Skip to content

Commit 0805769

Browse files
joeytakedajoeytakeda
committed
Merge branch 'dev' into iss2508_doctype
2 parents f07ac23 + 43e2037 commit 0805769

File tree

886 files changed

+2146
-6988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

886 files changed

+2146
-6988
lines changed

‎P5/Exemplars/tei_enrich.odd

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<TEI xmlns="http://www.tei-c.org/ns/1.0"
33
xmlns:sch="http://purl.oclc.org/dsdl/schematron"
4-
54
xmlns:xi="http://www.w3.org/2001/XInclude"
65
xmlns:s="http://www.ascc.net/xml/schematron"
76
xml:lang="en"
@@ -3454,8 +3453,11 @@ which should be supported by a more detailed description using the
34543453
<elementSpec ident="date" mode="change" module="core">
34553454
<constraintSpec scheme="schematron" ident="dates">
34563455
<constraint>
3457-
<sch:assert test="@when or (@notAfter and @notBefore) or (@from and @to)">
3458-
You must provide either @when or @to/@from, or @notAfter/@notBefore.</sch:assert>
3456+
<sch:rule context="tei:date">
3457+
<sch:assert test="@when or (@notAfter and @notBefore) or (@from and @to)">
3458+
You must provide either @when or @to/@from, or @notAfter/@notBefore.
3459+
</sch:assert>
3460+
</sch:rule>
34593461
</constraint>
34603462
</constraintSpec>
34613463
</elementSpec>

‎P5/Exemplars/tei_simplePrint.odd

+54-39
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?xml-model href="http://jenkins.tei-c.org/job/TEIP5/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
3-
<TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
3+
<TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:sch="http://purl.oclc.org/dsdl/schematron">
44
<teiHeader>
55
<fileDesc>
66
<titleStmt>
@@ -3483,13 +3483,18 @@ live without God in the world, and only mind earthly things.
34833483
<attDef ident="target" mode="change">
34843484
<constraintSpec ident="validtarget" scheme="schematron">
34853485
<constraint>
3486-
<rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:*[@target]">
3487-
<let name="results"
3488-
value="for $t in tokenize(normalize-space(@target),'\s+') return starts-with($t,'#') and not(id(substring($t,2)))"/>
3489-
<report test="some $x in $results satisfies $x"> Error: Every local pointer
3490-
in "<value-of select="@target"/>" must point to an ID in this document
3491-
(<value-of select="$results"/>)</report>
3492-
</rule>
3486+
<sch:rule context="tei:*[@target]">
3487+
<!-- If & when we are confident the processor
3488+
will be an XPath 3+ processor the
3489+
“tokenize(normalize-space(@target),'\s+')”
3490+
below could be shortened to just
3491+
“tokenize(@target)”. —Syd, 2024-04-12 -->
3492+
<sch:let name="results"
3493+
value="for $t in tokenize(normalize-space(@target),'\s+') return starts-with($t,'#') and not(id(substring($t,2)))"/>
3494+
<sch:report test="some $x in $results satisfies $x"> Error: Every local pointer
3495+
in "<sch:value-of select="@target"/>" must point to an ID in this document
3496+
(<sch:value-of select="$results"/>)</sch:report>
3497+
</sch:rule>
34933498
</constraint>
34943499
</constraintSpec>
34953500
</attDef>
@@ -3498,24 +3503,28 @@ live without God in the world, and only mind earthly things.
34983503
<classSpec type="atts" ident="att.global.rendition" mode="change">
34993504
<constraintSpec ident="renditionpointer" scheme="schematron">
35003505
<constraint>
3501-
<rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:*[@rendition]">
3502-
<let name="results"
3503-
value="for $val in tokenize(normalize-space(@rendition),'\s+') return starts-with($val,'simple:') or (starts-with($val,'#') and //tei:rendition[@xml:id=substring($val,2)])"/>
3504-
<assert test="every $x in $results satisfies $x"> Error: Each of the rendition
3505-
values in "<value-of select="@rendition"/>" must point to a local ID or to a
3506-
token in the Simple scheme (<value-of select="$results"/>)</assert>
3507-
</rule>
3506+
<sch:rule context="tei:*[@rendition]">
3507+
<sch:let name="results"
3508+
value="for $val in tokenize(normalize-space(@rendition),'\s+') return starts-with($val,'simple:')
3509+
or
3510+
(starts-with($val,'#')
3511+
and
3512+
//tei:rendition[@xml:id=substring($val,2)])"/>
3513+
<sch:assert test="every $x in $results satisfies $x"> Error: Each of the rendition
3514+
values in "<sch:value-of select="@rendition"/>" must point to a local ID or to a
3515+
token in the Simple scheme (<sch:value-of select="$results"/>)</sch:assert>
3516+
</sch:rule>
35083517
</constraint>
35093518
</constraintSpec>
35103519
<constraintSpec ident="corresppointer" scheme="schematron">
35113520
<constraint>
3512-
<rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:*[@corresp]">
3513-
<let name="results"
3521+
<sch:rule context="tei:*[@corresp]">
3522+
<sch:let name="results"
35143523
value="for $t in tokenize(normalize-space(@corresp),'\s+') return starts-with($t,'#') and not(id(substring($t,2)))"/>
3515-
<report test="some $x in $results satisfies $x"> Error: Every local pointer in
3516-
"<value-of select="@corresp"/>" must point to an ID in this document
3517-
(<value-of select="$results"/>)</report>
3518-
</rule>
3524+
<sch:report test="some $x in $results satisfies $x"> Error: Every local pointer in
3525+
"<sch:value-of select="@corresp"/>" must point to an ID in this document
3526+
(<sch:value-of select="$results"/>)</sch:report>
3527+
</sch:rule>
35193528
</constraint>
35203529
</constraintSpec>
35213530
<!-- remove unused attributes @rend and @style; constrain values for @rendition -->
@@ -3993,9 +4002,11 @@ live without God in the world, and only mind earthly things.
39934002
<elementSpec ident="bibl" mode="change">
39944003
<constraintSpec mode="add" ident="noEmptyBibl" scheme="schematron">
39954004
<constraint>
3996-
<assert xmlns="http://purl.oclc.org/dsdl/schematron"
3997-
test="child::* or child::text()[normalize-space()]" role="ERROR"> Element
3998-
"<name/>" may not be empty. </assert>
4005+
<sch:rule context="tei:bibl">
4006+
<sch:assert test="child::* or child::text()[normalize-space()]" role="ERROR">
4007+
Element "<sch:name/>" may not be empty.
4008+
</sch:assert>
4009+
</sch:rule>
39994010
</constraint>
40004011
</constraintSpec>
40014012
<model predicate="parent::listBibl" behaviour="listItem"/>
@@ -4109,16 +4120,24 @@ live without God in the world, and only mind earthly things.
41094120
<elementSpec ident="choice" mode="change">
41104121
<constraintSpec ident="choiceSize" scheme="schematron" mode="add">
41114122
<constraint>
4112-
<assert xmlns="http://purl.oclc.org/dsdl/schematron" test="count(*) &gt; 1"
4113-
role="ERROR"> Element "<name/>" must have at least two child elements.</assert>
4123+
<sch:rule context="tei:choice">
4124+
<sch:assert test="count(*) gt 1" role="ERROR">
4125+
Element "<sch:name/>" must have at least two child elements.
4126+
</sch:assert>
4127+
</sch:rule>
41144128
</constraint>
41154129
</constraintSpec>
41164130
<constraintSpec ident="choiceContent" scheme="schematron" mode="add">
41174131
<constraint>
4118-
<assert xmlns="http://purl.oclc.org/dsdl/schematron"
4119-
test="(tei:corr or tei:sic or tei:expan or tei:abbr or tei:reg or tei:orig) and ((tei:corr and tei:sic) or (tei:expan and tei:abbr) or (tei:reg and tei:orig))"
4120-
role="ERROR"> Element "<name/>" must have corresponding corr/sic, expand/abbr,
4121-
reg/orig </assert>
4132+
<sch:rule context="tei:choice">
4133+
<sch:assert test="( tei:corr and tei:sic )
4134+
or
4135+
( tei:expan and tei:abbr )
4136+
or
4137+
( tei:reg and tei:orig )" role="ERROR">
4138+
Element "<sch:name/>" must have corresponding corr/sic, expand/abbr, reg/orig
4139+
</sch:assert>
4140+
</sch:rule>
41224141
</constraint>
41234142
</constraintSpec>
41244143
<model output="plain" predicate="sic and corr" behaviour="inline">
@@ -5082,22 +5101,18 @@ live without God in the world, and only mind earthly things.
50825101

50835102
</elementSpec>
50845103
<elementSpec ident="text" mode="change">
5085-
<constraintSpec xmlns="http://www.tei-c.org/ns/1.0"
5086-
xmlns:XSL="http://www.w3.org/1999/XSL/Transform" ident="headeronlyelement"
5087-
scheme="schematron">
5104+
<constraintSpec ident="headeronlyelement" scheme="schematron">
50885105
<constraint>
5089-
<!-- <rule xmlns="http://purl.oclc.org/dsdl/schematron"
5106+
<!-- <sch:rule
50905107
context="tei:att | tei:biblFull | tei:biblStruct | tei:change | tei:charDecl | tei:charProp | tei:editor
50915108
| tei:editorialDecl | tei:email | tei:encodingDesc | tei:extent | tei:fileDesc | tei:gi | tei:glyph | tei:glyphName |
50925109
tei:idno | tei:imprint | tei:keywords | tei:licence | tei:listChange | tei:listPerson | tei:localName | tei:monogr |
50935110
tei:msDesc | tei:msIdentifier | tei:person | tei:physDesc | tei:profileDesc | tei:publicationStmt | tei:relatedItem |
50945111
tei:repository | tei:resp | tei:respStmt | tei:sourceDesc | tei:tag | tei:teiHeader | tei:term | tei:textClass | tei:textDesc
50955112
| tei:titleStmt | tei:typeDesc | tei:val | tei:value">-->
5096-
<rule xmlns="http://purl.oclc.org/dsdl/schematron"
5097-
context="tei:term | tei:biblFull ">
5098-
<report test="ancestor::tei:text">Error: The element <name/> is not permitted
5099-
outside the header</report>
5100-
</rule>
5113+
<sch:rule context="tei:term | tei:biblFull">
5114+
<sch:report test="ancestor::tei:text">Error: The element <sch:name/> is not permitted outside the header</sch:report>
5115+
</sch:rule>
51015116
</constraint>
51025117
</constraintSpec>
51035118
<model behaviour="body">

‎P5/Source/Guidelines/en/AB-About.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright TEI Consortium.
4-
Dual-licensed under CC-by and BSD2 licences
5-
See the file COPYING.txt for details.
6-
$Date$
7-
$Id$
8-
-->
2+
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
93

104

115
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>

‎P5/Source/Guidelines/en/AI-AnalyticMechanisms.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright TEI Consortium.
4-
Dual-licensed under CC-by and BSD2 licences
5-
See the file COPYING.txt for details.
6-
$Date$
7-
$Id$
8-
-->
2+
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
93
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
104
<div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="AI" n="15"><head>Simple Analytic Mechanisms</head>
115

‎P5/Source/Guidelines/en/BIB-Bibliography.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8"?><!--
2-
Copyright TEI Consortium.
3-
Dual-licensed under CC-by and BSD2 licences
4-
See the file COPYING.txt for details.
5-
$Date$
6-
$Id$
7-
--><?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
3+
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
84
<div xmlns="http://www.tei-c.org/ns/1.0" xml:id="BIB">
95
<head>Bibliography</head>
106
<div>

‎P5/Source/Guidelines/en/CC-LanguageCorpora.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright TEI Consortium.
4-
Dual-licensed under CC-by and BSD2 licences
5-
See the file COPYING.txt for details.
6-
$Date$
7-
$Id$
8-
-->
2+
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
93
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
104
<div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CC" n="23"><head>Language Corpora</head>
115
<p>The term <term>language corpus</term> is used to mean a number of

‎P5/Source/Guidelines/en/CE-CertaintyResponsibility.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright TEI Consortium.
4-
Dual-licensed under CC-by and BSD2 licences
5-
See the file COPYING.txt for details.
6-
$Date$
7-
$Id$
8-
-->
2+
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
93
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
104
<div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CE" n="17"><head>Certainty, Precision, and Responsibility</head>
115
<p>Encoders of text often find it useful to indicate that some aspects

‎P5/Source/Guidelines/en/CH-LanguagesCharacterSets.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright TEI Consortium.
4-
Dual-licensed under CC-by and BSD2 licences
5-
See the file COPYING.txt for details.
6-
$Date$
7-
$Id$
8-
-->
2+
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
93
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
104
<div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CH" n="4">
115
<head>Languages and Character Sets</head>

‎P5/Source/Guidelines/en/CO-CoreElements.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright TEI Consortium.
4-
Dual-licensed under CC-by and BSD2 licences
5-
See the file COPYING.txt for details.
6-
$Date$
7-
$Id$
8-
-->
2+
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
93
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
104
<div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CO" n="6">
115
<head>Elements Available in All TEI Documents</head>

‎P5/Source/Guidelines/en/COL-Colophon.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright TEI Consortium.
4-
Dual-licensed under CC-by and BSD2 licences
5-
See the file COPYING.txt for details.
6-
$Date$
7-
$Id$
8-
-->
2+
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
93

104

115
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>

‎P5/Source/Guidelines/en/DEPRECATIONS.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright TEI Consortium.
4-
Dual-licensed under CC-by and BSD2 licences
5-
See the file COPYING.txt for details.
6-
$Date$
7-
$Id$
8-
-->
2+
<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
93
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
104
<div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="DEPRECATIONS">
115
<head>Deprecations</head>

0 commit comments

Comments
 (0)