merge

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

src/command/render/pandoc-html.ts

@@ -96,7 +96,7 @@ export async function resolveSassBundles(
         !maybeBrandBundle.user?.find((v) => v === "brand") &&
           !maybeBrandBundle.dark?.user?.find((v) => v === "brand"),
     );
-    let foundBrand = { light: false, dark: false };
+    const foundBrand = { light: false, dark: false };
     const bundles: SassBundle[] = bundlesWithBrand.filter((bundle) =>
       bundle.key !== "brand"
     ).map((bundle) => {

src/command/render/project.ts

@@ -81,7 +81,6 @@ import { fileExecutionEngine } from "../../execute/engine.ts";
 import { projectContextForDirectory } from "../../project/project-context.ts";
 import { ProjectType } from "../../project/types/types.ts";
 import { ProjectConfig as ProjectConfig_Project } from "../../resources/types/schema-types.ts";
-import { Extension } from "../../extension/types.ts";
 
 const noMutationValidations = (
   projType: ProjectType,

src/core/safe-clone-deep.ts

@@ -24,6 +24,24 @@ export function safeCloneDeep<T>(obj: T): T {
     return obj.clone();
   }
 
+  // Handle Maps
+  if (obj instanceof Map) {
+    const clonedMap = new Map();
+    for (const [key, value] of obj.entries()) {
+      clonedMap.set(key, safeCloneDeep(value));
+    }
+    return clonedMap as T;
+  }
+
+  // Handle Sets
+  if (obj instanceof Set) {
+    const clonedSet = new Set();
+    for (const value of obj.values()) {
+      clonedSet.add(safeCloneDeep(value));
+    }
+    return clonedSet as T;
+  }
+
   // Handle regular objects
   const result = {} as T;
   for (const key in obj) {

src/core/sass.ts

@@ -8,7 +8,6 @@ import { existsSync } from "../deno_ral/fs.ts";
 import { join } from "../deno_ral/path.ts";
 
 import { quartoCacheDir } from "./appdirs.ts";
-import { TempContext } from "./temp.ts";
 
 import { SassBundleLayers, SassLayer } from "../config/types.ts";
 import { dartCompile } from "./dart-sass.ts";