postext 1.22.3 → 1.24.0

package/dist/measure/hardBreaks.js

@@ -0,0 +1,228 @@
+/**
+ * Forced line breaks inside a paragraph (#620): the parser writes a
+ * backslash ending a source line, or `\\`, as `BREAK_PLACEHOLDER` (U+2028,
+ * LINE SEPARATOR). The text between two breaks is broken on its own, by
+ * whichever breaker sets the paragraph (Knuth–Plass or line by line, the
+ * word-by-word breaker or the CJK composer): a forced break splits a
+ * Knuth–Plass paragraph into independent problems (the break is an infinite
+ * penalty after glue that fills the line), so breaking each piece alone
+ * finds the same lines. The pieces are then stacked as one paragraph:
+ *
+ * - every option that counts lines counts them through the whole paragraph:
+ *   a piece that starts on line `n` gets the indents, the measures
+ *   (`restWidths`), the lines that should not end on a hyphen
+ *   (`avoidHyphenAtLines`) and the kept breaks (`keepBreaks`) of lines
+ *   `n`, `n + 1`…;
+ * - the line before a break is set at its natural width, as a paragraph's
+ *   last line is (`isLastLine`), and flagged `hardBreak`;
+ * - the runt penalty and `lastLineRunt` are the last piece's, the
+ *   paragraph's end; `looseness` is taken by the last piece that can take
+ *   it, then the one before;
+ * - the break trace (`MeasuredBlock.breaks`) numbers the item positions of
+ *   piece `k` from `k × PIECE_STRIDE`, so a trace cut to its first lines
+ *   still tells each piece its own.
+ *
+ * Two breaks in a row are one (the parser merges them); a piece with no
+ * text sets no line.
+ */
+import { sliceSpan } from '../parse/links';
+import { lineIndentAt, lineMeasure } from './types';
+/** The forced line break in a paragraph's text (`BREAK_PLACEHOLDER`). */
+export const FORCED_BREAK = '
';
+/** Where the item positions of each piece start in a combined break trace. */
+export const PIECE_STRIDE = 1 << 24;
+/** The spans cut at the forced breaks, the breaks dropped. A span set
+ *  whole (a reference, a formula) holds none. */
+export function splitAtForcedBreaks(spans) {
+    const pieces = [[]];
+    for (const span of spans) {
+        if (!span.text.includes(FORCED_BREAK)) {
+            pieces[pieces.length - 1].push(span);
+            continue;
+        }
+        let from = 0;
+        for (let i = 0; i <= span.text.length; i++) {
+            if (i < span.text.length && span.text[i] !== FORCED_BREAK)
+                continue;
+            if (i > from)
+                pieces[pieces.length - 1].push(sliceSpan(span, from, i));
+            if (i < span.text.length)
+                pieces.push([]);
+            from = i + 1;
+        }
+    }
+    return pieces;
+}
+/** The indents of lines `n`, `n + 1`… as a table (see `lineIndentsPx`),
+ *  or none when they are all 0. */
+function indentsFrom(options, n) {
+    const until = Math.max(n, (options?.lineIndentsPx?.length ?? 2) - 1);
+    const table = [];
+    for (let li = n; li <= until; li++)
+        table.push(lineIndentAt(options, li));
+    return table.some((v) => v > 0) ? table : undefined;
+}
+/** The options of the piece that starts on line `n` of the paragraph
+ *  (see the module comment). */
+export function pieceOptions(options, maxWidthPx, piece, n, last, looseness) {
+    const { firstLineIndentPx: _first, hangingIndent: _hanging, lineIndentsPx: _table, labelColumnPx, restWidths, lineInsets, avoidHyphenAtLines, keepBreaks, looseness: _loose, runtPenalty, ...rest } = options ?? {};
+    void _first;
+    void _hanging;
+    void _table;
+    void _loose;
+    const out = { ...rest };
+    if (n === 0) {
+        if (options?.firstLineIndentPx !== undefined)
+            out.firstLineIndentPx = options.firstLineIndentPx;
+        if (options?.hangingIndent !== undefined)
+            out.hangingIndent = options.hangingIndent;
+        if (options?.lineIndentsPx !== undefined)
+            out.lineIndentsPx = options.lineIndentsPx;
+    }
+    else {
+        const table = indentsFrom(options, n);
+        if (table)
+            out.lineIndentsPx = table;
+    }
+    // A bibliography entry's label column: its first line's.
+    if (labelColumnPx !== undefined && piece === 0)
+        out.labelColumnPx = labelColumnPx;
+    if (restWidths && restWidths.length > 0) {
+        const steps = [];
+        const at = lineMeasure(maxWidthPx, restWidths, n);
+        if (restWidths.some((s) => s.fromLine <= n))
+            steps.push({ fromLine: 0, maxWidthPx: at });
+        for (const s of restWidths)
+            if (s.fromLine > n)
+                steps.push({ fromLine: s.fromLine - n, maxWidthPx: s.maxWidthPx });
+        if (steps.length > 0)
+            out.restWidths = steps;
+    }
+    // The lines set short beside a wrapped picture (#627), counted from the
+    // piece's first line.
+    if (lineInsets && lineInsets.length > 0) {
+        const steps = [];
+        for (const s of lineInsets) {
+            if (s.toLine !== undefined && s.toLine < n)
+                continue;
+            steps.push({ ...s, fromLine: Math.max(0, s.fromLine - n), ...(s.toLine !== undefined ? { toLine: s.toLine - n } : {}) });
+        }
+        if (steps.length > 0)
+            out.lineInsets = steps;
+    }
+    if (avoidHyphenAtLines) {
+        const lines = avoidHyphenAtLines.filter((l) => l > n).map((l) => l - n);
+        if (lines.length > 0)
+            out.avoidHyphenAtLines = lines;
+    }
+    if (keepBreaks) {
+        const at = keepBreaks.at.filter((a) => a >= piece * PIECE_STRIDE && a < (piece + 1) * PIECE_STRIDE).map((a) => a - piece * PIECE_STRIDE);
+        if (at.length > 0)
+            out.keepBreaks = { path: keepBreaks.path, at };
+    }
+    // A short last line before a forced break is the author's: the runt
+    // penalty weighs the paragraph's own end only.
+    if (runtPenalty !== undefined)
+        out.runtPenalty = last ? runtPenalty : 0;
+    if (looseness !== 0)
+        out.looseness = looseness;
+    return out;
+}
+/** Lines `lines` moved down by `dy`. */
+function shifted(lines, dy) {
+    if (dy === 0)
+        return [...lines];
+    return lines.map((line) => ({ ...line, bbox: { ...line.bbox, y: line.bbox.y + dy }, baseline: line.baseline + dy }));
+}
+/**
+ * Measure a paragraph whose spans hold forced line breaks (see the module
+ * comment): `measurePiece` breaks the text of one piece with the options
+ * given, as the paragraph's own breaker would.
+ */
+export function measureForcedBreaks(spans, maxWidthPx, lineHeightPx, options, measurePiece) {
+    const pieces = splitAtForcedBreaks(spans);
+    const lastPiece = pieces.length - 1;
+    // A placeholder (a formula, a reference, a note marker) is no
+    // whitespace: only a piece of spaces sets nothing.
+    const blank = (piece) => piece.every((s) => s.text.trim() === '');
+    const measureAll = (loose) => {
+        const results = [];
+        const starts = [];
+        let n = 0;
+        pieces.forEach((piece, k) => {
+            starts.push(n);
+            if (blank(piece)) {
+                results.push(null);
+                return;
+            }
+            const r = measurePiece(piece, pieceOptions(options, maxWidthPx, k, n, k === lastPiece, loose[k] ?? 0));
+            results.push(r);
+            n += r.lines.length;
+        });
+        return { results, starts };
+    };
+    let { results, starts } = measureAll([]);
+    // Looseness: the last piece that can set itself that many lines longer
+    // (or shorter) does, then the one before for what is left.
+    const wanted = options?.looseness ?? 0;
+    if (wanted !== 0) {
+        const loose = pieces.map(() => 0);
+        let remaining = wanted;
+        for (let k = lastPiece; k >= 0 && remaining !== 0; k--) {
+            const base = results[k];
+            if (!base)
+                continue;
+            const trial = measurePiece(pieces[k], pieceOptions(options, maxWidthPx, k, starts[k], k === lastPiece, remaining));
+            const delta = trial.lines.length - base.lines.length;
+            if (delta === 0 || Math.sign(delta) !== Math.sign(remaining))
+                continue;
+            loose[k] = remaining;
+            remaining -= delta;
+        }
+        if (loose.some((v) => v !== 0))
+            ({ results, starts } = measureAll(loose));
+    }
+    const lines = [];
+    let totalHeight = 0;
+    const traces = [];
+    let tracePath;
+    let traced = true;
+    let lastMeasured;
+    results.forEach((r, k) => {
+        if (!r || r.lines.length === 0)
+            return;
+        const placed = shifted(r.lines, lines.length * lineHeightPx);
+        if (k < lastPiece) {
+            const end = placed[placed.length - 1];
+            const { justifiedSpaceRatio: _ratio, ...ragged } = end;
+            void _ratio;
+            placed[placed.length - 1] = { ...ragged, isLastLine: true, hardBreak: true };
+        }
+        lines.push(...placed);
+        totalHeight += r.totalHeight;
+        if (r.breaks && (tracePath === undefined || tracePath === r.breaks.path)) {
+            tracePath = r.breaks.path;
+            for (const a of r.breaks.at)
+                traces.push(a + k * PIECE_STRIDE);
+        }
+        else {
+            traced = false;
+        }
+        lastMeasured = r;
+    });
+    // The paragraph ends on its last line: a trailing break (none: the
+    // parser keeps one at the end of a block as text) leaves no flag behind.
+    const tail = lines[lines.length - 1];
+    if (tail?.hardBreak) {
+        const { hardBreak: _flag, ...end } = tail;
+        void _flag;
+        lines[lines.length - 1] = end;
+    }
+    return {
+        lines,
+        totalHeight,
+        ...(traced && tracePath !== undefined ? { breaks: { path: tracePath, at: traces } } : {}),
+        ...(lastMeasured?.lastLineRunt && results[lastPiece] === lastMeasured ? { lastLineRunt: true } : {}),
+    };
+}
+//# sourceMappingURL=hardBreaks.js.map

package/dist/measure/hardBreaks.js.map

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

package/dist/measure/index.d.ts

@@ -1,6 +1,7 @@
 import type { InlineSpan } from '../parse';
 import type { MeasuredBlock, MeasurementCache, MeasureBlockOptions } from './types';
-export type { BreakTrace, LineWidthStep, MeasuredBlock, MeasurementCache, MeasureBlockOptions } from './types';
+export type { BreakTrace, LineInsetStep, LineWidthStep, MeasuredBlock, MeasurementCache, MeasureBlockOptions } from './types';
+export { lineIndentAt, maxLineIndent } from './types';
 export { buildFontString, initHyphenator, clearMeasurementCache, createMeasurementCache } from './font';
 export { measureGlyphWidth, measureTextWidth } from './canvas';
 export { measureBlock } from './plain';
@@ -10,8 +11,8 @@ export { setCjkComposition, getCjkComposition, cjkCompositionOf, cjkCompositionK
 export type { CjkComposition, PunctuationSide } from './cjkPunctuation';
 /** {@link measureBlock} through `cache`: the same text, font, width,
  *  leading and options measured before come back from it (a copy). A
- *  measurement with `options.keepBreaks` or `options.restWidths` is never
- *  cached, since its lines follow the breaks it keeps or the measures it
+ *  measurement with `options.keepBreaks`, `options.restWidths` or
+ *  `options.lineInsets` is never cached, since its lines follow the breaks it keeps or the measures it
  *  was given: it is measured afresh and leaves the cache as it was. One
  *  with `breakAfterDashes`, `optimalRagged`, `breakAfterHyphens`,
  *  `hyphenateCompounds: false` or `repeatHyphen` is kept apart from the

package/dist/measure/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/measure/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAMpF,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC/G,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzK,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAwCxE;;;;;;;+CAO+C;AAC/C,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,mBAAmB,GAAG,SAAS,EACxC,KAAK,EAAE,gBAAgB,GACtB,aAAa,CAIf;AAED;;4CAE4C;AAC5C,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,UAAU,EAAE,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,mBAAmB,GAAG,SAAS,EACxC,KAAK,EAAE,gBAAgB,GACtB,aAAa,CAIf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/measure/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAMpF,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9H,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzK,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAwCxE;;;;;;;+CAO+C;AAC/C,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,mBAAmB,GAAG,SAAS,EACxC,KAAK,EAAE,gBAAgB,GACtB,aAAa,CAIf;AAED;;4CAE4C;AAC5C,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,UAAU,EAAE,EACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,mBAAmB,GAAG,SAAS,EACxC,KAAK,EAAE,gBAAgB,GACtB,aAAa,CAIf"}

package/dist/measure/index.js

@@ -2,6 +2,7 @@ import { measureBlock } from './plain';
 import { measureRichBlock } from './rich';
 import { cachedMeasureBlock as cachedPlainBlock, cachedMeasureRichBlock as cachedRichBlock } from './cache';
 import { hasCompound } from './breakRules';
+export { lineIndentAt, maxLineIndent } from './types';
 export { buildFontString, initHyphenator, clearMeasurementCache, createMeasurementCache } from './font';
 export { measureGlyphWidth, measureTextWidth } from './canvas';
 export { measureBlock } from './plain';
@@ -46,14 +47,14 @@ function cacheFor(cache, options, text) {
 }
 /** {@link measureBlock} through `cache`: the same text, font, width,
  *  leading and options measured before come back from it (a copy). A
- *  measurement with `options.keepBreaks` or `options.restWidths` is never
- *  cached, since its lines follow the breaks it keeps or the measures it
+ *  measurement with `options.keepBreaks`, `options.restWidths` or
+ *  `options.lineInsets` is never cached, since its lines follow the breaks it keeps or the measures it
  *  was given: it is measured afresh and leaves the cache as it was. One
  *  with `breakAfterDashes`, `optimalRagged`, `breakAfterHyphens`,
  *  `hyphenateCompounds: false` or `repeatHyphen` is kept apart from the
  *  others, one set per combination of them. */
 export function cachedMeasureBlock(text, font, maxWidthPx, lineHeightPx, options, cache) {
-    return options?.keepBreaks || options?.restWidths
+    return options?.keepBreaks || options?.restWidths || options?.lineInsets
         ? measureBlock(text, font, maxWidthPx, lineHeightPx, options)
         : cachedPlainBlock(text, font, maxWidthPx, lineHeightPx, options, cacheFor(cache, options, text));
 }
@@ -61,7 +62,7 @@ export function cachedMeasureBlock(text, font, maxWidthPx, lineHeightPx, options
  *  does it: a measurement with `options.keepBreaks` or
  *  `options.restWidths` is never cached. */
 export function cachedMeasureRichBlock(spans, normalFont, boldFont, italicFont, boldItalicFont, maxWidthPx, lineHeightPx, options, cache) {
-    return options?.keepBreaks || options?.restWidths
+    return options?.keepBreaks || options?.restWidths || options?.lineInsets
         ? measureRichBlock(spans, normalFont, boldFont, italicFont, boldItalicFont, maxWidthPx, lineHeightPx, options)
         : cachedRichBlock(spans, normalFont, boldFont, italicFont, boldItalicFont, maxWidthPx, lineHeightPx, options, cacheFor(cache, options, spans.map((s) => s.text).join('')));
 }

package/dist/measure/index.js.map

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

package/dist/measure/leader.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Leaders: a character (or a short text) repeated over a room, flush with
+ * the room's end so the leaders of several lines line up. The contents'
+ * rows (`pipeline/toc.ts`) and the tab stops of body text (#622,
+ * `measure/tabs.ts`) both fit theirs here.
+ */
+/**
+ * The leader run for `room` px: `char` repeated as often as one repeat's
+ * width allows, or fewer times when the run, measured as a whole, is wider
+ * than the room. A face may kern the character against itself: Public Sans
+ * 700 sets one full stop 6.74 px wide at 25 px and a run of thirty at 7.58
+ * px a dot, and a leader counted from one dot then ran over the gap into
+ * the page number (EF-148). `widthOf` measures a run as it is painted (the
+ * leader's face, its tracking). Null when not one fits.
+ */
+export declare function fitLeader(char: string, room: number, widthOf: (text: string) => number): {
+    text: string;
+    width: number;
+} | null;
+//# sourceMappingURL=leader.d.ts.map

package/dist/measure/leader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"leader.d.ts","sourceRoot":"","sources":["../../src/measure/leader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAyB/H"}

package/dist/measure/leader.js

@@ -0,0 +1,46 @@
+/**
+ * Leaders: a character (or a short text) repeated over a room, flush with
+ * the room's end so the leaders of several lines line up. The contents'
+ * rows (`pipeline/toc.ts`) and the tab stops of body text (#622,
+ * `measure/tabs.ts`) both fit theirs here.
+ */
+/**
+ * The leader run for `room` px: `char` repeated as often as one repeat's
+ * width allows, or fewer times when the run, measured as a whole, is wider
+ * than the room. A face may kern the character against itself: Public Sans
+ * 700 sets one full stop 6.74 px wide at 25 px and a run of thirty at 7.58
+ * px a dot, and a leader counted from one dot then ran over the gap into
+ * the page number (EF-148). `widthOf` measures a run as it is painted (the
+ * leader's face, its tracking). Null when not one fits.
+ */
+export function fitLeader(char, room, widthOf) {
+    if (char.length === 0 || !(room > 0))
+        return null;
+    const unit = widthOf(char);
+    const most = unit > 0 ? Math.floor(room / unit) : 0;
+    if (most <= 0)
+        return null;
+    // Rounding in the width sums is not an overrun.
+    const fits = (width) => width <= room + 0.01;
+    const runOf = (n) => widthOf(char.repeat(n));
+    let width = runOf(most);
+    if (fits(width))
+        return { text: char.repeat(most), width };
+    // The longest shorter run that fits (a run widens with every character).
+    let lo = 0;
+    let hi = most - 1;
+    let loWidth = 0;
+    while (lo < hi) {
+        const mid = Math.ceil((lo + hi) / 2);
+        width = runOf(mid);
+        if (fits(width)) {
+            lo = mid;
+            loWidth = width;
+        }
+        else {
+            hi = mid - 1;
+        }
+    }
+    return lo > 0 ? { text: char.repeat(lo), width: loWidth } : null;
+}
+//# sourceMappingURL=leader.js.map

package/dist/measure/leader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"leader.js","sourceRoot":"","sources":["../../src/measure/leader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;GAQG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,IAAY,EAAE,OAAiC;IACrF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAClD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,IAAI,IAAI,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3B,gDAAgD;IAChD,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,GAAG,IAAI,CAAC;IACrD,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,IAAI,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,IAAI,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;IAC3D,yEAAyE;IACzE,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,IAAI,EAAE,GAAG,IAAI,GAAG,CAAC,CAAC;IAClB,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAChB,EAAE,GAAG,GAAG,CAAC;YACT,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACnE,CAAC"}

package/dist/measure/links.js

@@ -102,7 +102,7 @@ export function linkSegments(lines, spans) {
         let lineChanged = false;
         const segments = [];
         for (const seg of line.segments) {
-            if (seg.inserted) {
+            if (seg.inserted || seg.leader) {
                 segments.push(seg);
                 continue;
             }

package/dist/measure/links.js.map

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

package/dist/measure/plain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plain.d.ts","sourceRoot":"","sources":["../../src/measure/plain.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAS1C,OAAO,EAAmC,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAC;AA4JxG;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,EAAE,WAAW,UAAQ,GAAG,OAAO,CAMxH;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,cAAc,EAAE,EAC1B,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,SAAS,CAWpB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,aAAa,CAkOf"}
+{"version":3,"file":"plain.d.ts","sourceRoot":"","sources":["../../src/measure/plain.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAS1C,OAAO,EAAgH,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAC;AA4JrL;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,EAAE,WAAW,UAAQ,GAAG,OAAO,CAMxH;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,cAAc,EAAE,EAC1B,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,SAAS,CAWpB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,aAAa,CA8Nf"}

package/dist/measure/plain.js

@@ -1,10 +1,11 @@
+import { FORCED_BREAK } from './hardBreaks';
 import { prepareWithSegments, layoutNextLine, } from '@chenglou/pretext';
 import { createBoundingBox } from '../vdt';
 import { hyphenateText, hyphenateTextKeepingCompounds } from '../hyphenate';
 import { pretextSegmentsToItems, computeBreakpoints, reconstructPretextLines, } from '../knuthPlass';
 import { SOFT_HYPHEN } from './types';
 import { GEMINATE_DOT, endsInsideGeminate, withLineEndHyphen } from './geminate';
-import { lineMeasure, uniformMeasureFrom } from './types';
+import { lineStartAt, lineWidthAt, lineWidthFunction, markInsetLines, maxLineIndent, maxLineInset, uniformMeasureFrom } from './types';
 import { cleanSoftHyphens, measureTextWidth, normalSpaceWidthFor } from './canvas';
 import { isRuntLastLine } from './runts';
 import { measureRichBlock } from './rich';
@@ -200,6 +201,11 @@ export function measureBlock(text, font, maxWidthPx, lineHeightPx, options) {
         const opts = options;
         return withMeasureWritingMode(opts.writingMode, () => measureBlock(text, font, maxWidthPx, lineHeightPx, opts));
     }
+    // A forced line break (#620): the word-by-word breaker breaks the text
+    // between two of them on its own (`measure/hardBreaks.ts`).
+    if (text.includes(FORCED_BREAK)) {
+        return measureRichBlock([{ text, bold: false, italic: false }], font, font, font, font, maxWidthPx, lineHeightPx, options);
+    }
     // Words set without spaces (Chinese, Japanese, Korean): the formatted
     // path's breaker, which composes a CJK paragraph (clreq line breaking,
     // inter-character justification) and breaks a Latin one that quotes CJK
@@ -224,8 +230,9 @@ export function measureBlock(text, font, maxWidthPx, lineHeightPx, options) {
         return measureRichBlock([{ text, bold: false, italic: false }], font, font, font, font, maxWidthPx, lineHeightPx, options);
     }
     const shouldHyphenate = options?.hyphenate ?? false;
-    const indentPx = options?.firstLineIndentPx ?? 0;
-    const hanging = options?.hangingIndent ?? false;
+    // Each line's start: its indent past its inset beside a picture (#627).
+    const indentOf = (li) => lineStartAt(options, li);
+    const widestIndent = maxLineIndent(options) + maxLineInset(options?.lineInsets);
     const textAlign = options?.textAlign ?? 'left';
     // A hyphenation zone (ragged text) needs the word-level breakers, which
     // weigh each dictionary syllable against the gap it would leave and tell
@@ -239,13 +246,13 @@ export function measureBlock(text, font, maxWidthPx, lineHeightPx, options) {
     // word-by-word breaker glues all four (EF-66).
     // A glued group wider than the narrowest line likewise (EF-66): pretext
     // would cut it between characters.
-    if (text.includes(FIGURE_SPACE) || hasOverwideGluedGroup(text, font, Math.min(maxWidthPx, ...(options?.restWidths ?? []).map((s) => s.maxWidthPx)) - Math.max(0, indentPx))) {
+    if (text.includes(FIGURE_SPACE) || hasOverwideGluedGroup(text, font, Math.min(maxWidthPx, ...(options?.restWidths ?? []).map((s) => s.maxWidthPx)) - widestIndent)) {
         return measureRichBlock([{ text, bold: false, italic: false }], font, font, font, font, maxWidthPx, lineHeightPx, options);
     }
     // Words of a joining script stay whole: pretext would break one at a soft
     // hyphen its author typed, and cut one wider than the line between two
     // letters. The word-by-word breaker does neither.
-    if (joiningScriptIn(text) && (text.includes(SOFT_HYPHEN) || hasOverwideJoiningWord(text, font, Math.min(maxWidthPx, ...(options?.restWidths ?? []).map((s) => s.maxWidthPx)) - Math.max(0, indentPx)))) {
+    if (joiningScriptIn(text) && (text.includes(SOFT_HYPHEN) || hasOverwideJoiningWord(text, font, Math.min(maxWidthPx, ...(options?.restWidths ?? []).map((s) => s.maxWidthPx)) - widestIndent))) {
         return measureRichBlock([{ text, bold: false, italic: false }], font, font, font, font, maxWidthPx, lineHeightPx, options);
     }
     // A hyphen repeated at the start of the line after a compound's break
@@ -258,7 +265,7 @@ export function measureBlock(text, font, maxWidthPx, lineHeightPx, options) {
     // break, so Knuth–Plass must have it. A part of one wider than the line
     // is divided at its syllables by the word-by-word breaker.
     const keepCompounds = shouldHyphenate && options?.hyphenateCompounds === false;
-    if (keepCompounds && hasOverwideCompoundPart(text, font, maxWidthPx - Math.max(0, indentPx))) {
+    if (keepCompounds && hasOverwideCompoundPart(text, font, maxWidthPx - widestIndent)) {
         return measureRichBlock([{ text, bold: false, italic: false }], font, font, font, font, maxWidthPx, lineHeightPx, options);
     }
     const processedText = shouldHyphenate
@@ -285,19 +292,8 @@ export function measureBlock(text, font, maxWidthPx, lineHeightPx, options) {
         const hardHyphens = ragged || options.breakAfterHyphens === true || keepCompounds;
         const dotWidth = geminateDotWidth(text, font);
         const items = pretextSegmentsToItems(prepared, spaceWidth, maxStretchRatio, minShrinkRatio, options.breakAfterDashes === true, hardHyphens, ragged || keepCompounds ? 1 : 2, dotWidth);
-        const lineWidthFn = (li) => {
-            const isFirst = li === 0;
-            const indent = indentPx > 0
-                ? (hanging ? (isFirst ? 0 : indentPx) : (isFirst ? indentPx : 0))
-                : 0;
-            return lineMeasure(maxWidthPx, options.restWidths, li) - indent;
-        };
-        const lineIndentFn = (li) => {
-            const isFirst = li === 0;
-            return indentPx > 0
-                ? (hanging ? (isFirst ? 0 : indentPx) : (isFirst ? indentPx : 0))
-                : 0;
-        };
+        const lineWidthFn = lineWidthFunction(maxWidthPx, options);
+        const lineIndentFn = indentOf;
         const runtPenalty = options.runtPenalty ?? 0;
         const runtMinWidth = runtPenalty > 0
             ? (options.runtMinCharacters ?? 0) * spaceWidth
@@ -314,13 +310,14 @@ export function measureBlock(text, font, maxWidthPx, lineHeightPx, options) {
             ...(options.avoidHyphenAtLines ? { avoidHyphenAtLines: options.avoidHyphenAtLines } : {}),
             ...(options.keepBreaks?.path === 'plain' ? { fixedBreaks: options.keepBreaks.at } : {}),
             looseness: options.looseness ?? 0,
-            lineWidthUniformFrom: uniformMeasureFrom(options.restWidths),
+            lineWidthUniformFrom: uniformMeasureFrom(options.restWidths, options.lineIndentsPx, options.lineInsets),
             trackingPerChar,
             ...(ragged ? { raggedStretch: raggedStretchPx(font) } : {}),
         });
         if (breaks.length > 0) {
             const kpLines = reconstructPretextLines(items, breaks, prepared, lineHeightPx, lineWidthFn, lineIndentFn, normalSpaceWidth, textAlign, trackingPerChar, lineBaselineOffset(lineHeightPx, font), dotWidth);
             if (!hasOverfullLine(kpLines, lineWidthFn, ragged)) {
+                markInsetLines(kpLines, maxWidthPx, options);
                 return {
                     lines: kpLines,
                     totalHeight: kpLines.length * lineHeightPx,
@@ -338,12 +335,11 @@ export function measureBlock(text, font, maxWidthPx, lineHeightPx, options) {
     let y = 0;
     let lineIndex = 0;
     while (true) {
-        // First line indent: indent line 0 only. Hanging indent: indent all lines except 0.
-        const isFirstLine = lineIndex === 0;
-        const lineIndent = indentPx > 0
-            ? (hanging ? (isFirstLine ? 0 : indentPx) : (isFirstLine ? indentPx : 0))
-            : 0;
-        const lineMaxWidth = lineMeasure(maxWidthPx, options?.restWidths, lineIndex) - lineIndent;
+        // The line's own indent (`lineIndentAt`): the first line's, a hanging
+        // one, or the line's entry in `lineIndentsPx`; past its inset beside a
+        // picture (#627).
+        const lineIndent = indentOf(lineIndex);
+        const lineMaxWidth = lineWidthAt(maxWidthPx, options, lineIndex);
         const line = layoutNextLine(prepared, cursor, lineMaxWidth);
         if (line === null)
             break;
@@ -394,6 +390,7 @@ export function measureBlock(text, font, maxWidthPx, lineHeightPx, options) {
         lastLine.isLastLine = true;
         delete lastLine.justifiedSpaceRatio;
     }
+    markInsetLines(lines, maxWidthPx, options);
     return { lines, totalHeight: y };
 }
 //# sourceMappingURL=plain.js.map