Merge pull request #13777 from quarto-dev/fix/issue-13775

Author: cderv

news/changelog-1.9.md

@@ -39,6 +39,7 @@ All changes included in 1.9:
 - ([#13555](https://github.com/quarto-dev/quarto-cli/issues/13555)): Add support for `icon=false` in callouts when used in `format: typst`.
 - ([#13589](https://github.com/quarto-dev/quarto-cli/issues/13589)): Fix callouts with invalid ID prefixes crashing with "attempt to index a nil value". Callouts with unknown reference types now render as non-crossreferenceable callouts with a warning, ignoring the invalid ID.
 - ([#13602](https://github.com/quarto-dev/quarto-cli/issues/13602)): Fix support for multiple files set in `bibliography` field in `biblio.typ` template partial.
+- ([#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`.
 
 ### `pdf`
 

src/command/render/output-tex.ts

@@ -11,7 +11,12 @@ import { writeFileToStdout } from "../../core/console.ts";
 import { dirAndStem, expandPath } from "../../core/path.ts";
 import { texSafeFilename } from "../../core/tex.ts";
 
-import { kKeepTex, kOutputExt, kOutputFile } from "../../config/constants.ts";
+import {
+  kKeepTex,
+  kOutputExt,
+  kOutputFile,
+  kTargetFormat,
+} from "../../config/constants.ts";
 import { Format } from "../../config/types.ts";
 
 import { PandocOptions, RenderFlags, RenderOptions } from "./types.ts";
@@ -49,8 +54,8 @@ export function texToPdfOutputRecipe(
   // include variants in the tex stem if they are present to avoid
   // overwriting files
   let fixupInputName = "";
-  if (format.identifier["target-format"]) {
-    const formatDesc = parseFormatString(format.identifier["target-format"]);
+  if (format.identifier[kTargetFormat]) {
+    const formatDesc = parseFormatString(format.identifier[kTargetFormat]);
     fixupInputName = `${formatDesc.variants.join("")}${
       formatDesc.modifiers.join("")
     }`;

src/config/format.ts

@@ -10,51 +10,42 @@ import { Format, FormatPandoc } from "./types.ts";
 export function isPdfOutput(format: string): boolean;
 export function isPdfOutput(format: FormatPandoc): boolean;
 export function isPdfOutput(format: string | FormatPandoc): boolean {
-  if (typeof (format) !== "string") {
-    format = format?.to || "html";
-  }
-  return format === "pdf" || format === "beamer";
+  return isFormatTo(format, "pdf") || isFormatTo(format, "beamer");
 }
 
 export function isLatexOutput(format: FormatPandoc) {
-  return ["pdf", "latex", "beamer"].includes(format.to || "");
+  return ["pdf", "latex", "beamer"].some((fmt) => isFormatTo(format, fmt));
 }
 
 export function isTypstOutput(format: string): boolean;
 export function isTypstOutput(format: FormatPandoc): boolean;
 export function isTypstOutput(format: string | FormatPandoc) {
-  if (typeof (format) !== "string") {
-    format = format?.to || "html";
-  }
-  return format === "typst";
+  return isFormatTo(format, "typst");
 }
 
 export function isBeamerOutput(format: FormatPandoc) {
-  return ["beamer"].includes(format.to || "");
+  return isFormatTo(format, "beamer");
 }
 
 export function isEpubOutput(format: string): boolean;
 export function isEpubOutput(format: FormatPandoc): boolean;
 export function isEpubOutput(format: string | FormatPandoc): boolean {
-  if (typeof (format) !== "string") {
+  if (typeof format !== "string") {
     format = format?.to || "html";
   }
-  return ["epub", "epub2", "epub3"].includes(format || "");
+  return ["epub", "epub2", "epub3"].some((fmt) => isFormatTo(format, fmt));
 }
 
 export function isDocxOutput(format: string): boolean;
 export function isDocxOutput(format: FormatPandoc): boolean;
 export function isDocxOutput(format: string | FormatPandoc): boolean {
-  if (typeof (format) !== "string") {
-    format = format?.to || "html";
-  }
-  return format === "docx";
+  return isFormatTo(format, "docx");
 }
 
 export function isHtmlFileOutput(format: string): boolean;
 export function isHtmlFileOutput(format: FormatPandoc): boolean;
 export function isHtmlFileOutput(format?: string | FormatPandoc): boolean {
-  if (typeof (format) !== "string") {
+  if (typeof format !== "string") {
     format = format?.to || "html";
   }
   return isHtmlDocOutput(format) || isHtmlSlideOutput(format);
@@ -66,7 +57,7 @@ export function isHtmlOutput(
   format?: string | FormatPandoc,
   strict?: boolean,
 ): boolean {
-  if (typeof (format) !== "string") {
+  if (typeof format !== "string") {
     format = format?.to;
   }
   format = format || "html";
@@ -81,36 +72,26 @@ export function isHtmlOutput(
   }
 }
 
-export function isHtmlDocOutput(format?: string | FormatPandoc) {
-  if (typeof (format) !== "string") {
-    format = format?.to || "html";
-  }
-  return [
-    "html",
-    "html4",
-    "html5",
-  ].includes(format);
+export function isHtmlDocOutput(format: string | FormatPandoc) {
+  return ["html", "html4", "html5"].some((fmt) => isFormatTo(format, fmt));
 }
 
-export function isHtmlSlideOutput(format?: string | FormatPandoc) {
-  if (typeof (format) !== "string") {
-    format = format?.to || "html";
-  }
+export function isHtmlSlideOutput(format: string | FormatPandoc) {
   return [
     "s5",
     "dzslides",
     "slidy",
     "slideous",
     "revealjs",
-  ].includes(format);
+  ].some((fmt) => isFormatTo(format, fmt));
 }
 
 export function isHtmlDashboardOutput(format?: string) {
   return format === "dashboard" || format?.endsWith("-dashboard");
 }
 
 export function isJatsOutput(format?: string | FormatPandoc) {
-  if (typeof (format) !== "string") {
+  if (typeof format !== "string") {
     format = format?.to || "html";
   }
 
@@ -136,7 +117,7 @@ export function isPresentationOutput(format: FormatPandoc) {
 export function isRevealjsOutput(format: string): boolean;
 export function isRevealjsOutput(format: FormatPandoc): boolean;
 export function isRevealjsOutput(format?: string | FormatPandoc) {
-  if (typeof (format) !== "string") {
+  if (typeof format !== "string") {
     format = format?.to;
   }
   format = format || "html";
@@ -159,8 +140,11 @@ export function isIpynbOutput(format: FormatPandoc) {
   return isFormatTo(format, "ipynb");
 }
 
-function isFormatTo(format: FormatPandoc, to: string) {
-  return !!format.to && format.to.startsWith(to);
+function isFormatTo(format: string | FormatPandoc, to: string) {
+  const formatStr = typeof format === "string"
+    ? format
+    : (format?.to || "html");
+  return formatStr.startsWith(to);
 }
 
 export function isMarkdownOutput(

tests/docs/smoke-all/2025/12/09/.gitignore

@@ -0,0 +1,2 @@
+.quarto/
+*_files/

tests/docs/smoke-all/2025/12/09/13775-beamer-variants.qmd

@@ -0,0 +1,54 @@
+---
+title: "Test"
+format: 
+  beamer:
+    variant: -smart
+    # this is is needed to not triggered pdf recipe
+    output-ext: tex
+  beamer+without: 
+    # this is is needed to not triggered pdf recipe
+    output-ext: tex
+  beamer-smart: 
+    # this is is needed to not triggered pdf recipe
+    output-ext: tex
+_quarto:
+  tests:
+    beamer:
+      ensureFileRegexMatches:
+        - []
+        - 
+          # beamer should be detected and not trigger colorlinks by default
+          - 'linkcolor=\{blue\}'
+          - "``marks''"
+          - "`here'"
+      printsMessage:
+        level: INFO
+        regex: "to: beamer-smart\n" 
+    beamer-smart:
+      ensureFileRegexMatches:
+        - []
+        - 
+          # beamer should be detected and not trigger colorlinks by default
+          - 'linkcolor=\{blue\}'
+          # setting extensions to format works
+          - "``marks''"
+          - "`here'"
+      printsMessage:
+        level: INFO
+        regex: "to: beamer-smart\n"  
+    beamer+without:
+      ensureFileRegexMatches:
+        - 
+          - "``marks''"
+          - "`here'"
+        - 
+          - 'linkcolor=\{blue\}'
+      printsMessage:
+        level: INFO
+        regex: "to: beamer\n"
+---
+
+## Quarto
+
+
+Test the quotation "marks" here and 'here'.

tests/docs/smoke-all/2025/12/09/13775-brand-typst-citeproc.qmd

@@ -0,0 +1,22 @@
+---
+title: brand font not handled
+format: typst
+brand: 
+  typography: 
+    fonts:
+      - family: Sarabun
+        source: google
+    base:
+      family: Sarabun
+      size: 12pt
+citeproc: true
+_quarto:
+  tests: 
+    typst:
+      printsMessage:
+        level: INFO
+        regex: 'warning: unknown font family: sarabun'
+        negate: true
+---
+
+Content using Sarabun font.

tests/docs/smoke-all/2025/12/09/13775-html-variants.qmd

@@ -0,0 +1,56 @@
+---
+title: "Test variants are detected for HTML specific feature"
+format: 
+  html: 
+    variant: +literate_haskell
+  html+without: 
+    output-file: without
+  html+literate_haskell: 
+    output-file: with_ext
+reference-location: margin
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - 
+          - 'div.column-margin div#fn1' # this prove `isHtmlDocOutput()` is working
+        - []
+      printsMessage:
+        level: INFO
+        regex: "to: html\\+literate\\_haskell\n" 
+    html+literate_haskell:
+      ensureHtmlElements:
+        - 
+          - 'div.column-margin div#fn1' # this prove `isHtmlDocOutput()` is working
+        - []
+      printsMessage:
+        level: INFO
+        regex: "to: html\\+literate\\_haskell\n"  
+    html+without:
+      ensureHtmlElements:
+        - 
+          - 'div.column-margin div#fn1' # this prove `isHtmlDocOutput()` is working
+          - 'pre.sourceCode.haskell'
+        - ['pre.sourceCode.literatehaskell']
+      printsMessage:
+        level: INFO
+        regex: "to: html\n"
+---
+
+This documents tests that `isHtmlDocOutput()` is correctly detecting HTML even if there is a variant by checking some basic article layout feature are correctly working.
+
+## Ref in margin should work
+
+This is a reference[^1]
+
+[^1]: This is the footnote text.
+
+## see if extension is working (literate_haskell)
+
+This is just to see if setting variants works correctly in Quarto
+                    
+````{.haskell .literate}
+unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
+unsplit = arr . uncurry
+          -- arr (\op (x,y) -> x `op` y)
+````

tests/docs/smoke-all/2025/12/09/13775-latex-variants.qmd

@@ -0,0 +1,47 @@
+---
+title: "Test"
+format: 
+  latex:
+    variant: -smart
+  latex+without: default
+  latex-smart: default
+_quarto:
+  tests:
+    latex:
+      ensureFileRegexMatches:
+        - 
+         - 'linkcolor=\{blue\}'
+        - 
+          # setting extensions to format works
+          - "``marks''"
+          - "`here'"
+      printsMessage:
+        level: INFO
+        regex: "to: latex-smart\n" 
+    latex-smart:
+      ensureFileRegexMatches:
+        - 
+         - 'linkcolor=\{blue\}'
+        - 
+          # setting extensions to format works
+          - "``marks''"
+          - "`here'"
+      printsMessage:
+        level: INFO
+        regex: "to: latex-smart\n"  
+    latex+without:
+      ensureFileRegexMatches:
+        - 
+          - 'linkcolor=\{blue\}'
+          - "``marks''"
+          - "`here'"
+        - []
+      printsMessage:
+        level: INFO
+        regex: "to: latex\n"
+---
+
+## Quarto
+
+
+Test the quotation "marks" here and 'here'.