Improve Part / Chapter Handling

- We rely upon the `#` heading to mark chapters, so this must stay inline. only emit other metadata with template

- track the chapter depth

- only emit the startatroot when the depth is 0

Author: dragonstyle

src/project/types/book/book-config.ts

@@ -273,6 +273,7 @@ export type BookRenderItemType = "index" | "chapter" | "appendix" | "part";
 
 export interface BookRenderItem {
   type: BookRenderItemType;
+  depth: number;
   text?: string;
   file?: string;
   number?: number;
@@ -293,6 +294,7 @@ export async function bookRenderItems(
   const findInputs = async (
     type: BookRenderItemType,
     items: SidebarItem[],
+    depth = 0,
   ) => {
     const throwInputNotFound = (input: string) => {
       throw new Error(`Book ${type} '${input}' not found`);
@@ -303,8 +305,9 @@ export async function bookRenderItems(
           type: kBookItemPart,
           file: item.href,
           text: item.text,
+          depth,
         });
-        await findInputs(type, item.contents);
+        await findInputs(type, item.contents, depth + 1);
       } else if (item.href) {
         const itemPath = join(projectDir, item.href);
         if (safeExistsSync(itemPath)) {
@@ -325,6 +328,7 @@ export async function bookRenderItems(
               type,
               file: item.href,
               number,
+              depth,
             });
           }
         } else {
@@ -369,6 +373,7 @@ export async function bookRenderItems(
   await findChapters(kBookAppendix, {
     type: kBookItemAppendix,
     text: language[kSectionTitleAppendices] + " {.unnumbered}",
+    depth: 0,
   });
 
   // validate that all of the chapters exist

src/project/types/book/book-render.ts

@@ -351,6 +351,12 @@ async function mergeExecutedFiles(
             file.executeResult.markdown,
           );
 
+          const yaml = partitioned?.yaml
+            ? readYamlFromMarkdown(partitioned?.yaml)
+            : undefined;
+          const frontTitle = frontMatterTitle(yaml);
+          const titleMarkdown = frontTitle ? `# ${frontTitle}\n\n` : "";
+
           const titleBlockPath = resourcePath(
             "projects/book/pandoc/title-block.md",
           );
@@ -362,7 +368,8 @@ async function mergeExecutedFiles(
               "\n```````"
             : "";
 
-          itemMarkdown = bookItemMetadata(project, item, file) + titleBlockMd +
+          itemMarkdown = bookItemMetadata(project, item, file) + titleMarkdown +
+            titleBlockMd +
             (partitioned?.markdown || file.executeResult.markdown);
         } else {
           throw new Error(
@@ -542,6 +549,7 @@ function bookItemMetadata(
     bookItemType: item.type,
     bookItemNumber: item.number ? item.number : null,
     bookItemFile: item.file,
+    bookItemDepth: item.depth,
   };
 
   const inlineMetadataEncoded = base64Encode(JSON.stringify(inlineMetadata));

src/resources/filters/quarto-pre/book-numbering.lua

@@ -7,6 +7,7 @@ function bookNumbering()
       local file = currentFileMetadataState().file
       if file ~= nil then
         local bookItemType = file.bookItemType
+        local bookItemDepth = file.bookItemDepth
         if bookItemType ~= nil then
           -- if we are in an unnumbered chapter then add unnumbered class
           if bookItemType == "chapter" and file.bookItemNumber == nil then
@@ -29,13 +30,12 @@ function bookNumbering()
               tappend(appendixPara.content, el.content)
               appendixPara.content:insert(pandoc.RawInline('latex', '}'))
               return appendixPara
-            elseif bookItemType == "chapter" then
+            elseif bookItemType == "chapter" and bookItemDepth == 0 then
               preState.usingBookmark = true
-
-              local bookmarkReset = pandoc.Para({
-                pandoc.RawInline('latex', '\\bookmarksetup{startatroot}'),
+              local bookmarkReset = pandoc.Div({
+                pandoc.RawInline('latex', '\\bookmarksetup{startatroot}\n'),
+                el
               })
-              tappend(bookmarkReset.content, el.content)
               return bookmarkReset
             end
           end

src/resources/projects/book/pandoc/title-block.md

@@ -1,6 +1,5 @@
 $-- Be very careful about whitespace in this document - line breaks are very meaningful
 $-- and it is very easy to break the layout with poorly considered line breaks
-# $title$
 
 $if(subtitle)$$subtitle$$endif$