Add part content support

Author: dragonstyle

src/format/asciidoc/format-asciidoc.ts

@@ -9,8 +9,6 @@ import { Format } from "../../config/types.ts";
 
 import { mergeConfigs } from "../../core/config.ts";
 import { resolveInputTarget } from "../../project/project-index.ts";
-import { projectFormatOutputDir } from "../../project/project-shared.ts";
-import { kProjectType, ProjectContext } from "../../project/types.ts";
 import {
   BookChapterEntry,
   BookPart,
@@ -21,12 +19,19 @@ import {
   bookConfig,
   isBookIndexPage,
 } from "../../project/types/book/book-shared.ts";
-import { projectType } from "../../project/types/project-types.ts";
 import { join } from "path/mod.ts";
 
 import { plaintextFormat } from "../formats-shared.ts";
 import { dirAndStem } from "../../core/path.ts";
 import { formatResourcePath } from "../../core/resources.ts";
+import { ProjectContext } from "../../project/types.ts";
+import { kShiftHeadingLevelBy } from "../../config/constants.ts";
+
+type AsciiDocBookPart = string | {
+  partPath?: string;
+  part?: string;
+  chapters: string[];
+};
 
 // Provide the basic asciidoc format
 export function asciidocFormat(): Format {
@@ -67,13 +72,13 @@ const asciidocBookExtension = {
           "template.asciidoc",
         ),
       );
-
       return { markdown: completeMd, format };
     } else {
       // Turn off the TOC on child pages
       format.pandoc.toc = false;
+      format.pandoc[kShiftHeadingLevelBy] = -1;
+      return { format };
     }
-    return { format };
   },
   async bookPostProcess(_format: Format, _project: ProjectContext) {
   },
@@ -125,17 +130,22 @@ function levelOffset(offset: string) {
 }
 
 function partsAndChapters(
-  entries: BookChapterEntry[],
+  entries: AsciiDocBookPart[],
   include: (path: string) => string,
 ) {
   return entries.map((entry) => {
     if (typeof (entry) === "string") {
       return include(entry);
     } else {
       const partOutput: string[] = [];
-      partOutput.push(levelOffset("-1"));
-      partOutput.push(`= ${entry.part}`);
-      partOutput.push(levelOffset("+1"));
+
+      if (entry.partPath) {
+        partOutput.push(include(entry.partPath));
+      } else {
+        partOutput.push(levelOffset("-1"));
+        partOutput.push(`= ${entry.part}`);
+        partOutput.push(levelOffset("+1"));
+      }
 
       for (const chap of entry.chapters) {
         partOutput.push(include(chap));
@@ -182,7 +192,7 @@ async function resolveBookInputs(
     }
   };
 
-  const outputs: BookChapterEntry[] = [];
+  const outputs: AsciiDocBookPart[] = [];
   for (const input of inputs) {
     if (typeof (input) === "string") {
       const chapterOutput = await resolveChapter(input);
@@ -191,8 +201,11 @@ async function resolveBookInputs(
       }
     } else {
       const entry = input as BookPart;
+
+      const resolvedPart = await resolveChapter(entry.part);
       const entryOutput = {
-        part: entry.part,
+        partPath: resolvedPart,
+        part: resolvedPart ? undefined : entry.part,
         chapters: [] as string[],
       };
       for (const chapter of entry.chapters) {

tests/docs/smoke-all/book/htmlbook/.gitignore

@@ -0,0 +1 @@
+/.quarto/

tests/docs/smoke-all/book/htmlbook/_quarto.yml

@@ -0,0 +1,26 @@
+project:
+  type: book
+
+book:
+  title: "minibook"
+  author: "Hadley Wickham"
+  chapters:
+    - index.qmd
+    - formatting.qmd
+    - code.qmd
+    - part: part-1.qmd
+      chapters:
+        - chap-1-1.qmd
+        - chap-1-2.qmd
+  appendices:
+    - appendix-1.qmd
+    - appendix-2.qmd
+
+bibliography: references.bib
+
+format:
+  asciidoc: default
+    
+
+editor: visual
+

tests/docs/smoke-all/book/htmlbook/appendix-1.qmd

@@ -0,0 +1,10 @@
+# First appendix
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Integer ut lectus in ante bibendum egestas.
+Cras eget commodo justo, quis blandit nulla.
+Pellentesque bibendum eu tortor sed interdum.
+Nunc sem dui, ultrices at velit sit amet, laoreet fermentum libero.
+Quisque mi nulla, dignissim eu magna ac, placerat bibendum felis.
+Morbi tristique dolor arcu, ut fringilla nisi varius vel.
+In elit arcu, consequat a maximus et, imperdiet at magna.

tests/docs/smoke-all/book/htmlbook/appendix-2.qmd

@@ -0,0 +1,10 @@
+# Second appendix
+
+Donec orci nulla, eleifend finibus tempor vel, condimentum non nibh.
+Vivamus fringilla eleifend erat, ultricies varius ipsum tincidunt sed.
+Suspendisse massa mauris, placerat et sagittis sed, commodo at sem.
+Pellentesque id velit sapien.
+Fusce at porta sapien.
+Quisque purus odio, gravida eget nibh in, commodo dignissim enim.
+Suspendisse potenti.
+Praesent vulputate, ante sed tristique vestibulum, ipsum quam aliquet massa, vel mattis lacus tellus et justo.

tests/docs/smoke-all/book/htmlbook/chap-1-1.qmd

@@ -0,0 +1,80 @@
+# First chapter
+
+Duis porttitor commodo risus, non pellentesque quam faucibus a.
+Nunc ex arcu, molestie ac dolor quis, volutpat condimentum turpis.
+Nam rhoncus lectus finibus arcu aliquet, eu vehicula ligula imperdiet.
+Pellentesque felis ipsum, dapibus eu euismod in, mollis ut mauris.
+Duis consequat felis eu nunc porttitor, id auctor sapien dictum.
+Aenean imperdiet rhoncus est at fringilla.
+Nullam a vehicula enim.
+Phasellus egestas laoreet purus eget laoreet.
+Nunc a felis in odio aliquet tempus.
+In bibendum urna orci, sit amet pellentesque magna gravida id.
+Donec viverra sit amet odio ac pharetra.
+Ut blandit ante et tellus bibendum aliquet.
+Nunc eu risus nec metus dictum bibendum vel sit amet massa.
+Duis euismod purus eu gravida condimentum.
+In hac habitasse platea dictumst.
+
+Pellentesque ultrices luctus quam at tincidunt.
+Sed euismod risus nisi, in ultricies nisi posuere interdum.
+Sed ut porttitor erat.
+Suspendisse ullamcorper nulla sed orci dignissim condimentum.
+Fusce nec odio dui.
+Duis sed nulla in risus convallis pretium.
+Donec ultricies augue ut metus condimentum, quis volutpat lectus vulputate.
+Nunc et nibh gravida, blandit eros ac, pulvinar neque.
+Phasellus orci arcu, aliquam quis odio at, euismod dignissim sapien.
+Duis viverra semper lacus, id pretium mauris venenatis ut.
+Vivamus sed tristique tellus.
+Duis posuere vel ligula at scelerisque.
+
+## A subhead
+
+### Subsub head
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Sed lobortis rhoncus tortor, eget finibus enim placerat et.
+Morbi ultrices velit sit amet quam pulvinar mollis non ac magna.
+Nulla auctor dignissim velit quis volutpat.
+Cras efficitur arcu lectus, laoreet maximus mi sodales eget.
+Pellentesque at ornare dui.
+Phasellus ultricies odio sed rhoncus dapibus.
+Donec vitae urna augue.
+Sed hendrerit tellus velit, sed tempor orci volutpat id.
+
+### Subsub head 2
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Sed lobortis rhoncus tortor, eget finibus enim placerat et.
+Morbi ultrices velit sit amet quam pulvinar mollis non ac magna.
+Nulla auctor dignissim velit quis volutpat.
+Cras efficitur arcu lectus, laoreet maximus mi sodales eget.
+Pellentesque at ornare dui.
+Phasellus ultricies odio sed rhoncus dapibus.
+Donec vitae urna augue.
+Sed hendrerit tellus velit, sed tempor orci volutpat id.
+
+#### Subsubsub head
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Sed lobortis rhoncus tortor, eget finibus enim placerat et.
+Morbi ultrices velit sit amet quam pulvinar mollis non ac magna.
+Nulla auctor dignissim velit quis volutpat.
+Cras efficitur arcu lectus, laoreet maximus mi sodales eget.
+Pellentesque at ornare dui.
+Phasellus ultricies odio sed rhoncus dapibus.
+Donec vitae urna augue.
+Sed hendrerit tellus velit, sed tempor orci volutpat id.
+
+## `code()` in a subhead
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Sed lobortis rhoncus tortor, eget finibus enim placerat et.
+Morbi ultrices velit sit amet quam pulvinar mollis non ac magna.
+Nulla auctor dignissim velit quis volutpat.
+Cras efficitur arcu lectus, laoreet maximus mi sodales eget.
+Pellentesque at ornare dui.
+Phasellus ultricies odio sed rhoncus dapibus.
+Donec vitae urna augue.
+Sed hendrerit tellus velit, sed tempor orci volutpat id.

tests/docs/smoke-all/book/htmlbook/chap-1-2.qmd

@@ -0,0 +1,25 @@
+# Second chapter
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Mauris vel urna id dui posuere gravida ut non nunc.
+Phasellus porttitor luctus tristique.
+Nulla mollis accumsan ligula.
+Vestibulum et posuere turpis.
+Phasellus porttitor urna metus, at sodales libero imperdiet eu.
+Pellentesque efficitur diam consectetur ex bibendum, quis luctus tortor ullamcorper.
+Pellentesque feugiat fringilla justo non tempor.
+
+Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Vivamus vitae diam quis justo auctor varius eget in est.
+Donec gravida tempor lorem non auctor.
+Etiam in ultricies diam.
+Curabitur purus sem, pretium viverra pharetra eget, consequat eget tortor.
+Integer ac ex non erat condimentum efficitur.
+Nunc nunc mi, dignissim vel commodo at, feugiat vitae diam.
+
+Nam metus velit, dapibus tristique lacinia vitae, interdum nec arcu.
+Praesent magna nunc, porta maximus ex non, sodales euismod justo.
+Sed sit amet egestas justo.
+Proin in lectus in dui rutrum porttitor vel eu arcu.
+Pellentesque lorem ex, ullamcorper eget vulputate sed, maximus vitae diam.
+Phasellus risus orci, volutpat in magna at, placerat molestie lacus.
+Proin sapien tortor, consectetur sed est vitae, imperdiet finibus sem.

tests/docs/smoke-all/book/htmlbook/code.qmd

@@ -0,0 +1,32 @@
+# Code and figures {#sec-code-and-figures}
+
+```{r}
+#| include: false
+knitr::opts_chunk$set(collapse = TRUE, comment = "#>")
+```
+
+## Code {#sec-code}
+
+This is some R code
+
+```{r}
+1 + 1
+```
+
+This is some html code:
+
+``` html
+<p>Hello!</p>
+```
+
+## Figures
+
+@fig-hist shows a flat histogram.
+
+```{r}
+#| label: fig-hist
+#| echo: false
+#| fig-cap: This is a histogram
+#| fig-alt: This is some alt-text
+hist(1:10)
+```

tests/docs/smoke-all/book/htmlbook/formatting.qmd

@@ -0,0 +1,85 @@
+# Formatting
+
+## Inline
+
+-   *italic*
+-   **bold**
+-   `code`
+-   footnote[^formatting-1]
+-   footnote with style[^formatting-2]
+
+[^formatting-1]: This is a footnote.
+
+[^formatting-2]: This is another footnote, but *this* one `has` **style**!
+
+## Cross-links
+
+-   Figure: @fig-hist
+-   Within page: @sec-lists
+-   Across page: @sec-code
+-   Chapter: @sec-code-and-figures
+
+## Lists {#sec-lists}
+
+This is a tight bulleted list:
+
+-   Bullet 1
+-   Bullet 2
+-   Bullet 3
+
+This is a loose bulleted list:
+
+-   Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+    Mauris vel urna id dui posuere gravida ut non nunc.
+    Phasellus porttitor luctus tristique.
+    Nulla mollis accumsan ligula.
+    Vestibulum et posuere turpis.
+    Phasellus porttitor urna metus, at sodales libero imperdiet eu.
+    Pellentesque efficitur diam consectetur ex bibendum, quis luctus tortor ullamcorper.
+    Pellentesque feugiat fringilla justo non tempor.
+
+-   Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Vivamus vitae diam quis justo auctor varius eget in est.
+    Donec gravida tempor lorem non auctor.
+    Etiam in ultricies diam.
+    Curabitur purus sem, pretium viverra pharetra eget, consequat eget tortor.
+    Integer ac ex non erat condimentum efficitur.
+    Nunc nunc mi, dignissim vel commodo at, feugiat vitae diam.
+
+-   Nam metus velit, dapibus tristique lacinia vitae, interdum nec arcu.
+    Praesent magna nunc, porta maximus ex non, sodales euismod justo.
+    Sed sit amet egestas justo.
+    Proin in lectus in dui rutrum porttitor vel eu arcu.
+    Pellentesque lorem ex, ullamcorper eget vulputate sed, maximus vitae diam.
+    Phasellus risus orci, volutpat in magna at, placerat molestie lacus.
+    Proin sapien tortor, consectetur sed est vitae, imperdiet finibus sem.
+
+This is a numbered list:
+
+1.  First element
+2.  Second
+3.  Third
+4.  Fourth
+
+## Callouts
+
+::: callout-note
+This is a note
+:::
+
+::: callout-warning
+This is a warning
+:::
+
+::: callout-tip
+This is a tip
+:::
+
+::: callout-caution
+This is a caution
+:::
+
+::: callout-important
+## This is a heading
+
+This is important!
+:::

tests/docs/smoke-all/book/htmlbook/index.qmd

@@ -0,0 +1 @@
+# Index