Merge branch 'main' into jk/engine-commands

Author: jkrumbiegel

news/changelog-1.7.md

@@ -80,6 +80,7 @@ All changes included in 1.7:
 - Fix `pandoc.mediabag` Lua typings so autocompletions work with the Lua LSP integration.
 - ([#11896](https://github.com/quarto-dev/quarto-cli/pull/11896)): fix `\f` (`{{< pagebreak >}}`) form feed character not valid in PowerPoint (`pptx`).
 - ([#11664](https://github.com/quarto-dev/quarto-cli/issues/11664)): `lipsum` shortcode is no longer randomly generated by default, use `{{< lipsum random=true >}}` to restore randomness.
+- ([#11379](https://github.com/quarto-dev/quarto-cli/issues/11379)): Add `version` shortcode to display the current Quarto version.
 
 ## Engines
 

src/core/log.ts

@@ -344,8 +344,14 @@ Please consider reporting it at https://github.com/quarto-dev/quarto-cli. Thank
     if (!message) {
       message = err.stack;
     } else {
-      message = message + "\n\nStack trace:\n" +
-        err.stack.split("\n").slice(1).join("\n");
+      const stackLines = err.stack.split("\n");
+      const firstAtLineIndex = stackLines.findIndex((line) =>
+        /^\s*at /.test(line)
+      );
+      if (firstAtLineIndex !== -1) {
+        const stackTrace = stackLines.slice(firstAtLineIndex).join("\n");
+        message = message + "\n\nStack trace:\n" + stackTrace;
+      }
     }
   }
 

src/resources/extensions/quarto/version/_extension.yml

@@ -0,0 +1,6 @@
+title: Version
+author: Posit, PBC
+organization: quarto
+contributes:
+  shortcodes:
+    - version.lua

src/resources/extensions/quarto/version/version.lua

@@ -0,0 +1,5 @@
+return {
+  ['version'] = function(args, kwargs, meta)
+    return table.concat(quarto.version, '.')
+  end
+}

src/resources/filters/crossref/refs.lua

@@ -13,7 +13,7 @@ function resolveRefs()
       local function add_ref_prefix(ref, ref_type, prefix)
         local category = crossref.categories.by_ref_type[ref_type]
         ref:extend(prefix)
-        if category == nil or category.space_before_numbering ~= false then
+        if (category == nil or category.space_before_numbering ~= false) and not _quarto.format.isTypstOutput() then
           ref:extend({nbspString()})
         end
       end
@@ -82,12 +82,13 @@ function resolveRefs()
               -- so we don't get the fallthrough else clause in latex when custom ref commands
               -- are in play
               if category == nil or category.custom_ref_command == nil then
-                ref:extend({pandoc.RawInline('latex', '\\ref{' .. label .. '}')})
+                ref:extend(pandoc.List({pandoc.RawInline('latex', '\\ref{' .. label .. '}')}))
               end
             elseif _quarto.format.isAsciiDocOutput() then
               ref = pandoc.List({pandoc.RawInline('asciidoc', '<<' .. label .. '>>')})
             elseif _quarto.format.isTypstOutput() then
-              ref = pandoc.List({pandoc.RawInline('typst', '@' .. label)})
+              ref:insert(1, pandoc.RawInline('typst', '#ref(<' .. label .. '>, supplement: ['))
+              ref:insert(pandoc.RawInline('typst', '])'))
             else
               if not resolve then
                 local refClasses = pandoc.List({"quarto-unresolved-ref"})

tests/docs/smoke-all/2025/03/06/issue-12006.qmd

@@ -0,0 +1,10 @@
+---
+format: html
+_quarto:
+  tests:
+    html:
+      ensureFileRegexMatches:
+        - ["Quarto [0-9]+\\.[0-9]+\\.[0-9]+ is amazing"]
+---
+
+Quarto {{< version >}} is amazing.

tests/docs/smoke-all/crossrefs/float/typst/rawtablecaption.qmd

@@ -8,8 +8,7 @@ _quarto:
       ensureTypstFileRegexMatches:
         - 
           - "This is a caption."
-          - "<tbl-1>"
-          - "@tbl-1"
+          - "#ref\\(<tbl-1>, supplement: \\[Table\\]\\)"
         - []
 ---
 

tests/docs/smoke-all/crossrefs/float/typst/typst-float-1.qmd

@@ -7,10 +7,8 @@ _quarto:
     typst:
       ensureTypstFileRegexMatches:
         - 
-          - "<tbl-1>"
-          - "<fig-1>"
-          - "@fig-1"
-          - "@tbl-1"
+          - "#ref\\(<fig-1>, supplement: \\[Figure\\]\\)"
+          - "#ref\\(<tbl-1>, supplement: \\[Table\\]\\)"
         - []
 ---
 

tests/docs/smoke-all/crossrefs/float/typst/typst-float-2.qmd

@@ -7,10 +7,8 @@ _quarto:
     typst:
       ensureTypstFileRegexMatches:
         - 
-          - "<fig-foo>"
-          - "<tbl-foo>"
-          - "@fig-foo"
-          - "@tbl-foo"
+          - "#ref\\(<fig-foo>, supplement: \\[Figure\\]\\)"
+          - "#ref\\(<tbl-foo>, supplement: \\[Table\\]\\)"
           - "This is the figure"
           - "This is the table"
 ---

tests/docs/smoke-all/crossrefs/float/typst/typst-float-3.qmd

@@ -7,10 +7,8 @@ _quarto:
     typst:
       ensureTypstFileRegexMatches:
         - 
-          - "<fig-foo>"
-          - "<tbl-foo>"
-          - "@fig-foo"
-          - "@tbl-foo"
+          - "#ref\\(<fig-foo>, supplement: \\[Figure\\]\\)"
+          - "#ref\\(<tbl-foo>, supplement: \\[Table\\]\\)"
           - "This is a figure"
           - "This is a table"
 ---