@pretextbook/pretext-html 0.8.0 → 0.10.0

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

@@ -545,6 +545,14 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Parson (Horizontal) -->
 
 <xsl:template match="*[@pi:exercise-interactive = 'parson-horizontal']" mode="runestone-to-static">
+    <!-- Natural-language blocks (mathematics included) must stay in  -->
+    <!-- the normal flow, where markup is processed; only genuine     -->
+    <!-- program code belongs in a verbatim code display.  This       -->
+    <!-- mirrors the vertical Parsons template above.                 -->
+    <xsl:variable name="language">
+        <xsl:apply-templates select="." mode="get-programming-language"/>
+    </xsl:variable>
+    <xsl:variable name="b-natural" select="($language = '') or ($language = 'natural')"/>
     <xsl:attribute name="language">
         <xsl:apply-templates select="." mode="active-language"/>
     </xsl:attribute>
@@ -552,20 +560,31 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <!-- Statement -->
     <statement>
         <xsl:copy-of select="statement/node()"/>
-        <!-- programming language version -->
         <p>
-            <cd>
-                <cline>
-                    <!-- hard to tell which is last once sorted, -->
-                    <!-- so we just mark front *and* end         -->
+            <!-- hard to tell which is last once sorted, -->
+            <!-- so we just mark front *and* end         -->
+            <xsl:choose>
+                <xsl:when test="$b-natural">
                     <xsl:text> | </xsl:text>
                     <xsl:for-each select="blocks/block[@order]">
                         <xsl:sort select="@order"/>
-                        <xsl:apply-templates select="." mode="static-horizontal-block"/>
+                        <xsl:apply-templates select="." mode="static-horizontal-block-flow"/>
                         <xsl:text> | </xsl:text>
                     </xsl:for-each>
-                </cline>
-            </cd>
+                </xsl:when>
+                <xsl:otherwise>
+                    <cd>
+                        <cline>
+                            <xsl:text> | </xsl:text>
+                            <xsl:for-each select="blocks/block[@order]">
+                                <xsl:sort select="@order"/>
+                                <xsl:apply-templates select="." mode="static-horizontal-block"/>
+                                <xsl:text> | </xsl:text>
+                            </xsl:for-each>
+                        </cline>
+                    </cd>
+                </xsl:otherwise>
+            </xsl:choose>
         </p>
     </statement>
     <!-- We provide a complete solution below, -->
@@ -577,22 +596,34 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <!-- versions on authored ones.                                   -->
     <xsl:copy-of select="solution"/>
     <solution>
-        <!-- programming language version -->
         <!-- filter out distractors for the solution -->
         <xsl:variable name="the-blocks" select="blocks/block[not(@correct = 'no')]"/>
         <p>
-            <cd>
-                <cline>
+            <xsl:choose>
+                <xsl:when test="$b-natural">
                     <!-- authored in order, but need to follow @ref -->
                     <xsl:for-each select="$the-blocks">
-                        <xsl:apply-templates select="." mode="static-horizontal-block"/>
-                        <!-- context shift should handle distractors at the end -->
+                        <xsl:apply-templates select="." mode="static-horizontal-block-flow"/>
                         <xsl:if test="following-sibling::block">
                             <xsl:text> </xsl:text>
                         </xsl:if>
                     </xsl:for-each>
-                </cline>
-            </cd>
+                </xsl:when>
+                <xsl:otherwise>
+                    <cd>
+                        <cline>
+                            <!-- authored in order, but need to follow @ref -->
+                            <xsl:for-each select="$the-blocks">
+                                <xsl:apply-templates select="." mode="static-horizontal-block"/>
+                                <!-- context shift should handle distractors at the end -->
+                                <xsl:if test="following-sibling::block">
+                                    <xsl:text> </xsl:text>
+                                </xsl:if>
+                            </xsl:for-each>
+                        </cline>
+                    </cd>
+                </xsl:otherwise>
+            </xsl:choose>
         </p>
     </solution>
 </xsl:template>
@@ -610,6 +641,24 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:choose>
 </xsl:template>
 
+<!-- The flow variant serves natural-language blocks: the children  -->
+<!-- of a block are "p", whose contents join the running line, so   -->
+<!-- mathematics and other markup process normally.                 -->
+<!-- A natural-language block may wrap its content in a "p", or -->
+<!-- carry short inline content directly; the flow copy handles -->
+<!-- both shapes, following @ref to a reused source block first -->
+<xsl:template match="blocks/block" mode="static-horizontal-block-flow">
+    <xsl:variable name="the-block" select="id(@ref)|self::*[not(@ref)]"/>
+    <xsl:choose>
+        <xsl:when test="$the-block/p">
+            <xsl:copy-of select="$the-block/p/node()"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:copy-of select="$the-block/node()"/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
 <!-- Cardsort and Matching Problems -->
 
 <!-- Cardsort problems are (roughly) functions, while a (general)   -->
@@ -1172,23 +1221,26 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <xsl:template match="statement" mode="fillin-solution">
     <xsl:variable name="exercise" select=".."/>
+    <xsl:variable name="ordered-evaluates" select="$exercise/evaluation/evaluate[not(@all = 'yes')]"/>
     <solution>
         <xsl:apply-templates select="node()|@*" mode="fillin-solution"/>
         <!-- xerox feedback for correct response on each var -->
         <xsl:for-each select="../setup/var/condition[1]/feedback">
             <xsl:apply-templates select="node()" mode="fillin-solution"/>
         </xsl:for-each>
-        <xsl:for-each select=".//fillin[@answer]">
+        <xsl:for-each select=".//fillin">
             <xsl:variable name="fillin-name" select="@name"/>
             <xsl:variable name="fillin-pos" select="position()"/>
+            <xsl:variable name="named-evaluate" select="$exercise/evaluation/evaluate[@name = $fillin-name]"/>
+            <xsl:variable name="ordered-evaluate" select="$ordered-evaluates[position() = $fillin-pos]"/>
             <xsl:choose>
                 <!-- If #evaluate matches by name, find feedback on a correct result -->
-                <xsl:when test="$exercise/evaluation/evaluate[@name='$fillin-name']/test[@correct='yes']">
-                    <xsl:apply-templates select="$exercise/evaluation/evaluate[@name='$fillin-name']/test[@correct='yes']/feedback/node()" mode="fillin-solution"/>
+                <xsl:when test="$named-evaluate/test[@correct = 'yes']">
+                    <xsl:apply-templates select="$named-evaluate/test[@correct = 'yes']/feedback/node()" mode="fillin-solution"/>
                 </xsl:when>
                 <!-- Otherwise #evaluate matches by order, find feedback on a correct result -->
-                <xsl:when test="$exercise/evaluation/evaluate[$fillin-pos]/test[@correct='yes']">
-                    <xsl:apply-templates select="$exercise/evaluation/evaluate[$fillin-pos]/test[@correct='yes']/feedback/node()" mode="fillin-solution"/>
+                <xsl:when test="$ordered-evaluate/test[@correct = 'yes']">
+                    <xsl:apply-templates select="$ordered-evaluate/test[@correct = 'yes']/feedback/node()" mode="fillin-solution"/>
                 </xsl:when>
             </xsl:choose>
         </xsl:for-each>

package/assets/xsl/pretext-runestone.xsl

@@ -59,6 +59,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:param name="rs-css" select="''"/>
 <xsl:param name="rs-version" select="''"/>
 
+<xsl:param name="godot.shell" select="'https://runestone.academy/cdn/runestone/godot-shell-'"/>
+
 <!-- The Runestone Services version actually in use is -->
 <!-- needed several places, so we compute it once now. -->
 <!-- Manifest, two "ebookConfig".                      -->
@@ -542,10 +544,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:value-of select="$latex-packages-mathjax"/>
                 <xsl:value-of select="$latex-macros"/>
             </latex-macros>
-            <!-- Report major and minor versions from WW so Runestone knows what's up.   -->
-            <!-- These variables are formed in  -html  and could be empty/blank. Hoever, -->
-            <!-- they should always be defined as global variables.                      -->
-            <webwork-version major="{$webwork-major-version}" minor="{$webwork-minor-version}"/>
             <xsl:choose>
                 <xsl:when test="self::book">
                     <!-- Now recurse into chapters, appendix -->
@@ -2582,6 +2580,30 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             </xsl:attribute>
         </xsl:if>
     </xsl:if>
+    <!-- GDScript (Godot WASM) needs to find the shell engine files -->
+    <xsl:if test="$active-language = 'gdscript'">
+        <xsl:attribute name="data-wasm">
+            <xsl:value-of select="$godot.shell" />
+            <xsl:value-of select="$godot.version" />
+        </xsl:attribute>
+        <!-- Optional: per-exercise pck directory in the external directory -->
+        <xsl:if test="@pck">
+            <xsl:attribute name="data-pck">
+                <xsl:value-of select="$generated-directory"/>
+                <!-- add subdirectory -->
+                <xsl:text>gdscript/</xsl:text>
+                <!-- add template -->
+                <xsl:apply-templates select="." mode="unique-id" />
+                <xsl:text>.zip</xsl:text>
+            </xsl:attribute>
+        </xsl:if>
+        <!-- Scene path inside the .pck virtual filesystem -->
+        <xsl:if test="@scene">
+            <xsl:attribute name="data-scene">
+                <xsl:value-of select="@scene"/>
+            </xsl:attribute>
+        </xsl:if>
+    </xsl:if>
     <!-- interpreter arguments for hosted languages -->
     <xsl:variable name="interpreter-args">
         <xsl:call-template name="get-program-attr-or-default">
@@ -2751,6 +2773,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:when test="$language = 'javascript'">  <xsl:text>browser</xsl:text></xsl:when>
         <xsl:when test="$language = 'html'">        <xsl:text>browser</xsl:text></xsl:when>
         <xsl:when test="$language = 'sql'">         <xsl:text>browser</xsl:text></xsl:when>
+        <xsl:when test="$language = 'gdscript'">    <xsl:text>browser</xsl:text></xsl:when>
         <xsl:when test="$language = 'c'">           <xsl:text>jobeserver</xsl:text></xsl:when>
         <xsl:when test="$language = 'cpp'">         <xsl:text>jobeserver</xsl:text></xsl:when>
         <xsl:when test="$language = 'java'">        <xsl:text>jobeserver</xsl:text></xsl:when>

package/assets/xsl/pretext-text-utilities.xsl

@@ -1012,6 +1012,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- First define the replacements. These must be in     -->
 <!-- order as search + replace pairs                     -->
+<!-- Other control character replacements are not        -->
+<!-- included because they would not be valid at an      -->
+<!-- earlier stage.                                      -->
 <xsl:variable name="json-replacements">
     <search>\</search>
     <replace>\\</replace>
@@ -1025,6 +1028,10 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <replace>\r</replace>
     <search><xsl:value-of select="string('&#x22;')"/></search>
     <replace>\&#x22;</replace>
+    <search><xsl:value-of select="string('&#x2028;')"/></search>
+    <replace>\u2028</replace>
+    <search><xsl:value-of select="string('&#x2029;')"/></search>
+    <replace>\u2029</replace>
 </xsl:variable>
 <xsl:variable name="json-replacements-search-set" select="exsl:node-set($json-replacements)/search" />
 <xsl:variable name="json-replacements-replace-set" select="exsl:node-set($json-replacements)/replace" />

package/assets/xsl/pretext-text.xsl

@@ -353,12 +353,29 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Modest: each row a line, cells separated by double spaces.   -->
 <!-- No column alignment (yet), spanning cells simply run in.     -->
+<!-- Table notes ("tn") collect just below the table, lettered    -->
+<!-- in reading order; letters keep them apart from the [1]-style -->
+<!-- marks of true footnotes.                                     -->
 <xsl:template match="tabular">
     <xsl:text>&#xa;</xsl:text>
     <xsl:apply-templates select="row"/>
+    <xsl:for-each select=".//tn">
+        <xsl:text>[</xsl:text>
+        <xsl:apply-templates select="." mode="number"/>
+        <xsl:text>] </xsl:text>
+        <xsl:apply-templates/>
+        <xsl:text>&#xa;</xsl:text>
+    </xsl:for-each>
     <xsl:text>&#xa;</xsl:text>
 </xsl:template>
 
+<!-- The letter mark of a table note, at its cell location -->
+<xsl:template match="tabular//tn">
+    <xsl:text>[</xsl:text>
+    <xsl:apply-templates select="." mode="number"/>
+    <xsl:text>]</xsl:text>
+</xsl:template>
+
 <xsl:template match="row">
     <xsl:text>    </xsl:text>
     <xsl:for-each select="cell">

package/assets/xsl/publisher-variables.xsl

@@ -1416,6 +1416,29 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:if>
 </xsl:variable>
 
+<!-- A dynamic exercise may pull in a Javascript library that is not   -->
+<!-- part of the project, via  setup/jsimports/jslibrary/@url .  In    -->
+<!-- HTML that code runs in the reader's browser, sandboxed as any     -->
+<!-- other page script.  But a *static* build (LaTeX, PDF, EPUB) must  -->
+<!-- execute the same library under Node, on the machine doing the     -->
+<!-- build, with no sandbox at all.  So a static build refuses to run  -->
+<!-- a remote library unless the publisher has named it here:          -->
+<!--                                                                   -->
+<!--   <dynamics>                                                      -->
+<!--       <remote-libraries>                                          -->
+<!--           <library url="https://example.org/matrix.mjs"/>         -->
+<!--       </remote-libraries>                                         -->
+<!--   </dynamics>                                                     -->
+<!--                                                                   -->
+<!-- This is deliberately a per-URL list and not a blanket switch, so  -->
+<!-- that approval granted today cannot silently extend to a library   -->
+<!-- some exercise starts importing tomorrow.  HTML builds are not     -->
+<!-- gated, since the risk being managed is Node running unvetted      -->
+<!-- code as the author, which is strictly greater than the in-browser -->
+<!-- case.  The list is consumed by  extract-dynamic.xsl , which       -->
+<!-- passes it to the substitution script.                             -->
+<xsl:variable name="remote-library-allowlist" select="$publication/dynamics/remote-libraries/library"/>
+
 <!-- File of  custom/@name  elements, whose content is a custom -->
 <!-- replacement for a corresponding  custom/@ref  element in   -->
 <!-- the source.                                                -->
@@ -1807,6 +1830,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <!-- languages *always* supported, including "none" -->
         <xsl:when test="($entered-lang = 'none') or
                         ($entered-lang = 'python') or
+                        ($entered-lang = 'gdscript') or
                         ($entered-lang = 'javascript') or
                         ($entered-lang = 'html') or
                         ($entered-lang = 'sql')">
@@ -3420,6 +3444,16 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:choose>
 </xsl:variable>
 
+<!-- ######################## -->
+<!-- Beamer Slideshow Options -->
+<!-- ######################## -->
+
+<!-- Beamer Theme -->
+
+<xsl:variable name="beamer-theme">
+    <xsl:apply-templates select="$publisher-attribute-options/beamer/appearance/pi:pub-attribute[@name='theme']" mode="set-pubfile-variable"/>
+</xsl:variable>
+
 
 <!-- ########################################### -->
 <!-- Set Values/Defaults for Publisher Variables -->
@@ -3668,6 +3702,11 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <pi:pub-attribute name="math" default="online" options="embedded"/>
         </resources>
     </revealjs>
+    <beamer>
+        <appearance>
+            <pi:pub-attribute name="theme" default="Boadilla" freeform="yes"/>
+        </appearance>
+    </beamer>
 </pi:publisher>
 
 <!-- global variable for pi:publisher tree above -->