@mlightcad/mtext-parser 1.0.11 → 1.1.0

package/dist/parser.es.js

@@ -1,9 +1,9 @@
-var k = /* @__PURE__ */ ((s) => (s[s.NONE = 0] = "NONE", s[s.WORD = 1] = "WORD", s[s.STACK = 2] = "STACK", s[s.SPACE = 3] = "SPACE", s[s.NBSP = 4] = "NBSP", s[s.TABULATOR = 5] = "TABULATOR", s[s.NEW_PARAGRAPH = 6] = "NEW_PARAGRAPH", s[s.NEW_COLUMN = 7] = "NEW_COLUMN", s[s.WRAP_AT_DIMLINE = 8] = "WRAP_AT_DIMLINE", s[s.PROPERTIES_CHANGED = 9] = "PROPERTIES_CHANGED", s))(k || {}), b = /* @__PURE__ */ ((s) => (s[s.BOTTOM = 0] = "BOTTOM", s[s.MIDDLE = 1] = "MIDDLE", s[s.TOP = 2] = "TOP", s))(b || {}), E = /* @__PURE__ */ ((s) => (s[s.DEFAULT = 0] = "DEFAULT", s[s.LEFT = 1] = "LEFT", s[s.RIGHT = 2] = "RIGHT", s[s.CENTER = 3] = "CENTER", s[s.JUSTIFIED = 4] = "JUSTIFIED", s[s.DISTRIBUTED = 5] = "DISTRIBUTED", s))(E || {}), F = /* @__PURE__ */ ((s) => (s[s.NONE = 0] = "NONE", s[s.UNDERLINE = 1] = "UNDERLINE", s[s.OVERLINE = 2] = "OVERLINE", s[s.STRIKE_THROUGH = 4] = "STRIKE_THROUGH", s))(F || {});
-const m = {
+var k = /* @__PURE__ */ ((s) => (s[s.NONE = 0] = "NONE", s[s.WORD = 1] = "WORD", s[s.STACK = 2] = "STACK", s[s.SPACE = 3] = "SPACE", s[s.NBSP = 4] = "NBSP", s[s.TABULATOR = 5] = "TABULATOR", s[s.NEW_PARAGRAPH = 6] = "NEW_PARAGRAPH", s[s.NEW_COLUMN = 7] = "NEW_COLUMN", s[s.WRAP_AT_DIMLINE = 8] = "WRAP_AT_DIMLINE", s[s.PROPERTIES_CHANGED = 9] = "PROPERTIES_CHANGED", s))(k || {}), _ = /* @__PURE__ */ ((s) => (s[s.BOTTOM = 0] = "BOTTOM", s[s.MIDDLE = 1] = "MIDDLE", s[s.TOP = 2] = "TOP", s))(_ || {}), m = /* @__PURE__ */ ((s) => (s[s.DEFAULT = 0] = "DEFAULT", s[s.LEFT = 1] = "LEFT", s[s.RIGHT = 2] = "RIGHT", s[s.CENTER = 3] = "CENTER", s[s.JUSTIFIED = 4] = "JUSTIFIED", s[s.DISTRIBUTED = 5] = "DISTRIBUTED", s))(m || {}), E = /* @__PURE__ */ ((s) => (s[s.NONE = 0] = "NONE", s[s.UNDERLINE = 1] = "UNDERLINE", s[s.OVERLINE = 2] = "OVERLINE", s[s.STRIKE_THROUGH = 4] = "STRIKE_THROUGH", s))(E || {});
+const F = {
   c: "Ø",
   d: "°",
   p: "±"
-}, _ = {
+}, S = {
   l: 1,
   r: 2,
   c: 3,
@@ -12,49 +12,50 @@ const m = {
   /* DISTRIBUTED */
 };
 function R(s) {
-  const [e, t, r] = s;
-  return r << 16 | t << 8 | e;
-}
-function S(s) {
-  const e = s & 255, t = s >> 8 & 255, r = s >> 16 & 255;
-  return [e, t, r];
+  const [t, e, r] = s;
+  return r << 16 | e << 8 | t;
 }
 function v(s) {
-  return s.replace(/\r\n|\r|\n/g, "\\P");
+  const t = s & 255, e = s >> 8 & 255, r = s >> 16 & 255;
+  return [t, e, r];
 }
 function I(s) {
-  return s.replace(/\\P/g, "").replace(/\\~/g, "").includes("\\");
+  return s.replace(/\r\n|\r|\n/g, "\\P");
 }
 function N(s) {
-  const e = /* @__PURE__ */ new Set(), t = /\\[fF](.*?)[;|]/g;
-  return [...s.matchAll(t)].forEach((r) => {
-    e.add(r[1].toLowerCase());
+  return s.replace(/\\P/g, "").replace(/\\~/g, "").includes("\\");
+}
+function O(s, t = !1) {
+  const e = /* @__PURE__ */ new Set(), r = /\\[fF](.*?)[;|]/g;
+  return [...s.matchAll(r)].forEach((a) => {
+    let i = a[1].toLowerCase();
+    t && (i = i.replace(/\.(ttf|otf|woff|shx)$/, "")), e.add(i);
   }), e;
 }
-class O {
+class D {
   /**
    * Creates a new MTextParser instance
    * @param content - The MText content to parse
    * @param ctx - Optional initial MText context
    * @param yieldPropertyCommands - Whether to yield property change commands
    */
-  constructor(e, t, r = !1) {
-    this.ctxStack = [], this.continueStroke = !1, this.inStackContext = !1, this.scanner = new f(e), this.ctx = t ?? new g(), this.lastCtx = this.ctx.copy(), this.yieldPropertyCommands = r;
+  constructor(t, e, r = !1) {
+    this.ctxStack = [], this.continueStroke = !1, this.inStackContext = !1, this.scanner = new g(t), this.ctx = e ?? new d(), this.lastCtx = this.ctx.copy(), this.yieldPropertyCommands = r;
   }
   /**
    * Decode multi-byte character from hex code
    * @param hex - Hex code string (e.g. "C4E3")
    * @returns Decoded character or empty square if invalid
    */
-  decodeMultiByteChar(e) {
+  decodeMultiByteChar(t) {
     try {
-      const t = new Uint8Array([
-        parseInt(e.substr(0, 2), 16),
-        parseInt(e.substr(2, 2), 16)
-      ]), a = new TextDecoder("gbk").decode(t);
+      const e = new Uint8Array([
+        parseInt(t.substr(0, 2), 16),
+        parseInt(t.substr(2, 2), 16)
+      ]), a = new TextDecoder("gbk").decode(e);
       if (a !== "▯")
         return a;
-      const h = new TextDecoder("big5").decode(t);
+      const h = new TextDecoder("big5").decode(e);
       return h !== "▯" ? h : "▯";
     } catch {
       return "▯";
@@ -77,14 +78,14 @@ class O {
    * @returns Tuple of [TokenType.STACK, [numerator, denominator, type]]
    */
   parseStacking() {
-    const e = new f(this.extractExpression(!0));
-    let t = "", r = "", a = "";
+    const t = new g(this.extractExpression(!0));
+    let e = "", r = "", a = "";
     const i = () => {
-      let n = e.peek(), l = !1;
-      return n.charCodeAt(0) < 32 && (n = " "), n === "\\" && (l = !0, e.consume(1), n = e.peek()), e.consume(1), [n, l];
+      let n = t.peek(), l = !1;
+      return n.charCodeAt(0) < 32 && (n = " "), n === "\\" && (l = !0, t.consume(1), n = t.peek()), t.consume(1), [n, l];
     }, h = () => {
       let n = "";
-      for (; e.hasData; ) {
+      for (; t.hasData; ) {
         const [l, o] = i();
         if (!o && (l === "/" || l === "#" || l === "^"))
           return [n, l];
@@ -93,7 +94,7 @@ class O {
       return [n, ""];
     }, u = (n) => {
       let l = "", o = n;
-      for (; e.hasData; ) {
+      for (; t.hasData; ) {
         const [c, p] = i();
         if (!(o && c === " ")) {
           if (o = !1, !p && c === ";")
@@ -103,70 +104,70 @@ class O {
       }
       return l;
     };
-    return [t, a] = h(), a && (r = u(a === "^")), t === "" && r.includes("I/") ? [2, [" ", " ", "/"]] : a === "^" ? [2, [t, r, "^"]] : [2, [t, r, a]];
+    return [e, a] = h(), a && (r = u(a === "^")), e === "" && r.includes("I/") ? [2, [" ", " ", "/"]] : a === "^" ? [2, [e, r, "^"]] : [2, [e, r, a]];
   }
   /**
    * Parse MText properties
    * @param cmd - The property command to parse
    * @returns Property changes if yieldPropertyCommands is true and changes occurred
    */
-  parseProperties(e) {
-    const t = this.ctx.copy();
-    switch (e) {
+  parseProperties(t) {
+    const e = this.ctx.copy();
+    switch (t) {
       case "L":
-        t.underline = !0, this.continueStroke = !0;
+        e.underline = !0, this.continueStroke = !0;
         break;
       case "l":
-        t.underline = !1, t.hasAnyStroke || (this.continueStroke = !1);
+        e.underline = !1, e.hasAnyStroke || (this.continueStroke = !1);
         break;
       case "O":
-        t.overline = !0, this.continueStroke = !0;
+        e.overline = !0, this.continueStroke = !0;
         break;
       case "o":
-        t.overline = !1, t.hasAnyStroke || (this.continueStroke = !1);
+        e.overline = !1, e.hasAnyStroke || (this.continueStroke = !1);
         break;
       case "K":
-        t.strikeThrough = !0, this.continueStroke = !0;
+        e.strikeThrough = !0, this.continueStroke = !0;
         break;
       case "k":
-        t.strikeThrough = !1, t.hasAnyStroke || (this.continueStroke = !1);
+        e.strikeThrough = !1, e.hasAnyStroke || (this.continueStroke = !1);
         break;
       case "A":
-        this.parseAlign(t);
+        this.parseAlign(e);
         break;
       case "C":
-        this.parseAciColor(t);
+        this.parseAciColor(e);
         break;
       case "c":
-        this.parseRgbColor(t);
+        this.parseRgbColor(e);
         break;
       case "H":
-        this.parseHeight(t);
+        this.parseHeight(e);
         break;
       case "W":
-        this.parseWidth(t);
+        this.parseWidth(e);
         break;
       case "Q":
-        this.parseOblique(t);
+        this.parseOblique(e);
         break;
       case "T":
-        this.parseCharTracking(t);
+        this.parseCharTracking(e);
         break;
       case "p":
-        this.parseParagraphProperties(t);
+        this.parseParagraphProperties(e);
         break;
       case "f":
       case "F":
-        this.parseFontProperties(t);
+        this.parseFontProperties(e);
         break;
       default:
-        throw new Error(`Unknown command: ${e}`);
+        throw new Error(`Unknown command: ${t}`);
     }
-    if (this.continueStroke = t.hasAnyStroke, t.continueStroke = this.continueStroke, this.ctx = t, this.yieldPropertyCommands) {
-      const r = this.getPropertyChanges(this.lastCtx, t);
+    if (this.continueStroke = e.hasAnyStroke, e.continueStroke = this.continueStroke, this.ctx = e, this.yieldPropertyCommands) {
+      const r = this.getPropertyChanges(this.lastCtx, e);
       if (Object.keys(r).length > 0)
         return this.lastCtx = this.ctx.copy(), {
-          command: e,
+          command: t,
           changes: r
         };
     }
@@ -177,11 +178,11 @@ class O {
    * @param newCtx - The new context
    * @returns Object containing changed properties
    */
-  getPropertyChanges(e, t) {
+  getPropertyChanges(t, e) {
     const r = {};
-    if (e.underline !== t.underline && (r.underline = t.underline), e.overline !== t.overline && (r.overline = t.overline), e.strikeThrough !== t.strikeThrough && (r.strikeThrough = t.strikeThrough), e.aci !== t.aci && (r.aci = t.aci, r.rgb = t.rgb), e.rgb !== t.rgb && (r.rgb = t.rgb), e.align !== t.align && (r.align = t.align), JSON.stringify(e.fontFace) !== JSON.stringify(t.fontFace) && (r.fontFace = t.fontFace), (e.capHeight.value !== t.capHeight.value || e.capHeight.isRelative !== t.capHeight.isRelative) && (r.capHeight = t.capHeight), (e.widthFactor.value !== t.widthFactor.value || e.widthFactor.isRelative !== t.widthFactor.isRelative) && (r.widthFactor = t.widthFactor), (e.charTrackingFactor.value !== t.charTrackingFactor.value || e.charTrackingFactor.isRelative !== t.charTrackingFactor.isRelative) && (r.charTrackingFactor = t.charTrackingFactor), e.oblique !== t.oblique && (r.oblique = t.oblique), JSON.stringify(e.paragraph) !== JSON.stringify(t.paragraph)) {
+    if (t.underline !== e.underline && (r.underline = e.underline), t.overline !== e.overline && (r.overline = e.overline), t.strikeThrough !== e.strikeThrough && (r.strikeThrough = e.strikeThrough), t.color.aci !== e.color.aci && (r.aci = e.color.aci, r.rgb = e.color.rgb), t.color.rgbValue !== e.color.rgbValue && (r.rgb = e.color.rgb), t.align !== e.align && (r.align = e.align), JSON.stringify(t.fontFace) !== JSON.stringify(e.fontFace) && (r.fontFace = e.fontFace), (t.capHeight.value !== e.capHeight.value || t.capHeight.isRelative !== e.capHeight.isRelative) && (r.capHeight = e.capHeight), (t.widthFactor.value !== e.widthFactor.value || t.widthFactor.isRelative !== e.widthFactor.isRelative) && (r.widthFactor = e.widthFactor), (t.charTrackingFactor.value !== e.charTrackingFactor.value || t.charTrackingFactor.isRelative !== e.charTrackingFactor.isRelative) && (r.charTrackingFactor = e.charTrackingFactor), t.oblique !== e.oblique && (r.oblique = e.oblique), JSON.stringify(t.paragraph) !== JSON.stringify(e.paragraph)) {
       const a = {};
-      e.paragraph.indent !== t.paragraph.indent && (a.indent = t.paragraph.indent), e.paragraph.align !== t.paragraph.align && (a.align = t.paragraph.align), e.paragraph.left !== t.paragraph.left && (a.left = t.paragraph.left), e.paragraph.right !== t.paragraph.right && (a.right = t.paragraph.right), JSON.stringify(e.paragraph.tab_stops) !== JSON.stringify(t.paragraph.tab_stops) && (a.tab_stops = t.paragraph.tab_stops), Object.keys(a).length > 0 && (r.paragraph = a);
+      t.paragraph.indent !== e.paragraph.indent && (a.indent = e.paragraph.indent), t.paragraph.align !== e.paragraph.align && (a.align = e.paragraph.align), t.paragraph.left !== e.paragraph.left && (a.left = e.paragraph.left), t.paragraph.right !== e.paragraph.right && (a.right = e.paragraph.right), JSON.stringify(t.paragraph.tab_stops) !== JSON.stringify(e.paragraph.tab_stops) && (a.tab_stops = e.paragraph.tab_stops), Object.keys(a).length > 0 && (r.paragraph = a);
     }
     return r;
   }
@@ -189,27 +190,27 @@ class O {
    * Parse alignment property
    * @param ctx - The context to update
    */
-  parseAlign(e) {
-    const t = this.scanner.get();
-    "012".includes(t) ? e.align = parseInt(t) : e.align = 0, this.consumeOptionalTerminator();
+  parseAlign(t) {
+    const e = this.scanner.get();
+    "012".includes(e) ? t.align = parseInt(e) : t.align = 0, this.consumeOptionalTerminator();
   }
   /**
    * Parse height property
    * @param ctx - The context to update
    */
-  parseHeight(e) {
-    const t = this.extractFloatExpression(!0);
-    if (t)
+  parseHeight(t) {
+    const e = this.extractFloatExpression(!0);
+    if (e)
       try {
-        t.endsWith("x") ? e.capHeight = {
-          value: parseFloat(t.slice(0, -1)),
+        e.endsWith("x") ? t.capHeight = {
+          value: parseFloat(e.slice(0, -1)),
           isRelative: !0
-        } : e.capHeight = {
-          value: parseFloat(t),
+        } : t.capHeight = {
+          value: parseFloat(e),
           isRelative: !1
         };
       } catch {
-        this.scanner.consume(-t.length);
+        this.scanner.consume(-e.length);
         return;
       }
     this.consumeOptionalTerminator();
@@ -218,19 +219,19 @@ class O {
    * Parse width property
    * @param ctx - The context to update
    */
-  parseWidth(e) {
-    const t = this.extractFloatExpression(!0);
-    if (t)
+  parseWidth(t) {
+    const e = this.extractFloatExpression(!0);
+    if (e)
       try {
-        t.endsWith("x") ? e.widthFactor = {
-          value: parseFloat(t.slice(0, -1)),
+        e.endsWith("x") ? t.widthFactor = {
+          value: parseFloat(e.slice(0, -1)),
           isRelative: !0
-        } : e.widthFactor = {
-          value: parseFloat(t),
+        } : t.widthFactor = {
+          value: parseFloat(e),
           isRelative: !1
         };
       } catch {
-        this.scanner.consume(-t.length);
+        this.scanner.consume(-e.length);
         return;
       }
     this.consumeOptionalTerminator();
@@ -239,19 +240,19 @@ class O {
    * Parse character tracking property
    * @param ctx - The context to update
    */
-  parseCharTracking(e) {
-    const t = this.extractFloatExpression(!0);
-    if (t)
+  parseCharTracking(t) {
+    const e = this.extractFloatExpression(!0);
+    if (e)
       try {
-        t.endsWith("x") ? e.charTrackingFactor = {
-          value: Math.abs(parseFloat(t.slice(0, -1))),
+        e.endsWith("x") ? t.charTrackingFactor = {
+          value: Math.abs(parseFloat(e.slice(0, -1))),
           isRelative: !0
-        } : e.charTrackingFactor = {
-          value: Math.abs(parseFloat(t)),
+        } : t.charTrackingFactor = {
+          value: Math.abs(parseFloat(e)),
           isRelative: !1
         };
       } catch {
-        this.scanner.consume(-t.length);
+        this.scanner.consume(-e.length);
         return;
       }
     this.consumeOptionalTerminator();
@@ -261,33 +262,33 @@ class O {
    * @param value - Current value to apply factor to
    * @returns New value
    */
-  parseFloatValueOrFactor(e) {
-    const t = this.extractFloatExpression(!0);
-    if (t)
-      if (t.endsWith("x")) {
-        const r = parseFloat(t.slice(0, -1));
-        e *= r;
+  parseFloatValueOrFactor(t) {
+    const e = this.extractFloatExpression(!0);
+    if (e)
+      if (e.endsWith("x")) {
+        const r = parseFloat(e.slice(0, -1));
+        t *= r;
       } else
-        e = parseFloat(t);
-    return e;
+        t = parseFloat(e);
+    return t;
   }
   /**
    * Parse oblique angle property
    * @param ctx - The context to update
    */
-  parseOblique(e) {
-    const t = this.extractFloatExpression(!1);
-    t && (e.oblique = parseFloat(t)), this.consumeOptionalTerminator();
+  parseOblique(t) {
+    const e = this.extractFloatExpression(!1);
+    e && (t.oblique = parseFloat(e)), this.consumeOptionalTerminator();
   }
   /**
    * Parse ACI color property
    * @param ctx - The context to update
    */
-  parseAciColor(e) {
-    const t = this.extractIntExpression();
-    if (t) {
-      const r = parseInt(t);
-      r < 257 && (e.aci = r, e.rgb = null);
+  parseAciColor(t) {
+    const e = this.extractIntExpression();
+    if (e) {
+      const r = parseInt(e);
+      r < 257 && (t.color.aci = r);
     }
     this.consumeOptionalTerminator();
   }
@@ -295,11 +296,11 @@ class O {
    * Parse RGB color property
    * @param ctx - The context to update
    */
-  parseRgbColor(e) {
-    const t = this.extractIntExpression();
-    if (t) {
-      const r = parseInt(t) & 16777215, [a, i, h] = S(r);
-      e.rgb = [h, i, a];
+  parseRgbColor(t) {
+    const e = this.extractIntExpression();
+    if (e) {
+      const r = parseInt(e) & 16777215;
+      t.color.rgbValue = r;
     }
     this.consumeOptionalTerminator();
   }
@@ -308,8 +309,8 @@ class O {
    * @param relative - Whether to allow relative values (ending in 'x')
    * @returns Extracted expression
    */
-  extractFloatExpression(e = !1) {
-    const t = e ? /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?x?/ : /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/, r = this.scanner.tail.match(t);
+  extractFloatExpression(t = !1) {
+    const e = t ? /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?x?/ : /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/, r = this.scanner.tail.match(e);
     if (r) {
       const a = r[0];
       return this.scanner.consume(a.length), a;
@@ -321,10 +322,10 @@ class O {
    * @returns Extracted expression
    */
   extractIntExpression() {
-    const e = this.scanner.tail.match(/^\d+/);
-    if (e) {
-      const t = e[0];
-      return this.scanner.consume(t.length), t;
+    const t = this.scanner.tail.match(/^\d+/);
+    if (t) {
+      const e = t[0];
+      return this.scanner.consume(e.length), e;
     }
     return "";
   }
@@ -333,27 +334,27 @@ class O {
    * @param escape - Whether to handle escaped semicolons
    * @returns Extracted expression
    */
-  extractExpression(e = !1) {
-    const t = this.scanner.find(";", e);
-    if (t < 0) {
+  extractExpression(t = !1) {
+    const e = this.scanner.find(";", t);
+    if (e < 0) {
       const h = this.scanner.tail;
       return this.scanner.consume(h.length), h;
     }
-    const a = this.scanner.peek(t - this.scanner.currentIndex - 1) === "\\", i = this.scanner.tail.slice(0, t - this.scanner.currentIndex + (a ? 1 : 0));
+    const a = this.scanner.peek(e - this.scanner.currentIndex - 1) === "\\", i = this.scanner.tail.slice(0, e - this.scanner.currentIndex + (a ? 1 : 0));
     return this.scanner.consume(i.length + 1), i;
   }
   /**
    * Parse font properties
    * @param ctx - The context to update
    */
-  parseFontProperties(e) {
-    const t = this.extractExpression().split("|");
-    if (t.length > 0 && t[0]) {
-      const r = t[0];
+  parseFontProperties(t) {
+    const e = this.extractExpression().split("|");
+    if (e.length > 0 && e[0]) {
+      const r = e[0];
       let a = "Regular", i = 400;
-      for (const h of t.slice(1))
+      for (const h of e.slice(1))
         h.startsWith("b1") ? i = 700 : h.startsWith("i1") && (a = "Italic");
-      e.fontFace = {
+      t.fontFace = {
         family: r,
         style: a,
         weight: i
@@ -365,21 +366,21 @@ class O {
    * Handles properties like indentation, alignment, and tab stops
    * @param ctx - The context to update
    */
-  parseParagraphProperties(e) {
-    const t = new f(this.extractExpression());
-    let r = e.paragraph.indent, a = e.paragraph.left, i = e.paragraph.right, h = e.paragraph.align, u = [];
+  parseParagraphProperties(t) {
+    const e = new g(this.extractExpression());
+    let r = t.paragraph.indent, a = t.paragraph.left, i = t.paragraph.right, h = t.paragraph.align, u = [];
     const n = () => {
-      const l = t.tail.match(/^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/);
+      const l = e.tail.match(/^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/);
       if (l) {
         const o = parseFloat(l[0]);
-        for (t.consume(l[0].length); t.peek() === ","; )
-          t.consume(1);
+        for (e.consume(l[0].length); e.peek() === ","; )
+          e.consume(1);
         return o;
       }
       return 0;
     };
-    for (; t.hasData; )
-      switch (t.get()) {
+    for (; e.hasData; )
+      switch (e.get()) {
         case "i":
           r = n();
           break;
@@ -392,26 +393,26 @@ class O {
         case "x":
           break;
         case "q": {
-          const o = t.get();
-          for (h = _[o] || 0; t.peek() === ","; )
-            t.consume(1);
+          const o = e.get();
+          for (h = S[o] || 0; e.peek() === ","; )
+            e.consume(1);
           break;
         }
         case "t":
-          for (u = []; t.hasData; ) {
-            const o = t.peek();
+          for (u = []; e.hasData; ) {
+            const o = e.peek();
             if (o === "r" || o === "c") {
-              t.consume(1);
+              e.consume(1);
               const c = n();
               u.push(o + c.toString());
             } else {
               const c = n();
-              isNaN(c) ? t.consume(1) : u.push(c);
+              isNaN(c) ? e.consume(1) : u.push(c);
             }
           }
           break;
       }
-    e.paragraph = {
+    t.paragraph = {
       indent: r,
       left: a,
       right: i,
@@ -499,7 +500,7 @@ class O {
             continue;
           }
         if (n === "%" && this.scanner.peek(1) === "%") {
-          const o = this.scanner.peek(2).toLowerCase(), c = m[o];
+          const o = this.scanner.peek(2).toLowerCase(), c = F[o];
           if (c) {
             this.scanner.consume(3), i += c;
             continue;
@@ -548,19 +549,19 @@ class O {
     for (; ; ) {
       const [i, h] = a();
       if (i)
-        yield new d(i, this.ctx, h), r && (yield new d(r, this.ctx, null), r = null);
+        yield new b(i, this.ctx, h), r && (yield new b(r, this.ctx, null), r = null);
       else
         break;
     }
   }
 }
-class f {
+class g {
   /**
    * Create a new text scanner
    * @param text - The text to scan
    */
-  constructor(e) {
-    this.text = e, this.textLen = e.length, this._index = 0;
+  constructor(t) {
+    this.text = t, this.textLen = t.length, this._index = 0;
   }
   /**
    * Get the current index in the text
@@ -587,24 +588,24 @@ class f {
   get() {
     if (this.isEmpty)
       return "";
-    const e = this.text[this._index];
-    return this._index++, e;
+    const t = this.text[this._index];
+    return this._index++, t;
   }
   /**
    * Advance the index by the specified count
    * @param count - Number of characters to advance
    */
-  consume(e = 1) {
-    this._index = Math.max(0, Math.min(this._index + e, this.textLen));
+  consume(t = 1) {
+    this._index = Math.max(0, Math.min(this._index + t, this.textLen));
   }
   /**
    * Look at a character without advancing the index
    * @param offset - Offset from current position
    * @returns The character at the offset position, or empty string if out of bounds
    */
-  peek(e = 0) {
-    const t = this._index + e;
-    return t >= this.textLen || t < 0 ? "" : this.text[t];
+  peek(t = 0) {
+    const e = this._index + t;
+    return e >= this.textLen || e < 0 ? "" : this.text[e];
   }
   /**
    * Find the next occurrence of a character
@@ -612,12 +613,12 @@ class f {
    * @param escape - Whether to handle escaped characters
    * @returns Index of the character, or -1 if not found
    */
-  find(e, t = !1) {
+  find(t, e = !1) {
     let r = this._index;
     for (; r < this.textLen; ) {
-      if (t && this.text[r] === "\\") {
+      if (e && this.text[r] === "\\") {
         if (r + 1 < this.textLen) {
-          if (this.text[r + 1] === e)
+          if (this.text[r + 1] === t)
             return r + 1;
           r += 2;
           continue;
@@ -625,7 +626,7 @@ class f {
         r++;
         continue;
       }
-      if (this.text[r] === e)
+      if (this.text[r] === t)
         return r;
       r++;
     }
@@ -648,15 +649,110 @@ class f {
    * @returns Number of spaces consumed
    */
   consumeSpaces() {
-    let e = 0;
+    let t = 0;
     for (; this.isNextSpace(); )
-      this.consume(), e++;
-    return e;
+      this.consume(), t++;
+    return t;
   }
 }
-class g {
+class f {
+  // Store as 0xRRGGBB or null
+  /**
+   * Create a new MTextColor instance.
+   * @param color The initial color: number for ACI, [r,g,b] for RGB, or null/undefined for default (ACI=256).
+   */
+  constructor(t) {
+    this._aci = 256, this._rgbValue = null, Array.isArray(t) ? this.rgb = t : typeof t == "number" ? this.aci = t : this.aci = 256;
+  }
+  /**
+   * Get the current ACI color value.
+   * @returns The ACI color (0-256), or null if using RGB.
+   */
+  get aci() {
+    return this._aci;
+  }
+  /**
+   * Set the ACI color value. Setting this disables any RGB color.
+   * @param value The ACI color (0-256), or null to unset.
+   * @throws Error if value is out of range.
+   */
+  set aci(t) {
+    if (t === null)
+      this._aci = null;
+    else if (t >= 0 && t <= 256)
+      this._aci = t, this._rgbValue = null;
+    else
+      throw new Error("ACI not in range [0, 256]");
+  }
+  /**
+   * Get the current RGB color as a tuple [r, g, b], or null if not set.
+   * @returns The RGB color tuple, or null if using ACI.
+   */
+  get rgb() {
+    if (this._rgbValue === null) return null;
+    const t = this._rgbValue >> 16 & 255, e = this._rgbValue >> 8 & 255, r = this._rgbValue & 255;
+    return [t, e, r];
+  }
+  /**
+   * Set the RGB color. Setting this disables ACI color.
+   * @param value The RGB color tuple [r, g, b], or null to use ACI.
+   */
+  set rgb(t) {
+    if (t) {
+      const [e, r, a] = t;
+      this._rgbValue = (e & 255) << 16 | (r & 255) << 8 | a & 255, this._aci = null;
+    } else
+      this._rgbValue = null;
+  }
+  /**
+   * Returns true if the color is set by RGB, false if by ACI.
+   */
+  get isRgb() {
+    return this._rgbValue !== null;
+  }
+  /**
+   * Returns true if the color is set by ACI, false if by RGB.
+   */
+  get isAci() {
+    return this._rgbValue === null && this._aci !== null;
+  }
+  /**
+   * Get or set the internal RGB value as a number (0xRRGGBB), or null if not set.
+   * Setting this will switch to RGB mode and set ACI to null.
+   */
+  get rgbValue() {
+    return this._rgbValue;
+  }
+  set rgbValue(t) {
+    t === null ? this._rgbValue = null : (this._rgbValue = t & 16777215, this._aci = null);
+  }
+  /**
+   * Returns a deep copy of this color.
+   * @returns A new MTextColor instance with the same color state.
+   */
+  copy() {
+    const t = new f();
+    return t._aci = this._aci, t._rgbValue = this._rgbValue, t;
+  }
+  /**
+   * Returns a plain object for serialization.
+   * @returns An object with aci, rgb (tuple), and rgbValue (number or null).
+   */
+  toObject() {
+    return { aci: this._aci, rgb: this.rgb, rgbValue: this._rgbValue };
+  }
+  /**
+   * Equality check for color.
+   * @param other The other MTextColor to compare.
+   * @returns True if both ACI and RGB values are equal.
+   */
+  equals(t) {
+    return this._aci === t._aci && this._rgbValue === t._rgbValue;
+  }
+}
+class d {
   constructor() {
-    this._stroke = 0, this.continueStroke = !1, this._aci = 7, this.rgb = null, this.align = 0, this.fontFace = { family: "", style: "Regular", weight: 400 }, this._capHeight = { value: 1, isRelative: !1 }, this._widthFactor = { value: 1, isRelative: !1 }, this._charTrackingFactor = { value: 1, isRelative: !1 }, this.oblique = 0, this.paragraph = {
+    this._stroke = 0, this.continueStroke = !1, this.color = new f(), this.align = 0, this.fontFace = { family: "", style: "Regular", weight: 400 }, this._capHeight = { value: 1, isRelative: !1 }, this._widthFactor = { value: 1, isRelative: !1 }, this._charTrackingFactor = { value: 1, isRelative: !1 }, this.oblique = 0, this.paragraph = {
       indent: 0,
       left: 0,
       right: 0,
@@ -674,10 +770,10 @@ class g {
    * Set the capital letter height
    * @param value - Height value
    */
-  set capHeight(e) {
+  set capHeight(t) {
     this._capHeight = {
-      value: Math.abs(e.value),
-      isRelative: e.isRelative
+      value: Math.abs(t.value),
+      isRelative: t.isRelative
     };
   }
   /**
@@ -690,10 +786,10 @@ class g {
    * Set the character width factor
    * @param value - Width factor value
    */
-  set widthFactor(e) {
+  set widthFactor(t) {
     this._widthFactor = {
-      value: Math.abs(e.value),
-      isRelative: e.isRelative
+      value: Math.abs(t.value),
+      isRelative: t.isRelative
     };
   }
   /**
@@ -706,28 +802,37 @@ class g {
    * Set the character tracking factor
    * @param value - Tracking factor value
    */
-  set charTrackingFactor(e) {
+  set charTrackingFactor(t) {
     this._charTrackingFactor = {
-      value: Math.abs(e.value),
-      isRelative: e.isRelative
+      value: Math.abs(t.value),
+      isRelative: t.isRelative
     };
   }
   /**
    * Get the ACI color value
    */
   get aci() {
-    return this._aci;
+    return this.color.aci;
   }
   /**
    * Set the ACI color value
    * @param value - ACI color value (0-256)
    * @throws Error if value is out of range
    */
-  set aci(e) {
-    if (e >= 0 && e <= 256)
-      this._aci = e, this.rgb = null;
-    else
-      throw new Error("ACI not in range [0, 256]");
+  set aci(t) {
+    this.color.aci = t;
+  }
+  /**
+   * Get the RGB color value
+   */
+  get rgb() {
+    return this.color.rgb;
+  }
+  /**
+   * Set the RGB color value
+   */
+  set rgb(t) {
+    this.color.rgb = t;
   }
   /**
    * Get whether text is underlined
@@ -739,8 +844,8 @@ class g {
    * Set whether text is underlined
    * @param value - Whether to underline
    */
-  set underline(e) {
-    this._setStrokeState(1, e);
+  set underline(t) {
+    this._setStrokeState(1, t);
   }
   /**
    * Get whether text has strike-through
@@ -752,8 +857,8 @@ class g {
    * Set whether text has strike-through
    * @param value - Whether to strike through
    */
-  set strikeThrough(e) {
-    this._setStrokeState(4, e);
+  set strikeThrough(t) {
+    this._setStrokeState(4, t);
   }
   /**
    * Get whether text has overline
@@ -765,8 +870,8 @@ class g {
    * Set whether text has overline
    * @param value - Whether to overline
    */
-  set overline(e) {
-    this._setStrokeState(2, e);
+  set overline(t) {
+    this._setStrokeState(2, t);
   }
   /**
    * Check if any stroke formatting is active
@@ -779,42 +884,43 @@ class g {
    * @param stroke - The stroke type to set
    * @param state - Whether to enable or disable the stroke
    */
-  _setStrokeState(e, t = !0) {
-    t ? this._stroke |= e : this._stroke &= ~e;
+  _setStrokeState(t, e = !0) {
+    e ? this._stroke |= t : this._stroke &= ~t;
   }
   /**
    * Create a copy of this context
    * @returns A new context with the same properties
    */
   copy() {
-    const e = new g();
-    return e._stroke = this._stroke, e.continueStroke = this.continueStroke, e._aci = this._aci, e.rgb = this.rgb, e.align = this.align, e.fontFace = { ...this.fontFace }, e._capHeight = { ...this._capHeight }, e._widthFactor = { ...this._widthFactor }, e._charTrackingFactor = { ...this._charTrackingFactor }, e.oblique = this.oblique, e.paragraph = { ...this.paragraph }, e;
+    const t = new d();
+    return t._stroke = this._stroke, t.continueStroke = this.continueStroke, t.color = this.color.copy(), t.align = this.align, t.fontFace = { ...this.fontFace }, t._capHeight = { ...this._capHeight }, t._widthFactor = { ...this._widthFactor }, t._charTrackingFactor = { ...this._charTrackingFactor }, t.oblique = this.oblique, t.paragraph = { ...this.paragraph }, t;
   }
 }
-class d {
+class b {
   /**
    * Create a new MText token
    * @param type - The token type
    * @param ctx - The text context at this token
    * @param data - Optional token data
    */
-  constructor(e, t, r) {
-    this.type = e, this.ctx = t, this.data = r;
+  constructor(t, e, r) {
+    this.type = t, this.ctx = e, this.data = r;
   }
 }
 export {
-  g as MTextContext,
-  b as MTextLineAlignment,
-  E as MTextParagraphAlignment,
-  O as MTextParser,
-  F as MTextStroke,
-  d as MTextToken,
-  f as TextScanner,
+  f as MTextColor,
+  d as MTextContext,
+  _ as MTextLineAlignment,
+  m as MTextParagraphAlignment,
+  D as MTextParser,
+  E as MTextStroke,
+  b as MTextToken,
+  g as TextScanner,
   k as TokenType,
-  v as escapeDxfLineEndings,
-  N as getFonts,
-  I as hasInlineFormattingCodes,
-  S as int2rgb,
+  I as escapeDxfLineEndings,
+  O as getFonts,
+  N as hasInlineFormattingCodes,
+  v as int2rgb,
   R as rgb2int
 };
 //# sourceMappingURL=parser.es.js.map