@pretextbook/pretext-html 0.3.0 → 0.4.0

package/assets/xsl/pretext-numbers.xsl

@@ -389,7 +389,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- group as its serial number.     -->
 <xsl:template match="exercisegroup" mode="serial-number">
     <xsl:apply-templates select="exercise[1]" mode="serial-number" />
-    <xsl:call-template name="ndash-character"/>
+    <xsl:call-template name="character">
+        <xsl:with-param name="name" select="'ndash'"/>
+    </xsl:call-template>
     <xsl:apply-templates select="exercise[last()]" mode="serial-number" />
 </xsl:template>
 
@@ -450,7 +452,23 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Lists live in paragraphs, exercises, objectives, so       -->
 <!-- should be referenced as part of some enclosing element.   -->
 <!-- "mathbook" helps some tree-climbing routines halt -->
-<xsl:template match="mathbook|pretext|introduction|conclusion|frontmatter|backmatter|sidebyside|sbsgroup|ol|ul|dl|statement" mode="serial-number" />
+<xsl:template match="mathbook|pretext|frontmatter|backmatter|sidebyside|sbsgroup|ol|ul|dl|statement" mode="serial-number" />
+
+<!-- An "introduction" or "conclusion" of a structured division (a   -->
+<!-- "division companion") occurs at most once per division, and so   -->
+<!-- takes its number from the parent, exactly as GOAL-LIKE does.    -->
+<!-- The number is never displayed where born; it only serves to     -->
+<!-- identify the target of a cross-reference.  Every other flavor   -->
+<!-- (in blocks, tasks, exercise groups, ...) has no number at all.  -->
+<xsl:template match="introduction|conclusion" mode="serial-number"/>
+
+<xsl:template match="introduction[parent::article or parent::chapter or parent::appendix or parent::section or parent::subsection]|conclusion[parent::article or parent::chapter or parent::appendix or parent::section or parent::subsection]" mode="serial-number">
+    <xsl:apply-templates select="parent::*" mode="serial-number"/>
+</xsl:template>
+
+<xsl:template match="introduction[parent::article or parent::chapter or parent::appendix or parent::section or parent::subsection]|conclusion[parent::article or parent::chapter or parent::appendix or parent::section or parent::subsection]" mode="structure-number">
+    <xsl:apply-templates select="parent::*" mode="structure-number"/>
+</xsl:template>
 
 <!-- Poems go by their titles, not numbers -->
 <xsl:template match="poem" mode="serial-number" />
@@ -541,7 +559,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Should not drop in here.  Ever. -->
 <xsl:template match="*" mode="serial-number">
     <xsl:text>[NUM]</xsl:text>
-    <xsl:message>PTX:ERROR:   An object (<xsl:value-of select="local-name(.)" />) lacks a serial number, search output for "[NUM]"</xsl:message>
+    <xsl:message>PTX:BUG:   An object (<xsl:value-of select="local-name(.)" />) lacks a serial number, search output for "[NUM]"</xsl:message>
     <xsl:apply-templates select="." mode="location-report" />
 </xsl:template>
 
@@ -784,7 +802,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Should not drop in here.  Ever. -->
 <xsl:template match="*" mode="structure-number">
     <xsl:text>[STRUCT]</xsl:text>
-    <xsl:message>PTX:ERROR:   An object (<xsl:value-of select="local-name(.)" />) lacks a structure number, search output for "[STRUCT]"</xsl:message>
+    <xsl:message>PTX:BUG:   An object (<xsl:value-of select="local-name(.)" />) lacks a structure number, search output for "[STRUCT]"</xsl:message>
     <xsl:apply-templates select="." mode="location-report" />
 </xsl:template>
 

package/assets/xsl/pretext-revealjs.xsl

@@ -31,10 +31,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
     xmlns:xml="http://www.w3.org/XML/1998/namespace"
     xmlns:pi="http://pretextbook.org/2020/pretext/internal"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:pf="https://prefigure.org"
     xmlns:exsl="http://exslt.org/common"
     xmlns:date="http://exslt.org/dates-and-times"
     xmlns:str="http://exslt.org/strings"
     extension-element-prefixes="exsl date str"
+    exclude-result-prefixes="svg pf"
 >
 
 <!-- Necessary to get some HTML constructions,    -->
@@ -52,6 +55,17 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- HTML conversion (preferably avoid using this).                -->
 <xsl:variable name="b-reveal-build" select="true()" />
 
+<!-- Embedded mathematics: files of per-equation SVG and speech     -->
+<!-- representations, keyed by id, manufactured at build time by    -->
+<!-- the "mathjax_latex()" routine and passed in here as string     -->
+<!-- parameters.  Both are empty for online mathematics (the        -->
+<!-- default), and then the derived variables are empty node-sets,  -->
+<!-- never consulted.                                               -->
+<xsl:param name="mathfile" select="''"/>
+<xsl:param name="speechfile" select="''"/>
+<xsl:variable name="math-repr" select="document($mathfile)/pi:math-representations"/>
+<xsl:variable name="speech-repr" select="document($speechfile)/pi:math-representations"/>
+
 <!-- Reveal.js output is one monolithic page, so heading levels are -->
 <!-- threaded, not chunked.  The slideshow title (h1) and subtitle  -->
 <!-- (h2) are fixed.  A "section" is always level 2 (sections never -->
@@ -129,18 +143,34 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:apply-templates select="." mode="sagecell" />
             <xsl:call-template name="syntax-highlight"/>
 
-            <!-- load reveal.js resources; w/ v 4.1.2 -->
-            <!-- these seem to be *always* minified   -->
+            <!-- load reveal.js resources; w/ v 6.x                 -->
+            <!-- paths are relative to the distribution's "dist"    -->
+            <!-- directory, whose layout a "local" resource host    -->
+            <!-- must reproduce                                     -->
             <link href="{$reveal-root}/reset.css" rel="stylesheet"></link>
             <link href="{$reveal-root}/reveal.css" rel="stylesheet"></link>
             <link href="{$reveal-root}/theme/{$reveal-theme}.css" rel="stylesheet"></link>
             <script src="{$reveal-root}/reveal.js"></script>
-            <script src="{$reveal-root}/plugin/math/math.js"></script>
+            <!-- embedded mathematics needs no typesetting, so no math plugin -->
+            <xsl:if test="not($b-reveal-embedded-math)">
+                <script src="{$reveal-root}/plugin/math.js"></script>
+            </xsl:if>
 
             <link href="_static/pretext/css/pretext-reveal.css" rel="stylesheet"></link>
           <style>
+            <xsl:if test="$b-reveal-embedded-math">
+                <!-- layout for build-time SVG images of mathematics; the -->
+                <!-- class names are those of the EPUB conversion, which  -->
+                <!-- pioneered this device                                -->
+                <xsl:text>span.mjpage { display: inline; }&#xa;</xsl:text>
+                <xsl:text>span.mjpage__block { display: block; text-align: center; margin: 0.5em 0; }&#xa;</xsl:text>
+            </xsl:if>
           </style>
-          <xsl:call-template name="diagcess-header"/>
+          <!-- no diagcess machinery with embedded mathematics: an  -->
+          <!-- annotated PreFigure diagram is then a static image   -->
+          <xsl:if test="not($b-reveal-embedded-math)">
+              <xsl:call-template name="diagcess-header"/>
+          </xsl:if>
 
           <!-- custom-css, if specified, should be last -->
           <xsl:if test="not($reveal-custom-css = '')">
@@ -157,15 +187,22 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
         <body>
             <div class="reveal ptx-content">
-                <!-- For mathematics/MathJax, must be located -->
-                <!-- within div.reveal to be effective        -->
-                <xsl:apply-templates select="." mode="latex-macros"/>
+                <!-- For mathematics/MathJax, must be located  -->
+                <!-- within div.reveal to be effective.  With  -->
+                <!-- embedded mathematics the macros are baked -->
+                <!-- into the SVG images at build time, so the -->
+                <!-- hidden macro division would be inert.     -->
+                <xsl:if test="not($b-reveal-embedded-math)">
+                    <xsl:apply-templates select="." mode="latex-macros"/>
+                </xsl:if>
                 <div class="slides">
                      <xsl:apply-templates select="frontmatter"/>
                     <xsl:apply-templates select="section|slide"/>
                 </div>
             </div>
-            <xsl:call-template name="diagcess-footer"/>
+            <xsl:if test="not($b-reveal-embedded-math)">
+                <xsl:call-template name="diagcess-footer"/>
+            </xsl:if>
         </body>
 
         <script>
@@ -206,27 +243,41 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:text>  transition: 'fade',&#xa;</xsl:text>
             <xsl:text>  width: "100%",&#xa;</xsl:text>
             <xsl:text>  height: "100%",&#xa;</xsl:text>
-            <xsl:text>  margin: "0.025",&#xa;</xsl:text>
-            <!-- Explicitly enable AMS-style inline \(...\),      -->
-            <!-- and explicitly disable TeX-style inline $...$    -->
-            <!-- The main HTML conversion does not do anything    -->
-            <!-- special for display math, so we disable any such -->
-            <!-- markup, since we use environments exclusively.   -->
-            <!-- N.B. default HTML adds a "zero-width" space into -->
-            <!-- a \( authored in a non-math context.             -->
-            <!-- N.B. This may need to be changed for MathJax 3   -->
-
-            <!-- Suggested by  https://revealjs.com/math/, 2021-09-19 -->
-            <xsl:text>  math: {&#xa;</xsl:text>
-            <xsl:text>    mathjax: 'https://cdn.jsdelivr.net/gh/mathjax/mathjax@2.7.8/MathJax.js',&#xa;</xsl:text>
-            <xsl:text>    config: 'TeX-AMS_HTML-full',&#xa;</xsl:text>
-            <xsl:text>    // other options are passed into MathJax.Hub.Config()&#xa;</xsl:text>
-            <xsl:text>    tex2jax: {&#xa;</xsl:text>
-            <xsl:text>      inlineMath:  [['\\(','\\)']],&#xa;</xsl:text>
-            <xsl:text>      displayMath: [],&#xa;</xsl:text>
-            <xsl:text>    }&#xa;</xsl:text>
-            <xsl:text>  },&#xa;</xsl:text>
-            <xsl:text>  plugins: [ RevealMath ]&#xa;</xsl:text>
+            <!-- "margin" must be a JavaScript number.  The PDF export     -->
+            <!-- computes its page size as (slide dimension)*(1 + margin); -->
+            <!-- a quoted value concatenates instead of adding, producing  -->
+            <!-- pages ten times too large, and a print dialog then        -->
+            <!-- shrinks each slide to a small fraction of the paper.      -->
+            <xsl:text>  margin: 0.025,&#xa;</xsl:text>
+            <xsl:choose>
+                <!-- Embedded mathematics is finished SVG images: -->
+                <!-- no math plugin, no typesetting configuration -->
+                <xsl:when test="$b-reveal-embedded-math">
+                    <xsl:text>  plugins: []&#xa;</xsl:text>
+                </xsl:when>
+                <!-- Explicitly enable AMS-style inline \(...\),      -->
+                <!-- and explicitly disable TeX-style inline $...$    -->
+                <!-- The main HTML conversion does not do anything    -->
+                <!-- special for display math, so we disable any such -->
+                <!-- markup, since we use environments exclusively.   -->
+                <!-- N.B. default HTML adds a "zero-width" space into -->
+                <!-- a \( authored in a non-math context.             -->
+                <!-- The MathJax version matches the main HTML        -->
+                <!-- conversion; the "mathjax4" adapter of the math   -->
+                <!-- plugin loads it from the URL given and passes    -->
+                <!-- the "tex" object into the MathJax configuration. -->
+                <!-- Suggested by  https://revealjs.com/math/, 2026-07-22 -->
+                <xsl:otherwise>
+                    <xsl:text>  mathjax4: {&#xa;</xsl:text>
+                    <xsl:text>    mathjax: 'https://cdn.jsdelivr.net/npm/mathjax@4/tex-mml-chtml.js',&#xa;</xsl:text>
+                    <xsl:text>    tex: {&#xa;</xsl:text>
+                    <xsl:text>      inlineMath:  [['\\(','\\)']],&#xa;</xsl:text>
+                    <xsl:text>      displayMath: [],&#xa;</xsl:text>
+                    <xsl:text>    }&#xa;</xsl:text>
+                    <xsl:text>  },&#xa;</xsl:text>
+                    <xsl:text>  plugins: [ RevealMath.MathJax4 ]&#xa;</xsl:text>
+                </xsl:otherwise>
+            </xsl:choose>
             <xsl:text>});&#xa;</xsl:text>
         </script>
     </html>
@@ -416,8 +467,12 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <!-- Side-By-Side -->
-<!-- Built by implementing two abstract   -->
-<!-- templates from the -common templates -->
+<!-- Same container-declared composition as HTML and LaTeX,        -->
+<!-- realized here with CSS table display: margins are declared on -->
+<!-- the wrapper div, and each panel div carries its width and     -->
+<!-- vertical alignment.  Built by implementing the two abstract   -->
+<!-- templates ("panel-panel", "compose-panels") of the -common    -->
+<!-- machinery.                                                    -->
 
 <!-- Overall wrapper of a sidebyside  -->
 <xsl:template match="sidebyside" mode="compose-panels">
@@ -511,12 +566,165 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:with-param name="warning">Conversion to reveal.js presentations/slideshows is experimental&#xa;Requests for additional specific constructions welcome&#xa;Additional PreTeXt elements are subject to change</xsl:with-param>
     </xsl:call-template>
     <xsl:if test="not($theme = '')">
-        <xsl:message >PTX:WARNING: the temporary "theme" stringparam is deprecated and is being ignored by the conversion to a Reveal.js slideshow.  Please switch to using a publisher file to set this option, see documentation in The Guide.  The default theme is "simple".</xsl:message>
+        <xsl:message >PTX:DEPRECATE: the temporary "theme" stringparam is deprecated and is being ignored by the conversion to a Reveal.js slideshow.  Please switch to using a publisher file to set this option, see documentation in The Guide.  The default theme is "simple".</xsl:message>
         <xsl:text>simple</xsl:text>
     </xsl:if>
     <xsl:if test="not($local = '')">
-        <xsl:message >PTX:WARNING: the temporary "local" stringparam is deprecated and is being ignored.  Please switch to using a publisher file to set this option, see documentation in The Guide.  The default behavior is to get resources from a CDN.</xsl:message>
+        <xsl:message >PTX:DEPRECATE: the temporary "local" stringparam is deprecated and is being ignored.  Please switch to using a publisher file to set this option, see documentation in The Guide.  The default behavior is to get resources from a CDN.</xsl:message>
     </xsl:if>
 </xsl:template>
 
+<!-- #################### -->
+<!-- Embedded Mathematics -->
+<!-- #################### -->
+
+<!-- Online mathematics (the default) is authored LaTeX passed      -->
+<!-- through, inherited from the HTML conversion, for the math      -->
+<!-- plugin and MathJax to typeset in the browser.  Embedded        -->
+<!-- mathematics substitutes an SVG image and a speech string,      -->
+<!-- both manufactured at build time, so the slideshow performs no  -->
+<!-- typesetting at all: the same device as the EPUB conversion,    -->
+<!-- whose templates these mirror.  Every "md" has "mrow" children  -->
+<!-- once the assembly repairs an authored one-line "md", so the    -->
+<!-- match covers all mathematics.  Slides never link to an         -->
+<!-- equation (a cross-reference renders as its text), so no HTML   -->
+<!-- id is placed, unlike EPUB.                                     -->
+<xsl:template match="m|md[mrow]">
+    <xsl:choose>
+        <xsl:when test="$b-reveal-embedded-math">
+            <!-- NB: math-representation file writes with "visible-id" -->
+            <xsl:variable name="id">
+                <xsl:apply-templates select="." mode="unique-id"/>
+            </xsl:variable>
+            <xsl:variable name="math" select="$math-repr/pi:math[@id = $id]"/>
+            <xsl:variable name="speech" select="$speech-repr/pi:math[@id = $id]"/>
+            <span>
+                <xsl:attribute name="class">
+                    <xsl:choose>
+                        <xsl:when test="$math/@context = 'inline'">
+                            <xsl:text>mjpage</xsl:text>
+                        </xsl:when>
+                        <xsl:when test="$math/@context = 'displaymath'">
+                            <xsl:text>mjpage mjpage__block</xsl:text>
+                        </xsl:when>
+                    </xsl:choose>
+                </xsl:attribute>
+                <xsl:apply-templates select="$math/div[@class = 'svg']/svg:svg" mode="svg-edit">
+                    <xsl:with-param name="speech" select="$speech"/>
+                    <xsl:with-param name="base-id" select="$id"/>
+                </xsl:apply-templates>
+            </span>
+        </xsl:when>
+        <!-- online: the usual LaTeX-within-delimiters construction -->
+        <xsl:otherwise>
+            <xsl:apply-imports/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<!-- An annotated PreFigure diagram is normally embedded for the    -->
+<!-- diagcess library: an interactive, keyboard-driven exploration  -->
+<!-- for a screen reader.  With embedded mathematics the slideshow  -->
+<!-- has already traded such interactivity for fixed alternatives,  -->
+<!-- so the diagram becomes a static image (its plain SVG), and the -->
+<!-- diagcess machinery is omitted entirely.                        -->
+<xsl:template match="image[pf:prefigure[pf:diagram/pf:annotations]]" mode="image-inclusion">
+    <xsl:choose>
+        <xsl:when test="$b-reveal-embedded-math">
+            <xsl:variable name="base-pathname">
+                <xsl:value-of select="$generated-directory"/>
+                <xsl:if test="$b-managed-directories">
+                    <xsl:text>prefigure/</xsl:text>
+                </xsl:if>
+                <xsl:apply-templates select="pf:prefigure" mode="image-source-basename"/>
+            </xsl:variable>
+            <xsl:apply-templates select="." mode="svg-png-wrapper">
+                <xsl:with-param name="image-filename" select="concat($base-pathname, '.svg')"/>
+            </xsl:apply-templates>
+            <!-- possibly annotate with archive links -->
+            <xsl:apply-templates select="." mode="archive">
+                <xsl:with-param name="base-pathname" select="$base-pathname"/>
+            </xsl:apply-templates>
+            <!-- possibly give a long description -->
+            <xsl:apply-templates select="." mode="description"/>
+        </xsl:when>
+        <!-- online: the diagcess embedding, inherited -->
+        <xsl:otherwise>
+            <xsl:apply-imports/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<!-- MathJax mints an HTML id from an equation's \tag for its own  -->
+<!-- \eqref linking, which PreTeXt never uses; a tag used twice    -->
+<!-- (symbols as tags invite this) would duplicate the id, so they -->
+<!-- are dropped                                                   -->
+<xsl:template match="@id[starts-with(., 'mjx-eqn')]" mode="svg-edit"/>
+
+<!-- Identity for the SVG stream-edit -->
+<xsl:template match="node()|@*" mode="svg-edit">
+    <xsl:copy>
+        <xsl:apply-templates select="node()|@*" mode="svg-edit"/>
+    </xsl:copy>
+</xsl:template>
+
+<!-- We enrich the main "svg" element with a speech string.      -->
+<!--   1.  Since this is the "entry template" for this mode,     -->
+<!--       this is the only place we accept the "speech" param.  -->
+<!--   2.  MathJax seems to use SVGs inside of SVGs for placing  -->
+<!--       numbers/tags of numbered equations, so we only enrich -->
+<!--       "top-level" SVG - that is the point of the filter.    -->
+<!--   3.  The id of the math element will be used as the base   -->
+<!--       of (unique) ids necessary to point to the speech.     -->
+<!--       Pattern 11 at:                                        -->
+<!--       https://www.deque.com/blog/creating-accessible-svgs/  -->
+<!--   4.  Seems                                                 -->
+<!--           "title" + @aria-labelledby                        -->
+<!--           "desc"  + @aria-describedby                       -->
+<!--       cover all the bases.  It is suggested that the two    -->
+<!--       elements alone would be recognized by screen readers. -->
+<xsl:template match="svg:svg[not(ancestor::svg:svg)]" mode="svg-edit">
+    <xsl:param name="speech"/>
+    <xsl:param name="base-id"/>
+
+    <!-- manufacture id values for consistency, uniqueness -->
+    <xsl:variable name="title-id">
+        <xsl:value-of select="$base-id"/>
+        <xsl:text>-title</xsl:text>
+    </xsl:variable>
+    <xsl:variable name="desc-id">
+        <xsl:value-of select="$base-id"/>
+        <xsl:text>-desc</xsl:text>
+    </xsl:variable>
+
+    <xsl:copy>
+        <!-- attributes first -->
+        <xsl:apply-templates select="@*" mode="svg-edit"/>
+        <xsl:attribute name="role">
+            <xsl:text>img</xsl:text>
+        </xsl:attribute>
+        <xsl:attribute name="aria-labelledby">
+            <xsl:value-of select="$title-id"/>
+        </xsl:attribute>
+        <xsl:attribute name="aria-describedby">
+            <xsl:value-of select="$desc-id"/>
+        </xsl:attribute>
+        <!-- now additional metadata, of sorts -->
+        <xsl:element name="title" namespace="http://www.w3.org/2000/svg">
+            <xsl:attribute name="id">
+                <xsl:value-of select="$title-id"/>
+            </xsl:attribute>
+            <xsl:text>Math Expression</xsl:text>
+        </xsl:element>
+        <xsl:element name="desc" namespace="http://www.w3.org/2000/svg">
+            <xsl:attribute name="id">
+                <xsl:value-of select="$desc-id"/>
+            </xsl:attribute>
+            <xsl:value-of select="$speech"/>
+        </xsl:element>
+        <!-- and all the rest of the nodes -->
+        <xsl:apply-templates select="node()" mode="svg-edit"/>
+    </xsl:copy>
+</xsl:template>
+
 </xsl:stylesheet>

package/assets/xsl/pretext-runestone-fitb.xsl

@@ -83,7 +83,7 @@
                             </xsl:when>
                             <xsl:otherwise>
                                 <!-- Report if a seed is not provided-->
-                                <xsl:message>PTX:WARNING:   Dynamic exercise "<xsl:value-of select="@visible-id"/>" is missing setup @seed for static content generation.</xsl:message>
+                                <xsl:message>PTX:FALLBACK:   Dynamic exercise "<xsl:value-of select="@visible-id"/>" is missing setup @seed for static content generation.</xsl:message>
                                 <xsl:text>1234</xsl:text>
                             </xsl:otherwise>
                         </xsl:choose>
@@ -421,42 +421,32 @@
             </xsl:apply-templates>
         </xsl:when>
         <!-- If no explicit test is provided, use given answer. -->
+        <!-- NB: The @answer cases (mode='number' and mode='string') are now   -->
+        <!-- handled upstream in pretext-assembly.xsl (exercise pass), which   -->
+        <!-- injects a synthesized <test correct="yes"> element.               -->
+        <!-- The remaining cases are for fillins that use @ansobj that         -->
+        <!-- reference an object that was dynamically created (random).        -->
         <xsl:otherwise>
             <xsl:text>{</xsl:text>
             <xsl:choose>
-                <xsl:when test="$match-fillin/@answer">
-                    <xsl:choose>
-                        <xsl:when test="$match-fillin/@mode='number'">
-                            <xsl:text>"number": [</xsl:text>
-                            <xsl:value-of select="$match-fillin/@answer"/>
-                            <xsl:text>,</xsl:text>
-                            <xsl:value-of select="$match-fillin/@answer"/>
-                            <xsl:text>]</xsl:text>
-                        </xsl:when>
-                        <xsl:when test="$match-fillin/@mode='string'">
-                            <xsl:text>"regex": "</xsl:text>
-                            <xsl:value-of select="$match-fillin/@answer"/>
-                            <xsl:text>"</xsl:text>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:message>PTX:ERROR: fillin has an @answer with invalid or missing mode (valid: number or string) in "<xsl:value-of select="@visible-id"/>. If dynamic, you should use @ansobj.".</xsl:message>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:when>
                 <xsl:when test="$match-fillin/@ansobj">
                     <xsl:choose>
+                        <!-- Number objects — assume match with very tight tolerance -->
                         <xsl:when test="$match-fillin/@mode='number'">
                             <xsl:text>function() {&#xa;</xsl:text>
                             <xsl:text>    return (Math.abs(</xsl:text>
                             <xsl:value-of select="$match-fillin/@ansobj"/>
                             <xsl:text>- ans) &lt; 1e-10);&#xa;}</xsl:text>
                         </xsl:when>
+                        <!-- String objects — assume require exact string match -->
+                        <!-- otherwise the author should specify the test -->
                         <xsl:when test="$match-fillin/@mode='string'">
                             <xsl:text>function() {&#xa;</xsl:text>
                             <xsl:text>    return (</xsl:text>
                             <xsl:value-of select="$match-fillin/@ansobj"/>
                             <xsl:text>== ans);&#xa;}</xsl:text>
                         </xsl:when>
+                        <!-- Dynamic math objects: compare expressions -->
                         <xsl:when test="$match-fillin/@mode='math'">
                             <xsl:text>function() {&#xa;</xsl:text>
                             <xsl:text>    return _mobjs.compareExpressions(</xsl:text>
@@ -717,8 +707,16 @@
         <xsl:otherwise>
             <xsl:variable name="answer">
                 <xsl:choose>
+                    <!-- If comparing with actual answer, implicitly a literal check -->
                     <xsl:when test="strcmp/@use-answer='yes'">
-                        <xsl:value-of select="$fillin/@answer"/>
+                        <xsl:call-template name="escape-regexp-literal">
+                            <xsl:with-param name="text" select="$fillin/@answer"/>
+                        </xsl:call-template>
+                    </xsl:when>
+                    <xsl:when test="strcmp/@literal='yes'">
+                        <xsl:call-template name="escape-regexp-literal">
+                            <xsl:with-param name="text" select="strcmp"/>
+                        </xsl:call-template>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:value-of select="strcmp"/>
@@ -892,7 +890,7 @@
                 <xsl:when test="name($curTest)='mathcmp' and $curTest/@use-answer='yes'">
                     <xsl:choose>
                         <xsl:when test="not($fillin/@ansobj)">
-                            <xsl:message>PTX:WARNING: Feedback for "<xsl:value-of select="@visible-id"/>" says to use given math answer, but @ansobj not defined. </xsl:message>
+                            <xsl:message>PTX:ERROR:   Feedback for "<xsl:value-of select="@visible-id"/>" says to use given math answer, but @ansobj not defined. </xsl:message>
                             <xsl:text>UNDEFINED</xsl:text>
                         </xsl:when>
                         <xsl:otherwise>

package/assets/xsl/pretext-runestone.xsl

@@ -1154,7 +1154,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                                 <xsl:variable name="id">
                                     <xsl:apply-templates select="." mode="unique-id"/>
                                 </xsl:variable>
-                                <xsl:message>PTX:WARNING:  Parsons problems need a @langauge that is a valid activecode language to be runnable</xsl:message>
+                                <xsl:message>PTX:WARNING:  Parsons problems need a @language that is a valid activecode language to be runnable</xsl:message>
                                 <xsl:message>              id: <xsl:value-of select="$id"></xsl:value-of></xsl:message>
                             </xsl:otherwise>
                         </xsl:choose>
@@ -2413,7 +2413,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                                 <xsl:if test="tests/iotest">
                                     <xsl:choose>
                                         <xsl:when test="not(normalize-space(tests/text()) = '')">
-                                            <xsl:message>WARNING: You can either write text based tests or use iotests, but not both. iotests ignored in <xsl:value-of select="$rsid"/>.</xsl:message>
+                                            <xsl:message>PTX:FALLBACK: You can either write text based tests or use iotests, but not both. iotests ignored in <xsl:value-of select="$rsid"/>.</xsl:message>
                                         </xsl:when>
                                         <xsl:otherwise>
                                             <xsl:text>===iotests===&#x0a;</xsl:text>
@@ -3068,7 +3068,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:apply-templates select="$target" mode="runestone-id"/>
-                    <xsl:message>PTX:ERROR:   runestone-targets template was called with an invalid @output-field value "<xsl:value-of select="$output-field"/>"</xsl:message>
+                    <xsl:message>PTX:BUG:     runestone-targets template was called with an invalid @output-field value "<xsl:value-of select="$output-field"/>"</xsl:message>
                 </xsl:otherwise>
             </xsl:choose>
             <!-- n - 1 separators, required by receiving Javascript -->

package/assets/xsl/pretext-sage-doctest.xsl

@@ -124,7 +124,7 @@
                         <xsl:value-of select="@tolerance" />
                     </xsl:when>
                     <xsl:otherwise>
-                        <xsl:message>PTX:WARNING: '<xsl:value-of select="@doctest" /> tolerance' Sage doctest needs 'tolerance=' attribute</xsl:message>
+                        <xsl:message>PTX:ERROR:   '<xsl:value-of select="@doctest" /> tolerance' Sage doctest needs 'tolerance=' attribute</xsl:message>
                     </xsl:otherwise>
                 </xsl:choose>
             </xsl:when>
@@ -137,7 +137,7 @@
                         <xsl:value-of select="@package" />
                     </xsl:when>
                     <xsl:otherwise>
-                        <xsl:message>PTX:WARNING: 'optional' Sage doctest missing package, supply a 'package=' attribute</xsl:message>
+                        <xsl:message>PTX:ERROR:   'optional' Sage doctest missing package, supply a 'package=' attribute</xsl:message>
                     </xsl:otherwise>
                 </xsl:choose>
             </xsl:when>

package/assets/xsl/pretext-text-utilities.xsl

@@ -932,6 +932,31 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:choose>
 </xsl:template>
 
+<!-- Collapse each newline, and the horizontal space around -->
+<!-- it, to a single space: hard-wrapped, indented source   -->
+<!-- becomes one long line                                  -->
+<xsl:template name="flatten-line-breaks">
+    <xsl:param name="text"/>
+    <xsl:choose>
+        <xsl:when test="contains($text, '&#xa;')">
+            <xsl:call-template name="strip-trailing-whitespace">
+                <xsl:with-param name="text" select="substring-before($text, '&#xa;')"/>
+            </xsl:call-template>
+            <xsl:text> </xsl:text>
+            <xsl:call-template name="flatten-line-breaks">
+                <xsl:with-param name="text">
+                    <xsl:call-template name="strip-leading-whitespace">
+                        <xsl:with-param name="text" select="substring-after($text, '&#xa;')"/>
+                    </xsl:call-template>
+                </xsl:with-param>
+            </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="$text"/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
 <!-- spurious newlines introduce whitespace on either side -->
 <!-- we split at newlines, strip consecutive whitesapce on either side, -->
 <!-- and replace newlines by spaces (could restore a single newline) -->
@@ -1010,6 +1035,49 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:value-of select="str:replace($text, $json-replacements-search-set, $json-replacements-replace-set)" />
 </xsl:template>
 
+<!-- REGEX Escaped Strings -->
+<!-- When a string will be passed for comparison using regexp   -->
+<!-- but we want a literal match, we need to escape all of the  -->
+<!-- special characters by putting a slash in front.            -->
+<xsl:variable name="regexp-replacements">
+    <search>\</search>
+    <replace>\\</replace>
+    <search>.</search>
+    <replace>\.</replace>
+    <search>^</search>
+    <replace>\^</replace>
+    <search>$</search>
+    <replace>\$</replace>
+    <search>*</search>
+    <replace>\*</replace>
+    <search>+</search>
+    <replace>\+</replace>
+    <search>?</search>
+    <replace>\?</replace>
+    <search>{</search>
+    <replace>\{</replace>
+    <search>}</search>
+    <replace>\}</replace>
+    <search>[</search>
+    <replace>\[</replace>
+    <search>]</search>
+    <replace>\]</replace>
+    <search>(</search>
+    <replace>\(</replace>
+    <search>)</search>
+    <replace>\)</replace>
+    <search>|</search>
+    <replace>\|</replace>
+</xsl:variable>
+<xsl:variable name="regexp-replacements-search-set" select="exsl:node-set($regexp-replacements)/search" />
+<xsl:variable name="regexp-replacements-replace-set" select="exsl:node-set($regexp-replacements)/replace" />
+
+<xsl:template name="escape-regexp-literal">
+    <xsl:param name="text"/>
+
+    <xsl:value-of select="str:replace($text, $regexp-replacements-search-set, $regexp-replacements-replace-set)" />
+</xsl:template>
+
 <xsl:template name="quote-string">
     <xsl:param name="text" />
     <xsl:text>"</xsl:text>
@@ -1093,7 +1161,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:when test="$characters = ''">
             <xsl:message>PTX:FATAL:   Unable to find an unused character in:&#xa;<xsl:value-of select="$string" />&#xa;using characters from: <xsl:value-of select="$charset" /></xsl:message>
             <xsl:apply-templates select="." mode="location-report" />
-            <xsl:message terminate="yes">             That's fatal.  Sorry.  Quitting...</xsl:message>
+            <xsl:message terminate="yes">PTX:FATAL:   Quitting...</xsl:message>
         </xsl:when>
         <xsl:otherwise>
             <xsl:value-of select="substring($characters, 1, 1)"/>