xmmath 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xmmath",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "description": "",
     "main": "./dist/xmmath.umd.js",
     "module": "./dist/xmmath.es.js",

package/src/main.ts

@@ -27,7 +27,7 @@ const mathvariant = "mathvariant";
 import GraphemeSplitter from "grapheme-splitter";
 var splitter = new GraphemeSplitter();
 
-type vtype = "" | "str" | "v" | "f" | "blank" | "group";
+type vtype = "" | "str" | "v" | "f" | "blank" | "group" | "group1"; // group1组合基本类型，提高优先级
 type tree = { type: vtype; value: string; children?: tree; esc?: boolean }[];
 
 function ast(str: string) {
@@ -159,7 +159,7 @@ function ast(str: string) {
 }
 
 import symbols from "./symbols.json?raw";
-/** @see https://github.com/typst/typst/blob/6c542ea1a4a0ee85069dad6974ff331851eff406/library/src/symbols/sym.rs */
+/** @see https://github.com/typst/typst/blob/v0.6.0/library/src/symbols/sym.rs */
 let s = JSON.parse(symbols);
 
 // symbols路径简写
@@ -721,14 +721,20 @@ function in_kh(x: tree) {
     return k;
 }
 
+function is_sup(x: tree[0]) {
+    return x && x.type == "v" && x.value == "^" && !x.esc;
+}
+
+function is_sub(x: tree[0]) {
+    return x && x.type == "v" && x.value == "_" && !x.esc;
+}
+
 function is_frac(x: tree[0]) {
-    if (!x) return false;
-    return x.value == "/" && !x.esc;
+    return x && x.type == "v" && x.value == "/" && !x.esc;
 }
 
 function is_br(x: tree[0]) {
-    if (!x) return false;
-    return x.value == "br" && x.esc;
+    return x && x.value == "br" && x.esc;
 }
 
 function is_limit(tree: tree) {
@@ -770,6 +776,14 @@ function is_dot(x: tree[0]) {
     return x && x.type == "v" && x.value == ".";
 }
 
+function is_dot_f(x: tree[0]) {
+    return x && (x.type == "f" || (x.type == "v" && x.value.match(/[a-z]/)));
+}
+
+function is_factorial(x: tree[0]) {
+    return x && x.type == "v" && x.value == "!" && !x.esc;
+}
+
 let dh: tree[0] = { type: "v", value: "," };
 
 function v_f(str: string): tree[0] {
@@ -922,6 +936,29 @@ function ast2(tree: tree) {
         tree = t;
     }
 
+    // 处理!
+    {
+        let t: tree = [];
+        let tmpx: tree = [];
+        for (let n = 0; n < tree.length; n++) {
+            let x = tree[n];
+
+            if (is_factorial(tree?.[n + 1]) && !is_sup(x) && !is_sub(x) && !is_frac(x)) {
+                tmpx.push(x);
+            } else {
+                if (tmpx.length) {
+                    tmpx.push(x);
+                    t.push({ type: "group1", value: "", children: tmpx });
+                    tmpx = [];
+                } else {
+                    t.push(x);
+                }
+            }
+        }
+
+        tree = t;
+    }
+
     // 处理带.的f
     {
         let t: tree = [];
@@ -929,11 +966,15 @@ function ast2(tree: tree) {
         for (let n = 0; n < tree.length; n++) {
             let x = tree[n];
 
-            if (x.type == "f" && is_dot(tree[n + 1])) {
-                f += x.value + ".";
-                n++;
-                continue;
-            } else if (f && x.type == "f") {
+            if (is_dot_f(x) && is_dot(tree[n + 1])) {
+                if (f || (!f && x.type == "f")) {
+                    f += x.value + ".";
+                    n++;
+                    continue;
+                } else {
+                    t.push(x);
+                }
+            } else if (f && is_dot_f(x)) {
                 f += x.value;
                 if (!is_dot(tree[n + 1])) {
                     t.push({ type: "f", value: f });
@@ -990,17 +1031,11 @@ function ast2(tree: tree) {
         let start = NaN;
         for (let n = 0; n < tree.length; n++) {
             const x = tree[n];
-            if (x.value != "^" && x.value != "_") {
-                if (
-                    (tree[n + 1]?.value == "^" || tree[n + 1]?.value == "_") &&
-                    !(tree[n - 1]?.value == "^" || tree[n - 1]?.value == "_")
-                ) {
+            if (!is_sup(x) && !is_sub(x)) {
+                if ((is_sup(tree[n + 1]) || is_sub(tree[n + 1])) && !(is_sup(tree[n - 1]) || is_sub(tree[n - 1]))) {
                     if (!start) start = n;
                 }
-                if (
-                    (tree[n - 1]?.value == "^" || tree[n - 1]?.value == "_") &&
-                    !(tree[n + 1]?.value == "^" || tree[n + 1]?.value == "_")
-                ) {
+                if ((is_sup(tree[n - 1]) || is_sub(tree[n - 1])) && !(is_sup(tree[n + 1]) || is_sub(tree[n + 1]))) {
                     index.push([start, n]);
                     start = NaN;
                 }
@@ -1013,7 +1048,7 @@ function ast2(tree: tree) {
                 {
                     let tmp: tree[0] = tree[index[0][1]];
                     for (let i = index[0][1]; i >= index[0][0]; i--) {
-                        if (tree[i - 1]?.value == "^" && tree[i - 3]?.value == "_") {
+                        if (is_sup(tree[i - 1]) && is_sub(tree[i - 3])) {
                             let o = is_limit([tree[i - 4]])
                                 ? { t: out_kh(tmp), b: out_kh(tree[i - 2]) }
                                 : { tr: out_kh(tmp), br: out_kh(tree[i - 2]) };
@@ -1025,7 +1060,7 @@ function ast2(tree: tree) {
                             i -= 4 - 1;
                             continue;
                         }
-                        if (tree[i - 1]?.value == "_" && tree[i - 3]?.value == "^") {
+                        if (is_sub(tree[i - 1]) && is_sup(tree[i - 3])) {
                             let o = is_limit([tree[i - 4]])
                                 ? { t: out_kh(tree[i - 2]), b: out_kh(tmp) }
                                 : { tr: out_kh(tree[i - 2]), br: out_kh(tmp) };
@@ -1037,7 +1072,7 @@ function ast2(tree: tree) {
                             i -= 4 - 1;
                             continue;
                         }
-                        if (tree[i - 1]?.value == "^") {
+                        if (is_sup(tree[i - 1])) {
                             let o = is_limit([tree[i - 2]]) ? { t: out_kh(tmp) } : { tr: out_kh(tmp) };
                             tmp = {
                                 type: "f",
@@ -1047,7 +1082,7 @@ function ast2(tree: tree) {
                             i -= 2 - 1;
                             continue;
                         }
-                        if (tree[i - 1]?.value == "_") {
+                        if (is_sub(tree[i - 1])) {
                             let o = is_limit([tree[i - 2]]) ? { b: out_kh(tmp) } : { br: out_kh(tmp) };
                             tmp = {
                                 type: "f",
@@ -1094,7 +1129,7 @@ function ast2(tree: tree) {
                 {
                     let tmp: tree[0] = tree[index[0][0]];
                     for (let i = index[0][0]; i <= index[0][1]; i++) {
-                        if (tree[i + 1]?.value == "/") {
+                        if (is_frac(tree[i + 1])) {
                             tmp = {
                                 type: "f",
                                 value: "frac",
@@ -1294,6 +1329,19 @@ function render(tree: tree, e?: fonts) {
         }
     }
 
+    // 移除group1
+    {
+        let t: tree = [];
+        for (let x of tree) {
+            if (x.type == "group1") {
+                t.push(...x.children);
+            } else {
+                t.push(x);
+            }
+        }
+        tree = t;
+    }
+
     for (let i in tree) {
         let n = Number(i);
         let x = tree[n];

package/src/symbols.json

@@ -185,6 +185,7 @@
             "dot": "⋗",
             "double": "≫",
             "eq": "≥",
+            "eq.slant": "⩾",
             "eq.lt": "⋛",
             "eq.not": "≱",
             "eqq": "≧",
@@ -211,6 +212,7 @@
             "dot": "⋖",
             "double": "≪",
             "eq": "≤",
+            "eq.slant": "⩽",
             "eq.gt": "⋚",
             "eq.not": "≰",
             "eqq": "≦",