efront 4.35.2 → 4.35.4

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -40,6 +40,9 @@
 - zh-CN: 禁用
   en:    Disable
 
+- zh-CN: 代码结构错误
+  en:    Code structure error
+
 - zh-CN: 复制失败!
   en:    Copy failed!
 

package/coms/basic/#loader.js

@@ -524,7 +524,7 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}, a
     var _this = isModuleInit ? exports : window;
     var argsPromises = argsList.filter(isThenable);
     argsList = argsList.concat(exec.strs);
-    argsList.push(compiledNames || []);
+    argsList.push(exec, argsList, compiledNames || []);
     if (!argsPromises.length) {
         return exec.apply(_this, argsList);
     }

package/coms/basic/Table.js

@@ -54,6 +54,32 @@ class Table extends Array {
         });
         this.update();
     }
+    clone() {
+        var t = new Table;
+        t.fields = this.fields;
+        t.source = this.source;
+        t.searchFields = this.searchFields;
+        t.summaryFields = this.summaryFields;
+        return t;
+    }
+    toSorted(field) {
+        var t = this.clone();
+        t.sort(field);
+        return t;
+    }
+    toReversed() {
+        var t = this.clone();
+        t.length = this.length;
+        for (var cx = 0, dx = this.length; cx < dx; cx++) {
+            t[dx - cx] = this[cx];
+        }
+        return t;
+    }
+    toSpliced() {
+        var t = this.clone();
+        t.splice.apply(t, arguments);
+        return t;
+    }
     unsort() {
         this.sorted = null;
         this.update();

package/coms/basic/escapeRegExp.js

@@ -0,0 +1,24 @@
+if (RegExp.escape) return RegExp.escape;
+var tnvfr = 'tnvfr';
+var replaceFirst = function (m) {
+    return "\\x" + m.charCodeAt().toString(16)
+}
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#white_space
+// https://util.unicode.org/UnicodeJsps/list-unicodeset.jsp?a=%5Cp%7BGeneral_Category%3DSpace_Separator%7D
+var syntaxReg = /(^[0-9a-fA-F])|([\^\$\\\.\*\+\?\(\)\[\]\{\}\|\/])|([,\-\=\<\>#\&\!%\:;@~'`"\x20\xa0])|([\u0009-\u000d])|([\ud800-\udfff\ufeff\u2028\u2029\u1680\u2000-\u200a\u202f\u205f\u3000])/g;
+var replaceSynax = function (_, z, a, b, c, d) {
+    if (z) return replaceFirst(z);
+    if (a) return "\\" + a;
+    if (b) return "\\x" + b.charCodeAt().toString(16);
+    if (c) return "\\" + tnvfr.charAt(c.charCodeAt() - 9);
+    if (d) {
+        d = d.charCodeAt();
+        if (d <= 0xff) return "\\u00" + d.toString(16);
+        return "\\u" + d.toString(16);
+    }
+    return _;
+}
+function escapeRegExp(string) {
+    return string.replace(syntaxReg, replaceSynax)
+
+}

package/coms/basic/escapeRegExp_test.js

@@ -0,0 +1,35 @@
+var escape = RegExp.escape;
+delete RegExp.escape;
+var escapeRegExp = require("./escapeRegExp");
+var test = function (a) {
+    assert(escapeRegExp(a), escape(a))
+};
+
+test('0')
+test('9')
+test('a')
+test('b')
+test('c')
+test('d')
+test('e')
+test('f')
+test('foo')
+test(' ');
+test('\u00a0')
+test('\u0085')
+test('\ufeff')
+test('\ufffe')
+test('\u8fff')
+test('\u8fff')
+test('\u1680')
+test('\u2000')
+test('\u2009')
+test('\u0009')
+test('\u0008')
+test('\u000d')
+test('\u202f')
+test('\u2028')
+test('\u2029')
+test('\u3000')
+test('\u2000')
+test('\u1680')

package/coms/basic/math.js

@@ -3,6 +3,7 @@ var mo3 = (o, args) => args.length === 1 ? args[0] + `<ms>${o}</ms>` : args.join
 var ms = s => `<ms>${s}</ms>`;
 var mroot = (d, z) => `<mroot>${d}${z}</mroot>`;
 var msqrt = a => `<msqrt>${a}</msqrt>`;
+var mdot = a => `<mover><mn>${a}</mn><ms>・</ms></mover>`;
 var mi = s => `<mi>${s}</mi>`;
 var mn = s => `<mn>${s}</mn>`;
 var mi2 = (s, a, n) => {
@@ -50,7 +51,50 @@ var 三角函数 = {
     "csc"(a, n) {
         return mi2("csc", a, n);
     },
+    "arcsin"(a, n) {
+        return mi2("arcsin", a, n);
+    },
+    "arccos"(a, n) {
+        return mi2("arccos", a, n);
+    },
+    "arctan"(a, n) {
+        return mi2("arctan", a, n);
+    },
+    "arccot"(a, n) {
+        return mi2("arccot", a, n);
+    },
+    "arcsec"(a, n) {
+        return mi2("arcsec", a, n);
+    },
+    "arccsc"(a, n) {
+        return mi2("arccsc", a, n);
+    },
+};
+var roman = {
+    I: 1, V: 5, X: 10, L: 50, C: 100, D: 500, M: 1000
+};
+var toRoman = function (n) {
+    if (n > 3888 || (n | 0) !== n || n < 1) return `<mo>(</mo><ms>Roman</ms><mo>,</mo><mn>${n}</mn><mo>)</mo>`;
+    var [a = 0, b = 0, c = 0, d = 0] = n.toString().split("").reverse();
+    a = ["", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"][a];
+    b = ["", "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC"][b];
+    c = ["", "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM"][c];
+    d = ["", "M", "MM", "MMM"][d];
+    return d + c + b + a;
 };
+var circles = "①②③④⑤⑥⑦⑧⑨⑩";
+
+var tabs = {
+    roman(...args) {
+        return "&nbsp;&nbsp;" + args
+            .map(toRoman)
+            .map(a => `<mn>${a}</mn>`)
+            .join('<ms>&ensp;</ms>');
+    },
+    circle(...args) {
+        return args.map(n => circles.charAt(n - 1)).map(a => `<mn>${a}</mn>`).join('');
+    }
+}
 
 var funcmap = {
     "+"(...args) {
@@ -59,9 +103,21 @@ var funcmap = {
     "-"(...args) {
         return mo3("–", args);
     },
+    "+-"(...args) {
+        return mo3("±", args);
+    },
+    "-+"(...args) {
+        return mo3("∓", args);
+    },
     "*"(...args) {
         return args.join("");
     },
+    ">="(...args) {
+        return mo3("≥", args);
+    },
+    "<="(...args) {
+        return mo3("≤", args);
+    },
     "vector"(name, ...args) {
         name = `<mover>${name}<mo>→</mo></mover>`;
         if (args.length) {
@@ -98,6 +154,9 @@ var funcmap = {
     },
     sigma: series,
     series,
+    group(...args) {
+        return `<mo>{</mo><mtable><mtr><mtd>${args.join("</mtd></mtr><mtr><mtd>")}</mtd></mtr></mtable>`
+    },
     '!='(...args) {
         return mo3("≉", args);
     },
@@ -125,12 +184,18 @@ var unarymap = {
     "+"(a) {
         return unary("+", a);
     },
-    "!"(a) {
-        return unary("!", a);
-    },
     "-"(a) {
         return unary("–", a);
     },
+    "+-"(a) {
+        return unary("±", a);
+    },
+    "-+"(a) {
+        return unary("∓", a);
+    },
+    "!"(a) {
+        return unary("!", a);
+    },
     "~"(a) {
         return unary("~", a);
     },
@@ -159,6 +224,9 @@ var puncmap = {
     "_"(a, ...args) {
         return qt(msub, a, args);
     },
+    corner(name) {
+        return mo2("∠", name);
+    },
 
     // "积分": "∫",
     // "summa": "∫",
@@ -226,6 +294,9 @@ var br = function () {
 };
 function toString(obj, p, deep) {
     if (obj instanceof Array) {
+        if (deep == 1 && obj.length === 2 && obj[1].tab) {
+            return toString(obj[0], 0, deep) +"</mtd><mtd>"+ obj.slice(1, obj.length).map(a => toString(a, 0, 0)).join("</mtd><mtd>");
+        }
         deep++;
         var args = obj.map(a => toString(a, deep > 1 ? 0 : p, deep));
         deep--;
@@ -247,6 +318,35 @@ function toString(obj, p, deep) {
         for (var k in obj) break;
         if (!k) return '';
         var origin = obj[k];
+        if (k === '..') {
+            var [prefix, rep, dots, e] = origin;
+            prefix = String(prefix);
+            if (typeof rep === 'number') rep = String(rep);
+            if (rep && !/\./.test(prefix)) prefix += '.';
+            if (typeof e === 'number') e = String(e);
+            if (!rep) rep = '';
+            else if (rep.length === 1) {
+                rep = mdot(rep);
+            }
+            else if (rep.length >= 2) {
+                rep = mdot(rep.charAt(0)) + mn(rep.slice(1, rep.length - 1)) + mdot(rep.charAt(rep.length - 1));
+            }
+            else rep = mn(rep);
+            if (dots) dots = mn(dots);
+            else dots = '';
+            if (e) e = `<mo>×</mo><msup><mn>10</mn><mn>${e}</mn></msup>`;
+            else e = '';
+            prefix = mn(prefix);
+            return mrow([prefix, rep, dots, e].join(''), e ? p >= pmap["*"] : false, deep);
+        }
+        if (k === 'tab') {
+            k = origin.shift();
+            if (!origin.length || !(k in tabs)) {
+                var args = origin.map(a => toString(a, 0, deep));
+                return mrow(`<ms>(</ms>${k}${args.length ? "<ms>,</ms>" + args.join('<ms>,</ms>') : ''}<ms>)</ms>`, -1, deep);
+            }
+            return mrow(tabs[k](...origin), -1, deep);
+        }
         if (k in 三角函数) {
             var args = origin.map(a => toString(a, pmap["*"], 0));
             obj = 三角函数[k](...args);
@@ -263,9 +363,10 @@ function toString(obj, p, deep) {
         }
         else f = unarymap[k];
         if (!f) {
-            return mrow(`<mi>${k}</mi>${mrow(args instanceof Array ? args.join('<mo>,</mo>') : args, true)}`, false, deep);
+            return mrow(`<mi>${希腊[k] || k}</mi>${mrow(args instanceof Array ? args.join('<mo>,</mo>') : args, true)}`, false, deep);
         }
         if (args instanceof Array) {
+
             if (k === '*') {
                 var allnum = true;
                 var bx = 1;
@@ -294,6 +395,7 @@ function toString(obj, p, deep) {
     obj = 希腊[obj] || obj;
     if (typeof obj === "number") {
         if (obj === Infinity) obj = '∞';
+        if (obj < 0) obj = "–" + -obj;
         return mrow(mn(obj), -1, deep);
     }
     if (/^[\s,;]+$/.test(obj)) {

package/coms/basic/math.md

@@ -1,4 +1,6 @@
 # 数学公式生成工具
+在2023年及以后的浏览器(Chrome109, Firefox1, Safari5.1, ...)中可用
+受支持的浏览器参考 [https://developer.mozilla.org/zh-CN/docs/Web/MathML](https://developer.mozilla.org/zh-CN/docs/Web/MathML)
 使用方法有如下两种：
 1. 直接传入解析结构
 ```javascript
@@ -36,7 +38,7 @@ math(obj)
 ```
 
 2. 以数学公式的js表达式做为模板直接生成
-```javascript
+```mathscript
 // 勾股定理可以表示为如下形式
 math`a**2+b**2=c**2`
 // 海伦-秦九韶公式可以表式为如下形式
@@ -46,21 +48,39 @@ math`S=sqrt(p*(p-a)*(p-b)*(p-c))`
 
 ## 常用语法及函数名如下
 * 加法
-```javascript
+```mathscript
     1+2
 ```
 ```math
     1+2
 ```
 * 减法
-```javascript
+```mathscript
     1-2
 ```
 ```math
     1-2
 ```
+* 加减，正负，
+```mathscript
+    a +- 2;
+    a -+ 2;
+    +-a;
+    -+a;
+    // 分开写将识别为运算符加正负号
+    a + -2;
+    a - +2;
+```
+```math
+    a +- 2;
+    a -+ 2;
+    +-a;
+    -+a;
+    a + -2;
+    a - +2;
+```
 * 乘法
-```javascript
+```mathscript
     1*2
     a*b
     2*a
@@ -70,7 +90,7 @@ math`S=sqrt(p*(p-a)*(p-b)*(p-c))`
     a*b
     2*a
 ```
-```javascript
+```mathscript
 // 默认用`*`会自动转成`×`或`·`或省略
 // 如果自动生成的符号不符合预期
 // 可以使用`mul(a,b)`以强制生成`×`
@@ -82,56 +102,56 @@ mul(a,b),Mul(a,b),MUL(a,b)
 mul(a,b),Mul(a,b),MUL(a,b)
 ```
 * 分数
-```javascript
+```mathscript
  分子/分母
 ```
 ```math
     分子/分母
 ```
 * 以除号表示除法
-```javascript
+```mathscript
     div(被除数,除数)
 ```
 ```math
     div(被除数,除数)
 ```
 * 绝对值
-```javascript
+```mathscript
     abs(a)
 ```
 ```math
     abs(a)
 ```
 * 阶乘： n!
-```javascript
+```mathscript
     n!
 ```
 ```math
     n!
 ```
 * 幂
-```javascript
+```mathscript
     底数 ** 指数
 ```
 ```math
     底数 ** 指数
 ```
 * 平方根
-```javascript
+```mathscript
     sqrt(底数)
 ```
 ```math
     sqrt(底数)
 ```
 * 高次根式
-```javascript
+```mathscript
   root(底数,指数)
 ```
 ```math
   root(底数,指数)
 ```
 * 函数
-```javascript
+```mathscript
     f(x)=x**2
     f'(x)=2*x
 ```
@@ -141,7 +161,7 @@ mul(a,b),Mul(a,b),MUL(a,b)
 ```
 
 * 三角函数
-```javascript
+```mathscript
 sin(theta);
 sin(theta,2);
 sin(theta**2);
@@ -155,7 +175,7 @@ sin(theta)**2;
 ```
 
 * 向量
-```javascript
+```mathscript
     //vector(向量名,横坐标,纵坐标,竖坐标)
     vector(A,x,y)
     //坐标可以不传入
@@ -166,7 +186,7 @@ sin(theta)**2;
     vector(A)
 ```
 * 下标
-```javascript
+```mathscript
     a[n]
     a[n+1]
     a_n
@@ -179,7 +199,7 @@ sin(theta)**2;
     a_(n+1) 
 ```
 * 极限
-```javascript
+```mathscript
     limit(公式主体,变量,目标)
     // 可以用 Infinity表示无穷大
     limit(1/n,n,+Infinity)
@@ -190,14 +210,14 @@ sin(theta)**2;
 ```
 
 * 积分
-```javascript
+```mathscript
 integral(表达式,下界,上界)
 ```
 ```math
 integral(表达式,下界,上界)
 ```
 * 级数
-```javascript
+```mathscript
 sigma(公式主体,n=1,+Infinity)
 series(公式主体,n=1,+Infinity)
 ```
@@ -206,38 +226,121 @@ sigma(公式主体,n=1,+Infinity)
 series(公式主体,n=1,+Infinity)
 ```
 * 矩阵
-```javascript
+```mathscript
     [1,2;3,4]
 ```
 ```math
     [1,2;3,4]
 ```
 * 左除
-```javascript
+```mathscript
     [1,2;3,4] \ [5;6]
 ```
 ```math
     [1,2;3,4]\[5;6]
 ```
 * 转置
-```javascript
+```mathscript
     [1,2;3,4]'
 ```
 ```math
     [1,2;3,4]'
 ```
 * 离子
-```javascript
+```mathscript
     H[+], O[2-]
 ```
 ```math
     H[+], O[2-]
 ```
 
-## 希腊字母对照表如下
+* 无限小数
+```mathscript
+// 循环节
+0.3.;// 三分之一
+0.142857.;// 七分之一
+0.142.857142.;//七分之一
+0.142.857142;//七分之一
+```
+```math
+0.3.;// 三分之一
+0.142857.;// 七分之一
+0.142.857142.;//七分之一
+0.142.857142;//七分之一
+```
+```mathscript
+// 省略号，如果末尾出现多于一个小数点，这些小数点将被追加到数值结尾
+0.3...
+3444..
+66....
+```
+```math
+0.3...
+3444..
+66....
+```
+* 科学计数法
+```mathscript
+    1e3;
+    1e-3;
+    1.3.e3;
+    a*1.3e3
+```
+```math
+    1e3;
+    1e-3;
+    1.3.e3;
+    a*1.3e3
+```
+* 方程组
+```mathscript
+    group(
+        a+1=b;
+        a+b=3;
+    )
+```
+```math
+    group(
+        a+1=b,
+        a+b**2=3
+    )
+```
+* 标号
+```mathscript
+    tab(1); // 带小括号的数字
+    tab(circle,1,2,3,10); // 带圆圈的数字
+    tab(roman,1); //罗马数字
+    tab(roman,3888); //罗马数字
+    group(// 方程组中使用
+        x+y=10 tab(circle,1),
+        x*y=25 tab(circle,2)
+    )
+```
+```math
+    tab(1);
+    tab(circle,1,2,3,10);
+    tab(roman,1);
+    tab(roman,3888);
+    group(
+        x+y=10 tab(circle,1),
+        x*y=25 tab(circle,2)
+    )
+```
+* 角
+```mathscript
+    corner(1);
+    corner(A);
+    corner(BAC);
+```
+```math
+    corner(1);
+    corner(A);
+    corner(BAC);
+```
 
+## 希腊字母对照表如下
+按此表中的英文单词命名的变量将自动转换为希腊字母
 ```javascript
-    // 按此表中的英文单词命名的变量将自动转换为希腊字母
     alpha: "α",    Alpha: "Α",
     beta: "β",    Beta: "Β",
     gamma: "γ",    Gamma: "‌Γ",

package/coms/basic/spaces.js

@@ -2,7 +2,7 @@ var spaceDefined = [
     "\\u0002",
     "\\b-\\r",// "\\b"/*8*/, "\\t"/*9*/, "\\n"/*10*/, "\\v"/*11*/, "\\f"/*12*/, "\\r"/*13*/,
     " "/*32*/,
-    "\\u007f", "\\u00a0", "\\u00ad", "\\u034f", "\\u061c",
+    "\\u007f", "\\u0085"/*next line*/, "\\u00a0", "\\u00ad", "\\u034f", "\\u061c",
     "\\u115f", "\\u1160",
     "\\u17b4", "\\u17b5",
     "\\u180b-\\u180e",

package/coms/compile/Program.js

@@ -1203,7 +1203,7 @@ class Program {
             console.warn(
                 "代码异常结束",
                 `\r\n - 祖先标记: ${parents.slice(1).map(p => `${p.entry || ""}<red2>${p.tag || p.text || ""}</red2><gray>${p.row}:${p.col}</gray>`).join('')}`,
-                `\r\n - 内层入口: <yellow>${this.mindpath}</yellow>:${last.row}:${last.col} ${last.text || last.entry}`,
+                `\r\n - 内层入口: <yellow>${this.mindpath}</yellow>:${queue.row}:${queue.col} ${queue.entry}`,
             );
             while (queue !== origin) {
                 queue.error = "代码异常结束";

package/coms/compile/common.js

@@ -1515,7 +1515,7 @@ var createString = function (parsed) {
                         (STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype
                         && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type
                     ) {
-                        if (autospace || prev?.isdigit) result.push(" ");
+                        if (autospace || prev?.isdigit && patchspace) result.push(" ");
                     }
                     else if (p && o.type === STAMP && !/^[,;]/.test(o.text)) {
                         if (result[result.length - 1] === " ");