postext 1.8.6 → 1.9.1

package/dist/measure/canvas.d.ts

@@ -1,7 +1,32 @@
 export declare function measureTextWidth(text: string, font: string): number;
+/**
+ * The width of `text` set in one run, as the browser paints it: two CJK
+ * marks that meet are not measured apart (see {@link measureTextWidth}).
+ * For the pieces a renderer paints apart (`markPieces`), each of which
+ * holds only pairs the layout measured whole.
+ */
+export declare function measureRunWidth(text: string, font: string): number;
 /** Drop all cached text widths. Must be called whenever font faces are
  *  (un)registered: widths measured against fallback glyphs are stale. */
 export declare function clearTextWidthCache(): void;
+/** Called whenever {@link clearTextWidthCache} drops the widths (fonts
+ *  changed): other font-dependent caches clear with it. */
+export declare function onTextWidthCacheClear(listener: () => void): void;
+/** The ink box of `text` in `font` above and below the alphabetic
+ *  baseline (px), or null when the measurer gives no ink metrics. Not
+ *  cached. */
+export declare function measureInkBox(text: string, font: string): {
+    ascent: number;
+    descent: number;
+} | null;
+/** Where the ink of `text` in `font` starts and ends along the line, px
+ *  from the pen's origin (the start is negative when the ink overhangs
+ *  it), or null when the measurer gives no ink metrics or the text has no
+ *  ink. Not cached. */
+export declare function measureInkExtent(text: string, font: string): {
+    start: number;
+    end: number;
+} | null;
 /** Measure a short glyph (e.g. a list bullet) in the given font. */
 export declare function measureGlyphWidth(text: string, font: string): number;
 /** Compute the normal space width for a given font, used to express justified

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

@@ -1 +1 @@
-{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../src/measure/canvas.ts"],"names":[],"mappings":"AA0BA,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAyBnE;AAED;yEACyE;AACzE,wBAAgB,mBAAmB,IAAI,IAAI,CAG1C;AAED,oEAAoE;AACpE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED;oDACoD;AACpD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD"}
+{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../src/measure/canvas.ts"],"names":[],"mappings":"AA6BA,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CA+BnE;AAMD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAuBlE;AAED;yEACyE;AACzE,wBAAgB,mBAAmB,IAAI,IAAI,CAM1C;AAID;2DAC2D;AAC3D,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAEhE;AAED;;cAEc;AACd,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAWpG;AAED;;;uBAGuB;AACvB,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAYlG;AAED,oEAAoE;AACpE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED;oDACoD;AACpD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD"}

package/dist/measure/canvas.js

@@ -1,3 +1,5 @@
+import { cjkMarkPieces } from './cjkClasses';
+import { hasCJK } from './cjk';
 let _measureCtx = null;
 /** Font string currently set on the measure context, to skip redundant
  *  `ctx.font` assignments (each assignment re-parses the shorthand). */
@@ -36,7 +38,16 @@ export function measureTextWidth(text, font) {
         ctx.font = font;
         _currentFont = font;
     }
-    const width = ctx.measureText(text).width;
+    // Two CJK marks side by side (`）》`, `”“`) are measured apart: the
+    // browser would set the first half width in one run (see
+    // `cjkMarkCuts`), and the renderers paint them apart. Text with no CJK
+    // is never cut (`markCuts`): one measure, with no cut to look for.
+    let width = 0;
+    if (!hasCJK(text))
+        width += ctx.measureText(text).width;
+    else
+        for (const piece of cjkMarkPieces(text, true))
+            width += ctx.measureText(piece).width;
     if (_widthCacheEntries >= MAX_WIDTH_CACHE_ENTRIES) {
         _widthCaches = new Map();
         _widthCacheEntries = 0;
@@ -47,11 +58,89 @@ export function measureTextWidth(text, font) {
     _widthCacheEntries++;
     return width;
 }
+// Widths of runs as the browser sets them (see `measureRunWidth`).
+let _runCaches = new Map();
+let _runCacheEntries = 0;
+/**
+ * The width of `text` set in one run, as the browser paints it: two CJK
+ * marks that meet are not measured apart (see {@link measureTextWidth}).
+ * For the pieces a renderer paints apart (`markPieces`), each of which
+ * holds only pairs the layout measured whole.
+ */
+export function measureRunWidth(text, font) {
+    let byText = _runCaches.get(font);
+    if (byText === undefined) {
+        byText = new Map();
+        _runCaches.set(font, byText);
+    }
+    const cached = byText.get(text);
+    if (cached !== undefined)
+        return cached;
+    const ctx = getMeasureCtx();
+    if (font !== _currentFont) {
+        ctx.font = font;
+        _currentFont = font;
+    }
+    const width = ctx.measureText(text).width;
+    if (_runCacheEntries >= MAX_WIDTH_CACHE_ENTRIES) {
+        _runCaches = new Map();
+        _runCacheEntries = 0;
+        byText = new Map();
+        _runCaches.set(font, byText);
+    }
+    byText.set(text, width);
+    _runCacheEntries++;
+    return width;
+}
 /** Drop all cached text widths. Must be called whenever font faces are
  *  (un)registered: widths measured against fallback glyphs are stale. */
 export function clearTextWidthCache() {
     _widthCaches = new Map();
     _widthCacheEntries = 0;
+    _runCaches = new Map();
+    _runCacheEntries = 0;
+    for (const listener of _fontChangeListeners)
+        listener();
+}
+const _fontChangeListeners = new Set();
+/** Called whenever {@link clearTextWidthCache} drops the widths (fonts
+ *  changed): other font-dependent caches clear with it. */
+export function onTextWidthCacheClear(listener) {
+    _fontChangeListeners.add(listener);
+}
+/** The ink box of `text` in `font` above and below the alphabetic
+ *  baseline (px), or null when the measurer gives no ink metrics. Not
+ *  cached. */
+export function measureInkBox(text, font) {
+    const ctx = getMeasureCtx();
+    if (font !== _currentFont) {
+        ctx.font = font;
+        _currentFont = font;
+    }
+    const m = ctx.measureText(text);
+    const ascent = m.actualBoundingBoxAscent;
+    const descent = m.actualBoundingBoxDescent;
+    if (typeof ascent !== 'number' || typeof descent !== 'number' || !Number.isFinite(ascent) || !Number.isFinite(descent))
+        return null;
+    return { ascent, descent };
+}
+/** Where the ink of `text` in `font` starts and ends along the line, px
+ *  from the pen's origin (the start is negative when the ink overhangs
+ *  it), or null when the measurer gives no ink metrics or the text has no
+ *  ink. Not cached. */
+export function measureInkExtent(text, font) {
+    const ctx = getMeasureCtx();
+    if (font !== _currentFont) {
+        ctx.font = font;
+        _currentFont = font;
+    }
+    const m = ctx.measureText(text);
+    const left = m.actualBoundingBoxLeft;
+    const right = m.actualBoundingBoxRight;
+    if (typeof left !== 'number' || typeof right !== 'number' || !Number.isFinite(left) || !Number.isFinite(right))
+        return null;
+    const start = -left;
+    return right > start ? { start, end: right } : null;
 }
 /** Measure a short glyph (e.g. a list bullet) in the given font. */
 export function measureGlyphWidth(text, font) {

package/dist/measure/canvas.js.map

@@ -1 +1 @@
-{"version":3,"file":"canvas.js","sourceRoot":"","sources":["../../src/measure/canvas.ts"],"names":[],"mappings":"AAAA,IAAI,WAAW,GAAwE,IAAI,CAAC;AAC5F;wEACwE;AACxE,IAAI,YAAY,GAAG,EAAE,CAAC;AAEtB,SAAS,aAAa;IACpB,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,IAAI,OAAO,eAAe,KAAK,WAAW,EAAE,CAAC;YAC3C,WAAW,GAAG,IAAI,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAE,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,IAAI,CAAE,CAAC;QACnE,CAAC;QACD,YAAY,GAAG,EAAE,CAAC;IACpB,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,yEAAyE;AACzE,yEAAyE;AACzE,0EAA0E;AAC1E,0EAA0E;AAC1E,6DAA6D;AAC7D,MAAM,uBAAuB,GAAG,OAAO,CAAC;AACxC,IAAI,YAAY,GAAG,IAAI,GAAG,EAA+B,CAAC;AAC1D,IAAI,kBAAkB,GAAG,CAAC,CAAC;AAE3B,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,IAAY;IACzD,IAAI,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACnB,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IAExC,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC1B,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAChB,YAAY,GAAG,IAAI,CAAC;IACtB,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE1C,IAAI,kBAAkB,IAAI,uBAAuB,EAAE,CAAC;QAClD,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,kBAAkB,GAAG,CAAC,CAAC;QACvB,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACnB,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxB,kBAAkB,EAAE,CAAC;IACrB,OAAO,KAAK,CAAC;AACf,CAAC;AAED;yEACyE;AACzE,MAAM,UAAU,mBAAmB;IACjC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;IACzB,kBAAkB,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,iBAAiB,CAAC,IAAY,EAAE,IAAY;IAC1D,OAAO,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACtC,CAAC;AAED;oDACoD;AACpD,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,OAAO,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AACrC,CAAC"}
+{"version":3,"file":"canvas.js","sourceRoot":"","sources":["../../src/measure/canvas.ts"],"names":[],"mappings":"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"}

package/dist/measure/cjk.d.ts

@@ -1,19 +1,14 @@
+import { type CjkLineBreakLevel } from './cjkClasses';
 /** 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. */
+ *  {@link CJK_RUN_RE}): such a paragraph breaks between characters. */
 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;
+ *  (`**日本**語`), in a paragraph set word by word: next to a CJK character
+ *  only — the marks Latin text shares with Chinese (— … “ ”) count as
+ *  Latin here — under the prohibitions of `level` (the document's
+ *  `cjk.lineBreak` by default), so no line starts with closing punctuation
+ *  (。、」…) and none ends with an opening bracket (「（…). */
+export declare function cjkJoinBreaks(left: string, right: string, level?: CjkLineBreakLevel): boolean;
 //# sourceMappingURL=cjk.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"cjk.d.ts","sourceRoot":"","sources":["../../src/measure/cjk.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+D,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAYnH,gDAAgD;AAChD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE5C;AAWD;uEACuE;AACvE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED;;;;;0DAK0D;AAC1D,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,iBAAqC,GAAG,OAAO,CAShH"}

package/dist/measure/cjk.js

@@ -1,70 +1,46 @@
-import { prepareWithSegments } from '@chenglou/pretext';
+import { cjkBreakAllowed, cjkClassOf, getCjkLineBreak, isCjkGrapheme } from './cjkClasses';
+import { lastGrapheme } from './graphemes';
 /**
  * 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.
+ * The Han, kana and hangul ranges, the CJK punctuation and symbol blocks,
+ * and the halfwidth and fullwidth forms — never the marks Latin text shares
+ * with Chinese (— … · “ ”), nor the unit squares (㎡ ㎏ ㏄, see
+ * `isUnitSquare`), which alone say nothing about the language.
  */
-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;
+const CJK_RE = /[\u1100-\u11FF\u2E80-\u2FDF\u2FF0-\u2FFF\u3000-\u3370\u337B-\u337F\u33E0-\u33FE\u3400-\u4DBF\u4E00-\u9FFF\uA960-\uA97F\uAC00-\uD7FF\uF900-\uFAFF\uFE10-\uFE1F\uFE30-\uFE6F\uFF00-\uFFEF\u{16FE0}-\u{16FFF}\u{1B000}-\u{1B16F}\u{1F200}-\u{1F2FF}\u{20000}-\u{3FFFF}]/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.
+ * Words set without spaces: two ideographs, kana, bopomofo 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;
+const CJK_RUN_RE = /[\u3005-\u3007\u3040-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3100-\u312F\u31A0-\u31BF\u3400-\u4DBF\u4E00-\u9FFF\uAC00-\uD7AF\uF900-\uFAFF\uFF66-\uFF9F\u{20000}-\u{3FFFF}]{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. */
+ *  {@link CJK_RUN_RE}): such a paragraph breaks between characters. */
 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 === '')
+ *  (`**日本**語`), in a paragraph set word by word: next to a CJK character
+ *  only — the marks Latin text shares with Chinese (— … “ ”) count as
+ *  Latin here — under the prohibitions of `level` (the document's
+ *  `cjk.lineBreak` by default), so no line starts with closing punctuation
+ *  (。、」…) and none ends with an opening bracket (「（…). */
+export function cjkJoinBreaks(left, right, level = getCjkLineBreak()) {
+    const a = lastGrapheme(left);
+    const cp = right.codePointAt(0);
+    if (a === '' || cp === undefined)
         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);
+    const b = String.fromCodePoint(cp);
+    const aCjk = CJK_RE.test(a);
+    const bCjk = CJK_RE.test(b);
+    if (!aCjk && !bCjk)
+        return false;
+    return cjkBreakAllowed(cjkClassOf(a), isCjkGrapheme(a), cjkClassOf(b), isCjkGrapheme(b), level);
 }
 //# sourceMappingURL=cjk.js.map

package/dist/measure/cjk.js.map

@@ -1 +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"}
+{"version":3,"file":"cjk.js","sourceRoot":"","sources":["../../src/measure/cjk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAA0B,MAAM,cAAc,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,MAAM,GAAG,uQAAuQ,CAAC;AAEvR,gDAAgD;AAChD,MAAM,UAAU,MAAM,CAAC,IAAY;IACjC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,GAAG,0KAA0K,CAAC;AAE9L;uEACuE;AACvE,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;0DAK0D;AAC1D,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,KAAa,EAAE,QAA2B,eAAe,EAAE;IACrG,MAAM,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC/C,MAAM,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACjC,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAClG,CAAC"}

package/dist/measure/cjkAnnotate.d.ts

@@ -0,0 +1,96 @@
+/**
+ * Geometry of ruby readings (#194) and warichu notes (#195) inside a line,
+ * for the CJK composer.
+ *
+ * Everything is in the flow frame: `dx` along the line from where the
+ * annotated segment starts, `dy` across it from the line's baseline to the
+ * annotation's baseline, positive towards the line's foot (down in
+ * horizontal text, left in vertical text). A character's em box is centred
+ * on the font's central axis, {@link CENTRAL} em above the baseline, the
+ * axis vertical text is set on (`VDTFlowFrame.centralBaselines`) and the
+ * middle of a CJK face's ideographic em box in horizontal text.
+ *
+ * - Ruby over or under the base sits in the line gap, against the base's em
+ *   box, centred on the base; a reading wider than its base widens the base's
+ *   box (the base is centred in it) less what it may pass the base by: a
+ *   quarter of the ruby em onto a neighbour without ruby, none past a line
+ *   edge (the composer shifts it back), and it keeps a quarter of the ruby
+ *   em from a neighbour's reading (two zhuyin readings: a quarter of the
+ *   symbols' em).
+ * - Zhuyin right of the base (horizontal text) stacks its symbols in a
+ *   column beside each character, at 60 % of the ruby size (0.3 em by
+ *   default, clreq §5.5.3.2), the tone mark right of the column with half
+ *   of its ink above the top of the last symbol (§5.5.3.3), the
+ *   neutral-tone dot above the first in a tenth of an em; the character's
+ *   box grows by the column. Zhuyin over the base of vertical text is the
+ *   same column down the line, its tone mark and dot standing upright.
+ *   Tone marks and the dot are placed by their ink (the measurer's ink
+ *   box): fonts set these modifier letters high in their em box.
+ * - A warichu note's part on a line folds into two rows of the note size,
+ *   centred on the line's axis with no gap between them: the upper row
+ *   takes characters until it is at least half the part (the second row is
+ *   never the longer), and one more while the lower row would open with a
+ *   mark that may not start a line or the upper row would end with one
+ *   that may not end a line (an opening bracket).
+ */
+import type { VDTAnnotationRun } from '../vdt';
+/** The central axis of a face, in em above its baseline. */
+export declare const CENTRAL = 0.38;
+/** Zhuyin is set at this fraction of the ruby size (0.3 em of the text for
+ *  the default half-em ruby). */
+export declare const ZHUYIN_SIZE_RATIO = 0.6;
+/** Whether a reading is zhuyin (bopomofo). */
+export declare function isZhuyin(reading: string): boolean;
+/** `font` at `sizePx`, style, weight and family kept. */
+export declare function withFontSize(font: string, sizePx: number): string;
+/** What a ruby base is set with. */
+export interface RubyInput {
+    reading: string;
+    fontString: string;
+    /** `over` / `under` the base, or `right` of each character in the line
+     *  (zhuyin, horizontal text). */
+    position: 'over' | 'under' | 'right';
+    /** The base's advance and the text's em (px). */
+    baseWidth: number;
+    em: number;
+    /** How far the reading may pass the base's box on each side (px): a
+     *  quarter of the ruby em onto a neighbour without ruby, 0 at a line
+     *  edge, negative (keep apart) next to another reading. */
+    allowLeft: number;
+    allowRight: number;
+}
+/** How a ruby base is set: its box's advance, where the base sits in it
+ *  (`inset`), the reading's advance and the runs painted. */
+export interface RubyGeometry {
+    width: number;
+    inset: number;
+    rtWidth: number;
+    runs: VDTAnnotationRun[];
+    /** What the reading could pass the box by on each side (the input's). */
+    allowLeft: number;
+    allowRight: number;
+}
+/**
+ * The geometry of a ruby base (see the module comment). Measured in the
+ * writing mode the composer runs in: a vertical reading advances cell by
+ * cell down the line.
+ */
+export declare function rubyGeometry(input: RubyInput): RubyGeometry;
+/** The advance of a reading along the line (a zhuyin reading: its
+ *  symbols' column, tone marks aside), before its base is sized. */
+export declare function readingAdvance(reading: string, fontString: string, position: 'over' | 'under' | 'right'): number;
+/** Where the upper row of a warichu part ends (units `[0, at)`): see the
+ *  module comment. `startProhibited[i]`: unit `i` may not open a row;
+ *  `endProhibited[i]`: unit `i` may not close one (an opening bracket), so
+ *  the upper row takes the unit after it too. */
+export declare function splitNote(widths: readonly number[], startProhibited: readonly boolean[], endProhibited?: readonly boolean[]): number;
+/** The advance of a warichu part folded at `at`: the wider row. */
+export declare function foldWidth(widths: readonly number[], at: number): number;
+/** The baselines of a warichu part's rows (px from the line's baseline):
+ *  the upper row's em box ends at the line's axis, the lower one's starts
+ *  there. */
+export declare function noteRowBaselines(em: number, noteEm: number): {
+    upper: number;
+    lower: number;
+};
+//# sourceMappingURL=cjkAnnotate.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cjkAnnotate.d.ts","sourceRoot":"","sources":["../../src/measure/cjkAnnotate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAO/C,4DAA4D;AAC5D,eAAO,MAAM,OAAO,OAA2B,CAAC;AAEhD;iCACiC;AACjC,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAQrC,8CAA8C;AAC9C,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,yDAAyD;AACzD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAIjE;AAQD,oCAAoC;AACpC,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB;qCACiC;IACjC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;IACrC,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX;;+DAE2D;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;6DAC6D;AAC7D,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,gBAAgB,EAAE,CAAC;IACzB,yEAAyE;IACzE,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAkCD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,YAAY,CAuF3D;AAED;oEACoE;AACpE,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAMhH;AAED;;;iDAGiD;AACjD,wBAAgB,SAAS,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,EAAE,eAAe,EAAE,SAAS,OAAO,EAAE,EAAE,aAAa,CAAC,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,CASpI;AAED,mEAAmE;AACnE,wBAAgB,SAAS,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAQvE;AAED;;aAEa;AACb,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAG7F"}