postext 1.29.2 → 1.30.1

package/dist/canvas-backend/wordPieces.js

@@ -0,0 +1,132 @@
+import { lineWordSegmentsInOrder, sameSetWidth } from '../wordPieces';
+import { graphemeCount } from '../measure/graphemes';
+import { measurementGeneration } from '../measure/canvas';
+import { languageOf, setLetterSpacing } from './contextState';
+import { inSegmentLanguage } from './wordRuns';
+import { contextTextWidth } from './contextText';
+import { verticalFlowAdvance } from './verticalText';
+/** A line's segments → what is known of the line. */
+const painted = new WeakMap();
+/** What is known of the line of `segments` under the faces loaded, the
+ *  language and the `tracking` painted in and the line's `font`, with its
+ *  segments as they are; nothing yet when any of those changed. */
+function knownOf(ctx, line, segments, tracking, font) {
+    let widths = 0;
+    for (const seg of segments)
+        widths += seg.width;
+    const key = `${measurementGeneration()}\u0000${languageOf(ctx) ?? ''}\u0000${tracking}\u0000${segments.length}\u0000${widths}\u0000${line.hyphenated === true}\u0000${font}`;
+    let known = painted.get(segments);
+    if (known?.key !== key)
+        painted.set(segments, known = { key });
+    return known;
+}
+/**
+ * The segments to paint `line` from, and the order to advance through
+ * them in when the line carries one (`VDTLine.order`: a line with
+ * right-to-left text, any line of a mirrored page; the pieces of a
+ * left-to-right word are joined there too, and the order written for the
+ * segments that result). `composed`: a line of the CJK composer, painted
+ * as it is. A line set word by word down a vertical page is asked as any
+ * other, each text at the advance the vertical painter gives it: a Latin
+ * word runs sideways down the column, shaped as on a horizontal line, and
+ * a piece of it is as wide as the word grew by it. Chrome 154, Noto Sans
+ * JP at 14.58 px under `ja`: the layout holds `BY-` 21.01 and `SA` 17.23
+ * px, `BY-SA` being 38.24 px, where `SA` alone is 17.55 px; painted piece
+ * by piece `SA` ran 0.32 px into the space after it. `tracking` is the
+ * context's `letterSpacing` on entry, px, and on return; `fontOf` gives the font
+ * string a segment is painted in. The context's font is left at any
+ * value: the painter sets its own before each text.
+ */
+export function paintedSegments(ctx, line, composed, tracking, fontOf) {
+    const segments = line.segments;
+    const order = segments && !composed && line.order?.length === segments.length ? line.order : undefined;
+    if (!segments || segments.length === 0 || composed || typeof ctx.measureText !== 'function')
+        return { segments, order };
+    const known = knownOf(ctx, line, segments, tracking, fontOf(segments[0]));
+    if (known.set)
+        return known.set;
+    let font = '';
+    let spaced = tracking !== 0;
+    known.set = lineWordSegmentsInOrder(line, composed, (seg, text) => {
+        if (spaced) {
+            setLetterSpacing(ctx, 0);
+            spaced = false;
+        }
+        let width = 0;
+        inSegmentLanguage(ctx, seg, () => {
+            const own = fontOf(seg);
+            if (own !== font)
+                ctx.font = font = own;
+            // Down a vertical page a text advances as its cells and its
+            // sideways runs do (`verticalFlowAdvance`).
+            width = verticalFlowAdvance(ctx, text, tracking)
+                ?? contextTextWidth(ctx, text) + (tracking === 0 ? 0 : tracking * graphemeCount(text));
+        });
+        return width;
+    });
+    if (tracking !== 0 && !spaced)
+        setLetterSpacing(ctx, tracking);
+    return known.set;
+}
+/** A character past Latin-1 (see `contextText.ts`). */
+const WIDE_RE = /[^\u0000-\u00FF]/;
+const LETTER_RE = /\p{L}/u;
+/** Whether the browser may set the line's text otherwise as one text than
+ *  segment by segment: two of its pieces touch (a pair kerned across the
+ *  cut), the line ends on a hyphen the layout added (measured apart from
+ *  its word, and a face may kern the two: at 20 px Fira Sans sets `lec-`
+ *  0.86 px narrower than `lec` and `-`, Crimson Pro `bo-` 0.29 px wider),
+ *  or its text holds a character past U+00FF and one of its words is of
+ *  Latin-1 characters with no letter among them. */
+function mayDifferWhole(line, segments) {
+    if (line.hyphenated === true && !line.hardHyphen) {
+        const last = segments[segments.length - 1];
+        if (last?.kind === 'text' && last.text.length > 1 && last.text.endsWith('-'))
+            return true;
+    }
+    const wide = WIDE_RE.test(line.text);
+    for (let i = 0; i < segments.length; i++) {
+        const seg = segments[i];
+        if (seg.kind === 'space')
+            continue;
+        if (i > 0 && segments[i - 1].kind !== 'space')
+            return true;
+        if (wide && seg.kind === 'text' && !WIDE_RE.test(seg.text) && !LETTER_RE.test(seg.text))
+            return true;
+    }
+    return false;
+}
+/**
+ * Whether a line's text, painted with one `fillText` in the context's
+ * font (the line's `font`, set by the caller), is as wide as the layout
+ * measured its segments together. `tracking` is the context's
+ * `letterSpacing` on entry, px, and on return. A line with no two pieces
+ * that touch and no word the browser shapes otherwise inside a longer
+ * string is, with nothing asked: its words and its spaces were measured
+ * whole. So is any line where the context does not measure.
+ */
+export function paintsAsOneText(ctx, line, tracking, font) {
+    const segments = line.segments;
+    if (!segments || typeof ctx.measureText !== 'function' || !mayDifferWhole(line, segments))
+        return true;
+    const known = knownOf(ctx, line, segments, tracking, font);
+    if (known.whole === undefined) {
+        let measured = 0;
+        let widest = 0;
+        for (const seg of segments) {
+            measured += seg.width;
+            if (seg.width > widest)
+                widest = seg.width;
+        }
+        if (tracking !== 0)
+            setLetterSpacing(ctx, 0);
+        const set = contextTextWidth(ctx, line.text) + (tracking === 0 ? 0 : tracking * graphemeCount(line.text));
+        if (tracking !== 0)
+            setLetterSpacing(ctx, tracking);
+        // What a kerned pair moves is small beside a line: the difference is
+        // weighed against the line's widest word, as a word's pieces are.
+        known.whole = sameSetWidth(widest + set - measured, widest);
+    }
+    return known.whole;
+}
+//# sourceMappingURL=wordPieces.js.map

package/dist/canvas-backend/wordPieces.js.map

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

package/dist/canvas-backend/wordRuns.d.ts

@@ -48,7 +48,9 @@ export declare function fillSegmentWord(ctx: CanvasRenderingContext2D, seg: VDTL
 export declare function inSegmentLanguage(ctx: CanvasRenderingContext2D, seg: VDTLineSegment, paint: () => void): void;
 /** Paint the segments that name a language in it from now on (`on`), or
  *  in the page's as up to postext 1.28: the page painter says which for
- *  the document it paints (`bodyText.shapingLanguage`). */
+ *  the document it paints (`bodyText.shapingLanguage`). The same
+ *  documents have the ligatures of their tracked words take the tracking
+ *  of each letter (`setLetterTracking`, #770). */
 export declare function setSegmentLanguages(on: boolean): void;
 /** Whether a segment that names its language is painted on its own. */
 export declare function paintsSegmentLanguage(seg: VDTLineSegment): boolean;

package/dist/canvas-backend/wordRuns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wordRuns.d.ts","sourceRoot":"","sources":["../../src/canvas-backend/wordRuns.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAQ7C,8EAA8E;AAC9E,MAAM,MAAM,OAAO,GAAG,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAQlE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,wBAAwB,EAC7B,GAAG,EAAE,cAAc,EACnB,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACnD,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzD,IAAI,CAEN;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,wBAAwB,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,IAAI,GAAG,IAAI,CAa7G;AAMD;;2DAE2D;AAC3D,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAErD;AAED,uEAAuE;AACvE,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAElE;AA+BD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,wBAAwB,EAC7B,GAAG,EAAE,cAAc,EACnB,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACnD,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzD,IAAI,CAsCN"}
+{"version":3,"file":"wordRuns.d.ts","sourceRoot":"","sources":["../../src/canvas-backend/wordRuns.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAS7C,8EAA8E;AAC9E,MAAM,MAAM,OAAO,GAAG,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAQlE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,wBAAwB,EAC7B,GAAG,EAAE,cAAc,EACnB,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACnD,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzD,IAAI,CAEN;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,wBAAwB,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,IAAI,GAAG,IAAI,CAa7G;AAMD;;;;kDAIkD;AAClD,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAGrD;AAED,uEAAuE;AACvE,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAElE;AA+BD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,wBAAwB,EAC7B,GAAG,EAAE,cAAc,EACnB,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACnD,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzD,IAAI,CAsCN"}

package/dist/canvas-backend/wordRuns.js

@@ -1,10 +1,11 @@
 import { shapingTagOf } from '../locale';
 import { joiningScriptIn } from '../measure/joining';
 import { mirroredPaintActive } from './mirrorFrame';
-import { fillTrackedWord } from './trackedText';
+import { fillTrackedWord, setLetterTracking } from './trackedText';
 import { fillScriptWord } from './scriptText';
 import { scriptContextUntracked } from '../measure/script';
 import { restoreContext, saveContext, setLetterSpacing } from './contextState';
+import { contextTextWidth } from './contextText';
 /** How far above and below the baseline a run's clip reaches: past any
  *  ascender, stacked vowel sign or descender. */
 const CLIP_REACH = 4096;
@@ -72,9 +73,12 @@ export function inSegmentLanguage(ctx, seg, paint) {
 let segmentLanguages = false;
 /** Paint the segments that name a language in it from now on (`on`), or
  *  in the page's as up to postext 1.28: the page painter says which for
- *  the document it paints (`bodyText.shapingLanguage`). */
+ *  the document it paints (`bodyText.shapingLanguage`). The same
+ *  documents have the ligatures of their tracked words take the tracking
+ *  of each letter (`setLetterTracking`, #770). */
 export function setSegmentLanguages(on) {
     segmentLanguages = on;
+    setLetterTracking(on);
 }
 /** Whether a segment that names its language is painted on its own. */
 export function paintsSegmentLanguage(seg) {
@@ -130,7 +134,7 @@ function fillWord(ctx, seg, x, y, tracking, paint, runStyle) {
 export function paintWordRuns(ctx, seg, x, y, paint, runStyle) {
     const text = seg.text;
     const runs = seg.runs;
-    const whole = ctx.measureText(text).width;
+    const whole = contextTextWidth(ctx, text);
     if (!(whole > 0))
         return;
     const rtl = seg.rtl === true;
@@ -146,8 +150,8 @@ export function paintWordRuns(ctx, seg, x, y, paint, runStyle) {
             from--;
         while (to < text.length && MARK_RE.test(text[to]))
             to++;
-        const before = whole - ctx.measureText(text.slice(from)).width;
-        const after = whole - ctx.measureText(text.slice(0, to)).width;
+        const before = whole - contextTextWidth(ctx, text.slice(from));
+        const after = whole - contextTextWidth(ctx, text.slice(0, to));
         let left = x + Math.max(0, rtl ? after : before);
         let right = x + whole - Math.max(0, rtl ? before : after);
         if (mirroredPaintActive())
@@ -161,7 +165,7 @@ export function paintWordRuns(ctx, seg, x, y, paint, runStyle) {
         ctx.clip();
         ctx.font = font;
         ctx.fillStyle = fill;
-        const w = ctx.measureText(text).width;
+        const w = contextTextWidth(ctx, text);
         if (w > 0 && Math.abs(w - whole) > 0.01) {
             ctx.translate(x, 0);
             ctx.scale(whole / w, 1);

package/dist/canvas-backend/wordRuns.js.map

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

package/dist/comics/lettering/__tests__/fitAsPainted.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=fitAsPainted.test.d.ts.map

package/dist/comics/lettering/__tests__/fitAsPainted.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fitAsPainted.test.d.ts","sourceRoot":"","sources":["../../../../src/comics/lettering/__tests__/fitAsPainted.test.ts"],"names":[],"mappings":""}

package/dist/comics/lettering/__tests__/fitAsPainted.test.js

@@ -0,0 +1,97 @@
+import { describe, it, expect, afterEach } from 'vitest';
+import { clearTextWidthCache, setMeasureLanguage } from '../../../measure/canvas';
+import { prepareText, readLetteringText } from '../text';
+import { shapeText } from '../shape-text';
+import { presetLetteringStyles } from '../presets';
+// #770, round 2: the lines a shaping tries are measured as the layout sets
+// the ones it chooses. In a document shaped in its own language the layout
+// sets a line as wide as its runs are painted, each in its own direction;
+// the shaping measured every line left to right, whole, so a line of an
+// Arabic balloon that ends in a stop or a guillemet was chosen at another
+// width than it is set at.
+const EM = 20;
+const SIZE_RE = /(\d*\.?\d+)px/;
+/**
+ * The advance of `text`, in em, in a face that draws its marks by the run
+ * they stand in, as Playpen Sans Arabic and Markazi Text do in Arabic: a
+ * guillemet is 0.47 em and a stop 0.3 em in a text measured left to right
+ * (a run apart from the Arabic word, shaped alone), 0.41 em and 0.2 em in
+ * the right-to-left run it is painted in. A space is 0.25 em, any other
+ * character half an em.
+ */
+function faceWidth(text, rtl) {
+    let em = 0;
+    for (const ch of text) {
+        if (/[⁦-⁩]/.test(ch))
+            continue;
+        if (ch === ' ')
+            em += 0.25;
+        else if (ch === '«' || ch === '»')
+            em += rtl ? 0.41 : 0.47;
+        else if (ch === '.')
+            em += rtl ? 0.2 : 0.3;
+        else
+            em += 0.5;
+    }
+    return em;
+}
+class StubCtx {
+    font = `${EM}px Test`;
+    lang = 'inherit';
+    direction = 'ltr';
+    measureText(s) {
+        const px = Number(SIZE_RE.exec(this.font)?.[1] ?? EM);
+        return { width: faceWidth(s, this.direction === 'rtl') * px };
+    }
+}
+const globals = globalThis;
+globals.OffscreenCanvasRenderingContext2D = StubCtx;
+globals.OffscreenCanvas = class {
+    getContext() {
+        return new StubCtx();
+    }
+};
+clearTextWidthCache();
+afterEach(() => setMeasureLanguage(undefined));
+function shape(text, locale) {
+    const style = presetLetteringStyles({ fontSizePx: EM, locale, fontFamily: 'Test' })['speech'];
+    const p = prepareText(readLetteringText(text, undefined), style, { locale, vertical: false });
+    const shaped = shapeText(p, style, { locale, vertical: false, dpi: 96 });
+    return { shaped, lines: shaped.lines.map((l) => p.text.slice(l.start, l.end)) };
+}
+// Two sentences, each closed by a stop; the second inside guillemets.
+const ARABIC = 'هذا هو النص الاول. «وهذا هو النص الثاني.»';
+describe('#770: a balloon line is fitted at the width it is set at', () => {
+    it('in a document shaped in its own language, a right-to-left line as it is painted', () => {
+        setMeasureLanguage('ar');
+        const { shaped, lines } = shape(ARABIC, 'ar');
+        const set = shaped.block.lines.filter((l) => l.text.length > 0);
+        expect(set).toHaveLength(lines.length);
+        // The layout sets each line as one right-to-left run.
+        set.forEach((l, i) => expect(l.width).toBeCloseTo(faceWidth(lines[i], true) * EM, 6));
+        // And the shaping chose it at that width.
+        shaped.lines.forEach((l, i) => expect(l.width).toBeCloseTo(set[i].width, 6));
+        // The text holds marks the two directions set at other widths.
+        expect(faceWidth(ARABIC, false)).toBeGreaterThan(faceWidth(ARABIC, true) + 0.3);
+    });
+    it('in a document shaped in its host’s language, left to right and whole, as it was', () => {
+        const { shaped, lines } = shape(ARABIC, 'ar');
+        const set = shaped.block.lines.filter((l) => l.text.length > 0);
+        shaped.lines.forEach((l, i) => {
+            expect(l.width).toBeCloseTo(faceWidth(lines[i], false) * EM, 6);
+            expect(set[i].width).toBeCloseTo(l.width, 6);
+        });
+    });
+    it('a left-to-right line whole, whatever the document is shaped in', () => {
+        const text = 'This is one line. «And this is another.»';
+        const host = shape(text, 'en');
+        setMeasureLanguage('en');
+        const own = shape(text, 'en');
+        expect(own.lines).toEqual(host.lines);
+        own.shaped.lines.forEach((l, i) => {
+            expect(l.width).toBeCloseTo(faceWidth(own.lines[i], false) * EM, 6);
+            expect(l.width).toBeCloseTo(host.shaped.lines[i].width, 6);
+        });
+    });
+});
+//# sourceMappingURL=fitAsPainted.test.js.map

package/dist/comics/lettering/__tests__/fitAsPainted.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fitAsPainted.test.js","sourceRoot":"","sources":["../../../../src/comics/lettering/__tests__/fitAsPainted.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,2EAA2E;AAC3E,2EAA2E;AAC3E,0EAA0E;AAC1E,wEAAwE;AACxE,0EAA0E;AAC1E,2BAA2B;AAE3B,MAAM,EAAE,GAAG,EAAE,CAAC;AACd,MAAM,OAAO,GAAG,eAAe,CAAC;AAEhC;;;;;;;GAOG;AACH,SAAS,SAAS,CAAC,IAAY,EAAE,GAAY;IAC3C,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,KAAK,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;QACtB,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,SAAS;QAC/B,IAAI,EAAE,KAAK,GAAG;YAAE,EAAE,IAAI,IAAI,CAAC;aACtB,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG;YAAE,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;aACtD,IAAI,EAAE,KAAK,GAAG;YAAE,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;;YACtC,EAAE,IAAI,GAAG,CAAC;IACjB,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AACD,MAAM,OAAO;IACX,IAAI,GAAG,GAAG,EAAE,SAAS,CAAC;IACtB,IAAI,GAAG,SAAS,CAAC;IACjB,SAAS,GAAG,KAAK,CAAC;IAClB,WAAW,CAAC,CAAS;QACnB,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACtD,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC;IAChE,CAAC;CACF;AACD,MAAM,OAAO,GAAG,UAAiG,CAAC;AAClH,OAAO,CAAC,iCAAiC,GAAG,OAAO,CAAC;AACpD,OAAO,CAAC,eAAe,GAAG;IACxB,UAAU;QACR,OAAO,IAAI,OAAO,EAAE,CAAC;IACvB,CAAC;CACF,CAAC;AACF,mBAAmB,EAAE,CAAC;AAEtB,SAAS,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;AAE/C,SAAS,KAAK,CAAC,IAAY,EAAE,MAAc;IACzC,MAAM,KAAK,GAAG,qBAAqB,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAE,CAAC;IAC/F,MAAM,CAAC,GAAG,WAAW,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9F,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;IACzE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;AAClF,CAAC;AAED,sEAAsE;AACtE,MAAM,MAAM,GAAG,2CAA2C,CAAC;AAE3D,QAAQ,CAAC,0DAA0D,EAAE,GAAG,EAAE;IACxE,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;QACzF,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAChE,MAAM,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACvC,sDAAsD;QACtD,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACvF,0CAA0C;QAC1C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9E,+DAA+D;QAC/D,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;QACzF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAChE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC5B,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,IAAI,GAAG,0CAA0C,CAAC;QACxD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/B,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9B,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAChC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;YACrE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/comics/lettering/shape-text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shape-text.d.ts","sourceRoot":"","sources":["../../../src/comics/lettering/shape-text.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAA6B,MAAM,aAAa,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAsE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAE/G,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAEpD,+BAA+B;AAC/B,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ;wDACoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;2DACuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;0EAC0E;AAC1E,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,kBAAkB,CAAC;IAC1B,sEAAsE;IACtE,MAAM,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,qDAAqD;IACrD,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACvD,sEAAsE;IACtE,GAAG,EAAE,IAAI,EAAE,CAAC;IACZ,MAAM,EAAE,IAAI,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd;yEACqE;IACrE,SAAS,EAAE,MAAM,CAAC;IAClB;iBACa;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,8CAA8C;AAC9C,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C;;yEAEyE;AACzE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAErE;AAED;;gBAEgB;AAChB,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAKxD;AA6YD,4DAA4D;AAC5D,wBAAgB,eAAe,CAAC,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,GAAG,OAAO,CAItF;AAeD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,GAAG,UAAU,CAEhG;AAED,kEAAkE;AAClE,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,CA6B3H;AAwMD,8DAA8D;AAC9D,wBAAgB,KAAK,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,EAAE,CAgBtF;AAED;4DAC4D;AAC5D,wBAAgB,cAAc,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,kBAAkB,CAMpG"}
+{"version":3,"file":"shape-text.d.ts","sourceRoot":"","sources":["../../../src/comics/lettering/shape-text.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAA6B,MAAM,aAAa,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAsE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAE/G,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAEpD,+BAA+B;AAC/B,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ;wDACoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;2DACuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;0EAC0E;AAC1E,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,kBAAkB,CAAC;IAC1B,sEAAsE;IACtE,MAAM,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,qDAAqD;IACrD,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACvD,sEAAsE;IACtE,GAAG,EAAE,IAAI,EAAE,CAAC;IACZ,MAAM,EAAE,IAAI,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd;yEACqE;IACrE,SAAS,EAAE,MAAM,CAAC;IAClB;iBACa;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,8CAA8C;AAC9C,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C;;yEAEyE;AACzE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAErE;AAED;;gBAEgB;AAChB,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAKxD;AA0aD,4DAA4D;AAC5D,wBAAgB,eAAe,CAAC,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,GAAG,OAAO,CAItF;AAeD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,GAAG,UAAU,CAEhG;AAED,kEAAkE;AAClE,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,CAgC3H;AAwMD,8DAA8D;AAC9D,wBAAgB,KAAK,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,EAAE,CAgBtF;AAED;4DAC4D;AAC5D,wBAAgB,cAAc,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,kBAAkB,CAMpG"}

package/dist/comics/lettering/shape-text.js

@@ -19,7 +19,7 @@ import { parseRichDesignText, richDesignSpans, richFontSet, RichMeasurer } from
 import { composeCjkDesignParagraph, composesDesignAsCjk } from '../../design/cjkText';
 import { cjkCompositionKey, getCjkComposition, setCjkComposition } from '../../measure/cjkPunctuation';
 import { layoutTextElementAt } from '../../design/layout';
-import { designBaseDirection } from '../../design/bidiText';
+import { designBaseDirection, directedTextWidth, measuresRunsAsPainted } from '../../design/bidiText';
 import { primitiveToBlock } from '../../pipeline/headerFooter';
 import { cjkRegionOf, directionOf, isJapaneseLanguage, languageOf } from '../../locale';
 import { breakPoints, hasMarks, isIsolateControl, markupOf } from './text';
@@ -101,10 +101,10 @@ function measuringComposition(c) {
  * title in two (the comparison of #723). A text whose lines hold no pair
  * is shaped as it was.
  */
-function composedWidth(text, spans, fonts, pitch, tracking) {
+function composedWidth(text, spans, fonts, pitch, tracking, flowIn) {
     if (text.includes('\n') || !composesDesignAsCjk(text))
         return undefined;
-    const measureIn = (t, font) => Math.max(0, flowTextWidth(t, font) + tracking * graphemeCount(t));
+    const measureIn = (t, font) => Math.max(0, flowIn(t, font) + tracking * graphemeCount(t));
     const own = getCjkComposition();
     setCjkComposition(measuringComposition(own));
     try {
@@ -115,6 +115,27 @@ function composedWidth(text, spans, fonts, pitch, tracking) {
         setCjkComposition(own);
     }
 }
+/**
+ * How the lines a shaping tries are measured, untracked: as the layout
+ * that sets the chosen ones measures them (`layoutTextElement`).
+ *
+ * That is `flowTextWidth`, the text whole and left to right, in a document
+ * shaped in its host's language and down a column. In a document shaped
+ * in its own language the layout sets a line as wide as its runs are
+ * painted, each in its own direction (#770, `measuresRunsAsPainted`), and
+ * the shaping measures the same: the line's bidi levels resolved at
+ * `base`, the direction the balloon is set at, each run in the direction
+ * it is painted in. Measured left to right, the line
+ * `منارة بورثكوف، هنا «غانيت».` of an Arabic balloon in Playpen Sans
+ * Arabic at 15.625 px is 176.82 px wide, and it is set and painted
+ * 177.18 px wide (Chrome 154, in `ar`): its stop and its closing guillemet
+ * are a run apart there, and one run with the words when painted. A line
+ * with no right-to-left character at a left-to-right base is measured
+ * whole either way.
+ */
+function flowMeasure(base) {
+    return base !== undefined && measuresRunsAsPainted() ? (t, font) => directedTextWidth(t, font, base) : flowTextWidth;
+}
 /** A measurer of line widths over the prepared text, in the writing mode
  *  in force (call inside `withMeasureWritingMode`). Rich text is measured
  *  through the design-text measurer of its own markup, so that what is
@@ -123,16 +144,18 @@ function composedWidth(text, spans, fonts, pitch, tracking) {
  *  sets with the CJK composer is measured by composing it (#723, see
  *  `composedWidth`): the shaping asks for it, the ruby does not (it
  *  places a reading along a line, and the start of a line is no line of
- *  its own). */
-function measurerFor(p, style, composed = false) {
+ *  its own). `base`: the direction the lines are set at, for a measurer
+ *  of whole lines ({@link flowMeasure}); the ruby gives none. */
+function measurerFor(p, style, composed = false, base) {
     const tracking = trackingOf(p, style);
     const pitch = style.fontSizePx * style.lineHeight;
     const memo = new Map();
     const key = (a, b) => a * 100003 + b;
+    const flowIn = flowMeasure(base);
     if (hasMarks(p)) {
         const rt = parseRichDesignText(wholeMarkup(p), fontSpec(style));
         if (rt.text === p.text) {
-            const m = new RichMeasurer(rt, tracking);
+            const m = new RichMeasurer(rt, tracking, flowIn === flowTextWidth ? undefined : flowIn);
             const fonts = composed ? richFontSet(fontSpec(style)) : undefined;
             return {
                 rich: true,
@@ -140,7 +163,7 @@ function measurerFor(p, style, composed = false) {
                     const k = key(a, b);
                     let w = memo.get(k);
                     if (w === undefined) {
-                        w = a >= b ? 0 : (fonts && composedWidth(p.text.slice(a, b), () => richDesignSpans(rt, a, b), fonts, pitch, tracking)) ?? m.measure(a, b);
+                        w = a >= b ? 0 : (fonts && composedWidth(p.text.slice(a, b), () => richDesignSpans(rt, a, b), fonts, pitch, tracking, flowIn)) ?? m.measure(a, b);
                         memo.set(k, w);
                     }
                     return w;
@@ -158,8 +181,10 @@ function measurerFor(p, style, composed = false) {
             if (w === undefined) {
                 const row = p.text.slice(a, b);
                 const s = row.replace(/[\u2066-\u2069]/g, '');
-                w = a >= b ? 0 : (fonts && composedWidth(row, () => [{ text: row, bold: false, italic: false }], fonts, pitch, tracking))
-                    ?? Math.max(0, flowTextWidth(s, font) + tracking * graphemeCount(s));
+                // The isolates of a line set its runs' levels and print nothing:
+                // they stay in the text whose runs are resolved, as in the layout.
+                w = a >= b ? 0 : (fonts && composedWidth(row, () => [{ text: row, bold: false, italic: false }], fonts, pitch, tracking, flowIn))
+                    ?? Math.max(0, (flowIn === flowTextWidth ? flowTextWidth(s, font) : flowIn(row, font)) + tracking * graphemeCount(s));
                 memo.set(k, w);
             }
             return w;
@@ -425,10 +450,13 @@ export function shapeTextCandidates(p, style, opts, count) {
             breakings.set(p, (byKey = new Map()));
         // The composition is part of the key: a line the CJK composer sets is
         // measured by composing it (#723).
-        const key = [mode, region, level, lang === 'ja', fontString(style), style.letterSpacing ?? 0, style.lineHeight, cjkCompositionKey(getCjkComposition())].join('|');
+        // So is the direction the lines are set at, which a document shaped
+        // in its own language measures them in (`flowMeasure`).
+        const base = vertical ? undefined : baseDirection(p.text, opts.locale);
+        const key = [mode, region, level, lang === 'ja', fontString(style), style.letterSpacing ?? 0, style.lineHeight, cjkCompositionKey(getCjkComposition()), base ?? ''].join('|');
         let b = byKey.get(key);
         if (!b)
-            byKey.set(key, (b = breakingOf(p, breakPoints(p, level, lang === 'ja'), measurerFor(p, style, true))));
+            byKey.set(key, (b = breakingOf(p, breakPoints(p, level, lang === 'ja'), measurerFor(p, style, true, base))));
         // Japanese phrase breaks weigh more than a perfect profile: columns
         // move by whole characters.
         const penaltyWeight = lang === 'ja' ? 1 : 0.5;