@mlightcad/mtext-renderer 0.10.10 → 0.10.12

package/dist/index.js

@@ -10297,7 +10297,7 @@ class rl {
     }
   }
 }
-class te {
+class re {
   /**
    * Creates a new Point instance.
    * @param x - The x-coordinate (defaults to 0)
@@ -10335,7 +10335,7 @@ class te {
    * @returns A new Point instance with the same x and y values
    */
   clone() {
-    return new te(this.x, this.y);
+    return new re(this.x, this.y);
   }
   /**
    * Adds another point's coordinates to this point.
@@ -10440,18 +10440,18 @@ class Bt {
       }
       const a = 4 * Math.atan(Math.abs(this.bulge));
       this.radius = n / (2 * Math.sin(a / 2));
-      const i = this.start.clone().add(r.clone().divide(2)), s = new te(-r.y, r.x);
+      const i = this.start.clone().add(r.clone().divide(2)), s = new re(-r.y, r.x);
       s.normalize(), s.multiply(Math.abs(this.radius * Math.cos(a / 2))), this.center = i.clone(), this.isClockwise ? this.center.subtract(s) : this.center.add(s), 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 * Ta;
       const r = (e.octantCount === 0 ? 8 : e.octantCount) * Ta;
       this.endAngle = this.startAngle + (this.isClockwise ? -r : r), this.start = this.center.clone().add(
-        new te(
+        new re(
           this.radius * Math.cos(this.startAngle),
           this.radius * Math.sin(this.startAngle)
         )
       ), this.end = this.center.clone().add(
-        new te(this.radius * Math.cos(this.endAngle), this.radius * Math.sin(this.endAngle))
+        new re(this.radius * Math.cos(this.endAngle), this.radius * Math.sin(this.endAngle))
       );
     } else
       throw new Error("Invalid arc parameters");
@@ -10468,12 +10468,12 @@ class Bt {
     for (let i = 1; i < a; i++) {
       const s = i / a, o = this.isClockwise ? this.startAngle - s * n : this.startAngle + s * n;
       r.push(
-        this.center.clone().add(new te(this.radius * Math.cos(o), this.radius * Math.sin(o)))
+        this.center.clone().add(new re(this.radius * Math.cos(o), this.radius * Math.sin(o)))
       );
     }
     return r.push(
       this.end ? this.end.clone() : this.center.clone().add(
-        new te(
+        new re(
           this.radius * Math.cos(this.endAngle),
           this.radius * Math.sin(this.endAngle)
         )
@@ -10520,7 +10520,7 @@ class Tt {
    */
   normalizeToOrigin(e = !1) {
     const r = this.bbox;
-    return this.offset(new te(-r.minX, -r.minY), e);
+    return this.offset(new re(-r.minX, -r.minY), e);
   }
   /**
    * Converts the shape to an SVG string
@@ -10639,7 +10639,7 @@ class al {
    */
   parseShape(e) {
     const r = {
-      currentPoint: new te(),
+      currentPoint: new re(),
       polylines: [],
       currentPolyline: [],
       sp: [],
@@ -10725,7 +10725,7 @@ class al {
    * @returns Returns the vector for the given direction code
    */
   getVectorForDirection(e) {
-    const r = new te();
+    const r = new re();
     switch (e) {
       case 0:
         r.x = 1;
@@ -10796,13 +10796,13 @@ class al {
   }
   handleXYDisplacement(e, r, n) {
     let a = r;
-    const i = new te();
+    const i = new re();
     return i.x = ge.byteToSByte(e[++a]), i.y = ge.byteToSByte(e[++a]), n.currentPoint.add(i.multiply(n.scale)), n.isPenDown && n.currentPolyline.push(n.currentPoint.clone()), a;
   }
   handleMultipleXYDisplacements(e, r, n) {
     let a = r;
     for (; ; ) {
-      const i = new te();
+      const i = new re();
       if (i.x = ge.byteToSByte(e[++a]), i.y = ge.byteToSByte(e[++a]), i.x === 0 && i.y === 0)
         break;
       n.currentPoint.add(i.multiply(n.scale)), n.isPenDown && n.currentPolyline.push(n.currentPoint.clone());
@@ -10814,7 +10814,7 @@ class al {
     let i = r;
     const s = e[++i] * n.scale, o = ge.byteToSByte(e[++i]), c = (o & 112) >> 4;
     let u = o & 7;
-    const h = o < 0, p = Math.PI / 4 * c, l = n.currentPoint.clone().subtract(new te(Math.cos(p) * s, Math.sin(p) * s)), g = Bt.fromOctant(l, s, c, u, h);
+    const h = o < 0, p = Math.PI / 4 * c, l = n.currentPoint.clone().subtract(new re(Math.cos(p) * s, Math.sin(p) * s)), g = Bt.fromOctant(l, s, c, u, h);
     if (n.isPenDown) {
       const x = g.tessellate();
       n.currentPolyline.pop(), n.currentPolyline.push(...x.slice());
@@ -10831,29 +10831,29 @@ class al {
     h < 0 && (v = -v, x = -x, b = -1);
     let m = g * p, F = m + x;
     m += g * i / 256 * b, F += g * s / 256 * b;
-    const w = n.currentPoint.clone().subtract(new te(u * Math.cos(m), u * Math.sin(m)));
-    if (n.currentPoint = w.clone().add(new te(u * Math.cos(F), u * Math.sin(F))), n.isPenDown) {
+    const w = n.currentPoint.clone().subtract(new re(u * Math.cos(m), u * Math.sin(m)));
+    if (n.currentPoint = w.clone().add(new re(u * Math.cos(F), u * Math.sin(F))), n.isPenDown) {
       let k = m;
       const C = [];
       if (C.push(
-        w.clone().add(new te(u * Math.cos(k), u * Math.sin(k)))
+        w.clone().add(new re(u * Math.cos(k), u * Math.sin(k)))
       ), v > 0)
         for (; k + v < F; )
           k += v, C.push(
-            w.clone().add(new te(u * Math.cos(k), u * Math.sin(k)))
+            w.clone().add(new re(u * Math.cos(k), u * Math.sin(k)))
           );
       else
         for (; k + v > F; )
           k += v, C.push(
-            w.clone().add(new te(u * Math.cos(k), u * Math.sin(k)))
+            w.clone().add(new re(u * Math.cos(k), u * Math.sin(k)))
           );
-      C.push(w.clone().add(new te(u * Math.cos(F), u * Math.sin(F)))), n.currentPolyline.push(...C);
+      C.push(w.clone().add(new re(u * Math.cos(F), u * Math.sin(F)))), n.currentPolyline.push(...C);
     }
     return a;
   }
   handleBulgeArc(e, r, n) {
     let a = r;
-    const i = new te();
+    const i = new re();
     i.x = ge.byteToSByte(e[++a]), i.y = ge.byteToSByte(e[++a]);
     const s = ge.byteToSByte(e[++a]);
     return n.currentPoint = this.handleArcSegment(
@@ -10868,7 +10868,7 @@ class al {
   handleMultipleBulgeArcs(e, r, n) {
     let a = r;
     for (; ; ) {
-      const i = new te();
+      const i = new re();
       if (i.x = ge.byteToSByte(e[++a]), i.y = ge.byteToSByte(e[++a]), i.x === 0 && i.y === 0)
         break;
       const s = ge.byteToSByte(e[++a]);
@@ -11434,9 +11434,9 @@ yn.write = function(t, e, r, n, a, i) {
     if (d >= S)
       return 1;
     if (d >>>= 0, S >>>= 0, T >>>= 0, L >>>= 0, this === f) return 0;
-    for (var A = L - T, V = S - d, Y = Math.min(A, V), J = this.slice(T, L), de = f.slice(d, S), ee = 0; ee < Y; ++ee)
-      if (J[ee] !== de[ee]) {
-        A = J[ee], V = de[ee];
+    for (var A = L - T, V = S - d, Y = Math.min(A, V), J = this.slice(T, L), de = f.slice(d, S), te = 0; te < Y; ++te)
+      if (J[te] !== de[te]) {
+        A = J[te], V = de[te];
         break;
       }
     return A < V ? -1 : V < A ? 1 : 0;
@@ -11475,12 +11475,12 @@ yn.write = function(t, e, r, n, a, i) {
           de !== -1 && (J -= J - de), de = -1;
     } else
       for (d + V > A && (d = A - V), J = d; J >= 0; J--) {
-        for (var ee = !0, Ht = 0; Ht < V; Ht++)
+        for (var te = !0, Ht = 0; Ht < V; Ht++)
           if (Y(y, J + Ht) !== Y(f, Ht)) {
-            ee = !1;
+            te = !1;
             break;
           }
-        if (ee) return J;
+        if (te) return J;
       }
     return -1;
   }
@@ -11567,19 +11567,19 @@ yn.write = function(t, e, r, n, a, i) {
     for (var S = [], T = f; T < d; ) {
       var L = y[T], A = null, V = L > 239 ? 4 : L > 223 ? 3 : L > 191 ? 2 : 1;
       if (T + V <= d) {
-        var Y, J, de, ee;
+        var Y, J, de, te;
         switch (V) {
           case 1:
             L < 128 && (A = L);
             break;
           case 2:
-            Y = y[T + 1], (Y & 192) === 128 && (ee = (L & 31) << 6 | Y & 63, ee > 127 && (A = ee));
+            Y = y[T + 1], (Y & 192) === 128 && (te = (L & 31) << 6 | Y & 63, te > 127 && (A = te));
             break;
           case 3:
-            Y = y[T + 1], J = y[T + 2], (Y & 192) === 128 && (J & 192) === 128 && (ee = (L & 15) << 12 | (Y & 63) << 6 | J & 63, ee > 2047 && (ee < 55296 || ee > 57343) && (A = ee));
+            Y = y[T + 1], J = y[T + 2], (Y & 192) === 128 && (J & 192) === 128 && (te = (L & 15) << 12 | (Y & 63) << 6 | J & 63, te > 2047 && (te < 55296 || te > 57343) && (A = te));
             break;
           case 4:
-            Y = y[T + 1], J = y[T + 2], de = y[T + 3], (Y & 192) === 128 && (J & 192) === 128 && (de & 192) === 128 && (ee = (L & 15) << 18 | (Y & 63) << 12 | (J & 63) << 6 | de & 63, ee > 65535 && ee < 1114112 && (A = ee));
+            Y = y[T + 1], J = y[T + 2], de = y[T + 3], (Y & 192) === 128 && (J & 192) === 128 && (de & 192) === 128 && (te = (L & 15) << 18 | (Y & 63) << 12 | (J & 63) << 6 | de & 63, te > 65535 && te < 1114112 && (A = te));
         }
       }
       A === null ? (A = 65533, V = 1) : A > 65535 && (A -= 65536, S.push(A >>> 10 & 1023 | 55296), A = 56320 | A & 1023), S.push(A), T += V;
@@ -22180,7 +22180,7 @@ class Wl extends Ka {
         a += r, this.addUnsupportedChar(s);
         continue;
       }
-      n.push(o.offset(new te(a, 0))), a += o.width;
+      n.push(o.offset(new re(a, 0))), a += o.width;
     }
     return n;
   }
@@ -22639,10 +22639,10 @@ var Ze;
 (function(t) {
   t[t.BOTTOM = 0] = "BOTTOM", t[t.MIDDLE = 1] = "MIDDLE", t[t.TOP = 2] = "TOP";
 })(Ze || (Ze = {}));
-var re;
+var ee;
 (function(t) {
   t[t.DEFAULT = 0] = "DEFAULT", t[t.LEFT = 1] = "LEFT", t[t.RIGHT = 2] = "RIGHT", t[t.CENTER = 3] = "CENTER", t[t.JUSTIFIED = 4] = "JUSTIFIED", t[t.DISTRIBUTED = 5] = "DISTRIBUTED";
-})(re || (re = {}));
+})(ee || (ee = {}));
 var Xe;
 (function(t) {
   t[t.NONE = 0] = "NONE", t[t.UNDERLINE = 1] = "UNDERLINE", t[t.OVERLINE = 2] = "OVERLINE", t[t.STRIKE_THROUGH = 4] = "STRIKE_THROUGH";
@@ -22653,11 +22653,11 @@ const ql = {
   p: "±",
   "%": "%"
 }, Xl = {
-  l: re.LEFT,
-  r: re.RIGHT,
-  c: re.CENTER,
-  j: re.JUSTIFIED,
-  d: re.DISTRIBUTED
+  l: ee.LEFT,
+  r: ee.RIGHT,
+  c: ee.CENTER,
+  j: ee.JUSTIFIED,
+  d: ee.DISTRIBUTED
 };
 function Yl(t) {
   const [e, r, n] = t;
@@ -23179,7 +23179,7 @@ class Jl {
           break;
         case "q": {
           const h = r.get();
-          for (s = Xl[h] || re.DEFAULT; r.peek() === ","; )
+          for (s = Xl[h] || ee.DEFAULT; r.peek() === ","; )
             r.consume(1);
           break;
         }
@@ -23224,11 +23224,11 @@ class Jl {
         indent: 0,
         left: 0,
         right: 0,
-        align: re.DEFAULT,
+        align: ee.DEFAULT,
         tabs: []
       };
       const c = {};
-      return o.indent !== 0 && (c.indent = 0), o.left !== 0 && (c.left = 0), o.right !== 0 && (c.right = 0), o.align !== re.DEFAULT && (c.align = re.DEFAULT), JSON.stringify(o.tabs) !== JSON.stringify([]) && (c.tabs = []), c;
+      return o.indent !== 0 && (c.indent = 0), o.left !== 0 && (c.left = 0), o.right !== 0 && (c.right = 0), o.align !== ee.DEFAULT && (c.align = ee.DEFAULT), JSON.stringify(o.tabs) !== JSON.stringify([]) && (c.tabs = []), c;
     }
     const i = () => {
       let s = "";
@@ -23611,7 +23611,7 @@ class Dt {
       indent: 0,
       left: 0,
       right: 0,
-      align: re.DEFAULT,
+      align: ee.DEFAULT,
       tabs: []
     };
   }
@@ -24126,7 +24126,7 @@ class nf {
    * - underline/overline/strike-through flags
    */
   applyPropertyChanges(e) {
-    this.applyFontFaceChange(e.fontFace), this.applyColorCommandChanges(e), this.applyWidthFactorChange(e.widthFactor), this.applyCapHeightChange(e.capHeight), this.applyCharTrackingChange(e.charTrackingFactor), this.applyParagraphChange(e.paragraph), typeof e.underline == "boolean" && (this._currentContext.underline = e.underline), typeof e.overline == "boolean" && (this._currentContext.overline = e.overline), typeof e.strikeThrough == "boolean" && (this._currentContext.strikeThrough = e.strikeThrough), e.oblique !== void 0 && (this._currentContext.oblique = e.oblique);
+    this.applyFontFaceChange(e.fontFace), this.applyColorCommandChanges(e), this.applyWidthFactorChange(e.widthFactor), this.applyCapHeightChange(e.capHeight), this.applyCharTrackingChange(e.charTrackingFactor), this.applyParagraphMarginsOnly(e.paragraph), typeof e.underline == "boolean" && (this._currentContext.underline = e.underline), typeof e.overline == "boolean" && (this._currentContext.overline = e.overline), typeof e.strikeThrough == "boolean" && (this._currentContext.strikeThrough = e.strikeThrough), e.oblique !== void 0 && (this._currentContext.oblique = e.oblique);
   }
   /**
    * Apply a font face change to the current render context, including
@@ -24188,12 +24188,23 @@ class nf {
       isRelative: !1
     });
   }
+  /**
+   * Applies indent and margins from a paragraph snapshot only.
+   *
+   * Used when exiting `{}` formatting groups: the parser restores full context
+   * including `paragraph.align`, but paragraph alignment is not scoped to `{}`
+   * (see class comment on `_currentHorizontalAlignment`). Restoring align here
+   * would undo an active `\\p...` alignment before the line is finalized.
+   */
+  applyParagraphMarginsOnly(e) {
+    e && (typeof e.indent == "number" && (this._currentIndent = e.indent * this.defaultFontSize, this._hOffset += this._currentIndent), typeof e.left == "number" && (this._currentLeftMargin = e.left * this.defaultFontSize), typeof e.right == "number" && (this._currentRightMargin = e.right * this.defaultFontSize));
+  }
   /**
    * Apply paragraph-level changes such as alignment and margins.
    * @param paragraph Paragraph change data.
    */
   applyParagraphChange(e) {
-    e && (e.align && (this._currentHorizontalAlignment = e.align), typeof e.indent == "number" && (this._currentIndent = e.indent * this.defaultFontSize, this._hOffset += this._currentIndent), typeof e.left == "number" && (this._currentLeftMargin = e.left * this.defaultFontSize), typeof e.right == "number" && (this._currentRightMargin = e.right * this.defaultFontSize));
+    e && ("align" in e && (this._currentHorizontalAlignment = e.align), typeof e.indent == "number" && (this._currentIndent = e.indent * this.defaultFontSize, this._hOffset += this._currentIndent), typeof e.left == "number" && (this._currentLeftMargin = e.left * this.defaultFontSize), typeof e.right == "number" && (this._currentRightMargin = e.right * this.defaultFontSize));
   }
   /**
    * Reset paragraph properties to their default values from options.
@@ -24339,7 +24350,7 @@ class nf {
     let s = 0;
     for (let o = 0; o < e.length; o++) {
       const c = this.getCharShape(e[o]);
-      c ? this.currentHorizontalAlignment == re.DISTRIBUTED ? s += c.width * this.currentWidthFactor : s += c.width * this.currentWordSpace * this.currentWidthFactor : s += this._currentContext.blankWidth;
+      c ? this.currentHorizontalAlignment == ee.DISTRIBUTED ? s += c.width * this.currentWidthFactor : s += c.width * this.currentWordSpace * this.currentWidthFactor : s += this._currentContext.blankWidth;
     }
     this.hOffset + s > (this.maxLineWidth || 1 / 0) && (this._vOffset <= 0 && this._currentLineObjects.length <= 0 || (this.recordVisualLineBreak(a, i), this.advanceToNextLine(!1)));
     for (let o = 0; o < e.length; o++)
@@ -24552,7 +24563,7 @@ class nf {
     const u = this.fontManager.getFontType(this.currentFont);
     this._currentContext.bold && u === "mesh" && o.scale(1.06, 1.06, 1), this.hOffset > (this.maxLineWidth || 1 / 0) && (this.recordVisualLineBreak(a, i), this.advanceToNextLine(!1));
     const h = this.hOffset, p = this.flowDirection == Ye.BOTTOM_TO_TOP ? this.vOffset : this.vOffset - this.currentLayoutFontSize, l = s.width * this.currentWidthFactor, g = this.currentLayoutFontSize;
-    if (o.translate(h, p, 0), this.currentHorizontalAlignment == re.DISTRIBUTED ? this._hOffset += s.width * this.currentWidthFactor : this._hOffset += s.width * this.currentWordSpace * this.currentWidthFactor, r.push(o), this._lineHasRenderableChar = !0, this._options.collectCharBoxes !== !1) {
+    if (o.translate(h, p, 0), this.currentHorizontalAlignment == ee.DISTRIBUTED ? this._hOffset += s.width * this.currentWidthFactor : this._hOffset += s.width * this.currentWordSpace * this.currentWidthFactor, r.push(o), this._lineHasRenderableChar = !0, this._options.collectCharBoxes !== !1) {
       o.userData.char = e, o.boundingBox || o.computeBoundingBox();
       const b = new M.Box3().copy(o.boundingBox);
       o instanceof M.ShapeGeometry ? (this._lastCharBoxTarget = "mesh", a.push({
@@ -24717,28 +24728,29 @@ class nf {
       }
     };
     switch (this.currentHorizontalAlignment) {
-      case re.LEFT: {
+      case ee.LEFT:
+      case ee.JUSTIFIED: {
         const s = this._currentLeftMargin - n.min.x, o = /* @__PURE__ */ new Set();
         e.forEach((c) => {
           c.geometry.translate(s, 0, 0), o.has(c.owner) || (i(c.owner, s), o.add(c.owner));
         });
         break;
       }
-      case re.CENTER: {
+      case ee.CENTER: {
         const s = this._currentLeftMargin + (this.maxLineWidth - a.x) / 2 - n.min.x, o = /* @__PURE__ */ new Set();
         e.forEach((c) => {
           c.geometry.translate(s, 0, 0), o.has(c.owner) || (i(c.owner, s), o.add(c.owner));
         });
         break;
       }
-      case re.RIGHT: {
+      case ee.RIGHT: {
         const s = this._currentLeftMargin + this.maxLineWidth - a.x - n.min.x, o = /* @__PURE__ */ new Set();
         e.forEach((c) => {
           c.geometry.translate(s, 0, 0), o.has(c.owner) || (i(c.owner, s), o.add(c.owner));
         });
         break;
       }
-      case re.DISTRIBUTED: {
+      case ee.DISTRIBUTED: {
         const s = e.length > 1 ? (this.maxLineWidth - a.x) / (e.length - 1) : 0, o = /* @__PURE__ */ new Set();
         e.forEach((c, u) => {
           const h = s * u + (this._currentLeftMargin - n.min.x);
@@ -25019,23 +25031,23 @@ class cr extends M.Object3D {
       this.styleManager.unsupportedTextStyles[m] || (this.styleManager.unsupportedTextStyles[m] = 0), this.styleManager.unsupportedTextStyles[m]++;
     }
     const n = e.width || 0, a = Number.isFinite(n) && n > 0;
-    let i = re.LEFT;
+    let i = ee.LEFT;
     a && e.attachmentPoint && ([
       X.TopLeft,
       X.MiddleLeft,
       X.BottomLeft,
       X.BaselineLeft
-    ].includes(e.attachmentPoint) ? i = re.LEFT : [
+    ].includes(e.attachmentPoint) ? i = ee.LEFT : [
       X.TopCenter,
       X.MiddleCenter,
       X.BottomCenter,
       X.BaselineCenter
-    ].includes(e.attachmentPoint) ? i = re.CENTER : [
+    ].includes(e.attachmentPoint) ? i = ee.CENTER : [
       X.TopRight,
       X.MiddleRight,
       X.BottomRight,
       X.BaselineRight
-    ].includes(e.attachmentPoint) && (i = re.RIGHT));
+    ].includes(e.attachmentPoint) && (i = ee.RIGHT));
     let s = Ze.BOTTOM;
     e.attachmentPoint && ([
       X.TopLeft,
@@ -25746,12 +25758,13 @@ export {
   Dt as MTextContext,
   Ye as MTextFlowDirection,
   Ze as MTextLineAlignment,
-  re as MTextParagraphAlignment,
+  ee as MTextParagraphAlignment,
   Jl as MTextParser,
   Xe as MTextStroke,
   Nr as MTextToken,
   sf as MainThreadRenderer,
   tr as STACK_DIVIDER_CHAR,
+  il as ShxParserFont,
   Pr as TextScanner,
   Z as TokenType,
   lf as UnifiedRenderer,