@pretextbook/pretext-html 0.18.0 → 0.18.1

package/assets/xsl/pretext-fo.xsl

@@ -1102,15 +1102,16 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- prepends it ("statement" forwards the parameter through).    -->
 <!-- When the content does not lead with a paragraph, the heading -->
 <!-- falls back to a standalone block.  The context node is the   -->
-<!-- block whose children are the content; "title" is metadata,   -->
-<!-- consumed by the heading, and so not content.                 -->
+<!-- block whose children are the content; "title", "creator" and -->
+<!-- "origins" are metadata, consumed by the heading, and so not  -->
+<!-- content.                                                     -->
 <xsl:template name="heading-then-content">
     <xsl:param name="heading"/>
     <!-- "idx" and "notation" are invisible markers, not content;     -->
     <!-- render them for their side effects, but do not let them take  -->
     <!-- the heading or block its run-in into a leading paragraph.     -->
     <xsl:apply-templates select="idx | notation"/>
-    <xsl:variable name="content" select="*[not(self::title) and not(self::idx) and not(self::notation)]"/>
+    <xsl:variable name="content" select="*[not(self::title) and not(self::creator) and not(self::origins) and not(self::idx) and not(self::notation)]"/>
     <xsl:choose>
         <xsl:when test="$content[1][self::p] or $content[1][self::statement and *[1][self::p]]">
             <xsl:apply-templates select="$content[1]">
@@ -1277,7 +1278,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <!-- or blocking the heading's run-in (a "definition" often leads  -->
     <!-- with them).                                                   -->
     <xsl:apply-templates select="idx | notation"/>
-    <xsl:variable name="content" select="*[not(self::title) and not(self::idx) and not(self::notation)]"/>
+    <!-- "title", "creator" and "origins" are consumed by the heading -->
+    <xsl:variable name="content" select="*[not(self::title) and not(self::creator) and not(self::origins) and not(self::idx) and not(self::notation)]"/>
     <xsl:variable name="last" select="$content[last()]"/>
     <!-- The mark rides the paragraph that closes the block (directly,   -->
     <!-- or by closing a "statement") only when that paragraph holds     -->
@@ -1514,6 +1516,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:with-param name="b-has-answer" select="true()"/>
             <xsl:with-param name="b-has-solution" select="true()"/>
         </xsl:apply-templates>
+        <!-- a task of an OPENPROBLEM-LIKE may have DISCUSSION-LIKE -->
+        <xsl:apply-templates select="&DISCUSSION-LIKE;"/>
         <!-- writing space below a terminal task, in a printout -->
         <xsl:apply-templates select="." mode="workspace"/>
     </fo:block>
@@ -1991,6 +1995,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- The provisional label width is fixed, and generous; deep or  -->
 <!-- wide markers (e.g. "xviii.") may eventually warrant a width  -->
 <!-- computed from the actual labels.                             -->
+<!-- A list is usually the child of a paragraph, and an indented  -->
+<!-- paragraph hands its first-line indent down to every block    -->
+<!-- within ("text-indent" is inherited), so a list zeroes it.    -->
 <xsl:template match="ol|ul">
     <xsl:choose>
         <!-- A "cols" request (2 to 6) lays the items out in that many    -->
@@ -2014,7 +2021,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                             <xsl:for-each select="$row-items">
                                 <fo:table-cell padding-right="6pt">
                                     <fo:list-block provisional-distance-between-starts="2em"
-                                                   provisional-label-separation="0.25em">
+                                                   provisional-label-separation="0.25em"
+                                                   text-indent="0">
                                         <xsl:apply-templates select="."/>
                                     </fo:list-block>
                                 </fo:table-cell>
@@ -2030,6 +2038,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:otherwise>
             <fo:list-block provisional-distance-between-starts="2em"
                            provisional-label-separation="0.25em"
+                           text-indent="0"
                            space-before="0.5em"
                            space-after="0.5em">
                 <xsl:apply-templates select="li"/>
@@ -2117,6 +2126,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- bold title in a label column, then its content.  The        -->
 <!-- "@width" hint sizes that label column; a narrow one         -->
 <!-- flush-lefts its title, the others flush-right.              -->
+<!-- As for the other lists, the first-line indent of a          -->
+<!-- paragraph holding the list is not inherited.                -->
 <xsl:template match="dl">
     <xsl:variable name="label-width">
         <xsl:choose>
@@ -2128,6 +2139,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:variable>
     <fo:list-block provisional-distance-between-starts="{$label-width}"
                    provisional-label-separation="1em"
+                   text-indent="0"
                    space-before="0.5em"
                    space-after="0.5em">
         <xsl:apply-templates select="li"/>
@@ -2279,7 +2291,12 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- the text width, centering the result.  A table whose content   -->
 <!-- needs the whole text width (or more) falls back to the full    -->
 <!-- width.  The estimates also serve as the proportional column    -->
-<!-- widths, so the columns keep their relative sizes.  Header rows, -->
+<!-- widths, so the columns keep their relative sizes.  But when    -->
+<!-- the estimates sum to more than the text width, while the       -->
+<!-- longest words of the columns would fit, each column gives up   -->
+<!-- the same share of what it can spare (its estimate less its     -->
+<!-- longest word), so text wraps at a space and no word is         -->
+<!-- squeezed out of its column.  Header rows,                      -->
 <!-- horizontal or vertical (rotated), land in an fo:table-header,  -->
 <!-- which FOP tags as "TH" cells in the PDF structure tree, as     -->
 <!-- PDF/UA requires.  The @row-headers request bolds the leading   -->
@@ -2296,6 +2313,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:variable>
     <xsl:variable name="widths" select="exsl:node-set($widths-rtf)/w"/>
     <xsl:variable name="natural-width" select="sum($widths)"/>
+    <xsl:variable name="floor-width" select="sum($widths/@floor)"/>
     <!-- the natural width as a percentage of the text width, but    -->
     <!-- never wider than the full text width.  A table in a          -->
     <!-- "sidebyside" panel fills the panel: the panel width, not the -->
@@ -2369,7 +2387,22 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <!-- -common (cell, then row/col, then whole-tabular), so no      -->
         <!-- table-wide border is placed here.                           -->
         <xsl:for-each select="$widths">
-            <fo:table-column column-width="proportional-column-width({.})"/>
+            <xsl:variable name="column-width">
+                <xsl:choose>
+                    <!-- too wide for the text, though the longest words would fit:   -->
+                    <!-- each column takes its longest word, and the width left over  -->
+                    <!-- is shared out in proportion to what remains of each estimate -->
+                    <xsl:when test="($natural-width &gt; $text-width-points) and ($floor-width &lt; $text-width-points)">
+                        <xsl:value-of select="format-number(@floor + (. - @floor) * ($text-width-points - $floor-width) div ($natural-width - $floor-width), '0.##')"/>
+                    </xsl:when>
+                    <!-- the estimates fit, or else no sharing out keeps every word -->
+                    <!-- whole: the estimates stand, to be scaled alike if need be  -->
+                    <xsl:otherwise>
+                        <xsl:value-of select="."/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+            <fo:table-column column-width="proportional-column-width({$column-width})"/>
         </xsl:for-each>
         <xsl:if test="row[(@header = 'yes') or (@header = 'vertical')]">
             <fo:table-header>
@@ -2395,6 +2428,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:for-each>
 </xsl:template>
 
+<!-- The width allowed for one character of a table cell, in points: -->
+<!-- seven tenths of the point size of the document, so seven points -->
+<!-- at the default size of ten.  A formula, measured in points,     -->
+<!-- converts to characters at the same rate, so the two measures of -->
+<!-- a cell's content add up.                                        -->
+<xsl:variable name="tabular-points-per-character" select="0.7 * number(substring-before($font-size, 'pt'))"/>
+
 <!-- An estimated width, in points, for each of a tabular's columns, -->
 <!-- emitted as a "w" element apiece.  A column whose cells hold     -->
 <!-- paragraphs takes a fraction of the text width: its authored     -->
@@ -2402,10 +2442,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- converter, which a paragraph needs a settled width to wrap in). -->
 <!-- Every other column is measured from its widest piece of content -->
 <!-- among the rows that span no columns: the longest "line", the    -->
-<!-- longest line-free cell, or the longest visual URL.  Seven points -->
-<!-- per character plus padding is a deliberately generous estimate  -->
-<!-- (a capital or digit in the serif font runs near that wide), so  -->
-<!-- content is unlikely to overflow its column.                     -->
+<!-- longest line-free cell, or the longest visual URL.  The width   -->
+<!-- allowed per character, plus padding, is a deliberately generous -->
+<!-- estimate (a capital or digit in the serif font runs near that   -->
+<!-- wide), so content is unlikely to overflow its column.  Each "w" -->
+<!-- carries a "@floor", the same estimate made for the longest word -->
+<!-- of the column: the least width that holds its text when lines   -->
+<!-- break only at spaces.                                           -->
 <xsl:template name="tabular-column-widths">
     <xsl:param name="count"/>
     <xsl:param name="index" select="1"/>
@@ -2419,7 +2462,40 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <!-- empty column is left with nothing.                          -->
         <xsl:variable name="full-row-cells" select="row[(count(cell) = $count) and not(cell/@colspan)]/cell[$index]"/>
         <xsl:variable name="column-cells" select="$full-row-cells | row[not($full-row-cells) and not(cell/@colspan)]/cell[$index]"/>
-        <w>
+        <!-- Each piece of content the column must hold: a "line", a       -->
+        <!-- line-free cell, or a visual URL.  The character count of its  -->
+        <!-- displayed text (see "width-text") is recorded, and that of    -->
+        <!-- each of its words, since a line breaks only at a space.  A    -->
+        <!-- footnote's text is set elsewhere, not in the cell, so it does -->
+        <!-- not count.  The counts are gathered so the largest can be     -->
+        <!-- taken; a template call cannot live in a sort key.             -->
+        <xsl:variable name="measures-rtf">
+            <xsl:for-each select="$column-cells/line | $column-cells[not(line)] | $column-cells//url/@visual">
+                <xsl:variable name="displayed">
+                    <xsl:apply-templates select="." mode="width-text"/>
+                </xsl:variable>
+                <length>
+                    <xsl:value-of select="string-length(normalize-space($displayed))"/>
+                </length>
+                <xsl:for-each select="str:tokenize(normalize-space($displayed), ' ')">
+                    <word>
+                        <xsl:value-of select="string-length(.)"/>
+                    </word>
+                </xsl:for-each>
+            </xsl:for-each>
+        </xsl:variable>
+        <xsl:variable name="measures" select="exsl:node-set($measures-rtf)"/>
+        <xsl:variable name="longest">
+            <xsl:call-template name="largest-number">
+                <xsl:with-param name="numbers" select="$measures/length"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="longest-word">
+            <xsl:call-template name="largest-number">
+                <xsl:with-param name="numbers" select="$measures/word"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="estimate">
             <xsl:choose>
                 <!-- a paragraph column: a fraction of the text width -->
                 <xsl:when test="$column-cells/p">
@@ -2435,46 +2511,45 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                     </xsl:variable>
                     <xsl:value-of select="round($fraction * $text-width-points)"/>
                 </xsl:when>
-                <!-- a natural column: measured from its widest content; -->
-                <!-- a footnote's text is set elsewhere, not in the cell, -->
-                <!-- so it does not count toward the column's width       -->
+                <!-- a genuinely empty column (no cell of any row sits   -->
+                <!-- here, e.g. a "col" beyond the cells a row supplies) -->
+                <!-- takes only the padding, so a table-wide top or      -->
+                <!-- bottom rule does not trail past the real content;   -->
+                <!-- the value is the formula below at zero length.      -->
+                <xsl:when test="$longest = ''">
+                    <xsl:value-of select="8"/>
+                </xsl:when>
+                <!-- a natural column: measured from its widest content -->
                 <xsl:otherwise>
-                    <!-- the character count of each candidate's displayed  -->
-                    <!-- text (see "width-text"), gathered so the widest can -->
-                    <!-- be taken; a template call cannot live in a sort key -->
-                    <xsl:variable name="lengths-rtf">
-                        <xsl:for-each select="$column-cells/line | $column-cells[not(line)] | $column-cells//url/@visual">
-                            <xsl:variable name="displayed">
-                                <xsl:apply-templates select="." mode="width-text"/>
-                            </xsl:variable>
-                            <length>
-                                <xsl:value-of select="string-length(normalize-space($displayed))"/>
-                            </length>
-                        </xsl:for-each>
-                    </xsl:variable>
-                    <xsl:variable name="longest">
-                        <xsl:for-each select="exsl:node-set($lengths-rtf)/length">
-                            <xsl:sort select="number(.)" data-type="number" order="descending"/>
-                            <xsl:if test="position() = 1">
-                                <xsl:value-of select="."/>
-                            </xsl:if>
-                        </xsl:for-each>
-                    </xsl:variable>
-                    <xsl:choose>
-                        <!-- a genuinely empty column (no cell of any row sits  -->
-                        <!-- here, e.g. a "col" beyond the cells a row supplies) -->
-                        <!-- takes only the padding, so a table-wide top or      -->
-                        <!-- bottom rule does not trail past the real content;    -->
-                        <!-- the value is the formula below at zero length.       -->
-                        <xsl:when test="$longest = ''">
-                            <xsl:value-of select="8"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="7 * $longest + 8"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
+                    <xsl:value-of select="$tabular-points-per-character * $longest + 8"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="longest-word-width">
+            <xsl:choose>
+                <xsl:when test="$longest-word = ''">
+                    <xsl:value-of select="8"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$tabular-points-per-character * $longest-word + 8"/>
                 </xsl:otherwise>
             </xsl:choose>
+        </xsl:variable>
+        <w>
+            <!-- a paragraph column given less width than one of its -->
+            <!-- words needs is held to the width it was given, so a -->
+            <!-- floor is never more than the estimate               -->
+            <xsl:attribute name="floor">
+                <xsl:choose>
+                    <xsl:when test="$longest-word-width &lt; $estimate">
+                        <xsl:value-of select="$longest-word-width"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$estimate"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+            <xsl:value-of select="$estimate"/>
         </w>
         <xsl:call-template name="tabular-column-widths">
             <xsl:with-param name="count" select="$count"/>
@@ -2483,19 +2558,31 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:if>
 </xsl:template>
 
+<!-- The largest of the numbers held by the nodes of "numbers", and -->
+<!-- nothing at all when there are no nodes.                        -->
+<xsl:template name="largest-number">
+    <xsl:param name="numbers"/>
+    <xsl:for-each select="$numbers">
+        <xsl:sort select="number(.)" data-type="number" order="descending"/>
+        <xsl:if test="position() = 1">
+            <xsl:value-of select="."/>
+        </xsl:if>
+    </xsl:for-each>
+</xsl:template>
+
 <!-- The text a table column is sized from.  By default this      -->
-<!-- copy recurses, so wrapper elements, and the source text of   -->
-<!-- an "m" (a fair proxy for the rendered math), are measured,   -->
-<!-- while a footnote is dropped (its text is set outside the     -->
-<!-- cell).  A generator, though, makes text the source lacks,    -->
-<!-- so it is rendered to that text and the result measured: an   -->
-<!-- "xref" (its reference text), the TeX-family and              -->
+<!-- copy recurses, so a wrapper element is measured by its       -->
+<!-- content, while a footnote is dropped (its text is set        -->
+<!-- outside the cell).  A generator, though, makes text the      -->
+<!-- source lacks, so it is rendered to that text and the result  -->
+<!-- measured: an "xref" (its reference text), the TeX-family and -->
 <!-- PreTeXt/WeBWorK logos, the date and time, the Latin          -->
 <!-- abbreviations, a "url" (whose text may be an attribute),     -->
 <!-- the tag-syntax elements, and the punctuation and symbol      -->
 <!-- characters.  A "fillin" contributes its blank's character    -->
-<!-- count.  Text and attribute nodes fall to the built-in        -->
-<!-- rules, which copy their string value through.                -->
+<!-- count, and an "m" as many characters as its rendering is     -->
+<!-- wide.  Text and attribute nodes fall to the built-in rules,  -->
+<!-- which copy their string value through.                       -->
 <xsl:template match="*" mode="width-text">
     <xsl:apply-templates select="node()" mode="width-text"/>
 </xsl:template>
@@ -2550,6 +2637,30 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:value-of select="str:padding(number($characters), '0')"/>
 </xsl:template>
 
+<!-- Inline mathematics is measured by its rendering, since the     -->
+<!-- length of the LaTeX says little about the width of the result: -->
+<!-- delimiter sizing, spacing commands and macros lengthen the     -->
+<!-- source of a short formula, and a macro shortens the source of  -->
+<!-- a long one.  MathJax records the width of the SVG, which is    -->
+<!-- converted to points as for the "m" itself, and then to a run   -->
+<!-- of that many characters.  Without a rendering to consult, the  -->
+<!-- source is measured.                                            -->
+<xsl:template match="m" mode="width-text">
+    <xsl:variable name="id">
+        <xsl:apply-templates select="." mode="unique-id"/>
+    </xsl:variable>
+    <xsl:variable name="svg-width" select="$math-repr/pi:math[@id = $id]/div[@class = 'svg']/svg:svg/@width"/>
+    <xsl:choose>
+        <xsl:when test="contains($svg-width, 'ex')">
+            <xsl:variable name="width-points" select="number(substring-before($svg-width, 'ex')) * $math-points-per-ex"/>
+            <xsl:value-of select="str:padding(ceiling($width-points div $tabular-points-per-character), '0')"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:apply-templates select="node()" mode="width-text"/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
 <xsl:template name="equal-table-columns">
     <xsl:param name="remaining"/>
     <xsl:if test="$remaining &gt; 0">
@@ -3742,10 +3853,13 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:value-of select="$the-mark"/>
         </fo:inline>
         <fo:footnote-body>
-            <!-- "text-align-last" keeps the final line ragged: inside a -->
+            <!-- "text-align-last" keeps the final line ragged: inside a  -->
             <!-- "footnote-body" FOP justifies even the last line, which  -->
-            <!-- stretches a one-line note across the whole measure       -->
-            <fo:block font-size="80%" text-align="{$text-alignment}" text-align-last="start" space-before="0.25em">
+            <!-- stretches a one-line note across the whole measure.  A   -->
+            <!-- zero "text-indent" starts every note at the left edge:   -->
+            <!-- the body is a descendant of the paragraph calling the    -->
+            <!-- note, and would inherit a first-line indent from it.     -->
+            <fo:block font-size="80%" text-align="{$text-alignment}" text-align-last="start" text-indent="0" space-before="0.25em">
                 <xsl:apply-templates select="." mode="link-id-attribute"/>
                 <fo:inline baseline-shift="35%" font-size="70%">
                     <xsl:value-of select="$the-mark"/>
@@ -4133,6 +4247,9 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <!-- "text-align-last" repeats the choice because a         -->
         <!-- justified paragraph passes its own down to this lone   -->
         <!-- line, which would otherwise justify (left-pin) the SVG -->
+        <!-- A zero "text-indent" refuses the first-line indent an  -->
+        <!-- indented paragraph passes down, which would move the   -->
+        <!-- display, and any number it carries, to the right       -->
         <xsl:when test="$svg">
             <!-- a display wider than the measure cannot be placed well;  -->
             <!-- warn the author, by number when there is one, and report -->
@@ -4149,7 +4266,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
                 </xsl:message>
                 <xsl:apply-templates select="." mode="location-report"/>
             </xsl:if>
-            <fo:block text-align="{$display-align}" text-align-last="{$display-align}" space-before="0.5em" space-after="0.5em">
+            <fo:block text-align="{$display-align}" text-align-last="{$display-align}" text-indent="0" space-before="0.5em" space-after="0.5em">
                 <!-- an over-wide numbered display is a centered body in a -->
                 <!-- "min-width" SVG, so its body sits one number-width in -->
                 <!-- from the left.  At the full measure (inherited        -->
@@ -4266,13 +4383,16 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- value carried the source indentation), and glue the clause-      -->
 <!-- ending punctuation absorbed by the display to the final row      -->
 <!-- rather than leaving it stranded after that indentation.          -->
+<!-- As for a rendered display, the first-line indent of the          -->
+<!-- paragraph is refused.                                            -->
 <xsl:template match="md" mode="math-placeholder">
     <fo:block font-family="{$font-family-monospace}"
               border="solid 0.5pt #888888"
               padding="2pt"
               space-before="0.5em"
               space-after="0.5em"
-              text-align="center">
+              text-align="center"
+              text-indent="0">
         <xsl:apply-templates select="." mode="link-id-attribute"/>
         <xsl:for-each select="mrow">
             <fo:block>
@@ -4711,6 +4831,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         self::q or self::sq or self::dblbrackets or self::angles or
         self::c or self::cline or self::tag or self::tage or self::attr or self::today or self::timeofday or self::pi:localize or
         self::sharp or self::flat or self::natural or self::doublesharp or self::doubleflat or
+        self::origins or
         self::xref or self::index-list or self::notation-list or self::list-of)]">
     <xsl:message>PTX:FO-TODO: <xsl:value-of select="local-name()"/> (child of "<xsl:value-of select="local-name(parent::*)"/>")</xsl:message>
     <xsl:apply-templates select="*"/>