@pretextbook/pretext-html 0.13.0 → 0.14.0

package/assets/upstream.json

@@ -3,5 +3,5 @@
     "repository": "PreTeXtBook/pretext",
     "ref": "master"
   },
-  "refreshed": "2026-08-20T14:22:45.334Z"
+  "refreshed": "2026-08-21T22:01:23.781Z"
 }

package/assets/xsl/pretext-assembly.xsl

@@ -482,13 +482,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:template match="node()|@*" mode="augment">
     <xsl:param name="parent-struct" select="''"/>
     <xsl:param name="level" select="0"/>
-    <xsl:param name="ordered-list-level" select="0"/>
 
     <xsl:copy>
         <xsl:apply-templates select="node()|@*" mode="augment">
             <xsl:with-param name="parent-struct" select="$parent-struct"/>
             <xsl:with-param name="level" select="$level"/>
-            <xsl:with-param name="ordered-list-level" select="$ordered-list-level"/>
         </xsl:apply-templates>
     </xsl:copy>
 </xsl:template>
@@ -3660,6 +3658,28 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- whole, and the deprecation warning says so plainly         -->
 <xsl:template match="references/conclusion" mode="repair"/>
 
+<!-- 2026-08-20  "ol" structuring an "exercise" is deprecated -->
+
+<!-- An "ol" as a child of an "exercise", or of its "statement",  -->
+<!-- once lettered its items like exercise parts.  The list is    -->
+<!-- wrapped in a "p" here, like any other list in running prose. -->
+<!-- Within the divisions that historically lettered these lists, -->
+<!-- a stamp preserves the extra list level for existing sources; -->
+<!-- new sources letter a list with marker="(a)", or structure    -->
+<!-- real parts with "task".  The deprecation warning says so.    -->
+<xsl:template match="exercise/ol|exercise/statement/ol" mode="repair">
+    <p>
+        <xsl:copy>
+            <xsl:if test="ancestor::exercises or ancestor::reading-questions or ancestor::worksheet or ancestor::handout">
+                <xsl:attribute name="pi:legacy-parts">
+                    <xsl:text>yes</xsl:text>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:apply-templates select="node()|@*" mode="repair"/>
+        </xsl:copy>
+    </p>
+</xsl:template>
+
 <!-- ########## -->
 <!-- Enrichment -->
 <!-- ########## -->
@@ -4034,7 +4054,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:template match="part|chapter|appendix|section|subsection|subsubsection|exercises|solutions|reading-questions|references|glossary|worksheet|handout" mode="augment">
     <xsl:param name="parent-struct"/>
     <xsl:param name="level"/>
-    <xsl:param name="ordered-list-level" />
 
     <xsl:variable name="the-serial">
         <xsl:apply-templates select="." mode="division-serial-number"/>
@@ -4084,16 +4103,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         </xsl:choose>
     </xsl:variable>
     <xsl:variable name="next-level" select="$level + 1"/>
-    <xsl:variable name="next-ordered-list-level">
-        <xsl:choose>
-            <xsl:when test="self::exercises or self::worksheet or self::handout or self::reading-questions or self::references">
-                <xsl:number value="1" />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:number value="0" />
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
     <xsl:copy>
         <xsl:attribute name="pi:struct">
             <xsl:value-of select="$parent-struct"/>
@@ -4114,7 +4123,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:apply-templates select="node()|@*" mode="augment">
             <xsl:with-param name="parent-struct" select="$new-struct"/>
             <xsl:with-param name="level" select="$next-level"/>
-            <xsl:with-param name="ordered-list-level" select="$next-ordered-list-level"/>
         </xsl:apply-templates>
     </xsl:copy>
 </xsl:template>
@@ -4130,7 +4138,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:apply-templates select="node()|@*" mode="augment">
             <xsl:with-param name="parent-struct" select="''"/>
             <xsl:with-param name="level" select="0"/>
-            <xsl:with-param name="ordered-list-level" select="0"/>
         </xsl:apply-templates>
     </xsl:copy>
 </xsl:template>
@@ -4201,7 +4208,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:when test="$level='2'">i</xsl:when>
                 <xsl:when test="$level='3'">A</xsl:when>
                 <xsl:otherwise>
-                    <xsl:message>PTX:ERROR: ordered list is more than 4 levels deep (at level <xsl:value-of select="$level" />) or is inside an "exercise" and is more than 3 levels deep  (at level <xsl:value-of select="$level - 1" />)</xsl:message>
+                    <xsl:message>PTX:ERROR: ordered list is more than 4 levels deep (at level <xsl:value-of select="$level" />; a legacy exercise-parts list counts one level extra)</xsl:message>
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:otherwise>
@@ -4209,8 +4216,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <xsl:template match="ol" mode="augment">
-    <xsl:param name="ordered-list-level"/>
-    <xsl:variable name="next-level" select="$ordered-list-level + 1" />
+    <!-- The list level is intrinsic: a count of enclosing ordered   -->
+    <!-- lists, raised by one within a list the repair phase stamped -->
+    <!-- as a legacy exercise-parts list (the stamp lifts the whole  -->
+    <!-- nest, so sublists letter as they always have).              -->
+    <xsl:variable name="ordered-list-level" select="count(ancestor::ol) + number(boolean(ancestor-or-self::ol[@pi:legacy-parts]))"/>
     <xsl:variable name="format-code">
         <xsl:apply-templates select="." mode="format-code">
             <xsl:with-param name="level" select="$ordered-list-level"/>
@@ -4256,9 +4266,62 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:attribute name="pi:marker-suffix">
             <xsl:value-of select="$marker-suffix"/>
         </xsl:attribute>
-        <xsl:apply-templates select="node()|@*" mode="augment">
-            <xsl:with-param name="ordered-list-level" select="$next-level"/>
+        <xsl:apply-templates select="node()|@*" mode="augment"/>
+    </xsl:copy>
+</xsl:template>
+
+<!-- The stamp has served its purpose once the level is recorded, -->
+<!-- so it does not survive into the assembled tree.              -->
+<xsl:template match="@pi:legacy-parts" mode="augment"/>
+
+<!-- List levels and format codes are ancestor-axis computations    -->
+<!-- that *could* be made at conversion time in -common; we simply  -->
+<!-- choose to make them once, here in assembly, and stamp the      -->
+<!-- results.  Unordered lists follow the pattern of ordered lists  -->
+<!-- above: an authored @marker wins, else defaults cycle by depth. -->
+
+<!-- Labels of unordered lists have format codes:   -->
+<!-- disc, circle, square, or none.  Default order: -->
+<!-- disc, circle, square, disc.                    -->
+<xsl:template match="ul" mode="format-code">
+    <xsl:param name="level"/>
+    <xsl:choose>
+        <xsl:when test="@marker">
+            <xsl:choose>
+                <xsl:when test="@marker='disc'">disc</xsl:when>
+                <xsl:when test="@marker='circle'">circle</xsl:when>
+                <xsl:when test="@marker='square'">square</xsl:when>
+                <xsl:when test="@marker=''">none</xsl:when>
+                <xsl:otherwise>
+                    <xsl:message>PTX:ERROR: unordered list label (<xsl:value-of select="@marker" />) not recognized</xsl:message>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:choose>
+                <xsl:when test="$level='0'">disc</xsl:when>
+                <xsl:when test="$level='1'">circle</xsl:when>
+                <xsl:when test="$level='2'">square</xsl:when>
+                <xsl:when test="$level='3'">disc</xsl:when>
+                <xsl:otherwise>
+                    <xsl:message>PTX:ERROR: unordered list is more than 4 levels deep (at level <xsl:value-of select="$level" />)</xsl:message>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="ul" mode="augment">
+    <xsl:variable name="format-code">
+        <xsl:apply-templates select="." mode="format-code">
+            <xsl:with-param name="level" select="count(ancestor::ul)"/>
         </xsl:apply-templates>
+    </xsl:variable>
+    <xsl:copy>
+        <xsl:attribute name="pi:format-code">
+            <xsl:value-of select="$format-code"/>
+        </xsl:attribute>
+        <xsl:apply-templates select="node()|@*" mode="augment"/>
     </xsl:copy>
 </xsl:template>
 

package/assets/xsl/pretext-braille-preprint.xsl

@@ -1209,9 +1209,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <xsl:template match="ul/li" mode="unicode-list-marker">
-    <xsl:variable name="format-code">
-        <xsl:apply-templates select="parent::ul" mode="format-code"/>
-    </xsl:variable>
+    <xsl:variable name="format-code" select="parent::ul/@pi:format-code"/>
     <!-- The list label.  The file  en-ueb-chardefs.uti        -->
     <!-- associates these Unicode values with the indicated    -->
     <!-- dot patterns.  This jibes with [BANA-2016, 8.6.2],    -->

package/assets/xsl/pretext-common.xsl

@@ -5122,61 +5122,6 @@ Book (with parts), "section" at level 3
 <!-- Utility templates to determine the depth      -->
 <!-- of a list, relative to nesting in other lists -->
 
-<!-- We determine the depth of an unordered     -->
-<!-- list, relative only to other unordered     -->
-<!-- lists in a nesting, so as to determine     -->
-<!-- the right label to apply, esp. as defaults -->
-<!-- The recursive template should be called    -->
-<!-- without a level, since it defaults to zero -->
-<xsl:template match="ul" mode="unordered-list-level">
-    <!-- Start with level zero, and increment on successive calls -->
-    <xsl:param name="level" select="0"/>
-    <xsl:choose>
-        <!-- Another unordered list above, add one and recurse -->
-        <xsl:when test="ancestor::ul">
-            <xsl:apply-templates select="ancestor::ul[1]" mode="unordered-list-level">
-                <xsl:with-param name="level" select="$level + 1" />
-            </xsl:apply-templates>
-        </xsl:when>
-        <!-- No unordered list above, done, so return level -->
-        <xsl:otherwise>
-            <xsl:value-of select="$level" />
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- Ordered lists follow the same strategy,           -->
-<!-- except we implement exercises and references      -->
-<!-- elements as ordered lists, so we need to absorb   -->
-<!-- them into the general treatment of nested lists   -->
-<!-- They do only occur as top-level elements, so that -->
-<!-- assumption allows for some economy                -->
-<xsl:template match="ol" mode="ordered-list-level">
-    <xsl:param name="level" select="0"/>
-    <xsl:choose>
-        <!-- Since exercises divisions and references are top-level -->
-        <!-- ordered lists, when these are the only interesting     -->
-        <!-- ancestor, we add one to the level and return           -->
-        <xsl:when test="(ancestor::exercises or ancestor::worksheet or ancestor::handout or ancestor::reading-questions or ancestor::references) and not(ancestor::ol)">
-            <xsl:value-of select="$level + 1" />
-        </xsl:when>
-        <xsl:when test="ancestor::ol">
-            <xsl:apply-templates select="ancestor::ol[1]" mode="ordered-list-level">
-                <xsl:with-param name="level" select="$level + 1" />
-            </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$level" />
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- Exercises and References are        -->
-<!-- specialized top-level ordered lists -->
-<xsl:template match="exercises|worksheet|handout|reading-questions|references" mode="ordered-list-level">
-    <xsl:value-of select="0" />
-</xsl:template>
-
 <!-- To indent properly in markdown, we  -->
 <!-- need to count every type of list    -->
 <xsl:template match="*" mode="list-level">
@@ -5205,41 +5150,6 @@ Book (with parts), "section" at level 3
     </xsl:choose>
 </xsl:template>
 
-<!-- Labels of unordered list have formatting codes, which -->
-<!-- we detect here and pass on to other more specialized  -->
-<!-- templates for implementation specifics                -->
-<!-- disc, circle, square or blank are the options         -->
-<!-- Default order: disc, circle, square, disc             -->
-<xsl:template match="ul" mode="format-code">
-    <xsl:choose>
-        <xsl:when test="@marker">
-            <xsl:choose>
-                <xsl:when test="@marker='disc'">disc</xsl:when>
-                <xsl:when test="@marker='circle'">circle</xsl:when>
-                <xsl:when test="@marker='square'">square</xsl:when>
-                <xsl:when test="@marker=''">none</xsl:when>
-                <xsl:otherwise>
-                    <xsl:message>PTX:ERROR: unordered list label (<xsl:value-of select="@marker" />) not recognized</xsl:message>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:variable name="level">
-                <xsl:apply-templates select="." mode="unordered-list-level" />
-            </xsl:variable>
-            <xsl:choose>
-                <xsl:when test="$level='0'">disc</xsl:when>
-                <xsl:when test="$level='1'">circle</xsl:when>
-                <xsl:when test="$level='2'">square</xsl:when>
-                <xsl:when test="$level='3'">disc</xsl:when>
-                <xsl:otherwise>
-                    <xsl:message>PTX:ERROR: unordered list is more than 4 levels deep (at level <xsl:value-of select="$level" />)</xsl:message>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
 <!-- CSS class for multi-column lists.  Context is an element with -->
 <!-- a potential "cols" attribute.  Return value is "colsN" with   -->
 <!-- 2 <= N <= 6, or empty when @cols is absent.                   -->
@@ -12030,6 +11940,20 @@ http://andrewmccarthy.ie/2014/11/06/swung-dash-in-latex/
         <xsl:with-param name="message" select="'a &quot;references&quot; division no longer has a &quot;conclusion&quot;.  The element is discarded entirely: its content will not appear in any output.  Please relocate the content, perhaps following the &quot;references&quot;'"/>
     </xsl:call-template>
     <!--  -->
+    <!-- 2026-08-20  "ol" as a child of "exercise" is obsolete -->
+    <xsl:call-template name="deprecation-message">
+        <xsl:with-param name="occurrences" select="&quot;$document-root//exercise/ol&quot;" />
+        <xsl:with-param name="date-string" select="'2026-08-20'" />
+        <xsl:with-param name="message" select="'an &quot;ol&quot; is no longer a child of an &quot;exercise&quot;; a list belongs inside a &quot;p&quot;.  We will wrap it for you, and lettered exercise parts will letter as before.  Please convert: structure true parts with &quot;task&quot;, letter a plain list with marker=&quot;(a)&quot;, or consider an &quot;exercisegroup&quot; and its cols attribute for a compact multi-column layout'"/>
+    </xsl:call-template>
+    <!--  -->
+    <!-- 2026-08-20  "ol" as a child of an exercise "statement" is obsolete -->
+    <xsl:call-template name="deprecation-message">
+        <xsl:with-param name="occurrences" select="&quot;$document-root//exercise/statement/ol&quot;" />
+        <xsl:with-param name="date-string" select="'2026-08-20'" />
+        <xsl:with-param name="message" select="'an &quot;ol&quot; is no longer a child of an &quot;exercise&quot; &quot;statement&quot;; a list belongs inside a &quot;p&quot;.  We will wrap it for you, and lettered exercise parts will letter as before.  Please convert: structure true parts with &quot;task&quot;, letter a plain list with marker=&quot;(a)&quot;, or consider an &quot;exercisegroup&quot; and its cols attribute for a compact multi-column layout'"/>
+    </xsl:call-template>
+    <!--  -->
 </xsl:template>
 
 <!-- Miscellaneous -->

package/assets/xsl/pretext-fo.xsl

@@ -2046,13 +2046,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:value-of select="parent::ol/@pi:marker-suffix"/>
 </xsl:template>
 
-<!-- Bullets via the "format-code" machinery of pretext-common.xsl, -->
-<!-- which cycles disc, circle, square by level, and honors an      -->
-<!-- authored @marker (the empty @marker giving no bullet at all).  -->
+<!-- Bullets via the format code stamped during assembly, which    -->
+<!-- cycles disc, circle, square by level, and honors an authored  -->
+<!-- @marker (the empty @marker giving no bullet at all).          -->
 <xsl:template match="ul/li" mode="list-label">
-    <xsl:variable name="format-code">
-        <xsl:apply-templates select="parent::ul" mode="format-code"/>
-    </xsl:variable>
+    <xsl:variable name="format-code" select="parent::ul/@pi:format-code"/>
     <xsl:choose>
         <xsl:when test="$format-code = 'disc'">
             <xsl:text>&#x2022;</xsl:text>

package/assets/xsl/pretext-html.xsl

@@ -6169,14 +6169,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Utility templates to translate PTX              -->
 <!-- enumeration style to HTML list-style-type       -->
 <xsl:template match="ol|ol-marker" mode="html-list-class">
-    <xsl:variable name="mbx-format-code" select="./@pi:format-code" />
+    <xsl:variable name="ptx-format-code" select="./@pi:format-code" />
     <xsl:choose>
-        <xsl:when test="$mbx-format-code = '0'">decimal</xsl:when>
-        <xsl:when test="$mbx-format-code = '1'">decimal</xsl:when>
-        <xsl:when test="$mbx-format-code = 'a'">lower-alpha</xsl:when>
-        <xsl:when test="$mbx-format-code = 'A'">upper-alpha</xsl:when>
-        <xsl:when test="$mbx-format-code = 'i'">lower-roman</xsl:when>
-        <xsl:when test="$mbx-format-code = 'I'">upper-roman</xsl:when>
+        <xsl:when test="$ptx-format-code = '0'">decimal</xsl:when>
+        <xsl:when test="$ptx-format-code = '1'">decimal</xsl:when>
+        <xsl:when test="$ptx-format-code = 'a'">lower-alpha</xsl:when>
+        <xsl:when test="$ptx-format-code = 'A'">upper-alpha</xsl:when>
+        <xsl:when test="$ptx-format-code = 'i'">lower-roman</xsl:when>
+        <xsl:when test="$ptx-format-code = 'I'">upper-roman</xsl:when>
         <xsl:otherwise>
             <xsl:message>PTX:BUG: bad ordered list label format code in HTML conversion</xsl:message>
         </xsl:otherwise>
@@ -6184,14 +6184,12 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <xsl:template match="ul" mode="html-list-class">
-    <xsl:variable name="mbx-format-code">
-        <xsl:apply-templates select="." mode="format-code" />
-    </xsl:variable>
+    <xsl:variable name="ptx-format-code" select="./@pi:format-code"/>
     <xsl:choose>
-        <xsl:when test="$mbx-format-code = 'disc'">disc</xsl:when>
-        <xsl:when test="$mbx-format-code = 'circle'">circle</xsl:when>
-        <xsl:when test="$mbx-format-code = 'square'">square</xsl:when>
-        <xsl:when test="$mbx-format-code = 'none'">no-marker</xsl:when>
+        <xsl:when test="$ptx-format-code = 'disc'">disc</xsl:when>
+        <xsl:when test="$ptx-format-code = 'circle'">circle</xsl:when>
+        <xsl:when test="$ptx-format-code = 'square'">square</xsl:when>
+        <xsl:when test="$ptx-format-code = 'none'">no-marker</xsl:when>
         <xsl:otherwise>
             <xsl:message>PTX:BUG: bad unordered list label format code in HTML conversion</xsl:message>
         </xsl:otherwise>
@@ -6205,18 +6203,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:template match="ol|ul">
     <xsl:param name="b-original" select="true()" />
     <xsl:param name="heading-level"/>
-    <!-- need to switch on 0-1 for ol Arabic -->
-    <!-- no harm if called on "ul"           -->
-    <xsl:variable name="mbx-format-code">
-        <xsl:choose>
-            <xsl:when test="self::ol">
-                <xsl:value-of select="./@pi:format-code" />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:apply-templates select="." mode="format-code" />
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
+    <xsl:variable name="ptx-format-code" select="./@pi:format-code"/>
     <!-- newline inserted to encourage formatted output -->
     <xsl:text>&#xa;</xsl:text>
     <xsl:element name="{local-name(.)}">
@@ -6241,7 +6228,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:attribute name="id">
             <xsl:apply-templates select="." mode="html-id" />
         </xsl:attribute>
-        <xsl:if test="$mbx-format-code = '0'">
+        <xsl:if test="$ptx-format-code = '0'">
             <xsl:attribute name="start">
                 <xsl:text>0</xsl:text>
             </xsl:attribute>

package/assets/xsl/pretext-latex-common.xsl

@@ -5733,9 +5733,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <xsl:template match="ul" mode="latex-list-label">
-    <xsl:variable name="format-code">
-        <xsl:apply-templates select="." mode="format-code" />
-    </xsl:variable>
+    <xsl:variable name="format-code" select="./@pi:format-code"/>
    <xsl:choose>
         <xsl:when test="$format-code = 'disc'">\ptxlistdisc</xsl:when>
         <xsl:when test="$format-code = 'circle'">\ptxlistcircle</xsl:when>
@@ -5748,26 +5746,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 
-<!-- Utility template to translate unordered    -->
-<!-- list level to HTML list-style-type         -->
-<!-- This is similar to Firefox default choices -->
-<!-- but different in the fourth slot           -->
-<!-- disc, circle, square, disc                 -->
-<xsl:template match="*" mode="latex-unordered-list-label-default">
-    <xsl:variable name="level">
-        <xsl:apply-templates select="." mode="unordered-list-level" />
-    </xsl:variable>
-    <xsl:choose>
-        <xsl:when test="$level='0'">\ptxlistdisc</xsl:when>
-        <xsl:when test="$level='1'">\ptxlistcircle</xsl:when>
-        <xsl:when test="$level='2'">\ptxlistsquare</xsl:when>
-        <xsl:when test="$level='3'">\ptxlistdisc</xsl:when>
-        <xsl:otherwise>
-            <xsl:message>PTX:ERROR: unordered list is more than 4 levels deep</xsl:message>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
 <!-- Lists themselves -->
 <!-- If columns are specified, we        -->
 <!-- wrap in the multicolumn environment -->