@datatechsolutions/tympan-tokens 0.4.2 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatechsolutions/tympan-tokens",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Tympan design tokens: W3C DTCG source (colour, space, radius, type, elevation and glass, motion, z) and an OKLCH theme generator, with the tympan, fakhir, astrlabe, neutral and high-contrast presets in light and dark (plus opt-in UI themes derived from the print book styles), built to --ty-* CSS custom properties, JSON and a TypeScript export.",
   "license": "FSL-1.1-ALv2",
   "author": "Natalia Mesquita",

package/src/fonts.ts

@@ -16,8 +16,8 @@ import { SCRIPT_RULES } from './scripts.ts'
 
 /** Base stacks of every preset: Source Serif 4, IBM Plex Sans, IBM Plex Mono. */
 export const BASE_FONT_SPECS: readonly string[] = [
-  'Source Serif 4:ital,opsz,wght@0,8..60,400;0,8..60,600;0,8..60,700;1,8..60,400',
-  'IBM Plex Sans:ital,wght@0,400;0,500;0,600;0,700;1,400',
+  'Source Serif 4:ital,opsz,wght@0,8..60,400;0,8..60,600;0,8..60,700;1,8..60,400;1,8..60,600',
+  'IBM Plex Sans:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600',
   'IBM Plex Mono:ital,wght@0,400;0,500;0,600;0,700;1,400',
 ]
 

package/src/index.ts

@@ -6,6 +6,7 @@ export * from './dtcg.ts'
 export * from './stylesheet.ts'
 export * from './flow.ts'
 export * from './print-presets.ts'
+export * from './print-book-themes.ts'
 export * from './print-themes.ts'
 export * from './print-aliases.ts'
 export * from './fonts.ts'

package/src/print-book-themes.ts

@@ -0,0 +1,239 @@
+// Book themes: how a publisher or a collection defines its own look for
+// @datatechsolutions/tympan-print without touching tympan's code.
+//
+// A theme inherits a base (one of the 39 presets or another registered theme)
+// and overrides any token of PrintStyleOverrides, plus what belongs to a
+// publisher rather than to a style: its marks (publisher logo, collection
+// seal), the page format and bleed, the running head and folio, and local
+// font files. Register it by id and pass the id to PrintBook as `estilo`.
+//
+// A theme may come from JSON, either in the theme's own shape
+// (`PrintBookThemeJson`) or as a DTCG tree (`printThemeFromDtcg`), so a brand's
+// identity can live in the brand's repository.
+
+import { fromDtcgColor, type DtcgColor } from './dtcg.ts'
+import { toHex } from './color.ts'
+import { SYSTEM_FONT_FAMILIES, fontFaceCss, type FontManifest } from './fonts.ts'
+import {
+  mergePrintStyle,
+  printPresetById,
+  resolvePrintStyleName,
+  type PrintCoresParciais,
+  type PrintPagina,
+  type PrintStyle,
+  type PrintStyleOverrides,
+} from './print-presets.ts'
+
+/** A book theme: an id, a base and overrides. */
+export interface PrintBookTheme extends PrintStyleOverrides {
+  /** Registry id, e.g. 'lakebrasil-editorial'. Use it as PrintBook's `estilo`. */
+  id: string
+  /** A preset name (or deprecated alias) or the id of another registered theme. */
+  base: string
+  /** What the theme interprets (shown in galleries). */
+  referencia?: string
+}
+
+/** The JSON form of a theme: the same fields, colours as hex strings or DTCG colour objects. */
+export type PrintBookThemeJson = Omit<PrintBookTheme, 'cor' | 'pb'> & {
+  cor?: Record<string, unknown>
+  pb?: Record<string, unknown>
+}
+
+const REGISTRO = new Map<string, PrintBookTheme>()
+
+/** A style with overrides and theme extras applied (same as mergePrintStyle, kept for readability). */
+export const mergePrintTheme = mergePrintStyle
+
+/** Resolves a theme id or a preset id to a complete PrintStyle (`name` = the theme id). */
+export function printThemeById(id: string, visitados: string[] = []): PrintStyle {
+  const tema = REGISTRO.get(id)
+  if (!tema) return printPresetById(id)
+  if (visitados.includes(id)) throw new Error(`tympan: book theme cycle ${[...visitados, id].join(' → ')}`)
+  const base = printThemeById(tema.base, [...visitados, id])
+  const { id: _id, base: _base, referencia, ...over } = tema
+  return { ...mergePrintTheme(base, over), name: tema.id, label: tema.label ?? base.label, referencia: referencia ?? `Tema sobre ${base.name}: ${base.referencia}` }
+}
+
+/** True when `id` names a registered theme or a preset. */
+export function isPrintThemeId(id: string): boolean {
+  return REGISTRO.has(id) || resolvePrintStyleName(id) !== undefined
+}
+
+function normalizarCores(c: Record<string, unknown> | undefined): PrintCoresParciais | undefined {
+  if (!c) return undefined
+  const cor = (v: unknown): string => (typeof v === 'string' ? v : toHex(fromDtcgColor(v as DtcgColor)))
+  const out: Record<string, unknown> = {}
+  for (const [k, v] of Object.entries(c)) {
+    if ((k === 'prova' || k === 'temas' || k === 'categorias') && v && typeof v === 'object') out[k] = Object.fromEntries(Object.entries(v).map(([e, x]) => [e, cor(x)]))
+    else if ((k === 'ornamento' || k === 'categorica' || k === 'divergente') && Array.isArray(v)) out[k] = v.map(cor)
+    else out[k] = cor(v)
+  }
+  return out as PrintCoresParciais
+}
+
+/** Validates and normalises a theme read from JSON (colours may be hex or DTCG colour objects). */
+export function printThemeFromJson(json: PrintBookThemeJson | string): PrintBookTheme {
+  const j = (typeof json === 'string' ? JSON.parse(json) : json) as PrintBookThemeJson
+  if (!j || typeof j.id !== 'string' || !/^[a-z0-9][a-z0-9-]*$/.test(j.id)) throw new Error('tympan: a book theme needs an `id` in kebab case')
+  if (typeof j.base !== 'string') throw new Error(`tympan: book theme "${j.id}" needs a \`base\` (a preset or a registered theme)`)
+  const { cor, pb, ...rest } = j
+  const out: PrintBookTheme = { ...rest }
+  const c = normalizarCores(cor)
+  if (c) out.cor = c
+  const p = normalizarCores(pb)
+  if (p) out.pb = p
+  return out
+}
+
+type No = Record<string, unknown>
+
+/** Namespaces read for the theme's meta (id/name, base/extends): tympan's own and the short one brand repos use. */
+const EXTS = ['br.com.datatechsolutions.tympan', 'dev.tympan.print'] as const
+
+/** Unwraps a DTCG group into plain values: `{ $value }` leaves become their value; `$`-keys are dropped. */
+function desembrulhar(n: unknown): unknown {
+  if (!n || typeof n !== 'object' || Array.isArray(n)) return n
+  const o = n as No
+  if ('$value' in o) {
+    const v = o.$value
+    if (o.$type === 'fontFamily' && Array.isArray(v)) return pilhaDeFontes(v as string[])
+    if (o.$type === 'color' && v && typeof v === 'object') return toHex(fromDtcgColor(v as DtcgColor))
+    if (o.$type === 'dimension' && v && typeof v === 'object' && 'unit' in (v as No)) return emMm(v as { value: number; unit: string })
+    return v
+  }
+  const out: No = {}
+  for (const [k, v] of Object.entries(o)) if (!k.startsWith('$')) out[k] = desembrulhar(v)
+  return out
+}
+
+const GENERICAS = /^(serif|sans-serif|monospace|cursive|fantasy|system-ui|ui-[a-z-]+)$/
+const pilhaDeFontes = (v: string[]) => v.map((x) => (GENERICAS.test(x) || /^["']/.test(x) ? x : `"${x}"`)).join(', ')
+const emMm = (v: { value: number; unit: string }) => (v.unit === 'px' ? (v.value * 25.4) / 96 : v.unit === 'pt' ? (v.value * 25.4) / 72 : v.unit === 'cm' ? v.value * 10 : v.value)
+
+/** Figures from the meta: an object by role, or a phrase such as "tabular-nums em numero e rotulo". */
+function lerAlgarismos(v: unknown): Record<string, 'tabular' | 'proporcional'> | undefined {
+  if (v && typeof v === 'object') return v as Record<string, 'tabular' | 'proporcional'>
+  if (typeof v !== 'string') return undefined
+  const tipo = /proporc|proportional/.test(v) ? 'proporcional' : /tabular/.test(v) ? 'tabular' : undefined
+  if (!tipo) return undefined
+  const papeis = ['numero', 'rotulo', 'corpo'].filter((p) => v.includes(p))
+  return Object.fromEntries((papeis.length ? papeis : ['numero']).map((p) => [p, tipo]))
+}
+
+/**
+ * A theme from a DTCG (2025.10) tree. The tree mirrors PrintStyleOverrides: each group is a field
+ * (`label`, `fontes.<role>`, `googleFonts`, `cor.<role>`, `cor.prova.<state>`, `cor.categorica.<n>`,
+ * `cor.divergente.<n>`, `traco.largura`, `pb.*`, `estrutura.*`, `texto.*`, `marcas.*`, `pagina.*`, `folio.*`,
+ * `fontesLocais`…) and each `{ "$type", "$value" }` leaf becomes its value (colours as hex or DTCG colour
+ * objects, `fontFamily` arrays become CSS stacks, dimensions become mm). The theme's id and base come from
+ * the root `$extensions["dev.tympan.print"]` (or `["br.com.datatechsolutions.tympan"]`) as `name`/`id` and
+ * `extends`/`base`.
+ */
+export function printThemeFromDtcg(tree: No | string): PrintBookTheme {
+  const t = (typeof tree === 'string' ? JSON.parse(tree) : tree) as No
+  const exts = (t.$extensions ?? {}) as No
+  const meta = Object.assign({}, ...EXTS.map((e) => exts[e] as No | undefined).filter(Boolean).map((m) => ({ ...(m!.tema as No | undefined), ...m }))) as No
+  const id = (meta.id ?? meta.name) as string | undefined
+  const base = (meta.base ?? meta.extends) as string | undefined
+  if (!id || !base) throw new Error(`tympan: a DTCG book theme needs $extensions["dev.tympan.print"] with name and extends`)
+  const corpo = desembrulhar(t) as No
+  // Ordered lists written as groups ("1", "2"… or "a", "b"…) become arrays.
+  const cor = corpo.cor as No | undefined
+  for (const g of [cor, corpo.pb as No | undefined])
+    if (g) for (const k of ['categorica', 'divergente', 'ornamento']) if (g[k] && typeof g[k] === 'object' && !Array.isArray(g[k])) g[k] = Object.entries(g[k] as No).sort(([a], [b]) => a.localeCompare(b, 'en', { numeric: true })).map(([, v]) => v)
+  // Brand-repo extras in the meta: per-role weights, figures and the data palette.
+  const texto = { ...(corpo.texto as No | undefined) }
+  if (meta.pesos && typeof meta.pesos === 'object') texto.pesos = { ...(meta.pesos as No), ...(texto.pesos as No | undefined) }
+  const alg = lerAlgarismos(meta.algarismos)
+  if (alg) texto.algarismos = { ...alg, ...(texto.algarismos as No | undefined) }
+  if (Object.keys(texto).length) corpo.texto = texto
+  const dado = meta.dado as Record<string, string> | undefined
+  if (dado) {
+    const c = { ...(corpo.cor as No | undefined) }
+    if (dado.interesse && c.interesse === undefined) c.interesse = dado.interesse
+    if (dado.contexto) c.contexto = dado.contexto
+    if (dado.perdeu && dado.ganhou && c.divergente === undefined) c.divergente = [dado.perdeu, dado.ganhou]
+    corpo.cor = c
+  }
+  return printThemeFromJson({ ...corpo, id, base, ...(meta.referencia ? { referencia: meta.referencia as string } : {}) } as PrintBookThemeJson)
+}
+
+/** Registers (or replaces) a theme; accepts the theme object, its JSON or a DTCG tree. Returns the theme. */
+export function registerPrintTheme(tema: PrintBookTheme | PrintBookThemeJson | No | string): PrintBookTheme {
+  const obj = typeof tema === 'string' ? (JSON.parse(tema) as No) : (tema as No)
+  const t = obj.$extensions ? printThemeFromDtcg(obj) : printThemeFromJson(obj as PrintBookThemeJson)
+  if (resolvePrintStyleName(t.id)) throw new Error(`tympan: book theme id "${t.id}" collides with a preset`)
+  REGISTRO.set(t.id, t)
+  printThemeById(t.id) // fails now on an unknown base or a cycle
+  return t
+}
+
+/** Removes a registered theme (tests, hot reload). */
+export function unregisterPrintTheme(id: string): boolean {
+  return REGISTRO.delete(id)
+}
+
+/** Ids of the registered themes, in registration order. */
+export function registeredPrintThemes(): string[] {
+  return [...REGISTRO.keys()]
+}
+
+/** `@font-face` rules for a style's local font files ('' when it has none). */
+export function fontesLocaisCss(style: Pick<PrintStyle, 'fontesLocais'>): string {
+  return (style.fontesLocais ?? [])
+    .map(
+      (f) =>
+        `@font-face { font-family: "${f.familia.replace(/"/g, '')}"; src: url("${f.src.replace(/"/g, '%22')}") format("woff2"); font-weight: ${f.peso ?? 400}; font-style: ${f.estilo ?? 'normal'}; font-display: block; }`,
+    )
+    .join('\n')
+}
+
+/** Trim and bleed of a style (defaults 170 × 240 mm, 3 mm bleed). */
+export function paginaDoEstilo(style: Pick<PrintStyle, 'pagina'>): Required<PrintPagina> {
+  const p = style.pagina ?? {}
+  return { largura: p.largura ?? 170, altura: p.altura ?? 240, sangria: p.sangria ?? 3, marcasCorte: p.marcasCorte ?? false }
+}
+
+/** A neutral example theme (registered nowhere by default): a small press over `semanario`, in two inks. */
+export const TEMA_EXEMPLO_EDITORA: PrintBookTheme = {
+  id: 'editora-exemplo',
+  base: 'semanario',
+  label: 'Editora Exemplo · coleção ensaios',
+  fontes: { titulo: '"Source Serif 4", Georgia, serif' },
+  cor: { destaque: '#1f4e79', destaque2: '#b5562b', marcaTexto: '#e8eef5' },
+  pb: { destaque: '#333333', destaque2: '#8a8a8a' },
+  texto: { nomesProprios: 'preservar' },
+  folio: { folio: 'centro', cabeco: 'externo' },
+  pagina: { largura: 160, altura: 230, sangria: 3 },
+}
+
+
+/** Families named in a style's font stacks (quotes removed), in role order, without generic and system faces. */
+export function familiasDoEstilo(style: Pick<PrintStyle, 'fontes'>): string[] {
+  const out: string[] = []
+  for (const pilha of Object.values(style.fontes) as string[])
+    for (const f of pilha.split(',').map((x) => x.trim().replace(/^["']|["']$/g, '')))
+      if (f && !SYSTEM_FONT_FAMILIES.includes(f) && !out.includes(f)) out.push(f)
+  return out
+}
+
+/** Families the style names (first of each stack) that have neither a bundled file nor a theme `fontesLocais`. */
+export function familiasSemArquivo(style: Pick<PrintStyle, 'fontes' | 'fontesLocais'>, manifest: FontManifest): string[] {
+  const proprias = new Set((style.fontesLocais ?? []).map((f) => f.familia))
+  const primeiras = (Object.values(style.fontes) as string[]).map((p) => p.split(',')[0]!.trim().replace(/^["']|["']$/g, ''))
+  return [...new Set(primeiras)].filter((f) => !SYSTEM_FONT_FAMILIES.includes(f) && !proprias.has(f) && !manifest.families[f])
+}
+
+/**
+ * @font-face rules for a style from the fonts bundled in this package (`fonts/manifest.json`): every face of
+ * every family its font stacks name (so a mono or label family outside `googleFonts` is not forgotten), with
+ * URLs `<base><file>`, then the theme's own `fontesLocais`, which win for their family.
+ */
+export function fontesEmpacotadasCss(style: Pick<PrintStyle, 'fontes' | 'googleFonts' | 'fontesLocais'>, manifest: FontManifest, base: string): string {
+  const proprias = new Set((style.fontesLocais ?? []).map((f) => f.familia))
+  const familias = new Set(familiasDoEstilo(style).filter((f) => manifest.families[f] && !proprias.has(f)))
+  // Every bundled spec of those families (faces are de-duplicated by fontFaceCss).
+  const specs = Object.keys(manifest.specs).filter((s) => familias.has(s.split(':')[0]!))
+  return [specs.length ? fontFaceCss(manifest, specs, base) : '', fontesLocaisCss(style)].filter(Boolean).join('\n')
+}

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]!])