@weasel-js/text 1.14.2 → 1.15.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as StyledRun, T as TextStyle, L as LaidOutRuns, R as ResolvedTextStyle, a as ResolvedRun, b as LayoutRunsOpts, c as TextShaper, C as CacheUse, d as TextPaint, P as PlacedGlyph } from './test-seams-D6uEFbAw.js';
-export { B as BidiAnalysis, e as BidiReordering, f as BidiResolver, D as DEFAULT_TEXT_FILL, g as DEFAULT_TEXT_STYLE, F as FontVariantCaps, h as LAYOUT_CACHE_STRUCTURAL_LIMIT, i as LAYOUT_CACHE_VARIANT_LIMIT, j as LaidOutCell, k as LaidOutLineBox, M as MARKDOWN_RUN_GRAMMAR, l as RunFlag, m as RunGrammar, n as RunMarker, o as RunSourceMap, p as SCRIPT_METRICS, q as SMALL_CAPS_SCALE, r as ScriptPreset, s as ShapedCluster, t as ShapedGlyph, u as SmallCapsText, v as TextAlign, w as TextDirection, x as TextTransform, y as TransformedRunText, z as cachedLayoutRuns, A as dropRuns, E as fontString, G as halfLeadingFor, H as isBoldWeight, I as isSmallCapsLetter, J as layoutRuns, K as markdownToRuns, N as numericWeight, O as paragraphDirection, Q as registerBidi, U as resolveAlign, V as resolveRunFace, W as resolveRuns, X as resolveTextStyle, Y as resolveTextStyleInto, Z as runsToMarkdown, _ as runsToPlainText, $ as scriptMetrics, a0 as scriptMetricsFor, a1 as smallCapsScale, a2 as smallCapsScaleFor, a3 as smallCapsText, a4 as toRuns, a5 as transformRunTexts } from './test-seams-D6uEFbAw.js';
+import { S as StyledRun, T as TextStyle, L as LaidOutRuns, R as ResolvedTextStyle, a as ResolvedRun, b as LayoutRunsOpts, c as TextShaper, C as CacheUse, d as TextPaint, P as PlacedGlyph } from './test-seams-B2R_EedN.js';
+export { B as BidiAnalysis, e as BidiReordering, f as BidiResolver, D as DEFAULT_TEXT_FILL, g as DEFAULT_TEXT_STYLE, F as FontVariantCaps, h as LAYOUT_CACHE_STRUCTURAL_LIMIT, i as LAYOUT_CACHE_VARIANT_LIMIT, j as LaidOutCell, k as LaidOutLineBox, M as MARKDOWN_RUN_GRAMMAR, l as RunFlag, m as RunGrammar, n as RunMarker, o as RunSourceMap, p as SCRIPT_METRICS, q as SMALL_CAPS_SCALE, r as ScriptPreset, s as ShapedCluster, t as ShapedGlyph, u as SmallCapsText, v as TextAlign, w as TextDirection, x as TextTransform, y as TransformedRunText, z as cachedLayoutRuns, A as clearRuns, E as dropRuns, G as fontString, H as halfLeadingFor, I as isBoldWeight, J as isSmallCapsLetter, K as layoutRuns, N as markdownToRuns, O as numericWeight, Q as paragraphDirection, U as registerBidi, V as registeredBidi, W as resolveAlign, X as resolveRunFace, Y as resolveRuns, Z as resolveRunsInto, _ as resolveTextStyle, $ as resolveTextStyleInto, a0 as runsToMarkdown, a1 as runsToPlainText, a2 as scriptMetrics, a3 as scriptMetricsFor, a4 as smallCapsScale, a5 as smallCapsScaleFor, a6 as smallCapsText, a7 as toRuns, a8 as transformRunTexts, a9 as warnRtlWithoutEngine } from './test-seams-B2R_EedN.js';
 import { FaceRuleMetrics, FaceMetrics, BmFontChar, FontStyle, ResolveResult } from '@weasel-js/font';
 import { Fill, Stroke } from '@weasel-js/paint';
 import { Rect, PolygonPath, PathInWorldPose } from '@weasel-js/geom';
@@ -142,10 +142,13 @@ declare function layoutTextPose(pose: TextPose, scale?: number): TextPoseLayout;
  * it whenever its options carry none. Pass `null`, or call the function
  * returned, to take it out again.
  *
- * Shaping reaches the text whose face was registered with
- * `registerFontOutlines` from TrueType or OpenType bytes: those are the faces
- * whose glyphs are drawn by index. Text drawn from a baked or canvas atlas,
- * whose glyphs are looked up by code point, is laid out as before.
+ * Shaping reaches the text whose face has TrueType or OpenType bytes behind
+ * it: a face registered with `registerFontOutlines` alone, or a baked or
+ * canvas atlas face whose exact variant is also registered there. The atlas
+ * must be cut from that same file, or its advances disagree with the
+ * shaper's. On an atlas face, a cluster the shaping left as its code point's
+ * own glyph draws from the atlas as before; the rest draw from the shaper's
+ * glyphs.
  */
 declare function registerShaper(shaper: TextShaper | null): () => void;
 

package/dist/index.js

@@ -1,7 +1,7 @@
-import { DEFAULT_TAB_SIZE, shapesWithFeature, resolveTextStyle, cachedLayoutRuns, graphemeCount, wrapLines, hangs, emboldenGlyph, layoutRuns, lineDecorations, runFaces, tabAdvance, widthWithTabs, DECORATION_KINDS, decorationRule, faceOutlineD, hasGlyphQuad } from './chunk-5BJN6MC6.js';
-export { BREAK_ALLOWED, BREAK_MANDATORY, DEFAULT_DECORATION_METRICS, DEFAULT_TEXT_FILL, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, QUAD_STRIDE, cachedLayoutRuns, cachedPaintRuns, decorationMetrics, dropRuns, emboldenGlyphD, fontString, isHardLineBreak, layoutRuns, lineBreakOpportunities, paintRuns, paragraphDirection, registerBidi, registerShaper, resolveAlign, resolveTextStyle, resolveTextStyleInto, syntheticBoldOffset } from './chunk-5BJN6MC6.js';
+import { DEFAULT_TAB_SIZE, shapesWithFeature, resolveTextStyle, cachedLayoutRuns, graphemeCount, wrapLines, hangs, emboldenGlyph, layoutRuns, lineDecorations, runFaces, tabAdvance, widthWithTabs, DECORATION_KINDS, decorationRule, faceOutlineD, hasGlyphQuad } from './chunk-WUFANHTE.js';
+export { BREAK_ALLOWED, BREAK_MANDATORY, DEFAULT_DECORATION_METRICS, DEFAULT_TEXT_FILL, DEFAULT_TEXT_STYLE, LAYOUT_CACHE_STRUCTURAL_LIMIT, LAYOUT_CACHE_VARIANT_LIMIT, NO_BREAK, QUAD_STRIDE, cachedLayoutRuns, cachedPaintRuns, clearRuns, decorationMetrics, dropRuns, emboldenGlyphD, fontString, isHardLineBreak, layoutRuns, lineBreakOpportunities, paintRuns, paragraphDirection, registerBidi, registerShaper, registeredBidi, resolveAlign, resolveTextStyle, resolveTextStyleInto, syntheticBoldOffset, warnRtlWithoutEngine } from './chunk-WUFANHTE.js';
 import { resolveScreenLength, paintKey, strokeKey } from '@weasel-js/paint';
-import { faceMetricsOf, resolveFontVariant, loadFontOutlines, glyphGeneration, faceMetricsFor, outlineStatus, cssFamilyName } from '@weasel-js/font';
+import { faceMetricsOf, cachedFontVariant, loadFontOutlines, glyphGeneration, faceMetricsFor, outlineStatus, cssFamilyName } from '@weasel-js/font';
 import { MIXED, deepEqual } from '@weasel-js/registry';
 export { MIXED } from '@weasel-js/registry';
 import { transformPath, joinPaths, pathFromD, pathSignedArea, reversePath, poseFrameOf, originFor, coordsFrom, PATH_M, PATH_L, PATH_Z } from '@weasel-js/geom';
@@ -262,7 +262,7 @@ function smallCapsScale(face) {
   return x / cap;
 }
 function smallCapsScaleFor(family, weight, style) {
-  return smallCapsScale(faceMetricsOf(resolveFontVariant(family, weight, style)));
+  return smallCapsScale(faceMetricsOf(cachedFontVariant(family, weight, style)));
 }
 function isSmallCapsLetter(ch, lang) {
   return ch.toLocaleUpperCase(caseLocale(lang)) !== ch;
@@ -317,10 +317,10 @@ function scriptMetrics(face) {
   return out;
 }
 function scriptMetricsFor(family, weight, style) {
-  return scriptMetrics(faceMetricsOf(resolveFontVariant(family, weight, style)));
+  return scriptMetrics(faceMetricsOf(cachedFontVariant(family, weight, style)));
 }
 function halfLeadingFor(family, weight, style, fontSize, lineHeight) {
-  const m = faceMetricsOf(resolveFontVariant(family, weight, style));
+  const m = faceMetricsOf(cachedFontVariant(family, weight, style));
   if (m?.ascent === void 0 || m.descent === void 0) return void 0;
   return (lineHeight - m.ascent - m.descent) / 2 * fontSize;
 }
@@ -342,7 +342,10 @@ function resolveRunFace(run, style) {
   };
 }
 function resolveRuns(runs, style, viewScale = 1) {
-  const out = new Array(runs.length);
+  return resolveRunsInto(new Array(runs.length), runs, style, viewScale);
+}
+function resolveRunsInto(out, runs, style, viewScale = 1) {
+  if (out.length !== runs.length) out.length = runs.length;
   let transformed = false;
   for (const r of runs) if ((r.textTransform ?? style.textTransform) !== "none") transformed = true;
   const shown = transformed ? transformRunTexts(
@@ -376,26 +379,53 @@ function resolveRuns(runs, style, viewScale = 1) {
       }
     }
     const lang = run.lang ?? style.lang;
+    const fill = run.fill !== void 0 ? run.fill : style.fill;
+    const letterSpacing = run.letterSpacing !== void 0 ? resolveScreenLength(run.letterSpacing, viewScale) : style.letterSpacing;
+    const underline = run.underline || style.underline;
+    const strikethrough = run.strikethrough || style.strikethrough;
+    const overline = run.overline || style.overline;
+    const stroke = run.stroke ?? style.stroke;
+    const rotate = run.rotate && Number.isFinite(run.rotate) ? run.rotate : void 0;
+    const prev = out[i];
+    if (prev !== void 0 && prev.srcMap !== void 0 === (srcMap !== void 0) && prev.sizeMap !== void 0 === (sizeMap !== void 0) && prev.stroke !== void 0 === (stroke !== void 0) && prev.strutSize !== void 0 === relative && prev.rotate !== void 0 === (rotate !== void 0) && prev.fontFeatures !== void 0 === (fontFeatures !== void 0) && prev.lang !== void 0 === !!lang) {
+      prev.text = text;
+      prev.fontFamily = fontFamily;
+      prev.fontSize = fontSize;
+      prev.fontWeight = fontWeight;
+      prev.fontStyle = fontStyle;
+      prev.fill = fill;
+      prev.letterSpacing = letterSpacing;
+      prev.underline = underline;
+      prev.strikethrough = strikethrough;
+      prev.overline = overline;
+      prev.baselineShift = shiftEm * style.fontSize;
+      if (srcMap) prev.srcMap = srcMap;
+      if (sizeMap) prev.sizeMap = sizeMap;
+      if (stroke !== void 0) prev.stroke = stroke;
+      if (relative) prev.strutSize = style.fontSize;
+      if (rotate !== void 0) prev.rotate = rotate;
+      if (fontFeatures) prev.fontFeatures = fontFeatures;
+      if (lang) prev.lang = lang;
+      continue;
+    }
     const r = {
       text,
       fontFamily,
       fontSize,
       fontWeight,
       fontStyle,
-      fill: run.fill !== void 0 ? run.fill : style.fill,
-      letterSpacing: run.letterSpacing !== void 0 ? resolveScreenLength(run.letterSpacing, viewScale) : style.letterSpacing,
-      // `||`, not `??`: run-level decorations are additive over the node style.
-      underline: run.underline || style.underline,
-      strikethrough: run.strikethrough || style.strikethrough,
-      overline: run.overline || style.overline,
+      fill,
+      letterSpacing,
+      underline,
+      strikethrough,
+      overline,
       baselineShift: shiftEm * style.fontSize
     };
     if (srcMap) r.srcMap = srcMap;
     if (sizeMap) r.sizeMap = sizeMap;
-    const stroke = run.stroke ?? style.stroke;
     if (stroke !== void 0) r.stroke = stroke;
     if (relative) r.strutSize = style.fontSize;
-    if (run.rotate && Number.isFinite(run.rotate)) r.rotate = run.rotate;
+    if (rotate !== void 0) r.rotate = rotate;
     if (fontFeatures) r.fontFeatures = fontFeatures;
     if (lang) r.lang = lang;
     out[i] = r;
@@ -1110,7 +1140,7 @@ function assertOutlinable(run, caller) {
     void loadFontOutlines(fontFamily, { weight: fontWeight, style: fontStyle });
     fail("outlines-loading", "its outlines have not loaded yet; await loadTextOutlines first.");
   }
-  const r = resolveFontVariant(fontFamily, fontWeight, fontStyle);
+  const r = cachedFontVariant(fontFamily, fontWeight, fontStyle);
   const { family, weight, style } = r.resolved;
   if (r.source === "outline") return;
   const status = outlineStatus(family, weight, style);
@@ -1200,7 +1230,7 @@ function facesOf(runs) {
   };
   for (const r of runs) {
     add(r.fontFamily, r.fontWeight, r.fontStyle);
-    const { family, weight, style } = resolveFontVariant(r.fontFamily, r.fontWeight, r.fontStyle).resolved;
+    const { family, weight, style } = cachedFontVariant(r.fontFamily, r.fontWeight, r.fontStyle).resolved;
     add(family, weight, style);
   }
   return [...out.values()];
@@ -1358,6 +1388,6 @@ function clustersOf(data, width, scale) {
   });
 }
 
-export { MARKDOWN_RUN_GRAMMAR, SCRIPT_METRICS, SMALL_CAPS_SCALE, SYNTHETIC_ITALIC_RADIANS, TextOutlinesError, applyStyleToRange, caretIndexAt, createMarkdownRenderer, defaultLabelTextRenderer, effectiveRangeStyle, fitTextPose, glyphOutlineAt, glyphTurn, halfLeadingFor, isBoldWeight, isSmallCapsLetter, isTextData, layoutMarkdown, layoutTextPose, loadTextOutlines, markdownToRuns, measureText, measureTextBounds, measuredWidth, nodeHasFlag, numericWeight, patchRangeStyle, pointInTextPose, rangeWeight, renderLabel, resolveRunFace, resolveRuns, runsCarryStyling, runsToMarkdown, runsToPlainText, scriptMetrics, scriptMetricsFor, setFlagOverRange, smallCapsScale, smallCapsScaleFor, smallCapsText, styleAtRange, supersededKey, textClusters, textLineBoxes, textPoseLayoutInput, textToPath, textToPathsByPaint, toRuns, transformRunTexts, unboldPatch, verticalAlignOffset };
+export { MARKDOWN_RUN_GRAMMAR, SCRIPT_METRICS, SMALL_CAPS_SCALE, SYNTHETIC_ITALIC_RADIANS, TextOutlinesError, applyStyleToRange, caretIndexAt, createMarkdownRenderer, defaultLabelTextRenderer, effectiveRangeStyle, fitTextPose, glyphOutlineAt, glyphTurn, halfLeadingFor, isBoldWeight, isSmallCapsLetter, isTextData, layoutMarkdown, layoutTextPose, loadTextOutlines, markdownToRuns, measureText, measureTextBounds, measuredWidth, nodeHasFlag, numericWeight, patchRangeStyle, pointInTextPose, rangeWeight, renderLabel, resolveRunFace, resolveRuns, resolveRunsInto, runsCarryStyling, runsToMarkdown, runsToPlainText, scriptMetrics, scriptMetricsFor, setFlagOverRange, smallCapsScale, smallCapsScaleFor, smallCapsText, styleAtRange, supersededKey, textClusters, textLineBoxes, textPoseLayoutInput, textToPath, textToPathsByPaint, toRuns, transformRunTexts, unboldPatch, verticalAlignOffset };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map