Merge branch 'main' into bugfix/9832

Author: cscheid

.github/workflows/test-ff-matrix.yml

@@ -2,15 +2,19 @@
 name: Feature-Format Tests
 on:
   workflow_dispatch:
-  push:
-    branches: [main]
-    paths-ignore:
-      - "news/**"
-      - "src/resources/language/**"
-  pull_request:
-    branches: [main]
-    paths-ignore:
-      - "src/resources/language/**"
+  schedule:
+    # run daily at 1am UTC
+    - cron: "0 1 * * *"
+  # Deactivating run on commits for now
+  ## push:
+  ##   branches: [main]
+  ##   paths-ignore:
+  ##     - "news/**"
+  ##     - "src/resources/language/**"
+  ## pull_request:
+  ##   branches: [main]
+  ##   paths-ignore:
+  ##     - "src/resources/language/**"
 
 concurrency:
   # Use github.run_id on main branch

dev-docs/feature-format-matrix/qmd-files/layout/fig-align/toplevel-id-nocaption.qmd

@@ -18,7 +18,7 @@ _quarto:
     latex:
       ensureFileRegexMatches:
       -
-        - '\\hfill\\captionsetup\{labelsep=none\}\\includegraphics\{100.png\}'
+        - '\\hfill\\includegraphics\{100.png\}'
       - []
     typst:
       ensureTypstFileRegexMatches:

news/changelog-1.5.md

@@ -78,6 +78,7 @@ All changes included in 1.5:
 - ([#9671](https://github.com/quarto-dev/quarto-cli/issues/9671)): Reimplement `typst` subfloats to fix subfloat counters.
 - ([#9694](https://github.com/quarto-dev/quarto-cli/issues/9694)): Fix default callout (`::: callout ... ::: `) in Typst.
 - ([#9722](https://github.com/quarto-dev/quarto-cli/issues/9722)): Resolve data URI images in Typst.
+- ([#9555](https://github.com/quarto-dev/quarto-cli/issues/9555)): Text elements in Typst are internationalized.
 - Upgrade Typst to 0.11
 - Upgrade the Typst template to draw tables without grid lines by default, in accordance with latest Pandoc.
 
@@ -134,6 +135,7 @@ All changes included in 1.5:
 - ([#8417](https://github.com/quarto-dev/quarto-cli/issues/8417)): Maintain a single AST element in the output cells when parsing HTML from RawBlock elements.
 - ([#8582](https://github.com/quarto-dev/quarto-cli/issues/8582)): Improve the algorithm for extracting table elements from HTML RawBlock elements.
 - ([#8770](https://github.com/quarto-dev/quarto-cli/issues/8770)): Handle inconsistently-defined float types and identifier names more robustly in HTML tables.
+- ([#9862](https://github.com/quarto-dev/quarto-cli/issues/9862)): Fix crash with labeled tables in cells with `eval: false` and `echo: false`.
 
 ## Engines
 
@@ -160,7 +162,7 @@ All changes included in 1.5:
 
 ## `quarto typst`
 
-- ([#9106])(https://github.com/quarto-dev/quarto-cli/issues/9106)): Do not allow `quarto typst update`.
+- ([#9106](https://github.com/quarto-dev/quarto-cli/issues/9106)): Do not allow `quarto typst update`.
 
 ## Quarto's input format
 

src/resources/filters/customnodes/floatreftarget.lua

@@ -342,26 +342,6 @@ end, function(float)
   end
   latex_caption = latex_caption or pandoc.Inlines({})
 
-  if #latex_caption == 0 then
-    local caption_setup = quarto.LatexInlineCommand({
-      name = "captionsetup",
-      arg = "labelsep=none"
-    })
-    local pt = pandoc.utils.type(float.content)
-    if pt == "Block" then
-      if float.content.content == nil then
-        -- it's a block that doesn't support inner content
-        -- attempt a best-effort fix by replacing it with a wrapping div
-        float.content = pandoc.Div({float.content})
-      end
-      float.content.content:insert(1, caption_setup)
-    elseif pt == "Blocks" then
-      float.content:insert(1, caption_setup)
-    else
-      internal_error()
-    end
-  end
-
   local label_cmd = quarto.LatexInlineCommand({
     name = "label",
     arg = pandoc.RawInline("latex", float.identifier)
@@ -988,7 +968,7 @@ end, function(float)
     -- luacov: enable
   end
   local kind = "quarto-float-" .. ref
-  local supplement = info.name
+  local supplement = titleString('fig', info.name)
   -- FIXME: custom numbering doesn't work yet
   -- local numbering = ""
   -- if float.parent_id then

src/resources/filters/customnodes/theorem.lua

@@ -100,7 +100,7 @@ local function ensure_typst_theorems(reftype)
     letted_typst_theorem[reftype] = true
     local theorem_type = theorem_types[reftype]
     quarto.doc.include_text("in-header", "#let " .. theorem_type.env .. " = thmbox(\"" ..
-     theorem_type.env .. "\", \"" .. theorem_type.title .. "\")")
+     theorem_type.env .. "\", \"" .. titleString(reftype, theorem_type.title) .. "\")")
   end
 end
 

src/resources/filters/layout/pandoc3_figure.lua

@@ -161,7 +161,7 @@ function render_pandoc3_figure()
           caption = figure.caption.long[1],
           kind = "quarto-float-fig",
           caption_location = crossref.categories.by_ref_type["fig"].caption_location,
-          supplement = "Figure",
+          supplement = titleString('fig', 'Figure'),
         })
       end
     }

src/resources/filters/layout/typst.lua

@@ -95,7 +95,7 @@ end, function(layout)
     return float.content
     -- luacov: enable
   end
-  local supplement = info.name
+  local supplement = titleString(ref, info.name)
 
   -- typst output currently only supports a single grid
   -- as output, so no rows of varying columns, etc.
@@ -133,12 +133,12 @@ end, function(layout)
       _quarto.format.typst.as_typst_content(cells)
     }, false))
   else
-    result:insert(make_typst_figure {
+    result:extend(make_typst_figure {
       content = cells,
       caption_location = caption_location,
       caption = layout.float.caption_long,
       kind = kind,
-      supplement = info.prefix,
+      supplement = titleString(ref, info.prefix),
       numbering = info.numbering,
       identifier = layout.float.identifier
     })

src/resources/filters/quarto-pre/table-classes.lua

@@ -62,6 +62,9 @@ function table_classes()
       if kind ~= "tbl" then
         return nil
       end
+      if float.content == nil then
+        return nil
+      end
 
       if (float.caption_long == nil or 
           float.caption_long.content == nil or 

src/resources/formats/typst/pandoc/quarto/typst-template.typ

@@ -61,7 +61,7 @@
 
   if abstract != none {
     block(inset: 2em)[
-    #text(weight: "semibold")[Abstract] #h(1em) #abstract
+    #text(weight: "semibold")[$labels.abstract$] #h(1em) #abstract
     ]
   }
 

tests/docs/smoke-all/2023/09/19/issue-2546.qmd

@@ -5,7 +5,6 @@ _quarto:
     latex:
       ensureFileRegexMatches:
         - 
-          - "\\\\captionsetup\\{labelsep=none\\}"
           - "\\\\caption\\{\\\\label\\{fig-chapter-2\\}One with a caption\\}"
         - []
     html: