Merge branch 'main' into fix/fixup-protect-null-value

Author: cscheid

.air.toml

@@ -0,0 +1,8 @@
+[format]
+line-width = 80
+indent-width = 2
+indent-style = "space"
+line-ending = "auto"
+persistent-line-breaks = true
+exclude = []
+default-exclude = true

.vscode/extensions.json

@@ -3,6 +3,7 @@
     "denoland.vscode-deno",
     "esbenp.prettier-vscode",
     "sumneko.lua",
-    "nvarner.typst-lsp"
+    "nvarner.typst-lsp",
+    "Posit.air-vscode"
   ]
 }

.vscode/settings.json

@@ -3,8 +3,12 @@
     "editor.defaultFormatter": "denoland.vscode-deno"
   },
   "[r]": {
-    "editor.formatOnSave": false,
-    "editor.defaultFormatter": "REditorSupport.r"
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "Posit.air-vscode"
+  },
+  "[quarto]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "quarto.quarto"
   },
   "[html]": {
     "editor.formatOnSave": false
@@ -16,5 +20,7 @@
   "deno.lint": true,
   "deno.unstable": true,
   "deno.importMap": "./src/import_map.json",
-  "deno.disablePaths": ["tests/integration/playwright/"]
+  "deno.disablePaths": ["tests/integration/playwright/"],
+  // opt-out lintr as we use air formatter
+  "r.lsp.diagnostics": false
 }

configuration

@@ -11,10 +11,10 @@
 export DENO=v1.46.3
 # TODO figure out where 0.1.41 apple silicon libs are available
 export DENO_DOM=v0.1.41-alpha-artifacts
-export PANDOC=3.4
+export PANDOC=3.6.3
 export DARTSASS=1.85.1
 export ESBUILD=0.19.12
-export TYPST=0.11.0
+export TYPST=0.13.0
 
 
 # NB: we can't put comments in the same line as export statements because it

dev-docs/feature-format-matrix/qmd-files/css-properties/font-size/document.qmd

@@ -19,7 +19,7 @@ _quarto:
     typst:
       ensureTypstFileRegexMatches:
         -
-          - 'align\(center\)\[#set text\(size: 6pt\); #table\('
+          - '#\[\s*#set text\(size: 6pt\); #table\('
         - []
 ---
 

dev-docs/package-author-information/execution-environment.qmd

@@ -1,3 +1,4 @@
 - `QUARTO_PROJECT_ROOT` points to the root of the project, or the directory of the file is not in project mode
 - `QUARTO_DOCUMENT_PATH` points to the directory of the document being rendered
+- `QUARTO_DOCUMENT_FILE` points to the source filename of the document being rendered
 - `QUARTO_PROFILE` is set to profile used, e.g `QUARTO_PROFILE=advanced,production` for `quarto render --profile advanced,production`

dev-docs/upgrade-dependencies.md

@@ -1,6 +1,6 @@
 Change version numbers in `./configuration` to correspond to new versions.
 
-Contact JJ so he uploads the binaries to the S3 bucket.
+Contact Carlos so he uploads the binaries to the S3 bucket.
 
 ## Upgrade deno
 

news/changelog-1.7.md

@@ -52,12 +52,27 @@ All changes included in 1.7:
 - ([#11860](https://github.com/quarto-dev/quarto-cli/issues/11860)): ES6 modules that import other local JS modules in documents with `embed-resources: true` are now correctly embedded.
 - ([#1325](https://github.com/quarto-dev/quarto-cli/issues/1325)): Dark Mode pages should not flash light on reload. (Nor should Light Mode pages flash dark.)
 - ([#12307](https://github.com/quarto-dev/quarto-cli/issues/12307)): Tabsets using `tabby.js` in non-boostrap html (`theme: pandoc`, `theme: none` or `minimal: true`) now correctly render reactive content when `server: shiny` is used.
+- ([#12356](https://github.com/quarto-dev/quarto-cli/issues/12356)): Remove duplicate id in HTML document when using `#lst-` prefix label for using Quarto crossref.
 
 ## `pdf` format
 
 - ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
 - ([#11903](https://github.com/quarto-dev/quarto-cli/issues/11903)): `crossref` configuration like `fig-title` or `tbl-title` now correctly supports multi word values, e.g. `fig-title: 'Supplementary Figure'`.
 - ([#11878](https://github.com/quarto-dev/quarto-cli/issues/11878), [#12085](https://github.com/quarto-dev/quarto-cli/issues/12085)): Correctly fixup raw LaTeX table having an unexpected table env with options (e.g `\begin{table}[!ht]`) to be handled as crossref table.
+- Update to Pandoc's LaTeX template following Pandoc 3.6.3 support:
+  - `format: beamer` now uses its own template. The main template for latex does not use `$if(beamer)$` anymore, and the new template for beamer uses the same partials as latex one.
+  - Improved Babel support:
+    - New `babeloptions` variable in the template to allow for more flexible Babel options.
+    - `doc-class.tex` Quarto's partial has been updated as Babel options have been moved to `documentclass` definition in `doc-class.tex` Quarto's partial.
+  - New partials available for `format: latex` and `format: beamer`:
+    - Pandoc now uses partials for its latex templates, and they are available through `template-partials`. Pandoc's partials uses `.latex` extension: `passoptions.latex`, `common.latex`, `font-settings.latex`, `fonts.latex`, `hypersetup.latex`, `after-header-includes.latex`
+    - New Quarto partials: `babel-lang.tex`, `biblio-config.tex`. Quarto's partials uses `.tex` extension.
+  - BREAKING CHANGE for templates authors: `common.latex` does now uses `pandoc.tex` partial from Quarto, which include now part of the content that was in main `template.tex`. If you modify `pandoc.tex` as part of a custom format, it should be updated to new content.
+
+## `jats` format
+
+- Update to Pandoc's template following Pandoc 3.6.3 support:
+  - `article.jats_publishing` partials now support `author.roles`
 
 ## `revealjs` format
 
@@ -73,6 +88,7 @@ All changes included in 1.7:
 - ([#11676](https://github.com/quarto-dev/quarto-cli/pull/11676)): Convert unitless image widths from pixels to inches for column layouts.
 - ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
 - ([#11964](https://github.com/quarto-dev/quarto-cli/issues/11964)): Using panel layout without a crossref label now correctly do not add an empty `#block[]` that was leading to an unnecessary space in output.
+- ([#12354](https://github.com/quarto-dev/quarto-cli/issues/12354)): CodeBlock in Listing with `#lst-` prefix are now correctly highlighted.
 
 ## Interactive Shiny Document
 
@@ -92,6 +108,10 @@ All changes included in 1.7:
 - ([#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.
 
+## Quarto Lua API
+
+- ([#12299](https://github.com/quarto-dev/quarto-cli/issues/12299)): `quarto.doc.pdf_engine()` now correctly returns the PDF engine used for the document. `quarto.doc.cite_method()` now returns `nil` if no citation method will be used (i.e. no references is the document set).
+
 ## Engines
 
 ### `julia`
@@ -106,16 +126,17 @@ All changes included in 1.7:
 
 ## Other Fixes and Improvements
 
+- A new folder `quarto-session-temp` can be created in `.quarto` to store temporary files created by Quarto during a rendering. Reminder: `.quarto` is for internal use of Quarto and should not be versioned (thus added to `.gitignore`).
+- ([fb38eb5](https://github.com/quarto-dev/quarto-cli/commit/fb38eb56c11e09f44cef58fd3b697ff24bb5a3f3)) Use the `latest` parser for Acorn when analyzing JS code imported from OJS blocks.
 - ([#7260](https://github.com/quarto-dev/quarto-cli/issues/7260)): Add support for `active` class in tabsets so the `.active` tab shows up by default.
 - ([#8613](https://github.com/quarto-dev/quarto-cli/issues/8613)): Fix `giscus` color on load to support dark mode (by @kv9898).
 - ([#11441](https://github.com/quarto-dev/quarto-cli/issues/11441)): Don't add newlines around shortcodes during processing.
 - ([#11643](https://github.com/quarto-dev/quarto-cli/issues/11643)): Improve highlighting of nested code block inside markdown code block, i.e. using ` ```{{python}} ` or ` ```python ` inside ` ````markdown` fenced code block.
-- ([fb38eb5](https://github.com/quarto-dev/quarto-cli/commit/fb38eb56c11e09f44cef58fd3b697ff24bb5a3f3)) Use the `latest` parser for Acorn when analyzing JS code imported from OJS blocks.
 - ([#10532](https://github.com/quarto-dev/quarto-cli/issues/10532)): Quarto changed default of `--headless=old` to `--headless` as [Chrome 132 has removed old headless mode](https://developer.chrome.com/blog/removing-headless-old-from-chrome) and only support new mode. For using old mode, `QUARTO_CHROMIUM` could be set to a [new `chrome-headless-shell` binary](https://developer.chrome.com/blog/chrome-headless-shell) or too an older chrome version (between 128 and 132) and `QUARTO_CHROMIUM_HEADLESS_MODE` set to `old` for using old headless mode with that compatabitle version.
 - ([#10961](https://github.com/quarto-dev/quarto-cli/issues/10961)): Add more information on which Chrome Headless will be used in `quarto check install`. This is helpful to help debug mermaid issues.
+- ([#11606](https://github.com/quarto-dev/quarto-cli/discussions/11606)): Added a new `QUARTO_DOCUMENT_FILE` env var available to computation engine to the name of the file currently being rendered.
+- ([#11803](https://github.com/quarto-dev/quarto-cli/pull/11803)): Added a new CLI command `quarto call`. First users of this interface are the new `quarto call engine julia ...` subcommands.
 - ([#11951](https://github.com/quarto-dev/quarto-cli/issues/11951)): Raw LaTeX table without `tbl-` prefix label for using Quarto crossref are now correctly passed through unmodified.
 - ([#12117](https://github.com/quarto-dev/quarto-cli/issues/12117)): Color output to stdout and stderr is now correctly rendered for `html` format in the Jupyter and Julia engines.
 - ([#12264](https://github.com/quarto-dev/quarto-cli/issues/12264)): Upgrade `dart-sass` to 1.85.1.
-- ([#11803](https://github.com/quarto-dev/quarto-cli/pull/11803)): Added a new CLI command `quarto call`. First users of this interface are the new `quarto call engine julia ...` subcommands.
-- A new folder `quarto-session-temp` can be created in `.quarto` to store temporary files created by Quarto during a rendering. Reminder: `.quarto` is for internal use of Quarto and should not be versioned (thus added to `.gitignore`).
 - ([#12369](https://github.com/quarto-dev/quarto-cli/pull/12369)): `quarto preview` correctly throws a YAML validation error when a `format` key does not conform.

package/src/common/dependencies/esbuild.ts

@@ -67,7 +67,7 @@ export function esBuild(version: string): Dependency {
   };
 
   return {
-    name: "esbuild javscript bundler",
+    name: "esbuild javascript bundler",
     bucket: "esbuild",
     version,
     architectureDependencies: {

package/src/common/update-pandoc.ts

@@ -198,6 +198,7 @@ async function writePandocTemplates(
   );
   const latexOutdir = join(formatSrcDir, "pdf", "pandoc");
   const revealOutdir = join(formatSrcDir, "revealjs", "pandoc");
+  const beamerOutdir = join(formatSrcDir, "beamer", "pandoc");
   const asciidocOutdir = join(formatSrcDir, "asciidoc", "pandoc");
   const typstOutdir = join(formatSrcDir, "typst", "pandoc");
 
@@ -219,13 +220,31 @@ async function writePandocTemplates(
       ],
       [latexOutdir]: [
         { from: "default.latex", to: "latex.template" },
+        // Template we need to tweak
+        { from: "common.latex", to: "latex.common" },
+        // Template kept unchanged
+        { from: "after-header-includes.latex" },
+        { from: "hypersetup.latex" },
+        { from: "font-settings.latex" },
+        { from: "fonts.latex" },
+        { from: "passoptions.latex" },
+      ],
+      [beamerOutdir]: [
+        { from: "default.beamer", to: "beamer.template" },
+        // Template we need to tweak
+        { from: "common.latex", to: "latex.common" },
+        // Template kept unchanged
+        { from: "after-header-includes.latex" },
+        { from: "hypersetup.latex" },
+        { from: "font-settings.latex" },
+        { from: "fonts.latex" },
+        { from: "passoptions.latex" },
       ],
       [asciidocOutdir]: [
         { from: "default.asciidoc", to: "asciidoc.template" },
       ],
       [typstOutdir]: [
         { from: "default.typst", to: "typst.template" },
-        { from: "definitions.typst" },
         { from: "template.typst" }
       ]
     };