postext 1.58.3 → 1.59.1

package/dist/pipeline/build.js

@@ -22,6 +22,9 @@ import { stampCentralBaselines } from './verticalMetrics.js';
 import { orientLinesToFrames } from './mirrorFrame.js';
 import { verseMarginTopPx } from './buildBlockKind.js';
 import { verseLinesSettings, versesLineByLine } from './verseLines.js';
+import { exerciseOutline, exerciseSettingsFor, expandDocumentExercises, markTurnedBoxes, nameExerciseAnchors, needsExerciseExpansion, withExerciseStyles } from '../exercises/build.js';
+import { hasExercises } from '../exercises/model.js';
+import { exerciseDigitalOf } from '../exercises/digital.js';
 import { arabicNumbersOf, resolveAllConfig, computeBaselineGrid, computeColumnBboxes, resolvedDirection, resolvedLocale, validateConfigCache } from './config.js';
 import { resolveDebugConfig } from '../defaults/debug.js';
 import { defaultFontSet, documentFontFaces, faceRequestKey, fontFallbacks } from '../fonts/faces.js';
@@ -63,7 +66,7 @@ import { comicStripExtent, comicStripOffset, comicStripPlacement, comicStripWidt
 import { comicSpreadGutter, isComicSpread, layoutComicSpread } from '../comics/spread.js';
 import { comicTextPanelsSupported, layoutComicTextFrames, layoutStripTextFrames, planComicTextPanels, wrapComicTextPanels } from '../comics/textPanels.js';
 import { applyStyleAttrs, computePageMetrics, composedLeafConfig, flowPageMirrored, pageMirrored, sheetRectToFlow, isMarkerBlock, nextNonMarkerBlock, spaceLinesAfter, prevNonMarkerBlock, rollbackTrailingBlocks, } from './buildHelpers.js';
-import { measureContentBlock } from './measureContentBlock.js';
+import { measureContentBlock, wordSpacingProfile } from './measureContentBlock.js';
 import { containerStyle, paragraphStyleIdOf, planParagraphContainers } from './paragraphContainers.js';
 import { appendChapterEndNotes, footnoteIdsOfLines, footnoteParagraphStyle, noteContentBlock, noteNumberPositionOf, numberFootnotes, footnoteFormatOf, numberFootnotesByPlacement, sameFootnoteNumbers, splitFootnoteDefinitions, withFootnoteStyle, } from './footnotes.js';
 import { planParts, derivePartMeasureContext } from './parts.js';
@@ -75,6 +78,7 @@ import { enumerateCurrentPageSlots, measureFloatBand, floatGapAbove, floatGapBel
 import { computeHeadingContext, computeResourceNumberingState, } from './resourceNumbering.js';
 import { documentLocale, effectiveResourceTypes } from '../defaults/resourceTypes.js';
 import { resolveCalloutStylesConfig } from '../defaults/calloutStyles.js';
+import { relinkToPalette } from '../defaults/shared.js';
 import { codeBoxStyle, codeParseOptions, wrapCodeBlocks } from './codeBlocks.js';
 import { expandScoreBlocks, scoreInfoOf, scoreKeepHeight } from './scoreBlocks.js';
 import { buildCodeLineNumbers, codeOverflowWarnings } from './codeLines.js';
@@ -185,6 +189,11 @@ function chapterNumbersOfContent(blocks, resolved, prefixes, values, ordinalOffs
  * looseness counts from that optimum, so such a paragraph asks it for one
  * line less (EF-129: asked for one more, it could only match the target by
  * falling back to its optimum, unchecked).
+ *
+ * With `headings.balancing.fillShortColumns` (#1236) `extraLines` may be
+ * -1: the paragraph is set a line short, its tracking rungs taken in the
+ * other direction (tighter letters), and the outcome recorded as negative
+ * tracking.
  */
 function measureLooseParagraph(rawBlock, blockIdx, columnWidth, ctx, styleOverride, extraLines, trackingLadder, looseOutcome, offGrid) {
     const base = measureContentBlock(rawBlock, blockIdx, columnWidth, ctx, { styleOverride });
@@ -211,23 +220,32 @@ function measureLooseParagraph(rawBlock, blockIdx, columnWidth, ctx, styleOverri
     const onGrid = ctx.resolved.cjk.grid.enabled && composesAsCjk(rawBlock.text);
     const ladder = trackingLadder.length > 1 && (onGrid || mostlyJoiningScript(rawBlock.text)) ? trackingLadder.slice(0, 1) : trackingLadder;
     const gridCap = onGrid ? { gridTrackingEm: ctx.resolved.headings.balancing.maxTracking / 1000 } : {};
-    const maxWordSpacing = ctx.resolved.bodyText.maxWordSpacing + 1e-9;
+    // With `fillShortColumns` (#1236) the limit is the one the runt fix
+    // keeps (EF-65): no justified line looser than `maxWordSpacing` or than
+    // the paragraph's own loosest one, and no more lines set ragged past 3x
+    // than it had. A narrow column of long words often passes the absolute
+    // limit in every setting of a paragraph, the breaker's own included.
+    const natural = ctx.resolved.headings.balancing.fillShortColumns ? wordSpacingProfile(base.measured.lines) : undefined;
+    const maxWordSpacing = Math.max(ctx.resolved.bodyText.maxWordSpacing, natural?.loosest ?? 0) + 1e-9;
     // A CJK line spread past its tracking cap (`cjkLoose`) is past the
     // limit too.
-    const withinLimit = (lines) => lines.every((l) => l.isLastLine || ((l.justifiedSpaceRatio === undefined || l.justifiedSpaceRatio <= maxWordSpacing) && !l.cjkLoose));
+    const withinLimit = (lines) => natural
+        ? lines.every((l) => !l.cjkLoose) && ((p) => p.loosest <= maxWordSpacing && p.ragged <= natural.ragged)(wordSpacingProfile(lines))
+        : lines.every((l) => l.isLastLine || ((l.justifiedSpaceRatio === undefined || l.justifiedSpaceRatio <= maxWordSpacing) && !l.cjkLoose));
     const gains = (loose) => loose !== null
         && loose.measured.lines.length === target
         && !loose.measured.lastLineRunt
         && withinLimit(loose.measured.lines);
+    const sign = extraLines < 0 ? -1 : 1;
     for (const tracking of ladder) {
         const loose = measureContentBlock(rawBlock, blockIdx, columnWidth, ctx, {
             styleOverride,
             looseness,
-            trackingEm: tracking > 0 ? tracking / 1000 : undefined,
+            trackingEm: tracking > 0 ? (sign * tracking) / 1000 : undefined,
             ...gridCap,
         });
         if (gains(loose)) {
-            looseOutcome.set(blockIdx, tracking);
+            looseOutcome.set(blockIdx, sign * tracking);
             return loose;
         }
     }
@@ -288,7 +306,9 @@ function placeDocumentPass(content, config, cache, options, hints) {
      *  band above (a page-span box, a top float band) or a caption below has
      *  shortened it, so what does not fit it may still fit a full column. */
     const shortSideColumn = (page, col) => col.bbox.height < page.contentArea.height - 0.5;
-    const resolved = resolveAllConfig(config);
+    // Rebound once the content is read when it holds exercises (#1227): the
+    // config then also carries their chip and paragraph styles.
+    let resolved = resolveAllConfig(config);
     // Bitmaps sized by the document's `layout.bitmapResolution` carry it as
     // their own `resolution` from here on (#631); under the default policy
     // the content is untouched.
@@ -506,7 +526,21 @@ function placeDocumentPass(content, config, cache, options, hints) {
     // The citations of resource captions and notes (#529), formatted with
     // the text's.
     const captionCitations = citationsApplied && citationsApplied.captions.size > 0 ? citationsApplied.captions : undefined;
-    const footnoteSplit = splitFootnoteDefinitions(citationsApplied?.blocks ?? parsedBody);
+    // Exercises (#1227): each set as a box of ordinary blocks, its solutions
+    // where the book prints them.
+    const exerciseExpansion = needsExerciseExpansion(citationsApplied?.blocks ?? parsedBody)
+        ? expandDocumentExercises(citationsApplied?.blocks ?? parsedBody, resolved, computeColumnBboxes(pageMetrics.contentArea, resolved)[0]?.width ?? pageMetrics.contentArea.width, continuation, content.outline)
+        : undefined;
+    if (exerciseExpansion) {
+        resolved = withExerciseStyles(resolved);
+        // The document's config names the exercises' chip and paragraph
+        // styles too: an output that styles its text from the config (a
+        // reflowable EPUB, #1231) finds them there.
+        doc.config = resolved;
+        doc.exercises = exerciseExpansion.records;
+        doc.exerciseDigital = exerciseDigitalOf(exerciseSettingsFor(resolved));
+    }
+    const footnoteSplit = splitFootnoteDefinitions(exerciseExpansion?.blocks ?? citationsApplied?.blocks ?? parsedBody);
     const footnoteDefs = footnoteSplit.defs;
     // Numbered by page or column (`numbering: 'page'`), a note takes the
     // number the previous build gave it where it landed; the first build
@@ -534,7 +568,10 @@ function placeDocumentPass(content, config, cache, options, hints) {
     const resourceIds = new Set((content.resources ?? []).map((r) => r.id));
     const anchorRefs = hasAnchorRefs(parsedBlocks, resourceIds);
     const outline = content.outline
-        ?? (hasTocDirective(parsedBlocks) || hasIndexDirective(parsedBlocks) || anchorRefs ? computeOutline(parsedBlocks, resolved, headingStart, continuation?.statementCounters) : undefined);
+        ?? (hasTocDirective(parsedBlocks) || hasIndexDirective(parsedBlocks) || anchorRefs
+            // A reference to an exercise prints its name (#1225).
+            ? nameExerciseAnchors(computeOutline(parsedBlocks, resolved, headingStart, continuation?.statementCounters), exerciseExpansion?.records ?? [])
+            : undefined);
     // A story carried in from another chapter (#943) may refer to anchors too.
     const carriedRefs = continuation?.jumps?.some((j) => j.outline) === true;
     const anchorRefContext = anchorRefs || carriedRefs
@@ -630,6 +667,8 @@ function placeDocumentPass(content, config, cache, options, hints) {
     const syntheticBoxes = [
         ...(spanEmbeds.wrapped ? [spanEmbedStyle(bodyStyle.lineHeightPx, resolved.layout.inlineResourceGap !== 'above')] : []),
         ...(codeBoxes.wrapped ? [codeBoxStyle(resolved)] : []),
+        // The boxes exercises are set in (#1227).
+        ...(exerciseExpansion?.wrapped ? exerciseExpansion.boxes : []),
         // The frameless box of a composed page's story (#855).
         ...(composedWrap.wrapped || comicText.wrapped ? [frameBoxStyle(Math.max(resolved.bodyText.avoidOrphans ? resolved.bodyText.orphanMinLines : 1, resolved.bodyText.avoidWidows ? resolved.bodyText.widowMinLines : 1))] : []),
         // The boxes of main-flow groups: sub-columns a body line apart in the
@@ -638,12 +677,16 @@ function placeDocumentPass(content, config, cache, options, hints) {
             ? flowColumnsStyles(bodyStyle.lineHeightPx, dimensionToPx(resolved.layout.gutterWidth, resolved.page.dpi, bodyStyle.fontSizePx), resolved.bodyText.paragraphSpacing === false ? { value: 0, unit: 'px' } : { value: bodyStyle.marginBottomPx, unit: 'px' }, Math.max(resolved.bodyText.avoidOrphans ? resolved.bodyText.orphanMinLines : 1, resolved.bodyText.avoidWidows ? resolved.bodyText.widowMinLines : 1))
             : []),
     ];
+    const exerciseBoxIds = new Set(exerciseExpansion?.wrapped ? exerciseExpansion.boxes.map((b) => b.id) : []);
     const calloutStyles = syntheticBoxes.length > 0
-        ? [...resolved.calloutStyles, ...resolveCalloutStylesConfig(syntheticBoxes, resolved.bodyText, resolved.headings, resolved.unorderedLists, config?.locale)]
+        ? [...resolved.calloutStyles, ...resolveCalloutStylesConfig(syntheticBoxes, resolved.bodyText, resolved.headings, resolved.unorderedLists, config?.locale)
+                // The exercise boxes' defaults (a solutions title, a bank's frame)
+                // link to `main-color`: set them to the document's palette.
+                .map((s) => (exerciseBoxIds.has(s.id) ? relinkToPalette(s, config?.colorPalette) : s))]
         : resolved.calloutStyles;
     // A box nested in another looks its style up in the configuration it is
     // laid out with: the listings' box among them.
-    const calloutResolved = codeBoxes.wrapped || flowGroups.wrapped || composedWrap.wrapped || comicText.wrapped ? { ...resolved, calloutStyles } : resolved;
+    const calloutResolved = codeBoxes.wrapped || flowGroups.wrapped || composedWrap.wrapped || comicText.wrapped || exerciseExpansion?.wrapped ? { ...resolved, calloutStyles } : resolved;
     const blockquoteStyle = resolveBlockquoteStyle(resolved);
     const listLevelIndentsPx = computeLevelIndentsPx(resolved, bodyStyle.fontSizePx);
     const orderedMetrics = computeOrderedListRunMetrics(contentBlocks, resolved, bodyStyle.fontSizePx);
@@ -3336,6 +3379,17 @@ function placeDocumentPass(content, config, cache, options, hints) {
             && !(lvl.advancedDesign.enabled && lvl.advancedDesign.slot.elements.length > 0)
             && !headingIsHidden(raw, lvl);
     };
+    /** Whether a heading is measured across the content area: a `span:
+     *  'page'` level (or style) that prints, painted by the default opener or
+     *  by a design of its own, which lays out across the page as well. At the
+     *  column width a designed opener's title broke into more lines than the
+     *  design paints, and those lines set its band: taller than the same
+     *  heading without a design, so that it no longer fitted under the text
+     *  of a page the plain one opens on (#1224). */
+    const measuredAcrossPage = (raw) => {
+        const lvl = headingLevels.forBlock(raw);
+        return lvl?.span === 'page' && !headingIsHidden(raw, lvl);
+    };
     /** Page-spanning heading placed in `headingCol`, reserving `h` px from the
      *  top of the page: the same vertical band is reserved in every other
      *  column of the page, so body text under the opener band starts below it
@@ -3522,6 +3576,9 @@ function placeDocumentPass(content, config, cache, options, hints) {
     /** The band (`page:band`) a keep-with-next rollback last took each
      *  heading out of, by content index. */
     const headingLeftBand = new Map();
+    /** The band (`page:band`) each page-span heading opened under the text
+     *  of its page was set at the head of (#1238), by content index. */
+    const spanHeadingOpenedHere = new Map();
     /**
      * A `span: 'page'` heading with `spanBreak: false` (#539) opens where the
      * text reaches: the band the flow is in closes level under its text (a
@@ -3556,7 +3613,7 @@ function placeDocumentPass(content, config, cache, options, hints) {
         // opener paints it) or its design's band, with its margins.
         const width = page.contentArea.width;
         const measureCtx = partPlan.byBlock[blockIdx] ? partMeasureCtx : sectionMeasureCtx(sectionPlan.byBlock[blockIdx]);
-        const measured = measureContentBlock(rawBlock, blockIdx, opensDefaultOpener(rawBlock) ? width : cols[0].bbox.width, measureCtx);
+        const measured = measureContentBlock(rawBlock, blockIdx, measuredAcrossPage(rawBlock) ? width : cols[0].bbox.width, measureCtx);
         if (!measured)
             return false;
         const style = measured.kind.style;
@@ -3586,6 +3643,7 @@ function placeDocumentPass(content, config, cache, options, hints) {
             uncapBand(cols, uncappedBottoms);
         if (!closeBandAt(page, cols, cutY, top, cursor))
             return false;
+        spanHeadingOpenedHere.set(blockIdx, `${page.index}:${currentBand(page, cursor)}`);
         pendingSpacing = 0;
         return true;
     };
@@ -3976,6 +4034,21 @@ function placeDocumentPass(content, config, cache, options, hints) {
             n++;
         return n;
     };
+    /** Whether a block moving on whole may take the `run` headings closing
+     *  `col` along. A run that is all the column holds would open the next
+     *  column just as it opens this one, and is rolled back no further —
+     *  unless it opens a band a page-span heading cut under the text of the
+     *  page (`spanBreak: false`, #1238): rolled back, that heading opens the
+     *  next page instead (`headingLeftBand`), with the block it is kept with. */
+    const headingRunMayLeave = (col, run) => {
+        if (run <= 0)
+            return false;
+        if (run < col.blocks.length)
+            return true;
+        const head = col.blocks[0];
+        return head.contentIndex !== undefined
+            && spanHeadingOpenedHere.get(head.contentIndex) === `${cursor.pageIndex}:${col.band ?? 0}`;
+    };
     /**
      * An index group divided between two columns keeps at least
      * `index.groups.splitMinEntries` entries on each side (#712). `entry` is
@@ -5482,7 +5555,7 @@ function placeDocumentPass(content, config, cache, options, hints) {
                             break;
                     }
                     pendingSpacing = 0;
-                    if (part === 0 && resolved.headings.keepWithNext && run > 0 && run < curCol.blocks.length) {
+                    if (part === 0 && resolved.headings.keepWithNext && headingRunMayLeave(curCol, run)) {
                         const rolledBack = rollbackHeadings(curCol);
                         advanceToNextColumn(doc, cursor, geomResolved, contentArea, pageWidthPx, pageHeightPx, onNewPage);
                         return (rolledBack[0].contentIndex ?? startIdx - rolledBack.length) - 1;
@@ -5874,7 +5947,7 @@ function placeDocumentPass(content, config, cache, options, hints) {
         const spacingBefore = Math.max(pendingSpacing, floatGapPx);
         if (col.blocks.length > 0 && height > col.availableHeight - spacingBefore + FIT_EPS) {
             const run = trailingHeadingRun(col);
-            if (run > 0 && run < col.blocks.length) {
+            if (headingRunMayLeave(col, run)) {
                 const rolled = rollbackHeadings(col);
                 pendingSpacing = 0;
                 advanceToNextColumn(doc, cursor, geomResolved, contentArea, pageWidthPx, pageHeightPx, onAtomicNewPage(height));
@@ -7118,11 +7191,11 @@ function placeDocumentPass(content, config, cache, options, hints) {
             && knownOutcome === undefined
             && (looseGained.get(budget.group) ?? 0) >= budget.need;
         const tryLoose = looseLines !== undefined && !budgetMet && knownOutcome !== null;
-        // A page-span heading without a design of its own is painted by the
-        // default opener across the content area: measured at that width, its
-        // band holds the title as it is painted (EF-100). A designed opener
-        // keeps the column-width measure: its design sets the band.
-        const measureWidth = rawBlock.type === 'heading' && opensDefaultOpener(rawBlock)
+        // A page-span heading is painted across the content area, by the
+        // default opener or by its design: measured at that width, its band
+        // holds the title as it is painted (EF-100), and a design sets it no
+        // taller than the lines it paints (#1224).
+        const measureWidth = rawBlock.type === 'heading' && measuredAcrossPage(rawBlock)
             ? doc.pages[cursor.pageIndex].contentArea.width
             : col.bbox.width;
         // A resource on a vertical page stands upright, its frame at most as
@@ -7598,8 +7671,8 @@ function placeDocumentPass(content, config, cache, options, hints) {
          *  layout with text in both columns, a styled section with its own
          *  margins — is broken again there: its placed lines stay, the rest is
          *  broken for the new column. Not the loose paragraphs balancing runs
-         *  long (placed whole where they were measured), nor a heading the
-         *  default opener paints across the page. */
+         *  long (placed whole where they were measured), nor a page-span
+         *  heading, painted across the page. */
         let brokenForWidth = measureWidth;
         let laterWidths = [];
         /** Text wrap (#627): the lines of the block set short beside what text
@@ -7607,7 +7680,7 @@ function placeDocumentPass(content, config, cache, options, hints) {
         let wrapInsets = [];
         const wrapsBeside = canSplit && runsBesideWrap(rawBlock);
         const rebreaksForColumn = !tryLoose && rawBlock.toc === undefined && rawBlock.index === undefined
-            && (canSplit || (vdtType === 'heading' && !opensDefaultOpener(rawBlock)));
+            && (canSplit || (vdtType === 'heading' && !measuredAcrossPage(rawBlock)));
         /** Measure the block again for the columns it is set in (see
          *  `laterWidths`), with `extra` options. */
         const measureForColumns = (extra) => measureContentBlock(rawBlock, blockIdx, brokenForWidth, blockMeasureCtx, {
@@ -8157,7 +8230,7 @@ function placeDocumentPass(content, config, cache, options, hints) {
                     if (partIndex === 0 && curCol.blocks.length > 0) {
                         // Moving on whole must not strand a heading closing the column.
                         const headingRun = trailingHeadingRun(curCol);
-                        if (resolved.headings.keepWithNext && headingRun > 0 && headingRun < curCol.blocks.length) {
+                        if (resolved.headings.keepWithNext && headingRunMayLeave(curCol, headingRun)) {
                             const rolledBack = rollbackHeadings(curCol);
                             if (rolledBack.length > 0) {
                                 blockIdx = (rolledBack[0].contentIndex ?? blockIdx - rolledBack.length) - 1;
@@ -8728,7 +8801,7 @@ function placeDocumentPass(content, config, cache, options, hints) {
                 // Only a short column (under a float, a page-span box) lets the run
                 // move on to a taller one.
                 const headingRun = trailingHeadingRun(curCol);
-                const runFillsColumn = headingRun > 0 && headingRun === curCol.blocks.length;
+                const runFillsColumn = headingRun > 0 && !headingRunMayLeave(curCol, headingRun);
                 const strands = partIndex === 0 && vdtType !== 'heading'
                     && headingRun > 0 && !runFillsColumn;
                 const pullsRun = vdtType === 'heading' && (!runFillsColumn || shortColumn);
@@ -9076,6 +9149,9 @@ export function* buildDocumentGen(content, config, cache, options) {
         syncFontSet(fontSet);
     validateConfigCache(config);
     const doc = yield* buildDocumentRounds(content, config, cache, options);
+    // Boxes printed upside down (#1229): their blocks learn the point they
+    // turn about.
+    markTurnedBoxes(doc);
     // References and markup the source names wrongly: read from the source
     // once, located on the pages of the finished layout. Kept apart from
     // `doc.warnings`, whose entries keep their postext 1.4 shape.
@@ -9391,10 +9467,10 @@ function* buildDocumentRounds(content, config, cache, options) {
             if (!hasAnchorRefs(parsed, new Set((content.resources ?? []).map((r) => r.id))))
                 return false;
             const resolved = resolveAllConfig(config);
-            return printsAnchorPages(parsed, anchorTargetsOf(computeOutline(parsed, resolved, content.continuation?.headings, content.continuation?.statementCounters)), resolved.crossRefs.defaultStyle);
+            return printsAnchorPages(parsed, anchorTargetsOf(ownOutline(parsed, resolved, content.continuation)), resolved.crossRefs.defaultStyle);
         };
         if (hasTocDirective(parsed) || hasIndexDirective(parsed) || pageRefs()) {
-            let outline = computeOutline(parsed, resolveAllConfig(config), content.continuation?.headings, content.continuation?.statementCounters);
+            let outline = ownOutline(parsed, resolveAllConfig(config), content.continuation);
             let doc = withIndexMarks(yield* buildDocumentNumbered({ ...content, outline }, config, cache, options, 0, citing), content);
             for (let round = 0; round < MAX_TOC_ROUNDS; round++) {
                 const after = outlineFromDoc(doc, outline);
@@ -9408,6 +9484,12 @@ function* buildDocumentRounds(content, config, cache, options) {
     }
     return withIndexMarks(yield* buildDocumentNumbered(content, config, cache, options, 0, citing), content);
 }
+/** A document's own outline, its exercises' anchors named as a reference
+ *  prints them ("Exercise 3", #1225). */
+function ownOutline(parsed, resolved, continuation) {
+    const outline = computeOutline(parsed, resolved, continuation?.headings, continuation?.statementCounters);
+    return hasExercises(parsed) ? nameExerciseAnchors(outline, exerciseOutline(parsed, resolved, continuation).records) : outline;
+}
 /** The number each note's marker prints in `doc` (its first marker). */
 function printedFootnoteNumbers(doc) {
     const out = new Map();
@@ -9620,6 +9702,7 @@ citing = { hints: new Map(), refused: new Set() }) {
                 stable: score === 0,
                 failedLoose: old?.failedLoose ?? new Set(),
                 failedLines: old?.failedLines ?? new Set(),
+                failedTight: old?.failedTight ?? new Set(),
             };
         });
     };
@@ -9798,7 +9881,7 @@ citing = { hints: new Map(), refused: new Set() }) {
             let hit = false;
             for (const k of newLoose)
                 if (!cands || cands.has(k)) {
-                    s.failedLoose.add(k);
+                    failLoose(s, k);
                     hit = true;
                 }
             if (hit && looseFirst)
@@ -9817,6 +9900,13 @@ citing = { hints: new Map(), refused: new Set() }) {
             return true;
         return blacklist(null);
     };
+    /** The paragraphs the current proposal sets a line short (#1236): their
+     *  failures go to the segment's `failedTight`, the others' to
+     *  `failedLoose`. */
+    let tightKeys = new Set();
+    const failLoose = (s, k) => {
+        (tightKeys.has(k) ? s.failedTight : s.failedLoose).add(k);
+    };
     let balancingPasses = 0;
     function* balance() {
         while (balancingPasses < MAX_BALANCING_PASSES_PER_DOCUMENT) {
@@ -9827,11 +9917,14 @@ citing = { hints: new Map(), refused: new Set() }) {
             const owner = keyOwners(gaps);
             const failedLoose = new Set();
             const failedLines = new Set();
+            const failedTight = new Set();
             for (const s of segments) {
                 for (const k of s.failedLoose)
                     failedLoose.add(k);
                 for (const k of s.failedLines)
                     failedLines.add(k);
+                for (const k of s.failedTight)
+                    failedTight.add(k);
             }
             const proposal = proposeBalanceLines(best.doc, best.forcedBreakPages, applied, {
                 maxLinesPerHeading: balancing.maxLinesPerHeading,
@@ -9847,6 +9940,7 @@ citing = { hints: new Map(), refused: new Set() }) {
                 optimalLineBreaking: best.doc.config.bodyText.optimalLineBreaking,
                 failedLoose,
                 failedLines,
+                ...(balancing.fillShortColumns ? { fillShortColumns: true, failedTight } : {}),
                 closingBox: balancing.closingBox,
                 ...(onGrid && balancing.gridLines === 'off' ? { gridLines: false } : {}),
             });
@@ -9879,6 +9973,7 @@ citing = { hints: new Map(), refused: new Set() }) {
                 }
                 newLoose.push(k);
             }
+            tightKeys = new Set(newLoose.filter((k) => proposal.loose.get(k) < 0));
             const trying = new Set([...newLines, ...newLoose].map((k) => owner.get(k)));
             if (trying.size === 0) {
                 // No stretch point can absorb the remaining gaps — stable.
@@ -9926,7 +10021,7 @@ citing = { hints: new Map(), refused: new Set() }) {
                 // first) stay eligible for a later proposal.
                 const looseFailed = keysLoose.filter((k) => next.looseOutcome.get(k) === null);
                 for (const k of looseFailed)
-                    s.failedLoose.add(k);
+                    failLoose(s, k);
                 const looseWon = keysLoose.filter((k) => typeof next.looseOutcome.get(k) === 'number');
                 // A box closing its column that moves down onto the column's last
                 // grid slot (or level with the column beside it) closes less than a
@@ -9969,11 +10064,11 @@ citing = { hints: new Map(), refused: new Set() }) {
                             if (!boxKeys.has(k))
                                 s.failedLines.add(k);
                         for (const k of keysLoose)
-                            s.failedLoose.add(k);
+                            failLoose(s, k);
                     }
                     else if (looseFailed.length > 0 || looseWon.length > 0) {
                         for (const k of looseWon)
-                            s.failedLoose.add(k);
+                            failLoose(s, k);
                     }
                     else {
                         s.done = true;