From 449a0d73a35cf57d8fe2b0ab396f0b1311290388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?=
 <romjerome@users.noreply.github.com>
Date: Sun, 5 Jul 2015 11:12:04 +0200
Subject: [PATCH] 8683: Cover custom types on DTD and RNG files

Now, xmllint passes '--dtdvalid' and '--relaxng'
---
 data/grampsxml.dtd |  8 ++++++--
 data/grampsxml.rng | 34 +++-------------------------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 4f769fc48..3e4a91978 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -122,6 +122,7 @@ GENDER has values of M, F, or U.
 
 <!ELEMENT name    (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
                   (daterange|datespan|dateval|datestr)?, noteref*, citationref*)>
+<!-- (Unknown|Also Know As|Birth Name|Married Name|Other Name) -->
 <!ATTLIST name    
         alt       (0|1) #IMPLIED
         type      CDATA #IMPLIED
@@ -138,6 +139,8 @@ GENDER has values of M, F, or U.
 <!ELEMENT familynick (#PCDATA)>
 <!ELEMENT group      (#PCDATA)>
 <!ELEMENT surname    (#PCDATA)>
+<!-- (Unknown|Inherited|Given|Taken|Patronymic|Matronymic|Feudal|
+Pseudonym|Patrilineal|Matrilineal|Occupation|Location) -->
 <!ATTLIST surname
         prefix      CDATA #IMPLIED
         prim        (1|0) #IMPLIED
@@ -196,12 +199,13 @@ FAMILY
 <!ELEMENT mother EMPTY>
 <!ATTLIST mother hlink IDREF #REQUIRED>
 
+<!-- (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) -->
 <!ELEMENT childref (citationref*,noteref*)>
 <!ATTLIST childref
         hlink IDREF #REQUIRED
         priv  (0|1) #IMPLIED
-        mrel  (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) #IMPLIED
-        frel  (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) #IMPLIED
+        mrel  CDATA #IMPLIED
+        frel  CDATA #IMPLIED
 >
 
 <!ELEMENT type (#PCDATA)>
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 4d10746b8..da5749513 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -210,16 +210,7 @@
   </define>
 
   <define name="child-rel">
-    <choice>
-      <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>
+    <text/>
   </define>
 
   <define name="name-content">
@@ -230,13 +221,7 @@
     <optional><attribute name="priv">
         <ref name="priv-content"/>
     </attribute></optional>
-    <optional><attribute name="type"><choice>
-        <value>Unknown</value>
-        <value>Also Known As</value>
-        <value>Birth Name</value>
-        <value>Married Name</value>
-        <value>Other Name</value>
-    </choice></attribute></optional>
+    <optional><attribute name="type"><text/></attribute></optional>
     <optional><attribute name="sort"><text/></attribute></optional>
     <optional><attribute name="display"><text/></attribute></optional>
     <optional><element name="first"><text/></element></optional>
@@ -265,20 +250,7 @@
     <value>1</value>
     <value>0</value>
     </choice></attribute></optional>
-    <optional><attribute name="derivation"><choice>
-    <value>Unknown</value>
-    <value>Inherited</value>
-    <value>Given</value>
-    <value>Taken</value>
-    <value>Patronymic</value>
-    <value>Matronymic</value>
-    <value>Feudal</value>
-    <value>Pseudonym</value>
-    <value>Patrilineal</value>
-    <value>Matrilineal</value>
-    <value>Occupation</value>
-    <value>Location</value>
-    </choice></attribute></optional>
+    <optional><attribute name="derivation"><text/></attribute></optional>
     <optional><attribute name="connector"><text/></attribute></optional>
   </define>