Fix topic titles

jelovirt · Dec 22, 2024 · 944d773 · 944d773
1 parent 7391778
commit 944d773
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/src/generator/com/elovirta/pdf/commons.xsl b/src/generator/com/elovirta/pdf/commons.xsl
@@ -201,7 +201,8 @@
             </axsl:call-template>
             <axsl:text><xsl:text> </xsl:text></axsl:text>
 
-            <axsl:apply-templates select="*[contains(@class,' topic/title ')]" mode="getTitle"/>
+<!--            <axsl:apply-templates select="*[contains(@class,' topic/title ')]" mode="getTitle"/>-->
+            <axsl:apply-templates select="*[contains(@class,' topic/title ')]/node()"/>
           </fo:block>
 
 <!--          <axsl:apply-templates select="* except(*[contains(@class, ' topic/title ') or-->
@@ -416,7 +417,8 @@
             </axsl:call-template>
             <axsl:text><xsl:text> </xsl:text></axsl:text>
 
-            <axsl:apply-templates select="*[contains(@class,' topic/title ')]" mode="getTitle"/>
+<!--            <axsl:apply-templates select="*[contains(@class,' topic/title ')]" mode="getTitle"/>-->
+            <axsl:apply-templates select="*[contains(@class,' topic/title ')]/node()"/>
           </fo:block>
 
           <axsl:choose>

diff --git 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"/>-->
-<!--&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>-->
+      <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>
 
       <xsl:choose>
         <xsl:when test="$root ?style-chapter-numbering = 'document'">

diff --git a/src/main/resources/com/elovirta/pdf/default.json b/src/main/resources/com/elovirta/pdf/default.json
@@ -8,11 +8,16 @@
     "maximum-level": 6
   },
   "style": {
+    "body": {
+      "start-indent": "0pt"
+    },
     "h1": {
-      "font-weight": "bold"
+      "title-numbering": true,
+      "border-style": "none"
     },
     "h2": {
-      "title-numbering": true
+      "title-numbering": true,
+      "border-style": "none"
     },
     "h3": {
       "title-numbering": true