From 6104ff10530a24a6adeb1a83fd2f2d4a7a6bd0d9 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Sat, 28 Jan 2006 01:05:04 +0000
Subject: [PATCH] * doc/grampsxml.rng: Update to reflect new XML.

svn: r5846
---
 gramps2/ChangeLog         |  1 +
 gramps2/doc/grampsxml.dtd |  2 +-
 gramps2/doc/grampsxml.rng | 36 +++++++++++++++++++-----------------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index d8ae402bd..ebc9a2a80 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -7,6 +7,7 @@
 	* src/GrampsDb/_ReadGedcom.py (parse_repo_ref_caln): Properly set
 	media type.
 	* src/GrampsDb/_WriteXML.py: More XML updates.
+	* doc/grampsxml.rng: Update to reflect new XML.
 
 2006-01-27  Don Allingham  <don@gramps-project.org>
 	* src/GrampsDb/_ReadGedcomp.py: preselect gramps ids for events
diff --git a/gramps2/doc/grampsxml.dtd b/gramps2/doc/grampsxml.dtd
index 19b680490..d767a7cc9 100644
--- a/gramps2/doc/grampsxml.dtd
+++ b/gramps2/doc/grampsxml.dtd
@@ -4,7 +4,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2001 Graham J. Williams
-# Copyright (C) 2000-2005  Donald N. Allingham
+# Copyright (C) 2000-2006  Donald N. Allingham
 #
 # 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
diff --git a/gramps2/doc/grampsxml.rng b/gramps2/doc/grampsxml.rng
index facfd5ea3..8c9161265 100644
--- a/gramps2/doc/grampsxml.rng
+++ b/gramps2/doc/grampsxml.rng
@@ -3,7 +3,7 @@
 <!-- 
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2005  Donald N. Allingham
+# Copyright (C) 2005-2006  Donald N. Allingham
 #
 # 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
@@ -62,6 +62,12 @@
           </element></zeroOrMore>
       </element></optional>
 
+      <optional><element name="events">
+          <zeroOrMore><element name="event">
+              <ref name="event-content"/>
+          </element></zeroOrMore>
+      </element></optional>
+
       <optional><element name="sources">
           <zeroOrMore><element name="source">
               <ref name="source-content"/>
@@ -108,14 +114,12 @@
   <define name="primary-object">
     <attribute name="id"><text/></attribute>
     <attribute name="handle"><data type="ID"/></attribute>
-    <attribute name="change"><text/></attribute>
     <optional><attribute name="priv"><choice>
         <value>0</value>
         <value>1</value>
     </choice></attribute></optional>
-    <optional><element name="marker">
-        <attribute name="value"><text/></attribute>
-    </element></optional>
+    <optional><attribute name="marker"><text/></attribute></optional>
+    <attribute name="change"><text/></attribute>
   </define>
 
   <define name="person-content">
@@ -265,13 +269,9 @@
 
   <define name="family-content">
     <ref name="primary-object"/>
-    <optional><attribute name="type"><choice>
-        <value>Married</value>
-        <value>Unmarried</value>
-        <value>Civil Union</value>
-        <value>Unknown</value>
-        <value>Other</value>
-    </choice></attribute></optional>
+    <optional><element name="rel">
+        <attribute name="type"><text/></attribute>
+    </element></optional>
     <optional><element name="father">
         <attribute name="hlink"><data type="IDREF"/></attribute>
     </element></optional>
@@ -304,7 +304,7 @@
 
   <define name="event-content">
     <ref name="primary-object"/>
-    <attribute name="type"><text/></attribute>
+    <element name="type"><text/></element>
     <optional><ref name="date-content"/></optional>
     <optional><element name="place">
         <attribute name="hlink"><data type="IDREF"/></attribute>
@@ -345,7 +345,7 @@
 
   <define name="place-content">
     <ref name="primary-object"/>
-    <attribute name="title"><text/></attribute>
+    <optional><element name="ptitle"><text/></element></optional>
     <optional><element name="coord">
         <attribute name="long"><data type="float"/></attribute>
         <attribute name="lat"><data type="float"/></attribute>
@@ -376,9 +376,11 @@
 
   <define name="object-content">
     <ref name="primary-object"/>
-    <attribute name="src"><text/></attribute>
-    <attribute name="mime"><text/></attribute>
-    <attribute name="description"><text/></attribute>
+    <element name="file">
+        <attribute name="src"><text/></attribute>
+        <attribute name="mime"><text/></attribute>
+        <attribute name="description"><text/></attribute>
+    </element>
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
     </element></zeroOrMore>