postext 1.41.0 → 1.42.0

package/dist/pipeline/carriedOutline.js

@@ -0,0 +1,158 @@
+/**
+ * Index marks, anchors and headings written in the part of a story that
+ * went on in a page of another chapter (#988, DESIGN §5.17, §5.18).
+ *
+ * The chapter that sent the story cannot place them: the words are laid by
+ * the chapter that has the page, so the sender's own location finds no line
+ * for them and falls back on the page where the story starts. The receiving
+ * chapter knows the page and reports it ({@link locateCarriedOutline},
+ * `VDTDocument.carriedOutline`); a host with every chapter's outline puts
+ * the pages into the sender's entries ({@link mergeCarriedOutline}), keyed
+ * by the sending chapter and the offset in its body.
+ */
+/** The line of the character at `at` among `lines` (sorted by start): the
+ *  first page's line holding it; else the line before it
+ *  (`attach: 'before'`) or after it, as long as that lies within the span
+ *  the lines cover. */
+function lineAt(lines, at, attach) {
+    let lo = 0;
+    let hi = lines.length;
+    while (lo < hi) {
+        const mid = (lo + hi) >> 1;
+        if (lines[mid].start <= at)
+            lo = mid + 1;
+        else
+            hi = mid;
+    }
+    const i = lo - 1;
+    let found;
+    for (let j = i; j >= 0 && j > i - 64; j--) {
+        const l = lines[j];
+        if (at >= l.start && at < l.end && (found === undefined || l.page < found.page))
+            found = l;
+    }
+    if (found)
+        return found;
+    // Outside what this chapter laid: the mark is the sender's, not ours.
+    if (i < 0 || at > lines[lines.length - 1].end)
+        return undefined;
+    return attach === 'before' ? lines[i] : lines[i + 1] ?? lines[i];
+}
+/**
+ * What the stories carried into `doc` hold: each index mark, inline anchor
+ * and heading of a story that this chapter laid (the part the sender did
+ * not), with the page it landed on here. `baseLength` is where the carried
+ * blocks start among the chapter's content blocks, `bodyOffset` this
+ * chapter's own.
+ */
+export function locateCarriedOutline(doc, carried, bodyOffset) {
+    const out = [];
+    const known = new Set(doc.blocks);
+    const placed = doc.blocks.filter((b) => b.pageIndex >= 0);
+    for (const page of doc.pages)
+        for (const f of page.floats ?? [])
+            if (f.pageIndex >= 0 && !known.has(f))
+                placed.push(f);
+    for (const story of carried.stories.values()) {
+        const blocks = carried.blocks.slice(story.startIdx - carried.baseLength, story.endIdx - carried.baseLength + 1);
+        // The story's own lines: offsets in the sending chapter's file.
+        const lines = [];
+        const headingAt = new Map();
+        for (const b of placed) {
+            if (b.contentIndex === undefined || b.contentIndex < story.startIdx || b.contentIndex > story.endIdx)
+                continue;
+            if (b.type === 'heading' && !headingAt.has(b.contentIndex))
+                headingAt.set(b.contentIndex, { page: b.pageIndex, x: b.bbox.x, y: b.bbox.y });
+            if (b.hidden)
+                continue;
+            for (const l of b.lines) {
+                if (l.sourceStart !== undefined && l.sourceEnd !== undefined)
+                    lines.push({ start: l.sourceStart, end: l.sourceEnd, page: b.pageIndex, x: l.bbox.x, y: l.bbox.y });
+            }
+        }
+        lines.sort((a, b) => a.start - b.start || a.page - b.page);
+        const jump = story.jump;
+        // `sourceStart` of a carried block is its sender's plus this much.
+        const delta = jump.bodyOffset - bodyOffset;
+        const chapter = story.chapter;
+        blocks.forEach((block, k) => {
+            if (block.type === 'heading') {
+                const at = headingAt.get(story.startIdx + k);
+                const id = block.attrs?.id;
+                if (at) {
+                    out.push({
+                        chapter,
+                        kind: 'heading',
+                        sourceStart: block.sourceStart - delta,
+                        pageIndex: at.page,
+                        ...(id !== undefined && id.length > 0 ? { anchor: { id, x: at.x, y: at.y } } : {}),
+                    });
+                }
+            }
+            if (lines.length === 0)
+                return;
+            for (const m of block.indexMarks ?? []) {
+                if (m.anchor < 0)
+                    continue;
+                const line = lineAt(lines, m.anchor + jump.bodyOffset, m.attach);
+                if (line)
+                    out.push({ chapter, kind: 'indexMark', sourceStart: m.sourceStart - delta, pageIndex: line.page });
+            }
+            for (const m of block.anchorMarks ?? []) {
+                if (m.anchor < 0)
+                    continue;
+                const line = lineAt(lines, m.anchor + jump.bodyOffset, m.attach);
+                if (line)
+                    out.push({ chapter, kind: 'anchor', sourceStart: m.sourceStart - delta, pageIndex: line.page, anchor: { id: m.anchorId, x: line.x, y: line.y } });
+            }
+        });
+    }
+    return out;
+}
+/** `doc.carriedOutline` with the pages of the book. */
+export function carriedPlaces(doc) {
+    const offset = doc.pageIndexOffset ?? 0;
+    const out = [];
+    for (const c of doc.carriedOutline ?? []) {
+        const page = doc.pages[c.pageIndex];
+        if (page)
+            out.push({ chapter: c.chapter, kind: c.kind, sourceStart: c.sourceStart, pageLabel: page.pageLabel, pageIndex: offset + page.index, pageFormat: page.pageNumberFormat });
+    }
+    return out;
+}
+/**
+ * `outlines` (one array of entries per chapter, as `outlineFromDoc` gives
+ * them) with the pages the receiving chapters found for the index marks,
+ * anchors and headings of the stories they carry (`carriedPlaces`, one
+ * list per chapter) put into the sending chapter's entries. A chapter
+ * nothing was carried from keeps its array.
+ */
+export function mergeCarriedOutline(outlines, places) {
+    const out = outlines.slice();
+    const copied = new Set();
+    for (const list of places) {
+        for (const c of list ?? []) {
+            const entries = out[c.chapter];
+            if (!entries)
+                continue;
+            const at = entries.findIndex((e) => (c.kind === 'indexMark' ? e.kind === 'indexMark' && e.indexMark?.sourceStart === c.sourceStart
+                : c.kind === 'anchor' ? e.kind === 'anchor' && e.anchorSource === c.sourceStart
+                    : e.kind === 'heading' && e.headingSource === c.sourceStart));
+            if (at < 0)
+                continue;
+            if (!copied.has(c.chapter)) {
+                out[c.chapter] = entries.slice();
+                copied.add(c.chapter);
+            }
+            const mutable = out[c.chapter];
+            mutable[at] = {
+                ...mutable[at],
+                pageLabel: c.pageLabel,
+                pageIndex: c.pageIndex,
+                ...(c.kind === 'indexMark' ? { pageFormat: c.pageFormat } : {}),
+            };
+        }
+    }
+    return out;
+}
+//# sourceMappingURL=carriedOutline.js.map

package/dist/pipeline/carriedOutline.js.map

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

package/dist/pipeline/composedLayout.d.ts

@@ -36,7 +36,7 @@ import { type ContentWarning, type VDTBlock, type VDTComposedPage, type VDTPage
 import { dimensionToPx } from '../units';
 import { type FrameAreas, type Rect } from '../composed/geometry';
 import { type ComposedContinuation, type ComposedContinuationInput } from '../composed/continuation';
-import type { ResolvedFrame, ResolvedPageTemplate } from '../composed/types';
+import type { FrameLook, ResolvedFrame, ResolvedPageTemplate } from '../composed/types';
 import { type PageTemplateSource } from '../composed/templates';
 import { type BoxExclusion, type PlannedCallout } from './calloutLayout';
 import type { ImportedJumps } from '../composed/carry';
@@ -131,6 +131,13 @@ export declare function keepChromeAt(style: ResolvedCalloutStyleConfig, scale: n
  *  (side by side) and a measure that is the frame's. A style's placement,
  *  span, width and margins do not apply to a frame. */
 export declare function frameStyleOf(base: ResolvedCalloutStyleConfig, frame: ResolvedFrame): ResolvedCalloutStyleConfig;
+/** `base` with what a frame's `look` sets (#976) written over it: colours
+ *  of the fill, border, stripe, icon, marker, title, text and label tab,
+ *  and the tracking of the body. A fill colour turns the fill on. A part
+ *  the style does not have (a label tab it lacks) is left out. Kept per
+ *  style and look, so the pieces a measurement is keyed by (`body`,
+ *  `lists`) keep their identity from one call to the next. */
+export declare function styleWithLook(base: ResolvedCalloutStyleConfig, look: FrameLook): ResolvedCalloutStyleConfig;
 /** The story heads of a composed page's stories, by the head frame's
  *  name, read from the boxes `wrapComposedPages` made (`FRAME_ATTR`). */
 export declare function composedStories(startIdx: number, endIdx: number, plans: ReadonlyMap<number, PlannedCallout>): Map<string, ComposedStory>;

package/dist/pipeline/composedLayout.d.ts.map

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

package/dist/pipeline/composedLayout.js

@@ -15,6 +15,7 @@ import { frameElementId } from '../composed/ids';
 import { frameLinePx, frameRuleBlocks } from '../composed/rules';
 import { offsetCalloutToAbsolute } from './calloutLayout';
 import { isMarkerBlock } from './buildHelpers';
+import { createLayoutMemo, layoutMemoSwitch } from './layoutMemo';
 import { createMeasureMemo } from './measureMemo';
 import { computeOrderedListRunMetrics } from './lists';
 import { planParagraphContainers } from './paragraphContainers';
@@ -71,7 +72,7 @@ export function layoutComposedPage(given) {
     // frames collapsed).
     // The ladder lays the page again at each step: the measurements of one
     // step answer the next (#953).
-    const memoed = { ...given, pass: { ...given.pass, measureMemo: createMeasureMemo() } };
+    const memoed = { ...given, pass: { ...given.pass, measureMemo: createMeasureMemo(), ...(layoutMemoSwitch.enabled ? { layoutMemo: createLayoutMemo() } : {}) } };
     const input = given.continuing ? { ...memoed, template: continuationTemplate(given.template, given.continuing) } : memoed;
     const { template, fence, dpi } = input;
     const fi = fence.fenceIndex;
@@ -822,13 +823,16 @@ function composePage(input, template, fit, collapsed) {
     /** Whether a frame's lines are set as on a mirrored page: those of the
      *  page's own mode, not an unmirrored frame's. */
     const mirroredIn = (frame) => input.mirrored && unmirroredAt(frame) === undefined;
-    /** The widest a picture's upright frame may be in a vertical frame of a
-     *  horizontal page (#960): the frame's extent across its lines, less the
-     *  box's padding. The page turns such a frame a quarter turn, so its
-     *  pictures are laid out counter-rotated to stand upright; none of that
-     *  in a frame of the page's own mode. */
+    /** The widest a picture's upright frame may be in a frame whose lines run
+     *  down the page (#960, #971): the frame's extent across its lines, less
+     *  the box's padding. A vertical frame of a horizontal page is turned a
+     *  quarter turn on the page, a frame of a vertical page's own mode lies in
+     *  the flow, which is turned the same way; either way its pictures are
+     *  laid out counter-rotated to stand upright. A horizontal frame of a
+     *  vertical page is turned against the flow and already stands upright;
+     *  none of that on a horizontal page's own mode. */
     const uprightIn = (frame, across) => {
-        if (ownMode(frame) !== 'vertical-rl')
+        if ((frame.writingMode ?? pageMode) !== 'vertical-rl')
             return {};
         const pad = styleOf(frame).padding;
         const room = across - lengthPx(pad.top, dpi, input.emPx) - lengthPx(pad.bottom, dpi, input.emPx);
@@ -978,13 +982,60 @@ function composePage(input, template, fit, collapsed) {
                 if (known !== undefined)
                     return known;
                 const exclusions = at ? unscale(exclusionsFor(p.frame, { ...at, width }, true), s) : undefined;
-                const opts = { ...(exclusions ? { exclusions } : {}), ...(pic !== undefined ? { pictureScale: pic } : {}), ...(p.fromMark !== undefined ? { continuedMark: p.fromMark } : {}) };
-                const r = p.st.L.layoutRange(p.st.cut, p.st.L.end, width / s, p.blockId, p.continuation, input.mirrored, opts.exclusions || opts.pictureScale !== undefined || opts.continuedMark !== undefined ? opts : undefined);
+                // The room a vertical page's upright picture may take down the page
+                // is the flow's whole extent: the frame's height is what it settles.
+                const opts = { ...(exclusions ? { exclusions } : {}), ...(pic !== undefined ? { pictureScale: pic } : {}), ...(p.fromMark !== undefined ? { continuedMark: p.fromMark } : {}), ...uprightIn(p.frame, input.areas.area.height / s) };
+                const r = p.st.L.peekRange(p.st.cut, p.st.L.end, width / s, p.blockId, p.continuation, input.mirrored, Object.keys(opts).length > 0 ? opts : undefined);
                 const h = r.totalHeight * s;
                 memo.set(key, h);
                 return h;
             };
         };
+        /** The width an `'auto'`-width frame (#982) needs when it may take up
+         *  to `room`: the right edge of its longest line (a picture counting
+         *  by its own box), and what the box keeps to the right of its text
+         *  (padding, a stripe). The text is set flush left whatever its
+         *  alignment, so a centred title is as wide as its words, and not set
+         *  to a measure it would fill. Undefined for a frame of fixed or
+         *  `'fill'` width, or one in its own writing mode. */
+        const naturalWidthOf = (p) => {
+            if (p.frame.width !== 'auto' || ownMode(p.frame))
+                return undefined;
+            const memo = new Map();
+            return (room) => {
+                if (!p.holds)
+                    return 0;
+                const key = Math.round(room * 1000);
+                const known = memo.get(key);
+                if (known !== undefined)
+                    return known;
+                const s = textScale(p.frame);
+                const style = styleOf(p.frame);
+                const flush = { ...style, body: { ...style.body, textAlign: 'left' } };
+                const L = makeCalloutLayouter(pass, p.st.story.startIdx, p.st.story.plan, flush);
+                // Set at a measure far wider than the room, so that nothing wraps:
+                // the frame is then as wide as its words, and the room caps it
+                // (text that does not fit wraps at the room, as in a shrink-wrapped
+                // box).
+                const r = L.layoutRange(p.st.cut, L.end, (room * 8) / s, p.blockId, p.continuation, input.mirrored);
+                let right = 0;
+                for (const b of r.children) {
+                    if (b.type === 'callout' || b.hidden)
+                        continue;
+                    if (b.type === 'resource' || b.lines.length === 0)
+                        right = Math.max(right, b.bbox.x + b.bbox.width);
+                    for (const l of b.lines)
+                        if (l.text.length > 0)
+                            right = Math.max(right, l.bbox.x + l.bbox.width);
+                }
+                const inner = r.frame.callout?.innerRect;
+                const keep = inner ? Math.max(0, r.width - (inner.x + inner.width)) : 0;
+                // A quarter of a pixel over: a line is never set to its exact width.
+                const w = Math.min(room, (right + keep + 0.25) * s);
+                memo.set(key, w);
+                return w;
+            };
+        };
         /** The height a frame set in its own writing mode (#944) needs at
          *  `width`: its lines run down the box, so the least height whose
          *  lines, following each other across, fit `width`; the area's height
@@ -997,7 +1048,7 @@ function composePage(input, template, fit, collapsed) {
             if (known !== undefined)
                 return known;
             const opts = { ...(pic !== undefined ? { pictureScale: pic } : {}), ...(p.fromMark !== undefined ? { continuedMark: p.fromMark } : {}), ...uprightIn(p.frame, width / s) };
-            const across = (measure) => inMode(p.frame, () => p.st.L.layoutRange(p.st.cut, p.st.L.end, measure / s, p.blockId, p.continuation, mirroredIn(p.frame), Object.keys(opts).length > 0 ? opts : undefined).totalHeight * s);
+            const across = (measure) => inMode(p.frame, () => p.st.L.peekRange(p.st.cut, p.st.L.end, measure / s, p.blockId, p.continuation, mirroredIn(p.frame), Object.keys(opts).length > 0 ? opts : undefined).totalHeight * s);
             const most = Math.max(input.areas.area.height, input.emPx);
             let h = most;
             if (across(most) <= width + 0.5) {
@@ -1022,8 +1073,8 @@ function composePage(input, template, fit, collapsed) {
          *  off a spread's spine band, #861), its `'auto'` height measured at the
          *  width it is left with. Declared and final boxes alike: the band is
          *  the template's, not a reflow. */
-        const placeFitted = (frame, placeable, ctx, refs, nat) => {
-            const r = placeBox(placeable, template, ctx, refs, nat);
+        const placeFitted = (frame, placeable, ctx, refs, nat, natW) => {
+            const r = placeBox(placeable, template, ctx, refs, nat, natW);
             if (!input.fitBox)
                 return r;
             const keep = (placed) => {
@@ -1037,7 +1088,7 @@ function composePage(input, template, fit, collapsed) {
             const first = keep(r);
             if (Math.abs(first.width - r.width) < 0.01)
                 return first;
-            return keep(placeBox(placeable, template, ctx, refs, () => nat(first.width)));
+            return keep(placeBox(placeable, template, ctx, refs, () => nat(first.width), natW));
         };
         /** A frame's height as its template declares it: its `minHeight` where
          *  the height follows the content, else the content's (`natural`). */
@@ -1050,16 +1101,17 @@ function composePage(input, template, fit, collapsed) {
             const frame = p.frame;
             const placeable = framePlaceable(frame);
             const natural = naturalOf(p);
+            const natW = naturalWidthOf(p);
             const at = (refs) => {
-                const r0 = placeFitted(frame, placeable, input, refs, natural);
+                const r0 = placeFitted(frame, placeable, input, refs, natural, natW);
                 if (!p.holds || !exclusionsFor(frame, r0, true))
                     return { rect: r0, natural };
                 const round = naturalOf(p, r0);
-                return { rect: placeFitted(frame, placeable, input, refs, round), natural: round };
+                return { rect: placeFitted(frame, placeable, input, refs, round, natW), natural: round };
             };
             const decl = frame.pin ? at(declaredRefOf) : undefined;
             const fin = decl ?? at(refOf);
-            const declRect = placeFitted(frame, placeable, input, declaredRefOf, declaredNatural(frame, fin.natural));
+            const declRect = placeFitted(frame, placeable, input, declaredRefOf, declaredNatural(frame, fin.natural), natW);
             const rect = frame.pin ? declRect : fin.rect;
             declared.set(frame.name, declRect);
             rects.set(frame.name, rect);
@@ -1076,6 +1128,7 @@ function composePage(input, template, fit, collapsed) {
             const mmPx = dpi / MM_PER_IN;
             const yieldAll = fit.yieldAll.has(group.name);
             const preps = members.map(prepare);
+            const natWs = preps.map(naturalWidthOf);
             const solve = (mode, naturals) => {
                 const refs = mode === 'final' ? refOf : declaredRefOf;
                 const ownBox = own ? placeBox(own, template, input, refs, () => 0) : undefined;
@@ -1088,7 +1141,7 @@ function composePage(input, template, fit, collapsed) {
                     const placeable = framePlaceable(f);
                     // On a spread the member's own box keeps off the spine band, and
                     // the negotiation starts from it (#861).
-                    const box = placeFitted(f, placeable, ctx, memberRefs, declaredNatural(f, natural));
+                    const box = placeFitted(f, placeable, ctx, memberRefs, declaredNatural(f, natural), natWs[k]);
                     ownRects.set(f.name, box);
                     const auto = f.height === 'auto' && !(f.grid && !placeable.heightSet);
                     const fill = f.height === 'fill';
@@ -1494,7 +1547,7 @@ function stampFrameAttrText(box, sources, attrs, bodyOffset) {
 export function frameStyleOf(base, frame) {
     const padding = frame.padding ? { ...base.padding, ...frame.padding } : base.padding;
     return {
-        ...base,
+        ...(frame.look ? styleWithLook(base, frame.look) : base),
         padding,
         width: 'fill',
         placement: 'here',
@@ -1503,6 +1556,61 @@ export function frameStyleOf(base, frame) {
         marginBottom: { value: 0, unit: 'px' },
     };
 }
+const lookedStyles = new WeakMap();
+/** `base` with what a frame's `look` sets (#976) written over it: colours
+ *  of the fill, border, stripe, icon, marker, title, text and label tab,
+ *  and the tracking of the body. A fill colour turns the fill on. A part
+ *  the style does not have (a label tab it lacks) is left out. Kept per
+ *  style and look, so the pieces a measurement is keyed by (`body`,
+ *  `lists`) keep their identity from one call to the next. */
+export function styleWithLook(base, look) {
+    let byLook = lookedStyles.get(base);
+    if (!byLook)
+        lookedStyles.set(base, (byLook = new WeakMap()));
+    const known = byLook.get(look);
+    if (known)
+        return known;
+    const out = { ...base };
+    if (look.background) {
+        out.background = look.background;
+        out.backgroundEnabled = true;
+    }
+    if (look.border?.color)
+        out.border = { ...base.border, color: look.border.color };
+    if (look.stripe?.color)
+        out.stripe = { ...base.stripe, color: look.stripe.color };
+    if (look.icon?.color)
+        out.icon = { ...base.icon, color: look.icon.color };
+    if (look.marker?.color || look.marker?.rule?.color) {
+        out.marker = {
+            ...base.marker,
+            ...(look.marker.color ? { color: look.marker.color } : {}),
+            ...(look.marker.rule?.color ? { rule: { ...base.marker.rule, color: look.marker.rule.color } } : {}),
+        };
+    }
+    if (look.titleStyle?.color)
+        out.titleStyle = { ...base.titleStyle, color: look.titleStyle.color };
+    if (look.body) {
+        const b = look.body;
+        out.body = {
+            ...base.body,
+            ...(b.color ? { color: b.color } : {}),
+            ...(b.boldColor ? { boldColor: b.boldColor } : {}),
+            ...(b.italicColor ? { italicColor: b.italicColor } : {}),
+            ...(b.letterSpacing ? (b.letterSpacing.value !== 0 ? { letterSpacing: b.letterSpacing } : { letterSpacing: undefined }) : {}),
+        };
+    }
+    if (look.label && base.label) {
+        out.label = {
+            ...base.label,
+            ...(look.label.color ? { color: look.label.color } : {}),
+            ...(look.label.background ? { background: look.label.background } : {}),
+            ...(look.label.rule?.color ? { rule: { ...base.label.rule, color: look.label.rule.color } } : {}),
+        };
+    }
+    byLook.set(look, out);
+    return out;
+}
 /** The story heads of a composed page's stories, by the head frame's
  *  name, read from the boxes `wrapComposedPages` made (`FRAME_ATTR`). */
 export function composedStories(startIdx, endIdx, plans) {