efront 4.35.3 → 4.35.5

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/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) => {
@@ -69,6 +70,31 @@ var 三角函数 = {
         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) {
@@ -86,6 +112,12 @@ var funcmap = {
     "*"(...args) {
         return args.join("");
     },
+    ">="(...args) {
+        return mo3("≥", args);
+    },
+    "<="(...args) {
+        return mo3("≤", args);
+    },
     "vector"(name, ...args) {
         name = `<mover>${name}<mo>→</mo></mover>`;
         if (args.length) {
@@ -105,6 +137,12 @@ var funcmap = {
     abs(a) {
         return `<mo>|</mo>${a}<mo>|</mo>`;
     },
+    log(x, n) {
+        return `<msub><mo>log</mo>${n}</msub>${x}`
+    },
+    ln(x){
+        return `<mo>ln</mo>${x}`
+    },
     "div"(...args) {
         return mo3("÷", args);
     },
@@ -122,6 +160,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);
     },
@@ -189,6 +230,9 @@ var puncmap = {
     "_"(a, ...args) {
         return qt(msub, a, args);
     },
+    corner(name) {
+        return mo2("∠", name);
+    },
 
     // "积分": "∫",
     // "summa": "∫",
@@ -256,6 +300,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--;
@@ -277,6 +324,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);
@@ -296,6 +372,7 @@ function toString(obj, p, 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;

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
@@ -252,6 +254,101 @@ series(公式主体,n=1,+Infinity)
     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);
+```
+* 对数
+```mathscript
+    log(x,2);
+    log(x,e);
+    ln(x);
+```
+```math
+    log(x,2);
+    log(x,e);
+    ln(x);
+```
+
 ## 希腊字母对照表如下
 按此表中的英文单词命名的变量将自动转换为希腊字母
 ```javascript

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/basic/strings.js

@@ -5,6 +5,7 @@ var escapeMap = {
     "\b": "\\b",
     "\f": "\\f",
     "\v": "\\u000b",
+    "\\": "\\\\",
     "\u2028": "\\u2028",
     "\u2029": "\\u2029",
 };
@@ -44,7 +45,7 @@ var esc = function (a) {
 function uncode(s) {
     return s.replace(/\\u(?:\{[0-9a-f]+\}|[0-9a-f]{4})/ig, esc);
 }
-function kicode(s) {
+function kicode(s, singleSlash = false) {
     var t = [];
     return s.replace(/\\(?:u\{[0-9a-f]+\}|u[0-9a-f]{4}|x[0-9a-f]{2}|([0-7]{1,3}|[\s\S]))/ig, (a, b, i) => {
         if (!b) {
@@ -63,17 +64,19 @@ function kicode(s) {
         }
         if (unescapeMap.hasOwnProperty(a)) return unescapeMap[a];
         if (/^[0-7]+$/.test(b)) return String.fromCharCode(parseInt(b, 8));
+        if (b === singleSlash) return b;
+        if (singleSlash) return '\\' + b;
         return b;
     });
 }
-function decode(s) {
+function decode(s, singleSlash) {
     var r = /^(['"`])([\s\S]*)\1$/.exec(s);
     if (!r) return s;
-    return kicode(r[2]);
+    return kicode(r[2], singleSlash ? r[1] : null);
 }
 
-function recode(s) {
-    s = decode(s);
+function recode(s, singleSlash) {
+    s = decode(s, singleSlash);
     s = encode(s);
     return s;
 }

package/coms/compile/Html.js

@@ -133,7 +133,7 @@ class Html extends Javascript {
 }
 var property = new Program;
 property.stamps = "=".split('');
-var p = new Javascript;
+var progExp = new Javascript;
 var replaceISO8859 = function (data) {
     return String(data).replace(/<\!--([\s\S]*)--\>$/g, '$1').replace(/&\w+;/g, a => iso8859[a] || a).replace(/&#(\d+);/g, (_, a) => String.fromCodePoint(a))
 };
@@ -142,8 +142,8 @@ var parseExpress = function (data, mayberepeat) {
         data = `for(var ${data});`;
     }
     else data = "=" + replaceISO8859(data);
-    p.lastIndex = 0;
-    return p.exec(data);
+    progExp.lastIndex = 0;
+    return progExp.exec(data);
 };
 
 var toCamelCase = function (a) {
@@ -151,8 +151,12 @@ var toCamelCase = function (a) {
 }
 
 var isDynamic = a => /^(on|@|\-|_|\.|#|\:|\+|\*|\?|&|\$|\S+\-)|(@|\-|_|\.|#|\:|\+|\*|\?|&|\$)$/i.test(a);
-
+var decode = strings.decode;
+var decode2 = function (s) {
+    return decode(s, true);
+}
 Html.prototype.createScoped = function (code) {
+    progExp.mindpath = this.mindpath;
     var used = Object.create(null);
     var vars = Object.create(null);
     var rootvars = vars;
@@ -197,7 +201,7 @@ Html.prototype.createScoped = function (code) {
                         var nn = c.next.next;
                         if (!nn || nn.length > 0) return;
                         if (nn.type === EXPRESS || nn.type === QUOTED) {
-                            rootvars[strings.decode(createString([nn]))] = true;
+                            rootvars[decode(createString([nn]))] = true;
                         }
                     }
                 }
@@ -219,12 +223,14 @@ Html.prototype.createScoped = function (code) {
                     break;
                 }
                 if (noTag || !c.text) break;
-                var t = strings.decode(c.text);
+                var t = decode2(c.text);
                 if (color.isColor(t)) break;
                 var p = c.prev;
                 var pp = p && p.prev;
                 if (pp && isDynamic(pp.text)) {
                     var mayberepeat = p && pp && p.type === STAMP && p.text === "=" && /[\:\-\_@\&\*\?\#\+\.\$](src|repeat|for|each|foreach)$/i.test(pp.text)
+                    progExp.col = c.col;
+                    progExp.row = c.row;
                     t = parseExpress(t, mayberepeat);
                     var s = createScoped(t);
                     var envs = s.envs;
@@ -242,6 +248,8 @@ Html.prototype.createScoped = function (code) {
                 if (inScript || noTag) break;
                 if (c.queue.type === QUOTED) break;
                 var t = c.text;
+                progExp.col = c.col;
+                progExp.row = c.row;
                 t = parseExpress(t);
                 var s = createScoped(t);
                 var envs = s.envs;
@@ -301,7 +309,7 @@ Html.prototype.createScoped = function (code) {
     scoped.envs = envs;
     scoped.vars = vars;
     scoped.used = used;
-
+    delete progExp.mindpath;
     return scoped;
 };
 Html.prototype.createString = common.createString;

package/coms/compile/Program.js

@@ -179,6 +179,8 @@ class Program {
     lbtype = false;
     keepspace = false;
     lastIndex = 0
+    col = 1;
+    row = 1;
     detectLabel(o) {
         var queue = o.queue;
         var last = queue.last;
@@ -413,7 +415,7 @@ class Program {
             }
             queue.push(scope);
         };
-        var row = 1, colstart = -1;
+        var row = this.row, colstart = -this.col;
         var cache_stamp = null;
         var powermap = this.powermap;
         var push_stamp = function () {

package/coms/compile/autoeval.js

@@ -54,7 +54,7 @@ var punc_3 = {
         if (s && n1.length + +n2 > 15) {
             return BigInt(n1) << BigInt(n2) + s;
         }
-        return (n2 << n1) + s;
+        return (n1 << n2) + s;
     },
     ">"(n1, n2, s) {
         return String(+n1 > +n2);
@@ -84,7 +84,7 @@ var punc_3 = {
         return (n1 & n2) + s;
     },
     "||"(n1, n2, s) {
-        return (+n2 || +n1) + s;
+        return (+n1 || +n2) + s;
     },
     "&&"(n1, n2, s) {
         return (+n1 && + n2) + s;

package/coms/compile/autoeval_test.js

@@ -86,3 +86,8 @@ tc("Math.log(f) / Math.LN2 / 10 | 0", "Math.log(f) * 0.14426950408889633 | 0");
 tc("Math.log(f) / Math.LN2 / 10 * 10 | 0", "Math.log(f) * 1.4426950408889634 | 0");
 tc("Math.log(f) / Math.LN2 / 10 ** 2 | 0", "Math.log(f) * 0.014426950408889633 | 0");
 // tf(path.join(__dirname, "../zimoli/spacechar_test.js"))
+t("1<<0", '1');
+t("1<<3", '8');
+t("(1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0)",'1335')
+t("(1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0)","7973")
+t("(1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1)","21522")

package/coms/compile/scanner2.js

@@ -252,7 +252,7 @@ function scan(text) {
                 type = a;
                 break;
             default:
-                throw new Error('无效参数: ' + type);
+                throw new Error('无效参数: ' + a);
         }
     }
     if (!type) {

package/coms/compile//347/256/227/345/274/217.js

@@ -6,10 +6,11 @@ const {
     createString,
 } = require("./common");
 var powermap = require("./powermap");
-
+var number_rep = /^[+-]?([\d\.]+)(?:e([+-]?\d+))?$/;
 class Math extends Program {
-    number_reg = /^(\d+(\.\d+)?|\.\d+)$/;
+    number_reg = /^(\d+(?:\.\d+){0,2}|(?:\.\d+){1,2}|(?:\d+\.){1,3})\.*(?:e[+-]?\d+)?$/;
     powermap = Object.assign({}, powermap);
+    value_reg = /^(false|true|null|Infinity|NaN|undefined|eval|this|arguments)$/;
     constructor() {
         super();
         var pmap = this.powermap;
@@ -101,7 +102,12 @@ var getRows = function (code) {
     return trs;
 }
 var getArgs = function (a) {
-    return split(a, ',').map(toFlat);
+    return split(a, ',').map(a => {
+        var cells = createExpressList(a);
+        if (!cells[cells.length - 1]?.first) cells.pop();
+        if (cells.length === 1) return toFlat(cells[0]);
+        return cells.map(toFlat);
+    });
 }
 var uncup = function (cup) {
     if (cup.iscup && cup.length <= 1) cup = cup[0];
@@ -127,7 +133,7 @@ var back = function (cache) {
     cache.splice(s, cache.length - s);
 }
 var toFlat = function (exp) {
-    if (exp.length === 1 && exp[0].type !== SCOPED) return exp[0].text;
+    if (exp.length === 1 && exp[0].type !== SCOPED && !exp[0].isdigit) return exp[0].text;
     var bx = 0;
     var p0 = 0;
     var left = [];
@@ -235,12 +241,37 @@ var toFlat = function (exp) {
             }
             if (e.isdigit) a: {
                 var et = e.text;
-                var v = +et;
+                var [, a, e10] = number_rep.exec(et);
+                var b = a.split('.');
+                if (b.length > 2 || e10) {
+                    var nrep = b[2] || b[1];
+                    var npre = b[0];
+                    if (b[2]) {
+                        npre += "." + b[1];
+                    }
+                    else if (b[1] ? b.length <= 2 || b.length > 3 : b.length <= 1 || b.length > 2) {
+                        if (nrep) npre += "." + nrep;
+                        nrep = '';
+                    }
+                    if (String(+npre) === npre) npre = +npre;
+                    if (String(+nrep) === nrep) nrep = +nrep;
+                    var v = [npre, nrep];
+                    if (b.length > (b[2] ? 4 : b[1] ? 3 : 2)) v.push(b.slice(b[2] ? 3 : b[1] ? 2 : 1, b.length).join('.') + ".");
+                    else if (e10) v.push('');
+                    if (e10) {
+                        if (String(+e10) === e10) e10 = +e10;
+                        v.push(e10);
+                    }
+                    v = { "..": v };
+                    left.push(v);
+                    continue;
+                }
+                var v = +a;
                 if (/^\+/.test(et)) {
-                    if (String(v) !== et.slice(1)) break a;
+                    if (String(v) !== a.slice(1)) break a;
                     v = make("+", '', v);
                 }
-                if (String(v) !== et) break a;
+                if (String(v) !== a) break a;
                 left.push(v);
                 continue;
             }

package/coms/compile//347/256/227/345/274/217_test.js

@@ -21,6 +21,10 @@ t(`a(b,c)`)
 t(`[b,c]'`)
 t(`H[+]`)
 t(`H[2-]`)
-t.debug = true;
 t(`H'*1`)
-t(`cos(theta,2)*E +(1 - cos(theta))*K'*K+sin(theta)*[0,-K_2,K_1;K_2,0,-K_0;-K_1,K_0,0]`)
+t(`cos(theta,2)*E +(1 - cos(theta))*K'*K+sin(theta)*[0,-K_2,K_1;K_2,0,-K_0;-K_1,K_0,0]`)
+t.debug = true;
+t(`group(
+    x+y=10 tab(circle,1),
+    x*y=25 tab(circle,2)
+)`)

package/coms/compile//347/264/240/351/246/250.js

@@ -16,9 +16,10 @@ class 素玉 extends Program {
 
 var rarg = new 素玉;
 rarg.quotes.push(["url(", ")"]);
-var replaceHReg = new RegExp(numberReg.source + /\s*([\/\*])\s*/.source + numberReg.source, 'gi');
-var replaceLReg = new RegExp(numberReg.source + /(\s*[\+\-]\s+|[\+\-])/.source + numberReg.source, 'gi');
-var replaceTReg = new RegExp(numberReg.source + /\s*[\/\*\+\-]\s*/.source + numberReg.source, 'i');
+var numberReg2 = /([\-\+]?(?:\d+(?:\.\d*)?|\.\d+))([a-zH]+|%)?/;
+var replaceHReg = new RegExp(numberReg2.source + /\s*([\/\*])\s*/.source + numberReg2.source, 'gi');
+var replaceLReg = new RegExp(numberReg2.source + /(\s*[\+\-]\s+|[\+\-])/.source + numberReg2.source, 'gi');
+var replaceTReg = new RegExp(numberReg2.source + /\s*[\/\*\+\-]\s*/.source + numberReg2.source, 'i');
 var remove_quote = a => a.replace(/~\s*(['"`])((?:\\[\s\S]|[^'"`\\])*?)\1/g, '$2');
 var keepdot = function (a) {
     var g = Math.pow(10, Math.log10(a) | 0) * 1000;
@@ -70,7 +71,7 @@ var replace_punc = function (a) {
 }
 var killcalc = a => replace_punc(createString(a));
 var seprateFunc = function (express) {
-    var express = scanner2(express, rarg);
+    var express = scanner2(express, rarg, basepath[0] || base || '');
     var sps = [];
     var sp = [];
     for (var cx = 0, dx = express.length; cx < dx; cx++) {
@@ -108,7 +109,7 @@ var seprateFunc = function (express) {
 }
 var splitParams = function (params) {
     if (!params) return [];
-    params = scanner2(params, rarg);
+    params = scanner2(params, rarg, basepath[0] || base || '');
     var code = params;
     var params = [], p = [];
     for (var cx = 0, dx = code.length; cx < dx; cx++) {
@@ -124,7 +125,7 @@ var splitParams = function (params) {
     return params;
 }
 var createArgMap = function (args, split = ',', equal = ':') {
-    if (args) args = scanner2(args, rarg);
+    if (args) args = scanner2(args, rarg, basepath[0] || base || "");
     else args = [];
     var map = Object.create(null);
     var o = args.first;
@@ -726,7 +727,7 @@ var rcss = null;
 function 素馨(text, scopeName, compress) {
     if (!rcss) rcss = new 素心;
     rcss.debug = true;
-    var code = scanner2(text, rcss);
+    var code = scanner2(text, rcss, scopeName || "");
     var { scoped } = code;
     var result = evalscoped(scoped, scopeName);
     var queried = [];