From 822c770f7e6dbdca8db1cf155997cecd230524c4 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Fri, 23 Dec 2005 21:32:55 +0000 Subject: [PATCH] * doc/grampsxml.dtd: Describe new XML. * doc/grampsxml.rng: Describe new XML. svn: r5627 --- ChangeLog | 3 ++ doc/grampsxml.dtd | 98 +++++++++++++++++++++++++------------ doc/grampsxml.rng | 122 +++++++++++++++++++++++++++++----------------- 3 files changed, 147 insertions(+), 76 deletions(-) diff --git a/ChangeLog b/ChangeLog index da569502d..711e0f1b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ * src/EditSource.py: Use id(self) instead of self. * src/EventEdit.py: Use id(self) instead of self. + * doc/grampsxml.dtd: Describe new XML. + * doc/grampsxml.rng: Describe new XML. + 2005-12-22 Don Allingham * src/AddrEdit.py: More window management * src/AttrEdit.py: More window management diff --git a/doc/grampsxml.dtd b/doc/grampsxml.dtd index af62edaa9..10feb7c87 100644 --- a/doc/grampsxml.dtd +++ b/doc/grampsxml.dtd @@ -24,15 +24,15 @@ --> @@ -52,7 +52,7 @@ DATABASE - + + + + + + note?,objref*,data_item*,reporef*,marker?)> @@ -199,11 +214,12 @@ PLACES - + @@ -230,16 +246,32 @@ OBJECTS - + + + + + + + + - - - - - - - @@ -321,6 +354,7 @@ EVENT diff --git a/doc/grampsxml.rng b/doc/grampsxml.rng index eb28af1e4..facfd5ea3 100644 --- a/doc/grampsxml.rng +++ b/doc/grampsxml.rng @@ -31,7 +31,7 @@ @@ -80,6 +80,12 @@ + + + + + + @@ -103,14 +109,17 @@ + + 0 + 1 + + + + - - 0 - 1 - M F @@ -120,8 +129,8 @@ - - + + @@ -256,10 +265,6 @@ - - 0 - 1 - Married Unmarried @@ -273,8 +278,8 @@ - - + + @@ -297,6 +302,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -313,6 +338,9 @@ + + + @@ -363,6 +391,21 @@ + + + + + + + + + + + + + + + @@ -384,12 +427,32 @@ + + + + + + + + + + + + + + + + + + + + 0 1 - + @@ -405,40 +468,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +