@datatechsolutions/tympan-tokens 0.4.0 → 0.4.2

package/README.md

@@ -15,16 +15,55 @@ npm test -w @datatechsolutions/tympan-tokens           # vitest: colour math, ra
 
 | Output | Content |
 |---|---|
-| `@datatechsolutions/tympan-tokens/tokens.css` | every `--ty-*` custom property, in `@layer tympan.tokens` |
+| `@datatechsolutions/tympan-tokens/tokens.css` | every `--ty-*` custom property, in `@layer tympan.tokens`; starts with `@import './fonts.css'` |
+| `@datatechsolutions/tympan-tokens/fonts.css` | `@font-face` rules (font-display swap, unicode-range slices) for the base stacks and the per-script Noto families (CJK in `@datatechsolutions/tympan-fonts-cjk/fonts.css`) |
+| `@datatechsolutions/tympan-tokens/fonts/` | the bundled woff2 files, their licences (`<family>/OFL.txt`) and `manifest.json` (family, weights, version, origin, licence, size) |
 | `@datatechsolutions/tympan-tokens/tokens.json` | resolved values: base, density steps, each preset × mode (× high contrast) |
 | `@datatechsolutions/tympan-tokens/dtcg/*.tokens.json` | W3C DTCG trees (2025.10 format) of every set, as fed to Style Dictionary (`dtcg/print/` for the print themes) |
 | `@datatechsolutions/tympan-tokens/print-themes.css` | opt-in: every print book style as a UI theme (`data-ty-theme="print-<style>"`), light, dark and high contrast |
 | `@datatechsolutions/tympan-tokens/print-themes/<theme>.css` | opt-in: one print theme per file (for example `print-themes/print-suico.css`) |
-| `@datatechsolutions/tympan-tokens/print-themes.json` | name, label, font stylesheet URL and CSS file of each print theme |
+| `@datatechsolutions/tympan-tokens/print-themes.json` | name, label, CSS file and (legacy) Google Fonts URL of each print theme |
 | `@datatechsolutions/tympan-tokens/values` | the resolved values as a typed JS module (`values`, `cssVar()`) |
 | `@datatechsolutions/tympan-tokens` | the generator: colour math, `resolveTheme`, presets, `generateThemeCss`, DTCG conversion |
 | `dist/contrast-report.md` | WCAG ratio and APCA Lc of every declared pair, per preset and mode |
 
+## Fonts
+
+Every family a theme names ships in the package as woff2 (89 families, SIL
+OFL 1.1, from Google Fonts; see `THIRD_PARTY_NOTICES.md` and
+`fonts/manifest.json`): Source Serif 4, IBM Plex Sans and Mono, the Noto
+families of the per-script `:lang()` stacks (Arabic, Hebrew, Indic, Thai,
+Ethiopic …) and every print theme's families. Files are sliced by
+`unicode-range` the way Google Fonts serves them; a browser downloads a slice
+only when text uses that face and falls in its range.
+
+The CJK Noto families (Noto Sans and Serif JP, SC, TC, KR; about 41 MB) are
+the exception: the stacks and `:lang()` rules still name them, but their
+files and `@font-face` rules are in the optional package
+`@datatechsolutions/tympan-fonts-cjk` (`CJK_FONT_FAMILIES`,
+`CJK_FONT_SPECS`). Without it, CJK text falls back to the system faces (macOS
+and Windows cover CJK); with it, the bundled faces load:
+
+```ts
+import '@datatechsolutions/tympan-fonts-cjk/fonts.css'
+```
+
+- `tokens.css` imports `./fonts.css` (base stacks and non-CJK Noto); a bundler
+  resolves the relative URLs (`../fonts/<family>/<file>.woff2`) and emits the
+  files as assets. `@datatechsolutions/tympan/styles.css` keeps the same
+  import as `@import '@datatechsolutions/tympan-tokens/fonts.css'`.
+- The print theme sheets carry their own families' rules.
+- To opt out (strict size budget, own font hosting): import the tokens
+  without the fonts by aliasing `@datatechsolutions/tympan-tokens/fonts.css`
+  to an empty file in your bundler; the stacks then fall back to system
+  faces. `fontFaceCss(manifest, specs, base)` builds the same rules for a
+  subset of families.
+- `node scripts/fetch-fonts.mjs` (`npm run fetch-fonts`) refetches the files
+  from `BASE_FONT_SPECS`, `SCRIPT_FONT_SPECS` and the print styles'
+  `googleFonts` into this package's `fonts/` and, for the CJK families,
+  `packages/fonts-cjk/fonts/` (manifest and notices per package); the build
+  fails when a non-CJK spec has no bundled files.
+
 ## Token model
 
 **Static (authored as DTCG in `src/base/`)**: spacing on a 4 px base
@@ -142,8 +181,8 @@ focus ring, slate 50 / 950 grounds, glass surfaces).
 style draws on is named only in its description (`referencia`, "inspirado em
 …").
 Optional fields cover page ornaments (`estrutura.moldura`, `cor.ornamento`),
-columns (`estrutura.barras`), running-head bands and title treatments. Each `PrintStyle` names its fonts (Google Fonts,
-OFL), paper and ink, data and proof-state colours, paper texture, stroke,
+columns (`estrutura.barras`), running-head bands and title treatments. Each `PrintStyle` names its fonts (Google Fonts
+families, OFL, bundled in `fonts/`), paper and ink, data and proof-state colours, paper texture, stroke,
 chart renderer, proof-mark shape and page structure.
 
 ```ts
@@ -227,8 +266,11 @@ example `print-suico`, `print-minimo-de-tinta`). The mapping is data-driven:
   accent kept as the brand where it reads.
 - **Typography**: `fonts.display` and `fonts.body` are the style's title and
   body stacks; `fonts.mono` is the style's mono stack only when it is really
-  monospace (otherwise the base mono stays). `fontsUrl` is the style's Google
-  Fonts css2 URL (`googleFontsUrl`) limited to those families.
+  monospace (otherwise the base mono stays). The theme's sheet declares the
+  bundled `@font-face` rules of the style's families (`printThemeFontSpecs`).
+  `fontsUrl` (the style's Google Fonts css2 URL, `googleFontsUrl`) and
+  `printThemeFontUrls` remain as legacy API for hosts that prefer Google's
+  CDN; the themes no longer need them.
 - **Surface**: radius from the print corner radius (mm at 96 dpi); glass,
   a gradient call to action and soft shadows only for the card and wash
   styles (`dashboard`, `aquarela`); flat shadows for the ruled print styles
@@ -246,18 +288,16 @@ The print themes are **not** in `tokens.css`. To enable them in an app:
 
 ```ts
 import '@datatechsolutions/tympan/styles.css'                      // or tokens.css
-import '@datatechsolutions/tympan-tokens/print-themes.css'         // all print themes (about 2 MB, 160 kB gzip)
+import '@datatechsolutions/tympan-tokens/print-themes.css'         // all print themes (about 2.3 MB, with their @font-face rules)
 // or only the ones you offer:
 import '@datatechsolutions/tympan-tokens/print-themes/print-suico.css'
 
-import { printThemeFontUrls } from '@datatechsolutions/tympan-tokens'
-<ThemeProvider theme="print-suico" fonts={printThemeFontUrls}>…</ThemeProvider>
+<ThemeProvider theme="print-suico">…</ThemeProvider>
 ```
 
-`ThemeProvider`'s `fonts` map (theme name to stylesheet URL) adds the font
-link of the current theme; `themeInitScript(key, defaults, { fonts })` does the
-same before first paint. Without it the stacks fall back to the style's
-system families. `generatePrintThemesCss(list)` builds the same sheet at
+Each sheet declares the `@font-face` rules of its style's families, with URLs
+relative to the package's `fonts/`; the files load only when the theme is
+active and text uses them. `generatePrintThemesCss(list)` builds the same sheet at
 runtime. A default theme nested inside a print theme inherits the print
 fonts, because the built-in presets do not redeclare the font tokens.
 

package/THIRD_PARTY_NOTICES.md

@@ -0,0 +1,103 @@
+# Third-party notices
+
+`@datatechsolutions/tympan-tokens` is licensed under FSL-1.1-ALv2 (Copyright 2026 Natalia Mesquita).
+It bundles the font files below, unmodified, in `fonts/`: every family the Tympan themes name except the CJK Noto families (those are in @datatechsolutions/tympan-fonts-cjk)
+(generated by `packages/tokens/scripts/fetch-fonts.mjs`; fetched 2026-10-05 from the Google Fonts css2 API
+as woff2 sliced by unicode-range). Each family keeps its own licence, shipped next to its files.
+The SIL Open Font License 1.1 allows bundling and redistribution with software; the fonts may
+not be sold by themselves, and Reserved Font Names apply to modified versions (none here are modified).
+Font-file sizes: see `fonts/manifest.json`.
+
+| Family | Version (gstatic) | Licence | Designer | Files | Size | Licence file |
+|---|---|---|---|---|---|---|
+| Albert Sans | v4 | OFL-1.1 | Andreas Rasmussen | 4 | 0.07 MB | `fonts/albertsans/OFL.txt` |
+| Alegreya | v41 | OFL-1.1 | Juan Pablo del Peral, HT Fonts | 14 | 0.24 MB | `fonts/alegreya/OFL.txt` |
+| Alegreya SC | v28 | OFL-1.1 | Juan Pablo del Peral, HT Fonts | 14 | 0.16 MB | `fonts/alegreyasc/OFL.txt` |
+| Alfa Slab One | v21 | OFL-1.1 | JM Solé | 3 | 0.03 MB | `fonts/alfaslabone/OFL.txt` |
+| Allerta Stencil | v24 | OFL-1.1 | Matt McInerney | 1 | 0.01 MB | `fonts/allertastencil/OFL.txt` |
+| Archivo | v25 | OFL-1.1 | Omnibus-Type | 12 | 0.40 MB | `fonts/archivo/OFL.txt` |
+| Archivo Black | v23 | OFL-1.1 | Omnibus-Type | 2 | 0.02 MB | `fonts/archivoblack/OFL.txt` |
+| Arimo | v36 | OFL-1.1 | Steve Matteson | 8 | 0.20 MB | `fonts/arimo/OFL.txt` |
+| Bangers | v25 | OFL-1.1 | Vernon Adams | 3 | 0.03 MB | `fonts/bangers/OFL.txt` |
+| Barlow | v13 | OFL-1.1 | Jeremy Tribby | 18 | 0.18 MB | `fonts/barlow/OFL.txt` |
+| Barlow Condensed | v13 | OFL-1.1 | Jeremy Tribby | 6 | 0.05 MB | `fonts/barlowcondensed/OFL.txt` |
+| Bricolage Grotesque | v9 | OFL-1.1 | Mathieu Triay | 3 | 0.20 MB | `fonts/bricolagegrotesque/OFL.txt` |
+| Bungee | v17 | OFL-1.1 | David Jonathan Ross | 3 | 0.03 MB | `fonts/bungee/OFL.txt` |
+| Caveat | v23 | OFL-1.1 | Impallari Type | 4 | 0.21 MB | `fonts/caveat/OFL.txt` |
+| Comic Neue | v9 | OFL-1.1 | Craig Rozynski, Hrant Papazian | 2 | 0.02 MB | `fonts/comicneue/OFL.txt` |
+| Cormorant Garamond | v21 | OFL-1.1 | Christian Thalmann | 10 | 0.25 MB | `fonts/cormorantgaramond/OFL.txt` |
+| Courier Prime | v11 | OFL-1.1 | Alan Dague-Greene | 4 | 0.04 MB | `fonts/courierprime/OFL.txt` |
+| Crimson Pro | v28 | OFL-1.1 | Jacques Le Bailly | 6 | 0.13 MB | `fonts/crimsonpro/OFL.txt` |
+| DM Serif Display | v17 | OFL-1.1 | Colophon Foundry | 4 | 0.05 MB | `fonts/dmserifdisplay/OFL.txt` |
+| EB Garamond | v33 | OFL-1.1 | Georg Duffner, Octavio Pardo | 14 | 0.48 MB | `fonts/ebgaramond/OFL.txt` |
+| Federo | v20 | OFL-1.1 | Cyreal | 1 | 0.01 MB | `fonts/federo/OFL.txt` |
+| Fira Sans Condensed | v11 | OFL-1.1 | Carrois Apostrophe | 35 | 0.43 MB | `fonts/firasanscondensed/OFL.txt` |
+| Gelasio | v14 | OFL-1.1 | Eben Sorkin | 6 | 0.13 MB | `fonts/gelasio/OFL.txt` |
+| Gochi Hand | v27 | OFL-1.1 | HT Fonts | 1 | 0.02 MB | `fonts/gochihand/OFL.txt` |
+| Hanken Grotesk | v12 | OFL-1.1 | Alfredo Marco Pradil, Hanken Design Co. | 8 | 0.09 MB | `fonts/hankengrotesk/OFL.txt` |
+| Hind | v18 | OFL-1.1 | Indian Type Foundry | 12 | 0.19 MB | `fonts/hind/OFL.txt` |
+| IBM Plex Mono | v20 | OFL-1.1 | Mike Abbink, Bold Monday | 25 | 0.16 MB | `fonts/ibmplexmono/OFL.txt` |
+| IBM Plex Sans | v23 | OFL-1.1 | Mike Abbink, Bold Monday | 12 | 0.19 MB | `fonts/ibmplexsans/OFL.txt` |
+| IBM Plex Sans Condensed | v15 | OFL-1.1 | Mike Abbink, Bold Monday | 20 | 0.15 MB | `fonts/ibmplexsanscondensed/OFL.txt` |
+| IBM Plex Serif | v20 | OFL-1.1 | Mike Abbink, Bold Monday | 15 | 0.13 MB | `fonts/ibmplexserif/OFL.txt` |
+| IM Fell English | v14 | OFL-1.1 | Igino Marini | 2 | 0.11 MB | `fonts/imfellenglish/OFL.txt` |
+| IM Fell English SC | v16 | OFL-1.1 | Igino Marini | 1 | 0.05 MB | `fonts/imfellenglishsc/OFL.txt` |
+| Inter | v20 | OFL-1.1 | Rasmus Andersson | 7 | 0.21 MB | `fonts/inter/OFL.txt` |
+| Jost | v20 | OFL-1.1 | Owen Earl | 6 | 0.07 MB | `fonts/jost/OFL.txt` |
+| Kalam | v18 | OFL-1.1 | Indian Type Foundry | 6 | 0.14 MB | `fonts/kalam/OFL.txt` |
+| Lato | v25 | OFL-1.1 | Łukasz Dziedzic | 6 | 0.05 MB | `fonts/lato/OFL.txt` |
+| League Spartan | v15 | OFL-1.1 | Matt Bailey, Tyler Finck | 3 | 0.05 MB | `fonts/leaguespartan/OFL.txt` |
+| Libre Bodoni | v9 | OFL-1.1 | Pablo Impallari, Rodrigo Fuenzalida | 3 | 0.05 MB | `fonts/librebodoni/OFL.txt` |
+| Libre Franklin | v20 | OFL-1.1 | Impallari Type | 10 | 0.15 MB | `fonts/librefranklin/OFL.txt` |
+| Literata | v40 | OFL-1.1 | TypeTogether | 14 | 0.43 MB | `fonts/literata/OFL.txt` |
+| Londrina Solid | v19 | OFL-1.1 | Marcelo Magalhães | 2 | 0.04 MB | `fonts/londrinasolid/OFL.txt` |
+| Major Mono Display | v18 | OFL-1.1 | Emre Parlak | 3 | 0.02 MB | `fonts/majormonodisplay/OFL.txt` |
+| Montserrat | v31 | OFL-1.1 | Julieta Ulanovsky, Sol Matas, Juan Pablo del Peral, Jacques Le Bailly | 10 | 0.22 MB | `fonts/montserrat/OFL.txt` |
+| Newsreader | v26 | OFL-1.1 | Production Type | 6 | 0.49 MB | `fonts/newsreader/OFL.txt` |
+| Noto Naskh Arabic | v44 | OFL-1.1 | Google | 5 | 0.14 MB | `fonts/notonaskharabic/OFL.txt` |
+| Noto Sans | v42 | OFL-1.1 | Google | 8 | 0.42 MB | `fonts/notosans/OFL.txt` |
+| Noto Sans Arabic | v33 | OFL-1.1 | Google | 5 | 0.24 MB | `fonts/notosansarabic/OFL.txt` |
+| Noto Sans Armenian | v47 | OFL-1.1 | Google | 3 | 0.07 MB | `fonts/notosansarmenian/OFL.txt` |
+| Noto Sans Bengali | v33 | OFL-1.1 | Google | 3 | 0.14 MB | `fonts/notosansbengali/OFL.txt` |
+| Noto Sans Devanagari | v30 | OFL-1.1 | Google | 3 | 0.15 MB | `fonts/notosansdevanagari/OFL.txt` |
+| Noto Sans Ethiopic | v50 | OFL-1.1 | Google | 3 | 0.23 MB | `fonts/notosansethiopic/OFL.txt` |
+| Noto Sans Georgian | v48 | OFL-1.1 | Google | 7 | 0.11 MB | `fonts/notosansgeorgian/OFL.txt` |
+| Noto Sans Gujarati | v27 | OFL-1.1 | Google | 5 | 0.19 MB | `fonts/notosansgujarati/OFL.txt` |
+| Noto Sans Gurmukhi | v29 | OFL-1.1 | Google | 3 | 0.08 MB | `fonts/notosansgurmukhi/OFL.txt` |
+| Noto Sans Hebrew | v50 | OFL-1.1 | Google | 5 | 0.04 MB | `fonts/notosanshebrew/OFL.txt` |
+| Noto Sans Kannada | v32 | OFL-1.1 | Google | 3 | 0.13 MB | `fonts/notosanskannada/OFL.txt` |
+| Noto Sans Khmer | v29 | OFL-1.1 | Google | 3 | 0.09 MB | `fonts/notosanskhmer/OFL.txt` |
+| Noto Sans Lao | v33 | OFL-1.1 | Google | 3 | 0.06 MB | `fonts/notosanslao/OFL.txt` |
+| Noto Sans Malayalam | v29 | OFL-1.1 | Google | 3 | 0.13 MB | `fonts/notosansmalayalam/OFL.txt` |
+| Noto Sans Mono | v37 | OFL-1.1 | Google | 7 | 0.30 MB | `fonts/notosansmono/OFL.txt` |
+| Noto Sans Myanmar | v27 | OFL-1.1 | Google | 3 | 0.19 MB | `fonts/notosansmyanmar/OFL.txt` |
+| Noto Sans Sinhala | v36 | OFL-1.1 | Google | 3 | 0.17 MB | `fonts/notosanssinhala/OFL.txt` |
+| Noto Sans Tamil | v31 | OFL-1.1 | Google | 3 | 0.10 MB | `fonts/notosanstamil/OFL.txt` |
+| Noto Sans Telugu | v30 | OFL-1.1 | Google | 3 | 0.16 MB | `fonts/notosanstelugu/OFL.txt` |
+| Noto Sans Thai | v29 | OFL-1.1 | Google | 3 | 0.07 MB | `fonts/notosansthai/OFL.txt` |
+| Noto Serif | v33 | OFL-1.1 | Google | 8 | 0.44 MB | `fonts/notoserif/OFL.txt` |
+| Noto Serif Bengali | v31 | OFL-1.1 | Google | 3 | 0.22 MB | `fonts/notoserifbengali/OFL.txt` |
+| Noto Serif Devanagari | v34 | OFL-1.1 | Google | 3 | 0.16 MB | `fonts/notoserifdevanagari/OFL.txt` |
+| Noto Serif Ethiopic | v32 | OFL-1.1 | Google | 3 | 0.22 MB | `fonts/notoserifethiopic/OFL.txt` |
+| Noto Serif Hebrew | v30 | OFL-1.1 | Google | 3 | 0.06 MB | `fonts/notoserifhebrew/OFL.txt` |
+| Noto Serif Tamil | v31 | OFL-1.1 | Google | 3 | 0.11 MB | `fonts/notoseriftamil/OFL.txt` |
+| Noto Serif Thai | v28 | OFL-1.1 | Google | 3 | 0.08 MB | `fonts/notoserifthai/OFL.txt` |
+| Nunito | v32 | OFL-1.1 | Vernon Adams, Cyreal, Jacques Le Bailly | 10 | 0.19 MB | `fonts/nunito/OFL.txt` |
+| Nunito Sans | v19 | OFL-1.1 | Vernon Adams, Jacques Le Bailly, Manvel Shmavonyan, Alexei Vanyashin | 15 | 0.44 MB | `fonts/nunitosans/OFL.txt` |
+| Old Standard TT | v22 | OFL-1.1 | Alexey Kryukov | 15 | 0.15 MB | `fonts/oldstandardtt/OFL.txt` |
+| Oswald | v57 | OFL-1.1 | Vernon Adams, Kalapi Gajjar, Cyreal | 5 | 0.07 MB | `fonts/oswald/OFL.txt` |
+| Patrick Hand SC | v17 | OFL-1.1 | Patrick Wagesreiter | 3 | 0.03 MB | `fonts/patrickhandsc/OFL.txt` |
+| PT Sans | v18 | OFL-1.1 | ParaType | 12 | 0.10 MB | `fonts/ptsans/OFL.txt` |
+| PT Sans Narrow | v19 | OFL-1.1 | ParaType | 8 | 0.07 MB | `fonts/ptsansnarrow/OFL.txt` |
+| PT Serif | v19 | OFL-1.1 | ParaType | 12 | 0.13 MB | `fonts/ptserif/OFL.txt` |
+| Rubik | v31 | OFL-1.1 | Hubert and Fischer, Meir Sadan, Cyreal, Daniel Grumer, Omaima Dajani | 12 | 0.18 MB | `fonts/rubik/OFL.txt` |
+| Rubik Mono One | v20 | OFL-1.1 | Hubert and Fischer | 3 | 0.01 MB | `fonts/rubikmonoone/OFL.txt` |
+| Share Tech Mono | v16 | OFL-1.1 | Carrois Apostrophe | 1 | 0.01 MB | `fonts/sharetechmono/OFL.txt` |
+| Shrikhand | v17 | OFL-1.1 | Jonny Pinhorn | 3 | 0.06 MB | `fonts/shrikhand/OFL.txt` |
+| Source Serif 4 | v15 | OFL-1.1 | Frank Grießhammer | 12 | 0.59 MB | `fonts/sourceserif4/OFL.txt` |
+| Space Mono | v17 | OFL-1.1 | Colophon Foundry | 9 | 0.07 MB | `fonts/spacemono/OFL.txt` |
+| Stardos Stencil | v15 | OFL-1.1 | Vernon Adams | 2 | 0.03 MB | `fonts/stardosstencil/OFL.txt` |
+| STIX Two Text | v18 | OFL-1.1 | Tiro Typeworks, Ross Mills, John Hudson, Paul Hanslow | 12 | 0.20 MB | `fonts/stixtwotext/OFL.txt` |
+| Work Sans | v24 | OFL-1.1 | Wei Huang | 6 | 0.13 MB | `fonts/worksans/OFL.txt` |
+
+Total: 89 families, 599 files, 13.38 MB.

package/dist/contrast-report.md

@@ -664,23 +664,23 @@ Generated by `scripts/build.mjs`. WCAG 2.2 ratio decides pass/fail (4.5:1 text,
 |---|---|---|---|---|---|
 | ink | bg | text | 17.06 | 4.5 | 101.4 |
 | ink | surface > bg | text | 17.63 | 4.5 | 103.7 |
-| ink | surface-raised > bg | text | 17.77 | 4.5 | 104.3 |
-| ink | surface-sunken | text | 16.3 | 4.5 | 98.3 |
-| ink-2 | bg | text | 9.9 | 4.5 | 90.9 |
-| ink-2 | surface > bg | text | 10.23 | 4.5 | 93.1 |
-| ink-2 | surface-raised > bg | text | 10.31 | 4.5 | 93.7 |
-| ink-2 | surface-sunken | text | 9.45 | 4.5 | 87.7 |
-| ink-3 | bg | text | 6.71 | 4.5 | 81.2 |
-| ink-3 | surface > bg | text | 6.93 | 4.5 | 83.4 |
-| ink-3 | surface-raised > bg | text | 6.99 | 4.5 | 84 |
-| ink-3 | surface-sunken | text | 6.41 | 4.5 | 78 |
-| on-bg | bg | text | 9.9 | 4.5 | 90.9 |
-| on-surface | surface > bg | text | 10.23 | 4.5 | 93.1 |
-| on-surface-raised | surface-raised > bg | text | 10.31 | 4.5 | 93.7 |
-| on-surface-sunken | surface-sunken | text | 9.45 | 4.5 | 87.7 |
+| ink | surface-raised > bg | text | 17.74 | 4.5 | 104.1 |
+| ink | surface-sunken | text | 16.13 | 4.5 | 97.6 |
+| ink-2 | bg | text | 7.24 | 4.5 | 83.2 |
+| ink-2 | surface > bg | text | 7.48 | 4.5 | 85.4 |
+| ink-2 | surface-raised > bg | text | 7.53 | 4.5 | 85.9 |
+| ink-2 | surface-sunken | text | 6.85 | 4.5 | 79.4 |
+| ink-3 | bg | text | 5.48 | 4.5 | 75.5 |
+| ink-3 | surface > bg | text | 5.66 | 4.5 | 77.8 |
+| ink-3 | surface-raised > bg | text | 5.7 | 4.5 | 78.3 |
+| ink-3 | surface-sunken | text | 5.18 | 4.5 | 71.7 |
+| on-bg | bg | text | 7.24 | 4.5 | 83.2 |
+| on-surface | surface > bg | text | 7.48 | 4.5 | 85.4 |
+| on-surface-raised | surface-raised > bg | text | 7.53 | 4.5 | 85.9 |
+| on-surface-sunken | surface-sunken | text | 6.85 | 4.5 | 79.4 |
 | brand | bg | text | 6.01 | 4.5 | 77.3 |
 | brand | surface > bg | text | 6.21 | 4.5 | 79.6 |
-| brand | surface-raised > bg | text | 6.26 | 4.5 | 80.2 |
+| brand | surface-raised > bg | text | 6.25 | 4.5 | 80.1 |
 | brand-strong | surface > bg | text | 7.8 | 4.5 | 85.6 |
 | on-brand | brand | text | 6.29 | 4.5 | -85.7 |
 | on-brand-soft | brand-soft > surface > bg | text | 6.92 | 4.5 | 76.8 |
@@ -690,24 +690,24 @@ Generated by `scripts/build.mjs`. WCAG 2.2 ratio decides pass/fail (4.5:1 text,
 | on-cta | cta-stop-2 | text | 5.16 | 4.5 | -77.8 |
 | on-secondary | secondary > bg | text | 17.2 | 4.5 | 102.5 |
 | danger | surface > bg | text | 6.21 | 4.5 | 78.3 |
-| danger | surface-raised > bg | text | 6.26 | 4.5 | 78.8 |
+| danger | surface-raised > bg | text | 6.25 | 4.5 | 78.7 |
 | on-danger | danger | text | 6.01 | 4.5 | -81 |
 | on-danger-soft | danger-soft > surface > bg | text | 7.02 | 4.5 | 75.4 |
 | warning | surface > bg | text | 4.86 | 4.5 | 72.9 |
-| warning | surface-raised > bg | text | 4.9 | 4.5 | 73.4 |
+| warning | surface-raised > bg | text | 4.89 | 4.5 | 73.3 |
 | on-warning | warning | text | 4.71 | 4.5 | -75.8 |
 | on-warning-soft | warning-soft > surface > bg | text | 6.67 | 4.5 | 77.2 |
 | success | surface > bg | text | 4.95 | 4.5 | 73.3 |
-| success | surface-raised > bg | text | 4.99 | 4.5 | 73.9 |
+| success | surface-raised > bg | text | 4.98 | 4.5 | 73.7 |
 | on-success | success | text | 4.8 | 4.5 | -76.2 |
 | on-success-soft | success-soft > surface > bg | text | 6.19 | 4.5 | 75 |
 | info | surface > bg | text | 5.29 | 4.5 | 75.3 |
-| info | surface-raised > bg | text | 5.33 | 4.5 | 75.9 |
+| info | surface-raised > bg | text | 5.32 | 4.5 | 75.8 |
 | on-info | info | text | 5.13 | 4.5 | -78.2 |
 | on-info-soft | info-soft > surface > bg | text | 6.49 | 4.5 | 76.5 |
-| neutral | surface > bg | text | 6.93 | 4.5 | 83.4 |
-| neutral | surface-raised > bg | text | 6.99 | 4.5 | 84 |
-| on-neutral | neutral | text | 6.72 | 4.5 | -85.9 |
+| neutral | surface > bg | text | 5.66 | 4.5 | 77.8 |
+| neutral | surface-raised > bg | text | 5.7 | 4.5 | 78.3 |
+| on-neutral | neutral | text | 5.49 | 4.5 | -80.6 |
 | on-neutral-soft | neutral-soft > surface > bg | text | 6.6 | 4.5 | 77.5 |
 | proof-proved | surface > bg | text | 6.96 | 4.5 | 83 |
 | proof-proved | proof-proved-soft > surface > bg | text | 6.19 | 4.5 | 75 |
@@ -717,20 +717,20 @@ Generated by `scripts/build.mjs`. WCAG 2.2 ratio decides pass/fail (4.5:1 text,
 | proof-refuted | proof-refuted-soft > surface > bg | text | 7.02 | 4.5 | 75.4 |
 | proof-not-disclosed | surface > bg | text | 7.37 | 4.5 | 85 |
 | proof-not-disclosed | proof-not-disclosed-soft > surface > bg | text | 6.6 | 4.5 | 77.5 |
-| proof-none | surface > bg | text | 6.93 | 4.5 | 83.4 |
-| proof-none | proof-none-soft > surface > bg | text | 6.21 | 4.5 | 75.9 |
+| proof-none | surface > bg | text | 5.66 | 4.5 | 77.8 |
+| proof-none | proof-none-soft > surface > bg | text | 5.07 | 4.5 | 70.3 |
 | actor-person | actor-person-soft > surface > bg | text | 6.92 | 4.5 | 76.8 |
-| actor-agent | actor-agent-soft > surface > bg | text | 9.16 | 4.5 | 85.6 |
-| actor-system | actor-system-soft > surface > bg | text | 6.21 | 4.5 | 75.9 |
-| on-nav | nav-bg > bg | text | 10.23 | 4.5 | 93.1 |
+| actor-agent | actor-agent-soft > surface > bg | text | 6.7 | 4.5 | 77.9 |
+| actor-system | actor-system-soft > surface > bg | text | 5.07 | 4.5 | 70.3 |
+| on-nav | nav-bg > bg | text | 7.48 | 4.5 | 85.4 |
 | on-nav-active | nav-active > nav-bg > bg | text | 6.92 | 4.5 | 76.8 |
 | input | surface > bg | ui | 3.89 | 3 | 65.8 |
 | input | bg | ui | 3.76 | 3 | 63.6 |
-| input | surface-raised > bg | ui | 3.92 | 3 | 66.4 |
+| input | surface-raised > bg | ui | 3.91 | 3 | 66.3 |
 | focus-ring | bg | ui | 4.27 | 3 | 67.4 |
 | focus-ring | surface > bg | ui | 4.41 | 3 | 69.7 |
-| focus-ring | surface-raised > bg | ui | 4.45 | 3 | 70.3 |
-| brand | surface-sunken | ui | 5.74 | 3 | 74.2 |
+| focus-ring | surface-raised > bg | ui | 4.44 | 3 | 70.1 |
+| brand | surface-sunken | ui | 5.68 | 3 | 73.5 |
 | chart-1 | surface > bg | ui | 4.98 | 3 | 73.8 |
 | chart-2 | surface > bg | ui | 4.72 | 3 | 71.6 |
 | chart-3 | surface > bg | ui | 4.49 | 3 | 70 |
@@ -826,83 +826,83 @@ Generated by `scripts/build.mjs`. WCAG 2.2 ratio decides pass/fail (4.5:1 text,
 
 | foreground | over | kind | WCAG | min | APCA Lc |
 |---|---|---|---|---|---|
-| ink | bg | text | 17.89 | 4.5 | -103.8 |
-| ink | surface > bg | text | 15.16 | 4.5 | -101.9 |
-| ink | surface-raised > bg | text | 14.32 | 4.5 | -101.1 |
-| ink | surface-sunken | text | 17.86 | 4.5 | -103.8 |
-| ink-2 | bg | text | 12.61 | 4.5 | -79.8 |
-| ink-2 | surface > bg | text | 10.68 | 4.5 | -77.9 |
-| ink-2 | surface-raised > bg | text | 10.09 | 4.5 | -77.1 |
+| ink | bg | text | 20.17 | 4.5 | -107.8 |
+| ink | surface > bg | text | 16.57 | 4.5 | -105.9 |
+| ink | surface-raised > bg | text | 16.06 | 4.5 | -105.5 |
+| ink | surface-sunken | text | 18.69 | 4.5 | -107.2 |
+| ink-2 | bg | text | 13.59 | 4.5 | -80.3 |
+| ink-2 | surface > bg | text | 11.16 | 4.5 | -78.4 |
+| ink-2 | surface-raised > bg | text | 10.82 | 4.5 | -78.1 |
 | ink-2 | surface-sunken | text | 12.59 | 4.5 | -79.8 |
-| ink-3 | bg | text | 8.5 | 4.5 | -58.2 |
-| ink-3 | surface > bg | text | 7.19 | 4.5 | -56.3 |
-| ink-3 | surface-raised > bg | text | 6.8 | 4.5 | -55.5 |
-| ink-3 | surface-sunken | text | 8.48 | 4.5 | -58.1 |
-| on-bg | bg | text | 12.61 | 4.5 | -79.8 |
-| on-surface | surface > bg | text | 10.68 | 4.5 | -77.9 |
-| on-surface-raised | surface-raised > bg | text | 10.09 | 4.5 | -77.1 |
+| ink-3 | bg | text | 7.87 | 4.5 | -51.6 |
+| ink-3 | surface > bg | text | 6.46 | 4.5 | -49.8 |
+| ink-3 | surface-raised > bg | text | 6.27 | 4.5 | -49.4 |
+| ink-3 | surface-sunken | text | 7.29 | 4.5 | -51.1 |
+| on-bg | bg | text | 13.59 | 4.5 | -80.3 |
+| on-surface | surface > bg | text | 11.16 | 4.5 | -78.4 |
+| on-surface-raised | surface-raised > bg | text | 10.82 | 4.5 | -78.1 |
 | on-surface-sunken | surface-sunken | text | 12.59 | 4.5 | -79.8 |
-| brand | bg | text | 6.28 | 4.5 | -44.9 |
-| brand | surface > bg | text | 5.32 | 4.5 | -43 |
-| brand | surface-raised > bg | text | 5.02 | 4.5 | -42.2 |
-| brand-strong | surface > bg | text | 7.95 | 4.5 | -61.3 |
+| brand | bg | text | 6.76 | 4.5 | -45.4 |
+| brand | surface > bg | text | 5.56 | 4.5 | -43.5 |
+| brand | surface-raised > bg | text | 5.39 | 4.5 | -43.2 |
+| brand-strong | surface > bg | text | 8.31 | 4.5 | -61.9 |
 | on-brand | brand | text | 5.36 | 4.5 | 44.5 |
-| on-brand-soft | brand-soft > surface > bg | text | 7.16 | 4.5 | -64.2 |
+| on-brand-soft | brand-soft > surface > bg | text | 7.47 | 4.5 | -64.9 |
 | on-cta | cta-solid | text | 7.52 | 4.5 | -88.4 |
 | on-cta | cta-stop-0 | text | 6.03 | 4.5 | -82.5 |
 | on-cta | cta-stop-1 | text | 5.47 | 4.5 | -79.6 |
 | on-cta | cta-stop-2 | text | 5.16 | 4.5 | -77.8 |
-| on-secondary | secondary > bg | text | 14.47 | 4.5 | -96.1 |
-| danger | surface > bg | text | 5.89 | 4.5 | -47.8 |
-| danger | surface-raised > bg | text | 5.57 | 4.5 | -47 |
+| on-secondary | secondary > bg | text | 15.19 | 4.5 | -96.6 |
+| danger | surface > bg | text | 6.16 | 4.5 | -48.3 |
+| danger | surface-raised > bg | text | 5.97 | 4.5 | -47.9 |
 | on-danger | danger | text | 6.97 | 4.5 | 51.7 |
-| on-danger-soft | danger-soft > surface > bg | text | 6.76 | 4.5 | -59.9 |
-| warning | surface > bg | text | 9.5 | 4.5 | -71.2 |
-| warning | surface-raised > bg | text | 8.97 | 4.5 | -70.4 |
+| on-danger-soft | danger-soft > surface > bg | text | 7.07 | 4.5 | -60.6 |
+| warning | surface > bg | text | 9.93 | 4.5 | -71.8 |
+| warning | surface-raised > bg | text | 9.62 | 4.5 | -71.4 |
 | on-warning | warning | text | 11.25 | 4.5 | 73.9 |
-| on-warning-soft | warning-soft > surface > bg | text | 6.75 | 4.5 | -60.7 |
-| success | surface > bg | text | 9.1 | 4.5 | -69 |
-| success | surface-raised > bg | text | 8.6 | 4.5 | -68.2 |
+| on-warning-soft | warning-soft > surface > bg | text | 7.07 | 4.5 | -61.4 |
+| success | surface > bg | text | 9.51 | 4.5 | -69.5 |
+| success | surface-raised > bg | text | 9.22 | 4.5 | -69.1 |
 | on-success | success | text | 10.77 | 4.5 | 71.8 |
-| on-success-soft | success-soft > surface > bg | text | 7.11 | 4.5 | -64.7 |
-| info | surface > bg | text | 8.77 | 4.5 | -67.1 |
-| info | surface-raised > bg | text | 8.29 | 4.5 | -66.3 |
+| on-success-soft | success-soft > surface > bg | text | 7.46 | 4.5 | -65.5 |
+| info | surface > bg | text | 9.17 | 4.5 | -67.6 |
+| info | surface-raised > bg | text | 8.89 | 4.5 | -67.3 |
 | on-info | info | text | 10.39 | 4.5 | 70.1 |
-| on-info-soft | info-soft > surface > bg | text | 6.81 | 4.5 | -62.2 |
-| neutral | surface > bg | text | 7.19 | 4.5 | -56.3 |
-| neutral | surface-raised > bg | text | 6.8 | 4.5 | -55.5 |
-| on-neutral | neutral | text | 8.52 | 4.5 | 59.8 |
-| on-neutral-soft | neutral-soft > surface > bg | text | 6.7 | 4.5 | -61.2 |
-| proof-proved | surface > bg | text | 9.01 | 4.5 | -68.2 |
-| proof-proved | proof-proved-soft > surface > bg | text | 7.11 | 4.5 | -64.7 |
-| proof-pending | surface > bg | text | 8.28 | 4.5 | -63.6 |
-| proof-pending | proof-pending-soft > surface > bg | text | 6.75 | 4.5 | -60.7 |
-| proof-refuted | surface > bg | text | 8.1 | 4.5 | -62.5 |
-| proof-refuted | proof-refuted-soft > surface > bg | text | 6.76 | 4.5 | -59.9 |
-| proof-not-disclosed | surface > bg | text | 8.49 | 4.5 | -64.7 |
-| proof-not-disclosed | proof-not-disclosed-soft > surface > bg | text | 6.7 | 4.5 | -61.2 |
-| proof-none | surface > bg | text | 7.19 | 4.5 | -56.3 |
-| proof-none | proof-none-soft > surface > bg | text | 5.68 | 4.5 | -52.7 |
-| actor-person | actor-person-soft > surface > bg | text | 7.16 | 4.5 | -64.2 |
-| actor-agent | actor-agent-soft > surface > bg | text | 8.43 | 4.5 | -74.3 |
-| actor-system | actor-system-soft > surface > bg | text | 5.68 | 4.5 | -52.7 |
-| on-nav | nav-bg > bg | text | 10.68 | 4.5 | -77.9 |
-| on-nav-active | nav-active > nav-bg > bg | text | 7.16 | 4.5 | -64.2 |
-| input | surface > bg | ui | 3.72 | 3 | -29.7 |
-| input | bg | ui | 4.39 | 3 | -31.6 |
-| input | surface-raised > bg | ui | 3.51 | 3 | -28.9 |
-| focus-ring | bg | ui | 6.28 | 3 | -44.9 |
-| focus-ring | surface > bg | ui | 5.32 | 3 | -43 |
-| focus-ring | surface-raised > bg | ui | 5.02 | 3 | -42.2 |
+| on-info-soft | info-soft > surface > bg | text | 7.14 | 4.5 | -63 |
+| neutral | surface > bg | text | 6.46 | 4.5 | -49.8 |
+| neutral | surface-raised > bg | text | 6.27 | 4.5 | -49.4 |
+| on-neutral | neutral | text | 7.32 | 4.5 | 53.1 |
+| on-neutral-soft | neutral-soft > surface > bg | text | 7.03 | 4.5 | -62 |
+| proof-proved | surface > bg | text | 9.42 | 4.5 | -68.8 |
+| proof-proved | proof-proved-soft > surface > bg | text | 7.46 | 4.5 | -65.5 |
+| proof-pending | surface > bg | text | 8.65 | 4.5 | -64.2 |
+| proof-pending | proof-pending-soft > surface > bg | text | 7.07 | 4.5 | -61.4 |
+| proof-refuted | surface > bg | text | 8.47 | 4.5 | -63.1 |
+| proof-refuted | proof-refuted-soft > surface > bg | text | 7.07 | 4.5 | -60.6 |
+| proof-not-disclosed | surface > bg | text | 8.87 | 4.5 | -65.3 |
+| proof-not-disclosed | proof-not-disclosed-soft > surface > bg | text | 7.03 | 4.5 | -62 |
+| proof-none | surface > bg | text | 6.46 | 4.5 | -49.8 |
+| proof-none | proof-none-soft > surface > bg | text | 5.12 | 4.5 | -46.5 |
+| actor-person | actor-person-soft > surface > bg | text | 7.47 | 4.5 | -64.9 |
+| actor-agent | actor-agent-soft > surface > bg | text | 8.84 | 4.5 | -75.2 |
+| actor-system | actor-system-soft > surface > bg | text | 5.12 | 4.5 | -46.5 |
+| on-nav | nav-bg > bg | text | 11.16 | 4.5 | -78.4 |
+| on-nav-active | nav-active > nav-bg > bg | text | 7.47 | 4.5 | -64.9 |
+| input | surface > bg | ui | 3.89 | 3 | -30.2 |
+| input | bg | ui | 4.73 | 3 | -32.1 |
+| input | surface-raised > bg | ui | 3.77 | 3 | -29.9 |
+| focus-ring | bg | ui | 6.76 | 3 | -45.4 |
+| focus-ring | surface > bg | ui | 5.56 | 3 | -43.5 |
+| focus-ring | surface-raised > bg | ui | 5.39 | 3 | -43.2 |
 | brand | surface-sunken | ui | 6.26 | 3 | -44.9 |
-| chart-1 | surface > bg | ui | 7.21 | 3 | -56.5 |
-| chart-2 | surface > bg | ui | 7.56 | 3 | -59 |
-| chart-3 | surface > bg | ui | 7.84 | 3 | -60.8 |
-| chart-4 | surface > bg | ui | 7.25 | 3 | -56.8 |
-| chart-5 | surface > bg | ui | 6.98 | 3 | -55.1 |
-| chart-6 | surface > bg | ui | 7.13 | 3 | -55.9 |
-| chart-7 | surface > bg | ui | 7.79 | 3 | -60.8 |
-| chart-8 | surface > bg | ui | 7.1 | 3 | -55.9 |
+| chart-1 | surface > bg | ui | 7.54 | 3 | -57 |
+| chart-2 | surface > bg | ui | 7.9 | 3 | -59.5 |
+| chart-3 | surface > bg | ui | 8.19 | 3 | -61.4 |
+| chart-4 | surface > bg | ui | 7.58 | 3 | -57.4 |
+| chart-5 | surface > bg | ui | 7.29 | 3 | -55.7 |
+| chart-6 | surface > bg | ui | 7.45 | 3 | -56.5 |
+| chart-7 | surface > bg | ui | 8.15 | 3 | -61.4 |
+| chart-8 | surface > bg | ui | 7.42 | 3 | -56.4 |
 
 ## astrlabe / dark-high