Merge branch 'main' into fix/issue11664

Author: mcanouil

news/changelog-1.7.md

@@ -8,6 +8,7 @@ All changes included in 1.7:
 - ([#11580](https://github.com/quarto-dev/quarto-cli/issues/11580)): Fix regression with documents containing `categories` fields that are not strings.
 - ([#11752](https://github.com/quarto-dev/quarto-cli/issues/11752)): Fix regression with non-alphanumeric characters in `categories` preventing correct filtering of listing.
 - ([#11561](https://github.com/quarto-dev/quarto-cli/issues/11561)): Fix a regression with `$border-color` that impacted, callouts borders, tabset borders, and table borders of the defaults themes. `$border-color` is now correctly a mixed of `$body-color` and `$body-bg` even for the default theme.
+- ([#11943](https://github.com/quarto-dev/quarto-cli/issues/11943)): Fix callout title color on dark theme in revealjs following Revealjs update in quarto 1.6.
 
 ## YAML validation
 
@@ -44,6 +45,7 @@ All changes included in 1.7:
 - ([#11578](https://github.com/quarto-dev/quarto-cli/issues/11578)): Typst column layout widths use fractional `fr` units instead of percent `%` units for unitless and default widths in order to fill the enclosing block and not spill outside it.
 - ([#11676](https://github.com/quarto-dev/quarto-cli/pull/11676)): Convert unitless image widths from pixels to inches for column layouts.
 - ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
+- ([#11964](https://github.com/quarto-dev/quarto-cli/issues/11964)): Using panel layout without a crossref label now correctly do not add an empty `#block[]` that was leading to an unnecessary space in output.
 
 ## Lua Filters and extensions
 

package/src/common/cyclic-dependencies.ts

@@ -11,7 +11,7 @@ import { runCmd } from "../util/cmd.ts";
 import { Configuration, readConfiguration } from "./config.ts";
 import { error, info } from "../../../src/deno_ral/log.ts";
 import { progressBar } from "../../../src/core/console.ts";
-import { md5Hash } from "../../../src/core/hash.ts";
+import { md5HashSync } from "../../../src/core/hash.ts";
 
 export function cycleDependenciesCommand() {
   return new Command()
@@ -186,7 +186,7 @@ function findCyclicDependencies(
   // creates a hash for a set of paths (a cycle)
   const hash = (paths: string[]) => {
     const string = paths.join(" ");
-    return md5Hash(string);
+    return md5HashSync(string);
   };
 
   // The current import stack

package/src/common/patches/revealjs-theme-0001-dracula.patch

@@ -1,8 +1,8 @@
 diff --git a/src/resources/formats/revealjs/themes/dracula.scss b/src/resources/formats/revealjs/themes/dracula.scss
-index 5330fbc1b..45498dd41 100644
+index 5330fbc1b..fe068d9a8 100644
 --- a/src/resources/formats/revealjs/themes/dracula.scss
 +++ b/src/resources/formats/revealjs/themes/dracula.scss
-@@ -1,106 +1,88 @@
+@@ -1,106 +1,90 @@
  /**
   * Dracula Dark theme for reveal.js.
   * Based on https://draculatheme.com
@@ -151,7 +151,9 @@ index 5330fbc1b..45498dd41 100644
 -	}
 +  strong,
 +  b {
-+    color: var(--r-bold-color);
++    &:not(.callout-title strong, .callout-tile b) {
++      color: var(--r-bold-color);
++    }
 +  }
 +  em,
 +  i,

package/src/common/update-html-dependencies.ts

@@ -1123,7 +1123,9 @@ async function updateGithubSourceCodeDependency(
     await unzip(zipFile, working);
 
     await onDownload(working, version);
-    if (patches) await applyGitPatches(patches);
+    if (patches) {
+      await applyGitPatches(patches);
+    }
   } else {
     throw new Error(`${versionEnvVar} is not defined`);
   }

src/command/preview/cmd.ts

@@ -278,7 +278,7 @@ export const previewCommand = new Command()
       // get project and preview format
       const nbContext = notebookContext();
       const project = (await projectContext(dirname(file), nbContext)) ||
-        singleFileProjectContext(file, nbContext);
+        (await singleFileProjectContext(file, nbContext));
       const formats = await (async () => {
         const services = renderServices(nbContext);
         try {

src/command/preview/preview.ts

@@ -373,7 +373,7 @@ export async function previewFormat(
     return format;
   }
   const nbContext = notebookContext();
-  project = project || singleFileProjectContext(file, nbContext);
+  project = project || (await singleFileProjectContext(file, nbContext));
   formats = formats ||
     await withRenderServices(
       nbContext,
@@ -485,6 +485,8 @@ export async function renderForPreview(
     [],
   ));
 
+  renderResult.context.cleanup();
+
   return {
     file,
     format: renderResult.files[0].format,

src/command/publish/cmd.ts

@@ -339,7 +339,7 @@ async function createPublishOptions(
 
   // check for directory (either website or single-file project)
   const project = (await projectContext(path, nbContext)) ||
-    singleFileProjectContext(path, nbContext);
+    (await singleFileProjectContext(path, nbContext));
   if (Deno.statSync(path).isDirectory) {
     if (projectIsWebsite(project)) {
       input = project;

src/command/render/cmd.ts

@@ -245,6 +245,9 @@ export const renderCommand = new Command()
         const services = renderServices(notebookContext());
         try {
           renderResultInput = relative(Deno.cwd(), walk.path) || ".";
+          if (renderResult) {
+            renderResult.context.cleanup();
+          }
           renderResult = await render(renderResultInput, {
             services,
             flags,
@@ -255,6 +258,7 @@ export const renderCommand = new Command()
 
           // check for error
           if (renderResult.error) {
+            renderResult.context.cleanup();
             throw renderResult.error;
           }
         } finally {
@@ -275,6 +279,10 @@ export const renderCommand = new Command()
         if (finalOutput) {
           info("Output created: " + finalOutput + "\n");
         }
+
+        if (renderResult) {
+          renderResult.context.cleanup();
+        }
       }
     } else {
       throw new Error(`No valid input files passed to render`);

src/command/render/defaults.ts

@@ -39,9 +39,12 @@ export async function generateDefaults(
   let allDefaults: FormatPandoc | undefined;
 
   if (options.format.pandoc) {
-    allDefaults = (options.format.pandoc
-      ? ld.cloneDeep(options.format.pandoc)
-      : {}) as FormatPandoc;
+    allDefaults = {
+      ...(options.format.pandoc || {}),
+      variables: {
+        ...(options.format.pandoc?.variables || {}),
+      },
+    } as FormatPandoc;
 
     // resolve filters
     const resolvedFilters = await resolveFilters(

src/command/render/filters.ts

@@ -713,6 +713,7 @@ function initFilterParams(dependenciesFile: string) {
 const kQuartoFilterMarker = "quarto";
 const kQuartoCiteProcMarker = "citeproc";
 
+// NB: this mutates `pandoc.citeproc`
 export async function resolveFilters(
   filters: QuartoFilter[],
   options: PandocOptions,