Merge branch 'main' of github.com:quarto-dev/quarto-cli into main

Author: jjallaire

src/command/render/pandoc-html-dependencies.ts

@@ -9,7 +9,7 @@ import { join } from "path/mod.ts";
 
 import * as ld from "../../core/lodash.ts";
 
-import { Document, Element } from "../../core/deno-dom.ts";
+import { Document, Element, NodeType } from "../../core/deno-dom.ts";
 
 import { pathWithForwardSlashes } from "../../core/path.ts";
 
@@ -65,6 +65,8 @@ export function readAndInjectDependencies(
   if (htmlDependencies.length > 0) {
     const injector = domDependencyInjector(doc);
     processHtmlDependencies(htmlDependencies, inputDir, libDir, injector);
+    // Finalize the injection
+    injector.finalizeInjection();
   }
 
   return Promise.resolve({
@@ -93,6 +95,8 @@ export function resolveDependencies(
       libDir,
       injector,
     );
+    // Finalize the injection
+    injector.finalizeInjection();
 
     delete extras.html?.[kDependencies];
 
@@ -144,6 +148,8 @@ interface HtmlInjector {
   injectHtml(html: string): void;
 
   injectMeta(meta: Record<string, string>): void;
+
+  finalizeInjection(): void;
 }
 
 function processHtmlDependencies(
@@ -225,9 +231,30 @@ function processHtmlDependencies(
   }
 }
 
+const kDependencyTarget = "htmldependencies:E3FAD763";
+
 function domDependencyInjector(
   doc: Document,
 ): HtmlInjector {
+  // Locates the placeholder target for inserting content
+  const findTargetComment = () => {
+    for (const node of doc.head.childNodes) {
+      if (node.nodeType === NodeType.COMMENT_NODE) {
+        if (
+          node.textContent &&
+          node.textContent.trim() === kDependencyTarget
+        ) {
+          return node;
+        }
+      }
+    }
+
+    // We couldn't find a placeholder comment, just insert
+    // the nodes at the front of the head
+    return doc.head.firstChild;
+  };
+  const targetComment = findTargetComment();
+
   const injectEl = (
     el: Element,
     attribs?: Record<string, string>,
@@ -239,11 +266,11 @@ function domDependencyInjector(
       }
     }
     if (!afterBody) {
-      doc.head.appendChild(el);
-      doc.head.appendChild(doc.createTextNode("\n"));
+      doc.head.insertBefore(doc.createTextNode("\n"), targetComment);
+      doc.head.insertBefore(el, targetComment);
     } else {
       doc.body.appendChild(el);
-      doc.head.appendChild(doc.createTextNode("\n"));
+      doc.body.appendChild(doc.createTextNode("\n"));
     }
   };
 
@@ -299,12 +326,18 @@ function domDependencyInjector(
     });
   };
 
+  const finalizeInjection = () => {
+    // Remove the target comment
+    targetComment.remove();
+  };
+
   return {
     injectScript,
     injectStyle,
     injectLink,
     injectMeta,
     injectHtml,
+    finalizeInjection,
   };
 }
 
@@ -393,11 +426,15 @@ function lineDependencyInjector(
     });
   };
 
+  const finalizeInjection = () => {
+  };
+
   return {
     injectScript,
     injectStyle,
     injectLink,
     injectMeta,
     injectHtml,
+    finalizeInjection,
   };
 }

src/format/html/format-html-bootstrap.ts

@@ -360,7 +360,14 @@ function bootstrapHtmlPostprocessor(
       format.metadata[kAppendixStyle] !== false &&
       format.metadata[kAppendixStyle] !== "none"
     ) {
-      await processDocumentAppendix(input, inputTraits, format, flags, doc, offset);
+      await processDocumentAppendix(
+        input,
+        inputTraits,
+        format,
+        flags,
+        doc,
+        offset,
+      );
     }
 
     // no resource refs
@@ -632,6 +639,28 @@ const processFigureMarginCaption = (
   }
 };
 
+const processTableMarginCaption = (
+  captionContainer: Element,
+  doc: Document,
+) => {
+  // Find a caption
+  const caption = captionContainer.querySelector("caption");
+  if (caption) {
+    const marginCapEl = doc.createElement("DIV");
+    marginCapEl.classList.add("quarto-table-caption");
+    marginCapEl.classList.add("margin-caption");
+    marginCapEl.innerHTML = caption.innerHTML;
+
+    captionContainer.parentElement?.insertBefore(
+      marginCapEl,
+      captionContainer.nextElementSibling,
+    );
+
+    caption.remove();
+    removeCaptionClass(captionContainer);
+  }
+};
+
 // Process any captions that appear in margins
 const processMarginCaptions = (doc: Document) => {
   // Forward caption class from parents to the child fig caps
@@ -649,6 +678,23 @@ const processMarginCaptions = (doc: Document) => {
       } else {
         processFigureMarginCaption(captionContainer, doc);
       }
+    } else {
+      // Deal with table margin captions
+      if (figureEl.classList.contains("tbl-parent")) {
+        // This is table panel, so only grab the main caption
+        const capDivEl = figureEl.querySelector("div.panel-caption");
+        if (capDivEl) {
+          capDivEl.classList.add("margin-caption");
+          capDivEl.remove();
+          figureEl.appendChild(capDivEl);
+        }
+      } else {
+        // This is just a table, grab that caption
+        const table = figureEl.querySelector("table");
+        if (table) {
+          processTableMarginCaption(table, doc);
+        }
+      }
     }
     removeCaptionClass(figureEl);
   });

src/resources/formats/html/bootstrap/_bootstrap-rules.scss

@@ -655,6 +655,11 @@ aside,
   font-size: 0.825rem;
 }
 
+.panel-caption.margin-caption {
+  text-align: inherit;
+}
+
+
 .column-margin.column-container p {
 	margin-bottom: 0;
 }

src/resources/formats/html/pandoc/template.html

@@ -9,6 +9,7 @@
 $styles.html()$
 </style>
 
+<!-- htmldependencies:E3FAD763 -->
 $for(header-includes)$
 $header-includes$
 $endfor$

src/resources/rmd/hooks.R

@@ -96,7 +96,7 @@ knitr_hooks <- function(format, resourceDir, handledLanguages) {
   opts_hooks[["collapse"]] <- function(options) {
     if (isTRUE(options[["collapse"]])) {
       comment <- options[["comment"]]
-      if (is.null(comment) || !nzchar(comment) || is.na(comment)) {
+      if (is.null(comment) || is.na(comment)) {
         options[["comment"]] <- "##"
       }
     }
@@ -380,7 +380,7 @@ knitr_hooks <- function(format, resourceDir, handledLanguages) {
     }
     lineNumbers <- options[["code-line-numbers"]]
     if (!is.null(lineNumbers)) {
-      attr <- paste(attr, paste0('code-line-numbers="', as.character(lineNumbers), '"'))
+      attr <- paste(attr, paste0('code-line-numbers="', tolower(as.character(lineNumbers)), '"'))
     }
 
     lang <- tolower(options$engine)

src/resources/schema/definitions.yml

@@ -481,7 +481,7 @@
       site-path:
         string:
           description: |
-            Path to site (defaults to '/'). Not required if you specify `site-url`.
+            Path to site (defaults to `/`). Not required if you specify `site-url`.
       repo-url:
         string:
           description: "Base URL for website source code repository"

src/resources/schema/project.yml

@@ -92,7 +92,7 @@
             enum: [pdf, epub, docx]
             description: |
               Download buttons for other formats to include on navbar or sidebar
-              (one or more of `pdf`, `epub`, and `docx)
+              (one or more of `pdf`, `epub`, and `docx`)
         tools:
           arrayOf:
             schema:

tests/docs/code-highlighting/code-line-number-knitr.qmd

@@ -0,0 +1,21 @@
+---
+title: "Plot Test"
+format: html
+code-line-numbers: true
+knitr:
+  opts_chunk: 
+      eval: false
+---
+
+# with line number comment {#with-numbering}
+
+```{r}
+1 + 2
+```
+
+# no line number comment {#no-numbering}
+
+```{r}
+#| code-line-numbers: false
+1 + 2
+```

tests/docs/test-knitr-options.Rmd

@@ -0,0 +1,22 @@
+---
+title: "Plot Test"
+knit: quarto render
+---
+
+# collapse and empty comment {#comment-empty}
+
+```{r}
+#| collapse: true
+#| prompt: true
+#| comment: ""
+1 + 2
+```
+
+# collapse and specific comment {#comment-change}
+
+```{r}
+#| collapse: true
+#| prompt: true
+#| comment: $
+1 + 2
+```

tests/smoke/render/render-code-highlighting.test.ts

@@ -0,0 +1,22 @@
+/*
+* render-r.test.ts
+*
+* Copyright (C) 2020 by RStudio, PBC
+*
+*/
+
+import { fileLoader } from "../../utils.ts";
+import { ensureHtmlElements } from "../../verify.ts";
+import { testRender } from "./render.ts";
+
+const doc = fileLoader("code-highlighting")(
+  "code-line-number-knitr.qmd",
+  "html",
+);
+testRender(doc.input, "html", false, [
+  ensureHtmlElements(
+    doc.output.outputPath,
+    ["#with-numbering div.cell-code > pre.number-lines"],
+    ["#no-numbering div.cell-code > pre.number-lines"],
+  ),
+]);