@weasel-js/text 1.10.1 → 1.11.1

package/dist/index.js

@@ -1,10 +1,10 @@
-import { DEFAULT_TAB_SIZE, resolveTextStyle, cachedLayoutRuns, graphemeCount, wrapLines, hangs, tabAdvance, widthWithTabs, layoutRuns } from './chunk-EFPJZYNI.js';
-export { BREAK_ALLOWED, BREAK_MANDATORY, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, cachedLayoutRuns, fontString, isHardLineBreak, layoutRuns, lineBreakOpportunities, paragraphDirection, registerBidi, resolveAlign, resolveTextStyle } from './chunk-EFPJZYNI.js';
+import { DEFAULT_TAB_SIZE, resolveTextStyle, cachedLayoutRuns, graphemeCount, wrapLines, hangs, tabAdvance, widthWithTabs, layoutRuns } from './chunk-JOVZEHBJ.js';
+export { BREAK_ALLOWED, BREAK_MANDATORY, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, cachedLayoutRuns, fontString, isHardLineBreak, layoutRuns, lineBreakOpportunities, paragraphDirection, registerBidi, resolveAlign, resolveTextStyle } from './chunk-JOVZEHBJ.js';
 import { resolveScreenLength, fillHasInk, strokeHasInk, paintKey, strokeKey } from '@weasel-js/paint';
-import { faceMetricsOf, resolveFontVariant, glyphGeneration, loadFontOutlines, faceMetricsFor, glyphOutline, outlineStatus, cssFamilyName } from '@weasel-js/font';
-import { MIXED, isPlainObject } from '@weasel-js/registry';
+import { faceMetricsOf, resolveFontVariant, syntheticBoldGrowth, glyphGeneration, loadFontOutlines, faceMetricsFor, glyphOutline, outlineStatus, cssFamilyName } from '@weasel-js/font';
+import { pathToD, pathFromD, mergeRegion, growRegion, transformPath, poseFrameOf, pathSignedArea, reversePath, PATH_M, PATH_L, PATH_Z } from '@weasel-js/geom';
+import { MIXED, deepEqual } from '@weasel-js/registry';
 export { MIXED } from '@weasel-js/registry';
-import { transformPath, poseFrameOf, pathFromD, pathSignedArea, reversePath, PATH_M, PATH_L, PATH_Z } from '@weasel-js/geom';
 
 // src/runs.ts
 function toRuns(input) {
@@ -413,8 +413,8 @@ function lineDecorations(glyphs, runs, faceOf, paintOf) {
   };
   for (const g of glyphs) {
     const style = runs[g.run];
-    const paint = paintOf(g.run);
-    if (paint === null || !DECORATION_KINDS.some((kind) => style[kind])) {
+    const paint = style.underline || style.strikethrough || style.overline ? paintOf(g.run) : null;
+    if (paint === null) {
       close();
       continue;
     }
@@ -465,14 +465,66 @@ function layoutTextPose(pose, scale = 1) {
     y: pose.y + verticalAlignOffset(pose.verticalAlign, pose.height, laid.bounds.height)
   };
 }
+var SYNTHETIC_BOLD_TOLERANCE = 5e-4;
+var CACHE_LIMIT = 4096;
+var cache = /* @__PURE__ */ new Map();
+var dCache = /* @__PURE__ */ new Map();
+function syntheticBoldOffset(resolved2) {
+  if (!resolved2.synthetic.bold) return null;
+  const { source } = resolved2;
+  if (source !== "atlas" && source !== "canvas") return null;
+  const { family, weight, style } = resolved2.resolved;
+  const growth = syntheticBoldGrowth(source, family, weight, style);
+  if (growth === void 0 || !(growth > 0)) return null;
+  return { growth, join: source === "atlas" ? "miter" : "round" };
+}
+function emboldenGlyph(em, d, resolved2) {
+  const offset = syntheticBoldOffset(resolved2);
+  if (offset === null) return em;
+  const key = `${offset.growth}|${offset.join}|${d}`;
+  let grown = cache.get(key);
+  if (grown) return grown;
+  grown = mergeRegion(
+    growRegion(em, offset.growth, { join: offset.join, tolerance: SYNTHETIC_BOLD_TOLERANCE }),
+    { tolerance: SYNTHETIC_BOLD_TOLERANCE }
+  );
+  if (cache.size >= CACHE_LIMIT) cache.clear();
+  cache.set(key, grown);
+  return grown;
+}
+function emboldenGlyphD(d, resolved2) {
+  const offset = syntheticBoldOffset(resolved2);
+  if (offset === null) return null;
+  const tag = `bold:${offset.growth}:${offset.join}`;
+  const key = `${tag}|${d}`;
+  let grown = dCache.get(key);
+  if (grown === void 0) {
+    grown = pathToD(emboldenGlyph(pathFromD(d), d, resolved2));
+    if (dCache.size >= CACHE_LIMIT) dCache.clear();
+    dCache.set(key, grown);
+  }
+  return { d: grown, tag };
+}
+
+// src/layout/paintRuns.ts
 function glyphOutlineD(g, run, minSize) {
+  const outlineOnly = g.resolved.source === "outline";
+  if (!outlineOnly) {
+    if (minSize === void 0) return null;
+    if (run.fontSize < minSize && !strokeHasInk(run.stroke)) return null;
+  }
+  const d = faceOutlineD(g);
+  if (d === null) return null;
+  const { family, weight, style } = g.resolved.resolved;
+  const key = `${family}|${weight}|${style}|${g.cp}`;
+  if (outlineOnly || !g.resolved.synthetic.bold) return { d, key };
+  const bold = emboldenGlyphD(d, g.resolved);
+  return bold && { d: bold.d, key: `${key}|${bold.tag}` };
+}
+function faceOutlineD(g) {
   if (g.glyph?.color) return null;
   const { family, weight, style } = g.resolved.resolved;
-  if (g.resolved.source === "outline") return glyphOutline(family, weight, style, g.cp);
-  if (g.glyph === null) return null;
-  if (minSize === void 0) return null;
-  if (run.fontSize < minSize && !strokeHasInk(run.stroke)) return null;
-  if (g.resolved.synthetic.bold) return null;
+  if (g.resolved.source !== "outline" && g.glyph === null) return null;
   return glyphOutline(family, weight, style, g.cp);
 }
 function glyphQuad(g) {
@@ -497,10 +549,13 @@ function runFaces(runs) {
   const faces = runs.map((r) => faceMetricsOf(resolveFontVariant(r.fontFamily, r.fontWeight, r.fontStyle)));
   return (run) => faces[run];
 }
-function groupFor(groups, g, run, source) {
+function groupFor(groups, g, run, source, last) {
   const { family, weight, style } = g.resolved.resolved;
   const { synthetic } = g.resolved;
   const page = source === "outline" ? 0 : g.glyph.page;
+  if (last.group !== null && last.run === g.run && last.source === source && last.page === page && last.family === family && last.weight === weight && last.style === style && last.bold === synthetic.bold && last.italic === synthetic.italic) {
+    return last.group;
+  }
   const stroke = source === "outline" && strokeHasInk(run.stroke) ? run.stroke : void 0;
   const key = `${family}|${weight}|${style}|${synthetic.bold ? 1 : 0}${synthetic.italic ? 1 : 0}|${paintKey(run.fill?.paint)}|${strokeKey(stroke)}|${source}|${page}`;
   let group = groups.get(key);
@@ -519,23 +574,41 @@ function groupFor(groups, g, run, source) {
     };
     groups.set(key, group);
   }
+  last.group = group;
+  last.run = g.run;
+  last.family = family;
+  last.weight = weight;
+  last.style = style;
+  last.bold = synthetic.bold;
+  last.italic = synthetic.italic;
+  last.source = source;
+  last.page = page;
   return group;
 }
 function paintRuns(laid, runs, opts = {}) {
   const groups = /* @__PURE__ */ new Map();
+  const last = {
+    group: null,
+    run: -1,
+    family: "",
+    weight: 0,
+    style: "normal",
+    bold: false,
+    italic: false,
+    source: "atlas",
+    page: 0
+  };
   const decorations = [];
   const faceOf = runFaces(runs);
   const rulePaint = (run) => fillHasInk(runs[run].fill) ? paintKey(runs[run].fill.paint) : null;
   for (const line of laid.lines) {
     for (const g of line.glyphs) {
       const run = runs[g.run];
-      const d = glyphOutlineD(g, run, opts.outlineMinSize);
-      if (!fillHasInk(run.fill) && !(d !== null && strokeHasInk(run.stroke))) continue;
-      if (d !== null) {
-        const { family, weight, style } = g.resolved.resolved;
-        groupFor(groups, g, run, "outline").glyphs.push({
-          d,
-          key: `${family}|${weight}|${style}|${g.cp}`,
+      const outline = glyphOutlineD(g, run, opts.outlineMinSize);
+      if (!fillHasInk(run.fill) && !(outline !== null && strokeHasInk(run.stroke))) continue;
+      if (outline !== null) {
+        groupFor(groups, g, run, "outline", last).glyphs.push({
+          ...outline,
           x: g.x,
           baselineY: g.baselineY,
           scale: g.fontSize
@@ -543,7 +616,9 @@ function paintRuns(laid, runs, opts = {}) {
         continue;
       }
       const quad = glyphQuad(g);
-      if (quad) groupFor(groups, g, run, g.glyph?.color ? "color" : g.resolved.source).quads.push(quad);
+      if (!quad) continue;
+      if (g.glyph?.color) groupFor(groups, g, run, "color", last).quads.push({ ...quad, colorGlyph: g.glyph });
+      else groupFor(groups, g, run, g.resolved.source, last).quads.push(quad);
     }
     for (const rule of lineDecorations(line.glyphs, runs, faceOf, rulePaint)) {
       const { run, ...rect } = rule;
@@ -1007,18 +1082,6 @@ var FLAG_KEYS = /* @__PURE__ */ new Set([
   "strikethrough",
   "overline"
 ]);
-function deepEqual(a, b) {
-  if (Object.is(a, b)) return true;
-  if (Array.isArray(a) && Array.isArray(b)) {
-    return a.length === b.length && a.every((item, i) => deepEqual(item, b[i]));
-  }
-  if (isPlainObject(a) && isPlainObject(b)) {
-    const keys = Object.keys(a);
-    if (keys.length !== Object.keys(b).length) return false;
-    return keys.every((k) => k in b && deepEqual(a[k], b[k]));
-  }
-  return false;
-}
 function valueAt(run, key) {
   const value = run[key];
   if (FLAG_KEYS.has(key)) return value ?? false;
@@ -1277,9 +1340,6 @@ function assertOutlinable(run) {
   }
   const r = resolveFontVariant(fontFamily, fontWeight, fontStyle);
   const { family, weight, style } = r.resolved;
-  if (r.synthetic.bold) {
-    fail("synthetic-bold", `drawn as a faux bold of ${family} ${weight}/${style}, which has no geometry to embolden. Register outlines for the real bold face.`);
-  }
   if (r.source === "outline") return;
   const status = outlineStatus(family, weight, style);
   if (status === null) {
@@ -1374,7 +1434,7 @@ function walkOutlines(data, pose, opts) {
           "the text holds an emoji, which is drawn in its own colors and has no outline."
         );
       }
-      const d = glyphOutlineD(g, runs[g.run], 0);
+      const d = faceOutlineD(g);
       if (d === null) {
         if (glyphQuad(g) !== null) {
           const { family, weight, style } = g.resolved.resolved;
@@ -1391,7 +1451,7 @@ function walkOutlines(data, pose, opts) {
       const s = g.fontSize;
       const shear = g.resolved.synthetic.italic ? Math.tan(SYNTHETIC_ITALIC_RADIANS) : 0;
       const m = [s, 0, -shear * s, s, g.x + dx, g.baselineY + dy];
-      parts[paintOf[g.run]].push(transformPath(emGlyph(d), m));
+      parts[paintOf[g.run]].push(transformPath(emboldenGlyph(emGlyph(d), d, g.resolved), m));
     }
     for (const r of lineDecorations(line.glyphs, runs, faceOf, (run) => String(paintOf[run]))) {
       rules[paintOf[r.run]].push(ruleContour(r.x0 + dx, r.y0 + dy, r.x1 + dx, r.y1 + dy));
@@ -1428,6 +1488,6 @@ async function loadTextOutlines(data, opts = {}) {
   await Promise.all(facesOf(runs).map((f) => loadFontOutlines(f.family, { weight: f.weight, style: f.style })));
 }
 
-export { DEFAULT_DECORATION_METRICS, MARKDOWN_RUN_GRAMMAR, SCRIPT_METRICS, SMALL_CAPS_SCALE, SYNTHETIC_ITALIC_RADIANS, TextOutlinesError, applyStyleToRange, cachedPaintRuns, caretIndexAt, createMarkdownRenderer, decorationMetrics, defaultLabelTextRenderer, effectiveRangeStyle, fitTextPose, isBoldWeight, isSmallCapsLetter, isTextData, layoutMarkdown, layoutTextPose, loadTextOutlines, markdownToRuns, measureText, measureTextBounds, measuredWidth, nodeHasFlag, numericWeight, paintRuns, patchRangeStyle, pointInTextPose, rangeWeight, renderLabel, resolveRunFace, resolveRuns, runsCarryStyling, runsToMarkdown, runsToPlainText, scriptMetrics, scriptMetricsFor, setFlagOverRange, smallCapsScale, smallCapsScaleFor, smallCapsText, styleAtRange, supersededKey, textLineBoxes, textPoseLayoutInput, textToPath, textToPathsByPaint, toRuns, transformRunTexts, unboldPatch, verticalAlignOffset };
+export { DEFAULT_DECORATION_METRICS, MARKDOWN_RUN_GRAMMAR, SCRIPT_METRICS, SMALL_CAPS_SCALE, SYNTHETIC_ITALIC_RADIANS, TextOutlinesError, applyStyleToRange, cachedPaintRuns, caretIndexAt, createMarkdownRenderer, decorationMetrics, defaultLabelTextRenderer, effectiveRangeStyle, emboldenGlyphD, fitTextPose, isBoldWeight, isSmallCapsLetter, isTextData, layoutMarkdown, layoutTextPose, loadTextOutlines, markdownToRuns, measureText, measureTextBounds, measuredWidth, nodeHasFlag, numericWeight, paintRuns, patchRangeStyle, pointInTextPose, rangeWeight, renderLabel, resolveRunFace, resolveRuns, runsCarryStyling, runsToMarkdown, runsToPlainText, scriptMetrics, scriptMetricsFor, setFlagOverRange, smallCapsScale, smallCapsScaleFor, smallCapsText, styleAtRange, supersededKey, syntheticBoldOffset, textLineBoxes, textPoseLayoutInput, textToPath, textToPathsByPaint, toRuns, transformRunTexts, unboldPatch, verticalAlignOffset };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map