Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
anneferger committed Feb 5, 2024
2 parents 4e4e275 + b4917fa commit 65d8b2b
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 4 deletions.
4 changes: 4 additions & 0 deletions schema/tei_jtei_annotated.odd
Original file line number Diff line number Diff line change
Expand Up @@ -2435,6 +2435,10 @@
<valItem mode="add" ident="#indesign"/>
<valItem mode="add" ident="#teiboilerplate"/>
<valItem mode="add" ident="#teioxygenframework"/>
<valItem mode="add" ident="#git"/>
<valItem mode="add" ident="#emacs"/>
<valItem mode="add" ident="#emacsorgmode"/>
<valItem mode="add" ident="#mandoku1"/>
</valList>
<dataRef name="anyURI" restriction="http.+|#.+|@.+|hdl.+|mailto.+"/>
</alternate>
Expand Down
10 changes: 9 additions & 1 deletion schema/tei_jtei_annotated.rng
Original file line number Diff line number Diff line change
Expand Up @@ -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-05T14:10:24Z. 2014.
Schema generated from ODD source 2024-02-05T14:38:43Z. 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/
Expand Down Expand Up @@ -3061,6 +3061,14 @@ attributes @target and @cRef may be supplied on <name/>.</report>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#teioxygenframework</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#git</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#emacs</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#emacsorgmode</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#mandoku1</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
</choice>
<data type="anyURI">
<param name="pattern">http.+|#.+|@.+|hdl.+|mailto.+</param>
Expand Down
14 changes: 11 additions & 3 deletions schema/tei_software_annotation.rng
Original file line number Diff line number Diff line change
Expand Up @@ -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-05T14:10:20Z. .
Schema generated from ODD source 2024-02-05T14:38:38Z. .
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/

Expand Down Expand Up @@ -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="d70561e131269-constraint">
<pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d11767e131273-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
Expand Down Expand Up @@ -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="d70561e132648-constraint">
<pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d11767e132652-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
Expand Down Expand Up @@ -6834,6 +6834,14 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>teioxygenframework</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>git</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>emacs</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>emacsorgmode</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>mandoku1</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
</choice>
</attribute>
<empty/>
Expand Down
4 changes: 4 additions & 0 deletions schema/tei_software_annotation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,10 @@
<valItem mode="add" ident="indesign"/>
<valItem mode="add" ident="teiboilerplate"/>
<valItem mode="add" ident="teioxygenframework"/>
<valItem mode="add" ident="git"/>
<valItem mode="add" ident="emacs"/>
<valItem mode="add" ident="emacsorgmode"/>
<valItem mode="add" ident="mandoku1"/>
</valList>
</attDef>
</attList>
Expand Down

0 comments on commit 65d8b2b

Please sign in to comment.