postext 1.27.1 → 1.28.0

package/dist/__tests__/cjk/runt.test.js

@@ -1,7 +1,9 @@
 import { describe, it, expect, afterEach } from 'vitest';
 import { measureRichBlock } from '../../measure/rich';
 import { measureBlock } from '../../measure/plain';
-import { setCjkComposition } from '../../measure/cjkPunctuation';
+import { cjkCompositionKey, cjkCompositionOf, setCjkComposition } from '../../measure/cjkPunctuation';
+import { resolveCjkConfig } from '../../defaults/cjk';
+import { stripConfigDefaults } from '../../defaults';
 import { setCjkLineBreak } from '../../measure/cjkClasses';
 import { buildDocument } from '../../pipeline';
 // A paragraph does not end on a line holding one character, alone or with
@@ -100,4 +102,93 @@ describe('孤字 in a document: bodyText.avoidRunts', () => {
         }
     });
 });
+// A paragraph does not end on one character (clreq §7.1.2, 孤字不成行;
+// JLReq §3.5.4 takes the same care), on a character grid as off it: a
+// line that is not justified gives its last character up and stands one
+// cell short, as up to 1.27. Manuscript paper (`cjk.grid.fullLines`, #718)
+// keeps every cell of such a line instead, and the paragraph keeps its
+// lines as first broken.
+describe('孤字 on a character grid (#718)', () => {
+    const pt = (value) => ({ value, unit: 'pt' });
+    const K = '一二三四五六七八九十';
+    // 41 characters: two full lines of 20 and one character.
+    const P41 = K.repeat(4) + '終';
+    const config = (locale, body = {}, writingMode = 'horizontal-tb', grid = 'fullLines') => {
+        const along = pt(20 * 16 + 40);
+        const across = pt(20 * 24 + 40);
+        return {
+            locale,
+            page: {
+                width: writingMode === 'vertical-rl' ? across : along,
+                height: writingMode === 'vertical-rl' ? along : across,
+                dpi: 72,
+                margins: { top: pt(20), bottom: pt(20), left: pt(20), right: pt(20) },
+            },
+            layout: { layoutType: 'single', writingMode },
+            bodyText: { fontSize: pt(16), lineHeight: pt(24), textAlign: 'left', firstLineIndent: pt(0), ...body },
+            header: { elements: [] },
+            footer: { elements: [] },
+            ...(grid ? { cjk: { grid: { enabled: true, charsPerLine: 20, linesPerPage: 20, ...(grid === 'fullLines' ? { fullLines: true } : {}) } } } : {}),
+        };
+    };
+    const lines = (cfg) => buildDocument({ markdown: P41 }, cfg).pages[0].columns[0].blocks.flatMap((b) => b.lines);
+    const counts = (ls) => ls.map((l) => [...l.text].length);
+    const advance = (l) => l.segments.reduce((s, seg) => s + seg.width, 0);
+    for (const locale of ['ja', 'zh-Hans', 'zh-Hant']) {
+        for (const mode of ['horizontal-tb', 'vertical-rl']) {
+            it(`${locale}, ${mode}: on a grid a ragged paragraph gives the character up, as up to 1.27`, () => {
+                expect(counts(lines(config(locale, {}, mode, 'grid')))).toEqual([20, 19, 2]);
+                expect(counts(lines(config(locale, { textAlign: 'center' }, mode, 'grid')))).toEqual([20, 19, 2]);
+                // The same lines as off the grid.
+                expect(counts(lines(config(locale, {}, mode, false)))).toEqual([20, 19, 2]);
+            });
+            it(`${locale}, ${mode}: with fullLines a paragraph that is not justified keeps every full line full`, () => {
+                expect(counts(lines(config(locale, {}, mode)))).toEqual([20, 20, 1]);
+                expect(counts(lines(config(locale, { textAlign: 'center' }, mode)))).toEqual([20, 20, 1]);
+            });
+            it(`${locale}, ${mode}: a justified paragraph gives up the character either way, its line spread`, () => {
+                for (const grid of ['grid', 'fullLines']) {
+                    const set = lines(config(locale, { textAlign: 'justify' }, mode, grid));
+                    expect(counts(set), grid).toEqual([20, 19, 2]);
+                    expect(set[1].cjkLoose).toBeUndefined();
+                    expect(advance(set[1])).toBeCloseTo(20 * 16, 6);
+                }
+            });
+        }
+    }
+    it('avoidRunts: false leaves the lone character on a grid, justified or not', () => {
+        for (const grid of ['grid', 'fullLines']) {
+            expect(counts(lines(config('ja', { avoidRunts: false }, 'horizontal-tb', grid)))).toEqual([20, 20, 1]);
+            expect(counts(lines(config('ja', { avoidRunts: false, textAlign: 'justify' }, 'horizontal-tb', grid)))).toEqual([20, 20, 1]);
+        }
+    });
+    it('fullLines is read as a boolean, off without the grid, and stripped at its default', () => {
+        expect(resolveCjkConfig({}, 'ja').grid.fullLines).toBe(false);
+        expect(resolveCjkConfig({ grid: { enabled: true } }, 'ja').grid.fullLines).toBe(false);
+        expect(resolveCjkConfig({ grid: { enabled: true, fullLines: true } }, 'ja').grid.fullLines).toBe(true);
+        expect(resolveCjkConfig({ grid: { fullLines: true } }, 'ja').grid.fullLines).toBe(false);
+        expect(resolveCjkConfig({ grid: { enabled: true, fullLines: 'yes' } }, 'ja').grid.fullLines).toBe(false);
+        expect(stripConfigDefaults({ cjk: { grid: { enabled: true, fullLines: false } } }).cjk).toEqual({ grid: { enabled: true } });
+        expect(stripConfigDefaults({ cjk: { grid: { enabled: true, fullLines: true } } }).cjk).toEqual({ grid: { enabled: true, fullLines: true } });
+    });
+    it('the composer reads the rule from the composition alone', () => {
+        const of = (grid) => cjkCompositionOf(resolveCjkConfig({ grid }, 'zh-Hant'), 72, 'zh-Hant');
+        const full = { ...RUNTS, textAlign: 'left', cjkComposition: of({ enabled: true, charsPerLine: 10, linesPerPage: 10, fullLines: true }) };
+        expect(texts(both(HLM, 10 * EM, full))).toEqual(['此開卷第一回也作者自', '云因曾歷過一番夢幻之', '後。']);
+        expect(texts(both(HLM, 10 * EM, { ...full, textAlign: 'justify' }))).toEqual(['此開卷第一回也作者自', '云因曾歷過一番夢幻', '之後。']);
+        // A grid alone sets a ragged paragraph as 1.27 did.
+        const plain = { ...RUNTS, textAlign: 'left', cjkComposition: of({ enabled: true, charsPerLine: 10, linesPerPage: 10 }) };
+        expect(texts(both(HLM, 10 * EM, plain))).toEqual(['此開卷第一回也作者自', '云因曾歷過一番夢幻', '之後。']);
+    });
+    it('is part of the composition key only where set', () => {
+        const key = (cjk) => cjkCompositionKey(cjkCompositionOf(resolveCjkConfig(cjk, 'zh-Hans'), 96, 'zh-Hans'));
+        const plain = key({});
+        expect(cjkCompositionOf(resolveCjkConfig({}, 'zh-Hans'), 96, 'zh-Hans').gridFullLines).toBeUndefined();
+        expect(key({ grid: { enabled: false } })).toBe(plain);
+        // A grid alone keeps the key of 1.27.
+        expect(key({ grid: { enabled: true, charsPerLine: 20, linesPerPage: 20 } })).toBe(plain);
+        expect(key({ grid: { fullLines: true } })).toBe(plain);
+        expect(key({ grid: { enabled: true, charsPerLine: 20, linesPerPage: 20, fullLines: true } })).toBe(`${plain}:g`);
+    });
+});
 //# sourceMappingURL=runt.test.js.map

package/dist/__tests__/cjk/runt.test.js.map

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

package/dist/__tests__/codeBlocks.test.js

@@ -523,7 +523,7 @@ describe('stored documents (CONFIG_VERSION 9)', () => {
         'The end.',
     ].join('\n');
     it('pins the 1.22 reading of fences for a configuration with fences in its text', () => {
-        expect(CONFIG_VERSION).toBe(11);
+        expect(CONFIG_VERSION).toBe(12);
         expect(pinLegacyCodeBlocks({})).toEqual({ codeStyle: { blocks: false } });
         const own = { codeStyle: { blocks: true } };
         expect(pinLegacyCodeBlocks(own)).toBe(own);

package/dist/__tests__/columnBalancing.test.js

@@ -458,6 +458,42 @@ describe('list-end and loose-paragraph levers', () => {
             c.trailingCap = true;
         expect(headingLever(capped, NO_FORCED)).toBeUndefined();
     });
+    it('keeps the heading right under a page-span opener at its column\'s head in a closing band (#709)', () => {
+        // The opener stays in its own column as a hidden block, so the headline
+        // under it is block 1: on a page that flows on it is a heading lever
+        // like any other; in a closing band it is the column's head, and only
+        // the heading further down is offered.
+        const build = () => {
+            const opener = fakeBlock({ type: 'heading', headingLevel: 1, contentIndex: 80, hidden: true });
+            const full = fakeBlock({ type: 'paragraph', bbox: { x: 500, y: 0, width: 480, height: 900 } });
+            return fakeDoc([
+                [
+                    { blocks: [opener, heading(81, 2), para(), heading(82, 2), para()], availableHeight: 2 * 24 },
+                    { blocks: [full], availableHeight: 0 },
+                ],
+                [{ blocks: [para()], availableHeight: 0 }],
+            ]);
+        };
+        const headingLevers = (doc, forced) => collectColumnGaps(doc, forced).flatMap((g) => g.candidates).filter((c) => c.kind === 'heading').map((c) => c.contentIndex);
+        expect(headingLevers(build(), NO_FORCED)).toEqual([81, 82]);
+        expect(headingLevers(build(), new Set([0]))).toEqual([82]);
+        const capped = build();
+        for (const c of capped.pages[0].columns)
+            c.trailingCap = true;
+        expect(headingLevers(capped, NO_FORCED)).toEqual([82]);
+        // The lines the column needs go to the heading that is left.
+        const proposal = proposeBalanceLines(build(), new Set([0]), emptyState(), baseOptions());
+        expect(proposal.lines.get(81)).toBeUndefined();
+        expect(proposal.lines.get(82)).toBe(2);
+        // A structural hidden heading before it counts the same way, and a
+        // visible block before it makes it a mid-column heading again.
+        const structural = build();
+        structural.pages[0].columns[0].blocks.unshift(fakeBlock({ type: 'heading', headingLevel: 1, contentIndex: 79, hidden: true }));
+        expect(headingLevers(structural, new Set([0]))).toEqual([82]);
+        const mid = build();
+        mid.pages[0].columns[0].blocks.splice(1, 0, para());
+        expect(headingLevers(mid, new Set([0]))).toEqual([81, 82]);
+    });
     it('exhausts heading capacity before touching list ends', () => {
         const doc = fakeDoc([
             [
@@ -575,6 +611,160 @@ describe('list-end and loose-paragraph levers', () => {
         expect(turnedOff.loose.size).toBe(0);
     });
 });
+describe('headings hold their further lines for the levers after them (#707)', () => {
+    const heading = (contentIndex, level = 2) => fakeBlock({ type: 'heading', headingLevel: level, contentIndex });
+    const para = (contentIndex) => fakeBlock({ type: 'paragraph', contentIndex });
+    const justified = (contentIndex) => fakeBlock({ type: 'paragraph', contentIndex, textAlign: 'justify', lines: [fakeLine(), fakeLine(), fakeLine()] });
+    /** One short column of `blocks` with `gap` empty lines, on a page that flows on. */
+    const column = (blocks, gap) => fakeDoc([
+        [
+            { blocks, availableHeight: gap * 24 },
+            { blocks: [para(90)], availableHeight: 0 },
+        ],
+        [{ blocks: [para(91)], availableHeight: 0 }],
+    ]);
+    const options = (over) => baseOptions({ maxLinesPerHeading: 4, maxLinesBeforeLoose: 2, maxLooseParagraphs: 2, ...over });
+    const oneHeading = (gap = 4) => column([para(1), heading(2), justified(3), justified(4), para(5)], gap);
+    it('gives one heading two lines and offers the paragraphs the rest', () => {
+        const proposal = proposeBalanceLines(oneHeading(), new Set(), emptyState(), options());
+        expect(proposal.lines.get(2)).toBe(2);
+        expect([...proposal.loose.keys()].sort()).toEqual([3, 4]);
+        // Two lines are left: both paragraphs are needed.
+        expect(proposal.looseBudget.get(3).need).toBe(2);
+    });
+    it('gives the heading its further lines once the paragraphs have nothing left', () => {
+        // Both failed: the heading takes the four lines, as up to 1.27.
+        const failed = proposeBalanceLines(oneHeading(), new Set(), emptyState(), options({ failedLoose: new Set([3, 4]) }));
+        expect(failed.lines.get(2)).toBe(4);
+        expect(failed.loose.size).toBe(0);
+        // The next pass after the paragraphs gained their lines: two lines went
+        // above the heading, both paragraphs are loose, one line is still open.
+        const state = { lines: new Map([[2, 2]]), loose: new Map([[3, 1], [4, 1]]) };
+        const after = proposeBalanceLines(oneHeading(1), new Set(), state, options());
+        expect(after.lines.get(2)).toBe(3);
+        // One gained, one failed, two lines open: the heading closes them.
+        const mixed = proposeBalanceLines(oneHeading(2), new Set(), { lines: new Map([[2, 2]]), loose: new Map([[3, 1]]) }, options({ failedLoose: new Set([4]) }));
+        expect(mixed.lines.get(2)).toBe(4);
+        // A candidate is still untried: the heading waits for it.
+        const waiting = proposeBalanceLines(oneHeading(2), new Set(), { lines: new Map([[2, 2]]), loose: new Map([[3, 1]]) }, options());
+        expect(waiting.lines.get(2)).toBe(2);
+        expect(waiting.loose.has(4)).toBe(true);
+    });
+    it('gives the headings all their lines at once when the loose lever is off', () => {
+        for (const over of [{ looseParagraphs: false }, { optimalLineBreaking: false }, { maxLooseParagraphs: 0 }]) {
+            const proposal = proposeBalanceLines(oneHeading(), new Set(), emptyState(), options(over));
+            expect(proposal.lines.get(2), JSON.stringify(over)).toBe(4);
+            expect(proposal.loose.size).toBe(0);
+        }
+    });
+    it('tries the list ends and the displays before a heading\'s third line', () => {
+        const item = (contentIndex) => fakeBlock({ type: 'listItem', contentIndex });
+        const doc = column([para(1), heading(2), para(3), item(4), para(5), fakeBlock({ type: 'mathDisplay', contentIndex: 6 }), para(7)], 4);
+        const proposal = proposeBalanceLines(doc, new Set(), emptyState(), options({ looseParagraphs: false }));
+        expect(proposal.lines.get(2)).toBe(2);
+        expect(proposal.lines.get(5)).toBe(1); // after the list
+        expect(proposal.lines.get(7)).toBe(1); // under the formula
+        // A line more than they can take goes above the heading.
+        const five = proposeBalanceLines(column([para(1), heading(2), para(3), item(4), para(5), fakeBlock({ type: 'mathDisplay', contentIndex: 6 }), para(7)], 5), new Set(), emptyState(), options({ looseParagraphs: false }));
+        expect([five.lines.get(2), five.lines.get(5), five.lines.get(7)]).toEqual([3, 1, 1]);
+    });
+    it('counts the first cap per heading: six lines over two headings', () => {
+        const two = () => column([para(1), heading(2), justified(3), heading(4, 3), justified(5), para(6)], 6);
+        const first = proposeBalanceLines(two(), new Set(), emptyState(), options());
+        expect([first.lines.get(2), first.lines.get(4)]).toEqual([2, 2]);
+        expect(first.loose.size).toBe(2);
+        const later = proposeBalanceLines(two(), new Set(), emptyState(), options({ failedLoose: new Set([3, 5]) }));
+        expect([later.lines.get(2), later.lines.get(4)]).toEqual([3, 3]);
+    });
+    it('is the order of postext 1.27 with maxLinesBeforeLoose at or above the cap, or left out', () => {
+        for (const maxLinesBeforeLoose of [4, 9, undefined]) {
+            const proposal = proposeBalanceLines(oneHeading(), new Set(), emptyState(), options({ maxLinesBeforeLoose }));
+            expect(proposal.lines.get(2)).toBe(4);
+            expect(proposal.loose.size).toBe(0);
+        }
+        // 0: the other levers before any line above a heading.
+        const zero = proposeBalanceLines(oneHeading(), new Set(), emptyState(), options({ maxLinesBeforeLoose: 0 }));
+        expect(zero.lines.get(2)).toBeUndefined();
+        expect(zero.loose.size).toBe(2);
+    });
+});
+describe('under a float over several columns (#708)', () => {
+    const para = (contentIndex) => fakeBlock({ type: 'paragraph', contentIndex });
+    /** Page 0: two columns that start at y=300 under one float; `gaps` are
+     *  the empty lines of each. `width` is the float's: 980 stands over both
+     *  columns, 480 over the first alone. Page 1 follows, so page 0 flows on. */
+    const under = (gaps, width = 980, firstBlocks) => {
+        const doc = fakeDoc([
+            [
+                { blocks: firstBlocks ?? [para(1), para(2)], availableHeight: gaps[0] * 24 },
+                { blocks: [para(3), para(4)], availableHeight: gaps[1] * 24 },
+            ],
+            [{ blocks: [para(9)], availableHeight: 0 }],
+        ]);
+        for (const col of doc.pages[0].columns)
+            col.bbox = { ...col.bbox, y: 300, height: 600 };
+        doc.pages[0].floats = [fakeBlock({ type: 'resource', bbox: { x: 0, y: 0, width, height: 280 } })];
+        return doc;
+    };
+    const flush = (over) => baseOptions({ looseParagraphs: false, stretchAfterWideFloats: 'flush', ...over });
+    const propose = (doc, options) => {
+        const p = proposeBalanceLines(doc, NO_FORCED, emptyState(), options);
+        return [p.lines.get(1), p.lines.get(3)];
+    };
+    it('marks the after-float point of a column under a float that stands over another column too', () => {
+        const wide = collectColumnGaps(under([2, 1]), NO_FORCED).map((g) => g.candidates.find((c) => c.kind === 'afterFloat')?.wideFloat);
+        expect(wide).toEqual([{ key: '0:0', under: 2 }, { key: '0:0', under: 2 }]);
+        const narrow = collectColumnGaps(under([2, 1], 480), NO_FORCED)[0].candidates.find((c) => c.kind === 'afterFloat');
+        expect(narrow).toBeDefined();
+        expect(narrow.wideFloat).toBeUndefined();
+    });
+    it('adds no line that lowers one head and leaves its column short (case A)', () => {
+        // The first column needs two lines and may take one; the second is flush.
+        expect(propose(under([2, 0]), flush())).toEqual([undefined, undefined]);
+        // Up to 1.27, and with 'always': the first column moves down alone.
+        expect(propose(under([2, 0]), flush({ stretchAfterWideFloats: 'always' }))).toEqual([1, undefined]);
+        expect(propose(under([2, 0]), baseOptions({ looseParagraphs: false }))).toEqual([1, undefined]);
+    });
+    it('moves the columns under the float together (case B)', () => {
+        // Four lines short and one line short: both take one, the second ends flush.
+        expect(propose(under([4, 1]), flush())).toEqual([1, 1]);
+        expect(propose(under([4, 1]), flush({ stretchAfterWideFloats: 'always' }))).toEqual([1, 1]);
+        // The smallest number any of them can take, then more only to close a gap.
+        expect(propose(under([3, 2]), flush({ maxLinesAfterFloat: 3 }))).toEqual([3, 2]);
+        expect(propose(under([5, 2]), flush({ maxLinesAfterFloat: 3 }))).toEqual([2, 2]);
+    });
+    it('lets a column take its line alone when that ends it flush', () => {
+        expect(propose(under([1, 0]), flush())).toEqual([1, undefined]);
+        expect(propose(under([0, 1]), flush())).toEqual([undefined, 1]);
+        // Two lines within the cap close the gap too.
+        expect(propose(under([2, 0]), flush({ maxLinesAfterFloat: 2 }))).toEqual([2, undefined]);
+    });
+    it('counts a column with no after-float point as taking nothing', () => {
+        // A heading opens the first column: it is a heading lever, so the
+        // second has no neighbour to move with and three lines to close.
+        const headed = () => under([3, 3], 980, [fakeBlock({ type: 'heading', headingLevel: 2, contentIndex: 1 }), para(2)]);
+        const p = proposeBalanceLines(headed(), NO_FORCED, emptyState(), flush());
+        expect(p.lines.get(3)).toBeUndefined();
+        // A point that may take no more lines stops the group as well.
+        expect(propose(under([4, 1]), flush({ failedLines: new Set([1]) }))).toEqual([undefined, 1]);
+        expect(propose(under([4, 2]), flush({ failedLines: new Set([1]) }))).toEqual([undefined, undefined]);
+    });
+    it('leaves a float over one column as it was', () => {
+        expect(propose(under([2, 0], 480), flush())).toEqual([1, undefined]);
+        expect(propose(under([2, 0], 480), flush({ stretchAfterFloats: false }))).toEqual([undefined, undefined]);
+        expect(propose(under([4, 1]), flush({ stretchAfterFloats: false }))).toEqual([undefined, undefined]);
+    });
+    it('closes the last line alone once a loose paragraph gained one', () => {
+        // Case A with a justified paragraph: the proposal offers it and adds no
+        // after-float line; in the next pass one line is left, and it closes.
+        const justified = fakeBlock({ type: 'paragraph', contentIndex: 2, textAlign: 'justify', lines: [fakeLine(), fakeLine(), fakeLine()] });
+        const first = proposeBalanceLines(under([2, 0], 980, [para(1), justified]), NO_FORCED, emptyState(), flush({ looseParagraphs: true }));
+        expect(first.lines.get(1)).toBeUndefined();
+        expect([...first.loose.keys()]).toEqual([2]);
+        const next = proposeBalanceLines(under([1, 0], 980, [para(1), justified]), NO_FORCED, { lines: new Map(), loose: new Map([[2, 1]]) }, flush({ looseParagraphs: true }));
+        expect(next.lines.get(1)).toBe(1);
+    });
+});
 describe('cascade containment', () => {
     const para = (contentIndex, cont = false) => fakeBlock({ type: 'paragraph', contentIndex, id: cont ? `p-${contentIndex}-cont-1` : `p-${contentIndex}` });
     const heading = (contentIndex) => fakeBlock({ type: 'heading', headingLevel: 2, contentIndex });
@@ -687,6 +877,32 @@ describe('after-display lever and the level of a closing band', () => {
         expect(proposal.lines.get(3)).toBe(1);
         expect(proposal.lines.get(5)).toBe(1);
     });
+    it('adds no line under a formula or a box with stretchAfterDisplays off (#710)', () => {
+        const justified = (contentIndex) => fakeBlock({ type: 'paragraph', contentIndex, textAlign: 'justify', lines: [fakeLine(), fakeLine(), fakeLine()] });
+        const build = () => fakeDoc([
+            [
+                { blocks: [justified(1), math(2), para(3), boxChild(4), para(5)], availableHeight: 2 * 24 },
+                { blocks: [para(6)], availableHeight: 0 },
+            ],
+            [{ blocks: [para(10)], availableHeight: 0 }],
+        ]);
+        // The candidates are offered either way: the switch acts on the proposal.
+        const kinds = collectColumnGaps(build(), new Set())[0].candidates.map((c) => `${c.kind}:${c.contentIndex}`);
+        expect(kinds).toEqual(expect.arrayContaining(['afterDisplay:3', 'afterDisplay:5', 'looseParagraph:1']));
+        // On (and unset): one line under each, and nothing left for the loose lever.
+        for (const options of [baseOptions(), baseOptions({ stretchAfterDisplays: true })]) {
+            const on = proposeBalanceLines(build(), new Set(), emptyState(), options);
+            expect([on.lines.get(3), on.lines.get(5)]).toEqual([1, 1]);
+            expect(on.loose.size).toBe(0);
+        }
+        // Off: nothing under the displays; the gap goes on to the paragraph.
+        const off = proposeBalanceLines(build(), new Set(), emptyState(), baseOptions({ stretchAfterDisplays: false }));
+        expect(off.lines.size).toBe(0);
+        expect([...off.loose.keys()]).toEqual([1]);
+        // With no lever after it, the column ends short.
+        const short = proposeBalanceLines(build(), new Set(), emptyState(), baseOptions({ stretchAfterDisplays: false, looseParagraphs: false }));
+        expect(short.changed).toBe(false);
+    });
     it('never stretches a column of a closing page past the tallest column beside it', () => {
         // Page 0 does not flow on (forced break): column 0 ends one line above
         // column 1, which is the page's last column. Column 0 may take that one