From f92211cd7b0c1f9a6d2990b7522c02cea0709dcb Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Sat, 1 Dec 2007 05:06:07 +0000
Subject: [PATCH] 2007-11-30  Alex Roitman  <shura@gramps-project.org> 	*
 data/grampsxml.dtd: Add region to objref. 	* data/grampsxml.rng: Add
 region to objref.

svn: r9436
---
 ChangeLog          |  4 ++++
 data/grampsxml.dtd | 10 +++++++++-
 data/grampsxml.rng | 11 +++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 23b854195..d88a46193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-30  Alex Roitman  <shura@gramps-project.org>
+	* data/grampsxml.dtd: Add region to objref.
+	* data/grampsxml.rng: Add region to objref.
+
 2007-11-30 Benny Malengier <benny.malengier@gramps-project.org>
 	* src/GrampsCfg.py: rel media path entry box
 	* src/gen/db/base.py: methods for access
diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 536191ad0..8ddc8816d 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -427,12 +427,20 @@ SHARED ELEMENTS
         description CDATA #IMPLIED
 >
 
-<!ELEMENT objref (attribute*,sourceref*,noteref*)>
+<!ELEMENT objref (region?,reattribute*,sourceref*,noteref*)>
 <!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 2c46c99be..095865c90 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -555,6 +555,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>
@@ -593,4 +596,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>