Merge remote-tracking branch 'origin/main'

DH-RSE · Feb 5, 2024 · c652cf7 · c652cf7
2 parents 8da125d + 59de1d5
commit c652cf7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 34 deletions.
diff --git a/schema/tei_jtei_annotated.odd b/schema/tei_jtei_annotated.odd
@@ -2392,11 +2392,6 @@
                            <valItem mode="add" ident="#inkscape"/>
                            <valItem mode="add" ident="#apachespark"/>
                            <valItem mode="add" ident="#unrealengine"/>
-                           <valItem mode="add" ident="#software"/>
-                           <valItem mode="add" ident="#tool"/>
-                           <valItem mode="add" ident="#script"/>
-                           <valItem mode="add" ident="#code"/>
-                           <valItem mode="add" ident="#program"/>
                            <valItem mode="add" ident="#teicorpo"/>
                            <valItem mode="add" ident="#teiconvert"/>
                            <valItem mode="add" ident="#teimeta"/>

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:45:11Z. 2014. 
+Schema generated from ODD source 2024-02-05T14:10:24Z. 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/ 
   
@@ -2975,16 +2975,6 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                         <value>#unrealengine</value>
                         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-                        <value>#software</value>
-                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-                        <value>#tool</value>
-                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-                        <value>#script</value>
-                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-                        <value>#code</value>
-                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-                        <value>#program</value>
-                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                         <value>#teicorpo</value>
                         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                         <value>#teiconvert</value>

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:45:06Z. . 
+Schema generated from ODD source 2024-02-05T14:10:20Z. . 
 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="d58802e131274-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d70561e131269-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="d58802e132653-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d70561e132648-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
@@ -6748,16 +6748,6 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                <value>unrealengine</value>
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-               <value>software</value>
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-               <value>tool</value>
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-               <value>script</value>
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-               <value>code</value>
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
-               <value>program</value>
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                <value>teicorpo</value>
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                <value>teiconvert</value>

diff --git a/schema/tei_software_annotation.xml b/schema/tei_software_annotation.xml
@@ -318,11 +318,6 @@
                         <valItem mode="add" ident="inkscape"/>
                         <valItem mode="add" ident="apachespark"/>
                         <valItem mode="add" ident="unrealengine"/>
-                        <valItem mode="add" ident="software"/>
-                        <valItem mode="add" ident="tool"/>
-                        <valItem mode="add" ident="script"/>
-                        <valItem mode="add" ident="code"/>
-                        <valItem mode="add" ident="program"/>
                         <valItem mode="add" ident="teicorpo"/>
                         <valItem mode="add" ident="teiconvert"/>
                         <valItem mode="add" ident="teimeta"/>