Merge pull request #12262 from quarto-dev/chore/pandoc-3.6

Update to Pandoc 3.6.3 and Typst 0.13.0

Author: cscheid

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/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

@@ -59,6 +59,20 @@ All changes included in 1.7:
 - ([#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
 

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" }
       ]
     };

src/format/pdf/format-pdf.ts

@@ -232,9 +232,12 @@ function createPdfFormat(
         }
 
         // Provide a custom template for this format
-        const partialNames = [
+        // Partials can be the one from Quarto division
+        const partialNamesQuarto: string[] = [
+          "babel-lang",
           "before-bib",
           "biblio",
+          "biblio-config",
           "citations",
           "doc-class",
           "graphics",
@@ -247,12 +250,38 @@ function createPdfFormat(
           "title",
           "toc",
         ];
-        extras.templateContext = {
-          template: formatResourcePath("pdf", "pandoc/template.tex"),
-          partials: partialNames.map((name) => {
-            return formatResourcePath("pdf", `pandoc/${name}.tex`);
-          }),
+        // or the one from Pandoc division (since Pandoc 3.6.3)
+        const partialNamesPandoc: string[] = [
+          "after-header-includes",
+          "common",
+          "font-settings",
+          "fonts",
+          "hypersetup",
+          "passoptions",
+        ];
+
+        const createTemplateContext = function (
+          to: string,
+          partialNamesQuarto: string[],
+          partialNamesPandoc: string[],
+        ) {
+          return {
+            template: formatResourcePath(to, "pandoc/template.tex"),
+            partials: [
+              ...partialNamesQuarto.map((name) => {
+                return formatResourcePath(to, `pandoc/${name}.tex`);
+              }),
+              ...partialNamesPandoc.map((name) => {
+                return formatResourcePath(to, `pandoc/${name}.latex`);
+              }),
+            ],
+          };
         };
+        extras.templateContext = createTemplateContext(
+          displayName === "Beamer" ? "beamer" : "pdf",
+          partialNamesQuarto,
+          partialNamesPandoc,
+        );
 
         // Don't shift the headings if we see any H1s (we can't shift up any longer)
         const hasLevelOneHeadings = await hasL1Headings(markdown);

src/resources/extensions/quarto/docusaurus/docusaurus.lua

@@ -139,7 +139,7 @@ end, function(node)
     start.content:insert(pandoc.RawInline("markdown", "]\n"))
     admonition:insert(start)
   else
-    admonition:insert(pandoc.RawBlock("markdown", "\n:::" .. node.type))
+    admonition:insert(pandoc.RawBlock("markdown", ":::" .. node.type))
   end
   local content = node.content
   if type(content) == "table" then

src/resources/filters/customnodes/callout.lua

@@ -224,7 +224,7 @@ function _callout_main()
       return
     end
     included_font_awesome = true
-    quarto.doc.include_text("in-header", "#import \"@preview/fontawesome:0.1.0\": *")
+    quarto.doc.include_text("in-header", "#import \"@preview/fontawesome:0.5.0\": *")
   end
 
   _quarto.ast.add_renderer("Callout", function(_)

src/resources/filters/customnodes/floatreftarget.lua

@@ -1026,7 +1026,7 @@ end, function(float)
   local caption_location = cap_location(float)
 
   local open_block = pandoc.RawBlock("markdown", "<div id=\"" .. float.identifier .. "\">\n")
-  local close_block = pandoc.RawBlock("markdown", "\n</div>")
+  local close_block = pandoc.RawBlock("markdown", "</div>")
   local result = pandoc.Blocks({open_block})
   local insert_content = function()
     if pandoc.utils.type(float.content) == "Block" then
@@ -1051,6 +1051,7 @@ end, function(float)
     insert_content()
     result:insert(pandoc.RawBlock("markdown", "\n"))
     insert_caption()
+    result:insert(pandoc.RawBlock("markdown", "\n"))
     result:insert(close_block)
   end
   return result

src/resources/filters/customnodes/theorem.lua

@@ -93,7 +93,7 @@ local letted_typst_theorem = {}
 local function ensure_typst_theorems(reftype)
   if not included_typst_theorems then
     included_typst_theorems = true
-    quarto.doc.include_text("in-header", "#import \"@preview/ctheorems:1.1.0\": *")
+    quarto.doc.include_text("in-header", "#import \"@preview/ctheorems:1.1.3\": *")
     quarto.doc.include_text("in-header", "#show: thmrules")
   end
   if not letted_typst_theorem[reftype] then