@pretextbook/pretext-html 0.19.0 → 0.19.1

package/assets/upstream.json

@@ -1,7 +1,7 @@
 {
   "source": {
     "repository": "PreTeXtBook/pretext",
-    "ref": "da193419f0746242287b2358094a496029ca9671"
+    "ref": "d6a846cc46399b6e2484eda40c2930bb3c80c5ce"
   },
-  "refreshed": "2026-10-24T03:13:47.656Z"
+  "refreshed": "2026-11-07T02:36:36.547Z"
 }

package/assets/xsl/extract-biblio-csl.xsl

@@ -326,7 +326,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:element name="xref-csl" namespace="http://pretextbook.org/2020/pretext/internal">
             <!-- namespacing the attribute is sort of ugly -->
             <xsl:attribute name="id">
-                <xsl:value-of select="@pi:assembly-id"/>
+                <xsl:apply-templates select="." mode="assembly-id"/>
             </xsl:attribute>
             <xsl:value-of select="$citation-item-list"/>
         </xsl:element>

package/assets/xsl/extract-pg.xsl

@@ -175,7 +175,7 @@
 
 <xsl:template match="webwork[@source|statement|task|text()]" mode="extraction">
     <xsl:variable name="problem">
-        <xsl:value-of select="../@pi:assembly-id"/>
+        <xsl:apply-templates select=".." mode="assembly-id"/>
     </xsl:variable>
     <problem>
         <xsl:attribute name="id">
@@ -198,7 +198,7 @@
         <!-- the Python routines, which know it as "copied-from".                  -->
         <xsl:if test="@pi:copied-from">
             <xsl:attribute name="copied-from">
-                <xsl:value-of select="id(@pi:copied-from)/../@pi:assembly-id"/>
+                <xsl:apply-templates select="id(@pi:copied-from)/.." mode="assembly-id"/>
             </xsl:attribute>
         </xsl:if>
         <!-- 2. a seed for randomization (with a default explicitly declared)      -->

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

@@ -493,7 +493,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>{</xsl:text>
     <xsl:choose>
         <xsl:when test="@arg = 'unique-id'">
-            <xsl:value-of select="$ptx-node/@pi:unique-id"/>
+            <xsl:apply-templates select="$ptx-node" mode="unique-id"/>
         </xsl:when>
         <xsl:when test="@arg = 'ordinal'">
             <xsl:apply-templates select="$ptx-node" mode="texstyle-number"/>
@@ -511,7 +511,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:text>[</xsl:text>
         <xsl:choose>
             <xsl:when test="@opt = 'unique-id'">
-                <xsl:value-of select="$ptx-node/@pi:unique-id"/>
+                <xsl:apply-templates select="$ptx-node" mode="unique-id"/>
             </xsl:when>
             <xsl:when test="@arg = 'ordinal'">
                 <xsl:apply-templates select="$ptx-node" mode="texstyle-number"/>
@@ -523,7 +523,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:text>{</xsl:text>
         <xsl:choose>
             <xsl:when test="@arg = 'unique-id'">
-                <xsl:value-of select="$ptx-node/@pi:unique-id"/>
+                <xsl:apply-templates select="$ptx-node" mode="unique-id"/>
             </xsl:when>
             <xsl:when test="@arg = 'ordinal'">
                 <xsl:apply-templates select="$ptx-node" mode="texstyle-number"/>

package/assets/xsl/pretext-assembly.xsl

@@ -2093,8 +2093,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:otherwise>
             <!-- Load the per-exercise representation file for this    -->
             <!-- exercise, identified by its @pi:assembly-id.          -->
+            <xsl:variable name="the-id">
+                <xsl:apply-templates select="." mode="assembly-id"/>
+            </xsl:variable>
             <xsl:variable name="webwork-rep-uri"
-                select="concat($webwork-representations-dir, @pi:assembly-id, '.xml')"/>
+                select="concat($webwork-representations-dir, $the-id, '.xml')"/>
             <xsl:variable name="the-webwork-rep"
                 select="document($webwork-rep-uri, $original)/webwork-reps"/>
             <xsl:choose>
@@ -2106,14 +2109,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                     <xsl:copy>
                         <xsl:apply-templates select="node()|@*" mode="representations"/>
                     </xsl:copy>
-                    <xsl:message>PTX:ERROR:   no WeBWorK representations directory configured in the publication file; WeBWorK exercise with @pi:assembly-id "<xsl:value-of select="@pi:assembly-id"/>" will be empty.</xsl:message>
+                    <xsl:message>PTX:ERROR:   no WeBWorK representations directory configured in the publication file; WeBWorK exercise with @pi:assembly-id "<xsl:value-of select="$the-id"/>" will be empty.</xsl:message>
                 </xsl:when>
                 <!-- This should only fail if the file is missing or stale.  Repeatedly. -->
                 <xsl:when test="not($the-webwork-rep)">
                     <xsl:copy>
                         <xsl:apply-templates select="node()|@*" mode="representations"/>
                     </xsl:copy>
-                    <xsl:message>PTX:ERROR:   could not load WeBWorK representation file "<xsl:value-of select="$webwork-rep-uri"/>" for @pi:assembly-id "<xsl:value-of select="@pi:assembly-id"/>"; re-generate the WeBWorK representations.  A "webwork-representations.xml" in that directory indicates old-format files that need replacing.</xsl:message>
+                    <xsl:message>PTX:ERROR:   could not load WeBWorK representation file "<xsl:value-of select="$webwork-rep-uri"/>" for @pi:assembly-id "<xsl:value-of select="$the-id"/>"; re-generate the WeBWorK representations.  A "webwork-representations.xml" in that directory indicates old-format files that need replacing.</xsl:message>
                 </xsl:when>
                 <xsl:otherwise>
                     <!-- The representation file may record a server failure   -->
@@ -2123,7 +2126,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                     <!-- but warn the author so the failure does not go        -->
                     <!-- unnoticed in later builds.                            -->
                     <xsl:if test="$the-webwork-rep/static/@failure">
-                        <xsl:message>PTX:WARNING:   the WeBWorK problem with @pi:assembly-id "<xsl:value-of select="@pi:assembly-id"/>" has a stored "<xsl:value-of select="$the-webwork-rep/static/@failure"/>" failure recorded when the WeBWorK representations were last generated.  A placeholder is being rendered in its place.  Re-generate the WeBWorK representations (and watch for errors) to retry.</xsl:message>
+                        <xsl:message>PTX:WARNING:   the WeBWorK problem with @pi:assembly-id "<xsl:value-of select="$the-id"/>" has a stored "<xsl:value-of select="$the-webwork-rep/static/@failure"/>" failure recorded when the WeBWorK representations were last generated.  A placeholder is being rendered in its place.  Re-generate the WeBWorK representations (and watch for errors) to retry.</xsl:message>
                     </xsl:if>
                     <!-- Build a temporary exercise with "webwork-reps" from the  -->
                     <!-- representations file substituted in place of "webwork".   -->
@@ -2557,8 +2560,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:when test="($exercise-style = 'static') and not($b-extracting)">
             <!-- Read pre-computed URLs from sidecar file -->
             <!-- But not if doing an extraction           -->
+            <xsl:variable name="the-id">
+                <xsl:apply-templates select="." mode="assembly-id"/>
+            </xsl:variable>
             <xsl:variable name="url-file"
-                select="document(concat($generated-directory-source, 'qrcode/', @pi:assembly-id, '-url.xml'), $original)"/>
+                select="document(concat($generated-directory-source, 'qrcode/', $the-id, '-url.xml'), $original)"/>
             <!-- panel widths are experimental -->
             <sidebyside margins="7.5% 7.5%" widths="47% 21%" valign="top" halign="center">
                 <!-- copy over @xml:id, which may be in use by -->
@@ -3925,7 +3931,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <!-- id, and the derived name keeps it stable and             -->
             <!-- collision-free.                                          -->
             <xsl:attribute name="xml:id">
-                <xsl:value-of select="@pi:assembly-id"/>
+                <xsl:apply-templates select="." mode="assembly-id"/>
                 <xsl:text>-ggb-slate</xsl:text>
             </xsl:attribute>
             <xsl:attribute name="surface">
@@ -5036,6 +5042,18 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!--     interrogate the file manufactured in the generated directory in    -->
 <!--     order to make a sample of its content.  This happens before we     -->
 <!--     construct unique-id.                                               -->
+<!--                                                                        -->
+<!-- exercise and the project-like elements, when holding a "webwork"       -->
+<!--     A WeBWorK problem goes to a WeBWorK server, and what the server    -->
+<!--     returns is saved in a file of representations named by this id.    -->
+<!--     The "representations" pass reads that file back in, which happens  -->
+<!--     before we construct unique-id.                                     -->
+<!--                                                                        -->
+<!-- xref                                                                   -->
+<!--     A citation is formatted for a Citation Style Language (CSL) style  -->
+<!--     outside of this stylesheet, and the result is labeled by this id.  -->
+<!--     The "assembly" pass reads the formatted citations back in, which   -->
+<!--     happens before we construct unique-id.                             -->
 
 <!-- NB: we believe the @pi:assembly-id will equal the @pi:unique-id -->
 <!-- ("unique-id" template) for objects at the level of blocks,      -->
@@ -5061,11 +5079,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- 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.                                                    -->
+<!-- explicit — media and images, data files, WeBWorK and STACK      -->
+<!-- problems, cross-references for citations, 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  -->
@@ -5077,6 +5095,12 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:template match="audio|video|interactive|image
                    | datafile
                    | exercise/stack
+                   | exercise[@pi:exercise-interactive='webwork']
+                   | project[@pi:exercise-interactive='webwork']
+                   | activity[@pi:exercise-interactive='webwork']
+                   | exploration[@pi:exercise-interactive='webwork']
+                   | investigation[@pi:exercise-interactive='webwork']
+                   | xref
                    | exercise[@pi:exercise-interactive='fillin' and setup]
                    | project[@pi:exercise-interactive='fillin' and setup]
                    | activity[@pi:exercise-interactive='fillin' and setup]

package/assets/xsl/pretext-common.xsl

@@ -1621,8 +1621,8 @@ Book (with parts), "section" at level 3
     </xsl:apply-templates>
 </xsl:template>
 
-<!-- Console Session, prompt on input line-->
-<!-- An interactive command-line session with pairs of input and output -->
+<!-- Console Session, prompt on input line                              -->
+<!-- An interactive command-line session, input and output in any order -->
 <!-- Determining the prompt is a bit complicated, but always the same   -->
 <!-- and always a pure textual result.  It becomes a part of the input  -->
 <!-- line, so this modal template has an "input" as its context.        -->
@@ -3856,10 +3856,10 @@ Book (with parts), "section" at level 3
         <!-- If part of exercise-like, use that label, otherwise own                -->
         <!-- This is an implicit use of &PROJECT-LIKE; and should be kept in sync   -->
         <xsl:when test="parent::exercise|parent::task|parent::project|parent::activity|parent::exploration|parent::investigation">
-            <xsl:value-of select="../@pi:unique-id"/>
+            <xsl:apply-templates select=".." mode="unique-id"/>
         </xsl:when>
         <xsl:otherwise>
-            <xsl:value-of select="@pi:unique-id"/>
+            <xsl:apply-templates select="." mode="unique-id"/>
         </xsl:otherwise>
     </xsl:choose>
     <xsl:text>.js</xsl:text>

package/assets/xsl/pretext-html.xsl

@@ -6866,7 +6866,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:when test="latex-image">
                 <xsl:apply-templates select="$image-svg-xml/svg:svg/*" mode="svg-unique-ids">
                     <xsl:with-param name="svg-unique-id">
-                        <xsl:value-of select="@pi:unique-id"/>
+                        <xsl:apply-templates select="." mode="unique-id"/>
                     </xsl:with-param>
                 </xsl:apply-templates>
             </xsl:when>
@@ -6936,7 +6936,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- on the image, but kept within the available width, so an image  -->
 <!-- placed off-center by @margins does not push its description out -->
 <!-- of the text.                                                    -->
-<xsl:template match="image[not(&SBS-LAYOUT-FILTER;)]" mode="description-style">
+<xsl:template match="image[not(&SBS-LAYOUT-FILTER;) and not(parent::datafile)]" mode="description-style">
     <xsl:param name="layout" select="/.."/>
 
     <xsl:variable name="width" select="number($layout/width)"/>
@@ -6968,9 +6968,10 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:if>
 </xsl:template>
 
-<!-- An interactive is centered in a container that spans the -->
-<!-- available width, so its description is simply centered   -->
-<xsl:template match="interactive[not(&SBS-LAYOUT-FILTER;)]" mode="description-style">
+<!-- An interactive, or the image of a data file, is centered -->
+<!-- in a container that spans the available width, so its    -->
+<!-- description is simply centered                           -->
+<xsl:template match="interactive[not(&SBS-LAYOUT-FILTER;)]|datafile/image" mode="description-style">
     <xsl:attribute name="style">
         <xsl:text>width: 80%; margin-left: 10%;</xsl:text>
     </xsl:attribute>
@@ -10724,8 +10725,15 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <!-- period below is Javascript syntax for methods -->
                 <xsl:with-param name="pad" select="concat($applet-onload-argument,'.')" />
             </xsl:call-template>
-            <!-- call a function named 'listeners()' in attached .js file to communicate with other divs -->
-            <xsl:text>listeners(</xsl:text><xsl:value-of select='$applet-onload-argument'/><xsl:text>)</xsl:text>
+            <!-- A script attached by the "source" attribute of the "interactive"    -->
+            <!-- may define a function named "listeners".  It receives the applet    -->
+            <!-- once the commands above have run, so that event listeners can tie   -->
+            <!-- the applet to the HTML of the interactive, which they cannot do     -->
+            <!-- before the applet exists.  Most interactives attach no such script, -->
+            <!-- so the call is made only when the function is defined.              -->
+            <xsl:text>if (typeof listeners === "function") { listeners(</xsl:text>
+            <xsl:value-of select="$applet-onload-argument"/>
+            <xsl:text>); }&#xa;</xsl:text>
             <xsl:text>};&#xa;</xsl:text>
         </xsl:if>
         <!-- Parameter reference:                                              -->
@@ -13565,7 +13573,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             </xsl:attribute>
             <!-- copy id of this li for use in customization pass -->
             <xsl:attribute name="uid">
-                <xsl:value-of select="@pi:unique-id"/>
+                <xsl:apply-templates select="." mode="unique-id"/>
             </xsl:attribute>
             <div class="toc-title-box">
                 <a href="{$the-url}" class="internal">
@@ -13599,7 +13607,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:attribute>
     <!-- copy id of this li for use in customization pass, will remove there -->
     <xsl:attribute name="uid">
-        <xsl:value-of select="@pi:unique-id"/>
+        <xsl:apply-templates select="." mode="unique-id"/>
     </xsl:attribute>
     <div class="toc-title-box">
         <a href="{$the-url}" class="internal">
@@ -13628,7 +13636,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:variable name="toc-contents" select="exsl:node-set($toc-contents-rtf)"/>
 
     <!-- get the unique id of the current page -->
-    <xsl:variable name="uid" select="@pi:unique-id"/>
+    <xsl:variable name="uid">
+        <xsl:apply-templates select="." mode="unique-id"/>
+    </xsl:variable>
     <!-- use that to find the ToC node for that page -->
     <xsl:variable name="this-page-node" select="$toc-contents//*[@uid = $uid]"/>
     <!-- ancestor list will allow us to identify when we are in the path to the page -->

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

@@ -339,9 +339,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>%% this is a necessity for isolating styling and behavior&#xa;</xsl:text>
     <xsl:text>%% The tcolorbox library of the same name loads the base library&#xa;</xsl:text>
     <xsl:text>\tcbuselibrary{xparse}&#xa;</xsl:text>
-    <xsl:text>%% The tcolorbox library loads TikZ, its calc package is generally useful,&#xa;</xsl:text>
-    <xsl:text>%% and is necessary for some smaller documents that use partial tcolor boxes&#xa;</xsl:text>
-    <xsl:text>%% See:  https://github.com/PreTeXtBook/pretext/issues/1624&#xa;</xsl:text>
+    <xsl:text>%% The tcolorbox package loads TikZ.  The TikZ calc library, for coordinate&#xa;</xsl:text>
+    <xsl:text>%% arithmetic, is not used by PreTeXt's own LaTeX; it is loaded because&#xa;</xsl:text>
+    <xsl:text>%% TikZ code provided by an author may rely on it&#xa;</xsl:text>
     <xsl:text>\usetikzlibrary{calc}&#xa;</xsl:text>
     <xsl:text>%% We use some more exotic tcolorbox keys to restore indentation to parboxes&#xa;</xsl:text>
     <xsl:text>\tcbuselibrary{hooks}&#xa;</xsl:text>
@@ -1021,26 +1021,25 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:text>\newcommand{\ptxhrulemedium}{\noalign{\hrule height 0.07em}}&#xa;</xsl:text>
         <xsl:text>\newcommand{\ptxhrulethick} {\noalign{\hrule height 0.11em}}&#xa;</xsl:text>
         <!-- http://tex.stackexchange.com/questions/24549/horizontal-rule-with-adjustable-height-behaving-like-clinen-m -->
-        <!-- Could preserve/restore \arrayrulewidth on entry/exit to tabular -->
-        <!-- But we'll get cleaner source with this built into macros        -->
-        <!-- Could condition \setlength debacle on the use of extpfeil       -->
-        <!-- arrows (see discussion below)                                   -->
-        <xsl:text>%% We preserve a copy of the \setlength package before other&#xa;</xsl:text>
-        <xsl:text>%% packages (extpfeil) get a chance to load packages that redefine it&#xa;</xsl:text>
-        <xsl:text>\let\ptxoldsetlength\setlength&#xa;</xsl:text>
+        <!-- Could preserve/restore \arrayrulewidth on entry/exit to tabular    -->
+        <!-- But we'll get cleaner source with this built into macros           -->
+        <!-- The widths are plain TeX assignments, not \setlength: a package    -->
+        <!-- such as "calc" (loaded by "pdfpages", "musicography", "mathtools") -->
+        <!-- redefines \setlength, and a \global in front of its version has    -->
+        <!-- no lasting effect, so a partial rule would keep the default width  -->
         <xsl:text>\newlength{\ptxOldarrayrulewidth}&#xa;</xsl:text>
         <xsl:text>\newcommand{\ptxcrulethin}[1]%&#xa;</xsl:text>
-        <xsl:text>{\noalign{\global\ptxoldsetlength{\ptxOldarrayrulewidth}{\arrayrulewidth}}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\ptxoldsetlength{\arrayrulewidth}{0.04em}}\cline{#1}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\ptxoldsetlength{\arrayrulewidth}{\ptxOldarrayrulewidth}}}%&#xa;</xsl:text>
+        <xsl:text>{\noalign{\global\ptxOldarrayrulewidth=\arrayrulewidth}%&#xa;</xsl:text>
+        <xsl:text>\noalign{\global\arrayrulewidth=0.04em}\cline{#1}%&#xa;</xsl:text>
+        <xsl:text>\noalign{\global\arrayrulewidth=\ptxOldarrayrulewidth}}%&#xa;</xsl:text>
         <xsl:text>\newcommand{\ptxcrulemedium}[1]%&#xa;</xsl:text>
-        <xsl:text>{\noalign{\global\ptxoldsetlength{\ptxOldarrayrulewidth}{\arrayrulewidth}}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\ptxoldsetlength{\arrayrulewidth}{0.07em}}\cline{#1}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\ptxoldsetlength{\arrayrulewidth}{\ptxOldarrayrulewidth}}}&#xa;</xsl:text>
+        <xsl:text>{\noalign{\global\ptxOldarrayrulewidth=\arrayrulewidth}%&#xa;</xsl:text>
+        <xsl:text>\noalign{\global\arrayrulewidth=0.07em}\cline{#1}%&#xa;</xsl:text>
+        <xsl:text>\noalign{\global\arrayrulewidth=\ptxOldarrayrulewidth}}&#xa;</xsl:text>
         <xsl:text>\newcommand{\ptxcrulethick}[1]%&#xa;</xsl:text>
-        <xsl:text>{\noalign{\global\ptxoldsetlength{\ptxOldarrayrulewidth}{\arrayrulewidth}}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\ptxoldsetlength{\arrayrulewidth}{0.11em}}\cline{#1}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\ptxoldsetlength{\arrayrulewidth}{\ptxOldarrayrulewidth}}}&#xa;</xsl:text>
+        <xsl:text>{\noalign{\global\ptxOldarrayrulewidth=\arrayrulewidth}%&#xa;</xsl:text>
+        <xsl:text>\noalign{\global\arrayrulewidth=0.11em}\cline{#1}%&#xa;</xsl:text>
+        <xsl:text>\noalign{\global\arrayrulewidth=\ptxOldarrayrulewidth}}&#xa;</xsl:text>
         <!-- http://tex.stackexchange.com/questions/119153/table-with-different-rule-widths -->
         <xsl:text>%% Single letter column specifiers defined via array package&#xa;</xsl:text>
         <xsl:text>\newcolumntype{A}{!{\vrule width 0.04em}}&#xa;</xsl:text>
@@ -2135,9 +2134,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:text>%% You have elected to load the LaTeX "extpfeil" package&#xa;</xsl:text>
         <xsl:text>%% for certain extensible arrows, and it should appear just below.&#xa;</xsl:text>
         <xsl:text>%% This package has numerous shortcomings leading to conflicts with&#xa;</xsl:text>
-        <xsl:text>%% packages like "stmaryrd" and our manipulations of lengths to support&#xa;</xsl:text>
-        <xsl:text>%% variable thickness of rules in tables.  It should appear late&#xa;</xsl:text>
-        <xsl:text>%% in the preamble in an effort to mitigate these shortcomings.&#xa;</xsl:text>
+        <xsl:text>%% packages like "stmaryrd".  It should appear late in the preamble&#xa;</xsl:text>
+        <xsl:text>%% in an effort to mitigate these shortcomings.&#xa;</xsl:text>
     </xsl:if>
     <xsl:if test="not($latex-packages = '')">
         <xsl:text>%% Begin: Author-provided TeX/LaTeX packages&#xa;</xsl:text>
@@ -2190,7 +2188,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Fill-in-the-blank in text content -->
 <xsl:template name="fillin-text">
     <xsl:text>%% Used for fillin answer blank in text&#xa;</xsl:text>
-    <xsl:text>%% Relies on calc package, loaded via tcolorbox&#xa;</xsl:text>
+    <xsl:text>%% Box style sizes its sides with \dimexpr, no package needed&#xa;</xsl:text>
     <xsl:text>%% Argument is intended number of characters of blank&#xa;</xsl:text>
     <xsl:text>%% Length may compress for output to fit in one line&#xa;</xsl:text>
     <xsl:text>\newlength{\ptxfillinmaxwidth}&#xa;</xsl:text>
@@ -2204,13 +2202,16 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\newcommand{\ptxfillintext}[1]{%&#xa;</xsl:text>
     <xsl:text>\setlength{\ptxfillinmaxwidth}{#1\ptxcharmaxwidth}%&#xa;</xsl:text>
     <xsl:text>\setlength{\ptxfillincontract}{#1\ptxcharminwidth}%&#xa;</xsl:text>
-    <xsl:text>\setlength{\ptxfillinheight}{\baselineskip}\addtolength{\ptxfillinheight}{1.2pt}%&#xa;</xsl:text>
+    <!-- The height of the box and shade styles comes from the strut box, -->
+    <!-- which is one line high everywhere, while a "tabular" sets        -->
+    <!-- \baselineskip to zero inside its cells                           -->
+    <xsl:text>\setlength{\ptxfillinheight}{\dimexpr\ht\strutbox+\dp\strutbox+1.2pt\relax}%&#xa;</xsl:text>
     <xsl:choose>
         <xsl:when test="$fillin-text-style = 'underline'">
             <xsl:text>\strut\nobreak\leaders\vbox{\hrule width 0.3pt height 0.3pt \vskip -1.2pt}\hskip 1\ptxfillinmaxwidth minus \ptxfillincontract\nobreak\strut%&#xa;</xsl:text>
         </xsl:when>
         <xsl:when test="$fillin-text-style = 'box'">
-            <xsl:text>\rule[-1.2pt]{0.3pt}{\heightof{\strut}+1.8pt}\nobreak\hspace{-0.3pt}\nobreak\leaders\vbox{\hrule width 0.3pt height 0.3pt \vskip \ptxfillinheight \hrule width 0.3pt height 0.3pt \vskip -1.2pt}\hskip 1\ptxfillinmaxwidth minus \ptxfillincontract\nobreak\hspace{-0.3pt}\rule[-1.2pt]{0.3pt}{\heightof{\strut}+1.8pt}%&#xa;</xsl:text>
+            <xsl:text>\rule[-1.2pt]{0.3pt}{\dimexpr\ptxfillinheight+0.6pt\relax}\nobreak\hspace{-0.3pt}\nobreak\leaders\vbox{\hrule width 0.3pt height 0.3pt \vskip \ptxfillinheight \hrule width 0.3pt height 0.3pt \vskip -1.2pt}\hskip 1\ptxfillinmaxwidth minus \ptxfillincontract\nobreak\hspace{-0.3pt}\rule[-1.2pt]{0.3pt}{\dimexpr\ptxfillinheight+0.6pt\relax}%&#xa;</xsl:text>
         </xsl:when>
         <xsl:when test="$fillin-text-style = 'shade'">
             <xsl:text>{\color{fillintextshade}\strut\nobreak\leaders\vbox{\hrule width 0.3pt height \ptxfillinheight \vskip -1.2pt}\hskip 1\ptxfillinmaxwidth minus \ptxfillincontract}%&#xa;</xsl:text>

package/assets/xsl/pretext-runestone.xsl

@@ -3104,7 +3104,33 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                         <xsl:text>;base64,</xsl:text>
                         <xsl:value-of select="$image-b64-elt/@pi:base64"/>
                     </xsl:attribute>
+                    <!-- Alternative text as for other images, except that a -->
+                    <!-- data file is never decorative: an image without any -->
+                    <!-- description is named by its file instead            -->
+                    <xsl:choose>
+                        <xsl:when test="not(string(image/shortdescription) = '')">
+                            <xsl:attribute name="alt">
+                                <xsl:apply-templates select="image/shortdescription"/>
+                            </xsl:attribute>
+                        </xsl:when>
+                        <xsl:when test="image/description">
+                            <xsl:attribute name="alt">
+                                <xsl:text>described in detail following the image</xsl:text>
+                            </xsl:attribute>
+                            <xsl:attribute name="aria-describedby">
+                                <xsl:apply-templates select="image" mode="describedby-id"/>
+                            </xsl:attribute>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:attribute name="alt">
+                                <xsl:text>Image file: </xsl:text>
+                                <xsl:value-of select="@filename"/>
+                            </xsl:attribute>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </img>
+                <!-- possibly give a long description -->
+                <xsl:apply-templates select="image" mode="description"/>
             </xsl:when>
             <!-- text, an authored toy example, or a serious external file -->
             <xsl:when test="pre">