merge

Author: cscheid

news/changelog-1.9.md

@@ -4,6 +4,7 @@ All changes included in 1.9:
 
 - ([#13342](https://github.com/quarto-dev/quarto-cli/issues/13342)): Ensure that the `contents` shortcode works inside metadata.
 - ([#13489](https://github.com/quarto-dev/quarto-cli/issues/13489)): Add `mode=plain` option to the `kbd` shortcode to render keyboard shortcuts exactly as written, without OS-specific symbol translation.
+- ([#14061](https://github.com/quarto-dev/quarto-cli/issues/14061)): Fix `meta` shortcode not preserving line breaks in values. The shortcode now respects its usage context (block, inline, or text) and preserves paragraph breaks in block and code block contexts.
 
 ## Regression fixes
 
@@ -51,6 +52,7 @@ All changes included in 1.9:
 - ([#13825](https://github.com/quarto-dev/quarto-cli/issues/13825)): Fix `column: margin` not working with `renderings: [light, dark]` option. Column classes are now preserved when applying theme classes to cell outputs.
 - ([#13883](https://github.com/quarto-dev/quarto-cli/issues/13883)): Fix unequal top/bottom spacing in simple untitled callouts.
 - ([#13900](https://github.com/quarto-dev/quarto-cli/issues/13900)): Warn when `renderings` cell option contains duplicate names. Previously, duplicate names like `[dark, light, dark, light]` would silently use only the last output for each name.
+- ([#14065](https://github.com/quarto-dev/quarto-cli/issues/14065)): Fix `SCSSParsingError` when custom SCSS themes contain non-ASCII characters in selectors (e.g., `#présentation`).
 
 ### `typst`
 
@@ -63,6 +65,7 @@ All changes included in 1.9:
 - ([#13745](https://github.com/quarto-dev/quarto-cli/issues/13745)): Fix relative `font-paths` from extensions or document metadata not resolving correctly for Typst compilation. Relative paths are now resolved against the document directory before being passed to the Typst CLI.
 - ([#13775](https://github.com/quarto-dev/quarto-cli/issues/13775)): Fix brand fonts not being applied when using `citeproc: true` with Typst format. Format detection now properly handles Pandoc format variants like `typst-citations`.
 - ([#13868](https://github.com/quarto-dev/quarto-cli/issues/13868)): Add image alt text support for PDF/UA accessibility. Alt text from markdown captions and explicit `alt` attributes is now passed to Typst's `image()` function. (Temporary workaround until [jgm/pandoc#11394](https://github.com/jgm/pandoc/pull/11394) is merged.)
+- ([#13917](https://github.com/quarto-dev/quarto-cli/issues/13917)): Fix brand logo paths not resolving correctly for Typst documents in project subdirectories. Brand logo paths are now converted to project-absolute paths before merging with document metadata, replacing the fragile `projectOffset()` workaround.
 - ([#13249](https://github.com/quarto-dev/quarto-cli/pull/13249)): Update to Pandoc's Typst template following Pandoc 3.8.3 and Typst 0.14.2 support:
   - Code syntax highlighting now uses Skylighting by default.
   - New template variables `mathfont`, `codefont`, and `linestretch` for font and line spacing customization.
@@ -120,6 +123,7 @@ All changes included in 1.9:
 - ([#13932](https://github.com/quarto-dev/quarto-cli/pull/13932)): Add `llms-txt: true` option to generate LLM-friendly content for websites. Creates `.llms.md` markdown files alongside HTML pages and a root `llms.txt` index file following the [llms.txt](https://llmstxt.org/) specification.
 - ([#13951](https://github.com/quarto-dev/quarto-cli/issues/13951)): Fix `image-lazy-loading` not applying `loading="lazy"` attribute to auto-detected listing images.
 - ([#14003](https://github.com/quarto-dev/quarto-cli/pull/14003)): Add text fragments to search result links so browsers scroll to and highlight the matched text on the target page.
+- ([#9802](https://github.com/quarto-dev/quarto-cli/issues/9802), [#14047](https://github.com/quarto-dev/quarto-cli/issues/14047)): Fix search term highlighting disappearing on page scroll or layout events when navigating from search results. (author: @jtbayly, [#13442](https://github.com/quarto-dev/quarto-cli/pull/13442))
 
 ### `book`
 

src/core/brand/brand.ts

@@ -425,6 +425,45 @@ export function logoAddLeadingSlashes(
   };
 }
 
+// Return a copy of the brand with logo paths converted from project-relative
+// to project-absolute (leading /). Typst resolves these via --root, which
+// points to the project directory. Call this before resolveLogo so that
+// brand-sourced paths get the / prefix while document-sourced paths are
+// left untouched.
+export function brandWithAbsoluteLogoPaths(
+  brand: LightDarkBrand | undefined,
+): LightDarkBrand | undefined {
+  if (!brand) {
+    return brand;
+  }
+  const transformBrand = (b: Brand | undefined): Brand | undefined => {
+    if (!b) return b;
+    const oldLogo = b.processedData.logo;
+    const logo: ProcessedBrandData["logo"] = { images: {} };
+    for (const size of Zod.BrandNamedLogo.options) {
+      if (oldLogo[size]) {
+        logo[size] = {
+          ...oldLogo[size],
+          path: ensureLeadingSlashIfNotExternal(oldLogo[size]!.path),
+        };
+      }
+    }
+    for (const [key, value] of Object.entries(oldLogo.images)) {
+      logo.images[key] = {
+        ...value,
+        path: ensureLeadingSlashIfNotExternal(value.path),
+      };
+    }
+    const copy = Object.create(b) as Brand;
+    copy.processedData = { ...b.processedData, logo };
+    return copy;
+  };
+  return {
+    light: transformBrand(brand.light),
+    dark: transformBrand(brand.dark),
+  };
+}
+
 // this a typst workaround but might as well write it as a proper function
 export function fillLogoPaths(
   brand: LightDarkBrand | undefined,

src/core/sass/add-css-vars.ts

@@ -16,6 +16,16 @@ import { getVariableDependencies } from "./analyzer/get-dependencies.ts";
 
 const { getSassAst } = makeParserModule(parse);
 
+// Reverse the _u<hex>_ encoding applied in parse.ts so that
+// variable names emitted into the CSS vars block match the
+// original SCSS source that Dart Sass compiles against.
+// Non-ASCII codepoints are valid in CSS custom property names since they
+// follow the <ident> production (see spec references in parse.ts).
+const decodeScssName = (name: string) =>
+  name.replace(/_u([0-9a-f]+)_/g, (_, hex: string) =>
+    String.fromCodePoint(parseInt(hex, 16))
+  );
+
 export class SCSSParsingError extends Error {
   constructor(message: string) {
     super(`SCSS Parsing Error: ${message}`);
@@ -38,7 +48,8 @@ export const cssVarsBlock = (scssSource: string) => {
   for (const [dep, _] of deps) {
     const decl = ast.get(dep);
     if (decl.valueType === "color") {
-      output.push(`--quarto-scss-export-${dep}: #{$${dep}};`);
+      const originalName = decodeScssName(dep);
+      output.push(`--quarto-scss-export-${originalName}: #{$${originalName}};`);
     }
   }
   output.push("}");

src/core/sass/analyzer/parse.ts

@@ -41,6 +41,21 @@ export const makeParserModule = (
         "$1: $2",
       );
 
+      // scss-parser's tokenizer only handles ASCII identifier characters.
+      // Non-ASCII codepoints are valid in both CSS and SCSS identifiers:
+      // - CSS Syntax L3 §4.2 defines "ident code point" as including any
+      //   codepoint >= U+0080 (https://www.w3.org/TR/css-syntax-3/#ident-code-point)
+      // - CSS2 grammar includes `nonascii` in `nmstart`/`nmchar` productions
+      //   (https://www.w3.org/TR/CSS2/grammar.html#scanner)
+      // - Sass inherits CSS's <ident-token> grammar for identifiers
+      //   (https://github.com/sass/sass/blob/main/spec/syntax.md)
+      // Dart Sass handles them correctly, so we encode here as ASCII
+      // placeholders for analysis only, then decode in add-css-vars.ts.
+      contents = contents.replaceAll(
+        /[^\x00-\x7F]/g,
+        (ch) => `_u${ch.codePointAt(0)!.toString(16)}_`,
+      );
+
       // This is relatively painful, because unfortunately the error message of scss-parser
       // is not helpful.
 

src/format/typst/format-typst.ts

@@ -37,7 +37,11 @@ import {
   BrandNamedLogo,
   LogoLightDarkSpecifier,
 } from "../../resources/types/schema-types.ts";
-import { fillLogoPaths, resolveLogo } from "../../core/brand/brand.ts";
+import {
+  brandWithAbsoluteLogoPaths,
+  fillLogoPaths,
+  resolveLogo,
+} from "../../core/brand/brand.ts";
 import { LogoLightDarkSpecifierPathOptional } from "../../resources/types/zod/schema-types.ts";
 
 const typstBookExtension: BookExtension = {
@@ -98,6 +102,10 @@ export function typstFormat(): Format {
       }
 
       const brand = format.render.brand;
+      // For Typst, convert brand logo paths to project-absolute (with /)
+      // before merging with document logo metadata. Typst resolves / paths
+      // via --root which points to the project directory.
+      const typstBrand = brandWithAbsoluteLogoPaths(brand);
       const logoSpec = format
         .metadata[kLogo] as LogoLightDarkSpecifierPathOptional;
       const sizeOrder: BrandNamedLogo[] = [
@@ -108,8 +116,8 @@ export function typstFormat(): Format {
       // temporary: if document logo has object or light/dark objects
       // without path, do our own findLogo to add the path
       // typst is the exception not needing path but we'll probably deprecate this
-      const logo = fillLogoPaths(brand, logoSpec, sizeOrder);
-      format.metadata[kLogo] = resolveLogo(brand, logo, sizeOrder);
+      const logo = fillLogoPaths(typstBrand, logoSpec, sizeOrder);
+      format.metadata[kLogo] = resolveLogo(typstBrand, logo, sizeOrder);
       // force columns to wrap and move any 'columns' setting to metadata
       const columns = format.pandoc[kColumns];
       if (columns) {

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

@@ -13530,7 +13530,8 @@ var require_yaml_intelligence_resources = __commonJS({
           schema: "string",
           tags: {
             formats: [
-              "$pdf-all"
+              "$pdf-all",
+              "typst"
             ]
           },
           description: "The contents of an acknowledgments footnote after the document title."
@@ -13859,12 +13860,13 @@ var require_yaml_intelligence_resources = __commonJS({
             formats: [
               "$html-doc",
               "context",
-              "$pdf-all"
+              "$pdf-all",
+              "typst"
             ]
           },
           description: {
             short: "Sets the color of hyperlinks in the document.",
-            long: "For HTML output, sets the CSS `color` property on all links.\n\nFor LaTeX output, The color used for internal links using color options\nallowed by [`xcolor`](https://ctan.org/pkg/xcolor), \nincluding the `dvipsnames`, `svgnames`, and\n`x11names` lists.\n\nFor ConTeXt output, sets the color for both external links and links within the document.\n"
+            long: "For HTML output, sets the CSS `color` property on all links.\n\nFor LaTeX output, The color used for internal links using color options\nallowed by [`xcolor`](https://ctan.org/pkg/xcolor),\nincluding the `dvipsnames`, `svgnames`, and\n`x11names` lists.\n\nFor ConTeXt output, sets the color for both external links and links within the document.\n\nFor Typst output, sets the color of internal hyperlinks using Typst color syntax.\n"
           }
         },
         {
@@ -13898,25 +13900,27 @@ var require_yaml_intelligence_resources = __commonJS({
           schema: "string",
           tags: {
             formats: [
-              "$pdf-all"
+              "$pdf-all",
+              "typst"
             ]
           },
           description: {
-            short: "The color used for external links using color options allowed by `xcolor`",
-            long: "The color used for external links using color options\nallowed by [`xcolor`](https://ctan.org/pkg/xcolor), \nincluding the `dvipsnames`, `svgnames`, and\n`x11names` lists.\n"
+            short: "The color used for external links.",
+            long: "For LaTeX output, the color used for external links using color options\nallowed by [`xcolor`](https://ctan.org/pkg/xcolor),\nincluding the `dvipsnames`, `svgnames`, and\n`x11names` lists.\n\nFor Typst output, sets the color of external file links using Typst color syntax.\n"
           }
         },
         {
           name: "citecolor",
           schema: "string",
           tags: {
             formats: [
-              "$pdf-all"
+              "$pdf-all",
+              "typst"
             ]
           },
           description: {
-            short: "The color used for citation links using color options allowed by `xcolor`",
-            long: "The color used for citation links using color options\nallowed by [`xcolor`](https://ctan.org/pkg/xcolor), \nincluding the `dvipsnames`, `svgnames`, and\n`x11names` lists.\n"
+            short: "The color used for citation links.",
+            long: "For LaTeX output, the color used for citation links using color options\nallowed by [`xcolor`](https://ctan.org/pkg/xcolor),\nincluding the `dvipsnames`, `svgnames`, and\n`x11names` lists.\n\nFor Typst output, sets the color of citation links using Typst color syntax.\n"
           }
         },
         {
@@ -15138,6 +15142,19 @@ var require_yaml_intelligence_resources = __commonJS({
             long: "For HTML output, sets the CSS font-family property on code elements.\n\nFor PowerPoint output, sets the font used for code.\n\nFor LaTeX output, the monospace font family for use with `xelatex` or \n`lualatex`: take the name of any system font, using the\n[`fontspec`](https://ctan.org/pkg/fontspec) package.  \n\nFor ConTeXt output, the monspace font family. Use the name of any \nsystem font. See [ConTeXt Fonts](https://wiki.contextgarden.net/Fonts) for more\ninformation.\n"
           }
         },
+        {
+          name: "codefont",
+          schema: "string",
+          tags: {
+            formats: [
+              "typst"
+            ]
+          },
+          description: {
+            short: "Sets the font used for code in Typst output.",
+            long: "For Typst output, sets the font used for displaying code. Takes\nthe name of any font available to Typst (system fonts or fonts in\ndirectories specified by `font-paths`).\n"
+          }
+        },
         {
           name: "fontsize",
           schema: "string",
@@ -15216,12 +15233,13 @@ var require_yaml_intelligence_resources = __commonJS({
           schema: "string",
           tags: {
             formats: [
-              "$pdf-all"
+              "$pdf-all",
+              "typst"
             ]
           },
           description: {
-            short: "The math font family for use with `xelatex` or `lualatex`.",
-            long: "The math font family for use with `xelatex` or \n`lualatex`. Takes the name of any system font, using the\n[`fontspec`](https://ctan.org/pkg/fontspec) package.\n"
+            short: "The math font family for use with `xelatex`, `lualatex`, or Typst.",
+            long: "For LaTeX output, the math font family for use with `xelatex` or\n`lualatex`. Takes the name of any system font, using the\n[`fontspec`](https://ctan.org/pkg/fontspec) package.\n\nFor Typst output, sets the font used for mathematical content.\n"
           }
         },
         {
@@ -15374,12 +15392,13 @@ var require_yaml_intelligence_resources = __commonJS({
             formats: [
               "$html-doc",
               "context",
-              "$pdf-all"
+              "$pdf-all",
+              "typst"
             ]
           },
           description: {
             short: "Sets the line height or spacing for text in the document.",
-            long: "For HTML output sets the CSS `line-height` property on the html \nelement, which is preferred to be unitless.\n\nFor LaTeX output, adjusts line spacing using the \n[setspace](https://ctan.org/pkg/setspace) package, e.g. 1.25, 1.5.\n"
+            long: "For HTML output sets the CSS `line-height` property on the html\nelement, which is preferred to be unitless.\n\nFor LaTeX output, adjusts line spacing using the\n[setspace](https://ctan.org/pkg/setspace) package, e.g. 1.25, 1.5.\n\nFor Typst output, adjusts the spacing between lines of text.\n"
           }
         },
         {
@@ -23377,6 +23396,11 @@ var require_yaml_intelligence_resources = __commonJS({
         "Write markdown links as references rather than inline.",
         "Unique prefix for references (<code>none</code> to prevent automatic\nprefixes)",
         "Automatically re-render for preview whenever document is saved (note\nthat this requires a preview for the saved document be already running).\nThis option currently works only within VS Code.",
+        {
+          short: "Editor-specific options (used by RStudio and Positron).",
+          long: "Editor-specific options that control IDE behavior for this document.\nThese options are used by RStudio and Positron to configure per-document\neditor settings."
+        },
+        "Determines where chunk output is shown in the editor.",
         "Enable (<code>true</code>) or disable (<code>false</code>) Zotero for\na document. Alternatively, provide a list of one or more Zotero group\nlibraries to use with the document.",
         "The identifier for this publication.",
         "The identifier value.",
@@ -24752,6 +24776,10 @@ var require_yaml_intelligence_resources = __commonJS({
           short: "Visual style for theorem environments in Typst output.",
           long: "Controls how theorems, lemmas, definitions, etc. are rendered: -\n<code>simple</code>: Plain text with bold title and italic body\n(default) - <code>fancy</code>: Colored boxes using brand colors -\n<code>clouds</code>: Rounded colored background boxes -\n<code>rainbow</code>: Colored left border with colored title"
         },
+        {
+          short: "Email format version",
+          long: "Specifies which email format version to use."
+        },
         "Project configuration.",
         "Project type (<code>default</code>, <code>website</code>,\n<code>book</code>, or <code>manuscript</code>)",
         "Files to render (defaults to all files)",
@@ -25106,13 +25134,8 @@ var require_yaml_intelligence_resources = __commonJS({
         "internal-schema-hack",
         "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto\u2019s default order\nis \u2018knitr\u2019, \u2018jupyter\u2019, \u2018markdown\u2019, \u2018julia\u2019.",
         {
-          short: "Editor-specific options (used by RStudio and Positron).",
-          long: "Editor-specific options that control IDE behavior for this document.\nThese options are used by RStudio and Positron to configure per-document\neditor settings."
-        },
-        "Determines where chunk output is shown in the editor.",
-        {
-          short: "Email format version",
-          long: "Specifies which email format version to use."
+          short: "Sets the font used for code in Typst output.",
+          long: "For Typst output, sets the font used for displaying code. Takes the\nname of any font available to Typst (system fonts or fonts in\ndirectories specified by <code>font-paths</code>)."
         }
       ],
       "schema/external-schemas.yml": [
@@ -25343,12 +25366,12 @@ var require_yaml_intelligence_resources = __commonJS({
         mermaid: "%%"
       },
       "handlers/mermaid/schema.yml": {
-        _internalId: 221802,
+        _internalId: 222606,
         type: "object",
         description: "be an object",
         properties: {
           "mermaid-format": {
-            _internalId: 221794,
+            _internalId: 222598,
             type: "enum",
             enum: [
               "png",
@@ -25364,7 +25387,7 @@ var require_yaml_intelligence_resources = __commonJS({
             exhaustiveCompletions: true
           },
           theme: {
-            _internalId: 221801,
+            _internalId: 222605,
             type: "anyOf",
             anyOf: [
               {