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

Fix place object element order in DTD and RNG schemas

Browse Source 
Element placeobj content does not follow the DTD and RNG,
expecting (ptitle? , pname+)

Fixes #12500
This commit is contained in:
romjerome 2022-02-04 19:55:09 +01:00 committed by Nick Hall
parent aa7d9c10c8
commit 3ad5248af0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/grampsxml.dtd
View File

@ -251,7 +251,7 @@ PLACES
<!ELEMENT places (placeobj)*> <!ELEMENT places (placeobj)*>
<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*, <!ELEMENT placeobj (ptitle?, code?, pname+, coord?, placeref*, location*,
objref*, url*, noteref*, citationref*, tagref*)> objref*, url*, noteref*, citationref*, tagref*)>
<!ATTLIST placeobj <!ATTLIST placeobj
id CDATA #IMPLIED id CDATA #IMPLIED

2
data/grampsxml.rng
View File

@ -453,10 +453,10 @@
<ref name="primary-object"/> <ref name="primary-object"/>
<attribute name="type"><text/></attribute> <attribute name="type"><text/></attribute>
<optional><element name="ptitle"><text/></element></optional> <optional><element name="ptitle"><text/></element></optional>
<optional><element name="code"><text/></element></optional>
<oneOrMore><element name="pname"> <oneOrMore><element name="pname">
<ref name="placename-content"/> <ref name="placename-content"/>
</element></oneOrMore> </element></oneOrMore>
<optional><element name="code"><text/></element></optional>
<optional><element name="coord"> <optional><element name="coord">
<attribute name="long"><text/></attribute> <attribute name="long"><text/></attribute>
<attribute name="lat"><text/></attribute> <attribute name="lat"><text/></attribute>