Merge branch 'TEIC:dev' into lingsig-tests

LingSIG · Mar 27, 2024 · 6471076 · 6471076
2 parents b6ad7f4 + 420eb76
commit 6471076
Show file tree

Hide file tree

Showing 884 changed files with 2,055 additions and 6,923 deletions.
diff --git a/P5/Exemplars/tei_enrich.odd b/P5/Exemplars/tei_enrich.odd
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0"
      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-
      xmlns:xi="http://www.w3.org/2001/XInclude"
      xmlns:s="http://www.ascc.net/xml/schematron"
      xml:lang="en"

diff --git a/P5/Exemplars/tei_simplePrint.odd b/P5/Exemplars/tei_simplePrint.odd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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"?>
-<TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<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">
   <teiHeader>
     <fileDesc>
       <titleStmt>
@@ -3483,13 +3483,13 @@ live without God in the world, and only mind earthly things.
                 <attDef ident="target" mode="change">
                   <constraintSpec ident="validtarget" scheme="schematron">
                     <constraint>
-                      <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:*[@target]">
-                        <let name="results"
+                      <sch:rule context="tei:*[@target]">
+                        <sch:let name="results"
                           value="for $t in  tokenize(normalize-space(@target),'\s+') return starts-with($t,'#') and not(id(substring($t,2)))"/>
-                        <report test="some $x in $results  satisfies $x"> Error: Every local pointer
-                          in "<value-of select="@target"/>" must point to an ID in this document
-                            (<value-of select="$results"/>)</report>
-                      </rule>
+                        <sch:report test="some $x in $results satisfies $x"> Error: Every local pointer
+                          in "<sch:value-of select="@target"/>" must point to an ID in this document
+                            (<sch:value-of select="$results"/>)</sch:report>
+                      </sch:rule>
                     </constraint>
                   </constraintSpec>
                 </attDef>
@@ -3498,24 +3498,28 @@ live without God in the world, and only mind earthly things.
             <classSpec type="atts" ident="att.global.rendition" mode="change">
               <constraintSpec ident="renditionpointer" scheme="schematron">
                 <constraint>
-                  <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:*[@rendition]">
-                    <let name="results"
-                      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)])"/>
-                    <assert test="every $x in $results satisfies $x"> Error: Each of the rendition
-                      values in "<value-of select="@rendition"/>" must point to a local ID or to a
-                      token in the Simple scheme (<value-of select="$results"/>)</assert>
-                  </rule>
+                  <sch:rule context="tei:*[@rendition]">
+                    <sch:let name="results"
+                      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)])"/>
+                    <sch:assert test="every $x in $results satisfies $x"> Error: Each of the rendition
+                      values in "<sch:value-of select="@rendition"/>" must point to a local ID or to a
+                      token in the Simple scheme (<sch:value-of select="$results"/>)</sch:assert>
+                  </sch:rule>
                 </constraint>
               </constraintSpec>
               <constraintSpec ident="corresppointer" scheme="schematron">
                 <constraint>
-                  <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:*[@corresp]">
-                    <let name="results"
+                  <sch:rule context="tei:*[@corresp]">
+                    <sch:let name="results"
                       value="for $t in tokenize(normalize-space(@corresp),'\s+') return starts-with($t,'#') and not(id(substring($t,2)))"/>
-                    <report test="some $x in $results  satisfies $x"> Error: Every local pointer in
-                        "<value-of select="@corresp"/>" must point to an ID in this document
-                        (<value-of select="$results"/>)</report>
-                  </rule>
+                    <sch:report test="some $x in $results  satisfies $x"> Error: Every local pointer in
+                        "<sch:value-of select="@corresp"/>" must point to an ID in this document
+                        (<sch:value-of select="$results"/>)</sch:report>
+                  </sch:rule>
                 </constraint>
               </constraintSpec>
               <!-- remove unused attributes @rend and @style; constrain values for @rendition -->
@@ -3993,9 +3997,8 @@ live without God in the world, and only mind earthly things.
             <elementSpec ident="bibl" mode="change">
               <constraintSpec mode="add" ident="noEmptyBibl" scheme="schematron">
                 <constraint>
-                  <assert xmlns="http://purl.oclc.org/dsdl/schematron"
-                    test="child::* or child::text()[normalize-space()]" role="ERROR"> Element
-                    "<name/>" may not be empty. </assert>
+                  <sch:assert test="child::* or child::text()[normalize-space()]" role="ERROR"> Element
+                    "<sch:name/>" may not be empty. </sch:assert>
                 </constraint>
               </constraintSpec>
               <model predicate="parent::listBibl" behaviour="listItem"/>
@@ -4109,16 +4112,26 @@ live without God in the world, and only mind earthly things.
             <elementSpec ident="choice" mode="change">
               <constraintSpec ident="choiceSize" scheme="schematron" mode="add">
                 <constraint>
-                  <assert xmlns="http://purl.oclc.org/dsdl/schematron" test="count(*) &gt; 1"
-                    role="ERROR"> Element "<name/>" must have at least two child elements.</assert>
+                  <sch:assert test="count(*) &gt; 1" role="ERROR"> Element "<sch:name/>" must have at least two child elements.</sch:assert>
                 </constraint>
               </constraintSpec>
               <constraintSpec ident="choiceContent" scheme="schematron" mode="add">
                 <constraint>
-                  <assert xmlns="http://purl.oclc.org/dsdl/schematron"
-                    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))"
-                    role="ERROR"> Element "<name/>" must have corresponding corr/sic, expand/abbr,
-                    reg/orig </assert>
+                  <sch:assert 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)
+                                   )" role="ERROR">
+                    Element "<sch:name/>" must have corresponding corr/sic, expand/abbr, reg/orig </sch:assert>
                 </constraint>
               </constraintSpec>
               <model output="plain" predicate="sic and corr" behaviour="inline">
@@ -5082,22 +5095,18 @@ live without God in the world, and only mind earthly things.
 
             </elementSpec>
             <elementSpec ident="text" mode="change">
-              <constraintSpec xmlns="http://www.tei-c.org/ns/1.0"
-                xmlns:XSL="http://www.w3.org/1999/XSL/Transform" ident="headeronlyelement"
-                scheme="schematron">
+              <constraintSpec ident="headeronlyelement" scheme="schematron">
                 <constraint>
-                  <!-- <rule xmlns="http://purl.oclc.org/dsdl/schematron"
+                  <!-- <sch:rule
                     context="tei:att | tei:biblFull | tei:biblStruct | tei:change | tei:charDecl | tei:charProp | tei:editor
                     | tei:editorialDecl | tei:email | tei:encodingDesc | tei:extent | tei:fileDesc | tei:gi | tei:glyph | tei:glyphName | 
                     tei:idno | tei:imprint | tei:keywords | tei:licence | tei:listChange | tei:listPerson | tei:localName | tei:monogr | 
                     tei:msDesc | tei:msIdentifier | tei:person | tei:physDesc | tei:profileDesc | tei:publicationStmt | tei:relatedItem | 
                     tei:repository | tei:resp | tei:respStmt | tei:sourceDesc | tei:tag | tei:teiHeader | tei:term | tei:textClass | tei:textDesc 
                     | tei:titleStmt | tei:typeDesc | tei:val | tei:value">-->
-                  <rule xmlns="http://purl.oclc.org/dsdl/schematron"
-                    context="tei:term | tei:biblFull ">
-                    <report test="ancestor::tei:text">Error: The element <name/> is not permitted
-                      outside the header</report>
-                  </rule>
+                  <sch:rule context="tei:term | tei:biblFull">
+                    <sch:report test="ancestor::tei:text">Error: The element <sch:name/> is not permitted outside the header</sch:report>
+                  </sch:rule>
                 </constraint>
               </constraintSpec>
               <model behaviour="body">

diff --git a/P5/Source/Guidelines/en/AB-About.xml b/P5/Source/Guidelines/en/AB-About.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright TEI Consortium. 
-Dual-licensed under CC-by and BSD2 licences 
-See the file COPYING.txt for details.
-$Date$
-$Id$
--->
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 
 
 <?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"?>

diff --git a/P5/Source/Guidelines/en/AI-AnalyticMechanisms.xml b/P5/Source/Guidelines/en/AI-AnalyticMechanisms.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright TEI Consortium. 
-Dual-licensed under CC-by and BSD2 licences 
-See the file COPYING.txt for details.
-$Date$
-$Id$
--->
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 <?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"?>
 <div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="AI" n="15"><head>Simple Analytic Mechanisms</head>
 

diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-Copyright TEI Consortium. 
-Dual-licensed under CC-by and BSD2 licences 
-See the file COPYING.txt for details. 
-$Date$
-$Id$
---><?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"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
+<?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"?>
 <div xmlns="http://www.tei-c.org/ns/1.0" xml:id="BIB">
   <head>Bibliography</head>
   <div>

diff --git a/P5/Source/Guidelines/en/CC-LanguageCorpora.xml b/P5/Source/Guidelines/en/CC-LanguageCorpora.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright TEI Consortium. 
-Dual-licensed under CC-by and BSD2 licences 
-See the file COPYING.txt for details.
-$Date$
-$Id$
--->
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 <?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"?>
 <div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CC" n="23"><head>Language Corpora</head>
 <p>The term <term>language corpus</term> is used to mean a number of

diff --git a/P5/Source/Guidelines/en/CE-CertaintyResponsibility.xml b/P5/Source/Guidelines/en/CE-CertaintyResponsibility.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright TEI Consortium. 
-Dual-licensed under CC-by and BSD2 licences 
-See the file COPYING.txt for details.
-$Date$
-$Id$
--->
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 <?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"?>
 <div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CE" n="17"><head>Certainty, Precision, and Responsibility</head>
 <p>Encoders of text often find it useful to indicate that some aspects

diff --git a/P5/Source/Guidelines/en/CH-LanguagesCharacterSets.xml b/P5/Source/Guidelines/en/CH-LanguagesCharacterSets.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright TEI Consortium. 
-Dual-licensed under CC-by and BSD2 licences 
-See the file COPYING.txt for details.
-$Date$
-$Id$
--->
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 <?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"?>
 <div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CH" n="4"> 
 <head>Languages and Character Sets</head>

diff --git a/P5/Source/Guidelines/en/CO-CoreElements.xml b/P5/Source/Guidelines/en/CO-CoreElements.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright TEI Consortium. 
-Dual-licensed under CC-by and BSD2 licences 
-See the file COPYING.txt for details.
-$Date$
-$Id$
--->
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 <?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"?>
 <div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="CO" n="6">
 <head>Elements Available in All TEI Documents</head>

diff --git a/P5/Source/Guidelines/en/COL-Colophon.xml b/P5/Source/Guidelines/en/COL-Colophon.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright TEI Consortium. 
-Dual-licensed under CC-by and BSD2 licences 
-See the file COPYING.txt for details.
-$Date$
-$Id$
--->
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 
 
 <?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"?>

diff --git a/P5/Source/Guidelines/en/DEPRECATIONS.xml b/P5/Source/Guidelines/en/DEPRECATIONS.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright TEI Consortium. 
-Dual-licensed under CC-by and BSD2 licences 
-See the file COPYING.txt for details.
-$Date$
-$Id$
--->
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 <?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"?>
 <div xmlns="http://www.tei-c.org/ns/1.0" type="div1" xml:id="DEPRECATIONS">
   <head>Deprecations</head>