From 63d99d818415baec5fe3014c49844a6d920a8cf4 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sun, 6 Aug 2023 14:29:57 -0400
Subject: [PATCH 1/2] Address #2261 as follows:  * Made scheme= of
 constraintSpec optional (per closed schema)  * Made scheme= of constraintSpec
 required iff mode=add (default) or mode=replace  * Moved declarations of
 Schematron namespaces from constraintSpec to TEI in order to make above work 
 * Added a case in detest.odd to test new constraints

---
 P5/Source/Specs/TEI.xml                       |  6 ++++
 P5/Source/Specs/constraintSpec.xml            | 36 ++++++++++++++-----
 P5/Test/detest.odd                            | 19 ++++++++++
 .../detest_odd_schematron.log                 | 20 +++++++----
 4 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/P5/Source/Specs/TEI.xml b/P5/Source/Specs/TEI.xml
index e6daa53258..a0fe94201b 100644
--- a/P5/Source/Specs/TEI.xml
+++ b/P5/Source/Specs/TEI.xml
@@ -62,6 +62,12 @@ $Id$
       <sch:ns prefix="rna" uri="http://relaxng.org/ns/compatibility/annotations/1.0"/>
     </constraint>
   </constraintSpec>
+  <constraintSpec ident="c3" scheme="schematron">
+    <constraint>
+      <sch:ns prefix="sch" uri="http://purl.oclc.org/dsdl/schematron"/>
+      <sch:ns prefix="sch1x" uri="http://www.ascc.net/xml/schematron"/>
+    </constraint>
+  </constraintSpec>
   <attList>
     <attDef ident="version" usage="opt">
       <desc versionDate="2018-01-24" xml:lang="en">specifies the version number of the TEI Guidelines against
diff --git a/P5/Source/Specs/constraintSpec.xml b/P5/Source/Specs/constraintSpec.xml
index 04455bddd5..5acc1a8cbf 100644
--- a/P5/Source/Specs/constraintSpec.xml
+++ b/P5/Source/Specs/constraintSpec.xml
@@ -48,8 +48,7 @@ $Id$
   <constraintSpec ident="sch_no_more" scheme="schematron">
     <desc xml:lang="en" versionDate="2018-07-06">Relationship between scheme attribute and contents: Schematron 1.x</desc>
     <constraint>
-      <sch:ns prefix="s" uri="http://www.ascc.net/xml/schematron"/>
-      <sch:report test="tei:constraint/s:* and @scheme = ('isoschematron','schematron')">Rules
+      <sch:report test="tei:constraint/sch1x:* and @scheme = ('isoschematron','schematron')">Rules
         in the Schematron 1.* language must be inside a constraintSpec
         with a value other than 'schematron' or 'isoschematron' on the
         scheme attribute</sch:report>
@@ -58,15 +57,15 @@ $Id$
   <constraintSpec ident="isosch" scheme="schematron">
     <desc xml:lang="en" versionDate="2018-07-06">Relationship between scheme attribute and contents: ISO Schematron</desc>
     <constraint>
-      <sch:ns prefix="sch" uri="http://purl.oclc.org/dsdl/schematron"/>
-      <sch:report test="tei:constraint/sch:* and not( @scheme eq 'schematron')">Rules
-        in the ISO Schematron language must be inside a constraintSpec
-        with the value 'schematron' on the scheme attribute</sch:report>
+      <sch:rule context="tei:constraintSpec[ @mode = ('add','replace') or not( @mode ) ]">
+	<sch:report test="tei:constraint/sch:* and not( @scheme eq 'schematron')">Rules
+          in the ISO Schematron language must be inside a constraintSpec
+          with the value 'schematron' on the scheme attribute</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="needrules" scheme="schematron">
     <constraint>
-      <sch:ns prefix="sch" uri="http://purl.oclc.org/dsdl/schematron"/>
       <sch:rule context="tei:macroSpec/tei:constraintSpec[@scheme eq 'schematron']/tei:constraint">
         <sch:report test="sch:assert|sch:report">An ISO Schematron constraint specification for a macro should not
         have an 'assert' or 'report' element without a parent 'rule' element</sch:report>
@@ -84,21 +83,40 @@ $Id$
     </constraint>
   </constraintSpec>
   <attList>
-    <attDef ident="scheme" usage="req">
+    <attDef ident="scheme" usage="opt">
+      <!-- Note:
+	   Per "usage_based_on_mode", below,
+  	   * usage=req iff mode=add or mode=replace
+	   * usage=not allowed iff mode=change or mode=delete
+      -->
       <desc versionDate="2009-06-10" xml:lang="en">supplies the name of the language in which the constraints
       are defined</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
+      <constraintSpec scheme="schematron" ident="usage_based_on_mode">
+	<constraint>
+	  <sch:rule context="tei:constraintSpec[ @mode = ('add','replace')  or  not( @mode ) ]">
+	    <sch:assert test="@scheme">The @scheme attribute of &lt;constraintSpec> is required when the @mode is <sch:value-of select="if (@mode) then concat('&quot;',@mode,'&quot;') else 'not specified'"/>.</sch:assert>
+	  </sch:rule>
+	</constraint>
+      </constraintSpec>
       <valList type="semi">
         <valItem ident="schematron">
           <gloss versionDate="2016-09-27" xml:lang="en">ISO Schematron</gloss>
         </valItem>
       </valList>
-      <remarks versionDate="2021-09-27" xml:lang="en">
+      <remarks versionDate="2023-08-06" xml:lang="en">
         <p>These Guidelines no longer recommend, and the current TEI
         stylesheets no longer support, the use of Schematron 1.x
         within <gi>constraintSpec</gi>. Thus the value
         <val>schematron</val> is used to indicate that ISO Schematron
         is used within the <gi>constraintSpec</gi>.</p>
+	<p>The <att>scheme</att> attribute is required when the value
+	of <att>mode</att> is <val>add</val> or
+	<val>replace</val>. The <att>scheme</att> attribute is
+	permitted when the value of <att>mode</att> is
+	<val>delete</val>, but these Guidelines make no reccomendation
+	for what a processor should do if its value does not match
+	that of the <gi>constraintSpec</gi> being deleted.</p>
       </remarks>
     </attDef>
     <attDef ident="type" mode="replace">
diff --git a/P5/Test/detest.odd b/P5/Test/detest.odd
index 166a5ff372..ed347586ac 100644
--- a/P5/Test/detest.odd
+++ b/P5/Test/detest.odd
@@ -17,6 +17,11 @@
       </sourceDesc>
     </fileDesc>
     <revisionDesc>
+      <change when="2023-08-06" who="#sbauman.emt">
+        Add the <name>add_missing_scheme</name> and
+        <name>replace_missing_scheme</name> tests for
+        <gi>constraintSpec</gi>.
+      </change>
       <change when="2022-04-04" who="#sbauman.emt">
         <list>
           <item>Tweaked some comments and wording of content</item>
@@ -437,6 +442,20 @@
             <content>
               <rng:ref name="macro.phraseSeq"/>
             </content>
+            <constraintSpec ident="add_missing_scheme">
+              <desc>This <gi>constraintSpec</gi> is invalid because it is
+              missing <att>scheme</att> in <val>add</val> mode.</desc>
+              <constraint>
+                <sch:report test="false()">This rule never fires.</sch:report>
+              </constraint>
+            </constraintSpec>
+            <constraintSpec ident="replace_missing_scheme" mode="replace">
+              <desc>This <gi>constraintSpec</gi> is invalid because it is
+              missing <att>scheme</att> in <val>replace</val> mode.</desc>
+              <constraint>
+                <sch:report test="false()">This rule never fires.</sch:report>
+              </constraint>
+            </constraintSpec>
             <!--
                 * The following <constraintSpec>s have an @ident that
                 * is of the form
diff --git a/P5/Test/expected-results/detest_odd_schematron.log b/P5/Test/expected-results/detest_odd_schematron.log
index af88460ba3..469da17168 100644
--- a/P5/Test/expected-results/detest_odd_schematron.log
+++ b/P5/Test/expected-results/detest_odd_schematron.log
@@ -1,11 +1,11 @@
-Buildfile: /TEI/P5/Test/antruntest.xml
+Buildfile: /Users/syd/Documents/TEI_gitHub/P5/Test/antruntest.xml
 
 validateodd:
      [echo] Validate detest.odd as ODD ...
      [echo]  ... against RelaxNG (../p5odds.rng) with jing ...
      [echo]  ... against Schematron (../p5odds.message.isosch.xsl) with Saaxon via trax
-     [xslt] Processing /TEI/P5/Test/detest.odd to /dev/null
-     [xslt] Loading stylesheet /TEI/P5/p5odds.message.isosch.xsl
+     [xslt] Processing /Users/syd/Documents/TEI_gitHub/P5/Test/detest.odd to /dev/null
+     [xslt] Loading stylesheet /Users/syd/Documents/TEI_gitHub/P5/p5odds.message.isosch.xsl
      [xslt] 
      [xslt]                   Error: both the versionDate and xml:lang attributes on "remarks" are required when it is a child of "elementSpec".
      [xslt]                  (@xml:lang and @versionDate)
@@ -25,8 +25,16 @@ validateodd:
      [xslt] In the context of tagset documentation, each ptr or ref element inside a listRef must have a target attribute with only 1 pointer as its value. (@target and not( matches( @target,'\s') ))
      [xslt] In the context of tagset documentation, each ptr or ref element inside a listRef must have a target attribute with only 1 pointer as its value. (@target and not( matches( @target,'\s') ))
      [xslt] Rules
-     [xslt]         in the ISO Schematron language must be inside a constraintSpec
-     [xslt]         with the value 'schematron' on the scheme attribute (tei:constraint/sch:* and not( @scheme eq 'schematron'))
+     [xslt]           in the ISO Schematron language must be inside a constraintSpec
+     [xslt]           with the value 'schematron' on the scheme attribute (tei:constraint/sch:* and not( @scheme eq 'schematron'))
+     [xslt] Rules
+     [xslt]           in the ISO Schematron language must be inside a constraintSpec
+     [xslt]           with the value 'schematron' on the scheme attribute (tei:constraint/sch:* and not( @scheme eq 'schematron'))
+     [xslt] Rules
+     [xslt]           in the ISO Schematron language must be inside a constraintSpec
+     [xslt]           with the value 'schematron' on the scheme attribute (tei:constraint/sch:* and not( @scheme eq 'schematron'))
+     [xslt] The @scheme attribute of &lt;constraintSpec&gt; is required when the @mode is not specified. (@scheme)
+     [xslt] The @scheme attribute of &lt;constraintSpec&gt; is required when the @mode is "replace". (@scheme)
      [xslt] Since the @default-is-in-list-req attribute is required, it will always be specified. Thus the default value (of "ONE") will never be used. Either change the definition of the attribute so it is not required ("rec" or "opt"), or remove the defaultVal element. (tei:defaultVal)
      [xslt] Since the @default-NOT-in-list-req attribute is required, it will always be specified. Thus the default value (of "ONE") will never be used. Either change the definition of the attribute so it is not required ("rec" or "opt"), or remove the defaultVal element. (tei:defaultVal)
      [xslt] In the elementSpec defining
@@ -43,4 +51,4 @@ validateodd:
      [xslt]         values (string(tei:defaultVal) = tei:valList/tei:valItem/@ident)
 
 BUILD SUCCESSFUL
-Total time: 2 seconds
+Total time: 3 seconds

From 333a45e87c5052d3539ffb8fe246827ac467b5ed Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Thu, 9 Nov 2023 15:51:45 -0500
Subject: [PATCH 2/2] Not that it matters, but @joeytakeda is right, should not
 have my name in the expected log file

---
 P5/Test/expected-results/detest_odd_schematron.log | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/P5/Test/expected-results/detest_odd_schematron.log b/P5/Test/expected-results/detest_odd_schematron.log
index 469da17168..e5813482e5 100644
--- a/P5/Test/expected-results/detest_odd_schematron.log
+++ b/P5/Test/expected-results/detest_odd_schematron.log
@@ -1,11 +1,11 @@
-Buildfile: /Users/syd/Documents/TEI_gitHub/P5/Test/antruntest.xml
+Buildfile: /TEI/P5/Test/antruntest.xml
 
 validateodd:
      [echo] Validate detest.odd as ODD ...
      [echo]  ... against RelaxNG (../p5odds.rng) with jing ...
      [echo]  ... against Schematron (../p5odds.message.isosch.xsl) with Saaxon via trax
-     [xslt] Processing /Users/syd/Documents/TEI_gitHub/P5/Test/detest.odd to /dev/null
-     [xslt] Loading stylesheet /Users/syd/Documents/TEI_gitHub/P5/p5odds.message.isosch.xsl
+     [xslt] Processing /TEI/P5/Test/detest.odd to /dev/null
+     [xslt] Loading stylesheet /TEI/P5/p5odds.message.isosch.xsl
      [xslt] 
      [xslt]                   Error: both the versionDate and xml:lang attributes on "remarks" are required when it is a child of "elementSpec".
      [xslt]                  (@xml:lang and @versionDate)