claude: fix typst brand logo paths for subdirectory documents (#13917)

Transform brand logo paths to project-absolute (with / prefix) before
merging with document logo metadata via resolveLogo. This ensures brand
paths resolve correctly via Typst --root while document-sourced paths
remain input-relative.

Closes #13917.

Removes the projectOffset() hack from typst-brand-yaml.lua that was
indiscriminately prepending ../ to all logo paths.

Co-Authored-By: Claude Opus 4.6 <[email protected]>

Author: gordonwoodhull

news/changelog-1.9.md

@@ -64,6 +64,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.

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/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/filters/quarto-post/typst-brand-yaml.lua

@@ -328,10 +328,6 @@ function render_typst_brand_yaml()
           imageFilename = imageFilename and imageFilename:gsub('\\_', '_')
         else
           -- backslashes need to be doubled for Windows
-          if imageFilename[1] ~= "/" and _quarto.projectOffset() ~= "." then
-            local offset = _quarto.projectOffset()
-            imageFilename = pandoc.path.join({offset, imageFilename})
-          end
           imageFilename = string.gsub(imageFilename, '\\', '\\\\')
         end
         logoOptions.path = pandoc.RawInline('typst', imageFilename)

tests/docs/smoke-all/typst/logo-path/from-brand/.gitignore

@@ -0,0 +1,4 @@
+/.quarto/
+*.pdf
+
+**/*.quarto_ipynb

tests/docs/smoke-all/typst/logo-path/from-brand/_brand.yml

@@ -0,0 +1,5 @@
+logo:
+  images:
+    main:
+      path: logo.svg
+  small: main

tests/docs/smoke-all/typst/logo-path/from-brand/_quarto.yml

@@ -0,0 +1,4 @@
+project:
+  type: default
+format:
+  typst: default

tests/docs/smoke-all/typst/logo-path/from-brand/logo.svg

@@ -0,0 +1,16 @@
+---
+title: "Logo from _brand.yml in subdirectory"
+format:
+  typst:
+    keep-typ: true
+_quarto:
+  tests:
+    typst:
+      ensureTypstFileRegexMatches:
+      -
+        - 'image\("/logo\.svg"'
+      -
+        - 'image\("\.\./\.\./logo\.svg"'
+---
+
+Hello world.

tests/docs/smoke-all/typst/logo-path/from-brand/sub/doc.qmd

@@ -0,0 +1,4 @@
+/.quarto/
+*.pdf
+
+**/*.quarto_ipynb