Merge branch 'main' of github.com:quarto-dev/quarto-cli into main

Author: jjallaire

src/command/render/filters.ts

@@ -108,6 +108,10 @@ export function removeFilterParmas(metadata: Metadata) {
   delete metadata[kQuartoParams];
 }
 
+export function quartoInitFilter() {
+  return resourcePath("filters/quarto-init/quarto-init.lua");
+}
+
 export function quartoPreFilter() {
   return resourcePath("filters/quarto-pre/quarto-pre.lua");
 }
@@ -491,14 +495,21 @@ export function resolveFilters(
   options: PandocOptions,
 ): QuartoFilter[] | undefined {
   // build list of quarto filters
+
+  // The default order of filters will be
+  // quarto-init
+  // quarto-authors
+  // user filters
+  // extension filters
+  // quarto-filters <quarto>
+  // citeproc
+  // quarto-finalizer
+
   const quartoFilters: string[] = [];
   quartoFilters.push(quartoPreFilter());
   if (crossrefFilterActive(options)) {
     quartoFilters.push(crossrefFilter());
   }
-  if (authorsFilterActive(options)) {
-    quartoFilters.push(authorsFilter());
-  }
   quartoFilters.push(layoutFilter());
   quartoFilters.push(quartoPostFilter());
 
@@ -519,19 +530,27 @@ export function resolveFilters(
       ...filters.slice(quartoLoc + 1),
     ];
   } else {
-    filters.unshift(...quartoFilters);
+    filters.push(...quartoFilters);
+  }
+
+  // The author filter, if enabled
+  if (authorsFilterActive(options)) {
+    filters.unshift(authorsFilter());
   }
 
+  // The initializer for Quarto
+  filters.unshift(quartoInitFilter());
+
+  // The finalizer for Quarto
+  filters.push(quartoFinalizeFilter());
+
   // citeproc at the very end so all other filters can interact with citations
   filters = filters.filter((filter) => filter !== "citeproc");
   const citeproc = citeMethod(options) === "citeproc";
   if (citeproc) {
     filters.push("citeproc");
   }
 
-  // The finalizer for Quarto
-  filters.push(quartoFinalizeFilter());
-
   // return filters
   if (filters.length > 0) {
     return filters;

src/command/tools/tools/tinytex.ts

@@ -335,7 +335,7 @@ This will instruct TeX Live to create symlinks that it needs in <bin_dir_on_path
     const envPath = Deno.env.get("QUARTO_TEXLIVE_BINPATH");
     if (envPath) {
       paths.push(envPath);
-    } else {
+    } else if (Deno.build.os !== "windows") {
       paths.push(...suggestUserBinPaths());
     }
     const binPathMessage = envPath
@@ -359,7 +359,7 @@ This will instruct TeX Live to create symlinks that it needs in <bin_dir_on_path
             }
           }
         }
-        if (!result?.success) {
+        if (result && !result.success) {
           warning(message);
         }
       },

src/extension/extension-shared.ts

@@ -5,7 +5,7 @@
 *
 */
 import SemVer from "semver/mod.ts";
-import { Metadata } from "../config/types.ts";
+import { Metadata, PandocFilter } from "../config/types.ts";
 import { ProjectContext } from "../project/types.ts";
 
 export const kCommon = "common";
@@ -24,7 +24,7 @@ export interface Extension extends Record<string, unknown> {
   path: string;
   contributes: {
     shortcodes?: string[];
-    filters?: string[];
+    filters?: PandocFilter[];
     format?: Record<string, unknown>;
   };
 }

src/extension/extension.ts

@@ -13,7 +13,7 @@ import { kProjectType, ProjectContext } from "../project/types.ts";
 import { isSubdir } from "fs/_util.ts";
 
 import { dirname, join, normalize } from "path/mod.ts";
-import { Metadata } from "../config/types.ts";
+import { Metadata, PandocFilter } from "../config/types.ts";
 import { resolvePathGlobs } from "../core/path.ts";
 import { toInputRelativePaths } from "../project/project-shared.ts";
 import { projectType } from "../project/types/project-types.ts";
@@ -355,7 +355,7 @@ function readExtension(
 
   // The items that can be contributed
   const shortcodes = contributes?.shortcodes as string[] || [];
-  const filters = contributes?.filters as string[] || [];
+  const filters = contributes?.filters as PandocFilter[] || [];
   const format = contributes?.format as Metadata || [];
 
   // Process the special 'common' key by merging it

src/project/types/website/website-meta.ts

@@ -149,6 +149,9 @@ export function metadataHtmlPostProcessor(
       },
     };
 
+    // Resources that we find during this post processing
+    const resources: string[] = [];
+
     // go through each metadata provider and emit metadata
     [
       openGraphMetadataProvider,
@@ -180,7 +183,10 @@ export function metadataHtmlPostProcessor(
       }
 
       // Convert image to absolute href and add height and width
-      resolveImageMetadata(source, project, format, metadata);
+      const imagePath = resolveImageMetadata(source, project, format, metadata);
+      if (imagePath) {
+        resources.push(imagePath);
+      }
 
       // Allow the provider to resolve any defaults
       if (provider.resolveDefaults) {
@@ -209,7 +215,10 @@ export function metadataHtmlPostProcessor(
     // Process any pipelined markdown
     pipeline.processRenderedMarkdown(doc);
 
-    return Promise.resolve(kHtmlEmptyPostProcessResult);
+    return Promise.resolve({
+      resources,
+      supporting: [],
+    });
   };
 }
 
@@ -296,6 +305,8 @@ function resolveImageMetadata(
     if (altText && !metadata[kImageAlt]) {
       metadata[kImageAlt] = altText;
     }
+
+    return imgMeta.path;
   }
 }
 
@@ -348,6 +359,7 @@ function imageMetadata(
 
     // read the image size
     return {
+      path: image,
       href: `${baseUrl}${image}`,
       height: size?.height,
       width: size?.width,
@@ -364,6 +376,7 @@ function imageMetadata(
 
     // resolve the image path into an absolute href
     return {
+      path: imageProjectRelative,
       href: joinUrl(baseUrl, imageProjectRelative),
       height: size?.height,
       width: size?.width,

src/resources/filters/quarto-pre/includes.lua renamed to src/resources/filters/quarto-init/includes.lua

@@ -0,0 +1,29 @@
+-- quarto-init.lua
+-- Copyright (C) 2020 by RStudio, PBC
+
+-- required version
+PANDOC_VERSION:must_be_at_least '2.13'
+
+-- [import]
+function import(script)
+  local path = PANDOC_SCRIPT_FILE:match("(.*[/\\])")
+  dofile(path .. script)
+end
+import("../common/base64.lua")
+import("../common/filemetadata.lua")
+import("../common/meta.lua")
+import("../common/params.lua")
+import("includes.lua")
+import("resourcerefs.lua")
+-- [/import]
+
+-- initialize params
+initParams()
+
+return {
+  readIncludes(),
+  resourceRefs(),
+}
+
+
+

src/resources/filters/quarto-init/quarto-init.lua

@@ -50,7 +50,6 @@ import("../common/log.lua")
 import("../common/url.lua")
 import("../common/paths.lua")
 import("results.lua")
-import("includes.lua")
 import("options.lua")
 import("shortcodes.lua")
 import("shortcodes-handlers.lua")
@@ -60,7 +59,6 @@ import("table-rawhtml.lua")
 import("table-captions.lua")
 import("table-colwidth.lua")
 import("theorems.lua")
-import("resourcerefs.lua")
 import("resourcefiles.lua")
 import("book-numbering.lua")
 import("book-links.lua")
@@ -83,7 +81,6 @@ initParams()
 initShortcodeHandlers()
 
 return {
-  readIncludes(),
   initOptions(),
   shortCodesBlocks(),  
   shortCodesInlines(),  
@@ -101,7 +98,6 @@ return {
     indexBookFileTargets(),
     bookNumbering(),
     includePaths(),
-    resourceRefs(),
     resourceFiles(),
     figures(),
     theorems(),