pandorga 1.6.9 → 1.7.1

data/assets/css/ledger/home.css

@@ -49,18 +49,6 @@
   }
 }
 
-/* Structural edge: the short rule the mockup runs along the top-left of the
-   featured band, marking it as the page's first statement after the hero. */
-.home-band--ruled::before {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 6rem;
-  height: 3px;
-  background: var(--color-primary);
-}
-
 /* ── Hero ── */
 /* The band was 3rem above the name and 4.5rem below, which read as the block
    sitting low in its own space. Equal above and below, at 60% of the larger
@@ -117,7 +105,7 @@
   }
 }
 
-/* Ambient pool beNewsreader the hero.
+/* Ambient pool behind the hero.
  *
  * Same weight as the earlier primary-container bloom, but keyed to neutral
  * ink/outline so it stays grey paper depth instead of a blue spotlight. */
@@ -418,7 +406,7 @@ html[data-theme="light"] .home-hero-plate {
   box-shadow: none;
 }
 
-/* Silk facet beNewsreader the portrait — restored; the Borders pass had hidden it. */
+/* Silk facet behind the portrait — restored; the Borders pass had hidden it. */
 .home-hero-shard {
   top: -2.25rem;
   right: -2rem;
@@ -576,8 +564,7 @@ html[data-theme="light"] .home-hero-plate {
    was the piece the band leads with, and a reader scanning down met four
    equal entries. It now takes the card rung of the surface ladder, is fenced
    by the same hairline every other panel on the site carries, and opens on a
-   rule in the primary — the structural edge this page already uses on
-   `.home-band--ruled` — so the eye stops at the top of it. The image inside is
+   rule in the primary, so the eye stops at the top of it. The image inside is
    inset by the panel's own padding rather than running to the band edge, which
    is the other half of the promotion: the lead contains its picture, the cards
    below are contained by theirs.
@@ -646,7 +633,7 @@ html[data-theme="light"] .home-hero-plate {
    cubist half of the identity.
 
    The pair is placed around the poster rather than across the card, because
-   the poster is opaque and a shard beNewsreader it is a shard nobody sees. The
+   the poster is opaque and a shard behind it is a shard nobody sees. The
    alpha takes the top-left, over the index column, where there is nothing but
    chrome and air. The beta takes the bottom-right and comes out from *under*
    the poster into the strip below it, which is the same move the index band
@@ -1050,8 +1037,8 @@ html[data-theme="light"] .home-hero-plate {
   box-sizing: border-box;
 }
 
-/* The triad top rule (`.ledger-card--edge-primary`), restated at a weight
-   that beats the light-paper hairline reset on `.ledger-system-card`. */
+/* A primary top rule, at a weight that beats the light-paper hairline
+   reset on `.ledger-system-card`. */
 :root .home-projects-bench .home-project-specimen,
 :root .home-projects-bench .home-project-specimen:hover {
   border-top: 2px solid var(--color-primary);
@@ -1568,11 +1555,11 @@ button.home-project-inventory-row {
    The figure is hidden until the markup lands, so a plate that never arrives
    leaves the panel with its title and its link rather than an empty frame. */
 
-/* Ambient pool beNewsreader the pair. Dark palette only, for the reason set out
+/* Ambient pool behind the pair. Dark palette only, for the reason set out
    above the hero's.
  *
- * The two panels sat side by side with a visible seam and nothing beNewsreader
- * them. One pool centred on that seam, beNewsreader both, lights the pair as a
+ * The two panels sat side by side with a visible seam and nothing behind
+ * them. One pool centred on that seam, behind both, lights the pair as a
  * single object rather than giving each panel an opening of its own. Held at
  * 5% against the hero's 7%: at equal strength the page reads as having two
  * openings, and only one of them is where it starts.
@@ -1580,7 +1567,7 @@ button.home-project-inventory-row {
  * Centred is right here and nowhere else — the seam is the thing being lit,
  * so the offset is vertical instead, which is what keeps the pool partly
  * outside the band it backs. `.home-band` already carries `position:
- * relative`; `isolation: isolate` is what stops `z-index: -1` escaping beNewsreader
+ * relative`; `isolation: isolate` is what stops `z-index: -1` escaping behind
  * the page background. */
 .home-band--index {
   isolation: isolate;
@@ -1642,7 +1629,7 @@ button.home-project-inventory-row {
    the set, rotating hue the way every other shard on the site does.
  *
  * They sit in the foot of the panel, under the title and the link: the plate
- * above carries an opaque background, so a shard beNewsreader it would be a shard
+ * above carries an opaque background, so a shard behind it would be a shard
  * nobody sees. `overflow: hidden` on the panel above keeps the negative
  * offsets out of the document scroll width, and the shared utility already
  * unmounts both below 640px. */
@@ -1663,21 +1650,12 @@ button.home-project-inventory-row {
   background: var(--color-primary);
 }
 
-.home-index-shard--gamma {
-  right: -3rem;
-  bottom: -3.5rem;
-  width: 11rem;
-  height: 11rem;
-  background: var(--color-tertiary);
-}
-
 /* Between the shard cut-off and the layout each panel is the full
    band wide on small screens, so a shard sized for half of it stops being a corner accent. */
 @media (max-width: 899px) {
 
   .home-index-shard,
-  .home-index-shard--beta,
-  .home-index-shard--gamma {
+  .home-index-shard--beta {
     width: 8rem;
     height: 8rem;
     bottom: -2.5rem;
@@ -1688,7 +1666,7 @@ button.home-project-inventory-row {
   padding-top: var(--space-xl);
 }
 
-/* The title and the link have to sit clear of the shard beNewsreader them. The
+/* The title and the link have to sit clear of the shard behind them. The
    plate is excluded because it is the one child that must stay full-bleed,
    and the shard because it is the thing being sat clear of. */
 .home-index-panel> :not(.home-index-plate):not(.shard-accent) {
@@ -1697,13 +1675,6 @@ button.home-project-inventory-row {
   margin-inline: var(--space-lg);
 }
 
-.home-index-note {
-  margin: 0;
-  font-size: var(--type-body);
-  line-height: 1.5;
-  flex: 1 1 auto;
-}
-
 .home-index-title {
   margin: 0;
   font-size: var(--type-card);

data/assets/css/ledger/projects.css

@@ -183,7 +183,7 @@
   position: relative;
   display: block;
   text-decoration: none;
-  /* Empty blueprint as texture beNewsreader the plate — not a second view mode. */
+  /* Empty blueprint as texture behind the plate — not a second view mode. */
   background-color: var(--color-panel-contrast);
   background-image:
     linear-gradient(color-mix(in srgb, var(--color-outline) 10%, transparent) 1px, transparent 1px),
@@ -350,7 +350,7 @@
 
 /* ══ Repositories ══
    The mockup closed on a source-code ledger. Its licence stamp, spec
-   download and commit hashes have nothing beNewsreader them; the repository rows
+   download and commit hashes have nothing behind them; the repository rows
    do — `github` is set on five of the seven projects. */
 .projects-page .projects-repos {
   margin-top: var(--space-3xl);

data/assets/css/ledger/sources.css

@@ -9,7 +9,7 @@
 
 /* ── Shards ──
    The page had no depth treatment of any kind, and it is the wrong shape for
-   the ambient pool the home bands carry: a pool beNewsreader a grid of many small
+   the ambient pool the home bands carry: a pool behind a grid of many small
    cards only darkens one corner of it. Shards instead, the two canonical
    polygons from base.css, one at each end of the run — top right above the
    grid, bottom left below it, the diagonal pair the CV dossier uses inside
@@ -56,7 +56,7 @@
 }
 
 /* A card is not positioned, so without this the shard — which is — would be
-   painted over the bottom row rather than beNewsreader it. The rule the whole
+   painted over the bottom row rather than behind it. The rule the whole
    family answers to is that a backdrop never touches the object in front of
    it. */
 .sources-body>.listing-card-grid,
@@ -65,7 +65,7 @@
   z-index: 1;
 }
 
-/* The foot of the page, beside the pagination. It reaches up beNewsreader the last
+/* The foot of the page, beside the pagination. It reaches up behind the last
    row of cards. In dark those cards are opaque again, so what shows is the
    wedge in the gutter and the band across the pagination strip. */
 .sources-foot-shard {

data/assets/css/ledger/writing.css

@@ -70,7 +70,7 @@
    The alpha sits bottom left, under the foot of the copy, the one corner the
    plate never reaches at any width. The beta is a true corner accent at the
    top right: it is offset far enough up that its visible part is the triangle
-   above the plate's top edge, and it tucks beNewsreader the plate as it descends
+   above the plate's top edge, and it tucks behind the plate as it descends
    rather than fighting it. Neither corner repeats the home panel's pair, and
    the hues are the only two this page has — `.page-accent--green` rebinds
    primary onto secondary, so green and ochre is the whole palette here. */

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/jekyll/plugins/lib/writing_entry.rb

@@ -15,7 +15,7 @@ require_relative "text_excerpt"
 # (standalone, for scripts/content/export-content-json.rb). They differ only in how
 # they derive the repo-relative path used for Git chronology, so each passes
 # its own. Everything downstream lives here, because a field added or a bug
-# fixed in one copy used to leave the other silently beNewsreader.
+# fixed in one copy used to leave the other silently behind.
 module WritingEntry
   XCITE_RE = /\{%-?\s*include\s+xcite\.html\s+key=["']([^"']+)["'][^%]*-?%\}/
 

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.9"
+  VERSION = "1.7.1"
 end

data/scripts/content/export-content-json.rb

@@ -269,7 +269,7 @@ def prune_stale_output_files!
   end
 
   stale.each(&:delete)
-  # Remove empty directories left beNewsreader by unpublish/rename.
+  # Remove empty directories left behind by unpublish/rename.
   OUTPUT_ROOT.find.sort.reverse_each do |path|
     next unless path.directory?
     next if path == OUTPUT_ROOT

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/render-parity/load-runtime.mjs

@@ -5,7 +5,7 @@
 // and a Jekyll build never executes them, which is how a block that renders
 // an element with no backing field ships green. This loader concatenates the
 // partials in the exact order _includes/page/content-runtime.html includes
-// them, evaluates the result beNewsreader a deliberately thin DOM shim, and hands
+// them, evaluates the result behind a deliberately thin DOM shim, and hands
 // back the same object 90-bootstrap.html returns to the browser.
 //
 // The shim is small on purpose: createElement, className, setAttribute,

data/scripts/test/test-css-structure.rb

@@ -72,6 +72,26 @@ sheets.each do |path|
   if source.include?("home-profile-summary")
     errors << "#{relative}: .home-profile-summary is unused"
   end
+
+  # Selectors that matched no template, runtime string, or current content.
+  # A comment may still name one; a ruleset may not.
+  retired = %w[
+    page-title
+    ledger-marker--primary
+    ledger-card--edge-primary
+    ledger-card--edge-secondary
+    ledger-card--edge-tertiary
+    ledger-section-rule
+    home-band--ruled
+    home-index-shard--gamma
+    home-index-note
+    post-content
+  ]
+  retired.each do |name|
+    next unless cleaned.match?(/[.#]#{Regexp.escape(name)}\b/)
+
+    errors << "#{relative}: .#{name} is unused"
+  end
 end
 
 fail!("CSS structure problems:\n  - #{errors.join("\n  - ")}") unless errors.empty?

data/scripts/test/test-discovery.rb

@@ -41,6 +41,11 @@ fail!("portrait srcset is not read") unless runtime.include?("record.srcset = sr
 fail!("portrait sources are not applied") unless runtime.include?("applyHeroPortraitSources")
 shell = ROOT.join("_layouts/shell.html").read
 fail!("shell missing JSON-LD") unless shell.include?("theme/json-ld.html")
+og_images = shell.scan(/property="og:image"/)
+fail!("shell emits #{og_images.size} og:image properties; one page, one image") unless og_images.size == 1
+image_meta = shell[/<meta name="image"[^>]*>/]
+fail!("shell missing name=image") unless image_meta
+fail!("name=image also sets property=og:image") if image_meta.include?("property=")
 fail!("discovery generator is not loaded from the plugin dir") unless ROOT.join("lib/pandorga/jekyll/plugins/discovery.rb").file?
 
 puts "PASS test-discovery"

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"