@mlightcad/cad-simple-viewer 1.0.16 → 1.0.18

package/dist/index.js

@@ -1,7 +1,7 @@
-import { AcCmEventManager as te, AcGePoint2d as V, AcGeBox2d as ue, AcCmColor as lr, AcGeBox3d as js, AcDbDatabase as po, AcDbFileType as rn, AcGeMathUtil as vt, AcGeVector3d as Kt, AcGeGeometryUtil as fo, AcGeVector2d as Wn, acdbHostApplicationServices as Xs, AcDbViewport as $s, AcDbRasterImage as Ys, AcDbRay as qs, AcDbXline as Zs, AcDbHatch as jn, AcGePolyline2d as Qs, AcDbLine as Js, AcDbTextStyleTableRecord as Ks, AcDbMText as ei, AcGiMTextAttachmentPoint as go, AcGePoint3d as Xn, AcGeLoop2d as ti, AcGeCircArc2d as ni, AcGeLine2d as ri, AcDbArc as si, AcGeLine3d as dt, AcDbDatabaseConverter as mo, createWorkerApi as yo, AcDbLinetypeTableRecord as vo, AcDbDimStyleTableRecord as bo, AcDbLayerTableRecord as xo, AcDbViewportTableRecord as So, AcDbBlockTableRecord as wo, AcDbBatchProcessing as _o, AcDbLayout as To, AcDbRasterImageDef as Co, AcDbCircle as Io, AcDbEllipse as ko, AcDbSpline as Er, AcDbPoint as Eo, AcDbTrace as Mo, AcDbPolyline as Mr, AcGeEllipseArc2d as Ao, AcGeSpline3d as Ar, AcDbTable as Bo, AcDbText as Lo, AcDbLeader as Oo, AcDbAlignedDimension as Do, AcDb3PointAngularDimension as Ro, AcDbOrdinateDimension as Uo, AcDbRadialDimension as Fo, AcDbDiametricDimension as Po, AcDbBlockReference as Go, AcDbDxfConverter as No, AcDbDatabaseConverterManager as Br } from "@mlightcad/data-model";
+import { AcDbLayout as Ws, AcCmEventManager as te, AcGePoint2d as V, AcGeBox2d as ue, AcCmColor as lr, AcGeBox3d as Xs, AcDbDatabase as fo, AcDbFileType as rn, AcGeMathUtil as vt, AcGeVector3d as Kt, AcGeGeometryUtil as go, AcGeVector2d as jn, acdbHostApplicationServices as $s, AcDbViewport as Ys, AcDbRasterImage as qs, AcDbRay as Zs, AcDbXline as Qs, AcDbHatch as Wn, AcGePolyline2d as Js, AcDbLine as Ks, AcDbTextStyleTableRecord as ei, AcDbMText as ti, AcGiMTextAttachmentPoint as mo, AcGePoint3d as Xn, AcGeLoop2d as ni, AcGeCircArc2d as ri, AcGeLine2d as si, AcDbArc as ii, AcGeLine3d as dt, AcDbDatabaseConverter as yo, createWorkerApi as vo, AcDbLinetypeTableRecord as bo, AcDbDimStyleTableRecord as xo, AcDbLayerTableRecord as So, AcDbViewportTableRecord as wo, AcDbBlockTableRecord as _o, AcDbBatchProcessing as To, AcDbRasterImageDef as Co, AcDbCircle as Io, AcDbEllipse as ko, AcDbSpline as Er, AcDbPoint as Eo, AcDbTrace as Mo, AcDbPolyline as Mr, AcGeEllipseArc2d as Ao, AcGeSpline3d as Ar, AcDbTable as Bo, AcDbText as Lo, AcDbLeader as Oo, AcDbAlignedDimension as Do, AcDb3PointAngularDimension as Ro, AcDbOrdinateDimension as Uo, AcDbRadialDimension as Fo, AcDbDiametricDimension as Po, AcDbBlockReference as Go, AcDbDxfConverter as No, AcDbDatabaseConverterManager as Br } from "@mlightcad/data-model";
 import { find as zo, findIndex as Vo, defaults as Ho } from "lodash-es";
 import * as g from "three";
-import { BufferGeometry as sn, ExtrudeGeometry as Wo, BufferAttribute as jo, ShapePath as Xo } from "three";
+import { BufferGeometry as sn, ExtrudeGeometry as jo, BufferAttribute as Wo, ShapePath as Xo } from "three";
 import { mergeGeometries as $o } from "three/examples/jsm/utils/BufferGeometryUtils.js";
 import { OrbitControls as Yo } from "three/examples/jsm/controls/OrbitControls";
 import qo from "three/examples/jsm/libs/stats.module";
@@ -27,6 +27,8 @@ class Zo {
       this._view.setLayerVisibility(r.layer.name, !r.layer.isOff);
     }), t.database.events.headerSysVarChanged.addEventListener((r) => {
       r.name == "pdmode" && this._view.rerenderPoints(r.database.pdmode);
+    }), t.database.events.dictObjetSet.addEventListener((r) => {
+      r.object instanceof Ws && this._view.addLayout(r.object);
     }), e.selectionSet.events.selectionAdded.addEventListener((r) => {
       e.highlight(r.ids);
     }), e.selectionSet.events.selectionRemoved.addEventListener((r) => {
@@ -1029,7 +1031,7 @@ class ca {
       unhover: new te()
     }, this._canvas = e;
     const t = e.getBoundingClientRect();
-    this._bbox = new js(), this._width = t.width, this._height = t.height, this._curPos = new V(), this._curScreenPos = new V(), this._selectionSet = new aa(), this._editor = new oa(this), this._canvas.addEventListener("mousemove", (r) => this.onMouseMove(r)), this._canvas.addEventListener("mousedown", (r) => {
+    this._bbox = new Xs(), this._width = t.width, this._height = t.height, this._curPos = new V(), this._curScreenPos = new V(), this._selectionSet = new aa(), this._editor = new oa(this), this._canvas.addEventListener("mousemove", (r) => this.onMouseMove(r)), this._canvas.addEventListener("mousedown", (r) => {
       r.button === 1 && this._editor.setCursor(Lt.Grab);
     }), this._canvas.addEventListener("mouseup", (r) => {
       r.button === 1 && this._editor.restoreCursor();
@@ -1189,7 +1191,7 @@ class la {
    * The document is initialized with an "Untitled" title and read-only mode enabled.
    */
   constructor() {
-    this._fileName = "", this._docTitle = "", this._isReadOnly = !0, this._database = new po(), this.docTitle = "Untitled";
+    this._fileName = "", this._docTitle = "", this._isReadOnly = !0, this._database = new fo(), this.docTitle = "Untitled";
   }
   /**
    * Opens a CAD document from a URI.
@@ -1779,7 +1781,7 @@ class _a {
     return `${e}_${t}`;
   }
 }
-class ii {
+class oi {
   constructor() {
     this.unsupportedChars = {}, this.cache = new _a();
   }
@@ -1792,7 +1794,7 @@ class ii {
     this.unsupportedChars[e] || (this.unsupportedChars[e] = 0), this.unsupportedChars[e]++;
   }
 }
-class oi extends g.Shape {
+class ai extends g.Shape {
   /**
    * Creates a new instance of BaseTextShape
    * @param char - The character this shape represents   */
@@ -1824,7 +1826,7 @@ function Ia(n) {
     const s = () => {
       n.removeEventListener("success", i), n.removeEventListener("error", o);
     }, i = () => {
-      t(We(n.result)), s();
+      t(je(n.result)), s();
     }, o = () => {
       r(n.error), s();
     };
@@ -1855,7 +1857,7 @@ let qn = {
       if (e === "store")
         return t.objectStoreNames[1] ? void 0 : t.objectStore(t.objectStoreNames[0]);
     }
-    return We(n[e]);
+    return je(n[e]);
   },
   set(n, e, t) {
     return n[e] = t, !0;
@@ -1864,20 +1866,20 @@ let qn = {
     return n instanceof IDBTransaction && (e === "done" || e === "store") ? !0 : e in n;
   }
 };
-function ai(n) {
+function ci(n) {
   qn = n(qn);
 }
 function Ea(n) {
   return Ca().includes(n) ? function(...e) {
-    return n.apply(Zn(this), e), We(this.request);
+    return n.apply(Zn(this), e), je(this.request);
   } : function(...e) {
-    return We(n.apply(Zn(this), e));
+    return je(n.apply(Zn(this), e));
   };
 }
 function Ma(n) {
   return typeof n == "function" ? Ea(n) : (n instanceof IDBTransaction && ka(n), $n(n, Ta()) ? new Proxy(n, qn) : n);
 }
-function We(n) {
+function je(n) {
   if (n instanceof IDBRequest)
     return Ia(n);
   if (wn.has(n))
@@ -1887,9 +1889,9 @@ function We(n) {
 }
 const Zn = (n) => mn.get(n);
 function Aa(n, e, { blocked: t, upgrade: r, blocking: s, terminated: i } = {}) {
-  const o = indexedDB.open(n, e), a = We(o);
+  const o = indexedDB.open(n, e), a = je(o);
   return r && o.addEventListener("upgradeneeded", (c) => {
-    r(We(o.result), c.oldVersion, c.newVersion, We(o.transaction), c);
+    r(je(o.result), c.oldVersion, c.newVersion, je(o.transaction), c);
   }), t && o.addEventListener("blocked", (c) => t(
     // Casting due to https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/1405
     c.oldVersion,
@@ -1922,18 +1924,18 @@ function Rr(n, e) {
   };
   return _n.set(e, i), i;
 }
-ai((n) => ({
+ci((n) => ({
   ...n,
   get: (e, t, r) => Rr(e, t) || n.get(e, t, r),
   has: (e, t) => !!Rr(e, t) || n.has(e, t)
 }));
-const Oa = ["continue", "continuePrimaryKey", "advance"], Ur = {}, Qn = /* @__PURE__ */ new WeakMap(), ci = /* @__PURE__ */ new WeakMap(), Da = {
+const Oa = ["continue", "continuePrimaryKey", "advance"], Ur = {}, Qn = /* @__PURE__ */ new WeakMap(), li = /* @__PURE__ */ new WeakMap(), Da = {
   get(n, e) {
     if (!Oa.includes(e))
       return n[e];
     let t = Ur[e];
     return t || (t = Ur[e] = function(...r) {
-      Qn.set(this, ci.get(this)[e](...r));
+      Qn.set(this, li.get(this)[e](...r));
     }), t;
   }
 };
@@ -1943,13 +1945,13 @@ async function* Ra(...n) {
     return;
   e = e;
   const t = new Proxy(e, Da);
-  for (ci.set(t, e), mn.set(t, Zn(e)); e; )
+  for (li.set(t, e), mn.set(t, Zn(e)); e; )
     yield t, e = await (Qn.get(t) || e.continue()), Qn.delete(t);
 }
 function Fr(n, e) {
   return e === Symbol.asyncIterator && $n(n, [IDBIndex, IDBObjectStore, IDBCursor]) || e === "iterate" && $n(n, [IDBIndex, IDBObjectStore]);
 }
-ai((n) => ({
+ci((n) => ({
   ...n,
   get(e, t, r) {
     return Fr(e, t) ? Ra : n.get(e, t, r);
@@ -2089,8 +2091,8 @@ const nt = {
 };
 Kn.DATABASE_NAME = "mlightcad", Kn.DATABASE_VERSION = Jn[Jn.length - 1].version;
 let Tn = Kn;
-const Ua = (n) => n.substring(n.lastIndexOf(".") + 1), li = (n) => n.split("/").pop(), Pr = (n) => {
-  const e = li(n);
+const Ua = (n) => n.substring(n.lastIndexOf(".") + 1), hi = (n) => n.split("/").pop(), Pr = (n) => {
+  const e = hi(n);
   if (e) {
     const t = e.lastIndexOf(".");
     return t === -1 ? e : e.substring(0, t);
@@ -2489,7 +2491,7 @@ function Nr(n) {
       return console.error("THREE.BufferGeometryUtils: .mergeAttributes() failed. BufferAttribute.gpuType must be consistent across matching attributes."), null;
     i += h.count * t;
   }
-  const o = new e(i), a = new jo(o, t, r);
+  const o = new e(i), a = new Wo(o, t, r);
   let c = 0;
   for (let l = 0; l < n.length; ++l) {
     const h = n[l];
@@ -2567,7 +2569,7 @@ function Va(n, e = 1e-4) {
   }
   return v.setIndex(h), v;
 }
-class Ha extends Wo {
+class Ha extends jo {
   constructor(e, t = {}) {
     const r = t.font;
     if (r === void 0)
@@ -2579,7 +2581,7 @@ class Ha extends Wo {
     this.type = "TextGeometry";
   }
 }
-const hi = class {
+const ui = class {
   /**
    * Dummy replacement for `computeVertexNormals` that does nothing.
    */
@@ -2625,10 +2627,10 @@ const hi = class {
     }
   }
 };
-hi.originalComputeVertexNormals = sn.prototype.computeVertexNormals;
-let Wa = hi;
+ui.originalComputeVertexNormals = sn.prototype.computeVertexNormals;
+let ja = ui;
 const Ge = new g.Vector2();
-class zr extends oi {
+class zr extends ai {
   constructor(e, t, r) {
     super(e), this.isFound = !1, this.fontSize = t, this.font = r, this.width = this.getCharWidth(e, t, r);
   }
@@ -2639,7 +2641,7 @@ class zr extends oi {
    */
   toGeometry() {
     let e = this.font.cache.getGeometry(this.char, this.fontSize);
-    return e == null && (e = Wa.runWithoutNormals(() => {
+    return e == null && (e = ja.runWithoutNormals(() => {
       const t = new Ha(this.char, {
         font: this.font.font,
         depth: 0,
@@ -2696,14 +2698,14 @@ String.prototype.codePointAt || function() {
     writable: !0
   }) : String.prototype.codePointAt = e;
 }();
-var ur = 0, ui = -3;
+var ur = 0, di = -3;
 function Ct() {
   this.table = new Uint16Array(16), this.trans = new Uint16Array(288);
 }
-function ja(n, e) {
+function Wa(n, e) {
   this.source = n, this.sourceIndex = 0, this.tag = 0, this.bitcount = 0, this.dest = e, this.destLen = 0, this.ltree = new Ct(), this.dtree = new Ct();
 }
-var di = new Ct(), pi = new Ct(), dr = new Uint8Array(30), pr = new Uint16Array(30), fi = new Uint8Array(30), gi = new Uint16Array(30), Xa = new Uint8Array([
+var pi = new Ct(), fi = new Ct(), dr = new Uint8Array(30), pr = new Uint16Array(30), gi = new Uint8Array(30), mi = new Uint16Array(30), Xa = new Uint8Array([
   16,
   17,
   18,
@@ -2724,7 +2726,7 @@ var di = new Ct(), pi = new Ct(), dr = new Uint8Array(30), pr = new Uint16Array(
   1,
   15
 ]), Vr = new Ct(), ve = new Uint8Array(320);
-function mi(n, e, t, r) {
+function yi(n, e, t, r) {
   var s, i;
   for (s = 0; s < t; ++s)
     n[s] = 0;
@@ -2815,7 +2817,7 @@ function qa(n, e, t) {
   }
   Cn(e, ve, 0, r), Cn(t, ve, r, s);
 }
-function Wr(n, e, t) {
+function jr(n, e, t) {
   for (; ; ) {
     var r = er(n, e);
     if (r === 256)
@@ -2824,7 +2826,7 @@ function Wr(n, e, t) {
       n.dest[n.destLen++] = r;
     else {
       var s, i, o, a;
-      for (r -= 257, s = _e(n, dr[r], pr[r]), i = er(n, t), o = n.destLen - _e(n, fi[i], gi[i]), a = o; a < o + s; ++a)
+      for (r -= 257, s = _e(n, dr[r], pr[r]), i = er(n, t), o = n.destLen - _e(n, gi[i], mi[i]), a = o; a < o + s; ++a)
         n.dest[n.destLen++] = n.dest[a];
     }
   }
@@ -2833,35 +2835,35 @@ function Za(n) {
   for (var e, t, r; n.bitcount > 8; )
     n.sourceIndex--, n.bitcount -= 8;
   if (e = n.source[n.sourceIndex + 1], e = 256 * e + n.source[n.sourceIndex], t = n.source[n.sourceIndex + 3], t = 256 * t + n.source[n.sourceIndex + 2], e !== (~t & 65535))
-    return ui;
+    return di;
   for (n.sourceIndex += 4, r = e; r; --r)
     n.dest[n.destLen++] = n.source[n.sourceIndex++];
   return n.bitcount = 0, ur;
 }
 function Qa(n, e) {
-  var t = new ja(n, e), r, s, i;
+  var t = new Wa(n, e), r, s, i;
   do {
     switch (r = Ya(t), s = _e(t, 2, 0), s) {
       case 0:
         i = Za(t);
         break;
       case 1:
-        i = Wr(t, di, pi);
+        i = jr(t, pi, fi);
         break;
       case 2:
-        qa(t, t.ltree, t.dtree), i = Wr(t, t.ltree, t.dtree);
+        qa(t, t.ltree, t.dtree), i = jr(t, t.ltree, t.dtree);
         break;
       default:
-        i = ui;
+        i = di;
     }
     if (i !== ur)
       throw new Error("Data error");
   } while (!r);
   return t.destLen < t.dest.length ? typeof t.dest.slice == "function" ? t.dest.slice(0, t.destLen) : t.dest.subarray(0, t.destLen) : t.dest;
 }
-$a(di, pi);
-mi(dr, pr, 4, 3);
-mi(fi, gi, 2, 1);
+$a(pi, fi);
+yi(dr, pr, 4, 3);
+yi(gi, mi, 2, 1);
 dr[28] = 0;
 pr[28] = 258;
 var Ja = Qa;
@@ -2908,24 +2910,24 @@ Pe.prototype.addQuad = function(n, e, t, r, s, i) {
   var o = n + 0.6666666666666666 * (t - n), a = e + 2 / 3 * (r - e), c = o + 1 / 3 * (s - n), l = a + 1 / 3 * (i - e);
   this.addBezier(n, e, o, a, c, l, s, i);
 };
-function j() {
+function W() {
   this.commands = [], this.fill = "black", this.stroke = null, this.strokeWidth = 1;
 }
-j.prototype.moveTo = function(n, e) {
+W.prototype.moveTo = function(n, e) {
   this.commands.push({
     type: "M",
     x: n,
     y: e
   });
 };
-j.prototype.lineTo = function(n, e) {
+W.prototype.lineTo = function(n, e) {
   this.commands.push({
     type: "L",
     x: n,
     y: e
   });
 };
-j.prototype.curveTo = j.prototype.bezierCurveTo = function(n, e, t, r, s, i) {
+W.prototype.curveTo = W.prototype.bezierCurveTo = function(n, e, t, r, s, i) {
   this.commands.push({
     type: "C",
     x1: n,
@@ -2936,7 +2938,7 @@ j.prototype.curveTo = j.prototype.bezierCurveTo = function(n, e, t, r, s, i) {
     y: i
   });
 };
-j.prototype.quadTo = j.prototype.quadraticCurveTo = function(n, e, t, r) {
+W.prototype.quadTo = W.prototype.quadraticCurveTo = function(n, e, t, r) {
   this.commands.push({
     type: "Q",
     x1: n,
@@ -2945,12 +2947,12 @@ j.prototype.quadTo = j.prototype.quadraticCurveTo = function(n, e, t, r) {
     y: r
   });
 };
-j.prototype.close = j.prototype.closePath = function() {
+W.prototype.close = W.prototype.closePath = function() {
   this.commands.push({
     type: "Z"
   });
 };
-j.prototype.extend = function(n) {
+W.prototype.extend = function(n) {
   if (n.commands)
     n = n.commands;
   else if (n instanceof Pe) {
@@ -2960,7 +2962,7 @@ j.prototype.extend = function(n) {
   }
   Array.prototype.push.apply(this.commands, n);
 };
-j.prototype.getBoundingBox = function() {
+W.prototype.getBoundingBox = function() {
   for (var n = new Pe(), e = 0, t = 0, r = 0, s = 0, i = 0; i < this.commands.length; i++) {
     var o = this.commands[i];
     switch (o.type) {
@@ -2985,7 +2987,7 @@ j.prototype.getBoundingBox = function() {
   }
   return n.isEmpty() && n.addPoint(0, 0), n;
 };
-j.prototype.draw = function(n) {
+W.prototype.draw = function(n) {
   n.beginPath();
   for (var e = 0; e < this.commands.length; e += 1) {
     var t = this.commands[e];
@@ -2993,7 +2995,7 @@ j.prototype.draw = function(n) {
   }
   this.fill && (n.fillStyle = this.fill, n.fill()), this.stroke && (n.strokeStyle = this.stroke, n.lineWidth = this.strokeWidth, n.stroke());
 };
-j.prototype.toPathData = function(n) {
+W.prototype.toPathData = function(n) {
   n = n !== void 0 ? n : 2;
   function e(o) {
     return Math.round(o) === o ? "" + Math.round(o) : o.toFixed(n);
@@ -3011,21 +3013,21 @@ j.prototype.toPathData = function(n) {
   }
   return r;
 };
-j.prototype.toSVG = function(n) {
+W.prototype.toSVG = function(n) {
   var e = '<path d="';
   return e += this.toPathData(n), e += '"', this.fill && this.fill !== "black" && (this.fill === null ? e += ' fill="none"' : e += ' fill="' + this.fill + '"'), this.stroke && (e += ' stroke="' + this.stroke + '" stroke-width="' + this.strokeWidth + '"'), e += "/>", e;
 };
-j.prototype.toDOMElement = function(n) {
+W.prototype.toDOMElement = function(n) {
   var e = this.toPathData(n), t = document.createElementNS("http://www.w3.org/2000/svg", "path");
   return t.setAttribute("d", e), t;
 };
-function yi(n) {
+function vi(n) {
   throw new Error(n);
 }
-function jr(n, e) {
-  n || yi(e);
+function Wr(n, e) {
+  n || vi(e);
 }
-var A = { fail: yi, argument: jr, assert: jr }, Xr = 32768, $r = 2147483648, ct = {}, C = {}, B = {};
+var A = { fail: vi, argument: Wr, assert: Wr }, Xr = 32768, $r = 2147483648, ct = {}, C = {}, B = {};
 function me(n) {
   return function() {
     return n;
@@ -3529,7 +3531,7 @@ function rc(n, e) {
 function fr(n, e) {
   return n.getUint32(e, !1);
 }
-function vi(n, e) {
+function bi(n, e) {
   var t = n.getInt16(e, !1), r = n.getUint16(e + 2, !1);
   return t + r / 65535;
 }
@@ -3595,7 +3597,7 @@ b.prototype.parseULong = function() {
 };
 b.prototype.parseOffset32 = b.prototype.parseULong;
 b.prototype.parseFixed = function() {
-  var n = vi(this.data, this.offset + this.relativeOffset);
+  var n = bi(this.data, this.offset + this.relativeOffset);
   return this.relativeOffset += 4, n;
 };
 b.prototype.parseString = function(n) {
@@ -3857,7 +3859,7 @@ var M = {
   getCard16: hn,
   getShort: rc,
   getULong: fr,
-  getFixed: vi,
+  getFixed: bi,
   getTag: sc,
   getOffset: ic,
   getBytes: oc,
@@ -3980,7 +3982,7 @@ function fc(n) {
   }
   return i;
 }
-var bi = { parse: uc, make: fc }, en = [
+var xi = { parse: uc, make: fc }, en = [
   ".notdef",
   "space",
   "exclam",
@@ -5141,10 +5143,10 @@ var bi = { parse: uc, make: fc }, en = [
   "ccaron",
   "dcroat"
 ];
-function xi(n) {
+function Si(n) {
   this.font = n;
 }
-xi.prototype.charToGlyphIndex = function(n) {
+Si.prototype.charToGlyphIndex = function(n) {
   var e = n.codePointAt(0), t = this.font.glyphs;
   if (t) {
     for (var r = 0; r < t.length; r += 1)
@@ -5154,10 +5156,10 @@ xi.prototype.charToGlyphIndex = function(n) {
   }
   return null;
 };
-function Si(n) {
+function wi(n) {
   this.cmap = n;
 }
-Si.prototype.charToGlyphIndex = function(n) {
+wi.prototype.charToGlyphIndex = function(n) {
   return this.cmap.glyphIndexMap[n.codePointAt(0)] || 0;
 };
 function un(n, e) {
@@ -5221,7 +5223,7 @@ function xc(n, e, t, r, s) {
 }
 var Ne = { line: xc };
 function Sc(n, e) {
-  var t = e || new j();
+  var t = e || new W();
   return {
     configurable: !0,
     get: function() {
@@ -5256,7 +5258,7 @@ oe.prototype.getPath = function(n, e, t, r, s) {
     var l = 1 / (this.path.unitsPerEm || 1e3) * t;
     a === void 0 && (a = l), c === void 0 && (c = l);
   }
-  for (var h = new j(), d = 0; d < i.length; d += 1) {
+  for (var h = new W(), d = 0; d < i.length; d += 1) {
     var u = i[d];
     u.type === "M" ? h.moveTo(n + u.x * a, e + -u.y * c) : u.type === "L" ? h.lineTo(n + u.x * a, e + -u.y * c) : u.type === "Q" ? h.quadraticCurveTo(
       n + u.x1 * a,
@@ -5320,7 +5322,7 @@ oe.prototype.drawMetrics = function(n, e, t, r) {
   var i = this.xMin || 0, o = this.yMin || 0, a = this.xMax || 0, c = this.yMax || 0, l = this.advanceWidth || 0;
   n.strokeStyle = "blue", Ne.line(n, e + i * s, -1e4, e + i * s, 1e4), Ne.line(n, e + a * s, -1e4, e + a * s, 1e4), Ne.line(n, -1e4, t + -o * s, 1e4, t + -o * s), Ne.line(n, -1e4, t + -c * s, 1e4, t + -c * s), n.strokeStyle = "green", Ne.line(n, e + l * s, -1e4, e + l * s, 1e4);
 };
-function Wt(n, e, t) {
+function jt(n, e, t) {
   Object.defineProperty(n, e, {
     get: function() {
       return n.path, n[t];
@@ -5365,7 +5367,7 @@ function _c(n, e, t, r, s, i) {
       t(o, r, s);
       var a = i(n.glyphs, o);
       return a.unitsPerEm = n.unitsPerEm, a;
-    }, Wt(o, "xMin", "_xMin"), Wt(o, "xMax", "_xMax"), Wt(o, "yMin", "_yMin"), Wt(o, "yMax", "_yMax"), o;
+    }, jt(o, "xMin", "_xMin"), jt(o, "xMax", "_xMax"), jt(o, "yMin", "_yMin"), jt(o, "yMax", "_yMax"), o;
   };
 }
 function Tc(n, e, t, r) {
@@ -5378,14 +5380,14 @@ function Tc(n, e, t, r) {
   };
 }
 var Ce = { GlyphSet: mr, glyphLoader: wc, ttfGlyphLoader: _c, cffGlyphLoader: Tc };
-function wi(n, e) {
+function _i(n, e) {
   if (n === e)
     return !0;
   if (Array.isArray(n) && Array.isArray(e)) {
     if (n.length !== e.length)
       return !1;
     for (var t = 0; t < n.length; t += 1)
-      if (!wi(n[t], e[t]))
+      if (!_i(n[t], e[t]))
         return !1;
     return !0;
   } else
@@ -5466,7 +5468,7 @@ function Mc(n) {
   }
   return e;
 }
-function _i(n, e, t) {
+function Ti(n, e, t) {
   e = e !== void 0 ? e : 0;
   var r = new M.Parser(n, e), s = [], i = [];
   for (t = t !== void 0 ? t : n.length; r.relativeOffset < t; ) {
@@ -5478,7 +5480,7 @@ function _i(n, e, t) {
 function _t(n, e) {
   return e <= 390 ? e = en[e] : e = n[e - 391], e;
 }
-function Ti(n, e, t) {
+function Ci(n, e, t) {
   for (var r = {}, s, i = 0; i < e.length; i += 1) {
     var o = e[i];
     if (Array.isArray(o.type)) {
@@ -5496,7 +5498,7 @@ function Ac(n, e) {
   var t = {};
   return t.formatMajor = M.getCard8(n, e), t.formatMinor = M.getCard8(n, e + 1), t.size = M.getCard8(n, e + 2), t.offsetSize = M.getCard8(n, e + 3), t.startOffset = e, t.endOffset = e + 4, t;
 }
-var Ci = [
+var Ii = [
   { name: "version", op: 0, type: "SID" },
   { name: "notice", op: 1, type: "SID" },
   { name: "copyright", op: 1200, type: "SID" },
@@ -5532,18 +5534,18 @@ var Ci = [
   { name: "fdArray", op: 1236, type: "offset" },
   { name: "fdSelect", op: 1237, type: "offset" },
   { name: "fontName", op: 1238, type: "SID" }
-], Ii = [
+], ki = [
   { name: "subrs", op: 19, type: "offset", value: 0 },
   { name: "defaultWidthX", op: 20, type: "number", value: 0 },
   { name: "nominalWidthX", op: 21, type: "number", value: 0 }
 ];
 function Bc(n, e) {
-  var t = _i(n, 0, n.byteLength);
-  return Ti(t, Ci, e);
+  var t = Ti(n, 0, n.byteLength);
+  return Ci(t, Ii, e);
 }
-function ki(n, e, t, r) {
-  var s = _i(n, e, t);
-  return Ti(s, Ii, r);
+function Ei(n, e, t, r) {
+  var s = Ti(n, e, t);
+  return Ci(s, ki, r);
 }
 function Zr(n, e, t, r) {
   for (var s = [], i = 0; i < t.length; i += 1) {
@@ -5551,7 +5553,7 @@ function Zr(n, e, t, r) {
     a._subrs = [], a._subrsBias = 0, a._defaultWidthX = 0, a._nominalWidthX = 0;
     var c = a.private[0], l = a.private[1];
     if (c !== 0 && l !== 0) {
-      var h = ki(n, l + e, c, r);
+      var h = Ei(n, l + e, c, r);
       if (a._defaultWidthX = h.defaultWidthX, a._nominalWidthX = h.nominalWidthX, h.subrs !== 0) {
         var d = l + h.subrs, u = Ae(n, d + e);
         a._subrs = u.objects, a._subrsBias = sr(a._subrs);
@@ -5601,7 +5603,7 @@ function Oc(n, e, t) {
   return new un(s, t);
 }
 function Qr(n, e, t) {
-  var r, s, i, o, a = new j(), c = [], l = 0, h = !1, d = !1, u = 0, p = 0, f, m, y, v;
+  var r, s, i, o, a = new W(), c = [], l = 0, h = !1, d = !1, u = 0, p = 0, f, m, y, v;
   if (n.isCIDFont) {
     var S = n.tables.cff.topDict._fdSelect[e.index], x = n.tables.cff.topDict._fdArray[S];
     f = x._subrs, m = x._subrsBias, y = x._defaultWidthX, v = x._nominalWidthX;
@@ -5768,7 +5770,7 @@ function Rc(n, e, t, r) {
     var p = Ae(n, d), f = Zr(n, e, p.objects, a.objects);
     h._fdArray = f, u += e, h._fdSelect = Dc(n, u, t.numGlyphs, f.length);
   }
-  var m = e + h.private[1], y = ki(n, m, h.private[0], a.objects);
+  var m = e + h.private[1], y = Ei(n, m, h.private[0], a.objects);
   if (t.defaultWidthX = y.defaultWidthX, t.nominalWidthX = y.nominalWidthX, y.subrs !== 0) {
     var v = m + y.subrs, S = Ae(n, v);
     t.subrs = S.objects, t.subrsBias = sr(t.subrs);
@@ -5788,7 +5790,7 @@ function Rc(n, e, t, r) {
       t.glyphs.push(w, Ce.cffGlyphLoader(t, w, Qr, L));
     }
 }
-function Ei(n, e) {
+function Mi(n, e) {
   var t, r = en.indexOf(n);
   return r >= 0 && (t = r), r = e.indexOf(n), r >= 0 ? t = r + en.length : (t = en.length + e.length, e.push(n)), t;
 }
@@ -5809,10 +5811,10 @@ function Fc(n) {
     e.names.push({ name: "name_" + t, type: "NAME", value: n[t] });
   return e;
 }
-function Mi(n, e, t) {
+function Ai(n, e, t) {
   for (var r = {}, s = 0; s < n.length; s += 1) {
     var i = n[s], o = e[i.name];
-    o !== void 0 && !wi(o, i.value) && (i.type === "SID" && (o = Ei(o, t)), r[i.op] = { name: i.name, type: i.type, value: o });
+    o !== void 0 && !_i(o, i.value) && (i.type === "SID" && (o = Mi(o, t)), r[i.op] = { name: i.name, type: i.type, value: o });
   }
   return r;
 }
@@ -5820,7 +5822,7 @@ function Jr(n, e) {
   var t = new k.Record("Top DICT", [
     { name: "dict", type: "DICT", value: {} }
   ]);
-  return t.dict = Mi(Ci, n, e), t;
+  return t.dict = Ai(Ii, n, e), t;
 }
 function Kr(n) {
   var e = new k.Record("Top DICT INDEX", [
@@ -5846,7 +5848,7 @@ function Nc(n, e) {
   for (var t = new k.Record("Charsets", [
     { name: "format", type: "Card8", value: 0 }
   ]), r = 0; r < n.length; r += 1) {
-    var s = n[r], i = Ei(s, e);
+    var s = n[r], i = Mi(s, e);
     t.fields.push({ name: "glyph_" + r, type: "SID", value: i });
   }
   return t;
@@ -5892,9 +5894,9 @@ function Hc(n, e) {
   var t = new k.Record("Private DICT", [
     { name: "dict", type: "DICT", value: {} }
   ]);
-  return t.dict = Mi(Ii, n, e), t;
+  return t.dict = Ai(ki, n, e), t;
 }
-function Wc(n, e) {
+function jc(n, e) {
   for (var t = new k.Table("CFF ", [
     { name: "header", type: "RECORD" },
     { name: "nameIndex", type: "RECORD" },
@@ -5924,8 +5926,8 @@ function Wc(n, e) {
   var d = t.header.sizeOf() + t.nameIndex.sizeOf() + t.topDictIndex.sizeOf() + t.stringIndex.sizeOf() + t.globalSubrIndex.sizeOf();
   return s.charset = d, s.encoding = 0, s.charStrings = s.charset + t.charsets.sizeOf(), s.private[1] = s.charStrings + t.charStringsIndex.sizeOf(), h = Jr(s, l), t.topDictIndex = Kr(h), t;
 }
-var Ai = { parse: Rc, make: Wc };
-function jc(n, e) {
+var Bi = { parse: Rc, make: jc };
+function Wc(n, e) {
   var t = {}, r = new M.Parser(n, e);
   return t.version = r.parseVersion(), t.fontRevision = Math.round(r.parseFixed() * 1e3) / 1e3, t.checkSumAdjustment = r.parseULong(), t.magicNumber = r.parseULong(), A.argument(t.magicNumber === 1594834165, "Font header has wrong magic number."), t.flags = r.parseUShort(), t.unitsPerEm = r.parseUShort(), t.created = r.parseLongDateTime(), t.modified = r.parseLongDateTime(), t.xMin = r.parseShort(), t.yMin = r.parseShort(), t.xMax = r.parseShort(), t.yMax = r.parseShort(), t.macStyle = r.parseUShort(), t.lowestRecPPEM = r.parseUShort(), t.fontDirectionHint = r.parseShort(), t.indexToLocFormat = r.parseShort(), t.glyphDataFormat = r.parseShort(), t;
 }
@@ -5951,7 +5953,7 @@ function Xc(n) {
     { name: "glyphDataFormat", type: "SHORT", value: 0 }
   ], n);
 }
-var Bi = { parse: jc, make: Xc };
+var Li = { parse: Wc, make: Xc };
 function $c(n, e) {
   var t = {}, r = new M.Parser(n, e);
   return t.version = r.parseVersion(), t.ascender = r.parseShort(), t.descender = r.parseShort(), t.lineGap = r.parseShort(), t.advanceWidthMax = r.parseUShort(), t.minLeftSideBearing = r.parseShort(), t.minRightSideBearing = r.parseShort(), t.xMaxExtent = r.parseShort(), t.caretSlopeRise = r.parseShort(), t.caretSlopeRun = r.parseShort(), t.caretOffset = r.parseShort(), r.relativeOffset += 8, t.metricDataFormat = r.parseShort(), t.numberOfHMetrics = r.parseUShort(), t;
@@ -5977,7 +5979,7 @@ function Yc(n) {
     { name: "numberOfHMetrics", type: "USHORT", value: 0 }
   ], n);
 }
-var Li = { parse: $c, make: Yc };
+var Oi = { parse: $c, make: Yc };
 function qc(n, e, t, r, s) {
   for (var i, o, a = new M.Parser(n, e), c = 0; c < r; c += 1) {
     c < t && (i = a.parseUShort(), o = a.parseShort());
@@ -6003,7 +6005,7 @@ function Jc(n) {
   }
   return e;
 }
-var Oi = { parse: Qc, make: Jc };
+var Di = { parse: Qc, make: Jc };
 function Kc(n) {
   for (var e = new k.Table("ltag", [
     { name: "version", type: "ULONG", value: 1 },
@@ -6025,7 +6027,7 @@ function el(n, e) {
   }
   return i;
 }
-var Di = { make: Kc, parse: el };
+var Ri = { make: Kc, parse: el };
 function tl(n, e) {
   var t = {}, r = new M.Parser(n, e);
   return t.version = r.parseVersion(), t.numGlyphs = r.parseUShort(), t.version === 1 && (t.maxPoints = r.parseUShort(), t.maxContours = r.parseUShort(), t.maxCompositePoints = r.parseUShort(), t.maxCompositeContours = r.parseUShort(), t.maxZones = r.parseUShort(), t.maxTwilightPoints = r.parseUShort(), t.maxStorage = r.parseUShort(), t.maxFunctionDefs = r.parseUShort(), t.maxInstructionDefs = r.parseUShort(), t.maxStackElements = r.parseUShort(), t.maxSizeOfInstructions = r.parseUShort(), t.maxComponentElements = r.parseUShort(), t.maxComponentDepth = r.parseUShort()), t;
@@ -6036,7 +6038,7 @@ function nl(n) {
     { name: "numGlyphs", type: "USHORT", value: n }
   ]);
 }
-var Ri = { parse: tl, make: nl }, Ui = [
+var Ui = { parse: tl, make: nl }, Fi = [
   "copyright",
   // 0
   "fontFamily",
@@ -6083,7 +6085,7 @@ var Ri = { parse: tl, make: nl }, Ui = [
   // 21
   "wwsSubfamily"
   // 22
-], Fi = {
+], Pi = {
   0: "en",
   1: "fr",
   2: "de",
@@ -6442,7 +6444,7 @@ var Ri = { parse: tl, make: nl }, Ui = [
   // langAzerbaijanRoman → smRoman
   151: 0
   // langNynorsk → smRoman
-}, Pi = {
+}, Gi = {
   1078: "af",
   1052: "sq",
   1156: "gsw",
@@ -6665,9 +6667,9 @@ function sl(n, e, t) {
         return t[e];
       break;
     case 1:
-      return Fi[e];
-    case 3:
       return Pi[e];
+    case 3:
+      return Gi[e];
   }
 }
 var ir = "utf-16", il = {
@@ -6761,7 +6763,7 @@ var ir = "utf-16", il = {
   146: "x-mac-gaelic"
   // langIrishGaelicScript
 };
-function Gi(n, e, t) {
+function Ni(n, e, t) {
   switch (n) {
     case 0:
       return ir;
@@ -6775,7 +6777,7 @@ function Gi(n, e, t) {
 }
 function al(n, e, t) {
   for (var r = {}, s = new M.Parser(n, e), i = s.parseUShort(), o = s.parseUShort(), a = s.offset + s.parseUShort(), c = 0; c < o; c++) {
-    var l = s.parseUShort(), h = s.parseUShort(), d = s.parseUShort(), u = s.parseUShort(), p = Ui[u] || u, f = s.parseUShort(), m = s.parseUShort(), y = sl(l, d, t), v = Gi(l, h, d);
+    var l = s.parseUShort(), h = s.parseUShort(), d = s.parseUShort(), u = s.parseUShort(), p = Fi[u] || u, f = s.parseUShort(), m = s.parseUShort(), y = sl(l, d, t), v = Ni(l, h, d);
     if (v !== void 0 && y !== void 0) {
       var S = void 0;
       if (v === ir ? S = ct.UTF16(n, a + m, f) : S = ct.MACSTRING(n, a + m, f, v), S) {
@@ -6824,18 +6826,18 @@ function ts(n, e) {
   return t;
 }
 function ll(n, e) {
-  var t, r = [], s = {}, i = In(Ui);
+  var t, r = [], s = {}, i = In(Fi);
   for (var o in n) {
     var a = i[o];
     if (a === void 0 && (a = o), t = parseInt(a), isNaN(t))
       throw new Error('Name table entry "' + o + '" does not exist, see nameTableNames for complete list.');
     s[t] = n[o], r.push(t);
   }
-  for (var c = In(Fi), l = In(Pi), h = [], d = [], u = 0; u < r.length; u++) {
+  for (var c = In(Pi), l = In(Gi), h = [], d = [], u = 0; u < r.length; u++) {
     t = r[u];
     var p = s[t];
     for (var f in p) {
-      var m = p[f], y = 1, v = c[f], S = rl[v], x = Gi(y, S, v), _ = C.MACSTRING(m, x);
+      var m = p[f], y = 1, v = c[f], S = rl[v], x = Ni(y, S, v), _ = C.MACSTRING(m, x);
       _ === void 0 && (y = 0, v = e.indexOf(f), v < 0 && (v = e.length, e.push(f)), S = 4, _ = C.UTF16(m));
       var w = ts(_, d);
       h.push(es(
@@ -6871,7 +6873,7 @@ function ll(n, e) {
     O.fields.push({ name: "record_" + G, type: "RECORD", value: h[G] });
   return O.fields.push({ name: "strings", type: "LITERAL", value: d }), O;
 }
-var Ni = { parse: al, make: ll }, or = [
+var zi = { parse: al, make: ll }, or = [
   { begin: 0, end: 127 },
   // Basic Latin
   { begin: 128, end: 255 },
@@ -7223,7 +7225,7 @@ function fl() {
     { name: "maxMemType1", type: "ULONG", value: 0 }
   ]);
 }
-var zi = { parse: pl, make: fl }, de = new Array(9);
+var Vi = { parse: pl, make: fl }, de = new Array(9);
 de[1] = function() {
   var n = this.offset + this.relativeOffset, e = this.parseUShort();
   if (e === 1)
@@ -7469,7 +7471,7 @@ function ml(n) {
     { name: "lookups", type: "TABLE", value: new k.LookupList(n.lookups, ht) }
   ]);
 }
-var Vi = { parse: gl, make: ml };
+var Hi = { parse: gl, make: ml };
 function yl(n, e) {
   var t = new M.Parser(n, e), r = t.parseULong();
   A.argument(r === 1, "Unsupported META table version."), t.parseULong(), t.parseULong();
@@ -7492,7 +7494,7 @@ function vl(n) {
   }
   return s.fields.push({ name: "stringPool", type: "CHARARRAY", value: t }), s;
 }
-var Hi = { parse: yl, make: vl };
+var ji = { parse: yl, make: vl };
 function ns(n) {
   return Math.log(n) / Math.log(2) | 0;
 }
@@ -7584,7 +7586,7 @@ function xl(n) {
     minRightSideBearing: Math.min.apply(null, a)
   };
   x.ascender = n.ascender, x.descender = n.descender;
-  var _ = Bi.make({
+  var _ = Li.make({
     flags: 3,
     // 00000011 (baseline for font at y=0; left sidebearing point at x=0)
     unitsPerEm: n.unitsPerEm,
@@ -7594,7 +7596,7 @@ function xl(n) {
     yMax: x.yMax,
     lowestRecPPEM: 3,
     createdTimestamp: n.createdTimestamp
-  }), w = Li.make({
+  }), w = Oi.make({
     ascender: x.ascender,
     descender: x.descender,
     advanceWidthMax: x.advanceWidthMax,
@@ -7602,7 +7604,7 @@ function xl(n) {
     minRightSideBearing: x.minRightSideBearing,
     xMaxExtent: x.maxLeftSideBearing + (x.xMax - x.xMin),
     numberOfHMetrics: n.glyphs.length
-  }), L = Ri.make(n.glyphs.length), T = ar.make(Object.assign({
+  }), L = Ui.make(n.glyphs.length), T = ar.make(Object.assign({
     xAvgCharWidth: Math.round(x.advanceWidthAvg),
     usFirstCharIndex: c,
     usLastCharIndex: l,
@@ -7627,13 +7629,13 @@ function xl(n) {
     // Use space as the default character, if available.
     usBreakChar: n.hasChar(" ") ? 32 : 0
     // Use space as the break character, if available.
-  }, n.tables.os2)), I = Oi.make(n.glyphs), O = bi.make(n.glyphs), G = n.getEnglishName("fontFamily"), Q = n.getEnglishName("fontSubfamily"), ee = G + " " + Q, Y = n.getEnglishName("postScriptName");
+  }, n.tables.os2)), I = Di.make(n.glyphs), O = xi.make(n.glyphs), G = n.getEnglishName("fontFamily"), Q = n.getEnglishName("fontSubfamily"), ee = G + " " + Q, Y = n.getEnglishName("postScriptName");
   Y || (Y = G.replace(/\s/g, "") + "-" + Q);
   var U = {};
   for (var N in n.names)
     U[N] = n.names[N];
   U.uniqueID || (U.uniqueID = { en: n.getEnglishName("manufacturer") + ":" + ee }), U.postScriptName || (U.postScriptName = { en: Y }), U.preferredFamily || (U.preferredFamily = n.names.fontFamily), U.preferredSubfamily || (U.preferredSubfamily = n.names.fontSubfamily);
-  var F = [], H = Ni.make(U, F), q = F.length > 0 ? Di.make(F) : void 0, X = zi.make(), J = Ai.make(n.glyphs, {
+  var F = [], H = zi.make(U, F), q = F.length > 0 ? Ri.make(F) : void 0, X = Vi.make(), J = Bi.make(n.glyphs, {
     version: n.getEnglishName("version"),
     fullName: ee,
     familyName: G,
@@ -7641,11 +7643,11 @@ function xl(n) {
     postScriptName: Y,
     unitsPerEm: n.unitsPerEm,
     fontBBox: [0, x.yMin, x.ascender, x.advanceWidthMax]
-  }), R = n.metas && Object.keys(n.metas).length > 0 ? Hi.make(n.metas) : void 0, Z = [_, w, L, T, H, O, X, J, I];
-  q && Z.push(q), n.tables.gsub && Z.push(Vi.make(n.tables.gsub)), R && Z.push(R);
-  for (var xn = Wi(Z), ho = xn.encode(), uo = yr(ho), Sn = xn.fields, kr = !1, Nt = 0; Nt < Sn.length; Nt += 1)
+  }), R = n.metas && Object.keys(n.metas).length > 0 ? ji.make(n.metas) : void 0, Z = [_, w, L, T, H, O, X, J, I];
+  q && Z.push(q), n.tables.gsub && Z.push(Hi.make(n.tables.gsub)), R && Z.push(R);
+  for (var xn = Wi(Z), uo = xn.encode(), po = yr(uo), Sn = xn.fields, kr = !1, Nt = 0; Nt < Sn.length; Nt += 1)
     if (Sn[Nt].name === "head table") {
-      Sn[Nt].value.checkSumAdjustment = 2981146554 - uo, kr = !0;
+      Sn[Nt].value.checkSumAdjustment = 2981146554 - po, kr = !0;
       break;
     }
   if (!kr)
@@ -8118,7 +8120,7 @@ function as(n, e, t, r, s) {
   var i;
   return (e & r) > 0 ? (i = n.parseByte(), e & s || (i = -i), i = t + i) : (e & s) > 0 ? i = t : i = t + n.parseShort(), i;
 }
-function ji(n, e, t) {
+function Xi(n, e, t) {
   var r = new M.Parser(e, t);
   n.numberOfContours = r.parseShort(), n._xMin = r.parseShort(), n._yMin = r.parseShort(), n._xMax = r.parseShort(), n._yMax = r.parseShort();
   var s, i;
@@ -8190,8 +8192,8 @@ function Cl(n) {
   }
   return A.argument(t.length === 0, "There are still points left in the current contour."), e;
 }
-function Xi(n) {
-  var e = new j();
+function $i(n) {
+  var e = new W();
   if (!n)
     return e;
   for (var t = Cl(n), r = 0; r < t.length; ++r) {
@@ -8215,7 +8217,7 @@ function Xi(n) {
   }
   return e;
 }
-function $i(n, e) {
+function Yi(n, e) {
   if (e.isComposite)
     for (var t = 0; t < e.components.length; t += 1) {
       var r = e.components[t], s = n.get(r.glyphIndex);
@@ -8239,12 +8241,12 @@ function $i(n, e) {
         e.points = e.points.concat(i);
       }
     }
-  return Xi(e.points);
+  return $i(e.points);
 }
 function Il(n, e, t, r) {
   for (var s = new Ce.GlyphSet(r), i = 0; i < t.length - 1; i += 1) {
     var o = t[i], a = t[i + 1];
-    o !== a ? s.push(i, Ce.ttfGlyphLoader(r, i, ji, n, e + o, $i)) : s.push(i, Ce.glyphLoader(r, i));
+    o !== a ? s.push(i, Ce.ttfGlyphLoader(r, i, Xi, n, e + o, Yi)) : s.push(i, Ce.glyphLoader(r, i));
   }
   return s;
 }
@@ -8252,22 +8254,22 @@ function kl(n, e, t, r) {
   var s = new Ce.GlyphSet(r);
   return r._push = function(i) {
     var o = t[i], a = t[i + 1];
-    o !== a ? s.push(i, Ce.ttfGlyphLoader(r, i, ji, n, e + o, $i)) : s.push(i, Ce.glyphLoader(r, i));
+    o !== a ? s.push(i, Ce.ttfGlyphLoader(r, i, Xi, n, e + o, Yi)) : s.push(i, Ce.glyphLoader(r, i));
   }, s;
 }
 function El(n, e, t, r, s) {
   return s.lowMemory ? kl(n, e, t, r) : Il(n, e, t, r);
 }
-var Yi = { getPath: Xi, parse: El }, qi, je, Zi, cr;
-function Qi(n) {
+var qi = { getPath: $i, parse: El }, Zi, We, Qi, cr;
+function Ji(n) {
   this.font = n, this.getCommands = function(e) {
-    return Yi.getPath(e).commands;
+    return qi.getPath(e).commands;
   }, this._fpgmState = this._prepState = void 0, this._errorState = 0;
 }
 function Ml(n) {
   return n;
 }
-function Ji(n) {
+function Ki(n) {
   return Math.sign(n) * Math.round(Math.abs(n));
 }
 function Al(n) {
@@ -8282,7 +8284,7 @@ function Ll(n) {
 function Ol(n) {
   return Math.sign(n) * Math.floor(Math.abs(n));
 }
-var Ki = function(n) {
+var eo = function(n) {
   var e = this.srPeriod, t = this.srPhase, r = this.srThreshold, s = 1;
   return n < 0 && (n = -n, s = -1), n += r - t, n = Math.trunc(n / e) * e, n += t, n < 0 ? t * s : n * s;
 }, Te = {
@@ -8471,10 +8473,10 @@ function Be(n, 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 = Te, this.round = Ji;
+      this.fv = this.pv = this.dpv = Te, this.round = Ki;
   }
 }
-Qi.prototype.exec = function(n, e) {
+Ji.prototype.exec = function(n, e) {
   if (typeof e != "number")
     throw new Error("Point size is not a number!");
   if (!(this._errorState > 2)) {
@@ -8484,7 +8486,7 @@ Qi.prototype.exec = function(n, e) {
       if (!s) {
         Be.prototype = Dl, s = this._fpgmState = new Be("fpgm", t.tables.fpgm), s.funcs = [], s.font = t, exports.DEBUG && (console.log("---EXEC FPGM---"), s.step = -1);
         try {
-          je(s);
+          We(s);
         } catch (l) {
           console.log("Hinting error in FPGM:" + l), this._errorState = 3;
           return;
@@ -8499,21 +8501,21 @@ Qi.prototype.exec = function(n, e) {
         r.cvt = [];
       exports.DEBUG && (console.log("---EXEC PREP---"), r.step = -1);
       try {
-        je(r);
+        We(r);
       } catch (l) {
         this._errorState < 2 && console.log("Hinting error in PREP:" + l), this._errorState = 2;
       }
     }
     if (!(this._errorState > 1))
       try {
-        return Zi(n, r);
+        return Qi(n, r);
       } catch (l) {
         this._errorState < 1 && (console.log("Hinting error:" + l), console.log("Note: further hinting errors are silenced")), this._errorState = 1;
         return;
       }
   }
 };
-Zi = function(n, e) {
+Qi = function(n, e) {
   var t = e.ppem / e.font.unitsPerEm, r = t, s = n.components, i, o, a;
   if (Be.prototype = e, !s)
     a = new Be("glyf", n.instructions), exports.DEBUG && (console.log("---EXEC GLYPH---"), a.step = -1), cr(n, a, t, r), o = a.gZone;
@@ -8535,7 +8537,7 @@ Zi = function(n, e) {
     n.instructions && !a.inhibitGridFit && (a = new Be("glyf", n.instructions), a.gZone = a.z0 = a.z1 = a.z2 = o, a.contours = i, o.push(
       new ke(0, 0),
       new ke(Math.round(n.advanceWidth * t), 0)
-    ), exports.DEBUG && (console.log("---EXEC COMPOSITE---"), a.step = -1), je(a), o.length -= 2);
+    ), exports.DEBUG && (console.log("---EXEC COMPOSITE---"), a.step = -1), We(a), o.length -= 2);
   }
   return o;
 };
@@ -8558,19 +8560,19 @@ cr = function(n, e, t, r) {
     if (o.push(
       new ke(0, 0),
       new ke(Math.round(n.advanceWidth * t), 0)
-    ), je(e), o.length -= 2, exports.DEBUG) {
+    ), We(e), o.length -= 2, exports.DEBUG) {
       console.log("FINISHED GLYPH", e.stack);
       for (var f = 0; f < i; f++)
         console.log(f, o[f].x, o[f].y);
     }
   }
 };
-je = function(n) {
+We = function(n) {
   var e = n.prog;
   if (e) {
     var t = e.length, r;
     for (n.ip = 0; n.ip < t; n.ip++) {
-      if (exports.DEBUG && n.step++, r = qi[e[n.ip]], !r)
+      if (exports.DEBUG && n.step++, r = Zi[e[n.ip]], !r)
         throw new Error(
           "unknown instruction: 0x" + Number(e[n.ip]).toString(16)
         );
@@ -8582,7 +8584,7 @@ function yn(n) {
   for (var e = n.tZone = new Array(n.gZone.length), t = 0; t < e.length; t++)
     e[t] = new ke(0, 0);
 }
-function eo(n, e) {
+function to(n, e) {
   var t = n.prog, r = n.ip, s = 1, i;
   do
     if (i = t[++r], i === 88)
@@ -8657,7 +8659,7 @@ function Vl(n) {
 function Hl(n) {
   n.rp2 = n.stack.pop(), exports.DEBUG && console.log(n.step, "SRP2[]", n.rp2);
 }
-function Wl(n) {
+function jl(n) {
   var e = n.stack.pop();
   switch (exports.DEBUG && console.log(n.step, "SZP0[]", e), n.zp0 = e, e) {
     case 0:
@@ -8670,7 +8672,7 @@ function Wl(n) {
       throw new Error("Invalid zone pointer");
   }
 }
-function jl(n) {
+function Wl(n) {
   var e = n.stack.pop();
   switch (exports.DEBUG && console.log(n.step, "SZP1[]", e), n.zp1 = e, e) {
     case 0:
@@ -8713,7 +8715,7 @@ function Yl(n) {
   n.loop = n.stack.pop(), exports.DEBUG && console.log(n.step, "SLOOP[]", n.loop);
 }
 function ql(n) {
-  exports.DEBUG && console.log(n.step, "RTG[]"), n.round = Ji;
+  exports.DEBUG && console.log(n.step, "RTG[]"), n.round = Ki;
 }
 function Zl(n) {
   exports.DEBUG && console.log(n.step, "RTHG[]"), n.round = Bl;
@@ -8723,7 +8725,7 @@ function Ql(n) {
   exports.DEBUG && console.log(n.step, "SMD[]", e), n.minDis = e / 64;
 }
 function Jl(n) {
-  exports.DEBUG && console.log(n.step, "ELSE[]"), eo(n, !1);
+  exports.DEBUG && console.log(n.step, "ELSE[]"), to(n, !1);
 }
 function Kl(n) {
   var e = n.stack.pop();
@@ -8757,7 +8759,7 @@ function ih(n) {
   var s = n.ip, i = n.prog;
   n.prog = n.funcs[t];
   for (var o = 0; o < r; o++)
-    je(n), exports.DEBUG && console.log(
+    We(n), exports.DEBUG && console.log(
       ++n.step,
       o + 1 < r ? "next loopcall" : "done loopcall",
       o
@@ -8768,7 +8770,7 @@ function oh(n) {
   var e = n.stack.pop();
   exports.DEBUG && console.log(n.step, "CALL[]", e);
   var t = n.ip, r = n.prog;
-  n.prog = n.funcs[e], je(n), n.ip = t, n.prog = r, exports.DEBUG && console.log(++n.step, "returning from", e);
+  n.prog = n.funcs[e], We(n), n.ip = t, n.prog = r, exports.DEBUG && console.log(++n.step, "returning from", e);
 }
 function ah(n) {
   var e = n.stack, t = e.pop();
@@ -8976,7 +8978,7 @@ function Mh(n) {
 }
 function Ah(n) {
   var e = n.stack.pop();
-  exports.DEBUG && console.log(n.step, "IF[]", e), e || (eo(n, !0), exports.DEBUG && console.log(n.step, "EIF[]"));
+  exports.DEBUG && console.log(n.step, "IF[]", e), e || (to(n, !0), exports.DEBUG && console.log(n.step, "EIF[]"));
 }
 function Bh(n) {
   exports.DEBUG && console.log(n.step, "EIF[]");
@@ -9042,15 +9044,15 @@ function Hh(n) {
   var e = n.stack, t = e.pop();
   exports.DEBUG && console.log(n.step, "FLOOR[]", t), e.push(Math.floor(t / 64) * 64);
 }
-function Wh(n) {
+function jh(n) {
   var e = n.stack, t = e.pop();
   exports.DEBUG && console.log(n.step, "CEILING[]", t), e.push(Math.ceil(t / 64) * 64);
 }
-function jt(n, e) {
+function Wt(n, e) {
   var t = e.stack, r = t.pop();
   exports.DEBUG && console.log(e.step, "ROUND[]"), t.push(e.round(r / 64) * 64);
 }
-function jh(n) {
+function Wh(n) {
   var e = n.stack, t = e.pop(), r = e.pop();
   exports.DEBUG && console.log(n.step, "WCVTF[]", t, r), n.cvt[r] = t * n.ppem / n.font.unitsPerEm;
 }
@@ -9069,7 +9071,7 @@ function Bn(n, e) {
 }
 function Xh(n) {
   var e = n.stack.pop();
-  exports.DEBUG && console.log(n.step, "SROUND[]", e), n.round = Ki;
+  exports.DEBUG && console.log(n.step, "SROUND[]", e), n.round = eo;
   var t;
   switch (e & 192) {
     case 0:
@@ -9104,7 +9106,7 @@ function Xh(n) {
 }
 function $h(n) {
   var e = n.stack.pop();
-  exports.DEBUG && console.log(n.step, "S45ROUND[]", e), n.round = Ki;
+  exports.DEBUG && console.log(n.step, "S45ROUND[]", e), n.round = eo;
   var t;
   switch (e & 192) {
     case 0:
@@ -9219,7 +9221,7 @@ function E(n, e, t, r, s, i) {
     ")"
   ), i.rp1 = i.rp0, i.rp2 = c, e && (i.rp0 = c);
 }
-qi = [
+Zi = [
   /* 0x00 */
   cs.bind(void 0, Ie),
   /* 0x01 */
@@ -9259,9 +9261,9 @@ qi = [
   /* 0x12 */
   Hl,
   /* 0x13 */
-  Wl,
-  /* 0x14 */
   jl,
+  /* 0x14 */
+  Wl,
   /* 0x15 */
   Xl,
   /* 0x16 */
@@ -9436,15 +9438,15 @@ qi = [
   /* 0x66 */
   Hh,
   /* 0x67 */
-  Wh,
+  jh,
   /* 0x68 */
-  jt.bind(void 0, 0),
+  Wt.bind(void 0, 0),
   /* 0x69 */
-  jt.bind(void 0, 1),
+  Wt.bind(void 0, 1),
   /* 0x6A */
-  jt.bind(void 0, 2),
+  Wt.bind(void 0, 2),
   /* 0x6B */
-  jt.bind(void 0, 3),
+  Wt.bind(void 0, 3),
   /* 0x6C */
   void 0,
   // TODO NROUND[ab]
@@ -9458,7 +9460,7 @@ qi = [
   void 0,
   // TODO NROUND[ab]
   /* 0x70 */
-  jh,
+  Wh,
   /* 0x71 */
   An.bind(void 0, 2),
   /* 0x72 */
@@ -10010,7 +10012,7 @@ P.prototype.tokenize = function(n) {
 function Re(n) {
   return /[\u0600-\u065F\u066A-\u06D2\u06FA-\u06FF]/.test(n);
 }
-function to(n) {
+function no(n) {
   return /[\u0630\u0690\u0621\u0631\u0661\u0671\u0622\u0632\u0672\u0692\u06C2\u0623\u0673\u0693\u06C3\u0624\u0694\u06C4\u0625\u0675\u0695\u06C5\u06E5\u0676\u0696\u06C6\u0627\u0677\u0697\u06C7\u0648\u0688\u0698\u06C8\u0689\u0699\u06C9\u068A\u06CA\u066B\u068B\u06CB\u068C\u068D\u06CD\u06FD\u068E\u06EE\u06FE\u062F\u068F\u06CF\u06EF]/.test(n);
 }
 function Fe(n) {
@@ -10386,7 +10388,7 @@ function xr(n, e, t) {
 }
 function wu(n) {
   for (var e = [].concat(n.backtrack), t = e.length - 1; t >= 0; t--) {
-    var r = e[t], s = to(r), i = Fe(r);
+    var r = e[t], s = no(r), i = Fe(r);
     if (!s && !i)
       return !0;
     if (s)
@@ -10395,7 +10397,7 @@ function wu(n) {
   return !1;
 }
 function _u(n) {
-  if (to(n.current))
+  if (no(n.current))
     return !1;
   for (var e = 0; e < n.lookahead.length; e++) {
     var t = n.lookahead[e], r = Fe(t);
@@ -10662,12 +10664,12 @@ function D(n) {
       usWidthClass: n.widthClass || this.usWidthClasses.MEDIUM,
       fsSelection: n.fsSelection || this.fsSelectionValues.REGULAR
     }, n.tables.os2)
-  })), this.supported = !0, this.glyphs = new Ce.GlyphSet(this, n.glyphs || []), this.encoding = new xi(this), this.position = new Dt(this), this.substitution = new se(this), this.tables = this.tables || {}, this._push = null, this._hmtxTableData = {}, Object.defineProperty(this, "hinting", {
+  })), this.supported = !0, this.glyphs = new Ce.GlyphSet(this, n.glyphs || []), this.encoding = new Si(this), this.position = new Dt(this), this.substitution = new se(this), this.tables = this.tables || {}, this._push = null, this._hmtxTableData = {}, Object.defineProperty(this, "hinting", {
     get: function() {
       if (this._hinting)
         return this._hinting;
       if (this.outlinesFormat === "truetype")
-        return this._hinting = new Qi(this);
+        return this._hinting = new Ji(this);
     }
   });
 }
@@ -10746,7 +10748,7 @@ D.prototype.forEachGlyph = function(n, e, t, r, s, i) {
   return e;
 };
 D.prototype.getPath = function(n, e, t, r, s) {
-  var i = new j();
+  var i = new W();
   return this.forEachGlyph(n, e, t, r, s, function(o, a, c, l) {
     var h = o.getPath(a, c, l, s, this);
     i.extend(h);
@@ -10861,7 +10863,7 @@ D.prototype.usWeightClasses = {
   EXTRA_BOLD: 800,
   BLACK: 900
 };
-function no(n, e) {
+function ro(n, e) {
   var t = JSON.stringify(n), r = 256;
   for (var s in e) {
     var i = parseInt(s);
@@ -10874,7 +10876,7 @@ function no(n, e) {
   return e[r] = n, r;
 }
 function Ru(n, e, t) {
-  var r = no(e.name, t);
+  var r = ro(e.name, t);
   return [
     { name: "tag_" + n, type: "TAG", value: e.tag },
     { name: "minValue_" + n, type: "FIXED", value: e.minValue << 16 },
@@ -10889,7 +10891,7 @@ function Uu(n, e, t) {
   return r.tag = s.parseTag(), r.minValue = s.parseFixed(), r.defaultValue = s.parseFixed(), r.maxValue = s.parseFixed(), s.skip("uShort", 1), r.name = t[s.parseUShort()] || {}, r;
 }
 function Fu(n, e, t, r) {
-  for (var s = no(e.name, r), i = [
+  for (var s = ro(e.name, r), i = [
     { name: "nameID_" + n, type: "USHORT", value: s },
     { name: "flags_" + n, type: "USHORT", value: 0 }
   ], o = 0; o < t.length; ++o) {
@@ -10953,12 +10955,12 @@ var zu = { make: Gu, parse: Nu }, Vu = function() {
     return { pointindex: this.parseShort() };
   if (n === 3)
     return { coordinate: this.parseShort() };
-}, Wu = function() {
-  return this.parseList(b.pointer(Hu));
 }, ju = function() {
+  return this.parseList(b.pointer(Hu));
+}, Wu = function() {
   return {
     coverage: this.parsePointer(b.coverage),
-    ligGlyphs: this.parseList(b.pointer(Wu))
+    ligGlyphs: this.parseList(b.pointer(ju))
   };
 }, Xu = function() {
   return this.parseUShort(), this.parseList(b.pointer(b.coverage));
@@ -10974,7 +10976,7 @@ function $u(n, e) {
     version: r,
     classDef: t.parsePointer(b.classDef),
     attachList: t.parsePointer(Vu),
-    ligCaretList: t.parsePointer(ju),
+    ligCaretList: t.parsePointer(Wu),
     markAttachClassDef: t.parsePointer(b.classDef)
   };
   return r >= 1.2 && (s.markGlyphSets = t.parsePointer(Xu)), s;
@@ -11181,7 +11183,7 @@ function od(n, e) {
     var T = a[L], I = void 0;
     switch (T.tag) {
       case "cmap":
-        I = z(i, T), s.tables.cmap = bi.parse(I.data, I.offset), s.encoding = new Si(s.tables.cmap);
+        I = z(i, T), s.tables.cmap = xi.parse(I.data, I.offset), s.encoding = new wi(s.tables.cmap);
         break;
       case "cvt ":
         I = z(i, T), w = new M.Parser(I.data, I.offset), s.tables.cvt = w.parseShortList(T.length / 2);
@@ -11193,19 +11195,19 @@ function od(n, e) {
         I = z(i, T), w = new M.Parser(I.data, I.offset), s.tables.fpgm = w.parseByteList(T.length);
         break;
       case "head":
-        I = z(i, T), s.tables.head = Bi.parse(I.data, I.offset), s.unitsPerEm = s.tables.head.unitsPerEm, t = s.tables.head.indexToLocFormat;
+        I = z(i, T), s.tables.head = Li.parse(I.data, I.offset), s.unitsPerEm = s.tables.head.unitsPerEm, t = s.tables.head.indexToLocFormat;
         break;
       case "hhea":
-        I = z(i, T), s.tables.hhea = Li.parse(I.data, I.offset), s.ascender = s.tables.hhea.ascender, s.descender = s.tables.hhea.descender, s.numberOfHMetrics = s.tables.hhea.numberOfHMetrics;
+        I = z(i, T), s.tables.hhea = Oi.parse(I.data, I.offset), s.ascender = s.tables.hhea.ascender, s.descender = s.tables.hhea.descender, s.numberOfHMetrics = s.tables.hhea.numberOfHMetrics;
         break;
       case "hmtx":
         y = T;
         break;
       case "ltag":
-        I = z(i, T), r = Di.parse(I.data, I.offset);
+        I = z(i, T), r = Ri.parse(I.data, I.offset);
         break;
       case "maxp":
-        I = z(i, T), s.tables.maxp = Ri.parse(I.data, I.offset), s.numGlyphs = s.tables.maxp.numGlyphs;
+        I = z(i, T), s.tables.maxp = Ui.parse(I.data, I.offset), s.numGlyphs = s.tables.maxp.numGlyphs;
         break;
       case "name":
         x = T;
@@ -11214,7 +11216,7 @@ function od(n, e) {
         I = z(i, T), s.tables.os2 = ar.parse(I.data, I.offset);
         break;
       case "post":
-        I = z(i, T), s.tables.post = zi.parse(I.data, I.offset), s.glyphNames = new gr(s.tables.post);
+        I = z(i, T), s.tables.post = Vi.parse(I.data, I.offset), s.glyphNames = new gr(s.tables.post);
         break;
       case "prep":
         I = z(i, T), w = new M.Parser(I.data, I.offset), s.tables.prep = w.parseByteList(T.length);
@@ -11246,16 +11248,16 @@ function od(n, e) {
     }
   }
   var O = z(i, x);
-  if (s.tables.name = Ni.parse(O.data, O.offset, r), s.names = s.tables.name, u && S) {
+  if (s.tables.name = zi.parse(O.data, O.offset, r), s.names = s.tables.name, u && S) {
     var G = t === 0, Q = z(i, S), ee = sd.parse(Q.data, Q.offset, s.numGlyphs, G), Y = z(i, u);
-    s.glyphs = Yi.parse(Y.data, Y.offset, ee, s, e);
+    s.glyphs = qi.parse(Y.data, Y.offset, ee, s, e);
   } else if (h) {
     var U = z(i, h);
-    Ai.parse(U.data, U.offset, s, e);
+    Bi.parse(U.data, U.offset, s, e);
   } else
     throw new Error("Font doesn't contain TrueType or CFF outlines.");
   var N = z(i, y);
-  if (Oi.parse(s, N.data, N.offset, s.numberOfHMetrics, s.numGlyphs, s.glyphs, e), bc(s, e), v) {
+  if (Di.parse(s, N.data, N.offset, s.numberOfHMetrics, s.numGlyphs, s.glyphs, e), bc(s, e), v) {
     var F = z(i, v);
     s.kerningPairs = nd.parse(F.data, F.offset);
   } else
@@ -11270,7 +11272,7 @@ function od(n, e) {
   }
   if (m) {
     var X = z(i, m);
-    s.tables.gsub = Vi.parse(X.data, X.offset);
+    s.tables.gsub = Hi.parse(X.data, X.offset);
   }
   if (d) {
     var J = z(i, d);
@@ -11278,7 +11280,7 @@ function od(n, e) {
   }
   if (_) {
     var R = z(i, _);
-    s.tables.meta = Hi.parse(R.data, R.offset), s.metas = s.tables.meta;
+    s.tables.meta = ji.parse(R.data, R.offset), s.metas = s.tables.meta;
   }
   return s;
 }
@@ -11320,7 +11322,7 @@ function ad(n) {
     };
   })(od(n));
 }
-class ks extends ii {
+class ks extends oi {
   /**
    * Creates a new instance of MeshFont.
    * @param data - Either a MeshFontData object containing font information or an ArrayBuffer containing raw font data
@@ -11757,7 +11759,7 @@ class dd {
     }
   }
 }
-let W = class ro {
+let j = class so {
   /**
    * Creates a new Point instance.
    * @param x - The x-coordinate (defaults to 0)
@@ -11795,7 +11797,7 @@ let W = class ro {
    * @returns A new Point instance with the same x and y values
    */
   clone() {
-    return new ro(this.x, this.y);
+    return new so(this.x, this.y);
   }
   /**
    * Adds another point's coordinates to this point.
@@ -11900,18 +11902,18 @@ class Mt {
       }
       const s = 4 * Math.atan(Math.abs(this.bulge));
       this.radius = r / (2 * Math.sin(s / 2));
-      const i = this.start.clone().add(t.clone().divide(2)), o = new W(-t.y, t.x);
+      const i = this.start.clone().add(t.clone().divide(2)), o = new j(-t.y, t.x);
       o.normalize(), o.multiply(Math.abs(this.radius * Math.cos(s / 2))), this.center = i.clone(), this.isClockwise ? this.center.subtract(o) : this.center.add(o), this.startAngle = Math.atan2(this.start.y - this.center.y, this.start.x - this.center.x), this.endAngle = Math.atan2(this.end.y - this.center.y, this.end.x - this.center.x), this.isClockwise ? this.endAngle >= this.startAngle && (this.endAngle -= 2 * Math.PI) : this.endAngle <= this.startAngle && (this.endAngle += 2 * Math.PI);
     } else if (e.center && e.radius !== void 0 && e.startOctant !== void 0 && e.octantCount !== void 0 && e.isClockwise !== void 0) {
       this.center = e.center.clone(), this.radius = e.radius, this.isClockwise = e.isClockwise, this.startAngle = e.startOctant * Es;
       const t = (e.octantCount === 0 ? 8 : e.octantCount) * Es;
       this.endAngle = this.startAngle + (this.isClockwise ? -t : t), this.start = this.center.clone().add(
-        new W(
+        new j(
           this.radius * Math.cos(this.startAngle),
           this.radius * Math.sin(this.startAngle)
         )
       ), this.end = this.center.clone().add(
-        new W(this.radius * Math.cos(this.endAngle), this.radius * Math.sin(this.endAngle))
+        new j(this.radius * Math.cos(this.endAngle), this.radius * Math.sin(this.endAngle))
       );
     } else
       throw new Error("Invalid arc parameters");
@@ -11928,12 +11930,12 @@ class Mt {
     for (let i = 1; i < s; i++) {
       const o = i / s, a = this.isClockwise ? this.startAngle - o * r : this.startAngle + o * r;
       t.push(
-        this.center.clone().add(new W(this.radius * Math.cos(a), this.radius * Math.sin(a)))
+        this.center.clone().add(new j(this.radius * Math.cos(a), this.radius * Math.sin(a)))
       );
     }
     return t.push(
       this.end ? this.end.clone() : this.center.clone().add(
-        new W(
+        new j(
           this.radius * Math.cos(this.endAngle),
           this.radius * Math.sin(this.endAngle)
         )
@@ -11941,7 +11943,7 @@ class Mt {
     ), t;
   }
 }
-let Dn = class so {
+let Dn = class io {
   constructor(e, t = []) {
     this.lastPoint = e, this.polylines = t;
   }
@@ -11965,7 +11967,7 @@ let Dn = class so {
    */
   offset(e, t = !0) {
     var r, s;
-    return t ? new so(
+    return t ? new io(
       (r = this.lastPoint) == null ? void 0 : r.clone().add(e),
       this.polylines.map((i) => i.map((o) => o.clone().add(e)))
     ) : ((s = this.lastPoint) == null || s.add(e), this.polylines.forEach((i) => i.forEach((o) => o.add(e))), this);
@@ -12045,7 +12047,7 @@ let fd = class {
    */
   parseShape(n, e) {
     const t = {
-      currentPoint: new W(),
+      currentPoint: new j(),
       polylines: [],
       currentPolyline: [],
       sp: [],
@@ -12131,7 +12133,7 @@ let fd = class {
    * @returns Returns the vector for the given direction code
    */
   getVectorForDirection(n) {
-    const e = new W();
+    const e = new j();
     switch (n) {
       case 0:
         e.x = 1;
@@ -12202,13 +12204,13 @@ let fd = class {
   }
   handleXYDisplacement(n, e, t) {
     let r = e;
-    const s = new W();
+    const s = new j();
     return s.x = ne.byteToSByte(n[++r]), s.y = ne.byteToSByte(n[++r]), t.currentPoint.add(s.multiply(t.scale)), t.isPenDown && t.currentPolyline.push(t.currentPoint.clone()), r;
   }
   handleMultipleXYDisplacements(n, e, t) {
     let r = e;
     for (; ; ) {
-      const s = new W();
+      const s = new j();
       if (s.x = ne.byteToSByte(n[++r]), s.y = ne.byteToSByte(n[++r]), s.x === 0 && s.y === 0)
         break;
       t.currentPoint.add(s.multiply(t.scale)), t.isPenDown && t.currentPolyline.push(t.currentPoint.clone());
@@ -12220,7 +12222,7 @@ let fd = class {
     let s = e;
     const i = n[++s] * t.scale, o = ne.byteToSByte(n[++s]), a = (o & 112) >> 4;
     let c = o & 7;
-    const l = o < 0, h = Math.PI / 4 * a, d = t.currentPoint.clone().subtract(new W(Math.cos(h) * i, Math.sin(h) * i)), u = Mt.fromOctant(d, i, a, c, l);
+    const l = o < 0, h = Math.PI / 4 * a, d = t.currentPoint.clone().subtract(new j(Math.cos(h) * i, Math.sin(h) * i)), u = Mt.fromOctant(d, i, a, c, l);
     if (t.isPenDown) {
       const p = u.tessellate();
       t.currentPolyline.pop(), t.currentPolyline.push(...p.slice());
@@ -12237,29 +12239,29 @@ let fd = class {
     l < 0 && (f = -f, p = -p, m = -1);
     let y = u * h, v = y + p;
     y += u * s / 256 * m, v += u * i / 256 * m;
-    const S = t.currentPoint.clone().subtract(new W(c * Math.cos(y), c * Math.sin(y)));
-    if (t.currentPoint = S.clone().add(new W(c * Math.cos(v), c * Math.sin(v))), t.isPenDown) {
+    const S = t.currentPoint.clone().subtract(new j(c * Math.cos(y), c * Math.sin(y)));
+    if (t.currentPoint = S.clone().add(new j(c * Math.cos(v), c * Math.sin(v))), t.isPenDown) {
       let x = y;
       const _ = [];
       if (_.push(
-        S.clone().add(new W(c * Math.cos(x), c * Math.sin(x)))
+        S.clone().add(new j(c * Math.cos(x), c * Math.sin(x)))
       ), f > 0)
         for (; x + f < v; )
           x += f, _.push(
-            S.clone().add(new W(c * Math.cos(x), c * Math.sin(x)))
+            S.clone().add(new j(c * Math.cos(x), c * Math.sin(x)))
           );
       else
         for (; x + f > v; )
           x += f, _.push(
-            S.clone().add(new W(c * Math.cos(x), c * Math.sin(x)))
+            S.clone().add(new j(c * Math.cos(x), c * Math.sin(x)))
           );
-      _.push(S.clone().add(new W(c * Math.cos(v), c * Math.sin(v)))), t.currentPolyline.push(..._);
+      _.push(S.clone().add(new j(c * Math.cos(v), c * Math.sin(v)))), t.currentPolyline.push(..._);
     }
     return r;
   }
   handleBulgeArc(n, e, t) {
     let r = e;
-    const s = new W();
+    const s = new j();
     s.x = ne.byteToSByte(n[++r]), s.y = ne.byteToSByte(n[++r]);
     const i = ne.byteToSByte(n[++r]);
     return t.currentPoint = this.handleArcSegment(
@@ -12274,7 +12276,7 @@ let fd = class {
   handleMultipleBulgeArcs(n, e, t) {
     let r = e;
     for (; ; ) {
-      const s = new W();
+      const s = new j();
       if (s.x = ne.byteToSByte(n[++r]), s.y = ne.byteToSByte(n[++r]), s.x === 0 && s.y === 0)
         break;
       const i = ne.byteToSByte(n[++r]);
@@ -12430,7 +12432,7 @@ class gd {
     this.shapeParser.release();
   }
 }
-class wr extends oi {
+class wr extends ai {
   /**
    * Creates a new instance of ShxTextShape
    * @param char - The character this shape represents
@@ -12468,7 +12470,7 @@ class wr extends oi {
     return e;
   }
 }
-class As extends ii {
+class As extends oi {
   constructor(e) {
     super(), this.type = "shx", this.font = new gd(e), this.data = this.font.fontData;
   }
@@ -12495,7 +12497,7 @@ class As extends ii {
         s += t, this.addUnsupportedChar(o);
         continue;
       }
-      r.push(a.offset(new W(s, 0))), s += a.width;
+      r.push(a.offset(new j(s, 0))), s += a.width;
     }
     return r;
   }
@@ -12727,7 +12729,7 @@ class he {
    * @param url - The URL of the font file to load
    */
   async loadFont(e) {
-    const t = li(e);
+    const t = hi(e);
     if (!t)
       throw new Error(`Invalid font url: ${e}`);
     const r = Pr(e).toLowerCase(), s = await Tn.instance.get(r);
@@ -14577,7 +14579,7 @@ class Cd {
     return this.pointsSameX(e, t) ? this.pointsSameY(e, t) ? 0 : e[1] < t[1] ? -1 : 1 : e[0] < t[0] ? -1 : 1;
   }
 }
-class io extends Cd {
+class oo extends Cd {
   constructor(e = 1e-10) {
     super(), this.epsilon = e;
   }
@@ -14973,7 +14975,7 @@ class kd {
     this.push("done", null);
   }
 }
-class oo {
+class ao {
   constructor(e) {
     this.log = null, this.geo = e;
   }
@@ -15060,7 +15062,7 @@ class oo {
     return this.polygon(o);
   }
 }
-new oo(new io());
+new ao(new oo());
 class dn extends g.Object3D {
   /**
    * Flatten the hierarchy of the specified object so that all children are moved to be direct
@@ -17045,7 +17047,7 @@ class Od extends g.Group {
     return t;
   }
 }
-class ao extends dn {
+class co extends dn {
   constructor(e) {
     super(), this._styleManager = e;
   }
@@ -17059,7 +17061,7 @@ class ao extends dn {
     return this._styleManager = e._styleManager, super.copy(e, t);
   }
 }
-class ge extends ao {
+class ge extends co {
   constructor(e) {
     super(e), this._objectId = "", this._ownerId = "", this._layerName = "", this._box = new g.Box3();
   }
@@ -17505,7 +17507,7 @@ class zd extends ge {
         try {
           p.forEach((y, v) => {
             m = Math.min(e[y][0].relativeEps(), 1e-6);
-            const S = new oo(new io(m));
+            const S = new ao(new oo(m));
             if (v === 0)
               f = S.segments({
                 regions: [a(e[y])],
@@ -17553,7 +17555,7 @@ class zd extends ge {
       const c = [];
       for (let l = i + 1; l < r; l++) {
         const h = e[t[l]];
-        fo.isPolygonIntersect(
+        go.isPolygonIntersect(
           o,
           h
         ) && (a = !0, c.push(t[l]));
@@ -18012,12 +18014,12 @@ const nn = class xt {
   }
 };
 nn.CameraZoomUniform = { value: 1 }, nn.ViewportScaleUniform = { value: 1 }, nn.MaxFragmentUniforms = 1024;
-let Wd = nn;
-class jd {
+let jd = nn;
+class Wd {
   constructor(e) {
     this.events = {
       fontNotFound: new te()
-    }, this._renderer = e, this._styleManager = new Wd(), he.instance.events.fontNotFound.addEventListener((t) => {
+    }, this._renderer = e, this._styleManager = new jd(), he.instance.events.fontNotFound.addEventListener((t) => {
       this.events.fontNotFound.dispatch(t);
     });
   }
@@ -18109,7 +18111,7 @@ class jd {
    * Create one empty drawable object
    */
   createObject() {
-    return new ao(this._styleManager);
+    return new co(this._styleManager);
   }
   /**
    * Create one empty entity
@@ -18281,7 +18283,7 @@ class Xd {
     );
   }
 }
-class co {
+class lo {
   /**
    * Construct one instance of this class
    * @param renderer Input renderer
@@ -18386,9 +18388,9 @@ class co {
     ), this._raycaster.params.Line.threshold = t, this._raycaster.params.Points.threshold = t, this._raycaster;
   }
   zoomTo(e, t = 1.1) {
-    const r = new Wn();
+    const r = new jn();
     e.getSize(r);
-    const s = new Wn();
+    const s = new jn();
     e.getCenter(s);
     const i = new g.Vector3(s.x, s.y, 0);
     this._camera.position.set(s.x, s.y, this._camera.position.z), this._camera.lookAt(i), this._camera.setRotationFromEuler(new g.Euler(0, 0, 0));
@@ -18420,7 +18422,7 @@ class co {
     }, e.update(), e;
   }
 }
-class fn extends co {
+class fn extends lo {
   /**
    * Calcuate the bounding box of this viewport in client window coordinate system
    */
@@ -18478,7 +18480,7 @@ class fn extends co {
     }
   }
 }
-const $d = (n) => new js(n.min, n.max), Yd = (n) => new ue(
+const $d = (n) => new Xs(n.min, n.max), Yd = (n) => new ue(
   n.min,
   n.max
 ), qd = (n) => new g.Box3(
@@ -18667,7 +18669,7 @@ class sp extends tp {
     this.axes.geometry.dispose(), this.axes.material.dispose(), this.xText.geometry.dispose(), this.xText.material.dispose(), this.yText.geometry.dispose(), this.yText.material.dispose(), this.hasZAxis && ((e = this.zText) == null || e.geometry.dispose(), (t = this.zText) == null || t.material.dispose());
   }
 }
-class ip extends co {
+class ip extends lo {
   /**
    * Construct one instance of this class.
    *
@@ -18875,11 +18877,11 @@ class op {
     (t = this.activeLayoutView) == null || t.render(e);
   }
 }
-function lo(n, e, t = 0, r = n.length - 1, s = ap) {
+function ho(n, e, t = 0, r = n.length - 1, s = ap) {
   for (; r > t; ) {
     if (r - t > 600) {
       const c = r - t + 1, l = e - t + 1, h = Math.log(c), d = 0.5 * Math.exp(2 * h / 3), u = 0.5 * Math.sqrt(h * d * (c - d) / c) * (l - c / 2 < 0 ? -1 : 1), p = Math.max(t, Math.floor(e - l * d / c + u)), f = Math.min(r, Math.floor(e + (c - l) * d / c + u));
-      lo(n, e, p, f, s);
+      ho(n, e, p, f, s);
     }
     const i = n[e];
     let o = t, a = r;
@@ -19140,7 +19142,7 @@ function Ns(n, e, t, r, s) {
   for (; i.length; ) {
     if (t = i.pop(), e = i.pop(), t - e <= r) continue;
     const o = e + Math.ceil((t - e) / r / 2) * r;
-    lo(n, o, e, t, s), i.push(e, o, o, t);
+    ho(n, o, e, t, s), i.push(e, o, o, t);
   }
 }
 class fp {
@@ -19719,7 +19721,7 @@ class yp extends ca {
       alpha: !0,
       canvas: e.canvas
     });
-    t.canvas == null && (t.canvas = r.domElement), super(t.canvas), e.calculateSizeCallback && this.setCalculateSizeCallback(e.calculateSizeCallback), r.setPixelRatio(Math.min(window.devicePixelRatio, 2)), r.setSize(this.width, this.height), this._renderer = new jd(r);
+    t.canvas == null && (t.canvas = r.domElement), super(t.canvas), e.calculateSizeCallback && this.setCalculateSizeCallback(e.calculateSizeCallback), r.setPixelRatio(Math.min(window.devicePixelRatio, 2)), r.setSize(this.width, this.height), this._renderer = new Wd(r);
     const s = Tt.instance.fontMapping;
     this._renderer.setFontMapping(s), this._renderer.events.fontNotFound.addEventListener((i) => {
       Ue.emit("font-not-found", {
@@ -19732,9 +19734,9 @@ class yp extends ca {
       this.mode == De.SELECTION && this.select();
     }), document.addEventListener("keydown", (i) => {
       i.code === "Escape" && this.selectionSet.clear();
-    }), Xs().layoutManager.events.layoutSwitched.addEventListener(
+    }), $s().layoutManager.events.layoutSwitched.addEventListener(
       (i) => {
-        this.activeLayoutBtrId = i.newLayout.blockTableRecordId;
+        this.activeLayoutBtrId = i.layout.blockTableRecordId;
       }
     ), this._missedImages = /* @__PURE__ */ new Map(), this._layoutViewManager = new op(), this.initialize(), this.onWindowResize(), this.animate(), this._isDirty = !0;
   }
@@ -19935,27 +19937,34 @@ class yp extends ca {
    * @inheritdoc
    */
   addEntity(e) {
-    const t = this.createLayoutViewIfNeeded(e.ownerId);
-    let r = e.draw(
-      this._renderer
-    );
-    if (r) {
-      r.objectId = e.objectId, r.ownerId = e.ownerId, r.layerName = e.layer, r.visible = e.visibility;
-      const s = !(e instanceof qs || e instanceof Zs);
-      this._scene.addEntity(r, s), this._isDirty = !0, r.dispose(), r = null;
-    }
-    if (e instanceof $s) {
-      if (e.number > 1) {
-        const s = new fn(
-          t,
-          e.toGiViewport(),
-          this._renderer
-        );
-        t.addViewport(s);
+    let t = [];
+    Array.isArray(e) ? t = e : t.push(e);
+    for (let r = 0; r < t.length; ++r) {
+      const s = t[r];
+      let i = s.draw(
+        this._renderer
+      );
+      if (i) {
+        i.objectId = s.objectId, i.ownerId = s.ownerId, i.layerName = s.layer, i.visible = s.visibility;
+        const o = !(s instanceof Zs || s instanceof Qs);
+        this._scene.addEntity(i, o), this._isDirty = !0, i.dispose(), i = null;
+      }
+      if (s instanceof Ys) {
+        if (s.number > 1) {
+          const o = this._layoutViewManager.getAt(s.ownerId);
+          if (o) {
+            const a = new fn(
+              o,
+              s.toGiViewport(),
+              this._renderer
+            );
+            o.addViewport(a);
+          }
+        }
+      } else if (s instanceof qs) {
+        const o = s.imageFileName;
+        o && this._missedImages.set(s.objectId, o);
       }
-    } else if (e instanceof Ys) {
-      const s = e.imageFileName;
-      s && this._missedImages.set(e.objectId, s);
     }
   }
   /**
@@ -19969,10 +19978,21 @@ class yp extends ca {
    * @inheritdoc
    */
   updateEntity(e) {
-    const t = e.draw(this._renderer);
-    return t && (t.objectId = e.objectId, t.ownerId = e.ownerId, t.layerName = e.layer, t.visible = e.visibility, this._scene.update(t), this._isDirty = !0, setTimeout(() => {
+    let t = [];
+    Array.isArray(e) ? t = e : t.push(e);
+    for (let r = 0; r < t.length; ++r) {
+      const s = t[r], i = s.draw(this._renderer);
+      i && (i.objectId = s.objectId, i.ownerId = s.ownerId, i.layerName = s.layer, i.visible = s.visibility, this._scene.update(i));
+    }
+    this._isDirty = !0, setTimeout(() => {
       this._isDirty = !0;
-    }, 100)), t;
+    }, 100);
+  }
+  /**
+   * @inheritdoc
+   */
+  addLayout(e) {
+    this._scene.addEmptyLayout(e.blockTableRecordId), this.createLayoutViewIfNeeded(e.blockTableRecordId);
   }
   /**
    * @inheritdoc
@@ -20078,7 +20098,7 @@ class it {
   createExampleDoc1(e) {
     for (let s = 0; s < 2; ++s)
       for (let i = 0; i < 2; ++i) {
-        const o = new jn(), a = new Qs();
+        const o = new Wn(), a = new Js();
         a.addVertexAt(0, { x: i * 100, y: s * 100, bulge: 1 }), a.addVertexAt(1, { x: i * 100 + 100, y: s * 100, bulge: 1 }), a.closed = !0, o.add(a), e.tables.blockTable.modelSpace.appendEntity(o);
       }
   }
@@ -20108,7 +20128,7 @@ class it {
     const t = e.tables.blockTable.modelSpace;
     t.appendEntity(this.createArc()), this.createLines().forEach((s) => {
       e.tables.blockTable.modelSpace.appendEntity(
-        new Js(s.startPoint, s.endPoint)
+        new Ks(s.startPoint, s.endPoint)
       );
     }), t.appendEntity(this.createHatch()), e.tables.textStyleTable.add(this.createTextStyle()), t.appendEntity(this.createMText());
   }
@@ -20126,16 +20146,16 @@ class it {
       textGenerationFlag: 0,
       widthFactor: 0.667
     };
-    return new Ks(e);
+    return new ei(e);
   }
   createMText() {
-    const e = new ei();
-    return e.attachmentPoint = go.MiddleLeft, e.color = new lr().setColorName("red"), e.layer = "0", e.location = new Xn(9850, 86773, 0), e.contents = "{\\W0.667;\\T1.1;智慧8081}", e.height = 200, e.width = 1e3, e.styleName = "Standard", e;
+    const e = new ti();
+    return e.attachmentPoint = mo.MiddleLeft, e.color = new lr().setColorName("red"), e.layer = "0", e.location = new Xn(9850, 86773, 0), e.contents = "{\\W0.667;\\T1.1;智慧8081}", e.height = 200, e.width = 1e3, e.styleName = "Standard", e;
   }
   createHatch() {
-    const e = this.createLines(), t = new jn(), r = new ti();
+    const e = this.createLines(), t = new Wn(), r = new ni();
     return r.add(
-      new ni(
+      new ri(
         { x: 20241.23355899991, y: 174118.6312674369 },
         89258.30757455899,
         vt.degToRad(262.2471115358437),
@@ -20143,11 +20163,11 @@ class it {
         !1
       )
     ), e.forEach((s) => {
-      r.add(new ri(s.startPoint, s.endPoint));
+      r.add(new si(s.startPoint, s.endPoint));
     }), t.add(r), t;
   }
   createArc() {
-    return new si(
+    return new ii(
       { x: 20241.23355899991, y: 174118.6312674369, z: 0 },
       89258.30757455899,
       vt.degToRad(262.2471115358437),
@@ -20307,7 +20327,7 @@ class ce {
       width: window.innerWidth,
       height: window.innerHeight - 30
     }), s = new yp({ canvas: e, calculateSizeCallback: r });
-    this._context = new Zo(s, t), this._fontLoader = new vp(s.renderer), Xs().workingDatabase = t.database, this.registerCommands();
+    this._context = new Zo(s, t), this._fontLoader = new vp(s.renderer), $s().workingDatabase = t.database, this.registerCommands();
   }
   /**
    * Creates the singleton instance with an optional canvas element.
@@ -20641,7 +20661,7 @@ class Hs {
     return e.type == "ARC" ? this.convertArc(e) : e.type == "CIRCLE" ? this.convertCirle(e) : e.type == "DIMENSION" ? this.convertDimension(e) : e.type == "ELLIPSE" ? this.convertEllipse(e) : e.type == "HATCH" ? this.convertHatch(e) : e.type == "IMAGE" ? this.convertImage(e) : e.type == "LEADER" ? this.convertLeader(e) : e.type == "LINE" ? this.convertLine(e) : e.type == "LWPOLYLINE" ? this.convertLWPolyline(e) : e.type == "MTEXT" ? this.convertMText(e) : e.type == "POINT" ? this.convertPoint(e) : e.type == "POLYLINE" ? this.convertPolyline(e) : e.type == "RAY" ? this.convertRay(e) : e.type == "SPLINE" ? this.convertSpline(e) : e.type == "ACAD_TABLE" ? this.convertTable(e) : e.type == "TEXT" ? this.convertText(e) : e.type == "SOLID" ? this.convertSolid(e) : e.type == "VIEWPORT" ? this.convertViewport(e) : e.type == "XLINE" ? this.convertXline(e) : e.type == "INSERT" ? this.convertBlockReference(e) : null;
   }
   convertArc(e) {
-    return new si(
+    return new ii(
       e.center,
       e.radius,
       e.startAngle,
@@ -20665,7 +20685,7 @@ class Hs {
   }
   convertLine(e) {
     const t = e.startPoint, r = e.endPoint;
-    return new Js(
+    return new Ks(
       new Xn(t.x, t.y, t.z),
       new Xn(r.x, r.y, r.z)
     );
@@ -20721,7 +20741,7 @@ class Hs {
   }
   convertHatch(e) {
     var t;
-    const r = new jn();
+    const r = new Wn();
     return (t = e.definitionLines) == null || t.forEach((s) => {
       r.definitionLines.push({
         angle: s.angle,
@@ -20731,7 +20751,7 @@ class Hs {
       });
     }), r.hatchStyle = e.hatchStyle, r.patternName = e.patternName, r.patternType = e.patternType, r.patternAngle = e.patternAngle == null ? 0 : e.patternAngle, r.patternScale = e.patternScale == null ? 0 : e.patternScale, e.boundaryPaths.forEach((s) => {
       if (s.boundaryPathTypeFlag & 2) {
-        const i = s, o = new Qs();
+        const i = s, o = new Js();
         o.closed = i.isClosed, i.vertices.forEach((a, c) => {
           o.addVertexAt(c, {
             x: a.x,
@@ -20740,15 +20760,15 @@ class Hs {
           });
         }), r.add(o);
       } else {
-        const i = s, o = new ti();
+        const i = s, o = new ni();
         i.edges.forEach((a) => {
           if (a.type == 1) {
             const c = a;
-            o.add(new ri(c.start, c.end));
+            o.add(new si(c.start, c.end));
           } else if (a.type == 2) {
             const c = a;
             o.add(
-              new ni(
+              new ri(
                 c.center,
                 c.radius,
                 c.startAngle,
@@ -20758,7 +20778,7 @@ class Hs {
             );
           } else if (a.type == 3) {
             const c = a;
-            new Wn().subVectors(c.end, c.center);
+            new jn().subVectors(c.end, c.center);
             const l = Math.sqrt(
               Math.pow(c.end.x, 2) + Math.pow(c.end.y, 2)
             ), h = l * c.lengthOfMinorAxis;
@@ -20826,7 +20846,7 @@ class Hs {
     return t.textString = e.text, t.styleName = e.styleName, t.height = e.textHeight, t.position.copy(e.startPoint), t.rotation = e.rotation, t.oblique = e.obliqueAngle ?? 0, t.thickness = e.thickness, t.horizontalMode = e.halign, t.verticalMode = e.valign, t.widthFactor = e.xScale ?? 1, t;
   }
   convertMText(e) {
-    const t = new ei();
+    const t = new ti();
     return t.contents = e.text, e.styleName != null && (t.styleName = e.styleName), t.height = e.textHeight, t.width = e.rectWidth, t.rotation = e.rotation || 0, t.location = e.insertionPoint, t.attachmentPoint = e.attachmentPoint, e.direction && (t.direction = new Kt(e.direction)), t.drawingDirection = e.drawingDirection, t;
   }
   convertLeader(e) {
@@ -20884,7 +20904,7 @@ class Hs {
     ) * e.imageSize.y, t.rotation = Math.atan2(e.uPixel.y, e.uPixel.x);
   }
   convertImage(e) {
-    const t = new Ys();
+    const t = new qs();
     return this.processImage(e, t), t;
   }
   // private convertWipeout(wipeout: WipeoutEntity) {
@@ -20893,15 +20913,15 @@ class Hs {
   //   return dbWipeout
   // }
   convertViewport(e) {
-    const t = new $s();
+    const t = new Ys();
     return t.number = e.viewportId, t.centerPoint.copy(e.viewportCenter), t.height = e.height, t.width = e.width, t.viewCenter.copy(e.displayCenter), t.viewHeight = e.viewHeight, t;
   }
   convertRay(e) {
-    const t = new qs();
+    const t = new Zs();
     return t.basePoint.copy(e.firstPoint), t.unitDir.copy(e.unitDirection), t;
   }
   convertXline(e) {
-    const t = new Zs();
+    const t = new Qs();
     return t.basePoint.copy(e.firstPoint), t.unitDir.copy(e.unitDirection), t;
   }
   convertBlockReference(e) {
@@ -20915,13 +20935,13 @@ class Hs {
     t.layer = e.layer, t.objectId = e.handle.toString(), t.ownerId = e.ownerBlockRecordSoftId.toString(), e.lineType != null && (t.lineType = e.lineType), e.lineweight != null && (t.lineWeight = e.lineweight), e.lineTypeScale != null && (t.linetypeScale = e.lineTypeScale), e.color != null && (t.color.color = e.color), e.colorIndex != null && (t.color.colorIndex = e.colorIndex), e.colorName != null && (t.color.colorName = e.colorName), e.isVisible != null && (t.visibility = e.isVisible), e.transparency != null && (t.transparency = e.transparency);
   }
 }
-class bp extends mo {
+class bp extends yo {
   constructor(e = {}) {
     super(e), e.useWorker = !0, e.parserWorkerUrl || (e.parserWorkerUrl = "/assets/libredwg-parser-worker.js");
   }
   async parse(e) {
     if (this.config.useWorker && this.config.parserWorkerUrl)
-      return (await yo({ workerUrl: this.config.parserWorkerUrl }).execute(e)).data;
+      return (await vo({ workerUrl: this.config.parserWorkerUrl }).execute(e)).data;
     throw new Error("dwg converter can run in web worker only!");
   }
   /**
@@ -20978,13 +20998,13 @@ class bp extends mo {
         standardFlag: r.standardFlag,
         totalPatternLength: r.totalPatternLength,
         pattern: r.pattern
-      }, i = new vo(s);
+      }, i = new bo(s);
       this.processCommonTableEntryAttrs(r, i), i.name = r.name, t.tables.linetypeTable.add(i);
     });
   }
   processTextStyles(e, t) {
     e.tables.STYLE.entries.forEach((r) => {
-      const s = new Ks(r);
+      const s = new ei(r);
       this.processCommonTableEntryAttrs(r, s), t.tables.textStyleTable.add(s);
     });
   }
@@ -21064,7 +21084,7 @@ class bp extends mo {
         // TODO: Set correct value
         dimlwd: r.DIMLWD,
         dimlwe: r.DIMLWE
-      }, i = new bo(s);
+      }, i = new xo(s);
       this.processCommonTableEntryAttrs(r, i), t.tables.dimStyleTable.add(i);
     });
   }
@@ -21072,7 +21092,7 @@ class bp extends mo {
     e.tables.LAYER.entries.forEach((r) => {
       const s = new lr();
       s.colorIndex = r.colorIndex;
-      const i = new xo({
+      const i = new So({
         name: r.name,
         standardFlags: r.standardFlag,
         linetype: r.lineType,
@@ -21086,24 +21106,25 @@ class bp extends mo {
   }
   processViewports(e, t) {
     e.tables.VPORT.entries.forEach((r) => {
-      const s = new So();
+      const s = new wo();
       this.processCommonTableEntryAttrs(r, s), r.circleSides && (s.circleSides = r.circleSides), s.standardFlag = r.standardFlag, s.center.copy(r.center), s.lowerLeftCorner.copy(r.lowerLeftCorner), s.upperRightCorner.copy(r.upperRightCorner), r.snapBasePoint && s.snapBase.copy(r.snapBasePoint), r.snapRotationAngle && (s.snapAngle = r.snapRotationAngle), r.snapSpacing && s.snapIncrements.copy(r.snapSpacing), r.majorGridLines && (s.gridMajor = r.majorGridLines), r.gridSpacing && s.gridIncrements.copy(r.gridSpacing), r.backgroundObjectId && (s.backgroundObjectId = r.backgroundObjectId), s.gsView.center.copy(r.center), s.gsView.viewDirectionFromTarget.copy(r.viewDirectionFromTarget), s.gsView.viewTarget.copy(r.viewTarget), r.lensLength && (s.gsView.lensLength = r.lensLength), r.frontClippingPlane && (s.gsView.frontClippingPlane = r.frontClippingPlane), r.backClippingPlane && (s.gsView.backClippingPlane = r.backClippingPlane), r.viewHeight && (s.gsView.viewHeight = r.viewHeight), r.viewTwistAngle && (s.gsView.viewTwistAngle = r.viewTwistAngle), r.frozenLayers && (s.gsView.frozenLayers = r.frozenLayers), r.styleSheet && (s.gsView.styleSheet = r.styleSheet), r.renderMode && (s.gsView.renderMode = r.renderMode), r.viewMode && (s.gsView.viewMode = r.viewMode), r.ucsIconSetting && (s.gsView.ucsIconSetting = r.ucsIconSetting), r.ucsOrigin && s.gsView.ucsOrigin.copy(r.ucsOrigin), r.ucsXAxis && s.gsView.ucsXAxis.copy(r.ucsXAxis), r.ucsYAxis && s.gsView.ucsYAxis.copy(r.ucsYAxis), r.orthographicType && (s.gsView.orthographicType = r.orthographicType), r.shadePlotSetting && (s.gsView.shadePlotSetting = r.shadePlotSetting), r.shadePlotObjectId && (s.gsView.shadePlotObjectId = r.shadePlotObjectId), r.visualStyleObjectId && (s.gsView.visualStyleObjectId = r.visualStyleObjectId), r.isDefaultLightingOn && (s.gsView.isDefaultLightingOn = r.isDefaultLightingOn), r.defaultLightingType && (s.gsView.defaultLightingType = r.defaultLightingType), r.brightness && (s.gsView.brightness = r.brightness), r.contrast && (s.gsView.contrast = r.contrast), r.ambientColor && (s.gsView.ambientColor = r.ambientColor), t.tables.viewportTable.add(s);
     });
   }
   processBlockTables(e, t) {
     e.tables.BLOCK_RECORD.entries.forEach((r) => {
       let s = t.tables.blockTable.getAt(r.name);
-      s || (s = new wo(), s.objectId = r.handle.toString(), s.name = r.name, t.tables.blockTable.add(s)), !s.isModelSapce && !s.isPaperSapce && r.entities && r.entities.length > 0 && this.processEntitiesInBlock(r.entities, s);
+      s || (s = new _o(), s.objectId = r.handle.toString(), s.name = r.name, s.ownerId = r.ownerHandle.toString(), s.origin.copy(r.basePoint), s.layoutId = r.layout.toString(), t.tables.blockTable.add(s)), !s.isModelSapce && !s.isPaperSapce && r.entities && r.entities.length > 0 && this.processEntitiesInBlock(r.entities, s);
     });
   }
   processBlocks(e, t) {
   }
   async processEntitiesInBlock(e, t) {
-    const r = new Hs(), s = e.length;
-    for (let i = 0; i < s; i++) {
-      const o = e[i], a = r.convert(o);
-      a && t.appendEntity(a);
+    const r = new Hs(), s = e.length, i = [];
+    for (let o = 0; o < s; o++) {
+      const a = e[o], c = r.convert(a);
+      c && i.push(c);
     }
+    t.appendEntity(i);
   }
   /**
    * Breaks up the work into smaller chunks that are executed asynchronously. This is often referred to
@@ -21111,19 +21132,20 @@ class bp extends mo {
    * smaller pieces and executed in small intervals to allow the UI to remain responsive.
    */
   async processEntities(e, t, r, s, i) {
-    const o = new Hs(), a = e.entities, c = a.length, l = new _o(
+    const o = new Hs(), a = e.entities, c = a.length, l = new To(
       c,
       100 - s.value,
       r
     ), h = t.tables.blockTable.modelSpace;
     await l.processChunk(async (d, u) => {
-      for (let p = d; p < u; p++) {
-        const f = a[p], m = o.convert(f);
-        m && h.appendEntity(m);
+      const p = [];
+      for (let f = d; f < u; f++) {
+        const m = a[f], y = o.convert(m);
+        y && p.push(y);
       }
-      if (i) {
-        let p = s.value + u / c * (100 - s.value);
-        p > 100 && (p = 100), await i(p, "ENTITY", "IN-PROGRESS");
+      if (h.appendEntity(p), i) {
+        let f = s.value + u / c * (100 - s.value);
+        f > 100 && (f = 100), await i(f, "ENTITY", "IN-PROGRESS");
       }
     });
   }
@@ -21140,8 +21162,16 @@ class bp extends mo {
   processLayouts(e, t) {
     const r = t.dictionaries.layouts;
     e.objects.LAYOUT.forEach((s) => {
-      const i = new To();
-      i.layoutName = s.layoutName, i.tabOrder = s.tabOrder, i.blockTableRecordId = s.ownerHandle.toString(), i.limits.min.copy(s.minLimit), i.limits.max.copy(s.maxLimit), i.extents.min.copy(s.minExtent), i.extents.max.copy(s.maxExtent), this.processCommonObjectAttrs(s, i), r.setAt(i.layoutName, i);
+      const i = new Ws();
+      i.layoutName = s.layoutName, i.tabOrder = s.tabOrder;
+      const o = t.tables.blockTable.newIterator();
+      i.objectId = s.handle.toString();
+      for (const a of o)
+        if (a.layoutId === i.objectId) {
+          i.blockTableRecordId = a.objectId;
+          break;
+        }
+      i.limits.min.copy(s.minLimit), i.limits.max.copy(s.maxLimit), i.extents.min.copy(s.minExtent), i.extents.max.copy(s.maxExtent), this.processCommonObjectAttrs(s, i), r.setAt(i.layoutName, i);
     });
   }
   processImageDefs(e, t) {
@@ -21182,7 +21212,7 @@ const xp = {
   isShowToolbar: !0,
   isShowStats: !1,
   fontMapping: {}
-}, Ws = "settings";
+}, js = "settings";
 class Tt {
   constructor() {
     this.events = {
@@ -21217,7 +21247,7 @@ class Tt {
    */
   set(e, t) {
     const r = this.settings;
-    r[e] = t, localStorage.setItem(Ws, JSON.stringify(r)), this.events.modified.dispatch({
+    r[e] = t, localStorage.setItem(js, JSON.stringify(r)), this.events.modified.dispatch({
       key: e,
       value: t
     });
@@ -21372,7 +21402,7 @@ class Tt {
    * @returns The current settings object
    */
   get settings() {
-    const e = localStorage.getItem(Ws), t = e == null ? {} : JSON.parse(e);
+    const e = localStorage.getItem(js), t = e == null ? {} : JSON.parse(e);
     return Ho(t, xp);
   }
 }