From 8fa8bb103b85f15208908c415dcce3af952d2ce2 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Fri, 7 Oct 2005 16:28:10 +0000
Subject: [PATCH] * doc/grampsxml.dtd: Fix order, add missing contents.

svn: r5290
---
 gramps2/ChangeLog         |  3 +++
 gramps2/doc/grampsxml.dtd | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 92d617d45..29495facd 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2005-10-07  Alex Roitman  <shura@gramps-project.org>
+	* doc/grampsxml.dtd: Fix order, add missing contents.
+
 2005-10-07  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/plugins/TestcaseGenerator.py: Feed in more data
 	
diff --git a/gramps2/doc/grampsxml.dtd b/gramps2/doc/grampsxml.dtd
index e3334615c..363342021 100644
--- a/gramps2/doc/grampsxml.dtd
+++ b/gramps2/doc/grampsxml.dtd
@@ -92,8 +92,8 @@ PEOPLE
 >
 
 <!ELEMENT person (gender, name*, nick?, event*, lds_ord*,
-                  objref*, url*, childof*, address*, parentin*,
-                  sourceref?, attribute*, note?)>
+                  objref*, address*, attribute*, url*,
+                  childof*,  parentin*, note?, sourceref*)>
 <!ATTLIST person
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -158,7 +158,7 @@ FAMILY
 <!ELEMENT families (family)*>
 
 <!ELEMENT family (father?,mother?,event*,lds_ord*,
-                  objref*,child*,attribute*,note?)>
+                  objref*,child*,attribute*,note?,sourceref*)>
 <!ATTLIST family
         id       CDATA #REQUIRED
         handle   ID    #REQUIRED
@@ -323,5 +323,14 @@ EVENT
         description CDATA #IMPLIED
 >
 
-<!ELEMENT objref (attribute)*>
-<!ATTLIST objref hlink IDREF #REQUIRED>
+<!ELEMENT objref (attribute*,sourceref*,note?)>
+<!ATTLIST objref 
+        hlink IDREF #REQUIRED
+        priv (0|1)  #IMPLIED
+>
+
+<!ELEMENT data_item EMPTY>
+<!ATTLIST data_item
+        key   CDATA #REQUIRED
+        value CDATA #REQUIRED
+>