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

8683: fix duplicate <name> element on pre-1.7.0 XML version

Browse Source 
XML: use <pname> tag into place hierarchy instead of duplicate <name>
This commit is contained in:
Jérôme Rapinat
2015-07-05 10:50:13 +02:00
parent 63dc1ddff8
commit 49ec2e1244
6 changed files with 1347 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/grampsxml.dtd
View File

@ -248,7 +248,7 @@ PLACES
<!ELEMENT places (placeobj)*>
<!ELEMENT placeobj (ptitle?, name+, code?, coord?, placeref*, location*,
<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
objref*, url*, noteref*, citationref*, tagref*)>
<!ATTLIST placeobj
id CDATA #IMPLIED
@ -258,10 +258,9 @@ PLACES
type CDATA #REQUIRED
>
<!ELEMENT pname (daterange|datespan|dateval|datestr)?>
<!ELEMENT name (daterange|datespan|dateval|datestr)?>
<!ATTLIST name
<!ATTLIST pname
lang CDATA #IMPLIED
value CDATA #REQUIRED
>

2
data/grampsxml.rng
View File

@ -481,7 +481,7 @@
<ref name="primary-object"/>
<attribute name="type"><text/></attribute>
<optional><element name="ptitle"><text/></element></optional>
<oneOrMore><element name="name">
<oneOrMore><element name="pname">
<ref name="placename-content"/>
</element></oneOrMore>
<optional><element name="code"><text/></element></optional>