fix: harden Typst code annotation and filename escaping

Author: mcanouil

src/resources/filters/customnodes/decoratedcodeblock.lua

@@ -197,8 +197,9 @@ _quarto.ast.add_renderer("DecoratedCodeBlock",
       CodeBlock = render_folded_block
     }) or pandoc.Blocks({})
     local blocks = pandoc.Blocks({})
+    local escaped = node.filename:gsub('\\', '\\\\'):gsub('"', '\\"')
     blocks:insert(pandoc.RawBlock("typst",
-      '#quarto-code-filename("' .. node.filename .. '")['))
+      '#quarto-code-filename("' .. escaped .. '")['))
     blocks:extend(rendered)
     blocks:insert(pandoc.RawBlock("typst", "]"))
     return pandoc.Div(blocks)

src/resources/filters/quarto-pre/code-annotation.lua

@@ -321,10 +321,6 @@ function processAnnotation(line, annoteNumber, annotationProvider)
     return stripped
 end
 
-function processTypstAnnotation(line, annoteNumber, annotationProvider)
-  local stripped = annotationProvider.stripAnnotation(line, annoteNumber)
-  return stripped
-end
 
 function code_meta()
   return {
@@ -419,8 +415,6 @@ function code_annotations()
             annotationProcessor = processLaTeXAnnotation
           elseif _quarto.format.isAsciiDocOutput() then
             annotationProcessor = processAsciidocAnnotation
-          elseif _quarto.format.isTypstOutput() then
-            annotationProcessor = processTypstAnnotation
           end
 
           -- resolve annotations
@@ -564,7 +558,7 @@ function code_annotations()
                 local annotationNumber = block.start + i - 1
                 local annoteId = toAnnoteId(annotationNumber)
                 if pendingAnnotations[annoteId] then
-                  local content = pandoc.utils.stringify(v[1])
+                  local content = pandoc.write(pandoc.Pandoc({v[1]}), "typst")
                   annotationBlocks:insert(pandoc.RawBlock("typst",
                     "#quarto-annotation-item(" .. tostring(annotationNumber) .. ", [" .. content .. "])"))
                 end

src/resources/formats/typst/pandoc/quarto/definitions.typ

@@ -35,11 +35,14 @@
 
 // Derive a contrasting annotation colour from a background fill.
 // Light backgrounds get dark circles; dark backgrounds get light circles.
-// Uses relative luminance: 0.2126R + 0.7152G + 0.0722B.
 #let quarto-annote-color(bg) = {
   if type(bg) == color {
-    let (r, g, b, ..) = bg.components(alpha: false)
-    let lum = 0.2126 * r / 100% + 0.7152 * g / 100% + 0.0722 * b / 100%
+    let comps = bg.components(alpha: false)
+    let lum = if comps.len() == 1 {
+      comps.at(0) / 100%
+    } else {
+      0.2126 * comps.at(0) / 100% + 0.7152 * comps.at(1) / 100% + 0.0722 * comps.at(2) / 100%
+    }
     if lum < 0.5 { luma(200) } else { luma(60) }
   } else {
     luma(60)

tests/docs/smoke-all/typst/syntax-highlighting/skylighting-default.qmd

@@ -14,7 +14,7 @@ _quarto:
           - "#let EndLine"
           # Quarto override with proper block styling and arrow theme bgcolor
           - 'let bgcolor = rgb\("#f1f3f5"\)'
-          - 'block\(fill: bgcolor, width: 100%, inset: 8pt, radius: 2pt, blocks\)'
+          - 'block\(fill: bgcolor, width: 100%, inset: 8pt, radius: 2pt, stroke: 0\.5pt \+ luma\(200\), blocks\)'
         - ["```python"]
 ---
 

tests/docs/smoke-all/typst/syntax-highlighting/skylighting-line-numbers.qmd

@@ -14,7 +14,7 @@ _quarto:
           - '#Skylighting\(number: true'
           - "#KeywordTok"
           # Quarto override with proper block styling
-          - 'block\(fill: bgcolor, width: 100%, inset: 8pt, radius: 2pt, blocks\)'
+          - 'block\(fill: bgcolor, width: 100%, inset: 8pt, radius: 2pt, stroke: 0\.5pt \+ luma\(200\), blocks\)'
         - ["```python"]
 ---