GEPS 011: Tagging - Extended to Family, Note and Media objects

svn: r16025

data/grampsxml.dtd

@@ -3,8 +3,9 @@
 <!-- 
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2001 Graham J. Williams
+# Copyright (C) 2001       Graham J. Williams
 # Copyright (C) 2000-2007  Donald N. Allingham
+# Copyright (C) 2010       Nick Hall
 #
 # 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
@@ -171,8 +172,8 @@ FAMILY
 
 <!ELEMENT families (family)*>
 
-<!ELEMENT family (rel?, father?, mother?, eventref*, lds_ord*,
-                  objref*, childref*, attribute*, noteref*, sourceref*)>
+<!ELEMENT family (rel?, father?, mother?, eventref*, lds_ord*, objref*,
+                  childref*, attribute*, noteref*, sourceref*, tagref*)>
 <!ATTLIST family
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -277,7 +278,7 @@ OBJECTS
 <!ELEMENT objects (object)*>
 
 <!ELEMENT object (file, attribute*, noteref*,
-                 (daterange|datespan|dateval|datestr)?, sourceref*)>
+                 (daterange|datespan|dateval|datestr)?, sourceref*, tagref*)>
 <!ATTLIST object
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED
@@ -316,7 +317,7 @@ NOTES
 
 <!ELEMENT notes (note)*>
 
-<!ELEMENT note (text, style*)>
+<!ELEMENT note (text, style*, tagref*)>
 <!ATTLIST note
         id        CDATA #REQUIRED
         handle    ID    #REQUIRED

data/grampsxml.rng

@@ -4,6 +4,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2005-2007  Donald N. Allingham
+# Copyright (C) 2010       Nick Hall
 #
 # 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
@@ -364,6 +365,9 @@
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
+    <zeroOrMore><element name="tagref">
+        <ref name="tagref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="event-content">
@@ -457,6 +461,9 @@
     <zeroOrMore><element name="sourceref">
         <ref name="sourceref-content"/>
     </element></zeroOrMore>
+    <zeroOrMore><element name="tagref">
+        <ref name="tagref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="repository-content">
@@ -513,6 +520,9 @@
     </choice></attribute></optional>
     <attribute name="type"><text/></attribute>
     <ref name="styledtext"/>
+    <zeroOrMore><element name="tagref">
+        <ref name="tagref-content"/>
+    </element></zeroOrMore>
   </define>
 
   <define name="styledtext">