Merge branch 'main' of https://github.com/DH-RSE/software-citation in…

…to main
DH-RSE · Feb 22, 2024 · ec1ada0 · ec1ada0
2 parents 5676d81 + ee92fe7
commit ec1ada0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/schema/tei_jtei_annotated.odd b/schema/tei_jtei_annotated.odd
@@ -2487,6 +2487,9 @@
                            <valItem mode="add" ident="#lexico"/>
                            <valItem mode="add" ident="#jekyll"/>
                            <valItem mode="add" ident="#gatsby"/>
+                           <valItem mode="add" ident="#tableau"/>
+                           <valItem mode="add" ident="#islandora"/>
+                           <valItem mode="add" ident="#fedora"/>
                            <valItem mode="add" ident="#alexandria"/>
                            <valItem mode="add" ident="#teipelican"/>
                            <valItem mode="add" ident="#odd2odd"/>

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-20T16:22:25Z. 2014. 
+Schema generated from ODD source 2024-02-22T08:43:03Z. 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/ 
   
@@ -3165,6 +3165,12 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                         <value>#gatsby</value>
                         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+                        <value>#tableau</value>
+                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+                        <value>#islandora</value>
+                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+                        <value>#fedora</value>
+                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                         <value>#alexandria</value>
                         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                         <value>#teipelican</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-20T16:22:21Z. . 
+Schema generated from ODD source 2024-02-22T08:42:58Z. . 
 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="d35389e131331-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d82534e131334-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="d35389e132710-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d82534e132713-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
@@ -6938,6 +6938,12 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                <value>gatsby</value>
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+               <value>tableau</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+               <value>islandora</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+               <value>fedora</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                <value>alexandria</value>
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
                <value>teipelican</value>

diff --git a/schema/tei_software_annotation.xml b/schema/tei_software_annotation.xml
@@ -413,6 +413,9 @@
                         <valItem mode="add" ident="lexico"/>
                         <valItem mode="add" ident="jekyll"/>
                         <valItem mode="add" ident="gatsby"/>
+                        <valItem mode="add" ident="tableau"/>
+                        <valItem mode="add" ident="islandora"/>
+                        <valItem mode="add" ident="fedora"/>
                         <valItem mode="add" ident="alexandria"/>
                         <valItem mode="add" ident="teipelican"/>
                         <valItem mode="add" ident="odd2odd"/>