concluding merge after manual conflict resolution of:

sydb · sydb · commit 2d7aff0d8080 · 2024-05-16T22:54:42.000-04:00
* P5/Exemplars/tei_enrich.odd
 * P5/Exemplars/tei_simplePrint.odd
 * P5/Test/testmeta2010.odd
 * P5/Utilities/TEI-to-tei_customization.xslt
diff --git a/P5/Exemplars/tei_enrich.odd b/P5/Exemplars/tei_enrich.odd
@@ -3453,10 +3453,11 @@ which should be supported by a more detailed description using the
           <elementSpec ident="date" mode="change" module="core">
             <constraintSpec scheme="schematron" ident="dates">
               <constraint>
-                <sch:rule context="tei:date">
-                  <sch:assert test="@when or (@notAfter and @notBefore) or (@from and @to)">
-                    You must provide either @when or @to/@from, or @notAfter/@notBefore.</sch:assert>
-                </sch:rule>
+		<sch:rule context="tei:date">
+                  <sch:assert test="@when  or  (@notAfter and @notBefore)  or  (@from and @to)">
+                    You must provide either @when or @to/@from, or @notAfter/@notBefore.
+		  </sch:assert>
+		</sch:rule>
               </constraint>
             </constraintSpec>
           </elementSpec>
diff --git a/P5/Exemplars/tei_simplePrint.odd b/P5/Exemplars/tei_simplePrint.odd
@@ -3484,8 +3484,13 @@ live without God in the world, and only mind earthly things.
                   <constraintSpec ident="validtarget" scheme="schematron">
                     <constraint>
                       <sch:rule context="tei:*[@target]">
+			<!-- If & when we are confident the processor
+			     will be an XPath 3+ processor the
+			     “tokenize(normalize-space(@target),'\s+')”
+			     below could be shortened to just
+			     “tokenize(@target)”. —Syd, 2024-04-12 -->
                         <sch:let name="results"
-                          value="for $t in  tokenize(normalize-space(@target),'\s+') return starts-with($t,'#') and not(id(substring($t,2)))"/>
+                          value="for $t in tokenize(normalize-space(@target),'\s+') return starts-with($t,'#') and not(id(substring($t,2)))"/>
                         <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>
@@ -3997,10 +4002,11 @@ live without God in the world, and only mind earthly things.
             <elementSpec ident="bibl" mode="change">
               <constraintSpec mode="add" ident="noEmptyBibl" scheme="schematron">
                 <constraint>
-                  <sch:rule context="tei:bibl">
-                    <sch:assert test="child::* or child::text()[normalize-space()]" role="ERROR"> Element
-                      "<sch:name/>" may not be empty. </sch:assert>
-                  </sch:rule>
+		   <sch:rule context="tei:bibl">		   		  
+                     <sch:assert test="child::* or child::text()[normalize-space()]" role="ERROR">
+		       Element "<sch:name/>" may not be empty.
+		     </sch:assert>
+		   </sch:rule>
                 </constraint>
               </constraintSpec>
               <model predicate="parent::listBibl" behaviour="listItem"/>
@@ -4114,29 +4120,23 @@ live without God in the world, and only mind earthly things.
             <elementSpec ident="choice" mode="change">
               <constraintSpec ident="choiceSize" scheme="schematron" mode="add">
                 <constraint>
-                  <sch:rule context="tei:choice">
-                    <sch:assert test="count(*) &gt; 1" role="ERROR"> Element "<sch:name/>" must have at least two child elements.</sch:assert>
-                  </sch:rule>
+		   <sch:rule context="tei:choice"> 		  
+                     <sch:assert test="count(*) gt 1" role="ERROR">
+		       Element "<sch:name/>" must have at least two child elements.
+		     </sch:assert>
+		   </sch:rule>
                 </constraint>
               </constraintSpec>
               <constraintSpec ident="choiceContent" scheme="schematron" mode="add">
                 <constraint>
-                  <sch:rule context="tei:choice">
-                    <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>
+		  <sch:rule context="tei:choice">
+		    <sch:assert test="( 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>
 		  </sch:rule>
                 </constraint>
               </constraintSpec>
diff --git a/P5/Source/Guidelines/en/SA-LinkingSegmentationAlignment.xml b/P5/Source/Guidelines/en/SA-LinkingSegmentationAlignment.xml
@@ -3289,7 +3289,7 @@ will only select the text of the poem, with no markup inside.</p>
         <gi>standOff</gi> is largely the same as the metadata that describes the associated resource
       (e.g., the transcribed text in <gi>text</gi>), then the <gi>standOff</gi> and the encoded
       associated resource may appear as children of the same <gi>TEI</gi> element. The example below
-      has a transcription with <gi>placename</gi> elements in the text linked to a list of <gi>place</gi> elements in the
+      has a transcription with <gi>placeName</gi> elements in the text linked to a list of <gi>place</gi> elements in the
       <gi>standOff</gi> section.
       <egXML xmlns="http://www.tei-c.org/ns/Examples" valid="feasible">
         <TEI>
diff --git a/P5/Source/Specs/acquisition.xml b/P5/Source/Specs/acquisition.xml
@@ -1,8 +1,8 @@
 <?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"?><elementSpec xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="msdescription" xml:id="ACQUISITION" ident="acquisition">
-  <gloss xml:lang="en" versionDate="2007-06-12">acquisition</gloss>
-  <gloss xml:lang="es" versionDate="2022-06-16">adquisición</gloss>
+  <gloss versionDate="2007-06-12" xml:lang="en">acquisition</gloss>
+  <gloss versionDate="2022-06-16" xml:lang="es">adquisición</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">acquisition</gloss>
   <desc versionDate="2019-01-17" xml:lang="en" xml:id="acquisn.desc">contains any descriptive or other information
 concerning the process by which a manuscript or manuscript part or other object entered the holding
@@ -34,7 +34,7 @@ institution.</desc>
             date represented by the content of this element belongs.</desc>
         <desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
         <desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
-        <desc xml:lang="ja" versionDate="2019-02-03">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
+        <desc versionDate="2019-02-03" xml:lang="ja">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
         <desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
             appartient la date exprimée dans le contenu de l'élément.</desc>
         <desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
diff --git a/P5/Source/Specs/addSpan.xml b/P5/Source/Specs/addSpan.xml
@@ -74,11 +74,11 @@
     end by the <att>spanTo</att> attribute.</p>
   </remarks>
   <remarks versionDate="2018-09-08" xml:lang="es"><p>Tanto el inicio como el final del material que se agrego debe ser marcado; el inicio con el mismo elemento <gi>addSpan</gi>  y el final con el atributo <att>spanTo</att>.</p></remarks>
-  <remarks xml:lang="fr" versionDate="2009-11-16">
+  <remarks versionDate="2009-11-16" xml:lang="fr">
     <p>Le début et la fin de la partie de texte ajoutée doivent être marqués ; le début, par l'élément
                     <gi>addSpan</gi> lui-même, la fin, par l'attribut <att>spanTo</att>.</p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks versionDate="2008-04-05" xml:lang="ja">
     <p>
     追加する情報の始めと終わりの両方にマークアップすべきである。
     始めは、要素<gi>addSpan</gi>自身によって、終わりは属性
diff --git a/P5/Source/Specs/affiliation.xml b/P5/Source/Specs/affiliation.xml
@@ -1,7 +1,7 @@
 <?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"?><elementSpec xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="affiliation">
-  <gloss xml:lang="en" versionDate="2008-12-09">affiliation</gloss>
+  <gloss versionDate="2008-12-09" xml:lang="en">affiliation</gloss>
   <gloss versionDate="2008-12-09" xml:lang="fr">affiliation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains an informal description of a person's present or past affiliation with some
         organization, for example an employer or sponsor.</desc>
@@ -41,7 +41,7 @@
             date represented by the content of this element belongs.</desc>
         <desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
         <desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
-        <desc xml:lang="ja" versionDate="2019-02-03">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
+        <desc versionDate="2019-02-03" xml:lang="ja">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
         <desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
             appartient la date exprimée dans le contenu de l'élément.</desc>
         <desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
@@ -82,7 +82,7 @@
             </affiliation>
     </egXML>
   </exemplum>
-  <exemplum xml:lang="en" versionDate="2018-10-30">
+  <exemplum versionDate="2018-10-30" xml:lang="en">
     <p>This example indicates that the person was affiliated with the
     Australian Journalists Association at some point between the dates
     listed.</p>
@@ -92,7 +92,7 @@
             </affiliation>
     </egXML>
   </exemplum>
-  <exemplum xml:lang="en" versionDate="2018-10-30">
+  <exemplum versionDate="2018-10-30" xml:lang="en">
     <p>This example indicates that the person was affiliated with Mount Holyoke College throughout the entire span of the date range listed.</p>
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#NONE">
       <affiliation from="1902-01-01" to="1906-01-01">Was an assistant professor at Mount Holyoke College.</affiliation>
@@ -124,7 +124,7 @@
             <gi>name</gi> comme ci-dessus, soit l'élément plus spécifique
         <gi>orgName</gi>.</p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks versionDate="2008-04-05" xml:lang="ja">
     <p> 組織名は、要素<gi>name</gi>または、より特化した要素 <gi>orgName</gi>でマークアップした方がよい。 </p>
   </remarks>
   <listRef>
diff --git a/P5/Source/Specs/caption.xml b/P5/Source/Specs/caption.xml
@@ -2,7 +2,7 @@
 <!-- © 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"?>
 <elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="drama" ident="caption">
-  <gloss xml:lang="en" versionDate="2007-06-12">caption</gloss>
+  <gloss versionDate="2007-06-12" xml:lang="en">caption</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">sous-titre</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains the text of a caption or other text displayed as part of
 a film script or screenplay.</desc>
@@ -65,10 +65,10 @@ laughing affectedly and drinking champagne.</view>
   <remarks versionDate="2005-01-14" xml:lang="en">
     <p>A specialized form of stage direction.</p>
   </remarks>
-  <remarks xml:lang="fr" versionDate="2007-06-12">
+  <remarks versionDate="2007-06-12" xml:lang="fr">
     <p>Forme particulière d'indication scénique.</p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks versionDate="2008-04-05" xml:lang="ja">
     <p>ト書きの特別な形。</p>
   </remarks>
   <listRef>
diff --git a/P5/Source/Specs/case.xml b/P5/Source/Specs/case.xml
@@ -2,7 +2,7 @@
 <!-- © 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"?>
 <elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="dictionaries" ident="case">
-  <gloss xml:lang="en" versionDate="2007-06-12">case</gloss>
+  <gloss versionDate="2007-06-12" xml:lang="en">case</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">cas</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains grammatical case information given by a dictionary for a given form.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">주어진 형식에 대하여 사전에 제시된 문법적 격 정보를 포함한다.</desc>
@@ -91,15 +91,15 @@
         <mentioned>dative</mentioned>, <mentioned>genitive</mentioned>, etc.</p>
     <p>This element is synonymous with <tag>gram type="case"</tag>.</p>
   </remarks>
-  <remarks xml:lang="fr" versionDate="2007-06-12">
+  <remarks versionDate="2007-06-12" xml:lang="fr">
     <p rend="dataDesc">Peut contenir des caractères et des éléments du niveau expression.
                 Les valeurs types seront <mentioned> nominative</mentioned>,
                 <mentioned>accusative</mentioned>, <mentioned>dative</mentioned>,
                     <mentioned>genitive</mentioned>, etc.</p>
     <p>Cet élément est synonyme de<tag>gram type="case"</tag>
             </p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks versionDate="2008-04-05" xml:lang="ja">
     <p rend="dataDesc">
     文字データまたは句レベルの要素。典型的な値は、
       <mentioned>nominative(主格)</mentioned>、<mentioned>accusative(対格)</mentioned>、<mentioned>dative(与格)</mentioned>、<mentioned>genitive(属格)
diff --git a/P5/Test/testmeta2010.odd b/P5/Test/testmeta2010.odd
@@ -46,65 +46,64 @@
 
        <p>Now make some changes and deletions</p>
        <specGrp xml:id="Changes">
-         <elementSpec ident="list" mode="change">
-           <attList>
-             <attDef ident="type" mode="change">
-               <constraintSpec mode="add" ident="a1" scheme="schematron">
-                 <constraint>
-                   <sch:rule context="tei:list">
-                     <sch:assert test="count(ancestor-or-self::tei:list[1]/tei:item)&lt;2">list too short </sch:assert>
-                   </sch:rule>
-                 </constraint>
-               </constraintSpec>
-               <valList type="closed" mode="replace">
-                 <valItem ident="enumerated"/>
-                 <valItem ident="itemized"/>
-               </valList>
-             </attDef>
-           </attList>
-         </elementSpec>
-         <classSpec ident="att.canonical" type="atts" mode="delete"/>
-         <classSpec ident="att.global.rendition" type="atts" mode="change">
-           <attList>
-             <attDef ident="rendition" mode="delete"/>
-           </attList>
-         </classSpec>
-         <macroSpec ident="macro.specialPara" mode="change">
-           <content>
-             <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
-               <choice>
-                 <text/>
-                 <ref name="model.phrase"/>
-               </choice>
-             </zeroOrMore>
-           </content>
-         </macroSpec>
-         <elementSpec ident="div" mode="change">
-           <attList>
-             <attDef ident="type" mode="delete"/>
-             <attDef ident="rend" mode="change">
-               <valList type="closed" mode="add">
-                 <valItem ident="i">
-                   <gloss xml:lang="en" versionDate="2014-01-12">italic</gloss>
-                 </valItem>
-                 <valItem ident="b">
-                   <gloss xml:lang="en" versionDate="2014-01-12">bold</gloss>
-                 </valItem>
-               </valList>
-             </attDef>
-           </attList>
-         </elementSpec>
-         <classSpec mode="change" type="atts" ident="att.docStatus">
-           <attList>
-             <attDef ident="status" mode="change">
-               <valList  type="closed" mode="replace">
-                 <valItem ident="good"/>
-                 <valItem ident="bad"/>
-               </valList>
-             </attDef>
-           </attList>
-         </classSpec>
-
+	 <elementSpec ident="list" mode="change">
+	   <attList>
+	     <attDef ident="type" mode="change">
+	       <constraintSpec mode="add" ident="a1" scheme="schematron">
+		 <constraint>
+		   <sch:rule context="tei:list/@type">		   
+		     <sch:assert test="count( ancestor-or-self::tei:list[1]/tei:item ) lt 2">list too short </sch:assert>
+		   </sch:rule>
+		 </constraint>
+	       </constraintSpec>
+	       <valList type="closed" mode="replace">
+		 <valItem ident="enumerated"/>
+		 <valItem ident="itemized"/>
+	       </valList>
+	     </attDef>
+	   </attList>
+	 </elementSpec>
+	 <classSpec ident="att.canonical" type="atts" mode="delete"/>
+	 <classSpec ident="att.global.rendition" type="atts" mode="change">
+	   <attList>
+	     <attDef ident="rendition" mode="delete"/>
+	   </attList>
+	 </classSpec>
+	 <macroSpec ident="macro.specialPara" mode="change">
+	   <content>
+	     <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+	       <choice>
+		 <text/>
+		 <ref name="model.phrase"/>
+	       </choice>
+	     </zeroOrMore>
+	   </content>
+	 </macroSpec>
+	 <elementSpec ident="div" mode="change">
+	   <attList>
+	     <attDef ident="type" mode="delete"/>
+	     <attDef ident="rend" mode="change">
+	       <valList type="closed" mode="add">
+		 <valItem ident="i">
+		   <gloss xml:lang="en" versionDate="2014-01-12">italic</gloss>
+		 </valItem>
+		 <valItem ident="b">
+		   <gloss xml:lang="en" versionDate="2014-01-12">bold</gloss>
+		 </valItem>
+	       </valList>
+	     </attDef>
+	   </attList>
+	 </elementSpec>
+	 <classSpec mode="change" type="atts" ident="att.docStatus">
+	   <attList>
+	     <attDef ident="status" mode="change">
+	       <valList  type="closed" mode="replace">
+		 <valItem ident="good"/>
+		 <valItem ident="bad"/>
+	       </valList>
+	     </attDef>
+	   </attList>
+	 </classSpec>
        </specGrp>
 
        <p>Now add an element in another namespace, implementing parts
diff --git a/P5/Utilities/TEI-to-tei_customization.xslt b/P5/Utilities/TEI-to-tei_customization.xslt
@@ -53,6 +53,10 @@
 
   <xsl:variable name="revisionDesc">
     <revisionDesc>
+      <change who="#sbauman.emt" when="2024-04-12">
+	Added <gi>sch:rule</gi> elements PRN to avoid new warning
+	about contextless Schematron.
+      </change>
       <change who="#sbauman.emt" when="2023-06-06">
         <list>
           <item>Remove the <ident>altIdent-only-NCName</ident>
diff --git a/P5/Utilities/guidelines.xsl.model b/P5/Utilities/guidelines.xsl.model
diff --git a/P5/p5odds.odd b/P5/p5odds.odd
