Merge branch 'main' into fix/issue13216

Author: cderv

news/changelog-1.6.md

@@ -2,7 +2,7 @@ All changes included in 1.6:
 
 ## Breaking changes
 
-- The syntax for standard library imports in `quarto run` TypeScript files (`*.ts`) changed. Please see <https://prerelease.quarto.org/docs/projects/scripts.html#deno-scripts> for how to make the necessary changes.
+- The syntax for standard library imports in `quarto run` TypeScript files (`*.ts`) changed. Please see <https://quarto.org/docs/projects/scripts.html#deno-scripts> for how to make the necessary changes.
 
 ## Shortcodes
 

news/changelog-1.8.md

@@ -20,6 +20,7 @@ All changes included in 1.8:
 - ([#726](https://github.com/quarto-dev/quarto-cli/issues/726)): a11y - Provide `.screen-reader-only` callout type when callout text doesn't naturally include the type.
 - ([#5538](https://github.com/quarto-dev/quarto-cli/issues/5538)): Fix code-copy button style so that scrolling behaves properly.
 - ([#5879](https://github.com/quarto-dev/quarto-cli/issues/5879)): Improve font rendering of `kbd` shortcode on macOS. `kbd` will now also be stricter in converting keyboard shortcuts to macOS icons.
+- ([#8568](https://github.com/quarto-dev/quarto-cli/issues/8568)) Default inline code background color to the code block background color if not specified; foreground color is `$pre-color` in dark mode and (remains) purple in light mode.
 - ([#10983](https://github.com/quarto-dev/quarto-cli/issues/10983)): Fix spacing inconsistency between paras and first section headings.
 - ([#12259](https://github.com/quarto-dev/quarto-cli/issues/12259)): Fix conflict between `html-math-method: katex` and crossref popups (author: @benkeks).
 - ([#12341](https://github.com/quarto-dev/quarto-cli/issues/12341)): Enable light and dark logos for html formats (sidebar, navbar, dashboard).
@@ -66,6 +67,7 @@ All changes included in 1.8:
 
 ### `website`
 
+- ([#10284](https://github.com/quarto-dev/quarto-cli/issues/10284)): a11y - Fix keyboard navigation for tabset panels when using an HTML theme. Tabs now properly receive keyboard focus.
 - ([#12551](https://github.com/quarto-dev/quarto-cli/pull/12551)): Improve warning issued when `aliases` would overwrite an existing document.
 - ([#12616](https://github.com/quarto-dev/quarto-cli/issues/12616)): find SVG images in image discovery for listings.
 - ([#12693](https://github.com/quarto-dev/quarto-cli/issues/12693)): Prevent resource exhaustion on large websites by serializing `NotebookContext` information to file instead of the environment.
@@ -75,12 +77,15 @@ All changes included in 1.8:
 
 - ([#12615](https://github.com/quarto-dev/quarto-cli/pull/12615)): Adds `algorithm` to theorem environments. (author: @jeremy9959)
 
-## Lua Filters
+## Lua Filters and API
 
+- ([#11750](https://github.com/quarto-dev/quarto-cli/pull/11750)): Extend filter path resolution to support `at`/`path` filters from extensions.
 - ([#12727](https://github.com/quarto-dev/quarto-cli/issues/12727)): Do not crash in the presence of malformed tabset contents.
 - ([#12806](https://github.com/quarto-dev/quarto-cli/pull/12806)): Use pandoc APIs to handle codepage conversion on Windows.
 - ([#12811](https://github.com/quarto-dev/quarto-cli/pull/12811)): Add support for YouTube Shorts in `video` shortcode.
-- ([#13128](https://github.com/quarto-dev/quarto-cli/issues/13128)): Meta shortcode could crash on bad input.
+- ([#13112](https://github.com/quarto-dev/quarto-cli/pull/13112)): Add `quarto.format.format_identifier()` API entry.
+- ([#13128](https://github.com/quarto-dev/quarto-cli/issues/13128)): Avoid meta shortcode crash on bad input.
+- ([#13246](https://github.com/quarto-dev/quarto-cli/pull/13246)): Add `quarto.variables.get()` and `quarto.metadata.get()` APIs.
 
 ## Commands
 
@@ -108,7 +113,7 @@ All changes included in 1.8:
 
 - ([#12753](https://github.com/quarto-dev/quarto-cli/issues/12753)): Support change in IPython 9+ and import `set_matplotlib_formats` from `matplotlib_inline.backend_inline` in the internal `setup.py` script used to initialize rendering with Jupyter engine.
 - ([#12839](https://github.com/quarto-dev/quarto-cli/issues/12839)): Support for `plotly.py` 6+ which now loads plotly.js using a cdn in script as a module.
-- ([#13026](https://github.com/quarto-dev/quarto-cli/pulls/13026), [#13151](https://github.com/quarto-dev/quarto-cli/pulls/13151)), [#13184](https://github.com/quarto-dev/quarto-cli/pull/13184): Use `jsdelivr` CDN for jupyter widgets dependencies.
+- ([#13026](https://github.com/quarto-dev/quarto-cli/pull/13026), [#13151](https://github.com/quarto-dev/quarto-cli/pull/13151)), [#13184](https://github.com/quarto-dev/quarto-cli/pull/13184): Use `jsdelivr` CDN for jupyter widgets dependencies.
 
 ### `knitr`
 
@@ -118,10 +123,24 @@ All changes included in 1.8:
 
 - ([#12870](https://github.com/quarto-dev/quarto-cli/pull/12870)): Update `julia` engine from `0.17.0` to `0.17.3` to improve `juliaup` detection on Windows systems and correctly set `Base.source_path()` output to match REPL and script usage.
 
+## Languages
+
+- ([#13098](https://github.com/quarto-dev/quarto-cli/pull/13098)): Fox a minor inappropriate phrasing in the Chinese localization of `environment-proof-title` (@sun123xyz).
+
 ## Other fixes and improvements
 
 - ([#11321](https://github.com/quarto-dev/quarto-cli/issues/11321)): Follow [recommendation from LaTeX project](https://latex-project.org/news/latex2e-news/ltnews40.pdf) and use `lualatex` instead of `xelatex` as the default PDF engine.
 - ([#12782](https://github.com/quarto-dev/quarto-cli/pull/12782)): fix bug on `safeRemoveDirSync`'s detection of safe directory boundaries.
 - ([#12853](https://github.com/quarto-dev/quarto-cli/issues/12853)): fix replaceAll() escaping issue with embedded notebooks containing `$` in their Markdown.
 - ([#12939](https://github.com/quarto-dev/quarto-cli/pull/12939)): Upgrade `mermaidjs` to 11.6.0.
+- ([#13031](https://github.com/quarto-dev/quarto-cli/pull/13031)): Add `.quarto_ipynb` files to `.gitignore` by default.
+- ([#13085](https://github.com/quarto-dev/quarto-cli/pull/13085)): Avoid `kbd` shortcode crashes on unknown OS keys.
+- ([#13164](https://github.com/quarto-dev/quarto-cli/pull/13164)): add `julia` to execute schema to allow autocomplete suggestions. (@mcanouil)
+- ([#13121](https://github.com/quarto-dev/quarto-cli/issues/13121)): Allow `contents` shortcode to find inline elements.
 - ([#13216](https://github.com/quarto-dev/quarto-cli/issues/13216)): Properly disable `downlit` (`code-link`) and enable `code-annotations` when non-R code blocks are present.
+
+
+## Quarto Internals
+
+- ([#13155](https://github.com/quarto-dev/quarto-cli/pull/13155)): Process `pandoc-reader-FORMAT` raw blocks through `pandoc.read(FORMAT)`.
+- ([#13255](https://github.com/quarto-dev/quarto-cli/pull/13255)): Move some Lua code to use Pandoc's Lua API.

src/command/render/filters.ts

@@ -851,19 +851,28 @@ async function resolveFilterExtension(
   // Resolve any filters that are provided by an extension
   const results: (QuartoFilter | QuartoFilter[])[] = [];
   const getFilter = async (filter: QuartoFilter) => {
-    // Look for extension names in the filter list and result them
+    // Look for extension names in the filter list and resolve them
     // into the filters provided by the extension
-    if (
-      filter !== kQuartoFilterMarker && filter !== kQuartoCiteProcMarker &&
-      typeof filter === "string"
-    ) {
+    if (filter === kQuartoFilterMarker || filter === kQuartoCiteProcMarker) {
+      return filter;
+    }
+
+    let pathToResolve: string | null = null;
+    
+    if (typeof filter === "string") {
+      pathToResolve = filter;
+    } else if (typeof filter === "object" && filter.path) {
+      pathToResolve = filter.path;
+    }
+
+    if (pathToResolve) {
       // The filter string points to an executable file which exists
-      if (existsSync(filter) && !Deno.statSync(filter).isDirectory) {
+      if (existsSync(pathToResolve) && !Deno.statSync(pathToResolve).isDirectory) {
         return filter;
       }
 
       const extensions = await options.services.extension?.find(
-        filter,
+        pathToResolve,
         options.source,
         "filters",
         options.project?.config,
@@ -873,15 +882,35 @@ async function resolveFilterExtension(
       // Filter this list of extensions
       const filteredExtensions = filterExtensions(
         extensions || [],
-        filter,
+        pathToResolve,
         "filter",
       );
       // Return any contributed plugins
       if (filteredExtensions.length > 0) {
         // This matches an extension, use the contributed filters
-        const filters = extensions[0].contributes.filters;
-        if (filters) {
-          return filters;
+        const extensionFilters = extensions[0].contributes.filters;
+        if (extensionFilters) {
+          // After "path" resolution, "at" needs to be preserved
+          if (typeof filter === "string") {
+            return extensionFilters;
+          } else if (isFilterEntryPoint(filter)) {
+            return extensionFilters.map(extFilter => {
+              if (typeof extFilter === "string") {
+                return {
+                  type: extFilter.endsWith(".lua") ? "lua" : "json" as "lua" | "json",
+                  path: extFilter,
+                  at: filter.at
+                };
+              } else {
+                return {
+                  ...extFilter,
+                  at: filter.at
+                };
+              }
+            });
+          } else {
+            return extensionFilters;
+          }
         } else {
           return filter;
         }

src/extension/extension.ts

@@ -17,6 +17,7 @@ import {
 } from "../project/types.ts";
 
 import {
+  basename,
   dirname,
   isAbsolute,
   join,
@@ -158,7 +159,10 @@ export function projectExtensionPathResolver(
   return (href: string, projectOffset: string) => {
     const projectRelativeHref = relative(projectOffset, href);
 
-    if (projectRelativeHref.startsWith("_extensions/") || projectRelativeHref.startsWith("_extensions\\")) {
+    if (
+      projectRelativeHref.startsWith("_extensions/") ||
+      projectRelativeHref.startsWith("_extensions\\")
+    ) {
       const projectTargetHref = projectRelativeHref.replace(
         /^_extensions/,
         `${libDir}/quarto-contrib/quarto-project`,
@@ -809,10 +813,17 @@ async function readExtension(
         );
         if (resolved.include.length > 0) {
           if (key === "brand") {
-            (object.project as Record<string, unknown>)[key] = relative(
-              join(extensionDir, "..", ".."),
-              resolved.include[0],
-            );
+            let projectDir = extensionDir, last;
+            do {
+              last = basename(projectDir);
+              projectDir = dirname(projectDir);
+            } while (projectDir && last !== "_extensions");
+            if (projectDir) {
+              (object.project as Record<string, unknown>)[key] = relative(
+                projectDir,
+                resolved.include[0],
+              );
+            }
           } else {
             (object.project as Record<string, unknown>)[key] = resolved.include;
           }

src/project/project-gitignore.ts

@@ -15,7 +15,7 @@ import { lines } from "../core/text.ts";
 import { isEnvDir } from "../core/jupyter/capabilities.ts";
 import { isWindows } from "../deno_ral/platform.ts";
 
-export const kQuartoIgnore = [`/${kQuartoScratch}/`];
+export const kQuartoIgnore = [`/${kQuartoScratch}/`, `**/*.quarto_ipynb`];
 
 export async function ensureGitignore(
   dir: string,

src/resources/editor/tools/vs-code.mjs

@@ -13050,6 +13050,22 @@ var require_yaml_intelligence_resources = __commonJS({
             }
           }
         },
+        {
+          id: "brand-path-only-light-dark",
+          anyOf: [
+            "string",
+            {
+              object: {
+                closed: true,
+                properties: {
+                  light: "string",
+                  dark: "string"
+                }
+              }
+            }
+          ],
+          description: "A path to a brand.yml file, or an object with light and dark paths to brand.yml\n"
+        },
         {
           id: "brand-path-bool-light-dark",
           anyOf: [
@@ -14602,7 +14618,8 @@ var require_yaml_intelligence_resources = __commonJS({
             string: {
               completions: [
                 "jupyter",
-                "knitr"
+                "knitr",
+                "julia"
               ]
             }
           },
@@ -20452,9 +20469,9 @@ var require_yaml_intelligence_resources = __commonJS({
                 },
                 brand: {
                   schema: {
-                    ref: "brand-path-bool-light-dark"
+                    ref: "brand-path-only-light-dark"
                   },
-                  description: "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition, or an object with light and dark brand paths or definitions.\n"
+                  description: "Path to brand.yml or object with light and dark paths to brand.yml\n"
                 },
                 preview: {
                   description: "Options for `quarto preview`",
@@ -22594,6 +22611,7 @@ var require_yaml_intelligence_resources = __commonJS({
         "The font files to include. These can be local or online. Local file\npaths should be relative to the <code>brand.yml</code> file. Online\npaths should be complete URLs.",
         "The path to the font file. This can be a local path or a URL.",
         "A locally-installed font family name. When used, the end-user is\nresponsible for ensuring that the font is installed on their system.",
+        "A path to a brand.yml file, or an object with light and dark paths to\nbrand.yml",
         "Branding information to use for this document. If a string, the path\nto a brand file. If false, don\u2019t use branding on this document. If an\nobject, an inline (unified) brand definition, or an object with light\nand dark brand paths or definitions.",
         "The path to a light brand file or an inline light brand\ndefinition.",
         "The path to a dark brand file or an inline dark brand definition.",
@@ -23995,6 +24013,7 @@ var require_yaml_intelligence_resources = __commonJS({
         "HTML library (JS/CSS/etc.) directory",
         "Additional file resources to be copied to output directory",
         "Additional file resources to be copied to output directory",
+        "Path to brand.yml or object with light and dark paths to\nbrand.yml",
         "Options for <code>quarto preview</code>",
         "Scripts to run as a pre-render step",
         "Scripts to run as a post-render step",
@@ -24344,6 +24363,7 @@ var require_yaml_intelligence_resources = __commonJS({
         "HTML library (JS/CSS/etc.) directory",
         "Additional file resources to be copied to output directory",
         "Additional file resources to be copied to output directory",
+        "Path to brand.yml or object with light and dark paths to\nbrand.yml",
         "Options for <code>quarto preview</code>",
         "Scripts to run as a pre-render step",
         "Scripts to run as a post-render step",
@@ -24907,12 +24927,12 @@ var require_yaml_intelligence_resources = __commonJS({
         mermaid: "%%"
       },
       "handlers/mermaid/schema.yml": {
-        _internalId: 197505,
+        _internalId: 197539,
         type: "object",
         description: "be an object",
         properties: {
           "mermaid-format": {
-            _internalId: 197497,
+            _internalId: 197531,
             type: "enum",
             enum: [
               "png",
@@ -24928,7 +24948,7 @@ var require_yaml_intelligence_resources = __commonJS({
             exhaustiveCompletions: true
           },
           theme: {
-            _internalId: 197504,
+            _internalId: 197538,
             type: "anyOf",
             anyOf: [
               {