update to pandoc 2.19

Author: jjallaire

configuration

@@ -10,7 +10,7 @@
 # Binary dependencies
 export DENO=v1.22.0
 export DENO_DOM=v0.1.17-alpha
-export PANDOC=2.18
+export PANDOC=2.19
 export DARTSASS=1.32.8
 export ESBUILD=0.14.39
 

news/changelog-1.1.md

@@ -8,6 +8,11 @@
 
 - Correct handling of `knitr::include_graphics()` within inline expressions.
 
+## Pandoc
+
+- Update to Pandoc 2.19
+- Support for `embed-resources` document option
+
 ## References
 
 - Support for `nocite` within \_project.yml for book projects (#1660)

src/command/render/defaults.ts

@@ -12,6 +12,7 @@ import { FormatPandoc, QuartoFilter } from "../../config/types.ts";
 import { isLatexOutput } from "../../config/format.ts";
 
 import {
+  kEmbedResources,
   kFilters,
   kFrom,
   kIncludeAfterBody,
@@ -106,6 +107,7 @@ export function pandocDefaultsMessage(
     kOutputFile,
     kTemplate,
     kStandalone,
+    kEmbedResources,
     kSelfContained,
   ];
   const defaults: FormatPandoc = {};

src/command/render/flags.ts

@@ -11,12 +11,14 @@ import { readYaml, readYamlFromString } from "../../core/yaml.ts";
 import { mergeConfigs } from "../../core/config.ts";
 
 import {
+  kEmbedResources,
   kListings,
   kNumberOffset,
   kNumberSections,
   kReferenceLocation,
   kSelfContained,
   kShiftHeadingLevelBy,
+  kStandalone,
   kTableOfContents,
   kToc,
   kTopLevelDivision,
@@ -63,11 +65,21 @@ export async function parseRenderFlags(args: string[]) {
         flags.siteUrl = arg;
         break;
 
+      case "--standalone":
+        flags[kStandalone] = true;
+        arg = argsStack.shift();
+        break;
+
       case "--self-contained":
         flags[kSelfContained] = true;
         arg = argsStack.shift();
         break;
 
+      case "--embed-resources":
+        flags[kEmbedResources] = true;
+        arg = argsStack.shift();
+        break;
+
       case "--pdf-engine":
         arg = argsStack.shift();
         flags.pdfEngine = arg;

src/command/render/pandoc.ts

@@ -86,6 +86,7 @@ import {
   kDate,
   kDateFormat,
   kDocumentClass,
+  kEmbedResources,
   kFigResponsive,
   kFilterParams,
   kFormatResources,
@@ -736,11 +737,14 @@ export async function runPandoc(
   // during post processing, we need to implement self-contained ourselves
   // so don't allow pandoc to see this flag (but still print it)
   if (isHtmlFileOutput(options.format.pandoc)) {
-    // Hide self-contained argument
-    pandocArgs = pandocArgs.filter((arg) => arg !== "--self-contained");
+    // Hide self-contained arguments
+    pandocArgs = pandocArgs.filter((
+      arg,
+    ) => (arg !== "--self-contained" && arg !== "--embed-resources"));
 
     // Remove from defaults
     delete allDefaults[kSelfContained];
+    delete allDefaults[kEmbedResources];
   }
 
   // write the defaults file

src/command/render/render-info.ts

@@ -8,14 +8,19 @@ import { info } from "log/mod.ts";
 
 import * as colors from "fmt/colors.ts";
 
-import { kOutputExt, kSelfContained } from "../../config/constants.ts";
+import {
+  kEmbedResources,
+  kOutputExt,
+  kSelfContained,
+} from "../../config/constants.ts";
 import { Format } from "../../config/types.ts";
 import { RenderFlags } from "./types.ts";
 
 import { extname } from "path/mod.ts";
 
 export function isSelfContained(flags: RenderFlags, format: Format) {
-  return !!(flags[kSelfContained] || format.pandoc[kSelfContained]);
+  return !!(flags[kSelfContained] || format.pandoc[kSelfContained] ||
+    flags[kEmbedResources] || format.pandoc[kEmbedResources]);
 }
 
 // some extensions are 'known' to be standalone/self-contained

src/command/render/template.ts

@@ -6,6 +6,7 @@
 */
 import { basename, join } from "path/mod.ts";
 import {
+  kEmbedResources,
   kHtmlMathMethod,
   kSelfContained,
   kSelfContainedMath,
@@ -113,7 +114,8 @@ function applyTemplatePatches(
   // make math evade self-contained for HTML and Reveal
   if (isHtmlDocOutput(format.pandoc) || isRevealjsOutput(format.pandoc)) {
     if (
-      ((flags && flags[kSelfContained]) || format.pandoc[kSelfContained]) &&
+      ((flags && flags[kSelfContained]) || format.pandoc[kSelfContained] ||
+        (flags && flags[kEmbedResources]) || format.pandoc[kEmbedResources]) &&
       !format.render[kSelfContainedMath]
     ) {
       const math = mathConfig(format, flags);

src/config/constants.ts

@@ -353,9 +353,10 @@ export const kInputFiles = "input-files";
 export const kAtxHeaders = "atx-headers";
 export const kMarkdownHeadings = "markdown-headings";
 export const kTemplate = "template";
-export const kStandalone = "standalone";
 export const kWrap = "wrap";
+export const kStandalone = "standalone";
 export const kSelfContained = "self-contained";
+export const kEmbedResources = "embed-resources";
 export const kIncludeBeforeBody = "include-before-body";
 export const kIncludeAfterBody = "include-after-body";
 export const kIncludeInHeader = "include-in-header";
@@ -476,6 +477,7 @@ export const kPandocDefaultsKeys = [
   kTemplate,
   kStandalone,
   kSelfContained,
+  kEmbedResources,
   kVariables,
   "metadata",
   kMetadataFiles,

src/config/types.ts

@@ -49,6 +49,7 @@ import {
   kCss,
   kDfPrint,
   kEcho,
+  kEmbedResources,
   kEngine,
   kEnvironmentProofTitle,
   kEnvironmentRemarkTitle,
@@ -159,6 +160,7 @@ import {
   kShiftHeadingLevelBy,
   kShortcodes,
   kSlideLevel,
+  kStandalone,
   kSyntaxDefinitions,
   kTableOfContents,
   kTblColwidths,
@@ -398,6 +400,7 @@ export interface FormatPandoc {
   [kOutputFile]?: string;
   standalone?: boolean;
   [kSelfContained]?: boolean;
+  [kEmbedResources]?: boolean;
   [kVariables]?: { [key: string]: unknown };
   [kAtxHeaders]?: boolean;
   [kMarkdownHeadings]?: boolean;
@@ -432,7 +435,9 @@ export interface FormatPandoc {
 export interface PandocFlags {
   to?: string;
   output?: string;
+  [kStandalone]?: boolean;
   [kSelfContained]?: boolean;
+  [kEmbedResources]?: boolean;
   pdfEngine?: string;
   pdfEngineOpts?: string[];
   makeIndexOpts?: string[];

src/execute/ojs/compile.ts

@@ -14,6 +14,7 @@ import { parseModule } from "observablehq/parser";
 import { Format, kDependencies } from "../../config/types.ts";
 import { MappedExecuteResult, PandocIncludes } from "../../execute/types.ts";
 import {
+  kEmbedResources,
   kIncludeAfterBody,
   kIncludeInHeader,
   kSelfContained,
@@ -128,7 +129,8 @@ export async function ojsCompile(
   }
 
   const projDir = project?.dir;
-  const selfContained = options.format.pandoc?.[kSelfContained] ?? false;
+  const selfContained = options.format.pandoc?.[kSelfContained] ??
+    options.format.pandoc?.[kEmbedResources] ?? false;
   const isHtmlMarkdown = isMarkdownOutput(options.format.pandoc, [
     "gfm",
     "commonmark",