@pretextbook/pretext-html 0.13.0 → 0.15.0

package/assets/upstream.json

@@ -3,5 +3,5 @@
     "repository": "PreTeXtBook/pretext",
     "ref": "master"
   },
-  "refreshed": "2026-08-20T14:22:45.334Z"
+  "refreshed": "2026-08-31T02:38:18.809Z"
 }

package/assets/xsl/extract-interactive.xsl

@@ -50,6 +50,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- available for extraction.                                           -->
 <xsl:variable name="exercise-style" select="'dynamic'"/>
 
+<!-- A second Catch-22, of the same shape.  A publisher may hold GeoGebra   -->
+<!-- applets behind a play button, but then this pass would photograph the  -->
+<!-- button rather than the applet, and the resulting image is what stands  -->
+<!-- in for the applet in static output.  Worse, that image is exactly what -->
+<!-- would be wanted to fill the empty preview a play button leaves for an  -->
+<!-- applet GeoGebra does not host.  So the election is overridden here.    -->
+<xsl:variable name="b-geogebra-play-button" select="false()"/>
+
 <!-- @preview indicates custom image is present    -->
 <!-- Stylesheet output is text, with "unique-id"   -->
 <!-- of each interactive, one per line, to be      -->

package/assets/xsl/extract-pg.xsl

@@ -723,35 +723,6 @@
     <xsl:call-template name="begin-block">
         <xsl:with-param name="block-title">Header</xsl:with-param>
     </xsl:call-template>
-    <xsl:if test="not($b-human-readable)">
-        <!-- see select-latex-macros template -->
-        <xsl:variable name="macros">
-            <xsl:call-template name="select-latex-macros"/>
-        </xsl:variable>
-        <xsl:if test="$macros != ''">
-            <xsl:variable name="wrapped-macros">
-                <xsl:text>&lt;div style="display:none;">\(</xsl:text>
-                <xsl:value-of select="$macros" />
-                <xsl:text>\)&lt;/div></xsl:text>
-            </xsl:variable>
-            <xsl:variable name="delimiter">
-                <xsl:call-template name="find-unused-character">
-                    <xsl:with-param name="string" select="$wrapped-macros"/>
-                    <!-- https://stackoverflow.com/questions/43617820/what-are-the-legal-delimiters-for-perl-5s-pick-your-own-quotes-operators    -->
-                    <!-- NB: don't use (), <>, [], {}, because as perl delimiters, closer must be the right version; too complicated to check for -->
-                    <xsl:with-param name="charset" select="concat($apos,'|/?.,+-_~`!@$%^&amp;*')"/>
-                </xsl:call-template>
-            </xsl:variable>
-            <xsl:text>TEXT(MODES(PTX=&gt;'',HTML=&gt;</xsl:text>
-            <xsl:if test="$delimiter != $apos">
-                <xsl:text>q</xsl:text>
-            </xsl:if>
-            <xsl:value-of select="$delimiter"/>
-            <xsl:value-of select="$wrapped-macros"/>
-            <xsl:value-of select="$delimiter"/>
-            <xsl:text>));&#xa;</xsl:text>
-        </xsl:if>
-    </xsl:if>
     <xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
@@ -1034,9 +1005,7 @@
         <xsl:value-of select="$standard-macros" />
         <xsl:value-of select="$implied-macros" />
         <xsl:value-of select="$user-macros" />
-        <xsl:if test=".//latex-image or ancestor::exercisegroup/introduction//latex-image">
-            <xsl:value-of select="$ptx-pg-macros" />
-        </xsl:if>
+        <xsl:value-of select="$ptx-pg-macros" />
         <xsl:value-of select="$course-macros" />
         <xsl:text>);</xsl:text>
         <xsl:text>&#xa;</xsl:text>
@@ -1361,40 +1330,6 @@
     <xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
-<!-- Inside math we need to print definitions for PTX author-defined      -->
-<!-- LaTeX macros to support WeBWorK's images display mode.               -->
-
-<!-- TODO: This named template examines the current context (see '.' in   -->
-<!-- contains() below), so should be a match template. But its recursive  -->
-<!-- implementation makes it a named template for now.                    -->
-<xsl:template name="select-latex-macros">
-    <xsl:param name="macros" select="$latex-macros" />
-    <xsl:variable name="trimmed-start">
-        <xsl:if test="contains($macros, '\newcommand{')">
-            <xsl:value-of select="substring-after($macros, '\newcommand{')"/>
-        </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="macro-name">
-        <xsl:if test="contains($trimmed-start, '}')">
-            <xsl:value-of select="substring-before($trimmed-start, '}')"/>
-        </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="macro-command">
-        <xsl:value-of select="substring-before($macros, '&#xa;')"/>
-    </xsl:variable>
-    <xsl:variable name="next-lines">
-        <xsl:value-of select="substring-after($macros, '&#xa;')"/>
-    </xsl:variable>
-    <xsl:if test="contains(., $macro-name)">
-        <xsl:value-of select="normalize-space($macro-command)"/>
-    </xsl:if>
-    <xsl:if test="not($next-lines = '')">
-        <xsl:call-template name="select-latex-macros">
-            <xsl:with-param name="macros" select="$next-lines"/>
-        </xsl:call-template>
-    </xsl:if>
-</xsl:template>
-
 <!-- ##################################################################### -->
 <!-- ##################################################################### -->
 <!-- Above: templates for elements that only ever apply within a webwork   -->
@@ -1490,9 +1425,6 @@
 <xsl:template match="m">
     <xsl:param name="b-human-readable" />
     <xsl:text>[`</xsl:text>
-    <xsl:if test="$b-human-readable">
-        <xsl:call-template name="select-latex-macros"/>
-    </xsl:if>
     <xsl:apply-templates select="text()|var" />
     <!-- look ahead to absorb immediate clause-ending punctuation -->
     <xsl:apply-templates select="." mode="get-clause-punctuation" />
@@ -1507,9 +1439,6 @@
         <xsl:call-template name="potential-list-indent" />
     </xsl:if>
     <xsl:text>[```</xsl:text>
-    <xsl:if test="$b-human-readable">
-        <xsl:call-template name="select-latex-macros"/>
-    </xsl:if>
     <!-- only a single mrow as a child (transition from old "me") -->
     <xsl:apply-templates select="mrow/text()|mrow/var" />
     <!-- look ahead to absorb immediate clause-ending punctuation -->
@@ -1591,9 +1520,6 @@
         <xsl:call-template name="potential-list-indent" />
     </xsl:if>
     <xsl:text>[```</xsl:text>
-    <xsl:if test="$b-human-readable">
-        <xsl:call-template name="select-latex-macros"/>
-    </xsl:if>
     <xsl:value-of select="$content" />
     <xsl:if test="ancestor::ul|ancestor::ol">
         <xsl:call-template name="potential-list-indent" />

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>
@@ -3613,6 +3611,25 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:if>
 </xsl:template>
 
+<!-- A list ("ol", "ul", "dl") may stand bare at the top level   -->
+<!-- of a "slide" or "subslide", an authoring convenience        -->
+<!-- particular to the slideshow genre.  Internally we keep the  -->
+<!-- main grammar's single shape - a list lives within a         -->
+<!-- paragraph - so every later consumer of the tree meets only  -->
+<!-- one form.  The manufactured paragraph does not survive to   -->
+<!-- output as an HTML "p": the Reveal.js conversion explodes    -->
+<!-- any paragraph containing displays, and for a paragraph that -->
+<!-- is exactly one list the explosion is precisely the bare     -->
+<!-- list again.  A @pause stays on the list itself, where the   -->
+<!-- list item templates consult it.                             -->
+<xsl:template match="slide/ol|slide/ul|slide/dl|subslide/ol|subslide/ul|subslide/dl" mode="repair">
+    <p>
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*" mode="repair"/>
+        </xsl:copy>
+    </p>
+</xsl:template>
+
 
 <!-- ############################## -->
 <!-- Killed, in Chronological Order -->
@@ -3660,6 +3677,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 +4073,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 +4122,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 +4142,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 +4157,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 +4227,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 +4235,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 +4285,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>
 
@@ -4852,13 +4934,21 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- we want the stylesheet to be independent, and the template is    -->
 <!-- also applied here.                                               -->
 
-<!-- Every element carrying an "@pi:assembly-id" stamp reports it  -->
-<!-- through this single template.  The match list is deliberately -->
-<!-- explicit — media and images, data files, STACK problems, and  -->
-<!-- the fill-in dynamic-substitution owners (the exercise-like    -->
-<!-- elements, or a "task" they contain, whichever holds "setup")  -->
-<!-- — so the BUG fallback below can catch an unexpected           -->
-<!-- application.                                                  -->
+<!-- Every element carrying an "@pi:assembly-id" stamp reports it    -->
+<!-- through this single template.  The match list is deliberately   -->
+<!-- explicit — media and images, data files, STACK problems, and    -->
+<!-- the fill-in dynamic-substitution owners (the exercise-like      -->
+<!-- elements, or a "task" they contain, whichever holds "setup")    -->
+<!-- — so the BUG fallback below can catch an unexpected             -->
+<!-- application.                                                    -->
+<!--                                                                 -->
+<!-- The stamp belongs to the assembly, laid down partway through    -->
+<!-- the phases so that the later ones can coordinate on it.  It is  -->
+<!-- read here, and in the extraction stylesheets that feed those    -->
+<!-- phases, and nowhere else.  A conversion wants the "unique-id"   -->
+<!-- template instead: the two agree for most elements but not for   -->
+<!-- all, so a conversion reading this value can form a name that    -->
+<!-- nothing else in the build uses.                                 -->
 <xsl:template match="audio|video|interactive|image
                    | datafile
                    | exercise/stack

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,41 @@ 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>
+    <!--  -->
+    <!-- 2026-08-23  a "sidebyside" requires at least two panels -->
+    <xsl:call-template name="deprecation-message">
+        <xsl:with-param name="occurrences" select="&quot;$document-root//sidebyside[count(*) = 1][not(ancestor::interactive)]&quot;" />
+        <xsl:with-param name="date-string" select="'2026-08-23'" />
+        <xsl:with-param name="message" select="'a &quot;sidebyside&quot; now requires at least two panels.  Conversions will continue to honor a single panel until at least 2028-08-23.  Please convert: to size or center a lone &quot;image&quot;, use its &quot;width&quot; attribute; otherwise place the lone item outside any &quot;sidebyside&quot;'"/>
+    </xsl:call-template>
+    <!--  -->
+    <!-- 2026-08-23  one "sidebyside" may not nest within another -->
+    <xsl:call-template name="deprecation-message">
+        <xsl:with-param name="occurrences" select="&quot;$document-root//sidebyside//sidebyside&quot;" />
+        <xsl:with-param name="date-string" select="'2026-08-23'" />
+        <xsl:with-param name="message" select="'one &quot;sidebyside&quot; may not appear within another, no matter how much structure intervenes.  A nested &quot;sidebyside&quot; may behave unpredictably.  Please relocate the inner &quot;sidebyside&quot; outside the outer one'"/>
+    </xsl:call-template>
+    <!--  -->
+    <!-- 2026-08-23  an "sbsgroup" requires at least two "sidebyside" -->
+    <xsl:call-template name="deprecation-message">
+        <xsl:with-param name="occurrences" select="&quot;$document-root//sbsgroup[count(sidebyside) = 1]&quot;" />
+        <xsl:with-param name="date-string" select="'2026-08-23'" />
+        <xsl:with-param name="message" select="'an &quot;sbsgroup&quot; now requires at least two &quot;sidebyside&quot;.  A group of one behaves exactly like the &quot;sidebyside&quot; alone, so use the &quot;sidebyside&quot; by itself, with the layout attributes moved onto it'"/>
+    </xsl:call-template>
+    <!--  -->
 </xsl:template>
 
 <!-- Miscellaneous -->

package/assets/xsl/pretext-epub.xsl

@@ -819,6 +819,14 @@
             <link href="../{$css-dir}/epub.css" rel="stylesheet" type="text/css"/>
         </xsl:otherwise>
     </xsl:choose>
+    <!-- Custom list markers are "@counter-style" rules derived from -->
+    <!-- the source, so they ride along in every content file's head -->
+    <xsl:if test="$b-needs-custom-marker-css">
+        <style>
+            <xsl:text>&#xa;</xsl:text>
+            <xsl:apply-templates select="exsl:node-set($ol-markers)//ol-marker" mode="ol-marker-style"/>
+        </style>
+    </xsl:if>
 </xsl:template>
 
 <!-- ############# -->

package/assets/xsl/pretext-fo.xsl

@@ -585,6 +585,16 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
               role="H1">
         <xsl:apply-templates select="." mode="link-id-attribute"/>
         <xsl:apply-templates select="." mode="title-full"/>
+        <!-- A subtitle belongs to the heading, as it does in HTML, so it  -->
+        <!-- sits inside this block rather than following it.  Lighter and -->
+        <!-- smaller than the title, and on a line of its own.             -->
+        <xsl:if test="subtitle">
+            <fo:block font-size="60%"
+                      font-weight="normal"
+                      space-before="0.5em">
+                <xsl:apply-templates select="." mode="subtitle"/>
+            </fo:block>
+        </xsl:if>
     </fo:block>
 </xsl:template>
 
@@ -2046,13 +2056,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>