@mlightcad/mtext-parser 1.0.6 → 1.0.8

package/dist/parser.es.js

@@ -11,28 +11,21 @@ const m = {
   d: 5
   /* DISTRIBUTED */
 };
-function v(s) {
+function R(s) {
   const [e, t, r] = s;
   return r << 16 | t << 8 | e;
 }
-function R(s) {
+function S(s) {
   const e = s & 255, t = s >> 8 & 255, r = s >> 16 & 255;
   return [e, t, r];
 }
-function S(s) {
-  return s.replace(/\^(.)/g, (e, t) => {
-    const r = t.charCodeAt(0);
-    return r === 32 ? "^" : r === 73 ? "	" : r === 74 ? `
-` : r === 77 ? "" : "▯";
-  });
-}
-function I(s) {
+function v(s) {
   return s.replace(/\r\n|\r|\n/g, "\\P");
 }
-function N(s) {
+function I(s) {
   return s.replace(/\\P/g, "").replace(/\\~/g, "").includes("\\");
 }
-class O {
+class N {
   /**
    * Creates a new MTextParser instance
    * @param content - The MText content to parse
@@ -40,7 +33,7 @@ class O {
    * @param yieldPropertyCommands - Whether to yield property change commands
    */
   constructor(e, t, r = !1) {
-    this.ctxStack = [], this.continueStroke = !1, this.scanner = new p(S(e)), this.ctx = t ?? new g(), this.lastCtx = this.ctx.copy(), this.yieldPropertyCommands = r, this.decoder = new TextDecoder("gbk");
+    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, this.decoder = new TextDecoder("gbk");
   }
   /**
    * Decode multi-byte character from hex code
@@ -52,8 +45,11 @@ class O {
       const t = new Uint8Array([
         parseInt(e.substr(0, 2), 16),
         parseInt(e.substr(2, 2), 16)
-      ]);
-      return this.decoder.decode(t);
+      ]), a = new TextDecoder("gbk").decode(t);
+      if (a !== "▯")
+        return a;
+      const h = new TextDecoder("big5").decode(t);
+      return h !== "▯" ? h : "▯";
     } catch {
       return "▯";
     }
@@ -75,29 +71,33 @@ class O {
    * @returns Tuple of [TokenType.STACK, [numerator, denominator, type]]
    */
   parseStacking() {
-    const e = new p(this.extractExpression(!0));
-    let t = "", r = "", n = "";
+    const e = new f(this.extractExpression(!0));
+    let t = "", r = "", a = "";
     const i = () => {
-      let a = e.peek(), o = !1;
-      return a.charCodeAt(0) < 32 && (a = " "), a === "\\" && (o = !0, e.consume(1), a = e.peek()), e.consume(1), [a, o];
-    }, c = () => {
-      let a = "";
+      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];
+    }, h = () => {
+      let n = "";
       for (; e.hasData; ) {
-        const [o, h] = i();
-        if (!h && "^/#".includes(o))
-          return [a, o];
-        a += o;
+        const [l, o] = i();
+        if (!o && (l === "/" || l === "#" || l === "^"))
+          return [n, l];
+        n += l;
       }
-      return [a, ""];
-    }, u = () => {
-      let a = "";
+      return [n, ""];
+    }, u = (n) => {
+      let l = "", o = n;
       for (; e.hasData; ) {
-        const [o, h] = i();
-        h && o === ";" ? a += ";" : a += o;
+        const [c, p] = i();
+        if (!(o && c === " ")) {
+          if (o = !1, !p && c === ";")
+            break;
+          l += c;
+        }
       }
-      return a;
+      return l;
     };
-    return [t, n] = c(), n && (r = u()), [2, [t, r, n]];
+    return [t, a] = h(), a && (r = u(a === "^")), t === "" && r.includes("I/") ? [2, [" ", " ", "/"]] : a === "^" ? [2, [t, r, "^"]] : [2, [t, r, a]];
   }
   /**
    * Parse MText properties
@@ -156,7 +156,7 @@ class O {
       default:
         throw new Error(`Unknown command: ${e}`);
     }
-    if (t.continueStroke = this.continueStroke, this.ctx = t, this.yieldPropertyCommands) {
+    if (this.continueStroke = t.hasAnyStroke, t.continueStroke = this.continueStroke, this.ctx = t, this.yieldPropertyCommands) {
       const r = this.getPropertyChanges(this.lastCtx, t);
       if (Object.keys(r).length > 0)
         return this.lastCtx = this.ctx.copy(), {
@@ -174,8 +174,8 @@ class O {
   getPropertyChanges(e, t) {
     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)) {
-      const n = {};
-      e.paragraph.indent !== t.paragraph.indent && (n.indent = t.paragraph.indent), e.paragraph.align !== t.paragraph.align && (n.align = t.paragraph.align), e.paragraph.left !== t.paragraph.left && (n.left = t.paragraph.left), e.paragraph.right !== t.paragraph.right && (n.right = t.paragraph.right), JSON.stringify(e.paragraph.tab_stops) !== JSON.stringify(t.paragraph.tab_stops) && (n.tab_stops = t.paragraph.tab_stops), Object.keys(n).length > 0 && (r.paragraph = n);
+      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);
     }
     return r;
   }
@@ -260,9 +260,9 @@ class O {
     if (t)
       if (t.endsWith("x")) {
         const r = parseFloat(t.slice(0, -1));
-        e *= Math.abs(r);
+        e *= r;
       } else
-        e = Math.abs(parseFloat(t));
+        e = parseFloat(t);
     return e;
   }
   /**
@@ -292,8 +292,8 @@ class O {
   parseRgbColor(e) {
     const t = this.extractIntExpression();
     if (t) {
-      const r = parseInt(t) & 16777215, [n, i, c] = R(r);
-      e.rgb = [c, i, n];
+      const r = parseInt(t) & 16777215, [a, i, h] = S(r);
+      e.rgb = [h, i, a];
     }
     this.consumeOptionalTerminator();
   }
@@ -305,8 +305,8 @@ class O {
   extractFloatExpression(e = !1) {
     const t = e ? /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?x?/ : /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/, r = this.scanner.tail.match(t);
     if (r) {
-      const n = r[0];
-      return this.scanner.consume(n.length), n;
+      const a = r[0];
+      return this.scanner.consume(a.length), a;
     }
     return "";
   }
@@ -330,10 +330,10 @@ class O {
   extractExpression(e = !1) {
     const t = this.scanner.find(";", e);
     if (t < 0) {
-      const c = this.scanner.tail;
-      return this.scanner.consume(c.length), c;
+      const h = this.scanner.tail;
+      return this.scanner.consume(h.length), h;
     }
-    const n = this.scanner.peek(t - this.scanner.currentIndex - 1) === "\\", i = this.scanner.tail.slice(0, t - this.scanner.currentIndex + (n ? 1 : 0));
+    const a = this.scanner.peek(t - this.scanner.currentIndex - 1) === "\\", i = this.scanner.tail.slice(0, t - this.scanner.currentIndex + (a ? 1 : 0));
     return this.scanner.consume(i.length + 1), i;
   }
   /**
@@ -344,12 +344,12 @@ class O {
     const t = this.extractExpression().split("|");
     if (t.length > 0 && t[0]) {
       const r = t[0];
-      let n = "Regular", i = 400;
-      for (const c of t.slice(1))
-        c.startsWith("b1") ? i = 700 : c.startsWith("i1") && (n = "Italic");
+      let a = "Regular", i = 400;
+      for (const h of t.slice(1))
+        h.startsWith("b1") ? i = 700 : h.startsWith("i1") && (a = "Italic");
       e.fontFace = {
         family: r,
-        style: n,
+        style: a,
         weight: i
       };
     }
@@ -360,56 +360,56 @@ class O {
    * @param ctx - The context to update
    */
   parseParagraphProperties(e) {
-    const t = new p(this.extractExpression());
-    let r = e.paragraph.indent, n = e.paragraph.left, i = e.paragraph.right, c = e.paragraph.align, u = [];
-    const a = () => {
-      const o = t.tail.match(/^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/);
-      if (o) {
-        const h = parseFloat(o[0]);
-        for (t.consume(o[0].length); t.peek() === ","; )
+    const t = new f(this.extractExpression());
+    let r = e.paragraph.indent, a = e.paragraph.left, i = e.paragraph.right, h = e.paragraph.align, u = [];
+    const n = () => {
+      const l = t.tail.match(/^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?/);
+      if (l) {
+        const o = parseFloat(l[0]);
+        for (t.consume(l[0].length); t.peek() === ","; )
           t.consume(1);
-        return h;
+        return o;
       }
       return 0;
     };
     for (; t.hasData; )
       switch (t.get()) {
         case "i":
-          r = a();
+          r = n();
           break;
         case "l":
-          n = a();
+          a = n();
           break;
         case "r":
-          i = a();
+          i = n();
           break;
         case "x":
           break;
         case "q": {
-          const h = t.get();
-          for (c = _[h] || 0; t.peek() === ","; )
+          const o = t.get();
+          for (h = _[o] || 0; t.peek() === ","; )
             t.consume(1);
           break;
         }
         case "t":
           for (u = []; t.hasData; ) {
-            const h = t.peek();
-            if (h === "r" || h === "c") {
+            const o = t.peek();
+            if (o === "r" || o === "c") {
               t.consume(1);
-              const l = a();
-              u.push(h + l.toString());
+              const c = n();
+              u.push(o + c.toString());
             } else {
-              const l = a();
-              isNaN(l) ? t.consume(1) : u.push(l);
+              const c = n();
+              isNaN(c) ? t.consume(1) : u.push(c);
             }
           }
           break;
       }
     e.paragraph = {
       indent: r,
-      left: n,
+      left: a,
       right: i,
-      align: c,
+      align: h,
       tab_stops: u
     };
   }
@@ -425,29 +425,29 @@ class O {
    */
   *parse() {
     let r = null;
-    const n = () => {
-      var c;
+    const a = () => {
+      var h;
       let i = "";
       for (; this.scanner.hasData; ) {
-        let u = !1, a = this.scanner.peek();
-        const o = this.scanner.currentIndex;
-        if (a.charCodeAt(0) < 32) {
-          if (this.scanner.consume(1), a === "	")
+        let u = !1, n = this.scanner.peek();
+        const l = this.scanner.currentIndex;
+        if (n.charCodeAt(0) < 32) {
+          if (this.scanner.consume(1), n === "	")
             return [5, null];
-          if (a === `
+          if (n === `
 `)
             return [6, null];
-          a = " ";
+          n = " ";
         }
-        if (a === "\\")
+        if (n === "\\")
           if ("\\{}".includes(this.scanner.peek(1)))
-            u = !0, this.scanner.consume(1), a = this.scanner.peek();
+            u = !0, this.scanner.consume(1), n = this.scanner.peek();
           else {
             if (i)
               return [1, i];
             this.scanner.consume(1);
-            const h = this.scanner.get();
-            switch (h) {
+            const o = this.scanner.get();
+            switch (o) {
               case "~":
                 return [4, null];
               case "P":
@@ -456,78 +456,99 @@ class O {
                 return [7, null];
               case "X":
                 return [8, null];
-              case "S":
-                return this.parseStacking();
+              case "S": {
+                this.inStackContext = !0;
+                const c = this.parseStacking();
+                return this.inStackContext = !1, c;
+              }
               case "m":
               case "M":
                 if (this.scanner.peek() === "+") {
                   this.scanner.consume(1);
-                  const l = (c = this.scanner.tail.match(/^[0-9A-Fa-f]{4}/)) == null ? void 0 : c[0];
-                  if (l) {
+                  const c = (h = this.scanner.tail.match(/^[0-9A-Fa-f]{4}/)) == null ? void 0 : h[0];
+                  if (c) {
                     this.scanner.consume(4);
-                    const d = this.decodeMultiByteChar(l);
-                    return i ? [1, i] : [1, d];
+                    const p = this.decodeMultiByteChar(c);
+                    return i ? [1, i] : [1, p];
                   }
                   this.scanner.consume(-1);
                 }
                 i += "\\M";
                 continue;
               default:
-                if (h)
+                if (o)
                   try {
-                    const l = this.parseProperties(h);
-                    if (this.yieldPropertyCommands && l)
-                      return this.lastCtx = this.ctx.copy(), [9, l];
+                    const c = this.parseProperties(o);
+                    if (this.yieldPropertyCommands && c)
+                      return this.lastCtx = this.ctx.copy(), [9, c];
                     continue;
                   } catch {
-                    const l = this.scanner.tail.slice(
-                      o,
+                    const c = this.scanner.tail.slice(
+                      l,
                       this.scanner.currentIndex
                     );
-                    i += l;
+                    i += c;
                   }
             }
             continue;
           }
-        if (a === "%" && this.scanner.peek(1) === "%") {
-          const h = this.scanner.peek(2).toLowerCase(), l = m[h];
-          if (l) {
-            this.scanner.consume(3), i += l;
+        if (n === "%" && this.scanner.peek(1) === "%") {
+          const o = this.scanner.peek(2).toLowerCase(), c = m[o];
+          if (c) {
+            this.scanner.consume(3), i += c;
             continue;
           } else {
             this.scanner.consume(3);
             continue;
           }
         }
-        if (a === " ")
+        if (n === " ")
           return i ? (this.scanner.consume(1), r = 3, [1, i]) : (this.scanner.consume(1), [3, null]);
         if (!u) {
-          if (a === "{") {
+          if (n === "{") {
             if (i)
               return [1, i];
             this.scanner.consume(1), this.pushCtx();
             continue;
-          } else if (a === "}") {
+          } else if (n === "}") {
             if (i)
               return [1, i];
             this.scanner.consume(1), this.popCtx();
             continue;
           }
         }
-        this.scanner.consume(1), a.charCodeAt(0) >= 32 && (i += a);
+        if (!this.inStackContext && n === "^") {
+          const o = this.scanner.peek(1);
+          if (o) {
+            const c = o.charCodeAt(0);
+            if (this.scanner.consume(2), c === 32)
+              i += "^";
+            else {
+              if (c === 73)
+                return i ? [1, i] : [5, null];
+              if (c === 74)
+                return i ? [1, i] : [6, null];
+              if (c === 77)
+                continue;
+              i += "▯";
+            }
+            continue;
+          }
+        }
+        this.scanner.consume(1), n.charCodeAt(0) >= 32 && (i += n);
       }
       return i ? [1, i] : [0, null];
     };
     for (; ; ) {
-      const [i, c] = n();
+      const [i, h] = a();
       if (i)
-        yield new f(i, this.ctx, c), r && (yield new f(r, this.ctx, null), r = null);
+        yield new d(i, this.ctx, h), r && (yield new d(r, this.ctx, null), r = null);
       else
         break;
     }
   }
 }
-class p {
+class f {
   /**
    * Create a new text scanner
    * @param text - The text to scan
@@ -764,7 +785,7 @@ class 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;
   }
 }
-class f {
+class d {
   /**
    * Create a new MText token
    * @param type - The token type
@@ -779,15 +800,14 @@ export {
   g as MTextContext,
   b as MTextLineAlignment,
   E as MTextParagraphAlignment,
-  O as MTextParser,
+  N as MTextParser,
   F as MTextStroke,
-  f as MTextToken,
-  p as TextScanner,
+  d as MTextToken,
+  f as TextScanner,
   k as TokenType,
-  S as caretDecode,
-  I as escapeDxfLineEndings,
-  N as hasInlineFormattingCodes,
-  R as int2rgb,
-  v as rgb2int
+  v as escapeDxfLineEndings,
+  I as hasInlineFormattingCodes,
+  S as int2rgb,
+  R as rgb2int
 };
 //# sourceMappingURL=parser.es.js.map