postext 1.4.2 → 1.5.1

package/dist/pipeline/paragraphContainers.d.ts

@@ -10,17 +10,26 @@ import { type BlockStyle } from './styles';
 export interface ParagraphContainer {
     /** `containerId` of the start/end marker pair. */
     id: number;
+    /** The `style` id the container names. */
+    styleId: string;
     /** Style for every paragraph in the container. */
     style: BlockStyle;
-    /** Style for the container's last paragraph: the container's
-     *  `marginBottom` is baked into its `marginBottomPx` so the grid snap that
-     *  closes the container guarantees the margin (grid wins, margin is a
-     *  minimum — the same convention snapped headings follow). */
+    /** Style for the container's last paragraph: its `marginBottomPx` is
+     *  the space under the container, the larger of `spaceBetween` and
+     *  `marginBottom` (a negative `marginBottom` as it is). With
+     *  `bodyText.paragraphContainerSpacing: 'add'` (1.4) it is baked into
+     *  the grid snap that closes the container (grid wins, margin is a
+     *  minimum — the same convention snapped headings follow); with
+     *  `'collapse'` the flow snaps under the text and carries what the snap
+     *  left of the space, so it merges with the next block's own. */
     tailStyle: BlockStyle;
     /** Applied on entry through pending spacing. */
     marginTopPx: number;
     /** Fallback for containers whose last block is not a paragraph. */
     marginBottomPx: number;
+    /** The style's `snapToGrid`: whether the flow snaps back onto the
+     *  baseline grid under the container's last paragraph (EF-184). */
+    snapToGrid: boolean;
 }
 export interface ParagraphContainerPlan {
     /** Container id → entry, for `paragraphs` containers with a known style. */

package/dist/pipeline/paragraphContainers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paragraphContainers.d.ts","sourceRoot":"","sources":["../../src/pipeline/paragraphContainers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAyB,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAElE,MAAM,WAAW,kBAAkB;IACjC,kDAAkD;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,kDAAkD;IAClD,KAAK,EAAE,UAAU,CAAC;IAClB;;;kEAG8D;IAC9D,SAAS,EAAE,UAAU,CAAC;IACtB,gDAAgD;IAChD,WAAW,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,4EAA4E;IAC5E,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACtC,qEAAqE;IACrE,OAAO,EAAE,KAAK,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAAC;CAChD;AAED,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,SAAS,YAAY,EAAE,EACtC,QAAQ,EAAE,cAAc,GACvB,sBAAsB,CAoDxB"}
+{"version":3,"file":"paragraphContainers.d.ts","sourceRoot":"","sources":["../../src/pipeline/paragraphContainers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAyB,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAElE,MAAM,WAAW,kBAAkB;IACjC,kDAAkD;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,kDAAkD;IAClD,KAAK,EAAE,UAAU,CAAC;IAClB;;;;;;;qEAOiE;IACjE,SAAS,EAAE,UAAU,CAAC;IACtB,gDAAgD;IAChD,WAAW,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,cAAc,EAAE,MAAM,CAAC;IACvB;uEACmE;IACnE,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,sBAAsB;IACrC,4EAA4E;IAC5E,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACtC,qEAAqE;IACrE,OAAO,EAAE,KAAK,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAAC;CAChD;AAED,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,SAAS,YAAY,EAAE,EACtC,QAAQ,EAAE,cAAc,GACvB,sBAAsB,CAqDxB"}

package/dist/pipeline/paragraphContainers.js

@@ -11,9 +11,8 @@ export function planParagraphContainers(contentBlocks, resolved) {
     const byBlock = new Array(contentBlocks.length);
     const dpi = resolved.page.dpi;
     // Every open container occupies one slot, undefined for non-`paragraphs`
-    // containers and for unknown style ids (those render as plain body text —
-    // the build has no warnings channel; the editor's warnings phase can flag
-    // them).
+    // containers and for unknown style ids (those render as plain body text,
+    // and `collectContentWarnings` reports them in `doc.contentWarnings`).
     const open = [];
     const cache = new Map();
     for (let i = 0; i < contentBlocks.length; i++) {
@@ -32,10 +31,12 @@ export function planParagraphContainers(contentBlocks, resolved) {
                         // the entries' own spacing instead of collapsing with it.
                         const tailMarginPx = marginBottomPx < 0 ? marginBottomPx : Math.max(style.marginBottomPx, marginBottomPx);
                         base = {
+                            styleId,
                             style,
                             tailStyle: { ...style, marginBottomPx: tailMarginPx },
                             marginTopPx: dimensionToPx(cfg.marginTop, dpi, style.fontSizePx),
                             marginBottomPx,
+                            snapToGrid: cfg.snapToGrid,
                         };
                         cache.set(styleId, base);
                     }

package/dist/pipeline/paragraphContainers.js.map

@@ -1 +1 @@
-{"version":3,"file":"paragraphContainers.js","sourceRoot":"","sources":["../../src/pipeline/paragraphContainers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"paragraphContainers.js","sourceRoot":"","sources":["../../src/pipeline/paragraphContainers.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/partPalette.d.ts

@@ -1,6 +1,52 @@
-import type { ColorPaletteEntry } from '../types';
+import type { ColorPaletteEntry, PostextConfig, ResourceType } from '../types';
 import type { VDTDocument } from '../vdt';
+/** The colour of a block's text a setting sets: its running text, bold and
+ *  italic runs, references, list marker (a bullet or a number), or a
+ *  number's separator. */
+export type TextColorRole = 'color' | 'bold' | 'italic' | 'ref' | 'bullet' | 'separator';
+/** The colours of a contents row: the entry's text (bold and italic runs
+ *  included), its number, and its page number and subtitle. */
+export type TocColorRole = 'color' | 'number' | 'segment';
+/** The part of a callout frame a setting colours: the fills (background,
+ *  stripe, label tab), the border, the rules (the marker's and the
+ *  label's) and the text (title, icon and marker glyphs, label). */
+export type FrameColorRole = 'fill' | 'border' | 'rule' | 'text';
+/**
+ * The kinds of flow colour. A kind names the settings a colour of the VDT
+ * can come from:
+ * - `text:<role>` ({@link TextColorRole}): body text, blockquotes,
+ *   paragraph styles, lists, the text inside boxes, section and part
+ *   bodies, display maths;
+ * - `toc:<role>` ({@link TocColorRole}): the rows of the contents;
+ * - `heading:<level>` (a heading level), `heading@<style id>` (a heading
+ *   style), and `heading` for every heading colour;
+ * - `box:<role>@<callout style id>` ({@link FrameColorRole}) and
+ *   `box:<role>` for that part of every callout style;
+ * - `table:<setting>` (the document's table style), `table:<setting>@<id>`
+ *   (a named table style), `chip:<setting>@<id>` and `chip:<setting>`
+ *   (chip styles), `caption:<setting>` (the document's caption style) and
+ *   `caption:<setting>@<resource type id>` (a resource type's own): one
+ *   colour of those styles, as `table:headerBackground` or
+ *   `caption:note.color`.
+ */
+export type FlowColorKind = `text:${TextColorRole}` | `toc:${TocColorRole}` | 'heading' | `heading:${number}` | `heading@${string}` | `box:${string}` | `table:${string}` | `chip:${string}` | `caption:${string}`;
+/** For base values (lower-case hex) that palette entries share: the values
+ *  each kind of flow colour takes under a page's palette overrides. */
+export type FlowColorValues = ReadonlyMap<string, ReadonlyMap<FlowColorKind, ReadonlySet<string>>>;
+/**
+ * The values each kind of flow colour takes under `overrides` (palette id →
+ * hex), for the base values of `config`'s palette that two or more entries
+ * share: `config` is resolved with its own palette and with the overridden
+ * one, and every colour setting of the flow is read in both. Settings of a
+ * kind that resolve to one base value may disagree under the overrides (two
+ * entries that share it, or an entry and a colour written out); the set
+ * then holds each value.
+ */
+export declare function flowColorValues(config: PostextConfig | undefined, overrides: Readonly<Record<string, string>>, resourceTypes?: readonly ResourceType[]): FlowColorValues;
 /** Recolour each page's flow (columns and floats) with the palette overrides
- *  in force on it (`palettes[pageIndex]`: palette id → hex). */
-export declare function applyPartPalettesToFlow(doc: VDTDocument, palettes: readonly Record<string, string>[], basePalette: readonly ColorPaletteEntry[] | undefined): void;
+ *  in force on it (`palettes[pageIndex]`: palette id → hex). `valuesFor`
+ *  gives, for an override map, what each kind of flow colour takes where
+ *  two entries share a base value (see {@link flowColorValues}); without it
+ *  such a value takes the last override that changes it. */
+export declare function applyPartPalettesToFlow(doc: VDTDocument, palettes: readonly Record<string, string>[], basePalette: readonly ColorPaletteEntry[] | undefined, valuesFor?: (overrides: Readonly<Record<string, string>>) => FlowColorValues): void;
 //# sourceMappingURL=partPalette.d.ts.map

package/dist/pipeline/partPalette.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"partPalette.d.ts","sourceRoot":"","sources":["../../src/pipeline/partPalette.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,KAAK,EAA4B,WAAW,EAAW,MAAM,QAAQ,CAAC;AAiD7E;gEACgE;AAChE,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAC3C,WAAW,EAAE,SAAS,iBAAiB,EAAE,GAAG,SAAS,GACpD,IAAI,CAuBN"}
+{"version":3,"file":"partPalette.d.ts","sourceRoot":"","sources":["../../src/pipeline/partPalette.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAsB,iBAAiB,EAAc,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC/G,OAAO,KAAK,EAA4C,WAAW,EAAwD,MAAM,QAAQ,CAAC;AAqB1I;;0BAE0B;AAC1B,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEzF;+DAC+D;AAC/D,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE1D;;oEAEoE;AACpE,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;AAEjE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,aAAa,GACrB,QAAQ,aAAa,EAAE,GAAG,OAAO,YAAY,EAAE,GAAG,SAAS,GAAG,WAAW,MAAM,EAAE,GAAG,WAAW,MAAM,EAAE,GACvG,OAAO,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,GAAG,QAAQ,MAAM,EAAE,GAAG,WAAW,MAAM,EAAE,CAAC;AAEjF;uEACuE;AACvE,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AA+InG;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC3C,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,GACtC,eAAe,CAajB;AAmLD;;;;4DAI4D;AAC5D,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAC3C,WAAW,EAAE,SAAS,iBAAiB,EAAE,GAAG,SAAS,EACrD,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,eAAe,GAC3E,IAAI,CAyBN"}

package/dist/pipeline/partPalette.js

@@ -3,94 +3,462 @@
 // value: on the pages a part (or a styled section) rules, every colour of the
 // text flow equal to the base value of a palette entry the part overrides
 // takes the part's value — headings, bold and italic runs, references,
-// bullets and numbers, captions, table text and rules, callout boxes (title,
-// background, stripe). Explicit colours that
-// merely coincide with an entry (an inline swatch) keep theirs.
-const BLOCK_KEYS = ['color', 'boldColor', 'italicColor', 'refColor', 'bulletColor', 'separatorColor'];
-const RESOURCE_KEYS = ['captionColor', 'captionLabelColor', 'linkColor', 'noteColor'];
-const TABLE_KEYS = ['color', 'headerColor', 'borderColor'];
+// bullets and numbers, captions and caption bars, table text, rules and
+// fills, callout boxes (title, background, stripe), inline chips (fill,
+// outline, text). Explicit colours that merely coincide with an entry (an
+// inline swatch) keep theirs.
+//
+// Two entries can share a base value and still take different values on a
+// page (one overridden and not the other, or both to different colours).
+// The value alone then cannot say which one a flow colour came from. Each
+// colour of the VDT is therefore matched with the settings it can come
+// from (its kind: a block's text, bold, italic, reference, marker or
+// separator colour; a heading level or heading style; one part of one
+// callout style's frame; one colour of a table, chip or caption style) and
+// takes the value those settings resolve to under the page's palette
+// (`flowColorValues`). A cell's own fill follows its own link.
+import { resolveAllConfig } from './config';
+import { mergeCaptionStyle } from '../defaults/captionStyle';
+/** The colours a block's text is painted in: the VDT field and the kind of
+ *  setting each one comes from. */
+const TEXT_FIELDS = [
+    ['color', 'text:color'], ['boldColor', 'text:bold'], ['italicColor', 'text:italic'],
+    ['refColor', 'text:ref'], ['bulletColor', 'text:bullet'], ['separatorColor', 'text:separator'],
+];
+/** Colours of a resource block and of its table, and the setting of the
+ *  caption or table style each one is resolved from. */
+const CAPTION_KEYS = [['captionColor', 'color'], ['captionLabelColor', 'labelColor'], ['noteColor', 'note.color']];
+const TABLE_KEYS = [
+    ['color', 'bodyColor'], ['headerColor', 'headerColor'], ['borderColor', 'borderColor'],
+    ['headerBackground', 'headerBackground'], ['bodyBackground', 'bodyBackground'],
+    ['bodyAlternateBackground', 'bodyAlternateBackground'],
+];
+/** Keys whose subtree is a design (running heads, openers, part pages,
+ *  heading designs): designs follow their palette links directly. */
+const DESIGN_KEYS = new Set(['header', 'footer', 'design', 'versoDesign', 'advancedDesign']);
+const isIndex = (k) => /^\d+$/.test(k);
+/** The kinds a colour of a text setting at `path` belongs to. `color`
+ *  under a list is the marker's colour (list items take the body's). */
+function textKinds(path) {
+    const keys = path.filter((k) => !isIndex(k));
+    const inList = keys.some((k) => k === 'unorderedLists' || k === 'orderedLists' || k === 'lists');
+    switch (keys[keys.length - 1]) {
+        case 'boldColor':
+            return ['text:bold'];
+        case 'italicColor':
+            return ['text:italic'];
+        case 'referenceColor':
+            return ['text:ref'];
+        case 'bulletColor':
+        case 'numberColor':
+            return ['text:bullet'];
+        case 'separatorColor':
+            return ['text:separator'];
+        case 'color':
+            return [inList ? 'text:bullet' : 'text:color'];
+        default:
+            // `taskCompletedColor`: the text of a ticked task.
+            return ['text:color'];
+    }
+}
+/** The parts of a callout frame a setting of the style colours (`rest` is
+ *  its path inside the style, `stripe.color`); a colour this list does
+ *  not know counts for every part. */
+function frameRoles(rest) {
+    switch (rest) {
+        case 'background':
+        case 'stripe.color':
+        case 'label.background':
+            return ['fill'];
+        case 'border.color':
+            return ['border'];
+        case 'marker.rule.color':
+        case 'label.rule.color':
+            return ['rule'];
+        case 'titleStyle.color':
+        case 'icon.color':
+        case 'marker.color':
+        case 'label.color':
+            return ['text'];
+        default:
+            return ['fill', 'border', 'rule', 'text'];
+    }
+}
+/** The kinds of flow colour a colour of the resolved configuration `cfg`
+ *  at `path` sets: none for a design, the page, the debug overlay… */
+function kindsOfPath(path, cfg) {
+    if (path.some((k) => DESIGN_KEYS.has(k)))
+        return [];
+    const [top, second] = path;
+    const index = Number(second);
+    // The setting inside a style, indices left out (`note.color`).
+    const rest = (from) => path.slice(from).filter((k) => !isIndex(k)).join('.');
+    switch (top) {
+        case 'headings': {
+            if (second !== 'levels')
+                return ['heading'];
+            const level = cfg.headings.levels[Number(path[2])]?.level;
+            return level !== undefined && path[path.length - 1] === 'color' ? [`heading:${level}`, 'heading'] : ['heading'];
+        }
+        case 'headingStyles': {
+            if (path[2] === 'bodyStyle')
+                return textKinds(path);
+            if (path[2] !== 'overrides')
+                return [];
+            const id = cfg.headingStyles[index]?.id;
+            return id !== undefined && path[path.length - 1] === 'color' ? [`heading@${id}`, 'heading'] : ['heading'];
+        }
+        case 'bodyText':
+        case 'unorderedLists':
+        case 'orderedLists':
+        case 'paragraphStyles':
+        case 'math':
+            return textKinds(path);
+        case 'toc':
+            if (second === 'pageNumber' || second === 'subtitle')
+                return ['toc:segment'];
+            if (second !== 'levels')
+                return [];
+            return [path[path.length - 1] === 'numberColor' ? 'toc:number' : 'toc:color'];
+        case 'parts':
+            return second === 'bodyStyle' ? textKinds(path) : [];
+        case 'calloutStyles': {
+            if (path[2] === 'body' || path[2] === 'lists')
+                return textKinds(path);
+            const id = cfg.calloutStyles[index]?.id;
+            return frameRoles(rest(2)).flatMap((role) => (id !== undefined ? [`box:${role}@${id}`, `box:${role}`] : [`box:${role}`]));
+        }
+        case 'tableStyle':
+            return [`table:${rest(1)}`];
+        case 'tableStyles': {
+            const id = cfg.tableStyles[index]?.id;
+            return id !== undefined ? [`table:${rest(2)}@${id}`] : [];
+        }
+        case 'chipStyles': {
+            const id = cfg.chipStyles[index]?.id;
+            return id !== undefined ? [`chip:${rest(2)}@${id}`, `chip:${rest(2)}`] : [`chip:${rest(2)}`];
+        }
+        case 'captionStyle':
+            return [`caption:${rest(1)}`];
+        default:
+            return [];
+    }
+}
+function isColorValue(v) {
+    return typeof v === 'object' && v !== null && typeof v.hex === 'string';
+}
+/** Walk two resolved configurations of the same shape side by side and hand
+ *  every pair of colours to `visit` with its path. */
+function walkColorPairs(a, b, path, visit) {
+    if (isColorValue(a) && isColorValue(b)) {
+        visit(path, a, b);
+        return;
+    }
+    if (Array.isArray(a) && Array.isArray(b)) {
+        const n = Math.min(a.length, b.length);
+        for (let i = 0; i < n; i++)
+            walkColorPairs(a[i], b[i], [...path, String(i)], visit);
+        return;
+    }
+    if (typeof a !== 'object' || a === null || typeof b !== 'object' || b === null)
+        return;
+    for (const key of Object.keys(a)) {
+        if (key === 'colorPalette')
+            continue;
+        const va = a[key];
+        if (typeof va !== 'object' || va === null)
+            continue;
+        walkColorPairs(va, b[key], [...path, key], visit);
+    }
+}
+const withHash = (hex) => (hex.startsWith('#') ? hex : `#${hex}`);
+/**
+ * The values each kind of flow colour takes under `overrides` (palette id →
+ * hex), for the base values of `config`'s palette that two or more entries
+ * share: `config` is resolved with its own palette and with the overridden
+ * one, and every colour setting of the flow is read in both. Settings of a
+ * kind that resolve to one base value may disagree under the overrides (two
+ * entries that share it, or an entry and a colour written out); the set
+ * then holds each value.
+ */
+export function flowColorValues(config, overrides, resourceTypes) {
+    if (!config)
+        return new Map();
+    // Memoised per configuration object (resolved configurations are cached
+    // the same way) and override map: every build of a chapter asks again.
+    const key = JSON.stringify(Object.entries(overrides).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)));
+    let memo = valuesMemo.get(config);
+    if (!memo)
+        valuesMemo.set(config, (memo = new Map()));
+    let hit = memo.get(key);
+    if (!hit || hit.resourceTypes !== resourceTypes) {
+        hit = { resourceTypes, values: computeFlowColorValues(config, overrides, resourceTypes) };
+        memo.set(key, hit);
+    }
+    return hit.values;
+}
+const valuesMemo = new WeakMap();
+function computeFlowColorValues(config, overrides, resourceTypes) {
+    const out = new Map();
+    const palette = config.colorPalette;
+    if (!palette || palette.length === 0)
+        return out;
+    const counts = new Map();
+    for (const e of palette) {
+        const key = e.value.hex.toLowerCase();
+        counts.set(key, (counts.get(key) ?? 0) + 1);
+    }
+    const shared = new Set([...counts].filter(([, n]) => n > 1).map(([hex]) => hex));
+    if (shared.size === 0)
+        return out;
+    const next = palette.map((e) => {
+        const hex = overrides[e.id];
+        return hex ? { ...e, value: { ...e.value, hex: withHash(hex) } } : e;
+    });
+    const before = resolveAllConfig(config);
+    const after = resolveAllConfig({ ...config, colorPalette: next });
+    const record = (kinds, a, b) => {
+        const key = a.hex.toLowerCase();
+        if (kinds.length === 0 || !shared.has(key))
+            return;
+        let byKind = out.get(key);
+        if (!byKind)
+            out.set(key, (byKind = new Map()));
+        for (const kind of kinds) {
+            let values = byKind.get(kind);
+            if (!values)
+                byKind.set(kind, (values = new Set()));
+            values.add(b.hex.toLowerCase());
+        }
+    };
+    walkColorPairs(before, after, [], (path, a, b) => record(kindsOfPath(path, before), a, b));
+    // Captions of a resource type resolve their overrides at layout time.
+    for (const type of resourceTypes ?? []) {
+        const cs = type.captionStyle;
+        if (!cs)
+            continue;
+        walkColorPairs(mergeCaptionStyle(before.captionStyle, cs, before.colorPalette), mergeCaptionStyle(after.captionStyle, cs, after.colorPalette), [], (path, a, b) => record([`caption:${path.join('.')}@${type.id}`], a, b));
+    }
+    return out;
+}
+/** The kind groups of a style's colour `setting` (`headerBackground`):
+ *  the named style's own first, when the block names one. */
+function scoped(family, settings, id) {
+    const all = settings.map((s) => `${family}:${s}`);
+    return id ? [settings.map((s) => `${family}:${s}@${id}`), all] : [all];
+}
 /** Segment colours of `lines` (inline swatches keep their own colour: it
- *  lives on `segment.swatch`, which is not touched). */
-function recolorLines(lines, remap) {
+ *  lives on `segment.swatch`, which is not touched), chips included. A
+ *  chip's colours are replaced on a copy of its record: the measurement
+ *  cache shares that record between every copy of the measured lines, and
+ *  the same paragraph may also sit on a page the palette does not rule. */
+function recolorLines(lines, remap, r) {
     for (const line of lines ?? []) {
         for (const seg of line.segments ?? []) {
             if (seg.color)
                 seg.color = remap(seg.color);
+            const chip = seg.chip;
+            if (chip && (chip.background || chip.borderColor || chip.color)) {
+                const style = chip.styleId || undefined;
+                const background = r.by(scoped('chip', ['background'], style))(chip.background);
+                const borderColor = r.by(scoped('chip', ['borderColor'], style))(chip.borderColor);
+                const color = r.by(scoped('chip', ['color'], style))(chip.color);
+                if (background !== chip.background || borderColor !== chip.borderColor || color !== chip.color) {
+                    seg.chip = {
+                        ...chip,
+                        ...(background ? { background } : {}),
+                        ...(borderColor ? { borderColor } : {}),
+                        ...(color ? { color } : {}),
+                    };
+                }
+            }
         }
     }
 }
-function recolorDesign(blocks, remap) {
+/** A callout frame's decoration, each part by the settings that colour it
+ *  in the frame's style. */
+function recolorFrame(blocks, styleId, r) {
+    const part = (role) => r.by(styleId !== undefined ? [[`box:${role}@${styleId}`], [`box:${role}`]] : [[`box:${role}`]]);
     for (const b of blocks) {
-        if (b.kind === 'text' || b.kind === 'rule')
+        if (b.kind === 'text') {
+            const remap = part('text');
             b.color = remap(b.color) ?? b.color;
+            if (b.stroke)
+                b.stroke.color = remap(b.stroke.color) ?? b.stroke.color;
+        }
+        else if (b.kind === 'rule') {
+            b.color = part('rule')(b.color) ?? b.color;
+        }
         else if (b.kind === 'box') {
             if (b.box.backgroundColor)
-                b.box.backgroundColor = remap(b.box.backgroundColor);
+                b.box.backgroundColor = part('fill')(b.box.backgroundColor);
             if (b.box.borderColor)
-                b.box.borderColor = remap(b.box.borderColor);
+                b.box.borderColor = part('border')(b.box.borderColor);
         }
     }
 }
-function recolorBlock(block, remap) {
+/** The model cell a laid-out cell was set from. */
+function modelCell(rb, cell) {
+    return rb.resource?.table?.model.rows[cell.row]?.[cell.col];
+}
+/** Where a heading's colour comes from: its heading style when the style
+ *  sets one from the colour's value, otherwise its level. */
+function headingGroups(block) {
+    const level = block.headingLevel !== undefined ? `heading:${block.headingLevel}` : 'heading';
+    return block.headingStyleId !== undefined ? [[`heading@${block.headingStyleId}`], [level]] : [[level]];
+}
+/** The settings each text colour of a contents row comes from. A row
+ *  paints its bold and italic runs in its own colour. */
+const TOC_FIELDS = {
+    color: 'toc:color', boldColor: 'toc:color', italicColor: 'toc:color', bulletColor: 'toc:number', separatorColor: 'toc:number',
+};
+function recolorBlock(block, r) {
     const rec = block;
-    for (const key of BLOCK_KEYS)
-        if (rec[key])
-            rec[key] = remap(rec[key]);
-    recolorLines(block.lines, remap);
+    const heading = block.type === 'heading' ? headingGroups(block) : undefined;
+    const toc = block.tocEntry !== undefined;
+    for (const [key, kind] of TEXT_FIELDS) {
+        if (!rec[key])
+            continue;
+        const groups = heading && key === 'color' ? heading : [[(toc ? TOC_FIELDS[key] : undefined) ?? kind]];
+        rec[key] = r.by(groups)(rec[key]);
+    }
+    // A run with a colour of its own: a contents entry's page number or
+    // subtitle.
+    recolorLines(block.lines, r.by(toc ? [['toc:segment']] : heading ?? []), r);
     // A callout frame's decoration (background, border, stripe, title) is a
     // design overlay resolved from the style's palette-linked colours.
     if (block.type === 'callout' && block.designOverlay)
-        recolorDesign(block.designOverlay.blocks, remap);
+        recolorFrame(block.designOverlay.blocks, block.callout?.styleId, r);
     const rb = block.resourceBlock;
     if (!rb)
         return;
     const rrec = rb;
-    for (const key of RESOURCE_KEYS)
+    const typeId = rb.resource?.typeId;
+    for (const [key, setting] of CAPTION_KEYS)
         if (rrec[key])
-            rrec[key] = remap(rrec[key]);
-    recolorLines(rb.captionLines, remap);
-    recolorLines(rb.noteLines, remap);
-    recolorLines(rb.continuesLines, remap);
+            rrec[key] = r.by(scoped('caption', [setting], typeId))(rrec[key]);
+    // The references in captions and cells: `bodyText.referenceColor`.
+    if (rb.linkColor)
+        rb.linkColor = r.by([['text:ref']])(rb.linkColor) ?? rb.linkColor;
+    if (rb.captionBar)
+        rb.captionBar.background = r.by(scoped('caption', ['background'], typeId))(rb.captionBar.background) ?? rb.captionBar.background;
+    const captionRuns = r.by(scoped('caption', CAPTION_KEYS.map(([, s]) => s), typeId));
+    recolorLines(rb.captionLines, captionRuns, r);
+    recolorLines(rb.noteLines, captionRuns, r);
+    recolorLines(rb.continuesLines, captionRuns, r);
     if (rb.table) {
-        const trec = rb.table;
-        for (const key of TABLE_KEYS)
+        const t = rb.table;
+        const trec = t;
+        const styleId = rb.resource?.table?.styleId;
+        for (const [key, setting] of TABLE_KEYS)
             if (trec[key])
-                trec[key] = remap(trec[key]);
-        for (const cell of rb.table.cells)
-            recolorLines(cell.lines, remap);
+                trec[key] = r.by(scoped('table', [setting], styleId))(trec[key]);
+        const fills = scoped('table', ['bodyBackground', 'bodyAlternateBackground', 'headerBackground'], styleId);
+        const cellRuns = r.by(scoped('table', ['bodyColor', 'headerColor'], styleId));
+        for (const cell of t.cells) {
+            if (cell.background)
+                cell.background = r.cellFill(cell.background, modelCell(rb, cell)?.background, fills);
+            recolorLines(cell.lines, cellRuns, r);
+        }
     }
 }
 /** Recolour each page's flow (columns and floats) with the palette overrides
- *  in force on it (`palettes[pageIndex]`: palette id → hex). */
-export function applyPartPalettesToFlow(doc, palettes, basePalette) {
+ *  in force on it (`palettes[pageIndex]`: palette id → hex). `valuesFor`
+ *  gives, for an override map, what each kind of flow colour takes where
+ *  two entries share a base value (see {@link flowColorValues}); without it
+ *  such a value takes the last override that changes it. */
+export function applyPartPalettesToFlow(doc, palettes, basePalette, valuesFor) {
     if (!basePalette || basePalette.length === 0)
         return;
     const baseHex = new Map(basePalette.map((e) => [e.id, e.value.hex.toLowerCase()]));
     const cache = new Map();
+    const remapsOf = (overrides) => {
+        const hit = cache.get(overrides);
+        if (hit !== undefined)
+            return hit;
+        const map = new Map();
+        for (const [id, hex] of Object.entries(overrides)) {
+            const base = baseHex.get(id);
+            const next = withHash(hex);
+            if (base && base !== next.toLowerCase())
+                map.set(base, next);
+        }
+        const remaps = map.size === 0 ? null : pageRemaps(map, overrides, basePalette, valuesFor);
+        cache.set(overrides, remaps);
+        return remaps;
+    };
     for (const page of doc.pages) {
         const overrides = palettes[page.index];
         if (!overrides || Object.keys(overrides).length === 0)
             continue;
-        let map = cache.get(overrides);
-        if (!map) {
-            map = new Map();
-            for (const [id, hex] of Object.entries(overrides)) {
-                const base = baseHex.get(id);
-                const next = hex.startsWith('#') ? hex : `#${hex}`;
-                if (base && base !== next.toLowerCase())
-                    map.set(base, next);
-            }
-            cache.set(overrides, map);
-        }
-        if (map.size === 0)
+        const r = remapsOf(overrides);
+        if (!r)
             continue;
-        const m = map;
-        const remap = (hex) => (hex ? m.get(hex.toLowerCase()) ?? hex : hex);
         for (const col of page.columns)
             for (const block of col.blocks)
-                recolorBlock(block, remap);
+                recolorBlock(block, r);
         for (const block of page.floats ?? [])
-            recolorBlock(block, remap);
+            recolorBlock(block, r);
     }
 }
+function pageRemaps(map, overrides, basePalette, valuesFor) {
+    const byValue = (hex) => (hex ? map.get(hex.toLowerCase()) ?? hex : hex);
+    // Base values two entries share and the page gives two values.
+    const results = new Map();
+    for (const e of basePalette) {
+        const base = e.value.hex.toLowerCase();
+        const o = overrides[e.id];
+        let set = results.get(base);
+        if (!set)
+            results.set(base, (set = new Set()));
+        set.add(o ? withHash(o).toLowerCase() : base);
+    }
+    const ambiguous = new Set([...results].filter(([, s]) => s.size > 1).map(([hex]) => hex));
+    const values = ambiguous.size > 0 && valuesFor ? valuesFor(overrides) : undefined;
+    const linked = (source) => {
+        if (!source?.paletteId)
+            return undefined;
+        const entry = basePalette.find((e) => e.id === source.paletteId);
+        if (!entry)
+            return undefined;
+        const o = overrides[entry.id];
+        return o ? withHash(o) : entry.value.hex;
+    };
+    if (!values) {
+        return {
+            by: () => byValue,
+            cellFill: (hex, source) => (ambiguous.has(hex.toLowerCase()) ? linked(source) : undefined) ?? byValue(hex) ?? hex,
+        };
+    }
+    const by = (groups) => (hex) => {
+        if (!hex)
+            return hex;
+        const key = hex.toLowerCase();
+        if (ambiguous.has(key)) {
+            const found = values.get(key);
+            for (const group of groups) {
+                const taken = new Set();
+                for (const kind of group)
+                    for (const v of found?.get(kind) ?? [])
+                        taken.add(v);
+                if (taken.size === 0)
+                    continue;
+                // The settings that start from the value all agree: theirs.
+                // Otherwise the value decides, as without a palette clash.
+                if (taken.size === 1) {
+                    const v = taken.values().next().value;
+                    return v === key ? hex : v;
+                }
+                break;
+            }
+        }
+        return map.get(key) ?? hex;
+    };
+    return {
+        by,
+        // A cell fill with no link of its own (a colour written out) is told
+        // apart from the table's fills by value only.
+        cellFill: (hex, source, groups) => (ambiguous.has(hex.toLowerCase()) ? linked(source) : undefined) ?? by(groups)(hex) ?? hex,
+    };
+}
 //# sourceMappingURL=partPalette.js.map