@datatechsolutions/tympan-tokens 0.4.1 → 0.5.0

package/src/print-presets.ts

@@ -11,7 +11,7 @@
 // white variant) into `--ty-print-*` custom properties on
 // `[data-ty-print-style="<name>"]`.
 
-import { luminance, parseColor, toHex, type Rgba } from './color.ts'
+import { contrastRatio, luminance, oklchToRgb, parseColor, rgbToOklch, toHex, type Rgba } from './color.ts'
 import { PRINT_STYLE_ALIASES, warnDeprecatedPrintId, type PrintStyleAlias } from './print-aliases.ts'
 
 export type RenderizadorGrafico = 'limpo' | 'mao' | 'isotype' | 'gravura' | 'prancheta' | 'aquarela' | 'riso' | 'pontos'
@@ -20,7 +20,17 @@ export type EstadoProva = 'sustentada' | 'refutada' | 'nao-da-para-afirmar' | 'p
 
 export const ESTADOS_PROVA: readonly EstadoProva[] = ['sustentada', 'refutada', 'nao-da-para-afirmar', 'pendente', 'sem-dado', 'nao-testada']
 
-/** The word printed for each proof state (always visible, whatever the mark's shape). */
+/** The word printed for each proof state in English (tympan-print picks by the book's `lang`). */
+export const ROTULOS_PROVA_EN: Record<EstadoProva, string> = {
+  sustentada: 'Supported',
+  refutada: 'Refuted',
+  'nao-da-para-afirmar': 'Cannot claim',
+  pendente: 'Pending',
+  'sem-dado': 'No data',
+  'nao-testada': 'Not tested',
+}
+
+/** The word printed for each proof state (always visible, whatever the mark's shape); pt-BR. */
 export const ROTULOS_PROVA: Record<EstadoProva, string> = {
   sustentada: 'Sustentada',
   refutada: 'Refutada',
@@ -52,6 +62,16 @@ export interface PrintCores {
   prova: Record<EstadoProva, string>
   /** Colours of page ornaments only (frames, tiles, waves); never data. Up to four. */
   ornamento?: string[]
+  /** Colours by category key (official party colours…): used by categorical maps, parliament and bars. */
+  categorias?: Record<string, string>
+  /** Colours of data themes (blocks of a panel page: economia, saude…); --ty-print-tema-<id>. */
+  temas?: Record<string, string>
+  /** The series of interest in maps and charts (default: `destaque`), when the accent of the page differs from the data ink. */
+  interesse?: string
+  /** Data palette, diverging: the low and the high side (default destaque2 × destaque). */
+  divergente?: [string, string]
+  /** Data palette, qualitative (party, category: no implied order), up to eight (default: a colour-blind-safe set). */
+  categorica?: string[]
 }
 
 /** Partial colours: any role, and any subset of the proof states. */
@@ -137,6 +157,16 @@ export interface PrintEstrutura {
    */
   realce?: 'serie' | 'linha'
   /** Head of each small multiple: plain title (default), a band in the highlighter colour with an arrow (Schiphol), a dark band (Vignelli), a band in the ornament colour (Aicher), each multiple on its own tinted card (Le Corbusier, Bayer). */
+  /**
+   * Long runs (one page per unit, thousands of pages): no page ornaments, no tinted panel fills, the 'bolso'
+   * panel as a rule instead of a filled box. The style's type, colours and frames stay.
+   */
+  economiaTinta?: boolean
+  /**
+   * Pages without a molde fill the type area: panels widen to close their row of the six columns and rows of
+   * panels share the free height (dashboard). A page can turn it on or off with `preencher`.
+   */
+  preencher?: boolean
   cabecaMultiplo?: 'titulo' | 'faixa' | 'faixa-escura' | 'faixa-cor' | 'caixa-cor'
 }
 
@@ -176,7 +206,7 @@ export type Moldura =
   | 'formas' // triangle, square and circle (Bauhaus)
   | 'quartos' // quarter circles in the page corners (diagrama-modernista)
 
-export interface PrintStyle {
+export interface PrintStyle extends PrintTemaExtras {
   /** Stable id, e.g. 'jornal'. */
   name: string
   /** Human label, e.g. "Editorial de jornal". */
@@ -207,10 +237,94 @@ export interface PrintStyle {
    * has approved variations (ink, duotone, per style), see LogoDatatech.
    */
   logo?: 'cor' | 'mono'
+  /** Typesetting options a book may need against the style's idiom (see PrintTexto). */
+  texto?: PrintTexto
+}
+
+/**
+ * Typesetting switches for books whose content fights the style: a style in lower case (bauhaus,
+ * diagrama-modernista) would print "boa vista" for a proper name; a style with old-style figures would
+ * misalign table columns.
+ */
+export interface PrintTexto {
+  /**
+   * 'estilo' (default): page titles and eyebrows follow the style's casing. 'preservar': the level-1 title,
+   * eyebrows and table cells keep the casing written in the content (proper names, codes), while panel labels
+   * and running heads keep the style's.
+   */
+  nomesProprios?: 'estilo' | 'preservar'
+  /** Figures in table cells: 'tabular' (default, lining and equal width, columns align) or 'proporcional'. */
+  numerosTabela?: 'tabular' | 'proporcional'
+  /** Font weight per role (titles, key numbers, labels, body, notes, mono), e.g. { titulo: 600, numero: 600 }. */
+  pesos?: Partial<Record<keyof PrintFontes, number>>
+  /** Figures per role: 'tabular' (equal width, lining) or 'proporcional'. Tables follow `numerosTabela`. */
+  algarismos?: Partial<Record<'numero' | 'rotulo' | 'corpo', 'tabular' | 'proporcional'>>
+}
+
+// ---------------------------------------------------------------------------
+// Book-theme extras (see print-book-themes.ts)
+// ---------------------------------------------------------------------------
+
+/** A mark the theme prints (publisher logo, collection seal): an image URL (data: URIs work offline) and its text alternative. */
+export interface PrintMarca {
+  src: string
+  alt: string
+  /** Width in mm where the mark is placed (default 18 for the logo, 12 for the seal). */
+  largura?: number
+  /** Image used in black and white print (default: the same `src`, greyed by CSS). */
+  srcPb?: string
+}
+
+/** Page format and print finishing. */
+export interface PrintPagina {
+  /** Trim width in mm (default 170). */
+  largura?: number
+  /** Trim height in mm (default 240). */
+  altura?: number
+  /** Bleed in mm added around every page when the book prints for the press (default 3). */
+  sangria?: number
+  /** Crop marks in the slug, outside the bleed (default false). */
+  marcasCorte?: boolean
+}
+
+/** Running head and folio. */
+export interface PrintFolio {
+  /** Where the folio sits: outer corner (default) or centred. */
+  folio?: 'externo' | 'centro'
+  /** Where the running head sits: outer corner (default), centred, or not printed. */
+  cabeco?: 'externo' | 'centro' | 'nenhum'
+  /** Text before the folio number, e.g. "p. ". */
+  prefixoFolio?: string
+}
+
+/** A local font file (offline, deterministic builds and EPUB): one @font-face. */
+export interface PrintFonteLocal {
+  /** Family name as used in the theme's font stacks. */
+  familia: string
+  /** URL or path of the .woff2 (relative to the HTML, absolute, or a data: URI). */
+  src: string
+  peso?: number | string
+  estilo?: 'normal' | 'italic'
+}
+
+/** What a theme adds to a preset beyond the style tokens. */
+export interface PrintTemaExtras {
+  marcas?: { editora?: PrintMarca; selo?: PrintMarca }
+  pagina?: PrintPagina
+  folio?: PrintFolio
+  /** Local font files; with them PrintBook can run without network (`fontes="locais"`). */
+  fontesLocais?: PrintFonteLocal[]
+  /**
+   * Trace of a number (Rastro): sign it with the theme's seal (`marcas.selo`) or the lakebrasil mark, and add
+   * the lake version seal when the version carries a date. Default: neutral (neither).
+   */
+  rastro?: { assinatura?: 'selo' | 'lakebrasil' | 'nenhuma'; seloLake?: boolean }
+  /** Texts the print components write by themselves, by key (see tympan-print i18n: TEXTOS_PT / TEXTOS_EN). */
+  textos?: Record<string, string>
 }
 
 /** Any token of a style may be overridden by the editor (partial, nested). */
-export interface PrintStyleOverrides {
+export interface PrintStyleOverrides extends PrintTemaExtras {
   label?: string
   fontes?: Partial<PrintFontes>
   googleFonts?: string[]
@@ -224,6 +338,7 @@ export interface PrintStyleOverrides {
   pb?: PrintCoresParciais
   estrutura?: Partial<PrintEstrutura>
   logo?: 'cor' | 'mono'
+  texto?: PrintTexto
 }
 
 // ---------------------------------------------------------------------------
@@ -265,8 +380,9 @@ const dashboard: PrintStyle = {
     tinta2: '#3d3933',
     tinta3: '#5f594f',
     linha: '#d6cfc2',
-    destaque: '#1c1a17',
-    destaque2: '#9a4f2a',
+    // The highlight is not the ink (a highlighted bar must stand out): rust, AA on the paper, not a party colour.
+    destaque: '#9a4f2a',
+    destaque2: '#c4b8a8',
     marcaTexto: '#f3e6cf',
     contexto: '#8f877a',
     prova: {
@@ -285,7 +401,7 @@ const dashboard: PrintStyle = {
   raio: 1.6,
   caixaAlta: false,
   pb: {},
-  estrutura: { painel: 'nenhum', rotulo: 'letra', rotuloCaixa: 'alta', notas: 'dentro', figura: 'simples', minusculas: false },
+  estrutura: { painel: 'nenhum', rotulo: 'letra', rotuloCaixa: 'alta', notas: 'dentro', figura: 'simples', minusculas: false, preencher: true },
 }
 
 const graficos1900: PrintStyle = {
@@ -1476,7 +1592,26 @@ function mergeCores(base: PrintCores, over?: PrintCoresParciais): PrintCores {
   if (!over) return base
   const { prova, ...rest } = over
   const clean = Object.fromEntries(Object.entries(rest).filter(([, v]) => v !== undefined)) as Partial<PrintCores>
-  return { ...base, ...clean, prova: { ...base.prova, ...(prova ?? {}) } }
+  const temas = base.temas || clean.temas ? { temas: { ...base.temas, ...clean.temas } } : {}
+  const categorias = base.categorias || clean.categorias ? { categorias: { ...base.categorias, ...clean.categorias } } : {}
+  return { ...base, ...clean, ...temas, ...categorias, prova: { ...base.prova, ...(prova ?? {}) } }
+}
+
+function mergeExtras(base: PrintTemaExtras, over: PrintTemaExtras): PrintTemaExtras {
+  const out: PrintTemaExtras = {}
+  const marcas = { ...base.marcas, ...over.marcas }
+  if (Object.keys(marcas).length) out.marcas = marcas
+  const pagina = { ...base.pagina, ...over.pagina }
+  if (Object.keys(pagina).length) out.pagina = pagina
+  const folio = { ...base.folio, ...over.folio }
+  if (Object.keys(folio).length) out.folio = folio
+  const fl = over.fontesLocais ?? base.fontesLocais
+  if (fl) out.fontesLocais = fl
+  const rs = { ...base.rastro, ...over.rastro }
+  if (Object.keys(rs).length) out.rastro = rs
+  const tx = { ...base.textos, ...over.textos }
+  if (Object.keys(tx).length) out.textos = tx
+  return out
 }
 
 /** A style with the editor's overrides applied (nested, partial). */
@@ -1494,9 +1629,12 @@ export function mergePrintStyle(style: PrintStyle, overrides?: PrintStyleOverrid
     marcaProva: overrides.marcaProva ?? style.marcaProva,
     raio: overrides.raio ?? style.raio,
     caixaAlta: overrides.caixaAlta ?? style.caixaAlta,
-    pb: overrides.pb ? mergeCores({ ...style.cor, ...style.pb, prova: { ...style.cor.prova, ...style.pb.prova } }, overrides.pb) : style.pb,
+    // P&B adjustments stay partial: merging them over the full colour set would put colours back over the greys.
+    pb: overrides.pb ? { ...style.pb, ...overrides.pb, ...(style.pb.prova || overrides.pb.prova ? { prova: { ...style.pb.prova, ...overrides.pb.prova } } : {}) } : style.pb,
     estrutura: { ...style.estrutura, ...overrides.estrutura },
     logo: overrides.logo ?? style.logo,
+    ...(overrides.texto || style.texto ? { texto: { ...style.texto, ...overrides.texto } } : {}),
+    ...mergeExtras(style, overrides),
   }
 }
 
@@ -1525,6 +1663,10 @@ export function printStyleCoresPb(style: PrintStyle): PrintCores {
     contexto: toGrey(g.contexto),
     prova: Object.fromEntries(ESTADOS_PROVA.map((e) => [e, toGrey(g.prova[e])])) as Record<EstadoProva, string>,
     ...(g.ornamento ? { ornamento: g.ornamento.map(toGrey) } : {}),
+    ...(g.interesse ? { interesse: toGrey(g.interesse) } : {}),
+    ...(g.temas ? { temas: Object.fromEntries(Object.entries(g.temas).map(([k, v]) => [k, toGrey(v)])) } : {}),
+    ...(g.divergente ? { divergente: g.divergente.map(toGrey) as [string, string] } : {}),
+    categorica: categoricaDoEstilo(style).map(toGrey),
   }
   return mergeCores(grey, style.pb)
 }
@@ -1550,7 +1692,7 @@ export function resolvePrintStyle(style: PrintStyle | PrintStyleId, options: Omi
   return { ...merged, cor: printStyleCoresPb(merged) }
 }
 
-const kebab: Record<Exclude<keyof PrintCores, 'prova' | 'ornamento'>, string> = {
+const kebab: Record<Exclude<keyof PrintCores, 'prova' | 'ornamento' | 'divergente' | 'categorica' | 'interesse' | 'temas' | 'categorias'>, string> = {
   papel: 'papel',
   tinta: 'tinta',
   tinta2: 'tinta-2',
@@ -1564,6 +1706,58 @@ const kebab: Record<Exclude<keyof PrintCores, 'prova' | 'ornamento'>, string> =
 
 const num = (n: number) => String(Math.round(n * 1000) / 1000)
 
+/**
+ * `cor` moved along OKLCH lightness (hue and chroma kept) until it reaches `min`:1 against `papel`: the
+ * context grey of a theme stays visible on cream paper (areas ≥ 1.5:1, strokes ≥ 3:1).
+ */
+export function contrasteMinimo(cor: string, papel: string, min: number): string {
+  const p = parseColor(papel)
+  if (contrastRatio(parseColor(cor), p) >= min) return toHex(parseColor(cor))
+  const v = rgbToOklch(parseColor(cor))
+  const passo = luminance(p) > 0.2 ? -0.005 : 0.005
+  let out = parseColor(cor)
+  for (let i = 0; i < 200 && contrastRatio(out, p) < min; i++) {
+    v.l = Math.min(0.995, Math.max(0.02, v.l + passo))
+    out = oklchToRgb(v)
+  }
+  return toHex(out)
+}
+
+const SELETORES_PAPEL: Record<keyof PrintFontes, string> = {
+  titulo: ':is(h1, h2, h3, h4, .ty-print-title, .ty-print-figure-title, [class*="-title"]:not(.ty-print-panel-title, .ty-print-block-title, .ty-print-margin-title))',
+  numero: ':is(.ty-print-number-value, .ty-print-table td[data-numerica], .ty-print-parliament-total, [class*="-numero"], [class*="-number"])',
+  rotulo: ':is(.ty-print-panel-title, .ty-print-block-title, .ty-print-margin-title, .ty-print-sobretitle, .ty-print-table th, .ty-print-map-legend, .ty-print-running-head, .ty-print-folio, .ty-print-letter)',
+  corpo: '',
+  anotacao: ':is(.ty-print-annotation, .ty-print-margin, .ty-print-callout-text)',
+  mono: ':is(code, pre, .ty-print-mono, .ty-print-table td[data-mono])',
+}
+
+/**
+ * Unlayered rules (they win over `@layer tympan-print`) for a theme's per-role font weights and figures,
+ * scoped to `seletor`; '' when the theme sets neither.
+ */
+export function printTextoRolesCss(style: Pick<PrintStyle, 'texto'>, seletor: string): string {
+  const out: string[] = []
+  for (const [papel, peso] of Object.entries(style.texto?.pesos ?? {}) as Array<[keyof PrintFontes, number]>) {
+    const s = SELETORES_PAPEL[papel]
+    out.push(`${seletor}${s ? ` ${s}` : ''} { font-weight: ${peso}; }`)
+  }
+  for (const [papel, a] of Object.entries(style.texto?.algarismos ?? {}) as Array<[keyof PrintFontes, string]>) {
+    const s = SELETORES_PAPEL[papel]
+    out.push(`${seletor}${s ? ` ${s}` : ''} { font-variant-numeric: ${a === 'tabular' ? 'tabular-nums lining-nums' : 'proportional-nums'}; }`)
+  }
+  return out.join('\n')
+}
+
+/** Qualitative palette (Okabe & Ito 2008, colour-blind safe) used when a style defines none. */
+export const CATEGORICA_PADRAO = ['#0072b2', '#e69f00', '#009e73', '#cc79a7', '#56b4e9', '#d55e00', '#f0e442', '#555555'] as const
+
+/** The eight qualitative data colours of a style: its own `categorica`, completed by CATEGORICA_PADRAO. */
+export function categoricaDoEstilo(style: Pick<PrintStyle, 'cor'>): string[] {
+  const own = style.cor.categorica ?? []
+  return Array.from({ length: 8 }, (_, i) => own[i] ?? CATEGORICA_PADRAO[i]!)
+}
+
 /** Custom properties of a resolved style, in a stable order. */
 export function printStyleVariables(style: PrintStyle): Array<[string, string]> {
   const vars: Array<[string, string]> = []
@@ -1581,6 +1775,22 @@ export function printStyleVariables(style: PrintStyle): Array<[string, string]>
   vars.push(['--ty-print-rotulo-caixa', minusculas ? 'lowercase' : rc === 'alta' ? 'uppercase' : 'none'])
   vars.push(['--ty-print-rotulo-variante', rc === 'versalete' ? 'small-caps' : 'normal'])
   vars.push(['--ty-print-rotulo-espaco', rc === 'normal' ? 'normal' : '0.07em'])
+  vars.push(['--ty-print-pagina-largura', `${num(style.pagina?.largura ?? 170)}mm`])
+  vars.push(['--ty-print-pagina-altura', `${num(style.pagina?.altura ?? 240)}mm`])
+  const preservar = style.texto?.nomesProprios === 'preservar'
+  vars.push(['--ty-print-titulo1-caixa', preservar ? 'none' : style.caixaAlta ? 'uppercase' : minusculas ? 'lowercase' : 'none'])
+  vars.push(['--ty-print-sobretitulo-caixa', preservar ? 'none' : minusculas ? 'lowercase' : rc === 'alta' ? 'uppercase' : 'none'])
+  vars.push(['--ty-print-celula-caixa', preservar ? 'none' : minusculas ? 'lowercase' : 'none'])
+  vars.push(['--ty-print-tabela-numeros', style.texto?.numerosTabela === 'proporcional' ? 'proportional-nums lining-nums' : 'tabular-nums lining-nums'])
+  for (const [k, v] of Object.entries(style.cor.temas ?? {})) vars.push([`--ty-print-tema-${k.replace(/[^a-z0-9-]/gi, '')}`, v])
+  vars.push(['--ty-print-interesse', style.cor.interesse ?? style.cor.destaque])
+  vars.push(['--ty-print-contexto-area', contrasteMinimo(style.cor.contexto, style.cor.papel, 1.5)])
+  vars.push(['--ty-print-contexto-traco', contrasteMinimo(style.cor.contexto, style.cor.papel, 3)])
+  const dv = style.cor.divergente ?? [style.cor.destaque2, style.cor.destaque]
+  vars.push(['--ty-print-divergente-1', dv[0]])
+  vars.push(['--ty-print-divergente-2', dv[1]])
+  const cat = categoricaDoEstilo(style)
+  cat.forEach((c, i) => vars.push([`--ty-print-categorica-${i + 1}`, c]))
   const orn = style.cor.ornamento ?? []
   const reserva = [style.cor.destaque, style.cor.destaque2, style.cor.tinta, style.cor.marcaTexto]
   for (let i = 0; i < 4; i++) vars.push([`--ty-print-ornamento-${i + 1}`, orn[i] ?? reserva[i]!])

package/src/stylesheet.ts

@@ -120,6 +120,9 @@ export const FORCED_COLORS_VARS: VarList = [
   ['--ty-shadow-modal', 'none'],
   ['--ty-glass-blur-sheet', '0px'],
   ['--ty-glass-blur-floating', '0px'],
+  ['--ty-glass-edge', 'CanvasText'],
+  ['--ty-glass-fill', 'Canvas'],
+  ['--ty-glass-fill-raised', 'Canvas'],
 ]
 
 /** Reduced transparency (and no backdrop-filter support): opaque surfaces, no blur, no ambient. */
@@ -130,6 +133,8 @@ export const OPAQUE_VARS: VarList = [
   ['--ty-glass-blur-sheet', '0px !important'],
   ['--ty-glass-blur-floating', '0px !important'],
   ['--ty-glass-saturate', '1 !important'],
+  ['--ty-glass-fill', 'var(--ty-surface-solid) !important'],
+  ['--ty-glass-fill-raised', 'var(--ty-surface-raised-solid) !important'],
   ['--ty-ambient-1', 'transparent !important'],
   ['--ty-ambient-2', 'transparent !important'],
 ]

package/src/theme.ts

@@ -70,6 +70,31 @@ export interface ThemeConfig {
   elevation?: Elevation
   /** Arbitrary string variables (e.g. for textures) */
   strings?: Record<string, string>
+  /**
+   * String variables per mode (`--ty-<name>`), for values that differ
+   * between light and dark: a glass edge, a fill gradient, a brand mark
+   * gradient. Like pins, they are exact design values: the generated
+   * high-contrast variant leaves them out, so components fall back.
+   */
+  modeStrings?: Partial<Record<Mode, Record<string, string>>>
+  /** Backdrop saturation of glass surfaces per mode (1.15 when omitted). */
+  glassSaturate?: Partial<Record<Mode, number>>
+  /** Exact shadow layers per mode, replacing the generated ones by name. */
+  shadowPins?: Partial<Record<Mode, Partial<Record<ShadowName, ShadowPin[]>>>>
+  /** Card and sheet radii in px, when they do not follow the control radius. */
+  radii?: Partial<Record<'card' | 'sheet', number>>
+}
+
+export type ShadowName = 'sheet' | 'raised' | 'floating' | 'modal' | 'sheet-inset'
+
+/** One shadow layer of `shadowPins`, its colour as a CSS colour string. */
+export interface ShadowPin {
+  x: number
+  y: number
+  blur: number
+  spread: number
+  color: string
+  inset?: boolean
 }
 
 export const RAMP_STEPS = [50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 950] as const
@@ -288,7 +313,7 @@ export interface ResolvedTheme {
   colors: Record<string, Rgba>
   ramps: Record<SeedName, Record<RampStep, Rgba>>
   cta: { angle: number; stops: Rgba[] }
-  shadows: Record<'sheet' | 'raised' | 'floating' | 'modal' | 'sheet-inset', ShadowLayer[]>
+  shadows: Record<ShadowName, ShadowLayer[]>
   /** Pixel dimensions (radius, glass blur, focus width). */
   dimensions: Record<string, number>
   /** Font stacks keyed by token name (`serif`, `sans`, `mono`); empty when the theme keeps the base stacks. */
@@ -471,19 +496,24 @@ export function resolveTheme(config: ThemeConfig, mode: Mode, contrastOverride?:
     }
   }
 
+  const shadowPins = config.shadowPins?.[mode] ?? {}
+  for (const [name, layers] of Object.entries(shadowPins) as Array<[ShadowName, ShadowPin[]]>) {
+    shadows[name] = layers.map((l) => ({ ...l, color: parseColor(l.color) }))
+  }
+
   const R = config.radius
   const dimensions: Record<string, number> = {
     radius: R,
     'radius-control': R,
-    'radius-card': Math.round(R * 1.6),
-    'radius-sheet': Math.round(R * 2.4),
+    'radius-card': config.radii?.card ?? Math.round(R * 1.6),
+    'radius-sheet': config.radii?.sheet ?? Math.round(R * 2.4),
     'radius-pill': 999,
     'radius-agent': Math.max(2, Math.round(R * 0.6)),
     'focus-width': contrast === 'high' ? 3 : 2,
     'glass-blur-sheet': config.glass ? 20 : 0,
     'glass-blur-floating': config.glass ? 24 : 0,
   }
-  const numbers: Record<string, number> = { 'glass-saturate': config.glass ? 1.15 : 1 }
+  const numbers: Record<string, number> = { 'glass-saturate': config.glass ? (config.glassSaturate?.[mode] ?? 1.15) : 1 }
 
   const fonts: ResolvedTheme['fonts'] = {}
   for (const role of ['display', 'body', 'mono'] as const) {
@@ -491,7 +521,7 @@ export function resolveTheme(config: ThemeConfig, mode: Mode, contrastOverride?:
     if (list?.length) fonts[FONT_ROLE_TOKENS[role]] = [...list]
   }
 
-  return { name: config.name, mode, contrast, colors, ramps, cta: { angle: 135, stops: ctaStops }, shadows, dimensions, numbers, fonts, strings: config.strings ?? {}, report }
+  return { name: config.name, mode, contrast, colors, ramps, cta: { angle: 135, stops: ctaStops }, shadows, dimensions, numbers, fonts, strings: { ...config.strings, ...(contrast === config.contrast ? config.modeStrings?.[mode] : undefined) }, report }
 }
 
 // ---------------------------------------------------------------------------