From 1edd0bf53d58d0f1f4eb320258b097874f925814 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Thu, 13 Oct 2005 21:36:18 +0000
Subject: [PATCH] Update

svn: r5314
---
 gramps2/doc/grampsxml.dtd |  9 +++++----
 gramps2/doc/grampsxml.rng | 28 ++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/gramps2/doc/grampsxml.dtd b/gramps2/doc/grampsxml.dtd
index a3a549846..61524f50a 100644
--- a/gramps2/doc/grampsxml.dtd
+++ b/gramps2/doc/grampsxml.dtd
@@ -335,21 +335,22 @@ EVENT
         value CDATA #REQUIRED
 >
 
-<!ELEMENT lds_ord (temple?,place?,status?,sealed_to?,note?,sourceref*)>
+<!ELEMENT lds_ord ((daterange|dateval|datestr)?,temple?,place?,status?,
+                   sealed_to?,note?,sourceref*)>
 <!ATTLIST lds_ord
         type   CDATA #REQUIRED
 >
 
-<!ELEMENt temple #EMPTY>
+<!ELEMENT temple EMPTY>
 <!ATTLIST temple
         val   CDATA #REQUIRED
 >
 
-<!ELEMENt status #EMPTY>
+<!ELEMENT status EMPTY>
 <!ATTLIST status
         val   CDATA #REQUIRED
 >
-<!ELEMENt sealed_to #EMPTY>
+<!ELEMENT sealed_to EMPTY>
 <!ATTLIST sealed_to
         hlink IDREF #REQUIRED
 >
diff --git a/gramps2/doc/grampsxml.rng b/gramps2/doc/grampsxml.rng
index 83aaecb15..37af07ba9 100644
--- a/gramps2/doc/grampsxml.rng
+++ b/gramps2/doc/grampsxml.rng
@@ -160,11 +160,12 @@
 
   <define name="child-rel">
     <choice>
-      <value>None</value>
       <value>Birth</value>
       <value>Adopted</value>
+      <value>Stepchild</value>
       <value>Sponsored</value>
       <value>Foster</value>
+      <value>None</value>
       <value>Other</value>
       <value>Unknown</value>
     </choice>
@@ -247,7 +248,7 @@
 
   <define name="family-content">
     <ref name="primary-object"/>
-    <optional><attribute name="comlpete"><choice>
+    <optional><attribute name="complete"><choice>
         <value>0</value>
         <value>1</value>
     </choice></attribute></optional>
@@ -276,6 +277,16 @@
     <zeroOrMore><element name="child">
         <attribute name="hlink"><data type="IDREF"/></attribute>
     </element></zeroOrMore>
+    <zeroOrMore><element name="attribute">
+        <ref name="attribute-content"/>
+    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
+    <optional><ref name="date-content"/></optional>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="source-content">
@@ -378,16 +389,24 @@
     </attribute></optional>
     <attribute name="type"><text/></attribute>
     <attribute name="value"><text/></attribute>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
+    </element></zeroOrMore>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
   </define>
 
   <define name="event-content">
     <attribute name="type"><text/></attribute>
-        <optional><attribute name="priv">
+    <optional><attribute name="priv">
         <ref name="priv-content"/>
     </attribute></optional>
     <optional><ref name="date-content"/></optional>
     <zeroOrMore><element name="witness">
-        <optional><attribute name="hlink"><data type="IDREF"/></attribute></optional>
+        <optional><attribute name="hlink">
+            <data type="IDREF"/>
+        </attribute></optional>
         <optional><attribute name="name"><text/></attribute></optional>
         <optional><element name="comment"><text/></element></optional>
     </element></zeroOrMore>
@@ -434,6 +453,7 @@
 
   <define name="lds-content">
     <attribute name="type"><text/></attribute>
+    <optional><ref name="date-content"/></optional>
     <optional><element name="temple">
         <attribute name="val"><text/></attribute>
     </element></optional>