@mlightcad/mtext-renderer 0.7.3 → 0.7.4

package/dist/index.js

@@ -9896,7 +9896,7 @@ class Mh extends Ma {
     return new fa("?", e, this);
   }
 }
-class le {
+let le = class {
   /**
    * Converts an unsigned byte to a signed byte as used in SHX format.
    * Values > 127 are converted to their signed equivalent (-128 to -1).
@@ -10051,7 +10051,7 @@ class le {
       `Position ${e} is out of range for the data length ${this.data.byteLength}!`
     );
   }
-}
+};
 var fe = /* @__PURE__ */ ((t) => (t.SHAPES = "shapes", t.BIGFONT = "bigfont", t.UNIFONT = "unifont", t))(fe || {});
 class Ih {
   parse(e) {
@@ -22704,27 +22704,53 @@ class Ll {
   constructor(e, r, n = {}) {
     this.continueStroke = !1, this.inStackContext = !1, this.scanner = new Er(e);
     const a = r ?? new Ut();
-    this.ctxStack = new Ol(a), this.yieldPropertyCommands = n.yieldPropertyCommands ?? !1, this.resetParagraphParameters = n.resetParagraphParameters ?? !1;
+    this.ctxStack = new Ol(a), this.yieldPropertyCommands = n.yieldPropertyCommands ?? !1, this.resetParagraphParameters = n.resetParagraphParameters ?? !1, this.mifDecoder = n.mifDecoder ?? this.decodeMultiByteChar.bind(this), this.mifCodeLength = n.mifCodeLength ?? "auto";
   }
   /**
    * Decode multi-byte character from hex code
-   * @param hex - Hex code string (e.g. "C4E3")
+   * @param hex - Hex code string (e.g. "C4E3" or "1A2B3")
    * @returns Decoded character or empty square if invalid
    */
   decodeMultiByteChar(e) {
     try {
-      const r = new Uint8Array([
-        parseInt(e.substr(0, 2), 16),
-        parseInt(e.substr(2, 2), 16)
-      ]), n = new TextDecoder("gbk").decode(r);
-      if (n !== "▯")
-        return n;
-      const a = new TextDecoder("big5").decode(r);
-      return a !== "▯" ? a : "▯";
+      if (e.length === 5) {
+        const r = e[0];
+        let n = "gbk";
+        r === "1" ? n = "shift-jis" : r === "2" && (n = "big5");
+        const a = new Uint8Array([
+          parseInt(e.substr(1, 2), 16),
+          parseInt(e.substr(3, 2), 16)
+        ]);
+        return new TextDecoder(n).decode(a);
+      } else if (e.length === 4) {
+        const r = new Uint8Array([
+          parseInt(e.substr(0, 2), 16),
+          parseInt(e.substr(2, 2), 16)
+        ]), n = new TextDecoder("gbk").decode(r);
+        if (n !== "▯")
+          return n;
+        const a = new TextDecoder("big5").decode(r);
+        if (a !== "▯")
+          return a;
+      }
+      return "▯";
     } catch {
       return "▯";
     }
   }
+  /**
+   * Extract MIF hex code from scanner
+   * @param length - The length of the hex code to extract (4 or 5), or 'auto' to detect
+   * @returns The extracted hex code, or null if not found
+   */
+  extractMifCode(e) {
+    var r, n, a;
+    if (e === "auto") {
+      const i = (r = this.scanner.tail.match(/^[0-9A-Fa-f]{5}/)) == null ? void 0 : r[0];
+      return i || ((n = this.scanner.tail.match(/^[0-9A-Fa-f]{4}/)) == null ? void 0 : n[0]) || null;
+    } else
+      return ((a = this.scanner.tail.match(new RegExp(`^[0-9A-Fa-f]{${e}}`))) == null ? void 0 : a[0]) || null;
+  }
   /**
    * Push current context onto the stack
    */
@@ -23110,28 +23136,27 @@ class Ll {
       return i.indent !== 0 && (s.indent = 0), i.left !== 0 && (s.left = 0), i.right !== 0 && (s.right = 0), i.align !== 0 && (s.align = 0), JSON.stringify(i.tabs) !== JSON.stringify([]) && (s.tabs = []), s;
     }
     const n = () => {
-      var a;
-      let i = "";
+      let a = "";
       for (; this.scanner.hasData; ) {
-        let s = !1, o = this.scanner.peek();
-        const c = this.scanner.currentIndex;
-        if (o.charCodeAt(0) < 32) {
-          if (this.scanner.consume(1), o === "	")
+        let i = !1, s = this.scanner.peek();
+        const o = this.scanner.currentIndex;
+        if (s.charCodeAt(0) < 32) {
+          if (this.scanner.consume(1), s === "	")
             return [5, null];
-          if (o === `
+          if (s === `
 `)
             return [6, null];
-          o = " ";
+          s = " ";
         }
-        if (o === "\\")
+        if (s === "\\")
           if ("\\{}".includes(this.scanner.peek(1)))
-            s = !0, this.scanner.consume(1), o = this.scanner.peek();
+            i = !0, this.scanner.consume(1), s = this.scanner.peek();
           else {
-            if (i)
-              return [1, i];
+            if (a)
+              return [1, a];
             this.scanner.consume(1);
-            const u = this.scanner.get();
-            switch (u) {
+            const c = this.scanner.get();
+            switch (c) {
               case "~":
                 return [4, null];
               case "P":
@@ -23142,116 +23167,116 @@ class Ll {
                 return [8, null];
               case "S": {
                 this.inStackContext = !0;
-                const h = this.parseStacking();
-                return this.inStackContext = !1, h;
+                const u = this.parseStacking();
+                return this.inStackContext = !1, u;
               }
               case "m":
               case "M":
                 if (this.scanner.peek() === "+") {
                   this.scanner.consume(1);
-                  const h = (a = this.scanner.tail.match(/^[0-9A-Fa-f]{4}/)) == null ? void 0 : a[0];
-                  if (h) {
-                    this.scanner.consume(4);
-                    const d = this.decodeMultiByteChar(h);
-                    return i ? [1, i] : [1, d];
+                  const u = this.extractMifCode(this.mifCodeLength);
+                  if (u) {
+                    this.scanner.consume(u.length);
+                    const h = this.mifDecoder(u);
+                    return a ? [1, a] : [1, h];
                   }
                   this.scanner.consume(-1);
                 }
-                i += "\\M";
+                a += "\\M";
                 continue;
               case "U":
                 if (this.scanner.peek() === "+") {
                   this.scanner.consume(1);
-                  const h = this.scanner.tail.match(/^[0-9A-Fa-f]{4,8}/);
-                  if (h) {
-                    const d = h[0];
-                    this.scanner.consume(d.length);
-                    const p = parseInt(d, 16);
-                    let g = "";
+                  const u = this.scanner.tail.match(/^[0-9A-Fa-f]{4,8}/);
+                  if (u) {
+                    const h = u[0];
+                    this.scanner.consume(h.length);
+                    const d = parseInt(h, 16);
+                    let p = "";
                     try {
-                      g = String.fromCodePoint(p);
+                      p = String.fromCodePoint(d);
                     } catch {
-                      g = "▯";
+                      p = "▯";
                     }
-                    return i ? [1, i] : [1, g];
+                    return a ? [1, a] : [1, p];
                   }
                   this.scanner.consume(-1);
                 }
-                i += "\\U";
+                a += "\\U";
                 continue;
               default:
-                if (u)
+                if (c)
                   try {
-                    const h = this.parseProperties(u);
-                    if (this.yieldPropertyCommands && h)
-                      return [9, h];
+                    const u = this.parseProperties(c);
+                    if (this.yieldPropertyCommands && u)
+                      return [9, u];
                     continue;
                   } catch {
-                    const h = this.scanner.tail.slice(
-                      c,
+                    const u = this.scanner.tail.slice(
+                      o,
                       this.scanner.currentIndex
                     );
-                    i += h;
+                    a += u;
                   }
             }
             continue;
           }
-        if (o === "%" && this.scanner.peek(1) === "%") {
-          const u = this.scanner.peek(2).toLowerCase(), h = Ul[u];
-          if (h) {
-            this.scanner.consume(3), i += h;
+        if (s === "%" && this.scanner.peek(1) === "%") {
+          const c = this.scanner.peek(2).toLowerCase(), u = Ul[c];
+          if (u) {
+            this.scanner.consume(3), a += u;
             continue;
           } else {
             this.scanner.consume(3);
             continue;
           }
         }
-        if (o === " ")
-          return i ? (this.scanner.consume(1), e = 3, [1, i]) : (this.scanner.consume(1), [3, null]);
-        if (!s) {
-          if (o === "{") {
-            if (i)
-              return [1, i];
+        if (s === " ")
+          return a ? (this.scanner.consume(1), e = 3, [1, a]) : (this.scanner.consume(1), [3, null]);
+        if (!i) {
+          if (s === "{") {
+            if (a)
+              return [1, a];
             this.scanner.consume(1), this.pushCtx();
             continue;
-          } else if (o === "}") {
-            if (i)
-              return [1, i];
+          } else if (s === "}") {
+            if (a)
+              return [1, a];
             if (this.scanner.consume(1), this.yieldPropertyCommands) {
-              const u = this.ctxStack.current;
+              const c = this.ctxStack.current;
               this.popCtx();
-              const h = this.getPropertyChanges(u, this.ctxStack.current);
-              if (Object.keys(h).length > 0)
+              const u = this.getPropertyChanges(c, this.ctxStack.current);
+              if (Object.keys(u).length > 0)
                 return [
                   9,
-                  { command: void 0, changes: h, depth: this.ctxStack.depth }
+                  { command: void 0, changes: u, depth: this.ctxStack.depth }
                 ];
             } else
               this.popCtx();
             continue;
           }
         }
-        if (!this.inStackContext && o === "^") {
-          const u = this.scanner.peek(1);
-          if (u) {
-            const h = u.charCodeAt(0);
-            if (this.scanner.consume(2), h === 32)
-              i += "^";
+        if (!this.inStackContext && s === "^") {
+          const c = this.scanner.peek(1);
+          if (c) {
+            const u = c.charCodeAt(0);
+            if (this.scanner.consume(2), u === 32)
+              a += "^";
             else {
-              if (h === 73)
-                return i ? [1, i] : [5, null];
-              if (h === 74)
-                return i ? [1, i] : [6, null];
-              if (h === 77)
+              if (u === 73)
+                return a ? [1, a] : [5, null];
+              if (u === 74)
+                return a ? [1, a] : [6, null];
+              if (u === 77)
                 continue;
-              i += "▯";
+              a += "▯";
             }
             continue;
           }
         }
-        this.scanner.consume(1), o.charCodeAt(0) >= 32 && (i += o);
+        this.scanner.consume(1), s.charCodeAt(0) >= 32 && (a += s);
       }
-      return i ? [1, i] : [0, null];
+      return a ? [1, a] : [0, null];
     };
     for (; ; ) {
       const [a, i] = n.call(this);
@@ -24844,7 +24869,7 @@ class _l {
     this.isInitialized || (await this.loadFonts([Le.instance.defaultFont]), this.isInitialized = !0);
   }
 }
-class Hl {
+class zl {
   /**
    * Constructor
    *
@@ -24934,6 +24959,6 @@ export {
   wt as MTextFlowDirection,
   _l as MainThreadRenderer,
   Ii as StyleManager,
-  Hl as UnifiedRenderer,
+  zl as UnifiedRenderer,
   Pl as WebWorkerRenderer
 };