Merge branch 'main' into feature/brand-yaml

Author: cscheid

news/changelog-1.6.md

@@ -15,6 +15,7 @@ All changes included in 1.6:
 - ([#10168](https://github.com/quarto-dev/quarto-cli/issues/10168)): support `csl` bibliography style.
 - ([#10181](https://github.com/quarto-dev/quarto-cli/issues/10181)): Remove workaround for image dimensions which is no longer necessary and mishandled image paths with spaces.
 - ([#10217](https://github.com/quarto-dev/quarto-cli/issues/10217)): Explicitly compute units for image dimensions in `typst` format when they're not given.
+- ([#10212](https://github.com/quarto-dev/quarto-cli/issues/10212)): Moves Pandoc variables to the function declaration for the default template.
 
 ## Engines
 

src/resources/create/extensions/format-typst/_extensions/qstart-filesafename-qend/typst-show.typ

@@ -38,6 +38,7 @@ $if(region)$
 $endif$
 $if(abstract)$
   abstract: [$abstract$],
+  abstract-title: "$labels.abstract$",
 $endif$
 $if(margin)$
   margin: ($for(margin/pairs)$$margin.key$: $margin.value$,$endfor$),

src/resources/create/extensions/format-typst/_extensions/qstart-filesafename-qend/typst-template.typ

@@ -16,6 +16,7 @@
   authors: none,
   date: none,
   abstract: none,
+  abstract-title: none,
   cols: 1,
   margin: (x: 1.25in, y: 1.25in),
   paper: "us-letter",
@@ -72,7 +73,7 @@
 
   if abstract != none {
     block(inset: 2em)[
-    #text(weight: "semibold")[$labels.abstract$] #h(1em) #abstract
+    #text(weight: "semibold")[#abstract-title] #h(1em) #abstract
     ]
   }
 

src/resources/editor/tools/vs-code.mjs

@@ -11970,7 +11970,8 @@ var require_yaml_intelligence_resources = __commonJS({
             formats: [
               "$html-doc",
               "$epub-all",
-              "docx"
+              "docx",
+              "typst"
             ]
           },
           description: "Title used to label document abstract"
@@ -21121,8 +21122,11 @@ var require_yaml_intelligence_resources = __commonJS({
           long: 'Color for links to other content within the document.\nSee <a href="https://wiki.contextgarden.net/Color">ConTeXt Color</a>\nfor additional information.'
         },
         "Configuration for document commenting.",
-        "Configuration for crossref labels and prefixes.",
-        "A custom cross reference type.",
+        {
+          short: "Configuration for cross-reference labels and prefixes.",
+          long: 'Configuration for cross-reference labels and prefixes. See <a href="https://quarto.org/docs/reference/metadata/crossref.html">Cross-Reference\nOptions</a> for more details.'
+        },
+        'A custom cross reference type. See <a href="https://quarto.org/docs/reference/metadata/crossref.html#custom">Custom</a>\nfor more details.',
         "The kind of cross reference (currently only \u201Cfloat\u201D is\nsupported).",
         "The prefix used in rendered references when referencing this\ntype.",
         "The prefix used in rendered captions when referencing this type. If\nomitted, the field <code>reference-prefix</code> is used.",
@@ -21893,7 +21897,6 @@ var require_yaml_intelligence_resources = __commonJS({
         "Extension to use for generated output file",
         "Use the specified file as a custom template for the generated\ndocument.",
         "Include the specified files as partials accessible to the template\nfor the generated content.",
-        "Produce output with an appropriate header and footer (e.g.&nbsp;a\nstandalone HTML, LaTeX, TEI, or RTF file, not a fragment)",
         {
           short: "Produce a standalone HTML file with no external dependencies",
           long: 'Produce a standalone HTML file with no external dependencies, using\n<code>data:</code> URIs to incorporate the contents of linked scripts,\nstylesheets, images, and videos. The resulting file should be\n\u201Cself-contained,\u201D in the sense that it needs no external files and no\nnet access to be displayed properly by a browser. This option works only\nwith HTML output formats, including <code>html4</code>,\n<code>html5</code>, <code>html+lhs</code>, <code>html5+lhs</code>,\n<code>s5</code>, <code>slidy</code>, <code>slideous</code>,\n<code>dzslides</code>, and <code>revealjs</code>. Scripts, images, and\nstylesheets at absolute URLs will be downloaded; those at relative URLs\nwill be sought relative to the working directory (if the first source\nfile is local) or relative to the base URL (if the first source file is\nremote). Elements with the attribute <code>data-external="1"</code> will\nbe left alone; the documents they link to will not be incorporated in\nthe document. Limitation: resources that are loaded dynamically through\nJavaScript cannot be incorporated; as a result, some advanced features\n(e.g.&nbsp;zoom or speaker notes) may not work in an offline \u201Cself-contained\u201D\n<code>reveal.js</code> slide show.'
@@ -23092,12 +23095,12 @@ var require_yaml_intelligence_resources = __commonJS({
         mermaid: "%%"
       },
       "handlers/mermaid/schema.yml": {
-        _internalId: 187065,
+        _internalId: 186714,
         type: "object",
         description: "be an object",
         properties: {
           "mermaid-format": {
-            _internalId: 187057,
+            _internalId: 186706,
             type: "enum",
             enum: [
               "png",
@@ -23113,7 +23116,7 @@ var require_yaml_intelligence_resources = __commonJS({
             exhaustiveCompletions: true
           },
           theme: {
-            _internalId: 187064,
+            _internalId: 186713,
             type: "anyOf",
             anyOf: [
               {

src/resources/editor/tools/yaml/web-worker.js

@@ -4942,7 +4942,8 @@
         "formats": [
           "$html-doc",
           "$epub-all",
-          "docx"
+          "docx",
+          "typst"
         ]
       },
       "description": "Title used to label document abstract"
@@ -14093,8 +14094,11 @@
       "long": "Color for links to other content within the document.\nSee <a href=\"https://wiki.contextgarden.net/Color\">ConTeXt Color</a>\nfor additional information."
     },
     "Configuration for document commenting.",
-    "Configuration for crossref labels and prefixes.",
-    "A custom cross reference type.",
+    {
+      "short": "Configuration for cross-reference labels and prefixes.",
+      "long": "Configuration for cross-reference labels and prefixes. See <a href=\"https://quarto.org/docs/reference/metadata/crossref.html\">Cross-Reference\nOptions</a> for more details."
+    },
+    "A custom cross reference type. See <a href=\"https://quarto.org/docs/reference/metadata/crossref.html#custom\">Custom</a>\nfor more details.",
     "The kind of cross reference (currently only “float” is\nsupported).",
     "The prefix used in rendered references when referencing this\ntype.",
     "The prefix used in rendered captions when referencing this type. If\nomitted, the field <code>reference-prefix</code> is used.",
@@ -14865,7 +14869,6 @@
     "Extension to use for generated output file",
     "Use the specified file as a custom template for the generated\ndocument.",
     "Include the specified files as partials accessible to the template\nfor the generated content.",
-    "Produce output with an appropriate header and footer (e.g.&nbsp;a\nstandalone HTML, LaTeX, TEI, or RTF file, not a fragment)",
     {
       "short": "Produce a standalone HTML file with no external dependencies",
       "long": "Produce a standalone HTML file with no external dependencies, using\n<code>data:</code> URIs to incorporate the contents of linked scripts,\nstylesheets, images, and videos. The resulting file should be\n“self-contained,” in the sense that it needs no external files and no\nnet access to be displayed properly by a browser. This option works only\nwith HTML output formats, including <code>html4</code>,\n<code>html5</code>, <code>html+lhs</code>, <code>html5+lhs</code>,\n<code>s5</code>, <code>slidy</code>, <code>slideous</code>,\n<code>dzslides</code>, and <code>revealjs</code>. Scripts, images, and\nstylesheets at absolute URLs will be downloaded; those at relative URLs\nwill be sought relative to the working directory (if the first source\nfile is local) or relative to the base URL (if the first source file is\nremote). Elements with the attribute <code>data-external=\"1\"</code> will\nbe left alone; the documents they link to will not be incorporated in\nthe document. Limitation: resources that are loaded dynamically through\nJavaScript cannot be incorporated; as a result, some advanced features\n(e.g.&nbsp;zoom or speaker notes) may not work in an offline “self-contained”\n<code>reveal.js</code> slide show."
@@ -16064,12 +16067,12 @@
     "mermaid": "%%"
   },
   "handlers/mermaid/schema.yml": {
-    "_internalId": 187065,
+    "_internalId": 186714,
     "type": "object",
     "description": "be an object",
     "properties": {
       "mermaid-format": {
-        "_internalId": 187057,
+        "_internalId": 186706,
         "type": "enum",
         "enum": [
           "png",
@@ -16085,7 +16088,7 @@
         "exhaustiveCompletions": true
       },
       "theme": {
-        "_internalId": 187064,
+        "_internalId": 186713,
         "type": "anyOf",
         "anyOf": [
           {

src/resources/editor/tools/yaml/yaml-intelligence-resources.json

@@ -24,6 +24,7 @@ $if(region)$
 $endif$
 $if(abstract)$
   abstract: [$abstract$],
+  abstract-title: "$labels.abstract$",
 $endif$
 $if(margin)$
   margin: ($for(margin/pairs)$$margin.key$: $margin.value$,$endfor$),

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

@@ -5,6 +5,7 @@
   authors: none,
   date: none,
   abstract: none,
+  abstract-title: none,
   cols: 1,
   margin: (x: 1.25in, y: 1.25in),
   paper: "us-letter",
@@ -61,7 +62,7 @@
 
   if abstract != none {
     block(inset: 2em)[
-    #text(weight: "semibold")[$labels.abstract$] #h(1em) #abstract
+    #text(weight: "semibold")[#abstract-title] #h(1em) #abstract
     ]
   }
 

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

@@ -109,7 +109,7 @@
 - name: abstract-title
   schema: string
   tags:
-    formats: [$html-doc, $epub-all, docx]
+    formats: [$html-doc, $epub-all, docx, typst]
   description: "Title used to label document abstract"
 
 - name: notes