@mlightcad/mtext-renderer 0.12.8 → 0.12.10

package/dist/index.js

@@ -2560,7 +2560,7 @@ const St = {
   }
 };
 Be.DATABASE_NAME = "mlightcad", Be.DATABASE_VERSION = Kn[Kn.length - 1].version;
-let st = Be;
+let ze = Be;
 const Sc = 512;
 function wc(t, e) {
   return (t + e) * Sc;
@@ -2580,13 +2580,31 @@ const Ar = {
   // BIGFONT SHX stays available via glyph fallback for CJK coverage.
   modern: ["simsun", "hztxt"],
   international: ["txt", "simplex", "romans", "simsun"],
-  cjk: ["simsun", "gbcbig", "hztxt"]
+  // Full CJK: mesh faces for CN/KR/JP, then matching SHX big fonts.
+  // `malgun` → Noto Sans KR; `msgothic` → MS Gothic in the font repository.
+  cjk: [
+    "simsun",
+    "malgun",
+    "msgothic",
+    "gbcbig",
+    "hztxt",
+    "extfont2",
+    "extfont",
+    "whgtxt",
+    "whgdtxt"
+  ],
+  chinese: ["simsun", "gbcbig", "hztxt"],
+  korean: ["malgun", "whgtxt", "whgdtxt"],
+  japanese: ["msgothic", "extfont2", "extfont"]
 }, Zn = {
   minimal: ["simplex", "amgdt"],
   r12r14: ["simplex", "amgdt"],
   modern: ["simplex", "amgdt"],
   international: ["simplex", "amgdt"],
-  cjk: ["simplex", "amgdt"]
+  cjk: ["simplex", "amgdt"],
+  chinese: ["simplex", "amgdt"],
+  korean: ["simplex", "amgdt"],
+  japanese: ["simplex", "amgdt"]
 };
 function ks(t) {
   return Object.prototype.hasOwnProperty.call(Ar, t);
@@ -2618,7 +2636,7 @@ var ma = new Jt(), ya = new Jt(), Vr = new Uint8Array(30), qr = new Uint16Array(
   14,
   1,
   15
-]), Es = new Jt(), je = new Uint8Array(320);
+]), Es = new Jt(), $e = new Uint8Array(320);
 function va(t, e, n, r) {
   var s, i;
   for (s = 0; s < n; ++s) t[s] = 0;
@@ -2651,7 +2669,7 @@ function Ac(t) {
   var e = t.tag & 1;
   return t.tag >>>= 1, e;
 }
-function Ye(t, e, n) {
+function Xe(t, e, n) {
   if (!e)
     return n;
   for (; t.bitcount < 24; )
@@ -2670,33 +2688,33 @@ function Or(t, e) {
 }
 function Oc(t, e, n) {
   var r, s, i, a, o, c;
-  for (r = Ye(t, 5, 257), s = Ye(t, 5, 1), i = Ye(t, 4, 4), a = 0; a < 19; ++a) je[a] = 0;
+  for (r = Xe(t, 5, 257), s = Xe(t, 5, 1), i = Xe(t, 4, 4), a = 0; a < 19; ++a) $e[a] = 0;
   for (a = 0; a < i; ++a) {
-    var l = Ye(t, 3, 0);
-    je[kc[a]] = l;
+    var l = Xe(t, 3, 0);
+    $e[kc[a]] = l;
   }
-  for (Jn(Es, je, 0, 19), o = 0; o < r + s; ) {
+  for (Jn(Es, $e, 0, 19), o = 0; o < r + s; ) {
     var u = Or(t, Es);
     switch (u) {
       case 16:
-        var f = je[o - 1];
-        for (c = Ye(t, 2, 3); c; --c)
-          je[o++] = f;
+        var f = $e[o - 1];
+        for (c = Xe(t, 2, 3); c; --c)
+          $e[o++] = f;
         break;
       case 17:
-        for (c = Ye(t, 3, 3); c; --c)
-          je[o++] = 0;
+        for (c = Xe(t, 3, 3); c; --c)
+          $e[o++] = 0;
         break;
       case 18:
-        for (c = Ye(t, 7, 11); c; --c)
-          je[o++] = 0;
+        for (c = Xe(t, 7, 11); c; --c)
+          $e[o++] = 0;
         break;
       default:
-        je[o++] = u;
+        $e[o++] = u;
         break;
     }
   }
-  Jn(e, je, 0, r), Jn(n, je, r, s);
+  Jn(e, $e, 0, r), Jn(n, $e, r, s);
 }
 function Os(t, e, n) {
   for (; ; ) {
@@ -2707,7 +2725,7 @@ function Os(t, e, n) {
       t.dest[t.destLen++] = r;
     else {
       var s, i, a, o;
-      for (r -= 257, s = Ye(t, Vr[r], qr[r]), i = Or(t, n), a = t.destLen - Ye(t, ba[i], xa[i]), o = a; o < a + s; ++o)
+      for (r -= 257, s = Xe(t, Vr[r], qr[r]), i = Or(t, n), a = t.destLen - Xe(t, ba[i], xa[i]), o = a; o < a + s; ++o)
         t.dest[t.destLen++] = t.dest[o];
     }
   }
@@ -2724,7 +2742,7 @@ function Lc(t) {
 function Sa(t, e) {
   var n = new Fc(t, e), r, s, i;
   do {
-    switch (r = Ac(n), s = Ye(n, 2, 0), s) {
+    switch (r = Ac(n), s = Xe(n, 2, 0), s) {
       case 0:
         i = Lc(n);
         break;
@@ -3090,7 +3108,7 @@ function Ls(t, e) {
   t || Fa(e);
 }
 var H = { fail: Fa, argument: Ls, assert: Ls }, Is = 32768, Rs = 2147483648, Bc = -32768, Mc = 32767 + 1 / 65536, Nt = {}, B = {}, z = {};
-function qe(t) {
+function je(t) {
   return function() {
     return t;
   };
@@ -3098,11 +3116,11 @@ function qe(t) {
 B.BYTE = function(t) {
   return H.argument(t >= 0 && t <= 255, "Byte value should be between 0 and 255."), [t];
 };
-z.BYTE = qe(1);
+z.BYTE = je(1);
 B.CHAR = function(t) {
   return [t.charCodeAt(0)];
 };
-z.CHAR = qe(1);
+z.CHAR = je(1);
 B.CHARARRAY = function(t) {
   (t === null || typeof t > "u") && (t = "", console.warn("CHARARRAY with undefined or null value encountered and treated as an empty string. This is probably caused by a missing glyph name."));
   const e = [];
@@ -3116,23 +3134,23 @@ z.CHARARRAY = function(t) {
 B.USHORT = function(t) {
   return [t >> 8 & 255, t & 255];
 };
-z.USHORT = qe(2);
+z.USHORT = je(2);
 B.SHORT = function(t) {
   return t >= Is && (t = -(2 * Is - t)), [t >> 8 & 255, t & 255];
 };
-z.SHORT = qe(2);
+z.SHORT = je(2);
 B.UINT24 = function(t) {
   return [t >> 16 & 255, t >> 8 & 255, t & 255];
 };
-z.UINT24 = qe(3);
+z.UINT24 = je(3);
 B.ULONG = function(t) {
   return [t >> 24 & 255, t >> 16 & 255, t >> 8 & 255, t & 255];
 };
-z.ULONG = qe(4);
+z.ULONG = je(4);
 B.LONG = function(t) {
   return t >= Rs && (t = -(2 * Rs - t)), [t >> 24 & 255, t >> 16 & 255, t >> 8 & 255, t & 255];
 };
-z.LONG = qe(4);
+z.LONG = je(4);
 B.FLOAT = function(t) {
   if (t > Mc || t < Bc)
     throw new Error(`Value ${t} is outside the range of representable values in 16.16 format`);
@@ -3153,7 +3171,7 @@ z.F2DOT14 = z.USHORT;
 B.LONGDATETIME = function(t) {
   return [0, 0, 0, 0, t >> 24 & 255, t >> 16 & 255, t >> 8 & 255, t & 255];
 };
-z.LONGDATETIME = qe(8);
+z.LONGDATETIME = je(8);
 B.TAG = function(t) {
   return H.argument(t.length === 4, "Tag should be exactly 4 ASCII characters."), [
     t.charCodeAt(0),
@@ -3162,7 +3180,7 @@ B.TAG = function(t) {
     t.charCodeAt(3)
   ];
 };
-z.TAG = qe(4);
+z.TAG = je(4);
 B.Card8 = B.BYTE;
 z.Card8 = z.BYTE;
 B.Card16 = B.USHORT;
@@ -3180,11 +3198,11 @@ z.NUMBER = function(t) {
 B.NUMBER16 = function(t) {
   return [28, t >> 8 & 255, t & 255];
 };
-z.NUMBER16 = qe(3);
+z.NUMBER16 = je(3);
 B.NUMBER32 = function(t) {
   return [29, t >> 24 & 255, t >> 16 & 255, t >> 8 & 255, t & 255];
 };
-z.NUMBER32 = qe(5);
+z.NUMBER32 = je(5);
 B.REAL = function(t) {
   let e = t.toString();
   const n = /\.(\d*?)(?:9{5,20}|0{5,20})\d{0,2}(?:e(.+)|$)/.exec(e);
@@ -7109,7 +7127,7 @@ function Xr(t, e, n = 0, r = "hexa") {
   const a = _a(s.colorRecords[i]);
   return r === "bgra" ? a : zt(a, r);
 }
-function ze(t) {
+function We(t) {
   return ("0" + parseInt(t).toString(16)).slice(-2);
 }
 function xl(t) {
@@ -7151,7 +7169,7 @@ function vl(t) {
   };
 }
 function Ua(t) {
-  return parseInt(`0x${ze(t.b)}${ze(t.g)}${ze(t.r)}${ze(t.a * 255)}`, 16);
+  return parseInt(`0x${We(t.b)}${We(t.g)}${We(t.r)}${We(t.a * 255)}`, 16);
 }
 function Dn(t, e = "hexa") {
   const n = e == "raw" || e == "cpal", r = Number.isInteger(t);
@@ -7250,11 +7268,11 @@ function zt(t, e = "hexa") {
     case "hex":
     case "hex6":
     case "hex-6":
-      return `#${ze(t.r)}${ze(t.g)}${ze(t.b)}`;
+      return `#${We(t.r)}${We(t.g)}${We(t.b)}`;
     case "hexa":
     case "hex8":
     case "hex-8":
-      return `#${ze(t.r)}${ze(t.g)}${ze(t.b)}${ze(t.a * 255)}`;
+      return `#${We(t.r)}${We(t.g)}${We(t.b)}${We(t.a * 255)}`;
     case "hsl":
       return `hsl(${n.h.toFixed(2)}, ${n.s.toFixed(2)}%, ${n.l.toFixed(2)}%)`;
     case "hsla":
@@ -7507,7 +7525,7 @@ function Tl(t, e, n, r, s) {
     }, i;
   };
 }
-var Je = { GlyphSet: zn, glyphLoader: wl, ttfGlyphLoader: Cl, cffGlyphLoader: Tl };
+var Qe = { GlyphSet: zn, glyphLoader: wl, ttfGlyphLoader: Cl, cffGlyphLoader: Tl };
 function Na(t, e) {
   if (t === e)
     return !0;
@@ -7526,7 +7544,7 @@ function _n(t) {
   let e;
   return t.length < 1240 ? e = 107 : t.length < 33900 ? e = 1131 : e = 32768, e;
 }
-function $e(t, e, n, r) {
+function Ye(t, e, n, r) {
   const s = [], i = [], a = r > 1 ? D.getULong(t, e) : D.getCard16(t, e), o = r > 1 ? 4 : 2;
   let c, l;
   if (a !== 0) {
@@ -7739,7 +7757,7 @@ function _l(t, e, n) {
     if (o !== 0 && c !== 0) {
       const l = Jr(t, c + e, o, [], 2);
       if (l.subrs) {
-        const u = c + l.subrs, f = $e(t, u + e, void 0, 2);
+        const u = c + l.subrs, f = Ye(t, u + e, void 0, 2);
         a._subrs = f.objects, a._subrsBias = _n(a._subrs);
       }
       a._privateDict = l;
@@ -7757,7 +7775,7 @@ function Qn(t, e, n, r, s) {
     if (l !== 0 && u !== 0) {
       const f = Jr(t, u + e, l, r, s);
       if (c._defaultWidthX = f.defaultWidthX, c._nominalWidthX = f.nominalWidthX, f.subrs !== 0) {
-        const h = u + f.subrs, p = $e(t, h + e, void 0, s);
+        const h = u + f.subrs, p = Ye(t, h + e, void 0, s);
         c._subrs = p.objects, c._subrsBias = _n(c._subrs);
       }
       c._privateDict = f;
@@ -7840,7 +7858,7 @@ function Mr(t, e, n, r, s) {
     M = (u.length & 1) !== 0, M && !h && (N = u.shift() + C), f += u.length >> 1, u.length = 0, h = !0;
   }
   function U(M) {
-    let _, re, Te, Qe, _e, me, Y, ne, pe, be, ge, ye, ce = 0;
+    let _, re, Te, et, _e, me, Y, ne, pe, be, ge, ye, ce = 0;
     for (; ce < M.length; ) {
       let ve = M[ce];
       switch (ce += 1, ve) {
@@ -7908,10 +7926,10 @@ function Mr(t, e, n, r, s) {
             break;
           }
           if (u.length >= 4) {
-            const et = Br[u.pop()], x = Br[u.pop()], d = u.pop(), g = u.pop();
-            if (et && x) {
+            const tt = Br[u.pop()], x = Br[u.pop()], d = u.pop(), g = u.pop();
+            if (tt && x) {
               e.isComposite = !0, e.components = [];
-              const S = t.cffEncoding.charset.indexOf(et), k = t.cffEncoding.charset.indexOf(x);
+              const S = t.cffEncoding.charset.indexOf(tt), k = t.cffEncoding.charset.indexOf(x);
               e.components.push({
                 glyphIndex: k,
                 dx: 0,
@@ -7946,11 +7964,11 @@ function Mr(t, e, n, r, s) {
           R || (R = t.variation && s && t.variation.process.getBlendVector(E, T, s));
           var Z = u.pop(), xe = R ? R.length : E.itemVariationSubtables[T].regionIndexes.length, Ee = Z * xe, Ae = u.length - Ee, Oe = Ae - Z;
           if (R)
-            for (let et = 0; et < Z; et++) {
-              var Re = u[Oe + et];
+            for (let tt = 0; tt < Z; tt++) {
+              var Re = u[Oe + tt];
               for (let x = 0; x < xe; x++)
                 Re += R[x] * u[Ae++];
-              u[Oe + et] = Re;
+              u[Oe + tt] = Re;
             }
           for (; Ee--; )
             u.pop();
@@ -8010,7 +8028,7 @@ function Mr(t, e, n, r, s) {
             i = y, a = m + u.shift(), o = i + u.shift(), c = a + u.shift(), y = o + u.shift(), m = c + (u.length === 1 ? u.shift() : 0), l.curveTo(i, a, o, c, y, m);
           break;
         default:
-          ve < 32 ? console.log("Glyph " + e.index + ": unknown operator " + ve) : ve < 247 ? u.push(ve - 139) : ve < 251 ? (_ = M[ce], ce += 1, u.push((ve - 247) * 256 + _ + 108)) : ve < 255 ? (_ = M[ce], ce += 1, u.push(-(ve - 251) * 256 - _ - 108)) : (_ = M[ce], re = M[ce + 1], Te = M[ce + 2], Qe = M[ce + 3], ce += 4, u.push((_ << 24 | re << 16 | Te << 8 | Qe) / 65536));
+          ve < 32 ? console.log("Glyph " + e.index + ": unknown operator " + ve) : ve < 247 ? u.push(ve - 139) : ve < 251 ? (_ = M[ce], ce += 1, u.push((ve - 247) * 256 + _ + 108)) : ve < 255 ? (_ = M[ce], ce += 1, u.push(-(ve - 251) * 256 - _ - 108)) : (_ = M[ce], re = M[ce + 1], Te = M[ce + 2], et = M[ce + 3], ce += 4, u.push((_ << 24 | re << 16 | Te << 8 | et) / 65536));
       }
     }
   }
@@ -8058,7 +8076,7 @@ function Gl(t, e, n, r) {
   let s;
   const i = Ll(t, e);
   i.formatMajor === 2 ? s = n.tables.cff2 = {} : s = n.tables.cff = {};
-  const a = i.formatMajor > 1 ? null : $e(t, i.endOffset, D.bytesToString), o = i.formatMajor > 1 ? null : $e(t, a.endOffset), c = i.formatMajor > 1 ? null : $e(t, o.endOffset, D.bytesToString), l = $e(t, i.formatMajor > 1 ? e + i.size + i.topDictLength : c.endOffset, void 0, i.formatMajor);
+  const a = i.formatMajor > 1 ? null : Ye(t, i.endOffset, D.bytesToString), o = i.formatMajor > 1 ? null : Ye(t, a.endOffset), c = i.formatMajor > 1 ? null : Ye(t, o.endOffset, D.bytesToString), l = Ye(t, i.formatMajor > 1 ? e + i.size + i.topDictLength : c.endOffset, void 0, i.formatMajor);
   n.gsubrs = l.objects, n.gsubrsBias = _n(n.gsubrs);
   let u;
   if (i.formatMajor > 1) {
@@ -8074,38 +8092,38 @@ function Gl(t, e, n, r) {
     let h = u.fdArray, p = u.fdSelect;
     if (!h)
       throw new Error("This is a CFF2 font, but FDArray information is missing");
-    const y = $e(t, e + h, null, i.formatMajor), m = _l(t, e, y.objects);
+    const y = Ye(t, e + h, null, i.formatMajor), m = _l(t, e, y.objects);
     u._fdArray = m, p && (u._fdSelect = Ps(t, e + p, n.numGlyphs, m.length, i.formatMajor));
   } else if (n.isCIDFont) {
     let h = u.fdArray, p = u.fdSelect;
     if (h === 0 || p === 0)
       throw new Error("Font is marked as a CID font, but FDArray and/or FDSelect information is missing");
     h += e;
-    const y = $e(t, h), m = Qn(t, e, y.objects, c.objects, i.formatMajor);
+    const y = Ye(t, h), m = Qn(t, e, y.objects, c.objects, i.formatMajor);
     u._fdArray = m, p += e, u._fdSelect = Ps(t, p, n.numGlyphs, m.length, i.formatMajor);
   }
   if (i.formatMajor < 2) {
     const h = e + u.private[1], p = Jr(t, h, u.private[0], c.objects, i.formatMajor);
     if (n.defaultWidthX = p.defaultWidthX, n.nominalWidthX = p.nominalWidthX, p.subrs !== 0) {
-      const y = h + p.subrs, m = $e(t, y);
+      const y = h + p.subrs, m = Ye(t, y);
       n.subrs = m.objects, n.subrsBias = _n(n.subrs);
     } else
       n.subrs = [], n.subrsBias = 0;
   }
   let f;
-  if (r.lowMemory ? (f = Fl(t, e + u.charStrings, i.formatMajor), n.nGlyphs = f.offsets.length - (i.formatMajor > 1 ? 1 : 0)) : (f = $e(t, e + u.charStrings, null, i.formatMajor), n.nGlyphs = f.objects.length), i.formatMajor > 1 && n.tables.maxp && n.nGlyphs !== n.tables.maxp.numGlyphs && console.error(`Glyph count in the CFF2 table (${n.nGlyphs}) must correspond to the glyph count in the maxp table (${n.tables.maxp.numGlyphs})`), i.formatMajor < 2) {
+  if (r.lowMemory ? (f = Fl(t, e + u.charStrings, i.formatMajor), n.nGlyphs = f.offsets.length - (i.formatMajor > 1 ? 1 : 0)) : (f = Ye(t, e + u.charStrings, null, i.formatMajor), n.nGlyphs = f.objects.length), i.formatMajor > 1 && n.tables.maxp && n.nGlyphs !== n.tables.maxp.numGlyphs && console.error(`Glyph count in the CFF2 table (${n.nGlyphs}) must correspond to the glyph count in the maxp table (${n.tables.maxp.numGlyphs})`), i.formatMajor < 2) {
     let h = [], p = [];
     u.charset === 0 ? h = ll : u.charset === 1 ? h = ul : u.charset === 2 ? h = hl : h = Ul(t, e + u.charset, n.nGlyphs, c.objects, n.isCIDFont), u.encoding === 0 ? p = Br : u.encoding === 1 ? p = fl : p = Pl(t, e + u.encoding), n.cffEncoding = new Da(p, h), n.encoding = n.encoding || n.cffEncoding;
   }
-  if (n.glyphs = new Je.GlyphSet(n), r.lowMemory)
+  if (n.glyphs = new Qe.GlyphSet(n), r.lowMemory)
     n._push = function(h) {
       const p = kl(h, f.offsets, t, e + u.charStrings, void 0, i.formatMajor);
-      n.glyphs.push(h, Je.cffGlyphLoader(n, h, Mr, p, i.formatMajor));
+      n.glyphs.push(h, Qe.cffGlyphLoader(n, h, Mr, p, i.formatMajor));
     };
   else
     for (let h = 0; h < n.nGlyphs; h += 1) {
       const p = f.objects[h];
-      n.glyphs.push(h, Je.cffGlyphLoader(n, h, Mr, p, i.formatMajor));
+      n.glyphs.push(h, Qe.cffGlyphLoader(n, h, Mr, p, i.formatMajor));
     }
   if (u.vstore) {
     const h = new D.Parser(t, e + u.vstore);
@@ -8743,8 +8761,8 @@ function fu(t) {
     { name: "maxMemType1", type: "ULONG", value: c }
   ]);
 }
-var Ka = { parse: hu, make: fu }, We = new Array(9);
-We[1] = function() {
+var Ka = { parse: hu, make: fu }, Ve = new Array(9);
+Ve[1] = function() {
   const e = this.offset + this.relativeOffset, n = this.parseUShort();
   if (n === 1)
     return {
@@ -8760,7 +8778,7 @@ We[1] = function() {
     };
   H.assert(!1, "0x" + e.toString(16) + ": lookup type 1 format must be 1 or 2.");
 };
-We[2] = function() {
+Ve[2] = function() {
   const e = this.parseUShort();
   return H.argument(e === 1, "GSUB Multiple Substitution Subtable identifier-format must be 1"), {
     substFormat: e,
@@ -8768,7 +8786,7 @@ We[2] = function() {
     sequences: this.parseListOfLists()
   };
 };
-We[3] = function() {
+Ve[3] = function() {
   const e = this.parseUShort();
   return H.argument(e === 1, "GSUB Alternate Substitution Subtable identifier-format must be 1"), {
     substFormat: e,
@@ -8776,7 +8794,7 @@ We[3] = function() {
     alternateSets: this.parseListOfLists()
   };
 };
-We[4] = function() {
+Ve[4] = function() {
   const e = this.parseUShort();
   return H.argument(e === 1, "GSUB ligature table identifier-format must be 1"), {
     substFormat: e,
@@ -8793,7 +8811,7 @@ var Mt = {
   sequenceIndex: F.uShort,
   lookupListIndex: F.uShort
 };
-We[5] = function() {
+Ve[5] = function() {
   const e = this.offset + this.relativeOffset, n = this.parseUShort();
   if (n === 1)
     return {
@@ -8830,7 +8848,7 @@ We[5] = function() {
   }
   H.assert(!1, "0x" + e.toString(16) + ": lookup type 5 format must be 1, 2 or 3.");
 };
-We[6] = function() {
+Ve[6] = function() {
   const e = this.offset + this.relativeOffset, n = this.parseUShort();
   if (n === 1)
     return {
@@ -8871,17 +8889,17 @@ We[6] = function() {
     };
   H.assert(!1, "0x" + e.toString(16) + ": lookup type 6 format must be 1, 2 or 3.");
 };
-We[7] = function() {
+Ve[7] = function() {
   const e = this.parseUShort();
   H.argument(e === 1, "GSUB Extension Substitution subtable identifier-format must be 1");
   const n = this.parseUShort(), r = new F(this.data, this.offset + this.parseULong());
   return {
     substFormat: 1,
     lookupType: n,
-    extension: We[n].call(r)
+    extension: Ve[n].call(r)
   };
 };
-We[8] = function() {
+Ve[8] = function() {
   const e = this.parseUShort();
   return H.argument(e === 1, "GSUB Reverse Chaining Contextual Single Substitution Subtable identifier-format must be 1"), {
     substFormat: e,
@@ -8898,12 +8916,12 @@ function pu(t, e) {
     version: r,
     scripts: n.parseScriptList(),
     features: n.parseFeatureList(),
-    lookups: n.parseLookupList(We)
+    lookups: n.parseLookupList(Ve)
   } : {
     version: r,
     scripts: n.parseScriptList(),
     features: n.parseFeatureList(),
-    lookups: n.parseLookupList(We),
+    lookups: n.parseLookupList(Ve),
     variations: n.parseFeatureVariationsList()
   };
 }
@@ -9680,7 +9698,7 @@ function Vu(t) {
     N[Z].postScriptName || (N[Z].postScriptName = { en: j });
   }
   N.unicode.preferredFamily || (N.unicode.preferredFamily = X.fontFamily || ie.fontFamily || U.fontFamily), N.macintosh.preferredFamily || (N.macintosh.preferredFamily = ie.fontFamily || X.fontFamily || U.fontFamily), N.windows.preferredFamily || (N.windows.preferredFamily = U.fontFamily || X.fontFamily || ie.fontFamily), N.unicode.preferredSubfamily || (N.unicode.preferredSubfamily = X.fontSubfamily || ie.fontSubfamily || U.fontSubfamily), N.macintosh.preferredSubfamily || (N.macintosh.preferredSubfamily = ie.fontSubfamily || X.fontSubfamily || U.fontSubfamily), N.windows.preferredSubfamily || (N.windows.preferredSubfamily = U.fontSubfamily || X.fontSubfamily || ie.fontSubfamily);
-  const M = [], _ = Ia.make(N, M), re = M.length > 0 ? Ya.make(M) : void 0, Te = Ka.make(t), Qe = Dr.make(t.glyphs, {
+  const M = [], _ = Ia.make(N, M), re = M.length > 0 ? Ya.make(M) : void 0, Te = Ka.make(t), et = Dr.make(t.glyphs, {
     version: t.getEnglishName("version"),
     fullName: W,
     familyName: R,
@@ -9689,7 +9707,7 @@ function Vu(t) {
     unitsPerEm: t.unitsPerEm,
     fontBBox: [0, y.yMin, y.ascender, y.advanceWidthMax],
     topDict: t.tables.cff && t.tables.cff.topDict || {}
-  }), _e = t.metas && Object.keys(t.metas).length > 0 ? Ja.make(t.metas) : void 0, me = [b, v, w, C, _, E, Te, Qe, T];
+  }), _e = t.metas && Object.keys(t.metas).length > 0 ? Ja.make(t.metas) : void 0, me = [b, v, w, C, _, E, Te, et, T];
   re && me.push(re);
   const Y = {
     gsub: Za,
@@ -10877,18 +10895,18 @@ function fo(t, e) {
   return ts(e.points);
 }
 function uh(t, e, n, r) {
-  const s = new Je.GlyphSet(r);
+  const s = new Qe.GlyphSet(r);
   for (let i = 0; i < n.length - 1; i += 1) {
     const a = n[i], o = n[i + 1];
-    a !== o ? s.push(i, Je.ttfGlyphLoader(r, i, ho, t, e + a, fo)) : s.push(i, Je.glyphLoader(r, i));
+    a !== o ? s.push(i, Qe.ttfGlyphLoader(r, i, ho, t, e + a, fo)) : s.push(i, Qe.glyphLoader(r, i));
   }
   return s;
 }
 function hh(t, e, n, r) {
-  const s = new Je.GlyphSet(r);
+  const s = new Qe.GlyphSet(r);
   return r._push = function(i) {
     const a = n[i], o = n[i + 1];
-    a !== o ? s.push(i, Je.ttfGlyphLoader(r, i, ho, t, e + a, fo)) : s.push(i, Je.glyphLoader(r, i));
+    a !== o ? s.push(i, Qe.ttfGlyphLoader(r, i, ho, t, e + a, fo)) : s.push(i, Qe.glyphLoader(r, i));
   }, s;
 }
 function fh(t, e, n, r, s) {
@@ -11368,7 +11386,7 @@ var xo = function(t) {
   const r = this.srThreshold;
   let s = 1;
   return t < 0 && (t = -t, s = -1), t += r - n, t = Math.trunc(t / e) * e, t += n, t < 0 ? n * s : t * s;
-}, Ze = {
+}, Je = {
   x: 1,
   y: 0,
   axis: "x",
@@ -11393,10 +11411,10 @@ var xo = function(t) {
       return;
     }
     if (s = r.distance(t, e, !0, !0), i = r.distance(t, n, !0, !0), c = r.distance(e, e, !1, !0), l = r.distance(n, n, !1, !0), a = Math.abs(s), o = Math.abs(i), u = a + o, u === 0) {
-      Ze.setRelative(t, t, (c + l) / 2, r, !0);
+      Je.setRelative(t, t, (c + l) / 2, r, !0);
       return;
     }
-    Ze.setRelative(t, t, (c * o + l * a) / u, r, !0);
+    Je.setRelative(t, t, (c * o + l * a) / u, r, !0);
   },
   // Slope of line normal to this
   normalSlope: Number.NEGATIVE_INFINITY,
@@ -11497,13 +11515,13 @@ var xo = function(t) {
     t.yTouched = !1;
   }
 };
-Object.freeze(Ze);
+Object.freeze(Je);
 Object.freeze(it);
 function an(t, e) {
   this.x = t, this.y = e, this.axis = void 0, this.slope = e / t, this.normalSlope = -t / e, Object.freeze(this);
 }
 an.prototype.distance = function(t, e, n, r) {
-  return this.x * Ze.distance(t, e, n, r) + this.y * it.distance(t, e, n, r);
+  return this.x * Je.distance(t, e, n, r) + this.y * it.distance(t, e, n, r);
 };
 an.prototype.interpolate = function(t, e, n, r) {
   let s, i, a, o, c, l, u;
@@ -11523,7 +11541,7 @@ an.prototype.touch = function(t) {
 };
 function on(t, e) {
   const n = Math.sqrt(t * t + e * e);
-  return t /= n, e /= n, t === 1 && e === 0 ? Ze : t === 0 && e === 1 ? it : new an(t, e);
+  return t /= n, e /= n, t === 1 && e === 0 ? Je : t === 0 && e === 1 ? it : new an(t, e);
 }
 function at(t, e, n, r) {
   this.x = this.xo = Math.round(t * 64) / 64, this.y = this.yo = Math.round(e * 64) / 64, this.lastPointOfContour = n, this.onCurve = r, this.prevPointOnContour = void 0, this.nextPointOnContour = void 0, this.xTouched = !1, this.yTouched = !1, Object.preventExtensions(this);
@@ -11554,7 +11572,7 @@ function pt(t, e) {
     case "glyf":
       this.zp0 = this.zp1 = this.zp2 = 1, this.rp0 = this.rp1 = this.rp2 = 0;
     case "prep":
-      this.fv = this.pv = this.dpv = Ze, this.round = bo;
+      this.fv = this.pv = this.dpv = Je, this.round = bo;
   }
 }
 yo.prototype.exec = function(t, e) {
@@ -12267,15 +12285,15 @@ go = [
   /* 0x00 */
   Xs.bind(void 0, it),
   /* 0x01 */
-  Xs.bind(void 0, Ze),
+  Xs.bind(void 0, Je),
   /* 0x02 */
   Ks.bind(void 0, it),
   /* 0x03 */
-  Ks.bind(void 0, Ze),
+  Ks.bind(void 0, Je),
   /* 0x04 */
   Zs.bind(void 0, it),
   /* 0x05 */
-  Zs.bind(void 0, Ze),
+  Zs.bind(void 0, Je),
   /* 0x06 */
   Js.bind(void 0, 0),
   /* 0x07 */
@@ -12368,7 +12386,7 @@ go = [
   /* 0x30 */
   ti.bind(void 0, it),
   /* 0x31 */
-  ti.bind(void 0, Ze),
+  ti.bind(void 0, Je),
   /* 0x32 */
   ni.bind(void 0, 0),
   /* 0x33 */
@@ -13974,7 +13992,7 @@ function te(t) {
       }, t.tables.os2)
     });
   }
-  this.supported = !0, this.glyphs = new Je.GlyphSet(this, t.glyphs || []), this.encoding = new Ba(this), this.position = new ju(this), this.substitution = new Qu(this), this.tables = this.tables || {}, this.tables = new Proxy(this.tables, {
+  this.supported = !0, this.glyphs = new Qe.GlyphSet(this, t.glyphs || []), this.encoding = new Ba(this), this.position = new ju(this), this.substitution = new Qu(this), this.tables = this.tables || {}, this.tables = new Proxy(this.tables, {
     set: (e, n, r) => (e[n] = r, e.fvar && (e.gvar || e.cff2) && !this.variation && (this.variation = new dh(this)), !0)
   }), this.palettes = new uo(this), this.layers = new eh(this), this.svgImages = new th(this), this._push = null, this._hmtxTableData = {}, Object.defineProperty(this, "hinting", {
     get: function() {
@@ -14283,8 +14301,8 @@ function cd(t, e) {
   };
   return r >= 1.2 && (s.markGlyphSets = n.parsePointer(od)), s;
 }
-var ld = { parse: cd }, Ve = new Array(10);
-Ve[1] = function() {
+var ld = { parse: cd }, qe = new Array(10);
+qe[1] = function() {
   const e = this.offset + this.relativeOffset, n = this.parseUShort();
   if (n === 1)
     return {
@@ -14300,7 +14318,7 @@ Ve[1] = function() {
     };
   H.assert(!1, "0x" + e.toString(16) + ": GPOS lookup type 1 format must be 1 or 2.");
 };
-Ve[2] = function() {
+qe[2] = function() {
   const e = this.offset + this.relativeOffset, n = this.parseUShort();
   H.assert(n === 1 || n === 2, "0x" + e.toString(16) + ": GPOS lookup type 2 format must be 1 or 2.");
   const r = this.parsePointer(F.coverage), s = this.parseUShort(), i = this.parseUShort();
@@ -14340,25 +14358,25 @@ Ve[2] = function() {
     };
   }
 };
-Ve[3] = function() {
+qe[3] = function() {
   return { error: "GPOS Lookup 3 not supported" };
 };
-Ve[4] = function() {
+qe[4] = function() {
   return { error: "GPOS Lookup 4 not supported" };
 };
-Ve[5] = function() {
+qe[5] = function() {
   return { error: "GPOS Lookup 5 not supported" };
 };
-Ve[6] = function() {
+qe[6] = function() {
   return { error: "GPOS Lookup 6 not supported" };
 };
-Ve[7] = function() {
+qe[7] = function() {
   return { error: "GPOS Lookup 7 not supported" };
 };
-Ve[8] = function() {
+qe[8] = function() {
   return { error: "GPOS Lookup 8 not supported" };
 };
-Ve[9] = function() {
+qe[9] = function() {
   return { error: "GPOS Lookup 9 not supported" };
 };
 function ud(t, e) {
@@ -14368,12 +14386,12 @@ function ud(t, e) {
     version: r,
     scripts: n.parseScriptList(),
     features: n.parseFeatureList(),
-    lookups: n.parseLookupList(Ve)
+    lookups: n.parseLookupList(qe)
   } : {
     version: r,
     scripts: n.parseScriptList(),
     features: n.parseFeatureList(),
-    lookups: n.parseLookupList(Ve),
+    lookups: n.parseLookupList(qe),
     variations: n.parseFeatureVariationsList()
   };
 }
@@ -15372,9 +15390,9 @@ var wo = { exports: {} }, rs = {}, jn = {};
 jn.byteLength = $d;
 jn.toByteArray = Xd;
 jn.fromByteArray = Jd;
-var Xe = [], Ue = [], qd = typeof Uint8Array < "u" ? Uint8Array : Array, cr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+var Ke = [], Ue = [], qd = typeof Uint8Array < "u" ? Uint8Array : Array, cr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 for (var Rt = 0, jd = cr.length; Rt < jd; ++Rt)
-  Xe[Rt] = cr[Rt], Ue[cr.charCodeAt(Rt)] = Rt;
+  Ke[Rt] = cr[Rt], Ue[cr.charCodeAt(Rt)] = Rt;
 Ue[45] = 62;
 Ue[95] = 63;
 function Co(t) {
@@ -15400,7 +15418,7 @@ function Xd(t) {
   return s === 2 && (e = Ue[t.charCodeAt(c)] << 2 | Ue[t.charCodeAt(c + 1)] >> 4, i[a++] = e & 255), s === 1 && (e = Ue[t.charCodeAt(c)] << 10 | Ue[t.charCodeAt(c + 1)] << 4 | Ue[t.charCodeAt(c + 2)] >> 2, i[a++] = e >> 8 & 255, i[a++] = e & 255), i;
 }
 function Kd(t) {
-  return Xe[t >> 18 & 63] + Xe[t >> 12 & 63] + Xe[t >> 6 & 63] + Xe[t & 63];
+  return Ke[t >> 18 & 63] + Ke[t >> 12 & 63] + Ke[t >> 6 & 63] + Ke[t & 63];
 }
 function Zd(t, e, n) {
   for (var r, s = [], i = e; i < n; i += 3)
@@ -15411,9 +15429,9 @@ function Jd(t) {
   for (var e, n = t.length, r = n % 3, s = [], i = 16383, a = 0, o = n - r; a < o; a += i)
     s.push(Zd(t, a, a + i > o ? o : a + i));
   return r === 1 ? (e = t[n - 1], s.push(
-    Xe[e >> 2] + Xe[e << 4 & 63] + "=="
+    Ke[e >> 2] + Ke[e << 4 & 63] + "=="
   )) : r === 2 && (e = (t[n - 2] << 8) + t[n - 1], s.push(
-    Xe[e >> 10] + Xe[e >> 4 & 63] + Xe[e << 2 & 63] + "="
+    Ke[e >> 10] + Ke[e >> 4 & 63] + Ke[e << 2 & 63] + "="
   )), s.join("");
 }
 var ss = {};
@@ -15699,7 +15717,7 @@ ss.write = function(t, e, n, r, s, i) {
           return Te(this, d, g);
         case "latin1":
         case "binary":
-          return Qe(this, d, g);
+          return et(this, d, g);
         case "base64":
           return U(this, d, g);
         case "ucs2":
@@ -15932,7 +15950,7 @@ ss.write = function(t, e, n, r, s, i) {
       S += String.fromCharCode(x[k] & 127);
     return S;
   }
-  function Qe(x, d, g) {
+  function et(x, d, g) {
     var S = "";
     g = Math.min(x.length, g);
     for (var k = d; k < g; ++k)
@@ -15943,7 +15961,7 @@ ss.write = function(t, e, n, r, s, i) {
     var S = x.length;
     (!d || d < 0) && (d = 0), (!g || g < 0 || g > S) && (g = S);
     for (var k = "", A = d; A < g; ++A)
-      k += et[x[A]];
+      k += tt[x[A]];
     return k;
   }
   function me(x, d, g) {
@@ -16219,7 +16237,7 @@ ss.write = function(t, e, n, r, s, i) {
   function ve(x) {
     return x !== x;
   }
-  var et = function() {
+  var tt = function() {
     for (var x = "0123456789abcdef", d = new Array(256), g = 0; g < 16; ++g)
       for (var S = g * 16, k = 0; k < 16; ++k)
         d[S + k] = x[g] + x[k];
@@ -16562,16 +16580,16 @@ function r0() {
     }
   }, hr;
 }
-var tt = {}, Fi;
+var nt = {}, Fi;
 function s0() {
-  if (Fi) return tt;
+  if (Fi) return nt;
   Fi = 1;
   var t = xt.Buffer;
-  tt._utf32 = e;
+  nt._utf32 = e;
   function e(l, u) {
     this.iconv = u, this.bomAware = !0, this.isLE = l.isLE;
   }
-  tt.utf32le = { type: "_utf32", isLE: !0 }, tt.utf32be = { type: "_utf32", isLE: !1 }, tt.ucs4le = "utf32le", tt.ucs4be = "utf32be", e.prototype.encoder = n, e.prototype.decoder = r;
+  nt.utf32le = { type: "_utf32", isLE: !0 }, nt.utf32be = { type: "_utf32", isLE: !1 }, nt.ucs4le = "utf32le", nt.ucs4be = "utf32be", e.prototype.encoder = n, e.prototype.decoder = r;
   function n(l, u) {
     this.isLE = u.isLE, this.highSurrogate = 0;
   }
@@ -16624,7 +16642,7 @@ function s0() {
   }
   r.prototype.end = function() {
     this.overflow.length = 0;
-  }, tt.utf32 = i, tt.ucs4 = "utf32";
+  }, nt.utf32 = i, nt.ucs4 = "utf32";
   function i(l, u) {
     this.iconv = u;
   }
@@ -16679,7 +16697,7 @@ function s0() {
           }
     return b - y > m - p ? "utf-32be" : b - y < m - p ? "utf-32le" : u || "utf-32le";
   }
-  return tt;
+  return nt;
 }
 var yn = {}, ki;
 function i0() {
@@ -26694,7 +26712,7 @@ const ft = class ft extends ia {
 };
 ft.NOT_ENCODABLE = -1;
 let Gr = ft;
-class Ke {
+class Ze {
   constructor() {
   }
   /**
@@ -26702,7 +26720,7 @@ class Ke {
    * @returns The FontFactory instance
    */
   static get instance() {
-    return Ke._instance || (Ke._instance = new Ke()), Ke._instance;
+    return Ze._instance || (Ze._instance = new Ze()), Ze._instance;
   }
   /**
    * Creates a font instance based on the provided font data.
@@ -26811,7 +26829,7 @@ class $ {
       const i = lt(s.file).toLowerCase();
       n.set(i, { ...s, source: "remote" });
     }
-    const r = await st.instance.getAll();
+    const r = await ze.instance.getAll();
     for (const s of r) {
       const i = s.name.toLowerCase();
       n.has(i) || n.set(i, this.cachedFontDataToFontInfo(s));
@@ -26946,8 +26964,8 @@ class $ {
       data: i
     };
     try {
-      const f = Ke.instance.createFont(u);
-      return l.forEach((h) => f.names.add(h)), this.registerFontInMap(o, f), this.enableFontCache && await st.instance.set(o, u), this.events.fontLoaded.dispatch({ fontName: o }), {
+      const f = Ze.instance.createFont(u);
+      return l.forEach((h) => f.names.add(h)), this.registerFontInMap(o, f), this.enableFontCache && await ze.instance.set(o, u), this.events.fontLoaded.dispatch({ fontName: o }), {
         fontName: o,
         url: "",
         status: "Success"
@@ -26974,11 +26992,11 @@ class $ {
     const n = lt(e).toLowerCase();
     if (this.isFontLoaded(n))
       return !0;
-    const r = await st.instance.find(e);
+    const r = await ze.instance.find(e);
     if (!r)
       return !1;
     try {
-      const i = Ke.instance.createFont(r);
+      const i = Ze.instance.createFont(r);
       return (s = r.alias) == null || s.forEach((a) => i.names.add(a)), this.registerFontInMap(r.name, i), this.events.fontLoaded.dispatch({ fontName: r.name }), !0;
     } catch {
       return !1;
@@ -27251,6 +27269,51 @@ class $ {
       count: this.missedFonts[e]
     }), n && this.lazyFontLoading && this.requestFont(e)));
   }
+  /**
+   * Adds catalog / `fonts.json` names onto a font instance.
+   */
+  applyCatalogNames(e, n) {
+    n.forEach((r) => {
+      r && e.names.add(r);
+    });
+  }
+  /**
+   * Ensures an already-loaded primary face is also addressable under the
+   * current catalog names. Needed when IndexedDB still has an older alias
+   * list (e.g. `noto-sans-kr` cached before `malgun` was added) or when the
+   * binary was loaded under the file basename first.
+   */
+  ensureCatalogAliases(e, n) {
+    const r = this.loadedFontMap.get(e.toLowerCase()) ?? n.map((s) => this.loadedFontMap.get(s.toLowerCase())).find((s) => s != null);
+    r && (this.applyCatalogNames(r, n), this.registerFontInMap(e, r));
+  }
+  /**
+   * Merges catalog / primary names into an existing IndexedDB alias list so
+   * cold starts after `getAllFontsFromCache` pick up newly added style names.
+   */
+  async persistCatalogAliases(e, n) {
+    if (!this.enableFontCache)
+      return;
+    const r = await ze.instance.get(e);
+    if (!r)
+      return;
+    const s = [
+      .../* @__PURE__ */ new Set([...r.alias ?? [], ...n, e])
+    ], i = r.alias ?? [];
+    s.length === i.length && s.every((a) => i.includes(a)) || await ze.instance.set(e, {
+      ...r,
+      alias: s
+    });
+  }
+  /**
+   * Clears miss / failed-request bookkeeping for a primary name and aliases
+   * so a later alias request is not permanently blocked after the binary
+   * loaded under a different key.
+   */
+  clearRequestStateForNames(e) {
+    for (const n of e)
+      n && (this.clearMissedFontEntry(n), this.fontRequestFailed.delete(n.toLowerCase()));
+  }
   /**
    * Loads a single font
    * @param fontInfo - The matadata of the font to be loaded
@@ -27258,24 +27321,34 @@ class $ {
   async loadFont(e) {
     if (!ta(e.file))
       throw new Error(`Invalid font file name: ${e.file}`);
-    const r = this.fontInfoToFontData(e), s = r.name;
-    if (this.isFontLoaded(r.name))
+    const r = this.fontInfoToFontData(e), s = r.name, i = e.name ?? [];
+    if (this.isFontLoaded(r.name)) {
+      this.ensureCatalogAliases(s, i), this.clearRequestStateForNames([s, ...i]), await this.persistCatalogAliases(s, i);
       return;
-    const i = this.loadEpoch, a = await st.instance.get(s);
-    if (i === this.loadEpoch) {
-      if (a) {
-        if (await new Promise((c) => setTimeout(c, 0)), i !== this.loadEpoch || this.isFontLoaded(s))
+    }
+    const a = this.loadEpoch, o = await ze.instance.get(s);
+    if (a === this.loadEpoch) {
+      if (o) {
+        if (await new Promise((l) => setTimeout(l, 0)), a !== this.loadEpoch)
+          return;
+        if (this.isFontLoaded(s)) {
+          this.ensureCatalogAliases(s, i), this.clearRequestStateForNames([s, ...i]), await this.persistCatalogAliases(s, i);
           return;
-        const o = Ke.instance.createFont(a);
-        o && this.registerFontInMap(s, o);
+        }
+        const c = Ze.instance.createFont(o);
+        c && (this.applyCatalogNames(c, i), this.registerFontInMap(s, c), await this.persistCatalogAliases(s, i));
       } else {
-        const o = await this.loader.loadAsync(e.url);
-        if (i !== this.loadEpoch || (r.data = o, await new Promise((l) => setTimeout(l, 0)), i !== this.loadEpoch || this.isFontLoaded(s)))
+        const c = await this.loader.loadAsync(e.url);
+        if (a !== this.loadEpoch || (r.data = c, await new Promise((u) => setTimeout(u, 0)), a !== this.loadEpoch))
           return;
-        const c = Ke.instance.createFont(r);
-        c && (e.name.forEach((l) => c.names.add(l)), this.registerFontInMap(s, c), this.enableFontCache && await st.instance.set(s, r));
+        if (this.isFontLoaded(s)) {
+          this.ensureCatalogAliases(s, i), this.clearRequestStateForNames([s, ...i]), await this.persistCatalogAliases(s, i);
+          return;
+        }
+        const l = Ze.instance.createFont(r);
+        l && (this.applyCatalogNames(l, i), this.registerFontInMap(s, l), this.enableFontCache && await ze.instance.set(s, r));
       }
-      i !== this.loadEpoch || !this.isFontLoaded(s) || (this.clearMissedFontEntry(s), this.fontRequestFailed.delete(s.toLowerCase()), this.events.fontLoaded.dispatch({
+      a !== this.loadEpoch || !this.isFontLoaded(s) || (this.clearRequestStateForNames([s, ...i]), this.events.fontLoaded.dispatch({
         fontName: s
       }));
     }
@@ -27295,12 +27368,12 @@ class $ {
   async getAllFontsFromCache() {
     if (this.loadedFontMap.size !== 0)
       return;
-    const e = await st.instance.getAll();
+    const e = await ze.instance.getAll();
     for (const n of e) {
       const { name: r } = n;
       if (this.fileNames && !this.fileNames.includes(r))
         continue;
-      const s = Ke.instance.createFont(n);
+      const s = Ze.instance.createFont(n);
       this.registerFontInMap(r, s);
     }
   }
@@ -29862,17 +29935,17 @@ class $i {
             _
           );
         n.push(...ie), r.push(...U), s.push(...M), i.push(..._);
-        const re = [], Te = [], Qe = [], _e = [];
+        const re = [], Te = [], et = [], _e = [];
         this._hOffset = l + W, this._vOffset = N;
         for (const me of o)
           this.processChar(
             me,
             re,
             Te,
-            Qe,
+            et,
             _e
           );
-        n.push(...re), r.push(...Te), s.push(...Qe), i.push(..._e), this._hOffset = l + R, E && (this._currentContext.fontSizeScaleFactor = p, this.calcuateLineParams());
+        n.push(...re), r.push(...Te), s.push(...et), i.push(..._e), this._hOffset = l + R, E && (this._currentContext.fontSizeScaleFactor = p, this.calcuateLineParams());
       }
     } else {
       const C = [], T = [], E = [], R = [];
@@ -30503,7 +30576,7 @@ function Q0(t) {
     return String.fromCharCode(r);
   });
 }
-const $t = /* @__PURE__ */ new I.Vector3(), nt = /* @__PURE__ */ new I.Vector3(), rt = /* @__PURE__ */ new I.Vector3(), Yi = /* @__PURE__ */ new I.Vector3(1, 0, 0);
+const $t = /* @__PURE__ */ new I.Vector3(), rt = /* @__PURE__ */ new I.Vector3(), st = /* @__PURE__ */ new I.Vector3(), Yi = /* @__PURE__ */ new I.Vector3(1, 0, 0);
 class tn extends I.Object3D {
   /**
    * Extracts all unique font names used in an MText string.
@@ -30990,9 +31063,9 @@ class tn extends I.Object3D {
     e.updateWorldMatrix(!1, !1);
     const s = (c = (o = e.userData) == null ? void 0 : o.layout) == null ? void 0 : c.chars, i = (l = e.userData) == null ? void 0 : l.lineLayouts;
     if (i && i.length > 0 && i.forEach((h) => {
-      $t.set(0, h.y, 0).applyMatrix4(e.matrixWorld), nt.set(0, h.y - h.height / 2, 0).applyMatrix4(e.matrixWorld), rt.set(0, h.y + h.height / 2, 0).applyMatrix4(e.matrixWorld), r.push({
+      $t.set(0, h.y, 0).applyMatrix4(e.matrixWorld), rt.set(0, h.y - h.height / 2, 0).applyMatrix4(e.matrixWorld), st.set(0, h.y + h.height / 2, 0).applyMatrix4(e.matrixWorld), r.push({
         y: $t.y,
-        height: Math.abs(rt.y - nt.y),
+        height: Math.abs(st.y - rt.y),
         breakIndex: h.breakIndex
       });
     }), s && s.length > 0) {
@@ -31057,7 +31130,7 @@ class tn extends I.Object3D {
     }
     const s = (c = e.userData) == null ? void 0 : c.lineLayouts;
     s && s.length > 0 && s.forEach((p) => {
-      nt.set(0, p.y - p.height / 2, 0).applyMatrix4(e.matrixWorld), rt.set(0, p.y + p.height / 2, 0).applyMatrix4(e.matrixWorld), n.hasLine = !0, n.minX = Math.min(n.minX, nt.x, rt.x), n.maxX = Math.max(n.maxX, nt.x, rt.x), n.minY = Math.min(n.minY, nt.y, rt.y), n.maxY = Math.max(n.maxY, nt.y, rt.y), n.minZ = Math.min(n.minZ, nt.z, rt.z), n.maxZ = Math.max(n.maxZ, nt.z, rt.z);
+      rt.set(0, p.y - p.height / 2, 0).applyMatrix4(e.matrixWorld), st.set(0, p.y + p.height / 2, 0).applyMatrix4(e.matrixWorld), n.hasLine = !0, n.minX = Math.min(n.minX, rt.x, st.x), n.maxX = Math.max(n.maxX, rt.x, st.x), n.minY = Math.min(n.minY, rt.y, st.y), n.maxY = Math.max(n.maxY, rt.y, st.y), n.minZ = Math.min(n.minZ, rt.z, st.z), n.maxZ = Math.max(n.maxZ, rt.z, st.z);
     });
     const i = (u = (l = e.userData) == null ? void 0 : l.layout) == null ? void 0 : u.chars;
     if (i && i.length > 0) {
@@ -31973,7 +32046,7 @@ class c1 {
       fonts: []
     };
     try {
-      r = await st.instance.getStorageStats();
+      r = await ze.instance.getStorageStats();
     } catch {
     }
     const s = e.totalEstimatedBytes + n.reduce((i, a) => i + a.totalEstimatedBytes, 0);
@@ -32021,7 +32094,7 @@ export {
   Gi as DEFAULT_LINE_SPACE_FACTOR,
   F0 as DefaultFontLoader,
   gs as EventManager,
-  Ke as FontFactory,
+  Ze as FontFactory,
   $ as FontManager,
   N0 as LINE_SPACING_SCALE_FACTOR,
   Sc as MATERIAL_ESTIMATED_BYTES,