postext 1.4.1 → 1.5.0

package/dist/__tests__/pipeline/displayMathFlow.test.js

@@ -0,0 +1,156 @@
+import { describe, it, expect, beforeAll } from 'vitest';
+import { buildDocument } from '../../pipeline/build';
+import { createMeasurementCache } from '../../measure';
+import { parseMarkdown, parseMarkdownWithIssues } from '../../parse';
+import { initMathEngine } from '../../math';
+import { resolveMathConfig, stripMathDefaults } from '../../defaults';
+// Deterministic text measurement stub (no DOM in the node test env).
+class StubCtx {
+    font = '';
+    measureText(s) {
+        return { width: s.length * 7 };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+beforeAll(async () => {
+    await initMathEngine();
+}, 60_000);
+const pt = (value) => ({ value, unit: 'pt' });
+const para = (i) => `Paragraph ${i} carries enough words to take a few lines of the narrow column so the flow advances steadily.`;
+const filler = (n, from = 0) => Array.from({ length: n }, (_, i) => para(from + i)).join('\n\n');
+const sentences = (n) => Array.from({ length: n }, (_, i) => `Sentence ${i} runs on.`).join(' ');
+const PAGE = {
+    page: { width: pt(400), height: pt(400), margins: { top: pt(20), bottom: pt(20), left: pt(20), right: pt(20) } },
+    bodyText: { firstLineIndent: pt(12) },
+    headings: { levels: [] },
+};
+const build = (markdown, config = PAGE) => buildDocument({ markdown }, config, createMeasurementCache());
+const blocksOf = (doc) => doc.pages.flatMap((p) => p.columns.flatMap((c, ci) => c.blocks.map((b) => ({ page: p.index, column: ci, block: b }))));
+const firstLineX = (b) => b.lines[0].bbox.x - b.bbox.x;
+describe('the text after a display formula (EF-85)', () => {
+    it('a display on its own line interrupts a paragraph, blank line or not', () => {
+        const blocks = parseMarkdown('The period is\n$$T = 2\\pi\\sqrt{L/g}$$\nwhere $L$ is the length.\n\nA new paragraph.');
+        expect(blocks.map((b) => b.type)).toEqual(['paragraph', 'mathDisplay', 'paragraph', 'paragraph']);
+        expect(blocks[0].text).toBe('The period is');
+        expect(blocks[1].tex).toBe('T = 2\\pi\\sqrt{L/g}');
+        expect(blocks[2].continuesParagraph).toBe(true);
+        expect(blocks[3].continuesParagraph).toBeUndefined();
+        // A fenced display the same way.
+        const fenced = parseMarkdown('Lead in\n$$\nx^2\n$$\nand on.');
+        expect(fenced.map((b) => b.type)).toEqual(['paragraph', 'mathDisplay', 'paragraph']);
+        expect(fenced[2].continuesParagraph).toBe(true);
+        // With blank lines the paragraph after it is a new one.
+        const apart = parseMarkdown('Lead in\n\n$$x^2$$\n\nNew one.');
+        expect(apart[2].continuesParagraph).toBeUndefined();
+        // `$$` inside a line stays literal text, as before.
+        expect(parseMarkdown('Costs $$5 and $$6 today.').map((b) => b.type)).toEqual(['paragraph']);
+    });
+    /** Per paragraph of `md`: whether it continues one a display interrupted. */
+    const continues = (md) => parseMarkdown(md).filter((b) => b.type === 'paragraph').map((b) => b.continuesParagraph ?? false);
+    it('continues only a paragraph the display interrupted: 1.4 input reads as it did', () => {
+        // A display set off from the text above by a blank line was a block of
+        // its own in 1.4, and the text under it a new, indented paragraph.
+        expect(continues('Lead in.\n\n$$x^2$$\nwhere x is small.')).toEqual([false, false]);
+        expect(continues('Lead in.\n\n$$\nx^2\n$$\nwhere x is small.')).toEqual([false, false]);
+        // Nor after a list item or a quotation.
+        expect(continues('- An item\n$$x$$\nwhere x is small.')).toEqual([false]);
+        expect(continues('> A quotation\n$$x$$\nwhere x is small.')).toEqual([false]);
+        expect(continues('> A quotation\n\n$$x$$\nwhere x is small.')).toEqual([false]);
+        // Inside a box the same.
+        expect(continues(':::callout\nLead in.\n\n$$x$$\nwhere x is small.\n:::')).toEqual([false, false]);
+        expect(continues(':::callout\nLead in.\n$$x$$\nwhere x is small.\n:::')).toEqual([false, true]);
+        // Two displays in a row inside one paragraph: the text after both continues it.
+        expect(continues('Lead in\n$$a$$\n$$b$$\nwhere a and b are small.')).toEqual([false, true]);
+        // Text after the display, then another display, then more text: one paragraph throughout.
+        expect(continues('Lead in\n$$a$$\nand then\n$$b$$\nand so on.')).toEqual([false, true, true]);
+    });
+    it('interrupts a paragraph only with a whole display', () => {
+        // Two formulas on one line are not one display: the line stays text.
+        const two = parseMarkdownWithIssues('Prose before\n$$a$$ and $$b$$\nmore prose.');
+        expect(two.blocks.map((b) => b.type)).toEqual(['paragraph']);
+        // A stray `$$` line with no closing fence after it opens no display
+        // that would swallow the rest of the document.
+        const stray = parseMarkdownWithIssues('Prose before\n$$\nmore prose.\n\nAnother paragraph.');
+        expect(stray.blocks.map((b) => b.type)).toEqual(['paragraph', 'paragraph']);
+        expect(stray.issues.some((i) => i.kind === 'unclosedMathBlock')).toBe(false);
+        // Nor one whose only closing fence lies past a blank line: the display
+        // later on stays a display of its own.
+        const far = parseMarkdownWithIssues('Prose before\n$$\nmore prose.\n\n$$\nx^2\n$$');
+        expect(far.blocks.map((b) => b.type)).toEqual(['paragraph', 'mathDisplay']);
+        expect(far.blocks[1].tex).toBe('x^2');
+    });
+    it('indents the paragraph after a display set off by a blank line above, as 1.4 did', () => {
+        const md = `${sentences(8)}\n\n$$x^2 + y^2 = z^2$$\n${sentences(8)}`;
+        const on = blocksOf(build(md)).filter((b) => b.block.type === 'paragraph').map((b) => firstLineX(b.block));
+        expect(on[0]).toBeGreaterThan(5);
+        expect(on[1]).toBeCloseTo(on[0], 1);
+        // `math.indentAfterDisplay: false` sets it flush.
+        const off = blocksOf(build(md, { ...PAGE, math: { indentAfterDisplay: false } })).filter((b) => b.block.type === 'paragraph').map((b) => firstLineX(b.block));
+        expect(off[1]).toBeCloseTo(0, 1);
+    });
+    it('sets the continuation flush, and the new paragraph indented', () => {
+        const doc = build(`${sentences(8)}\n$$x^2 + y^2 = z^2$$\n${sentences(8)}\n\n$$a + b$$\n\n${sentences(8)}`);
+        const paras = blocksOf(doc).filter((b) => b.block.type === 'paragraph').map((b) => b.block);
+        expect(paras.length).toBe(3);
+        const indent = firstLineX(paras[0]);
+        expect(indent).toBeGreaterThan(5);
+        expect(firstLineX(paras[1])).toBeCloseTo(0, 1); // "where …": continues
+        expect(firstLineX(paras[2])).toBeCloseTo(indent, 1); // after a blank line: a new paragraph
+    });
+    it('math.indentAfterDisplay: false sets every paragraph after a display flush', () => {
+        expect(resolveMathConfig().indentAfterDisplay).toBe(true);
+        expect(stripMathDefaults({ indentAfterDisplay: true })).toBeUndefined();
+        expect(stripMathDefaults({ indentAfterDisplay: false })).toEqual({ indentAfterDisplay: false });
+        const md = `${sentences(8)}\n\n$$a + b$$\n\n${sentences(8)}\n\n${sentences(8)}`;
+        const on = blocksOf(build(md)).filter((b) => b.block.type === 'paragraph').map((b) => firstLineX(b.block));
+        const off = blocksOf(build(md, { ...PAGE, math: { indentAfterDisplay: false } })).filter((b) => b.block.type === 'paragraph').map((b) => firstLineX(b.block));
+        expect(on[1]).toBeGreaterThan(5);
+        expect(off[1]).toBeCloseTo(0, 1);
+        // Only the paragraph right after the formula.
+        expect(off[0]).toBeCloseTo(on[0], 1);
+        expect(off[2]).toBeCloseTo(on[2], 1);
+    });
+});
+describe('a display formula keeps with its lead-in line (EF-84)', () => {
+    /** Paragraph lengths that put the lead-in's last line at a column foot. */
+    const cases = (keep) => {
+        const out = [];
+        for (let tail = 4; tail <= 30; tail++) {
+            const md = `${filler(8)}\n\nThe period is given by ${sentences(tail)} as\n\n$$T_0 = 2\\pi\\sqrt{\\frac{L}{g}}$$\n\n${filler(6, 20)}`;
+            out.push({ tail, doc: build(md, { ...PAGE, math: { keepWithLeadIn: keep } }) });
+        }
+        return out;
+    };
+    /** Whether the formula sits in another column than the lead-in's last line. */
+    const separated = (doc) => {
+        const all = blocksOf(doc);
+        const at = all.findIndex((b) => b.block.type === 'mathDisplay');
+        const formula = all[at];
+        const lead = all[at - 1];
+        return lead.page !== formula.page || lead.column !== formula.column;
+    };
+    it('is off by default: the formula alone moves on', () => {
+        expect(resolveMathConfig().keepWithLeadIn).toBe(false);
+        expect(stripMathDefaults({ keepWithLeadIn: false })).toBeUndefined();
+        expect(cases(false).filter(({ doc }) => separated(doc)).length).toBeGreaterThan(0);
+    }, 60_000);
+    it('takes the last line of the paragraph on with the formula', () => {
+        const off = cases(false);
+        const on = cases(true);
+        let moved = 0;
+        on.forEach(({ tail, doc }, i) => {
+            expect(separated(doc), `tail=${tail}`).toBe(false);
+            if (separated(off[i].doc))
+                moved++;
+            // Every line of the lead-in is still set, once.
+            const lines = (d) => blocksOf(d).filter((b) => b.block.type === 'paragraph').reduce((n, b) => n + b.block.lines.length, 0);
+            expect(lines(doc), `tail=${tail}`).toBe(lines(off[i].doc));
+        });
+        expect(moved).toBeGreaterThan(0);
+    }, 60_000);
+});
+//# sourceMappingURL=displayMathFlow.test.js.map

package/dist/__tests__/pipeline/displayMathFlow.test.js.map

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

package/dist/__tests__/pipeline/emptyResourceTemplate.test.d.ts

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

package/dist/__tests__/pipeline/emptyResourceTemplate.test.d.ts.map

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

package/dist/__tests__/pipeline/emptyResourceTemplate.test.js

@@ -0,0 +1,66 @@
+import { describe, it, expect } from 'vitest';
+import { buildDocument } from '../../pipeline';
+// EF-149: a resource type whose `numberingTemplate` is empty prints no
+// number. Its caption used to read "Do .Lines…" (a no-break space and a
+// full stop where the number goes, and no space before the description)
+// and its references "Do " (a trailing no-break space).
+class StubCtx {
+    font = '';
+    measureText(s) {
+        return { width: s.length * 7 };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const doType = (extra = {}) => ({
+    id: 'do', name: 'Do', shortLabel: 'Do', captionPrefix: 'Do', numberingTemplate: '', resetOn: 'never', counterFormat: 'decimal',
+    ...extra,
+});
+const svg = (caption) => ({
+    id: 'do-grid', typeId: 'do', kind: 'svg', placement: { position: 'here' }, createdAt: 0, updatedAt: 0,
+    caption, svg: { fileId: 'grid.svg', width: 20, height: 10 },
+});
+function build(type, caption, markdown = 'See :ref{id="do-grid"} and :ref{id="do-grid" style="full"} here.\n\n::resource{id="do-grid"}\n') {
+    const config = { layout: { layoutType: 'single' }, resourceTypes: [type] };
+    return buildDocument({ markdown, resources: [svg(caption)] }, config);
+}
+const resourceBlock = (doc) => doc.pages.flatMap((p) => [...p.columns.flatMap((c) => c.blocks), ...(p.floats ?? [])])
+    .map((b) => b.resourceBlock)
+    .find((rb) => rb !== undefined);
+const paragraphText = (doc) => doc.pages[0].columns[0].blocks.find((b) => b.type === 'paragraph').lines.map((l) => l.text).join(' ');
+describe('EF-149: an empty resource numberingTemplate', () => {
+    it('sets the caption as "<prefix>. <caption>"', () => {
+        const doc = build(doType(), 'Lines at 0°');
+        expect(resourceBlock(doc).number).toBe('');
+        expect(resourceBlock(doc).captionLines.map((l) => l.text).join(' ')).toBe('Do. Lines at 0°');
+    });
+    it('prints the label alone in a reference, short and full', () => {
+        const doc = build(doType({ name: 'Diagram' }), 'Lines at 0°');
+        expect(paragraphText(doc)).toBe('See Do and Diagram here.');
+    });
+    it('adds no second full stop after a prefix that ends in one', () => {
+        const doc = build(doType({ captionPrefix: 'Pl.' }), 'Lines at 0°');
+        expect(resourceBlock(doc).captionLines.map((l) => l.text).join(' ')).toBe('Pl. Lines at 0°');
+    });
+    it('counts a colon, a question or exclamation mark and an ellipsis as a stop', () => {
+        for (const prefix of ['Note:', 'Why?', 'Look!', 'Fig…', '図：']) {
+            const doc = build(doType({ captionPrefix: prefix }), 'Lines at 0°');
+            expect(resourceBlock(doc).captionLines.map((l) => l.text).join(' ')).toBe(`${prefix} Lines at 0°`);
+        }
+    });
+    it('drops spaces at the end of the prefix before the stop', () => {
+        const doc = build(doType({ captionPrefix: 'Do ' }), 'Lines at 0°');
+        expect(resourceBlock(doc).captionLines.map((l) => l.text).join(' ')).toBe('Do. Lines at 0°');
+        const stopped = build(doType({ captionPrefix: 'Pl. ' }), 'Lines at 0°');
+        expect(resourceBlock(stopped).captionLines.map((l) => l.text).join(' ')).toBe('Pl. Lines at 0°');
+    });
+    it('leaves a numbered caption and reference as they were', () => {
+        const doc = build(doType({ numberingTemplate: '{n}' }), 'Lines at 0°');
+        expect(resourceBlock(doc).captionLines.map((l) => l.text).join(' ')).toBe('Do\u00A01. Lines at 0°');
+        expect(paragraphText(doc)).toBe('See Do\u00A01 and Do\u00A01 here.');
+    });
+});
+//# sourceMappingURL=emptyResourceTemplate.test.js.map

package/dist/__tests__/pipeline/emptyResourceTemplate.test.js.map

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

package/dist/__tests__/pipeline/figureBodyAlign.test.d.ts

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

package/dist/__tests__/pipeline/figureBodyAlign.test.d.ts.map

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

package/dist/__tests__/pipeline/figureBodyAlign.test.js

@@ -0,0 +1,92 @@
+import { describe, it, expect } from 'vitest';
+import { buildDocument } from '../../pipeline';
+// EF-98: a figure body narrower than its slot — shrunk by
+// `layout.fitFiguresToPage`, or a bitmap smaller than the column — sits in
+// the slot per `placement.align`, like a float narrowed by `placement.width`.
+// The caption and note keep the slot's measure.
+class StubCtx {
+    font = '';
+    measureText(s) {
+        return { width: s.length * 7 };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const px = (value) => ({ value, unit: 'px' });
+/** A screen-like page: 600 × 400 px, no margins, one column. */
+const PAGE = {
+    page: { dpi: 144, width: px(600), height: px(400), margins: { top: px(0), bottom: px(0), left: px(0), right: px(0) } },
+    layout: { layoutType: 'single' },
+    headings: { balancing: { enabled: false }, levels: [{ level: 1, breakBefore: { enabled: false } }] },
+};
+const FIT = { ...PAGE, layout: { ...PAGE.layout, fitFiguresToPage: true } };
+/** A portrait plate: at the 600 px measure it stands 900 px tall. */
+const plate = (placement, bitmap = { width: 2000, height: 3000 }) => ({
+    id: 'plate',
+    typeId: 'figure',
+    kind: 'bitmap',
+    caption: 'A tall plate.',
+    createdAt: 0,
+    updatedAt: 0,
+    bitmap: { fileId: 'f', format: 'jpeg', ...bitmap },
+    placement,
+});
+const figure = (doc) => {
+    for (const page of doc.pages) {
+        for (const b of [...page.columns.flatMap((c) => c.blocks), ...(page.floats ?? [])]) {
+            if (b.type === 'resource')
+                return b;
+        }
+    }
+    throw new Error('no figure placed');
+};
+/** The body's left edge on the page and the free room beside it. */
+const bodyOf = (b) => {
+    const body = b.resourceBlock.bodyRect;
+    return { left: b.bbox.x + body.x, width: body.width, room: b.bbox.width - body.width };
+};
+describe('EF-98: a narrowed figure body follows placement.align', () => {
+    it('centres a body shrunk by fitFiguresToPage', () => {
+        const b = figure(buildDocument({ markdown: '::resource{id="plate"}', resources: [plate({ position: 'here', align: 'center' })] }, FIT));
+        const { left, width, room } = bodyOf(b);
+        expect(width).toBeLessThan(600);
+        expect(room).toBeGreaterThan(100);
+        expect(left - b.bbox.x).toBeCloseTo(room / 2, 5);
+        // The caption keeps the column's measure: it starts at the slot's edge.
+        expect(b.resourceBlock.captionLines[0].bbox.x).toBeCloseTo(b.bbox.x, 5);
+    });
+    it('sets it flush right with align: right', () => {
+        const b = figure(buildDocument({ markdown: '::resource{id="plate"}', resources: [plate({ position: 'here', align: 'right' })] }, FIT));
+        const { left, width } = bodyOf(b);
+        expect(left + width).toBeCloseTo(b.bbox.x + b.bbox.width, 5);
+    });
+    it('keeps it flush left by default (unchanged output)', () => {
+        const b = figure(buildDocument({ markdown: '::resource{id="plate"}', resources: [plate({ position: 'here' })] }, FIT));
+        expect(bodyOf(b).left).toBeCloseTo(b.bbox.x, 5);
+    });
+    it('aligns a float\'s shrunk body too', () => {
+        const b = figure(buildDocument({ markdown: 'See :ref{id="plate"}.', resources: [plate({ position: 'top', align: 'center' })] }, FIT));
+        const { left, room } = bodyOf(b);
+        expect(room).toBeGreaterThan(100);
+        expect(left - b.bbox.x).toBeCloseTo(room / 2, 5);
+    });
+    it('aligns a bitmap narrower than its column', () => {
+        const small = plate({ position: 'here', align: 'center' }, { width: 300, height: 100 });
+        const b = figure(buildDocument({ markdown: '::resource{id="plate"}', resources: [small] }, PAGE));
+        const { left, width } = bodyOf(b);
+        expect(width).toBeCloseTo(300, 5);
+        expect(left - b.bbox.x).toBeCloseTo(150, 5);
+    });
+    it('aligns inside a slot narrowed by placement.width', () => {
+        // Half the column (300 px), centred; the 200 px bitmap centred in it.
+        const small = plate({ position: 'here', width: 0.5, align: 'center' }, { width: 200, height: 100 });
+        const b = figure(buildDocument({ markdown: '::resource{id="plate"}', resources: [small] }, PAGE));
+        const { left, width } = bodyOf(b);
+        expect(width).toBeCloseTo(200, 5);
+        expect(left - b.bbox.x).toBeCloseTo(150 + 50, 5);
+    });
+});
+//# sourceMappingURL=figureBodyAlign.test.js.map

package/dist/__tests__/pipeline/figureBodyAlign.test.js.map

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

package/dist/__tests__/pipeline/floatAfterCitingLine.test.d.ts

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

package/dist/__tests__/pipeline/floatAfterCitingLine.test.d.ts.map

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

package/dist/__tests__/pipeline/floatAfterCitingLine.test.js

@@ -0,0 +1,217 @@
+import { describe, it, expect } from 'vitest';
+import { buildDocument } from '../../pipeline/build';
+import { createMeasurementCache } from '../../measure';
+// Deterministic text measurement stub (no DOM in the node test env).
+class StubCtx {
+    font = '';
+    measureText(s) {
+        return { width: s.length * 7 };
+    }
+}
+globalThis.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+const sentences = (n, from = 0) => Array.from({ length: n }, (_, i) => `Sentence number ${from + i + 1} of this paragraph runs on to fill the measure.`).join(' ');
+/** `n` sentences in paragraphs of `per`. */
+const paragraphs = (n, per) => {
+    const out = [];
+    for (let i = 0; i < n; i += per)
+        out.push(sentences(Math.min(per, n - i), i));
+    return out.join('\n\n');
+};
+const figure = (placement) => ({
+    id: 'fig',
+    typeId: 'figure',
+    kind: 'bitmap',
+    caption: 'A figure.',
+    createdAt: 0,
+    updatedAt: 0,
+    bitmap: { fileId: 'f.png', format: 'png', width: 1000, height: 400 },
+    placement,
+});
+const build = (markdown, placement, layoutType) => {
+    const config = { layout: { layoutType }, headings: { levels: [] } };
+    return buildDocument({ markdown, resources: [figure(placement)] }, config, createMeasurementCache());
+};
+/** `a` sentences of text, then paragraph B citing the figure near its end
+ *  (after ten sentences), then more text. */
+const citingLate = (a) => `${paragraphs(a, 8)}\n\n${sentences(10)} The figure is cited here (:ref{id="fig"}). ${sentences(2)}\n\n${paragraphs(120, 10)}`;
+const locate = (doc) => {
+    let float;
+    let ref;
+    for (const p of doc.pages) {
+        for (const f of p.floats ?? [])
+            float = { page: p.index, x: f.bbox.x, y: f.bbox.y };
+        for (const c of p.columns) {
+            for (const b of c.blocks) {
+                for (const l of b.lines ?? []) {
+                    if (!ref && l.segments?.some((s) => s.refResourceId === 'fig'))
+                        ref = { page: p.index, x: l.bbox.x, y: l.bbox.y };
+                }
+            }
+        }
+    }
+    return { float: float, ref: ref };
+};
+/** The float sits above the line citing it: on an earlier page, or higher on
+ *  the same page (in the same column, for a column float). */
+const aboveCitation = (doc, pageSpan) => {
+    const { float, ref } = locate(doc);
+    if (float.page !== ref.page)
+        return float.page < ref.page;
+    return float.y < ref.y && (pageSpan || Math.abs(float.x - ref.x) < 1);
+};
+describe('a float never lands above the line that cites it (EF-69)', () => {
+    it('a page-wide top figure cited on the next page waits for the page after it', () => {
+        // Paragraph B starts at the foot of page 1 and its citation falls on
+        // page 2 (a = 116…127): the head of page 2 is above the citation.
+        for (const a of [116, 120, 124, 126]) {
+            const doc = build(citingLate(a), { position: 'top', span: 'page' }, 'single');
+            const { float, ref } = locate(doc);
+            expect(aboveCitation(doc, true), `a=${a}`).toBe(false);
+            expect(float.page, `a=${a}`).toBe(ref.page + 1);
+            expect(float.y).toBeCloseTo(doc.pages[float.page].contentArea.y, 0);
+        }
+    }, 30_000);
+    it('holds for page-wide figures over two columns', () => {
+        for (const a of [287, 290, 293, 296, 299]) {
+            const doc = build(citingLate(a), { position: 'top', span: 'page' }, 'double');
+            expect(aboveCitation(doc, true), `a=${a}`).toBe(false);
+        }
+    }, 30_000);
+    it('holds for column figures placed automatically', () => {
+        // The first free slot after the citation is the foot of its column or
+        // the head of the next, never the head of the column that holds it.
+        for (const a of [288, 291, 294, 297]) {
+            const doc = build(citingLate(a), { position: 'auto', span: 'column' }, 'double');
+            expect(aboveCitation(doc, false), `a=${a}`).toBe(false);
+        }
+    }, 30_000);
+    it('holds for a citation that ends its paragraph on the next page (EF-69 addendum)', () => {
+        // figures-float-where-cited moved a citation to the end of the paragraph
+        // before: that paragraph's last line opens page 2, and the figure used
+        // to take the head of page 2 above it (a = 127, 128 in 1.4).
+        for (const a of [127, 128]) {
+            const md = `${paragraphs(a, 8)} Many terminal moraines hold back lakes (:ref{id="fig"}).\n\n${paragraphs(80, 10)}`;
+            for (const placement of [{ position: 'top', span: 'page' }, { position: 'auto', span: 'column' }]) {
+                const doc = build(md, placement, 'single');
+                const { float, ref } = locate(doc);
+                expect(ref.page, `a=${a}`).toBe(1);
+                expect(aboveCitation(doc, placement.span === 'page'), `a=${a} ${placement.position}/${placement.span}`).toBe(false);
+                expect(float.page, `a=${a}`).toBeGreaterThanOrEqual(ref.page);
+            }
+        }
+    }, 60_000);
+    it('holds for a citation in the part of a split box that opens the next page', () => {
+        // A box that splits between its paragraphs: the head closes page 1, the
+        // paragraph citing the figure opens page 2 — the figure waits for it.
+        const config = {
+            layout: { layoutType: 'single' },
+            headings: { levels: [] },
+            calloutStyles: [{ id: 'note', keepTogether: false }],
+        };
+        const box = (n) => `:::callout{type="note"}\n${Array.from({ length: n }, (_, i) => sentences(4, i * 4)).join('\n\n')}\n\nThe figure is cited here (:ref{id="fig"}). ${sentences(2)}\n:::`;
+        let split = 0;
+        for (const a of [104, 106, 108, 110, 112]) {
+            const md = `${paragraphs(a, 8)}\n\n${box(4)}\n\n${paragraphs(120, 10)}`;
+            const doc = buildDocument({ markdown: md, resources: [figure({ position: 'top', span: 'page' })] }, config, createMeasurementCache());
+            const frames = doc.pages.flatMap((p) => p.columns.flatMap((c) => c.blocks.filter((b) => b.type === 'callout').map(() => p.index)));
+            const { ref } = locate(doc);
+            if (frames.length > 1 && ref.page > frames[0])
+                split++;
+            expect(aboveCitation(doc, true), `a=${a}`).toBe(false);
+        }
+        expect(split).toBeGreaterThan(0);
+    }, 30_000);
+    it('holds for a heading that cites the figure, which keep-with-next may still carry on', () => {
+        // The heading closes column 2 of page 1. Its figure used to be released
+        // as soon as the heading was set: it took the foot of column 2, the
+        // paragraph after the heading then lacked widow room there, and
+        // keep-with-next pulled the heading to page 2, under its own figure
+        // (a = 112, 113). The figure now waits for the paragraph's first line.
+        for (const a of [110, 111, 112, 113, 114]) {
+            const md = `${paragraphs(a, 7)}\n\n## A heading citing (:ref{id="fig"})\n\n${paragraphs(40, 6)}`;
+            for (const placement of [{ position: 'auto', span: 'column' }, { position: 'top', span: 'page' }]) {
+                const doc = buildDocument({ markdown: md, resources: [figure(placement)] }, { layout: { layoutType: 'double' } }, createMeasurementCache());
+                expect(aboveCitation(doc, placement.span === 'page'), `a=${a} ${placement.position}/${placement.span}`).toBe(false);
+            }
+        }
+        // The same when a box follows the heading: the box is what it keeps with
+        // (a = 120…124 put the figure at the head of page 2, over the heading).
+        for (const a of [120, 122, 124]) {
+            const md = `${paragraphs(a, 7)}\n\n## A heading citing (:ref{id="fig"})\n\n:::callout{type="note"}\n${sentences(6)}\n:::\n\n${paragraphs(40, 6)}`;
+            const doc = buildDocument({ markdown: md, resources: [figure({ position: 'auto', span: 'column' })] }, { layout: { layoutType: 'double' } }, createMeasurementCache());
+            expect(aboveCitation(doc, false), `box a=${a}`).toBe(false);
+        }
+    }, 30_000);
+    it('a citation on the page the paragraph starts still takes the head of the next page', () => {
+        // The citation opens paragraph B, which starts on page 1 and runs on:
+        // the head of page 2 comes after it in reading order.
+        const md = `${paragraphs(100, 8)}\n\nThe figure is cited here (:ref{id="fig"}). ${sentences(40)}\n\n${paragraphs(80, 10)}`;
+        const doc = build(md, { position: 'top', span: 'page' }, 'single');
+        const { float, ref } = locate(doc);
+        expect(ref.page).toBe(0);
+        expect(float.page).toBe(1);
+        expect(float.y).toBeCloseTo(doc.pages[1].contentArea.y, 0);
+    });
+});
+describe('a float cited by the block that closes a flow segment lands after it (EF-69)', () => {
+    // The chapter barrier drains every pending float onto the pages before
+    // it; a figure the barrier block itself cites belongs to the new chapter.
+    const chapterTwo = (heading) => `# One\n\n${sentences(30)}\n\n${heading}\n\n${sentences(20)}\n\n${paragraphs(40, 8)}`;
+    const run = (markdown, placement, config) => {
+        const doc = buildDocument({ markdown, resources: [figure(placement)] }, config, createMeasurementCache());
+        const { float, ref } = locate(doc);
+        const opener = doc.pages.findIndex((p) => p.columns.some((c) => c.blocks.some((b) => b.type === 'heading' && b.lines.some((l) => l.text.includes('Two')))));
+        return { doc, float, ref, opener };
+    };
+    const placements = [{ position: 'top', span: 'page' }, { position: 'auto', span: 'column' }];
+    it('a heading with breakBefore', () => {
+        const config = {
+            layout: { layoutType: 'double' },
+            headings: { levels: [{ level: 1, breakBefore: { enabled: true, parity: 'any' } }] },
+        };
+        for (const placement of placements) {
+            const { doc, float, ref, opener } = run(chapterTwo('# Two, with its figure (:ref{id="fig"})'), placement, config);
+            const label = `${placement.position}/${placement.span}`;
+            expect(opener, label).toBeGreaterThan(0);
+            expect(ref.page, label).toBe(opener);
+            expect(float.page, label).toBeGreaterThanOrEqual(opener);
+            expect(aboveCitation(doc, placement.span === 'page'), label).toBe(false);
+        }
+    }, 30_000);
+    it('a heading level set across the page (span: page)', () => {
+        const config = {
+            layout: { layoutType: 'double' },
+            headings: { levels: [{ level: 1, span: 'page', breakBefore: { enabled: false } }] },
+        };
+        for (const placement of placements) {
+            const { doc, float, ref, opener } = run(chapterTwo('# Two, with its figure (:ref{id="fig"})'), placement, config);
+            const label = `${placement.position}/${placement.span}`;
+            expect(opener, label).toBeGreaterThan(0);
+            expect(ref.page, label).toBe(opener);
+            expect(float.page, label).toBeGreaterThanOrEqual(opener);
+            expect(aboveCitation(doc, placement.span === 'page'), label).toBe(false);
+        }
+    }, 30_000);
+    it('the first paragraph after a part', () => {
+        const config = {
+            layout: { layoutType: 'double' },
+            headings: { levels: [{ level: 1, breakBefore: { enabled: false } }] },
+        };
+        const md = `# One\n\n${sentences(30)}\n\n:::part{number="II" title="Two"}\n:::\n\nThe part opens citing its figure (:ref{id="fig"}). ${sentences(20)}\n\n${paragraphs(40, 8)}`;
+        for (const placement of placements) {
+            const doc = buildDocument({ markdown: md, resources: [figure(placement)] }, config, createMeasurementCache());
+            const { float, ref } = locate(doc);
+            const part = doc.pages.findIndex((p) => p.partInfo);
+            const label = `${placement.position}/${placement.span}`;
+            expect(part, label).toBeGreaterThan(0);
+            expect(ref.page, label).toBeGreaterThan(part);
+            expect(float.page, label).toBeGreaterThanOrEqual(ref.page);
+            expect(aboveCitation(doc, placement.span === 'page'), label).toBe(false);
+        }
+    }, 30_000);
+});
+//# sourceMappingURL=floatAfterCitingLine.test.js.map