jelovirt · jelovirt · Jan 18, 2025 · Jan 18, 2025
diff --git a/src/app/components/Other.tsx b/src/app/components/Other.tsx
@@ -13,11 +13,11 @@ export default function Other() {
         <h3>Table of Contents</h3>
         <fieldset>
           <p>
-            <label htmlFor="toc_maximum_level">Show level</label>
+            <label htmlFor="style_toc_maximum_level">Show level</label>
             <Field
               component="select"
-              name="toc_maximum_level"
-              id="toc_maximum_level"
+              name="style_toc_maximum_level"
+              id="style_toc_maximum_level"
             >
               <option value="2">1</option>
               <option value="3">2</option>

diff --git a/src/generator/Model.ts b/src/generator/Model.ts
@@ -75,7 +75,7 @@ export type Model = {
   cover_image_metadata: string;
   cover_image_topic: string;
   bookmark_style: 'COLLAPSED' | 'EXPANDED';
-  toc_maximum_level: number;
+  style_toc_maximum_level: number;
   task_label: boolean;
   include_related_links: 'none' | 'all' | 'nofamily';
   table_continued: boolean;
@@ -170,7 +170,7 @@ export function getInitStore(): PluginModel {
     cover_image_metadata: 'cover-image',
     cover_image_topic: '',
     bookmark_style: 'COLLAPSED',
-    toc_maximum_level: 4,
+    style_toc_maximum_level: 4,
     task_label: false,
     include_related_links: 'none',
     table_continued: false,

diff --git a/src/generator/basic-settings.ts b/src/generator/basic-settings.ts
@@ -11,8 +11,8 @@ export function generate_custom_attr(root: Element, conf: Generator) {
     select: `'${conf.formatter}'`,
   });
   SubElement(root, 'xsl:param', {
-    name: 'tocMaximumLevel',
-    select: conf.toc_maximum_level.toString(),
+    name: 'styleTocMaximumLevel',
+    select: conf.style_toc_maximum_level.toString(),
   });
   // page size
   SubElement(root, xsl('variable'), { name: 'page-width' }).text =

diff --git a/src/generator/com/elovirta/pdf/basic-settings.xsl b/src/generator/com/elovirta/pdf/basic-settings.xsl
@@ -20,8 +20,8 @@
     <axsl:stylesheet version="2.0">
       <xsl:call-template name="generate-namespace-node"/>
       <axsl:param name="pdfFormatter" select="'{. ?formatter}'"/>
-      <xsl:if test="map:contains($root, 'toc-maximum-level')">
-        <axsl:param name="tocMaximumLevel" select="{$root ?toc-maximum-level}"/>
+      <xsl:if test="map:contains($root, 'style-toc-maximum-level')">
+        <axsl:param name="tocMaximumLevel" select="{$root ?style-toc-maximum-level}"/>
       </xsl:if>
       <!-- page size -->
       <xsl:if test="map:contains($root, 'page-width')">

diff --git a/src/generator/index.ts b/src/generator/index.ts
@@ -76,7 +76,7 @@ export default class Generator {
   body_column_count;
   index_column_count;
   bookmark_style;
-  toc_maximum_level;
+  style_toc_maximum_level;
   task_label;
   include_related_links;
   column_gap;
@@ -119,7 +119,7 @@ export default class Generator {
     this.force_page_count = conf.force_page_count;
     this.chapter_layout = conf.chapter_layout;
     this.bookmark_style = conf.bookmark_style;
-    this.toc_maximum_level = conf.toc_maximum_level;
+    this.style_toc_maximum_level = conf.style_toc_maximum_level;
     this.task_label = conf.task_label;
     this.include_related_links = conf.include_related_links;
     if (conf.body_column_count) {

diff --git a/src/main/resources/com/elovirta/pdf/default.json b/src/main/resources/com/elovirta/pdf/default.json
@@ -41,9 +41,6 @@
       "text-align": "start"
     }
   },
-  "toc": {
-    "maximum-level": 6
-  },
   "style": {
     "body": {
       "start-indent": "0pt",
@@ -141,6 +138,7 @@
       "title-numbering": true
     },
     "toc": {
+      "maximum-level": 6,
       "part": {
         "start-indent": "0pt",
         "space-before": "0.6em",

diff --git a/src/main/resources/schema.json b/src/main/resources/schema.json
@@ -37,7 +37,7 @@
       "default": "COLLAPSED",
       "description": "Expand state of PDF bookmarks."
     },
-    "toc-maximum-level": {
+    "style-toc-maximum-level": {
       "type": "integer",
       "description": "Maximum TOC depth.",
       "default": 4

diff --git a/src/test/resources/exp/theme.json b/src/test/resources/exp/theme.json
@@ -5,7 +5,7 @@
   "bookmark-style": "COLLAPSED",
   "table-continued": false,
   "column-gap": "12pt",
-  "toc-maximum-level": 4,
+  "style-toc-maximum-level": 4,
   "include-related-links": "none",
   "force-page-count": "even",
   "index-column-count": 2,

diff --git a/src/test/resources/src/base.json b/src/test/resources/src/base.json
@@ -815,7 +815,7 @@
   "cover_image_metadata": "cover-image",
   "cover_image_topic": "",
   "bookmark_style": "COLLAPSED",
-  "toc_maximum_level": 4,
+  "style_toc_maximum_level": 4,
   "task_label": false,
   "include_related_links": "none",
   "table_continued": false,

diff --git a/src/test/resources/src/base.yaml b/src/test/resources/src/base.yaml
@@ -784,7 +784,7 @@ chapter_layout: BASIC
 cover_image_metadata: cover-image
 cover_image_topic: ''
 bookmark_style: COLLAPSED
-toc_maximum_level: 4
+style_toc_maximum_level: 4
 task_label: false
 include_related_links: none
 table_continued: false

diff --git a/src/test/resources/src/theme.json b/src/test/resources/src/theme.json
@@ -160,7 +160,7 @@
   "cover_image_metadata": "cover-image",
   "cover_image_topic": "",
   "bookmark_style": "COLLAPSED",
-  "toc_maximum_level": 4,
+  "style_toc_maximum_level": 4,
   "task_label": false,
   "include_related_links": "none",
   "table_continued": false,

diff --git a/src/test/resources/src/theme.yaml b/src/test/resources/src/theme.yaml
@@ -134,7 +134,7 @@ chapter_layout: BASIC
 cover_image_metadata: cover-image
 cover_image_topic: ''
 bookmark_style: COLLAPSED
-toc_maximum_level: 4
+style_toc_maximum_level: 4
 task_label: false
 include_related_links: none
 table_continued: false