Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5105: Parser Error on DTD 1.4.0 with XML::LibXML

Browse Source 
svn: r18005
This commit is contained in:
Michiel Nauta 2011-08-07 21:56:10 +00:00
parent 65891fd653
commit 7a5aad2ea8
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/grampsxml.dtd
View File

@ -110,7 +110,6 @@ PEOPLE
id CDATA #IMPLIED id CDATA #IMPLIED
handle ID #REQUIRED handle ID #REQUIRED
priv (0|1) #IMPLIED priv (0|1) #IMPLIED
marker CDATA #IMPLIED
change CDATA #REQUIRED change CDATA #REQUIRED
> >
@ -119,7 +118,7 @@ GENDER has values of M, F, or U.
--> -->
<!ELEMENT gender (#PCDATA)> <!ELEMENT gender (#PCDATA)>
<!ELEMENT name (first?, call?, surname*, nick?, familynick?, suffix?, title?, group? <!ELEMENT name (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
(daterange|datespan|dateval|datestr)?, noteref*, sourceref*)> (daterange|datespan|dateval|datestr)?, noteref*, sourceref*)>
<!ATTLIST name <!ATTLIST name
alt (0|1) #IMPLIED alt (0|1) #IMPLIED
@ -164,6 +163,7 @@ GENDER has values of M, F, or U.
<!ATTLIST address priv (0|1) #IMPLIED> <!ATTLIST address priv (0|1) #IMPLIED>
<!ELEMENT street (#PCDATA)> <!ELEMENT street (#PCDATA)>
<!ELEMENT locality (#PCDATA)>
<!ELEMENT city (#PCDATA)> <!ELEMENT city (#PCDATA)>
<!ELEMENT county (#PCDATA)> <!ELEMENT county (#PCDATA)>
<!ELEMENT country (#PCDATA)> <!ELEMENT country (#PCDATA)>
@ -185,7 +185,6 @@ FAMILY
id CDATA #IMPLIED id CDATA #IMPLIED
handle ID #REQUIRED handle ID #REQUIRED
priv (0|1) #IMPLIED priv (0|1) #IMPLIED
marker CDATA #IMPLIED
change CDATA #REQUIRED change CDATA #REQUIRED
> >
@ -219,7 +218,6 @@ EVENT
id CDATA #IMPLIED id CDATA #IMPLIED
handle ID #REQUIRED handle ID #REQUIRED
priv (0|1) #IMPLIED priv (0|1) #IMPLIED
marker CDATA #IMPLIED
change CDATA #REQUIRED change CDATA #REQUIRED
> >
@ -234,7 +232,6 @@ SOURCES
id CDATA #IMPLIED id CDATA #IMPLIED
handle ID #REQUIRED handle ID #REQUIRED
priv (0|1) #IMPLIED priv (0|1) #IMPLIED
marker CDATA #IMPLIED
change CDATA #REQUIRED change CDATA #REQUIRED
> >
<!ELEMENT stitle (#PCDATA)> <!ELEMENT stitle (#PCDATA)>
@ -254,7 +251,6 @@ PLACES
id CDATA #IMPLIED id CDATA #IMPLIED
handle ID #REQUIRED handle ID #REQUIRED
priv (0|1) #IMPLIED priv (0|1) #IMPLIED
marker CDATA #IMPLIED
change CDATA #REQUIRED change CDATA #REQUIRED
> >
@ -290,7 +286,6 @@ OBJECTS
id CDATA #IMPLIED id CDATA #IMPLIED
handle ID #REQUIRED handle ID #REQUIRED
priv (0|1) #IMPLIED priv (0|1) #IMPLIED
marker CDATA #IMPLIED
change CDATA #REQUIRED change CDATA #REQUIRED
> >
@ -312,7 +307,6 @@ REPOSITORIES
id CDATA #IMPLIED id CDATA #IMPLIED
handle ID #REQUIRED handle ID #REQUIRED
priv (0|1) #IMPLIED priv (0|1) #IMPLIED
marker CDATA #IMPLIED
change CDATA #REQUIRED change CDATA #REQUIRED
> >
@ -329,7 +323,6 @@ NOTES
id CDATA #IMPLIED id CDATA #IMPLIED
handle ID #REQUIRED handle ID #REQUIRED
priv (0|1) #IMPLIED priv (0|1) #IMPLIED
marker CDATA #IMPLIED
change CDATA #REQUIRED change CDATA #REQUIRED
format (0|1) #IMPLIED format (0|1) #IMPLIED
type CDATA #REQUIRED type CDATA #REQUIRED

51
data/grampsxml.rng
View File

@ -148,7 +148,6 @@
<value>0</value> <value>0</value>
<value>1</value> <value>1</value>
</choice></attribute></optional> </choice></attribute></optional>
<optional><attribute name="marker"><text/></attribute></optional>
</define> </define>
<define name="person-content"> <define name="person-content">
@ -225,6 +224,7 @@
<ref name="priv-content"/> <ref name="priv-content"/>
</attribute></optional> </attribute></optional>
<optional><attribute name="type"><choice> <optional><attribute name="type"><choice>
<value>Unknown</value>
<value>Also Known As</value> <value>Also Known As</value>
<value>Birth Name</value> <value>Birth Name</value>
<value>Married Name</value> <value>Married Name</value>
@ -234,14 +234,14 @@
<optional><attribute name="display"><text/></attribute></optional> <optional><attribute name="display"><text/></attribute></optional>
<optional><element name="first"><text/></element></optional> <optional><element name="first"><text/></element></optional>
<optional><element name="call"><text/></element></optional> <optional><element name="call"><text/></element></optional>
<optional><element name="nick"><text/></element></optional>
<optional><element name="familynick"><text/></element></optional>
<optional><element name="group"><text/></element></optional>
<zeroOrMore><element name="surname"> <zeroOrMore><element name="surname">
<ref name="surname-content"/> <ref name="surname-content"/>
</element></zeroOrMore> </element></zeroOrMore>
<optional><element name="suffix"><text/></element></optional> <optional><element name="suffix"><text/></element></optional>
<optional><element name="title"><text/></element></optional> <optional><element name="title"><text/></element></optional>
<optional><element name="nick"><text/></element></optional>
<optional><element name="familynick"><text/></element></optional>
<optional><element name="group"><text/></element></optional>
<optional><ref name="date-content"/></optional> <optional><ref name="date-content"/></optional>
<zeroOrMore><element name="noteref"> <zeroOrMore><element name="noteref">
<ref name="noteref-content"/> <ref name="noteref-content"/>
@ -252,21 +252,27 @@
</define> </define>
<define name="surname-content"> <define name="surname-content">
<element name="surname"> <text/>
<text/> <optional><attribute name="prefix"><text/></attribute></optional>
<optional><attribute name="prefix"><text/></attribute></optional> <optional><attribute name="prim"><choice>
<optional><attribute name="prim"><choice> <value>1</value>
<value>1</value> <value>0</value>
<value>0</value> </choice></attribute></optional>
</choice></attribute></optional> <optional><attribute name="derivation"><choice>
<optional><attribute name="derivation"><choice> <value>Unknown</value>
<value>inherited</value> <value>Inherited</value>
<value>patronymic</value> <value>Given</value>
<value>matronymic</value> <value>Taken</value>
<value>other</value> <value>Patronymic</value>
</choice></attribute></optional> <value>Matronymic</value>
<optional><attribute name="connector"><text/></attribute></optional> <value>Feudal</value>
</element> <value>Pseudonym</value>
<value>Patrilineal</value>
<value>Matrilineal</value>
<value>Occupation</value>
<value>Location</value>
</choice></attribute></optional>
<optional><attribute name="connector"><text/></attribute></optional>
</define> </define>
<define name="address-content"> <define name="address-content">
@ -371,6 +377,12 @@
<optional><attribute name="frel"> <optional><attribute name="frel">
<ref name="child-rel"/> <ref name="child-rel"/>
</attribute></optional> </attribute></optional>
<zeroOrMore><element name="sourceref">
<ref name="sourceref-content"/>
</element></zeroOrMore>
<zeroOrMore><element name="noteref">
<ref name="noteref-content"/>
</element></zeroOrMore>
</element></zeroOrMore> </element></zeroOrMore>
<zeroOrMore><element name="attribute"> <zeroOrMore><element name="attribute">
<ref name="attribute-content"/> <ref name="attribute-content"/>
@ -439,6 +451,7 @@
</element></optional> </element></optional>
<zeroOrMore><element name="location"> <zeroOrMore><element name="location">
<optional><attribute name="street"><text/></attribute></optional> <optional><attribute name="street"><text/></attribute></optional>
<optional><attribute name="locality"><text/></attribute></optional>
<optional><attribute name="city"><text/></attribute></optional> <optional><attribute name="city"><text/></attribute></optional>
<optional><attribute name="parish"><text/></attribute></optional> <optional><attribute name="parish"><text/></attribute></optional>
<optional><attribute name="county"><text/></attribute></optional> <optional><attribute name="county"><text/></attribute></optional>