From e09bb5e46a14d670464ede5ad39d348bd89c053f Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sat, 12 Oct 2024 11:11:26 +0300
Subject: [PATCH 01/19] Add part TOC generation

---
 src/generator/com/elovirta/pdf/basic-settings.xsl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/generator/com/elovirta/pdf/basic-settings.xsl b/src/generator/com/elovirta/pdf/basic-settings.xsl
index b56d2ba..6f2e78f 100644
--- a/src/generator/com/elovirta/pdf/basic-settings.xsl
+++ b/src/generator/com/elovirta/pdf/basic-settings.xsl
@@ -68,6 +68,9 @@
       <axsl:variable name="antArgsChapterLayout">
         <xsl:value-of select="if (map:contains($root, 'chapter-layout')) then $root ?chapter-layout else 'BASIC'"/>
       </axsl:variable>
+      <axsl:variable name="partLayout">
+        <xsl:value-of select="if (map:contains($root, 'part-layout')) then $root ?part-layout else 'BASIC'"/>
+      </axsl:variable>
     </axsl:stylesheet>
   </xsl:template>
 

From 548712b0ea99ab810fabb1d5ce26b3b89ac9d9bc Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sat, 12 Oct 2024 13:02:24 +0300
Subject: [PATCH 02/19] Add custom part TOC

---
 src/generator/com/elovirta/pdf/commons.xsl | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
index a647444..8e29daf 100644
--- a/src/generator/com/elovirta/pdf/commons.xsl
+++ b/src/generator/com/elovirta/pdf/commons.xsl
@@ -151,6 +151,41 @@
       <xsl:if test="$root ?cover-image-topic">
         <axsl:template match="*[contains(@class, ' topic/topic ')][@outputclass = '{$root ?cover-image-topic}']" priority="1000"/>
       </xsl:if>
+
+      <axsl:template match="*" mode="createMiniToc">
+        <!-- Part introduction -->
+        <axsl:apply-templates select="*[contains(@class,' topic/titlealts ')]"/>
+        <axsl:if test="*[contains(@class,' topic/shortdesc ')
+                         or contains(@class, ' topic/abstract ')]/node()">
+          <fo:block axsl:use-attribute-sets="p">
+            <axsl:apply-templates select="*[contains(@class,' topic/shortdesc ')
+                                            or contains(@class, ' topic/abstract ')]/node()"/>
+          </fo:block>
+        </axsl:if>
+        <axsl:apply-templates select="*[contains(@class,' topic/body ')]/*"/>
+        <axsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]"/>
+        <axsl:if test="*[contains(@class,' topic/related-links ')]//
+                         *[contains(@class,' topic/link ')]
+                          [not(@role) or @role != 'child']">
+          <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>
+        </axsl:if>
+        <!-- Part TOC -->
+        <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="toc"/>
+        <!--
+        <axsl:if test="*[contains(@class, ' topic/topic ')]">
+          <fo:block axsl:use-attribute-sets="__toc__mini">
+            <fo:block axsl:use-attribute-sets="__toc__mini__header">
+              <axsl:call-template name="getVariable">
+                <axsl:with-param name="id" select="'Mini Toc'"/>
+              </axsl:call-template>
+            </fo:block>
+            <fo:list-block axsl:use-attribute-sets="__toc__mini__list">
+              <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="in-this-chapter-list"/>
+            </fo:list-block>
+          </fo:block>
+        </axsl:if>
+        -->
+      </axsl:template>
     </axsl:stylesheet>
   </xsl:template>
 

From 72cb409267545ae9f031b7bc7c29a84e528bda8a Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sat, 12 Oct 2024 21:21:26 +0300
Subject: [PATCH 03/19] Add part TOC

---
 src/generator/com/elovirta/pdf/commons.xsl |   2 +-
 src/generator/com/elovirta/pdf/toc.xsl     | 109 +++++++++++++++++++++
 src/generator/com/elovirta/pdf/utils.xsl   |   4 +-
 3 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
index 8e29daf..d78bb32 100644
--- a/src/generator/com/elovirta/pdf/commons.xsl
+++ b/src/generator/com/elovirta/pdf/commons.xsl
@@ -170,7 +170,7 @@
           <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>
         </axsl:if>
         <!-- Part TOC -->
-        <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="toc"/>
+        <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="part-toc"/>
         <!--
         <axsl:if test="*[contains(@class, ' topic/topic ')]">
           <fo:block axsl:use-attribute-sets="__toc__mini">
diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index fc62734..c450a3e 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -124,6 +124,82 @@
 <!--        </axsl:call-template>-->
 <!--      </axsl:template>-->
 
+      <axsl:template match="node()" mode="part-toc">
+        <axsl:param name="include"/>
+        <axsl:apply-templates mode="#current">
+          <axsl:with-param name="include" select="$include"/>
+        </axsl:apply-templates>
+      </axsl:template>
+
+      <axsl:template match="*[contains(@class, ' topic/topic ')]" mode="part-toc">
+        <axsl:param name="include"/>
+        <axsl:variable name="topicLevel" as="xs:integer">
+          <axsl:apply-templates select="." mode="get-topic-level"/>
+        </axsl:variable>
+        <axsl:if test="$topicLevel &lt; $tocMaximumLevel">
+          <axsl:variable name="mapTopicref" select="key('map-id', @id)[1]" as="element()?"/>
+          <axsl:choose>
+            <axsl:when test="$mapTopicref[@toc = 'yes' or not(@toc)] or
+                                (not($mapTopicref) and $include = 'true')">
+              <fo:block axsl:use-attribute-sets="__toc__indent__part">
+                <axsl:variable name="tocItemContent">
+                  <fo:basic-link axsl:use-attribute-sets="__toc__link">
+                    <axsl:attribute name="internal-destination">
+                      <axsl:call-template name="generate-toc-id"/>
+                    </axsl:attribute>
+                    <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: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: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: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">
+                      <fo:leader axsl:use-attribute-sets="__toc__leader"/>
+                      <fo:page-number-citation>
+                        <axsl:attribute name="ref-id">
+                          <axsl:call-template name="generate-toc-id"/>
+                        </axsl:attribute>
+                      </fo:page-number-citation>
+                    </fo:inline>
+                  </fo:basic-link>
+                </axsl:variable>
+                <axsl:choose>
+                  <axsl:when test="not($mapTopicref)">
+                    <axsl:apply-templates select="." mode="tocText">
+                      <axsl:with-param name="tocItemContent" select="$tocItemContent"/>
+                      <axsl:with-param name="currentNode" select="."/>
+                    </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:apply-templates>
+                  </axsl:otherwise>
+                </axsl:choose>
+              </fo:block>
+              <axsl:apply-templates mode="#current">
+                <axsl:with-param name="include" select="'true'"/>
+              </axsl:apply-templates>
+            </axsl:when>
+            <axsl:otherwise>
+              <axsl:apply-templates mode="#current">
+                <axsl:with-param name="include" select="'true'"/>
+              </axsl:apply-templates>
+            </axsl:otherwise>
+          </axsl:choose>
+        </axsl:if>
+      </axsl:template>
     </axsl:stylesheet>
   </xsl:template>
 
@@ -175,6 +251,39 @@
         </axsl:attribute>
       </axsl:attribute-set>
 
+      <axsl:attribute-set name="__toc__indent__part">
+        <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-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
+                  select="concat($side-col-width, ' + (', string($level - 1), ' * ', $toc.toc-indent, ') + ', $toc.text-indent)"/>
+            </axsl:when>
+          </axsl:choose>
+        </axsl:attribute>
+      </axsl:attribute-set>
+
       <axsl:attribute-set name="__toc__indent__booklist">
         <axsl:attribute name="start-indent">
           <axsl:value-of select="concat(e:force-unit('{$root ?style-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>
diff --git a/src/generator/com/elovirta/pdf/utils.xsl b/src/generator/com/elovirta/pdf/utils.xsl
index 3fb625e..38eb1d4 100644
--- a/src/generator/com/elovirta/pdf/utils.xsl
+++ b/src/generator/com/elovirta/pdf/utils.xsl
@@ -337,6 +337,7 @@
         <xsl:attribute name="ditaarch:dummy" namespace="http://dita.oasis-open.org/architecture/2005/"/>
         <xsl:attribute name="opentopic:dummy" namespace="http://www.idiominc.com/opentopic"/>
         <xsl:attribute name="opentopic-func:dummy" namespace="http://www.idiominc.com/opentopic/exsl/function"/>
+        <xsl:attribute name="fox:dummy" namespace="http://xmlgraphics.apache.org/fop/extensions"/>
       </dummy>
     </xsl:variable>
     <xsl:variable name="namespaces" select="
@@ -345,7 +346,8 @@
       $dummy/namespace::dita-ot,
       $dummy/namespace::ditaarch,
       $dummy/namespace::opentopic,
-      $dummy/namespace::opentopic-func
+      $dummy/namespace::opentopic-func,
+      $dummy/namespace::fox
     "/>
     <xsl:copy-of select="$namespaces"/>
     <xsl:attribute name="exclude-result-prefixes">xs e dita-ot ditaarch opentopic opentopic-func</xsl:attribute>

From 77de20bc80d7fad693a8e26a600291bcd3a2f1ce Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sun, 13 Oct 2024 11:54:57 +0300
Subject: [PATCH 04/19] Adjust TOC part indentation

---
 src/generator/com/elovirta/pdf/toc.xsl | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index c450a3e..853203f 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -220,8 +220,15 @@
 
       <axsl:attribute-set name="__toc__indent">
         <axsl:attribute name="start-indent">
-          <axsl:variable name="level" select="count(ancestor-or-self::*[contains(@class, ' topic/topic ')])"/>
+          <axsl:variable name="level" as="xs:integer">
+            <axsl:apply-templates select="." mode="get-topic-level"/>
+          </axsl:variable>
           <axsl:choose>
+            <xsl:if test="map:contains($root,  'style-toc-part-start-indent')">
+              <axsl:when test="$level eq 1 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: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)"/>
@@ -290,6 +297,13 @@
         </axsl:attribute>
       </axsl:attribute-set>
 
+      <axsl:attribute-set name="__toc__part__content" use-attribute-sets="__toc__topic__content">
+        <xsl:call-template name="generate-attribute-set">
+          <xsl:with-param name="prefix" select="'style-toc-part'"/>
+          <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'"/>

From c7522faa2f5369161894ad4b3d9fb55d5eec59c2 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sun, 13 Oct 2024 16:37:41 +0300
Subject: [PATCH 05/19] Add prefix to Part numbering

---
 src/generator/com/elovirta/pdf/topic.xsl | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/generator/com/elovirta/pdf/topic.xsl b/src/generator/com/elovirta/pdf/topic.xsl
index 4367496..586cd1c 100644
--- a/src/generator/com/elovirta/pdf/topic.xsl
+++ b/src/generator/com/elovirta/pdf/topic.xsl
@@ -63,6 +63,26 @@
                          level="multiple"
                          format="A.1.1"/>
           </axsl:when>
+          <xsl:choose>
+            <xsl:when test="$root ?style-part-title-numbering">
+              <axsl:when test="self::*[contains(@class, ' bookmap/part ')]">
+                <axsl:call-template name="getVariable">
+                  <axsl:with-param name="id" select="'Part with number'"/>
+  <!--                <axsl:with-param name="id" select="'Table of Contents Part'"/>-->
+                  <axsl:with-param name="params">
+                    <number>
+                      <axsl:number count="*[contains(@class, ' bookmap/part ')]"
+                                   level="single"
+                                   format="1"/>
+                    </number>
+                  </axsl:with-param>
+                </axsl:call-template>
+              </axsl:when>
+            </xsl:when>
+            <xsl:otherwise>
+              <axsl:when test="self::*[contains(@class, ' bookmap/part ')]"/>
+            </xsl:otherwise>
+          </xsl:choose>
           <axsl:when test="$e:number-levels[$depth]">
             <axsl:number count="*[contains(@class, ' map/topicref ')]
                               [not(ancestor-or-self::*[contains(@class, ' bookmap/frontmatter ')])]"

From b0f15ca4fbd6275303a7facd20cf431a4abc2139 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Tue, 15 Oct 2024 21:40:12 +0300
Subject: [PATCH 06/19] Add support for styling part title

---
 src/generator/com/elovirta/pdf/commons.xsl | 58 ++++++++++++++++++++++
 src/generator/com/elovirta/pdf/toc.xsl     |  2 +-
 src/generator/com/elovirta/pdf/topic.xsl   |  5 ++
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
index d78bb32..0333636 100644
--- a/src/generator/com/elovirta/pdf/commons.xsl
+++ b/src/generator/com/elovirta/pdf/commons.xsl
@@ -186,6 +186,64 @@
         </axsl:if>
         -->
       </axsl:template>
+
+      <axsl:template match="*" mode="processTopicPartInsideFlow">
+        <fo:block axsl:use-attribute-sets="topic">
+          <!-- TODO: Replace with mode="commonattributes" -->
+          <axsl:call-template name="commonattributes"/>
+          <axsl:if test="empty(ancestor::*[contains(@class, ' topic/topic ')])">
+            <fo:marker marker-class-name="current-topic-number">
+              <axsl:variable name="topicref"
+                            select="key('map-id', ancestor-or-self::*[contains(@class, ' topic/topic ')][1]/@id)[1]"
+                            as="element()?"
+              />
+              <axsl:for-each select="$topicref">
+                <axsl:apply-templates select="." mode="topicTitleNumber"/>
+              </axsl:for-each>
+            </fo:marker>
+            <axsl:apply-templates select="." mode="insertTopicHeaderMarker"/>
+          </axsl:if>
+          <axsl:apply-templates select="." mode="customTopicMarker"/>
+
+          <axsl:apply-templates select="*[contains(@class,' topic/prolog ')]"/>
+
+          <axsl:apply-templates select="." mode="insertChapterFirstpageStaticContent">
+            <axsl:with-param name="type" select="'part'"/>
+          </axsl:apply-templates>
+
+          <fo:block axsl:use-attribute-sets="part.title">
+            <axsl:apply-templates select="." mode="customTopicAnchor"/>
+            <axsl:call-template name="pullPrologIndexTerms"/>
+            <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]"/>
+            <axsl:for-each select="*[contains(@class,' topic/title ')]">
+              <axsl:apply-templates select="." mode="getTitle"/>
+            </axsl:for-each>
+          </fo:block>
+
+          <axsl:choose>
+            <axsl:when test="$partLayout = 'BASIC'">
+              <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or
+                                                       contains(@class,' ditaot-d/ditaval-startprop ') or
+                                                       contains(@class, ' topic/prolog ') or
+                                                       contains(@class, ' topic/topic ')])"/>
+              <!--axsl:apply-templates select="." mode="buildRelationships"/-->
+            </axsl:when>
+            <axsl:otherwise>
+              <axsl:apply-templates select="." mode="createMiniToc"/>
+            </axsl:otherwise>
+          </axsl:choose>
+          <axsl:for-each select="*[contains(@class,' topic/topic ')]">
+            <axsl:variable name="topicType" as="xs:string">
+              <axsl:call-template name="determineTopicType"/>
+            </axsl:variable>
+            <axsl:if test="$topicType = 'topicSimple'">
+              <axsl:apply-templates select="."/>
+            </axsl:if>
+          </axsl:for-each>
+          <axsl:call-template name="pullPrologIndexTerms.end-range"/>
+        </fo:block>
+      </axsl:template>
+
     </axsl:stylesheet>
   </xsl:template>
 
diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index 853203f..c678ee3 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -225,7 +225,7 @@
           </axsl:variable>
           <axsl:choose>
             <xsl:if test="map:contains($root,  'style-toc-part-start-indent')">
-              <axsl:when test="$level eq 1 and key('map-id', @id)/self::*[contains(@class, ' bookmap/part ')]">
+              <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:when>
             </xsl:if>
diff --git a/src/generator/com/elovirta/pdf/topic.xsl b/src/generator/com/elovirta/pdf/topic.xsl
index 586cd1c..ddda1aa 100644
--- a/src/generator/com/elovirta/pdf/topic.xsl
+++ b/src/generator/com/elovirta/pdf/topic.xsl
@@ -323,6 +323,11 @@
     <axsl:stylesheet version="2.0">
       <xsl:call-template name="generate-namespace-node"/>
       <!-- titles -->
+      <axsl:attribute-set name="part.title" use-attribute-sets="topic.title">
+        <xsl:call-template name="generate-attribute-set">
+          <xsl:with-param name="prefix" select="'style-part'"/>
+        </xsl:call-template>
+      </axsl:attribute-set>
       <axsl:attribute-set name="topic.title">
         <xsl:call-template name="generate-attribute-set">
           <xsl:with-param name="prefix" select="'style-topic'"/>

From f04a39677b80a16df1a252cec07a1446ef2a817b Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Fri, 18 Oct 2024 10:28:36 +0300
Subject: [PATCH 07/19] Add chapter TOC

---
 src/generator/com/elovirta/pdf/commons.xsl | 120 ++++++++++++++---
 src/generator/com/elovirta/pdf/toc.xsl     | 147 +++++++++++++++++++--
 2 files changed, 232 insertions(+), 35 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
index 0333636..fe9da43 100644
--- a/src/generator/com/elovirta/pdf/commons.xsl
+++ b/src/generator/com/elovirta/pdf/commons.xsl
@@ -152,7 +152,66 @@
         <axsl:template match="*[contains(@class, ' topic/topic ')][@outputclass = '{$root ?cover-image-topic}']" priority="1000"/>
       </xsl:if>
 
-      <axsl:template match="*" mode="createMiniToc">
+      <!-- Part -->
+
+      <axsl:template match="*" mode="processTopicPartInsideFlow">
+        <fo:block axsl:use-attribute-sets="topic">
+          <!-- TODO: Replace with mode="commonattributes" -->
+          <axsl:call-template name="commonattributes"/>
+          <axsl:if test="empty(ancestor::*[contains(@class, ' topic/topic ')])">
+            <fo:marker marker-class-name="current-topic-number">
+              <axsl:variable name="topicref"
+                            select="key('map-id', ancestor-or-self::*[contains(@class, ' topic/topic ')][1]/@id)[1]"
+                            as="element()?"
+              />
+              <axsl:for-each select="$topicref">
+                <axsl:apply-templates select="." mode="topicTitleNumber"/>
+              </axsl:for-each>
+            </fo:marker>
+            <axsl:apply-templates select="." mode="insertTopicHeaderMarker"/>
+          </axsl:if>
+          <axsl:apply-templates select="." mode="customTopicMarker"/>
+
+          <axsl:apply-templates select="*[contains(@class,' topic/prolog ')]"/>
+
+          <axsl:apply-templates select="." mode="insertChapterFirstpageStaticContent">
+            <axsl:with-param name="type" select="'part'"/>
+          </axsl:apply-templates>
+
+          <fo:block axsl:use-attribute-sets="part.title">
+            <axsl:apply-templates select="." mode="customTopicAnchor"/>
+            <axsl:call-template name="pullPrologIndexTerms"/>
+            <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]"/>
+            <axsl:for-each select="*[contains(@class,' topic/title ')]">
+              <axsl:apply-templates select="." mode="getTitle"/>
+            </axsl:for-each>
+          </fo:block>
+
+          <axsl:choose>
+            <axsl:when test="$partLayout = 'BASIC'">
+              <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or
+                                                       contains(@class,' ditaot-d/ditaval-startprop ') or
+                                                       contains(@class, ' topic/prolog ') or
+                                                       contains(@class, ' topic/topic ')])"/>
+              <!--axsl:apply-templates select="." mode="buildRelationships"/-->
+            </axsl:when>
+            <axsl:otherwise>
+              <axsl:apply-templates select="." mode="createPartToc"/>
+            </axsl:otherwise>
+          </axsl:choose>
+          <axsl:for-each select="*[contains(@class,' topic/topic ')]">
+            <axsl:variable name="topicType" as="xs:string">
+              <axsl:call-template name="determineTopicType"/>
+            </axsl:variable>
+            <axsl:if test="$topicType = 'topicSimple'">
+              <axsl:apply-templates select="."/>
+            </axsl:if>
+          </axsl:for-each>
+          <axsl:call-template name="pullPrologIndexTerms.end-range"/>
+        </fo:block>
+      </axsl:template>
+
+      <axsl:template match="*" mode="createPartToc">
         <!-- Part introduction -->
         <axsl:apply-templates select="*[contains(@class,' topic/titlealts ')]"/>
         <axsl:if test="*[contains(@class,' topic/shortdesc ')
@@ -187,16 +246,20 @@
         -->
       </axsl:template>
 
-      <axsl:template match="*" mode="processTopicPartInsideFlow">
+      <!-- Chapter -->
+
+      <axsl:template match="*" mode="processTopicChapterInsideFlow">
         <fo:block axsl:use-attribute-sets="topic">
           <!-- TODO: Replace with mode="commonattributes" -->
           <axsl:call-template name="commonattributes"/>
-          <axsl:if test="empty(ancestor::*[contains(@class, ' topic/topic ')])">
+          <axsl:variable name="level" as="xs:integer">
+            <axsl:apply-templates select="." mode="get-topic-level"/>
+          </axsl:variable>
+          <axsl:if test="$level eq 1">
             <fo:marker marker-class-name="current-topic-number">
               <axsl:variable name="topicref"
-                            select="key('map-id', ancestor-or-self::*[contains(@class, ' topic/topic ')][1]/@id)[1]"
-                            as="element()?"
-              />
+                             select="key('map-id', ancestor-or-self::*[contains(@class, ' topic/topic ')][1]/@id)[1]"
+                             as="element()?"/>
               <axsl:for-each select="$topicref">
                 <axsl:apply-templates select="." mode="topicTitleNumber"/>
               </axsl:for-each>
@@ -208,10 +271,10 @@
           <axsl:apply-templates select="*[contains(@class,' topic/prolog ')]"/>
 
           <axsl:apply-templates select="." mode="insertChapterFirstpageStaticContent">
-            <axsl:with-param name="type" select="'part'"/>
+            <axsl:with-param name="type" select="'chapter'"/>
           </axsl:apply-templates>
 
-          <fo:block axsl:use-attribute-sets="part.title">
+          <fo:block axsl:use-attribute-sets="topic.title">
             <axsl:apply-templates select="." mode="customTopicAnchor"/>
             <axsl:call-template name="pullPrologIndexTerms"/>
             <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]"/>
@@ -221,29 +284,42 @@
           </fo:block>
 
           <axsl:choose>
-            <axsl:when test="$partLayout = 'BASIC'">
-              <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or
-                                                       contains(@class,' ditaot-d/ditaval-startprop ') or
-                                                       contains(@class, ' topic/prolog ') or
-                                                       contains(@class, ' topic/topic ')])"/>
-              <!--axsl:apply-templates select="." mode="buildRelationships"/-->
+            <axsl:when test="$chapterLayout='BASIC'">
+              <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or contains(@class,' ditaot-d/ditaval-startprop ') or
+                      contains(@class, ' topic/prolog ') or contains(@class, ' topic/topic ')])"/>
+              <!--xsl:apply-templates select="." mode="buildRelationships"/-->
             </axsl:when>
             <axsl:otherwise>
               <axsl:apply-templates select="." mode="createMiniToc"/>
             </axsl:otherwise>
           </axsl:choose>
-          <axsl:for-each select="*[contains(@class,' topic/topic ')]">
-            <axsl:variable name="topicType" as="xs:string">
-              <axsl:call-template name="determineTopicType"/>
-            </axsl:variable>
-            <axsl:if test="$topicType = 'topicSimple'">
-              <axsl:apply-templates select="."/>
-            </axsl:if>
-          </axsl:for-each>
+
+          <axsl:apply-templates select="*[contains(@class,' topic/topic ')]"/>
           <axsl:call-template name="pullPrologIndexTerms.end-range"/>
         </fo:block>
       </axsl:template>
 
+      <axsl:template match="*" mode="createMiniToc">
+        <!-- Chapter TOC -->
+        <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="chapter-toc"/>
+        <!-- Chapter introduction -->
+        <axsl:apply-templates select="*[contains(@class,' topic/titlealts ')]"/>
+        <axsl:if test="*[contains(@class,' topic/shortdesc ')
+                         or contains(@class, ' topic/abstract ')]/node()">
+          <fo:block axsl:use-attribute-sets="p">
+            <axsl:apply-templates select="*[contains(@class,' topic/shortdesc ')
+                                            or contains(@class, ' topic/abstract ')]/node()"/>
+          </fo:block>
+        </axsl:if>
+        <axsl:apply-templates select="*[contains(@class,' topic/body ')]/*"/>
+        <axsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]"/>
+        <axsl:if test="*[contains(@class,' topic/related-links ')]//
+                         *[contains(@class,' topic/link ')]
+                          [not(@role) or @role != 'child']">
+          <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>
+        </axsl:if>
+      </axsl:template>
+
     </axsl:stylesheet>
   </xsl:template>
 
diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index c678ee3..d1a52e0 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -124,6 +124,8 @@
 <!--        </axsl:call-template>-->
 <!--      </axsl:template>-->
 
+      <!-- Part TOC -->
+
       <axsl:template match="node()" mode="part-toc">
         <axsl:param name="include"/>
         <axsl:apply-templates mode="#current">
@@ -200,6 +202,85 @@
           </axsl:choose>
         </axsl:if>
       </axsl:template>
+
+     <!-- Chapter TOC -->
+
+      <axsl:template match="node()" mode="chapter-toc">
+        <axsl:param name="include"/>
+        <axsl:apply-templates mode="#current">
+          <axsl:with-param name="include" select="$include"/>
+        </axsl:apply-templates>
+      </axsl:template>
+
+      <axsl:template match="*[contains(@class, ' topic/topic ')]" mode="chapter-toc">
+        <axsl:param name="include"/>
+        <axsl:variable name="topicLevel" as="xs:integer">
+          <axsl:apply-templates select="." mode="get-topic-level"/>
+        </axsl:variable>
+        <axsl:if test="$topicLevel &lt; $tocMaximumLevel">
+          <axsl:variable name="mapTopicref" select="key('map-id', @id)[1]" as="element()?"/>
+          <axsl:choose>
+            <axsl:when test="$mapTopicref[@toc = 'yes' or not(@toc)] or
+                                (not($mapTopicref) and $include = 'true')">
+              <fo:block axsl:use-attribute-sets="__toc__indent__chapter">
+                <axsl:variable name="tocItemContent">
+                  <fo:basic-link axsl:use-attribute-sets="__toc__link">
+                    <axsl:attribute name="internal-destination">
+                      <axsl:call-template name="generate-toc-id"/>
+                    </axsl:attribute>
+                    <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: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: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: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">
+                      <fo:leader axsl:use-attribute-sets="__toc__leader"/>
+                      <fo:page-number-citation>
+                        <axsl:attribute name="ref-id">
+                          <axsl:call-template name="generate-toc-id"/>
+                        </axsl:attribute>
+                      </fo:page-number-citation>
+                    </fo:inline>
+                  </fo:basic-link>
+                </axsl:variable>
+                <axsl:choose>
+                  <axsl:when test="not($mapTopicref)">
+                    <axsl:apply-templates select="." mode="tocText">
+                      <axsl:with-param name="tocItemContent" select="$tocItemContent"/>
+                      <axsl:with-param name="currentNode" select="."/>
+                    </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:apply-templates>
+                  </axsl:otherwise>
+                </axsl:choose>
+              </fo:block>
+              <axsl:apply-templates mode="#current">
+                <axsl:with-param name="include" select="'true'"/>
+              </axsl:apply-templates>
+            </axsl:when>
+            <axsl:otherwise>
+              <axsl:apply-templates mode="#current">
+                <axsl:with-param name="include" select="'true'"/>
+              </axsl:apply-templates>
+            </axsl:otherwise>
+          </axsl:choose>
+        </axsl:if>
+      </axsl:template>
     </axsl:stylesheet>
   </xsl:template>
 
@@ -224,27 +305,32 @@
             <axsl:apply-templates select="." mode="get-topic-level"/>
           </axsl:variable>
           <axsl:choose>
-            <xsl:if test="map:contains($root,  'style-toc-part-start-indent')">
+            <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:when>
             </xsl:if>
-            <xsl:if test="map:contains($root,  'style-toc-1-start-indent')">
+            <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: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')">
+            <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')">
+            <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')">
+            <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>
@@ -262,24 +348,59 @@
         <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-toc-1-start-indent')">
+            <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-toc-1-start-indent}'), ' + ', $toc.text-indent)"/>
+                <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-toc-2-start-indent')">
+            <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-toc-2-start-indent}'), ' + ', $toc.text-indent)"/>
+                <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-toc-3-start-indent')">
+            <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-toc-3-start-indent}'), ' + ', $toc.text-indent)"/>
+                <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-toc-4-start-indent')">
+            <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-toc-4-start-indent}'), ' + ', $toc.text-indent)"/>
+                <axsl:value-of select="concat(e:force-unit('{$root ?style-part-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
+                  select="concat($side-col-width, ' + (', string($level - 1), ' * ', $toc.toc-indent, ') + ', $toc.text-indent)"/>
+            </axsl:when>
+          </axsl:choose>
+        </axsl:attribute>
+      </axsl:attribute-set>
+
+      <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="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>
             <!-- Workaround for xsl:choose must contain at least one xsl:when -->

From 6df4c04efb70c0cb1fe150e637a6e54e6fea753c Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Fri, 18 Oct 2024 16:28:35 +0300
Subject: [PATCH 08/19] Add function to get title number

---
 src/generator/com/elovirta/pdf/links.xsl |  5 +----
 src/generator/com/elovirta/pdf/topic.xsl | 16 ++++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/links.xsl b/src/generator/com/elovirta/pdf/links.xsl
index 5755fd6..97eedad 100644
--- a/src/generator/com/elovirta/pdf/links.xsl
+++ b/src/generator/com/elovirta/pdf/links.xsl
@@ -138,10 +138,7 @@
       </axsl:template>
 
       <axsl:template match="*[contains(@class, ' topic/topic ')]" mode="retrieveReferenceTitle">
-        <axsl:variable name="topicref" select="key('map-id', @id)[1]"/>
-        <axsl:variable name="contents" as="node()*">
-          <axsl:apply-templates select="$topicref[1]" mode="e:title-number"/>
-        </axsl:variable>
+        <axsl:variable name="contents" as="node()*" select="e:get-title-number(.)"/>
         <axsl:if test="exists($contents)">
           <axsl:copy-of select="$contents"/>
           <axsl:text>
diff --git a/src/generator/com/elovirta/pdf/topic.xsl b/src/generator/com/elovirta/pdf/topic.xsl
index ddda1aa..8f40c43 100644
--- a/src/generator/com/elovirta/pdf/topic.xsl
+++ b/src/generator/com/elovirta/pdf/topic.xsl
@@ -35,11 +35,7 @@
 
       <axsl:template match="*[contains(@class, ' topic/topic ')]/*[contains(@class, ' topic/title ')]" mode="getTitle">
         <axsl:variable name="topic" select="ancestor-or-self::*[contains(@class, ' topic/topic ')][1]"/>
-        <axsl:variable name="id" select="$topic/@id"/>
-        <axsl:variable name="mapTopics" select="key('map-id', $id)"/>
-        <axsl:variable name="contents" as="node()*">
-          <axsl:apply-templates select="$mapTopics[1]" mode="e:title-number"/>
-        </axsl:variable>
+        <axsl:variable name="contents" as="node()*" select="e:get-title-number($topic)"/>
         <axsl:if test="exists($contents)">
           <axsl:copy-of select="$contents"/>
 <!--          <fo:leader leader-pattern="space" leader-length="from-nearest-specified-value(font-size)"/>-->
@@ -50,6 +46,12 @@
         <axsl:apply-templates/>
       </axsl:template>
 
+      <axsl:function name="e:get-title-number" as="node()*">
+        <axsl:param name="topic" as="element()"/>
+        <axsl:variable name="topicref" as="element()*" select="key('map-id', $topic/@id, root($topic))"/>
+        <axsl:apply-templates select="$topicref[1]" mode="e:title-number"/>
+      </axsl:function>
+
       <axsl:template match="*[contains(@class, ' map/topicref')]" mode="e:title-number">
         <axsl:variable name="depth" select="count(ancestor-or-self::*[contains(@class, ' map/topicref')])"/>
         <axsl:choose>
@@ -119,9 +121,7 @@
 
       <axsl:template name="getNavTitle">
         <axsl:variable name="topicref" select="key('map-id', @id)[1]"/>
-        <axsl:variable name="contents" as="node()*">
-          <axsl:apply-templates select="$topicref[1]" mode="e:title-number"/>
-        </axsl:variable>
+        <axsl:variable name="contents" as="node()*" select="e:get-title-number(.)"/>
         <axsl:if test="exists($contents)">
           <axsl:copy-of select="$contents"/>
 <!--          <fo:leader leader-pattern="space" leader-length="from-nearest-specified-value(font-size)"/>-->

From 2a966d6fccbb06410e9d4e580c7e6e7ee8454027 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sat, 19 Oct 2024 19:00:58 +0300
Subject: [PATCH 09/19] Fix numbering chapters inside parts

---
 src/generator/com/elovirta/pdf/commons.xsl | 75 +++++++++++++---------
 src/generator/com/elovirta/pdf/toc.xsl     | 11 ++++
 src/generator/com/elovirta/pdf/topic.xsl   | 38 ++++++++++-
 3 files changed, 92 insertions(+), 32 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
index fe9da43..679ab75 100644
--- a/src/generator/com/elovirta/pdf/commons.xsl
+++ b/src/generator/com/elovirta/pdf/commons.xsl
@@ -187,18 +187,23 @@
             </axsl:for-each>
           </fo:block>
 
-          <axsl:choose>
-            <axsl:when test="$partLayout = 'BASIC'">
-              <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or
+          <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or
                                                        contains(@class,' ditaot-d/ditaval-startprop ') or
                                                        contains(@class, ' topic/prolog ') or
                                                        contains(@class, ' topic/topic ')])"/>
+
+          <axsl:choose>
+            <axsl:when test="$partLayout = 'BASIC'">
               <!--axsl:apply-templates select="." mode="buildRelationships"/-->
             </axsl:when>
             <axsl:otherwise>
-              <axsl:apply-templates select="." mode="createPartToc"/>
+              <fo:block axsl:use-attribute-sets="e:part_toc">
+              <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="part-toc"/>
+              </fo:block>
+<!--              <axsl:apply-templates select="." mode="createPartToc"/>-->
             </axsl:otherwise>
           </axsl:choose>
+
           <axsl:for-each select="*[contains(@class,' topic/topic ')]">
             <axsl:variable name="topicType" as="xs:string">
               <axsl:call-template name="determineTopicType"/>
@@ -211,8 +216,10 @@
         </fo:block>
       </axsl:template>
 
-      <axsl:template match="*" mode="createPartToc">
+<!--      <axsl:template match="*" mode="createPartToc">-->
         <!-- Part introduction -->
+        <!--
+
         <axsl:apply-templates select="*[contains(@class,' topic/titlealts ')]"/>
         <axsl:if test="*[contains(@class,' topic/shortdesc ')
                          or contains(@class, ' topic/abstract ')]/node()">
@@ -223,13 +230,15 @@
         </axsl:if>
         <axsl:apply-templates select="*[contains(@class,' topic/body ')]/*"/>
         <axsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]"/>
+
         <axsl:if test="*[contains(@class,' topic/related-links ')]//
                          *[contains(@class,' topic/link ')]
                           [not(@role) or @role != 'child']">
           <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>
         </axsl:if>
+        -->
         <!-- Part TOC -->
-        <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="part-toc"/>
+<!--        <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="part-toc"/>-->
         <!--
         <axsl:if test="*[contains(@class, ' topic/topic ')]">
           <fo:block axsl:use-attribute-sets="__toc__mini">
@@ -244,7 +253,7 @@
           </fo:block>
         </axsl:if>
         -->
-      </axsl:template>
+<!--      </axsl:template>-->
 
       <!-- Chapter -->
 
@@ -285,40 +294,46 @@
 
           <axsl:choose>
             <axsl:when test="$chapterLayout='BASIC'">
-              <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or contains(@class,' ditaot-d/ditaval-startprop ') or
-                      contains(@class, ' topic/prolog ') or contains(@class, ' topic/topic ')])"/>
               <!--xsl:apply-templates select="." mode="buildRelationships"/-->
             </axsl:when>
             <axsl:otherwise>
-              <axsl:apply-templates select="." mode="createMiniToc"/>
+              <fo:block axsl:use-attribute-sets="e:chapter_toc">
+                <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="chapter-toc"/>
+              </fo:block>
+              <!--              <axsl:apply-templates select="." mode="createMiniToc"/>-->
             </axsl:otherwise>
           </axsl:choose>
 
+          <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or
+                                                       contains(@class,' ditaot-d/ditaval-startprop ') or
+                                                       contains(@class, ' topic/prolog ') or
+                                                       contains(@class, ' topic/topic ')])"/>
+
           <axsl:apply-templates select="*[contains(@class,' topic/topic ')]"/>
           <axsl:call-template name="pullPrologIndexTerms.end-range"/>
         </fo:block>
       </axsl:template>
 
-      <axsl:template match="*" mode="createMiniToc">
-        <!-- Chapter TOC -->
-        <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="chapter-toc"/>
-        <!-- Chapter introduction -->
-        <axsl:apply-templates select="*[contains(@class,' topic/titlealts ')]"/>
-        <axsl:if test="*[contains(@class,' topic/shortdesc ')
-                         or contains(@class, ' topic/abstract ')]/node()">
-          <fo:block axsl:use-attribute-sets="p">
-            <axsl:apply-templates select="*[contains(@class,' topic/shortdesc ')
-                                            or contains(@class, ' topic/abstract ')]/node()"/>
-          </fo:block>
-        </axsl:if>
-        <axsl:apply-templates select="*[contains(@class,' topic/body ')]/*"/>
-        <axsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]"/>
-        <axsl:if test="*[contains(@class,' topic/related-links ')]//
-                         *[contains(@class,' topic/link ')]
-                          [not(@role) or @role != 'child']">
-          <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>
-        </axsl:if>
-      </axsl:template>
+<!--      <axsl:template match="*" mode="createMiniToc">-->
+<!--        &lt;!&ndash; Chapter TOC &ndash;&gt;-->
+<!--        <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="chapter-toc"/>-->
+<!--        &lt;!&ndash; Chapter introduction &ndash;&gt;-->
+<!--        <axsl:apply-templates select="*[contains(@class,' topic/titlealts ')]"/>-->
+<!--        <axsl:if test="*[contains(@class,' topic/shortdesc ')-->
+<!--                         or contains(@class, ' topic/abstract ')]/node()">-->
+<!--          <fo:block axsl:use-attribute-sets="p">-->
+<!--            <axsl:apply-templates select="*[contains(@class,' topic/shortdesc ')-->
+<!--                                            or contains(@class, ' topic/abstract ')]/node()"/>-->
+<!--          </fo:block>-->
+<!--        </axsl:if>-->
+<!--        <axsl:apply-templates select="*[contains(@class,' topic/body ')]/*"/>-->
+<!--        <axsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]"/>-->
+<!--        <axsl:if test="*[contains(@class,' topic/related-links ')]//-->
+<!--                         *[contains(@class,' topic/link ')]-->
+<!--                          [not(@role) or @role != 'child']">-->
+<!--          <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>-->
+<!--        </axsl:if>-->
+<!--      </axsl:template>-->
 
     </axsl:stylesheet>
   </xsl:template>
diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index d1a52e0..34cd4a5 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -495,6 +495,17 @@
             <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
           </xsl:call-template>
         </axsl:attribute-set>
+
+        <axsl:attribute-set name="e:part_toc">
+          <xsl:call-template name="generate-attribute-set">
+            <xsl:with-param name="prefix" select="'style-part-toc'"/>
+          </xsl:call-template>
+        </axsl:attribute-set>
+        <axsl:attribute-set name="e:chapter_toc">
+          <xsl:call-template name="generate-attribute-set">
+            <xsl:with-param name="prefix" select="'style-chapter-toc'"/>
+          </xsl:call-template>
+        </axsl:attribute-set>
       </xsl:if>
     </axsl:stylesheet>
   </xsl:template>
diff --git a/src/generator/com/elovirta/pdf/topic.xsl b/src/generator/com/elovirta/pdf/topic.xsl
index 8f40c43..eed6943 100644
--- a/src/generator/com/elovirta/pdf/topic.xsl
+++ b/src/generator/com/elovirta/pdf/topic.xsl
@@ -5,6 +5,7 @@
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 xmlns:map="http://www.w3.org/2005/xpath-functions/map"
                 xmlns:array="http://www.w3.org/2005/xpath-functions/array"
+                xmlns:opentopic="http://www.idiominc.com/opentopic"
                 exclude-result-prefixes="xs axsl map array">
 
   <xsl:import href="utils.xsl"/>
@@ -46,10 +47,43 @@
         <axsl:apply-templates/>
       </axsl:template>
 
+      <axsl:variable name="map-without-parts" as="document-node()">
+        <axsl:document>
+          <opentopic:map>
+            <axsl:apply-templates select="$map/*[contains(@class, ' map/topicref ')]" mode="gen-map-without-parts"/>
+          </opentopic:map>
+        </axsl:document>
+      </axsl:variable>
+
+      <axsl:template match="*[contains(@class, ' map/topicref ')]" mode="gen-map-without-parts">
+        <axsl:copy>
+          <axsl:copy-of select="@*"/>
+          <axsl:apply-templates select="*[contains(@class, ' map/topicref ')]" mode="#current"/>
+        </axsl:copy>
+      </axsl:template>
+
+      <axsl:template match="*[contains(@class, ' bookmap/part ')]" mode="gen-map-without-parts" priority="10">
+        <axsl:apply-templates select="*[contains(@class, ' map/topicref ')]" mode="#current"/>
+      </axsl:template>
+
+      <axsl:key name="map-without-parts-id"
+                match="*"
+                use="@id"/>
+
       <axsl:function name="e:get-title-number" as="node()*">
         <axsl:param name="topic" as="element()"/>
-        <axsl:variable name="topicref" as="element()*" select="key('map-id', $topic/@id, root($topic))"/>
-        <axsl:apply-templates select="$topicref[1]" mode="e:title-number"/>
+        <axsl:variable name="topicref" as="element()?" select="key('map-id', $topic/@id, root($topic))[1]"/>
+<!--        <axsl:if test="empty($topicref)">-->
+<!--          <axsl:message terminate="yes" select="'empty topicref', $topic/title"/>-->
+<!--        </axsl:if>-->
+        <axsl:choose>
+          <axsl:when test="contains($topicref/@class, ' bookmap/part ')">
+            <axsl:apply-templates select="$topicref" mode="e:title-number"/>
+          </axsl:when>
+          <axsl:otherwise>
+            <axsl:apply-templates select="key('map-without-parts-id', $topicref/@id, $map-without-parts)" mode="e:title-number"/>
+          </axsl:otherwise>
+        </axsl:choose>
       </axsl:function>
 
       <axsl:template match="*[contains(@class, ' map/topicref')]" mode="e:title-number">

From 90d8a48c5de2092d4997ed87e835a5cc84ab80f9 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sun, 20 Oct 2024 11:46:05 +0300
Subject: [PATCH 10/19] Add part and chapter TOC max depth

---
 src/generator/com/elovirta/pdf/toc.xsl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index 34cd4a5..6547f20 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -126,6 +126,8 @@
 
       <!-- Part TOC -->
 
+      <axsl:variable name="e:partTocMaximumLevel" select="{($root ?style-part-toc-maximum-level, 6)[1] + 1}"/>
+
       <axsl:template match="node()" mode="part-toc">
         <axsl:param name="include"/>
         <axsl:apply-templates mode="#current">
@@ -138,7 +140,7 @@
         <axsl:variable name="topicLevel" as="xs:integer">
           <axsl:apply-templates select="." mode="get-topic-level"/>
         </axsl:variable>
-        <axsl:if test="$topicLevel &lt; $tocMaximumLevel">
+        <axsl:if test="$topicLevel &lt; $e:partTocMaximumLevel">
           <axsl:variable name="mapTopicref" select="key('map-id', @id)[1]" as="element()?"/>
           <axsl:choose>
             <axsl:when test="$mapTopicref[@toc = 'yes' or not(@toc)] or
@@ -203,7 +205,9 @@
         </axsl:if>
       </axsl:template>
 
-     <!-- Chapter TOC -->
+      <!-- Chapter TOC -->
+
+      <axsl:variable name="e:chapterTocMaximumLevel" select="{($root ?style-chapter-toc-maximum-level, 6)[1] + 2}"/>
 
       <axsl:template match="node()" mode="chapter-toc">
         <axsl:param name="include"/>
@@ -217,7 +221,7 @@
         <axsl:variable name="topicLevel" as="xs:integer">
           <axsl:apply-templates select="." mode="get-topic-level"/>
         </axsl:variable>
-        <axsl:if test="$topicLevel &lt; $tocMaximumLevel">
+        <axsl:if test="$topicLevel &lt; $e:chapterTocMaximumLevel">
           <axsl:variable name="mapTopicref" select="key('map-id', @id)[1]" as="element()?"/>
           <axsl:choose>
             <axsl:when test="$mapTopicref[@toc = 'yes' or not(@toc)] or

From 164c78bb74e38a7ff88ab3a769a93369ee13eaf5 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Mon, 21 Oct 2024 20:49:20 +0300
Subject: [PATCH 11/19] Add support for changing chapter numbering reset per
 part

---
 src/generator/com/elovirta/pdf/topic.xsl | 94 ++++++++++++++----------
 1 file changed, 57 insertions(+), 37 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/topic.xsl b/src/generator/com/elovirta/pdf/topic.xsl
index eed6943..576c6ae 100644
--- a/src/generator/com/elovirta/pdf/topic.xsl
+++ b/src/generator/com/elovirta/pdf/topic.xsl
@@ -47,44 +47,55 @@
         <axsl:apply-templates/>
       </axsl:template>
 
-      <axsl:variable name="map-without-parts" as="document-node()">
-        <axsl:document>
-          <opentopic:map>
-            <axsl:apply-templates select="$map/*[contains(@class, ' map/topicref ')]" mode="gen-map-without-parts"/>
-          </opentopic:map>
-        </axsl:document>
-      </axsl:variable>
+      <xsl:choose>
+        <xsl:when test="$root ?style-chapter-numbering = 'document'">
+          <axsl:variable name="map-without-parts" as="document-node()">
+            <axsl:document>
+              <opentopic:map>
+                <axsl:apply-templates select="$map/*[contains(@class, ' map/topicref ')]" mode="gen-map-without-parts"/>
+              </opentopic:map>
+            </axsl:document>
+          </axsl:variable>
 
-      <axsl:template match="*[contains(@class, ' map/topicref ')]" mode="gen-map-without-parts">
-        <axsl:copy>
-          <axsl:copy-of select="@*"/>
-          <axsl:apply-templates select="*[contains(@class, ' map/topicref ')]" mode="#current"/>
-        </axsl:copy>
-      </axsl:template>
+          <axsl:template match="*[contains(@class, ' map/topicref ')]" mode="gen-map-without-parts">
+            <axsl:copy>
+              <axsl:copy-of select="@*"/>
+              <axsl:apply-templates select="*[contains(@class, ' map/topicref ')]" mode="#current"/>
+            </axsl:copy>
+          </axsl:template>
 
-      <axsl:template match="*[contains(@class, ' bookmap/part ')]" mode="gen-map-without-parts" priority="10">
-        <axsl:apply-templates select="*[contains(@class, ' map/topicref ')]" mode="#current"/>
-      </axsl:template>
+          <axsl:template match="*[contains(@class, ' bookmap/part ')]" mode="gen-map-without-parts" priority="10">
+            <axsl:apply-templates select="*[contains(@class, ' map/topicref ')]" mode="#current"/>
+          </axsl:template>
 
-      <axsl:key name="map-without-parts-id"
-                match="*"
-                use="@id"/>
+          <axsl:key name="map-without-parts-id"
+                    match="*"
+                    use="@id"/>
 
-      <axsl:function name="e:get-title-number" as="node()*">
-        <axsl:param name="topic" as="element()"/>
-        <axsl:variable name="topicref" as="element()?" select="key('map-id', $topic/@id, root($topic))[1]"/>
-<!--        <axsl:if test="empty($topicref)">-->
-<!--          <axsl:message terminate="yes" select="'empty topicref', $topic/title"/>-->
-<!--        </axsl:if>-->
-        <axsl:choose>
-          <axsl:when test="contains($topicref/@class, ' bookmap/part ')">
-            <axsl:apply-templates select="$topicref" mode="e:title-number"/>
-          </axsl:when>
-          <axsl:otherwise>
-            <axsl:apply-templates select="key('map-without-parts-id', $topicref/@id, $map-without-parts)" mode="e:title-number"/>
-          </axsl:otherwise>
-        </axsl:choose>
-      </axsl:function>
+          <axsl:function name="e:get-title-number" as="node()*">
+            <axsl:param name="topic" as="element()"/>
+            <axsl:variable name="topicref" as="element()?" select="key('map-id', $topic/@id, root($topic))[1]"/>
+    <!--        <axsl:if test="empty($topicref)">-->
+    <!--          <axsl:message terminate="yes" select="'empty topicref', $topic/title"/>-->
+    <!--        </axsl:if>-->
+            <axsl:choose>
+              <axsl:when test="contains($topicref/@class, ' bookmap/part ')">
+                <axsl:apply-templates select="$topicref" mode="e:title-number"/>
+              </axsl:when>
+              <axsl:otherwise>
+                <axsl:apply-templates select="key('map-without-parts-id', $topicref/@id, $map-without-parts)" mode="e:title-number"/>
+              </axsl:otherwise>
+            </axsl:choose>
+          </axsl:function>
+        </xsl:when>
+        <xsl:otherwise>
+          <axsl:function name="e:get-title-number" as="node()*">
+            <axsl:param name="topic" as="element()"/>
+            <axsl:variable name="topicref" as="element()*" select="key('map-id', $topic/@id, root($topic))"/>
+            <axsl:apply-templates select="$topicref[1]" mode="e:title-number"/>
+          </axsl:function>
+        </xsl:otherwise>
+      </xsl:choose>
 
       <axsl:template match="*[contains(@class, ' map/topicref')]" mode="e:title-number">
         <axsl:variable name="depth" select="count(ancestor-or-self::*[contains(@class, ' map/topicref')])"/>
@@ -107,9 +118,18 @@
   <!--                <axsl:with-param name="id" select="'Table of Contents Part'"/>-->
                   <axsl:with-param name="params">
                     <number>
-                      <axsl:number count="*[contains(@class, ' bookmap/part ')]"
-                                   level="single"
-                                   format="1"/>
+                      <xsl:choose>
+                        <xsl:when test="$root ?style-chapter-numbering = 'document'">
+                          <axsl:number count="*[contains(@class, ' bookmap/part ')]"
+                                       level="single"
+                                       format="1"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <axsl:number count="*[contains(@class, ' bookmap/part ') or contains(@class, ' bookmap/chapter ')]"
+                                       level="single"
+                                       format="1"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
                     </number>
                   </axsl:with-param>
                 </axsl:call-template>

From ae4fee08fb1a61f314bea5d8029eea4bfdce5b71 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Mon, 21 Oct 2024 21:18:01 +0300
Subject: [PATCH 12/19] Fix shortdesc, abstract, and body in part and chapter

---
 src/generator/com/elovirta/pdf/commons.xsl | 38 ++++++++++++++--------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
index 679ab75..4e43b4f 100644
--- a/src/generator/com/elovirta/pdf/commons.xsl
+++ b/src/generator/com/elovirta/pdf/commons.xsl
@@ -187,21 +187,29 @@
             </axsl:for-each>
           </fo:block>
 
-          <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or
-                                                       contains(@class,' ditaot-d/ditaval-startprop ') or
-                                                       contains(@class, ' topic/prolog ') or
-                                                       contains(@class, ' topic/topic ')])"/>
+<!--          <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or-->
+<!--                                                       contains(@class,' ditaot-d/ditaval-startprop ') or-->
+<!--                                                       contains(@class, ' topic/prolog ') or-->
+<!--                                                       contains(@class, ' topic/topic ')])"/>-->
+          <axsl:if test="*[contains(@class,' topic/shortdesc ') or
+                           contains(@class, ' topic/abstract ')]/node()">
+            <fo:block axsl:use-attribute-sets="topic__shortdesc">
+              <axsl:apply-templates select="*[contains(@class,' topic/shortdesc ') or
+                                              contains(@class, ' topic/abstract ')]/node()"/>
+            </fo:block>
+          </axsl:if>
+          <axsl:apply-templates select="*[contains(@class,' topic/body ')]"/>
 
           <axsl:choose>
             <axsl:when test="$partLayout = 'BASIC'">
               <!--axsl:apply-templates select="." mode="buildRelationships"/-->
             </axsl:when>
-            <axsl:otherwise>
+            <axsl:when test="exists(*[contains(@class, ' topic/topic ')])">
               <fo:block axsl:use-attribute-sets="e:part_toc">
-              <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="part-toc"/>
+                <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="part-toc"/>
               </fo:block>
 <!--              <axsl:apply-templates select="." mode="createPartToc"/>-->
-            </axsl:otherwise>
+            </axsl:when>
           </axsl:choose>
 
           <axsl:for-each select="*[contains(@class,' topic/topic ')]">
@@ -296,18 +304,22 @@
             <axsl:when test="$chapterLayout='BASIC'">
               <!--xsl:apply-templates select="." mode="buildRelationships"/-->
             </axsl:when>
-            <axsl:otherwise>
+            <axsl:when test="exists(*[contains(@class, ' topic/topic ')])">
               <fo:block axsl:use-attribute-sets="e:chapter_toc">
                 <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="chapter-toc"/>
               </fo:block>
               <!--              <axsl:apply-templates select="." mode="createMiniToc"/>-->
-            </axsl:otherwise>
+            </axsl:when>
           </axsl:choose>
 
-          <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or
-                                                       contains(@class,' ditaot-d/ditaval-startprop ') or
-                                                       contains(@class, ' topic/prolog ') or
-                                                       contains(@class, ' topic/topic ')])"/>
+          <axsl:if test="*[contains(@class,' topic/shortdesc ') or
+                           contains(@class, ' topic/abstract ')]/node()">
+            <fo:block axsl:use-attribute-sets="topic__shortdesc">
+              <axsl:apply-templates select="*[contains(@class,' topic/shortdesc ') or
+                                              contains(@class, ' topic/abstract ')]/node()"/>
+            </fo:block>
+          </axsl:if>
+          <axsl:apply-templates select="*[contains(@class,' topic/body ')]"/>
 
           <axsl:apply-templates select="*[contains(@class,' topic/topic ')]"/>
           <axsl:call-template name="pullPrologIndexTerms.end-range"/>

From 2fa4185c0e400034f0dcbce0342994ff44e8aaed Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Mon, 21 Oct 2024 21:45:29 +0300
Subject: [PATCH 13/19] Add support for task labels

---
 src/generator/com/elovirta/pdf/shell.xsl                       | 1 +
 src/generator/com/elovirta/pdf/task-elements.xsl               | 3 +++
 .../java/com/elovirta/pdf/ant/StylesheetGeneratorTask.java     | 1 +
 3 files changed, 5 insertions(+)

diff --git a/src/generator/com/elovirta/pdf/shell.xsl b/src/generator/com/elovirta/pdf/shell.xsl
index c4655c8..dba3c5b 100644
--- a/src/generator/com/elovirta/pdf/shell.xsl
+++ b/src/generator/com/elovirta/pdf/shell.xsl
@@ -166,6 +166,7 @@
       <axsl:import href="plugin:org.dita.pdf2:cfg/fo/attrs/task-elements-attr.xsl"/>
       <axsl:import href="{$plugin_name}cfg/fo/attrs/task-elements-attr.xsl"/>
       <axsl:import href="plugin:org.dita.pdf2:xsl/fo/task-elements.xsl"/>
+      <axsl:import href="{$plugin_name}xsl/fo/task-elements.xsl"/>
 
       <axsl:import href="plugin:org.dita.pdf2:cfg/fo/attrs/reference-elements-attr.xsl"/>
       <axsl:import href="plugin:org.dita.pdf2:xsl/fo/reference-elements.xsl"/>
diff --git a/src/generator/com/elovirta/pdf/task-elements.xsl b/src/generator/com/elovirta/pdf/task-elements.xsl
index 2be48d9..ad8cd89 100644
--- a/src/generator/com/elovirta/pdf/task-elements.xsl
+++ b/src/generator/com/elovirta/pdf/task-elements.xsl
@@ -14,6 +14,9 @@
   <xsl:template match=".[. instance of map(*)]">
     <axsl:stylesheet version="2.0">
       <xsl:call-template name="generate-namespace-node"/>
+      <xsl:if test="$root ?style-task-labels">
+        <axsl:param name="GENERATE-TASK-LABELS" select="'YES'"/>
+      </xsl:if>
     </axsl:stylesheet>
   </xsl:template>
 
diff --git a/src/main/java/com/elovirta/pdf/ant/StylesheetGeneratorTask.java b/src/main/java/com/elovirta/pdf/ant/StylesheetGeneratorTask.java
index fd11977..609f343 100644
--- a/src/main/java/com/elovirta/pdf/ant/StylesheetGeneratorTask.java
+++ b/src/main/java/com/elovirta/pdf/ant/StylesheetGeneratorTask.java
@@ -80,6 +80,7 @@ public void execute() throws BuildException {
         generate(xdmItem, "static-content.xsl", "xsl/fo/static-content.xsl", null);
 //        generate(xdmItem, "task-elements.xsl", "xsl/fo/task-elements.xsl", null);
         generate(xdmItem, "topic.xsl", "xsl/fo/topic.xsl", null);
+        generate(xdmItem, "task-elements.xsl", "xsl/fo/task-elements.xsl", null);
         generate(xdmItem, "layout-masters.xsl", "cfg/fo/layout-masters.xsl", null);
         generate(xdmItem, "front-matter.xsl", "cfg/fo/attrs/front-matter-attr.xsl", ATTR);
         generate(xdmItem, "commons.xsl", "cfg/fo/attrs/commons-attr.xsl", ATTR);

From 45234c1f0472ce1bad723993c355717b2d95d14b Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Tue, 22 Oct 2024 16:10:48 +0300
Subject: [PATCH 14/19] Add related links to chapter and part pages

---
 src/generator/com/elovirta/pdf/commons.xsl | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
index 4e43b4f..9648d99 100644
--- a/src/generator/com/elovirta/pdf/commons.xsl
+++ b/src/generator/com/elovirta/pdf/commons.xsl
@@ -199,7 +199,12 @@
             </fo:block>
           </axsl:if>
           <axsl:apply-templates select="*[contains(@class,' topic/body ')]"/>
-
+          <axsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]"/>
+          <axsl:if test="*[contains(@class,' topic/related-links ')]//
+                           *[contains(@class,' topic/link ')]
+                            [not(@role) or @role != 'child']">
+            <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>
+          </axsl:if>
           <axsl:choose>
             <axsl:when test="$partLayout = 'BASIC'">
               <!--axsl:apply-templates select="." mode="buildRelationships"/-->
@@ -320,7 +325,12 @@
             </fo:block>
           </axsl:if>
           <axsl:apply-templates select="*[contains(@class,' topic/body ')]"/>
-
+          <axsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]"/>
+          <axsl:if test="*[contains(@class,' topic/related-links ')]//
+                           *[contains(@class,' topic/link ')]
+                            [not(@role) or @role != 'child']">
+            <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>
+          </axsl:if>
           <axsl:apply-templates select="*[contains(@class,' topic/topic ')]"/>
           <axsl:call-template name="pullPrologIndexTerms.end-range"/>
         </fo:block>

From 11359123d116ecd0045d51eaac63b5f9020604d6 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sun, 27 Oct 2024 09:41:14 +0200
Subject: [PATCH 15/19] Fix part and chapter title

---
 src/generator/com/elovirta/pdf/commons.xsl | 196 ++++++++++++---------
 src/generator/com/elovirta/pdf/toc.xsl     |  28 +--
 src/generator/com/elovirta/pdf/topic.xsl   |  63 ++++---
 3 files changed, 174 insertions(+), 113 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
index 9648d99..6506262 100644
--- a/src/generator/com/elovirta/pdf/commons.xsl
+++ b/src/generator/com/elovirta/pdf/commons.xsl
@@ -39,85 +39,86 @@
 <!--      <xsl:if test="map:contains($root, 'style-topic-title-numbering') and $root ?style-topic-title-numbering">-->
         <axsl:template match="*" mode="insertChapterFirstpageStaticContent">
           <axsl:param name="type" as="xs:string"/>
-          <fo:block>
-            <axsl:attribute name="id">
-              <axsl:call-template name="generate-toc-id"/>
-            </axsl:attribute>
-<!--            -->
-<!--            <axsl:choose>-->
-<!--              <axsl:when test="$type = 'chapter'">-->
+<!--          <fo:block>-->
+<!--            <axsl:attribute name="id">-->
+<!--              <axsl:call-template name="generate-toc-id"/>-->
+<!--            </axsl:attribute>-->
+
+            <axsl:choose>
+              <axsl:when test="$type = 'chapter'">
 <!--                <fo:block axsl:use-attribute-sets="__chapter__frontmatter__name__container">-->
-<!--                  <axsl:call-template name="getVariable">-->
-<!--                    <axsl:with-param name="id" select="'Chapter with number'"/>-->
-<!--                    <axsl:with-param name="params" as="element()*">-->
-<!--                      <number>-->
-<!--&lt;!&ndash;                        <fo:block axsl:use-attribute-sets="__chapter__frontmatter__number__container">&ndash;&gt;-->
-<!--                          <axsl:apply-templates select="key('map-id', @id)[1]" mode="topicTitleNumber"/>-->
-<!--&lt;!&ndash;                        </fo:block>&ndash;&gt;-->
-<!--                      </number>-->
-<!--                    </axsl:with-param>-->
-<!--                  </axsl:call-template>-->
+                  <axsl:call-template name="getVariable">
+                    <axsl:with-param name="id" select="'Chapter with number'"/>
+                    <axsl:with-param name="params" as="element()*">
+                      <number>
+<!--                        <fo:block axsl:use-attribute-sets="__chapter__frontmatter__number__container">-->
+                          <axsl:apply-templates select="key('map-id', @id)[1]" mode="topicTitleNumber"/>
+<!--                        </fo:block>-->
+                      </number>
+                    </axsl:with-param>
+                  </axsl:call-template>
 <!--                </fo:block>-->
-<!--              </axsl:when>-->
-<!--              <axsl:when test="$type = 'appendix'">-->
+              </axsl:when>
+              <axsl:when test="$type = 'appendix'">
 <!--                <fo:block axsl:use-attribute-sets="__chapter__frontmatter__name__container">-->
-<!--                  <axsl:call-template name="getVariable">-->
-<!--                    <axsl:with-param name="id" select="'Appendix with number'"/>-->
-<!--                    <axsl:with-param name="params" as="element()*">-->
-<!--                      <number>-->
-<!--&lt;!&ndash;                        <fo:block axsl:use-attribute-sets="__chapter__frontmatter__number__container">&ndash;&gt;-->
-<!--                          <axsl:apply-templates select="key('map-id', @id)[1]" mode="topicTitleNumber"/>-->
-<!--&lt;!&ndash;                        </fo:block>&ndash;&gt;-->
-<!--                      </number>-->
-<!--                    </axsl:with-param>-->
-<!--                  </axsl:call-template>-->
+                  <axsl:call-template name="getVariable">
+                    <axsl:with-param name="id" select="'Appendix with number'"/>
+                    <axsl:with-param name="params" as="element()*">
+                      <number>
+<!--                        <fo:block axsl:use-attribute-sets="__chapter__frontmatter__number__container">-->
+                          <axsl:apply-templates select="key('map-id', @id)[1]" mode="topicTitleNumber"/>
+<!--                        </fo:block>-->
+                      </number>
+                    </axsl:with-param>
+                  </axsl:call-template>
 <!--                </fo:block>-->
-<!--              </axsl:when>-->
-<!--              <axsl:when test="$type = 'appendices'">-->
+              </axsl:when>
+              <axsl:when test="$type = 'appendices'">
 <!--                <fo:block axsl:use-attribute-sets="__chapter__frontmatter__name__container">-->
-<!--                  <axsl:call-template name="getVariable">-->
-<!--                    <axsl:with-param name="id" select="'Appendix with number'"/>-->
-<!--                    <axsl:with-param name="params" as="element()*">-->
-<!--                      <number>-->
-<!--&lt;!&ndash;                        <fo:block axsl:use-attribute-sets="__chapter__frontmatter__number__container">&ndash;&gt;-->
-<!--                          <axsl:text>&#xA0;</axsl:text>-->
-<!--&lt;!&ndash;                        </fo:block>&ndash;&gt;-->
-<!--                      </number>-->
-<!--                    </axsl:with-param>-->
-<!--                  </axsl:call-template>-->
+                  <axsl:call-template name="getVariable">
+                    <axsl:with-param name="id" select="'Appendix with number'"/>
+                    <axsl:with-param name="params" as="element()*">
+                      <number>
+<!--                        <fo:block axsl:use-attribute-sets="__chapter__frontmatter__number__container">-->
+                          <axsl:text>&#xA0;</axsl:text>
+<!--                        </fo:block>-->
+                      </number>
+                    </axsl:with-param>
+                  </axsl:call-template>
 <!--                </fo:block>-->
-<!--              </axsl:when>-->
-<!--              <axsl:when test="$type = 'part'">-->
+              </axsl:when>
+              <axsl:when test="$type = 'part'">
 <!--                <fo:block axsl:use-attribute-sets="__chapter__frontmatter__name__container">-->
-<!--                  <axsl:call-template name="getVariable">-->
-<!--                    <axsl:with-param name="id" select="'Part with number'"/>-->
-<!--                    <axsl:with-param name="params" as="element()*">-->
-<!--                      <number>-->
-<!--&lt;!&ndash;                        <fo:block axsl:use-attribute-sets="__chapter__frontmatter__number__container">&ndash;&gt;-->
-<!--                          <axsl:apply-templates select="key('map-id', @id)[1]" mode="topicTitleNumber"/>-->
-<!--&lt;!&ndash;                        </fo:block>&ndash;&gt;-->
-<!--                      </number>-->
-<!--                    </axsl:with-param>-->
-<!--                  </axsl:call-template>-->
+                  <axsl:call-template name="getVariable">
+                    <axsl:with-param name="id" select="'Part with number'"/>
+                    <axsl:with-param name="params" as="element()*">
+                      <number>
+<!--                        <fo:block axsl:use-attribute-sets="__chapter__frontmatter__number__container">-->
+                          <axsl:apply-templates select="key('map-id', @id)[1]" mode="topicTitleNumber"/>
+<!--                        </fo:block>-->
+                      </number>
+                    </axsl:with-param>
+                  </axsl:call-template>
 <!--                </fo:block>-->
-<!--              </axsl:when>-->
-<!--              <axsl:when test="$type = 'preface'">-->
+              </axsl:when>
+              <axsl:when test="$type = 'preface'">
 <!--                <fo:block axsl:use-attribute-sets="__chapter__frontmatter__name__container">-->
-<!--                  <axsl:call-template name="getVariable">-->
-<!--                    <axsl:with-param name="id" select="'Preface title'"/>-->
-<!--                  </axsl:call-template>-->
+                  <axsl:call-template name="getVariable">
+                    <axsl:with-param name="id" select="'Preface title'"/>
+                  </axsl:call-template>
 <!--                </fo:block>-->
-<!--              </axsl:when>-->
-<!--              <axsl:when test="$type = 'notices'">-->
+              </axsl:when>
+              <axsl:when test="$type = 'notices'">
 <!--                <fo:block axsl:use-attribute-sets="__chapter__frontmatter__name__container">-->
-<!--                  <axsl:call-template name="getVariable">-->
-<!--                    <axsl:with-param name="id" select="'Notices title'"/>-->
-<!--                  </axsl:call-template>-->
+                  <axsl:call-template name="getVariable">
+                    <axsl:with-param name="id" select="'Notices title'"/>
+                  </axsl:call-template>
 <!--                </fo:block>-->
-<!--              </axsl:when>-->
-<!--            </axsl:choose>-->
-          </fo:block>
+              </axsl:when>
+            </axsl:choose>
+<!--          </fo:block>-->
         </axsl:template>
+
 <!--      </xsl:if>-->
       <xsl:if test="$root ?formatter != 'fop'">
         <xsl:if test="$root ?page-number = 'chapter-page'">
@@ -174,17 +175,33 @@
 
           <axsl:apply-templates select="*[contains(@class,' topic/prolog ')]"/>
 
-          <axsl:apply-templates select="." mode="insertChapterFirstpageStaticContent">
-            <axsl:with-param name="type" select="'part'"/>
-          </axsl:apply-templates>
+<!--          <axsl:apply-templates select="." mode="insertChapterFirstpageStaticContent">-->
+<!--            <axsl:with-param name="type" select="'part'"/>-->
+<!--          </axsl:apply-templates>-->
 
           <fo:block axsl:use-attribute-sets="part.title">
-            <axsl:apply-templates select="." mode="customTopicAnchor"/>
+            <axsl:attribute name="id">
+              <axsl:call-template name="generate-toc-id"/>
+            </axsl:attribute>
+<!--            <axsl:apply-templates select="." mode="customTopicAnchor"/>-->
             <axsl:call-template name="pullPrologIndexTerms"/>
             <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]"/>
-            <axsl:for-each select="*[contains(@class,' topic/title ')]">
-              <axsl:apply-templates select="." mode="getTitle"/>
-            </axsl:for-each>
+
+<!--            <axsl:apply-templates select="." mode="insertChapterFirstpageStaticContent">-->
+<!--              <axsl:with-param name="type" select="'part'"/>-->
+<!--            </axsl:apply-templates>-->
+            <axsl:call-template name="getVariable">
+              <axsl:with-param name="id" select="'Part with number'"/>
+              <axsl:with-param name="params" as="element()*">
+                <number>
+                  <axsl:sequence select="e:get-title-number(.)"/>
+<!--                  <axsl:apply-templates select="key('map-id', @id)[1]" mode="topicTitleNumber"/>-->
+                </number>
+              </axsl:with-param>
+            </axsl:call-template>
+            <axsl:text><xsl:text> </xsl:text></axsl:text>
+
+            <axsl:apply-templates select="*[contains(@class,' topic/title ')]" mode="getTitle"/>
           </fo:block>
 
 <!--          <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or-->
@@ -292,17 +309,30 @@
 
           <axsl:apply-templates select="*[contains(@class,' topic/prolog ')]"/>
 
-          <axsl:apply-templates select="." mode="insertChapterFirstpageStaticContent">
-            <axsl:with-param name="type" select="'chapter'"/>
-          </axsl:apply-templates>
+<!--          <axsl:apply-templates select="." mode="insertChapterFirstpageStaticContent">-->
+<!--            <axsl:with-param name="type" select="'chapter'"/>-->
+<!--          </axsl:apply-templates>-->
 
           <fo:block axsl:use-attribute-sets="topic.title">
-            <axsl:apply-templates select="." mode="customTopicAnchor"/>
+            <axsl:attribute name="id">
+              <axsl:call-template name="generate-toc-id"/>
+            </axsl:attribute>
+<!--            <axsl:apply-templates select="." mode="customTopicAnchor"/>-->
             <axsl:call-template name="pullPrologIndexTerms"/>
             <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]"/>
-            <axsl:for-each select="*[contains(@class,' topic/title ')]">
-              <axsl:apply-templates select="." mode="getTitle"/>
-            </axsl:for-each>
+
+            <axsl:call-template name="getVariable">
+              <axsl:with-param name="id" select="'Chapter with number'"/>
+              <axsl:with-param name="params" as="element()*">
+                <number>
+                  <axsl:sequence select="e:get-title-number(.)"/>
+                  <!--<axsl:apply-templates select="key('map-id', @id)[1]" mode="topicTitleNumber"/>-->
+                </number>
+              </axsl:with-param>
+            </axsl:call-template>
+            <axsl:text><xsl:text> </xsl:text></axsl:text>
+
+            <axsl:apply-templates select="*[contains(@class,' topic/title ')]" mode="getTitle"/>
           </fo:block>
 
           <axsl:choose>
@@ -356,6 +386,12 @@
 <!--          <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>-->
 <!--        </axsl:if>-->
 <!--      </axsl:template>-->
+      <axsl:template match="*[contains(@class, ' bookmap/part ')]" mode="topicTitleNumber">
+<!--        <axsl:variable name="topic" select="ancestor-or-self::*[contains(@class, ' topic/topic ')][1]"/>-->
+<!--        <axsl:variable name="contents" as="node()*" select="e:get-title-number($topic)"/>-->
+        <axsl:sequence select="e:get-title-number(key('topic-id', @id))"/>
+<!--        <axsl:number format="I" count="*[contains(@class, ' bookmap/part ')]"/>-->
+      </axsl:template>
 
     </axsl:stylesheet>
   </xsl:template>
diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index 6547f20..9714f2e 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -110,19 +110,21 @@
 <!--      <xsl:if test="map:contains($root, 'style-toc-1.prefix') and not($root ?style-toc-1.prefix)">-->
         <axsl:template match="node()" mode="tocPrefix"/>
 <!--      </xsl:if>-->
-<!--      <axsl:template-->
-<!--          match="*[contains(@class, ' bookmap/chapter ')] (:|-->
-<!--                 *[contains(@class, ' bookmap/bookmap ')]/opentopic:map/*[contains(@class, ' map/topicref ')]:)"-->
-<!--          mode="tocPrefix" priority="-1">-->
-<!--        <axsl:call-template name="getVariable">-->
-<!--          <axsl:with-param name="id" select="'Table of Contents Chapter'"/>-->
-<!--          <axsl:with-param name="params">-->
-<!--            <number>-->
-<!--              <axsl:apply-templates select="." mode="topicTitleNumber"/>-->
-<!--            </number>-->
-<!--          </axsl:with-param>-->
-<!--        </axsl:call-template>-->
-<!--      </axsl:template>-->
+      <!--
+      <xsl:if test="$root ?style-chapter-title-numbering">
+        <axsl:template match="*[contains(@class, ' bookmap/chapter ')]"
+            mode="tocPrefix" priority="-1">
+          <axsl:call-template name="getVariable">
+            <axsl:with-param name="id" select="'Table of Contents Chapter'"/>
+            <axsl:with-param name="params">
+              <number>
+                <axsl:apply-templates select="." mode="topicTitleNumber"/>
+              </number>
+            </axsl:with-param>
+          </axsl:call-template>
+        </axsl:template>
+      </xsl:if>
+      -->
 
       <!-- Part TOC -->
 
diff --git a/src/generator/com/elovirta/pdf/topic.xsl b/src/generator/com/elovirta/pdf/topic.xsl
index 576c6ae..435b6c5 100644
--- a/src/generator/com/elovirta/pdf/topic.xsl
+++ b/src/generator/com/elovirta/pdf/topic.xsl
@@ -34,18 +34,18 @@
         </xsl:attribute>
       </axsl:variable>
 
-      <axsl:template match="*[contains(@class, ' topic/topic ')]/*[contains(@class, ' topic/title ')]" mode="getTitle">
-        <axsl:variable name="topic" select="ancestor-or-self::*[contains(@class, ' topic/topic ')][1]"/>
-        <axsl:variable name="contents" as="node()*" select="e:get-title-number($topic)"/>
-        <axsl:if test="exists($contents)">
-          <axsl:copy-of select="$contents"/>
-<!--          <fo:leader leader-pattern="space" leader-length="from-nearest-specified-value(font-size)"/>-->
-          <axsl:text>
-            <xsl:text> </xsl:text>
-          </axsl:text>
-        </axsl:if>
-        <axsl:apply-templates/>
-      </axsl:template>
+<!--      <axsl:template match="*[contains(@class, ' topic/topic ')]/*[contains(@class, ' topic/title ')]" mode="getTitle">-->
+<!--        <axsl:variable name="topic" select="ancestor-or-self::*[contains(@class, ' topic/topic ')][1]"/>-->
+<!--        <axsl:variable name="contents" as="node()*" select="e:get-title-number($topic)"/>-->
+<!--        <axsl:if test="exists($contents)">-->
+<!--          <axsl:copy-of select="$contents"/>-->
+<!--&lt;!&ndash;          <fo:leader leader-pattern="space" leader-length="from-nearest-specified-value(font-size)"/>&ndash;&gt;-->
+<!--          <axsl:text>-->
+<!--            <xsl:text> </xsl:text>-->
+<!--          </axsl:text>-->
+<!--        </axsl:if>-->
+<!--        <axsl:apply-templates/>-->
+<!--      </axsl:template>-->
 
       <xsl:choose>
         <xsl:when test="$root ?style-chapter-numbering = 'document'">
@@ -113,11 +113,11 @@
           <xsl:choose>
             <xsl:when test="$root ?style-part-title-numbering">
               <axsl:when test="self::*[contains(@class, ' bookmap/part ')]">
-                <axsl:call-template name="getVariable">
-                  <axsl:with-param name="id" select="'Part with number'"/>
-  <!--                <axsl:with-param name="id" select="'Table of Contents Part'"/>-->
-                  <axsl:with-param name="params">
-                    <number>
+<!--                <axsl:call-template name="getVariable">-->
+<!--                  <axsl:with-param name="id" select="'Part with number'"/>-->
+<!--  &lt;!&ndash;                <axsl:with-param name="id" select="'Table of Contents Part'"/>&ndash;&gt;-->
+<!--                  <axsl:with-param name="params">-->
+<!--                    <number>-->
                       <xsl:choose>
                         <xsl:when test="$root ?style-chapter-numbering = 'document'">
                           <axsl:number count="*[contains(@class, ' bookmap/part ')]"
@@ -130,9 +130,32 @@
                                        format="1"/>
                         </xsl:otherwise>
                       </xsl:choose>
-                    </number>
-                  </axsl:with-param>
-                </axsl:call-template>
+<!--                    </number>-->
+<!--                  </axsl:with-param>-->
+<!--                </axsl:call-template>-->
+              </axsl:when>
+            </xsl:when>
+            <xsl:when test="$root ?style-chapter-title-numbering">
+              <axsl:when test="self::*[contains(@class, ' bookmap/chapter ')]">
+<!--                <axsl:call-template name="getVariable">-->
+<!--                  <axsl:with-param name="id" select="'Chapter with number'"/>-->
+<!--                  <axsl:with-param name="params">-->
+<!--                    <number>-->
+                      <xsl:choose>
+                        <xsl:when test="$root ?style-chapter-numbering = 'document'">
+                          <axsl:number count="*[contains(@class, ' bookmap/chapter ')]"
+                                       level="single"
+                                       format="1"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <axsl:number count="*[contains(@class, ' bookmap/chapter '))]"
+                                       level="single"
+                                       format="1"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
+<!--                    </number>-->
+<!--                  </axsl:with-param>-->
+<!--                </axsl:call-template>-->
               </axsl:when>
             </xsl:when>
             <xsl:otherwise>

From 6a9af1f49c64505a2061c1c76a2362fa35400844 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sun, 27 Oct 2024 10:04:55 +0200
Subject: [PATCH 16/19] Fix chapter and part toc prefix

---
 src/generator/com/elovirta/pdf/toc.xsl   | 38 ++++++++++++++++++++----
 src/generator/com/elovirta/pdf/topic.xsl | 16 +++++-----
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index 9714f2e..1e71024 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -108,23 +108,51 @@
       </axsl:template>
 
 <!--      <xsl:if test="map:contains($root, 'style-toc-1.prefix') and not($root ?style-toc-1.prefix)">-->
-        <axsl:template match="node()" mode="tocPrefix"/>
+<!--        <axsl:template match="node()" mode="tocPrefix"/>-->
 <!--      </xsl:if>-->
-      <!--
+      <axsl:template match="*[contains(@class, ' map/topicref ')]"
+                     mode="tocPrefix">
+<!--        <axsl:call-template name="getVariable">-->
+<!--          <axsl:with-param name="id" select="'Table of Contents Part'"/>-->
+<!--          <axsl:with-param name="params">-->
+<!--            <number>-->
+              <axsl:sequence select="e:get-title-number(key('topic-id', @id))"/>
+              <axsl:text><xsl:text> </xsl:text></axsl:text>
+              <!--                <axsl:apply-templates select="." mode="topicTitleNumber"/>-->
+<!--            </number>-->
+<!--          </axsl:with-param>-->
+<!--        </axsl:call-template>-->
+      </axsl:template>
+
+      <xsl:if test="$root ?style-part-title-numbering">
+        <axsl:template match="*[contains(@class, ' bookmap/part ')]"
+                       mode="tocPrefix" priority="10">
+          <axsl:call-template name="getVariable">
+            <axsl:with-param name="id" select="'Table of Contents Part'"/>
+            <axsl:with-param name="params">
+              <number>
+                <axsl:sequence select="e:get-title-number(key('topic-id', @id))"/>
+<!--                <axsl:apply-templates select="." mode="topicTitleNumber"/>-->
+              </number>
+            </axsl:with-param>
+          </axsl:call-template>
+        </axsl:template>
+      </xsl:if>
+
       <xsl:if test="$root ?style-chapter-title-numbering">
         <axsl:template match="*[contains(@class, ' bookmap/chapter ')]"
-            mode="tocPrefix" priority="-1">
+                       mode="tocPrefix" priority="10">
           <axsl:call-template name="getVariable">
             <axsl:with-param name="id" select="'Table of Contents Chapter'"/>
             <axsl:with-param name="params">
               <number>
-                <axsl:apply-templates select="." mode="topicTitleNumber"/>
+                <axsl:sequence select="e:get-title-number(key('topic-id', @id))"/>
+                <!--                <axsl:apply-templates select="." mode="topicTitleNumber"/>-->
               </number>
             </axsl:with-param>
           </axsl:call-template>
         </axsl:template>
       </xsl:if>
-      -->
 
       <!-- Part TOC -->
 
diff --git a/src/generator/com/elovirta/pdf/topic.xsl b/src/generator/com/elovirta/pdf/topic.xsl
index 435b6c5..c2a3dbd 100644
--- a/src/generator/com/elovirta/pdf/topic.xsl
+++ b/src/generator/com/elovirta/pdf/topic.xsl
@@ -198,14 +198,14 @@
 
       <axsl:template name="getNavTitle">
         <axsl:variable name="topicref" select="key('map-id', @id)[1]"/>
-        <axsl:variable name="contents" as="node()*" select="e:get-title-number(.)"/>
-        <axsl:if test="exists($contents)">
-          <axsl:copy-of select="$contents"/>
-<!--          <fo:leader leader-pattern="space" leader-length="from-nearest-specified-value(font-size)"/>-->
-          <axsl:text>
-            <xsl:text> </xsl:text>
-          </axsl:text>
-        </axsl:if>
+<!--        <axsl:variable name="contents" as="node()*" select="e:get-title-number(.)"/>-->
+<!--        <axsl:if test="exists($contents)">-->
+<!--          <axsl:copy-of select="$contents"/>-->
+<!--&lt;!&ndash;          <fo:leader leader-pattern="space" leader-length="from-nearest-specified-value(font-size)"/>&ndash;&gt;-->
+<!--          <axsl:text>-->
+<!--            <xsl:text> </xsl:text>-->
+<!--          </axsl:text>-->
+<!--        </axsl:if>-->
         <axsl:choose>
           <axsl:when
               test="$topicref/@locktitle = 'yes' and $topicref/*[contains(@class, ' map/topicmeta ')]/*[contains(@class, ' topic/navtitle ')]">

From 7160f074967c4be6816a97feb2f259c531eff08d Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sun, 27 Oct 2024 20:52:39 +0200
Subject: [PATCH 17/19] Fix chapter and part layout

---
 src/generator/com/elovirta/pdf/toc.xsl | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index 1e71024..76e7098 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -69,6 +69,13 @@
         <axsl:for-each select="$currentNode">
           <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">
+                <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">
@@ -76,6 +83,13 @@
                 </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 eq 1 or $level eq 2">
+                <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">
@@ -457,6 +471,17 @@
           <xsl:with-param name="prefix" select="'style-toc-part'"/>
           <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
         </xsl:call-template>
+        <!-- Override PDF2 default -->
+        <axsl:attribute name="padding-top">inherit</axsl:attribute>
+      </axsl:attribute-set>
+
+      <axsl:attribute-set name="__toc__chapter__content" use-attribute-sets="__toc__topic__content">
+        <xsl:call-template name="generate-attribute-set">
+          <xsl:with-param name="prefix" select="'style-toc-chapter'"/>
+          <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
+        </xsl:call-template>
+        <!-- Override PDF2 default -->
+        <axsl:attribute name="padding-top">inherit</axsl:attribute>
       </axsl:attribute-set>
 
       <axsl:attribute-set name="__toc__topic__content">

From 9ec24e3d9728ec6884bc3385c17245f37584982f Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Wed, 30 Oct 2024 14:32:56 +0200
Subject: [PATCH 18/19] Fix toc styling

---
 src/generator/com/elovirta/pdf/toc.xsl | 80 ++++++++++++++++----------
 1 file changed, 49 insertions(+), 31 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index 76e7098..af4735a 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -466,20 +466,59 @@
         </axsl:attribute>
       </axsl:attribute-set>
 
-      <axsl:attribute-set name="__toc__part__content" use-attribute-sets="__toc__topic__content">
-        <xsl:call-template name="generate-attribute-set">
-          <xsl:with-param name="prefix" select="'style-toc-part'"/>
-          <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
-        </xsl:call-template>
+      <axsl:attribute-set name="__toc__part__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">
+              <xsl:with-param name="prefix" select="'style-toc-part'"/>
+              <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-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__chapter__content" use-attribute-sets="__toc__topic__content">
-        <xsl:call-template name="generate-attribute-set">
-          <xsl:with-param name="prefix" select="'style-toc-chapter'"/>
-          <xsl:with-param name="properties" select="$allProperties[. ne 'start-indent']"/>
-        </xsl:call-template>
+      <axsl:attribute-set name="__toc__chapter__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">
+              <xsl:with-param name="prefix" select="'style-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-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')">
+            <xsl:call-template name="generate-attribute-set">
+              <xsl:with-param name="prefix" select="'style-toc-appendix'"/>
+              <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-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>
@@ -513,27 +552,6 @@
       </axsl:attribute-set>
 
       <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-1')">
-        <axsl:attribute-set name="__toc__chapter__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__appendix__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__part__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__preface__content">
           <xsl:call-template name="generate-attribute-set">
             <xsl:with-param name="prefix" select="'style-toc-1'"/>

From 7f46ab16067e2537ab1bb20a12532f43d44256a6 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Wed, 30 Oct 2024 15:30:57 +0200
Subject: [PATCH 19/19] Add support for appendix toc entry

---
 src/generator/com/elovirta/pdf/commons.xsl | 84 ++++++++++++++++++++++
 src/generator/com/elovirta/pdf/toc.xsl     | 10 ++-
 2 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
index 6506262..af893d4 100644
--- a/src/generator/com/elovirta/pdf/commons.xsl
+++ b/src/generator/com/elovirta/pdf/commons.xsl
@@ -246,6 +246,90 @@
         </fo:block>
       </axsl:template>
 
+      <!-- Appendix -->
+
+      <axsl:template match="*" mode="processTopicAppendixInsideFlow">
+        <fo:block axsl:use-attribute-sets="topic">
+          <!-- TODO: Replace with mode="commonattributes" -->
+          <axsl:call-template name="commonattributes"/>
+          <axsl:variable name="level" as="xs:integer">
+            <axsl:apply-templates select="." mode="get-topic-level"/>
+          </axsl:variable>
+          <axsl:if test="$level eq 1">
+            <fo:marker marker-class-name="current-topic-number">
+              <axsl:variable name="topicref"
+                             select="key('map-id', ancestor-or-self::*[contains(@class, ' topic/topic ')][1]/@id)[1]"
+                             as="element()?"/>
+              <axsl:for-each select="$topicref">
+                <axsl:apply-templates select="." mode="topicTitleNumber"/>
+              </axsl:for-each>
+            </fo:marker>
+            <axsl:apply-templates select="." mode="insertTopicHeaderMarker"/>
+          </axsl:if>
+          <axsl:apply-templates select="." mode="customTopicMarker"/>
+
+          <axsl:apply-templates select="*[contains(@class,' topic/prolog ')]"/>
+
+<!--          <axsl:apply-templates select="." mode="insertChapterFirstpageStaticContent">-->
+<!--            <axsl:with-param name="type" select="'appendix'"/>-->
+<!--          </axsl:apply-templates>-->
+
+          <fo:block axsl:use-attribute-sets="topic.title">
+            <axsl:attribute name="id">
+              <axsl:call-template name="generate-toc-id"/>
+            </axsl:attribute>
+<!--            <axsl:apply-templates select="." mode="customTopicAnchor"/>-->
+            <axsl:call-template name="pullPrologIndexTerms"/>
+            <axsl:apply-templates select="*[contains(@class,' ditaot-d/ditaval-startprop ')]"/>
+
+            <axsl:call-template name="getVariable">
+              <axsl:with-param name="id" select="'Appendix with number'"/>
+              <axsl:with-param name="params" as="element()*">
+                <number>
+                  <axsl:sequence select="e:get-title-number(.)"/>
+                  <!--                  <axsl:apply-templates select="key('map-id', @id)[1]" mode="topicTitleNumber"/>-->
+                </number>
+              </axsl:with-param>
+            </axsl:call-template>
+            <axsl:text><xsl:text> </xsl:text></axsl:text>
+
+            <axsl:apply-templates select="*[contains(@class,' topic/title ')]" mode="getTitle"/>
+          </fo:block>
+
+          <axsl:if test="*[contains(@class,' topic/shortdesc ') or
+                           contains(@class, ' topic/abstract ')]/node()">
+            <fo:block axsl:use-attribute-sets="topic__shortdesc">
+              <axsl:apply-templates select="*[contains(@class,' topic/shortdesc ') or
+                                              contains(@class, ' topic/abstract ')]/node()"/>
+            </fo:block>
+          </axsl:if>
+          <axsl:apply-templates select="*[contains(@class,' topic/body ')]"/>
+          <axsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-endprop ')]"/>
+          <axsl:if test="*[contains(@class,' topic/related-links ')]//
+                           *[contains(@class,' topic/link ')]
+                            [not(@role) or @role != 'child']">
+            <axsl:apply-templates select="*[contains(@class,' topic/related-links ')]"/>
+          </axsl:if>
+
+          <axsl:choose>
+            <axsl:when test="$appendixLayout='BASIC'">
+<!--              <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or contains(@class,' ditaot-d/ditaval-startprop ') or-->
+<!--                      contains(@class, ' topic/prolog ') or contains(@class, ' topic/topic ')])"/>-->
+              <!--xsl:apply-templates select="." mode="buildRelationships"/-->
+            </axsl:when>
+            <axsl:when test="exists(*[contains(@class, ' topic/topic ')])">
+              <fo:block axsl:use-attribute-sets="e:appendix_toc">
+                <axsl:apply-templates select="*[contains(@class, ' topic/topic ')]" mode="part-toc"/>
+              </fo:block>
+<!--              <axsl:apply-templates select="." mode="createMiniToc"/>-->
+            </axsl:when>
+          </axsl:choose>
+
+          <axsl:apply-templates select="*[contains(@class,' topic/topic ')]"/>
+          <axsl:call-template name="pullPrologIndexTerms.end-range"/>
+        </fo:block>
+      </axsl:template>
+
 <!--      <axsl:template match="*" mode="createPartToc">-->
         <!-- Part introduction -->
         <!--
diff --git a/src/generator/com/elovirta/pdf/toc.xsl b/src/generator/com/elovirta/pdf/toc.xsl
index af4735a..f36409c 100644
--- a/src/generator/com/elovirta/pdf/toc.xsl
+++ b/src/generator/com/elovirta/pdf/toc.xsl
@@ -67,10 +67,11 @@
         <axsl:param name="tocItemContent"/>
         <axsl:param name="currentNode"/>
         <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">
+              <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>
@@ -84,7 +85,7 @@
               </axsl:when>
             </xsl:if>
             <xsl:if test="some $key in map:keys($root) satisfies starts-with($key, 'style-toc-chapter')">
-              <axsl:when test="$level eq 1 or $level eq 2">
+              <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>
@@ -583,6 +584,11 @@
             <xsl:with-param name="prefix" select="'style-chapter-toc'"/>
           </xsl:call-template>
         </axsl:attribute-set>
+        <axsl:attribute-set name="e:appendix_toc">
+          <xsl:call-template name="generate-attribute-set">
+            <xsl:with-param name="prefix" select="'style-chapter-appendix'"/>
+          </xsl:call-template>
+        </axsl:attribute-set>
       </xsl:if>
     </axsl:stylesheet>
   </xsl:template>