From e51d189b29a8806f256f946a0a2608dbef554138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= <romjerome@yahoo.fr>
Date: Thu, 29 Sep 2011 16:02:49 +0000
Subject: [PATCH] 5264: minor validation issues on researcher and person
 reference

svn: r18219
---
 data/grampsxml.rng | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index cf48a85a0..9636b7ec8 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -42,10 +42,15 @@
             <attribute name="date"><data type="date"/></attribute>
             <attribute name="version"><text/></attribute>
         </element>
-        <optional><element name="researcher">
+        <element name="researcher">
+            <optional>
             <ref name="researcher-content"/>
-        </element></optional>
-        <optional><element name="mediapath"><text/></element></optional>
+            </optional>
+        </element>
+        <optional>
+           <element name="mediapath"><text/>
+           </element>
+        </optional>
       </element>
 
       <optional><element name="name-formats">
@@ -185,11 +190,7 @@
         <attribute name="hlink"><data type="IDREF"/></attribute>
     </element></zeroOrMore>
     <zeroOrMore><element name="personref">
-        <attribute name="hlink"><data type="IDREF"/></attribute>
-        <optional><attribute name="priv">
-            <ref name="priv-content"/>
-        </attribute></optional>
-        <attribute name="rel"><text/></attribute>
+        <ref name="personref-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
@@ -578,6 +579,17 @@
     </element></zeroOrMore>
   </define>
 
+  <define name="personref-content">
+    <attribute name="hlink"><data type="IDREF"/></attribute>
+        <optional><attribute name="priv">
+            <ref name="priv-content"/>
+        </attribute></optional>
+        <attribute name="rel"><text/></attribute>
+    <optional><zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
+    </element></zeroOrMore></optional>
+  </define>
+
   <define name="sourceref-content">
     <attribute name="hlink"><data type="IDREF"/></attribute>
     <optional><attribute name="priv">