From 225bcabce31e24a756dfec8c798d2086551c5ada Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Sat, 29 Sep 2007 22:24:33 +0000
Subject: [PATCH] 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
---
 ChangeLog          |  4 ++++
 data/grampsxml.dtd | 10 +++++++++-
 data/grampsxml.rng | 11 +++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b520c0dd6..5e6cc79a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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> 
 	* src/GrampsDb/_ReadXML.py: read region tag in xml
 	* src/GrampsDb/_WriteXML.py: output region tag in xml (=subsection of picture)
diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 347c401c8..301990843 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -415,12 +415,20 @@ SHARED ELEMENTS
         description CDATA #IMPLIED
 >
 
-<!ELEMENT objref (attribute*,sourceref*,note?)>
+<!ELEMENT objref (region?,attribute*,sourceref*,note?)>
 <!ATTLIST objref 
         hlink IDREF #REQUIRED
         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>
 <!ATTLIST data_item
         key   CDATA #REQUIRED
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 33dc63e5b..98107785a 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -539,6 +539,9 @@
     <optional><attribute name="priv">
         <ref name="priv-content"/>
     </attribute></optional>
+    <optional><element name="region">
+        <ref name="region-content"/>
+    </element></optional>    
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
     </element></zeroOrMore>
@@ -577,4 +580,12 @@
     </element></zeroOrMore>
   </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>