@pretextbook/pretext-html 0.16.0 → 0.17.0

package/assets/xsl/pretext-numbers.xsl

@@ -358,6 +358,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>)</xsl:text>
 </xsl:template>
 
+<!-- A "figure" may also stack subfigures vertically: a "stack" -->
+<!-- holding only "figure", each subnumbered in the same way   -->
+<xsl:template match="figure/stack/figure" mode="serial-number">
+    <xsl:text>(</xsl:text>
+    <xsl:number format="a" count="figure"/>
+    <xsl:text>)</xsl:text>
+</xsl:template>
+
 <!-- Serial Numbers: List Items -->
 
 <!-- First, the number of a list item within its own ordered list.  This -->
@@ -586,6 +594,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:value-of select="@pi:struct"/>
 </xsl:template>
 
+<!-- Structure Numbers: Slides -->
+<!-- The number of the "section" holding a slide, or empty, as -->
+<!-- decided in assembly by the numbering level of divisions   -->
+<xsl:template match="slide" mode="structure-number">
+    <xsl:value-of select="@pi:struct"/>
+</xsl:template>
+
 <!-- Structure Numbers: Specialized Divisions -->
 <!-- Some divisions get their numbers from their parents, or  -->
 <!-- in other ways.  We are careful to do this by determining -->
@@ -669,6 +684,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:template match="figure/sbsgroup/sidebyside/figure | figure/sbsgroup/sidebyside/table | figure/sbsgroup/sidebyside/listing | figure/sbsgroup/sidebyside/list" mode="structure-number">
     <xsl:apply-templates select="parent::sidebyside/parent::sbsgroup/parent::figure" mode="number" />
 </xsl:template>
+<xsl:template match="figure/stack/figure" mode="structure-number">
+    <xsl:apply-templates select="parent::stack/parent::figure" mode="number" />
+</xsl:template>
 
 <!-- Structure Numbers: Equations -->
 <!-- "mrow" may be numbered, and bare "md" inherit a number from their  -->
@@ -842,11 +860,12 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                         <xsl:text>:</xsl:text>
                     </xsl:when>
                     <!-- A figure-like inside a sidebyside (or       -->
-                    <!-- sbsgroup) inside a figure is subnumbered    -->
+                    <!-- sbsgroup) inside a figure, or a figure in   -->
+                    <!-- a stack inside a figure, is subnumbered     -->
                     <!-- with a letter like "(a)", so the serial     -->
                     <!-- number already carries its own delimiter    -->
                     <!-- and no period separator is needed.          -->
-                    <xsl:when test="(&FIGURE-FILTER;) and (parent::sidebyside/parent::figure or parent::sidebyside/parent::sbsgroup/parent::figure)"/>
+                    <xsl:when test="(&FIGURE-FILTER;) and (parent::sidebyside/parent::figure or parent::sidebyside/parent::sbsgroup/parent::figure or self::figure[parent::stack/parent::figure])"/>
                     <xsl:otherwise>
                         <xsl:text>.</xsl:text>
                     </xsl:otherwise>
@@ -878,6 +897,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:choose>
 </xsl:template>
 
+<!-- Serial Numbers: Slides -->
+<!-- Assembly counts every slide, through the slideshow or -->
+<!-- within a section, by the numbering level of divisions -->
+<xsl:template match="slide" mode="serial-number">
+    <xsl:value-of select="@pi:serial"/>
+</xsl:template>
+
 <!-- Serial Numbers: Specialized Divisions -->
 <xsl:template match="exercises|solutions|worksheet|handout|reading-questions|references|glossary" mode="serial-number">
     <xsl:variable name="is-numbered">

package/assets/xsl/pretext-revealjs.xsl

@@ -66,6 +66,22 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:variable name="math-repr" select="document($mathfile)/pi:math-representations"/>
 <xsl:variable name="speech-repr" select="document($speechfile)/pi:math-representations"/>
 
+<!-- Embedded mathematics is extracted as SVG with clause-ending    -->
+<!-- punctuation absorbed into display mathematics only, so the     -->
+<!-- text after inline mathematics must keep its punctuation.  This -->
+<!-- overrides the HTML value, which absorbs punctuation into all   -->
+<!-- mathematics, as MathJax does for online mathematics.           -->
+<xsl:variable name="math.punctuation.include">
+    <xsl:choose>
+        <xsl:when test="$b-reveal-embedded-math">
+            <xsl:text>display</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>all</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:variable>
+
 <!-- Reveal.js output is one monolithic page, so heading levels are -->
 <!-- threaded, not chunked.  The slideshow title (h1) and subtitle  -->
 <!-- (h2) are fixed.  A "section" is always level 2 (sections never -->
@@ -178,6 +194,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:text>.reveal .slides section.valign-top { top: 0 !important; }&#xa;</xsl:text>
             <xsl:text>.reveal .slides section.valign-middle.present { display: flex !important; flex-direction: column; justify-content: center; top: 0 !important; height: 100% !important; }&#xa;</xsl:text>
             <xsl:text>.reveal .slides section.valign-bottom.present { display: flex !important; flex-direction: column; justify-content: flex-end; top: 0 !important; height: 100% !important; }&#xa;</xsl:text>
+            <!-- A slide without a number still gets the number's box, -->
+            <!-- which reveal.js displays with an inline style         -->
+            <xsl:if test="$b-reveal-slide-numbering">
+                <xsl:text>.reveal .slide-number:has(.slide-number-a:empty) { display: none !important; }&#xa;</xsl:text>
+            </xsl:if>
           </style>
           <!-- no diagcess machinery with embedded mathematics: an  -->
           <!-- annotated PreFigure diagram is then a static image   -->
@@ -251,6 +272,20 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:value-of select="$reveal-navigation-mode"/>
             <xsl:text>',&#xa;</xsl:text>
             <xsl:text>  progress: false,&#xa;</xsl:text>
+            <!-- reveal.js displays what this function returns, so a -->
+            <!-- slide shows the number PreTeXt computed for it, the -->
+            <!-- same in every navigation mode, and any other slide  -->
+            <!-- (title, abstract, section title) shows nothing      -->
+            <xsl:text>  slideNumber: </xsl:text>
+                <xsl:choose>
+                    <xsl:when test="$b-reveal-slide-numbering">
+                        <xsl:text>function(slide) { return [(slide &amp;&amp; slide.dataset.slideNumber) || '']; }</xsl:text>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:text>false</xsl:text>
+                    </xsl:otherwise>
+                </xsl:choose>
+            <xsl:text>,&#xa;</xsl:text>
             <!-- reveal.js "center" vertically centers every slide,  -->
             <!-- so it realizes a document-wide "middle" default;    -->
             <!-- a "top" or "bottom" default disables it, and slides -->
@@ -448,6 +483,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                   <xsl:apply-templates select="." mode="valign"/>
               </xsl:with-param>
           </xsl:call-template>
+          <xsl:if test="$b-reveal-slide-numbering">
+              <xsl:attribute name="data-slide-number">
+                  <xsl:apply-templates select="." mode="number"/>
+              </xsl:attribute>
+          </xsl:if>
           <xsl:variable name="slide-hN">
               <xsl:apply-templates select="." mode="hN">
                   <xsl:with-param name="heading-level" select="$reveal-slide-heading-level"/>
@@ -628,7 +668,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Images get wrapped in a div with @class="fragment" if they are  -->
 <!-- paused                                                          -->
-<xsl:template match="image[not(ancestor::sidebyside) and (@pause='yes')]">
+<xsl:template match="image[not(&SBS-LAYOUT-FILTER;) and (@pause='yes')]">
     <div class="fragment">
       <xsl:apply-imports/>
     </div>
@@ -757,7 +797,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- match covers all mathematics.  Slides never link to an         -->
 <!-- equation (a cross-reference renders as its text), so no HTML   -->
 <!-- id is placed, unlike EPUB.                                     -->
-<xsl:template match="m|md[mrow]">
+<!-- Music notation ("n", "scaledeg", "timesignature", "chord")     -->
+<!-- is set as inline math, so it has a representation as well.     -->
+<xsl:template match="m|md[mrow]|n|scaledeg|timesignature|chord">
     <xsl:choose>
         <xsl:when test="$b-reveal-embedded-math">
             <!-- NB: math-representation file writes with "unique-id" -->

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

@@ -691,6 +691,29 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </solution>
 </xsl:template>
 
+<!-- A card ("premise" or "response") is copied as-is -->
+<xsl:template match="premise|response" mode="cardsort-card-static">
+    <xsl:copy-of select="."/>
+</xsl:template>
+
+<!-- Experimental, see "debug.advanced.feedback": a card of a -->
+<!-- "cardsort" may have a "statement" and a "feedback".  The -->
+<!-- card becomes the content of the "statement", while any   -->
+<!-- "feedback" is dropped.                                   -->
+<xsl:template match="cardsort/match/premise|cardsort/match/response" mode="cardsort-card-static">
+    <xsl:copy>
+        <xsl:copy-of select="@*"/>
+        <xsl:choose>
+            <xsl:when test="$b-debug-advanced-feedback and statement">
+                <xsl:copy-of select="statement/node()"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:copy-of select="node()"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:copy>
+</xsl:template>
+
 <!-- Exercise statement as a tabular -->
 
 <!-- For a problem statement, we use a response list re-ordered    -->
@@ -709,7 +732,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:variable name="sorted-premises-rtf">
         <xsl:for-each select="match/premise|premise">
             <xsl:sort select="@order"/>
-            <xsl:copy-of select="."/>
+            <xsl:apply-templates select="." mode="cardsort-card-static"/>
         </xsl:for-each>
     </xsl:variable>
     <xsl:variable name="sorted-premises" select="exsl:node-set($sorted-premises-rtf)"/>
@@ -718,7 +741,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:variable name="sorted-responses-rtf">
         <xsl:for-each select="match/response|response">
             <xsl:sort select="@order"/>
-            <xsl:copy-of select="."/>
+            <xsl:apply-templates select="." mode="cardsort-card-static"/>
         </xsl:for-each>
     </xsl:variable>
     <xsl:variable name="sorted-responses" select="exsl:node-set($sorted-responses-rtf)"/>
@@ -790,7 +813,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <p>
                     <xsl:choose>
                         <xsl:when test="response">
-                            <xsl:copy-of select="response"/>
+                            <xsl:apply-templates select="response" mode="cardsort-card-static"/>
                         </xsl:when>
                         <xsl:otherwise>
                             <xsl:text>(</xsl:text>
@@ -804,7 +827,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                         <ul>
                             <xsl:for-each select="premise">
                                 <li>
-                                    <xsl:copy-of select="."/>
+                                    <xsl:apply-templates select="." mode="cardsort-card-static"/>
                                 </li>
                             </xsl:for-each>
                         </ul>

package/assets/xsl/pretext-runestone.xsl

@@ -1608,7 +1608,19 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Carsort Problem -->
 
+<!-- Experimental, see "debug.advanced.feedback": XML for Runestone -->
 <xsl:template match="*[@pi:exercise-interactive = 'cardsort']" mode="runestone-to-interactive">
+    <xsl:choose>
+        <xsl:when test="$b-debug-advanced-feedback">
+            <xsl:apply-templates select="." mode="cardsort-xml"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:apply-templates select="." mode="cardsort-html"/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="*[@pi:exercise-interactive = 'cardsort']" mode="cardsort-html">
     <div class="ptx-runestone-container">
         <div class="runestone cardsort_section">
             <ul data-component="dragndrop" data-question_label="" style="visibility: hidden;">
@@ -1660,6 +1672,106 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </div>
 </xsl:template>
 
+<!-- Experimental, see "debug.advanced.feedback".  The XML form    -->
+<!-- Runestone reads for "matching" and for "dragndrop", which     -->
+<!-- allows a "feedback" on each card.  The exercise's "feedback"  -->
+<!-- is always first, even when empty, so a Runestone that looks   -->
+<!-- for the first "feedback" never finds a card's "feedback".     -->
+<!-- Identifications are those of the HTML form: a "premise" is a  -->
+<!-- "_drag" and a "response" is a "_drop".  A "premise" without a -->
+<!-- "response" gets no "answer", making it a distractor.          -->
+<xsl:template match="*[@pi:exercise-interactive = 'cardsort']" mode="cardsort-xml">
+    <xsl:variable name="rsid">
+        <xsl:apply-templates select="." mode="runestone-id"/>
+    </xsl:variable>
+    <div class="ptx-runestone-container">
+        <div class="runestone cardsort_section">
+            <div data-component="dragndrop" data-question_label="">
+                <xsl:apply-templates select="." mode="runestone-id-attribute"/>
+                <script type="text/xml">
+                    <dragndrop>
+                        <statement>
+                            <xsl:apply-templates select="statement"/>
+                        </statement>
+                        <feedback>
+                            <xsl:apply-templates select="feedback"/>
+                        </feedback>
+                        <xsl:apply-templates select="cardsort/match/premise" mode="cardsort-xml">
+                            <xsl:with-param name="rsid" select="$rsid"/>
+                        </xsl:apply-templates>
+                        <xsl:apply-templates select="cardsort/match/response" mode="cardsort-xml">
+                            <xsl:with-param name="rsid" select="$rsid"/>
+                        </xsl:apply-templates>
+                        <xsl:apply-templates select="cardsort/match/premise" mode="cardsort-xml-answer">
+                            <xsl:with-param name="rsid" select="$rsid"/>
+                        </xsl:apply-templates>
+                    </dragndrop>
+                </script>
+            </div>
+        </div>
+    </div>
+</xsl:template>
+
+<!-- A card, with an optional "feedback" -->
+<xsl:template match="premise|response" mode="cardsort-xml">
+    <xsl:param name="rsid"/>
+    <xsl:element name="{local-name(.)}">
+        <id>
+            <xsl:apply-templates select="." mode="cardsort-xml-id">
+                <xsl:with-param name="rsid" select="$rsid"/>
+            </xsl:apply-templates>
+        </id>
+        <label>
+            <xsl:choose>
+                <xsl:when test="statement">
+                    <xsl:apply-templates select="statement/node()"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:apply-templates select="node()"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </label>
+        <xsl:if test="feedback">
+            <feedback>
+                <xsl:apply-templates select="feedback"/>
+            </feedback>
+        </xsl:if>
+    </xsl:element>
+</xsl:template>
+
+<!-- A "premise" matches the "response" of its "match", if any -->
+<xsl:template match="premise" mode="cardsort-xml-answer">
+    <xsl:param name="rsid"/>
+    <xsl:if test="../response">
+        <answer>
+            <xsl:attribute name="premise">
+                <xsl:apply-templates select="." mode="cardsort-xml-id">
+                    <xsl:with-param name="rsid" select="$rsid"/>
+                </xsl:apply-templates>
+            </xsl:attribute>
+            <xsl:attribute name="response">
+                <xsl:apply-templates select="../response" mode="cardsort-xml-id">
+                    <xsl:with-param name="rsid" select="$rsid"/>
+                </xsl:apply-templates>
+            </xsl:attribute>
+        </answer>
+    </xsl:if>
+</xsl:template>
+
+<xsl:template match="premise" mode="cardsort-xml-id">
+    <xsl:param name="rsid"/>
+    <xsl:value-of select="$rsid"/>
+    <xsl:text>_drag</xsl:text>
+    <xsl:number count="premise" from="cardsort" level="any"/>
+</xsl:template>
+
+<xsl:template match="response" mode="cardsort-xml-id">
+    <xsl:param name="rsid"/>
+    <xsl:value-of select="$rsid"/>
+    <xsl:text>_drop</xsl:text>
+    <xsl:number count="response" from="cardsort" level="any"/>
+</xsl:template>
+
 <!-- A "category" is simply the sequence number of an     -->
 <!-- enclosing "match" element, which serves to group     -->
 <!-- any number of "premise" with zero or one "response", -->

package/assets/xsl/pretext-text.xsl

@@ -1077,9 +1077,10 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>&#xa;&#xa;</xsl:text>
 </xsl:template>
 
-<!-- The heading line of a block: type, number when there is one, -->
-<!-- a parenthesized creator for the theorem-like and axiom-like, -->
-<!-- title when there is one                                      -->
+<!-- The heading line of a block: type, number when there is one,  -->
+<!-- title when there is one, for a mathematical block the         -->
+<!-- parenthesized attribution (creator and origins), and a period -->
+<!-- only when neither follows the number                          -->
 <xsl:template match="*" mode="block-heading">
     <xsl:call-template name="block-heading-line">
         <xsl:with-param name="heading">
@@ -1091,20 +1092,19 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:text> </xsl:text>
                 <xsl:value-of select="$the-number"/>
             </xsl:if>
-            <xsl:if test="creator and (&THEOREM-FILTER; or &AXIOM-FILTER;)">
+            <xsl:variable name="b-attribution" select="(creator or origins) and (&THEOREM-FILTER; or &AXIOM-FILTER; or &DEFINITION-FILTER; or &OPENPROBLEM-FILTER;)"/>
+            <xsl:if test="not(title) and not($b-attribution)">
+                <xsl:text>.</xsl:text>
+            </xsl:if>
+            <xsl:if test="title">
+                <xsl:text> </xsl:text>
+                <xsl:apply-templates select="." mode="title-full"/>
+            </xsl:if>
+            <xsl:if test="$b-attribution">
                 <xsl:text> (</xsl:text>
-                <xsl:apply-templates select="." mode="creator-full"/>
+                <xsl:apply-templates select="." mode="attribution-full"/>
                 <xsl:text>)</xsl:text>
             </xsl:if>
-            <xsl:choose>
-                <xsl:when test="title">
-                    <xsl:text> </xsl:text>
-                    <xsl:apply-templates select="." mode="title-full"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:text>.</xsl:text>
-                </xsl:otherwise>
-            </xsl:choose>
         </xsl:with-param>
     </xsl:call-template>
 </xsl:template>
@@ -1317,6 +1317,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:apply-templates/>
 </xsl:template>
 
+<!-- A "stack" within a "figure" holds subfigures, each a      -->
+<!-- "figure" with its own caption, subnumbered "(a)", "(b)",  -->
+<!-- ...; the enclosing figure captions the whole.             -->
+<xsl:template match="figure/stack">
+    <xsl:apply-templates select="figure"/>
+</xsl:template>
+
 <!-- ##### -->
 <!-- Lists -->
 <!-- ##### -->