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
anneferger committed Feb 20, 2024
2 parents 4af4a8e + 20590f7 commit ff3ffc4
Show file tree
Hide file tree
Showing 8 changed files with 242 additions and 109 deletions.
174 changes: 105 additions & 69 deletions data/JTEI/16_2023_spa/jtei-rioriande-torresallen-250-source.xml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/JTEI/8_2014-15/jtei-8-rosselli-source.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
<ptr type="software" xml:id="R108" target="#EVT"/><rs type="soft.name" ref="R108"
>EVT</rs> could go beyond being a project-specific tool. The inspiration for these
changes came from work done in similar projects developed within the TEI community,
namely <ptr type="software" xml:id="R10" target="#boilerplate"/>
namely <ptr type="software" xml:id="R10" target="#teiboilerplate"/>
<ref target="http://dcl.slis.indiana.edu/teibp/">
<rs type="soft.name" ref="#R10">TEI Boilerplate</rs></ref>,<note><p>TEI Boilerplate,
<rs type="soft.url" ref="#R10">
Expand Down
11 changes: 10 additions & 1 deletion schema/tei_jtei_annotated.odd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2277,7 +2277,9 @@
<valItem mode="add" ident="#webpack"/>
<valItem mode="add" ident="#elem"/>
<valItem mode="add" ident="#literaturetranslation"/>
<valItem mode="add" ident="#teitok"/>
<valItem mode="add" ident="#github"/>
<valItem mode="add" ident="#githubpages"/>
<valItem mode="add" ident="#leaflet"/>
<valItem mode="add" ident="#ugarit"/>
<valItem mode="add" ident="#smartcompose"/>
Expand Down Expand Up @@ -2384,6 +2386,9 @@
<valItem mode="add" ident="#azurecloud"/>
<valItem mode="add" ident="#gate"/>
<valItem mode="add" ident="#r"/>
<valItem mode="add" ident="#textualcommunities"/>
<valItem mode="add" ident="#visualstudiocode"/>
<valItem mode="add" ident="#scholarlyxml"/>
<valItem mode="add" ident="#igraph"/>
<valItem mode="add" ident="#textal"/>
<valItem mode="add" ident="#planthumanitiesworkbench"/>
Expand Down Expand Up @@ -2422,7 +2427,6 @@
<valItem mode="add" ident="#eppt"/>
<valItem mode="add" ident="#elwoodviewer"/>
<valItem mode="add" ident="#evt"/>
<valItem mode="add" ident="#boilerplate"/>
<valItem mode="add" ident="#tei2html"/>
<valItem mode="add" ident="#basex"/>
<valItem mode="add" ident="#tipuesearch"/>
Expand All @@ -2447,6 +2451,7 @@
<valItem mode="add" ident="#ediarum"/>
<valItem mode="add" ident="#transkribus"/>
<valItem mode="add" ident="#xproc"/>
<valItem mode="add" ident="#ceteicean"/>
<valItem mode="add" ident="#imagemarkuptool"/>
<valItem mode="add" ident="#tustep"/>
<valItem mode="add" ident="#netbeans"/>
Expand Down Expand Up @@ -2477,6 +2482,10 @@
<valItem mode="add" ident="#lexico"/>
<valItem mode="add" ident="#jekyll"/>
<valItem mode="add" ident="#gatsby"/>
<valItem mode="add" ident="#alexandria"/>
<valItem mode="add" ident="#teipelican"/>
<valItem mode="add" ident="#odd2odd"/>
<valItem mode="add" ident="#zenodo"/>
</valList>
<dataRef name="anyURI" restriction="http.+|#.+|@.+|hdl.+|mailto.+"/>
</alternate>
Expand Down
24 changes: 21 additions & 3 deletions schema/tei_jtei_annotated.rng
View file
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-20T08:30:54Z. 2014.
Schema generated from ODD source 2024-02-20T15:11:22Z. 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 @@ -2745,8 +2745,12 @@ attributes @target and @cRef may be supplied on <name/>.</report>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#literaturetranslation</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#teitok</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#github</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#githubpages</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#leaflet</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#ugarit</value>
Expand Down Expand Up @@ -2959,6 +2963,12 @@ attributes @target and @cRef may be supplied on <name/>.</report>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#r</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#textualcommunities</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#visualstudiocode</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#scholarlyxml</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#igraph</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#textal</value>
Expand Down Expand Up @@ -3035,8 +3045,6 @@ attributes @target and @cRef may be supplied on <name/>.</report>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#evt</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#boilerplate</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#tei2html</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#basex</value>
Expand Down Expand Up @@ -3085,6 +3093,8 @@ attributes @target and @cRef may be supplied on <name/>.</report>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#xproc</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#ceteicean</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#imagemarkuptool</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#tustep</value>
Expand Down Expand Up @@ -3145,6 +3155,14 @@ 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>#alexandria</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#teipelican</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#odd2odd</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>#zenodo</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
28 changes: 23 additions & 5 deletions schema/tei_software_annotation.rng
View file
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-20T08:30:49Z. .
Schema generated from ODD source 2024-02-20T15:11:18Z. .
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="d23593e131315-constraint">
<pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d58923e131325-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="d23593e132694-constraint">
<pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d58923e132704-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 @@ -6518,8 +6518,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>literaturetranslation</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>teitok</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>github</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>githubpages</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>leaflet</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>ugarit</value>
Expand Down Expand Up @@ -6732,6 +6736,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>r</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>textualcommunities</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>visualstudiocode</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>scholarlyxml</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>igraph</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>textal</value>
Expand Down Expand Up @@ -6808,8 +6818,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>evt</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>boilerplate</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>tei2html</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>basex</value>
Expand Down Expand Up @@ -6858,6 +6866,8 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>xproc</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>ceteicean</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>imagemarkuptool</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>tustep</value>
Expand Down Expand Up @@ -6918,6 +6928,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>gatsby</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>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>odd2odd</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>zenodo</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
</choice>
</attribute>
<empty/>
Expand Down
11 changes: 10 additions & 1 deletion schema/tei_software_annotation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@
<valItem mode="add" ident="webpack"/>
<valItem mode="add" ident="elem"/>
<valItem mode="add" ident="literaturetranslation"/>
<valItem mode="add" ident="teitok"/>
<valItem mode="add" ident="github"/>
<valItem mode="add" ident="githubpages"/>
<valItem mode="add" ident="leaflet"/>
<valItem mode="add" ident="ugarit"/>
<valItem mode="add" ident="smartcompose"/>
Expand Down Expand Up @@ -310,6 +312,9 @@
<valItem mode="add" ident="azurecloud"/>
<valItem mode="add" ident="gate"/>
<valItem mode="add" ident="r"/>
<valItem mode="add" ident="textualcommunities"/>
<valItem mode="add" ident="visualstudiocode"/>
<valItem mode="add" ident="scholarlyxml"/>
<valItem mode="add" ident="igraph"/>
<valItem mode="add" ident="textal"/>
<valItem mode="add" ident="planthumanitiesworkbench"/>
Expand Down Expand Up @@ -348,7 +353,6 @@
<valItem mode="add" ident="eppt"/>
<valItem mode="add" ident="elwoodviewer"/>
<valItem mode="add" ident="evt"/>
<valItem mode="add" ident="boilerplate"/>
<valItem mode="add" ident="tei2html"/>
<valItem mode="add" ident="basex"/>
<valItem mode="add" ident="tipuesearch"/>
Expand All @@ -373,6 +377,7 @@
<valItem mode="add" ident="ediarum"/>
<valItem mode="add" ident="transkribus"/>
<valItem mode="add" ident="xproc"/>
<valItem mode="add" ident="ceteicean"/>
<valItem mode="add" ident="imagemarkuptool"/>
<valItem mode="add" ident="tustep"/>
<valItem mode="add" ident="netbeans"/>
Expand Down Expand Up @@ -403,6 +408,10 @@
<valItem mode="add" ident="lexico"/>
<valItem mode="add" ident="jekyll"/>
<valItem mode="add" ident="gatsby"/>
<valItem mode="add" ident="alexandria"/>
<valItem mode="add" ident="teipelican"/>
<valItem mode="add" ident="odd2odd"/>
<valItem mode="add" ident="zenodo"/>
</valList>
</attDef>
</attList>
Expand Down
Loading

0 comments on commit ff3ffc4

Please sign in to comment.