@pretextbook/pretext-html 0.8.0 → 0.9.0

package/assets/xsl/pretext-common.xsl

@@ -81,6 +81,12 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- provisional cross-references show in red          -->
 <xsl:param name="author.tools" select="''" />
 
+<!-- The Godot engine version used for GDScript.  Read both by the   -->
+<!-- conversion to Runestone, for the Web Assembly shell, and by the -->
+<!-- "pck" extraction, which runs as a separate command.  A default  -->
+<!-- in each would let the two silently disagree.                    -->
+<xsl:param name="godot.version" select="'4.6.3'"/>
+
 <!-- ######### -->
 <!-- Variables -->
 <!-- ######### -->
@@ -2828,7 +2834,7 @@ Book (with parts), "section" at level 3
     <xsl:value-of select="true()"/>
 </xsl:template>
 <!-- Introductions and Conclusions -->
-<xsl:template match="article/introduction|chapter/introduction|section/introduction|subsection/introduction|appendix/introduction|exercises/introduction|solutions/introduction|worksheet/introduction|handout/introduction|reading-questions/introduction|glossary/introduction|references/introduction|article/conclusion|chapter/conclusion|section/conclusion|subsection/conclusion|appendix/conclusion|exercises/conclusion|solutions/conclusion|worksheet/conclusion|handout/conclusion|reading-questions/conclusion|glossary/conclusion|references/conclusion" mode="title-wants-punctuation">
+<xsl:template match="article/introduction|chapter/introduction|section/introduction|subsection/introduction|appendix/introduction|exercises/introduction|solutions/introduction|worksheet/introduction|handout/introduction|reading-questions/introduction|article/conclusion|chapter/conclusion|section/conclusion|subsection/conclusion|appendix/conclusion|exercises/conclusion|solutions/conclusion|worksheet/conclusion|handout/conclusion|reading-questions/conclusion" mode="title-wants-punctuation">
     <xsl:value-of select="true()"/>
 </xsl:template>
 <xsl:template match="*" mode="title-wants-punctuation">
@@ -3201,7 +3207,7 @@ Book (with parts), "section" at level 3
             <xsl:text>[</xsl:text>
             <xsl:value-of select="$str-id" />
             <xsl:text>]</xsl:text>
-            <xsl:message>PTX:BUG:     could not translate string with id "<xsl:value-of select="$str-id"/>" into language for code "<xsl:value-of select="$lang"/>"</xsl:message>
+            <xsl:message>PTX:WARNING: could not translate string with id "<xsl:value-of select="$str-id"/>" into language for code "<xsl:value-of select="$lang"/>"</xsl:message>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>
@@ -3217,6 +3223,19 @@ Book (with parts), "section" at level 3
     </xsl:apply-templates>
 </xsl:template>
 
+<!-- A bare appendix letter beside a title is ambiguous ("A Trip    -->
+<!-- Abroad"), so wherever the letter and title compose on one line -->
+<!-- a period follows the letter: "A. Trip Abroad".  A "solutions"  -->
+<!-- division in the back matter shares the letter sequence (see    -->
+<!-- "division-serial-number" in the assembly), so it is treated    -->
+<!-- identically.  Only the top-level letter: subdivision numbers   -->
+<!-- ("A.2") are already unambiguous.  Styling refinements are      -->
+<!-- anticipated.                                                   -->
+<xsl:template match="*" mode="division-number-separator"/>
+<xsl:template match="appendix|backmatter/solutions" mode="division-number-separator">
+    <xsl:text>.</xsl:text>
+</xsl:template>
+
 <!-- Most PreTeXt elements have names, and their localizations, indexed   -->
 <!-- by a "string-id" that is simply their local name.  However, others   -->
 <!-- ("exercise" is archetypical) have names that vary according to their -->
@@ -3819,7 +3838,7 @@ Book (with parts), "section" at level 3
                 <xsl:text>has been encountered without a @label attribute.  For reasons of backward-compatibility &#xa;</xsl:text>
                 <xsl:text>we have used the value of an @xml:id.  This may not be what you want, and as of 2024-02-15 &#xa;</xsl:text>
                 <xsl:text>is no longer best practice.  You can copy the @xml:id value exactly into a new @label &#xa;</xsl:text>
-                <xsl:text>attribute and this warning will stop AND your project's entries in any Runestone database &#xa;</xsl:text>
+                <xsl:text>attribute and this message will stop AND your project's entries in any Runestone database &#xa;</xsl:text>
                 <xsl:text>will be preserved and function exactly as before.&#xa;</xsl:text>
                 <xsl:text>[You may get more than one message about this instance.]&#xa;</xsl:text>
             </xsl:message>
@@ -6484,7 +6503,7 @@ Book (with parts), "section" at level 3
     <xsl:if test="@primary='no' or @secondary='yes'">
         <xsl:text>Secondary </xsl:text>
     </xsl:if>
-    <xsl:value-of select="."/>
+    <xsl:value-of select="normalize-space(.)"/>
     <xsl:choose>
         <xsl:when test="following-sibling::keyword[1][@primary='no' or @secondary='yes']">
             <xsl:text>; </xsl:text>
@@ -7387,6 +7406,8 @@ Book (with parts), "section" at level 3
     <language name="basic"      active=""            listings="Basic"            prism="basic"/>
     <language name="c"          active="c"           listings="C"                prism="c"/>
     <language name="cpp"        active="cpp"         listings="C++"              prism="cpp"/>
+    <!-- using Python as a closest match for now in listings. -->
+    <language name="gdscript"   active="gdscript"    listings="Python"           prism="gdscript"/>
     <language name="go"         active=""            listings="C"                prism="go"/>
     <language name="java"       active="java"        listings="Java"             prism="java"/>
     <language name="javascript" active="javascript"  listings=""                 prism="javascript"/>
@@ -7461,6 +7482,35 @@ Book (with parts), "section" at level 3
     </xsl:if>
 </xsl:variable>
 
+<!-- The content of a "slide" of a "slideshow" may be placed at   -->
+<!-- the top, middle, or bottom of the slide.  A document-wide    -->
+<!-- default comes from "docinfo/defaults/slides/@valign"; absent -->
+<!-- an expressed preference, content is placed at the top.       -->
+<xsl:variable name="slides-valign-default">
+    <xsl:choose>
+        <xsl:when test="$docinfo/defaults/slides/@valign">
+            <xsl:value-of select="$docinfo/defaults/slides/@valign"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>top</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:variable>
+
+<!-- A "slide" may override the document-wide default with its  -->
+<!-- own "@valign"; the conversions consult this modal template -->
+<!-- for the effective vertical alignment of a slide's content. -->
+<xsl:template match="slide" mode="valign">
+    <xsl:choose>
+        <xsl:when test="@valign">
+            <xsl:value-of select="@valign"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="$slides-valign-default"/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
 <!-- Determine programming language to use. First choice is @language     -->
 <!-- on current element. If that is not available, check docinfo default. -->
 <!-- "exercise" might be a Runestone interactive (programming) exercise.  -->
@@ -9018,18 +9068,32 @@ Book (with parts), "section" at level 3
                 <!-- content override of type-prefix -->
                 <xsl:when test="$b-has-content">
                     <xsl:copy-of select="$custom-text" />
-                    <xsl:apply-templates select="." mode="xref-text-separator"/>
-                    <xsl:apply-templates select="$target" mode="xref-number">
-                        <xsl:with-param name="xref" select="." />
-                    </xsl:apply-templates>
+                    <xsl:variable name="the-number">
+                        <xsl:apply-templates select="$target" mode="xref-number">
+                            <xsl:with-param name="xref" select="." />
+                        </xsl:apply-templates>
+                    </xsl:variable>
+                    <!-- an unnumbered target ("paragraphs", squelched  -->
+                    <!-- numbering) contributes no separator, either    -->
+                    <xsl:if test="not($the-number = '')">
+                        <xsl:apply-templates select="." mode="xref-text-separator"/>
+                    </xsl:if>
+                    <xsl:copy-of select="$the-number"/>
                 </xsl:when>
                 <!-- usual, default case -->
                 <xsl:otherwise>
                     <xsl:apply-templates select="$target" mode="type-name" />
-                    <xsl:apply-templates select="." mode="xref-text-separator"/>
-                    <xsl:apply-templates select="$target" mode="xref-number">
-                        <xsl:with-param name="xref" select="." />
-                    </xsl:apply-templates>
+                    <xsl:variable name="the-number">
+                        <xsl:apply-templates select="$target" mode="xref-number">
+                            <xsl:with-param name="xref" select="." />
+                        </xsl:apply-templates>
+                    </xsl:variable>
+                    <!-- an unnumbered target ("paragraphs", squelched  -->
+                    <!-- numbering) contributes no separator, either    -->
+                    <xsl:if test="not($the-number = '')">
+                        <xsl:apply-templates select="." mode="xref-text-separator"/>
+                    </xsl:if>
+                    <xsl:copy-of select="$the-number"/>
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:when>
@@ -9038,14 +9102,50 @@ Book (with parts), "section" at level 3
                 <!-- content override of type-prefix -->
                 <xsl:when test="$b-has-content">
                     <xsl:copy-of select="$custom-text" />
-                    <xsl:apply-templates select="." mode="xref-text-separator"/>
-                    <xsl:apply-templates select="$target" mode="serial-number" />
+                    <xsl:variable name="the-number">
+                        <xsl:apply-templates select="$target" mode="serial-number" />
+                    </xsl:variable>
+                    <!-- an unnumbered target ("paragraphs", squelched  -->
+                    <!-- numbering) contributes no separator, either    -->
+                    <xsl:if test="not($the-number = '')">
+                        <xsl:apply-templates select="." mode="xref-text-separator"/>
+                    </xsl:if>
+                    <!-- a task's local serial reads as its rendered  -->
+                    <!-- label: "Task (a)", not "Task a"              -->
+                    <xsl:choose>
+                        <xsl:when test="$target/self::task">
+                            <xsl:text>(</xsl:text>
+                            <xsl:copy-of select="$the-number"/>
+                            <xsl:text>)</xsl:text>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:copy-of select="$the-number"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </xsl:when>
                 <!-- usual, default case -->
                 <xsl:otherwise>
                     <xsl:apply-templates select="$target" mode="type-name" />
-                    <xsl:apply-templates select="." mode="xref-text-separator"/>
-                    <xsl:apply-templates select="$target" mode="serial-number" />
+                    <xsl:variable name="the-number">
+                        <xsl:apply-templates select="$target" mode="serial-number" />
+                    </xsl:variable>
+                    <!-- an unnumbered target ("paragraphs", squelched  -->
+                    <!-- numbering) contributes no separator, either    -->
+                    <xsl:if test="not($the-number = '')">
+                        <xsl:apply-templates select="." mode="xref-text-separator"/>
+                    </xsl:if>
+                    <!-- a task's local serial reads as its rendered  -->
+                    <!-- label: "Task (a)", not "Task a"              -->
+                    <xsl:choose>
+                        <xsl:when test="$target/self::task">
+                            <xsl:text>(</xsl:text>
+                            <xsl:copy-of select="$the-number"/>
+                            <xsl:text>)</xsl:text>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:copy-of select="$the-number"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:when>
@@ -9060,19 +9160,26 @@ Book (with parts), "section" at level 3
                     <xsl:apply-templates select="$target" mode="type-name" />
                 </xsl:otherwise>
             </xsl:choose>
-            <xsl:apply-templates select="." mode="xref-text-separator"/>
             <!-- only difference in behavior is global/local number -->
-            <xsl:choose>
-                <xsl:when test="$text-style = 'type-global-title'">
-                    <xsl:apply-templates select="$target" mode="xref-number">
-                        <xsl:with-param name="xref" select="." />
-                    </xsl:apply-templates>
-                </xsl:when>
-                <xsl:when test="$text-style = 'type-local-title'">
-                    <xsl:apply-templates select="$target" mode="serial-number"/>
-                </xsl:when>
-                <xsl:otherwise/>
-            </xsl:choose>
+            <xsl:variable name="the-number">
+                <xsl:choose>
+                    <xsl:when test="$text-style = 'type-global-title'">
+                        <xsl:apply-templates select="$target" mode="xref-number">
+                            <xsl:with-param name="xref" select="." />
+                        </xsl:apply-templates>
+                    </xsl:when>
+                    <xsl:when test="$text-style = 'type-local-title'">
+                        <xsl:apply-templates select="$target" mode="serial-number"/>
+                    </xsl:when>
+                    <xsl:otherwise/>
+                </xsl:choose>
+            </xsl:variable>
+            <!-- an unnumbered target ("paragraphs", squelched  -->
+            <!-- numbering) contributes no separator, either    -->
+            <xsl:if test="not($the-number = '')">
+                <xsl:apply-templates select="." mode="xref-text-separator"/>
+            </xsl:if>
+            <xsl:copy-of select="$the-number"/>
             <xsl:variable name="the-title">
                 <xsl:apply-templates select="$target" mode="title-xref"/>
             </xsl:variable>
@@ -11902,6 +12009,27 @@ http://andrewmccarthy.ie/2014/11/06/swung-dash-in-latex/
         <xsl:with-param name="message" select="'the document-wide style of cross-reference text is now a &quot;text&quot; attribute on an &quot;xrefs&quot; element within &quot;docinfo/defaults&quot;, replacing the &quot;cross-references&quot; element.  We will honor your intent, but please convert to the new form.'"/>
     </xsl:call-template>
     <!--  -->
+    <!-- 2026-07-31  a footnote within a "tabular" cell becomes a "tn" table note -->
+    <xsl:call-template name="deprecation-message">
+        <xsl:with-param name="occurrences" select="&quot;$document-root//tabular//fn&quot;" />
+        <xsl:with-param name="date-string" select="'2026-07-31'" />
+        <xsl:with-param name="message" select="'a footnote (&quot;fn&quot;) within a &quot;tabular&quot; cell is now a table note, the &quot;tn&quot; element, lettered and placed at the bottom of the table.  We will honor your intent, but please convert to &quot;tn&quot;.  Note that a table note is not part of the numbering of true footnotes, and is not a target for a cross-reference.'"/>
+    </xsl:call-template>
+    <!--  -->
+    <!-- 2026-08-06  references "introduction" is now a "headnote" -->
+    <xsl:call-template name="deprecation-message">
+        <xsl:with-param name="occurrences" select="&quot;$document-root//references/introduction&quot;" />
+        <xsl:with-param name="date-string" select="'2026-08-06'" />
+        <xsl:with-param name="message" select="'a &quot;references&quot; &quot;introduction&quot; is now a &quot;headnote&quot;.  We will attempt to fix your source, but a &quot;title&quot; on such an &quot;introduction&quot; is discarded entirely: its text will not appear in any output.  Please convert to a &quot;headnote&quot; yourself'"/>
+    </xsl:call-template>
+    <!--  -->
+    <!-- 2026-08-06  references "conclusion" is obsolete -->
+    <xsl:call-template name="deprecation-message">
+        <xsl:with-param name="occurrences" select="&quot;$document-root//references/conclusion&quot;" />
+        <xsl:with-param name="date-string" select="'2026-08-06'" />
+        <xsl:with-param name="message" select="'a &quot;references&quot; division no longer has a &quot;conclusion&quot;.  The element is discarded entirely: its content will not appear in any output.  Please relocate the content, perhaps following the &quot;references&quot;'"/>
+    </xsl:call-template>
+    <!--  -->
 </xsl:template>
 
 <!-- Miscellaneous -->

package/assets/xsl/pretext-epub.xsl

@@ -1403,11 +1403,6 @@
 </xsl:template>
 
 <!-- Footnotes -->
-<!-- First disable the "footnote" popping routine used to -->
-<!-- move the content out of HTML structures where it is  -->
-<!-- not welcome (e.g a "p" inside a "p").                -->
-<xsl:template match="*" mode="pop-footnote-text"/>
-
 <!-- Drop a marker as a superscript -->
 <xsl:template match="fn">
     <xsl:variable name="hid">

package/assets/xsl/pretext-fo.xsl

@@ -430,6 +430,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             </xsl:variable>
             <xsl:if test="not($the-number = '')">
                 <xsl:value-of select="$the-number"/>
+                <xsl:apply-templates select="." mode="division-number-separator"/>
                 <xsl:text> </xsl:text>
             </xsl:if>
             <xsl:variable name="the-title">
@@ -498,11 +499,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <xsl:template match="affiliation">
-    <xsl:apply-templates select="department|institution|location"/>
+    <xsl:apply-templates select="position|department|institution|location"/>
 </xsl:template>
 
 <!-- each is a line, or authored "line"s, of the address block -->
-<xsl:template match="department|institution|location">
+<xsl:template match="position|department|institution|location">
     <xsl:choose>
         <xsl:when test="line">
             <xsl:apply-templates select="line"/>
@@ -731,6 +732,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:apply-templates select="." mode="link-id-attribute"/>
                 <xsl:if test="not($the-number = '')">
                     <xsl:value-of select="$the-number"/>
+                    <xsl:apply-templates select="." mode="division-number-separator"/>
                     <xsl:text> </xsl:text>
                 </xsl:if>
                 <xsl:apply-templates select="." mode="title-full"/>
@@ -1431,24 +1433,32 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:apply-templates select="." mode="exercise-heading"/>
             <xsl:text> </xsl:text>
         </xsl:variable>
+        <!-- The component switches must pass as genuine booleans: a   -->
+        <!-- with-param carrying *content* is a result tree fragment,   -->
+        <!-- and any fragment, even one whose text is "false", is true  -->
+        <!-- in the boolean tests downstream.  So: compute the strings, -->
+        <!-- pass comparisons.                                          -->
+        <xsl:variable name="has-hint">
+            <xsl:apply-templates select="." mode="b-main-text-component">
+                <xsl:with-param name="component" select="'hint'"/>
+            </xsl:apply-templates>
+        </xsl:variable>
+        <xsl:variable name="has-answer">
+            <xsl:apply-templates select="." mode="b-main-text-component">
+                <xsl:with-param name="component" select="'answer'"/>
+            </xsl:apply-templates>
+        </xsl:variable>
+        <xsl:variable name="has-solution">
+            <xsl:apply-templates select="." mode="b-main-text-component">
+                <xsl:with-param name="component" select="'solution'"/>
+            </xsl:apply-templates>
+        </xsl:variable>
         <xsl:apply-templates select="." mode="exercise-components">
             <xsl:with-param name="b-original" select="true()"/>
             <xsl:with-param name="b-has-statement" select="true()"/>
-            <xsl:with-param name="b-has-hint">
-                <xsl:apply-templates select="." mode="b-main-text-component">
-                    <xsl:with-param name="component" select="'hint'"/>
-                </xsl:apply-templates>
-            </xsl:with-param>
-            <xsl:with-param name="b-has-answer">
-                <xsl:apply-templates select="." mode="b-main-text-component">
-                    <xsl:with-param name="component" select="'answer'"/>
-                </xsl:apply-templates>
-            </xsl:with-param>
-            <xsl:with-param name="b-has-solution">
-                <xsl:apply-templates select="." mode="b-main-text-component">
-                    <xsl:with-param name="component" select="'solution'"/>
-                </xsl:apply-templates>
-            </xsl:with-param>
+            <xsl:with-param name="b-has-hint" select="$has-hint = 'true'"/>
+            <xsl:with-param name="b-has-answer" select="$has-answer = 'true'"/>
+            <xsl:with-param name="b-has-solution" select="$has-solution = 'true'"/>
             <xsl:with-param name="run-in-heading" select="$heading"/>
         </xsl:apply-templates>
         <!-- writing space below, in a printout, when requested -->
@@ -2346,6 +2356,19 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:apply-templates select="row[not(@header = 'yes') and not(@header = 'vertical')]"/>
         </fo:table-body>
     </fo:table>
+    <!-- Table notes ("tn") collect just below the table, lettered in -->
+    <!-- reading order, which is document order of the marks (Notes   -->
+    <!-- to tables: CMoS 18th ed., 3.77-3.81; specific notes at       -->
+    <!-- 3.80).  Disjoint from true footnote numbering.               -->
+    <xsl:for-each select=".//tn">
+        <fo:block font-size="80%" text-align="{$text-alignment}" text-align-last="start" space-before="0.25em">
+            <fo:inline baseline-shift="35%" font-size="70%" font-style="italic">
+                <xsl:apply-templates select="." mode="number"/>
+            </fo:inline>
+            <xsl:text> </xsl:text>
+            <xsl:apply-templates/>
+        </fo:block>
+    </xsl:for-each>
 </xsl:template>
 
 <!-- An estimated width, in points, for each of a tabular's columns, -->
@@ -2455,6 +2478,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <xsl:template match="fn" mode="width-text"/>
 
+<!-- A table note's text sets below the table, so a cell is only -->
+<!-- as wide as its mark: one superscript letter, roughly one    -->
+<!-- character.                                                  -->
+<xsl:template match="tn" mode="width-text">
+    <xsl:text>a</xsl:text>
+</xsl:template>
+
 <!-- A cross-reference's displayed text is generated, never in    -->
 <!-- the source, so render it via the shared "xref-text" (driven  -->
 <!-- by the resolved text style) rather than measure an empty     -->
@@ -3179,42 +3209,65 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Figures and Caption -->
 <!-- ################### -->
 
-<!-- The FIGURE-LIKE blocks (a captioned "figure"; and "table",   -->
-<!-- "listing", "list", each titled) wrap their contents and      -->
-<!-- finish with a caption: a body-aligned paragraph led by a     -->
-<!-- bold run-in heading (the type name and number), so a long    -->
-<!-- caption sets as ordinary prose, not centered ragged lines.   -->
-<!-- All share one counter.  The "caption" element is consumed    -->
-<!-- here, so it is killed in the default mode, with the rest     -->
-<!-- of the metadata.                                             -->
+<!-- The FIGURE-LIKE blocks: a "figure" wraps its contents and    -->
+<!-- finishes with its caption below, while the titled blocks     -->
+<!-- ("table", "listing", "list") lead with their title above,    -->
+<!-- as the other conversions do.  Either way the heading is a    -->
+<!-- body-aligned paragraph led by a bold run-in (the type name   -->
+<!-- and number), so a long caption or title sets as ordinary     -->
+<!-- prose, not centered ragged lines.  All share one counter.    -->
+<!-- The "caption" element is consumed here, so it is killed in   -->
+<!-- the default mode, with the rest of the metadata.             -->
 <xsl:template match="&FIGURE-LIKE;">
     <xsl:apply-templates select="." mode="forced-pagebreak"/>
     <fo:block space-before="1em" space-after="1em">
         <xsl:apply-templates select="." mode="link-id-attribute"/>
+        <xsl:if test="not(self::figure)">
+            <xsl:apply-templates select="." mode="figure-like-heading"/>
+        </xsl:if>
         <xsl:apply-templates select="*"/>
-        <fo:block text-align="{$text-alignment}" space-before="0.5em" keep-with-previous.within-page="always">
-            <fo:inline font-weight="bold">
-                <xsl:apply-templates select="." mode="type-name"/>
-                <xsl:variable name="the-number">
-                    <xsl:apply-templates select="." mode="number"/>
-                </xsl:variable>
-                <xsl:if test="not($the-number = '')">
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="$the-number"/>
-                </xsl:if>
-                <xsl:text>.</xsl:text>
-            </fo:inline>
-            <xsl:text> </xsl:text>
-            <xsl:choose>
-                <xsl:when test="self::figure">
-                    <xsl:apply-templates select="caption/node()"/>
-                </xsl:when>
-                <!-- "table", "listing", "list" are titled -->
-                <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="title-full"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </fo:block>
+        <xsl:if test="self::figure">
+            <xsl:apply-templates select="." mode="figure-like-heading"/>
+        </xsl:if>
+    </fo:block>
+</xsl:template>
+
+<!-- The caption of a "figure" (set below, held to its content), or -->
+<!-- the title of a "table"/"listing"/"list" (set above, held to    -->
+<!-- its content).                                                  -->
+<xsl:template match="&FIGURE-LIKE;" mode="figure-like-heading">
+    <fo:block text-align="{$text-alignment}">
+        <xsl:choose>
+            <xsl:when test="self::figure">
+                <xsl:attribute name="space-before">0.5em</xsl:attribute>
+                <xsl:attribute name="keep-with-previous.within-page">always</xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:attribute name="space-after">0.5em</xsl:attribute>
+                <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
+            </xsl:otherwise>
+        </xsl:choose>
+        <fo:inline font-weight="bold">
+            <xsl:apply-templates select="." mode="type-name"/>
+            <xsl:variable name="the-number">
+                <xsl:apply-templates select="." mode="number"/>
+            </xsl:variable>
+            <xsl:if test="not($the-number = '')">
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="$the-number"/>
+            </xsl:if>
+            <xsl:text>.</xsl:text>
+        </fo:inline>
+        <xsl:text> </xsl:text>
+        <xsl:choose>
+            <xsl:when test="self::figure">
+                <xsl:apply-templates select="caption/node()"/>
+            </xsl:when>
+            <!-- "table", "listing", "list" are titled -->
+            <xsl:otherwise>
+                <xsl:apply-templates select="." mode="title-full"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </fo:block>
 </xsl:template>
 
@@ -3624,6 +3677,15 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- text, and the body, marked again, collected at the bottom of -->
 <!-- the page above the separator rule defined in the entry       -->
 <!-- template.  The footnote number is the serial machinery's.    -->
+<!-- A table note ("tn") drops only its superscript letter mark at   -->
+<!-- the cell location; the note text collects below the table, in   -->
+<!-- the "tabular" template.  No footnote machinery is involved.     -->
+<xsl:template match="tabular//tn">
+    <fo:inline baseline-shift="35%" font-size="70%" font-style="italic">
+        <xsl:apply-templates select="." mode="number"/>
+    </fo:inline>
+</xsl:template>
+
 <xsl:template match="fn">
     <xsl:variable name="the-mark">
         <xsl:apply-templates select="." mode="serial-number"/>