From e9d0cfe947c4b99fae2943c727f6ae3ca17fd5f1 Mon Sep 17 00:00:00 2001
From: Zsolt Foldvari <zfoldvar@users.sourceforge.net>
Date: Fri, 11 Apr 2008 09:33:20 +0000
Subject: [PATCH] Updated with StyledText Notes.

svn: r10545
---
 data/grampsxml.dtd | 25 +++++++++++++++++++------
 data/grampsxml.rng | 17 ++++++++++++++---
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 4a1609065..35846bfbe 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -24,15 +24,15 @@
 -->
 
 <!--
-    This is the Document Type Definition file for v1.2.0
+    This is the Document Type Definition file for v1.3.0
     of the GRAMPS XML genealogy data format.
     Please use the following formal public identifier to identify it:
 
-    "-//GRAMPS//DTD GRAMPS XML V1.2.0//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.3.0//EN"
 
     For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.2.0//EN"
-                "http://gramps-project.org/xml/1.2.0/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.3.0//EN"
+                "http://gramps-project.org/xml/1.3.0/grampsxml.dtd"
                 [...]>
 -->
 
@@ -55,7 +55,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, events?, people?, families?,
                     sources?, places?, objects?, repositories?, notes?,
                     bookmarks?,namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.2.0/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.3.0/">
 
 <!--	************************************************************
 HEADER
@@ -313,7 +313,7 @@ NOTES
 
 <!ELEMENT notes (note)*>
 
-<!ELEMENT note (#PCDATA)>
+<!ELEMENT note (text,tag*)>
 <!ATTLIST note
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -324,6 +324,19 @@ NOTES
 	type      CDATA #REQUIRED
 >
 
+<!ELEMENT text (#PCDATA)>
+
+<!ELEMENT tag (range+)>
+<!ATTLIST tag
+	name	CDATA #REQUIRED
+	value	CDATA #IMPLIED
+>
+
+<!ELEMENT range EMPTY>
+<!ATTLIST range
+	start	CDATA #REQUIRED
+	end	CDATA #REQUIRED
+>
 
 <!--	************************************************************
 BOOKMARKS
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 5a09e16e1..2b4de3f1e 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -31,7 +31,7 @@
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.2.0/"
+  ns="http://gramps-project.org/xml/1.3.0/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -413,7 +413,6 @@
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
-
   </define>
 
   <define name="object-content">
@@ -488,7 +487,19 @@
         <value>1</value>
     </choice></attribute></optional>
     <attribute name="type"><text/></attribute>
-    <text/>
+    <ref name="styledtext"/>
+  </define>
+
+  <define name="styledtext">
+    <element name="text"><text/></element>
+    <zeroOrMore><element name="tag">
+      <attribute name="name"><text/></attribute>
+      <optional><attribute name="value"><text/></attribute></optional>
+      <oneOrMore><element name="range">
+        <attribute name="start"><data type="int"/></attribute>
+        <attribute name="end"><data type="int"/></attribute>
+      </element></oneOrMore>
+    </element></zeroOrMore>
   </define>
 
   <define name="sourceref-content">