pandorga 1.6.8 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 355770a826a6483d7fbc1e014c76fc0ef865d23bba44674cc2153d25ed840a9c
-  data.tar.gz: 6fd8451064d1a3bc58a8ff4ed53b90606183644756c28984018ff20ae485a543
+  metadata.gz: b57cef517472b9cc15b3c3dcd4c13f119d495df666d167f9c741fff760b0e02b
+  data.tar.gz: '08c03b31d4b06e92df419ad20b091e63c31537fef06354a3af52abda07d5371a'
 SHA512:
-  metadata.gz: 331cf7a4687f241ee1b653e2435986bd511536ac3d1bfd21b65c91deef8969994999d8d65696e54a5725e7be41169d10ff9abac70475844a018480869cb19c1c
-  data.tar.gz: 88fc4c23d1cb5680b054c2e7028e374caab861977114ae235de52547b482de74b0c282957fc5bdf31764c9c3f11e39a65bbd4372ee7ee8fbf397b238b41f1c66
+  metadata.gz: c60041b89ca661282fbfbc53052e55b46405a23eb914b3aa35ead456628b35c6834efe9f369e3cb301f311e4fd7f82932cf57c403e7afbfb5c36bdf525c0ed2c
+  data.tar.gz: fbf2fc58bd6578caba218953e8203a393dae30b2913e8d0ed6beb051ff0b795397807b697d1ec72bcdda4b20f222c11e8f7ef1654b472a84e090c0378bd448de

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [1.7.0] — 2026-10-10
+
+### Added
+
+- A site can name its typefaces under `pandorga.fonts`. `title`, `body`,
+  and `mono` take a Google Fonts family, or a map with `family` and
+  optional `weights` and `italic`. `label` and `subtitle` are optional.
+  Omitted roles keep Cinzel Decorative, Newsreader, and Courier Prime.
+  The text faces still load after the first paint.
+
+## [1.6.9] — 2026-10-10
+
+### Fixed
+
+- Home list hydration no longer fills every band in one turn. The project
+  specimen measurement yields between projects, each band starts on its
+  own turn, and each home section introduction yields before it is
+  parsed. Dates reuse one formatter. The lists still render.
+
+No `pandorga:` config keys were added or renamed.
+
 ## [1.6.8] — 2026-10-10
 
 ### Fixed

data/_includes/content-runtime/40-listing.html

@@ -113,15 +113,23 @@
       return textExcerpt((item && item.body_markdown) || '');
     }
 
+    var dateFormatters = Object.create(null);
+
     function formatDate(value, locale) {
       if (!value) return '';
       var parts = String(value).slice(0, 10).split('-').map(Number);
       if (parts.length !== 3 || parts.some(isNaN)) return value;
-      return new Intl.DateTimeFormat(locale || 'en', {
-        day: '2-digit',
-        month: 'short',
-        year: 'numeric'
-      }).format(new Date(parts[0], parts[1] - 1, parts[2]));
+      var key = locale || 'en';
+      var formatter = dateFormatters[key];
+      if (!formatter) {
+        formatter = new Intl.DateTimeFormat(key, {
+          day: '2-digit',
+          month: 'short',
+          year: 'numeric'
+        });
+        dateFormatters[key] = formatter;
+      }
+      return formatter.format(new Date(parts[0], parts[1] - 1, parts[2]));
     }
 
     function chronologySortKey(item) {

data/_includes/content-runtime/60-fragments.html

@@ -353,15 +353,31 @@
       });
     }
 
+    function yieldToMain() {
+      return new Promise(function (resolve) {
+        if (typeof scheduler !== 'undefined' && typeof scheduler.yield === 'function') {
+          scheduler.yield().then(resolve);
+          return;
+        }
+        window.setTimeout(resolve, 0);
+      });
+    }
+
     function hydrateHomeSections() {
       var roots = Array.prototype.slice.call(
         document.querySelectorAll('[data-content-home-section]')
       );
       if (!roots.length) return Promise.resolve();
       return loadPageHeaders().then(function (sections) {
+        var chain = Promise.resolve();
         roots.forEach(function (root) {
-          applyHomeSection(root, sections[root.getAttribute('data-content-home-section')]);
+          chain = chain.then(function () {
+            return yieldToMain().then(function () {
+              applyHomeSection(root, sections[root.getAttribute('data-content-home-section')]);
+            });
+          });
         });
+        return chain;
       }).catch(function (error) {
         console.error(error);
         roots.forEach(function (root) { applyHomeSection(root, null); });
@@ -605,21 +621,31 @@
     }
 
     function hydratePageFragments() {
-      document.querySelectorAll('[data-content-page-header]').forEach(function (el) {
-        hydratePageHeader(el);
+      var headers = Array.prototype.slice.call(document.querySelectorAll('[data-content-page-header]'));
+      var chain = Promise.resolve();
+      headers.forEach(function (el) {
+        chain = chain.then(function () {
+          return yieldToMain().then(function () { return hydratePageHeader(el); });
+        });
       });
       document.querySelectorAll('[data-content-fragment]').forEach(function (el) {
         var path = el.getAttribute('data-content-fragment');
         if (!path) return;
-        mountMarkdownFragment(path, el, {
-          loadingText: el.getAttribute('data-content-loading') || 'Loading...',
-          errorText: el.getAttribute('data-content-error') || 'Content could not be loaded right now.'
+        chain = chain.then(function () {
+          return yieldToMain().then(function () {
+            return mountMarkdownFragment(path, el, {
+              loadingText: el.getAttribute('data-content-loading') || 'Loading...',
+              errorText: el.getAttribute('data-content-error') || 'Content could not be loaded right now.'
+            });
+          });
         });
       });
-      hydrateHomeSections();
-      hydrateBandArt();
-      hydrateContacts();
-      hydrateHeroPortrait();
+      chain.then(function () {
+        hydrateHomeSections();
+        hydrateBandArt();
+        hydrateContacts();
+        hydrateHeroPortrait();
+      });
     }
 
     function schedulePageFragmentHydration() {

data/_includes/theme/font-loader.html

@@ -1,62 +1,10 @@
-{% include theme/theme-context.liquid %}
-{% assign font_title = sf.title | default: "Lora" %}
-{% assign font_subtitle = sf.subtitle | default: "Lato" %}
-{% assign font_label = sf.label | default: "Ysabeau SC" %}
-{% assign font_body = sf.body | default: "Newsreader" %}
-{% assign font_mono = sf.mono %}
-{% assign font_code = sf.code %}
-{% assign font_cv_body = sf.cv_body %}
-{% assign title_slug = font_title | replace: ' ', '+' %}
-{% assign subtitle_slug = font_subtitle | replace: ' ', '+' %}
-{% assign label_slug = font_label | replace: ' ', '+' %}
-{% assign body_slug = font_body | replace: ' ', '+' %}
-{% assign mono_slug = font_mono | replace: ' ', '+' %}
-{% assign code_slug = font_code | replace: ' ', '+' %}
-{% assign cv_body_slug = font_cv_body | replace: ' ', '+' %}
-{% assign title_spec = sf.google_title_spec | default: "ital,wght@0,400;0,500;0,700;1,400;1,500" %}
-{% assign subtitle_spec = sf.google_subtitle_spec | default: "ital,wght@0,300;0,400;0,500;0,700;1,400;1,500" %}
-{% assign label_spec = sf.google_label_spec | default: "ital,wght@0,400;0,500;0,700;1,400;1,500" %}
-{% assign body_spec = sf.google_body_spec | default: "ital,wght@0,300;0,400;0,500;0,700;1,400;1,500;1,700" %}
-{% assign mono_spec = sf.google_mono_spec | default: "wght@400;500;700" %}
-{% assign code_spec = sf.google_code_spec | default: "wght@300;400;500;600;700" %}
-{% assign cv_body_spec = sf.google_cv_body_spec | default: "wght@300;400;500;600;700" %}
-{% comment %}
-  Build the Google Fonts URL without repeating a family. Title is always
-  requested. Body / label / subtitle / mono / code append only when their
-  family name differs from ones already on the URL.
-{% endcomment %}
-{% assign fonts_href = "https://fonts.googleapis.com/css2?family=" | append: title_slug | append: ":" | append: title_spec %}
-{% unless font_label == font_title %}
-  {% assign fonts_href = fonts_href | append: "&family=" | append: label_slug | append: ":" | append: label_spec %}
-{% endunless %}
-{% unless font_body == font_title or font_body == font_label %}
-  {% assign fonts_href = fonts_href | append: "&family=" | append: body_slug | append: ":" | append: body_spec %}
-{% endunless %}
-{% if font_mono and font_mono != '' %}
-  {% unless font_mono == font_title or font_mono == font_label or font_mono == font_body %}
-    {% assign fonts_href = fonts_href | append: "&family=" | append: mono_slug | append: ":" | append: mono_spec %}
-  {% endunless %}
-{% endif %}
-{% if font_code and font_code != '' %}
-  {% unless font_code == font_title or font_code == font_label or font_code == font_body or font_code == font_mono %}
-    {% assign fonts_href = fonts_href | append: "&family=" | append: code_slug | append: ":" | append: code_spec %}
-  {% endunless %}
-{% endif %}
-{% if font_subtitle != font_body and font_subtitle != font_label and font_subtitle != font_title %}
-  {% assign fonts_href = fonts_href | append: "&family=" | append: subtitle_slug | append: ":" | append: subtitle_spec %}
-{% endif %}
-{% if font_cv_body and font_cv_body != '' %}
-  {% unless font_cv_body == font_title or font_cv_body == font_label or font_cv_body == font_body or font_cv_body == font_subtitle %}
-    {% assign fonts_href = fonts_href | append: "&family=" | append: cv_body_slug | append: ":" | append: cv_body_spec %}
-  {% endunless %}
-{% endif %}
-{% assign fonts_href = fonts_href | append: "&display=swap" %}
 {% comment %}
   Not a render-blocking head link, and not the load event. A blocking
   sheet holds first paint on the font host. The load event holds the hero
   summary until images finish. The shell inserts this sheet after the
-  first paint. display=swap stays.
+  first paint. The URL always ends in &display=swap.
 {% endcomment %}
+{% assign fonts_href = site | pandorga_font_stylesheet %}
 <script>
   window.__pandorgaFontsHref = {{ fonts_href | jsonify }};
 </script>

data/_includes/theme/theme-vars-block.liquid

@@ -1,6 +1,7 @@
 {% comment %}
   Emits CSS custom properties for one palette. Expects `theme_name` (e.g. light, dark).
-  Colour roles come from _data/themes/<name>.yml; fonts / motion / geometry from shared.yml.
+  Colour roles come from _data/themes/<name>.yml. Type stacks come from
+  pandorga.fonts, then shared.yml. Motion and geometry come from shared.yml.
 {% endcomment %}
 {% assign theme_profile = site.data.themes[theme_name] %}
 {% if theme_profile == nil %}
@@ -17,34 +18,25 @@
 {% assign color_primary = tc.primary | default: "#1c5a7a" %}
 {% assign color_secondary = tc.secondary | default: "#287445" %}
 {% assign color_tertiary = tc.tertiary | default: "#746f30" %}
-{% assign font_title = sf.title | default: "Lora" %}
-{% assign font_subtitle = sf.subtitle | default: "Lato" %}
-{% assign font_label = sf.label | default: "Ysabeau SC" %}
-{% assign font_body = sf.body | default: "Newsreader" %}
-{% assign font_cv_body = sf.cv_body | default: "Newsreader" %}
 {% assign font_cv_body_weight = sf.cv_body_weight | default: 400 %}
-{% assign font_title_fallback = sf.title_fallback | default: "serif" %}
-{% assign font_subtitle_fallback = sf.subtitle_fallback | default: "serif" %}
-{% assign font_label_fallback = sf.label_fallback | default: "serif" %}
-{% assign font_body_fallback = sf.body_fallback | default: "Georgia, serif" %}
 {% assign bg_secondary = tn.background_secondary | default: tn.surface_container_low | default: "#f5f5f5" %}
 {% assign surface_value = tn.surface | default: "#ffffff" %}
 {% assign surface_variant_value = tn.surface_variant | default: "#e2e2e2" %}
 {% if theme_name == "light" %}:root,{% endif %}
   [data-theme="{{ theme_name }}"] {
-    --font-title: '{{ font_title }}', {{ font_title_fallback }};
-    --font-subtitle: '{{ font_subtitle }}', {{ font_subtitle_fallback }};
-    --font-label: '{{ font_label }}', {{ font_label_fallback }};
-    --font-body: '{{ font_body }}', {{ font_body_fallback }};
-    --font-cv-body: '{{ font_cv_body }}', {{ font_body_fallback }};
+    --font-title: {{ site | pandorga_font_stack: "title" }};
+    --font-subtitle: {{ site | pandorga_font_stack: "subtitle" }};
+    --font-label: {{ site | pandorga_font_stack: "label" }};
+    --font-body: {{ site | pandorga_font_stack: "body" }};
+    --font-cv-body: {{ site | pandorga_font_stack: "cv_body" }};
     --font-cv-body-weight: {{ font_cv_body_weight }};
-    --font-serif: '{{ font_title }}', {{ font_title_fallback }};
+    --font-serif: {{ site | pandorga_font_stack: "title" }};
     /* Content titles share the body face at 600 — Cinzel Decorative is
        reserved for page/display titles. */
     --font-content-title: var(--font-body);
     --font-sans: var(--font-body);
-    --font-mono: {% if sf.mono and sf.mono != '' %}'{{ sf.mono }}', {% endif %}ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, monospace;
-    --font-code: {% if sf.code and sf.code != '' %}'{{ sf.code }}', {% elsif sf.mono and sf.mono != '' %}'{{ sf.mono }}', {% endif %}ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, monospace;
+    --font-mono: {{ site | pandorga_font_stack: "mono" }};
+    --font-code: {{ site | pandorga_font_stack: "code" }};
 
     /* Motion. Named for what they are for: state change, poster filter
        warm-up, poster/plate scale. Shared across palettes. */

data/_layouts/home.html

@@ -121,7 +121,21 @@ layout: shell
     }
 
     function byDateDesc(a, b) {
-      return String(b.date || '').localeCompare(String(a.date || ''));
+      var left = String(b.date || '');
+      var right = String(a.date || '');
+      if (left > right) return 1;
+      if (left < right) return -1;
+      return 0;
+    }
+
+    function afterPaint() {
+      return new Promise(function (resolve) {
+        if (typeof scheduler !== 'undefined' && typeof scheduler.yield === 'function') {
+          scheduler.yield().then(resolve);
+          return;
+        }
+        window.setTimeout(resolve, 0);
+      });
     }
 
     function tagHrefFrom(element) {
@@ -175,8 +189,13 @@ layout: shell
     function draftFolios(posts) {
       var folios = Object.create(null);
       posts.slice().sort(function (a, b) {
-        var byDate = String(a.date || '').localeCompare(String(b.date || ''));
-        return byDate !== 0 ? byDate : String(a.slug || '').localeCompare(String(b.slug || ''));
+        var byDate = String(a.date || '') < String(b.date || '') ? -1 : (String(a.date || '') > String(b.date || '') ? 1 : 0);
+        if (byDate !== 0) return byDate;
+        var left = String(a.slug || '');
+        var right = String(b.slug || '');
+        if (left < right) return -1;
+        if (left > right) return 1;
+        return 0;
       }).forEach(function (entry, index) {
         folios[entry.slug] = index + 1;
       });
@@ -221,7 +240,8 @@ layout: shell
       element.appendChild(fragment);
     }
 
-    function fillBand(section, index) {
+    async function fillBand(section, index) {
+      await afterPaint();
       var kind = section.getAttribute('data-home-kind');
       var collection = section.getAttribute('data-home-collection');
       var limit = parseInt(section.getAttribute('data-home-limit') || '3', 10) || 3;
@@ -316,7 +336,7 @@ layout: shell
           fitted(best);
         }
 
-        function paintSpecimen(entry) {
+        async function paintSpecimen(entry) {
           specimenSlot.innerHTML = '';
           specimenSlot.appendChild(runtime.renderProjectSpecimen(asItem(entry), {
             href: entry.url || runtime.projectUrl(entry.slug),
@@ -324,10 +344,11 @@ layout: shell
             folio: positionOf(entry.slug) + 1,
             openLabel: 'Open project'
           }));
+          await afterPaint();
           ellipsizeSpecimenCopy(specimenSlot);
         }
 
-        function measureTallestSpecimen() {
+        async function measureTallestSpecimen() {
           var bench = specimenSlot.closest('.home-projects-bench');
           if (!bench) return 0;
           var width = specimenSlot.getBoundingClientRect().width;
@@ -348,7 +369,8 @@ layout: shell
           bench.appendChild(probe);
 
           var max = 0;
-          portfolio.forEach(function (entry, i) {
+          for (var i = 0; i < portfolio.length; i += 1) {
+            var entry = portfolio[i];
             probe.innerHTML = '';
             var card = runtime.renderProjectSpecimen(asItem(entry), {
               href: entry.url || runtime.projectUrl(entry.slug),
@@ -360,15 +382,16 @@ layout: shell
             card.style.minHeight = '0';
             probe.appendChild(card);
             max = Math.max(max, Math.ceil(card.getBoundingClientRect().height));
-          });
+            await afterPaint();
+          }
           probe.remove();
           return max;
         }
 
-        function lockSpecimenHeight() {
+        async function lockSpecimenHeight() {
           var bench = specimenSlot.closest('.home-projects-bench');
           if (!bench) return;
-          var tallest = measureTallestSpecimen();
+          var tallest = await measureTallestSpecimen();
           /* Floor at the CSS inventory minimum so six rows always clear
              three stacked resource icons (see --home-inventory-min-height). */
           var inventoryMin = 0;
@@ -425,8 +448,9 @@ layout: shell
           });
         }
 
-        lockSpecimenHeight();
-        paintSpecimen(entryBySlug(selectedSlug));
+        await lockSpecimenHeight();
+        await paintSpecimen(entryBySlug(selectedSlug));
+        await afterPaint();
         paintInventory();
 
         var resizeTimer = null;
@@ -437,8 +461,9 @@ layout: shell
             var nextWidth = Math.round(specimenSlot.getBoundingClientRect().width);
             if (nextWidth === lastMeasureWidth) return;
             lastMeasureWidth = nextWidth;
-            lockSpecimenHeight();
-            paintSpecimen(entryBySlug(selectedSlug));
+            lockSpecimenHeight().then(function () {
+              return paintSpecimen(entryBySlug(selectedSlug));
+            });
           }, 120);
         });
         return;
@@ -484,7 +509,11 @@ layout: shell
 
     runtime.loadJson('data/writing_index.json').then(function (entries) {
       var index = Array.isArray(entries) ? entries : [];
-      sections.forEach(function (section) { fillBand(section, index); });
+      var chain = Promise.resolve();
+      sections.forEach(function (section) {
+        chain = chain.then(function () { return fillBand(section, index); });
+      });
+      return chain;
     }).catch(function (error) {
       console.error(error);
       sections.forEach(function (section) {

data/examples/full/_config.yml

@@ -18,6 +18,15 @@ pandorga:
     base_url: ""
   home:
     hero_art: page/hero-default.html
+  fonts:
+    title: "Cinzel Decorative"
+    body:
+      family: "Newsreader"
+      weights: [300, 400, 500, 600, 700]
+    mono:
+      family: "Courier Prime"
+      weights: [400, 700]
+      italic: true
   taxonomies:
     articles:
       tags: [Writing]

data/lib/pandorga/fonts.rb

@@ -0,0 +1,235 @@
+# frozen_string_literal: true
+
+# Spec: docs/features/fonts.md
+# Refs: PLT-AC-30
+module Pandorga
+  # Google Fonts families for one site. An omitted role keeps the
+  # Architectural Ledger face. A set role replaces that face only.
+  module Fonts
+    module_function
+
+    ROLES = %i[title label body mono code subtitle cv_body].freeze
+    # These follow another role when the theme used one family for both
+    # and the site did not name them. Changing the body then changes the
+    # tagline, instead of leaving Newsreader behind.
+    FOLLOW = { subtitle: :body, code: :mono, cv_body: :body }.freeze
+    MONO_FALLBACK = "ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, monospace"
+    FAMILY_NAME = /\A[\p{L}\p{N}][\p{L}\p{N} .+\-]*\z/
+
+    DEFAULTS = {
+      title: { family: "Cinzel Decorative", spec: "wght@400;700;900", fallback: "serif" },
+      subtitle: {
+        family: "Newsreader",
+        spec: "ital,opsz,wght@0,6..72,300;0,6..72,400;0,6..72,500;0,6..72,600;0,6..72,700;1,6..72,300;1,6..72,400;1,6..72,500",
+        fallback: "serif"
+      },
+      label: { family: "Marcellus SC", spec: "wght@400;700", fallback: "serif" },
+      body: { family: "Newsreader", spec: "wght@300;400;500;600;700", fallback: "Georgia, serif" },
+      mono: { family: "Courier Prime", spec: "ital,wght@0,400;0,700;1,400;1,700", fallback: MONO_FALLBACK },
+      code: { family: "Courier Prime", spec: "ital,wght@0,300;0,400;0,700;1,400;1,700", fallback: MONO_FALLBACK },
+      cv_body: { family: "Newsreader", spec: "wght@300;400;500;600;700", fallback: "Georgia, serif" }
+    }.freeze
+
+    def resolve(site_fonts, theme_fonts = nil)
+      site = string_keys(site_fonts)
+      theme = string_keys(theme_fonts)
+      resolved = {}
+      ROLES.each do |role|
+        resolved[role] = resolve_role(role, site[role.to_s], theme)
+      end
+      FOLLOW.each do |role, source|
+        next if named?(site[role.to_s])
+        next unless same_family?(theme, role, source)
+
+        resolved[role] = resolved[role].merge(
+          family: resolved[source][:family],
+          spec: resolved[source][:spec]
+        )
+      end
+      resolved
+    end
+
+    def from_site(site)
+      pandorga = lookup(site, "pandorga")
+      fonts = lookup(pandorga, "fonts")
+      data = lookup(site, "data")
+      themes = lookup(data, "themes")
+      shared = lookup(themes, "shared")
+      resolve(fonts, lookup(shared, "fonts"))
+    end
+
+    def stylesheet_href(resolved)
+      seen = []
+      parts = []
+      ROLES.each do |role|
+        face = resolved[role]
+        family = face[:family].to_s
+        next if family.empty? || seen.include?(family)
+
+        seen << family
+        parts << "#{family.tr(' ', '+')}:#{face[:spec]}"
+      end
+      return "" if parts.empty?
+
+      "https://fonts.googleapis.com/css2?family=#{parts.join('&family=')}&display=swap"
+    end
+
+    def css_stack(resolved, role)
+      face = resolved[role.to_sym]
+      return "" unless face
+
+      quoted = face[:family].to_s.empty? ? nil : "'#{escape_css(face[:family])}'"
+      [quoted, face[:fallback].to_s.strip].compact.reject(&:empty?).join(", ")
+    end
+
+    def resolve_role(role, override, theme)
+      base = DEFAULTS.fetch(role)
+      family = text(theme[role.to_s])
+      family = base[:family] if family.empty?
+      spec = text(theme["google_#{role}_spec"])
+      spec = base[:spec] if spec.empty?
+      fallback = fallback_for(role, theme, base)
+
+      parsed = parse_override(override)
+      return { family: family, spec: spec, fallback: fallback } unless parsed
+
+      {
+        family: parsed[:family],
+        spec: spec_for(parsed, family, spec, base[:family]),
+        fallback: fallback
+      }
+    end
+
+    def fallback_for(role, theme, base)
+      if role == :cv_body
+        body = text(theme["body_fallback"])
+        return body unless body.empty?
+      end
+      own = text(theme["#{role}_fallback"])
+      own.empty? ? base[:fallback] : own
+    end
+
+    def spec_for(parsed, theme_family, theme_spec, default_family)
+      if parsed[:weights] || !parsed[:italic].nil?
+        weights = parsed[:weights] || [400, 700]
+        if parsed[:italic]
+          # Roman tuples first, then italic, so the axis list stays sorted.
+          tuples = weights.map { |weight| "0,#{weight}" } + weights.map { |weight| "1,#{weight}" }
+          "ital,wght@#{tuples.join(';')}"
+        else
+          "wght@#{weights.join(';')}"
+        end
+      elsif parsed[:family] == theme_family || parsed[:family] == default_family
+        theme_spec
+      else
+        "wght@400;700"
+      end
+    end
+
+    def parse_override(value)
+      case value
+      when String
+        family = clean_family(value)
+        family && { family: family, weights: nil, italic: nil }
+      when Hash
+        fields = string_keys(value)
+        family = clean_family(fields["family"] || fields["name"])
+        return nil unless family
+
+        { family: family, weights: parse_weights(fields["weights"]), italic: italic_flag(fields) }
+      end
+    end
+
+    def italic_flag(fields)
+      return nil unless fields.key?("italic")
+
+      value = fields["italic"]
+      case value
+      when true, "true", "yes", 1, "1" then true
+      else false
+      end
+    end
+
+    def parse_weights(value)
+      return nil if value.nil?
+
+      list = case value
+             when Array then value
+             when Integer then [value]
+             when String then value.split(",")
+             else return nil
+             end
+      numbers = []
+      list.each do |item|
+        text = item.to_s.strip
+        next if text.empty?
+        return nil unless text.match?(/\A\d+\z/)
+
+        number = text.to_i
+        return nil unless number.between?(1, 1000)
+
+        numbers << number
+      end
+      return nil if numbers.empty?
+
+      numbers.uniq.sort
+    end
+
+    def clean_family(value)
+      family = value.to_s.strip
+      return nil if family.empty? || !FAMILY_NAME.match?(family)
+
+      family
+    end
+
+    def named?(value)
+      !parse_override(value).nil?
+    end
+
+    def same_family?(theme, role, source)
+      role_family = text(theme[role.to_s])
+      source_family = text(theme[source.to_s])
+      role_family = DEFAULTS.fetch(role)[:family] if role_family.empty?
+      source_family = DEFAULTS.fetch(source)[:family] if source_family.empty?
+      role_family == source_family
+    end
+
+    def text(value)
+      value.to_s.strip
+    end
+
+    def string_keys(value)
+      return {} unless value.is_a?(Hash)
+
+      value.each_with_object({}) { |(key, item), out| out[key.to_s] = item }
+    end
+
+    def lookup(object, key)
+      return nil if object.nil?
+
+      string_key = key.to_s
+      if object.is_a?(Hash)
+        return object[string_key] if object.key?(string_key)
+        return object[string_key.to_sym] if object.key?(string_key.to_sym)
+
+        return nil
+      end
+
+      if object.respond_to?(:[])
+        begin
+          found = object[string_key]
+          return found unless found.nil?
+        rescue StandardError
+          nil
+        end
+      end
+      return object.public_send(string_key) if object.respond_to?(string_key)
+
+      nil
+    end
+
+    def escape_css(family)
+      family.to_s.gsub("\\", "\\\\\\\\").gsub("'", "\\\\'").gsub(/[\r\n]/, "")
+    end
+  end
+end

data/lib/pandorga/jekyll/plugins/fonts.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "../../fonts"
+
+# Liquid filters for pandorga.fonts. The stylesheet URL and the CSS stacks
+# come from one resolver so the head and the tokens cannot drift.
+module PandorgaFontFilter
+  def pandorga_font_stylesheet(site)
+    Pandorga::Fonts.stylesheet_href(Pandorga::Fonts.from_site(site))
+  end
+
+  def pandorga_font_stack(site, role)
+    Pandorga::Fonts.css_stack(Pandorga::Fonts.from_site(site), role)
+  end
+end
+
+Liquid::Template.register_filter(PandorgaFontFilter) if defined?(Liquid::Template)

data/lib/pandorga/registry/schema.yml

@@ -50,6 +50,27 @@ home:
       type: string
       notes: Include path for hero decoration (default `page/hero-default.html`)
 
+fonts:
+  title: "`pandorga.fonts`"
+  intro: |
+    Each value is a Google Fonts family name, or a map with `family` plus optional `weights` (integers) and `italic` (boolean). An omitted role keeps the Architectural Ledger face. `code` follows `mono`, and the tagline and CV body follow `body`, when the theme used one family for both. Text faces still load after the first paint, with `display=swap`. A `_data/themes/shared.yml` file remains the fallback under any role this map does not set.
+  keys:
+    title:
+      type: string or map
+      notes: Display face. Default family `Cinzel Decorative`, weights 400, 700, and 900
+    body:
+      type: string or map
+      notes: Reading face. Default family `Newsreader`, weights 300, 400, 500, 600, and 700
+    mono:
+      type: string or map
+      notes: Monospace face. Default family `Courier Prime`, roman and italic at 400 and 700
+    label:
+      type: string or map
+      notes: Optional chrome face. Default family `Marcellus SC`, weights 400 and 700
+    subtitle:
+      type: string or map
+      notes: Optional tagline face. Omitted, it follows `body` when the theme used the same family
+
 taxonomies:
   title: "`pandorga.taxonomies`"
   prose: |

data/lib/pandorga/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pandorga
-  VERSION = "1.6.8"
+  VERSION = "1.7.0"
 end

data/scripts/check_home_lists.mjs

@@ -4,7 +4,7 @@
 // Lighthouse run treats an empty home as a fast page.
 
 import { spawn } from 'node:child_process';
-import { mkdtemp, rm } from 'node:fs/promises';
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
 import { createServer } from 'node:net';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
@@ -90,17 +90,44 @@ class Cdp {
   }
 }
 
-async function waitForDevtools(port) {
-  for (let attempt = 0; attempt < 50; attempt += 1) {
-    try {
-      const response = await fetch(`http://127.0.0.1:${port}/json/version`);
-      if (response.ok) return response.json();
-    } catch (_error) {
-      // Chrome is still starting.
+async function activePort(profile) {
+  try {
+    const text = await readFile(join(profile, 'DevToolsActivePort'), 'utf8');
+    const value = Number(text.split('\n')[0]);
+    return Number.isInteger(value) && value > 0 ? value : null;
+  } catch (_error) {
+    return null;
+  }
+}
+
+async function waitForDevtools(port, chrome, profile) {
+  let stderr = '';
+  if (chrome.stderr) {
+    chrome.stderr.on('data', (chunk) => {
+      stderr += chunk;
+    });
+  }
+  for (let attempt = 0; attempt < 200; attempt += 1) {
+    if (chrome.exitCode !== null) {
+      throw new Error(`Chrome exited ${chrome.exitCode}: ${stderr.slice(-500)}`);
+    }
+    const opened = await activePort(profile);
+    const candidates = opened && opened !== port ? [port, opened] : [port];
+    for (const candidate of candidates) {
+      try {
+        const response = await fetch(`http://127.0.0.1:${candidate}/json/version`);
+        if (response.ok) return response.json();
+      } catch (_error) {
+        // Chrome is still starting.
+      }
     }
     await delay(100);
   }
-  throw new Error('Chrome DevTools did not answer');
+  const opened = await activePort(profile);
+  throw new Error(
+    `Chrome DevTools did not answer on ${port}` +
+    `${opened ? ` (DevToolsActivePort ${opened})` : ''}. ${stderr.slice(-500)}`
+  );
 }
 
 async function openSocket(url) {
@@ -155,14 +182,15 @@ async function main() {
     '--disable-dev-shm-usage',
     '--no-first-run',
     '--remote-allow-origins=*',
+    '--remote-debugging-address=127.0.0.1',
     `--remote-debugging-port=${port}`,
     `--user-data-dir=${profile}`,
     'about:blank'
-  ], { stdio: 'ignore' });
+  ], { stdio: ['ignore', 'ignore', 'pipe'] });
 
   let failed = false;
   try {
-    const version = await waitForDevtools(port);
+    const version = await waitForDevtools(port, chrome, profile);
     const ws = await openSocket(version.webSocketDebuggerUrl);
     const browser = new Cdp(ws);
     const created = await browser.send('Target.createTarget', { url: 'about:blank' });

data/scripts/generate-configuration-doc.rb

@@ -66,7 +66,7 @@ def generate(schema)
   out << "via `scripts/generate-configuration-doc.rb` (`PLT-AC-11`)."
   out << ""
 
-  %w[identity content home].each do |section|
+  %w[identity content home fonts].each do |section|
     data = schema.fetch(section)
     out << "## #{data.fetch('title')}"
     out << ""

data/scripts/test/test-examples-build.rb

@@ -90,6 +90,15 @@ end
     warn "FAIL test-examples-build: #{name} home is missing JSON-LD"
     exit 1
   end
+  ledger_faces = "family=Cinzel+Decorative:wght@400;700;900"
+  unless html.include?(ledger_faces) && html.include?("&display=swap") && html.include?("__pandorgaFontsHref")
+    warn "FAIL test-examples-build: #{name} home dropped the ledger font request"
+    exit 1
+  end
+  unless html.include?("--font-title: 'Cinzel Decorative', serif")
+    warn "FAIL test-examples-build: #{name} home dropped the title face"
+    exit 1
+  end
 end
 
 puts "PASS test-examples-build"

data/scripts/test/test-fonts.rb

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# PLT-AC-30. A site names its Google Fonts families in pandorga.fonts.
+# Omitted roles keep Cinzel Decorative, Newsreader, and Courier Prime.
+
+require "pathname"
+require "yaml"
+
+ROOT = Pathname.new(__dir__).join("..", "..").expand_path
+
+def fail!(message)
+  warn "FAIL test-fonts: #{message}"
+  exit 1
+end
+
+require_relative "../../lib/pandorga/fonts"
+
+DEFAULT_HREF = "https://fonts.googleapis.com/css2?family=Cinzel+Decorative:wght@400;700;900" \
+               "&family=Marcellus+SC:wght@400;700" \
+               "&family=Newsreader:wght@300;400;500;600;700" \
+               "&family=Courier+Prime:ital,wght@0,400;0,700;1,400;1,700" \
+               "&display=swap"
+
+theme = YAML.safe_load(ROOT.join("_data/themes/shared.yml").read).fetch("fonts")
+bare = Pandorga::Fonts.resolve(nil, nil)
+from_theme = Pandorga::Fonts.resolve(nil, theme)
+fail!("unset config dropped the ledger faces") unless Pandorga::Fonts.stylesheet_href(bare) == DEFAULT_HREF
+fail!("theme tokens drifted from the ledger faces") unless Pandorga::Fonts.stylesheet_href(from_theme) == DEFAULT_HREF
+
+fail!("title stack dropped Cinzel") unless Pandorga::Fonts.css_stack(from_theme, "title") == "'Cinzel Decorative', serif"
+fail!("body stack dropped the serif fallback") unless Pandorga::Fonts.css_stack(from_theme, "body") == "'Newsreader', Georgia, serif"
+fail!("mono stack dropped Courier Prime") unless Pandorga::Fonts.css_stack(from_theme, "mono").start_with?("'Courier Prime', ui-monospace")
+
+custom = Pandorga::Fonts.resolve(
+  {
+    "title" => "Fraunces",
+    "body" => { "family" => "Source Serif 4", "weights" => [600, 400, 400] },
+    "mono" => { "family" => "IBM Plex Mono", "weights" => [400, 500], "italic" => true }
+  },
+  theme
+)
+custom_href = Pandorga::Fonts.stylesheet_href(custom)
+fail!("custom title was not requested") unless custom_href.include?("family=Fraunces:wght@400;700")
+fail!("custom title kept the Cinzel axis") if custom_href.include?("Cinzel")
+fail!("body weights were not sorted") unless custom_href.include?("family=Source+Serif+4:wght@400;600")
+fail!("mono italic axis is wrong") unless custom_href.include?("family=IBM+Plex+Mono:ital,wght@0,400;0,500;1,400;1,500")
+fail!("unset label left Marcellus") unless custom_href.include?("family=Marcellus+SC:wght@400;700")
+fail!("body change left the tagline on Newsreader") unless Pandorga::Fonts.css_stack(custom, "subtitle").start_with?("'Source Serif 4'")
+fail!("code face did not follow mono") unless Pandorga::Fonts.css_stack(custom, "code").start_with?("'IBM Plex Mono'")
+
+kept = Pandorga::Fonts.resolve({ "title" => "Cinzel Decorative" }, theme)
+fail!("naming the default title changed the stylesheet") unless Pandorga::Fonts.stylesheet_href(kept) == DEFAULT_HREF
+
+ignored = Pandorga::Fonts.resolve({ "title" => "Fraunces</style>" }, theme)
+fail!("a broken family name was accepted") unless Pandorga::Fonts.stylesheet_href(ignored) == DEFAULT_HREF
+
+example = YAML.safe_load(ROOT.join("examples/full/_config.yml").read)
+example_fonts = example.dig("pandorga", "fonts")
+fail!("full example has no pandorga.fonts") unless example_fonts.is_a?(Hash)
+fail!("full example changed the measured faces") unless Pandorga::Fonts.stylesheet_href(Pandorga::Fonts.resolve(example_fonts, theme)) == DEFAULT_HREF
+
+loader = ROOT.join("_includes/theme/font-loader.html").read
+shell = ROOT.join("_layouts/shell.html").read
+fail!("loader no longer hands the href to the shell") unless loader.include?("__pandorgaFontsHref")
+fail!("loader preloads the text faces") if loader.include?('rel="preload"')
+fail!("text faces wait for the load event") if loader.include?("addEventListener('load'")
+preconnect_at = shell.index("fonts.googleapis.com")
+script_at = shell.index("theme/critical-preload.html")
+fail!("font host is not preconnected before the preload script") unless preconnect_at && script_at && preconnect_at < script_at
+fail!("text faces are not requested after the first paint") unless shell.include?("requestAnimationFrame") && shell.include?("__pandorgaFontsHref")
+
+spec = ROOT.join("docs/spec.md").read
+fail!("spec is missing PLT-AC-30") unless spec.include?("PLT-AC-30")
+fail!("configuration reference omits pandorga.fonts") unless ROOT.join("docs/configuration.md").read.include?("pandorga.fonts")
+
+puts "PASS test-fonts"

data/scripts/test/test-home-lists.rb

@@ -43,7 +43,14 @@ end
 
 home = ROOT.join("_layouts/home.html").read
 fail!("home paint still runs before the runtime") unless home.scan("pandorga:runtime").length >= 2
-fail!("home bands still return when the runtime is missing") if home.include?("if (!runtime) return")
+fail!("home bands still fill in one turn") unless home.include?("scheduler.yield") && home.include?("await afterPaint()")
+fail!("specimen measurement does not yield") unless home.include?("await measureTallestSpecimen()")
+fail!("home still fills every band inside one callback") if home.include?("sections.forEach(function (section) { fillBand(section, index); })")
+fragments = ROOT.join("_includes/content-runtime/60-fragments.html").read
+fail!("home section markdown still runs in one turn") unless fragments.include?("function yieldToMain()") &&
+  fragments.include?("return yieldToMain().then(function () {")
+listing = ROOT.join("_includes/content-runtime/40-listing.html").read
+fail!("date formatting builds a new formatter per card") unless listing.include?("dateFormatters")
 
 marked = ROOT.join("_includes/content-runtime/00-config.html").read
 fail!("markdown library no longer defers") unless marked.include?("<script defer ")
@@ -67,6 +74,8 @@ fail!("probe ignores the project inventory") unless probe.include?("#home-projec
 fail!("probe ignores article cards") unless probe.include?("#home-articles .home-featured, #home-articles .ledger-card")
 fail!("probe ignores the phone viewport") unless probe.include?("name: 'mobile'")
 fail!("probe ignores the desktop viewport") unless probe.include?("name: 'desktop'")
+fail!("probe does not pin DevTools to IPv4") unless probe.include?("--remote-debugging-address=127.0.0.1")
+fail!("probe gives Chrome only a few seconds to open DevTools") unless probe.include?("attempt < 200")
 
 _out, err, status = Open3.capture3("node", "--check", ROOT.join("scripts/check_home_lists.mjs").to_s)
 fail!("home list probe is not valid JavaScript\n#{err}") unless status.success?

data/scripts/validate.sh

@@ -64,6 +64,7 @@ TESTS=(
   scripts/test/test-home-articles.rb
   scripts/test/test-rascunhos-licence.rb
   scripts/test/test-pwa-icons.rb
+  scripts/test/test-fonts.rb
   scripts/test/test-css-delivery.rb
   scripts/test/test-discovery.rb
 )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandorga
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.7.0
 platform: ruby
 authors:
 - The Pandorga contributors
@@ -288,6 +288,7 @@ files:
 - lib/pandorga/commands/serve.rb
 - lib/pandorga/commands/studio_schema.rb
 - lib/pandorga/discovery.rb
+- lib/pandorga/fonts.rb
 - lib/pandorga/hero_summary.rb
 - lib/pandorga/jekyll.rb
 - lib/pandorga/jekyll/generator.rb
@@ -303,6 +304,7 @@ files:
 - lib/pandorga/jekyll/plugins/content_writing_index.rb
 - lib/pandorga/jekyll/plugins/content_writing_paths.rb
 - lib/pandorga/jekyll/plugins/discovery.rb
+- lib/pandorga/jekyll/plugins/fonts.rb
 - lib/pandorga/jekyll/plugins/force_utf8_encoding.rb
 - lib/pandorga/jekyll/plugins/git_chronology.rb
 - lib/pandorga/jekyll/plugins/git_metadata.rb
@@ -422,6 +424,7 @@ files:
 - scripts/test/test-export-content-json-incremental.rb
 - scripts/test/test-export.rb
 - scripts/test/test-exported-fields-reach-the-view.rb
+- scripts/test/test-fonts.rb
 - scripts/test/test-form-control-theming.rb
 - scripts/test/test-git-chronology.rb
 - scripts/test/test-hero-name.rb