@pretextbook/pretext-html 0.3.0 → 0.5.0

package/assets/xsl/pretext-html.xsl

@@ -143,10 +143,6 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:choose>
 </xsl:variable>
 
-<!-- Annotation -->
-<xsl:param name="html.annotation" select="''" />
-<xsl:variable name="b-activate-hypothesis" select="boolean($html.annotation='hypothesis')" />
-
 <!-- Should we build the SCORM manifest file? -->
 <xsl:param name="html.scorm" select="'no'" />
 <!-- b-host-scorm is true when building a SCORM package  -->
@@ -187,6 +183,10 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- so lightweight stylesheets can access the same logic. -->
 <xsl:variable name="chunk-level" select="$html-chunk-level"/>
 
+<!-- A document with chunking set to 0, or with no chapters or sections -->
+<!-- will be a single page. -->
+<xsl:variable name="b-is-single-page" select="$chunk-level = 0 or ($b-is-article and count($document-root/section) = 0) or ($b-is-book and count($document-root//chapter) = 0)"/>
+
 <!-- HTML files as output -->
 <xsl:variable name="file-extension" select="'.html'" />
 
@@ -200,6 +200,10 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Used to identify if target is reveal.js instead of vanilla html -->
 <xsl:variable name="b-reveal-build" select="false()" />
 
+<!-- Standard HTML builds start chunks from level 1. Other builds like epub -->
+<!-- may need a different value.                                            -->
+<xsl:variable name="chunk-heading-level" select="1"/>
+
 <!-- ############### -->
 <!-- Source Analysis -->
 <!-- ############### -->
@@ -395,7 +399,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <!-- But first, we see if there is a coding error, due to            -->
     <!-- the critical chunk level variable being overridden              -->
     <xsl:if test="$chunk-level = ''">
-        <xsl:message>PTX:BUG     the $chunk-level variable has been left undefined&#xa;due to a change in a stylesheet that imports the HTML conversion&#xa;and the computation of an index page may fail spectacularly (infinite recursion?)"</xsl:message>
+        <xsl:message>PTX:BUG:    the $chunk-level variable has been left undefined&#xa;due to a change in a stylesheet that imports the HTML conversion&#xa;and the computation of an index page may fail spectacularly (infinite recursion?)"</xsl:message>
     </xsl:if>
     <xsl:variable name="sanitized-ref">
         <xsl:choose>
@@ -416,7 +420,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                         <xsl:value-of select="$html-index-page-entered-ref"/>
                     </xsl:when>
                     <xsl:otherwise>
-                        <xsl:message>PTX:WARNING:   the requested HTML index page cannot be constructed since "<xsl:value-of select="$html-index-page-entered-ref"/>" is not a complete web page at the current chunking level (level <xsl:value-of select="$chunk-level"/>).  Defaults will be used instead</xsl:message>
+                        <xsl:message>PTX:FALLBACK:   the requested HTML index page cannot be constructed since "<xsl:value-of select="$html-index-page-entered-ref"/>" is not a complete web page at the current chunking level (level <xsl:value-of select="$chunk-level"/>).  Defaults will be used instead</xsl:message>
                         <xsl:text/>
                     </xsl:otherwise>
                 </xsl:choose>
@@ -487,15 +491,18 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- The "file-wrap" routine should accept a $content       -->
 <!-- parameter holding the contents of the body of the page -->
 
+<!-- The HTML conversion (and hence its derivatives) opts in -->
+<!-- to "division companion" chunks: introduction, conclusion, -->
+<!-- objectives, outcomes of a division realized as a summary -->
+<!-- page become pages themselves (see pretext-common.xsl)    -->
+<xsl:variable name="b-division-companion-chunks" select="true()"/>
+
 <!-- A complete page for a structural division -->
-<!-- Unlike the base implemenation in -common we pass a        -->
-<!-- "heading-level", which begins at 2 to account for an "h1" -->
-<!-- being used in the masthead of the page infrastructure.    -->
 <xsl:template match="&STRUCTURAL;" mode="chunk">
     <xsl:apply-templates select="." mode="file-wrap">
         <xsl:with-param name="content">
             <xsl:apply-templates select=".">
-                 <xsl:with-param name="heading-level" select="2"/>
+                 <xsl:with-param name="heading-level" select="$chunk-heading-level"/>
             </xsl:apply-templates>
         </xsl:with-param>
         <!-- Set b-has-printout to true if the structural node is or contains a worksheet or handout -->
@@ -506,9 +513,6 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- A summary page for a structural division -->
 <!-- Processing of a structural node realized as an           -->
 <!-- intermediate/summary node.                               -->
-<!-- We pass in a "heading-level", which begins at 2 to       -->
-<!-- account for an "h1" being used in the masthead of the    -->
-<!-- page infrastructure.                                     -->
 <xsl:template match="&STRUCTURAL;" mode="intermediate">
     <xsl:apply-templates select="." mode="file-wrap">
         <xsl:with-param name="content">
@@ -518,15 +522,15 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <section class="{local-name(.)}">
                 <xsl:apply-templates select="." mode="html-id-attribute"/>
                 <xsl:apply-templates select="." mode="section-heading">
-                    <xsl:with-param name="heading-level" select="2"/>
+                    <xsl:with-param name="heading-level" select="$chunk-heading-level"/>
                 </xsl:apply-templates>
                 <xsl:apply-templates select="." mode="author-byline"/>
                 <!-- Special case when building page for frontmatter without a titlepage -->
                 <xsl:if test="self::frontmatter[not(titlepage)]">
                     <xsl:call-template name="frontmatter-title" />
                 </xsl:if>
-                <xsl:apply-templates select="objectives|introduction|titlepage|abstract">
-                    <xsl:with-param name="heading-level" select="3"/>
+                <xsl:apply-templates select="titlepage|abstract">
+                    <xsl:with-param name="heading-level" select="$chunk-heading-level + 1"/>
                 </xsl:apply-templates>
                 <!-- Links to subsidiary divisions, as a group of button/hyperlinks -->
                 <nav class="summary-links">
@@ -534,9 +538,6 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                         <xsl:apply-templates select="*" mode="summary-nav" />
                     </ul>
                 </nav>
-                <xsl:apply-templates select="conclusion|outcomes">
-                    <xsl:with-param name="heading-level" select="3"/>
-                </xsl:apply-templates>
                 <!-- Insert permalink -->
                 <xsl:apply-templates select="." mode="permalink"/>
             </section>
@@ -571,9 +572,87 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </li>
 </xsl:template>
 
-<!-- introduction (etc.) and conclusion get dropped -->
+<!-- Division companions become links, like the structural children; -->
+<!-- document order places an "introduction" before the subdivision -->
+<!-- links and a "conclusion" after, with no extra machinery        -->
+<xsl:template match="&DIVISION-COMPANION;" mode="summary-nav">
+    <!-- a link only when realized as a page (a conversion that -->
+    <!-- has not opted in renders no link, and no bare content) -->
+    <xsl:variable name="chunk">
+        <xsl:apply-templates select="." mode="is-chunk"/>
+    </xsl:variable>
+    <xsl:if test="$chunk = 'true'">
+        <xsl:variable name="url">
+            <xsl:apply-templates select="." mode="url" />
+        </xsl:variable>
+        <li>
+            <a href="{$url}" class="internal">
+                <span class="title">
+                    <xsl:apply-templates select="." mode="division-companion-text"/>
+                </span>
+            </a>
+        </li>
+    </xsl:if>
+</xsl:template>
+
+<!-- everything else on a summary page gets dropped -->
 <xsl:template match="*" mode="summary-nav" />
 
+<!-- Text for links (and ToC entries) to a division companion page.  -->
+<!-- "introduction"/"conclusion": the localized type-name only (an  -->
+<!-- authored title is silently ignored, pending deprecation).      -->
+<!-- "objectives"/"outcomes": the localized type-name, plus the     -->
+<!-- title when authored, mirroring the inline block headings.      -->
+<xsl:template match="introduction|conclusion" mode="division-companion-text">
+    <xsl:apply-templates select="." mode="type-name"/>
+</xsl:template>
+
+<xsl:template match="objectives|outcomes" mode="division-companion-text">
+    <xsl:apply-templates select="." mode="type-name"/>
+    <xsl:if test="title">
+        <xsl:text>: </xsl:text>
+        <xsl:apply-templates select="." mode="title-short"/>
+    </xsl:if>
+</xsl:template>
+
+<!-- A division companion realized as its own page -->
+<xsl:template match="&DIVISION-COMPANION;" mode="chunk">
+    <xsl:apply-templates select="." mode="file-wrap">
+        <xsl:with-param name="content">
+            <xsl:apply-templates select="." mode="division-companion-page"/>
+        </xsl:with-param>
+    </xsl:apply-templates>
+</xsl:template>
+
+<!-- Page content: a manufactured heading (the link text), then the -->
+<!-- children, much as the inline realization would present them    -->
+<xsl:template match="introduction|conclusion" mode="division-companion-page">
+    <xsl:text>&#xa;</xsl:text>
+    <section>
+        <xsl:attribute name="class">
+            <xsl:value-of select="local-name(.)" />
+        </xsl:attribute>
+        <xsl:apply-templates select="." mode="html-id-attribute"/>
+        <xsl:apply-templates select="." mode="heading-generic">
+            <xsl:with-param name="heading-level" select="$chunk-heading-level"/>
+            <xsl:with-param name="heading-title">
+                <xsl:apply-templates select="." mode="division-companion-text"/>
+            </xsl:with-param>
+        </xsl:apply-templates>
+        <xsl:apply-templates select="*">
+            <xsl:with-param name="heading-level" select="$chunk-heading-level + 1"/>
+        </xsl:apply-templates>
+    </section>
+</xsl:template>
+
+<!-- Page content: the ordinary block realization, whose heading -->
+<!-- already displays the type-name and any authored title       -->
+<xsl:template match="objectives|outcomes" mode="division-companion-page">
+    <xsl:apply-templates select=".">
+        <xsl:with-param name="heading-level" select="$chunk-heading-level"/>
+    </xsl:apply-templates>
+</xsl:template>
+
 <!-- Default template for content of a structural  -->
 <!-- division, which could be an entire page's     -->
 <!-- worth, or just a subdivision within a page    -->
@@ -632,7 +711,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:apply-templates select="." mode="author-byline"/>
         <!-- If there is watermark text, we print it here in an assistive p -->
         <!-- so that it is the first thing read by a screen-reader user.    -->
-        <xsl:if test="$b-watermark and $heading-level = 2">
+        <xsl:if test="$b-watermark and $heading-level = $chunk-heading-level">
             <p class="watermark">
                 <xsl:text>Watermark text: </xsl:text>
                 <xsl:value-of select="$watermark-text"/>
@@ -646,16 +725,12 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <!-- and the method is defined there.                       -->
         <xsl:apply-templates select="." mode="view-source-widget"/>
 
-        <!-- This is usually recurrence, so increment heading-level,  -->
-        <!-- but "book" and "article" have an h1  masthead, so if     -->
-        <!-- this is the context, we just pass along the level of     -->
-        <!-- "2" which is supplied by the chunking templates          -->
-        <!-- N.B. the modal "solutions" templates increment           -->
-        <!--      $heading-level as "exercise" are produced, so       -->
-        <!--      we by-pass the increment here.                      -->
+        <!-- The "solutions" modal templates increment $heading-level  -->
+        <!-- themselves, so bypassing the increment here avoids a skip -->
+        <!-- for both a solutions page and an inline "solutions".      -->
         <xsl:variable name="next-level">
             <xsl:choose>
-                <xsl:when test="self::book or self::article or self::solutions">
+                <xsl:when test="self::solutions">
                     <xsl:value-of select="$heading-level"/>
                 </xsl:when>
                 <xsl:otherwise>
@@ -821,15 +896,47 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:if>
 </xsl:template>
 
-<!-- The front and back matter have their own style -->
-<xsl:template match="frontmatter|backmatter" mode="section-heading" />
+<!-- The frontmatter has its own style -->
+<xsl:template match="frontmatter" mode="section-heading" />
 
-<!-- A book or article is the top level, so the   -->
-<!-- masthead might suffice, else an author can   -->
-<!-- provide a frontmatter/titlepage to provide   -->
-<!-- more specific information.  In either event, -->
-<!-- a typical section heading is out of place.   -->
-<xsl:template match="book|article" mode="section-heading" />
+<!-- Fixed header for the backmatter contents.      -->
+<!-- We generally will hide this for sighted users. -->
+<xsl:template match="backmatter" mode="section-heading">
+    <xsl:if test="not($b-is-single-page)">
+        <xsl:variable name="html-heading">
+            <xsl:apply-templates select="." mode="html-heading">
+                <xsl:with-param name="heading-level" select="$chunk-heading-level"/>
+            </xsl:apply-templates>
+        </xsl:variable>
+        <xsl:element name="{$html-heading}">
+            <xsl:attribute name="class">heading ptx-backmatter-heading</xsl:attribute>
+            <xsl:apply-templates select="." mode="type-name">
+                <xsl:with-param name="string-id" select="'backmatter'"/>
+            </xsl:apply-templates>
+        </xsl:element>
+    </xsl:if>
+</xsl:template>
+
+<!-- A book or article is the top level, using the title would be -->
+<!-- duplicative of the banner. Instead, the page-specific header -->
+<!-- announces that this is the table of contents unless build is -->
+<!-- a single page.                                               -->
+<!-- We generally will hide this for sighted users.               -->
+<xsl:template match="book|article" mode="section-heading">
+    <xsl:if test="not($b-is-single-page)">
+        <xsl:variable name="html-heading">
+            <xsl:apply-templates select="." mode="html-heading">
+                <xsl:with-param name="heading-level" select="$chunk-heading-level"/>
+            </xsl:apply-templates>
+        </xsl:variable>
+        <xsl:element name="{$html-heading}">
+            <xsl:attribute name="class">heading ptx-toc-heading</xsl:attribute>
+            <xsl:apply-templates select="." mode="type-name">
+                <xsl:with-param name="string-id" select="'toc'"/>
+            </xsl:apply-templates>
+        </xsl:element>
+    </xsl:if>
+</xsl:template>
 
 <!-- An abstract needs structure, and an ID for a -->
 <!-- link out of the ToC sidebar for an article   -->
@@ -902,7 +1009,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:apply-templates select="." mode="title-full" />
     </span>
     <!-- add print preview button for printouts -->
-    <xsl:if test="(self::worksheet or self::handout)">
+    <xsl:if test="(&PRINTOUT-FILTER;)">
         <xsl:apply-templates select="." mode="standalone-printout-links"/>
     </xsl:if>
 </xsl:template>
@@ -912,7 +1019,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- print previews.  A simple button with printer icon that reloads -->
 <!-- the page with a url parameter that tells javascript to switch   -->
 <!-- to printout css and format all the pages and workspace.         -->
-<xsl:template match="worksheet|handout" mode="standalone-printout-links">
+<xsl:template match="&PRINTOUT;" mode="standalone-printout-links">
     <xsl:variable name="printout-id">
         <xsl:apply-templates select="." mode="html-id"/>
     </xsl:variable>
@@ -967,7 +1074,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- This is all within a .frontmatter class for CSS       -->
 <xsl:template match="titlepage">
     <!-- Use a context-free template to generate -->
-    <!-- an "h2" title/subtitle heading          -->
+    <!-- an "h1" title/subtitle heading          -->
     <xsl:call-template name="frontmatter-title"/>
     <!-- text generator for title page items from "bibinfo" -->
     <xsl:apply-templates select="$document-root/frontmatter/titlepage/titlepage-items" />
@@ -988,7 +1095,14 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- generated by a "frontmatter" element (including, e.g., an intermediate page). -->
 <xsl:template name="frontmatter-title">
     <xsl:variable name="b-has-subtitle" select="$document-root/subtitle"/>
-    <h2 class="heading">
+    <!-- heading level should match default chunk heading level -->
+    <xsl:variable name="html-heading">
+        <xsl:apply-templates select="." mode="html-heading">
+            <xsl:with-param name="heading-level" select="$chunk-heading-level"/>
+        </xsl:apply-templates>
+    </xsl:variable>
+    <xsl:element name="{$html-heading}">
+        <xsl:attribute name="class">heading</xsl:attribute>
         <span class="title">
             <xsl:apply-templates select="$document-root" mode="title-full" />
         </span>
@@ -997,7 +1111,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:apply-templates select="$document-root" mode="subtitle" />
             </span>
         </xsl:if>
-    </h2>
+    </xsl:element>
 </xsl:template>
 
 <!-- A "credit" required "title" followed by an author (or several)    -->
@@ -1161,7 +1275,9 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
 <xsl:template match="bibinfo/copyright">
     <div class="para copyright">
-        <xsl:call-template name="copyright-character"/>
+        <xsl:call-template name="character">
+            <xsl:with-param name="name" select="'copyright'"/>
+        </xsl:call-template>
         <xsl:apply-templates select="year" />
         <xsl:text> </xsl:text>
         <xsl:apply-templates select="holder" />
@@ -1830,7 +1946,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <!-- The directories of knowls that are targets of references.  Most,   -->
-<!-- but not all, filenames are based on the "visible-id" template,     -->
+<!-- but not all, filenames are based on the "unique-id" template,      -->
 <!-- but this is organized so alternate naming conventions can be used. -->
 <!-- The file extension is *.html so recognized as OK by Moodle, etc    -->
 <xsl:template match="*" mode="knowl-filename">
@@ -1847,15 +1963,15 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         </xsl:when>
         <xsl:when test="$origin = 'index'">
             <xsl:text>index/</xsl:text>
-            <xsl:apply-templates select="." mode="visible-id" />
+            <xsl:apply-templates select="." mode="unique-id" />
         </xsl:when>
         <xsl:when test="$origin = 'list-of'">
             <xsl:text>list-of/</xsl:text>
-            <xsl:apply-templates select="." mode="visible-id" />
+            <xsl:apply-templates select="." mode="unique-id" />
         </xsl:when>
         <xsl:when test="$origin = 'notation'">
             <xsl:text>notation/</xsl:text>
-            <xsl:apply-templates select="." mode="visible-id" />
+            <xsl:apply-templates select="." mode="unique-id" />
         </xsl:when>
         <!-- put a "location-report" template here to debug a bad knowl file -->
         <!-- (the file, or a reference to it) that lacks a subdirectory      -->
@@ -1883,8 +1999,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- progression corresponding to "section" and "article" nodes       -->
 <!-- of the HTML tree.                                                -->
 <!--                                                                  -->
-<!-- We set the "heading-level" to "2" when chunking is initiated,    -->
-<!-- since we expect the masthead/banner to contain an "h1".          -->
+<!-- We set the "heading-level" to "1" when chunking is initiated.    -->
 <!-- Whenever a template processes its children, we increment the     -->
 <!-- variable as we pass it down, so a template receives the correct  -->
 <!-- level (and before it ever gets here, since we have consciously   -->
@@ -1921,9 +2036,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Emit the "hN" tag name for a heading element.  Every caller is -->
 <!-- expected to thread a $heading-level parameter through from the -->
-<!-- chunk-template starting point (currently 2, accounting for the -->
-<!-- masthead h1) via "body", "wrapped-content", and the various    -->
-<!-- heading-* helper templates.                                    -->
+<!-- chunk-template starting point.                                 -->
 <xsl:template match="*" mode="hN">
     <xsl:param name="heading-level" />
     <xsl:variable name="actual-heading-level">
@@ -1938,8 +2051,8 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 <!-- and the various heading-* templates.  If you see  -->
                 <!-- this message, locate the apply-templates chain    -->
                 <!-- that omitted the parameter and add it.            -->
-                <xsl:message>PTX:BUG:     "hN" template reached without a $heading-level parameter on element &lt;<xsl:value-of select="local-name(.)"/>&gt; at <xsl:for-each select="ancestor::*"><xsl:value-of select="local-name(.)"/><xsl:text>/</xsl:text></xsl:for-each><xsl:value-of select="local-name(.)"/>; defaulting to h2</xsl:message>
-                <xsl:text>2</xsl:text>
+                <xsl:message>PTX:BUG:     "hN" template reached without a $heading-level parameter on element &lt;<xsl:value-of select="local-name(.)"/>&gt; at <xsl:for-each select="ancestor::*"><xsl:value-of select="local-name(.)"/><xsl:text>/</xsl:text></xsl:for-each><xsl:value-of select="local-name(.)"/>; defaulting to h1</xsl:message>
+                <xsl:text>1</xsl:text>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:variable>
@@ -3840,9 +3953,9 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <!-- *  Never for a "worksheet" - too messy for printing           -->
             <!-- *  Not hitting PROJECT-LIKE here, see elsewhere               -->
             <xsl:variable name="b-tabbed-tasks" select="
-                (@exercise-customization = 'divisional' and $b-html-tabbed-tasks-divisional) or
-                (@exercise-customization = 'inline' and $b-html-tabbed-tasks-inline) or
-                (@exercise-customization = 'reading' and $b-html-tabbed-tasks-reading)"/>
+                (@pi:exercise-customization = 'divisional' and $b-html-tabbed-tasks-divisional) or
+                (@pi:exercise-customization = 'inline' and $b-html-tabbed-tasks-inline) or
+                (@pi:exercise-customization = 'reading' and $b-html-tabbed-tasks-reading)"/>
             <xsl:choose>
                 <xsl:when test="$b-tabbed-tasks">
                     <!-- Use tabbed viewer from Runestone Components -->
@@ -3986,7 +4099,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <!-- be presented by a "tabbed" interface from Runestone  -->
             <!-- components. Note: this test is simpler than for  -->
             <!-- "exercise" since we know we have a PROJECT-LIKE and  -->
-            <!-- do not need to consult @exercise-customization. -->
+            <!-- do not need to consult @pi:exercise-customization.   -->
             <xsl:choose>
                 <xsl:when test="$b-html-tabbed-tasks-project">
                     <!-- Use tabbed viewer from Runestone Components -->
@@ -4335,8 +4448,13 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- When born use this heading -->
 <xsl:template match="&SOLUTION-LIKE;" mode="heading-birth">
     <xsl:param name="heading-level"/>
+    <!-- consult the single "heading-birth-is-h" predicate, so the -->
+    <!-- "body" heading-level increment cannot disagree with this  -->
+    <xsl:variable name="heads-with-h">
+        <xsl:apply-templates select="." mode="heading-birth-is-h"/>
+    </xsl:variable>
     <xsl:choose>
-        <xsl:when test="($knowl-example-solution = 'no') and ancestor::*[&EXAMPLE-FILTER;]">
+        <xsl:when test="$heads-with-h = 'yes'">
             <xsl:apply-templates select="." mode="heading-non-singleton-number">
                 <xsl:with-param name="heading-level" select="$heading-level"/>
             </xsl:apply-templates>
@@ -4435,7 +4553,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Largely a Runestone/database operation referencing -->
 <!-- existing questions supplied by the manifest,       -->
 <!-- so we go straight to an HTML version               -->
-<xsl:template match="*[@exercise-interactive = 'select']" mode="exercise-components">
+<xsl:template match="*[@pi:exercise-interactive = 'select']" mode="exercise-components">
     <xsl:apply-templates select="." mode="runestone-to-interactive"/>
 </xsl:template>
 
@@ -4451,17 +4569,17 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- The "runestone-to-interactive" templates will combine a   -->
 <!-- "regular" PreTeXt statement together with some additional -->
 <!-- interactive material to make a hybrid "statement"         -->
-<xsl:template match="*[(@exercise-interactive = 'truefalse') or
-                       (@exercise-interactive = 'multiplechoice') or
-                       (@exercise-interactive = 'parson') or
-                       (@exercise-interactive = 'parson-horizontal') or
-                       (@exercise-interactive = 'cardsort') or
-                       (@exercise-interactive = 'matching') or
-                       (@exercise-interactive = 'clickablearea') or
-                       (@exercise-interactive = 'fillin-basic') or
-                       (@exercise-interactive = 'coding') or
-                       (@exercise-interactive = 'dual') or
-                       (@exercise-interactive = 'shortanswer')]" mode="exercise-components">
+<xsl:template match="*[(@pi:exercise-interactive = 'truefalse') or
+                       (@pi:exercise-interactive = 'multiplechoice') or
+                       (@pi:exercise-interactive = 'parson') or
+                       (@pi:exercise-interactive = 'parson-horizontal') or
+                       (@pi:exercise-interactive = 'cardsort') or
+                       (@pi:exercise-interactive = 'matching') or
+                       (@pi:exercise-interactive = 'clickablearea') or
+                       (@pi:exercise-interactive = 'fillin-basic') or
+                       (@pi:exercise-interactive = 'coding') or
+                       (@pi:exercise-interactive = 'dual') or
+                       (@pi:exercise-interactive = 'shortanswer')]" mode="exercise-components">
     <xsl:param name="b-original"/>
     <xsl:param name="block-type"/>
     <xsl:param name="heading-level"/>
@@ -4485,7 +4603,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Dynamic fillin is broken out separately because the test for -->
 <!-- correctness as well as feedback is dynamically chosen.       -->
-<xsl:template match="*[@exercise-interactive = 'fillin']" mode="exercise-components">
+<xsl:template match="*[@pi:exercise-interactive = 'fillin']" mode="exercise-components">
     <xsl:param name="b-original"/>
     <xsl:param name="block-type"/>
     <xsl:param name="heading-level"/>
@@ -5203,11 +5321,15 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:apply-templates select="." mode="heading-generic">
         <xsl:with-param name="heading-level" select="$heading-level"/>
         <xsl:with-param name="heading-title">
-            <xsl:call-template name="langle-character"/>
+            <xsl:call-template name="character">
+                <xsl:with-param name="name" select="'langle'"/>
+            </xsl:call-template>
             <xsl:apply-templates select="." mode="number"/>
             <xsl:text> </xsl:text>
             <xsl:apply-templates select="." mode="title-full"/>
-            <xsl:call-template name="rangle-character"/>
+            <xsl:call-template name="character">
+                <xsl:with-param name="name" select="'rangle'"/>
+            </xsl:call-template>
             <!--  U+2261 ≡ IDENTICAL TO -->
             <xsl:text> &#x2261;</xsl:text>
         </xsl:with-param>
@@ -5244,6 +5366,29 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- are in the order presented above: simple first, -->
 <!-- and top-down when components are also knowled.  -->
 
+<!-- Does a block's "heading-birth" emit an actual "h" at its     -->
+<!-- level?  Consulted by the "body" increment and the "solution" -->
+<!-- heading-birth so their notion of an "h" heading stays one.   -->
+<xsl:template match="*" mode="heading-birth-is-h">
+    <xsl:text>yes</xsl:text>
+</xsl:template>
+
+<xsl:template match="&FIGURE-LIKE;" mode="heading-birth-is-h">
+    <xsl:text>no</xsl:text>
+</xsl:template>
+
+<xsl:template match="&SOLUTION-LIKE;" mode="heading-birth-is-h">
+    <xsl:choose>
+        <!-- an example's solution, shown un-knowled, is a numbered "h" -->
+        <xsl:when test="($knowl-example-solution = 'no') and ancestor::*[&EXAMPLE-FILTER;]">
+            <xsl:text>yes</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>no</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
 
 <xsl:template match="&REMARK-LIKE;|&COMPUTATION-LIKE;|&DEFINITION-LIKE;|&ASIDE-LIKE;|poem|&FIGURE-LIKE;|assemblage|blockquote|paragraphs|&GOAL-LIKE;|&OPENPROBLEM-LIKE;|&EXAMPLE-LIKE;|subexercises|exercisegroup|exercise|&PROJECT-LIKE;|task|&SOLUTION-LIKE;|&DISCUSSION-LIKE;|&THEOREM-LIKE;|&AXIOM-LIKE;|&PROOF-LIKE;|case|fn|contributor|biblio|biblio/note|interactive/instructions|fragment" mode="body">
     <xsl:param name="b-original" select="true()"/>
@@ -5296,11 +5441,25 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:apply-templates select="." mode="view-source-widget"/>
         <!-- Then actual content, respecting b-original flag  -->
         <!-- Pass $block-type for Sage cells to know environs -->
-        <!-- Increment heading-level for descendant blocks    -->
+        <!-- Descendant blocks step down a heading level, unless -->
+        <!-- this block heads with something other than an "h";  -->
+        <!-- the "heading-birth-is-h" predicate decides.         -->
+        <xsl:variable name="heads-with-h">
+            <xsl:apply-templates select="." mode="heading-birth-is-h"/>
+        </xsl:variable>
         <xsl:apply-templates select="." mode="wrapped-content">
             <xsl:with-param name="b-original" select="$b-original" />
             <xsl:with-param name="block-type" select="$block-type" />
-            <xsl:with-param name="heading-level" select="$heading-level + 1"/>
+            <xsl:with-param name="heading-level">
+                <xsl:choose>
+                    <xsl:when test="$heads-with-h = 'no'">
+                        <xsl:value-of select="$heading-level"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$heading-level + 1"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:with-param>
         </xsl:apply-templates>
         <!-- Apply workspace div (but not in project, exercises or tasks, -->
         <!-- since they get them applied in their exercise-content        -->
@@ -5929,7 +6088,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Utility templates to translate PTX              -->
 <!-- enumeration style to HTML list-style-type       -->
 <xsl:template match="ol|ol-marker" mode="html-list-class">
-    <xsl:variable name="mbx-format-code" select="./@format-code" />
+    <xsl:variable name="mbx-format-code" select="./@pi:format-code" />
     <xsl:choose>
         <xsl:when test="$mbx-format-code = '0'">decimal</xsl:when>
         <xsl:when test="$mbx-format-code = '1'">decimal</xsl:when>
@@ -5970,7 +6129,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:variable name="mbx-format-code">
         <xsl:choose>
             <xsl:when test="self::ol">
-                <xsl:value-of select="./@format-code" />
+                <xsl:value-of select="./@pi:format-code" />
             </xsl:when>
             <xsl:otherwise>
                 <xsl:apply-templates select="." mode="format-code" />
@@ -6022,7 +6181,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:for-each >
 </xsl:template>
 
-<xsl:template match="ol[not(@marker) and @format-code = 'a' and @ordered-list-level = '1']" mode="ol-marker-class">
+<xsl:template match="ol[not(@marker) and @pi:format-code = 'a' and @pi:ordered-list-level = '1']" mode="ol-marker-class">
     <xsl:text>lower-alpha-level-1</xsl:text>
 </xsl:template>
 
@@ -6030,10 +6189,10 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
 <xsl:template match="ol[@marker]" mode="ol-markers">
     <xsl:element name="ol-marker">
-        <xsl:copy-of select="@format-code"/>
+        <xsl:copy-of select="@pi:format-code"/>
         <xsl:copy-of select="@marker"/>
-        <xsl:copy-of select="@marker-prefix"/>
-        <xsl:copy-of select="@marker-suffix"/>
+        <xsl:copy-of select="@pi:marker-prefix"/>
+        <xsl:copy-of select="@pi:marker-suffix"/>
         <xsl:attribute name="classname">
             <xsl:text>ol-marker-</xsl:text>
             <xsl:value-of select="position()" />
@@ -6047,11 +6206,11 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>ol.</xsl:text>
     <xsl:value-of select="./@classname"/>
     <xsl:text> &gt; li::marker { content: &quot;</xsl:text>
-    <xsl:value-of select="./@marker-prefix" />
+    <xsl:value-of select="./@pi:marker-prefix" />
     <xsl:text>&quot;counter(list-item,</xsl:text>
     <xsl:apply-templates select="." mode="html-list-class" />
     <xsl:text>)&quot;</xsl:text>
-    <xsl:value-of select="./@marker-suffix" />
+    <xsl:value-of select="./@pi:marker-suffix" />
     <xsl:text> &quot;; }&#xa;</xsl:text>
 </xsl:template>
 
@@ -6400,7 +6559,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             </xsl:when>
             <!-- failure -->
             <xsl:otherwise>
-                <xsl:message>PTX:ERROR:   the Asymptote diagram produced in "<xsl:value-of select="$image-xml"/>" needs to be available relative to the primary source file, or if available it is perhaps ill-formed and its width cannot be determined (which you might report as a bug).  We might be able to proceed as if the diagram is square, but results can be unpredictable.</xsl:message>
+                <xsl:message>PTX:FALLBACK:   the Asymptote diagram produced in "<xsl:value-of select="$image-xml"/>" needs to be available relative to the primary source file, or if available it is perhaps ill-formed and its width cannot be determined (which you might report as a bug).  We might be able to proceed as if the diagram is square, but results can be unpredictable.</xsl:message>
                 <!-- reasonable guess at points/pixels -->
                 <xsl:text>400</xsl:text>
             </xsl:otherwise>
@@ -6422,7 +6581,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             </xsl:when>
             <!-- failure -->
             <xsl:otherwise>
-                <xsl:message>PTX:ERROR:   the Asymptote diagram produced in "<xsl:value-of select="$image-xml"/>" needs to be available relative to the primary source file, or if available it is perhaps ill-formed and its height cannot be determined (which you might report as a bug).  We might be able to proceed as if the diagram is square, but results can be unpredictable.</xsl:message>
+                <xsl:message>PTX:FALLBACK:   the Asymptote diagram produced in "<xsl:value-of select="$image-xml"/>" needs to be available relative to the primary source file, or if available it is perhaps ill-formed and its height cannot be determined (which you might report as a bug).  We might be able to proceed as if the diagram is square, but results can be unpredictable.</xsl:message>
                 <!-- reasonable guess at points/pixels -->
                 <xsl:text>400</xsl:text>
             </xsl:otherwise>
@@ -6589,7 +6748,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:when test="latex-image">
                 <xsl:apply-templates select="$image-svg-xml/svg:svg/*" mode="svg-unique-ids">
                     <xsl:with-param name="svg-unique-id">
-                        <xsl:value-of select="@unique-id"/>
+                        <xsl:value-of select="@pi:unique-id"/>
                     </xsl:with-param>
                 </xsl:apply-templates>
             </xsl:when>
@@ -6644,7 +6803,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Utility template so "aria-describedby" values are consistent -->
 <xsl:template match="image|interactive[@platform|@desmos|@calcplot3d|@circuitjs|@iframe]" mode="describedby-id">
-    <xsl:apply-templates select="." mode="visible-id"/>
+    <xsl:apply-templates select="." mode="unique-id"/>
     <xsl:text>-description</xsl:text>
 </xsl:template>
 
@@ -6941,11 +7100,13 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:element>
 </xsl:template>
 
-<!-- We take in all three rows and package       -->
-<!-- them up inside an overriding "sidebyside"   -->
-<!-- div containing three "sbsrow" divs.  Purely -->
-<!--  a container, never a target, so no xml:id  -->
-<!-- in source, so no HTML id on div.sidebyside  -->
+<!-- The finished panels arrive as one opaque fragment and are      -->
+<!-- copied, untouched, into a "sidebyside" div holding a single    -->
+<!-- "sbsrow" grid div.  All layout (margins, column widths, column -->
+<!-- gap) is declared as CSS on the containers, so wrapping the     -->
+<!-- panels as a unit is exactly the right granularity.  Purely a   -->
+<!-- container, never a target, so no xml:id in source, no HTML id  -->
+<!-- on the div.                                                    -->
 <xsl:template match="sidebyside" mode="compose-panels">
     <xsl:param name="layout" />
     <xsl:param name="panels" />
@@ -7248,11 +7409,11 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 <!-- this *must* be first for maximum utility -->
                 <xsl:call-template name="skip-to-content-link" />
                 <xsl:apply-templates select="." mode="latex-macros" />
-                 <header id="ptx-masthead" class="ptx-masthead">
+                <header id="ptx-masthead" class="ptx-masthead" role="banner">
                     <div class="ptx-banner">
                         <xsl:call-template name="brand-logo" />
                         <div class="title-container">
-                            <h1 class="heading">
+                            <div class="heading ptx-banner-heading">
                                 <xsl:variable name="root-filename">
                                     <xsl:apply-templates select="$document-root" mode="containing-filename" />
                                 </xsl:variable>
@@ -7270,7 +7431,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                                         </span>
                                     </xsl:if>
                                 </a>
-                            </h1>
+                            </div>
                             <!-- Serial list of authors/editors -->
                             <xsl:if test="$b-html-banner-byline">
                                 <p class="byline">
@@ -8429,9 +8590,9 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <!-- The @id attribute of an HTML element is critical.      -->
-<!-- We supply the "visible-id".                            -->
+<!-- We supply the "unique-id".                             -->
 <xsl:template match="*" mode="html-id">
-    <xsl:apply-templates select="." mode="visible-id"/>
+    <xsl:apply-templates select="." mode="unique-id"/>
 </xsl:template>
 
 <!-- And a convenience template to make an id attribute.  -->
@@ -8452,9 +8613,9 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- is banned in Javascript, so we make a "no-dash" version,       -->
 <!-- by replacing a hyphen by a double-underscore.                  -->
 <!-- NB: This runs some non-zero probability of breaking uniqueness -->
-<xsl:template match="*" mode="visible-id-no-dash">
+<xsl:template match="*" mode="unique-id-no-dash">
     <xsl:variable name="the-id">
-        <xsl:apply-templates select="." mode="visible-id" />
+        <xsl:apply-templates select="." mode="unique-id" />
     </xsl:variable>
     <xsl:value-of select="str:replace($the-id, '-', '__')" />
 </xsl:template>
@@ -8688,56 +8849,6 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </s>
 </xsl:template>
 
-<!-- Copyright symbol -->
-<xsl:template name="copyright-character">
-    <xsl:text>&#xa9;</xsl:text>
-</xsl:template>
-
-<!-- Phonomark symbol -->
-<xsl:template name="phonomark-character">
-    <xsl:text>&#x2117;</xsl:text>
-</xsl:template>
-
-<!-- Copyleft symbol -->
-<!-- May not be universally available in fonts                 -->
-<!-- Open C (U+254) plus Combining Circle (U+20dd) can imitate -->
-<xsl:template name="copyleft-character">
-    <xsl:text>&#x1f12f;</xsl:text>
-</xsl:template>
-
-<!-- Registered symbol -->
-<!-- Bringhurst: should be superscript                    -->
-<!-- We consider it a font mistake if not superscripted,  -->
-<!-- since if we use a "sup" tag then a correct font will -->
-<!-- get way too small                                    -->
-<xsl:template name="registered-character">
-    <xsl:text>&#xae;</xsl:text>
-</xsl:template>
-
-<!-- Trademark symbol -->
-<xsl:template name="trademark-character">
-    <xsl:text>&#x2122;</xsl:text>
-</xsl:template>
-
-<!-- Servicemark symbol -->
-<xsl:template name="servicemark-character">
-    <xsl:text>&#x2120;</xsl:text>
-</xsl:template>
-
-<!-- Degree -->
-<xsl:template name="degree-character">
-    <xsl:text>&#xb0;</xsl:text>
-</xsl:template>
-
-<!-- Prime -->
-<xsl:template name="prime-character">
-    <xsl:text>&#x2032;</xsl:text>
-</xsl:template>
-
-<xsl:template name="dblprime-character">
-    <xsl:text>&#x2033;</xsl:text>
-</xsl:template>
-
 <!-- Characters for Tagging Equations -->
 
 <!-- 'SIX POINTED BLACK STAR' (U+2736) -->
@@ -8774,7 +8885,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- https://groups.google.com/forum/#!topic/mathjax-users/IEivs1D7ntM    -->
 <xsl:template match="fillin[not(parent::m or parent::mrow)]">
     <xsl:choose>
-        <xsl:when test="ancestor::statement/../@exercise-interactive='fillin'">
+        <xsl:when test="ancestor::statement/../@pi:exercise-interactive='fillin'">
             <xsl:apply-imports />
         </xsl:when>
         <xsl:otherwise>
@@ -9033,110 +9144,9 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:apply-templates>
 </xsl:template>
 
-<!-- Left Double Bracket -->
-<!-- MATHEMATICAL LEFT WHITE SQUARE BRACKET -->
-<xsl:template name="ldblbracket-character">
-    <xsl:text>&#x27e6;</xsl:text>
-</xsl:template>
-
-<!-- Right Double Bracket -->
-<!-- MATHEMATICAL RIGHT WHITE SQUARE BRACKET -->
-<xsl:template name="rdblbracket-character">
-    <xsl:text>&#x27e7;</xsl:text>
-</xsl:template>
-
-<!-- Left Angle Bracket -->
-<!-- LEFT ANGLE BRACKET -->
-<!-- U+2329 was once used and caused a validator warning      -->
-<!-- "Text run is not in Unicode Normalization Form C" (NFC)  -->
-<xsl:template name="langle-character">
-    <xsl:text>&#x3008;</xsl:text>
-</xsl:template>
-
-<!-- Right Angle Bracket -->
-<!-- RIGHT ANGLE BRACKET -->
-<!-- U+232A was once used and caused a validator warning      -->
-<!-- "Text run is not in Unicode Normalization Form C" (NFC)  -->
-<xsl:template name="rangle-character">
-    <xsl:text>&#x3009;</xsl:text>
-</xsl:template>
-
 
 <!-- Other Miscellaneous Symbols, Constructions -->
 
-<!-- Ellipsis (dots), for text, not math -->
-<xsl:template name="ellipsis-character">
-    <xsl:text>&#x2026;</xsl:text>
-</xsl:template>
-
-<!-- Midpoint -->
-<!-- A centered dot used sometimes like a decorative dash -->
-<!-- Bringhurst: Not Unicode +387, "GREEK ANO TELEIA"     -->
-<xsl:template name="midpoint-character">
-    <xsl:text>&#xb7;</xsl:text>
-</xsl:template>
-
-<!-- Swung Dash -->
-<!-- A decorative dash, like a tilde, but bigger, and centered -->
-<xsl:template name="swungdash-character">
-    <xsl:text>&#x2053;</xsl:text>
-</xsl:template>
-
-<!-- Per Mille -->
-<!-- Or, per thousand, like a percent sign -->
-<xsl:template name="permille-character">
-    <xsl:text>&#x2030;</xsl:text>
-</xsl:template>
-
-<!-- Pilcrow -->
-<!-- Often used to mark the start of a paragraph -->
-<xsl:template name="pilcrow-character">
-    <xsl:text>&#xb6;</xsl:text>
-</xsl:template>
-
-<!-- Section Mark -->
-<!-- The stylized double-S to indicate section numbers -->
-<xsl:template name="section-mark-character">
-    <xsl:text>&#xa7;</xsl:text>
-</xsl:template>
-
-<!-- Minus -->
-<!-- A hyphen/dash for use in text as subtraction or negation-->
-<xsl:template name="minus-character">
-    <xsl:text>&#x2212;</xsl:text>
-</xsl:template>
-
-<!-- Times -->
-<!-- A "multiplication sign" symbol for use in text   -->
-<!-- Styled to enhance, consensus at Google Group was -->
-<!-- font-size: larger; vertical-align: -.2ex;        -->
-<xsl:template name="times-character">
-    <xsl:element name="span">
-        <xsl:attribute name="class">
-            <xsl:text>times-sign</xsl:text>
-        </xsl:attribute>
-        <xsl:text>&#xd7;</xsl:text>
-    </xsl:element>
-</xsl:template>
-
-<!-- Solidus -->
-<!-- Fraction bar, not as steep as a forward slash -->
-<xsl:template name="solidus-character">
-    <xsl:text>&#x2044;</xsl:text>
-</xsl:template>
-
-<!-- Obelus -->
-<!-- A "division" symbol for use in text -->
-<xsl:template name="obelus-character">
-    <xsl:text>&#xf7;</xsl:text>
-</xsl:template>
-
-<!-- Plus/Minus -->
-<!-- The combined symbol -->
-<xsl:template name="plusminus-character">
-    <xsl:text>&#xb1;</xsl:text>
-</xsl:template>
-
 <!-- Foreign words/idioms -->
 <!-- Rutter, Web Typography, p.50 advocates a "span" with      -->
 <!-- a "lang" attribute for foreign words so screen readers    -->
@@ -9331,35 +9341,34 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Special Characters -->
 <!-- ################## -->
 
-<!-- These are specific instances of abstract templates        -->
-<!-- See the similar section of  pretext-common.xsl  for more -->
-
-<!-- Non-breaking space, which "joins" two words as a unit            -->
-<!-- Using &nbsp; does not travel well into node-set() in common file -->
-<!-- http://stackoverflow.com/questions/31870                         -->
-<!-- /using-a-html-entity-in-xslt-e-g-nbsp                            -->
-<!-- Should create UTF-8 anyway:                                      -->
-<!-- https://html.spec.whatwg.org/multipage/semantics.html#charset    -->
+<!-- Each character is the bare Unicode code point, read from the -->
+<!-- representation table in  pretext-common.xsl; an exception    -->
+<!-- needing markup overrides the modal template, per character   -->
 
-<xsl:template name="nbsp-character">
-    <xsl:text>&#xa0;</xsl:text>
-</xsl:template>
-
-<xsl:template name="ndash-character">
-    <xsl:text>&#8211;</xsl:text>
-</xsl:template>
-
-<xsl:template name="mdash-character">
-    <xsl:text>&#8212;</xsl:text>
+<xsl:template match="char" mode="character">
+    <xsl:choose>
+        <xsl:when test="@unicode">
+            <xsl:value-of select="@unicode"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="warn-unimplemented-character">
+                <xsl:with-param name="char-name" select="@name"/>
+            </xsl:call-template>
+        </xsl:otherwise>
+    </xsl:choose>
 </xsl:template>
 
-<!-- The abstract template for "mdash" consults a publisher option -->
-<!-- for thin space, or no space, surrounding an em-dash.  So the  -->
-<!-- "thin-space-character" is needed for that purpose, and does   -->
-<!-- not have an associated empty PTX element.                     -->
-
-<xsl:template name="thin-space-character">
-    <xsl:text>&#8201;</xsl:text>
+<!-- Times -->
+<!-- A "multiplication sign" symbol for use in text   -->
+<!-- Styled to enhance, consensus at Google Group was -->
+<!-- font-size: larger; vertical-align: -.2ex;        -->
+<xsl:template match="char[@name = 'times']" mode="character">
+    <xsl:element name="span">
+        <xsl:attribute name="class">
+            <xsl:text>times-sign</xsl:text>
+        </xsl:attribute>
+        <xsl:text>&#xd7;</xsl:text>
+    </xsl:element>
 </xsl:template>
 
 <!--       -->
@@ -9464,7 +9473,9 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:template match="fragref">
     <xsl:variable name="target" select="id(@ref)"/>
     <span>
-        <xsl:call-template name="langle-character"/>
+        <xsl:call-template name="character">
+            <xsl:with-param name="name" select="'langle'"/>
+        </xsl:call-template>
         <xsl:apply-templates select="." mode="xref-link">
             <xsl:with-param name="target" select="$target" />
             <!-- "fragref" is isomorpic to "xref" as a link -->
@@ -9475,7 +9486,9 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         </xsl:apply-templates>
         <xsl:text> </xsl:text>
         <xsl:apply-templates select="$target" mode="number"/>
-        <xsl:call-template name="rangle-character"/>
+        <xsl:call-template name="character">
+            <xsl:with-param name="name" select="'rangle'"/>
+        </xsl:call-template>
     </span>
     <br/>
 </xsl:template>
@@ -9836,14 +9849,12 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:apply-templates>
     <!-- (2) Identical content, but now isolated on a reader-friendly page -->
     <!-- (we skip this for portable html)                                  -->
-    <!-- The standalone page has its own masthead h1, so headings inside   -->
-    <!-- start fresh at h2.                                                -->
     <xsl:if test="not($b-portable-html)">
         <xsl:apply-templates select="." mode="standalone-page" >
             <xsl:with-param name="content">
                 <xsl:apply-templates select="." mode="interactive-core">
                     <xsl:with-param name="is-standalone" select="true()"/>
-                    <xsl:with-param name="heading-level" select="2"/>
+                    <xsl:with-param name="heading-level" select="1"/>
                 </xsl:apply-templates>
             </xsl:with-param>
         </xsl:apply-templates>
@@ -9863,7 +9874,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <!-- We want to recognize an "interactive" authored  -->
      <!-- in an "exercise" (or similar) which originated -->
      <!-- from a "dual" dynamic/static exercise.         -->
-    <xsl:variable name="b-in-dual-exercise" select="ancestor::*[@exercise-interactive = 'dual']"/>
+    <xsl:variable name="b-in-dual-exercise" select="ancestor::*[@pi:exercise-interactive = 'dual']"/>
     <xsl:choose>
         <!-- A DoenetML interactive lives two lives.  Plain 'ol PreTeXt,  -->
         <!-- supported by a Doenet CDN for its interactivity.  But when   -->
@@ -10318,11 +10329,32 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </canvas>
 </xsl:template>
 
-<!-- HTML Code -->
-<!-- Simply create deep-copy of HTML elements -->
-<!-- TODO: should this be a div, with width and height? -->
+<!-- HTML Code                                                  -->
+<!-- Simply create deep-copy of HTML elements                   -->
+<!-- TODO: should this be a div, with width and height?         -->
+<!-- Authored HTML goes into the page verbatim.  But a plain    -->
+<!-- "xsl:copy-of" materializes every namespace in scope at the -->
+<!-- source location as a declaration on the copy: the source   -->
+<!-- file's own declarations (such as XInclude) and any         -->
+<!-- namespace employed by the assembly machinery.  So instead  -->
+<!-- we rebuild each element, which carries along only the      -->
+<!-- namespaces actually in use.                                -->
 <xsl:template match="slate[@surface = 'html']">
-    <xsl:copy-of select="*" />
+    <xsl:apply-templates select="*" mode="copy-authored-html"/>
+</xsl:template>
+
+<!-- Attributes in the internal namespace are the assembly's     -->
+<!-- identification stamps, not the author's work, so they stay  -->
+<!-- out of the copy.                                            -->
+<xsl:template match="*" mode="copy-authored-html">
+    <xsl:element name="{name()}" namespace="{namespace-uri()}">
+        <xsl:copy-of select="@*[namespace-uri(.) != 'http://pretextbook.org/2020/pretext/internal']"/>
+        <xsl:apply-templates select="node()" mode="copy-authored-html"/>
+    </xsl:element>
+</xsl:template>
+
+<xsl:template match="text()|comment()|processing-instruction()" mode="copy-authored-html">
+    <xsl:copy/>
 </xsl:template>
 
 <!-- Similar to the "div" surface, but with class information -->
@@ -10386,7 +10418,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <!-- ensure identifier does not lead with a digit, so "ggb_". -->
     <xsl:variable name="applet-name">
         <xsl:text>ggb_</xsl:text>
-        <xsl:apply-templates select="." mode="visible-id-no-dash" />
+        <xsl:apply-templates select="." mode="unique-id-no-dash" />
     </xsl:variable>
     <!-- And a Javascript identifier for the parameters -->
     <xsl:variable name="applet-parameters">
@@ -10406,7 +10438,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:variable>
     <!-- And an HTML unique identifier -->
     <xsl:variable name="applet-container">
-        <xsl:apply-templates select="." mode="visible-id" />
+        <xsl:apply-templates select="." mode="unique-id" />
         <xsl:text>-container</xsl:text>
     </xsl:variable>
     <!-- Javascript API for loading GeoGebra                               -->
@@ -10462,7 +10494,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:text>",&#xa;</xsl:text>
             </xsl:when>
             <xsl:when test="@geogebra">
-                <xsl:message>PTX Warning:  "geogebra" attribute on "slate" element is deprecated; use "material" attribute</xsl:message>
+                <xsl:message>PTX:DEPRECATE: "geogebra" attribute on "slate" element is deprecated; use "material" attribute</xsl:message>
                 <xsl:text>material_id:"</xsl:text>
                 <xsl:value-of select="@geogebra" />
                 <xsl:text>",&#xa;</xsl:text>
@@ -10586,7 +10618,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
   <!-- the div that jsxgraph will take over -->
   <xsl:element name="div">
       <xsl:attribute name="id">
-          <xsl:apply-templates select="." mode="visible-id" />
+          <xsl:apply-templates select="." mode="unique-id" />
       </xsl:attribute>
       <xsl:attribute name="class">
           <xsl:text>jxgbox</xsl:text>
@@ -10602,7 +10634,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
               </xsl:attribute>
               <!-- Put the board in the appropriate container. -->
               <xsl:attribute name="container">
-                  <xsl:apply-templates select="." mode="visible-id" />
+                  <xsl:apply-templates select="." mode="unique-id" />
               </xsl:attribute>
               <xsl:if test="@boundingbox">
                   <xsl:attribute name="boundingbox">
@@ -10632,7 +10664,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
               </xsl:attribute>
               <xsl:text>function parseJessie(code) {&#xa;</xsl:text>
               <xsl:text>  let board = JXG.JSXGraph.initBoard('</xsl:text>
-              <xsl:apply-templates select="." mode="visible-id" />
+              <xsl:apply-templates select="." mode="unique-id" />
               <xsl:text>', {</xsl:text>
               <xsl:if test="@boundingbox">
                   <xsl:text>boundingbox:[</xsl:text>
@@ -10900,7 +10932,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <xsl:template match="interactive" mode="get-resize-behavior">
-    <xsl:variable name="platform" select="@interactive-platform"/>
+    <xsl:variable name="platform" select="@pi:interactive-platform"/>
     <xsl:choose>
         <xsl:when test="@resize-behavior != ''">
             <xsl:value-of select="@resize-behavior"/>
@@ -11000,7 +11032,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <!-- the div to hold the JSX output -->
     <xsl:element name="div">
         <xsl:attribute name="id">
-            <xsl:apply-templates select="." mode="visible-id" />
+            <xsl:apply-templates select="." mode="unique-id" />
         </xsl:attribute>
         <xsl:attribute name="class">
             <xsl:text>jxgbox</xsl:text>
@@ -11108,10 +11140,10 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <!-- (or PROJECT-LIKE).  So in this case (only) we place    -->
     <!-- an id value on the  div.exercise-wrapper that is       -->
     <!-- derived from the parent.  Otherwise, we use the        -->
-    <!-- parent @assembly-id with a "-ww-inner" suffix.         -->
+    <!-- parent @pi:assembly-id with a "-ww-inner" suffix.      -->
     <!-- The suffix ensures the inner wrapper's DOM id is       -->
     <!-- distinct from the enclosing "exercise" article's       -->
-    <!-- id (which also holds the @assembly-id value).          -->
+    <!-- id (which also holds the @pi:assembly-id value).       -->
     <!-- Without the suffix, JavaScript (handleWW) would        -->
     <!-- look up the inner id with getElementById and find      -->
     <!-- the outer "exercise" article instead.                  -->
@@ -11122,7 +11154,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:text>-ww-rs</xsl:text>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:value-of select="concat(@assembly-id, '-ww-inner')"/>
+                <xsl:value-of select="concat(@pi:assembly-id, '-ww-inner')"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:variable>
@@ -11270,7 +11302,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:variable>
     <!-- build the iframe -->
     <!-- mimicking Mike Gage's blog post -->
-    <iframe name="{concat(@assembly-id, '-ww-inner')}" width="{$design-width}" src="{$the-url}" data-seed="{static/@seed}"/>
+    <iframe name="{concat(@pi:assembly-id, '-ww-inner')}" width="{$design-width}" src="{$the-url}" data-seed="{static/@seed}"/>
     <script>
         <xsl:text>iFrameResize({log:true,inPageLinks:true,resizeFrom:'child',checkOrigin:["</xsl:text>
         <xsl:value-of select="$webwork-server" />
@@ -11523,11 +11555,15 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <!-- this *must* be first for maximum utility -->
             <xsl:call-template name="skip-to-content-link" />
             <!-- HTML5 body/header will be a "banner" landmark automatically -->
-            <header id="ptx-masthead" class="ptx-masthead">
+            <header id="ptx-masthead" class="ptx-masthead" role="banner">
                 <div class="ptx-banner">
                     <xsl:call-template name="brand-logo" />
                     <div class="title-container">
-                        <h1 class="heading">
+                        <xsl:variable name="banner-heading-element-type">
+                            <xsl:apply-templates select="." mode="banner-heading-element-type"/>
+                        </xsl:variable>
+                        <xsl:element name="{$banner-heading-element-type}">
+                            <xsl:attribute name="class">heading ptx-banner-heading</xsl:attribute>
                             <xsl:variable name="root-filename">
                                 <xsl:apply-templates select="$document-root" mode="containing-filename" />
                             </xsl:variable>
@@ -11545,7 +11581,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                                     </span>
                                 </xsl:if>
                             </a>
-                        </h1>
+                        </xsl:element>
                         <!-- Serial list of authors/editors -->
                         <xsl:if test="$b-html-banner-byline">
                             <p class="byline">
@@ -11554,7 +11590,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                             </p>
                         </xsl:if>
                     </div>  <!-- title-container -->
-                </div>  <!-- banner -->
+                </div> <!-- banner -->
             </header>  <!-- masthead -->
             <xsl:apply-templates select="." mode="primary-navigation"/>
             <xsl:apply-templates select="." mode="latex-macros"/>
@@ -11618,6 +11654,24 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </exsl:document>
 </xsl:template>
 
+<!-- Most pages get a plain div for the banner title element as content will have an h1 -->
+<xsl:template match="*" mode="banner-heading-element-type">
+    <xsl:text>div</xsl:text>
+</xsl:template>
+
+<!-- Root page for a single page document needs h1 as the banner title element -->
+<!-- as there will not be on in page contents.                                 -->
+<xsl:template match="book|article" mode="banner-heading-element-type">
+    <xsl:choose>
+        <xsl:when test="$b-is-single-page">
+            <xsl:text>h1</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>div</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
 <!-- Templates that can be overriden to inject into various      -->
 <!-- points in the HTML page. See file-wrap above for locations. -->
 <xsl:template match="*" mode="file-wrap-head-pre"/>
@@ -11632,7 +11686,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:param name="content" />
     <xsl:variable name="filename">
         <!-- do not use "containing-filename" may be different -->
-        <xsl:apply-templates select="." mode="visible-id" />
+        <xsl:apply-templates select="." mode="unique-id" />
         <text>.html</text>
     </xsl:variable>
     <exsl:document href="{$filename}" method="html" indent="yes" encoding="UTF-8" doctype-system="about:legacy-compat">
@@ -11906,15 +11960,25 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- TODO: perhaps isolate logic to return nodes and put into "common" -->
 
+<!-- Is a node a unit of the linear page order?  The structural  -->
+<!-- nodes are; so is a division companion realized as a page     -->
+<xsl:template match="*" mode="is-linear-unit">
+    <xsl:apply-templates select="." mode="is-structural"/>
+</xsl:template>
+
+<xsl:template match="&DIVISION-COMPANION;" mode="is-linear-unit">
+    <xsl:apply-templates select="." mode="is-chunk"/>
+</xsl:template>
+
 <!-- Check if the XML tree has a preceding/following/parent node -->
-<!-- Then check if it is a document node (structural)            -->
+<!-- Then check if it is a page of the reading order             -->
 <!-- If so, compute the URL for the node                         -->
 <!-- NB: tree urls maybe enabled as a processing option          -->
 <xsl:template match="*" mode="previous-tree-url">
     <xsl:if test="preceding-sibling::*">
         <xsl:variable name="preceding" select="preceding-sibling::*[1]" />
         <xsl:variable name="structural">
-            <xsl:apply-templates select="$preceding" mode="is-structural" />
+            <xsl:apply-templates select="$preceding" mode="is-linear-unit" />
         </xsl:variable>
         <xsl:if test="$structural='true'">
             <xsl:apply-templates select="$preceding" mode="url" />
@@ -11927,7 +11991,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:if test="following-sibling::*">
         <xsl:variable name="following" select="following-sibling::*[1]" />
         <xsl:variable name="structural">
-            <xsl:apply-templates select="$following" mode="is-structural" />
+            <xsl:apply-templates select="$following" mode="is-linear-unit" />
         </xsl:variable>
         <xsl:if test="$structural='true'">
             <xsl:apply-templates select="$following" mode="url" />
@@ -11965,11 +12029,11 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:choose>
         <xsl:when test="$intermediate='true'">
             <!-- Descend once, will always have a child that is structural -->
-            <xsl:variable name="first-structural-child" select="*[&STRUCTURAL-FILTER;][1]" />
+            <xsl:variable name="first-structural-child" select="*[&STRUCTURAL-FILTER; or ($b-division-companion-chunks and (&DIVISION-COMPANION-FILTER;))][1]" />
             <xsl:apply-templates select="$first-structural-child" mode="url" />
             <!-- remainder is a basic check, could be removed -->
             <xsl:variable name="structural">
-                <xsl:apply-templates select="$first-structural-child" mode="is-structural" />
+                <xsl:apply-templates select="$first-structural-child" mode="is-linear-unit" />
             </xsl:variable>
             <xsl:if test="$structural='false'">
                 <xsl:message>PTX:ERROR: descending into first node of an intermediate page (<xsl:value-of select="local-name($first-structural-child)" />) that is non-structural; maybe your source has incorrect structure</xsl:message>
@@ -11990,7 +12054,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:if test="following-sibling::*">
             <xsl:variable name="following" select="following-sibling::*[1]" />
             <xsl:variable name="structural">
-                <xsl:apply-templates select="$following" mode="is-structural" />
+                <xsl:apply-templates select="$following" mode="is-linear-unit" />
             </xsl:variable>
             <xsl:if test="$structural='true'">
                 <!-- A normal sibling following -->
@@ -12024,7 +12088,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:if test="preceding-sibling::*">
             <xsl:variable name="preceding" select="preceding-sibling::*[1]" />
             <xsl:variable name="structural">
-                <xsl:apply-templates select="$preceding" mode="is-structural" />
+                <xsl:apply-templates select="$preceding" mode="is-linear-unit" />
             </xsl:variable>
             <xsl:if test="$structural='true'">
                 <!-- A normal sibling precedin, result is just a sentinel-->
@@ -12064,11 +12128,11 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <xsl:apply-templates select="." mode="url" />
         </xsl:when>
         <xsl:otherwise>
-            <xsl:variable name="last-structural-child" select="*[&STRUCTURAL-FILTER;][last()]" />
+            <xsl:variable name="last-structural-child" select="*[&STRUCTURAL-FILTER; or ($b-division-companion-chunks and (&DIVISION-COMPANION-FILTER;))][last()]" />
             <xsl:apply-templates select="$last-structural-child" mode="previous-descent-url" />
             <!-- remainder is a basic check, could be removed -->
             <xsl:variable name="structural">
-                <xsl:apply-templates select="$last-structural-child" mode="is-structural" />
+                <xsl:apply-templates select="$last-structural-child" mode="is-linear-unit" />
             </xsl:variable>
             <xsl:if test="$structural='false'">
                 <xsl:message>PTX:ERROR: descending into last node of an intermediate page (<xsl:value-of select="local-name($last-structural-child)" />) that is non-structural</xsl:message>
@@ -12926,6 +12990,35 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </li>
 </xsl:template>
 
+<!-- A division companion earns a ToC entry when it is a page -->
+<xsl:template match="&DIVISION-COMPANION;" mode="toc-item">
+    <xsl:variable name="chunk">
+        <xsl:apply-templates select="." mode="is-chunk"/>
+    </xsl:variable>
+    <xsl:if test="$chunk = 'true'">
+        <xsl:variable name="the-url">
+            <xsl:apply-templates select="." mode="url"/>
+        </xsl:variable>
+        <li>
+            <xsl:attribute name="class">
+                <xsl:text>toc-item toc-</xsl:text>
+                <xsl:value-of select="local-name()"/>
+            </xsl:attribute>
+            <!-- copy id of this li for use in customization pass -->
+            <xsl:attribute name="uid">
+                <xsl:value-of select="@pi:unique-id"/>
+            </xsl:attribute>
+            <div class="toc-title-box">
+                <a href="{$the-url}" class="internal">
+                    <span class="title">
+                        <xsl:apply-templates select="." mode="division-companion-text"/>
+                    </span>
+                </a>
+            </div>
+        </li>
+    </xsl:if>
+</xsl:template>
+
 <!-- Recurse through un-interesting elements -->
 <!-- NB: pass along current page -->
 <!-- Will pickup blocks, etc on unstructured divisions while picking up specialized divisions -->
@@ -12947,7 +13040,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:attribute>
     <!-- copy id of this li for use in customization pass, will remove there -->
     <xsl:attribute name="uid">
-        <xsl:value-of select="@unique-id"/>
+        <xsl:value-of select="@pi:unique-id"/>
     </xsl:attribute>
     <div class="toc-title-box">
         <a href="{$the-url}" class="internal">
@@ -12975,7 +13068,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:variable name="toc-contents" select="exsl:node-set($toc-contents-rtf)"/>
 
     <!-- get the unique id of the current page -->
-    <xsl:variable name="uid" select="@unique-id"/>
+    <xsl:variable name="uid" select="@pi:unique-id"/>
     <!-- use that to find the ToC node for that page -->
     <xsl:variable name="this-page-node" select="$toc-contents//*[@uid = $uid]"/>
     <!-- ancestor list will allow us to identify when we are in the path to the page -->
@@ -14473,7 +14566,9 @@ TODO:
                 </a>
             </xsl:when>
             <xsl:otherwise>
+                <span id="logo-link" class="logo-link">
                     <img src="{$location}" alt="Logo image"/>
+                </span>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:if>
@@ -14599,7 +14694,7 @@ TODO:
 <!-- We put page-margins-attributes only on printout sections -->
 <xsl:template match="*" mode="page-margins-attribute"/>
 
-<xsl:template match="worksheet|handout" mode="page-margins-attribute">
+<xsl:template match="&PRINTOUT;" mode="page-margins-attribute">
     <xsl:attribute name="data-margins">
         <!-- A space-separated list for top, right, bottom, and left margins -->
         <xsl:apply-templates select="." mode="printout-margin">
@@ -14627,7 +14722,7 @@ TODO:
 <!-- Add data-* attributes for headers and footers -->
 <xsl:template match="*" mode="page-header-footer-attributes"/>
 
-<xsl:template match="worksheet|handout" mode="page-header-footer-attributes">
+<xsl:template match="&PRINTOUT;" mode="page-header-footer-attributes">
     <xsl:if test="not($ws-header-first-left = '')">
         <xsl:attribute name="data-header-first-left">
             <xsl:value-of select="normalize-space($ws-header-first-left)"/>