@pretextbook/pretext-html 0.16.0 → 0.16.1

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

@@ -128,7 +128,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:template name="latex-preamble">
     <!-- Some journal styles require specific packages be loaded right away -->
     <xsl:call-template name="journal-packages"/>
-    <xsl:call-template name="frontmatter-helpers"/>
     <xsl:call-template name="preamble-early"/>
     <xsl:call-template name="cleardoublepage"/>
     <xsl:call-template name="standard-packages"/>
@@ -251,7 +250,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Other latex styles can override this to put some information there. -->
 <xsl:template name="bibinfo-pre-begin-document">
     <xsl:apply-templates select="$document-root" mode="article-title"/>
-    <!--<xsl:apply-templates select="$bibinfo/support" mode="article-frontmatter"/>-->
     <xsl:call-template name="article-authors"/>
     <xsl:apply-templates select="$bibinfo/date" mode="article-frontmatter"/>
 </xsl:template>
@@ -367,10 +365,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 
+<!-- The article-level support statement is a "\thanks" on the title -->
+<!-- (see the "article-title" template): a marked footnote on the    -->
+<!-- title page, apart from the per-author "\thanks" off each name   -->
 <xsl:template match="bibinfo/support" mode="article-frontmatter">
-    <xsl:text>\ptxsupport{</xsl:text>
-    <xsl:apply-templates select="$bibinfo/support" mode="article-info"/>
-    <xsl:text>}&#xa;</xsl:text>
+    <xsl:text>\thanks{</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>}</xsl:text>
 </xsl:template>
 
 
@@ -594,20 +595,24 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 
-<xsl:template match="&THEOREM-LIKE;|&AXIOM-LIKE;|&DEFINITION-LIKE;|&REMARK-LIKE;|&COMPUTATION-LIKE;|&OPENPROBLEM-LIKE;|&EXAMPLE-LIKE;|&PROJECT-LIKE;|exercise[boolean(&INLINE-EXERCISE-FILTER;)]" mode="env-title"> 
-    <xsl:if test="title|creator">
-        <xsl:text>[</xsl:text>
+<!-- amsthm sets the optional argument in parentheses, so a title, -->
+<!-- the creator, and the origins share that one group, separated  -->
+<!-- by commas.  Braces protect the argument: a citation such as   -->
+<!-- [3] would otherwise end it at the first "]".                  -->
+<xsl:template match="&THEOREM-LIKE;|&AXIOM-LIKE;|&DEFINITION-LIKE;|&REMARK-LIKE;|&COMPUTATION-LIKE;|&OPENPROBLEM-LIKE;|&EXAMPLE-LIKE;|&PROJECT-LIKE;|exercise[boolean(&INLINE-EXERCISE-FILTER;)]" mode="env-title">
+    <xsl:if test="title or creator or origins">
+        <xsl:text>[{</xsl:text>
         <xsl:if test="title">
             <!-- Title, but without punctuation.  Or is there a smarter way? -->
             <xsl:apply-templates select="." mode="title-xref"/>
         </xsl:if>
-        <xsl:if test="(title) and (creator)">
-            <xsl:text>&#160;</xsl:text>
+        <xsl:if test="title and (creator or origins)">
+            <xsl:text>, </xsl:text>
         </xsl:if>
-        <xsl:if test="creator">
-            <xsl:apply-templates select="." mode="creator-full"/>
+        <xsl:if test="creator or origins">
+            <xsl:apply-templates select="." mode="attribution-full"/>
         </xsl:if>
-        <xsl:text>]</xsl:text>
+        <xsl:text>}]</xsl:text>
     </xsl:if>
 </xsl:template>
 
@@ -772,6 +777,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         </xsl:call-template>
     </xsl:if>
     <xsl:text>]{block}{}&#xa;</xsl:text>
+    <!-- tcolorbox names each auto counter after its box, so the names     -->
+    <!-- below reappear in the LaTeX as counters, "tcb@cnt@figuredistinct" -->
+    <!-- for one, and as macros, "\thetcb@cnt@figuredistinct", which       -->
+    <!-- subfigure captions write out directly.  A control sequence name   -->
+    <!-- cannot contain a hyphen, so none of the box names does.           -->
     <!-- should condition on $project-reps, but it is not defined yet -->
     <xsl:if test="$b-number-project-distinct">
         <xsl:text>%%&#xa;</xsl:text>
@@ -787,7 +797,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:with-param name="level" select="$numbering-projects" />
             </xsl:call-template>
         </xsl:if>
-        <xsl:text>]{project-distinct}{}&#xa;</xsl:text>
+        <xsl:text>]{projectdistinct}{}&#xa;</xsl:text>
     </xsl:if>
     <xsl:if test="$b-number-exercise-distinct">
         <xsl:text>%%&#xa;</xsl:text>
@@ -802,7 +812,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:with-param name="level" select="$numbering-exercises" />
             </xsl:call-template>
         </xsl:if>
-        <xsl:text>]{exercise-distinct}{}&#xa;</xsl:text>
+        <xsl:text>]{exercisedistinct}{}&#xa;</xsl:text>
     </xsl:if>
     <xsl:if test="$b-number-figure-distinct">
         <xsl:text>%%&#xa;</xsl:text>
@@ -817,7 +827,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:with-param name="level" select="$numbering-figures" />
             </xsl:call-template>
         </xsl:if>
-        <xsl:text>]{figure-distinct}{}&#xa;</xsl:text>
+        <xsl:text>]{figuredistinct}{}&#xa;</xsl:text>
     </xsl:if>
     <xsl:if test="$b-number-openproblem-distinct">
         <xsl:text>%%&#xa;</xsl:text>
@@ -833,7 +843,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:with-param name="level" select="$numbering-openproblems" />
             </xsl:call-template>
         </xsl:if>
-        <xsl:text>]{openproblem-distinct}{}&#xa;</xsl:text>
+        <xsl:text>]{openproblemdistinct}{}&#xa;</xsl:text>
     </xsl:if>
     <!-- TODO: condition of figure/*/figure-like, or $subfigure-reps -->
     <xsl:text>%% A faux tcolorbox whose only purpose is to provide common numbering&#xa;</xsl:text>
@@ -844,16 +854,24 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>\newtcolorbox[auto counter</xsl:text>
     <!-- control the levels of the numbering -->
     <!-- global (no periods) is the default  -->
+    <!-- The subnumbers nest within the counter that numbers figures, -->
+    <!-- and the full number, a figure number followed by a letter,   -->
+    <!-- is built from that same counter                              -->
+    <xsl:variable name="figure-counter">
+        <xsl:choose>
+            <xsl:when test="$b-number-figure-distinct">
+                <xsl:text>tcb@cnt@figuredistinct</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>tcb@cnt@block</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:variable>
     <xsl:text>, number within=</xsl:text>
-    <xsl:choose>
-        <xsl:when test="$b-number-figure-distinct">
-            <xsl:text>tcb@cnt@figure-distinct</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:text>tcb@cnt@block</xsl:text>
-        </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>, number freestyle={\noexpand\thetcb@cnt@block(\noexpand\alph{\tcbcounter})}</xsl:text>
+    <xsl:value-of select="$figure-counter"/>
+    <xsl:text>, number freestyle={\noexpand\the</xsl:text>
+    <xsl:value-of select="$figure-counter"/>
+    <xsl:text>(\noexpand\alph{\tcbcounter})}</xsl:text>
     <xsl:text>]{subdisplay}{}&#xa;</xsl:text>
     <!-- faux subdisplay requires manipulating low-level counters -->
     <xsl:text>\makeatother&#xa;</xsl:text>
@@ -876,14 +894,15 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <!-- FIGURE-LIKE come in three flavors: blocks (not in a side-by-side),  -->
     <!-- panels (in a side-by-side, but not in an overall "figure"), or      -->
     <!-- subnumbered (panel of a side-by-side, which is then in an overall   -->
-    <!-- "figure').  Selections must be careful (not like dropping through   -->
+    <!-- "figure", or a "figure" in a "stack" that is the content of an      -->
+    <!-- overall "figure").  Selections must be careful (not dropping through -->
     <!-- a choose/when).  Environments need to consider title/caption        -->
     <!-- placement and counters.  So we might create twelve different        -->
     <!-- environments here.  In -common, see the "figure-placement" template -->
     <!-- for another determination, and a more careful explanation.          -->
     <!-- (There was once a subtle bug when we were not so careful here.)     -->
     <xsl:variable name="figure-reps" select="
-        ($document-root//figure[not(parent::sidebyside)])[1]|
+        ($document-root//figure[not(parent::sidebyside or parent::stack/parent::figure)])[1]|
         ($document-root//table[not(parent::sidebyside)])[1]|
         ($document-root//listing[not(parent::sidebyside)])[1]|
         ($document-root//list[not(parent::sidebyside)])[1]"/>
@@ -913,7 +932,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <!-- (SUB)FIGURE-LIKE -->
     <!-- subnumbered versions, if contained by overall figure -->
     <xsl:variable name="subnumber-reps" select="
-        ($document-root//figure/sidebyside/figure|$document-root//figure/sbsgroup/sidebyside/figure)[1]|
+        ($document-root//figure/sidebyside/figure|$document-root//figure/sbsgroup/sidebyside/figure|$document-root//figure/stack/figure)[1]|
         ($document-root//figure/sidebyside/table|$document-root//figure/sbsgroup/sidebyside/table)[1]|
         ($document-root//figure/sidebyside/listing|$document-root//figure/sbsgroup/sidebyside/listing)[1]|
         ($document-root//figure/sidebyside/list|$document-root//figure/sbsgroup/sidebyside/list)[1]"/>
@@ -942,10 +961,4 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:for-each>
 </xsl:template>
 
-
-<!-- Preamble template for elements needed to produce the frontmatter -->
-<xsl:template name="frontmatter-helpers">
-    <xsl:call-template name="support-footnote"/>
-</xsl:template>
-
 </xsl:stylesheet>