xmmath 1.0.3 → 1.0.4

package/package.json

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

package/src/main.ts

@@ -7,39 +7,13 @@ function createEl(tagname: string) {
     return document.createElement(tagname);
 }
 
-type mathtag =
-    | "math"
-    | "menclose"
-    | "merror"
-    | "mfrac"
-    | "mi"
-    | "mmultiscripts"
-    | "mprescripts"
-    | "mn"
-    | "mo"
-    | "mover"
-    | "mpadded"
-    | "mphantom"
-    | "mroot"
-    | "mrow"
-    | "ms"
-    | "mspace"
-    | "msqrt"
-    | "mstyle"
-    | "msub"
-    | "msubsup"
-    | "msup"
-    | "mtable"
-    | "mtd"
-    | "mtext"
-    | "mtr"
-    | "munder"
-    | "munderover"
-    | "semantics";
-
-function createMath(tagname: mathtag, innerText?: string, attr?: { [name: string]: string }) {
-    let el = document.createElement(tagname);
-    if (innerText) el.innerText = innerText;
+function createMath<K extends keyof MathMLElementTagNameMap>(
+    tagname: K,
+    innerText?: string,
+    attr?: { [name: string]: string }
+) {
+    let el = document.createElementNS("http://www.w3.org/1998/Math/MathML", tagname);
+    if (innerText) el.textContent = innerText;
     if (attr) {
         for (let i in attr) {
             el.setAttribute(i, attr[i]);
@@ -169,16 +143,16 @@ function ast(str: string) {
             } else {
                 p_tree.push({ tree: now_tree, close: false });
                 now_tree.push({ type: "group", value: tmp_str, children: [] });
-                now_tree = now_tree[now_tree.length - 1].children;
+                now_tree = now_tree.at(-1).children;
                 tmp_str = "";
                 continue;
             }
         }
         if (t == ")") {
-            if (p_tree[p_tree.length - 1]) {
-                if (p_tree[p_tree.length - 1].close == false) {
-                    p_tree[p_tree.length - 1].close = true;
-                    now_tree = p_tree[p_tree.length - 1].tree;
+            if (p_tree.at(-1)) {
+                if (p_tree.at(-1).close == false) {
+                    p_tree.at(-1).close = true;
+                    now_tree = p_tree.at(-1).tree;
                     p_tree.pop();
                     continue;
                 }
@@ -289,8 +263,7 @@ let f = {
     attach: (attr: tree[], dic: fdic) => {
         let base = createMath("mrow");
         base.append(render(attr[0]));
-        let el = createMath("mmultiscripts");
-        el.append(base);
+        let el: MathMLElement;
         let tl = createMath("mrow");
         if (dic.tl) tl.append(render(dic.tl));
         let bl = createMath("mrow");
@@ -300,23 +273,33 @@ let f = {
         let br = createMath("mrow");
         if (dic.br) br.append(render(dic.br));
         if (dic.tl || dic.bl || dic.tr || dic.br) {
-            el.append(br, tr, createMath("mprescripts"), bl, tl);
+            if (dic.tl || dic.bl) {
+                el = createMath("mmultiscripts");
+                el.append(base, br, tr, createMath("mprescripts"), bl, tl);
+            } else if (dic.tr && dic.br) {
+                el = createMath("msubsup");
+                el.append(base, br, tr);
+            } else if (dic.tr) {
+                el = createMath("msup");
+                el.append(base, tr);
+            } else {
+                el = createMath("msub");
+                el.append(base, br);
+            }
         }
         if (dic.t || dic.b) {
-            let ud = createMath("munderover");
-            if (el.children.length == 1) {
-                let base = createMath("mrow");
-                base.append(render(attr[0]));
-                ud.append(base);
+            let uo = createMath("munderover");
+            if (!el) {
+                uo.append(base);
             } else {
-                ud.append(el);
+                uo.append(el);
             }
             let t = createMath("mrow");
             if (dic.t) t.append(render(dic.t));
             let b = createMath("mrow");
             if (dic.b) b.append(render(dic.b));
-            ud.append(b, t);
-            el = ud;
+            uo.append(b, t);
+            el = uo;
         }
         return el;
     },
@@ -505,7 +488,30 @@ let f = {
         let t = createMath("mtable");
         for (let i of attr) {
             let r = createMath("mtr");
-            r.append(render(i));
+
+            // 按&拆分
+            let result: tree[] = [];
+            let tmp_group: tree = [];
+            for (let n = 0; n < i.length; n++) {
+                if (!i[n].esc && i[n].value == "&") {
+                    if (tmp_group.length > 0) {
+                        result.push(tmp_group);
+                        tmp_group = [];
+                    }
+                } else {
+                    tmp_group.push(i[n]);
+                }
+            }
+            if (tmp_group.length > 0) {
+                result.push(tmp_group);
+            }
+
+            for (let i of result) {
+                let d = createMath("mtd");
+                r.append(d);
+                d.append(render(i));
+            }
+
             t.append(r);
         }
         return t;
@@ -644,10 +650,10 @@ function underover_f(type: "under" | "over", tree: tree, x: string, str?: tree)
 function kh(tree: tree) {
     let f = createMath("mrow");
     let l = createMath("mo");
-    l.innerText = "(";
+    l.textContent = "(";
     let c = render(tree);
     let r = createMath("mo");
-    r.innerText = ")";
+    r.textContent = ")";
     f.append(l, c, r);
     return f;
 }
@@ -716,6 +722,9 @@ function dic_to_ast(dic: { [id: string]: tree }) {
     for (let i in dic) {
         l.push({ type: "f", value: i });
         l.push({ type: "v", value: ":" });
+        for (let x of dic[i]) {
+            if (x.type == "v" && x.value == ",") x.esc = true;
+        }
         l.push(...dic[i]);
         if (Number(i) + 1 != Object.keys(dic).length) {
             l.push(dh);
@@ -782,11 +791,11 @@ function ast2(tree: tree) {
                         nn++;
                     }
                     if (l.length) {
-                        let nx: tree[0] = { type: "f", value: shorthand[l[l.length - 1]] };
+                        let nx: tree[0] = { type: "f", value: shorthand[l.at(-1)] };
                         t.push(nx);
 
                         // 不处理已经后面连起来的字符
-                        continue_c = l[l.length - 1].length - 1;
+                        continue_c = l.at(-1).length - 1;
                     } else {
                         t.push(x);
                     }
@@ -1134,7 +1143,7 @@ function render(tree: tree) {
                     if (is_f_mark(t, ",")) {
                         if (type == "dic") {
                             dicl.push(l);
-                            l = [];
+                            type = "array";
                         } else {
                             attr.push(l);
                         }
@@ -1184,7 +1193,13 @@ function render(tree: tree) {
 
         if (x.type == "f" && !x.children) {
             if (ss[x.value]) {
-                let el = createMath("mo", ss[x.value]);
+                let tag: keyof MathMLElementTagNameMap;
+                if (x.value.match(/[a-zA-Z\u0391-\u03C9]/)) {
+                    tag = "mi";
+                } else {
+                    tag = "mo";
+                }
+                let el = createMath(tag, ss[x.value]);
                 fragment.append(el);
             } else {
                 if (f[x.value]) {
@@ -1200,10 +1215,10 @@ function render(tree: tree) {
         }
 
         if (x.type == "v") {
-            let tag: mathtag;
+            let tag: keyof MathMLElementTagNameMap;
             if (x.value.match(/[0-9]+/)) {
                 tag = "mn";
-            } else if (x.value.match(/[a-zA-Z]/)) {
+            } else if (x.value.match(/[a-zA-Z\u0391-\u03C9]/)) {
                 tag = "mi";
             } else {
                 tag = "mo";
@@ -1224,7 +1239,7 @@ function toMML(str: string) {
     let obj = ast(str);
     console.log(obj);
 
-    let mathEl = createEl("math");
+    let mathEl = createMath("math");
     mathEl.setAttribute("display", "block");
     let f = render(obj);
     mathEl.append(f);

package/test/text.html

@@ -1,32 +0,0 @@
-<html lang="">
-
-<head>
-    <meta charset="utf-8">
-    <title></title>
-</head>
-
-<body>
-
-    <textarea name="" id="" cols="30" rows="10"></textarea>
-
-    <script src="../dist/xmmath.umd.js"></script>
-    <script>
-        let text = document.querySelector('textarea')
-        let div = document.createElement('div')
-        document.body.append(div)
-        text.oninput = () => {
-            div.innerHTML = xmmath.toMMLHTML(text.value)
-        }
-        let l = ['x^2y^2', 'attach(F,bl:2,br:3)', "(x+y^2)/(k+1)", "x+y^(2/(k+1))", 'a/(b\\/2)', "a_0+1/(a_1+1/(a_2+1/(a_3+1/a_4)))", "attach(Pi, t: alpha, b: beta,tl: 1, tr: 2+3, bl: 4+5, br: 6,)", `binom(n,k\\/2)`, `binom(p,2)x^2y^(p-2)-1/(1-x) 1/(1-x^2)`, `sum_(0<=i<=m\\ 0<j<n) P(i,j)`, `x^(2y)`, `sum^p_(i=1)sum^q_(j=1)sum^r_(k=1) a_(i j)b_(j k)c_(k i)`, 'sqrt(1+sqrt(1+sqrt(1+sqrt(1+sqrt(1+sqrt(1+sqrt(1+x)))))))', '(diff^2/(diff x^2)+diff^2/(diff y^2))abs(phi (x+"i" y))^2=0', '2^2^2^x', 'integral^x_1(d t)/t', 'integral integral_D d x d y', 'f(x)=cases(1 \\/ 3 "if" 0<= x <=1";",2\\/3 "if"3<=x<=4";")', 'overbrace(x+dots+x,k"times")', 'sum_(p"prime")f(p)=integral_(t>1)f(t)d Pi(t)', '{underbrace(overbrace(a\\,dots\\,a),overbrace(b\\,dots\\,b))}', 'mat(mat(a,b;c,d),mat(e,f;g,h);0,mat(i,j;k,l))', 'det mat(delim:"|",c_0,c_1,c_2,dots,c_n;c_1)>0', 'y_x_2', 'x^31415_92+Pi', 'x^(z^c_d)_(y^a_b)', "y^(''')_3", 'lim_(n->+oo)sqrt(2Pi n)/(n!)(n/e)^n=1', 'det(A)=sum_(sigma in S_n)epsilon.alt(sigma)product^n_(i=1)a_(i,sigma_i)']
-        for (let i of l) {
-            let div = document.createElement('div')
-            let p = document.createElement('pre')
-            p.innerText = i
-            div.append(p)
-            div.insertAdjacentHTML('beforeend', xmmath.toMMLHTML(i))
-            document.body.append(div)
-        }
-    </script>
-</body>
-
-</html>