postext 1.46.4 → 1.48.0

package/dist/__tests__/composed/overConnectors.test.js

@@ -0,0 +1,232 @@
+/**
+ * Connectors painted over the frames (#1076): a connector with an end at a
+ * picture's anchor (a pointer into a map) is painted after every frame of
+ * the page, in every backend and in the source map, while the rest of the
+ * decoration stays one paint item under the frames. `over` overrides the
+ * default either way. The fixture is the parts of a map of #1057, its map
+ * frame at the default layer.
+ */
+import { describe, it, expect } from 'vitest';
+import { buildDocument } from '../../pipeline/build';
+import { createMeasurementCache } from '../../measure';
+import { renderToHtmlIndexed } from '../../html-backend';
+import { renderPageToCanvas } from '../../index';
+import { collectConfigWarnings } from '../../configWarnings';
+import { sourceAt } from '../../composed/sourceMap';
+import { composedPaintOrder, composedReadingOrder, decorationOver, decorationUnder } from '../../composed/paint';
+import { flowRectToPage } from '../../vdt';
+import { mapPartsFixture } from './fixtures/mapParts';
+class StubCtx {
+    font = '';
+    measureText(s) {
+        const m = /(\d+(?:\.\d+)?)px/.exec(this.font);
+        const em = m ? Number(m[1]) : 10;
+        return { width: [...s].length * em * 0.5 };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const MM = 300 / 25.4;
+const mm = (value) => ({ value, unit: 'mm' });
+const CONNECTORS = ['a-titulo', 'a-leyenda', 'a-escala'];
+/** The map-parts book, its templates patched by `patch`. */
+const build = (locale, patch = (t) => t) => {
+    const f = mapPartsFixture(locale);
+    const config = { ...f.config, pageTemplates: f.config.pageTemplates.map((t) => patch(t)) };
+    return buildDocument({ markdown: f.markdown, resources: f.resources }, config, createMeasurementCache());
+};
+/** The map frame under the decoration, as #1057's fixture had it. */
+const mapUnder = (t) => ({ ...t, frames: (t.frames ?? []).map((f) => (f.name === 'mapa' ? { ...f, layer: -1 } : f)) });
+/** Every connector of the template with `over` set. */
+const withOver = (over) => (t) => ({
+    ...t,
+    decoration: { elements: (t.decoration?.elements ?? []).map((e) => ('kind' in e && e.kind === 'connector' ? { ...e, over } : e)) },
+});
+const composedPage = (doc) => doc.pages.find((p) => p.composed);
+const pathOf = (page, id) => page.composed.decoration.blocks.find((x) => x.elementId === id);
+const pointsOf = (b) => b.subpaths.flat().filter((c) => c.op !== 'Z').map((c) => ({ x: c.x, y: c.y }));
+const order = (page) => composedPaintOrder(page).map((i) => (i.kind === 'frame' ? i.frame.name : i.kind));
+const configPath = (i) => `/pageTemplates/0/decoration/elements/${i}`;
+/** A canvas that records the strokes' starts and the words it fills. */
+function recordCanvas() {
+    const ops = [];
+    const ctx = new Proxy({ font: '', fillStyle: '#000000' }, {
+        get(target, key) {
+            if (key === 'fillText')
+                return (text) => ops.push(`text:${text}`);
+            if (key === 'moveTo')
+                return (x, y) => ops.push(`move:${Math.round(x)},${Math.round(y)}`);
+            if (key === 'measureText')
+                return (s) => ({ width: [...s].length * 7 });
+            if (key in target)
+                return target[key];
+            return () => undefined;
+        },
+        set(target, key, value) { target[key] = value; return true; },
+    });
+    return { ops, canvas: { width: 0, height: 0, getContext: () => ctx } };
+}
+describe('connectors into a picture paint over the frames (#1076)', () => {
+    it('a connector with an anchor end is marked over; the paint order ends with the over item', () => {
+        const page = composedPage(build('en'));
+        expect(page.composed.frames.find((f) => f.name === 'mapa').layer).toBe(1);
+        for (const id of CONNECTORS)
+            expect(pathOf(page, id).over).toBe(true);
+        const o = order(page);
+        expect(o.at(-1)).toBe('over');
+        // Every frame (the map among them) is painted before it.
+        expect(o.indexOf('mapa')).toBeLessThan(o.indexOf('over'));
+        expect(o.filter((k) => k === 'decoration')).toHaveLength(1);
+        // The decoration item holds what is not over; the over item the rest.
+        const deco = page.composed.decoration;
+        expect(decorationUnder(deco).blocks.some((b) => b.kind === 'path' && b.over)).toBe(false);
+        expect(decorationOver(deco).blocks.map((b) => b.elementId)).toEqual([...CONNECTORS]);
+        // Read with the decoration, before the frames.
+        expect(composedReadingOrder(composedPaintOrder(page)).slice(0, 2).map((i) => i.kind)).toEqual(['decoration', 'over']);
+    });
+    it('draws the same lines as the map frame under the decoration (layer -1) did', () => {
+        const now = composedPage(build('en'));
+        const before = composedPage(build('en', mapUnder));
+        for (const id of CONNECTORS)
+            expect(pathOf(now, id).subpaths).toEqual(pathOf(before, id).subpaths);
+        // With the map under the decoration the connectors are still painted
+        // after every frame.
+        const o = order(before);
+        expect(o.indexOf('mapa')).toBeLessThan(o.indexOf('decoration'));
+        expect(o.at(-1)).toBe('over');
+    });
+    it('over: false keeps an anchored connector with the decoration, under the frames', () => {
+        const page = composedPage(build('en', withOver(false)));
+        for (const id of CONNECTORS)
+            expect(pathOf(page, id).over).toBeUndefined();
+        expect(order(page)).not.toContain('over');
+        // Nothing is copied: the decoration paints as one slot.
+        expect(decorationUnder(page.composed.decoration)).toBe(page.composed.decoration);
+        expect(decorationOver(page.composed.decoration)).toBeUndefined();
+    });
+    it('on the canvas: each pointer is stroked after the notes\' words and the map', () => {
+        for (const locale of ['en', 'ar']) {
+            const doc = build(locale);
+            const page = composedPage(doc);
+            const { ops, canvas } = recordCanvas();
+            renderPageToCanvas(page, doc, canvas);
+            // The last word of the frames (the folio, painted after the page, aside).
+            const lastWord = ops.reduce((at, o, i) => (o.startsWith('text:') && !/^text:[\d\u0660-\u0669]+$/.test(o) ? i : at), -1);
+            for (const id of CONNECTORS) {
+                const p = pointsOf(pathOf(page, id))[0];
+                const at = ops.lastIndexOf(`move:${Math.round(p.x)},${Math.round(p.y)}`);
+                expect(at, `${locale} ${id}`).toBeGreaterThan(lastWord);
+            }
+        }
+        // Under the frames when over is false: before the notes' words.
+        const doc = build('en', withOver(false));
+        const page = composedPage(doc);
+        const { ops, canvas } = recordCanvas();
+        renderPageToCanvas(page, doc, canvas);
+        const p = pointsOf(pathOf(page, 'a-titulo'))[0];
+        const at = ops.indexOf(`move:${Math.round(p.x)},${Math.round(p.y)}`);
+        expect(at).toBeGreaterThan(-1);
+        expect(at).toBeLessThan(ops.findIndex((o) => o.startsWith('text:')));
+    });
+    it('in HTML: the over part in a box of its own above every frame; through a flow frame after the rest', () => {
+        const htmlOf = (doc) => renderToHtmlIndexed(doc).pages[composedPage(doc).index].innerHtml;
+        const html = htmlOf(build('en'));
+        const over = /class="pt-frame-decoration pt-frame-decoration-over" style="[^"]*z-index:(\d+);/.exec(html);
+        expect(over).not.toBeNull();
+        const frames = [...html.matchAll(/class="pt-frame[^"]*" data-frame-id="[^"]*" data-layer="-?\d+"[^>]*z-index:(\d+)/g)].map((m) => Number(m[1]));
+        expect(frames.length).toBeGreaterThan(0);
+        expect(Number(over[1])).toBeGreaterThan(Math.max(...frames));
+        // Every pointer is drawn in it, and none under the frames: the
+        // fixture's decoration holds nothing else, so no box is written there.
+        expect((html.slice(over.index).match(/stroke="#2e4a5c"/g) ?? []).length).toBe(CONNECTORS.length);
+        expect(html.indexOf('stroke="#2e4a5c"')).toBeGreaterThan(over.index);
+        expect(html).not.toMatch(/class="pt-frame-decoration" /);
+        // With over: false they are in the decoration's box, under the frames.
+        const under = htmlOf(build('en', withOver(false)));
+        const deco = /class="pt-frame-decoration" style="[^"]*z-index:(\d+);">/.exec(under);
+        expect(deco).not.toBeNull();
+        expect(Number(deco[1])).toBe(1);
+        expect(under).not.toContain('pt-frame-decoration-over');
+        // Right to left: the frames are written in the mirrored flow, the
+        // decoration on the sheet after it, the pointers last.
+        const rtl = htmlOf(build('ar'));
+        expect(rtl).not.toContain('pt-frame-decoration-over');
+        const flowEnd = rtl.lastIndexOf('pt-frame');
+        const strokes = [...rtl.matchAll(/stroke="#2e4a5c"/g)].map((m) => m.index);
+        expect(strokes.length).toBe(CONNECTORS.length);
+        for (const s of strokes)
+            expect(s).toBeGreaterThan(flowEnd);
+    });
+    it('the source map answers the connector on its ink inside the map frame', () => {
+        const doc = build('en');
+        const page = composedPage(doc);
+        const path = pathOf(page, 'a-titulo');
+        const end = pointsOf(path).at(-1);
+        const map = flowRectToPage(page, page.composed.frames.find((f) => f.name === 'mapa').rect);
+        const p = { x: end.x - 3, y: end.y };
+        expect(p.x).toBeGreaterThan(map.x);
+        const hit = sourceAt(doc, page.index, p.x, p.y);
+        expect(hit.some((e) => e.source?.path === configPath(0))).toBe(true);
+        // Under the frames, the map answers there.
+        const under = build('en', withOver(false));
+        const q = composedPage(under);
+        const hitUnder = sourceAt(under, q.index, p.x, p.y);
+        expect(hitUnder.some((e) => e.source?.path === configPath(0))).toBe(false);
+    });
+    it('frameCovered does not read connectors: none for pointers over the map or a line over a note', () => {
+        const doc = build('en');
+        expect(doc.contentWarnings?.filter((w) => w.kind === 'frameCovered') ?? []).toEqual([]);
+        // A straight line forced over, across the words of the notes.
+        const across = build('en', (t) => ({
+            ...t,
+            decoration: { elements: [{ kind: 'connector', id: 'x', routing: 'straight', over: true, from: { to: '#n1', side: 'top' }, to: { to: '#n3', side: 'bottom' } }] },
+        }));
+        expect(pathOf(composedPage(across), 'x').over).toBe(true);
+        expect(across.contentWarnings?.filter((w) => w.kind === 'frameCovered') ?? []).toEqual([]);
+    });
+});
+describe('plain connectors stay under the frames (#1076)', () => {
+    const two = {
+        id: 'dos',
+        header: false,
+        frames: [
+            { name: 'izq', width: mm(40), height: mm(20), placement: { anchor: { to: 'container', edge: 'top-left' } } },
+            { name: 'der', width: mm(40), height: mm(20), placement: { anchor: { to: 'container', edge: 'top-left' }, offset: { x: mm(100), y: mm(60) } } },
+        ],
+        decoration: { elements: [{ kind: 'box', id: 'band', style: { backgroundColor: { hex: '#eeeeee', model: 'hex' } }, placement: { anchor: { to: 'container', edge: 'top-left' }, size: { width: mm(20), height: mm(20) } } }] },
+    };
+    const md = '::::page{template="dos"}\n:::frame{slot="izq"}\nLeft\n:::\n:::frame{slot="der"}\nRight\n:::\n::::\n';
+    const page = (c) => {
+        const t = { ...two, decoration: { elements: [...two.decoration.elements, { kind: 'connector', id: 'c', from: { to: '#izq' }, to: { to: '#der' }, ...c }] } };
+        return composedPage(buildDocument({ markdown: md }, { pageTemplates: [t] }, createMeasurementCache()));
+    };
+    it('frame to frame: no over mark, no over item', () => {
+        const p = page({});
+        expect(pathOf(p, 'c').over).toBeUndefined();
+        expect(order(p)).toEqual(['decoration', 'izq', 'der']);
+    });
+    it('over: true paints a plain connector after the frames; the box stays under them', () => {
+        const p = page({ over: true });
+        expect(order(p)).toEqual(['decoration', 'izq', 'der', 'over']);
+        expect(decorationUnder(p.composed.decoration).blocks.map((b) => b.elementId)).toEqual(['band']);
+        expect(decorationOver(p.composed.decoration).blocks.map((b) => b.elementId)).toEqual(['c']);
+        const pts = pointsOf(pathOf(p, 'c'));
+        expect(pts.length).toBeGreaterThan(1);
+        expect(Math.abs(pts[0].x - pts[1].x) + Math.abs(pts[0].y - pts[1].y)).toBeGreaterThan(MM);
+    });
+    it('a non-boolean over is unknownConfigValue, read as its default', () => {
+        const config = { pageTemplates: [{ ...two, decoration: { elements: [
+                            { kind: 'connector', id: 'c', from: { to: '#izq' }, to: { to: '#der' }, over: 'yes' },
+                            { kind: 'connector', id: 'd', from: { to: '#izq' }, to: { to: '#der', anchor: 'x' }, over: 1 },
+                        ] } }] };
+        const w = collectConfigWarnings(config).filter((x) => x.kind === 'unknownConfigValue' && x.path.endsWith('.over'));
+        expect(w).toEqual([
+            expect.objectContaining({ path: 'pageTemplates[0].decoration.elements[0].over', value: 'yes', used: 'false' }),
+            expect.objectContaining({ path: 'pageTemplates[0].decoration.elements[1].over', value: '1', used: 'true' }),
+        ]);
+    });
+});
+//# sourceMappingURL=overConnectors.test.js.map

package/dist/__tests__/composed/overConnectors.test.js.map

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

package/dist/__tests__/composed/overlap.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=overlap.test.d.ts.map

package/dist/__tests__/composed/overlap.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"overlap.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/composed/overlap.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/composed/overlap.test.js

@@ -0,0 +1,339 @@
+/**
+ * The overlap checks of composed pages (#1053, DESIGN §12.10): ink of a
+ * frame under a frame painted over it (`frameCovered`) and ink past the
+ * trim, the bleed or the box a frame is anchored inside
+ * (`frameOutsideArea`). The fixture (`fixtures/overlap/`) holds the two
+ * cases a real textbook's port passed `check` with: a caption clipped under
+ * a picture frame on a higher layer, and a tab label under a cut-out photo;
+ * besides, a note anchored inside a card that runs past its foot, and a
+ * strap of text below the trim.
+ */
+// @ts-expect-error -- a Node built-in: the package compiles without @types/node.
+import { readFileSync as readFile } from 'node:fs';
+import { describe, it, expect } from 'vitest';
+import { buildDocument } from '../../pipeline/build';
+import { createMeasurementCache } from '../../measure';
+import { formatWarning } from '../../pipeline/contentWarnings';
+import { composedReflowLog } from '../../composed/reflowLog';
+import { validatePageTemplates } from '../../composed/validate';
+class StubCtx {
+    font = '';
+    measureText(s) {
+        return { width: s.length * 7 };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const readFileSync = readFile;
+const DIR = new URL('./fixtures/overlap/', import.meta.url);
+const CONFIG = JSON.parse(readFileSync(new URL('config.json', DIR), 'utf8'));
+const MARKDOWN = readFileSync(new URL('overlap.md', DIR), 'utf8');
+/** The fixture's pictures at their pixel sizes, 300 ppi (as the command
+ *  line reads a folder of pictures). */
+const RESOURCES = [['chart', 1200, 600], ['photo', 900, 600], ['cutout', 720, 720]].map(([id, width, height]) => ({
+    id,
+    typeId: 'pic',
+    kind: 'bitmap',
+    caption: '',
+    createdAt: 0,
+    updatedAt: 0,
+    bitmap: { fileId: `${id}.png`, format: 'png', width, height, resolution: 300 },
+}));
+const mm = (value) => ({ value, unit: 'mm' });
+const template = () => structuredClone(CONFIG.pageTemplates[0]);
+/** The fixture with frames changed by `patch` (by name). */
+const withFrames = (patch, base = template()) => ({
+    ...base,
+    frames: base.frames.map((f) => (patch[f.name] ? { ...f, ...patch[f.name] } : f)),
+});
+const build = (tpl = template(), markdown = MARKDOWN, extra = {}) => buildDocument({ markdown, resources: RESOURCES }, { ...CONFIG, ...extra, pageTemplates: [tpl] }, createMeasurementCache());
+const covered = (doc) => (doc.contentWarnings ?? []).filter((w) => w.kind === 'frameCovered');
+const outside = (doc) => (doc.contentWarnings ?? []).filter((w) => w.kind === 'frameOutsideArea');
+const pair = (doc, frame, by) => covered(doc).find((w) => w.frame === frame && w.coveredBy === by);
+/** `tpl` with a proposal applied as the Sandbox applies it: a value set at
+ *  its path (`/pageTemplates/0/frames/<i>/<key>[/<key>]`), a move added to
+ *  the frame's placement offset. */
+const applyProposal = (tpl, p) => {
+    const out = structuredClone(tpl);
+    if (p.kind === 'move') {
+        const f = out.frames.find((x) => x.name === p.frame);
+        const off = f.placement.offset ?? {};
+        const v = (d) => d?.value ?? 0;
+        f.placement = { ...f.placement, offset: { x: mm(v(off.x) + p.dxMm), y: mm(v(off.y) + p.dyMm) } };
+        return out;
+    }
+    const [, , , , index, ...keys] = p.path.split('/');
+    let node = out.frames[Number(index)];
+    for (const k of keys.slice(0, -1))
+        node = (node[k] ??= {});
+    node[keys[keys.length - 1]] = p.value;
+    return out;
+};
+describe('frameCovered (#1053)', () => {
+    const doc = build();
+    it('reports a caption clipped under a picture frame on a higher layer', () => {
+        const w = pair(doc, 'figure', 'photo');
+        expect(w).toMatchObject({ template: 'overlaps', fenceIndex: 0, pageIndex: 0, locale: 'en', configPath: '/pageTemplates/0/frames/0', coveredByPath: '/pageTemplates/0/frames/1' });
+        expect(w.text).toMatch(/^Rainfall in the four seasons/);
+        expect(w.overlapMm2).toBeGreaterThan(10);
+        expect(w.sourceStart).toBeGreaterThan(0);
+        // Painting the photo under the figure would hide the photo under the
+        // chart: not proposed. A caption does not run round a pushing frame:
+        // no exclude either. The photo is anchored inside the figure, which it
+        // fills from the chart to the caption: every move off the caption
+        // takes it out of the figure (#1075), so none is proposed.
+        expect(w.proposals).toEqual([]);
+    });
+    it('reports a tab label under a cut-out photo', () => {
+        const w = pair(doc, 'card', 'cutout');
+        expect(w.text).toMatch(/^Field notes/);
+        expect(w.coveredByPath).toBe('/pageTemplates/0/frames/3');
+        const move = w.proposals.find((p) => p.kind === 'move');
+        expect(move).toMatchObject({ kind: 'move', frame: 'cutout' });
+    });
+    it('reports nothing else on the fixture: the note sits clear of the card text, the strap over nothing', () => {
+        expect(covered(doc).map((w) => `${w.frame}<${w.coveredBy}`).sort()).toEqual(['card<cutout', 'figure<photo']);
+    });
+    it('the proposed move uncovers the tab', () => {
+        const w = pair(doc, 'card', 'cutout');
+        const move = w.proposals.find((p) => p.kind === 'move');
+        const cut = template().frames.find((f) => f.name === 'cutout');
+        const off = cut.placement.offset;
+        const moved = withFrames({ cutout: { placement: { ...cut.placement, offset: { x: mm(off.x.value + move.dxMm), y: mm(off.y.value + move.dyMm) } } } });
+        expect(pair(build(moved), 'card', 'cutout')).toBeUndefined();
+    });
+    it('the move off the tab goes right, not up onto the caption (#1075)', () => {
+        // 8.6 mm up takes the cut-out off the tab and puts it on the figure's
+        // caption; past the caption is further than 13 mm to the right.
+        const move = pair(doc, 'card', 'cutout').proposals.find((p) => p.kind === 'move');
+        expect(move).toMatchObject({ dyMm: 0 });
+        expect(move.dxMm).toBeGreaterThan(8.6);
+    });
+    describe('where a move lands (#1075)', () => {
+        // A column of text down the page's left, a note beside it and a photo
+        // over the column's head. Up and left take the photo past the trim, down
+        // runs the length of the column: the way out is to the right, past the
+        // note.
+        const tpl = {
+            id: 'overlaps',
+            frames: [
+                { name: 'column', width: mm(40), height: mm(215), placement: { anchor: { to: 'container', edge: 'top-left' } } },
+                { name: 'note', style: 'sticky', width: mm(40), height: mm(40), placement: { anchor: { to: 'container', edge: 'top-left' }, offset: { x: mm(45) } } },
+                { name: 'photo', layer: 2, width: mm(30), placement: { anchor: { to: 'container', edge: 'top-left' }, offset: { x: mm(5) } } },
+            ],
+        };
+        const md = [
+            '::::page{template="overlaps"}',
+            ':::frame{slot="column"}',
+            'The mill keeps a record of each season. '.repeat(60),
+            ':::',
+            '',
+            ':::frame{slot="note"}',
+            'Ask at the mill for the record of the last ten years. '.repeat(8),
+            ':::',
+            '',
+            '::resource{id="cutout" slot="photo"}',
+            '::::',
+            '',
+        ].join('\n');
+        it('goes on past a frame it would land on', () => {
+            const doc = build(tpl, md);
+            const w = pair(doc, 'column', 'photo');
+            const move = w.proposals.find((p) => p.kind === 'move');
+            // Some 35 mm takes it off the column's lines and onto the note's;
+            // past them (the note's padding is fill, not covered) it is 78 mm.
+            expect(move.dyMm).toBe(0);
+            expect(move.dxMm).toBeGreaterThan(75);
+            expect(move.dxMm).toBeLessThan(82);
+            const fixed = build(applyProposal(tpl, move), md);
+            expect(covered(fixed)).toEqual([]);
+            expect(outside(fixed).filter((x) => x.frame === 'photo')).toEqual([]);
+        });
+        it('proposes no move where every way out is blocked', () => {
+            // The note as wide as the rest of the page: past it the photo runs
+            // past the trim.
+            const wide = withFrames({ note: { width: mm(115) } }, tpl);
+            const w = pair(build(wide, md), 'column', 'photo');
+            expect(w.proposals.map((p) => p.kind)).toEqual(['layer', 'exclude']);
+        });
+        it('proposes no move of a frame the covered one is anchored to', () => {
+            // The column hangs from the photo: they move together.
+            const hung = withFrames({ column: { placement: { anchor: { to: '#photo', edge: 'top-left' }, offset: { x: mm(-5) } } } }, tpl);
+            const w = pair(build(hung, md), 'column', 'photo');
+            expect(w.proposals.some((p) => p.kind === 'move')).toBe(false);
+        });
+    });
+    it('applying any offered fix clears its warning and raises no other (#1075)', () => {
+        const before = new Set(covered(doc).map((w) => `${w.frame}<${w.coveredBy}`));
+        const outBefore = new Set(outside(doc).map((w) => w.frame));
+        const offered = [...covered(doc), ...outside(doc)].flatMap((w) => w.proposals.map((p) => ({ w, p })));
+        expect(offered.filter((x) => x.p.kind === 'move').length).toBeGreaterThanOrEqual(2);
+        for (const { w, p } of offered) {
+            const fixed = build(applyProposal(template(), p));
+            const after = covered(fixed).map((x) => `${x.frame}<${x.coveredBy}`);
+            expect(after.filter((k) => !before.has(k)), `${w.kind} ${w.frame} ${JSON.stringify(p)}`).toEqual([]);
+            if (w.kind === 'frameCovered')
+                expect(after).not.toContain(`${w.frame}<${w.coveredBy}`);
+            if (p.kind === 'move') {
+                // A move also keeps every frame where it was inside.
+                expect(outside(fixed).map((x) => x.frame).filter((f) => !outBefore.has(f))).toEqual([]);
+                if (w.kind === 'frameOutsideArea')
+                    expect(outside(fixed).filter((x) => x.frame === w.frame && x.past === w.past)).toEqual([]);
+            }
+        }
+    });
+    it('proposes exclude: push for body text under a picture, and a layer swap where the text lies on nothing opaque', () => {
+        const tpl = {
+            id: 'overlaps',
+            frames: [
+                { name: 'text', width: mm(120), placement: { anchor: { to: 'container', edge: 'top-left' } } },
+                { name: 'photo', layer: 2, width: mm(40), placement: { anchor: { to: 'container', edge: 'top-left' }, offset: { x: mm(30), y: mm(2) } } },
+            ],
+        };
+        const md = `::::page{template="overlaps"}\n:::frame{slot="text"}\n${'The mill keeps a record of each season. '.repeat(30)}\n:::\n\n::resource{id="photo" slot="photo"}\n::::\n`;
+        const w = pair(build(tpl, md), 'text', 'photo');
+        expect(w.proposals.map((p) => p.kind)).toEqual(['layer', 'exclude', 'move']);
+        expect(w.proposals[0]).toEqual({ kind: 'layer', path: '/pageTemplates/0/frames/1/layer', value: 0 });
+        expect(w.proposals[1]).toEqual({ kind: 'exclude', path: '/pageTemplates/0/frames/1/exclude', value: 'push' });
+        // Pushing, the photo sends the lines round it: nothing is covered.
+        const pushed = build(withFrames({ photo: { exclude: 'push' } }, tpl), md);
+        expect(pair(pushed, 'text', 'photo')).toBeUndefined();
+        // Under the text, the photo hides nothing.
+        const lowered = build(withFrames({ photo: { layer: 0 } }, tpl), md);
+        expect(covered(lowered)).toEqual([]);
+    });
+    it("a frame with no fill and no picture covers nothing between its lines", () => {
+        // A frameless frame over the card's text, painted after it, its one
+        // word at its foot, below the card's lines.
+        const tpl = template();
+        tpl.frames.push({ name: 'veil', layer: 3, width: mm(60), height: mm(30), verticalAlign: 'bottom', placement: { anchor: { to: '#card', edge: 'top-left' }, offset: { y: mm(8) } } });
+        const md = MARKDOWN.replace('\n::::', '\n\n:::frame{slot="veil"}\nWet\n:::\n::::');
+        const d = build(tpl, md);
+        expect(d.pages[0].composed.frames.find((f) => f.name === 'veil').blockIds.length).toBeGreaterThan(0);
+        expect(covered(d).filter((w) => w.coveredBy === 'veil')).toEqual([]);
+        // Given a fill, it hides the card's lines.
+        tpl.frames[tpl.frames.length - 1] = { ...tpl.frames[tpl.frames.length - 1], style: 'sticky' };
+        const filled = pair(build(tpl, md), 'card', 'veil');
+        expect(filled?.text).toMatch(/river/);
+    });
+    it("overlap: 'allow' on either frame silences the pair", () => {
+        expect(pair(build(withFrames({ photo: { overlap: 'allow' } })), 'figure', 'photo')).toBeUndefined();
+        expect(pair(build(withFrames({ figure: { overlap: 'allow' } })), 'figure', 'photo')).toBeUndefined();
+        // The other pair still reports.
+        expect(pair(build(withFrames({ photo: { overlap: 'allow' } })), 'card', 'cutout')).toBeDefined();
+    });
+    it('is written for the command line, and the reflow log names it', () => {
+        const w = pair(doc, 'card', 'cutout');
+        const text = formatWarning(w);
+        expect(text).toContain('Frame "card" of template "overlaps" (en) lies under frame "cutout"');
+        expect(text).toContain('"Field notes');
+        expect(text).toContain("overlap: 'allow'");
+        const lines = composedReflowLog(doc)[0].lines;
+        expect(lines).toEqual(expect.arrayContaining([expect.stringMatching(/^figure lies under photo \([\d.]+ mm²\)$/), expect.stringMatching(/^card lies under cutout/)]));
+    });
+});
+describe('frameOutsideArea (#1053)', () => {
+    const doc = build();
+    it('reports a frame anchored inside a box that runs past it, with fixes', () => {
+        const w = outside(doc).find((x) => x.frame === 'note');
+        expect(w).toMatchObject({ past: 'frame', target: 'card', configPath: '/pageTemplates/0/frames/4', pageIndex: 0, locale: 'en' });
+        expect(w.sides.bottom).toBeGreaterThan(10);
+        expect(w.excessMm).toBe(w.sides.bottom);
+        const kinds = w.proposals.map((p) => p.kind);
+        // (Taller than the card, it is not brought in by a move.)
+        expect(kinds).toEqual(['maxHeight', 'continueNextPage', 'minHeight']);
+        const max = w.proposals[0];
+        expect(max.path).toBe('/pageTemplates/0/frames/4/maxHeight');
+        const min = w.proposals[2];
+        expect(min).toMatchObject({ path: '/pageTemplates/0/frames/2/minHeight', frame: 'card' });
+        // The card raised to the proposed minimum holds the note.
+        expect(outside(build(withFrames({ card: { minHeight: min.value } }))).filter((x) => x.frame === 'note')).toEqual([]);
+        // Held to the proposed maximum it is inside too.
+        expect(outside(build(withFrames({ note: { height: max.value } }))).filter((x) => x.frame === 'note')).toEqual([]);
+    });
+    it('reports text past the trim', () => {
+        const w = outside(doc).find((x) => x.frame === 'strap');
+        expect(w).toMatchObject({ past: 'trim', configPath: '/pageTemplates/0/frames/5' });
+        expect(w.sides.bottom).toBeGreaterThan(0.3);
+        // Held by its foot, a smaller height would not bring it in: moved up it is.
+        expect(w.proposals).toEqual([{ kind: 'move', frame: 'strap', dxMm: 0, dyMm: -w.sides.bottom }]);
+        const strap = template().frames.find((f) => f.name === 'strap');
+        const up = withFrames({ strap: { placement: { ...strap.placement, offset: { x: mm(20), y: mm(14 - w.sides.bottom - 0.5) } } } });
+        expect(outside(build(up)).filter((x) => x.frame === 'strap')).toEqual([]);
+        expect(formatWarning(w)).toContain('runs');
+        expect(formatWarning(w)).toContain('past the trim');
+    });
+    it('a fill or a picture may run into the bleed; past it, it is reported', () => {
+        const band = (y) => ({
+            id: 'overlaps',
+            frames: [{ name: 'band', style: 'sticky', width: mm(240), height: mm(30), placement: { anchor: { to: 'page', edge: 'top-left' }, offset: { x: mm(-3), y: mm(y) } } }],
+        });
+        const md = '::::page{template="overlaps"}\n:::frame{slot="band"}\nBand\n:::\n::::\n';
+        // 240 mm on a 200 mm sheet from 3 mm left of the trim: 37 mm past its
+        // right edge, with no bleed.
+        const w = outside(build(band(0), md)).find((x) => x.frame === 'band');
+        expect(w).toMatchObject({ past: 'bleed' });
+        expect(w.sides.left).toBeCloseTo(3, 0);
+        expect(w.sides.right).toBeCloseTo(37, 0);
+    });
+    it("does not report a frame placed by an element edge or whose anchor point lies outside the box", () => {
+        expect(outside(doc).filter((x) => x.frame === 'cutout' || x.frame === 'photo' || x.frame === 'card' || x.frame === 'figure')).toEqual([]);
+    });
+    it("overlap: 'allow' silences it", () => {
+        expect(outside(build(withFrames({ note: { overlap: 'allow' } }))).filter((x) => x.frame === 'note')).toEqual([]);
+        expect(outside(build(withFrames({ strap: { overlap: 'allow' } }))).filter((x) => x.frame === 'strap')).toEqual([]);
+    });
+    it('the reflow log names it', () => {
+        const lines = composedReflowLog(doc)[0].lines;
+        expect(lines).toEqual(expect.arrayContaining([expect.stringMatching(/^note runs [\d.]+ mm past card$/), expect.stringMatching(/^strap runs [\d.]+ mm past the trim$/)]));
+    });
+});
+describe('the overlap checks on a spread (#1053)', () => {
+    const spread = {
+        id: 'sheet',
+        spread: true,
+        gutter: mm(10),
+        frames: [
+            { name: 'left', width: mm(120), placement: { anchor: { to: 'container', edge: 'top-left' } } },
+            { name: 'right', width: mm(120), placement: { anchor: { to: 'container', edge: 'top-right' } } },
+            { name: 'stamp', layer: 2, width: mm(30), placement: { anchor: { to: 'container', edge: 'top-right' }, offset: { x: mm(-20), y: mm(2) } } },
+        ],
+    };
+    const md = [
+        '::::page{template="sheet" spread}',
+        ':::frame{slot="left"}',
+        'The left page holds the first half of the walk along the river.',
+        ':::',
+        '',
+        ':::frame{slot="right"}',
+        `${'The right page holds the second half, past the mill and the bridge. '.repeat(6)}`,
+        ':::',
+        '',
+        '::resource{id="cutout" slot="stamp"}',
+        '::::',
+        '',
+    ].join('\n');
+    it('reads the warning on the page that holds the covered frame, and checks the facing copies of nothing', () => {
+        const doc = build(spread, md);
+        const ws = covered(doc);
+        expect(ws.map((w) => `${w.frame}<${w.coveredBy}`)).toEqual(['right<stamp']);
+        const pages = doc.pages.filter((p) => p.composed?.spread);
+        expect(pages).toHaveLength(2);
+        // The right frame is on the second page of the sheet.
+        const holder = pages.find((p) => p.composed.frames.some((f) => f.name === 'right' && f.blockIds.length > 0));
+        expect(ws[0].pageIndex).toBe(holder.index);
+        expect(holder.composed.log.some((e) => e.kind === 'covered' && e.frame === 'right')).toBe(true);
+    });
+});
+describe('FrameConfig.overlap (#1053)', () => {
+    it("is 'check' or 'allow'; any other word is reported", () => {
+        const tpl = withFrames({ photo: { overlap: 'sometimes' } });
+        const ws = validatePageTemplates({ ...CONFIG, pageTemplates: [tpl] });
+        expect(ws).toEqual([expect.objectContaining({ kind: 'unknownConfigValue', path: '/pageTemplates/0/frames/1/overlap', value: 'sometimes', used: 'check' })]);
+        expect(validatePageTemplates({ ...CONFIG, pageTemplates: [withFrames({ photo: { overlap: 'allow' } })] })).toEqual([]);
+    });
+});
+//# sourceMappingURL=overlap.test.js.map