2007-09-29 Alex Roitman <shura@gramps-project.org>

* data/grampsxml.rng: Add region to objref.
	* data/grampsxml.dtd: Add region to objref.



svn: r9040
This commit is contained in:
Alex Roitman 2007-09-29 22:24:33 +00:00
parent bb231a73f1
commit 225bcabce3
3 changed files with 24 additions and 1 deletions

View File

@ -1,3 +1,7 @@
2007-09-29 Alex Roitman <shura@gramps-project.org>
* data/grampsxml.rng: Add region to objref.
* data/grampsxml.dtd: Add region to objref.
2007-09-29 Benny Malengier <benny.malengier@gramps-project.org> 2007-09-29 Benny Malengier <benny.malengier@gramps-project.org>
* src/GrampsDb/_ReadXML.py: read region tag in xml * src/GrampsDb/_ReadXML.py: read region tag in xml
* src/GrampsDb/_WriteXML.py: output region tag in xml (=subsection of picture) * src/GrampsDb/_WriteXML.py: output region tag in xml (=subsection of picture)

View File

@ -415,12 +415,20 @@ SHARED ELEMENTS
description CDATA #IMPLIED description CDATA #IMPLIED
> >
<!ELEMENT objref (attribute*,sourceref*,note?)> <!ELEMENT objref (region?,attribute*,sourceref*,note?)>
<!ATTLIST objref <!ATTLIST objref
hlink IDREF #REQUIRED hlink IDREF #REQUIRED
priv (0|1) #IMPLIED priv (0|1) #IMPLIED
> >
<!ELEMENT region EMPTY>
<!ATTLIST region
corner1_x CDATA #REQUIRED
corner1_y CDATA #REQUIRED
corner2_x CDATA #REQUIRED
corner2_y CDATA #REQUIRED
>
<!ELEMENT data_item EMPTY> <!ELEMENT data_item EMPTY>
<!ATTLIST data_item <!ATTLIST data_item
key CDATA #REQUIRED key CDATA #REQUIRED

View File

@ -539,6 +539,9 @@
<optional><attribute name="priv"> <optional><attribute name="priv">
<ref name="priv-content"/> <ref name="priv-content"/>
</attribute></optional> </attribute></optional>
<optional><element name="region">
<ref name="region-content"/>
</element></optional>
<zeroOrMore><element name="attribute"> <zeroOrMore><element name="attribute">
<ref name="attribute-content"/> <ref name="attribute-content"/>
</element></zeroOrMore> </element></zeroOrMore>
@ -577,4 +580,12 @@
</element></zeroOrMore> </element></zeroOrMore>
</define> </define>
<define name="region-content">
<attribute name="corner1_x"><data type="integer"/></attribute>
<attribute name="corner1_y"><data type="integer"/></attribute>
<attribute name="corner2_x"><data type="integer"/></attribute>
<attribute name="corner2_y"><data type="integer"/></attribute>
<text/>
</define>
</grammar> </grammar>