postext 1.4.2 → 1.5.0

package/dist/measure/breakRules.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Whether a line may end after the em or en dash `dash`, set closed between
+ * `prev` and `next` (the characters around it; undefined at the edge of the
+ * text, or where a space stands): "say—that’s", "riddles.—I", "Hamburg–Berlin".
+ * `beforePrev` is the character before `prev`, read the same way.
+ * The dash is the Unicode line-breaking class B2 (em) or BA (en), both of
+ * which allow a break after them. Never after a dash that opens an aside or a
+ * line of dialogue: a space before it ("—dijo"), or a space and a quotation
+ * mark (`said "—Hola`, German `sagte »—Ich`). A straight quote, `»`, `”` or
+ * `’` before the dash may open a quote as well as close one, so it counts as
+ * closing only after a letter, a digit or closing punctuation ("\"no\"—and",
+ * "boys'—and", "«no»—y"), and `»` also after a no-break space (French
+ * "« non »—et"). `“` and `«`, which German and Danish close with, count as
+ * closing only after a letter, a digit, `.`, `!`, `?` or `…` ("„nein“—und",
+ * "»nej«—og"). Never before punctuation ("él—,"), a quotation mark
+ * or a bracket ("thinking—\" and", "says—“no”", "says—(no)"), inside a run of
+ * dashes ("——"), or inside a range of numbers set with an en dash
+ * ("1914–1918"). A quote after a dash may close the speech as well as open
+ * one, and UAX #14 allows no break before it; pretext, which sets plain text
+ * line by line, keeps a dash with the quote or bracket after it, so both
+ * breakers agree.
+ */
+export declare function breaksAfterDash(prev: string | undefined, dash: string, next: string | undefined, beforePrev?: string): boolean;
+/** Whether `ch` is an em or an en dash. */
+export declare function isDash(ch: string | undefined): boolean;
+/** Whether `text` holds a compound (see {@link COMPOUND_RE}). A soft hyphen
+ *  next to the hyphen hides it, as it hides it from the breakers. */
+export declare function hasCompound(text: string): boolean;
+/**
+ * Whether a line may end after a hyphen the text carries, between `prev`
+ * and `next` (the characters around it): between two letters only
+ * ("meta-analyses", "UNE-EN"), never in "-5", "1-2" or "pre-(war)". The
+ * line then ends on that hyphen and nothing is added.
+ */
+export declare function breaksAfterHardHyphen(prev: string | undefined, next: string | undefined): boolean;
+/**
+ * How far a ragged line may fall short of its measure at the cost a
+ * justified line pays at its word-spacing limit, in ems of the text: the
+ * right-hand "glue" of a ragged setting in Knuth and Plass's model (TeX's
+ * `\rightskip` of `0pt plus 3em`). A shorter line costs less, a line short by
+ * more than this is priced like one stretched past the limit.
+ */
+export declare const RAGGED_STRETCH_EM = 3;
+/** The size of a CSS font string, in px (the `16px` of `italic 16px Serif`);
+ *  16 when it names none. */
+export declare function fontSizePxOf(font: string): number;
+/** The stretch a ragged line of `font` gets in the Knuth–Plass model (see
+ *  {@link RAGGED_STRETCH_EM}). */
+export declare function raggedStretchPx(font: string): number;
+//# sourceMappingURL=breakRules.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"breakRules.d.ts","sourceRoot":"","sources":["../../src/measure/breakRules.ts"],"names":[],"mappings":"AAyCA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAOT;AAED,2CAA2C;AAC3C,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEtD;AAQD;qEACqE;AACrE,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEjG;AAED;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC;6BAC6B;AAC7B,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIjD;AAED;kCACkC;AAClC,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD"}

package/dist/measure/breakRules.js

@@ -0,0 +1,116 @@
+// Break opportunities and costs shared by the plain and the rich line
+// breakers.
+const EM_DASH = '—';
+const EN_DASH = '–';
+/** What may stand right before a closed dash a line breaks after: a letter,
+ *  a digit, or punctuation that closes ("riddles.—I", "so,—and", "(1914)—the"). */
+const BEFORE_DASH_RE = /[\p{L}\p{N}.,;:!?)\]}»”’"'“«…]/u;
+/** The marks of {@link BEFORE_DASH_RE} that may open a quote as well as
+ *  close one: a straight quote, `»` (German opens with it), `”` (Swedish and
+ *  Finnish open with it), `’`, and `“` and `«`, which German and Danish
+ *  close with („nein“, »nej«) and English and Spanish open with. */
+const QUOTE_BEFORE_DASH_RE = /["'»”’“«]/u;
+/** What must stand before such a quote for it to close a word: a letter, a
+ *  digit or closing punctuation ("no"—and, “no.”—and, boys'—and). */
+const BEFORE_CLOSING_QUOTE_RE = /[\p{L}\p{N}.,;:!?)\]}…]/u;
+/** What must stand before `“` or `«` for it to close a word: a letter, a
+ *  digit, or a stop that ends the quoted words („nein“—und, „Nein!“—und,
+ *  »nej«—og). A comma, colon or bracket before them is taken for the start
+ *  of a quote. */
+const BEFORE_CLOSING_OPENER_RE = /[\p{L}\p{N}.!?…]/u;
+/** French sets a no-break space inside its guillemets: `»` after one closes
+ *  a quote (`« non »—et`). */
+const NO_BREAK_SPACE_RE = /[\u00A0\u202F]/u;
+/** What may follow a dash a line breaks after: a letter or a digit. Not a
+ *  quotation mark, which after a dash often closes the speech the dash broke
+ *  off (`thinking—" and`, German `dachte—“ sagte`), nor an opening bracket
+ *  or `¿`, which pretext keeps with the dash in plain text. */
+const AFTER_DASH_RE = /[\p{L}\p{N}]/u;
+const DIGIT_RE = /\p{N}/u;
+/** Whether the quotation mark `quote`, with `before` standing right before
+ *  it, closes a word (see {@link QUOTE_BEFORE_DASH_RE}). */
+function closesQuote(quote, before) {
+    if (before === undefined)
+        return false;
+    if (quote === '“' || quote === '«')
+        return BEFORE_CLOSING_OPENER_RE.test(before);
+    return BEFORE_CLOSING_QUOTE_RE.test(before) || (quote === '»' && NO_BREAK_SPACE_RE.test(before));
+}
+/**
+ * Whether a line may end after the em or en dash `dash`, set closed between
+ * `prev` and `next` (the characters around it; undefined at the edge of the
+ * text, or where a space stands): "say—that’s", "riddles.—I", "Hamburg–Berlin".
+ * `beforePrev` is the character before `prev`, read the same way.
+ * The dash is the Unicode line-breaking class B2 (em) or BA (en), both of
+ * which allow a break after them. Never after a dash that opens an aside or a
+ * line of dialogue: a space before it ("—dijo"), or a space and a quotation
+ * mark (`said "—Hola`, German `sagte »—Ich`). A straight quote, `»`, `”` or
+ * `’` before the dash may open a quote as well as close one, so it counts as
+ * closing only after a letter, a digit or closing punctuation ("\"no\"—and",
+ * "boys'—and", "«no»—y"), and `»` also after a no-break space (French
+ * "« non »—et"). `“` and `«`, which German and Danish close with, count as
+ * closing only after a letter, a digit, `.`, `!`, `?` or `…` ("„nein“—und",
+ * "»nej«—og"). Never before punctuation ("él—,"), a quotation mark
+ * or a bracket ("thinking—\" and", "says—“no”", "says—(no)"), inside a run of
+ * dashes ("——"), or inside a range of numbers set with an en dash
+ * ("1914–1918"). A quote after a dash may close the speech as well as open
+ * one, and UAX #14 allows no break before it; pretext, which sets plain text
+ * line by line, keeps a dash with the quote or bracket after it, so both
+ * breakers agree.
+ */
+export function breaksAfterDash(prev, dash, next, beforePrev) {
+    if (dash !== EM_DASH && dash !== EN_DASH)
+        return false;
+    if (prev === undefined || next === undefined)
+        return false;
+    if (!BEFORE_DASH_RE.test(prev) || !AFTER_DASH_RE.test(next))
+        return false;
+    if (QUOTE_BEFORE_DASH_RE.test(prev) && !closesQuote(prev, beforePrev))
+        return false;
+    if (dash === EN_DASH && DIGIT_RE.test(prev) && DIGIT_RE.test(next))
+        return false;
+    return true;
+}
+/** Whether `ch` is an em or an en dash. */
+export function isDash(ch) {
+    return ch === EM_DASH || ch === EN_DASH;
+}
+const LETTER_RE = /\p{L}/u;
+/** A compound: a hyphen between two letters ("after-dinner", "vencer-se"),
+ *  where {@link breaksAfterHardHyphen} lets a line end. */
+const COMPOUND_RE = /\p{L}-\p{L}/u;
+/** Whether `text` holds a compound (see {@link COMPOUND_RE}). A soft hyphen
+ *  next to the hyphen hides it, as it hides it from the breakers. */
+export function hasCompound(text) {
+    return text.includes('-') && COMPOUND_RE.test(text);
+}
+/**
+ * Whether a line may end after a hyphen the text carries, between `prev`
+ * and `next` (the characters around it): between two letters only
+ * ("meta-analyses", "UNE-EN"), never in "-5", "1-2" or "pre-(war)". The
+ * line then ends on that hyphen and nothing is added.
+ */
+export function breaksAfterHardHyphen(prev, next) {
+    return prev !== undefined && next !== undefined && LETTER_RE.test(prev) && LETTER_RE.test(next);
+}
+/**
+ * How far a ragged line may fall short of its measure at the cost a
+ * justified line pays at its word-spacing limit, in ems of the text: the
+ * right-hand "glue" of a ragged setting in Knuth and Plass's model (TeX's
+ * `\rightskip` of `0pt plus 3em`). A shorter line costs less, a line short by
+ * more than this is priced like one stretched past the limit.
+ */
+export const RAGGED_STRETCH_EM = 3;
+/** The size of a CSS font string, in px (the `16px` of `italic 16px Serif`);
+ *  16 when it names none. */
+export function fontSizePxOf(font) {
+    const m = /(\d*\.?\d+)px/.exec(font);
+    const size = m ? Number(m[1]) : 16;
+    return Number.isFinite(size) && size > 0 ? size : 16;
+}
+/** The stretch a ragged line of `font` gets in the Knuth–Plass model (see
+ *  {@link RAGGED_STRETCH_EM}). */
+export function raggedStretchPx(font) {
+    return RAGGED_STRETCH_EM * fontSizePxOf(font);
+}
+//# sourceMappingURL=breakRules.js.map

package/dist/measure/breakRules.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/measure/cache.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;AA2CpF,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,CAOf;AAED,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,CAOf"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/measure/cache.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;AAkEpF,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,CAOf;AAED,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,CAOf"}

package/dist/measure/cache.js

@@ -1,26 +1,47 @@
 import { measureBlock } from './plain';
 import { measureRichBlock } from './rich';
+import { getHyphenationLocale } from '../hyphenate';
+/** Options that change a block's lines, joined into its cache key. The
+ *  active hyphenation dictionary is one: soft hyphens (and the syllables an
+ *  overlong word is divided at) depend on it. */
+function optionsKey(options) {
+    return `${options?.textAlign ?? ''}\x00${options?.hyphenate ?? ''}\x00${options?.firstLineIndentPx ?? ''}\x00${options?.hangingIndent ?? ''}\x00${options?.optimal ?? ''}\x00${options?.maxStretchRatio ?? ''}\x00${options?.minShrinkRatio ?? ''}\x00${options?.runtPenalty ?? ''}\x00${options?.runtMinCharacters ?? ''}\x00${options?.looseness ?? ''}\x00${options?.letterSpacingPx ?? ''}\x00${options?.hyphenationZonePx ?? ''}\x00${getHyphenationLocale()}${options?.justifyTrackingPx ? `\x00${options.justifyTrackingPx}` : ''}${options?.runtGraded ? '\x00rg' : ''}${options?.avoidHyphenAtLines?.length ? `\x00ah${options.avoidHyphenAtLines.join(',')}` : ''}`;
+}
 function buildPlainCacheKey(text, font, maxWidthPx, lineHeightPx, options) {
-    return `${text}\x00${font}\x00${maxWidthPx}\x00${lineHeightPx}\x00${options?.textAlign ?? ''}\x00${options?.hyphenate ?? ''}\x00${options?.firstLineIndentPx ?? ''}\x00${options?.hangingIndent ?? ''}\x00${options?.optimal ?? ''}\x00${options?.maxStretchRatio ?? ''}\x00${options?.minShrinkRatio ?? ''}\x00${options?.runtPenalty ?? ''}\x00${options?.runtMinCharacters ?? ''}\x00${options?.looseness ?? ''}\x00${options?.letterSpacingPx ?? ''}`;
+    return `${text}\x00${font}\x00${maxWidthPx}\x00${lineHeightPx}\x00${optionsKey(options)}`;
 }
 /** A chip is one placeholder char in the span text: its words and resolved
  *  box decide its measure, so they join the key. */
 function chipCacheKey(chip) {
-    const words = chip.spans.map((s) => `${s.text}~${s.bold}~${s.italic}~${s.script ?? ''}`).join('~');
+    const words = chip.spans.map((s) => `${s.text}~${s.bold}~${s.italic}~${s.script ?? ''}${s.smallCaps ? '~sc' : ''}`).join('~');
     return `|chip:${words}|${chip.box ? JSON.stringify(chip.box) : ''}`;
 }
+/** A formula is one placeholder char in the span text too: its TeX decides
+ *  what is painted, and its render's size (which follows the maths font
+ *  scale, or is a placeholder's before the engine is ready) its measure. */
+function mathCacheKey(span) {
+    const render = span.mathRender;
+    return `|m:${span.math.tex}${render ? `|${render.widthPx}x${render.heightPx}` : ''}`;
+}
 function buildRichCacheKey(spans, fonts, maxWidthPx, lineHeightPx, options) {
-    const spanKey = spans.map((s) => `${s.text}|${s.bold}|${s.italic}|${s.ref?.resourceId ?? ''}${s.chip ? chipCacheKey(s.chip) : ''}`).join('\x01');
-    return `R\x00${spanKey}\x00${fonts[0]}\x00${fonts[1]}\x00${fonts[2]}\x00${fonts[3]}\x00${maxWidthPx}\x00${lineHeightPx}\x00${options?.textAlign ?? ''}\x00${options?.hyphenate ?? ''}\x00${options?.firstLineIndentPx ?? ''}\x00${options?.hangingIndent ?? ''}\x00${options?.optimal ?? ''}\x00${options?.maxStretchRatio ?? ''}\x00${options?.minShrinkRatio ?? ''}\x00${options?.runtPenalty ?? ''}\x00${options?.runtMinCharacters ?? ''}\x00${options?.looseness ?? ''}\x00${options?.letterSpacingPx ?? ''}`;
+    // Script and small-caps marks change the measure of the same text, and a
+    // formula or a swatch colour what a placeholder paints: they join the key
+    // only when set, so the common keys are unchanged.
+    const spanKey = spans.map((s) => `${s.text}|${s.bold}|${s.italic}|${s.ref?.resourceId ?? ''}${s.chip ? chipCacheKey(s.chip) : ''}${s.math ? mathCacheKey(s) : ''}${s.swatch ? `|sw:${s.swatch.color}` : ''}${s.script ? `|${s.script}` : ''}${s.smallCaps ? '|sc' : ''}`).join('\x01');
+    return `R\x00${spanKey}\x00${fonts[0]}\x00${fonts[1]}\x00${fonts[2]}\x00${fonts[3]}\x00${maxWidthPx}\x00${lineHeightPx}\x00${optionsKey(options)}`;
 }
+/** A cached result must read exactly like a fresh measure: the block's own
+ *  fields (`totalHeight`, `lastLineRunt`, whatever it gains) are carried
+ *  whole, and only the lines — which the pipeline shifts and stamps — are
+ *  copied. */
 function cloneMeasuredBlock(block) {
     return {
+        ...block,
         lines: block.lines.map((l) => ({
             ...l,
             bbox: { ...l.bbox },
             segments: l.segments ? l.segments.map((s) => ({ ...s })) : undefined,
         })),
-        totalHeight: block.totalHeight,
     };
 }
 export function cachedMeasureBlock(text, font, maxWidthPx, lineHeightPx, options, cache) {

package/dist/measure/cache.js.map

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

package/dist/measure/cjk.d.ts

@@ -0,0 +1,19 @@
+/** Whether the text holds any CJK character. */
+export declare function hasCJK(text: string): boolean;
+/** Whether the text holds words set without spaces between them (see
+ *  {@link CJK_RUN_RE}), which only a first-fit breaker can divide: optimal
+ *  line breaking breaks at spaces and hyphenation points. */
+export declare function hasCJKRun(text: string): boolean;
+/**
+ * Where a line may break inside a run of text with no spaces, as pretext's
+ * own breaker finds it: between two characters when either is CJK. Pretext's
+ * segments carry its kinsoku rules, so no line starts with closing
+ * punctuation (。、」ー…) and none ends with an opening bracket (「（…).
+ * Offsets into `text`, ascending; none when the run holds no CJK.
+ */
+export declare function cjkBreakIndices(text: string, font: string): number[];
+/** Whether a line may break where two runs meet with no space between them
+ *  (`**日本**語`): only between ideographs, under the same kinsoku rules as
+ *  inside a run. */
+export declare function cjkJoinBreaks(left: string, right: string, font: string): boolean;
+//# sourceMappingURL=cjk.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cjk.d.ts","sourceRoot":"","sources":["../../src/measure/cjk.ts"],"names":[],"mappings":"AAUA,gDAAgD;AAChD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE5C;AAUD;;6DAE6D;AAC7D,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAYpE;AAED;;oBAEoB;AACpB,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAKhF"}

package/dist/measure/cjk.js

@@ -0,0 +1,70 @@
+import { prepareWithSegments } from '@chenglou/pretext';
+/**
+ * Chinese, Japanese and Korean: scripts set without spaces between words.
+ * The ranges pretext's line breaker treats as breakable between characters
+ * (CJK punctuation and fullwidth forms included), so the plain and the rich
+ * breaker agree on where such text may break.
+ */
+const CJK_RE = /[\u3000-\u30FF\u3130-\u318F\u3400-\u4DBF\u4E00-\u9FFF\uAC00-\uD7AF\uF900-\uFAFF\uFF00-\uFFEF\u{20000}-\u{2A6DF}\u{2A700}-\u{2EE5D}\u{2F800}-\u{2FA1F}\u{30000}-\u{33479}]/u;
+/** Whether the text holds any CJK character. */
+export function hasCJK(text) {
+    return CJK_RE.test(text);
+}
+/**
+ * Words set without spaces: two ideographs, kana or hangul syllables in a
+ * row (the iteration marks 々 〆 〇 count as ideographs). CJK punctuation,
+ * brackets (〈 「), the middle dot ・ alone and fullwidth signs (％ ＋) do
+ * not: quoted in Latin text they need no break between characters.
+ */
+const CJK_RUN_RE = /[\u3005-\u3007\u3040-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3400-\u4DBF\u4E00-\u9FFF\uAC00-\uD7AF\uF900-\uFAFF\uFF66-\uFF9F\u{20000}-\u{2A6DF}\u{2A700}-\u{2EE5D}\u{2F800}-\u{2FA1F}\u{30000}-\u{33479}]{2}/u;
+/** Whether the text holds words set without spaces between them (see
+ *  {@link CJK_RUN_RE}), which only a first-fit breaker can divide: optimal
+ *  line breaking breaks at spaces and hyphenation points. */
+export function hasCJKRun(text) {
+    return CJK_RUN_RE.test(text);
+}
+/**
+ * Where a line may break inside a run of text with no spaces, as pretext's
+ * own breaker finds it: between two characters when either is CJK. Pretext's
+ * segments carry its kinsoku rules, so no line starts with closing
+ * punctuation (。、」ー…) and none ends with an opening bracket (「（…).
+ * Offsets into `text`, ascending; none when the run holds no CJK.
+ */
+export function cjkBreakIndices(text, font) {
+    if (!CJK_RE.test(text))
+        return [];
+    const segments = prepareWithSegments(text, font).segments;
+    if (segments.join('') !== text)
+        return [];
+    const out = [];
+    let at = 0;
+    for (let k = 0; k < segments.length; k++) {
+        const seg = segments[k];
+        if (k > 0 && at > 0 && (CJK_RE.test(lastChar(segments[k - 1])) || CJK_RE.test(firstChar(seg))))
+            out.push(at);
+        at += seg.length;
+    }
+    return out;
+}
+/** Whether a line may break where two runs meet with no space between them
+ *  (`**日本**語`): only between ideographs, under the same kinsoku rules as
+ *  inside a run. */
+export function cjkJoinBreaks(left, right, font) {
+    const a = lastChar(left);
+    const b = firstChar(right);
+    if (a === '' || b === '')
+        return false;
+    return cjkBreakIndices(a + b, font).length > 0;
+}
+function firstChar(text) {
+    const cp = text.codePointAt(0);
+    return cp === undefined ? '' : String.fromCodePoint(cp);
+}
+function lastChar(text) {
+    if (text.length === 0)
+        return '';
+    const low = text.charCodeAt(text.length - 1);
+    const start = low >= 0xdc00 && low <= 0xdfff && text.length > 1 ? text.length - 2 : text.length - 1;
+    return text.slice(start);
+}
+//# sourceMappingURL=cjk.js.map

package/dist/measure/cjk.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cjk.js","sourceRoot":"","sources":["../../src/measure/cjk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD;;;;;GAKG;AACH,MAAM,MAAM,GAAG,4KAA4K,CAAC;AAE5L,gDAAgD;AAChD,MAAM,UAAU,MAAM,CAAC,IAAY;IACjC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,GAAG,yMAAyM,CAAC;AAE7N;;6DAE6D;AAC7D,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,IAAY;IACxD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1D,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IAC1C,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9G,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC;IACnB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;oBAEoB;AACpB,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,KAAa,EAAE,IAAY;IACrE,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzB,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,KAAK,CAAC;IACvC,OAAO,eAAe,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC/B,OAAO,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,GAAG,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IACpG,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC"}

package/dist/measure/font.d.ts

@@ -1,24 +1,40 @@
-import type { HyphenationLocale } from '../types';
+import type { LocaleTag } from '../types';
 import type { MeasurementCache } from './types';
 /**
  * Build a CSS font shorthand string for canvas / pretext.
  * Example: "75px EB Garamond"
  */
 export declare function buildFontString(fontFamily: string, fontSizePx: number, weight?: string, style?: string): string;
+/** Whether a `fontFamily` value is a CSS font stack (`'EB Garamond',
+ *  Georgia, serif`) rather than one family: it has a comma outside quotes. */
+export declare function isFontStack(fontFamily: string): boolean;
+/**
+ * The one family a `fontFamily` value sets text in. A `fontFamily` names a
+ * single family: canvas, HTML and PDF must measure and paint the same face,
+ * and the PDF embeds a font per family, with no fallback chain. A CSS font
+ * stack is therefore cut to its first family (`'EB Garamond', serif` →
+ * `EB Garamond`) instead of being read as one family whose name has a
+ * comma in it — which matched no face and measured with a fallback font.
+ * Any other value comes back unchanged (a comma inside quotes is part of
+ * the name).
+ */
+export declare function primaryFontFamily(fontFamily: string): string;
 /**
  * A family name the CSS font shorthand would not take bare — a word that
  * starts with a digit ("Optima 105", "DIN Pro 120"), a character outside
  * letters, digits, spaces, hyphens and underscores — goes in double quotes;
  * canvas silently ignores the whole shorthand otherwise. Plain names stay
  * bare (the existing font-string cache keys), and a name already quoted is
- * left alone.
+ * left alone. A font stack sets in its first family (see
+ * {@link primaryFontFamily}).
  */
 export declare function quoteFamily(fontFamily: string): string;
 /**
- * Initializes the hyphenator for a given locale.
- * Must be called before measureBlock is used with hyphenation.
+ * Initializes the hyphenator for a given locale (any BCP 47 tag; see
+ * `matchHyphenationLocale`). Must be called before measureBlock is used with
+ * hyphenation.
  */
-export declare function initHyphenator(locale: HyphenationLocale): void;
+export declare function initHyphenator(locale: LocaleTag): void;
 /**
  * Clear pretext's internal measurement caches and the engine's own
  * text-width cache. Call this after fonts finish loading (or are removed)

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

@@ -1 +1 @@
-{"version":3,"file":"font.d.ts","sourceRoot":"","sources":["../../src/measure/font.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAGlD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAiB,EACzB,KAAK,GAAE,MAAiB,GACvB,MAAM,CAOR;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAKtD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAE9D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAED,wBAAgB,sBAAsB,IAAI,gBAAgB,CAEzD"}
+{"version":3,"file":"font.d.ts","sourceRoot":"","sources":["../../src/measure/font.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAiB,EACzB,KAAK,GAAE,MAAiB,GACvB,MAAM,CAOR;AAgCD;8EAC8E;AAC9E,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAG5D;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAKtD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAEtD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAED,wBAAgB,sBAAsB,IAAI,gBAAgB,CAEzD"}

package/dist/measure/font.js

@@ -15,16 +15,72 @@ export function buildFontString(fontFamily, fontSizePx, weight = 'normal', style
     parts.push(quoteFamily(fontFamily));
     return parts.join(' ');
 }
+/** The families of a CSS font stack, split at the commas outside quotes,
+ *  trimmed and unquoted, empty entries dropped — or `undefined` when the
+ *  value has no comma outside quotes (it names one family). */
+function stackFamilies(fontFamily) {
+    const out = [];
+    let quote;
+    let start = 0;
+    let split = false;
+    const push = (end) => {
+        let f = fontFamily.slice(start, end).trim();
+        if (f.length >= 2 && /^["']/.test(f) && f.endsWith(f[0]))
+            f = f.slice(1, -1).trim();
+        if (f.length > 0)
+            out.push(f);
+    };
+    for (let i = 0; i < fontFamily.length; i++) {
+        const c = fontFamily[i];
+        if (quote) {
+            if (c === quote)
+                quote = undefined;
+        }
+        else if (c === '"' || c === "'") {
+            quote = c;
+        }
+        else if (c === ',') {
+            push(i);
+            start = i + 1;
+            split = true;
+        }
+    }
+    if (!split)
+        return undefined;
+    push(fontFamily.length);
+    return out;
+}
+/** Whether a `fontFamily` value is a CSS font stack (`'EB Garamond',
+ *  Georgia, serif`) rather than one family: it has a comma outside quotes. */
+export function isFontStack(fontFamily) {
+    return fontFamily.includes(',') && (stackFamilies(fontFamily)?.length ?? 0) > 0;
+}
+/**
+ * The one family a `fontFamily` value sets text in. A `fontFamily` names a
+ * single family: canvas, HTML and PDF must measure and paint the same face,
+ * and the PDF embeds a font per family, with no fallback chain. A CSS font
+ * stack is therefore cut to its first family (`'EB Garamond', serif` →
+ * `EB Garamond`) instead of being read as one family whose name has a
+ * comma in it — which matched no face and measured with a fallback font.
+ * Any other value comes back unchanged (a comma inside quotes is part of
+ * the name).
+ */
+export function primaryFontFamily(fontFamily) {
+    if (!fontFamily.includes(','))
+        return fontFamily;
+    return stackFamilies(fontFamily)?.[0] ?? fontFamily;
+}
 /**
  * A family name the CSS font shorthand would not take bare — a word that
  * starts with a digit ("Optima 105", "DIN Pro 120"), a character outside
  * letters, digits, spaces, hyphens and underscores — goes in double quotes;
  * canvas silently ignores the whole shorthand otherwise. Plain names stay
  * bare (the existing font-string cache keys), and a name already quoted is
- * left alone.
+ * left alone. A font stack sets in its first family (see
+ * {@link primaryFontFamily}).
  */
 export function quoteFamily(fontFamily) {
-    const f = fontFamily.trim();
+    const f = primaryFontFamily(fontFamily).trim();
     if (/^["'].*["']$/.test(f))
         return f;
     if (/(^|\s)\d/.test(f) || /[^\w\s-]/.test(f))
@@ -32,8 +88,9 @@ export function quoteFamily(fontFamily) {
     return f;
 }
 /**
- * Initializes the hyphenator for a given locale.
- * Must be called before measureBlock is used with hyphenation.
+ * Initializes the hyphenator for a given locale (any BCP 47 tag; see
+ * `matchHyphenationLocale`). Must be called before measureBlock is used with
+ * hyphenation.
  */
 export function initHyphenator(locale) {
     setHyphenationLocale(locale);

package/dist/measure/font.js.map

@@ -1 +1 @@
-{"version":3,"file":"font.js","sourceRoot":"","sources":["../../src/measure/font.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,UAAkB,EAClB,UAAkB,EAClB,SAAiB,QAAQ,EACzB,QAAgB,QAAQ;IAExB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,KAAK,KAAK,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,MAAM,KAAK,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,CAAC,CAAC;IAC9B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;IACpC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CAAC,UAAkB;IAC5C,MAAM,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACrC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;IACnF,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,MAAyB;IACtD,oBAAoB,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB;IACnC,UAAU,EAAE,CAAC;IACb,mBAAmB,EAAE,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;AAChC,CAAC"}
+{"version":3,"file":"font.js","sourceRoot":"","sources":["../../src/measure/font.ts"],"names":[],"mappings":"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"}

package/dist/measure/index.d.ts

@@ -1,7 +1,21 @@
-export type { MeasuredBlock, MeasurementCache, MeasureBlockOptions } from './types';
+import type { InlineSpan } from '../parse';
+import type { MeasuredBlock, MeasurementCache, MeasureBlockOptions } from './types';
+export type { BreakTrace, LineWidthStep, MeasuredBlock, MeasurementCache, MeasureBlockOptions } from './types';
 export { buildFontString, initHyphenator, clearMeasurementCache, createMeasurementCache } from './font';
 export { measureGlyphWidth, measureTextWidth } from './canvas';
 export { measureBlock } from './plain';
 export { measureRichBlock } from './rich';
-export { cachedMeasureBlock, cachedMeasureRichBlock } from './cache';
+/** {@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
+ *  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 declare function cachedMeasureBlock(text: string, font: string, maxWidthPx: number, lineHeightPx: number, options: MeasureBlockOptions | undefined, cache: MeasurementCache): MeasuredBlock;
+/** {@link measureRichBlock} through `cache`, as {@link cachedMeasureBlock}
+ *  does it: a measurement with `options.keepBreaks` or
+ *  `options.restWidths` is never cached. */
+export declare function cachedMeasureRichBlock(spans: InlineSpan[], normalFont: string, boldFont: string, italicFont: string, boldItalicFont: string, maxWidthPx: number, lineHeightPx: number, options: MeasureBlockOptions | undefined, cache: MeasurementCache): MeasuredBlock;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/measure/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AACpF,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,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC"}
+{"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;AAwC1C;;;;;;;+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

@@ -1,6 +1,66 @@
+import { measureBlock } from './plain';
+import { measureRichBlock } from './rich';
+import { cachedMeasureBlock as cachedPlainBlock, cachedMeasureRichBlock as cachedRichBlock } from './cache';
+import { hasCompound } from './breakRules';
 export { buildFontString, initHyphenator, clearMeasurementCache, createMeasurementCache } from './font';
 export { measureGlyphWidth, measureTextWidth } from './canvas';
 export { measureBlock } from './plain';
 export { measureRichBlock } from './rich';
-export { cachedMeasureBlock, cachedMeasureRichBlock } from './cache';
+/** The caches that hold measurements made with the line-breaking options
+ *  added after postext 1.4 (`breakAfterDashes`, `optimalRagged`,
+ *  `breakAfterHyphens`, `hyphenateCompounds: false`, `repeatHyphen`), per
+ *  cache and per combination of them. `measure/cache.ts` keys a block on
+ *  the options it knew; a block measured with one of these goes to a cache
+ *  of its own, so each combination keeps its own lines and the keys of the
+ *  others are unchanged. A worker that drops its cache for a fresh one
+ *  drops these with it. */
+const optionVariants = new WeakMap();
+const DASH_RE = /[\u2013\u2014]/;
+/** The cache for a measurement of `text` with `options`. An option that
+ *  cannot change these lines (no dash or compound in the text, justified or
+ *  first-fit text, hyphenation off) leaves it in the shared one. */
+function cacheFor(cache, options, text) {
+    const dashes = options?.breakAfterDashes === true && DASH_RE.test(text);
+    const ragged = options?.optimalRagged === true && options.optimal === true && (options.textAlign ?? 'left') !== 'justify';
+    const compound = (options?.breakAfterHyphens === true || options?.repeatHyphen === true
+        || (options?.hyphenateCompounds === false && options.hyphenate === true)) && hasCompound(text);
+    const hyphens = compound && options?.breakAfterHyphens === true;
+    const whole = compound && options?.hyphenateCompounds === false && options.hyphenate === true;
+    const repeat = compound && options?.repeatHyphen === true;
+    const variant = `${dashes ? 'd' : ''}${ragged ? 'r' : ''}${hyphens ? 'h' : ''}${whole ? 'w' : ''}${repeat ? 'p' : ''}`;
+    if (variant === '')
+        return cache;
+    let byVariant = optionVariants.get(cache);
+    if (!byVariant) {
+        byVariant = new Map();
+        optionVariants.set(cache, byVariant);
+    }
+    let own = byVariant.get(variant);
+    if (!own) {
+        own = { _blocks: new Map() };
+        byVariant.set(variant, own);
+    }
+    return own;
+}
+/** {@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
+ *  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
+        ? measureBlock(text, font, maxWidthPx, lineHeightPx, options)
+        : cachedPlainBlock(text, font, maxWidthPx, lineHeightPx, options, cacheFor(cache, options, text));
+}
+/** {@link measureRichBlock} through `cache`, as {@link cachedMeasureBlock}
+ *  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
+        ? 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('')));
+}
 //# sourceMappingURL=index.js.map