typst brand yaml working under new schema

reverts changes that allowed logging font paths from lua
to the output recipe, because it's much simpler to do this in typescript

Author: gordonwoodhull

src/command/render/output-typst.ts

@@ -65,8 +65,7 @@ export function typstPdfOutputRecipe(
     const pdfOutput = join(inputDir, inputStem + ".pdf");
     const typstOptions: TypstCompileOptions = {
       quiet: options.flags?.quiet,
-      // use recipe that may have been modified, not format which has not
-      fontPaths: asArray(recipe.format.metadata?.[kFontPaths]) as string[],
+      fontPaths: asArray(format.metadata?.[kFontPaths]) as string[],
     };
     if (project?.dir) {
       typstOptions.rootDir = project.dir;

src/command/render/pandoc-dependencies-html.ts

@@ -138,25 +138,6 @@ export function readAndInjectDependencies(
   });
 }
 
-// this should be resolveMetadata returning an object
-// like {'output-recipe': metadata}
-export function resolveTypstFontPaths(
-  dependenciesFile: string,
-) {
-  const dependencyJsonStream = Deno.readTextFileSync(dependenciesFile);
-  const fontPaths: string[] = [];
-  lines(dependencyJsonStream).forEach((json) => {
-    if (json) {
-      const dependency = JSON.parse(json);
-      if (dependency.type === "typst-font-path") {
-        const path = dependency?.content?.path;
-        fontPaths.push(path);
-      }
-    }
-  });
-  return fontPaths;
-}
-
 export function resolveDependencies(
   extras: FormatExtras,
   inputDir: string,

src/command/render/pandoc.ts

@@ -139,7 +139,6 @@ import { kDefaultHighlightStyle } from "./constants.ts";
 import {
   HtmlPostProcessor,
   HtmlPostProcessResult,
-  OutputRecipe,
   PandocOptions,
   RunPandocResult,
 } from "./types.ts";
@@ -176,7 +175,6 @@ import { resolveAndFormatDate, resolveDate } from "../../core/date.ts";
 import { katexPostProcessor } from "../../format/html/format-html-math.ts";
 import {
   readAndInjectDependencies,
-  resolveTypstFontPaths,
   writeDependencies,
 } from "./pandoc-dependencies-html.ts";
 import {
@@ -420,13 +418,13 @@ export async function runPandoc(
     );
 
     const extras = await resolveExtras(
+      options.source,
       inputExtras,
       options.format,
       cwd,
       options.libDir,
       options.services.temp,
       dependenciesFile,
-      options.recipe,
       options.project,
     );
 
@@ -1283,13 +1281,13 @@ function cleanupPandocMetadata(metadata: Metadata) {
 }
 
 async function resolveExtras(
+  input: string,
   extras: FormatExtras, // input format extras (project, format, brand)
   format: Format,
   inputDir: string,
   libDir: string,
   temp: TempContext,
   dependenciesFile: string,
-  recipe: OutputRecipe,
   project: ProjectContext,
 ) {
   // resolve format resources
@@ -1346,15 +1344,25 @@ async function resolveExtras(
 
   // perform typst-specific merging
   if (isTypstOutput(format.pandoc)) {
-    extras.postprocessors = extras.postprocessors || [];
-    extras.postprocessors.push(async () => {
-      // gw: IMO this could be way more general as resolveMetadata
-      // returning all metadata found in the file
-      // then apply output-recipe and any others found using mergeConfigs
-      // would not be format-specific
-      const fontPaths = await resolveTypstFontPaths(dependenciesFile);
-      recipe.format.metadata[kFontPaths] = fontPaths;
-    });
+    const brand = await project.resolveBrand(input);
+    const fontdirs: Set<string> = new Set();
+    if (brand?.data.typography) {
+      const fonts = brand.data.typography.fonts || [];
+      for (const font of fonts) {
+        if (font.source === "file") {
+          for (const file of font.files || []) {
+            const path = typeof file === "object" ? file.path : file;
+            fontdirs.add(dirname(join(brand.brandDir, path)));
+          }
+        }
+      }
+    }
+    let fontPaths = format.metadata[kFontPaths] as Array<string> || [];
+    if (typeof fontPaths === "string") {
+      fontPaths = [fontPaths];
+    }
+    fontPaths.push(...fontdirs);
+    format.metadata[kFontPaths] = fontPaths;
   }
 
   // Process format resources

src/command/render/render.ts

@@ -191,7 +191,6 @@ export async function renderPandoc(
     metadata: executeResult.metadata,
     quiet,
     flags: context.options.flags,
-    recipe,
   };
 
   // add offset if we are in a project

src/command/render/types.ts

@@ -226,9 +226,6 @@ export interface PandocOptions {
 
   // optional offset from file to project dir
   offset?: string;
-
-  // output recipe (this makes many of above options redundant)
-  recipe: OutputRecipe;
 }
 
 // command line flags that we need to inspect

src/core/brand/brand.ts

@@ -177,16 +177,16 @@ export class Brand {
       return undefined;
     }
     const typography = this.data.typography;
-    if (name === "base") {
-      return typography.base;
+    switch (name) {
+      case "base":
+        return typography.base;
+      case "headings":
+        return typography.headings;
+      case "link":
+        return typography.link;
+      case "monospace":
+        return typography.monospace;
     }
-    if (name === "headings") {
-      return typography.headings;
-    }
-    if (name === "link") {
-      return typography.link;
-    }
-
     return undefined;
   }
 

src/resources/filters/quarto-post/typst-brand-yaml.lua

@@ -147,23 +147,6 @@ function render_typst_brand_yaml()
       if headings and headings.family then
         meta['title-font'] = headings.family
       end
-      -- really should be _brand.yml directory
-      local projectDir = pandoc.path.directory(quarto.doc.input_file)
-      local fontdirs = {}
-      for _, fontName in ipairs({'base', 'headings', 'monospace'}) do
-        local font = _quarto.modules.brand.get_typography(fontName)
-        if font and font.files then
-          local files = font.files
-          if type(files) == 'string' then files = {files} end
-          for _, file in ipairs(files) do
-            local dir = pandoc.path.directory(pandoc.path.normalize(pandoc.path.join({projectDir, file})))
-            fontdirs[dir] = true
-          end        
-        end
-      end
-      for fontdir, _ in pairs(fontdirs) do
-        quarto.doc.add_typst_font_path(fontdir)
-      end
       return meta
     end
   }

tests/docs/smoke-all/typst/brand-yaml/color/exper/_brand.yml

@@ -1,5 +1,5 @@
 color:
-  with:
+  palette:
     blue: "#447099"
     orange: "#EE6331"
     gray: "#404041"

tests/docs/smoke-all/typst/brand-yaml/color/homedepot/_brand.yml

@@ -1,5 +1,5 @@
 color:
-  with:
+  palette:
     orange: "#F96302"
     white: "#FFFFFF"
     black: "#000000"

tests/docs/smoke-all/typst/brand-yaml/color/posit/_brand.yml

@@ -1,5 +1,5 @@
 color:
-  with:
+  palette:
     blue: "#447099"
     orange: "#EE6331"
     gray: "#404041"