A proposed fix for

#773. I am quite confident it fixes the problem identified
in that issue, but does it break anything else?

Author: sydb

Test2/expected-results/testPure1.rng

@@ -5802,20 +5802,17 @@ Elements]</a:documentation>
                   </optional>
                </optional>
             </group>
-            <group>
-               <optional>
-                  <ref name="t_publisher"/>
-               </optional>
-               <optional>
-                  <ref name="t_publisher"/>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_publisher"/>
                   <optional>
-                     <ref name="t_publisher"/>
+                     <rng:ref name="t_publisher"/>
                      <optional>
-                        <ref name="t_publisher"/>
+                        <rng:ref name="t_publisher"/>
                      </optional>
                   </optional>
-               </optional>
-            </group>
+               </rng:group>
+            </rng:optional>
             <optional>
                <ref name="t_date"/>
             </optional>

Test2/expected-results/testPure1InvalidInstanceRngMessages.txt

@@ -7,22 +7,23 @@
 /invalidInstances/testPure1InvalidInstance.xml:78:47: error: value of attribute "copyOf" is invalid; must be an integer matching the regular expression "[0-9][0-9]?"
 /invalidInstances/testPure1InvalidInstance.xml:90:20: error: element "title" not allowed yet; missing required element "author"
 /invalidInstances/testPure1InvalidInstance.xml:97:24: error: element "publisher" not allowed yet; missing required element "title"
-/invalidInstances/testPure1InvalidInstance.xml:110:31: error: element "publisher" not allowed here; expected the element end-tag or element "date"
-/invalidInstances/testPure1InvalidInstance.xml:113:23: error: element "biblStruct" not allowed anywhere; expected the element end-tag or element "anchor", "bibl", "biblFull", "cb", "gb", "lb", "listBibl", "milestone" or "pb"
-/invalidInstances/testPure1InvalidInstance.xml:115:60: error: element "biblStruct" not allowed anywhere; expected the element end-tag or element "anchor", "bibl", "biblFull", "cb", "gb", "lb", "listBibl", "milestone" or "pb"
-/invalidInstances/testPure1InvalidInstance.xml:117:34: error: element "biblStruct" not allowed anywhere; expected the element end-tag or element "anchor", "bibl", "biblFull", "cb", "gb", "lb", "listBibl", "milestone" or "pb"
-/invalidInstances/testPure1InvalidInstance.xml:127:12: error: element "w" missing required attribute "ana"
-/invalidInstances/testPure1InvalidInstance.xml:137:53: error: element "addName" not allowed anywhere; expected the element end-tag, text or element "abbr", "add", "address", "alt", "altGrp", "anchor", "att", "binaryObject", "c", "cb", "choice", "cit", "cl", "corr", "date", "del", "distinct", "ellipsis", "email", "emph", "expan", "floatingText", "foreign", "gap", "gb", "gi", "gloss", "graphic", "hi", "idno", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "m", "measure", "measureGrp", "media", "mentioned", "milestone", "name", "note", "noteGrp", "num", "orgName", "orig", "pb", "pc", "persName", "phr", "placeName", "ptr", "q", "quote", "ref", "reg", "rs", "ruby", "s", "said", "seg", "sic", "soCalled", "span", "spanGrp", "term", "time", "timeline", "title", "unclear", "unit", "val" or "w"
-/invalidInstances/testPure1InvalidInstance.xml:141:13: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer"
-/invalidInstances/testPure1InvalidInstance.xml:142:46: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer"
-/invalidInstances/testPure1InvalidInstance.xml:143:45: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer"
-/invalidInstances/testPure1InvalidInstance.xml:148:73: error: character content of element "email" invalid; must be equal to "[email protected]" or "[email protected]"
-/invalidInstances/testPure1InvalidInstance.xml:154:30: error: element "reg" not allowed yet; expected element "abbr", "corr", "expan" or "orig"
-/invalidInstances/testPure1InvalidInstance.xml:154:46: error: element "orig" not allowed here; expected the element end-tag
-/invalidInstances/testPure1InvalidInstance.xml:161:19: error: element "alt_of_seq_3-4" incomplete; expected element "emph" or "orgName"
-/invalidInstances/testPure1InvalidInstance.xml:163:24: error: element "orgName" not allowed here; expected the element end-tag
-/invalidInstances/testPure1InvalidInstance.xml:168:19: error: element "alt_of_seq_3-4" incomplete; missing required element "emph"
+/invalidInstances/testPure1InvalidInstance.xml:107:31: error: element "publisher" not allowed here; expected the element end-tag or element "date"
+/invalidInstances/testPure1InvalidInstance.xml:109:31: error: element "publisher" not allowed here; expected the element end-tag or element "date"
+/invalidInstances/testPure1InvalidInstance.xml:112:23: error: element "biblStruct" not allowed anywhere; expected the element end-tag or element "anchor", "bibl", "biblFull", "cb", "gb", "lb", "listBibl", "milestone" or "pb"
+/invalidInstances/testPure1InvalidInstance.xml:114:60: error: element "biblStruct" not allowed anywhere; expected the element end-tag or element "anchor", "bibl", "biblFull", "cb", "gb", "lb", "listBibl", "milestone" or "pb"
+/invalidInstances/testPure1InvalidInstance.xml:116:34: error: element "biblStruct" not allowed anywhere; expected the element end-tag or element "anchor", "bibl", "biblFull", "cb", "gb", "lb", "listBibl", "milestone" or "pb"
+/invalidInstances/testPure1InvalidInstance.xml:126:12: error: element "w" missing required attribute "ana"
+/invalidInstances/testPure1InvalidInstance.xml:136:53: error: element "addName" not allowed anywhere; expected the element end-tag, text or element "abbr", "add", "address", "alt", "altGrp", "anchor", "att", "binaryObject", "c", "cb", "choice", "cit", "cl", "corr", "date", "del", "distinct", "ellipsis", "email", "emph", "expan", "floatingText", "foreign", "gap", "gb", "gi", "gloss", "graphic", "hi", "idno", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "m", "measure", "measureGrp", "media", "mentioned", "milestone", "name", "note", "noteGrp", "num", "orgName", "orig", "pb", "pc", "persName", "phr", "placeName", "ptr", "q", "quote", "ref", "reg", "rs", "ruby", "s", "said", "seg", "sic", "soCalled", "span", "spanGrp", "term", "time", "timeline", "title", "unclear", "unit", "val" or "w"
+/invalidInstances/testPure1InvalidInstance.xml:140:13: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer"
+/invalidInstances/testPure1InvalidInstance.xml:141:46: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer"
+/invalidInstances/testPure1InvalidInstance.xml:142:45: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer"
+/invalidInstances/testPure1InvalidInstance.xml:147:73: error: character content of element "email" invalid; must be equal to "[email protected]" or "[email protected]"
+/invalidInstances/testPure1InvalidInstance.xml:153:30: error: element "reg" not allowed yet; expected element "abbr", "corr", "expan" or "orig"
+/invalidInstances/testPure1InvalidInstance.xml:153:46: error: element "orig" not allowed here; expected the element end-tag
+/invalidInstances/testPure1InvalidInstance.xml:160:19: error: element "alt_of_seq_3-4" incomplete; expected element "emph" or "orgName"
+/invalidInstances/testPure1InvalidInstance.xml:162:24: error: element "orgName" not allowed here; expected the element end-tag
+/invalidInstances/testPure1InvalidInstance.xml:167:19: error: element "alt_of_seq_3-4" incomplete; missing required element "emph"
+/invalidInstances/testPure1InvalidInstance.xml:173:11: error: element "emph" not allowed here; expected the element end-tag
+/invalidInstances/testPure1InvalidInstance.xml:173:16: error: element "lb" not allowed here; expected the element end-tag
 /invalidInstances/testPure1InvalidInstance.xml:174:11: error: element "emph" not allowed here; expected the element end-tag
 /invalidInstances/testPure1InvalidInstance.xml:174:16: error: element "lb" not allowed here; expected the element end-tag
-/invalidInstances/testPure1InvalidInstance.xml:175:11: error: element "emph" not allowed here; expected the element end-tag
-/invalidInstances/testPure1InvalidInstance.xml:175:16: error: element "lb" not allowed here; expected the element end-tag

Test2/inputFiles/invalidInstances/testPure1InvalidInstance.xml

@@ -106,7 +106,6 @@
             <publisher n="3"/>
             <publisher n="4"/>
             <!-- That should be enough to make it fail, as 3 is the max -->
-            <!-- But it doesn't work right. See #354. -->
             <publisher n="5"/>
             <date when="2019-01-06"/>
           </bibl>

debian-tei-xsl/debian/changelog

@@ -1,3 +1,9 @@
+tei-xsl (7.60.0a) natty; urgency=low
+
+  * new release from upstream
+
+ -- TEI                               <[email protected]>  Thu, 04 Sep 2025 22:20:25 -0400
+
 tei-xsl (7.59.0) natty; urgency=low
 
   * new release from upstream

odds/teiodds.xsl

@@ -2243,11 +2243,7 @@ of this software, even if advised of the possibility of such damage.
         <xsl:variable name="count" select="$max - $min"/>
         <rng:group>
           <xsl:choose>
-            <xsl:when test="$min eq 0">
-              <rng:optional>
-                <xsl:copy-of select="$c"/>
-              </rng:optional>
-            </xsl:when>
+            <xsl:when test="$min eq 0"/>
             <xsl:otherwise>
               <xsl:for-each select="1 to min( ( $min, $maxint ) )">
                 <xsl:copy-of select="$c"/>