revert GEPS045 schema versions

Author: romjerome

lxml/grampsxml.dtd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
+<!-- 
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2001       Graham J. Williams
@@ -21,18 +21,19 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+# $Id$
 -->
 
 <!--
-    This is the Document Type Definition file for v1.8.0
+    This is the Document Type Definition file for v1.7.1
     of the GRAMPS XML genealogy data format.
     Please use the following formal public identifier to identify it:
 
-    "-//GRAMPS//DTD GRAMPS XML V1.8.0//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"
 
     For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.8.0//EN"
-                "http://gramps-project.org/xml/1.8.0/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"
+                "http://gramps-project.org/xml/1.7.1/grampsxml.dtd"
                 [...]>
 -->
 
@@ -58,10 +59,10 @@ DATABASE
     tags
 -->
 
-<!ELEMENT database (header, name-formats?, place-types?, tags?, events?,
-                    people?, families?, citations?, sources?, places?,
-                    objects?, repositories?, notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.8.0/">
+<!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.7.1/">
 
 
 <!--    ************************************************************
@@ -99,7 +100,7 @@ PEOPLE
 -->
 
 <!ELEMENT people (person)*>
-<!ATTLIST people
+<!ATTLIST people 
         default CDATA #IMPLIED
         home    IDREF #IMPLIED
 >
@@ -122,7 +123,7 @@ GENDER has values of M, F, or U.
 <!ELEMENT name    (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
                   (daterange|datespan|dateval|datestr)?, noteref*, citationref*)>
 <!-- (Unknown|Also Know As|Birth Name|Married Name|Other Name) -->
-<!ATTLIST name
+<!ATTLIST name    
         alt       (0|1) #IMPLIED
         type      CDATA #IMPLIED
         priv      (0|1) #IMPLIED
@@ -155,15 +156,15 @@ Pseudonym|Patrilineal|Matrilineal|Occupation|Location) -->
 <!ATTLIST parentin hlink IDREF #REQUIRED>
 
 <!ELEMENT personref (citationref*, noteref*)>
-<!ATTLIST personref
+<!ATTLIST personref 
         hlink IDREF #REQUIRED
         priv  (0|1) #IMPLIED
         rel   CDATA #REQUIRED
 >
 
-<!ELEMENT address ((daterange|datespan|dateval|datestr)?, street?,
-                   locality?, city?, county?, state?, country?, postal?,
-                   phone?, noteref*,citationref*)>
+<!ELEMENT address ((daterange|datespan|dateval|datestr)?, street?, 
+				   locality?, city?, county?, state?, country?, postal?, 
+				   phone?, noteref*,citationref*)>
 <!ATTLIST address priv (0|1) #IMPLIED>
 
 <!ELEMENT street   (#PCDATA)>
@@ -220,7 +221,7 @@ EVENT
 <!ELEMENT event (type?, (daterange|datespan|dateval|datestr)?, place?, cause?,
                  description?, attribute*, noteref*, citationref*, objref*,
                  tagref*)>
-<!ATTLIST event
+<!ATTLIST event 
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
         priv      (0|1) #IMPLIED
@@ -251,36 +252,25 @@ PLACES
 
 <!ELEMENT places (placeobj)*>
 
-<!ELEMENT placeobj (ptitle?, pname+, ptype+, coord?, placeref*, location*,
-                    objref*, url*, noteref*, citationref*, tagref*,
-                    attribute*, eventref*)>
+<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
+                    objref*, url*, noteref*, citationref*, tagref*)>
 <!ATTLIST placeobj
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
         priv      (0|1) #IMPLIED
         change    CDATA #REQUIRED
+        type      CDATA #REQUIRED
 >
 
-<!ELEMENT pname ((daterange|datespan|dateval|datestr)?, citationref*,
-                 pabbr*)>
+<!ELEMENT pname (daterange|datespan|dateval|datestr)?>
+
 <!ATTLIST pname
         lang CDATA #IMPLIED
         value CDATA #REQUIRED
 >
 
 <!ELEMENT ptitle (#PCDATA)>
-
-<!ELEMENT placeref ((daterange|datespan|dateval|datestr)?, citationref*)>
-<!ATTLIST placeref
-        type CDATA #IMPLIED
-        hlink IDREF #REQUIRED
->
-
-<!ELEMENT ptype ((daterange|datespan|dateval|datestr)?, citationref*)>
-<!ATTLIST ptype
-        value   CDATA #REQUIRED
-        number  CDATA #IMPLIED
->
+<!ELEMENT code (#PCDATA)>
 
 <!ELEMENT coord EMPTY>
 <!ATTLIST coord
@@ -300,12 +290,6 @@ PLACES
         postal   CDATA #IMPLIED
         phone    CDATA #IMPLIED
 >
-<!ELEMENT pabbr EMPTY>
-<!ATTLIST pabbr
-        type CDATA #IMPLIED
-        value CDATA #REQUIRED
->
-
 
 <!--    ************************************************************
 OBJECTS
@@ -336,7 +320,7 @@ REPOSITORIES
 
 <!ELEMENT repositories (repository)*>
 
-<!ELEMENT repository (rname?, type, address*, url*, noteref*, tagref*)>
+<!ELEMENT repository (rname, type, address*, url*, noteref*, tagref*)>
 <!ATTLIST repository
         id        CDATA #IMPLIED
         handle    ID    #REQUIRED
@@ -413,7 +397,7 @@ BOOKMARKS
 
 <!ELEMENT bookmarks (bookmark)*>
 <!ELEMENT bookmark EMPTY>
-<!ATTLIST bookmark
+<!ATTLIST bookmark 
         target (person|family|event|source|citation|place|media|repository|
                 note) #REQUIRED
         hlink  IDREF #REQUIRED
@@ -424,7 +408,7 @@ NAME MAPS
 -->
 <!ELEMENT namemaps (map)*>
 <!ELEMENT map EMPTY>
-<!ATTLIST map
+<!ATTLIST map 
         type  CDATA #REQUIRED
         key   CDATA #REQUIRED
         value CDATA #REQUIRED
@@ -443,18 +427,6 @@ NAME FORMATS
         active  (0|1) #IMPLIED
 >
 
-<!--    ************************************************************
-PLACE TYPES
--->
-
-<!ELEMENT place-types (place-type)*>
-<!ELEMENT place-type (pgroup*)>
-<!ATTLIST place-type
-        number  CDATA #IMPLIED
-        name    CDATA #REQUIRED
->
-<!ELEMENT pgroup (#PCDATA)>
-
 <!--    ************************************************************
 SHARED ELEMENTS
 -->
@@ -465,7 +437,7 @@ SHARED ELEMENTS
         quality   (estimated|calculated) #IMPLIED
         cformat   CDATA                  #IMPLIED
         dualdated (0|1)                  #IMPLIED
-        newyear   CDATA                  #IMPLIED
+        newyear   CDATA                  #IMPLIED 
 >
 
 <!ELEMENT datespan EMPTY>
@@ -475,7 +447,7 @@ SHARED ELEMENTS
         quality   (estimated|calculated) #IMPLIED
         cformat   CDATA                  #IMPLIED
         dualdated (0|1)                  #IMPLIED
-        newyear   CDATA                  #IMPLIED
+        newyear   CDATA                  #IMPLIED 
 >
 
 <!ELEMENT dateval EMPTY>
@@ -485,7 +457,7 @@ SHARED ELEMENTS
         quality   (estimated|calculated) #IMPLIED
         cformat   CDATA                  #IMPLIED
         dualdated (0|1)                  #IMPLIED
-        newyear   CDATA                  #IMPLIED
+        newyear   CDATA                  #IMPLIED 
 >
 
 <!ELEMENT datestr EMPTY>
@@ -558,11 +530,16 @@ SHARED ELEMENTS
 >
 
 <!ELEMENT objref (region?, attribute*, citationref*, noteref*)>
-<!ATTLIST objref
+<!ATTLIST objref 
         hlink IDREF #REQUIRED
         priv (0|1)  #IMPLIED
 >
 
+<!ELEMENT placeref ((daterange|datespan|dateval|datestr)?)>
+<!ATTLIST placeref
+        hlink IDREF #REQUIRED
+>
+
 <!ELEMENT region EMPTY>
 <!ATTLIST region
         corner1_x  CDATA #REQUIRED
@@ -596,4 +573,4 @@ SHARED ELEMENTS
 <!ELEMENT sealed_to EMPTY>
 <!ATTLIST sealed_to
         hlink IDREF #REQUIRED
->
+>