Merge pull request #2559 from TEIC/sydb_2497_p_in_epigraph_in_lg_is_OK

ebeshero · web-flow · commit 052a3400b20c · 2025-01-20T23:00:41.000-05:00
fix an abstract model violation msg
diff --git a/P5/Source/Specs/ab.xml b/P5/Source/Specs/ab.xml
@@ -28,12 +28,12 @@
   <content>
     <macroRef key="macro.abContent"/>
   </content>
-  <constraintSpec ident="abstractModel-structure-ab-in-l-or-lg" scheme="schematron" xml:lang="en">
+  <constraintSpec ident="abstractModel-structure-ab-in-l" scheme="schematron" xml:lang="en">
     <constraint>
-      <sch:rule context="tei:ab">
-        <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
-        </sch:report>
+      <sch:rule context="tei:l//tei:ab">
+        <sch:assert test="ancestor::tei:floatingText | parent::tei:figure | parent::tei:note">
+          Abstract model violation: Metrical lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
+        </sch:assert>
       </sch:rule>
     </constraint>
   </constraintSpec>
diff --git a/P5/Source/Specs/div.xml b/P5/Source/Specs/div.xml
@@ -65,12 +65,12 @@
       </sequence>
     </sequence>
   </content>
-  <constraintSpec ident="abstractModel-structure-div-in-l-or-lg" scheme="schematron" xml:lang="en">
+  <constraintSpec ident="abstractModel-structure-div-in-l" scheme="schematron" xml:lang="en">
     <constraint>
-      <sch:rule context="tei:div">
-        <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
-          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-        </sch:report>
+      <sch:rule context="tei:l//tei:div">
+        <sch:assert test="ancestor::tei:floatingText">
+          Abstract model violation: Metrical lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:assert>
       </sch:rule>
     </constraint>
   </constraintSpec>
diff --git a/P5/Source/Specs/p.xml b/P5/Source/Specs/p.xml
@@ -49,15 +49,12 @@
       </sch:rule>
     </constraint>
   </constraintSpec>
-  <constraintSpec ident="abstractModel-structure-p-in-l-or-lg" scheme="schematron" xml:lang="en">
+  <constraintSpec ident="abstractModel-structure-p-in-l" scheme="schematron" xml:lang="en">
     <constraint>
-      <sch:rule context="tei:p">
-        <sch:report test="( ancestor::tei:l  or  ancestor::tei:lg ) and
-                       not( ancestor::tei:floatingText
-                          | parent::tei:figure
-                          | parent::tei:note )">
-          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
-        </sch:report>
+      <sch:rule context="tei:l//tei:p">
+        <sch:assert test="ancestor::tei:floatingText | parent::tei:figure | parent::tei:note">
+          Abstract model violation: Metrical lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
+        </sch:assert>
       </sch:rule>
     </constraint>
   </constraintSpec>
diff --git a/P5/Test/detest.odd b/P5/Test/detest.odd
@@ -464,14 +464,14 @@
               <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>
+                <sch:report test="false()">This rule never fires, 01</sch:report>
               </constraint>
             </constraintSpec>
             <constraintSpec ident="replace_missing_scheme" mode="replace" xml:lang="en">
               <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>
+                <sch:report test="false()">This rule never fires, 02.</sch:report>
               </constraint>
             </constraintSpec>
             <constraintSpec ident="test_contextless_report" scheme="schematron" xml:lang="en">
@@ -480,7 +480,7 @@
               (i.e., does not have a <tag>sch:rule
               context="…"</tag>.)</desc>
               <constraint>
-                <sch:report test="false()">This rule never fires.</sch:report>
+                <sch:report test="false()">This rule never fires, 03.</sch:report>
               </constraint>
             </constraintSpec>
             <!--
diff --git a/P5/Test/detest.xml b/P5/Test/detest.xml
@@ -82,7 +82,7 @@
         <head>Testing schematron constraints</head>
 
         <p xml:lang="la">
-	  sicut erat in
+          sicut erat in
           <bibl><author>freddy</author></bibl> principia
           <list>
             <item>
@@ -91,14 +91,14 @@
               <num value="1/2"/> cats
             </item>
           </list>
-	</p>
+        </p>
 
-	<div>
+        <div>
           <p>Added by MDH. This tests the Schematron constraint that any
           element with <att>calendar</att> must have some textual
           content.</p>
           <p><date when="2012-09-06" calendar="http://en.wikipedia.org/wiki/Gregorian_calendar"/></p>
-	</div>
+        </div>
 
 	<div>
 	  <head generatedBy="human">For CMC</head>
@@ -130,7 +130,7 @@
 	  </div>
 	</div>
 
-	<div type="testingSpan">
+        <div type="testingSpan">
           <p><del>This has some content which is OK </del>
           <delSpan spanTo="#ds1"/>This one doesn't<anchor xml:id="ds1"/> but that's also OK.
           <delSpan/> That one (just to my left) is illegal
@@ -145,8 +145,8 @@
             <head>A Canon Text</head>
             <p>hello</p>
           </div>
-	</div>
-	<div type="canon">
+        </div>
+        <div type="canon">
           <head>Canon 2</head>
           <p>hello</p>
           <div type="canonText">
@@ -157,35 +157,35 @@
             <head>A 2nd Canon Text</head>
             <p>hello</p>
           </div>
-	</div>
-	<div type="canon">
+        </div>
+        <div type="canon">
           <head>Canon 3</head>
           <div type="canon">
             <head>Canon 4</head>
           </div>
-	</div>
-	<div type="register">
+        </div>
+        <div type="register">
           <head>Register 1</head>
           <div type="canon">
             <head>Canon 5</head>
           </div>
-	</div>
-	<div type="redundant">
+        </div>
+        <div type="redundant">
           <p>
             <s>This sentence contains
             <s>an illegally nested phrase</s>
             and should trigger a schematron squawk</s>
           </p>
-	</div>
+        </div>
       </div>
       <div type="test">
         <p>
-	  Testing multiple occurences of a datatype in a single
-	  attribute value. The following should be valid:
-	  <distinct type="valid" o01="0" o02="0" o0i="0" o11="0" o12="1" o1i="1" o22="1 2" o2i="1 2">minimum</distinct>
-	  <distinct type="valid" o01="1" o02="1" o0i="1" o11="1" o12="1 2" o1i="1 2" o22="1 2" o2i="1 2 3">min +1 unless ≤, in which case max</distinct> 
-	  <distinct type="valid" o01="1" o02="1 2" o0i="1 2 3 4 5 6 7 8 9 0" o11="1" o12="1 2" o1i="1 2 3 4 5 6 7 8 9 0" o22="1 2" o2i="1 2 3 4 5 6 7 8 9 0">max</distinct>
-	</p>
+          Testing multiple occurences of a datatype in a single
+          attribute value. The following should be valid:
+          <distinct type="valid" o01="0" o02="0" o0i="0" o11="0" o12="1" o1i="1" o22="1 2" o2i="1 2">minimum</distinct>
+          <distinct type="valid" o01="1" o02="1" o0i="1" o11="1" o12="1 2" o1i="1 2" o22="1 2" o2i="1 2 3">min +1 unless ≤, in which case max</distinct> 
+          <distinct type="valid" o01="1" o02="1 2" o0i="1 2 3 4 5 6 7 8 9 0" o11="1" o12="1 2" o1i="1 2 3 4 5 6 7 8 9 0" o22="1 2" o2i="1 2 3 4 5 6 7 8 9 0">max</distinct>
+        </p>
       </div>
 
       <div>
@@ -234,15 +234,15 @@
       <div>
         <head>Some transcribed text with subst errors</head>
         <p>... are all included. <del hand="#RG">It is</del>
-  	  <subst><add>T</add></subst>the expressed</p>
+          <subst><add>T</add></subst>the expressed</p>
         <p> that he and his Sister Miſs D —
-	<lb/>who always lived with him, wd. be very
-	<subst><lb/><add>principally</add></subst> remembered in her Will.</p>
+        <lb/>who always lived with him, wd. be very
+        <subst><lb/><add>principally</add></subst> remembered in her Will.</p>
         <p><subst>ἐπιτρέψῃ [ἐπετρέψῃ]</subst> τῷ ὑποδέκτῃ μὴ ὀχλῆσαι</p>
         <p>τ<subst><add place="above">ῶν</add></subst>α συνκυρόντων<subst><del>α</del></subst>
-	ἐργαστηρί<hi rend="above">ων</hi><subst><del>α</del></subst></p>
+        ἐργαστηρί<hi rend="above">ων</hi><subst><del>α</del></subst></p>
         <p>While <del xml:id="r112">pondering</del> thus <add xml:id="r113">she mus'd</add>,
-	her pinions fann'd<substJoin target="#r112 #r113"/></p>
+        her pinions fann'd<substJoin target="#r112 #r113"/></p>
       </div>
 
       <div>
@@ -278,45 +278,45 @@
       </div>
 
       <div xml:id="msDesc_unitary_parts">
-	<head>test msDesc elements that should not be repeated</head>
-	<p>Some manuscript description elements are supposed to occur
-	a max of only once, even though RelaxNG allows infinite.</p>
-	<p>Added 2023-10-11 19:21 by Syd.</p>
-	<msDesc>
-	  <msIdentifier>
-	    <repository>MEL</repository> <!-- Middle Earth Library -->
-	    <collection>BB</collection>	 <!-- Bilbo Baggins -->
-	    <idno>mel:bb:ve:08</idno>	 <!-- I just made the "08" up -->
-	    <msName>riddle of Strider</msName>
-	  </msIdentifier>
-	  <msContents n="1"><ab>occurs only once, thus valid</ab></msContents>
-	  <physDesc n="1"><ab>occurs twice, thus invalid</ab></physDesc>
-	  <physDesc n="2"><ab>occurs twice, thus invalid</ab></physDesc>
-	  <history n="1"><ab>three occurrences, thus invalid</ab></history>
-	  <history n="2"><ab>three occurrences, thus invalid</ab></history>
-	  <history n="3"><ab>three occurrences, thus invalid</ab></history>
-	  <additional n="1"><surrogates>four occurrences, thus invalid</surrogates></additional>
-	  <additional n="2"><surrogates>four occurrences, thus invalid</surrogates></additional>
-	  <additional n="3"><surrogates>four occurrences, thus invalid</surrogates></additional>
-	  <additional n="4"><surrogates>four occurrences, thus invalid</surrogates></additional>
-	</msDesc>
-	<p>The above <gi>msDesc</gi> should generate 3 errors, one
-	each for <gi>physDesc</gi>, <gi>history</gi>, and
-	<gi>additional</gi>.</p>
-	<lg>
-	  <lg>
-	    <l>All that is gold does not glitter,</l>
-	    <l>Not all those who wander are lost;</l>
-	    <l>The old that is strong does not wither,</l>
-	    <l>Deep roots are not reached by the frost.</l>
-	  </lg>
-	  <lg>
-	    <l>From the ashes a fire shall be woken,</l>
-	    <l>A light from the shadows shall spring;</l>
-	    <l>Renewed shall be blade that was broken,</l>
-	    <l>The crownless again shall be king.</l>
-	  </lg>
-	</lg>
+        <head>test msDesc elements that should not be repeated</head>
+        <p>Some manuscript description elements are supposed to occur
+        a max of only once, even though RelaxNG allows infinite.</p>
+        <p>Added 2023-10-11 19:21 by Syd.</p>
+        <msDesc>
+          <msIdentifier>
+            <repository>MEL</repository> <!-- Middle Earth Library -->
+            <collection>BB</collection>  <!-- Bilbo Baggins -->
+            <idno>mel:bb:ve:08</idno>    <!-- I just made the "08" up -->
+            <msName>riddle of Strider</msName>
+          </msIdentifier>
+          <msContents n="1"><ab>occurs only once, thus valid</ab></msContents>
+          <physDesc n="1"><ab>occurs twice, thus invalid</ab></physDesc>
+          <physDesc n="2"><ab>occurs twice, thus invalid</ab></physDesc>
+          <history n="1"><ab>three occurrences, thus invalid</ab></history>
+          <history n="2"><ab>three occurrences, thus invalid</ab></history>
+          <history n="3"><ab>three occurrences, thus invalid</ab></history>
+          <additional n="1"><surrogates>four occurrences, thus invalid</surrogates></additional>
+          <additional n="2"><surrogates>four occurrences, thus invalid</surrogates></additional>
+          <additional n="3"><surrogates>four occurrences, thus invalid</surrogates></additional>
+          <additional n="4"><surrogates>four occurrences, thus invalid</surrogates></additional>
+        </msDesc>
+        <p>The above <gi>msDesc</gi> should generate 3 errors, one
+        each for <gi>physDesc</gi>, <gi>history</gi>, and
+        <gi>additional</gi>.</p>
+        <lg>
+          <lg>
+            <l>All that is gold does not glitter,</l>
+            <l>Not all those who wander are lost;</l>
+            <l>The old that is strong does not wither,</l>
+            <l>Deep roots are not reached by the frost.</l>
+          </lg>
+          <lg>
+            <l>From the ashes a fire shall be woken,</l>
+            <l>A light from the shadows shall spring;</l>
+            <l>Renewed shall be blade that was broken,</l>
+            <l>The crownless again shall be king.</l>
+          </lg>
+        </lg>
       </div>
       <div>
         <head>Shift should have a new attribute</head>
@@ -401,14 +401,24 @@
         <p>Here is <floatingText><body><div><p>a little floating text</p></div></body></floatingText>.</p>
         <ab>Here is <floatingText><body><div><p>another little floating text</p></div></body></floatingText>.</ab>
         <lg>
+          <epigraph>
+            <quote>
+              <p>This paragraph should be valid.
+                The one around “find”, below, should be invalid.</p>
+            </quote>
+          </epigraph>
           <l>I think that I shall never see <note><ab>Sight of TEI elements is significant in this little poem.</ab></note></l>
           <l>A <floatingText><body><ab>floating text</ab></body></floatingText> inside this <figure><ab>tree</ab></figure>.</l>
           <l>Nor can it be <floatingText><body><p>that I shall know</p></body></floatingText></l>
           <l><figure><p>A paragraph</p></figure> <note><p>herein below</p></note>.</l>
-          <l>More likely maybe I could find</l>
+          <l>More likely maybe I could <quote><p>find</p></quote></l>
           <l><floatingText><body><div><p>A div</p></div></body></floatingText> stuck in this poem's lines.</l>
         </lg>
         <p>And here is the same poem again, inside a giant floatingText and coded a little differently.</p>
+	<p>The “find”, below, <emph>should</emph> be flagged as an
+	abstract model violation, IMHO, but is not because the
+	Schematron is fooled by the fact that it is within a
+	<gi>floatingText</gi>. Sigh. —Syd, 2024-05-18</p>
         <floatingText>
           <body>
             <lg>
@@ -417,7 +427,7 @@
               <l>A <floatingText><body><ab>floating text</ab></body></floatingText> inside this <figure><ab>tree</ab></figure>.</l>
               <l>Nor can it be that I shall know</l>
               <l><figure><p>A paragraph</p></figure> <note><p>herein below</p></note>.</l>
-              <l>More likely maybe I could find</l>
+              <l>More likely maybe I could <quote><p>find</p></quote></l>
               <l><floatingText><body><div><p>A div</p></div></body></floatingText> stuck in this poem's lines.</l>
             </lg>
           </body>
@@ -432,7 +442,7 @@
         <name type="file">detest.odd</name> because they would break
         the build there</desc>
         <elementSpec ident="silly_and_not_used" mode="add">
-	  <desc>See <code>//elementSpec[@ident eq 'abbr']/listRef</code> in <name type="file">detest.odd</name></desc>
+          <desc>See <code>//elementSpec[@ident eq 'abbr']/listRef</code> in <name type="file">detest.odd</name></desc>
           <listRef>
             <ref type="invalid" n="1">no target (2B caught by Schematron)</ref>
             <ref type="valid" n="2" target="https://www.example.edu/tst">good target absolute URI</ref>
diff --git a/P5/Test/expected-results/detest_xml_relaxng.log b/P5/Test/expected-results/detest_xml_relaxng.log
@@ -73,7 +73,7 @@ allowed:
 	element http://www.tei-c.org/ns/1.0^listRef
 	element http://www.tei-c.org/ns/1.0^relatedItem
 	element http://www.tei-c.org/ns/1.0^citedRange
-detest.xml:441:12: error: attribute ^target with invalid value ""
+detest.xml:451:12: error: attribute ^target with invalid value ""
 required:
 	data http://www.w3.org/2001/XMLSchema-datatypes^anyURI
 error: some documents are invalid
diff --git a/P5/Test/expected-results/detest_xml_schematron.log b/P5/Test/expected-results/detest_xml_schematron.log
@@ -38,3 +38,4 @@ In the context of tagset documentation, the listRef element must not self-nest.
 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') ))
 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') ))
  The @new attribute should always be supplied; use the special value "normal" to indicate that the feature concerned ceases to be remarkable at this point. (@new / warning)
+ Abstract model violation: Metrical lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. (ancestor::tei:floatingText | parent::tei:figure | parent::tei:note)
