Merge remote-tracking branch 'origin/main'

DH-RSE · Feb 5, 2024 · 7aff0f8 · 7aff0f8
2 parents c7b1721 + 03cf79d
commit 7aff0f8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/schema/tei_jtei_annotated.odd b/schema/tei_jtei_annotated.odd
@@ -3498,7 +3498,7 @@
                   <attList>
               <!-- To do: Pointers should point to ../taxonomy/citation-taxonomy.xml and multiple values divided by whitespaces are also allowed -->
                      <attDef ident="type" mode="change" usage="req">
-                        <valList type="closed">
+                        <valList type="closed" mode="change">
                            <valItem mode="add" ident="soft.bib"/>
                            <valItem mode="add" ident="soft.bib.ref"/>
                            <valItem mode="add" ident="soft.name"/>

diff --git a/schema/tei_jtei_annotated.rng b/schema/tei_jtei_annotated.rng
@@ -5,7 +5,7 @@
          xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2024-02-05T11:39:57Z. 2014. 
+Schema generated from ODD source 2024-02-05T11:45:11Z. 2014. 
 TEI Edition: P5 Version 4.7.0. Last updated on 16th November 2023, revision e5dd73ed0 
 TEI Edition Location: https://www.tei-c.org/Vault/P5/4.7.0/ 
   
@@ -2459,9 +2459,22 @@ Sample values include: 1] rubbing (rubbing); 2] mildew (mildew); 3] smoke (smoke
          <ref name="att.naming.attributes"/>
          <attribute name="type">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.</a:documentation>
-            <data type="token">
-               <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
+            <choice>
+               <value>soft.bib</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+               <value>soft.bib.ref</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+               <value>soft.name</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+               <value>soft.agent</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+               <value>soft.url</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+               <value>soft.pid</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+               <value>soft.ver</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+            </choice>
          </attribute>
          <attribute name="ref">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>

diff --git a/schema/tei_software_annotation.rng b/schema/tei_software_annotation.rng
@@ -5,7 +5,7 @@
          xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2024-02-05T11:39:52Z. . 
+Schema generated from ODD source 2024-02-05T11:45:06Z. . 
 TEI Edition: P5 Version 4.7.0. Last updated on 16th November 2023, revision e5dd73ed0 
 TEI Edition Location: https://www.tei-c.org/Vault/P5/4.7.0/ 
 
@@ -138,7 +138,7 @@ TEI Edition Location: https://www.tei-c.org/Vault/P5/4.7.0/
             </choice>
          </zeroOrMore>
       </element>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d8e131274-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d58802e131274-constraint">
          <rule context="tei:content">
             <report test="descendant::*[not(namespace-uri(.) =               ('http://relaxng.org/ns/compatibility/annotations/1.0', 'http://relaxng.org/ns/structure/1.0', 'http://www.tei-c.org/ns/1.0'))]">content descendants must be in the
               namespaces
@@ -187,7 +187,7 @@ TEI Edition Location: https://www.tei-c.org/Vault/P5/4.7.0/
             </choice>
          </zeroOrMore>
       </element>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d8e132653-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d58802e132653-constraint">
          <rule context="tei:datatype">
             <report test="descendant::*[not(namespace-uri(.) =               ('http://relaxng.org/ns/structure/1.0', 'http://www.tei-c.org/ns/1.0'))]">datatype descendants must be in the
               namespaces