From d31576b21bbf7b8aca07b686a189a09e755df2df Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Fri, 7 Feb 2025 14:20:32 +0200
Subject: [PATCH 1/3] Fix TOC styling bugs

---
 src/generator/com/elovirta/pdf/toc.xsl | 395 ++++++++++++++-----------
 1 file changed, 227 insertions(+), 168 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index a0469e1..2a2c5c5 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -66,66 +66,47 @@
       <axsl:template match="node()" mode="tocText" priority="-10">
         <axsl:param name="tocItemContent"/>
         <axsl:param name="currentNode"/>
+        <axsl:param name="prefix" select="''" as="xs:string?"/>
         <axsl:for-each select="$currentNode">
           <axsl:variable name="topicref" select="key('map-id', @id)"/>
           <axsl:variable name="level" select="count(ancestor-or-self::*[contains(@class, ' topic/topic ')])"/>
           <axsl:choose>
-            <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-part')">
-              <axsl:when test="$level eq 1 and $topicref/self::*[contains(@class, ' bookmap/part ')]">
-                <fo:block axsl:use-attribute-sets="__toc__part__content">
-                  <axsl:copy-of select="$tocItemContent"/>
-                </fo:block>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-1')">
-              <axsl:when test="$level eq 1">
-                <fo:block axsl:use-attribute-sets="__toc__topic__content">
-                  <axsl:copy-of select="$tocItemContent"/>
-                </fo:block>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-chapter')">
-              <axsl:when test="$level = (1, 2) and $topicref/self::*[contains(@class, ' bookmap/chapter ')]">
-                <fo:block axsl:use-attribute-sets="__toc__chapter__content">
-                  <axsl:copy-of select="$tocItemContent"/>
-                </fo:block>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-2')">
-              <axsl:when test="$level eq 2">
-                <fo:block axsl:use-attribute-sets="__toc__topic__content_2">
-                  <axsl:copy-of select="$tocItemContent"/>
-                </fo:block>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-3')">
-              <axsl:when test="$level eq 3">
-                <fo:block axsl:use-attribute-sets="__toc__topic__content_3">
-                  <axsl:copy-of select="$tocItemContent"/>
-                </fo:block>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-4')">
-              <axsl:when test="$level eq 4">
-                <fo:block axsl:use-attribute-sets="__toc__topic__content_4">
-                  <axsl:copy-of select="$tocItemContent"/>
-                </fo:block>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-5')">
-              <axsl:when test="$level eq 5">
-                <fo:block axsl:use-attribute-sets="__toc__topic__content_5">
-                  <axsl:copy-of select="$tocItemContent"/>
-                </fo:block>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-6')">
-              <axsl:when test="$level eq 6">
-                <fo:block axsl:use-attribute-sets="__toc__topic__content_6">
-                  <axsl:copy-of select="$tocItemContent"/>
-                </fo:block>
-              </axsl:when>
-            </xsl:if>
+            <xsl:for-each select="'', 'part', 'chapter', 'appendix'">
+              <xsl:variable name="prefix" select="."/>
+              <xsl:variable name="attribute-set-prefix" select="if (. eq '') then '' else ('__' || .)"/>
+              <xsl:variable name="key-prefix" select="if (. eq '') then '' else ('-' || .)"/>
+              <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-part')">
+                <axsl:when test="$prefix eq '{$prefix}' and $level eq 1 and $topicref/self::*[contains(@class, ' bookmap/part ')]">
+                  <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__part__content">
+                    <axsl:copy-of select="$tocItemContent"/>
+                  </fo:block>
+                </axsl:when>
+              </xsl:if>
+              <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-chapter')">
+                <axsl:when test="$prefix eq '{$prefix}' and $level = (1, 2) and $topicref/self::*[contains(@class, ' bookmap/chapter ')]">
+                  <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__chapter__content">
+                    <axsl:copy-of select="$tocItemContent"/>
+                  </fo:block>
+                </axsl:when>
+              </xsl:if>
+              <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-1')">
+                <axsl:when test="$prefix eq '{$prefix}' and $level eq 1">
+                  <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__topic__content">
+                    <axsl:copy-of select="$tocItemContent"/>
+                  </fo:block>
+                </axsl:when>
+              </xsl:if>
+              <xsl:for-each select="2 to 6">
+                <xsl:variable name="level" select="."/>
+                <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-' || $level)">
+                  <axsl:when test="$prefix eq '{$prefix}' and $level eq {$level}">
+                    <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__topic__content_{$level}">
+                      <axsl:copy-of select="$tocItemContent"/>
+                    </fo:block>
+                  </axsl:when>
+                </xsl:if>
+              </xsl:for-each>
+            </xsl:for-each>
             <!-- Workaround for xsl:choose must contain at least one xsl:when -->
             <axsl:when test="true()">
               <fo:block axsl:use-attribute-sets="__toc__topic__content">
@@ -256,12 +237,14 @@
                     <axsl:apply-templates select="." mode="tocText">
                       <axsl:with-param name="tocItemContent" select="$tocItemContent"/>
                       <axsl:with-param name="currentNode" select="."/>
+                      <axsl:with-param name="prefix" select="'part'"/>
                     </axsl:apply-templates>
                   </axsl:when>
                   <axsl:otherwise>
                     <axsl:apply-templates select="$mapTopicref" mode="tocText">
                       <axsl:with-param name="tocItemContent" select="$tocItemContent"/>
                       <axsl:with-param name="currentNode" select="."/>
+                      <axsl:with-param name="prefix" select="'part'"/>
                     </axsl:apply-templates>
                   </axsl:otherwise>
                 </axsl:choose>
@@ -337,12 +320,14 @@
                     <axsl:apply-templates select="." mode="tocText">
                       <axsl:with-param name="tocItemContent" select="$tocItemContent"/>
                       <axsl:with-param name="currentNode" select="."/>
+                      <axsl:with-param name="prefix" select="'chapter'"/>
                     </axsl:apply-templates>
                   </axsl:when>
                   <axsl:otherwise>
                     <axsl:apply-templates select="$mapTopicref" mode="tocText">
                       <axsl:with-param name="tocItemContent" select="$tocItemContent"/>
                       <axsl:with-param name="currentNode" select="."/>
+                      <axsl:with-param name="prefix" select="'chapter'"/>
                     </axsl:apply-templates>
                   </axsl:otherwise>
                 </axsl:choose>
@@ -418,12 +403,14 @@
                     <axsl:apply-templates select="." mode="tocText">
                       <axsl:with-param name="tocItemContent" select="$tocItemContent"/>
                       <axsl:with-param name="currentNode" select="."/>
+                      <axsl:with-param name="prefix" select="'appendix'"/>
                     </axsl:apply-templates>
                   </axsl:when>
                   <axsl:otherwise>
                     <axsl:apply-templates select="$mapTopicref" mode="tocText">
                       <axsl:with-param name="tocItemContent" select="$tocItemContent"/>
                       <axsl:with-param name="currentNode" select="."/>
+                      <axsl:with-param name="prefix" select="'appendix'"/>
                     </axsl:apply-templates>
                   </axsl:otherwise>
                 </axsl:choose>
@@ -474,26 +461,34 @@
                 <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-chapter-start-indent}'), ' + ', $toc.text-indent)"/>
               </axsl:when>
             </xsl:if>
-            <xsl:if test="map:contains($root, 'style-toc-1-start-indent')">
-              <axsl:when test="$level eq 1">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-toc-2-start-indent')">
-              <axsl:when test="$level eq 2">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-2-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-toc-3-start-indent')">
-              <axsl:when test="$level eq 3">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-3-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-toc-4-start-indent')">
-              <axsl:when test="$level eq 4">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-4-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
+            <xsl:for-each select="1 to 6">
+              <xsl:variable name="level" select="."/>
+              <xsl:if test="map:contains($root, 'style-toc-' || $level || '-start-indent')">
+                <axsl:when test="$level eq {$level}">
+                  <axsl:value-of select="concat(e:force-unit('{map:get($root, 'style-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
+                </axsl:when>
+              </xsl:if>
+            </xsl:for-each>
+<!--            <xsl:if test="map:contains($root, 'style-toc-1-start-indent')">-->
+<!--              <axsl:when test="$level eq 1">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-toc-2-start-indent')">-->
+<!--              <axsl:when test="$level eq 2">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-2-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-toc-3-start-indent')">-->
+<!--              <axsl:when test="$level eq 3">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-3-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-toc-4-start-indent')">-->
+<!--              <axsl:when test="$level eq 4">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-4-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
             <!-- Workaround for xsl:choose must contain at least one xsl:when -->
             <axsl:when test="true()">
               <axsl:value-of
@@ -507,36 +502,44 @@
         <axsl:attribute name="start-indent">
           <axsl:variable name="level" select="count(ancestor-or-self::*[contains(@class, ' topic/topic ')]) - 1"/>
           <axsl:choose>
-            <xsl:if test="map:contains($root, 'style-part-toc-1-start-indent')">
-              <axsl:when test="$level eq 1">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-part-toc-2-start-indent')">
-              <axsl:when test="$level eq 2">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-2-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-part-toc-3-start-indent')">
-              <axsl:when test="$level eq 3">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-3-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-part-toc-4-start-indent')">
-              <axsl:when test="$level eq 4">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-4-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-part-toc-5-start-indent')">
-              <axsl:when test="$level eq 5">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-5-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-part-toc-6-start-indent')">
-              <axsl:when test="$level eq 6">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-6-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
+            <xsl:for-each select="1 to 6">
+              <xsl:variable name="level" select="."/>
+              <xsl:if test="map:contains($root, 'style-part-toc-' || $level || '-start-indent')">
+                <axsl:when test="$level eq {$level}">
+                  <axsl:value-of select="concat(e:force-unit('{map:get($root, 'style-part-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
+                </axsl:when>
+              </xsl:if>
+            </xsl:for-each>
+<!--            <xsl:if test="map:contains($root, 'style-part-toc-1-start-indent')">-->
+<!--              <axsl:when test="$level eq 1">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-part-toc-2-start-indent')">-->
+<!--              <axsl:when test="$level eq 2">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-2-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-part-toc-3-start-indent')">-->
+<!--              <axsl:when test="$level eq 3">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-3-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-part-toc-4-start-indent')">-->
+<!--              <axsl:when test="$level eq 4">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-4-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-part-toc-5-start-indent')">-->
+<!--              <axsl:when test="$level eq 5">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-5-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-part-toc-6-start-indent')">-->
+<!--              <axsl:when test="$level eq 6">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-toc-6-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
             <!-- Workaround for xsl:choose must contain at least one xsl:when -->
             <axsl:when test="true()">
               <axsl:value-of
@@ -552,36 +555,44 @@
           <axsl:variable name="level" select="count(ancestor-or-self::*[contains(@class, ' topic/topic ')])
                                               - (if ($inside-part) then 2 else 1)"/>
           <axsl:choose>
-            <xsl:if test="map:contains($root, 'style-chapter-toc-1-start-indent')">
-              <axsl:when test="$level eq 1">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-chapter-toc-2-start-indent')">
-              <axsl:when test="$level eq 2">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-2-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-chapter-toc-3-start-indent')">
-              <axsl:when test="$level eq 3">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-3-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-chapter-toc-4-start-indent')">
-              <axsl:when test="$level eq 4">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-4-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-chapter-toc-5-start-indent')">
-              <axsl:when test="$level eq 5">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-5-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-chapter-toc-6-start-indent')">
-              <axsl:when test="$level eq 6">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-6-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
+            <xsl:for-each select="1 to 6">
+              <xsl:variable name="level" select="."/>
+              <xsl:if test="map:contains($root, 'style-chapter-toc-' || $level || '-start-indent')">
+                <axsl:when test="$level eq {$level}">
+                  <axsl:value-of select="concat(e:force-unit('{map:get($root, 'style-chapter-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
+                </axsl:when>
+              </xsl:if>
+            </xsl:for-each>
+<!--            <xsl:if test="map:contains($root, 'style-chapter-toc-1-start-indent')">-->
+<!--              <axsl:when test="$level eq 1">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-chapter-toc-2-start-indent')">-->
+<!--              <axsl:when test="$level eq 2">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-2-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-chapter-toc-3-start-indent')">-->
+<!--              <axsl:when test="$level eq 3">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-3-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-chapter-toc-4-start-indent')">-->
+<!--              <axsl:when test="$level eq 4">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-4-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-chapter-toc-5-start-indent')">-->
+<!--              <axsl:when test="$level eq 5">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-5-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-chapter-toc-6-start-indent')">-->
+<!--              <axsl:when test="$level eq 6">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-chapter-toc-6-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
             <!-- Workaround for xsl:choose must contain at least one xsl:when -->
             <axsl:when test="true()">
               <axsl:value-of
@@ -595,36 +606,44 @@
         <axsl:attribute name="start-indent">
           <axsl:variable name="level" select="count(ancestor-or-self::*[contains(@class, ' topic/topic ')]) - 1"/>
           <axsl:choose>
-            <xsl:if test="map:contains($root, 'style-appendix-toc-1-start-indent')">
-              <axsl:when test="$level eq 1">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-appendix-toc-2-start-indent')">
-              <axsl:when test="$level eq 2">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-2-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-appendix-toc-3-start-indent')">
-              <axsl:when test="$level eq 3">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-3-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-appendix-toc-4-start-indent')">
-              <axsl:when test="$level eq 4">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-4-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-appendix-toc-5-start-indent')">
-              <axsl:when test="$level eq 5">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-5-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
-            <xsl:if test="map:contains($root, 'style-appendix-toc-6-start-indent')">
-              <axsl:when test="$level eq 6">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-6-start-indent}'), ' + ', $toc.text-indent)"/>
-              </axsl:when>
-            </xsl:if>
+            <xsl:for-each select="1 to 6">
+              <xsl:variable name="level" select="."/>
+              <xsl:if test="map:contains($root, 'style-appendix-toc-' || $level || '-start-indent')">
+                <axsl:when test="$level eq {$level}">
+                  <axsl:value-of select="concat(e:force-unit('{map:get($root, 'style-appendix-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
+                </axsl:when>
+              </xsl:if>
+            </xsl:for-each>
+<!--            <xsl:if test="map:contains($root, 'style-appendix-toc-1-start-indent')">-->
+<!--              <axsl:when test="$level eq 1">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-appendix-toc-2-start-indent')">-->
+<!--              <axsl:when test="$level eq 2">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-2-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-appendix-toc-3-start-indent')">-->
+<!--              <axsl:when test="$level eq 3">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-3-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-appendix-toc-4-start-indent')">-->
+<!--              <axsl:when test="$level eq 4">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-4-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-appendix-toc-5-start-indent')">-->
+<!--              <axsl:when test="$level eq 5">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-5-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
+<!--            <xsl:if test="map:contains($root, 'style-appendix-toc-6-start-indent')">-->
+<!--              <axsl:when test="$level eq 6">-->
+<!--                <axsl:value-of select="concat(e:force-unit('{$root ?style-appendix-toc-6-start-indent}'), ' + ', $toc.text-indent)"/>-->
+<!--              </axsl:when>-->
+<!--            </xsl:if>-->
             <!-- Workaround for xsl:choose must contain at least one xsl:when -->
             <axsl:when test="true()">
               <axsl:value-of
@@ -678,6 +697,25 @@
         <axsl:attribute name="padding-top">inherit</axsl:attribute>
       </axsl:attribute-set>
 
+      <axsl:attribute-set name="__part__toc__chapter__content">
+        <xsl:choose>
+          <xsl:when test="some $key in map:keys($root) satisfies starts-with($key, 'style-part-toc-chapter')">
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-part-toc-chapter'"/>
+              <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-part-toc-1'"/>
+              <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
+        <!-- Override PDF2 default -->
+        <axsl:attribute name="padding-top">inherit</axsl:attribute>
+      </axsl:attribute-set>
+
       <axsl:attribute-set name="__toc__appendix__content">
         <xsl:choose>
           <xsl:when test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-appendix')">
@@ -705,14 +743,35 @@
       </axsl:attribute-set>
 
       <xsl:for-each select="2 to 6">
-        <axsl:attribute-set name="__toc__topic__content_{.}" use-attribute-sets="__toc__topic__content">
+        <xsl:variable name="level" select="."/>
+        <axsl:attribute-set name="__toc__topic__content_{$level}" use-attribute-sets="__toc__topic__content">
           <xsl:call-template name="generate-attribute-set">
-            <xsl:with-param name="prefix" select="'style-toc-{.}'"/>
+            <xsl:with-param name="prefix" select="'style-toc-{$level}'"/>
             <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
           </xsl:call-template>
         </axsl:attribute-set>
       </xsl:for-each>
 
+      <xsl:for-each select="('part', 'chapter', 'appendix')">
+        <xsl:variable name="prefix" select="."/>
+        <axsl:attribute-set name="__{$prefix}__toc__topic__content">
+          <xsl:call-template name="generate-attribute-set">
+            <xsl:with-param name="prefix" select="'style-' || $prefix || '-toc-1'"/>
+            <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+          </xsl:call-template>
+        </axsl:attribute-set>
+
+        <xsl:for-each select="2 to 6">
+          <xsl:variable name="level"  select="."/>
+          <axsl:attribute-set name="__{$prefix}__toc__topic__content_{.}" use-attribute-sets="__{$prefix}__toc__topic__content">
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-' || $prefix || '-toc-' || $level"/>
+              <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+            </xsl:call-template>
+          </axsl:attribute-set>
+        </xsl:for-each>
+      </xsl:for-each>
+
       <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-1')">
         <axsl:attribute-set name="__toc__preface__content">
           <xsl:call-template name="generate-attribute-set">

From abbde76f20c1e26b8d183944d9af680d7d4b9923 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Fri, 7 Feb 2025 16:14:47 +0200
Subject: [PATCH 2/3] Fix TOC entry attribute sets

---
 src/generator/com/elovirta/pdf/toc.xsl | 87 ++++++++++++++++----------
 1 file changed, 55 insertions(+), 32 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index 2a2c5c5..f2c2160 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -75,21 +75,26 @@
               <xsl:variable name="prefix" select="."/>
               <xsl:variable name="attribute-set-prefix" select="if (. eq '') then '' else ('__' || .)"/>
               <xsl:variable name="key-prefix" select="if (. eq '') then '' else ('-' || .)"/>
-              <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-part')">
-                <axsl:when test="$prefix eq '{$prefix}' and $level eq 1 and $topicref/self::*[contains(@class, ' bookmap/part ')]">
+              <xsl:if
+                  test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-part')">
+                <axsl:when
+                    test="$prefix eq '{$prefix}' and $level eq 1 and $topicref/self::*[contains(@class, ' bookmap/part ')]">
                   <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__part__content">
                     <axsl:copy-of select="$tocItemContent"/>
                   </fo:block>
                 </axsl:when>
               </xsl:if>
-              <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-chapter')">
-                <axsl:when test="$prefix eq '{$prefix}' and $level = (1, 2) and $topicref/self::*[contains(@class, ' bookmap/chapter ')]">
+              <xsl:if
+                  test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-chapter')">
+                <axsl:when
+                    test="$prefix eq '{$prefix}' and $level = (1, 2) and $topicref/self::*[contains(@class, ' bookmap/chapter ')]">
                   <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__chapter__content">
                     <axsl:copy-of select="$tocItemContent"/>
                   </fo:block>
                 </axsl:when>
               </xsl:if>
-              <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-1')">
+              <xsl:if
+                  test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-1')">
                 <axsl:when test="$prefix eq '{$prefix}' and $level eq 1">
                   <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__topic__content">
                     <axsl:copy-of select="$tocItemContent"/>
@@ -98,7 +103,8 @@
               </xsl:if>
               <xsl:for-each select="2 to 6">
                 <xsl:variable name="level" select="."/>
-                <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-' || $level)">
+                <xsl:if
+                    test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-' || $level)">
                   <axsl:when test="$prefix eq '{$prefix}' and $level eq {$level}">
                     <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__topic__content_{$level}">
                       <axsl:copy-of select="$tocItemContent"/>
@@ -209,17 +215,20 @@
                     <axsl:attribute name="fox:alt-text">
                       <axsl:call-template name="getNavTitle"/>
                     </axsl:attribute>
-                    <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]/revprop[@changebar]" mode="changebar">
+                    <axsl:apply-templates
+                        select="*[contains(@class,' ditaot-d/ditaval-startprop ')]/revprop[@changebar]"
+                        mode="changebar">
                       <axsl:with-param name="changebar-id" select="concat(dita-ot:generate-changebar-id(.),'-toc')"/>
                     </axsl:apply-templates>
                     <axsl:apply-templates select="$mapTopicref" mode="tocPrefix"/>
                     <fo:inline axsl:use-attribute-sets="__toc__title">
                       <axsl:variable name="pulledNavigationTitle" as="item()*">
-                        <axsl:call-template name="getNavTitle" />
+                        <axsl:call-template name="getNavTitle"/>
                       </axsl:variable>
                       <axsl:apply-templates select="$pulledNavigationTitle" mode="dropCopiedIds"/>
                     </fo:inline>
-                    <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-endprop ')]/revprop[@changebar]" mode="changebar">
+                    <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-endprop ')]/revprop[@changebar]"
+                                          mode="changebar">
                       <axsl:with-param name="changebar-id" select="concat(dita-ot:generate-changebar-id(.),'-toc')"/>
                     </axsl:apply-templates>
                     <fo:inline axsl:use-attribute-sets="__toc__page-number">
@@ -292,17 +301,20 @@
                     <axsl:attribute name="fox:alt-text">
                       <axsl:call-template name="getNavTitle"/>
                     </axsl:attribute>
-                    <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]/revprop[@changebar]" mode="changebar">
+                    <axsl:apply-templates
+                        select="*[contains(@class,' ditaot-d/ditaval-startprop ')]/revprop[@changebar]"
+                        mode="changebar">
                       <axsl:with-param name="changebar-id" select="concat(dita-ot:generate-changebar-id(.),'-toc')"/>
                     </axsl:apply-templates>
                     <axsl:apply-templates select="$mapTopicref" mode="tocPrefix"/>
                     <fo:inline axsl:use-attribute-sets="__toc__title">
                       <axsl:variable name="pulledNavigationTitle" as="item()*">
-                        <axsl:call-template name="getNavTitle" />
+                        <axsl:call-template name="getNavTitle"/>
                       </axsl:variable>
                       <axsl:apply-templates select="$pulledNavigationTitle" mode="dropCopiedIds"/>
                     </fo:inline>
-                    <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-endprop ')]/revprop[@changebar]" mode="changebar">
+                    <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-endprop ')]/revprop[@changebar]"
+                                          mode="changebar">
                       <axsl:with-param name="changebar-id" select="concat(dita-ot:generate-changebar-id(.),'-toc')"/>
                     </axsl:apply-templates>
                     <fo:inline axsl:use-attribute-sets="__toc__page-number">
@@ -375,17 +387,20 @@
                     <axsl:attribute name="fox:alt-text">
                       <axsl:call-template name="getNavTitle"/>
                     </axsl:attribute>
-                    <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]/revprop[@changebar]" mode="changebar">
+                    <axsl:apply-templates
+                        select="*[contains(@class,' ditaot-d/ditaval-startprop ')]/revprop[@changebar]"
+                        mode="changebar">
                       <axsl:with-param name="changebar-id" select="concat(dita-ot:generate-changebar-id(.),'-toc')"/>
                     </axsl:apply-templates>
                     <axsl:apply-templates select="$mapTopicref" mode="tocPrefix"/>
                     <fo:inline axsl:use-attribute-sets="__toc__title">
                       <axsl:variable name="pulledNavigationTitle" as="item()*">
-                        <axsl:call-template name="getNavTitle" />
+                        <axsl:call-template name="getNavTitle"/>
                       </axsl:variable>
                       <axsl:apply-templates select="$pulledNavigationTitle" mode="dropCopiedIds"/>
                     </fo:inline>
-                    <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-endprop ')]/revprop[@changebar]" mode="changebar">
+                    <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-endprop ')]/revprop[@changebar]"
+                                          mode="changebar">
                       <axsl:with-param name="changebar-id" select="concat(dita-ot:generate-changebar-id(.),'-toc')"/>
                     </axsl:apply-templates>
                     <fo:inline axsl:use-attribute-sets="__toc__page-number">
@@ -438,7 +453,7 @@
         <axsl:param name="value"/>
         <axsl:sequence select="if (normalize-space($value) = '0') then '0pt' else $value"/>
       </axsl:function>
-      
+
       <axsl:attribute-set name="__toc__header">
         <xsl:call-template name="generate-attribute-set">
           <xsl:with-param name="prefix" select="'style-topic'"/>
@@ -453,19 +468,22 @@
           <axsl:choose>
             <xsl:if test="map:contains($root, 'style-toc-part-start-indent')">
               <axsl:when test="$level eq 0 and key('map-id', @id)/self::*[contains(@class, ' bookmap/part ')]">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-part-start-indent}'), ' + ', $toc.text-indent)"/>
+                <axsl:value-of
+                    select="concat(e:force-unit('{$root ?style-toc-part-start-indent}'), ' + ', $toc.text-indent)"/>
               </axsl:when>
             </xsl:if>
             <xsl:if test="map:contains($root, 'style-toc-chapter-start-indent')">
               <axsl:when test="$level eq 1">
-                <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-chapter-start-indent}'), ' + ', $toc.text-indent)"/>
+                <axsl:value-of
+                    select="concat(e:force-unit('{$root ?style-toc-chapter-start-indent}'), ' + ', $toc.text-indent)"/>
               </axsl:when>
             </xsl:if>
             <xsl:for-each select="1 to 6">
               <xsl:variable name="level" select="."/>
               <xsl:if test="map:contains($root, 'style-toc-' || $level || '-start-indent')">
                 <axsl:when test="$level eq {$level}">
-                  <axsl:value-of select="concat(e:force-unit('{map:get($root, 'style-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
+                  <axsl:value-of
+                      select="concat(e:force-unit('{map:get($root, 'style-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
                 </axsl:when>
               </xsl:if>
             </xsl:for-each>
@@ -506,7 +524,8 @@
               <xsl:variable name="level" select="."/>
               <xsl:if test="map:contains($root, 'style-part-toc-' || $level || '-start-indent')">
                 <axsl:when test="$level eq {$level}">
-                  <axsl:value-of select="concat(e:force-unit('{map:get($root, 'style-part-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
+                  <axsl:value-of
+                      select="concat(e:force-unit('{map:get($root, 'style-part-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
                 </axsl:when>
               </xsl:if>
             </xsl:for-each>
@@ -551,7 +570,8 @@
 
       <axsl:attribute-set name="__toc__indent__chapter">
         <axsl:attribute name="start-indent">
-          <axsl:variable name="inside-part" as="xs:boolean" select="exists(key('map-id', @id)/ancestor-or-self::*[contains(@class, ' bookmap/part ')])"/>
+          <axsl:variable name="inside-part" as="xs:boolean"
+                         select="exists(key('map-id', @id)/ancestor-or-self::*[contains(@class, ' bookmap/part ')])"/>
           <axsl:variable name="level" select="count(ancestor-or-self::*[contains(@class, ' topic/topic ')])
                                               - (if ($inside-part) then 2 else 1)"/>
           <axsl:choose>
@@ -559,7 +579,8 @@
               <xsl:variable name="level" select="."/>
               <xsl:if test="map:contains($root, 'style-chapter-toc-' || $level || '-start-indent')">
                 <axsl:when test="$level eq {$level}">
-                  <axsl:value-of select="concat(e:force-unit('{map:get($root, 'style-chapter-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
+                  <axsl:value-of
+                      select="concat(e:force-unit('{map:get($root, 'style-chapter-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
                 </axsl:when>
               </xsl:if>
             </xsl:for-each>
@@ -610,7 +631,8 @@
               <xsl:variable name="level" select="."/>
               <xsl:if test="map:contains($root, 'style-appendix-toc-' || $level || '-start-indent')">
                 <axsl:when test="$level eq {$level}">
-                  <axsl:value-of select="concat(e:force-unit('{map:get($root, 'style-appendix-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
+                  <axsl:value-of
+                      select="concat(e:force-unit('{map:get($root, 'style-appendix-toc-' || $level || '-start-indent')}'), ' + ', $toc.text-indent)"/>
                 </axsl:when>
               </xsl:if>
             </xsl:for-each>
@@ -659,7 +681,7 @@
         </axsl:attribute>
       </axsl:attribute-set>
 
-      <axsl:attribute-set name="__toc__part__content">
+      <axsl:attribute-set name="__toc__part__content" use-attribute-sets="__toc__topic__content">
         <xsl:choose>
           <xsl:when test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-part')">
             <xsl:call-template name="generate-attribute-set">
@@ -678,7 +700,7 @@
         <axsl:attribute name="padding-top">inherit</axsl:attribute>
       </axsl:attribute-set>
 
-      <axsl:attribute-set name="__toc__chapter__content">
+      <axsl:attribute-set name="__toc__chapter__content" use-attribute-sets="__toc__topic__content">
         <xsl:choose>
           <xsl:when test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-chapter')">
             <xsl:call-template name="generate-attribute-set">
@@ -697,7 +719,7 @@
         <axsl:attribute name="padding-top">inherit</axsl:attribute>
       </axsl:attribute-set>
 
-      <axsl:attribute-set name="__part__toc__chapter__content">
+      <axsl:attribute-set name="__part__toc__chapter__content" use-attribute-sets="__toc__topic__content">
         <xsl:choose>
           <xsl:when test="some $key in map:keys($root) satisfies starts-with($key, 'style-part-toc-chapter')">
             <xsl:call-template name="generate-attribute-set">
@@ -716,7 +738,7 @@
         <axsl:attribute name="padding-top">inherit</axsl:attribute>
       </axsl:attribute-set>
 
-      <axsl:attribute-set name="__toc__appendix__content">
+      <axsl:attribute-set name="__toc__appendix__content" use-attribute-sets="__toc__topic__content">
         <xsl:choose>
           <xsl:when test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-appendix')">
             <xsl:call-template name="generate-attribute-set">
@@ -754,7 +776,7 @@
 
       <xsl:for-each select="('part', 'chapter', 'appendix')">
         <xsl:variable name="prefix" select="."/>
-        <axsl:attribute-set name="__{$prefix}__toc__topic__content">
+        <axsl:attribute-set name="__{$prefix}__toc__topic__content" use-attribute-sets="__toc__topic__content">
           <xsl:call-template name="generate-attribute-set">
             <xsl:with-param name="prefix" select="'style-' || $prefix || '-toc-1'"/>
             <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
@@ -762,8 +784,9 @@
         </axsl:attribute-set>
 
         <xsl:for-each select="2 to 6">
-          <xsl:variable name="level"  select="."/>
-          <axsl:attribute-set name="__{$prefix}__toc__topic__content_{.}" use-attribute-sets="__{$prefix}__toc__topic__content">
+          <xsl:variable name="level" select="."/>
+          <axsl:attribute-set name="__{$prefix}__toc__topic__content_{.}"
+                              use-attribute-sets="__{$prefix}__toc__topic__content">
             <xsl:call-template name="generate-attribute-set">
               <xsl:with-param name="prefix" select="'style-' || $prefix || '-toc-' || $level"/>
               <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
@@ -773,14 +796,14 @@
       </xsl:for-each>
 
       <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-1')">
-        <axsl:attribute-set name="__toc__preface__content">
+        <axsl:attribute-set name="__toc__preface__content" use-attribute-sets="__toc__topic__content">
           <xsl:call-template name="generate-attribute-set">
             <xsl:with-param name="prefix" select="'style-toc-1'"/>
             <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
           </xsl:call-template>
         </axsl:attribute-set>
 
-        <axsl:attribute-set name="__toc__notices__content">
+        <axsl:attribute-set name="__toc__notices__content" use-attribute-sets="__toc__topic__content">
           <xsl:call-template name="generate-attribute-set">
             <xsl:with-param name="prefix" select="'style-toc-1'"/>
             <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>

From 257ae4aba7c13027a5ecfc5d2b8a420283de91d6 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sun, 9 Feb 2025 12:11:26 +0200
Subject: [PATCH 3/3] Fix toc level styling

---
 src/generator/com/elovirta/pdf/toc.xsl | 47 +++++++++++++-------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index f2c2160..c339a3c 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -85,7 +85,7 @@
                 </axsl:when>
               </xsl:if>
               <xsl:if
-                  test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-chapter')">
+                  test="$prefix = ('', 'part') and (some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-chapter'))">
                 <axsl:when
                     test="$prefix eq '{$prefix}' and $level = (1, 2) and $topicref/self::*[contains(@class, ' bookmap/chapter ')]">
                   <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__chapter__content">
@@ -93,15 +93,16 @@
                   </fo:block>
                 </axsl:when>
               </xsl:if>
-              <xsl:if
-                  test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-1')">
-                <axsl:when test="$prefix eq '{$prefix}' and $level eq 1">
-                  <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__topic__content">
-                    <axsl:copy-of select="$tocItemContent"/>
-                  </fo:block>
-                </axsl:when>
-              </xsl:if>
-              <xsl:for-each select="2 to 6">
+<!--              <xsl:if-->
+<!--                  test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-1')">-->
+<!--                <axsl:when test="$prefix eq '{$prefix}' and $level eq 1">-->
+<!--                  <fo:block axsl:use-attribute-sets="{$attribute-set-prefix}__toc__topic__content">-->
+<!--                    <axsl:copy-of select="$tocItemContent"/>-->
+<!--                  </fo:block>-->
+<!--                </axsl:when>-->
+<!--              </xsl:if>-->
+
+              <xsl:for-each select="1 to 6">
                 <xsl:variable name="level" select="."/>
                 <xsl:if
                     test="some $key in map:keys($root) satisfies starts-with($key, 'style' || $key-prefix || '-toc-' || $level)">
@@ -757,18 +758,18 @@
         <axsl:attribute name="padding-top">inherit</axsl:attribute>
       </axsl:attribute-set>
 
-      <axsl:attribute-set name="__toc__topic__content">
-        <xsl:call-template name="generate-attribute-set">
-          <xsl:with-param name="prefix" select="'style-toc-1'"/>
-          <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
-        </xsl:call-template>
-      </axsl:attribute-set>
+<!--      <axsl:attribute-set name="__toc__topic__content">-->
+<!--        <xsl:call-template name="generate-attribute-set">-->
+<!--          <xsl:with-param name="prefix" select="'style-toc-1'"/>-->
+<!--          <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>-->
+<!--        </xsl:call-template>-->
+<!--      </axsl:attribute-set>-->
 
-      <xsl:for-each select="2 to 6">
+      <xsl:for-each select="1 to 6">
         <xsl:variable name="level" select="."/>
         <axsl:attribute-set name="__toc__topic__content_{$level}" use-attribute-sets="__toc__topic__content">
           <xsl:call-template name="generate-attribute-set">
-            <xsl:with-param name="prefix" select="'style-toc-{$level}'"/>
+            <xsl:with-param name="prefix" select="'style-toc-' || $level"/>
             <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
           </xsl:call-template>
         </axsl:attribute-set>
@@ -777,13 +778,13 @@
       <xsl:for-each select="('part', 'chapter', 'appendix')">
         <xsl:variable name="prefix" select="."/>
         <axsl:attribute-set name="__{$prefix}__toc__topic__content" use-attribute-sets="__toc__topic__content">
-          <xsl:call-template name="generate-attribute-set">
-            <xsl:with-param name="prefix" select="'style-' || $prefix || '-toc-1'"/>
-            <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
-          </xsl:call-template>
+<!--          <xsl:call-template name="generate-attribute-set">-->
+<!--            <xsl:with-param name="prefix" select="'style-' || $prefix || '-toc-1'"/>-->
+<!--            <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>-->
+<!--          </xsl:call-template>-->
         </axsl:attribute-set>
 
-        <xsl:for-each select="2 to 6">
+        <xsl:for-each select="1 to 6">
           <xsl:variable name="level" select="."/>
           <axsl:attribute-set name="__{$prefix}__toc__topic__content_{.}"
                               use-attribute-sets="__{$prefix}__toc__topic__content">