Update/Migrate 'example.gramps' and XML schema files

jpschewe · Jun 27, 2015 · 62082a4 · 62082a4
1 parent d81e182
commit 62082a4
Showing 3 changed files with 2,605 additions and 1,304 deletions.
diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
@@ -25,15 +25,15 @@
 -->
 
 <!--
-    This is the Document Type Definition file for v1.6.0
+    This is the Document Type Definition file for v1.7.0
     of the GRAMPS XML genealogy data format.
     Please use the following formal public identifier to identify it:
 
-    "-//GRAMPS//DTD GRAMPS XML V1.6.0//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.7.0//EN"
 
     For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.6.0//EN"
-                "http://gramps-project.org/xml/1.6.0/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.7.0//EN"
+                "http://gramps-project.org/xml/1.7.0/grampsxml.dtd"
                 [...]>
 -->
 
@@ -62,7 +62,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
                     citations?, sources?, places?, objects?, repositories?,
                     notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.6.0/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.7.0/">
 
 
 <!--    ************************************************************
@@ -248,20 +248,26 @@ PLACES
 
 <!ELEMENT places (placeobj)*>
 
-<!ELEMENT placeobj (ptitle?, code?, alt_name*, coord?, placeref*, location*,
+<!ELEMENT placeobj (ptitle?, name+, code?, coord?, placeref*, location*,
                     objref*, url*, noteref*, citationref*, tagref*)>
 <!ATTLIST placeobj
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
         priv      (0|1) #IMPLIED
         change    CDATA #REQUIRED
-        name      CDATA #REQUIRED
         type      CDATA #REQUIRED
 >
 
+
+<!ELEMENT name (daterange|datespan|dateval|datestr)?>
+
+<!ATTLIST name
+        lang CDATA #IMPLIED
+        value CDATA #REQUIRED
+>
+
 <!ELEMENT ptitle (#PCDATA)>
 <!ELEMENT code (#PCDATA)>
-<!ELEMENT alt_name (#PCDATA)>
 
 <!ELEMENT coord EMPTY>
 <!ATTLIST coord

diff --git a/data/grampsxml.rng b/data/grampsxml.rng
@@ -25,13 +25,13 @@
 -->
 
 <!--
-  This is the RELAX NG schema for the Gramps XML genealogy data format.
+  This is the RELAX NG schema for the GRAMPS XML genealogy data format.
 -->
 
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.6.0/"
+  ns="http://gramps-project.org/xml/1.7.0/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
@@ -479,11 +479,12 @@
 
   <define name="place-content">
     <ref name="primary-object"/>
-    <attribute name="name"><text/></attribute>
     <attribute name="type"><text/></attribute>
     <optional><element name="ptitle"><text/></element></optional>
+    <oneOrMore><element name="name">
+        <ref name="placename-content"/>
+    </element></oneOrMore>
     <optional><element name="code"><text/></element></optional>
-    <zeroOrMore><element name="alt_name"><text/></element></zeroOrMore>
     <optional><element name="coord">
         <attribute name="long"><text/></attribute>
         <attribute name="lat"><text/></attribute>
@@ -772,6 +773,12 @@
     <text/>
   </define>
 
+  <define name="placename-content">
+    <attribute name="value"><text/></attribute>
+    <optional><attribute name="lang"><text/></attribute></optional>
+    <optional><ref name="date-content"/></optional>
+  </define>
+
   <define name="placeref-content">
     <attribute name="hlink"><data type="IDREF"/></attribute>
     <optional><ref name="date-content"/></optional>