Merge branch 'main' into create/file-permissions

Author: cderv

news/changelog-1.10.md

@@ -1,5 +1,11 @@
 All changes included in 1.10:
 
+## Formats
+
+### `typst`
+
+- ([#14261](https://github.com/quarto-dev/quarto-cli/issues/14261)): Fix theorem/example block titles containing inline code producing invalid Typst markup when syntax highlighting is applied.
+
 ## Commands
 
 ### `quarto create`

src/quarto.ts

@@ -196,13 +196,6 @@ export async function quarto(
 
   try {
     await promise;
-    for (const [key, value] of Object.entries(oldEnv)) {
-      if (value === undefined) {
-        Deno.env.delete(key);
-      } else {
-        Deno.env.set(key, value);
-      }
-    }
     if (commandFailed()) {
       exitWithCleanup(1);
     }
@@ -213,6 +206,14 @@ export async function quarto(
     } else {
       throw e;
     }
+  } finally {
+    for (const [key, value] of Object.entries(oldEnv)) {
+      if (value === undefined) {
+        Deno.env.delete(key);
+      } else {
+        Deno.env.set(key, value);
+      }
+    }
   }
 }
 

src/resources/filters/customnodes/theorem.lua

@@ -259,9 +259,9 @@ end, function(thm)
     ensure_typst_theorems(type)
     local preamble = pandoc.Plain({pandoc.RawInline("typst", "#" .. theorem_type.env .. "(")})
     if name and #name > 0 then
-      preamble.content:insert(pandoc.RawInline("typst", 'title: "'))
+      preamble.content:insert(pandoc.RawInline("typst", 'title: ['))
       tappend(preamble.content, name)
-      preamble.content:insert(pandoc.RawInline("typst", '"'))
+      preamble.content:insert(pandoc.RawInline("typst", ']'))
     end
     preamble.content:insert(pandoc.RawInline("typst", ")["))
     local callthm = make_scaffold(pandoc.Div, preamble)

tests/docs/smoke-all/crossrefs/theorem/algorithm.qmd

@@ -22,7 +22,7 @@ _quarto:
         -
           - "#ref\\(<alg-gcd>, supplement: \\[alg.\\]\\)"
           - "#ref\\(<alg-gcd>, supplement: \\[Alg.\\]\\)"
-          - "#algorithm\\(title: \"Euclid\"\\)"
+          - "#algorithm\\(title: \\[Euclid\\]\\)"
         - []
     markdown:
       ensureFileRegexMatches:

tests/docs/smoke-all/crossrefs/theorem/lemma-1.qmd

@@ -20,7 +20,7 @@ _quarto:
       ensureTypstFileRegexMatches:
         -
           - "#ref\\(<lem-line>, supplement: \\[Lemma\\]\\)"
-          - "#lemma\\(title: \"Line\"\\)"
+          - "#lemma\\(title: \\[Line\\]\\)"
         - []
     markdown:
       ensureFileRegexMatches:

tests/docs/smoke-all/crossrefs/theorem/theorem-1.qmd

@@ -21,7 +21,7 @@ _quarto:
       ensureTypstFileRegexMatches:
         -
           - "#ref\\(<thm-line>, supplement: \\[Theorem\\]\\)"
-          - "#theorem\\(title: \"Line\"\\)"
+          - "#theorem\\(title: \\[Line\\]\\)"
           - "#import \"@preview/theorion:0\\.4\\.1\": make-frame"
           - "simple-theorem-render"
         -

tests/docs/smoke-all/typst/theorem/theorem-inline-code-title.qmd

@@ -0,0 +1,37 @@
+---
+format:
+  typst:
+    keep-typ: true
+_quarto:
+  tests:
+    typst:
+      ensureTypstFileRegexMatches:
+        -
+          - "title: \\["
+        -
+          - "\\(title: \""
+---
+
+# Theorem Test - Inline Code in Title
+
+::: {#exm-devtools}
+
+## `devtools`
+
+A useful package for R developers.
+
+```r
+install.packages("devtools")
+```
+
+:::
+
+::: {#thm-bayes}
+
+## `P(A|B)` = Bayes' Rule
+
+If $P(B) > 0$, then $P(A|B) = \frac{P(B|A)P(A)}{P(B)}$.
+
+:::
+
+See @exm-devtools and @thm-bayes.