@weasel-js/text 1.9.2 → 1.9.4

package/dist/{chunk-JQPOFIGT.js → chunk-VZNK3C6F.js}

@@ -1,11 +1,34 @@
 import { resolveScreenLength } from '@weasel-js/paint';
-import { resolveFontVariant, faceMetricsOf, fontPending, glyphGeneration, glyphOutline, resolveGlyphFallback } from '@weasel-js/font';
+import { cssFamilyName, resolveFontVariant, faceMetricsOf, fontPending, glyphGeneration, glyphOutline, resolveGlyphFallback } from '@weasel-js/font';
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
+
+// src/layout/tabStops.ts
+var DEFAULT_TAB_SIZE = 8;
+function tabAdvance(x, stop, min) {
+  if (!(stop > 0)) return 0;
+  const toNext = (Math.floor(x / stop) + 1) * stop - x;
+  return toNext < min ? toNext + stop : toNext;
+}
+function widthWithTabs(start, end, tabs, stopOf, flatWidth) {
+  let x = 0;
+  let from = start;
+  for (const t of tabs) {
+    if (t < start) continue;
+    if (t >= end) break;
+    if (t > from) x += flatWidth(from, t);
+    const { stop, min } = stopOf(t);
+    x += tabAdvance(x, stop, min);
+    from = t + 1;
+  }
+  return from < end ? x + flatWidth(from, end) : x;
+}
+
+// src/textStyle.ts
 function resolveAlign(align, direction) {
   if (align === "start" || align === "justify") return direction === "rtl" ? "right" : "left";
   if (align === "end") return direction === "rtl" ? "left" : "right";
@@ -24,8 +47,9 @@ var DEFAULT_TEXT_STYLE = {
   fontWeight: 400,
   fontStyle: "normal",
   align: "left",
-  direction: "ltr",
+  direction: "auto",
   lineHeight: 1.2,
+  tabSize: DEFAULT_TAB_SIZE,
   wrap: false,
   fill: DEFAULT_FILL,
   caretColor: paintColor(DEFAULT_FILL),
@@ -67,6 +91,7 @@ function resolveTextStyle(style, paint, scale = 1) {
     align: style.align ?? DEFAULT_TEXT_STYLE.align,
     direction: style.direction ?? DEFAULT_TEXT_STYLE.direction,
     lineHeight: style.lineHeight ?? DEFAULT_TEXT_STYLE.lineHeight,
+    tabSize: style.tabSize ?? DEFAULT_TEXT_STYLE.tabSize,
     wrap: style.wrap ?? DEFAULT_TEXT_STYLE.wrap,
     fill,
     caretColor,
@@ -83,7 +108,7 @@ function resolveTextStyle(style, paint, scale = 1) {
   };
 }
 function fontString(s) {
-  return `${s.fontStyle} ${s.fontWeight} ${s.fontSize}px ${s.fontFamily}`;
+  return `${s.fontStyle} ${s.fontWeight} ${s.fontSize}px ${cssFamilyName(s.fontFamily)}`;
 }
 
 // src/layout/decorationMetrics.ts
@@ -468,8 +493,112 @@ function lineBreakOpportunities(cps) {
   }
 }
 
+// src/layout/bidiRegistry.ts
+var registered = null;
+function registerBidi(engine) {
+  registered = engine;
+  return () => {
+    if (registered === engine) registered = null;
+  };
+}
+function registeredBidi() {
+  return registered;
+}
+function directionOfLevel(level) {
+  return level % 2 === 1 ? "rtl" : "ltr";
+}
+function paragraphDirection(text, direction = "auto", engine = registered) {
+  if (direction !== "auto") return direction;
+  if (engine === null) return "ltr";
+  const cps = [];
+  for (const ch of text) {
+    const cp = ch.codePointAt(0);
+    if (isHardLineBreak(cp)) break;
+    cps.push(cp);
+  }
+  return directionOfLevel(engine.baseLevel(engine.analyze(cps, "auto")));
+}
+
+// src/layout/bidiLines.ts
+function analyzeParagraphs(engine, codePoints, isBreak, direction) {
+  const paragraphs = [];
+  let start = 0;
+  for (let i = 0; i <= codePoints.length; i++) {
+    if (i < codePoints.length && !isBreak(i)) continue;
+    if (i > start) {
+      paragraphs.push({ start, end: i, analysis: engine.analyze(codePoints.slice(start, i), direction) });
+    }
+    start = i + 1;
+  }
+  const holding = (at) => {
+    let lo = 0;
+    let hi = paragraphs.length - 1;
+    while (lo < hi) {
+      const mid = lo + hi >> 1;
+      if (paragraphs[mid].end <= at) lo = mid + 1;
+      else hi = mid;
+    }
+    const p = paragraphs[lo];
+    return p !== void 0 && at >= p.start && at < p.end ? p : void 0;
+  };
+  return {
+    reorder(from, to) {
+      const p = holding(from);
+      if (p === void 0 || to > p.end) return { order: [], levels: [] };
+      const r = engine.reorder(p.analysis, from - p.start, to - p.start);
+      return { order: r.order.map((i) => i + p.start), levels: r.levels };
+    },
+    baseLevel(at) {
+      const p = holding(at);
+      return p === void 0 ? 0 : engine.baseLevel(p.analysis);
+    }
+  };
+}
+function restoreRemoved(order, count, rtl) {
+  if (order.length === count) return [...order];
+  const kept = new Set(order);
+  const leading = [];
+  const following = /* @__PURE__ */ new Map();
+  let anchor = -1;
+  let firstKept = -1;
+  for (let k = 0; k < count; k++) {
+    if (kept.has(k)) {
+      anchor = k;
+      if (firstKept < 0) firstKept = k;
+    } else if (anchor < 0) {
+      leading.push(k);
+    } else {
+      const list = following.get(anchor);
+      if (list) list.push(k);
+      else following.set(anchor, [k]);
+    }
+  }
+  if (firstKept < 0) return leading;
+  const out = [];
+  for (const p of order) {
+    const after = following.get(p) ?? [];
+    const before = p === firstKept ? leading : [];
+    if (rtl(p)) out.push(...[...after].reverse(), p, ...[...before].reverse());
+    else out.push(...before, p, ...after);
+  }
+  return out;
+}
+
+// src/layout/refId.ts
+var nextRefId = 1;
+var refIds = /* @__PURE__ */ new WeakMap();
+function refId(o) {
+  let id = refIds.get(o);
+  if (id === void 0) {
+    id = nextRefId++;
+    refIds.set(o, id);
+  }
+  return id;
+}
+
 // src/measure/graphemes.ts
 var segmenter;
+var NEEDS_SEGMENTING = /[\r\u0300-\uffff]/;
 function graphemeSegmenter() {
   if (segmenter === void 0) {
     segmenter = typeof Intl !== "undefined" && "Segmenter" in Intl ? new Intl.Segmenter(void 0, { granularity: "grapheme" }) : null;
@@ -478,6 +607,10 @@ function graphemeSegmenter() {
 }
 function graphemeEnds(text) {
   const out = [];
+  if (!NEEDS_SEGMENTING.test(text)) {
+    for (let i = 1; i <= text.length; i++) out.push(i);
+    return out;
+  }
   const seg = graphemeSegmenter();
   if (seg) {
     for (const s of seg.segment(text)) out.push(s.index + s.segment.length);
@@ -492,7 +625,7 @@ function graphemeCount(text) {
 }
 
 // src/layout/lineBreak/wrapLines.ts
-var SPACE = 32;
+var hangs = (cp) => cp === 32 || cp === 9;
 function wrapLines(cps, maxWidth, widthOf) {
   const n = cps.length;
   const breaks = Number.isFinite(maxWidth) ? lineBreakOpportunities(cps) : null;
@@ -507,14 +640,14 @@ function wrapLines(cps, maxWidth, widthOf) {
       start = i;
       continue;
     }
-    if (cp === SPACE) {
+    if (hangs(cp)) {
       i++;
       continue;
     }
     let j = i + 1;
     let ink = i + 1;
     while (j < n && !isHardLineBreak(cps[j]) && (!breaks || breaks[j] === NO_BREAK)) {
-      if (cps[j] !== SPACE) ink = j + 1;
+      if (!hangs(cps[j])) ink = j + 1;
       j++;
     }
     if (breaks && i > start && widthOf(start, ink) > maxWidth) {
@@ -542,7 +675,7 @@ function atlasMetrics(font) {
 function fillKey(p) {
   if (p === null) return "none";
   if ("color" in p) return `s:${p.color}:${p.opacity ?? 1}`;
-  return `nx:${Math.random()}`;
+  return `nx:${refId(p)}`;
 }
 function sameFill(a, b) {
   if (a === b) return true;
@@ -609,7 +742,7 @@ function getOrCreateGroup(ctx, run, resolved2, page, sourceOverride) {
   }
   return g;
 }
-function resolveGlyph(run, font, resolved2, cp) {
+function resolveGlyph(run, font, resolved2, cp, warn = true) {
   const direct = font.charMap.get(cp);
   if (direct) return { glyph: direct, font, resolved: resolved2 };
   const fallback = resolveGlyphFallback(run.fontFamily, run.fontWeight, run.fontStyle);
@@ -620,7 +753,7 @@ function resolveGlyph(run, font, resolved2, cp) {
       return { glyph, font: face.font, resolved: fallback };
     }
   }
-  warnMissingGlyphOnce(resolved2.resolved.family, cp);
+  if (warn) warnMissingGlyphOnce(resolved2.resolved.family, cp);
   return null;
 }
 var RTL_BLOCKS = [
@@ -639,7 +772,7 @@ function warnLogicalRtlOnce() {
   console.warn(
     // Naming the import in `from "<pkg>"` form would trip labkit's
     // consumer smoke test, which greps dist for that exact shape.
-    "weasel layoutRuns: this text contains right-to-left characters but no `bidi` engine was supplied, so it is being laid out in logical order \u2014 the glyphs will appear reversed. Import `bidi` out of the `@weasel-js/bidi` package and add it to the layout options."
+    "weasel layoutRuns: this text contains right-to-left characters but no `bidi` engine is registered, so it is being laid out in logical order \u2014 the glyphs will appear reversed. Import `bidi` out of the `@weasel-js/bidi` package and call `registerBidi(bidi)` once at startup."
   );
 }
 var warnedMissingGlyphs = /* @__PURE__ */ new Set();
@@ -663,8 +796,10 @@ function warnNoMetricsOnce(family, weight, style) {
 }
 function layoutRuns(runs, opts) {
   const ctx = { groups: /* @__PURE__ */ new Map() };
-  const align = resolveAlign(opts.align, opts.direction ?? "ltr");
+  const bidi = opts.bidi ?? registeredBidi();
+  const direction = opts.direction ?? "auto";
   const justify = opts.justify === true || opts.align === "justify";
+  const tabSize = opts.tabSize ?? DEFAULT_TAB_SIZE;
   const lineSize = (e) => Math.max(e.run.fontSize, e.run.strutSize ?? 0);
   const aboveBaseline = (e) => {
     const k = lineSize(e) / e.metrics.size;
@@ -673,6 +808,7 @@ function layoutRuns(runs, opts) {
     return (lineSize(e) * opts.lineHeight - ascent - e.metrics.descent * k) / 2 + ascent;
   };
   const entries = [];
+  const closesCluster = [];
   const runFaces = /* @__PURE__ */ new Map();
   let prevCp;
   let prevMetrics;
@@ -706,12 +842,14 @@ function layoutRuns(runs, opts) {
     const sizes = run.sizeMap;
     let at = 0;
     const runTracking = run.letterSpacing;
-    const clusterEnds = runTracking === 0 ? null : new Set(graphemeEnds(run.text));
+    const clusterEnds = new Set(graphemeEnds(run.text));
     for (const ch of [...run.text]) {
       const cp = ch.codePointAt(0);
       const fontSize = sizes ? sizes[at] : run.fontSize;
       const scale = fontSize / metrics.size;
-      const tracking = clusterEnds === null || clusterEnds.has(at + ch.length) ? runTracking : 0;
+      const clusterEnd = clusterEnds.has(at + ch.length);
+      closesCluster.push(clusterEnd);
+      const tracking = clusterEnd ? runTracking : 0;
       const isNewline = isHardLineBreak(cp);
       const isSpace = cp === 32;
       const srcStart = map ? runBase + map.starts[at] : runBase + at;
@@ -743,10 +881,36 @@ function layoutRuns(runs, opts) {
         prevFontSize = void 0;
         continue;
       }
-      if (isSpace) {
+      const isTab = cp === 9;
+      if (isSpace || isTab) {
         const spaceGlyph = resolved2.dynamicFace ? resolved2.dynamicFace.requestGlyph(32) : font?.charMap.get(32) ?? null;
         const spaceAdvance = spaceGlyph ? spaceGlyph.xadvance : metrics.advanceOf(32);
         const advance = spaceAdvance !== null ? spaceAdvance * scale : fontSize * 0.25;
+        if (isTab) {
+          entries.push({
+            run,
+            font,
+            metrics,
+            glyph: { id: cp, x: 0, y: 0, width: 0, height: 0, xoffset: 0, yoffset: 0, xadvance: 0, page: 0 },
+            cp,
+            advance: 0,
+            tracking: 0,
+            kerningBefore: 0,
+            isSpace: false,
+            isNewline: false,
+            tab: { stop: tabSize * (advance + runTracking), min: advance / 2 },
+            drawsInk: false,
+            resolved: resolved2,
+            fontSize,
+            srcIndex: srcStart,
+            srcEnd,
+            flat: 0
+          });
+          prevCp = void 0;
+          prevMetrics = void 0;
+          prevFontSize = void 0;
+          continue;
+        }
         let kerningBefore2 = 0;
         if (prevCp !== void 0 && prevMetrics !== void 0 && prevFontSize !== void 0) {
           kerningBefore2 = prevMetrics.kernOf(prevCp, cp) * (prevFontSize / prevMetrics.size);
@@ -883,17 +1047,22 @@ function layoutRuns(runs, opts) {
     }
   }
   for (let i = 0; i < entries.length; i++) entries[i].flat = i;
-  const analysis = opts.bidi ? opts.bidi.analyze(entries.map((e) => e.cp), opts.direction ?? "auto") : null;
-  if (!opts.bidi && entries.some((e) => RTL_BLOCKS.some(([lo, hi]) => e.cp >= lo && e.cp <= hi))) {
+  const paragraphs = bidi ? analyzeParagraphs(bidi, entries.map((e) => e.cp), (i) => entries[i].isNewline, direction) : null;
+  if (!bidi && entries.some((e) => RTL_BLOCKS.some(([lo, hi]) => e.cp >= lo && e.cp <= hi))) {
     warnLogicalRtlOnce();
   }
-  const openingWidth = (e) => e.isSpace ? 0 : e.advance + e.tracking;
+  const openingWidth = (e) => e.advance + e.tracking;
   const sum = new Float64Array(entries.length + 1);
   for (let k = 0; k < entries.length; k++) {
     const e = entries[k];
     sum[k + 1] = sum[k] + e.kerningBefore + e.advance + e.tracking;
   }
-  const widthOf = (start, end) => openingWidth(entries[start]) + sum[end] - sum[start + 1];
+  const flatWidth = (start, end) => openingWidth(entries[start]) + sum[end] - sum[start + 1];
+  const tabs = [];
+  entries.forEach((e, k) => {
+    if (e.tab) tabs.push(k);
+  });
+  const widthOf = tabs.length === 0 ? flatWidth : (start, end) => widthWithTabs(start, end, tabs, (k) => entries[k].tab, flatWidth);
   const lines = [];
   for (const span2 of wrapLines(entries.map((e) => e.cp), opts.maxWidth, widthOf)) {
     const line = { entries: [], width: 0, height: 0, ...span2.wrapped ? { wrapped: true } : {} };
@@ -904,7 +1073,8 @@ function layoutRuns(runs, opts) {
     }
     for (let k = span2.start; k < span2.end; k++) {
       const e = entries[k];
-      const placed = k > span2.start ? e : e.isSpace ? { ...e, kerningBefore: 0, advance: 0, tracking: 0 } : { ...e, kerningBefore: 0 };
+      const opened = k > span2.start ? e : { ...e, kerningBefore: 0 };
+      const placed = e.tab ? { ...opened, advance: tabAdvance(line.width, e.tab.stop, e.tab.min) } : opened;
       line.entries.push(placed);
       line.width += placed.kerningBefore + placed.advance + placed.tracking;
       line.height = Math.max(line.height, lineSize(e) * opts.lineHeight);
@@ -943,7 +1113,7 @@ function layoutRuns(runs, opts) {
     let hung = 0;
     for (let k = line.entries.length - 1; k >= 0; k--) {
       const e = line.entries[k];
-      if (!e.isSpace) break;
+      if (!e.isSpace && !e.tab) break;
       hung += e.kerningBefore + e.advance + e.tracking;
     }
     const inkWidth = line.width - hung;
@@ -958,6 +1128,7 @@ function layoutRuns(runs, opts) {
       if (gaps.size > 0) gapExtra = (alignWidth - inkWidth) / gaps.size;
     }
     const spread = gapExtra * gaps.size;
+    const align = resolveAlign(opts.align, direction !== "auto" ? direction : directionOfLevel(line.entries.length > 0 ? paragraphs?.baseLevel(line.entries[0].flat) ?? 0 : 0));
     const alignShift = (() => {
       if (spread > 0) return 0;
       if (align === "left") return 0;
@@ -978,10 +1149,10 @@ function layoutRuns(runs, opts) {
     flatOf.forEach((f, pos) => posOfFlat.set(f, pos));
     let visual = line.entries.map((_, k) => k);
     let levelOf = () => 0;
-    if (opts.bidi && analysis !== null && line.entries.length > 0) {
+    if (paragraphs !== null && line.entries.length > 0) {
       const from = flatOf[0];
       const to = flatOf[flatOf.length - 1] + 1;
-      const r = opts.bidi.reorder(analysis, from, to);
+      const r = paragraphs.reorder(from, to);
       const seen = /* @__PURE__ */ new Set();
       const ordered = [];
       for (const f of r.order) {
@@ -991,28 +1162,34 @@ function layoutRuns(runs, opts) {
           seen.add(pos);
         }
       }
-      for (let k = 0; k < line.entries.length; k++) if (!seen.has(k)) ordered.push(k);
-      visual = ordered;
       levelOf = (pos) => {
         const l = r.levels[flatOf[pos] - from];
         return typeof l === "number" && l >= 0 ? l : 0;
       };
+      visual = restoreRemoved(ordered, line.entries.length, (pos) => levelOf(pos) % 2 === 1);
     }
-    if (opts.bidi) {
+    if (bidi) {
       for (let pos = 0; pos < line.entries.length; pos++) {
         if (levelOf(pos) % 2 === 0) continue;
         const e = line.entries[pos];
-        const m = opts.bidi.mirror(e.cp);
+        const m = bidi.mirror(e.cp);
         if (m === null || m === e.cp) continue;
         if (e.font !== null) {
-          const hit = resolveGlyph(e.run, e.font, e.resolved, m);
+          const hit = resolveGlyph(e.run, e.font, e.resolved, m, false);
           if (!hit) continue;
+          if (hit.font !== e.font) {
+            e.font = hit.font;
+            e.metrics = atlasMetrics(hit.font);
+            e.resolved = hit.resolved;
+          }
           e.glyph = hit.glyph;
         }
         e.cp = m;
       }
     }
-    let penX = lineX0;
+    const hangsLeft = hung > 0 && levelOf(line.entries.length - 1) % 2 === 1;
+    const lineLeft = hangsLeft ? lineX0 - hung : lineX0;
+    let penX = lineLeft;
     let prevPos = -1;
     for (const pos of visual) {
       const e = line.entries[pos];
@@ -1026,7 +1203,8 @@ function layoutRuns(runs, opts) {
         x: penX,
         advance: step,
         level: levelOf(pos),
-        drawsInk: e.drawsInk
+        drawsInk: e.drawsInk,
+        clusterEnd: closesCluster[e.flat]
       };
       cells[pos] = cell;
       const scale = e.fontSize / e.metrics.size;
@@ -1094,9 +1272,9 @@ function layoutRuns(runs, opts) {
     const lastCell = line.entries[line.entries.length - 1];
     const srcEnd = lastCell ? lastCell.srcEnd : line.blank?.srcIndex ?? 0;
     lineBoxes.push({
-      x0: lineX0,
+      x0: lineLeft,
       y0: penY,
-      x1: lineX0 + line.width + spread,
+      x1: lineLeft + line.width + spread,
       y1: penY + line.height,
       baselineY: lineBaselineY,
       cells,
@@ -1128,17 +1306,8 @@ function outlineBucket(runs, min) {
 function variantKey(runs, opts) {
   const alignWidth = opts.alignWidth ?? opts.maxWidth;
   const justify = opts.justify === true || opts.align === "justify";
-  return `${opts.maxWidth}|${alignWidth}|${opts.lineHeight}|${opts.align}|${justify ? "j" : ""}|${outlineBucket(runs, opts.outlineMinSize)}`;
-}
-var nextRefId = 1;
-var refIds = /* @__PURE__ */ new WeakMap();
-function refId(o) {
-  let id = refIds.get(o);
-  if (id === void 0) {
-    id = nextRefId++;
-    refIds.set(o, id);
-  }
-  return id;
+  const bidi = opts.bidi ?? registeredBidi();
+  return `${opts.maxWidth}|${alignWidth}|${opts.lineHeight}|${opts.align}|${justify ? "j" : ""}|${outlineBucket(runs, opts.outlineMinSize)}|${opts.direction ?? ""}|${bidi ? refId(bidi) : ""}|${opts.tabSize ?? ""}`;
 }
 function paintKey(p) {
   if (p === null) return "none";
@@ -1160,7 +1329,7 @@ function strokeKey2(s) {
 function runsKey(runs) {
   let out = "";
   for (const r of runs) {
-    out += `${r.text.length}:${r.text}|${r.fontFamily.length}:${r.fontFamily}|${r.fontSize}|${r.fontWeight}|${r.fontStyle}|${r.letterSpacing}|${r.underline ? 1 : 0}${r.strikethrough ? 1 : 0}${r.overline ? 1 : 0}|${r.baselineShift}|${paintKey(r.fill)}|${strokeKey2(r.stroke)}|${r.srcMap ? `${r.srcMap.length}:${r.srcMap.starts.join(",")}` : ""}|${r.sizeMap ? r.sizeMap.join(",") : ""}|`;
+    out += `${r.text.length}:${r.text}|${r.fontFamily.length}:${r.fontFamily}|${r.fontSize}|${r.fontWeight}|${r.fontStyle}|${r.letterSpacing}|${r.underline ? 1 : 0}${r.strikethrough ? 1 : 0}${r.overline ? 1 : 0}|${r.baselineShift}|${r.strutSize ?? ""}|${paintKey(r.fill)}|${strokeKey2(r.stroke)}|${r.srcMap ? `${r.srcMap.length}:${r.srcMap.starts.join(",")}` : ""}|${r.sizeMap ? r.sizeMap.join(",") : ""}|`;
   }
   return out;
 }
@@ -1202,6 +1371,6 @@ function _resetLayoutCacheForTests() {
   structuralGeneration = -1;
 }
 
-export { BREAK_ALLOWED, BREAK_MANDATORY, DECORATION_KINDS, DEFAULT_DECORATION_METRICS, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, _resetLayoutCacheForTests, cachedLayoutRuns, decorationMetrics, decorationRule, fontString, graphemeCount, isHardLineBreak, layoutRuns, lineBreakOpportunities, resolveAlign, resolveTextStyle, wrapLines };
-//# sourceMappingURL=chunk-JQPOFIGT.js.map
-//# sourceMappingURL=chunk-JQPOFIGT.js.map
+export { BREAK_ALLOWED, BREAK_MANDATORY, DECORATION_KINDS, DEFAULT_DECORATION_METRICS, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, _resetLayoutCacheForTests, cachedLayoutRuns, decorationMetrics, decorationRule, fontString, graphemeCount, hangs, isHardLineBreak, layoutRuns, lineBreakOpportunities, paragraphDirection, registerBidi, resolveAlign, resolveTextStyle, wrapLines };
+//# sourceMappingURL=chunk-VZNK3C6F.js.map
+//# sourceMappingURL=chunk-VZNK3C6F.js.map