@pretextbook/pretext-html 0.8.0 → 0.10.0

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

@@ -369,6 +369,15 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\AtBeginDocument{\setlength{\ptxnormalparindent}{\parindent}}&#xa;</xsl:text>
     <xsl:text>\AtBeginDocument{\setlength{\ptxnormalparskip}{\parskip}}&#xa;</xsl:text>
     <xsl:text>\newcommand{\ptxsetparstyle}{\setlength{\parindent}{\ptxnormalparindent}\setlength{\parskip}{\ptxnormalparskip}}</xsl:text>
+    <xsl:text>%% An appendix is numbered by a letter, and a bare letter beside a&#xa;</xsl:text>
+    <xsl:text>%% title is ambiguous ("A Trip Abroad"), so a letter composed with&#xa;</xsl:text>
+    <xsl:text>%% a title carries a period ("A. Trip Abroad").  These macros are&#xa;</xsl:text>
+    <xsl:text>%% seams in the division styles, empty until the appendices arrive&#xa;</xsl:text>
+    <xsl:text>%% (chapter-level for a book, section-level for an article, so a&#xa;</xsl:text>
+    <xsl:text>%% multi-part number like "E.1" never gains a period); see the&#xa;</xsl:text>
+    <xsl:text>%% uses at  \appendix&#xa;</xsl:text>
+    <xsl:text>\newcommand{\ptxappendixperiodchapter}{}&#xa;</xsl:text>
+    <xsl:text>\newcommand{\ptxappendixperiodsection}{}&#xa;</xsl:text>
     <xsl:text>%% Hyperref should be here, but likes to be loaded late&#xa;</xsl:text>
     <xsl:text>%%&#xa;</xsl:text>
     <xsl:text>%% Inline math delimiters, \(, \), need to be robust&#xa;</xsl:text>
@@ -1012,6 +1021,10 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Tables -->
 <xsl:template name="tables">
+    <xsl:if test="$document-root//tabular[.//tn]">
+        <xsl:text>%% A box to measure a "tabular", so its table notes set to its width&#xa;</xsl:text>
+        <xsl:text>\newsavebox{\ptxtablenotebox}&#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>
@@ -1492,10 +1505,31 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- http://tex.stackexchange.com/questions/106159/why-i-shouldnt-load-pdftex-option-with-hyperref -->
 <xsl:template name="load-configure-hyperref">
     <xsl:text>%% hyperref driver does not need to be specified, it will be detected&#xa;</xsl:text>
-    <xsl:text>%% Footnote marks in tcolorbox have broken linking under&#xa;</xsl:text>
-    <xsl:text>%% hyperref, so it is necessary to turn off all linking&#xa;</xsl:text>
-    <xsl:text>%% It *must* be given as a package option, not with \hypersetup&#xa;</xsl:text>
-    <xsl:text>\usepackage[hyperfootnotes=false]{hyperref}&#xa;</xsl:text>
+    <xsl:text>\usepackage{hyperref}&#xa;</xsl:text>
+    <!-- Any footnote within a tcolorbox-implemented block would have    -->
+    <!-- its text trapped in the box, marked by the letters of the       -->
+    <!-- "mpfootnote" counter that boxes switch to.  The "footnotehyper" -->
+    <!-- package (the hyperref-safe successor of "footnote") supplies    -->
+    <!-- the "savenotes" environment: wrapped around a box, it delays    -->
+    <!-- each footnote's text to the true page bottom.  The              -->
+    <!-- "\ptxnativefootnotes" command restores the standard counter,    -->
+    <!-- so marks number continuously with the running text.  It rides   -->
+    <!-- on "\ptxsetparstyle", which every paragraph-organized box       -->
+    <!-- already runs at exactly the right moment (after any title       -->
+    <!-- attaches to the upper part, which is too early), and a hook     -->
+    <!-- covers lower parts (figure captions).  Block templates emit     -->
+    <!-- the wrapping via the "begin-saved-footnotes" and                -->
+    <!-- "end-saved-footnotes" templates.                                -->
+    <xsl:if test="$document-root//fn">
+        <xsl:text>%% footnotehyper: footnote text escapes boxed environments ("savenotes")&#xa;</xsl:text>
+        <xsl:text>%% and every box restores the standard footnote counter for its marks&#xa;</xsl:text>
+        <xsl:text>\usepackage{footnotehyper}&#xa;</xsl:text>
+        <xsl:text>\makeatletter&#xa;</xsl:text>
+        <xsl:text>\newcommand{\ptxnativefootnotes}{\def\@mpfn{footnote}\def\thempfn{\thefootnote}}&#xa;</xsl:text>
+        <xsl:text>\makeatother&#xa;</xsl:text>
+        <xsl:text>\appto\ptxsetparstyle{\ptxnativefootnotes}&#xa;</xsl:text>
+        <xsl:text>\tcbset{every box/.append style={before lower pre={\ptxnativefootnotes}}}&#xa;</xsl:text>
+    </xsl:if>
     <!-- http://tex.stackexchange.com/questions/79051/how-to-style-text-in-hyperref-url -->
     <xsl:if test="$document-root//url">
     <xsl:text>%% configure hyperref's  \href{}{}  and  \nolinkurl  to match listings' inline verbatim&#xa;</xsl:text>
@@ -1511,6 +1545,10 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <!-- unexpected-value-for-option-hidelinkshyperref-is-ignored -->
         <!-- https://tex.stackexchange.com/a/503001                   -->
         <xsl:text>\hypersetup{hidelinks}&#xa;</xsl:text>
+        <xsl:text>%% A print PDF needs no internal anchors, nor links to them:&#xa;</xsl:text>
+        <xsl:text>%% both dissolve to their content, which preserves spacing&#xa;</xsl:text>
+        <xsl:text>\renewcommand{\hypertarget}[2]{#2}&#xa;</xsl:text>
+        <xsl:text>\renewcommand{\hyperlink}[2]{#2}&#xa;</xsl:text>
     </xsl:if>
     <!-- Hyperref gives names to destinations for links that look like      -->
     <!-- "section*.5.2" which you can guess is the second section of        -->
@@ -1931,8 +1969,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:for-each>
     <!-- INTRODUCTION, CONCLUSION (divisional) -->
     <xsl:variable name="introduction-reps" select="
-        ($root/article/introduction|$document-root//chapter/introduction|$document-root//section/introduction|$document-root//subsection/introduction|$document-root//appendix/introduction|$document-root//exercises/introduction|$document-root//solutions/introduction|$document-root//worksheet/introduction|$document-root//handout/introduction|$document-root//reading-questions/introduction|$document-root//glossary/introduction|$document-root//references/introduction)[1]|
-        ($root/article/conclusion|$document-root//chapter/conclusion|$document-root//section/conclusion|$document-root//subsection/conclusion|$document-root//appendix/conclusion|$document-root//exercises/conclusion|$document-root//solutions/conclusion|$document-root//worksheet/conclusion|$document-root//handout/conclusion|$document-root//handout/conclusion|$document-root//reading-questions/conclusion|$document-root//glossary/conclusion|$document-root//references/conclusion)[1]"/>
+        ($root/article/introduction|$document-root//chapter/introduction|$document-root//section/introduction|$document-root//subsection/introduction|$document-root//appendix/introduction|$document-root//exercises/introduction|$document-root//solutions/introduction|$document-root//worksheet/introduction|$document-root//handout/introduction|$document-root//reading-questions/introduction)[1]|
+        ($root/article/conclusion|$document-root//chapter/conclusion|$document-root//section/conclusion|$document-root//subsection/conclusion|$document-root//appendix/conclusion|$document-root//exercises/conclusion|$document-root//solutions/conclusion|$document-root//worksheet/conclusion|$document-root//handout/conclusion|$document-root//reading-questions/conclusion)[1]"/>
     <xsl:if test="$introduction-reps">
         <xsl:text>%%&#xa;</xsl:text>
         <xsl:text>%% xparse environments for introductions and conclusions of divisions&#xa;</xsl:text>
@@ -1941,6 +1979,16 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:for-each select="$introduction-reps">
         <xsl:apply-templates select="." mode="environment"/>
     </xsl:for-each>
+    <!-- HEADNOTE (prefatory note of a list-like division) -->
+    <xsl:variable name="headnote-reps" select="($document-root//headnote)[1]"/>
+    <xsl:if test="$headnote-reps">
+        <xsl:text>%%&#xa;</xsl:text>
+        <xsl:text>%% xparse environment for headnotes of list-like divisions&#xa;</xsl:text>
+        <xsl:text>%%&#xa;</xsl:text>
+    </xsl:if>
+    <xsl:for-each select="$headnote-reps">
+        <xsl:apply-templates select="." mode="environment"/>
+    </xsl:for-each>
     <!-- MISCELLANEOUS -->
     <!-- "paragraphs" are partly like a division, -->
     <!-- but we include it here as a one-off      -->
@@ -2336,6 +2384,18 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
+<!-- A "headnote" is the prefatory note of a list-like division -->
+<!-- (a glossary, a references, an index, an appendix that is a -->
+<!-- notation list).  It functions just like an "introduction", -->
+<!-- though a headnote never carries a title of its own.        -->
+<xsl:template match="headnote" mode="environment">
+    <xsl:text>%% headnote: prefatory note of a list-like division&#xa;</xsl:text>
+    <xsl:text>\NewDocumentEnvironment{headnote}{m}&#xa;</xsl:text>
+    <xsl:text>{\notblank{#1}{\noindent\textbf{#1}\space}{}}</xsl:text>
+    <xsl:text>{\par\medskip}</xsl:text>
+    <xsl:text>&#xa;</xsl:text>
+</xsl:template>
+
 <!-- A division has a PTX name via local-name() and a corresponding -->
 <!-- LaTeX traditional division via the "division-name" template.   -->
 <!-- The following templates build the names of the environments,   -->
@@ -3325,6 +3385,10 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Preprocessor always puts Department, Institution, and Location         -->
 <!-- inside Affiliation. This just adds line breaks between them as needed. -->
 <xsl:template match="affiliation">
+    <xsl:if test="position">
+        <xsl:text>\\&#xa;</xsl:text>
+        <xsl:apply-templates select="position" />
+    </xsl:if>
     <xsl:if test="department">
         <xsl:text>\\&#xa;</xsl:text>
         <xsl:apply-templates select="department" />
@@ -3349,11 +3413,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Departments, Institutions, and Addresses are free-form, or sequences of lines  -->
 <!-- Line breaks are inserted above, due to \and, etc, so do not end last line here -->
-<xsl:template match="department|institution|location">
+<xsl:template match="position|department|institution|location">
     <xsl:apply-templates/>
 </xsl:template>
 
-<xsl:template match="department[line]|institution[line]|location[line]">
+<xsl:template match="position[line]|department[line]|institution[line]|location[line]">
     <xsl:apply-templates select="line" />
 </xsl:template>
 
@@ -3399,6 +3463,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:if test="appendix|solutions">
         <xsl:text>%&#xa;</xsl:text>
         <xsl:text>\appendix%&#xa;</xsl:text>
+        <xsl:text>%% Appendix letters compose with titles, so take a period: in&#xa;</xsl:text>
+        <xsl:text>%% contents entries (scoped: the .toc file is read within a group)&#xa;</xsl:text>
+        <xsl:text>\addtocontents{toc}{\protect\renewcommand{\protect\ptxappendixperiodsection}{.}}%&#xa;</xsl:text>
+        <xsl:text>%% and in the hang-shape division headings from here on&#xa;</xsl:text>
+        <xsl:text>\renewcommand{\ptxappendixperiodsection}{.}%&#xa;</xsl:text>
         <xsl:text>%&#xa;</xsl:text>
         <xsl:text>%% A lineskip in table of contents as a transition to the appendices&#xa;</xsl:text>
         <xsl:text>\addtocontents{toc}{\vspace{\normalbaselineskip}}%&#xa;</xsl:text>
@@ -3418,6 +3487,10 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:if test="appendix|solutions">
         <xsl:text>%&#xa;</xsl:text>
         <xsl:text>\appendix%&#xa;</xsl:text>
+        <xsl:text>%% Appendix letters compose with titles in contents entries, so&#xa;</xsl:text>
+        <xsl:text>%% take a period (scoped: the .toc file is read within a group;&#xa;</xsl:text>
+        <xsl:text>%% display-shape chapter headings do not compose, and stay bare)&#xa;</xsl:text>
+        <xsl:text>\addtocontents{toc}{\protect\renewcommand{\protect\ptxappendixperiodchapter}{.}}%&#xa;</xsl:text>
         <!-- When the equation counter is scoped to "part" (see the         -->
         <!-- equation-numbering template), the LaTeX book class's chapter   -->
         <!-- reset of "equation" has been removed, so \appendix no longer   -->
@@ -3478,6 +3551,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:choose>
     <xsl:text>\pagestyle{empty}&#xa;</xsl:text>
     <xsl:text>\vspace*{\stretch{1}}&#xa;</xsl:text>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:text>\begin{backcolophon}</xsl:text>
     <xsl:text>{</xsl:text>
     <xsl:apply-templates select="." mode="type-name" />
@@ -3488,12 +3562,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>%&#xa;</xsl:text>
     <xsl:apply-templates select="*"/>
     <xsl:text>\end{backcolophon}%&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
     <xsl:text>\vspace*{\stretch{2}}&#xa;</xsl:text>
 </xsl:template>
 
 <!-- The back colophon of an article is simpler -->
 <xsl:template match="article/backmatter/colophon">
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:text>\begin{backcolophon}</xsl:text>
     <xsl:text>{</xsl:text>
     <xsl:apply-templates select="." mode="type-name" />
@@ -3504,7 +3579,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>%&#xa;</xsl:text>
     <xsl:apply-templates select="*"/>
     <xsl:text>\end{backcolophon}%&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 <!-- Appendices are handled in the general subdivision template -->
@@ -3528,15 +3603,27 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <!-- infrastructure and not so hard-coded as it is here.     -->
             <xsl:text>\newpage%&#xa;</xsl:text>
             <xsl:apply-templates select="." mode="latex-division-heading"/>
+            <xsl:apply-templates select="headnote"/>
             <xsl:apply-templates select="index-list"/>
             <xsl:apply-templates select="." mode="latex-division-footing"/>
         </xsl:when>
         <xsl:when test="$index-maker = 'latex'">
+            <xsl:apply-templates select="headnote" mode="index-prologue"/>
             <xsl:apply-templates select="index-list"/>
         </xsl:when>
     </xsl:choose>
 </xsl:template>
 
+<!-- The \printindex of the  imakeidx  package makes the division  -->
+<!-- heading itself, so a headnote cannot simply precede it.  The  -->
+<!-- package's \indexprologue stores the note, and \printindex     -->
+<!-- sets it after the heading and before the entries.             -->
+<xsl:template match="index/headnote" mode="index-prologue">
+    <xsl:text>\indexprologue{%&#xa;</xsl:text>
+    <xsl:apply-templates select="."/>
+    <xsl:text>}%&#xa;</xsl:text>
+</xsl:template>
+
 <!-- TEMPORARY (2024-08-11) (migrate to publisher)  -->
 <!-- We parameterize creation of the index with     -->
 <!-- a switch that determines "who" does the work.  -->
@@ -4067,8 +4154,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:text>}&#xa;</xsl:text>
     </xsl:if>
     <!-- For references we open a list to hold "biblio" -->
-    <!-- unless we need to wait for an "introduction"   -->
-    <xsl:if test="self::references and not(introduction)">
+    <!-- unless we need to wait for a "headnote"         -->
+    <xsl:if test="self::references and not(headnote)">
         <xsl:call-template name="open-reference-list"/>
     </xsl:if>
 </xsl:template>
@@ -4108,9 +4195,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Footings are straightforward -->
 <xsl:template match="part|chapter|appendix|section|subsection|subsubsection|acknowledgement|foreword|preface|exercises|solutions|reading-questions|glossary|references|index|worksheet|handout" mode="latex-division-footing">
-    <!-- For references we close a list holding "biblio"    -->
-    <!-- unless we already added it before the "conclusion" -->
-    <xsl:if test="self::references and not(conclusion)">
+    <!-- For references we close a list holding "biblio" -->
+    <xsl:if test="self::references">
         <xsl:call-template name="close-reference-list"/>
     </xsl:if>
 
@@ -4131,7 +4217,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Title optional (and discouraged), in argument    -->
 <!-- typically just a few paragraphs                  -->
 <!-- NB: a glossary has a "headnote" (elsewhere) and does not have a "conclusion" -->
-<xsl:template match="article/introduction|chapter/introduction|section/introduction|subsection/introduction|appendix/introduction|exercises/introduction|solutions/introduction|worksheet/introduction|handout/introduction|reading-questions/introduction|references/introduction">
+<xsl:template match="article/introduction|chapter/introduction|section/introduction|subsection/introduction|appendix/introduction|exercises/introduction|solutions/introduction|worksheet/introduction|handout/introduction|reading-questions/introduction">
     <xsl:text>\begin{introduction}</xsl:text>
     <xsl:text>{</xsl:text>
     <xsl:apply-templates select="." mode="title-full" />
@@ -4143,19 +4229,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>%&#xa;</xsl:text>
     <xsl:apply-templates select="*"/>
     <xsl:text>\end{introduction}%&#xa;</xsl:text>
-    <!-- We have not opened the list of references yet    -->
-    <!-- when it has an "introduction".  Now is the time. -->
-    <xsl:if test="parent::references">
-        <xsl:call-template name="open-reference-list"/>
-    </xsl:if>
 </xsl:template>
 
-<xsl:template match="article/conclusion|chapter/conclusion|section/conclusion|subsection/conclusion|appendix/conclusion|exercises/conclusion|solutions/conclusion|worksheet/conclusion|handout/conclusion|reading-questions/conclusion|references/conclusion">
-    <!-- We will not close the list of references when -->
-    <!-- it has an "introduction".  Now is the time.   -->
-    <xsl:if test="parent::references">
-        <xsl:call-template name="close-reference-list"/>
-    </xsl:if>
+<xsl:template match="article/conclusion|chapter/conclusion|section/conclusion|subsection/conclusion|appendix/conclusion|exercises/conclusion|solutions/conclusion|worksheet/conclusion|handout/conclusion|reading-questions/conclusion">
     <xsl:text>\begin{conclusion}</xsl:text>
     <xsl:text>{</xsl:text>
     <xsl:apply-templates select="." mode="title-full" />
@@ -4278,6 +4354,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Style is controlled in the preamble       -->
 <xsl:template match="&THEOREM-LIKE;|&AXIOM-LIKE;">
     <xsl:apply-templates select="." mode="newpage"/>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <!-- environment, title, label string, newline -->
     <xsl:text>\begin{</xsl:text>
     <xsl:value-of select="local-name(.)" />
@@ -4299,7 +4376,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:if test="&THEOREM-FILTER;">
         <xsl:apply-templates select="&PROOF-LIKE;" />
     </xsl:if>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 <!-- PROOF-LIKE (regular, major) -->
@@ -4310,6 +4387,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:variable name="environment-name">
         <xsl:value-of select="local-name(.)"/>
     </xsl:variable>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:text>\begin{</xsl:text>
     <xsl:value-of select="$environment-name"/>
     <xsl:text>}</xsl:text>
@@ -4338,11 +4416,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\end{</xsl:text>
     <xsl:value-of select="$environment-name"/>
     <xsl:text>}&#xa;</xsl:text>
-    <!-- A standalone proof may need to have its footnote text popped,     -->
-    <!-- rather than waiting for a container like "theorem" to do the job. -->
-    <xsl:if test="not(parent::*[&THEOREM-FILTER;])">
-        <xsl:apply-templates select="." mode="pop-footnote-text"/>
-    </xsl:if>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 <!-- PROOF-LIKE (solutions, minor) -->
@@ -4581,6 +4655,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:variable name="env-name">
         <xsl:apply-templates select="." mode="environment-name"/>
     </xsl:variable>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:text>\begin{</xsl:text>
     <xsl:value-of select="$env-name"/>
     <xsl:text>}</xsl:text>
@@ -4649,7 +4724,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\end{</xsl:text>
     <xsl:value-of select="$env-name"/>
     <xsl:text>}%&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
     <!-- structured version of a project may contain a postlude, -->
     <!-- which is rendered *after* environment ends              -->
     <xsl:if test="$project and (statement or task)">
@@ -5110,6 +5185,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Only EXAMPLE-LIKE has hint, answer, solution -->
 <xsl:template match="&DEFINITION-LIKE;|&REMARK-LIKE;|&COMPUTATION-LIKE;|&OPENPROBLEM-LIKE;|&EXAMPLE-LIKE;">
     <xsl:apply-templates select="." mode="newpage"/>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <!-- structured version may contain a prelude -->
     <!-- no structure => don't even consider it   -->
     <xsl:if test="statement or task">
@@ -5153,7 +5229,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\end{</xsl:text>
         <xsl:value-of select="local-name(.)" />
     <xsl:text>}&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
     <!-- structured version may contain a postlude -->
     <!-- no structure => don't even consider it    -->
     <xsl:if test="statement or task">
@@ -5167,6 +5243,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- title is inline, boldface in mdframe setup  -->
 <xsl:template match="&ASIDE-LIKE;">
     <xsl:apply-templates select="." mode="newpage"/>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <!-- environment, title, label string, newline -->
     <xsl:text>\begin{</xsl:text>
     <xsl:value-of select="local-name(.)" />
@@ -5181,7 +5258,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\end{</xsl:text>
     <xsl:value-of select="local-name(.)" />
     <xsl:text>}&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 <!-- Assemblages -->
@@ -5189,6 +5266,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Title is optional, keep remainders coordinated      -->
 <xsl:template match="assemblage">
     <xsl:apply-templates select="." mode="newpage"/>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <!-- environment, title, label string, newline -->
     <xsl:text>\begin{</xsl:text>
     <xsl:value-of select="local-name(.)" />
@@ -5202,13 +5280,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\end{</xsl:text>
     <xsl:value-of select="local-name(.)" />
     <xsl:text>}&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 <!-- A GOAL-LIKE element holds a list,         -->
 <!-- surrounded by introduction and conclusion -->
 <xsl:template match="&GOAL-LIKE;">
     <xsl:apply-templates select="." mode="newpage"/>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:text>\begin{</xsl:text>
     <xsl:value-of select="local-name(.)" />
     <xsl:text>}</xsl:text>
@@ -5235,7 +5314,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\end{</xsl:text>
     <xsl:value-of select="local-name(.)" />
     <xsl:text>}&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 <!-- DISCUSSION-LIKE -->
@@ -5843,6 +5922,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             </xsl:otherwise>
         </xsl:choose>
     </xsl:variable>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:text>\begin{</xsl:text>
     <xsl:value-of select="$item-environment"/>
     <xsl:text>}{</xsl:text>
@@ -5854,7 +5934,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\end{</xsl:text>
     <xsl:value-of select="$item-environment"/>
     <xsl:text>}%&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 
@@ -7071,6 +7151,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- 3: empty, or a hard-coded number from -common -->
 <xsl:template match="figure">
     <xsl:apply-templates select="." mode="newpage"/>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:if test="@landscape and $b-latex-print">
       <xsl:text>\begin{sidewaysfigure}%&#xa;</xsl:text>
     </xsl:if>
@@ -7106,7 +7187,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:if test="@landscape and $b-latex-print">
       <xsl:text>\end{sidewaysfigure}%&#xa;</xsl:text>
     </xsl:if>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 <!-- Tables, (Named) Lists -->
@@ -7116,6 +7197,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- 3: empty, or a hard-coded number from -common  -->
 <xsl:template match="table|list|listing">
     <xsl:apply-templates select="." mode="newpage"/>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:if test="@landscape and $b-latex-print">
       <xsl:text>\begin{sidewaystable}%&#xa;</xsl:text>
     </xsl:if>
@@ -7154,7 +7236,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:if test="@landscape and $b-latex-print">
         <xsl:text>\end{sidewaystable}%&#xa;</xsl:text>
     </xsl:if>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 
@@ -7220,6 +7302,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <!-- into the definition, so it is "hidden" and not in the body -->
 
     <xsl:apply-templates select="." mode="leave-vertical-mode"/>
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:text>\begin{sidebyside}{</xsl:text>
     <xsl:value-of select="$number-panels" />
     <xsl:text>}{</xsl:text>
@@ -7232,7 +7315,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <!-- The main event -->
     <xsl:value-of select="$panels" />
     <xsl:text>\end{sidebyside}%&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 <!-- Possibility for a newpage -->
@@ -7615,6 +7698,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:if test="ancestor::sidebyside">
         <xsl:text>{\centering%&#xa;</xsl:text>
     </xsl:if>
+    <!-- A tabular with table notes, other than a "longtable" (which  -->
+    <!-- cannot be boxed), is measured in a box so the notes can set   -->
+    <!-- to exactly the width of the table.                            -->
+    <xsl:variable name="b-has-table-notes" select="boolean(.//tn)"/>
+    <xsl:variable name="b-boxed-notes" select="$b-has-table-notes and not(@break = 'yes')"/>
+    <xsl:if test="$b-boxed-notes">
+        <xsl:text>\begin{lrbox}{\ptxtablenotebox}%&#xa;</xsl:text>
+    </xsl:if>
     <!-- Build latex column specification                         -->
     <!--   vertical borders (left side, right side, three widths) -->
     <!--   horizontal alignment (left, center, right)             -->
@@ -7720,12 +7811,47 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>}&#xa;</xsl:text>
     <!-- finish grouping for tabular font -->
     <xsl:text>}%&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <!-- Table notes ("tn") collect 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.  -->
+    <!-- The usual case sets the notes flush left in a "minipage" -->
+    <!-- of exactly the table's measured width; a "longtable"     -->
+    <!-- cannot be boxed, so its notes set at the text width.     -->
+    <xsl:choose>
+        <xsl:when test="$b-boxed-notes">
+            <xsl:text>\end{lrbox}%&#xa;</xsl:text>
+            <xsl:text>\begin{minipage}{\wd\ptxtablenotebox}&#xa;</xsl:text>
+            <xsl:text>\usebox{\ptxtablenotebox}\par&#xa;</xsl:text>
+            <xsl:text>\smallskip%&#xa;</xsl:text>
+            <xsl:text>{\footnotesize\raggedright%&#xa;</xsl:text>
+            <xsl:call-template name="latex-table-notes"/>
+            <xsl:text>}%&#xa;</xsl:text>
+            <xsl:text>\end{minipage}%&#xa;</xsl:text>
+        </xsl:when>
+        <xsl:when test="$b-has-table-notes">
+            <xsl:text>\par\smallskip%&#xa;</xsl:text>
+            <xsl:text>{\footnotesize\raggedright%&#xa;</xsl:text>
+            <xsl:call-template name="latex-table-notes"/>
+            <xsl:text>}%&#xa;</xsl:text>
+        </xsl:when>
+    </xsl:choose>
     <xsl:if test="ancestor::sidebyside">
         <xsl:text>\par}&#xa;</xsl:text>
     </xsl:if>
 </xsl:template>
 
+<!-- Context is the "tabular"; one line per note -->
+<xsl:template name="latex-table-notes">
+    <xsl:for-each select=".//tn">
+        <xsl:text>\textsuperscript{\textit{</xsl:text>
+        <xsl:apply-templates select="." mode="number"/>
+        <xsl:text>}}\,</xsl:text>
+        <xsl:apply-templates/>
+        <xsl:text>\par&#xa;</xsl:text>
+    </xsl:for-each>
+</xsl:template>
+
 
 <!-- We recursively traverse the "col" elements of the "column" group,   -->
 <!-- accumulating a cline specification for the top border in the $clines -->
@@ -7965,18 +8091,38 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                         <xsl:with-param name="align" select="$row-valign" />
                     </xsl:call-template>
                     <xsl:text>{</xsl:text>
+                    <!-- The paragraph sets to the combined width of every   -->
+                    <!-- column the cell spans, so a spanning cell occupies  -->
+                    <!-- its full span, not just its leftmost column.        -->
+                    <!-- A column with no @width silently contributes the    -->
+                    <!-- 20% default; some ill-formed WW exercises arrive    -->
+                    <!-- here, so a less-precise warning is given on the     -->
+                    <!-- author's source.                                    -->
+                    <xsl:variable name="spanned-widths-rtf">
+                        <xsl:for-each select="parent::row/parent::tabular/col[position() &gt;= number($left-column-number) and position() &lt;= number($right-column-number)]">
+                            <w>
+                                <xsl:choose>
+                                    <xsl:when test="@width">
+                                        <xsl:variable name="width">
+                                            <xsl:call-template name="normalize-percentage">
+                                                <xsl:with-param name="percentage" select="@width" />
+                                            </xsl:call-template>
+                                        </xsl:variable>
+                                        <xsl:value-of select="substring-before($width, '%') div 100" />
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:text>0.2</xsl:text>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </w>
+                        </xsl:for-each>
+                    </xsl:variable>
+                    <xsl:variable name="spanned-widths" select="exsl:node-set($spanned-widths-rtf)/w"/>
                     <xsl:choose>
-                        <xsl:when test="$left-col/@width">
-                            <xsl:variable name="width">
-                                <xsl:call-template name="normalize-percentage">
-                                    <xsl:with-param name="percentage" select="$left-col/@width" />
-                                </xsl:call-template>
-                            </xsl:variable>
-                            <xsl:value-of select="substring-before($width, '%') div 100" />
+                        <xsl:when test="$spanned-widths">
+                            <xsl:value-of select="sum($spanned-widths)"/>
                         </xsl:when>
-                        <!-- If there is no $left-col/@width, silently use 20% as default -->
-                        <!-- We get some ill-formed WW exercises here, so a less-precise  -->
-                        <!-- warning is given on the author's source.                     -->
+                        <!-- no "col" elements at all -->
                         <xsl:otherwise>
                             <xsl:text>0.2</xsl:text>
                         </xsl:otherwise>
@@ -8658,6 +8804,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:variable name="xref-as-ref">
         <xsl:apply-templates select="$target" mode="xref-as-ref" />
     </xsl:variable>
+    <!-- Under the author's draft mode a forward reference, one     -->
+    <!-- preceding its target in document order, colors distinctly, -->
+    <!-- so material moved out of logical order announces itself.   -->
+    <!-- The count-union membership test reads document order.      -->
+    <xsl:variable name="b-draft-forward-reference" select="$b-latex-draft-mode and not(ancestor::title|ancestor::subtitle) and (count(current()|$target/preceding::*) = count($target/preceding::*))"/>
+    <xsl:if test="$b-draft-forward-reference">
+        <xsl:text>{\hypersetup{linkcolor=green}</xsl:text>
+    </xsl:if>
     <xsl:choose>
         <!-- inactive in titles, just text               -->
         <!-- With protection against incorrect, sloppy   -->
@@ -8704,6 +8858,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:text>}</xsl:text>
         </xsl:otherwise>
     </xsl:choose>
+    <xsl:if test="$b-draft-forward-reference">
+        <xsl:text>}</xsl:text>
+    </xsl:if>
 </xsl:template>
 
 <xsl:template match="xref|&PROOF-LIKE;" mode="latex-page-number">
@@ -8994,89 +9151,69 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <!-- Footnotes -->
-<!-- For blocks implemented as "tcolorbox" we need to manage -->
-<!-- footnotes more carefully.  Also for captions since they -->
-<!-- migrate to list of figures.  At the location, we just   -->
-<!-- drop a mark, with no text.  Testing with the "footmisc" -->
-<!-- package, and its "\mpfootnotemark" alternative works    -->
-<!-- worse than simple default LaTeX (though the numbers     -->
-<!-- could be hard-coded if necessary).                      -->
-<!-- NB: (2020-11-15) New environments may mean there is no  -->
-<!-- migration to the *.aux file, hence the \protect may not -->
-<!-- be necessary.                                           -->
-<!-- 2023-06-03: one of REMARK-LIKE is a "note", but we also -->
-<!-- have, from long ago, a biblio/note.  So a footnote      -->
-<!-- inside a  biblio/note  was being caught here and        -->
-<!-- producing a \footnotemark{}.  However, there was no     -->
-<!-- matching  \footnotetext  since "biblio" is not yet a    -->
-<!-- tcolorbox and the "pop-footnote-text" template was not  -->
-<!-- present as part of processing  biblio/note.             -->
+<!-- A footnote is native LaTeX everywhere.  When one sits within a -->
+<!-- tcolorbox-implemented block, the enclosing "savenotes"         -->
+<!-- environment (see "begin-saved-footnotes") delays its text to   -->
+<!-- the true page bottom, and every box restores the standard      -->
+<!-- footnote counter (see "\ptxnativefootnotes" in the preamble),  -->
+<!-- so the mark numbers continuously with the running text.        -->
+<!-- A table note ("tn") drops only its superscript letter mark at  -->
+<!-- the cell location; the note text collects below the table, in  -->
+<!-- the "tabular-inclusion" template.  Letters count per-tabular   -->
+<!-- in document order.  No footnote machinery is involved, so a    -->
+<!-- "tn" never interacts with tcolorbox footnote management.       -->
+<xsl:template match="tabular//tn">
+    <xsl:text>\textsuperscript{\textit{</xsl:text>
+    <xsl:apply-templates select="." mode="number"/>
+    <xsl:text>}}</xsl:text>
+</xsl:template>
+
 <xsl:template match="fn">
-    <xsl:choose>
-        <xsl:when test="ancestor::*[&ASIDE-FILTER; or &THEOREM-FILTER; or &AXIOM-FILTER;  or &DEFINITION-FILTER; or &REMARK-FILTER; or &COMPUTATION-FILTER; or &OPENPROBLEM-FILTER; or &EXAMPLE-FILTER; or &PROJECT-FILTER; or &GOAL-FILTER; or &FIGURE-FILTER; or self::tabular or self::list or self::sidebyside or self::gi or self::colophon/parent::backmatter or self::assemblage or self::exercise or (self::li and parent::dl) or self::proof[not(parent::*[&THEOREM-FILTER;])] or self::argument[not(parent::*[&THEOREM-FILTER;])] or self::justification[not(parent::*[&THEOREM-FILTER;])] or self::reasoning[not(parent::*[&THEOREM-FILTER;])] or self::explanation[not(parent::*[&THEOREM-FILTER;])]] and not(ancestor::note/parent::biblio)">
-            <!-- a footnote in the text of a caption will migrate to -->
-            <!-- the auxiliary file for use in the "list of figures" -->
-            <!-- and there is some confusion of braces and the use   -->
-            <!-- of \footnote and \footnotemark, hence a \protect    -->
-            <!-- https://tex.stackexchange.com/questions/10181       -->
-            <xsl:if test="ancestor::*[&FIGURE-FILTER;]">
-                <xsl:text>\protect</xsl:text>
-            </xsl:if>
-            <xsl:text>\footnotemark{}</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:text>\footnote{</xsl:text>
-            <xsl:apply-templates/>
-            <xsl:apply-templates select="." mode="label" />
-            <xsl:text>}</xsl:text>
-        </xsl:otherwise>
-    </xsl:choose>
+    <xsl:text>\footnote{</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:apply-templates select="." mode="label" />
+    <xsl:text>}</xsl:text>
 </xsl:template>
 
 
-<!-- Part 2: for items implemented as "tcolorbox", and other       -->
-<!-- environments that could harbor a footnote, such as            -->
-<!-- "figure", "table", "tabular", etc., we scan back              -->
-<!-- through the contents, formulating the text of footnotes,      -->
-<!-- in order.  It is necessary to hard-code the (serial) number   -->
-<!-- of the footnote since otherwise the numbering gets confused   -->
-<!-- by an intervening "tcolorbox".  The template should be placed -->
-<!-- immediately after the "\end{}" of affected environments.      -->
-<!-- It will format as one footnote text per output line.          -->
-<!--                                                               -->
-<!-- We need to pop all interior footnotes iff we are free of      -->
-<!-- enclosing blocks implemented with tcolorbox.  So this         -->
-<!-- template is called at the end of a template for a block,      -->
-<!-- but after the tcolorbox closes.  So we are in the clear when  -->
-<!-- no ancestors are implmented by tcolorbox.  Otherwise, we      -->
-<!-- "wait" and pop all interior footnotes later.                  -->
-<!-- NB: these templates could be improved with an entity          -->
-<!-- NB: "detached" proofs require a proliferation of              -->
-<!-- complicated constructions                                     -->
-<xsl:template match="&ASIDE-LIKE;|&THEOREM-LIKE;|&AXIOM-LIKE;|&DEFINITION-LIKE;|&REMARK-LIKE;|&COMPUTATION-LIKE;|&OPENPROBLEM-LIKE;|&EXAMPLE-LIKE;|&PROJECT-LIKE;|&FIGURE-LIKE;|tabular|list|sidebyside|gi|&GOAL-LIKE;|backmatter/colophon|assemblage|exercise|dl/li|proof[not(parent::*[&THEOREM-FILTER;])]|argument[not(parent::*[&THEOREM-FILTER;])]|justification[not(parent::*[&THEOREM-FILTER;])]|reasoning[not(parent::*[&THEOREM-FILTER;])]|explanation[not(parent::*[&THEOREM-FILTER;])]" mode="pop-footnote-text">
-    <xsl:if test="count(ancestor::*[&ASIDE-FILTER; or &THEOREM-FILTER; or &AXIOM-FILTER;  or &DEFINITION-FILTER; or &REMARK-FILTER; or &COMPUTATION-FILTER; or &EXAMPLE-FILTER; or &PROJECT-FILTER; or &GOAL-FILTER; or &FIGURE-FILTER; or self::tabular or self::list or self::sidebyside or self::gi or self::colophon/parent::backmatter or self::assemblage or self::exercise or (self::li and parent::dl) or self::proof[not(parent::*[&THEOREM-FILTER;])] or self::argument[not(parent::*[&THEOREM-FILTER;])] or self::justification[not(parent::*[&THEOREM-FILTER;])] or self::reasoning[not(parent::*[&THEOREM-FILTER;])] or self::explanation[not(parent::*[&THEOREM-FILTER;])]]) = 0">
-        <xsl:for-each select=".//fn">
-            <xsl:text>\footnotetext[</xsl:text>
-            <xsl:apply-templates select="." mode="serial-number"/>
-            <xsl:text>]</xsl:text>
-            <xsl:text>{</xsl:text>
-            <xsl:apply-templates/>
-            <xsl:apply-templates select="." mode="label" />
-            <xsl:text>}%&#xa;</xsl:text>
-        </xsl:for-each>
+<!-- Any block that could harbor a footnote wraps itself in a       -->
+<!-- "savenotes" environment (footnotehyper), which collects each   -->
+<!-- footnote's text and emits it, as the box closes, into the      -->
+<!-- page-bottom inserts.  The wrapping is transparent where no     -->
+<!-- tcolorbox intervenes, and nests properly, so a block simply    -->
+<!-- asks: any footnote at all among my descendants?  A "tabular"   -->
+<!-- appears nowhere in this scheme: a footnote within a "tabular"  -->
+<!-- cell is repaired into a "tn" table note during assembly, which -->
+<!-- involves no footnote machinery at all.                         -->
+<xsl:template name="begin-saved-footnotes">
+    <xsl:if test=".//fn">
+        <xsl:text>\begin{savenotes}%&#xa;</xsl:text>
+    </xsl:if>
+</xsl:template>
+
+<xsl:template name="end-saved-footnotes">
+    <xsl:if test=".//fn">
+        <xsl:text>\end{savenotes}%&#xa;</xsl:text>
     </xsl:if>
 </xsl:template>
 
-<!-- TEMPORARILY: render a glossary "headnote" as an "introduction" -->
-<xsl:template match="glossary/headnote">
-    <xsl:text>%% this should be a new (isomorphic) "headnote" environment&#xa;</xsl:text>
-    <xsl:text>\begin{introduction}{}%&#xa;</xsl:text>
+<!-- A "headnote" prefaces the list of a list-like division; the -->
+<!-- index is special (see the "index-prologue" mode nearby its  -->
+<!-- division template), the other hosts render it in place      -->
+<xsl:template match="glossary/headnote|references/headnote|index/headnote|appendix/headnote">
+    <xsl:text>\begin{headnote}{}%&#xa;</xsl:text>
     <xsl:apply-templates select="*"/>
-    <xsl:text>\end{introduction}%&#xa;</xsl:text>
+    <xsl:text>\end{headnote}%&#xa;</xsl:text>
+    <!-- We have not opened the list of references yet when -->
+    <!-- a "headnote" intervenes.  Now is the time.         -->
+    <xsl:if test="parent::references">
+        <xsl:call-template name="open-reference-list"/>
+    </xsl:if>
 </xsl:template>
 
 <!-- Defined Terms, in a Glossary -->
 <xsl:template match="gi">
+    <xsl:call-template name="begin-saved-footnotes"/>
     <xsl:text>\begin{glossaryitem}</xsl:text>
     <xsl:text>{</xsl:text>
     <xsl:apply-templates select="." mode="title-full"/>
@@ -9087,7 +9224,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>&#xa;</xsl:text>
     <xsl:apply-templates select="*"/>
     <xsl:text>\end{glossaryitem}&#xa;</xsl:text>
-    <xsl:apply-templates select="." mode="pop-footnote-text"/>
+    <xsl:call-template name="end-saved-footnotes"/>
 </xsl:template>
 
 <!-- ############################ -->
@@ -9181,14 +9318,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- and \bibitem seems comfortable there, so our source -->
 <!-- is nearly compatible with the usual usage           -->
 
-<!-- We open and close a single "referencelist" environment,    -->
-<!-- which we create in the preamble.  It opens right after     -->
-<!-- a "references" division, or after optional "introduction". -->
-<!-- It closes right before the "references" division closes,   -->
-<!-- or right before the "conclusion" begins.  The templates    -->
-<!-- below ensure consistency, and help with overrides.  You    -->
-<!-- can search on them to see the two pairs of scenarios       -->
-<!-- just described.                                            -->
+<!-- We open and close a single "referencelist" environment,   -->
+<!-- which we create in the preamble.  It opens right after a  -->
+<!-- "references" division, or after an optional "headnote",   -->
+<!-- and closes right before the division does.  The templates -->
+<!-- below ensure consistency, and help with overrides.        -->
 
 <xsl:template name="open-reference-list">
     <xsl:text>%% If this is a top-level references&#xa;</xsl:text>
@@ -9516,7 +9650,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:value-of select="$font-name"/>
     <xsl:text>}{}{\GenericError{}{The font "</xsl:text>
     <xsl:value-of select="$font-name"/>
-    <xsl:text>" requested by PreTeXt output processed by the  xelatex  executable is not available.  Either a file cannot be located in default locations via a filename, or a font is not known by its name as part of your system.}{Consult the PreTeXt Guide for help with LaTeX fonts, or perhaps try using  pdflatex  as a test.}{}}&#xa;</xsl:text>
+    <xsl:text>" requested by PreTeXt output processed by the  xelatex  executable is not available.  Either a file cannot be located in default locations via a filename, or a font is not known by its name as part of your system.}{Perhaps try using  pdflatex  as a test.}{}}&#xa;</xsl:text>
 </xsl:template>
 
 <!-- Miscellaneous -->