Skip to content

Commit ff3ffc4

Browse files
annefergeranneferger
committed
Merge remote-tracking branch 'origin/main'
2 parents 4af4a8e + 20590f7 commit ff3ffc4

File tree

8 files changed

+242
-109
lines changed

8 files changed

+242
-109
lines changed

‎data/JTEI/16_2023_spa/jtei-rioriande-torresallen-250-source.xml

Lines changed: 105 additions & 69 deletions
Large diffs are not rendered by default.

‎data/JTEI/8_2014-15/jtei-8-rosselli-source.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
<ptr type="software" xml:id="R108" target="#EVT"/><rs type="soft.name" ref="R108"
250250
>EVT</rs> could go beyond being a project-specific tool. The inspiration for these
251251
changes came from work done in similar projects developed within the TEI community,
252-
namely <ptr type="software" xml:id="R10" target="#boilerplate"/>
252+
namely <ptr type="software" xml:id="R10" target="#teiboilerplate"/>
253253
<ref target="http://dcl.slis.indiana.edu/teibp/">
254254
<rs type="soft.name" ref="#R10">TEI Boilerplate</rs></ref>,<note><p>TEI Boilerplate,
255255
<rs type="soft.url" ref="#R10">

‎schema/tei_jtei_annotated.odd

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2277,7 +2277,9 @@
22772277
<valItem mode="add" ident="#webpack"/>
22782278
<valItem mode="add" ident="#elem"/>
22792279
<valItem mode="add" ident="#literaturetranslation"/>
2280+
<valItem mode="add" ident="#teitok"/>
22802281
<valItem mode="add" ident="#github"/>
2282+
<valItem mode="add" ident="#githubpages"/>
22812283
<valItem mode="add" ident="#leaflet"/>
22822284
<valItem mode="add" ident="#ugarit"/>
22832285
<valItem mode="add" ident="#smartcompose"/>
@@ -2384,6 +2386,9 @@
23842386
<valItem mode="add" ident="#azurecloud"/>
23852387
<valItem mode="add" ident="#gate"/>
23862388
<valItem mode="add" ident="#r"/>
2389+
<valItem mode="add" ident="#textualcommunities"/>
2390+
<valItem mode="add" ident="#visualstudiocode"/>
2391+
<valItem mode="add" ident="#scholarlyxml"/>
23872392
<valItem mode="add" ident="#igraph"/>
23882393
<valItem mode="add" ident="#textal"/>
23892394
<valItem mode="add" ident="#planthumanitiesworkbench"/>
@@ -2422,7 +2427,6 @@
24222427
<valItem mode="add" ident="#eppt"/>
24232428
<valItem mode="add" ident="#elwoodviewer"/>
24242429
<valItem mode="add" ident="#evt"/>
2425-
<valItem mode="add" ident="#boilerplate"/>
24262430
<valItem mode="add" ident="#tei2html"/>
24272431
<valItem mode="add" ident="#basex"/>
24282432
<valItem mode="add" ident="#tipuesearch"/>
@@ -2447,6 +2451,7 @@
24472451
<valItem mode="add" ident="#ediarum"/>
24482452
<valItem mode="add" ident="#transkribus"/>
24492453
<valItem mode="add" ident="#xproc"/>
2454+
<valItem mode="add" ident="#ceteicean"/>
24502455
<valItem mode="add" ident="#imagemarkuptool"/>
24512456
<valItem mode="add" ident="#tustep"/>
24522457
<valItem mode="add" ident="#netbeans"/>
@@ -2477,6 +2482,10 @@
24772482
<valItem mode="add" ident="#lexico"/>
24782483
<valItem mode="add" ident="#jekyll"/>
24792484
<valItem mode="add" ident="#gatsby"/>
2485+
<valItem mode="add" ident="#alexandria"/>
2486+
<valItem mode="add" ident="#teipelican"/>
2487+
<valItem mode="add" ident="#odd2odd"/>
2488+
<valItem mode="add" ident="#zenodo"/>
24802489
</valList>
24812490
<dataRef name="anyURI" restriction="http.+|#.+|@.+|hdl.+|mailto.+"/>
24822491
</alternate>

‎schema/tei_jtei_annotated.rng

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns="http://relaxng.org/ns/structure/1.0"
66
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
77
ns="http://www.tei-c.org/ns/1.0"><!--
8-
Schema generated from ODD source 2024-02-20T08:30:54Z. 2014.
8+
Schema generated from ODD source 2024-02-20T15:11:22Z. 2014.
99
TEI Edition: P5 Version 4.7.0. Last updated on 16th November 2023, revision e5dd73ed0
1010
TEI Edition Location: https://www.tei-c.org/Vault/P5/4.7.0/
1111
@@ -2745,8 +2745,12 @@ attributes @target and @cRef may be supplied on <name/>.</report>
27452745
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
27462746
<value>#literaturetranslation</value>
27472747
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
2748+
<value>#teitok</value>
2749+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
27482750
<value>#github</value>
27492751
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
2752+
<value>#githubpages</value>
2753+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
27502754
<value>#leaflet</value>
27512755
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
27522756
<value>#ugarit</value>
@@ -2959,6 +2963,12 @@ attributes @target and @cRef may be supplied on <name/>.</report>
29592963
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
29602964
<value>#r</value>
29612965
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
2966+
<value>#textualcommunities</value>
2967+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
2968+
<value>#visualstudiocode</value>
2969+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
2970+
<value>#scholarlyxml</value>
2971+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
29622972
<value>#igraph</value>
29632973
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
29642974
<value>#textal</value>
@@ -3035,8 +3045,6 @@ attributes @target and @cRef may be supplied on <name/>.</report>
30353045
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
30363046
<value>#evt</value>
30373047
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
3038-
<value>#boilerplate</value>
3039-
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
30403048
<value>#tei2html</value>
30413049
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
30423050
<value>#basex</value>
@@ -3085,6 +3093,8 @@ attributes @target and @cRef may be supplied on <name/>.</report>
30853093
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
30863094
<value>#xproc</value>
30873095
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
3096+
<value>#ceteicean</value>
3097+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
30883098
<value>#imagemarkuptool</value>
30893099
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
30903100
<value>#tustep</value>
@@ -3145,6 +3155,14 @@ attributes @target and @cRef may be supplied on <name/>.</report>
31453155
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
31463156
<value>#gatsby</value>
31473157
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
3158+
<value>#alexandria</value>
3159+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
3160+
<value>#teipelican</value>
3161+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
3162+
<value>#odd2odd</value>
3163+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
3164+
<value>#zenodo</value>
3165+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
31483166
</choice>
31493167
<data type="anyURI">
31503168
<param name="pattern">http.+|#.+|@.+|hdl.+|mailto.+</param>

‎schema/tei_software_annotation.rng

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns="http://relaxng.org/ns/structure/1.0"
66
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
77
ns="http://www.tei-c.org/ns/1.0"><!--
8-
Schema generated from ODD source 2024-02-20T08:30:49Z. .
8+
Schema generated from ODD source 2024-02-20T15:11:18Z. .
99
TEI Edition: P5 Version 4.7.0. Last updated on 16th November 2023, revision e5dd73ed0
1010
TEI Edition Location: https://www.tei-c.org/Vault/P5/4.7.0/
1111

@@ -138,7 +138,7 @@ TEI Edition Location: https://www.tei-c.org/Vault/P5/4.7.0/
138138
</choice>
139139
</zeroOrMore>
140140
</element>
141-
<pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d23593e131315-constraint">
141+
<pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d58923e131325-constraint">
142142
<rule context="tei:content">
143143
<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
144144
namespaces
@@ -187,7 +187,7 @@ TEI Edition Location: https://www.tei-c.org/Vault/P5/4.7.0/
187187
</choice>
188188
</zeroOrMore>
189189
</element>
190-
<pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d23593e132694-constraint">
190+
<pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d58923e132704-constraint">
191191
<rule context="tei:datatype">
192192
<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
193193
namespaces
@@ -6518,8 +6518,12 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
65186518
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
65196519
<value>literaturetranslation</value>
65206520
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6521+
<value>teitok</value>
6522+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
65216523
<value>github</value>
65226524
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6525+
<value>githubpages</value>
6526+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
65236527
<value>leaflet</value>
65246528
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
65256529
<value>ugarit</value>
@@ -6732,6 +6736,12 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
67326736
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
67336737
<value>r</value>
67346738
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6739+
<value>textualcommunities</value>
6740+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6741+
<value>visualstudiocode</value>
6742+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6743+
<value>scholarlyxml</value>
6744+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
67356745
<value>igraph</value>
67366746
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
67376747
<value>textal</value>
@@ -6808,8 +6818,6 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
68086818
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
68096819
<value>evt</value>
68106820
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6811-
<value>boilerplate</value>
6812-
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
68136821
<value>tei2html</value>
68146822
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
68156823
<value>basex</value>
@@ -6858,6 +6866,8 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
68586866
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
68596867
<value>xproc</value>
68606868
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6869+
<value>ceteicean</value>
6870+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
68616871
<value>imagemarkuptool</value>
68626872
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
68636873
<value>tustep</value>
@@ -6918,6 +6928,14 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
69186928
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
69196929
<value>gatsby</value>
69206930
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6931+
<value>alexandria</value>
6932+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6933+
<value>teipelican</value>
6934+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6935+
<value>odd2odd</value>
6936+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
6937+
<value>zenodo</value>
6938+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
69216939
</choice>
69226940
</attribute>
69236941
<empty/>

‎schema/tei_software_annotation.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,9 @@
203203
<valItem mode="add" ident="webpack"/>
204204
<valItem mode="add" ident="elem"/>
205205
<valItem mode="add" ident="literaturetranslation"/>
206+
<valItem mode="add" ident="teitok"/>
206207
<valItem mode="add" ident="github"/>
208+
<valItem mode="add" ident="githubpages"/>
207209
<valItem mode="add" ident="leaflet"/>
208210
<valItem mode="add" ident="ugarit"/>
209211
<valItem mode="add" ident="smartcompose"/>
@@ -310,6 +312,9 @@
310312
<valItem mode="add" ident="azurecloud"/>
311313
<valItem mode="add" ident="gate"/>
312314
<valItem mode="add" ident="r"/>
315+
<valItem mode="add" ident="textualcommunities"/>
316+
<valItem mode="add" ident="visualstudiocode"/>
317+
<valItem mode="add" ident="scholarlyxml"/>
313318
<valItem mode="add" ident="igraph"/>
314319
<valItem mode="add" ident="textal"/>
315320
<valItem mode="add" ident="planthumanitiesworkbench"/>
@@ -348,7 +353,6 @@
348353
<valItem mode="add" ident="eppt"/>
349354
<valItem mode="add" ident="elwoodviewer"/>
350355
<valItem mode="add" ident="evt"/>
351-
<valItem mode="add" ident="boilerplate"/>
352356
<valItem mode="add" ident="tei2html"/>
353357
<valItem mode="add" ident="basex"/>
354358
<valItem mode="add" ident="tipuesearch"/>
@@ -373,6 +377,7 @@
373377
<valItem mode="add" ident="ediarum"/>
374378
<valItem mode="add" ident="transkribus"/>
375379
<valItem mode="add" ident="xproc"/>
380+
<valItem mode="add" ident="ceteicean"/>
376381
<valItem mode="add" ident="imagemarkuptool"/>
377382
<valItem mode="add" ident="tustep"/>
378383
<valItem mode="add" ident="netbeans"/>
@@ -403,6 +408,10 @@
403408
<valItem mode="add" ident="lexico"/>
404409
<valItem mode="add" ident="jekyll"/>
405410
<valItem mode="add" ident="gatsby"/>
411+
<valItem mode="add" ident="alexandria"/>
412+
<valItem mode="add" ident="teipelican"/>
413+
<valItem mode="add" ident="odd2odd"/>
414+
<valItem mode="add" ident="zenodo"/>
406415
</valList>
407416
</attDef>
408417
</attList>

0 commit comments

Comments
 (0)