Updated with StyledText Notes.

svn: r10545
This commit is contained in:
Zsolt Foldvari 2008-04-11 09:33:20 +00:00
parent 18f863e84f
commit e9d0cfe947
2 changed files with 33 additions and 9 deletions

View File

@ -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. of the GRAMPS XML genealogy data format.
Please use the following formal public identifier to identify it: 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: For example:
<!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.2.0//EN" <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.3.0//EN"
"http://gramps-project.org/xml/1.2.0/grampsxml.dtd" "http://gramps-project.org/xml/1.3.0/grampsxml.dtd"
[...]> [...]>
--> -->
@ -55,7 +55,7 @@ DATABASE
<!ELEMENT database (header, name-formats?, events?, people?, families?, <!ELEMENT database (header, name-formats?, events?, people?, families?,
sources?, places?, objects?, repositories?, notes?, sources?, places?, objects?, repositories?, notes?,
bookmarks?,namemaps?)> 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 HEADER
@ -313,7 +313,7 @@ NOTES
<!ELEMENT notes (note)*> <!ELEMENT notes (note)*>
<!ELEMENT note (#PCDATA)> <!ELEMENT note (text,tag*)>
<!ATTLIST note <!ATTLIST note
id CDATA #REQUIRED id CDATA #REQUIRED
handle ID #REQUIRED handle ID #REQUIRED
@ -324,6 +324,19 @@ NOTES
type CDATA #REQUIRED 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 BOOKMARKS

View File

@ -31,7 +31,7 @@
<grammar <grammar
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" 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"> xmlns="http://relaxng.org/ns/structure/1.0">
<start><element name="database"> <start><element name="database">
@ -413,7 +413,6 @@
<zeroOrMore><element name="sourceref"> <zeroOrMore><element name="sourceref">
<ref name="sourceref-content"/> <ref name="sourceref-content"/>
</element></zeroOrMore> </element></zeroOrMore>
</define> </define>
<define name="object-content"> <define name="object-content">
@ -488,7 +487,19 @@
<value>1</value> <value>1</value>
</choice></attribute></optional> </choice></attribute></optional>
<attribute name="type"><text/></attribute> <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>
<define name="sourceref-content"> <define name="sourceref-content">