@weasel-js/text 1.14.2 → 1.15.1

package/dist/{chunk-5BJN6MC6.js → chunk-WUFANHTE.js}

@@ -1,5 +1,5 @@
 import { isSolidPaint, resolveFill, resolveScreenLength, fillHasInk, strokeHasInk, paintKey, strokeKey } from '@weasel-js/paint';
-import { cssFamilyName, resolveFontVariant, syntheticBoldGrowth, glyphOutline, faceMetricsOf, glyphGeneration, faceGeneration, metricsOf, warnNoMetrics, resolveColorCluster, glyphIn, resolveGlyph } from '@weasel-js/font';
+import { cssFamilyName, cachedFontVariant, syntheticBoldGrowth, glyphOutline, faceMetricsOf, glyphGeneration, faceGeneration, metricsOf, warnNoMetrics, resolveColorCluster, glyphIn, resolveGlyph, outlineMetrics } from '@weasel-js/font';
 import { mergeRegion, growRegion, pathToD, pathFromD } from '@weasel-js/geom';
 
 var __defProp = Object.defineProperty;
@@ -134,20 +134,24 @@ function registerShaper(shaper) {
 function registeredShaper() {
   return registered;
 }
-var bytesOf = /* @__PURE__ */ new WeakMap();
-function shapeableBytes(resolved2) {
-  const face = resolved2.outlineFace;
+var embeddingOf = /* @__PURE__ */ new WeakMap();
+function shapingFace(resolved2) {
+  const { family, weight, style } = resolved2.resolved;
+  const face = resolved2.outlineFace ?? (resolved2.source === "outline" ? void 0 : outlineMetrics(family, weight, style === "italic" ? "italic" : "normal"));
   if (!face) return null;
-  let bytes = bytesOf.get(face);
-  if (bytes === void 0) {
-    bytes = face.embedding?.().sfnt ?? null;
-    bytesOf.set(face, bytes);
+  let embedding = embeddingOf.get(face);
+  if (embedding === void 0) {
+    embedding = face.embedding?.() ?? null;
+    embeddingOf.set(face, embedding);
   }
-  return bytes;
+  return embedding;
+}
+function shapeableBytes(resolved2) {
+  return shapingFace(resolved2)?.sfnt ?? null;
 }
 function shapesWithFeature(family, weight, style, tag, shaper = registered) {
   if (shaper === null) return false;
-  const bytes = shapeableBytes(resolveFontVariant(family, weight, style));
+  const bytes = shapeableBytes(cachedFontVariant(family, weight, style));
   return bytes !== null && shaper.hasFeature(bytes, tag);
 }
 
@@ -649,7 +653,7 @@ function within(ranges, cp2) {
   return false;
 }
 var warnedLogicalRtl = false;
-function warnRtlWithoutEngine(codePoints) {
+function warnRtlWithoutEngine(codePoints, who = "weasel layoutRuns") {
   if (warnedLogicalRtl) return;
   for (let i = 0; i < codePoints.length; i++) {
     const cp2 = codePoints[i];
@@ -658,7 +662,7 @@ function warnRtlWithoutEngine(codePoints) {
     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 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."
+      `${who}: 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.`
     );
     return;
   }
@@ -1122,19 +1126,23 @@ function graphemeCount(text) {
 var NOTHING_DRAWN = Object.freeze({ d: null, key: "", glyphs: Object.freeze([]), rtl: false, text: "" });
 var COVERED = Object.freeze({ cluster: NOTHING_DRAWN, advance: 0 });
 var slotsOf = /* @__PURE__ */ new WeakMap();
+var atlasSlotsOf = /* @__PURE__ */ new WeakMap();
 var fmt = (v) => String(Math.round(v * 1e5) / 1e5);
 function shapeRun(run, resolved2, shaper) {
   if (shaper === null) return null;
-  const face = shapeableBytes(resolved2);
-  if (face === null) return null;
+  const embedding = shapingFace(resolved2);
+  if (embedding === null) return null;
+  const face = embedding.sfnt;
   const glyphs = shaper.shape(face, run.text, run.fontFeatures, run.lang);
-  let slots2 = slotsOf.get(glyphs);
+  const cache2 = resolved2.source === "outline" ? slotsOf : atlasSlotsOf;
+  let slots2 = cache2.get(glyphs);
   if (slots2) return slots2;
-  slots2 = slotsFor(shaper, face, run.text, glyphs);
-  slotsOf.set(glyphs, slots2);
+  const plain2 = resolved2.source === "outline" ? null : (cp2) => embedding.glyphIndexOf(cp2);
+  slots2 = slotsFor(shaper, face, run.text, glyphs, plain2);
+  cache2.set(glyphs, slots2);
   return slots2;
 }
-function slotsFor(shaper, face, text, glyphs) {
+function slotsFor(shaper, face, text, glyphs, plain2) {
   const slots2 = new Array(text.length);
   const ends = graphemeEnds(text);
   let g = 0;
@@ -1147,7 +1155,7 @@ function slotsFor(shaper, face, text, glyphs) {
     while (g < ends.length && ends[g] <= start2) g++;
     let inner = 0;
     for (let k = g; k < ends.length && ends[k] < end; k++) inner++;
-    if (!holdsNotdef(glyphs, i, j)) {
+    if (!holdsNotdef(glyphs, i, j) && !(plain2 && isPlain(glyphs[i], j - i, text, start2, end, plain2))) {
       const total = advanceOf(glyphs, i, j);
       const share = total / (inner + 1);
       const shift = glyphs[i].rtl ? share - total : 0;
@@ -1163,6 +1171,11 @@ function slotsFor(shaper, face, text, glyphs) {
   }
   return slots2;
 }
+function isPlain(first, count, text, start2, end, plain2) {
+  if (count !== 1 || first.dx !== 0 || first.dy !== 0) return false;
+  const cp2 = text.codePointAt(start2);
+  return end - start2 === (cp2 > 65535 ? 2 : 1) && plain2(cp2) === first.gid;
+}
 function advanceOf(glyphs, from, to) {
   let sum2 = 0;
   for (let k = from; k < to; k++) sum2 += glyphs[k].advance;
@@ -1180,7 +1193,7 @@ function clusterSlot(shaper, face, glyphs, from, to, text, shift, advance) {
   for (let k = from; k < to; k++) {
     const g = glyphs[k];
     const x = pen + g.dx, y = g.dy;
-    placed2.push({ gid: g.gid, x, y });
+    placed2.push({ gid: g.gid, x, y, advance: g.advance });
     d += shaper.glyphD(face, g.gid, x, y) ?? "";
     key += `${k === from ? "" : ";"}${g.gid}${x === 0 && y === 0 ? "" : `@${fmt(x)},${fmt(y)}`}`;
     pen += g.advance;
@@ -1197,7 +1210,7 @@ function measureRuns(runs, tabSize, pool, into, shaper = null) {
   let srcIndex = 0;
   for (let runIndex = 0; runIndex < runs.length; runIndex++) {
     const run = runs[runIndex];
-    const resolved2 = resolveFontVariant(run.fontFamily, run.fontWeight, run.fontStyle);
+    const resolved2 = cachedFontVariant(run.fontFamily, run.fontWeight, run.fontStyle);
     const metrics = metricsOf(resolved2);
     if (!metrics) {
       warnNoMetrics(run.fontFamily, run.fontWeight, run.fontStyle);
@@ -1359,7 +1372,7 @@ function mirrorEntries(entries2, levels, mirror, runs) {
     const odd = levels[pos] % 2 === 1;
     if (entry.shaped !== null && entry.shaped.rtl !== odd) {
       const flipped = mirror(entry.cp);
-      if (flipped !== null && flipped !== entry.cp) entry = { ...entry, shaped: null };
+      if (flipped !== null && flipped !== entry.cp) entry = unshaped(entry, runs[entry.run]);
     }
     if (!odd) return entry;
     if (entry.shaped !== null) return entry;
@@ -1372,6 +1385,11 @@ function mirrorEntries(entries2, levels, mirror, runs) {
     return { ...entry, cp: cp2, resolved: hit.resolved, metrics: hit.metrics, font: hit.font, glyph: hit.glyph };
   });
 }
+function unshaped(entry, run) {
+  if (entry.resolved.source === "outline") return { ...entry, shaped: null };
+  const hit = resolveGlyph(entry.resolved, run.fontFamily, run.fontWeight, run.fontStyle, entry.cp, false);
+  return hit ? { ...entry, shaped: null, resolved: hit.resolved, metrics: hit.metrics, font: hit.font, glyph: hit.glyph } : { ...entry, shaped: null };
+}
 
 // src/layout/lineBreak/wrapLines.ts
 var hangs = (cp2) => cp2 === 32 || cp2 === 9;
@@ -1588,7 +1606,7 @@ function resolveLayoutOpts(opts, out = {
   tabSize: 0
 }) {
   out.maxWidth = opts.maxWidth;
-  out.alignWidth = opts.alignWidth ?? opts.maxWidth;
+  storeAlignWidth(out, opts);
   out.lineHeight = opts.lineHeight;
   out.align = opts.align;
   out.justify = opts.justify === true || opts.align === "justify";
@@ -1598,6 +1616,10 @@ function resolveLayoutOpts(opts, out = {
   out.tabSize = opts.tabSize ?? DEFAULT_TAB_SIZE;
   return out;
 }
+function storeAlignWidth(out, opts) {
+  if (opts.alignWidth === void 0) out.alignWidth = opts.maxWidth;
+  else out.alignWidth = opts.alignWidth;
+}
 function layoutBidi(opts) {
   return opts.bidi ?? registeredBidi();
 }
@@ -1872,9 +1894,9 @@ function takeGroups(out) {
 }
 
 // src/layout/paintRuns.ts
-function glyphOutlineD(g, run, minSize) {
+function glyphOutlineD(g, run, minSize, ungated = false) {
   const outlineOnly = g.resolved.source === "outline";
-  if (!outlineOnly) {
+  if (!outlineOnly && !ungated) {
     if (minSize === void 0) return null;
     if (run.fontSize < minSize && !strokeHasInk(run.stroke)) return null;
   }
@@ -1893,8 +1915,16 @@ function faceOutlineD(g) {
   if (g.resolved.source !== "outline" && g.glyph === null) return null;
   return glyphOutline(family, weight, style, g.cp);
 }
+function shapedQuadGlyph(g) {
+  const face = g.resolved.dynamicFace;
+  const shaped = g.shaped;
+  if (!face || shaped.d === null) return null;
+  const glyph = face.requestShaped(shaped.key, shaped.d);
+  if (!glyph || glyph.page < 0 || glyph.width === 0) return null;
+  return { ...g, font: face.font, glyph };
+}
 function runFaces(runs) {
-  const faces = runs.map((r) => faceMetricsOf(resolveFontVariant(r.fontFamily, r.fontWeight, r.fontStyle)));
+  const faces = runs.map((r) => faceMetricsOf(cachedFontVariant(r.fontFamily, r.fontWeight, r.fontStyle)));
   return (run) => faces[run];
 }
 var isDecorated = (r) => r.underline || r.strikethrough || r.overline;
@@ -1933,7 +1963,13 @@ function paintRunsInto(laid, runs, opts, out) {
       rules?.add(g);
       const run = runs[g.run];
       const inks = cols !== null ? cols.drawsInk(start2, pos) : line.cells[g.cell].drawsInk;
-      const outline = inks ? glyphOutlineD(g, run, opts.outlineMinSize) : null;
+      let outline = inks ? glyphOutlineD(g, run, opts.outlineMinSize) : null;
+      let q = g;
+      if (inks && outline === null && g.shaped) {
+        const baked = shapedQuadGlyph(g);
+        if (baked) q = baked;
+        else outline = glyphOutlineD(g, run, opts.outlineMinSize, true);
+      }
       if (!fillHasInk(run.fill) && !(outline !== null && strokeHasInk(run.stroke))) continue;
       if (outline !== null) {
         const placed2 = { ...outline, x: g.x, baselineY: g.baselineY, scale: g.fontSize };
@@ -1941,8 +1977,8 @@ function paintRunsInto(laid, runs, opts, out) {
         groupFor(runs, g, "outline").glyphs.push(placed2);
         continue;
       }
-      if (!hasGlyphQuad(g)) continue;
-      const group = groupFor(runs, g, g.glyph.color ? "color" : g.resolved.source);
+      if (!hasGlyphQuad(q)) continue;
+      const group = groupFor(runs, q, q.glyph.color ? "color" : q.resolved.source);
       if (sized === null) {
         sized = group;
         group.quadData = buf;
@@ -1950,12 +1986,12 @@ function paintRunsInto(laid, runs, opts, out) {
       let quads = group.quadData;
       if (quads === NO_QUADS) group.quadData = quads = [];
       if (group === sized) {
-        writeGlyphQuad(g, quads, sizedAt);
+        writeGlyphQuad(q, quads, sizedAt);
         sizedAt += QUAD_STRIDE;
       } else {
-        writeGlyphQuad(g, quads, quads.length);
+        writeGlyphQuad(q, quads, quads.length);
       }
-      group.colorGlyphs?.push(g.glyph);
+      group.colorGlyphs?.push(q.glyph);
     }
     if (!rules) continue;
     for (const rule of rules.end()) {
@@ -1990,7 +2026,8 @@ function entryFor(runs) {
       painting: null,
       paintedOn: null,
       paintedStamp: 0,
-      paintMin: void 0
+      paintMin: void 0,
+      listed: null
     };
     entries.set(runs, e);
   }
@@ -2001,11 +2038,15 @@ function dropEntry(runs) {
   if (e !== void 0) entries.delete(runs);
   return e;
 }
-function giveEntry(e) {
+function emptyEntry(e) {
   e.generation = -1;
   e.painting = null;
   e.paintedOn = null;
   e.paintMin = void 0;
+  e.listed = null;
+}
+function giveEntry(e) {
+  emptyEntry(e);
   if (spare2.length < SPARE_MAX2) spare2.push(e);
 }
 function _resetRunsEntriesForTests() {
@@ -2104,12 +2145,16 @@ function cachedPaintRuns(laid, runs, opts = {}, use = "keep") {
   if (list.length >= PAINT_CACHE_VARIANT_LIMIT) list.shift();
   list.push(p);
   const e = mine ?? entryFor(runs);
+  if (e.painting !== null && e.painting !== p) settlePainting(e.painting, runs);
   e.paintedOn = laid;
   e.paintedStamp = stamp;
   e.painting = p;
   e.paintMin = min;
   return handOut(p, use);
 }
+function settlePainting(p, runs) {
+  if (p.runs === runs) keyOf(p);
+}
 function handOut(p, use) {
   if (use === "keep") p.pinned = true;
   return p.painted;
@@ -2183,7 +2228,7 @@ function disown(vs) {
 var NO_LAYOUT = { lines: [], bounds: { width: 0, height: 0 } };
 function fill(v, opts, bidi, laid) {
   v.maxWidth = opts.maxWidth;
-  v.alignWidth = opts.alignWidth ?? opts.maxWidth;
+  storeAlignWidth(v, opts);
   v.lineHeight = opts.lineHeight;
   v.align = opts.align;
   v.justify = opts.justify === true || opts.align === "justify";
@@ -2197,9 +2242,9 @@ function fill(v, opts, bidi, laid) {
 function variant(opts, bidi, laid) {
   const spare4 = spareVariants.pop();
   if (spare4 !== void 0) return fill(spare4, opts, bidi, laid);
-  return {
+  const v = {
     maxWidth: opts.maxWidth,
-    alignWidth: opts.alignWidth ?? opts.maxWidth,
+    alignWidth: opts.maxWidth,
     lineHeight: opts.lineHeight,
     align: opts.align,
     justify: opts.justify === true || opts.align === "justify",
@@ -2209,6 +2254,8 @@ function variant(opts, bidi, laid) {
     shaper: layoutShaper(opts),
     laid
   };
+  storeAlignWidth(v, opts);
+  return v;
 }
 function mix(h, n) {
   return Math.imul(h ^ n, 16777619);
@@ -2279,7 +2326,7 @@ function cachedLayoutRuns(runs, opts, use = "keep") {
       return handOut2(v.laid, use);
     }
   }
-  const laid = structuralLayout(runs, opts, bidi, fonts);
+  const laid = structuralLayout(runs, opts, bidi, fonts, entry);
   const vs = entry.variants;
   if (vs.length >= LAYOUT_CACHE_VARIANT_LIMIT) disown(vs);
   vs.unshift(variant(opts, bidi, laid));
@@ -2293,9 +2340,12 @@ function dropRuns(runs) {
   disown(entry.variants);
   giveEntry(entry);
 }
-function structuralLayout(runs, opts, bidi, fonts) {
+function structuralLayout(runs, opts, bidi, fonts, entry) {
   if (structuralGeneration !== fonts) {
-    for (const s of structural) unlist(s);
+    for (const s of structural) {
+      unlist(s);
+      s.runs = NO_RUNS;
+    }
     structural = [];
     structuralGeneration = fonts;
   }
@@ -2316,11 +2366,29 @@ function structuralLayout(runs, opts, bidi, fonts) {
   filled.hash = hash;
   filled.runs = runs;
   filled.used = ++clock;
+  entry.listed = filled;
   const cols = columnsOf(laid);
   if (cols !== null) cols.listed = true;
   if (!full) structural.push(filled);
   return laid;
 }
+function clearRuns(runs) {
+  const entry = entryOf(runs);
+  if (entry === void 0) return;
+  const s = entry.listed;
+  if (s !== null && s.runs === runs) {
+    unlist(s);
+    s.laid = NO_LAYOUT;
+    s.runs = NO_RUNS;
+    s.hash = -1;
+    s.used = 0;
+  }
+  const p = entry.painting;
+  disown(entry.variants);
+  if (p !== null) settlePainting(p, runs);
+  emptyEntry(entry);
+}
+var NO_RUNS = [];
 function structuralEntry(opts, bidi, laid) {
   return fill({
     maxWidth: 0,
@@ -2351,6 +2419,6 @@ function _resetLayoutCacheForTests() {
   clock = 0;
 }
 
-export { BREAK_ALLOWED, BREAK_MANDATORY, DECORATION_KINDS, DEFAULT_DECORATION_METRICS, DEFAULT_TAB_SIZE, DEFAULT_TEXT_FILL, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, QUAD_STRIDE, _resetBidiWarningForTests, _resetLayoutCacheForTests, cachedLayoutRuns, cachedPaintRuns, decorationMetrics, decorationRule, dropRuns, emboldenGlyph, emboldenGlyphD, faceOutlineD, fontString, graphemeCount, hangs, hasGlyphQuad, isHardLineBreak, layoutRuns, lineBreakOpportunities, lineDecorations, paintRuns, paragraphDirection, registerBidi, registerShaper, resolveAlign, resolveTextStyle, resolveTextStyleInto, runFaces, shapesWithFeature, syntheticBoldOffset, tabAdvance, widthWithTabs, wrapLines };
-//# sourceMappingURL=chunk-5BJN6MC6.js.map
-//# sourceMappingURL=chunk-5BJN6MC6.js.map
+export { BREAK_ALLOWED, BREAK_MANDATORY, DECORATION_KINDS, DEFAULT_DECORATION_METRICS, DEFAULT_TAB_SIZE, DEFAULT_TEXT_FILL, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, QUAD_STRIDE, _resetBidiWarningForTests, _resetLayoutCacheForTests, cachedLayoutRuns, cachedPaintRuns, clearRuns, decorationMetrics, decorationRule, dropRuns, emboldenGlyph, emboldenGlyphD, faceOutlineD, fontString, graphemeCount, hangs, hasGlyphQuad, isHardLineBreak, layoutRuns, lineBreakOpportunities, lineDecorations, paintRuns, paragraphDirection, registerBidi, registerShaper, registeredBidi, resolveAlign, resolveTextStyle, resolveTextStyleInto, runFaces, shapesWithFeature, syntheticBoldOffset, tabAdvance, warnRtlWithoutEngine, widthWithTabs, wrapLines };
+//# sourceMappingURL=chunk-WUFANHTE.js.map
+//# sourceMappingURL=chunk-WUFANHTE.js.map