@unmade/text-renderer 0.1.3 → 0.1.4

package/dist/index.js

@@ -2945,9 +2945,9 @@ function st(e, r, t) {
     T = i.length % 2 !== 0, T && !f && (L = i.shift() + y), l += i.length >> 1, i.length = 0, f = !0;
   }
   function C(T) {
-    for (var R, q, A, X, Q, P, H, Y, W, I, z, $, M = 0; M < T.length; ) {
-      var _ = T[M];
-      switch (M += 1, _) {
+    for (var R, q, A, X, Q, P, H, Y, W, I, z, $, B = 0; B < T.length; ) {
+      var _ = T[B];
+      switch (B += 1, _) {
         case 1:
           D();
           break;
@@ -2979,7 +2979,7 @@ function st(e, r, t) {
         case 11:
           return;
         case 12:
-          switch (_ = T[M], M += 1, _) {
+          switch (_ = T[B], B += 1, _) {
             case 35:
               n = p + i.shift(), a = h + i.shift(), s = n + i.shift(), o = a + i.shift(), H = s + i.shift(), Y = o + i.shift(), W = H + i.shift(), I = Y + i.shift(), z = W + i.shift(), $ = I + i.shift(), p = z + i.shift(), h = $ + i.shift(), i.shift(), u.curveTo(n, a, s, o, H, Y), u.curveTo(W, I, z, $, p, h);
               break;
@@ -3005,7 +3005,7 @@ function st(e, r, t) {
         case 19:
         // hintmask
         case 20:
-          D(), M += l + 7 >> 3;
+          D(), B += l + 7 >> 3;
           break;
         case 21:
           i.length > 2 && !f && (L = i.shift() + y, f = !0), h += i.pop(), p += i.pop(), w(p, h);
@@ -3035,7 +3035,7 @@ function st(e, r, t) {
             n = p + i.shift(), a = h, s = n + i.shift(), o = a + i.shift(), p = s + i.shift(), h = o, u.curveTo(n, a, s, o, p, h);
           break;
         case 28:
-          R = T[M], q = T[M + 1], i.push((R << 24 | q << 16) >> 16), M += 2;
+          R = T[B], q = T[B + 1], i.push((R << 24 | q << 16) >> 16), B += 2;
           break;
         case 29:
           Q = i.pop() + e.gsubrsBias, P = e.gsubrs[Q], P && C(P);
@@ -3049,7 +3049,7 @@ function st(e, r, t) {
             n = p, a = h + i.shift(), s = n + i.shift(), o = a + i.shift(), p = s + i.shift(), h = o + (i.length === 1 ? i.shift() : 0), u.curveTo(n, a, s, o, p, h);
           break;
         default:
-          _ < 32 ? console.log("Glyph " + r.index + ": unknown operator " + _) : _ < 247 ? i.push(_ - 139) : _ < 251 ? (R = T[M], M += 1, i.push((_ - 247) * 256 + R + 108)) : _ < 255 ? (R = T[M], M += 1, i.push(-(_ - 251) * 256 - R - 108)) : (R = T[M], q = T[M + 1], A = T[M + 2], X = T[M + 3], M += 4, i.push((R << 24 | q << 16 | A << 8 | X) / 65536));
+          _ < 32 ? console.log("Glyph " + r.index + ": unknown operator " + _) : _ < 247 ? i.push(_ - 139) : _ < 251 ? (R = T[B], B += 1, i.push((_ - 247) * 256 + R + 108)) : _ < 255 ? (R = T[B], B += 1, i.push(-(_ - 251) * 256 - R - 108)) : (R = T[B], q = T[B + 1], A = T[B + 2], X = T[B + 3], B += 4, i.push((R << 24 | q << 16 | A << 8 | X) / 65536));
       }
     }
   }
@@ -3130,7 +3130,7 @@ function Aa() {
     { name: "major", type: "Card8", value: 1 }
   ]);
 }
-function Ma(e) {
+function Ba(e) {
   var r = new S.Record("Name INDEX", [
     { name: "names", type: "INDEX", value: [] }
   ]);
@@ -3158,7 +3158,7 @@ function it(e) {
   ]);
   return r.topDicts = [{ name: "topDict_0", type: "TABLE", value: e }], r;
 }
-function Ba(e) {
+function Ma(e) {
   var r = new S.Record("String INDEX", [
     { name: "strings", type: "INDEX", value: [] }
   ]);
@@ -3248,9 +3248,9 @@ function Wa(e, r) {
   }, s = {}, o = [], u, i = 1; i < e.length; i += 1)
     u = e.get(i), o.push(u.name);
   var l = [];
-  t.header = Aa(), t.nameIndex = Ma([r.postScriptName]);
+  t.header = Aa(), t.nameIndex = Ba([r.postScriptName]);
   var f = ot(a, l);
-  t.topDictIndex = it(f), t.globalSubrIndex = Ia(), t.charsets = Pa(o, l), t.charStringsIndex = Na(e), t.privateDict = Ha(s, l), t.stringIndex = Ba(l);
+  t.topDictIndex = it(f), t.globalSubrIndex = Ia(), t.charsets = Pa(o, l), t.charStringsIndex = Na(e), t.privateDict = Ha(s, l), t.stringIndex = Ma(l);
   var c = t.header.sizeOf() + t.nameIndex.sizeOf() + t.topDictIndex.sizeOf() + t.stringIndex.sizeOf() + t.globalSubrIndex.sizeOf();
   return a.charset = c, a.encoding = 0, a.charStrings = a.charset + t.charsets.sizeOf(), a.private[1] = a.charStrings + t.charStringsIndex.sizeOf(), f = ot(a, l), t.topDictIndex = it(f), t;
 }
@@ -4971,14 +4971,14 @@ function ms(e) {
     postScriptName: Q,
     unitsPerEm: e.unitsPerEm,
     fontBBox: [0, x.yMin, x.ascender, x.advanceWidthMax]
-  }), M = e.metas && Object.keys(e.metas).length > 0 ? yn.make(e.metas) : void 0, _ = [L, w, D, C, W, R, z, $, T];
-  I && _.push(I), e.tables.gsub && _.push(mn.make(e.tables.gsub)), M && _.push(M);
-  for (var De = xn(_), pr = De.encode(), Ae = _r(pr), Me = De.fields, Be = !1, Ce = 0; Ce < Me.length; Ce += 1)
-    if (Me[Ce].name === "head table") {
-      Me[Ce].value.checkSumAdjustment = 2981146554 - Ae, Be = !0;
+  }), B = e.metas && Object.keys(e.metas).length > 0 ? yn.make(e.metas) : void 0, _ = [L, w, D, C, W, R, z, $, T];
+  I && _.push(I), e.tables.gsub && _.push(mn.make(e.tables.gsub)), B && _.push(B);
+  for (var De = xn(_), pr = De.encode(), Ae = _r(pr), Be = De.fields, Me = !1, Ce = 0; Ce < Be.length; Ce += 1)
+    if (Be[Ce].name === "head table") {
+      Be[Ce].value.checkSumAdjustment = 2981146554 - Ae, Me = !0;
       break;
     }
-  if (!Be)
+  if (!Me)
     throw new Error("Could not find head table with checkSum to adjust.");
   return De;
 }
@@ -5594,7 +5594,7 @@ function Fs(e, r, t, n) {
 function Us(e, r, t, n, a) {
   return a.lowMemory ? Fs(e, r, t, n) : ks(e, r, t, n);
 }
-var Fn = { getPath: Tn, parse: Us }, Un, Ue, Cn, Mr;
+var Fn = { getPath: Tn, parse: Us }, Un, Ue, Cn, Br;
 function wn(e) {
   this.font = e, this.getCommands = function(r) {
     return Fn.getPath(r).commands;
@@ -5853,13 +5853,13 @@ wn.prototype.exec = function(e, r) {
 Cn = function(e, r) {
   var t = r.ppem / r.font.unitsPerEm, n = t, a = e.components, s, o, u;
   if (xe.prototype = r, !a)
-    u = new xe("glyf", e.instructions), exports.DEBUG && (console.log("---EXEC GLYPH---"), u.step = -1), Mr(e, u, t, n), o = u.gZone;
+    u = new xe("glyf", e.instructions), exports.DEBUG && (console.log("---EXEC GLYPH---"), u.step = -1), Br(e, u, t, n), o = u.gZone;
   else {
     var i = r.font;
     o = [], s = [];
     for (var l = 0; l < a.length; l++) {
       var f = a[l], c = i.glyphs.get(f.glyphIndex);
-      u = new xe("glyf", c.instructions), exports.DEBUG && (console.log("---EXEC COMP " + l + "---"), u.step = -1), Mr(c, u, t, n);
+      u = new xe("glyf", c.instructions), exports.DEBUG && (console.log("---EXEC COMP " + l + "---"), u.step = -1), Br(c, u, t, n);
       for (var p = Math.round(f.dx * t), h = Math.round(f.dy * n), d = u.gZone, g = u.contours, m = 0; m < d.length; m++) {
         var y = d[m];
         y.xTouched = y.yTouched = !1, y.xo = y.x = y.x + p, y.yo = y.y = y.y + h;
@@ -5876,7 +5876,7 @@ Cn = function(e, r) {
   }
   return o;
 };
-Mr = function(e, r, t, n) {
+Br = function(e, r, t, n) {
   for (var a = e.points || [], s = a.length, o = r.gZone = r.z0 = r.z1 = r.z2 = [], u = r.contours = [], i, l = 0; l < s; l++)
     i = a[l], o[l] = new ce(
       i.x * t,
@@ -5968,11 +5968,11 @@ function As(e) {
   var r = e.stack, t = r.pop(), n = r.pop();
   exports.DEBUG && console.log(e.step, "SPVFS[]", t, n), e.fv = Xe(n, t);
 }
-function Ms(e) {
+function Bs(e) {
   var r = e.stack, t = e.pv;
   exports.DEBUG && console.log(e.step, "GPV[]"), r.push(t.x * 16384), r.push(t.y * 16384);
 }
-function Bs(e) {
+function Ms(e) {
   var r = e.stack, t = e.fv;
   exports.DEBUG && console.log(e.step, "GFV[]"), r.push(t.x * 16384), r.push(t.y * 16384);
 }
@@ -6347,11 +6347,11 @@ function Ao(e) {
   var r = e.stack, t = r.pop();
   exports.DEBUG && console.log(e.step, "SDB[]", t), e.deltaBase = t;
 }
-function Mo(e) {
+function Bo(e) {
   var r = e.stack, t = r.pop();
   exports.DEBUG && console.log(e.step, "SDS[]", t), e.deltaShift = Math.pow(0.5, t);
 }
-function Bo(e) {
+function Mo(e) {
   var r = e.stack, t = r.pop(), n = r.pop();
   exports.DEBUG && console.log(e.step, "ADD[]", t, n), r.push(n + t);
 }
@@ -6582,9 +6582,9 @@ Un = [
   /* 0x0B */
   As,
   /* 0x0C */
-  Ms,
-  /* 0x0D */
   Bs,
+  /* 0x0D */
+  Ms,
   /* 0x0E */
   Is,
   /* 0x0F */
@@ -6757,9 +6757,9 @@ Un = [
   /* 0x5E */
   Ao,
   /* 0x5F */
-  Mo,
-  /* 0x60 */
   Bo,
+  /* 0x60 */
+  Mo,
   /* 0x61 */
   Io,
   /* 0x62 */
@@ -7976,7 +7976,7 @@ ae.prototype.getTextGlyphs = function(e) {
   }
   return r;
 };
-function B(e) {
+function M(e) {
   e = e || {}, e.tables = e.tables || {}, e.empty || (Pe(e.familyName, "When creating a new Font object, familyName is required."), Pe(e.styleName, "When creating a new Font object, styleName is required."), Pe(e.unitsPerEm, "When creating a new Font object, unitsPerEm is required."), Pe(e.ascender, "When creating a new Font object, ascender is required."), Pe(e.descender <= 0, "When creating a new Font object, negative descender value is required."), this.names = {
     fontFamily: { en: e.familyName || " " },
     fontSubfamily: { en: e.styleName || " " },
@@ -8008,17 +8008,17 @@ function B(e) {
     }
   });
 }
-B.prototype.hasChar = function(e) {
+M.prototype.hasChar = function(e) {
   return this.encoding.charToGlyphIndex(e) !== null;
 };
-B.prototype.charToGlyphIndex = function(e) {
+M.prototype.charToGlyphIndex = function(e) {
   return this.encoding.charToGlyphIndex(e);
 };
-B.prototype.charToGlyph = function(e) {
+M.prototype.charToGlyph = function(e) {
   var r = this.charToGlyphIndex(e), t = this.glyphs.get(r);
   return t || (t = this.glyphs.get(0)), t;
 };
-B.prototype.updateFeatures = function(e) {
+M.prototype.updateFeatures = function(e) {
   return this.defaultRenderOptions.features.map(function(r) {
     return r.script === "latn" ? {
       script: "latn",
@@ -8028,7 +8028,7 @@ B.prototype.updateFeatures = function(e) {
     } : r;
   });
 };
-B.prototype.stringToGlyphs = function(e, r) {
+M.prototype.stringToGlyphs = function(e, r) {
   var t = this, n = new ae(), a = function(c) {
     return t.charToGlyphIndex(c.char);
   };
@@ -8039,22 +8039,22 @@ B.prototype.stringToGlyphs = function(e, r) {
     i[f] = this.glyphs.get(o[f]) || l;
   return i;
 };
-B.prototype.nameToGlyphIndex = function(e) {
+M.prototype.nameToGlyphIndex = function(e) {
   return this.glyphNames.nameToGlyphIndex(e);
 };
-B.prototype.nameToGlyph = function(e) {
+M.prototype.nameToGlyph = function(e) {
   var r = this.nameToGlyphIndex(e), t = this.glyphs.get(r);
   return t || (t = this.glyphs.get(0)), t;
 };
-B.prototype.glyphIndexToName = function(e) {
+M.prototype.glyphIndexToName = function(e) {
   return this.glyphNames.glyphIndexToName ? this.glyphNames.glyphIndexToName(e) : "";
 };
-B.prototype.getKerningValue = function(e, r) {
+M.prototype.getKerningValue = function(e, r) {
   e = e.index || e, r = r.index || r;
   var t = this.position.defaultKerningTables;
   return t ? this.position.getKerningValue(t, e, r) : this.kerningPairs[e + "," + r] || 0;
 };
-B.prototype.defaultRenderOptions = {
+M.prototype.defaultRenderOptions = {
   kerning: !0,
   features: [
     /**
@@ -8065,7 +8065,7 @@ B.prototype.defaultRenderOptions = {
     { script: "latn", tags: ["liga", "rlig"] }
   ]
 };
-B.prototype.forEachGlyph = function(e, r, t, n, a, s) {
+M.prototype.forEachGlyph = function(e, r, t, n, a, s) {
   r = r !== void 0 ? r : 0, t = t !== void 0 ? t : 0, n = n !== void 0 ? n : 72, a = Object.assign({}, this.defaultRenderOptions, a);
   var o = 1 / this.unitsPerEm * n, u = this.stringToGlyphs(e, a), i;
   if (a.kerning) {
@@ -8082,43 +8082,43 @@ B.prototype.forEachGlyph = function(e, r, t, n, a, s) {
   }
   return r;
 };
-B.prototype.getPath = function(e, r, t, n, a) {
+M.prototype.getPath = function(e, r, t, n, a) {
   var s = new V();
   return this.forEachGlyph(e, r, t, n, a, function(o, u, i, l) {
     var f = o.getPath(u, i, l, a, this);
     s.extend(f);
   }), s;
 };
-B.prototype.getPaths = function(e, r, t, n, a) {
+M.prototype.getPaths = function(e, r, t, n, a) {
   var s = [];
   return this.forEachGlyph(e, r, t, n, a, function(o, u, i, l) {
     var f = o.getPath(u, i, l, a, this);
     s.push(f);
   }), s;
 };
-B.prototype.getAdvanceWidth = function(e, r, t) {
+M.prototype.getAdvanceWidth = function(e, r, t) {
   return this.forEachGlyph(e, 0, 0, r, t, function() {
   });
 };
-B.prototype.draw = function(e, r, t, n, a, s) {
+M.prototype.draw = function(e, r, t, n, a, s) {
   this.getPath(r, t, n, a, s).draw(e);
 };
-B.prototype.drawPoints = function(e, r, t, n, a, s) {
+M.prototype.drawPoints = function(e, r, t, n, a, s) {
   this.forEachGlyph(r, t, n, a, s, function(o, u, i, l) {
     o.drawPoints(e, u, i, l);
   });
 };
-B.prototype.drawMetrics = function(e, r, t, n, a, s) {
+M.prototype.drawMetrics = function(e, r, t, n, a, s) {
   this.forEachGlyph(r, t, n, a, s, function(o, u, i, l) {
     o.drawMetrics(e, u, i, l);
   });
 };
-B.prototype.getEnglishName = function(e) {
+M.prototype.getEnglishName = function(e) {
   var r = this.names[e];
   if (r)
     return r.en;
 };
-B.prototype.validate = function() {
+M.prototype.validate = function() {
   var e = this;
   function r(n, a) {
   }
@@ -8128,18 +8128,18 @@ B.prototype.validate = function() {
   }
   t("fontFamily"), t("weightName"), t("manufacturer"), t("copyright"), t("version"), this.unitsPerEm > 0;
 };
-B.prototype.toTables = function() {
+M.prototype.toTables = function() {
   return ys.fontToTable(this);
 };
-B.prototype.toBuffer = function() {
+M.prototype.toBuffer = function() {
   return console.warn("Font.toBuffer is deprecated. Use Font.toArrayBuffer instead."), this.toArrayBuffer();
 };
-B.prototype.toArrayBuffer = function() {
+M.prototype.toArrayBuffer = function() {
   for (var e = this.toTables(), r = e.encode(), t = new ArrayBuffer(r.length), n = new Uint8Array(t), a = 0; a < r.length; a++)
     n[a] = r[a];
   return t;
 };
-B.prototype.download = function(e) {
+M.prototype.download = function(e) {
   var r = this.getEnglishName("fontFamily"), t = this.getEnglishName("fontSubfamily");
   e = e || r.replace(/\s/g, "") + "-" + t + ".otf";
   var n = this.toArrayBuffer();
@@ -8156,7 +8156,7 @@ B.prototype.download = function(e) {
     i.writeFileSync(e, l);
   }
 };
-B.prototype.fsSelectionValues = {
+M.prototype.fsSelectionValues = {
   ITALIC: 1,
   //1
   UNDERSCORE: 2,
@@ -8178,7 +8178,7 @@ B.prototype.fsSelectionValues = {
   OBLIQUE: 512
   //512
 };
-B.prototype.usWidthClasses = {
+M.prototype.usWidthClasses = {
   ULTRA_CONDENSED: 1,
   EXTRA_CONDENSED: 2,
   CONDENSED: 3,
@@ -8189,7 +8189,7 @@ B.prototype.usWidthClasses = {
   EXTRA_EXPANDED: 8,
   ULTRA_EXPANDED: 9
 };
-B.prototype.usWeightClasses = {
+M.prototype.usWeightClasses = {
   THIN: 100,
   EXTRA_LIGHT: 200,
   LIGHT: 300,
@@ -8223,11 +8223,11 @@ function Ai(e, r, t) {
     { name: "nameID_" + e, type: "USHORT", value: n }
   ];
 }
-function Mi(e, r, t) {
+function Bi(e, r, t) {
   var n = {}, a = new F.Parser(e, r);
   return n.tag = a.parseTag(), n.minValue = a.parseFixed(), n.defaultValue = a.parseFixed(), n.maxValue = a.parseFixed(), a.skip("uShort", 1), n.name = t[a.parseUShort()] || {}, n;
 }
-function Bi(e, r, t, n) {
+function Mi(e, r, t, n) {
   for (var a = Dn(r.name, n), s = [
     { name: "nameID_" + e, type: "USHORT", value: a },
     { name: "flags_" + e, type: "USHORT", value: 0 }
@@ -8262,7 +8262,7 @@ function Pi(e, r) {
   for (var n = 0; n < e.axes.length; n++)
     t.fields = t.fields.concat(Ai(n, e.axes[n], r));
   for (var a = 0; a < e.instances.length; a++)
-    t.fields = t.fields.concat(Bi(a, e.instances[a], e.axes, r));
+    t.fields = t.fields.concat(Mi(a, e.instances[a], e.axes, r));
   return t;
 }
 function Gi(e, r, t) {
@@ -8271,7 +8271,7 @@ function Gi(e, r, t) {
   var s = n.parseOffset16();
   n.skip("uShort", 1);
   for (var o = n.parseUShort(), u = n.parseUShort(), i = n.parseUShort(), l = n.parseUShort(), f = [], c = 0; c < o; c++)
-    f.push(Mi(e, r + s + c * u, t));
+    f.push(Bi(e, r + s + c * u, t));
   for (var p = [], h = r + s + o * u, d = 0; d < i; d++)
     p.push(Ii(e, h + d * l, f, t));
   return { axes: f, instances: p };
@@ -8484,7 +8484,7 @@ function au(e, r) {
     r("Font could not be loaded");
   }, t.send();
 }
-function Mt(e, r) {
+function Bt(e, r) {
   for (var t = [], n = 12, a = 0; a < r; a += 1) {
     var s = F.getTag(e, n), o = F.getULong(e, n + 4), u = F.getULong(e, n + 8), i = F.getULong(e, n + 12);
     t.push({ tag: s, checksum: o, offset: u, length: i, compression: !1 }), n += 16;
@@ -8516,11 +8516,11 @@ function N(e, r) {
 }
 function $r(e, r) {
   r = r ?? {};
-  var t, n, a = new B({ empty: !0 }), s = new DataView(e, 0), o, u = [], i = F.getTag(s, 0);
+  var t, n, a = new M({ empty: !0 }), s = new DataView(e, 0), o, u = [], i = F.getTag(s, 0);
   if (i === "\0
\0\0" || i === "true" || i === "typ1")
-    a.outlinesFormat = "truetype", o = F.getUShort(s, 4), u = Mt(s, o);
+    a.outlinesFormat = "truetype", o = F.getUShort(s, 4), u = Bt(s, o);
   else if (i === "OTTO")
-    a.outlinesFormat = "cff", o = F.getUShort(s, 4), u = Mt(s, o);
+    a.outlinesFormat = "cff", o = F.getUShort(s, 4), u = Bt(s, o);
   else if (i === "wOFF") {
     var l = F.getTag(s, 4);
     if (l === "\0
\0\0")
@@ -8632,8 +8632,8 @@ function $r(e, r) {
     a.tables.fvar = Ni.parse($.data, $.offset, a.names);
   }
   if (L) {
-    var M = N(s, L);
-    a.tables.meta = yn.parse(M.data, M.offset), a.metas = a.tables.meta;
+    var B = N(s, L);
+    a.tables.meta = yn.parse(B.data, B.offset), a.metas = a.tables.meta;
   }
   return a;
 }
@@ -8667,7 +8667,7 @@ function iu(e, r) {
 }
 var uu = /* @__PURE__ */ Object.freeze({
   __proto__: null,
-  Font: B,
+  Font: M,
   Glyph: K,
   Path: V,
   BoundingBox: he,
@@ -8693,8 +8693,8 @@ function lu(e, r) {
     }
   });
 }
-const Br = /* @__PURE__ */ new Map(), _u = () => Br, fu = async (e, r = !1) => {
-  const t = Br.get(e);
+const Mr = /* @__PURE__ */ new Map(), _u = () => Mr, fu = async (e, r = !1) => {
+  const t = Mr.get(e);
   if (t) {
     if (r && !t.svgGlyphs) {
       const i = await fetch(e);
@@ -8719,7 +8719,7 @@ const Br = /* @__PURE__ */ new Map(), _u = () => Br, fu = async (e, r = !1) => {
     o = await i(a);
   }
   const u = lu(s, o);
-  return Br.set(e, u), u;
+  return Mr.set(e, u), u;
 }, pu = 0.03125, An = 1.1, cu = 0.2, $e = {
   outlineWidth: pu,
   letterSpacing: 0,
@@ -8771,7 +8771,7 @@ const vu = (e) => e === void 0 || e === "flat" ? { type: "flat" } : e === "curve
     }
   }
   return l += s * (n * An), `M 0 ${l} L ${o} ${l}`;
-}, Mn = ({
+}, Bn = ({
   boxDimensions: e,
   baseline: r,
   textHeight: t,
@@ -8779,7 +8779,7 @@ const vu = (e) => e === void 0 || e === "flat" ? { type: "flat" } : e === "curve
 }) => {
   const { width: a, height: s } = e, o = t * cu, u = t + o, i = n === "top" ? 0 : s / 2 - u / 2, l = r + i, f = l + o;
   if (n !== "top" && (f > s || l - t < 0))
-    return Mn({
+    return Bn({
       boxDimensions: e,
       baseline: r,
       textHeight: t,
@@ -8823,7 +8823,7 @@ const vu = (e) => e === void 0 || e === "flat" ? { type: "flat" } : e === "curve
   let l = i.y2 - i.y1;
   if (s > 0) {
     const d = kr * s;
-    l -= d * 2;
+    l += d * 2;
   }
   const c = l / r.height * r.physicalHeight, p = a[0] / c;
   return kr * p;
@@ -8839,9 +8839,9 @@ const vu = (e) => e === void 0 || e === "flat" ? { type: "flat" } : e === "curve
     height: h,
     baseline: d
   };
-}, Zr = window.DOMParser, bu = globalThis.DOMMatrix, Bn = typeof window < "u" ? new URL(window.location.href) : null;
-Bn?.searchParams.get("mode");
-Bn?.searchParams.has("rasterlayplan");
+}, Zr = window.DOMParser, bu = globalThis.DOMMatrix, Mn = typeof window < "u" ? new URL(window.location.href) : null;
+Mn?.searchParams.get("mode");
+Mn?.searchParams.has("rasterlayplan");
 typeof navigator < "u" && navigator.vendor && navigator.vendor.indexOf("Apple") > -1;
 const Su = {
   aliceblue: "#f0f8ff",
@@ -8995,7 +8995,13 @@ const Su = {
 }, Tu = (e) => {
   let r = Array.from(e), t = !1;
   return r[0] === "#" && (r.shift(), t = !0), r.length === 3 && (r = r.map((n) => `${n}${n}`)), `${t ? "#" : ""}${r.join("").toLowerCase()}`;
-}, Fr = (e) => Math.max(0, Math.min(255, Math.round(e))).toString(16).padStart(2, "0"), Bt = (e, r, t) => `#${Fr(e)}${Fr(r)}${Fr(t)}`, ku = (e, r, t) => {
+}, Fr = (e) => {
+  const r = typeof e == "string" ? Number.parseInt(e, 10) : e;
+  return Math.max(0, Math.min(255, Math.round(r))).toString(16).padStart(2, "0");
+}, Mt = (...e) => {
+  const [r, t, n] = Array.isArray(e[0]) ? e[0] : e;
+  return `#${Fr(r)}${Fr(t)}${Fr(n)}`;
+}, ku = (e, r, t) => {
   if (r === 0) {
     const f = Math.round(t * 255);
     return [f, f, f];
@@ -9015,7 +9021,7 @@ const Su = {
     const n = r.match(
       /rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*(?:,\s*[\d.]+\s*)?\)/
     );
-    return n ? Bt(
+    return n ? Mt(
       Number.parseInt(n[1], 10),
       Number.parseInt(n[2], 10),
       Number.parseInt(n[3], 10)
@@ -9027,7 +9033,7 @@ const Su = {
     );
     if (!n) return;
     const a = Number.parseInt(n[1], 10), s = Number.parseFloat(n[2]) / 100, o = Number.parseFloat(n[3]) / 100, [u, i, l] = ku(a, s, o);
-    return Bt(u, i, l);
+    return Mt(u, i, l);
   }
   const t = Su[r];
   if (t) return t;
@@ -9148,10 +9154,10 @@ function Au(e, r) {
     }
   return Gn(t, n);
 }
-const Mu = ["fill", "stroke", "stop-color"], Bu = ["path", "rect", "circle", "ellipse", "polygon", "polyline", "text"];
+const Bu = ["fill", "stroke", "stop-color"], Mu = ["path", "rect", "circle", "ellipse", "polygon", "polyline", "text"];
 function Iu(e, r) {
   const { doc: t, wasWrapped: n } = Pn(e);
-  for (const s of Mu)
+  for (const s of Bu)
     for (const o of t.querySelectorAll(`[${s}]`)) {
       const u = o.getAttribute(s);
       if (!u || !Lu(u)) continue;
@@ -9160,7 +9166,7 @@ function Iu(e, r) {
     }
   const a = r["#000000"];
   if (a) {
-    const s = Bu.map((o) => `${o}:not([fill])`).join(", ");
+    const s = Mu.map((o) => `${o}:not([fill])`).join(", ");
     for (const o of t.querySelectorAll(s))
       o.setAttribute("fill", a.hex);
   }
@@ -9207,13 +9213,13 @@ const It = (e, r, t) => e / t * r, Nu = ({
       throw new Error(
         `TOO_WIDE: character "${t[R]}" at index ${R} exceeds baseline path length (${Math.round(I + W)} > ${Math.round(p)})`
       );
-    const z = I + Y / 2, $ = f.getTangentAtLength(z), M = Math.atan2($.y, $.x) * 180 / Math.PI, _ = f.getPointAtLength(I), De = _.x, pr = _.y, Ae = A.x2 - A.x1, Me = new fe(A.x1 + Ae / 2, 0), Be = hu(
+    const z = I + Y / 2, $ = f.getTangentAtLength(z), B = Math.atan2($.y, $.x) * 180 / Math.PI, _ = f.getPointAtLength(I), De = _.x, pr = _.y, Ae = A.x2 - A.x1, Be = new fe(A.x1 + Ae / 2, 0), Me = hu(
       new fe(A.x1, 0),
-      M,
-      Me
-    ), Ce = De - Be.X, Nn = pr - Be.Y;
+      B,
+      Be
+    ), Ce = De - Me.X, Nn = pr - Me.Y;
     let se = Pu();
-    se = se.translate(Ce, Nn), M && (se = se.translate(A.x1 + Ae / 2, 0), se = se.rotate(M), se = se.translate(-A.x1 - Ae / 2, 0));
+    se = se.translate(Ce, Nn), B && (se = se.translate(A.x1 + Ae / 2, 0), se = se.rotate(B), se = se.translate(-A.x1 - Ae / 2, 0));
     const Hn = se.toString();
     let ve = q.toPathData(2);
     ve.length && !ve.endsWith("Z") && (ve += "Z", ve = ve.replace(/M/g, "ZM"), ve = ve.substring(1));
@@ -9325,7 +9331,7 @@ const It = (e, r, t) => e / t * r, Nu = ({
         du(y.path), T = y.path;
         break;
       case "curved":
-        T = Mn({
+        T = Bn({
           boxDimensions: a,
           baseline: x[C].baseline,
           textHeight: x[C].height,
@@ -9370,7 +9376,7 @@ export {
   pu as DEFAULT_OUTLINE_FACTOR,
   $e as DEFAULT_SPACING,
   An as LINE_HEIGHT,
-  Mn as generateCurvedBaseline,
+  Bn as generateCurvedBaseline,
   gu as generateFlatBaseline,
   _u as getFontCache,
   Vu as getFontColours,