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

Author: jjallaire

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

@@ -253,7 +253,7 @@ function domDependencyInjector(
     afterBody?: boolean,
   ) => {
     const scriptEl = doc.createElement("script");
-    scriptEl.setAttribute("src", href);
+    scriptEl.setAttribute("src", pathWithForwardSlashes(href));
     injectEl(scriptEl, attribs, afterBody);
   };
 
@@ -263,7 +263,7 @@ function domDependencyInjector(
     afterBody?: boolean,
   ) => {
     const linkEl = doc.createElement("link");
-    linkEl.setAttribute("href", href);
+    linkEl.setAttribute("href", pathWithForwardSlashes(href));
     linkEl.setAttribute("rel", "stylesheet");
     injectEl(linkEl, attribs, afterBody);
   };
@@ -274,7 +274,7 @@ function domDependencyInjector(
     type?: string,
   ) => {
     const linkEl = doc.createElement("link");
-    linkEl.setAttribute("href", href);
+    linkEl.setAttribute("href", pathWithForwardSlashes(href));
     linkEl.setAttribute("rel", rel);
     if (type) {
       linkEl.setAttribute("type", type);
@@ -378,7 +378,9 @@ function lineDependencyInjector(
     if (!type) {
       type = "";
     }
-    lines.push(rawLinkTemplate({ href, type, rel }));
+    lines.push(
+      rawLinkTemplate({ href: pathWithForwardSlashes(href), type, rel }),
+    );
   };
 
   const injectHtml = (html: string) => {

src/command/tools/cmd.ts

@@ -56,7 +56,7 @@ Use 'quarto tools' with no arguments to show the status of all tools.`,
   )
   .example(
     "Show tool status",
-    "quarto tools",
+    "quarto tools list",
   )
   // deno-lint-ignore no-explicit-any
   .action(async (_options: any, command: string, tool?: string) => {

src/format/html/format-html-shared.ts

@@ -339,6 +339,8 @@ export function setMainColumn(doc: Document, column: string) {
     "main.content",
     ".page-navigation",
     ".quarto-banner-title-block .quarto-title",
+    "div[class^='quarto-about-']",
+    "div[class*=' quarto-about-']",
   ];
   selectors.forEach((selector) => {
     const el = doc.querySelector(selector);

src/format/reveal/format-reveal.ts

@@ -645,15 +645,17 @@ function applyStretch(doc: Document, autoStretch: boolean) {
       const image = images[0];
       const imageEl = image as Element;
 
-      // screen out early specials divs (layout panels, columns, fragments, ...)
       if (
+        // screen out early specials divs (layout panels, columns, fragments, ...)
         findParent(imageEl, (el: Element) => {
           return el.classList.contains("column") ||
             el.classList.contains("quarto-layout-panel") ||
             el.classList.contains("fragment") ||
             el.classList.contains(kOutputLocationSlide) ||
             !!el.className.match(/panel-/);
-        })
+        }) ||
+        // Do not autostrech if an aside is used
+        slideEl.querySelectorAll("aside").length !== 0
       ) {
         continue;
       }

src/resources/rmd/execute.R

@@ -418,7 +418,7 @@ html_dependencies_as_string <- function(dependencies, files_dir) {
   dependencies <- lapply(dependencies, function(dependency) {
     dir <- dependency$src$file
     if (!is.null(dir)) {
-      dependency$src$file <- paste(files_dir, basename(dir), sep = "/")
+      dependency$src$file <- gsub("\\\\", "/", paste(files_dir, basename(dir), sep = "/"))
     }
     dependency
   })

tests/docs/reveal/stretch.qmd

@@ -234,4 +234,12 @@ Some content
 plot(cars)
 ```
 
+:::
+
+## With aside on slide  {#aside}
+
+![Caption](https://revealjs.com/images/logo/reveal-black-text.svg)
+
+::: {.aside}
+Something here as an aside
 :::

tests/smoke/render/render-reveal.test.ts

@@ -66,5 +66,6 @@ testRender(input, "revealjs", false, [
     "#custom-divs-caption img.r-stretch",
     "#custom-divs-knitr img.r-stretch",
     "#custom-divs-knitr-caption img.r-stretch",
+    "#aside img.r-stretch",
   ]),
 ]);