efront 4.35.3 → 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/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) {
@@ -122,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);
     },
@@ -189,6 +224,9 @@ var puncmap = {
     "_"(a, ...args) {
         return qt(msub, a, args);
     },
+    corner(name) {
+        return mo2("∠", name);
+    },
 
     // "积分": "∫",
     // "summa": "∫",
@@ -256,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--;
@@ -277,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);
@@ -296,6 +366,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,90 @@ 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);
+```
+
 ## 希腊字母对照表如下
 按此表中的英文单词命名的变量将自动转换为希腊字母
 ```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/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;

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

@@ -78,6 +78,12 @@ test(`a    >{b{a:b}}`, `a>b{a:b;}`);
 test(`a{>b{a:b}}`, `a>b{a:b;}`);
 test(`.type(@type,@media) {.@{type} {&:before{content:"@{media}";}}}.type(videoinput, "相机");`, `.videoinput:before{content:"相机";}`);
 test(`.type(@type,@media) {.@{type} {&:before{content:"@{media}";}}}.type(videoinput, 相机);`, `.videoinput:before{content:"相机";}`);
+test(`
+    @avatar-top: -12px;
+    a{
+        top: 12px- @avatar-top;
+    }
+`,'a{top:24px;}');
 common.createString.debug = true;
 Program.debug = true;
 test(`@type(@len){
@@ -89,7 +95,7 @@ test(`@type(@len){
         }
         }
         @type(1)
-        `, '');
+        `, '>[nlist]{width:1.9em;}');
 Program.debug = false;
 common.createString.debug = false;
 assert(素馨(`:not(a):not(b){c:d}`, 'abc'), `abc :not(a):not(b){c:d;}`);
@@ -132,4 +138,4 @@ assert(素馨(`h1{a:c; span{a:b} i{a:b} }`, '.home-', true), `.home- h1 span{a:b
 assert(素馨(`h1{ button{&:not(hover){.track{a:b}}} }`, '.home-', true), `.home- h1 button:not(hover) .track{a:b;}`);
 assert(素馨(`@type(@a){&[type=@a]{a:1}} @type(white)`, '.btn-', true), `.btn-[type=white]{a:1;}`);
 assert(素馨(`a,b{c,d{ g&{e:f}}}`, '', true), `a gc,b gc,a gd,b gd{e:f;}`);
-assert(素馨(`a{a:lch(from rgb(20 20 20) l c h)}`, '', true), `a{a:lch(from rgb(20 20 20) l c h);}`);
+assert(素馨(`a{a:lch(from rgb(20 20 20) l c h)}`, '', true), `a{a:lch(from rgb(20 20 20) l c h);}`);

package/coms/explorer/main.less

@@ -52,6 +52,7 @@ padding {
 
 & {
     height: 100%;
+    overflow: hidden;
 }
 
 fileitem {

package/coms/reptile/colors.js

@@ -40,7 +40,8 @@ var colors = module.exports = {
     BgCyan2: "\x1b[106m",
     BgWhite2: "\x1b[107m",
 };
-colors.label = colors.strap = colors.value = colors.FgBlue2;
+colors.tag = colors.FgBlue2;
+colors.label = colors.strap = colors.value = colors.FgWhite;
 colors.comment = colors.FgGreen;
 colors.invoke = colors.method = colors.FgYellow2;
 colors.express = colors.property = colors.FgCyan2;

package/coms/zimoli/arriswise.js

@@ -36,7 +36,7 @@ var replaceArg = function (arg) {
 function build(func, argNames, argsArr) {
     var newf = String(func).replace(regexps, rep);
     return Function.apply(null, argNames.map(replaceArg).concat("return " + newf))
-        .apply(this, replaceArg(argsArr));
+        .apply(this, argsArr.map(replaceArg));
 }
 var arriswise = function (func, args = []) {
     if (isFunction(args.slice)) {

package/coms/zimoli/color-config.less

@@ -1,2 +1,2 @@
 @border-solid: #0003;
-@border-focus: #06fe;
+@border-focus: #29c;

package/coms/zimoli/confirm.js

@@ -151,7 +151,7 @@ function confirm() {
     Promise.resolve().then(function () {
         if (isMounted(element)) return;
         element.$mask = true;
-        popup(element, target || [.5, .5], target ? 'rhomb' : true);
+        popup(element, target || [.5, .5], target ? 'rhomb' : target !== false);
         element.focus();
         if (!target) drag.on(head, element);
         else {

package/coms/zimoli/popup.js

@@ -141,7 +141,7 @@ var popup_view = function (element, target, style) {
     }
     else if (target instanceof Array) {
         if (isNode(style) && style.$mask) addMask(element, style);
-        else if (typeof style === 'boolean') addMask(element);
+        else if (typeof style === 'boolean' && style) addMask(element);
         popup_to_point(element, target);
     }
     else if (target === true || target < 0) {

package/coms/zimoli/prompt.js

@@ -35,6 +35,7 @@ function prompt() {
     var submit = null;
     var wrap = false;
     var value = '';
+    var mask = false;
     var attrs = {
         type: null,
         max: null,
@@ -48,6 +49,7 @@ function prompt() {
         else if (typeof arg === 'string') msg = arg;
         else if (isArray(arg)) opts = arg;
         else if (isFunction(arg) || arg instanceof RegExp) check = arg;
+        else if (typeof arg === 'boolean') mask = arg;
         else if (isObject(arg)) {
             if (isFunction(arg.test)) check = arg;
             if (isFunction(arg.check)) check = arg.check;
@@ -55,6 +57,7 @@ function prompt() {
             if (isString(arg.msg || arg.title)) msg = arg.msg || arg.title;
             if (isHandled(arg.info)) info = arg.info;
             if (isHandled(arg.value)) value = arg.value;
+            if (isHandled(arg.mask)) mask = arg.mask;
             for (var k in attrs) {
                 if (k in arg) attrs[k] = arg[k];
             }
@@ -117,7 +120,7 @@ function prompt() {
         } else {
             c.errored = true;
         }
-    });
+    }, { target: mask });
     on('mounted')(ipt, function () {
         if (setDisable) setDisable();
         setTimeout(function () {

package/coms/zimoli/scrollbar.less

@@ -44,6 +44,6 @@
         border-radius: 7px;
         height: 100%;
         width: 100%;
-        background-color: #0092cc;
+        background-color: #29c9;
     }
 }

package/coms/zimoli/table.js

@@ -611,7 +611,7 @@ function table(elem) {
             model,
             scrollbar,
             sort(f) {
-                this.data.sort(f);
+                this.data = this.data.toSorted(f);
             },
             setWidth(target, f) {
                 css(target, { width: f.width });

package/coms/zimoli/vbox.js

@@ -147,6 +147,7 @@ function ybox(generator) {
     } else {
         var wheelTime = 0;
         onmousewheel(_box, function (event) {
+            if (event.defaultPrevented) return;
             event.preventDefault();
             var isNew = event.timeStamp - wheelTime > 120;
             wheelTime = event.timeStamp;

package/coms//350/214/250/350/217/260//344/270/212/350/211/262.xht

@@ -39,10 +39,14 @@
         color: #b5cea8;
     }
 
-    label {
+    tag {
         color: #569cd6;
     }
 
+    label {
+        color: #ccc;
+    }
+
     selector {
         color: #d7ba7d;
     }

package/coms//350/214/250/350/217/260//346/240/207/347/255/276/345/214/226.js

@@ -71,6 +71,7 @@ var codecolor = function (c) {
     };
     var setExpress = function (o, label) {
         if (!o.text || o.wraped) return;
+        if (o.type !== EXPRESS) return;
         o.wraped = true;
         var keys = o.text.split(".");
         var pdot = !keys[0] && keys.length > 1;
@@ -124,6 +125,13 @@ var codecolor = function (c) {
         switch (o.type) {
             case LABEL:
                 o.text = wrap(o.text, 'label');
+                var label = o.tack;
+                used[o.tack].forEach(o => {
+                    if (o.text !== label) return;
+                    var prev = o.prev;
+                    if (!prev || prev.type !== STRAP || prev.isend || !/^(break|continue)$/.test(prev.text)) return;
+                    o.text = wrap(o.text, 'label');
+                })
                 break;
             case QUOTED:
                 if (o.length || !o.text) {
@@ -157,7 +165,7 @@ var codecolor = function (c) {
                 if (o.tag_leave) o.tag_leave = wrapcode(o.tag_leave, 'stamp');
                 if (o.entry) o.entry = wrapcode(o.entry, 'stamp');
                 if (o.leave) o.leave = wrapcode(o.leave, 'stamp');
-                o.tag = wrapcode(o.tag, 'label');
+                o.tag = wrapcode(o.tag, 'tag');
                 o.forEach(setcolor);
                 break;
             case SCOPED:

package/coms//350/214/250/350/217/260//346/270/262/346/237/223.js

@@ -9,7 +9,7 @@ var rows = function (type, text) {
     type = String(type).toLowerCase();
     if (type in 语言) {
         var c = 语言[type](text);
-        标签化(c);
+        标签化(c, c.envs);
         text = c.toString();
     }
     else text = 标签化.encode(text);