postext 0.3.45 → 0.3.47

package/dist/pipeline/build.js

@@ -84,7 +84,14 @@ function measureLooseParagraph(rawBlock, blockIdx, columnWidth, ctx, styleOverri
  * @internal Exposed for tests only; use `buildDocument`.
  */
 export function buildDocumentPass(content, config, cache, options, hints = {}) {
-    const { balanceExtraPx, balanceLooseness, balanceLooseBudget, bandCaps } = hints;
+    const { balanceExtraPx, balanceLooseness, balanceLooseBudget, bandCaps, captionUnder } = hints;
+    const captionUnderProposals = new Set();
+    /** Side columns whose foot a figure's side caption has cut, by the figure. */
+    const asideCutBy = new WeakMap();
+    /** A side column that does not run the page's whole content height: a
+     *  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);
     // Tracking rungs a loose paragraph may climb: none, then 5‰ steps up to
     // the cap (`headings.balancing.maxTracking`, thousandths of an em), the
@@ -243,7 +250,7 @@ export function buildDocumentPass(content, config, cache, options, hints = {}) {
             pendingFloats.push(stamped);
         }
     };
-    /** Floated boxes (`placement: 'top' | 'bottom'`, `span` column / page):
+    /** Floated boxes (`placement: 'auto' | 'top' | 'bottom'`, `span` column / page):
      *  a `:::callout` that leaves the flow like a resource and takes the
      *  first free band after the point it occurs at — the foot of the
      *  current page, or the head / foot of a page the flow opens later —
@@ -604,7 +611,7 @@ export function buildDocumentPass(content, config, cache, options, hints = {}) {
         // The caption beside the figure, in the band's side column.
         let aside;
         let sideCol;
-        if (f.captionSide && !pageSpan && !side && !rotated) {
+        if (f.captionSide && !pageSpan && !side && !rotated && !captionUnder?.has(f.resourceId)) {
             const sc = sideColumnOf(page, first.band ?? 0);
             if (sc && sc.bbox.width > 0.5) {
                 sideCol = sc;
@@ -639,6 +646,19 @@ export function buildDocumentPass(content, config, cache, options, hints = {}) {
                 }
             }
         }
+        // A bottom float's caption cuts the side column's foot; when the side
+        // stack already reaches into that band (a box set beside the text
+        // above), the caption goes under the figure instead of behind the box.
+        if (aside && sideCol && position === 'bottom' && measure.asideHeight !== undefined) {
+            const captionTop = y + measure.height - measure.asideHeight - floatGapPx;
+            if (sideUsedBottom(sideCol) > captionTop + 0.5) {
+                const plain = measureFloat(f.resourceId, width, slice, rotated);
+                if (plain) {
+                    ({ need, y } = measureFloatBand(position, plain, targetCols, page.contentArea, baselineGrid, floatGapPx, bottomOf));
+                    return { need, y, measure: plain, slice, width, xLeft, rotated };
+                }
+            }
+        }
         return { need, y, measure, slice, width, xLeft, rotated, ...(aside ? { aside, sideCol } : {}) };
     };
     /** Free height `col` keeps for the flow once a float band `probe` is
@@ -704,6 +724,16 @@ export function buildDocumentPass(content, config, cache, options, hints = {}) {
             if (need > first.availableHeight + 0.01) {
                 if (mode === 'strict' || sideUsedBottom(first) > first.bbox.y + 0.5)
                     return 'defer';
+                // An empty column shortened by a band above it (a page-span box,
+                // a top float) is no measure of the float: when a full column
+                // would hold it, it waits for one instead of overflowing this one.
+                if (shortSideColumn(page, first) && measure.height <= page.contentArea.height + 0.01)
+                    return 'defer';
+                // Overflowing a column a side caption has shortened: the next pass
+                // sets that caption under its figure and gives the column back.
+                const cutBy = asideCutBy.get(first);
+                if (cutBy !== undefined)
+                    captionUnderProposals.add(cutBy);
             }
             const built = buildFloatBlock(f.resourceId, xLeft, width, slice);
             if (!built)
@@ -824,6 +854,8 @@ export function buildDocumentPass(content, config, cache, options, hints = {}) {
                 const cut = Math.max(0, sideCol.bbox.y + sideCol.bbox.height - (y + built.height - measure.asideHeight - floatGapPx));
                 sideCol.bbox.height = Math.max(0, sideCol.bbox.height - cut);
                 sideCol.availableHeight = Math.max(0, sideCol.availableHeight - cut);
+                if (cut > 0.5)
+                    asideCutBy.set(sideCol, f.resourceId);
             }
         }
         for (const col of targetCols) {
@@ -2197,6 +2229,15 @@ export function buildDocumentPass(content, config, cache, options, hints = {}) {
         if (!fits()) {
             if (mode === 'strict' || used > side.bbox.y + 0.5)
                 return false;
+            // A box that a full side column would hold waits for one rather than
+            // overflowing an empty column a band above has shortened.
+            if (shortSideColumn(page, side) && result.totalHeight <= page.contentArea.height + 0.01)
+                return false;
+            // Same as a side float: a box that overflows a caption-shortened
+            // column asks for that caption to go under its figure.
+            const cutBy = asideCutBy.get(side);
+            if (cutBy !== undefined)
+                captionUnderProposals.add(cutBy);
         }
         const frame = result.frame;
         stampCalloutSource(frame, startIdx, plan);
@@ -2277,7 +2318,7 @@ export function buildDocumentPass(content, config, cache, options, hints = {}) {
         // this point (the foot of the current page, or the head / foot of a
         // page the flow opens later) and the text after them fills the page.
         // A side box always stacks beside the text it interrupts.
-        if ((placement === 'top' || placement === 'bottom') && span !== 'side') {
+        if ((placement === 'auto' || placement === 'top' || placement === 'bottom') && span !== 'side') {
             enqueueCalloutFloat(startIdx, plan, style, L, placement, span);
             return undefined;
         }
@@ -3284,7 +3325,7 @@ export function buildDocumentPass(content, config, cache, options, hints = {}) {
     buildHeadersAndFooters(doc, resourceById);
     doc.converged = true;
     doc.iterationCount = 1;
-    return { doc, forcedBreakPages, bandCapProposals, spanPlacedInBand, bandCapsApplied, looseOutcome };
+    return { doc, forcedBreakPages, bandCapProposals, spanPlacedInBand, bandCapsApplied, looseOutcome, captionUnderProposals };
 }
 /** Passes a document printing its own contents gets at most, beyond the
  *  first, for the page labels it prints to settle. */
@@ -3363,16 +3404,31 @@ function* buildDocumentBalanced(content, config, cache, options, tocRound = 0) {
     const passOptions = onProgress
         ? { ...options, onProgress: (p) => onProgress({ ...p, pass: passIndex }) }
         : options;
+    // Side captions moved under their figure (see `PassHints.captionUnder`):
+    // once a pass asks for one, every later pass keeps it.
+    const captionUnder = new Set();
     const runPass = (hints) => {
         passIndex++;
         const started = onPass ? now() : 0;
-        const result = buildDocumentPass(content, config, cache, passOptions, hints);
+        const result = buildDocumentPass(content, config, cache, passOptions, { ...hints, captionUnder });
+        for (const id of result.captionUnderProposals)
+            captionUnder.add(id);
         onPass?.({ pass: passIndex, tocRound, ms: now() - started, pages: result.doc.pages.length });
         return result;
     };
     // The first pass is a pass too: let a cancel land before the caps run.
-    const initial = runPass();
+    let initial = runPass();
     yield;
+    // A side box or side float spilled over a figure's side caption: place
+    // again with that caption under the figure (a moved caption can free or
+    // crowd another side column, hence the short loop).
+    for (let round = 0; round < 3 && initial.captionUnderProposals.size > 0; round++) {
+        const before = captionUnder.size;
+        initial = runPass();
+        yield;
+        if (captionUnder.size === before)
+            break;
+    }
     // --- Band caps (page-span blocks mid-page) -----------------------------
     // A span block that arrived in an uneven band proposes a cap; the driver
     // re-places the document with it (and grows / drops caps whose band
@@ -3529,6 +3585,7 @@ function* buildDocumentBalanced(content, config, cache, options, tocRound = 0) {
             spanPlacedInBand: mergeSet(best.spanPlacedInBand, next.spanPlacedInBand),
             bandCapsApplied: mergeSet(best.bandCapsApplied, next.bandCapsApplied),
             looseOutcome: mergeMap(best.looseOutcome, next.looseOutcome),
+            captionUnderProposals: new Set([...best.captionUnderProposals, ...next.captionUnderProposals]),
         };
     };
     /**