import all brand.typography.fonts

whether or not they are referenced in typography elements

fixes #11929

Author: gordonwoodhull

news/changelog-1.9.md

@@ -18,6 +18,7 @@ All changes included in 1.9:
 
 ### `html`
 
+- ([#11929](https://github.com/quarto-dev/quarto-cli/issues/11929)): Import all `brand.typography.fonts` in CSS, whether or not fonts are referenced by typography elements.
 - ([#13413](https://github.com/quarto-dev/quarto-cli/issues/13413)): Fix uncentered play button in `video` shortcodes from cross-reference divs. (author: @bruvellu)
 
 ### `typst`

src/core/sass/brand.ts

@@ -15,7 +15,6 @@ import {
 } from "../../config/types.ts";
 import { ProjectContext } from "../../project/types.ts";
 import {
-  BrandFont,
   // BrandFontBunny,
   BrandFontCommon,
   BrandFontFile,
@@ -338,104 +337,6 @@ const brandTypographyLayer = (
   const typographyImports: Set<string> = new Set();
   const fonts = brand.data?.typography?.fonts ?? [];
 
-  const getFontFamilies = (family: string | undefined) => {
-    return fonts.filter((font) =>
-      typeof font !== "string" && font.family === family
-    );
-  };
-
-  const resolveGoogleFontFamily = (
-    font: BrandFont[],
-  ): string | undefined => {
-    let googleFamily = "";
-    for (const _resolvedFont of font) {
-      const safeResolvedFont = Zod.BrandFontGoogle.safeParse(_resolvedFont);
-      if (!safeResolvedFont.success) {
-        return undefined;
-      }
-      const resolvedFont = safeResolvedFont.data;
-      const thisFamily = resolvedFont.family;
-      if (!thisFamily) {
-        continue;
-      }
-      if (googleFamily === "") {
-        googleFamily = thisFamily;
-      } else if (googleFamily !== thisFamily) {
-        throw new Error(
-          `Inconsistent Google font families found: ${googleFamily} and ${thisFamily}`,
-        );
-      }
-      typographyImports.add(googleFontImportString(resolvedFont));
-    }
-    if (googleFamily === "") {
-      return undefined;
-    }
-    return googleFamily;
-  };
-
-  const resolveBunnyFontFamily = (
-    font: BrandFont[],
-  ): string | undefined => {
-    let bunnyFamily = "";
-    for (const _resolvedFont of font) {
-      const safeResolvedFont = Zod.BrandFontBunny.safeParse(_resolvedFont);
-      if (!safeResolvedFont.success) {
-        return undefined;
-      }
-      const resolvedFont = safeResolvedFont.data;
-      // Typescript's type checker doesn't understand that it's ok to attempt
-      // to access a property that might not exist on a type when you're
-      // only testing for its existence.
-
-      const thisFamily = resolvedFont.family;
-      if (!thisFamily) {
-        continue;
-      }
-      if (bunnyFamily === "") {
-        bunnyFamily = thisFamily;
-      } else if (bunnyFamily !== thisFamily) {
-        throw new Error(
-          `Inconsistent Bunny font families found: ${bunnyFamily} and ${thisFamily}`,
-        );
-      }
-      typographyImports.add(bunnyFontImportString(resolvedFont));
-    }
-    if (bunnyFamily === "") {
-      return undefined;
-    }
-    return bunnyFamily;
-  };
-
-  const resolveFileFontFamily = (
-    brand: Brand,
-    font: BrandFont[],
-  ): string | undefined => {
-    let fileFamily = "";
-    for (const _resolvedFont of font) {
-      const safeResolvedFont = Zod.BrandFontFile.safeParse(_resolvedFont);
-      if (!safeResolvedFont.success) {
-        return undefined;
-      }
-      const resolvedFont = safeResolvedFont.data;
-      const thisFamily = resolvedFont.family;
-      if (!thisFamily) {
-        continue;
-      }
-      if (fileFamily === "") {
-        fileFamily = thisFamily;
-      } else if (fileFamily !== thisFamily) {
-        throw new Error(
-          `Inconsistent Files font families found: ${fileFamily} and ${thisFamily}`,
-        );
-      }
-      typographyImports.add(fileFontImportString(brand, resolvedFont));
-    }
-    if (fileFamily === "") {
-      return undefined;
-    }
-    return fileFamily;
-  };
-
   type HTMLFontInformation = { [key: string]: unknown };
 
   type FontKind =
@@ -461,11 +362,7 @@ const brandTypographyLayer = (
     //   that we can attempt to extract the family from.
     const family =
       (resolvedFontOptions as Record<string, string | undefined>).family;
-    const font = getFontFamilies(family);
-    result.family = resolveGoogleFontFamily(font) ??
-      resolveBunnyFontFamily(font) ??
-      resolveFileFontFamily(brand, font) ??
-      family;
+    result.family = family;
     for (
       const entry of [
         "line-height",
@@ -576,6 +473,50 @@ const brandTypographyLayer = (
     ],
   };
 
+  for (const font of fonts) {
+    switch (font.source) {
+      case "google": {
+        const safeResolvedFont = Zod.BrandFontGoogle.safeParse(font);
+        if (!safeResolvedFont.success) {
+          continue;
+        }
+        const resolvedFont = safeResolvedFont.data;
+        const thisFamily = resolvedFont.family;
+        if (!thisFamily) {
+          continue;
+        }
+        typographyImports.add(googleFontImportString(resolvedFont));
+        break;
+      }
+      case "bunny": {
+        const safeResolvedFont = Zod.BrandFontBunny.safeParse(font);
+        if (!safeResolvedFont.success) {
+          continue;
+        }
+        const resolvedFont = safeResolvedFont.data;
+        const thisFamily = resolvedFont.family;
+        if (!thisFamily) {
+          continue;
+        }
+        typographyImports.add(bunnyFontImportString(resolvedFont));
+        break;
+      }
+      case "file": {
+        const safeResolvedFont = Zod.BrandFontFile.safeParse(font);
+        if (!safeResolvedFont.success) {
+          continue;
+        }
+        const resolvedFont = safeResolvedFont.data;
+        const thisFamily = resolvedFont.family;
+        if (!thisFamily) {
+          continue;
+        }
+        typographyImports.add(fileFontImportString(brand, resolvedFont));
+        break;
+      }
+    }
+  }
+
   for (
     const kind of [
       // more specific entries go first

src/resources/schema/definitions.yml

@@ -3168,7 +3168,7 @@
     #
     # in Quarto, the default source for typst is `google`
     # and the default source for html formats is `bunny`
-    - ref: brand-font-common
+
 - id: brand-font-weight
   description: A font weight.
   enum:
@@ -3237,6 +3237,7 @@
     properties:
       source:
         enum: [system]
+    required: [source]
 
 - id: brand-font-google
   description: A font definition from Google Fonts.
@@ -3247,6 +3248,7 @@
     properties:
       source:
         enum: [google]
+    required: [source]
 
 - id: brand-font-bunny
   description: A font definition from fonts.bunny.net.
@@ -3257,6 +3259,7 @@
     properties:
       source:
         enum: [bunny]
+    required: [source]
 
 - id: brand-font-file
   description: A method for providing font files directly, either locally or from an online location.

tests/docs/smoke-all/brand/logo/source-sans-pro/brand.yml

@@ -0,0 +1,23 @@
+---
+title: Load all brand fonts
+
+brand:
+  typography:
+    fonts:
+      - family: Barrio
+        source: google
+      - family: Roboto
+        source: google
+    base: Roboto
+    # headings: Barrio
+---
+
+## Base font
+
+{{< lipsum 1 >}}
+
+## Barrio font
+
+::: {style="font-family: Barrio"}
+{{< lipsum 1 >}}
+:::