Update Gramps XML Import/Export to support Citations

svn: r18086

data/grampsxml.rng

@@ -4,7 +4,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2005-2007  Donald N. Allingham
-# Copyright (C) 2010       Nick Hall
+# Copyright (C) 2010-2011  Nick Hall
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.4.0/"
+  ns="http://gramps-project.org/xml/1.5.0/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -82,6 +82,12 @@
           </element></zeroOrMore>
       </element></optional>
 
+      <optional><element name="citations">
+          <zeroOrMore><element name="citation">
+              <ref name="citation-content"/>
+          </element></zeroOrMore>
+      </element></optional>
+
       <optional><element name="sources">
           <zeroOrMore><element name="source">
               <ref name="source-content"/>
@@ -148,7 +154,6 @@
         <value>0</value>
         <value>1</value>
     </choice></attribute></optional>
-    <optional><attribute name="marker"><text/></attribute></optional>
   </define>
 
   <define name="person-content">
@@ -195,8 +200,8 @@
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="tagref">
         <ref name="tagref-content"/>
@@ -234,20 +239,20 @@
     <optional><attribute name="display"><text/></attribute></optional>
     <optional><element name="first"><text/></element></optional>
     <optional><element name="call"><text/></element></optional>
+    <zeroOrMore>
+        <ref name="surname-content"/>
+    </zeroOrMore>
+    <optional><element name="suffix"><text/></element></optional>
+    <optional><element name="title"><text/></element></optional>
     <optional><element name="nick"><text/></element></optional>
     <optional><element name="familynick"><text/></element></optional>
     <optional><element name="group"><text/></element></optional>
-    <zeroOrMore><element name="surname">
-        <ref name="surname-content"/>
-    </element></zeroOrMore>
-    <optional><element name="suffix"><text/></element></optional>
-    <optional><element name="title"><text/></element></optional>
     <optional><ref name="date-content"/></optional>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
   </define>
 
@@ -284,8 +289,8 @@
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
   </define>
 
@@ -379,8 +384,8 @@
         <ref name="noteref-content"/>
     </element></zeroOrMore>
     <optional><ref name="date-content"/></optional>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="tagref">
         <ref name="tagref-content"/>
@@ -401,14 +406,34 @@
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="objref">
         <ref name="objref-content"/>
     </element></zeroOrMore>
   </define>
 
+  <define name="citation-content">
+    <ref name="primary-object"/>
+    <optional><ref name="date-content"/></optional>
+    <optional><element name="page"><text/></element></optional>
+    <optional><element name="confidence"><text/></element></optional>
+    <zeroOrMore><element name="noteref">
+        <ref name="noteref-content"/>
+    </element></zeroOrMore>
+    <zeroOrMore><element name="objref">
+        <ref name="objref-content"/>
+    </element></zeroOrMore>
+    <zeroOrMore><element name="data_item">
+        <attribute name="key"><text/></attribute>
+        <attribute name="value"><text/></attribute>
+    </element></zeroOrMore>
+    <element name="sourceref">
+        <ref name="sourceref-content"/>
+    </element>
+  </define>
+
   <define name="source-content">
     <ref name="primary-object"/>
     <optional><element name="stitle"><text/></element></optional>
@@ -456,8 +481,8 @@
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
   </define>
 
@@ -475,8 +500,8 @@
         <ref name="noteref-content"/>
     </element></zeroOrMore>
     <optional><ref name="date-content"/></optional>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="tagref">
         <ref name="tagref-content"/>
@@ -564,19 +589,14 @@
     </element></zeroOrMore>
   </define>
 
+  <define name="citationref-content">
+    <attribute name="hlink"><data type="IDREF"/></attribute>
+  </define>
+    
   <define name="sourceref-content">
     <attribute name="hlink"><data type="IDREF"/></attribute>
-    <optional><attribute name="priv">
-        <ref name="priv-content"/>
-    </attribute></optional>
-    <optional><attribute name="conf"><text/></attribute></optional>
-    <optional><element name="spage"><text/></element></optional>
-    <zeroOrMore><element name="noteref">
-        <ref name="noteref-content"/>
-    </element></zeroOrMore>
-    <optional><ref name="date-content"/></optional>
   </define>
-
+    
   <define name="eventref-content">
     <attribute name="hlink"><data type="IDREF"/></attribute>
     <optional><attribute name="priv">
@@ -620,8 +640,8 @@
     </attribute></optional>
     <attribute name="type"><text/></attribute>
     <attribute name="value"><text/></attribute>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
@@ -648,8 +668,8 @@
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
     </element></zeroOrMore>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
     <zeroOrMore><element name="noteref">
         <ref name="noteref-content"/>
@@ -678,8 +698,8 @@
         <ref name="noteref-content"/>
     </element></zeroOrMore>
     <optional><ref name="date-content"/></optional>
-    <zeroOrMore><element name="sourceref">
-        <ref name="sourceref-content"/>
+    <zeroOrMore><element name="citationref">
+        <ref name="citationref-content"/>
     </element></zeroOrMore>
   </define>