@pretextbook/pretext-html 0.3.0 → 0.4.0

package/assets/xsl/extract-qrcode.xsl

@@ -54,7 +54,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- applying specializations below -->
 <xsl:import href="./extract-identity.xsl" />
 
-<xsl:output method="text" encoding="UTF-8"/>
+<xsl:output method="xml" encoding="UTF-8"/>
 
 <!-- Avoid Catch-22: default assembly/pre-processor provides output  -->
 <!-- for a conversion to a static format, but that format will       -->
@@ -74,6 +74,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:variable name="chunk-level" select="$html-chunk-level"/>
 <xsl:variable name="file-extension" select="'.html'"/>
 
+<!-- Wrap the ids below in a manifest of exactly the elements that  -->
+<!-- earn a QR code; the generator opens only these sidecar files.  -->
+<xsl:template match="*" mode="extraction-wrapper">
+    <pi:qrcodes>
+        <xsl:apply-imports/>
+    </pi:qrcodes>
+</xsl:template>
+
 <xsl:template match="audio[@source|@href]|video[@source|@href|@youtube|@youtubeplaylist|@vimeo]|interactive" mode="extraction">
     <!-- Sidecar XML file with pre-computed URLs for use      -->
     <!-- by pretext-assembly.xsl when building static         -->
@@ -95,6 +103,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             </pi:embed-iframe-url>
         </pi:qrcode-urls>
     </exsl:document>
+    <!-- record the id in the returned manifest (see the wrapper above) -->
+    <pi:qrcode id="{$the-id}"/>
 </xsl:template>
 
 </xsl:stylesheet>

package/assets/xsl/extract-sageplot.xsl

@@ -88,7 +88,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:text>3d</xsl:text>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:message>PTX:ERROR:   a "sageplot" has a @variant attribute ("<xsl:value-of select="@variant"/>") for "<xsl:value-of select="$filebase"/>" whose value is not "2d" nor "3d".  The default ("2d") is being used, which could be incorrect</xsl:message>
+                <xsl:message>PTX:FALLBACK:   a "sageplot" has a @variant attribute ("<xsl:value-of select="@variant"/>") for "<xsl:value-of select="$filebase"/>" whose value is not "2d" nor "3d".  The default ("2d") is being used, which could be incorrect</xsl:message>
                 <xsl:text>2d</xsl:text>
             </xsl:otherwise>
         </xsl:choose>

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

@@ -210,7 +210,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:call-template name="math-packages"/>
     <xsl:call-template name="pdfpages-package"/>
     <xsl:call-template name="semantic-macros"/>
-    <xsl:call-template name="exercises-and-solutions"/>
     <xsl:call-template name="chapter-start-number"/>
     <xsl:call-template name="equation-numbering"/>
     <xsl:call-template name="image-tcolorbox"/>
@@ -624,7 +623,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             </xsl:apply-templates>
         </xsl:when>
         <xsl:otherwise>
-            <xsl:message>PTX:WARNING: The @authority attribute on a keyword element (in a texstyle file) is required and must be "author" or "msc".  Found "@authority="<xsl:value-of select="@authority"/>". </xsl:message>
+            <xsl:message>PTX:ERROR:   The @authority attribute on a keyword element (in a texstyle file) is required and must be "author" or "msc".  Found "@authority="<xsl:value-of select="@authority"/>". </xsl:message>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>

package/assets/xsl/localizations/README.md

@@ -17,9 +17,10 @@ You should have received a copy of the GNU General Public License
 along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************-->
 
-# PreTeXt Localizations
+PreTeXt Localizations
+=====================
 
-Each file in this directory provides translations of various strings used in titles and headings (and other places) to a specific language. Filenames reflect the code for language (lowercase) and then the code for the region (uppercase). This is a requirement.
+Each file in this directory provides translations of various strings used in titles and headings (and other places) to a specific language.  Filenames reflect the code for language (lowercase) and then the code for the region (uppercase).  This is a requirement.
 
 For each file of translations, the "language" attribute of the "locale" element used to reference the language code and the "string-id" of each "localization" element is the lookup key. Element content is the language-specific string. The English version ("en-US") is carefully documented, so additions of new languages do not necessarily require new documentation, though it could help other implementers. See `xsl/pretext-common.xsl` for the two routines which make use of this information, one is a named template and the other (largely) uses the name of an element as the string-id.
 
@@ -27,30 +28,29 @@ Some items peculiar to LaTeX are explained [here](http://www.tex.ac.uk/cgi-bin/t
 
 There is a [general overview of language tags](http://www.w3.org/International/articles/language-tags/) and the [Subtag Registry](http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry).
 
-Contibutions of new languages are always welcome and especially encouraged! Search on "Translation needed" to see where you can help. Use the en-US file as a template for a new language file, since it is always most complete. It is understood that certain English words and phrases have subtleties that can be very hard to capture in another language. Do your best to concoct a close approximation -- something should be better than nothing. And it might improve with additions from others later. We try to address some of this in the en-US file, so do be certain to look there for explanations of how these strings are employed. Comments about your own decisions, within the relevant language file, can be very helpful later.
+Contibutions of new languages are always welcome and especially encouraged! Search on "Translation needed" to see where you can help. Use the  en-US  file as a template for a new language file, since it is always most complete.  It is understood that certain English words and phrases have subtleties that can be very hard to capture in another language.  Do your best to concoct a close approximation -- something should be better than nothing.  And it might improve with additions from others later.  We try to address some of this in the  en-US  file, so do be certain to look there for explanations of how these strings are employed.  Comments about your own decisions, within the relevant language file, can be very helpful later.
 
-NEW LANGUAGES: for a new file to be effective, a single line needs to be added to the `xsl/localizations/localizations.xml` file. It should be obvious what to do by looking at the other lines of that file. If you create a new file, please include a "commented-out" line for any words you do not translate, and please use the **exact** style of commenting as elsewhere (one line per comment, indented). Including these, and using teh same style, greatly aids in maintenance and reliability.
+NEW LANGUAGES: for a new file to be effective, a single line needs to be added to the `xsl/localizations/localizations.xml` file.  It should be obvious what to do by looking at the other lines of that file.  If you create a new file, please include a "commented-out" line for any words you do not translate, and please use the **exact** style of commenting as elsewhere (one line per comment, indented).  Including these, and using teh same style, greatly aids in maintenance and reliability.
 
-Additions to incomplete files, or new files for additional languages, are very welcome and are a huge help in making PreTeXt useable for more authors. A GitHub pull request is preferable. If you do not know GitHub well, then emailing the entire language file (as an attachment) is very welcome and just as easy to deal with on our end. Please respect the order in the en-US file, it saves us time when we add new terms to each and every file. Thanks.
+Additions to incomplete files, or new files for additional languages, are very welcome and are a huge help in making PreTeXt useable for more authors.  A GitHub pull request is preferable.  If you do not know GitHub well, then emailing the entire language file (as an attachment) is very welcome and just as easy to deal with on our end.  Please respect the order in the en-US file, it saves us time when we add new terms to each and every file.  Thanks.
 
-To test, or use: place `xml:lang="es-ES"`, or similar, as an attribute on your `<pretext>` element. `en-US` is the default if no `@xml:lang` attribute is given on the `pretext` element.
+To test, or use: place  `xml:lang="es-ES"`, or similar, as an attribute on your `<pretext>` element.  `en-US` is the default if no `@xml:lang` attribute is given on the `pretext` element.
 
 Current (partially) implemented language codes and contributors
-
-- af-ZA, Afrikaans (South Africa), Dirk Basson
-- bg-BG, Bulgarian (Bulgaria), Boyko Bantchev
-- ca-ES, Catalan (Spain), Jordi Saludes
-- cs-CZ, Czech (Czechia), Jiří Lebl
-- de-DE, German (Germany), Karl-Dieter Crisman
-- es-ES, Spanish (Spain), Juan José Torrens
-- en-US, English (United States), Robert A. Beezer
-- fi-FI, Finnish (Finland), Lasse M. Manninen
-- fr-CA, French (Canada), Jean-Sébastien Turcotte
-- fr-FR, French (France), Thomas W. Judson, Julien Giol, Jean-Sébastien Turcotte
-- hu-HU, Hungarian (Hungary), Sándor Czirbusz
-- it-IT, Italian (Italy), Valerio Monti
-- ku-CKB, Rebin Muhammad, Kurdish (Central Kurdish)
-- nl-NL, Dutch (Netherlands), Gosia Wrzesinska
-- pt-BR, Portugese (Brazil), Igor Morgado, Vinicius Monego, Leon Silva
-- pt-PT, Portugese (Portugal), António Pereira
-- zh-HANS, Chinese Simplified (China), Hongqi Wang
+* af-ZA, Afrikaans (South Africa), Dirk Basson
+* bg-BG, Bulgarian (Bulgaria), Boyko Bantchev
+* ca-ES, Catalan (Spain), Jordi Saludes
+* cs-CZ, Czech (Czechia), Jiří Lebl
+* de-DE, German (Germany), Karl-Dieter Crisman
+* es-ES, Spanish (Spain), Juan José Torrens
+* en-US, English (United States), Robert A. Beezer
+* fi-FI, Finnish (Finland), Lasse M. Manninen
+* fr-CA, French (Canada), Jean-Sébastien Turcotte
+* fr-FR, French (France), Thomas W. Judson, Julien Giol, Jean-Sébastien Turcotte
+* hu-HU, Hungarian (Hungary), Sándor Czirbusz
+* it-IT, Italian (Italy), Valerio Monti
+* ku-CKB, Rebin Muhammad, Kurdish (Central Kurdish)
+* nl-NL, Dutch (Netherlands), Gosia Wrzesinska
+* pt-BR, Portugese (Brazil), Igor Morgado, Vinicius Monego, Leon Silva
+* pt-PT, Portugese (Portugal), António Pereira
+* zh-HANS, Chinese Simplified (China), Hongqi Wang

package/assets/xsl/pretext-assembly.xsl

@@ -519,6 +519,12 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Also, note that this tree is useful for certain tasks, like      -->
 <!-- validation, or reporting values of publisher variables, without  -->
 <!-- regard to the subsequent passes.                                 -->
+<!-- The version tree is the earliest assembly product a publisher   -->
+<!-- variable may consult (structure can differ by version).  The    -->
+<!-- passes up to, and including, "version" must never consult a     -->
+<!-- variable defined from this tree — that is a circular reference, -->
+<!-- detected only at runtime.  The "crossing point" facts in        -->
+<!-- publisher-variables.xsl enumerate the consumers.                -->
 <xsl:variable name="version-root" select="$version/pretext"/>
 <xsl:variable name="version-docinfo" select="$version-root/docinfo"/>
 <xsl:variable name="version-document-root" select="$version-root/*[not(self::docinfo)]"/>
@@ -872,7 +878,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <!-- This is an AWOL node, not empty content (which is allowed) -->
         <xsl:if test="not($the-lookup)">
             <xsl:text>[MISSING CUSTOM CONTENT HERE]</xsl:text>
-            <xsl:message>PTX:WARNING:   lookup for a "custom" element with @name set to "<xsl:value-of select="$the-ref"/>" has failed, while consulting the customization file "<xsl:value-of select="$customizations-file"/>".  Output will contain "[MISSING CUSTOM CONTENT HERE]" instead</xsl:message>
+            <xsl:message>PTX:ERROR:     lookup for a "custom" element with @name set to "<xsl:value-of select="$the-ref"/>" has failed, while consulting the customization file "<xsl:value-of select="$customizations-file"/>".  Output will contain "[MISSING CUSTOM CONTENT HERE]" instead</xsl:message>
             <xsl:apply-templates select="$the-custom" mode="location-report"/>
         </xsl:if>
         <!-- Copying the contents of "custom" via the "version" templates  -->
@@ -1070,11 +1076,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <!-- Look at each "biblio" in the external file -->
         <xsl:for-each select="$biblios/pretext-biblios/biblio">
             <xsl:variable name="the-id" select="@xml:id"/>
-            <xsl:message>@xml:id of &lt;biblio&gt; in bibliography file: <xsl:value-of select="$the-id"/></xsl:message>
+            <xsl:message>PTX:DEBUG: @xml:id of &lt;biblio&gt; in bibliography file: <xsl:value-of select="$the-id"/></xsl:message>
             <!-- Building duplicate, so look at $original for    -->
             <!-- "xref" pointing to the current context "biblio" -->
             <xsl:if test="$original//xref[@ref = $the-id]">
-                <xsl:message>  Located this &lt;biblio&gt; cited in original source</xsl:message>
+                <xsl:message>PTX:DEBUG:  Located this &lt;biblio&gt; cited in original source</xsl:message>
                 <xsl:apply-templates select="." mode="assembly"/>
             </xsl:if>
         </xsl:for-each>
@@ -1613,6 +1619,78 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:attribute>
 </xsl:template>
 
+<!-- Insert a default correct "test" for a FITB "exercise" or -->
+<!-- PROJECT-LIKE when an "evaluate" has no explicit correct  -->
+<!-- "test": the corresponding "fillin" has a static @answer, -->
+<!-- so synthesize a "test" and let all downstream processing -->
+<!-- follow a single code path.  Only @mode "string" and      -->
+<!-- "number" are handled here; "math" uses separate logic.   -->
+<xsl:template match="evaluation/evaluate[
+    not(@all = 'yes') and
+    not(test[@correct = 'yes']) and
+    not(
+        count(../../statement//fillin) > 1
+        and
+        ../evaluate[@all = 'yes']/test
+    )
+    ]" mode="exercise">
+    <xsl:param name="division"/>
+
+    <!-- Identify this evaluate's position among its siblings and its name, -->
+    <!-- to locate the corresponding fillin by name first, position second. -->
+    <xsl:variable name="eval-position" select="count(preceding-sibling::evaluate) + 1"/>
+    <xsl:variable name="eval-name" select="@name"/>
+
+    <!-- Navigate to the exercise/project/task parent of evaluation -->
+    <xsl:variable name="exercise-parent" select="parent::evaluation/parent::*"/>
+
+    <!-- Find the corresponding fillin (name-based match takes priority) -->
+    <xsl:variable name="match-fillin">
+        <xsl:choose>
+            <xsl:when test="$eval-name != '' and
+                            $exercise-parent/statement//fillin[@name = $eval-name]">
+                <xsl:copy-of select="$exercise-parent/statement//fillin[@name = $eval-name]"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:copy-of select="($exercise-parent/statement//fillin)[$eval-position]"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="fillin" select="exsl:node-set($match-fillin)/fillin"/>
+
+    <xsl:copy>
+        <xsl:apply-templates select="@*" mode="exercise">
+            <xsl:with-param name="division" select="$division"/>
+        </xsl:apply-templates>
+        <!-- Synthesize a correct test when the fillin has a static @answer -->
+        <!-- and a recognized mode. Place it first so it takes precedence.  -->
+        <xsl:if test="$fillin/@answer and not($fillin/@ansobj)">
+            <xsl:choose>
+                <xsl:when test="$fillin/@mode = 'number'">
+                    <test correct="yes">
+                        <numcmp use-answer="yes"/>
+                    </test>
+                </xsl:when>
+                <xsl:when test="$fillin/@mode = 'string'">
+                    <test correct="yes">
+                        <strcmp use-answer="yes"/>
+                    </test>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:message>PTX:WARNING: fillin in "<xsl:value-of
+                        select="$exercise-parent/@visible-id"/>" has @answer but
+                        @mode is missing or not recognized (expected 'number' or
+                        'string'). No default correct test synthesized.</xsl:message>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:if>
+        <!-- Copy existing children (non-correct tests, feedback, etc.) -->
+        <xsl:apply-templates select="node()" mode="exercise">
+            <xsl:with-param name="division" select="$division"/>
+        </xsl:apply-templates>
+    </xsl:copy>
+</xsl:template>
+
 <!-- ##################################################### -->
 <!-- Dynamic Substitutions                                 -->
 <!-- Cut out dynamic setup and evaluation for static mode. -->
@@ -3357,6 +3435,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- which have not been schema-compliant since circa 2017   -->
 <xsl:template match="sidebyside/*[&METADATA-FILTER;]" mode="repair"/>
 
+<!-- 2026-07-08  "title" deprecated on "introduction"/"conclusion" of a traditional division -->
+
+<!-- The title is dropped, silently; conversions provide a localized -->
+<!-- heading whenever a heading is called for.  Titles remain within -->
+<!-- specialized divisions, which are never structured, and so are   -->
+<!-- never summary pages (the situation that demands the heading)    -->
+<xsl:template match="introduction[parent::article or parent::chapter or parent::appendix or parent::section or parent::subsection]/title|conclusion[parent::article or parent::chapter or parent::appendix or parent::section or parent::subsection]/title" mode="repair"/>
+
 <!-- ########## -->
 <!-- Enrichment -->
 <!-- ########## -->
@@ -4012,7 +4098,12 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:param name="project-nodes"/>
     <xsl:param name="exercise-nodes"/>
     <xsl:param name="openproblem-nodes"/>
-    <xsl:variable name="b-terminal" select="not(part|chapter|appendix|section|subsection|subsubsection|preface)"/>
+    <!-- terminal: holds content directly, so it has no child divisions of  -->
+    <!-- any kind.  Specialized divisions ("worksheet", "handout", etc.)     -->
+    <!-- count here just like the traditional ones, else a division whose    -->
+    <!-- children are specialized divisions is wrongly deemed terminal and   -->
+    <!-- pools their blocks into one scope instead of one scope apiece.      -->
+    <xsl:variable name="b-terminal" select="not(part|chapter|appendix|section|subsection|subsubsection|preface|exercises|worksheet|handout|reading-questions|references|glossary|solutions)"/>
     <xsl:variable name="b-open-eq"          select="not($eq-nodes)          and ($b-terminal or (@level &gt;= $numbering-equations))"/>
     <xsl:variable name="b-open-fn"          select="not($fn-nodes)          and ($b-terminal or (@level &gt;= $numbering-footnotes))"/>
     <xsl:variable name="b-open-blocks"      select="not($blocks-nodes)      and ($b-terminal or (@level &gt;= $numbering-blocks))"/>
@@ -4683,20 +4774,19 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Natural override for YouTube videos               -->
 <!-- Better - standalone page, with "View on You Tube" -->
 
-<!-- NB: ampersand is escaped for LaTeX use, be careful with switch to QR codes via Python! -->
-<!-- POTENTIAL BUG: this should be un-LaTeX'ed for general use and then  -->
-<!-- sanitized on the receiving end in the LaTeX conversion, or maybe    -->
-<!-- the LaTeX conversion will do just fine if the right URL package is  -->
-<!-- used and the ampersand is handled correctly?                        -->
+<!-- NB: this is a genuine URL, with no escaping: consumers apply     -->
+<!-- their own (the LaTeX conversion escapes the ampersand for its    -->
+<!-- "\href", HTML-derived conversions use it as-is, and the QR code  -->
+<!-- generator must encode exactly what a phone's camera should see). -->
 
 <xsl:template match="video[@youtube|@youtubeplaylist]" mode="static-url">
     <xsl:apply-templates select="." mode="youtube-view-url" />
     <xsl:if test="@start">
-        <xsl:text>\&amp;start=</xsl:text>
+        <xsl:text>&amp;start=</xsl:text>
         <xsl:value-of select="@start" />
     </xsl:if>
     <xsl:if test="@end">
-        <xsl:text>\&amp;end=</xsl:text>
+        <xsl:text>&amp;end=</xsl:text>
         <xsl:value-of select="@end" />
     </xsl:if>
 </xsl:template>

package/assets/xsl/pretext-beamer.xsl

@@ -287,7 +287,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:template match="slide//ol/li|slide//ul/li">
     <xsl:text>\item{}</xsl:text>
     <xsl:if test="title">
-        <xsl:text> \lititle{</xsl:text>
+        <xsl:text> \ptxlititle{</xsl:text>
         <xsl:apply-templates select="." mode="title-full"/>
         <xsl:text>}\par</xsl:text>
     </xsl:if>
@@ -434,12 +434,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Preamble -->
 <!-- ######## -->
 
-<!-- N.B. Portions of this preamble duplicate fragments of the LaTeX   -->
-<!-- conversion's preamble, since the inherited content templates      -->
-<!-- presume supporting macros and environments ("image", "sidebyside" -->
-<!-- and "sbspanel", "program", "console", "sageinput"/"sageoutput",   -->
-<!-- tabular rules, semantic macros).  Re-architecting the LaTeX       -->
-<!-- preamble into shareable pieces would remove the duplication.      -->
+<!-- N.B. This preamble is assembled largely from the shared preamble  -->
+<!-- pieces of pretext-latex-common.xsl (tcolorbox setup, images,      -->
+<!-- tables, side-by-side, code, font hooks), so the environments the  -->
+<!-- inherited content templates emit are all defined.  Two fragments  -->
+<!-- remain local duplicates: the semantic macros (a subset, with      -->
+<!-- Beamer-specific treatment of \alert and no styling hooks) and     -->
+<!-- the engine/font setup (fontenc/fontspec, where the regular        -->
+<!-- "font-support" prescribes document fonts a theme should control). -->
 <xsl:template name="beamer-preamble">
     <xsl:text>\documentclass[11pt, compress]{beamer}&#xa;</xsl:text>
     <xsl:if test="$latex.preamble.early != ''">
@@ -466,121 +468,38 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>%% Some aspects of the preamble are conditional,&#xa;</xsl:text>
     <xsl:text>%% the LaTeX engine is one such determinant&#xa;</xsl:text>
     <xsl:text>\usepackage{ifthen}&#xa;</xsl:text>
-    <xsl:text>\newcommand{\tabularfont}{}&#xa;</xsl:text>
-    <xsl:text>\usepackage[xparse, raster]{tcolorbox}&#xa;</xsl:text>
+    <!-- The style-writer font hooks that shared preamble pieces -->
+    <!-- presume; under Beamer the theme controls fonts, so the  -->
+    <!-- no-op defaults are exactly right                        -->
+    <xsl:call-template name="automatic-font-control"/>
+    <xsl:text>%% Shared tcolorbox styles restore paragraph shape via \ptxsetparstyle;&#xa;</xsl:text>
+    <xsl:text>%% under Beamer the theme's paragraph shape should rule, so a no-op&#xa;</xsl:text>
+    <xsl:text>\newcommand{\ptxsetparstyle}{}&#xa;</xsl:text>
+    <!-- The shared tcolorbox setup: package, libraries, stock styles -->
+    <xsl:call-template name="tcolorbox-init"/>
+    <xsl:text>%% Boxes default to white backgrounds and frames, so tcolorbox&#xa;</xsl:text>
+    <xsl:text>%% content does not pick up colors from the Beamer theme&#xa;</xsl:text>
     <xsl:text>\tcbset{colback=white, colframe=white}&#xa;</xsl:text>
-    <xsl:text>%% tcolorbox styles used by images and side-by-side panels&#xa;</xsl:text>
-    <xsl:text>\tcbset{ bwminimalstyle/.style={size=minimal, boxrule=-0.3pt, frame empty,&#xa;</xsl:text>
-    <xsl:text>colback=white, colbacktitle=white, coltitle=black, opacityfill=0.0} }&#xa;</xsl:text>
-    <xsl:if test="$document-root//image">
-        <xsl:text>%% "tcolorbox" environment for a single image, as in the LaTeX conversion&#xa;</xsl:text>
-        <xsl:text>\tcbset{ imagestyle/.style={bwminimalstyle} }&#xa;</xsl:text>
-        <xsl:text>\NewTColorBox{tcbimage}{mmm}{imagestyle,left skip=#1\linewidth,width=#2\linewidth}&#xa;</xsl:text>
-        <xsl:text>\NewDocumentEnvironment{image}{mmmm}{\notblank{#4}{\leavevmode\nopagebreak\vspace{#4}}{}\begin{tcbimage}{#1}{#2}{#3}}{\end{tcbimage}%&#xa;}</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-    </xsl:if>
+    <!-- The shared "tcolorbox" environment for a single image -->
+    <xsl:call-template name="image-tcolorbox"/>
     <xsl:if test="$document-root//ol[@cols]|$document-root//ul[@cols]">
         <xsl:text>%% Multiple column lists&#xa;</xsl:text>
         <xsl:text>\usepackage{multicol}&#xa;</xsl:text>
     </xsl:if>
-    <xsl:if test="$b-has-program or $b-has-console or $b-has-sage">
-        <xsl:text>%% Program listing support: for listings, programs, consoles, and Sage code&#xa;</xsl:text>
-        <xsl:text>\ifthenelse{\boolean{xetex} \or \boolean{luatex}}%&#xa;</xsl:text>
-        <xsl:text>  {\tcbuselibrary{listings}}%&#xa;</xsl:text>
-        <xsl:text>  {\tcbuselibrary{listingsutf8}}%&#xa;</xsl:text>
-        <xsl:text>%% A null language, free of any formatting or style&#xa;</xsl:text>
-        <xsl:text>\lstdefinelanguage{none}{identifierstyle=,commentstyle=,stringstyle=,keywordstyle=}&#xa;</xsl:text>
-        <xsl:if test="$b-has-program">
-            <xsl:text>%% Colors match a subset of Google prettify "Default" style&#xa;</xsl:text>
-            <xsl:text>\definecolor{identifiers}{rgb}{0.375,0,0.375}&#xa;</xsl:text>
-            <xsl:text>\definecolor{comments}{rgb}{0.5,0,0}&#xa;</xsl:text>
-            <xsl:text>\definecolor{strings}{rgb}{0,0.5,0}&#xa;</xsl:text>
-            <xsl:text>\definecolor{keywords}{rgb}{0,0,0.5}&#xa;</xsl:text>
-            <xsl:text>\lstdefinestyle{programcodestyle}{identifierstyle=\color{identifiers},commentstyle=\color{comments},stringstyle=\color{strings},keywordstyle=\color{keywords}, breaklines=true, breakatwhitespace=true, columns=fixed, extendedchars=true, aboveskip=0pt, belowskip=0pt}&#xa;</xsl:text>
-            <xsl:text>\lstdefinestyle{programcodenumberedstyle}{style=programcodestyle, numbers=left}&#xa;</xsl:text>
-            <xsl:text>\tcbset{ programboxstyle/.style={left=3ex, right=0pt, top=0ex, bottom=0ex, middle=0pt, toptitle=0pt, bottomtitle=0pt, boxsep=0pt, &#xa;</xsl:text>
-            <xsl:text>listing only, fontupper=\small\ttfamily,&#xa;</xsl:text>
-            <xsl:text>colback=white, sharp corners, boxrule=-0.3pt, leftrule=0.5pt,&#xa;</xsl:text>
-            <xsl:text>parbox=false,&#xa;</xsl:text>
-            <xsl:text>} }&#xa;</xsl:text>
-            <xsl:text>\tcbset{ programboxnumberedstyle/.style={programboxstyle, left=6ex} }&#xa;</xsl:text>
-            <xsl:text>%% Arguments: language, left margin, width, right margin (latter ignored)&#xa;</xsl:text>
-            <xsl:text>\newtcblisting{program}[4]{programboxstyle, left skip=#2\linewidth, width=#3\linewidth, listing options={language=#1, style=programcodestyle}}&#xa;</xsl:text>
-            <xsl:text>\newtcblisting{programnumbered}[4]{programboxnumberedstyle, left skip=#2\linewidth, width=#3\linewidth, listing options={language=#1, style=programcodenumberedstyle}}&#xa;</xsl:text>
-            <xsl:text>\newcommand{\programfragment}[2]{\lstinline[language=#1, style=programcodestyle, basicstyle=\ttfamily]#2}&#xa;</xsl:text>
-        </xsl:if>
-        <xsl:if test="$b-has-console">
-            <xsl:text>%% Console session with prompt, input, output&#xa;</xsl:text>
-            <xsl:text>\newcommand{\consoleinput}[1]{\textbf{#1}}&#xa;</xsl:text>
-            <xsl:text>\lstdefinestyle{consolecodestyle}{language=none, escapeinside={(*}{*)}, identifierstyle=, commentstyle=, stringstyle=, keywordstyle=, breaklines=false, breakatwhitespace=false, columns=fixed, extendedchars=true, aboveskip=0pt, belowskip=0pt}&#xa;</xsl:text>
-            <xsl:text>\tcbset{ consoleboxstyle/.style={left=0pt, right=0pt, top=0ex, bottom=0ex, middle=0pt, toptitle=0pt, bottomtitle=0pt, boxsep=0pt,&#xa;</xsl:text>
-            <xsl:text>listing only, fontupper=\small\ttfamily,&#xa;</xsl:text>
-            <xsl:text>colback=white, boxrule=-0.3pt,&#xa;</xsl:text>
-            <xsl:text>parbox=false,&#xa;</xsl:text>
-            <xsl:text>} }&#xa;</xsl:text>
-            <xsl:text>%% Arguments: left margin, width, right margin (latter ignored)&#xa;</xsl:text>
-            <xsl:text>\newtcblisting{console}[3]{consoleboxstyle, left skip=#1\linewidth, width=#2\linewidth, listing options={style=consolecodestyle}}&#xa;</xsl:text>
-        </xsl:if>
-        <xsl:if test="$b-has-sage">
-            <xsl:text>%% The listings package as tcolorbox for Sage code&#xa;</xsl:text>
-            <xsl:text>\definecolor{sageblue}{HTML}{</xsl:text><xsl:value-of select="$sage-input-background"/><xsl:text>}&#xa;</xsl:text>
-            <xsl:text>\tcbset{ sagestyle/.style={left=0pt, right=0pt, top=0ex, bottom=0ex, middle=0pt, toptitle=0pt, bottomtitle=0pt,&#xa;</xsl:text>
-            <xsl:text>boxsep=4pt, listing only, fontupper=\small\ttfamily,&#xa;</xsl:text>
-            <xsl:text>parbox=false, &#xa;</xsl:text>
-            <xsl:text>listing options={language=Python,breaklines=true,breakatwhitespace=true, extendedchars=true, aboveskip=0pt, belowskip=0pt}} }&#xa;</xsl:text>
-            <xsl:text>\newtcblisting{sageinput}{sagestyle, colback=sageblue, sharp corners, boxrule=0.5pt, }&#xa;</xsl:text>
-            <xsl:text>\newtcblisting{sageoutput}{sagestyle, colback=white, colframe=white, frame empty, before skip=0pt, after skip=0pt, }&#xa;</xsl:text>
-        </xsl:if>
-    </xsl:if>
-    <xsl:if test="$document-root//sidebyside">
-        <xsl:text>%% tcolorbox styles for sidebyside layout&#xa;</xsl:text>
-        <xsl:text>\tcbset{ sbsstyle/.style={raster before skip=2.0ex, raster equal height=rows, raster force size=false} }&#xa;</xsl:text>
-        <xsl:text>\tcbset{ sbspanelstyle/.style={bwminimalstyle} }&#xa;</xsl:text>
-        <xsl:text>%% "xparse" environment for entire sidebyside&#xa;</xsl:text>
-        <xsl:text>\NewDocumentEnvironment{sidebyside}{mmmm}&#xa;</xsl:text>
-        <xsl:text>  {\begin{tcbraster}&#xa;</xsl:text>
-        <xsl:text>    [sbsstyle,raster columns=#1,&#xa;</xsl:text>
-        <xsl:text>    raster left skip=#2\linewidth,raster right skip=#3\linewidth,raster column skip=#4\linewidth]}&#xa;</xsl:text>
-        <xsl:text>  {\end{tcbraster}}&#xa;</xsl:text>
-        <xsl:text>%% "tcolorbox" environment for a panel of sidebyside&#xa;</xsl:text>
-        <xsl:text>\NewTColorBox{sbspanel}{mO{top}}{sbspanelstyle,width=#1\linewidth,valign=#2}&#xa;</xsl:text>
-    </xsl:if>
-    <xsl:if test="$document-root//tabular">
-        <xsl:text>%% For improved tables&#xa;</xsl:text>
-        <xsl:text>\usepackage{array}&#xa;</xsl:text>
-        <xsl:text>\setlength{\extrarowheight}{0.2ex}&#xa;</xsl:text>
-        <xsl:text>%% Variable thickness horizontal rules, full and partial&#xa;</xsl:text>
-        <xsl:text>\newcommand{\hrulethin}  {\noalign{\hrule height 0.04em}}&#xa;</xsl:text>
-        <xsl:text>\newcommand{\hrulemedium}{\noalign{\hrule height 0.07em}}&#xa;</xsl:text>
-        <xsl:text>\newcommand{\hrulethick} {\noalign{\hrule height 0.11em}}&#xa;</xsl:text>
-        <xsl:text>\let\oldsetlength\setlength&#xa;</xsl:text>
-        <xsl:text>\newlength{\Oldarrayrulewidth}&#xa;</xsl:text>
-        <xsl:text>\newcommand{\crulethin}[1]%&#xa;</xsl:text>
-        <xsl:text>{\noalign{\global\oldsetlength{\Oldarrayrulewidth}{\arrayrulewidth}}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\oldsetlength{\arrayrulewidth}{0.04em}}\cline{#1}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\oldsetlength{\arrayrulewidth}{\Oldarrayrulewidth}}}%&#xa;</xsl:text>
-        <xsl:text>\newcommand{\crulemedium}[1]%&#xa;</xsl:text>
-        <xsl:text>{\noalign{\global\oldsetlength{\Oldarrayrulewidth}{\arrayrulewidth}}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\oldsetlength{\arrayrulewidth}{0.07em}}\cline{#1}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\oldsetlength{\arrayrulewidth}{\Oldarrayrulewidth}}}&#xa;</xsl:text>
-        <xsl:text>\newcommand{\crulethick}[1]%&#xa;</xsl:text>
-        <xsl:text>{\noalign{\global\oldsetlength{\Oldarrayrulewidth}{\arrayrulewidth}}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\oldsetlength{\arrayrulewidth}{0.11em}}\cline{#1}%&#xa;</xsl:text>
-        <xsl:text>\noalign{\global\oldsetlength{\arrayrulewidth}{\Oldarrayrulewidth}}}&#xa;</xsl:text>
-        <xsl:text>%% Single letter column specifiers defined via array package&#xa;</xsl:text>
-        <xsl:text>\newcolumntype{A}{!{\vrule width 0.04em}}&#xa;</xsl:text>
-        <xsl:text>\newcolumntype{B}{!{\vrule width 0.07em}}&#xa;</xsl:text>
-        <xsl:text>\newcolumntype{C}{!{\vrule width 0.11em}}&#xa;</xsl:text>
-    </xsl:if>
-    <xsl:if test="$document-root//cell/line">
-        <xsl:text>\newcommand{\tablecelllines}[3]%&#xa;</xsl:text>
-        <xsl:text>{\begin{tabular}[#2]{@{}#1@{}}#3\end{tabular}}&#xa;</xsl:text>
-    </xsl:if>
+    <!-- The shared support for programs, consoles, Sage code, and -->
+    <!-- verbatim-ish material ("pre", "cd", literate programming) -->
+    <xsl:call-template name="code-support"/>
+    <!-- The shared side-by-side environments; their styles employ -->
+    <!-- the \blocktitlefont and \ptxsetparstyle hooks defined above   -->
+    <xsl:call-template name="sidebyside-environment"/>
+    <!-- The shared table support: rules, column types, and the       -->
+    <!-- "tabularbox" that the inherited "tabular" templates rely on  -->
+    <xsl:call-template name="tables"/>
     <xsl:text>\newcommand{\lt}{&lt;}&#xa;</xsl:text>
     <xsl:text>\newcommand{\gt}{&gt;}&#xa;</xsl:text>
     <xsl:text>\newcommand{\amp}{&amp;}&#xa;</xsl:text>
     <xsl:text>%% Begin: Semantic Macros&#xa;</xsl:text>
-    <xsl:text>\newcommand{\mono}[1]{\texttt{#1}}&#xa;</xsl:text>
+    <xsl:text>\newcommand{\ptxmono}[1]{\texttt{#1}}&#xa;</xsl:text>
     <xsl:variable name="one-line-reps" select="
         ($document-root//abbr)[1]|
         ($document-root//acro)[1]|
@@ -589,13 +508,15 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:apply-templates select="." mode="tex-macro"/>
     </xsl:for-each>
     <xsl:if test="$document-root//alert">
-        <xsl:text>\newcommand{\alert}[1]{\textbf{\textit{#1}}}&#xa;</xsl:text>
+        <!-- Beamer has its own theme-aware, overlay-capable \alert, -->
+        <!-- so the PreTeXt semantic macro is realized through it    -->
+        <xsl:text>\newcommand{\ptxalert}[1]{\alert{#1}}&#xa;</xsl:text>
     </xsl:if>
     <xsl:if test="$document-root//term">
-        <xsl:text>\newcommand{\terminology}[1]{\textbf{#1}}&#xa;</xsl:text>
+        <xsl:text>\newcommand{\ptxterminology}[1]{\textbf{#1}}&#xa;</xsl:text>
     </xsl:if>
     <xsl:if test="$document-root//pubtitle">
-        <xsl:text>\newcommand{\pubtitle}[1]{\textsl{#1}}&#xa;</xsl:text>
+        <xsl:text>\newcommand{\ptxpubtitle}[1]{\textsl{#1}}&#xa;</xsl:text>
     </xsl:if>
     <xsl:if test="$document-root//fillin[not(parent::m or parent::me or parent::men or parent::mrow)]">
         <xsl:call-template name="fillin-text"/>
@@ -604,42 +525,18 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:call-template name="fillin-math"/>
     </xsl:if>
     <xsl:if test="$document-root//swungdash">
-        <xsl:text>\newcommand{\swungdash}{\raisebox{-2.25ex}{\scalebox{2}{\~{}}}}&#xa;</xsl:text>
-    </xsl:if>
-    <xsl:if test="$document-root//quantity">
-        <xsl:text>%% Used for units and number formatting&#xa;</xsl:text>
-        <xsl:text>\usepackage[per-mode=fraction]{siunitx}&#xa;</xsl:text>
-        <xsl:text>\sisetup{inter-unit-product=\cdot}&#xa;</xsl:text>
-        <xsl:text>\ifxetex\sisetup{math-micro=\text{µ},text-micro=µ}\fi&#xa;</xsl:text>
-        <xsl:text>\ifluatex\sisetup{math-micro=\text{µ},text-micro=µ}\fi&#xa;</xsl:text>
-        <xsl:text>%% Common non-SI units&#xa;</xsl:text>
-        <xsl:for-each select="document('pretext-units.xsl')//base[@siunitx]">
-            <xsl:text>\DeclareSIUnit\</xsl:text>
-            <xsl:value-of select="@full" />
-            <xsl:text>{</xsl:text>
-            <xsl:choose>
-                <xsl:when test="@siunitx='none'">
-                    <xsl:value-of select="@short" />
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="@siunitx" />
-                </xsl:otherwise>
-            </xsl:choose>
-            <xsl:text>}&#xa;</xsl:text>
-        </xsl:for-each>
+        <xsl:text>\newcommand{\ptxswungdash}{\raisebox{-2.25ex}{\scalebox{2}{\~{}}}}&#xa;</xsl:text>
     </xsl:if>
+    <!-- The shared siunitx support for "quantity" -->
+    <xsl:call-template name="quantity-support"/>
     <xsl:if test="$document-root//case[@direction]">
         <xsl:text>%% Arrows for iff proofs, with trailing space&#xa;</xsl:text>
-        <xsl:text>\newcommand{\forwardimplication}{($\Rightarrow$)}&#xa;</xsl:text>
-        <xsl:text>\newcommand{\backwardimplication}{($\Leftarrow$)}&#xa;</xsl:text>
+        <xsl:text>\newcommand{\ptxforwardimplication}{($\Rightarrow$)}&#xa;</xsl:text>
+        <xsl:text>\newcommand{\ptxbackwardimplication}{($\Leftarrow$)}&#xa;</xsl:text>
     </xsl:if>
     <xsl:if test="$document-root//ol/li/title|$document-root//ul/li/title">
         <xsl:text>%% Style of a title on a list item, for ordered and unordered lists&#xa;</xsl:text>
-        <xsl:text>\newcommand{\lititle}[1]{{\slshape#1}}&#xa;</xsl:text>
-    </xsl:if>
-    <xsl:if test="$document-root//xref">
-        <xsl:text>%% Font for cross-reference numbers, a no-op on slides&#xa;</xsl:text>
-        <xsl:text>\newcommand{\xreffont}{}&#xa;</xsl:text>
+        <xsl:text>\newcommand{\ptxlititle}[1]{{\slshape#1}}&#xa;</xsl:text>
     </xsl:if>
     <xsl:text>%% End: Semantic Macros&#xa;</xsl:text>
     <xsl:if test="$latex.preamble.late != ''">