From d7dd3e2de75ef224cb0476c0c511a0e55fb8ffe9 Mon Sep 17 00:00:00 2001
From: KristinaRichts <krichts@mail.uni-paderborn.de>
Date: Fri, 13 Mar 2020 19:32:32 +0100
Subject: [PATCH] name in persons erlaubt

---
 schema/de/wegaPersons.isosch |  4 ++--
 schema/de/wegaPersons.rng    | 28 ++++++++++++++++++++++++++--
 schema/en/wegaPersons.isosch |  4 ++--
 schema/en/wegaPersons.rng    | 28 ++++++++++++++++++++++++++--
 src/WeGA_common.odd.xml      | 24 ++++++++++++------------
 src/WeGA_persons.odd.xml     |  2 +-
 6 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/schema/de/wegaPersons.isosch b/schema/de/wegaPersons.isosch
index f1a6f15f..3927f252 100644
--- a/schema/de/wegaPersons.isosch
+++ b/schema/de/wegaPersons.isosch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
    <title>ISO Schematron rules</title>
-   <!-- This file generated 2020-03-13T12:56:07.06+01:00 by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2020-03-13T19:30:50.804+01:00 by 'extract-isosch.xsl'. -->
 
 <!-- ********************* -->
 <!-- namespaces, declared: -->
@@ -36,7 +36,7 @@ belongs, but this <name/> element has no textual content.</assert>
         </pattern>
    <pattern id="wegaPersons-rs-constraint-rs-typeNkey-4">
                     <rule context="tei:rs[@type][@key]">
-                        <assert test="                             (matches(@key, '^A00\d{4}$') and @type='person') or                             (matches(@key, '^A02\d{4}$') and @type='work') or                             (matches(@key, '^A03\d{4}$') and @type='writing') or                             (matches(@key, '^A04\d{4}$') and @type='letter') or                             (matches(@key, '^A06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(A00\d{4}\s)*A00\d{4}$') and @type='persons') or                             (matches(@key, '^(A02\d{4}\s)*A02\d{4}$') and @type='works') or                             (matches(@key, '^(A03\d{4}\s)*A03\d{4}$') and @type='writings') or                             (matches(@key, '^(A04\d{4}\s)*A04\d{4}$') and @type='letters') or                             (matches(@key, '^(A05\d{4}\s)*A05\d{4}$') and @type='news') or                             (matches(@key, '^(A06\d{4}\s)*A06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^(A11\d{4}\s)*A11\d{4}$') and @type='biblio')">Type mismatch: The value for @type must be in accordance with the given ID in @key</assert>
+                        <assert test="                             (matches(@key, '^H00\d{4}$') and @type='person') or                             (matches(@key, '^H02\d{4}$') and @type='work') or                             (matches(@key, '^H03\d{4}$') and @type='writing') or                             (matches(@key, '^H04\d{4}$') and @type='letter') or                             (matches(@key, '^H06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(H00\d{4}\s)*H00\d{4}$') and @type='persons') or                             (matches(@key, '^(H02\d{4}\s)*H02\d{4}$') and @type='works') or                             (matches(@key, '^(H03\d{4}\s)*H03\d{4}$') and @type='writings') or                             (matches(@key, '^(H04\d{4}\s)*H04\d{4}$') and @type='letters') or                             (matches(@key, '^(H05\d{4}\s)*H05\d{4}$') and @type='news') or                             (matches(@key, '^(H06\d{4}\s)*H06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^(H11\d{4}\s)*H11\d{4}$') and @type='biblio')">Type mismatch: The value for @type must be in accordance with the given ID in @key</assert>
                     </rule>
                 </pattern>
    <pattern id="wegaPersons-date-constraint-dateHeuristics1-5">
diff --git a/schema/de/wegaPersons.rng b/schema/de/wegaPersons.rng
index 8a0748ac..4a156e35 100644
--- a/schema/de/wegaPersons.rng
+++ b/schema/de/wegaPersons.rng
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://www.tei-c.org/ns/1.0">
   <!--
-Schema generated from ODD source 2020-03-13T12:56:05Z. 
+Schema generated from ODD source 2020-03-13T19:30:49Z. 
 Edition: Version 2.7.0. Last updated on
 	16th September 2014, revision 13036
 Edition Location: http://www.tei-c.org/Vault/P5/Version 2.7.0/
@@ -690,6 +690,7 @@ Empfohlene Werte sind: 1] internal; 2] external; 3] conjecture</a:documentation>
   </define>
   <define name="model.nameLike.agent">
     <choice>
+      <ref name="name"/>
       <ref name="orgName"/>
       <ref name="persName"/>
       <ref name="characterName"/>
@@ -697,17 +698,22 @@ Empfohlene Werte sind: 1] internal; 2] external; 3] conjecture</a:documentation>
   </define>
   <define name="model.nameLike.agent_alternation">
     <choice>
+      <ref name="name"/>
       <ref name="orgName"/>
       <ref name="persName"/>
       <ref name="characterName"/>
     </choice>
   </define>
   <define name="model.nameLike.agent_sequence">
+    <ref name="name"/>
     <ref name="orgName"/>
     <ref name="persName"/>
     <ref name="characterName"/>
   </define>
   <define name="model.nameLike.agent_sequenceOptional">
+    <optional>
+      <ref name="name"/>
+    </optional>
     <optional>
       <ref name="orgName"/>
     </optional>
@@ -719,6 +725,9 @@ Empfohlene Werte sind: 1] internal; 2] external; 3] conjecture</a:documentation>
     </optional>
   </define>
   <define name="model.nameLike.agent_sequenceOptionalRepeatable">
+    <zeroOrMore>
+      <ref name="name"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="orgName"/>
     </zeroOrMore>
@@ -730,6 +739,9 @@ Empfohlene Werte sind: 1] internal; 2] external; 3] conjecture</a:documentation>
     </zeroOrMore>
   </define>
   <define name="model.nameLike.agent_sequenceRepeatable">
+    <oneOrMore>
+      <ref name="name"/>
+    </oneOrMore>
     <oneOrMore>
       <ref name="orgName"/>
     </oneOrMore>
@@ -1385,13 +1397,25 @@ Empfohlene Werte sind: 1] internal; 2] external; 3] conjecture</a:documentation>
       <empty/>
     </element>
   </define>
+  <define name="name">
+    <element name="name">
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(name, proper noun) contains a proper noun or noun phrase. [3.5.1. ]</a:documentation>
+      <ref name="macro.phraseSeq"/>
+      <ref name="att.global.attributes"/>
+      <ref name="att.personal.attributes"/>
+      <ref name="att.datable.attributes"/>
+      <ref name="att.editLike.attributes"/>
+      <ref name="att.typed.attributes"/>
+      <empty/>
+    </element>
+  </define>
   <define name="rs">
     <element name="rs">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(referenzierende Zeichenkette) bezeichnet ein oder mehrere Objekt(e) vom Typ Person, Werk, Tagebucheintrag, usw. [13.2.1.  3.5.1. ]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="wegaPersons-rs-rs-typeNkey-constraint-4">
         <sch:rule xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:s="http://www.ascc.net/xml/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:rs[@type][@key]">
-          <sch:assert test="                             (matches(@key, '^A00\d{4}$') and @type='person') or                             (matches(@key, '^A02\d{4}$') and @type='work') or                             (matches(@key, '^A03\d{4}$') and @type='writing') or                             (matches(@key, '^A04\d{4}$') and @type='letter') or                             (matches(@key, '^A06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(A00\d{4}\s)*A00\d{4}$') and @type='persons') or                             (matches(@key, '^(A02\d{4}\s)*A02\d{4}$') and @type='works') or                             (matches(@key, '^(A03\d{4}\s)*A03\d{4}$') and @type='writings') or                             (matches(@key, '^(A04\d{4}\s)*A04\d{4}$') and @type='letters') or                             (matches(@key, '^(A05\d{4}\s)*A05\d{4}$') and @type='news') or                             (matches(@key, '^(A06\d{4}\s)*A06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^(A11\d{4}\s)*A11\d{4}$') and @type='biblio')">Type mismatch: The value for @type must be in accordance with the given ID in @key</sch:assert>
+          <sch:assert test="                             (matches(@key, '^H00\d{4}$') and @type='person') or                             (matches(@key, '^H02\d{4}$') and @type='work') or                             (matches(@key, '^H03\d{4}$') and @type='writing') or                             (matches(@key, '^H04\d{4}$') and @type='letter') or                             (matches(@key, '^H06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(H00\d{4}\s)*H00\d{4}$') and @type='persons') or                             (matches(@key, '^(H02\d{4}\s)*H02\d{4}$') and @type='works') or                             (matches(@key, '^(H03\d{4}\s)*H03\d{4}$') and @type='writings') or                             (matches(@key, '^(H04\d{4}\s)*H04\d{4}$') and @type='letters') or                             (matches(@key, '^(H05\d{4}\s)*H05\d{4}$') and @type='news') or                             (matches(@key, '^(H06\d{4}\s)*H06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^(H11\d{4}\s)*H11\d{4}$') and @type='biblio')">Type mismatch: The value for @type must be in accordance with the given ID in @key</sch:assert>
         </sch:rule>
       </pattern>
       <ref name="att.typed.attribute.subtype"/>
diff --git a/schema/en/wegaPersons.isosch b/schema/en/wegaPersons.isosch
index b22b2dd7..48559051 100644
--- a/schema/en/wegaPersons.isosch
+++ b/schema/en/wegaPersons.isosch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
    <title>ISO Schematron rules</title>
-   <!-- This file generated 2020-03-13T12:56:21.289+01:00 by 'extract-isosch.xsl'. -->
+   <!-- This file generated 2020-03-13T19:31:37.729+01:00 by 'extract-isosch.xsl'. -->
 
 <!-- ********************* -->
 <!-- namespaces, declared: -->
@@ -36,7 +36,7 @@ belongs, but this <name/> element has no textual content.</assert>
         </pattern>
    <pattern id="wegaPersons-rs-constraint-rs-typeNkey-4">
                     <rule context="tei:rs[@type][@key]">
-                        <assert test="                             (matches(@key, '^A00\d{4}$') and @type='person') or                             (matches(@key, '^A02\d{4}$') and @type='work') or                             (matches(@key, '^A03\d{4}$') and @type='writing') or                             (matches(@key, '^A04\d{4}$') and @type='letter') or                             (matches(@key, '^A06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(A00\d{4}\s)*A00\d{4}$') and @type='persons') or                             (matches(@key, '^(A02\d{4}\s)*A02\d{4}$') and @type='works') or                             (matches(@key, '^(A03\d{4}\s)*A03\d{4}$') and @type='writings') or                             (matches(@key, '^(A04\d{4}\s)*A04\d{4}$') and @type='letters') or                             (matches(@key, '^(A05\d{4}\s)*A05\d{4}$') and @type='news') or                             (matches(@key, '^(A06\d{4}\s)*A06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^(A11\d{4}\s)*A11\d{4}$') and @type='biblio')">Type mismatch: The value for @type must be in accordance with the given ID in @key</assert>
+                        <assert test="                             (matches(@key, '^H00\d{4}$') and @type='person') or                             (matches(@key, '^H02\d{4}$') and @type='work') or                             (matches(@key, '^H03\d{4}$') and @type='writing') or                             (matches(@key, '^H04\d{4}$') and @type='letter') or                             (matches(@key, '^H06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(H00\d{4}\s)*H00\d{4}$') and @type='persons') or                             (matches(@key, '^(H02\d{4}\s)*H02\d{4}$') and @type='works') or                             (matches(@key, '^(H03\d{4}\s)*H03\d{4}$') and @type='writings') or                             (matches(@key, '^(H04\d{4}\s)*H04\d{4}$') and @type='letters') or                             (matches(@key, '^(H05\d{4}\s)*H05\d{4}$') and @type='news') or                             (matches(@key, '^(H06\d{4}\s)*H06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^(H11\d{4}\s)*H11\d{4}$') and @type='biblio')">Type mismatch: The value for @type must be in accordance with the given ID in @key</assert>
                     </rule>
                 </pattern>
    <pattern id="wegaPersons-date-constraint-dateHeuristics1-5">
diff --git a/schema/en/wegaPersons.rng b/schema/en/wegaPersons.rng
index 591524de..3f3c87fb 100644
--- a/schema/en/wegaPersons.rng
+++ b/schema/en/wegaPersons.rng
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://www.tei-c.org/ns/1.0">
   <!--
-Schema generated from ODD source 2020-03-13T12:56:19Z. 
+Schema generated from ODD source 2020-03-13T19:31:35Z. 
 Edition: Version 2.7.0. Last updated on
 	16th September 2014, revision 13036
 Edition Location: http://www.tei-c.org/Vault/P5/Version 2.7.0/
@@ -690,6 +690,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
   </define>
   <define name="model.nameLike.agent">
     <choice>
+      <ref name="name"/>
       <ref name="orgName"/>
       <ref name="persName"/>
       <ref name="characterName"/>
@@ -697,17 +698,22 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
   </define>
   <define name="model.nameLike.agent_alternation">
     <choice>
+      <ref name="name"/>
       <ref name="orgName"/>
       <ref name="persName"/>
       <ref name="characterName"/>
     </choice>
   </define>
   <define name="model.nameLike.agent_sequence">
+    <ref name="name"/>
     <ref name="orgName"/>
     <ref name="persName"/>
     <ref name="characterName"/>
   </define>
   <define name="model.nameLike.agent_sequenceOptional">
+    <optional>
+      <ref name="name"/>
+    </optional>
     <optional>
       <ref name="orgName"/>
     </optional>
@@ -719,6 +725,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
     </optional>
   </define>
   <define name="model.nameLike.agent_sequenceOptionalRepeatable">
+    <zeroOrMore>
+      <ref name="name"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="orgName"/>
     </zeroOrMore>
@@ -730,6 +739,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
     </zeroOrMore>
   </define>
   <define name="model.nameLike.agent_sequenceRepeatable">
+    <oneOrMore>
+      <ref name="name"/>
+    </oneOrMore>
     <oneOrMore>
       <ref name="orgName"/>
     </oneOrMore>
@@ -1385,13 +1397,25 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
       <empty/>
     </element>
   </define>
+  <define name="name">
+    <element name="name">
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(name, proper noun) contains a proper noun or noun phrase. [3.5.1. ]</a:documentation>
+      <ref name="macro.phraseSeq"/>
+      <ref name="att.global.attributes"/>
+      <ref name="att.personal.attributes"/>
+      <ref name="att.datable.attributes"/>
+      <ref name="att.editLike.attributes"/>
+      <ref name="att.typed.attributes"/>
+      <empty/>
+    </element>
+  </define>
   <define name="rs">
     <element name="rs">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(referencing string) identifies one or more objects by type person, work, dairy entry, and so on. [13.2.1.  3.5.1. ]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="wegaPersons-rs-rs-typeNkey-constraint-4">
         <sch:rule xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:s="http://www.ascc.net/xml/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:rs[@type][@key]">
-          <sch:assert test="                             (matches(@key, '^A00\d{4}$') and @type='person') or                             (matches(@key, '^A02\d{4}$') and @type='work') or                             (matches(@key, '^A03\d{4}$') and @type='writing') or                             (matches(@key, '^A04\d{4}$') and @type='letter') or                             (matches(@key, '^A06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(A00\d{4}\s)*A00\d{4}$') and @type='persons') or                             (matches(@key, '^(A02\d{4}\s)*A02\d{4}$') and @type='works') or                             (matches(@key, '^(A03\d{4}\s)*A03\d{4}$') and @type='writings') or                             (matches(@key, '^(A04\d{4}\s)*A04\d{4}$') and @type='letters') or                             (matches(@key, '^(A05\d{4}\s)*A05\d{4}$') and @type='news') or                             (matches(@key, '^(A06\d{4}\s)*A06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^(A11\d{4}\s)*A11\d{4}$') and @type='biblio')">Type mismatch: The value for @type must be in accordance with the given ID in @key</sch:assert>
+          <sch:assert test="                             (matches(@key, '^H00\d{4}$') and @type='person') or                             (matches(@key, '^H02\d{4}$') and @type='work') or                             (matches(@key, '^H03\d{4}$') and @type='writing') or                             (matches(@key, '^H04\d{4}$') and @type='letter') or                             (matches(@key, '^H06\d{4}$') and @type='diaryDay') or                             (matches(@key, '^(H00\d{4}\s)*H00\d{4}$') and @type='persons') or                             (matches(@key, '^(H02\d{4}\s)*H02\d{4}$') and @type='works') or                             (matches(@key, '^(H03\d{4}\s)*H03\d{4}$') and @type='writings') or                             (matches(@key, '^(H04\d{4}\s)*H04\d{4}$') and @type='letters') or                             (matches(@key, '^(H05\d{4}\s)*H05\d{4}$') and @type='news') or                             (matches(@key, '^(H06\d{4}\s)*H06\d{4}$') and @type='diaryDays') or                             (matches(@key, '^(H11\d{4}\s)*H11\d{4}$') and @type='biblio')">Type mismatch: The value for @type must be in accordance with the given ID in @key</sch:assert>
         </sch:rule>
       </pattern>
       <ref name="att.typed.attribute.subtype"/>
diff --git a/src/WeGA_common.odd.xml b/src/WeGA_common.odd.xml
index 425a51f0..f9fce155 100644
--- a/src/WeGA_common.odd.xml
+++ b/src/WeGA_common.odd.xml
@@ -1037,18 +1037,18 @@
                     <sch:rule context="tei:rs[@type][@key]">
                         <sch:assert
                             test="
-                            (matches(@key, '^A00\d{4}$') and @type='person') or
-                            (matches(@key, '^A02\d{4}$') and @type='work') or
-                            (matches(@key, '^A03\d{4}$') and @type='writing') or
-                            (matches(@key, '^A04\d{4}$') and @type='letter') or
-                            (matches(@key, '^A06\d{4}$') and @type='diaryDay') or
-                            (matches(@key, '^(A00\d{4}\s)*A00\d{4}$') and @type='persons') or
-                            (matches(@key, '^(A02\d{4}\s)*A02\d{4}$') and @type='works') or
-                            (matches(@key, '^(A03\d{4}\s)*A03\d{4}$') and @type='writings') or
-                            (matches(@key, '^(A04\d{4}\s)*A04\d{4}$') and @type='letters') or
-                            (matches(@key, '^(A05\d{4}\s)*A05\d{4}$') and @type='news') or
-                            (matches(@key, '^(A06\d{4}\s)*A06\d{4}$') and @type='diaryDays') or
-                            (matches(@key, '^(A11\d{4}\s)*A11\d{4}$') and @type='biblio')"
+                            (matches(@key, '^H00\d{4}$') and @type='person') or
+                            (matches(@key, '^H02\d{4}$') and @type='work') or
+                            (matches(@key, '^H03\d{4}$') and @type='writing') or
+                            (matches(@key, '^H04\d{4}$') and @type='letter') or
+                            (matches(@key, '^H06\d{4}$') and @type='diaryDay') or
+                            (matches(@key, '^(H00\d{4}\s)*H00\d{4}$') and @type='persons') or
+                            (matches(@key, '^(H02\d{4}\s)*H02\d{4}$') and @type='works') or
+                            (matches(@key, '^(H03\d{4}\s)*H03\d{4}$') and @type='writings') or
+                            (matches(@key, '^(H04\d{4}\s)*H04\d{4}$') and @type='letters') or
+                            (matches(@key, '^(H05\d{4}\s)*H05\d{4}$') and @type='news') or
+                            (matches(@key, '^(H06\d{4}\s)*H06\d{4}$') and @type='diaryDays') or
+                            (matches(@key, '^(H11\d{4}\s)*H11\d{4}$') and @type='biblio')"
                             >Type mismatch: The value for @type must be in accordance with the given ID in @key</sch:assert>
                     </sch:rule>
                 </constraint>
diff --git a/src/WeGA_persons.odd.xml b/src/WeGA_persons.odd.xml
index 237be162..d2b56801 100644
--- a/src/WeGA_persons.odd.xml
+++ b/src/WeGA_persons.odd.xml
@@ -42,7 +42,7 @@
             
             <div>
                 <schemaSpec ident="wegaPersons" xml:lang="en" start="person">
-                    <moduleRef key="core" include="addrLine address bibl date head hi item list note p ref rs"/>
+                    <moduleRef key="core" include="addrLine address bibl date head hi item list name note p ref rs"/>
                     <moduleRef key="tei"/>
                     <moduleRef key="header" include="idno staffNum"/>
                     <moduleRef key="namesdates" include="addName affiliation birth country death event forename genName geogName nameLink occupation orgName persName person placeName region residence roleName settlement sex surname"/>