@famibee/skynovel 1.25.0 → 1.25.4

package/CHANGELOG.md

@@ -1,3 +1,47 @@
+## [1.25.4](https://github.com/famibee/SKYNovel/compare/v1.25.3...v1.25.4) (2021-12-26)
+
+
+### Bug Fixes
+
+* ラベルジャンプ処理内で[let_ml][endlet_ml]ブロック以降の行番号が狂う件 ([92aff23](https://github.com/famibee/SKYNovel/commit/92aff2394630f4d3001b1c5db519b20410dffb0e))
+
+- fix: ラベルジャンプ処理内で[let_ml][endlet_ml]ブロック以降の行番号が狂う件
+
+
+## [1.25.3](https://github.com/famibee/SKYNovel/compare/v1.25.2...v1.25.3) (2021-12-25)
+
+
+### Bug Fixes
+
+* 本文冒頭でリジューム（load＆save）するとエラーになる件 ([1f3f978](https://github.com/famibee/SKYNovel/commit/1f3f978b81c85b97fc4988a21599a57cae6e4de3))
+
+- fix: 本文冒頭でリジューム（load＆save）するとエラーになる件
+- docs: [event]にcall属性記述が抜けていたのを修正
+
+
+## [1.25.2](https://github.com/famibee/SKYNovel/compare/v1.25.1...v1.25.2) (2021-12-24)
+
+
+### Bug Fixes
+
+* 引数の省略時デフォルト値が空文字の場合、引数が渡されない件（a=%b|'' など） ([25f2a91](https://github.com/famibee/SKYNovel/commit/25f2a914d3c98e3a15014b3f0495b09fa6089d35))
+
+- fix: 引数の省略時デフォルト値が空文字の場合、引数が渡されない件（a=%b|'' など）
+- fix: 前回更新でややムダな処理があったのを改善
+- fix: タグ名・resvTokenなど、内部使用属性名を同名属性指定により壊されない対策
+- fix: AnalyzeTagArg テスト追記
+
+
+## [1.25.1](https://github.com/famibee/SKYNovel/compare/v1.25.0...v1.25.1) (2021-12-24)
+
+
+### Bug Fixes
+
+* 右クリックから戻りでクリック待ちが左上へ移動する件 ([b68facc](https://github.com/famibee/SKYNovel/commit/b68facca6174769521c9d7bcc5c418526e28266c))
+
+- fix: 右クリックから戻りでクリック待ちが左上へ移動する件
+
+
 # [1.25.0](https://github.com/famibee/SKYNovel/compare/v1.24.2...v1.25.0) (2021-12-23)
 
 

package/app.js

@@ -66183,15 +66183,15 @@ _Button_procMasume4pic = { value: (_me, _sp, _w3, _h) => { } };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CallStack = void 0;
 class CallStack {
-    constructor($fn = '', $idx = 0, $hArg = null) {
+    constructor($fn = '', $idx = 0, $csArg = { ':hEvt1Time': {}, ':hMp': {} }) {
         this.$fn = $fn;
         this.$idx = $idx;
-        this.$hArg = $hArg;
-        this.toString = () => `[fn:${this.$fn}, idx:${this.$idx}, hArg:${this.$hArg}]`;
+        this.$csArg = $csArg;
+        this.toString = () => `[fn:${this.$fn}, idx:${this.$idx}, csArg:${this.$csArg}]`;
     }
     get fn() { return this.$fn; }
     get idx() { return this.$idx; }
-    get csArg() { return this.$hArg; }
+    get csArg() { return this.$csArg; }
 }
 exports.CallStack = CallStack;
 
@@ -66287,7 +66287,7 @@ function argChk_Num(hash, name, def) {
     const v = hash[name];
     if (!(name in hash)) {
         if (isNaN(def))
-            throw `[${hash.タグ名}]属性 ${name} は必須です`;
+            throw `[${hash[':タグ名']}]属性 ${name} は必須です`;
         hash[name] = def;
         return def;
     }
@@ -66295,7 +66295,7 @@ function argChk_Num(hash, name, def) {
         ? parseInt(v)
         : parseFloat(v);
     if (isNaN(n))
-        throw `[${hash.タグ名}]属性 ${name} の値【${v}】が数値ではありません`;
+        throw `[${hash[':タグ名']}]属性 ${name} の値【${v}】が数値ではありません`;
     return hash[name] = n;
 }
 exports.argChk_Num = argChk_Num;
@@ -67578,7 +67578,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _EventMng_instances, _EventMng_elc, _EventMng_cvsHint, _EventMng_picHint_w, _EventMng_picHint_h, _EventMng_padHint, _EventMng_grpHint, _EventMng_gamepad, _EventMng_fcs, _EventMng_resvFlameEvent4Wheel, _EventMng_ev_keydown, _EventMng_ev_contextmenu, _EventMng_ev_wheel, _EventMng_wheeling, _EventMng_extend_wheel, _EventMng_ev_wheel_waitstop, _EventMng_hLocalEvt2Fnc, _EventMng_hGlobalEvt2Fnc, _EventMng_isDbgBreak, _EventMng_isWait, _EventMng_getEvt2Fnc, _EventMng_waitEventBase, _EventMng_firstWait, _EventMng_dispHint, _EventMng_dispHint_hArg, _EventMng_dispHint_ctnBtn, _EventMng_dispHint_masume, _EventMng_procWheel4wle, _EventMng_elcWLE, _EventMng_clear_event, _EventMng_clear_eventer, _EventMng_event, _EventMng_canFocus, _EventMng_getHtmlElmList, _EventMng_goTxt, _EventMng_l, _EventMng_p, _EventMng_fncCancelSkip, _EventMng_set_cancel_skip, _EventMng_unregisterClickEvts, _EventMng_set_focus, _EventMng_wait, _EventMng_waitclick, _EventMng_hDownKeys;
+var _EventMng_instances, _EventMng_elc, _EventMng_cvsHint, _EventMng_picHint_w, _EventMng_picHint_h, _EventMng_padHint, _EventMng_grpHint, _EventMng_gamepad, _EventMng_fcs, _EventMng_resvFlameEvent4Wheel, _EventMng_ev_keydown, _EventMng_ev_contextmenu, _EventMng_ev_wheel, _EventMng_wheeling, _EventMng_extend_wheel, _EventMng_ev_wheel_waitstop, _EventMng_hLocalEvt2Fnc, _EventMng_hGlobalEvt2Fnc, _EventMng_isDbgBreak, _EventMng_isWait, _EventMng_getEvt2Fnc, _EventMng_waitEventBase, _EventMng_firstWait, _EventMng_dispHint, _EventMng_dispHint_hArg, _EventMng_dispHint_ctnBtn, _EventMng_dispHint_masume, _EventMng_procWheel4wle, _EventMng_elcWLE, _EventMng_clear_event, _EventMng_clear_eventer, _EventMng_event, _EventMng_canFocus, _EventMng_getHtmlElmList, _EventMng_goTxt, _EventMng_l, _EventMng_p, _EventMng_fncCancelSkip, _EventMng_set_cancel_skip, _EventMng_set_focus, _EventMng_wait, _EventMng_waitclick, _EventMng_hDownKeys;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.EventMng = void 0;
 const CmnLib_1 = __webpack_require__(/*! ./CmnLib */ "./core/src/sn/CmnLib.ts");
@@ -67636,7 +67636,7 @@ class EventMng {
             __classPrivateFieldGet(this, _EventMng_grpHint, "f").y = rctBtn.y;
             __classPrivateFieldGet(this, _EventMng_grpHint, "f").rotation = ctnBtn.rotation;
             const p = (isLink ? ctnBtn.parent : ctnBtn).scale;
-            const isBtnPic = (hArg.タグ名 === 'button') && (hArg.pic);
+            const isBtnPic = (hArg[':タグ名'] === 'button') && (hArg.pic);
             __classPrivateFieldGet(this, _EventMng_grpHint, "f").clear()
                 .beginFill(0x33FF00, 0.2)
                 .lineStyle(1, 0x33FF00, 1)
@@ -68096,7 +68096,7 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
     const rctBtn = ctnBtn instanceof Button_1.Button
         ? ctnBtn.getBtnBounds()
         : ctnBtn.getBounds();
-    const isLink = (hArg.タグ名 === 'link');
+    const isLink = (hArg[':タグ名'] === 'link');
     if (!isLink) {
         const cpp = ctnBtn.parent.parent;
         rctBtn.x += cpp.x;
@@ -68275,22 +68275,8 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
         this.val.setVal_Nochk('tmp', 'sn.auto.enabled', false);
         this.layMng.setNormalWaitTxtLayer();
     }, "f");
-    __classPrivateFieldGet(this, _EventMng_instances, "m", _EventMng_unregisterClickEvts).call(this);
+    this.scrItr.unregisterClickEvts();
     return false;
-}, _EventMng_unregisterClickEvts = function _EventMng_unregisterClickEvts() {
-    const len = this.scrItr.lenCallStk;
-    for (let i = 0; i < len; ++i) {
-        const cs = this.scrItr.getCallStk(i);
-        if (!cs)
-            continue;
-        const hE1T = cs.hEvt1Time;
-        if (!hE1T)
-            continue;
-        delete hE1T['Click'];
-        delete hE1T['Enter'];
-        delete hE1T['ArrowDown'];
-        delete hE1T['wheel.y>0'];
-    }
 }, _EventMng_set_focus = function _EventMng_set_focus(hArg) {
     const add = hArg.add;
     if (add?.slice(0, 4) === 'dom=') {
@@ -71486,7 +71472,6 @@ class ScriptIterator {
         _ScriptIterator_lineNum.set(this, 0);
         this.addLineNum = (len) => __classPrivateFieldSet(this, _ScriptIterator_lineNum, __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f") + len, "f");
         _ScriptIterator_aCallStk.set(this, []);
-        this.getCallStk = (idx) => __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[idx].csArg;
         _ScriptIterator_grm.set(this, new Grammar_1.Grammar);
         this.firstWait = () => { };
         _ScriptIterator_hHook.set(this, {
@@ -71538,7 +71523,7 @@ class ScriptIterator {
             stepout: o => {
                 if (__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_isIdxOverLast).call(this))
                     return;
-                if (this.lenCallStk > 0)
+                if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length > 0)
                     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepout).call(this, true);
                 else
                     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepover).call(this, o);
@@ -71641,7 +71626,7 @@ class ScriptIterator {
         hTag.record_place = () => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_record_place).call(this);
         hTag.save = o => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_save).call(this, o);
         if (cfg.oCfg.debug.token)
-            __classPrivateFieldSet(this, _ScriptIterator_dbgToken, token => console.log(`🌱 トークン fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idxToken:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} token【${token}】`), "f");
+            __classPrivateFieldSet(this, _ScriptIterator_dbgToken, token => console.log(`🌱 トークン fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idx:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} token【${token}】`), "f");
         val.defTmp('const.sn.vctCallStk.length', () => __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length);
         __classPrivateFieldGet(this, _ScriptIterator_grm, "f").setEscape(cfg.oCfg.init.escape);
         if (CmnLib_1.CmnLib.isDbg) {
@@ -71689,19 +71674,24 @@ class ScriptIterator {
         else
             this.recodeDesign = () => { };
         if (cfg.oCfg.debug.tag)
-            __classPrivateFieldSet(this, _ScriptIterator_procDebugtag, tag_name => console.log(`🌲 タグ解析 fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} lnum:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} [${tag_name} %o]`, this.alzTagArg.hPrm), "f");
+            __classPrivateFieldSet(this, _ScriptIterator_procDebugtag, tag_name => console.log(`🌲 タグ解析 fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idx:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} [${tag_name} %o]`, this.alzTagArg.hPrm), "f");
     }
     get scriptFn() { return __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"); }
     ;
     subIdxToken() { var _b; __classPrivateFieldSet(this, _ScriptIterator_idxToken, (_b = __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"), --_b), "f"); }
     ;
     get lineNum() { return __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f"); }
-    get lenCallStk() { return __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length; }
-    ;
-    get lastHArg() { return __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[this.lenCallStk - 1].csArg; }
-    ;
     destroy() { this.isBreak = () => false; }
     ;
+    unregisterClickEvts() {
+        __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").forEach(cs => {
+            const hE1T = cs.csArg[':hEvt1Time'];
+            delete hE1T['Click'];
+            delete hE1T['Enter'];
+            delete hE1T['ArrowDown'];
+            delete hE1T['wheel.y>0'];
+        });
+    }
     タグ解析(tagToken) {
         const [tag_name, args] = (0, Grammar_1.tagToken2Name_Args)(tagToken);
         const tag_fnc = this.hTag[tag_name];
@@ -71722,26 +71712,25 @@ class ScriptIterator {
                 return false;
         }
         let hArg = {};
-        const lenStk = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
+        const len = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
         if (this.alzTagArg.isKomeParam) {
-            if (lenStk === 0)
-                throw '属性「*」はマクロのみ有効です';
-            if (!this.lastHArg)
+            if (len === 0)
                 throw '属性「*」はマクロのみ有効です';
-            hArg = { ...hArg, ...this.lastHArg };
+            hArg = { ...__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - 1].csArg };
         }
+        hArg[':タグ名'] = tag_name;
         for (const arg_nm in hPrm) {
             let v = hPrm[arg_nm].val;
-            if (v && v.charAt(0) === '%') {
-                if (lenStk === 0)
+            if (v?.charAt(0) === '%') {
+                if (len === 0)
                     throw '属性「%」はマクロ定義内でのみ使用できます（そのマクロの引数を示す簡略文法であるため）';
-                const mac = this.lastHArg[v.slice(1)];
+                const mac = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - 1].csArg[v.slice(1)];
                 if (mac) {
                     hArg[arg_nm] = mac;
                     continue;
                 }
                 v = hPrm[arg_nm].def;
-                if (!v || v === 'null')
+                if (v === undefined || v === 'null')
                     continue;
             }
             v = this.prpPrs.getValAmpersand(v ?? '');
@@ -71756,7 +71745,6 @@ class ScriptIterator {
             if (v !== 'undefined')
                 hArg[arg_nm] = v;
         }
-        hArg.タグ名 = tag_name;
         return tag_fnc(hArg);
     }
     setOtherObj(evtMng, layMng) {
@@ -71859,7 +71847,7 @@ class ScriptIterator {
         let idx = 0;
         const len = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
         if (hArg.design_unit && len > 0) {
-            const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[len - 1];
+            const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[0];
             fn = cs.fn;
             idx = cs.idx;
         }
@@ -71894,7 +71882,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     }
 }, _ScriptIterator_go_stepout = function _ScriptIterator_go_stepout(out) {
     this.sys.callHook(`stopOnStep${out ? 'Out' : ''}`, {});
-    __classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, this.lenCallStk - (out ? 1 : 0), "f");
+    __classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - (out ? 1 : 0), "f");
     __classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
     __classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.stepout : BreakState.stepouting, "f");
     this.main.setLoop(true);
@@ -71915,7 +71903,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.stepout, "f");
             break;
         case BreakState.stepout:
-            if (this.lenCallStk !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
+            if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
                 break;
             __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.step, "f");
             this.main.setLoop(false, 'ステップ実行');
@@ -71987,8 +71975,6 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         return a;
     for (let i = len - 1; i >= 0; --i) {
         const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[i];
-        if (!cs.csArg)
-            continue;
         const st = __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")[cs.fn];
         const tkn = st.aToken[cs.idx - 1];
         const lc = __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_cnvIdx2lineCol).call(this, st, cs.idx);
@@ -71998,7 +71984,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             ln: lc.ln,
             col: lc.col_s + 1,
             nm: tag_name ? `[${tag_name}]` : tkn,
-            ma: cs.csArg.hMp['const.sn.macro'] ?? '{}',
+            ma: cs.csArg[':hMp']['const.sn.macro'] ?? '{}',
         });
     }
     return a;
@@ -72034,11 +72020,9 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         console.info(now);
         for (let i = len - 1; i >= 0; --i) {
             const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[i];
-            if (!cs.csArg)
-                continue;
-            const csa = cs.csArg.hMp;
-            const from_macro_nm = csa ? csa['タグ名'] : null;
-            const call_nm = cs.csArg.タグ名;
+            const hMp = cs.csArg[':hMp'];
+            const from_macro_nm = hMp ? hMp[':タグ名'] : null;
+            const call_nm = cs.csArg[':タグ名'] ?? '';
             const lc = __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_cnvIdx2lineCol).call(this, __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")[cs.fn], cs.idx);
             console.info(`${len - i}つ前のコール元 fn:${cs.fn} line:${lc.ln} col:${lc.col_s + 1}` + (from_macro_nm ? '（[' + from_macro_nm + ']マクロ内）' : ' ') +
                 `で [${call_nm} ...]をコール`);
@@ -72174,7 +72158,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     const fn = hArg.fn;
     if (fn)
         __classPrivateFieldGet(this, _ScriptIterator_cnvSnPath, "f").call(this, fn);
-    __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_callSub).call(this, { hEvt1Time: __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").popLocalEvts(), hMp: this.val.cloneMp() });
+    __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_callSub).call(this, { ':hEvt1Time': __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").popLocalEvts(), ':hMp': this.val.cloneMp() });
     if ((0, CmnLib_1.argChk_Boolean)(hArg, 'clear_local_event', false))
         this.hTag.clear_event({});
     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_jumpWork).call(this, fn, hArg.label);
@@ -72182,7 +72166,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
 }, _ScriptIterator_callSub = function _ScriptIterator_callSub(csa) {
     __classPrivateFieldGet(this, _ScriptIterator_script, "f").aLNum[__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")] = __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f");
     if (!__classPrivateFieldGet(this, _ScriptIterator_resvToken, "f")) {
-        csa.resvToken = '';
+        csa[':resvToken'] = '';
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
     }
     __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").push(new CallStack_1.CallStack(__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"), __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"), csa));
@@ -72238,14 +72222,12 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").pop();
     if (!cs)
         throw '[return] スタックが空です';
-    const csArg = cs.csArg;
-    if (!csArg)
-        return false;
+    const csa = cs.csArg;
     __classPrivateFieldGet(this, _ScriptIterator_aIfStk, "f").shift();
-    const hMp = csArg.hMp;
+    const hMp = csa[':hMp'];
     if (hMp)
         this.val.setMp(hMp);
-    const after_token = csArg.resvToken;
+    const after_token = csa[':resvToken'];
     if (after_token)
         this.nextToken = () => {
             __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
@@ -72253,8 +72235,8 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         };
     else
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
-    if (csArg.hEvt1Time)
-        __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").pushLocalEvts(csArg.hEvt1Time);
+    if (csa[':hEvt1Time'])
+        __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").pushLocalEvts(csa[':hEvt1Time']);
     if (cs.fn in __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")) {
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_jump_light).call(this, cs);
         return false;
@@ -72384,6 +72366,14 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     for (let i = 0; i < len; ++i) {
         st.aLNum[i] ||= ln;
         const tkn = st.aToken[i];
+        if (in_let_ml) {
+            __classPrivateFieldGet(this, _ScriptIterator_REG_TAG_ENDLET_ML, "f").lastIndex = 0;
+            if (__classPrivateFieldGet(this, _ScriptIterator_REG_TAG_ENDLET_ML, "f").test(tkn))
+                in_let_ml = false;
+            else
+                ln += (tkn.match(/\n/g) ?? []).length;
+            continue;
+        }
         const uc = tkn.charCodeAt(0);
         if (uc === 10) {
             ln += tkn.length;
@@ -72397,17 +72387,9 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         if (uc !== 91)
             continue;
         ln += (tkn.match(/\n/g) ?? []).length;
-        if (in_let_ml) {
-            __classPrivateFieldGet(this, _ScriptIterator_REG_TAG_ENDLET_ML, "f").lastIndex = 0;
-            if (__classPrivateFieldGet(this, _ScriptIterator_REG_TAG_ENDLET_ML, "f").test(tkn))
-                in_let_ml = false;
-        }
-        else {
-            __classPrivateFieldGet(this, _ScriptIterator_REG_TAG_LET_ML, "f").lastIndex = 0;
-            if (__classPrivateFieldGet(this, _ScriptIterator_REG_TAG_LET_ML, "f").test(tkn))
-                in_let_ml = true;
-        }
-        continue;
+        __classPrivateFieldGet(this, _ScriptIterator_REG_TAG_LET_ML, "f").lastIndex = 0;
+        if (__classPrivateFieldGet(this, _ScriptIterator_REG_TAG_LET_ML, "f").test(tkn))
+            in_let_ml = true;
     }
     if (in_let_ml)
         throw '[let_ml]の終端・[endlet_ml]がありません';
@@ -72491,7 +72473,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     __classPrivateFieldSet(this, _ScriptIterator_REGSTEPIN, new RegExp(`\\[(${__classPrivateFieldGet(this, _ScriptIterator_strStepin, "f")})\\b`), "f");
     this.hTag[name] = hArgM => {
         hArgM.design_unit = hArg.design_unit;
-        __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_callSub).call(this, { ...hArgM, hMp: this.val.cloneMp() });
+        __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_callSub).call(this, { ...hArgM, ':hMp': this.val.cloneMp() });
         this.val.setMp(hArgM);
         this.val.setVal_Nochk('mp', 'const.sn.macro', JSON.stringify(hArg));
         this.val.setVal_Nochk('mp', 'const.sn.me_call_scriptFn', __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"));
@@ -72593,7 +72575,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             fn: __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"),
             idx: __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"),
         };
-    const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[len - 1];
+    const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[0];
     return {
         fn: cs.fn,
         idx: cs.idx,
@@ -72602,7 +72584,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     if (!('place' in hArg))
         throw 'placeは必須です';
     const place = Number(hArg.place);
-    delete hArg.タグ名;
+    delete hArg[':タグ名'];
     delete hArg.place;
     hArg.text = (hArg.text ?? '').replace(/^(<br\/>)+/, '');
     __classPrivateFieldGet(this, _ScriptIterator_mark, "f").json = hArg;
@@ -74959,10 +74941,13 @@ class TxtStage extends pixi_js_1.Container {
         __classPrivateFieldSet(this, _TxtStage_fncEndChIn, () => {
             __classPrivateFieldSet(this, _TxtStage_isChInIng, false, "f");
             chs.forEach(v => v.className = v.className.replace(/ go_ch_in_[^\s"]+/g, ''));
-            if (__classPrivateFieldGet(this, _TxtStage_break_fixed, "f"))
-                __classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_cntBreak).position.set(__classPrivateFieldGet(this, _TxtStage_break_fixed_left, "f"), __classPrivateFieldGet(this, _TxtStage_break_fixed_top, "f"));
-            else
-                __classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_cntBreak).position.set(rctLastCh.x + (__classPrivateFieldGet(this, _TxtStage_isTategaki, "f") ? 0 : rctLastCh.width), rctLastCh.y + (__classPrivateFieldGet(this, _TxtStage_isTategaki, "f") ? rctLastCh.height : 0));
+            if (begin !== len) {
+                __classPrivateFieldSet(this, _TxtStage_break_fixed_left, rctLastCh.x
+                    + (__classPrivateFieldGet(this, _TxtStage_isTategaki, "f") ? 0 : rctLastCh.width), "f");
+                __classPrivateFieldSet(this, _TxtStage_break_fixed_top, rctLastCh.y
+                    + (__classPrivateFieldGet(this, _TxtStage_isTategaki, "f") ? rctLastCh.height : 0), "f");
+            }
+            __classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_cntBreak).position.set(__classPrivateFieldGet(this, _TxtStage_break_fixed_left, "f"), __classPrivateFieldGet(this, _TxtStage_break_fixed_top, "f"));
             __classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_cntBreak).visible = true;
             __classPrivateFieldSet(this, _TxtStage_fncEndChIn, () => { }, "f");
         }, "f");

package/core/lib/sn/CallStack.d.ts

@@ -1,18 +1,18 @@
 import { IHEvt2Fnc, IValMp } from './CmnInterface';
 export interface ICallStackArg {
-    resvToken?: string;
-    hEvt1Time: IHEvt2Fnc;
-    hMp: IValMp;
-    タグ名?: string;
+    ':resvToken'?: string;
+    ':hEvt1Time': IHEvt2Fnc;
+    ':hMp': IValMp;
+    ':タグ名'?: string;
 }
 export declare class CallStack {
     private readonly $fn;
     private readonly $idx;
-    private readonly $hArg;
-    constructor($fn?: string, $idx?: number, $hArg?: ICallStackArg | null);
+    private readonly $csArg;
+    constructor($fn?: string, $idx?: number, $csArg?: ICallStackArg);
     get fn(): string;
     get idx(): number;
-    get csArg(): ICallStackArg | null;
+    get csArg(): ICallStackArg;
     readonly toString: () => string;
 }
 //# sourceMappingURL=CallStack.d.ts.map

package/core/lib/sn/CallStack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CallStack.d.ts","sourceRoot":"","sources":["../../src/sn/CallStack.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,SAAS,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAEjD,MAAM,WAAW,aAAa;IAC7B,SAAS,CAAC,EAAG,MAAM,CAAC;IACpB,SAAS,EAAG,SAAS,CAAC;IACtB,GAAG,EAAK,MAAM,CAAC;IACf,GAAG,CAAC,EAAI,MAAM,CAAC;CACf;AAED,qBAAa,SAAS;IACT,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAO,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAM,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAA3D,GAAG,SAAK,EAAmB,IAAI,SAAI,EAAmB,KAAK,GAAE,aAAa,GAAG,IAAW;IAErH,IAAI,EAAE,WAAoB;IAC1B,IAAI,GAAG,WAAqB;IAC5B,IAAI,KAAK,yBAAsB;IAC/B,QAAQ,CAAC,QAAQ,eAAiE;CAElF"}
+{"version":3,"file":"CallStack.d.ts","sourceRoot":"","sources":["../../src/sn/CallStack.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,SAAS,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAEjD,MAAM,WAAW,aAAa;IAC7B,YAAY,CAAC,EAAG,MAAM,CAAC;IACvB,YAAY,EAAG,SAAS,CAAC;IACzB,MAAM,EAAK,MAAM,CAAC;IAClB,MAAM,CAAC,EAAI,MAAM,CAAC;CAClB;AAED,qBAAa,SAAS;IACT,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAO,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAM,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAA5D,GAAG,SAAK,EAAmB,IAAI,SAAI,EAAmB,MAAM,GAAE,aAA8C;IAEzI,IAAI,EAAE,WAAoB;IAC1B,IAAI,GAAG,WAAqB;IAC5B,IAAI,KAAK,kBAAuB;IAChC,QAAQ,CAAC,QAAQ,eAAmE;CAEpF"}

package/core/lib/sn/CmnInterface.d.ts

@@ -1,5 +1,5 @@
 export declare type HArg = {
-    タグ名?: string;
+    ':タグ名'?: string;
     layer?: string;
     class?: string;
     index?: number;

package/core/lib/sn/CmnInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CmnInterface.d.ts","sourceRoot":"","sources":["../../src/sn/CmnInterface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CmnInterface.d.ts","sourceRoot":"","sources":["../../src/sn/CmnInterface.ts"],"names":[],"mappings":"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"}

package/core/lib/sn/EventMng.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventMng.d.ts","sourceRoot":"","sources":["../../src/sn/EventMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAAe,OAAO,EAA6B,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAY,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAOhD,OAAO,EAAC,SAAS,EAAE,WAAW,EAA6B,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAIlC,qBAAa,QAAS,YAAW,OAAO;;IAe3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,QAAQ,CAAC,OAAO,EAAE,WAAW;IAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAkB,QAAQ,CAAC,GAAG,EAAE,OAAO;IAR1S,UAAU,SAAU,MAAM,cAAc,MAAM,cAAc,MAAM,UAAO;gBAQ5C,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAW,OAAO,EAAE,WAAW,EAAmB,IAAI,EAAE,KAAK,EAAmB,MAAM,EAAE,QAAQ,EAAmB,GAAG,EAAE,SAAS,EAAmB,MAAM,EAAE,QAAQ,EAAmB,MAAM,EAAE,cAAc,EAAW,GAAG,EAAE,OAAO;IAkL1S,cAAc,CAAC,GAAG,EAAE,MAAM;IAyD1B,OAAO;IASP,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK;IAqC1B,YAAY,IAAI,SAAS;IAKzB,aAAa,CAAC,CAAC,EAAE,SAAS;IAE1B,SAAS,CAAC,QAAQ,EAAE,MAAK,IAAI,EAAE,OAAO,UAAO,EAAE,MAAM,UAAQ,GAAG,OAAO;IA2DvE,QAAQ,CAAC,MAAM,EAAE,SAAS;IAC1B,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAK,IAAI,EAAE,KAAK,EAAE,MAAK,OAAO,EAAE,OAAO,EAAE,MAAK,IAAI;IA8GhG,SAAS;IA4CT,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAK,IAAI,GAAG,OAAO;IAkU1D,aAAa,IAAI,OAAO;CAkBxB"}
+{"version":3,"file":"EventMng.d.ts","sourceRoot":"","sources":["../../src/sn/EventMng.ts"],"names":[],"mappings":"AAOA,OAAO,EAAe,OAAO,EAA6B,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAY,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAOhD,OAAO,EAAC,SAAS,EAAE,WAAW,EAA6B,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAIlC,qBAAa,QAAS,YAAW,OAAO;;IAe3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,QAAQ,CAAC,OAAO,EAAE,WAAW;IAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAkB,QAAQ,CAAC,GAAG,EAAE,OAAO;IAR1S,UAAU,SAAU,MAAM,cAAc,MAAM,cAAc,MAAM,UAAO;gBAQ5C,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAW,OAAO,EAAE,WAAW,EAAmB,IAAI,EAAE,KAAK,EAAmB,MAAM,EAAE,QAAQ,EAAmB,GAAG,EAAE,SAAS,EAAmB,MAAM,EAAE,QAAQ,EAAmB,MAAM,EAAE,cAAc,EAAW,GAAG,EAAE,OAAO;IAkL1S,cAAc,CAAC,GAAG,EAAE,MAAM;IAyD1B,OAAO;IASP,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK;IAqC1B,YAAY,IAAI,SAAS;IAKzB,aAAa,CAAC,CAAC,EAAE,SAAS;IAE1B,SAAS,CAAC,QAAQ,EAAE,MAAK,IAAI,EAAE,OAAO,UAAO,EAAE,MAAM,UAAQ,GAAG,OAAO;IA2DvE,QAAQ,CAAC,MAAM,EAAE,SAAS;IAC1B,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAK,IAAI,EAAE,KAAK,EAAE,MAAK,OAAO,EAAE,OAAO,EAAE,MAAK,IAAI;IA8GhG,SAAS;IA4CT,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAK,IAAI,GAAG,OAAO;IAoT1D,aAAa,IAAI,OAAO;CAkBxB"}

package/core/lib/sn/ScriptIterator.d.ts

@@ -1,6 +1,5 @@
 import { IHTag, IMain, IVariable, HArg, IPropParser } from './CmnInterface';
 import { Config } from './Config';
-import { ICallStackArg } from './CallStack';
 import { AnalyzeTagArg } from './AnalyzeTagArg';
 import { EventMng } from './EventMng';
 import { LayerMng } from './LayerMng';
@@ -21,13 +20,11 @@ export declare class ScriptIterator {
     subIdxToken(): void;
     get lineNum(): number;
     readonly addLineNum: (len: number) => number;
-    get lenCallStk(): number;
-    get lastHArg(): any;
-    readonly getCallStk: (idx: number) => ICallStackArg | null;
     constructor(cfg: Config, hTag: IHTag, main: IMain, val: IVariable, alzTagArg: AnalyzeTagArg, runAnalyze: () => void, prpPrs: IPropParser, sndMng: SoundMng, sys: SysBase);
     firstWait: () => void;
     destroy(): void;
     cnvPath4Dbg: (fn: string) => string;
+    unregisterClickEvts(): void;
     isBreak: (_token: string) => boolean;
     タグ解析(tagToken: string): boolean;
     setOtherObj(evtMng: EventMng, layMng: LayerMng): void;

package/core/lib/sn/ScriptIterator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScriptIterator.d.ts","sourceRoot":"","sources":["../../src/sn/ScriptIterator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAS,IAAI,EAAU,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACzF,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAY,aAAa,EAAC,MAAM,aAAa,CAAC;AAErD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAsBlC,qBAAa,cAAc;;IAoBd,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAiB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAa,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAe,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,GAAG;IAhBvT,IAAI,QAAQ,IAAI,MAAM,CAAyB;IAE/C,WAAW,IAAI,IAAI;IAEnB,IAAI,OAAO,IAAI,MAAM,CAAwB;IAC7C,QAAQ,CAAC,UAAU,QAAS,MAAM,YAAyB;IAI3D,IAAI,UAAU,IAAI,MAAM,CAAgC;IACxD,IAAI,QAAQ,IAAI,GAAG,CAAmD;IACtE,QAAQ,CAAC,UAAU,QAAS,MAAM,0BAA8B;gBAKnC,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAmB,IAAI,EAAE,KAAK,EAAmB,GAAG,EAAE,SAAS,EAAmB,SAAS,EAAE,aAAa,EAAmB,UAAU,EAAE,MAAK,IAAI,EAAmB,MAAM,EAAE,WAAW,EAAmB,MAAM,EAAE,QAAQ,EAAmB,GAAG,EAAE,OAAO;IA0FhU,SAAS,aAAW;IAKpB,OAAO;IAgFP,WAAW,OAAQ,MAAM,YAAyE;IAoClG,OAAO,WAAY,MAAM,aAAU;IAqGnC,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAsD/B,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI;IA2HrD,WAAW,UAAW,OAAO,UAAM;IAInC,eAAe;IAmQf,OAAO,CAAC,WAAW;IAQnB,SAAS,eAAW;IA8NpB,IAAI,QAAQ,IAAI,OAAO,CAAyB;IAKhD,IAAI,YAAY,IAAI,OAAO,CAoB1B;IAGD,IAAI,UAAU,IAAI,MAAM,CAYvB;IAoID,IAAI,SAAS,YAA2B;IAoExC,UAAU;IA8BV,YAAY,CAAC,IAAI,EAAE,IAAI;IA0BvB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAEhC"}
+{"version":3,"file":"ScriptIterator.d.ts","sourceRoot":"","sources":["../../src/sn/ScriptIterator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAS,IAAI,EAAU,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACzF,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAsBlC,qBAAa,cAAc;;IAiBd,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAS,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAiB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAa,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAe,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAY,OAAO,CAAC,QAAQ,CAAC,GAAG;IAbvT,IAAI,QAAQ,WAA2B;IAEvC,WAAW;IAEX,IAAI,OAAO,WAA0B;IACrC,QAAQ,CAAC,UAAU,QAAS,MAAM,YAAyB;gBAQ9B,GAAG,EAAE,MAAM,EAAmB,IAAI,EAAE,KAAK,EAAmB,IAAI,EAAE,KAAK,EAAmB,GAAG,EAAE,SAAS,EAAmB,SAAS,EAAE,aAAa,EAAmB,UAAU,EAAE,MAAK,IAAI,EAAmB,MAAM,EAAE,WAAW,EAAmB,MAAM,EAAE,QAAQ,EAAmB,GAAG,EAAE,OAAO;IA0FhU,SAAS,aAAW;IAKpB,OAAO;IAgFP,WAAW,OAAQ,MAAM,YAAyE;IA+BlG,mBAAmB;IAenB,OAAO,WAAY,MAAM,aAAU;IAmGnC,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAuD/B,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI;IAyHrD,WAAW,UAAW,OAAO,UAAM;IAInC,eAAe;IAkQf,OAAO,CAAC,WAAW;IAQnB,SAAS,eAAW;IA6NpB,IAAI,QAAQ,IAAI,OAAO,CAAyB;IAKhD,IAAI,YAAY,IAAI,OAAO,CAoB1B;IAGD,IAAI,UAAU,IAAI,MAAM,CAYvB;IAmID,IAAI,SAAS,YAA2B;IAoExC,UAAU;IA8BV,YAAY,CAAC,IAAI,EAAE,IAAI;IA0BvB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAEhC"}

package/core/lib/sn/SysBase.d.ts

@@ -52,7 +52,7 @@ export declare class SysBase implements ISysBase {
     protected readonly window: ITag;
     setTitleInfo(txt: string): void;
     decStr(ext: string, d: string): string;
-    dec(ext: string, d: ArrayBuffer): Promise<string | HTMLImageElement | HTMLVideoElement | ArrayBuffer>;
+    dec(ext: string, d: ArrayBuffer): Promise<string | ArrayBuffer | HTMLImageElement | HTMLVideoElement>;
     protected enc: (d: string) => string;
     protected stk: () => string;
     hash: (_data: string) => string;

package/core/lib/sn/TxtStage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TxtStage.d.ts","sourceRoot":"","sources":["../../src/sn/TxtStage.ts"],"names":[],"mappings":"AAOA,OAAO,EAAS,OAAO,EAA6B,MAAM,UAAU,CAAC;AACrE,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAG3C,OAAO,EAAC,SAAS,EAAW,MAAM,EAAuB,QAAQ,EAAQ,MAAM,SAAS,CAAC;AAGzF,UAAU,SAAS;IAClB,QAAQ,EAAG,MAAM,CAAC;IAClB,MAAM,EAAI,MAAM,CAAC;IACjB,OAAO,EAAI,MAAM,CAAC;IAClB,QAAQ,EAAG,MAAM,CAAC;IAClB,SAAS,EAAG,MAAM,CAAC;IACnB,OAAO,EAAI,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;CACpB;AAiBD,qBAAa,QAAS,SAAQ,SAAS;;IAmD1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAU,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhDrE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAS9B,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO;IAEhC,MAAM,CAAC,OAAO;gBAqCe,KAAK,EAAE,MAAM,EAAmB,QAAQ,EAAE,MAAK,OAAO;IAenF,GAAG,CAAC,IAAI,EAAE,IAAI;IAgFd,SAAS;IAWT,IAAI,QAAQ,YAA4B;IAIxC,IAAI,KAAK,IAAI,SAAS,CAAqB;IAC3C,IAAI,QAAQ,WAA8B;IAC1C,IAAI,SAAS,WAA+B;IAE5C,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA8WrC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE;IAiSrB,QAAQ,IAAI,OAAO;IAWnB,MAAM,CAAC,WAAW;IAIlB,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM;IAChC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG;IA2CnC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;;;IACjC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG;IA+BpC,SAAS,CAAC,GAAG,EAAE,MAAM;IAQrB,MAAM,CAAC,QAAQ;IAkGf,KAAK,IAAI,QAAQ;IAyBjB,MAAM;;;;;;;;;;;;IAeN,QAAQ,CAAC,IAAI,EAAE,GAAG;IAmBlB,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAK,IAAI;IAgBrC,YAAY;IAIZ,cAAc,CAAC,GAAG,EAAE,eAAe;IAOnC,cAAc;IAEd,IAAI,IAAI,MAAM;IAaL,OAAO;CAOhB"}
+{"version":3,"file":"TxtStage.d.ts","sourceRoot":"","sources":["../../src/sn/TxtStage.ts"],"names":[],"mappings":"AAOA,OAAO,EAAS,OAAO,EAA6B,MAAM,UAAU,CAAC;AACrE,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAG3C,OAAO,EAAC,SAAS,EAAW,MAAM,EAAuB,QAAQ,EAAQ,MAAM,SAAS,CAAC;AAGzF,UAAU,SAAS;IAClB,QAAQ,EAAG,MAAM,CAAC;IAClB,MAAM,EAAI,MAAM,CAAC;IACjB,OAAO,EAAI,MAAM,CAAC;IAClB,QAAQ,EAAG,MAAM,CAAC;IAClB,SAAS,EAAG,MAAM,CAAC;IACnB,OAAO,EAAI,MAAM,CAAC;IAClB,UAAU,EAAG,MAAM,CAAC;CACpB;AAiBD,qBAAa,QAAS,SAAQ,SAAS;;IAmD1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAU,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhDrE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAS9B,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO;IAEhC,MAAM,CAAC,OAAO;gBAqCe,KAAK,EAAE,MAAM,EAAmB,QAAQ,EAAE,MAAK,OAAO;IAenF,GAAG,CAAC,IAAI,EAAE,IAAI;IAgFd,SAAS;IAWT,IAAI,QAAQ,YAA4B;IAIxC,IAAI,KAAK,IAAI,SAAS,CAAqB;IAC3C,IAAI,QAAQ,WAA8B;IAC1C,IAAI,SAAS,WAA+B;IAE5C,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA8WrC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE;IAmSrB,QAAQ,IAAI,OAAO;IAWnB,MAAM,CAAC,WAAW;IAIlB,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM;IAChC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG;IA2CnC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;;;IACjC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG;IA+BpC,SAAS,CAAC,GAAG,EAAE,MAAM;IAQrB,MAAM,CAAC,QAAQ;IAkGf,KAAK,IAAI,QAAQ;IAyBjB,MAAM;;;;;;;;;;;;IAeN,QAAQ,CAAC,IAAI,EAAE,GAAG;IAmBlB,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAK,IAAI;IAgBrC,YAAY;IAIZ,cAAc,CAAC,GAAG,EAAE,eAAe;IAOnC,cAAc;IAEd,IAAI,IAAI,MAAM;IAaL,OAAO;CAOhB"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@famibee/skynovel",
-	"version": "1.25.0",
+	"version": "1.25.4",
 	"description": "webgl novelgame framework",
 	"main": "core/web.js",
 	"types": "core/lib/index.d.ts",
@@ -29,7 +29,7 @@
 		"@types/electron-json-storage": "^4.5.0",
 		"@types/fs-extra": "^9.0.13",
 		"@types/mocha": "^9.0.0",
-		"@types/node": "^17.0.3",
+		"@types/node": "^17.0.4",
 		"@types/parsimmon": "^1.10.6",
 		"@types/platform": "^1.3.4",
 		"@types/power-assert": "^1.5.8",

package/web.js

@@ -67531,15 +67531,15 @@ _Button_procMasume4pic = { value: (_me, _sp, _w3, _h) => { } };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CallStack = void 0;
 class CallStack {
-    constructor($fn = '', $idx = 0, $hArg = null) {
+    constructor($fn = '', $idx = 0, $csArg = { ':hEvt1Time': {}, ':hMp': {} }) {
         this.$fn = $fn;
         this.$idx = $idx;
-        this.$hArg = $hArg;
-        this.toString = () => `[fn:${this.$fn}, idx:${this.$idx}, hArg:${this.$hArg}]`;
+        this.$csArg = $csArg;
+        this.toString = () => `[fn:${this.$fn}, idx:${this.$idx}, csArg:${this.$csArg}]`;
     }
     get fn() { return this.$fn; }
     get idx() { return this.$idx; }
-    get csArg() { return this.$hArg; }
+    get csArg() { return this.$csArg; }
 }
 exports.CallStack = CallStack;
 
@@ -67635,7 +67635,7 @@ function argChk_Num(hash, name, def) {
     const v = hash[name];
     if (!(name in hash)) {
         if (isNaN(def))
-            throw `[${hash.タグ名}]属性 ${name} は必須です`;
+            throw `[${hash[':タグ名']}]属性 ${name} は必須です`;
         hash[name] = def;
         return def;
     }
@@ -67643,7 +67643,7 @@ function argChk_Num(hash, name, def) {
         ? parseInt(v)
         : parseFloat(v);
     if (isNaN(n))
-        throw `[${hash.タグ名}]属性 ${name} の値【${v}】が数値ではありません`;
+        throw `[${hash[':タグ名']}]属性 ${name} の値【${v}】が数値ではありません`;
     return hash[name] = n;
 }
 exports.argChk_Num = argChk_Num;
@@ -68926,7 +68926,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _EventMng_instances, _EventMng_elc, _EventMng_cvsHint, _EventMng_picHint_w, _EventMng_picHint_h, _EventMng_padHint, _EventMng_grpHint, _EventMng_gamepad, _EventMng_fcs, _EventMng_resvFlameEvent4Wheel, _EventMng_ev_keydown, _EventMng_ev_contextmenu, _EventMng_ev_wheel, _EventMng_wheeling, _EventMng_extend_wheel, _EventMng_ev_wheel_waitstop, _EventMng_hLocalEvt2Fnc, _EventMng_hGlobalEvt2Fnc, _EventMng_isDbgBreak, _EventMng_isWait, _EventMng_getEvt2Fnc, _EventMng_waitEventBase, _EventMng_firstWait, _EventMng_dispHint, _EventMng_dispHint_hArg, _EventMng_dispHint_ctnBtn, _EventMng_dispHint_masume, _EventMng_procWheel4wle, _EventMng_elcWLE, _EventMng_clear_event, _EventMng_clear_eventer, _EventMng_event, _EventMng_canFocus, _EventMng_getHtmlElmList, _EventMng_goTxt, _EventMng_l, _EventMng_p, _EventMng_fncCancelSkip, _EventMng_set_cancel_skip, _EventMng_unregisterClickEvts, _EventMng_set_focus, _EventMng_wait, _EventMng_waitclick, _EventMng_hDownKeys;
+var _EventMng_instances, _EventMng_elc, _EventMng_cvsHint, _EventMng_picHint_w, _EventMng_picHint_h, _EventMng_padHint, _EventMng_grpHint, _EventMng_gamepad, _EventMng_fcs, _EventMng_resvFlameEvent4Wheel, _EventMng_ev_keydown, _EventMng_ev_contextmenu, _EventMng_ev_wheel, _EventMng_wheeling, _EventMng_extend_wheel, _EventMng_ev_wheel_waitstop, _EventMng_hLocalEvt2Fnc, _EventMng_hGlobalEvt2Fnc, _EventMng_isDbgBreak, _EventMng_isWait, _EventMng_getEvt2Fnc, _EventMng_waitEventBase, _EventMng_firstWait, _EventMng_dispHint, _EventMng_dispHint_hArg, _EventMng_dispHint_ctnBtn, _EventMng_dispHint_masume, _EventMng_procWheel4wle, _EventMng_elcWLE, _EventMng_clear_event, _EventMng_clear_eventer, _EventMng_event, _EventMng_canFocus, _EventMng_getHtmlElmList, _EventMng_goTxt, _EventMng_l, _EventMng_p, _EventMng_fncCancelSkip, _EventMng_set_cancel_skip, _EventMng_set_focus, _EventMng_wait, _EventMng_waitclick, _EventMng_hDownKeys;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.EventMng = void 0;
 const CmnLib_1 = __webpack_require__(/*! ./CmnLib */ "./core/src/sn/CmnLib.ts");
@@ -68984,7 +68984,7 @@ class EventMng {
             __classPrivateFieldGet(this, _EventMng_grpHint, "f").y = rctBtn.y;
             __classPrivateFieldGet(this, _EventMng_grpHint, "f").rotation = ctnBtn.rotation;
             const p = (isLink ? ctnBtn.parent : ctnBtn).scale;
-            const isBtnPic = (hArg.タグ名 === 'button') && (hArg.pic);
+            const isBtnPic = (hArg[':タグ名'] === 'button') && (hArg.pic);
             __classPrivateFieldGet(this, _EventMng_grpHint, "f").clear()
                 .beginFill(0x33FF00, 0.2)
                 .lineStyle(1, 0x33FF00, 1)
@@ -69444,7 +69444,7 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
     const rctBtn = ctnBtn instanceof Button_1.Button
         ? ctnBtn.getBtnBounds()
         : ctnBtn.getBounds();
-    const isLink = (hArg.タグ名 === 'link');
+    const isLink = (hArg[':タグ名'] === 'link');
     if (!isLink) {
         const cpp = ctnBtn.parent.parent;
         rctBtn.x += cpp.x;
@@ -69623,22 +69623,8 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
         this.val.setVal_Nochk('tmp', 'sn.auto.enabled', false);
         this.layMng.setNormalWaitTxtLayer();
     }, "f");
-    __classPrivateFieldGet(this, _EventMng_instances, "m", _EventMng_unregisterClickEvts).call(this);
+    this.scrItr.unregisterClickEvts();
     return false;
-}, _EventMng_unregisterClickEvts = function _EventMng_unregisterClickEvts() {
-    const len = this.scrItr.lenCallStk;
-    for (let i = 0; i < len; ++i) {
-        const cs = this.scrItr.getCallStk(i);
-        if (!cs)
-            continue;
-        const hE1T = cs.hEvt1Time;
-        if (!hE1T)
-            continue;
-        delete hE1T['Click'];
-        delete hE1T['Enter'];
-        delete hE1T['ArrowDown'];
-        delete hE1T['wheel.y>0'];
-    }
 }, _EventMng_set_focus = function _EventMng_set_focus(hArg) {
     const add = hArg.add;
     if (add?.slice(0, 4) === 'dom=') {
@@ -72834,7 +72820,6 @@ class ScriptIterator {
         _ScriptIterator_lineNum.set(this, 0);
         this.addLineNum = (len) => __classPrivateFieldSet(this, _ScriptIterator_lineNum, __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f") + len, "f");
         _ScriptIterator_aCallStk.set(this, []);
-        this.getCallStk = (idx) => __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[idx].csArg;
         _ScriptIterator_grm.set(this, new Grammar_1.Grammar);
         this.firstWait = () => { };
         _ScriptIterator_hHook.set(this, {
@@ -72886,7 +72871,7 @@ class ScriptIterator {
             stepout: o => {
                 if (__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_isIdxOverLast).call(this))
                     return;
-                if (this.lenCallStk > 0)
+                if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length > 0)
                     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepout).call(this, true);
                 else
                     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepover).call(this, o);
@@ -72989,7 +72974,7 @@ class ScriptIterator {
         hTag.record_place = () => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_record_place).call(this);
         hTag.save = o => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_save).call(this, o);
         if (cfg.oCfg.debug.token)
-            __classPrivateFieldSet(this, _ScriptIterator_dbgToken, token => console.log(`🌱 トークン fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idxToken:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} token【${token}】`), "f");
+            __classPrivateFieldSet(this, _ScriptIterator_dbgToken, token => console.log(`🌱 トークン fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idx:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} token【${token}】`), "f");
         val.defTmp('const.sn.vctCallStk.length', () => __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length);
         __classPrivateFieldGet(this, _ScriptIterator_grm, "f").setEscape(cfg.oCfg.init.escape);
         if (CmnLib_1.CmnLib.isDbg) {
@@ -73037,19 +73022,24 @@ class ScriptIterator {
         else
             this.recodeDesign = () => { };
         if (cfg.oCfg.debug.tag)
-            __classPrivateFieldSet(this, _ScriptIterator_procDebugtag, tag_name => console.log(`🌲 タグ解析 fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} lnum:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} [${tag_name} %o]`, this.alzTagArg.hPrm), "f");
+            __classPrivateFieldSet(this, _ScriptIterator_procDebugtag, tag_name => console.log(`🌲 タグ解析 fn:${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")} idx:${__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")} ln:${__classPrivateFieldGet(this, _ScriptIterator_lineNum, "f")} [${tag_name} %o]`, this.alzTagArg.hPrm), "f");
     }
     get scriptFn() { return __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"); }
     ;
     subIdxToken() { var _b; __classPrivateFieldSet(this, _ScriptIterator_idxToken, (_b = __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"), --_b), "f"); }
     ;
     get lineNum() { return __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f"); }
-    get lenCallStk() { return __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length; }
-    ;
-    get lastHArg() { return __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[this.lenCallStk - 1].csArg; }
-    ;
     destroy() { this.isBreak = () => false; }
     ;
+    unregisterClickEvts() {
+        __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").forEach(cs => {
+            const hE1T = cs.csArg[':hEvt1Time'];
+            delete hE1T['Click'];
+            delete hE1T['Enter'];
+            delete hE1T['ArrowDown'];
+            delete hE1T['wheel.y>0'];
+        });
+    }
     タグ解析(tagToken) {
         const [tag_name, args] = (0, Grammar_1.tagToken2Name_Args)(tagToken);
         const tag_fnc = this.hTag[tag_name];
@@ -73070,26 +73060,25 @@ class ScriptIterator {
                 return false;
         }
         let hArg = {};
-        const lenStk = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
+        const len = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
         if (this.alzTagArg.isKomeParam) {
-            if (lenStk === 0)
-                throw '属性「*」はマクロのみ有効です';
-            if (!this.lastHArg)
+            if (len === 0)
                 throw '属性「*」はマクロのみ有効です';
-            hArg = { ...hArg, ...this.lastHArg };
+            hArg = { ...__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - 1].csArg };
         }
+        hArg[':タグ名'] = tag_name;
         for (const arg_nm in hPrm) {
             let v = hPrm[arg_nm].val;
-            if (v && v.charAt(0) === '%') {
-                if (lenStk === 0)
+            if (v?.charAt(0) === '%') {
+                if (len === 0)
                     throw '属性「%」はマクロ定義内でのみ使用できます（そのマクロの引数を示す簡略文法であるため）';
-                const mac = this.lastHArg[v.slice(1)];
+                const mac = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - 1].csArg[v.slice(1)];
                 if (mac) {
                     hArg[arg_nm] = mac;
                     continue;
                 }
                 v = hPrm[arg_nm].def;
-                if (!v || v === 'null')
+                if (v === undefined || v === 'null')
                     continue;
             }
             v = this.prpPrs.getValAmpersand(v ?? '');
@@ -73104,7 +73093,6 @@ class ScriptIterator {
             if (v !== 'undefined')
                 hArg[arg_nm] = v;
         }
-        hArg.タグ名 = tag_name;
         return tag_fnc(hArg);
     }
     setOtherObj(evtMng, layMng) {
@@ -73207,7 +73195,7 @@ class ScriptIterator {
         let idx = 0;
         const len = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
         if (hArg.design_unit && len > 0) {
-            const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[len - 1];
+            const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[0];
             fn = cs.fn;
             idx = cs.idx;
         }
@@ -73242,7 +73230,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     }
 }, _ScriptIterator_go_stepout = function _ScriptIterator_go_stepout(out) {
     this.sys.callHook(`stopOnStep${out ? 'Out' : ''}`, {});
-    __classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, this.lenCallStk - (out ? 1 : 0), "f");
+    __classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - (out ? 1 : 0), "f");
     __classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
     __classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.stepout : BreakState.stepouting, "f");
     this.main.setLoop(true);
@@ -73263,7 +73251,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.stepout, "f");
             break;
         case BreakState.stepout:
-            if (this.lenCallStk !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
+            if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
                 break;
             __classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.step, "f");
             this.main.setLoop(false, 'ステップ実行');
@@ -73335,8 +73323,6 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         return a;
     for (let i = len - 1; i >= 0; --i) {
         const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[i];
-        if (!cs.csArg)
-            continue;
         const st = __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")[cs.fn];
         const tkn = st.aToken[cs.idx - 1];
         const lc = __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_cnvIdx2lineCol).call(this, st, cs.idx);
@@ -73346,7 +73332,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             ln: lc.ln,
             col: lc.col_s + 1,
             nm: tag_name ? `[${tag_name}]` : tkn,
-            ma: cs.csArg.hMp['const.sn.macro'] ?? '{}',
+            ma: cs.csArg[':hMp']['const.sn.macro'] ?? '{}',
         });
     }
     return a;
@@ -73382,11 +73368,9 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         console.info(now);
         for (let i = len - 1; i >= 0; --i) {
             const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[i];
-            if (!cs.csArg)
-                continue;
-            const csa = cs.csArg.hMp;
-            const from_macro_nm = csa ? csa['タグ名'] : null;
-            const call_nm = cs.csArg.タグ名;
+            const hMp = cs.csArg[':hMp'];
+            const from_macro_nm = hMp ? hMp[':タグ名'] : null;
+            const call_nm = cs.csArg[':タグ名'] ?? '';
             const lc = __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_cnvIdx2lineCol).call(this, __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")[cs.fn], cs.idx);
             console.info(`${len - i}つ前のコール元 fn:${cs.fn} line:${lc.ln} col:${lc.col_s + 1}` + (from_macro_nm ? '（[' + from_macro_nm + ']マクロ内）' : ' ') +
                 `で [${call_nm} ...]をコール`);
@@ -73522,7 +73506,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     const fn = hArg.fn;
     if (fn)
         __classPrivateFieldGet(this, _ScriptIterator_cnvSnPath, "f").call(this, fn);
-    __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_callSub).call(this, { hEvt1Time: __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").popLocalEvts(), hMp: this.val.cloneMp() });
+    __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_callSub).call(this, { ':hEvt1Time': __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").popLocalEvts(), ':hMp': this.val.cloneMp() });
     if ((0, CmnLib_1.argChk_Boolean)(hArg, 'clear_local_event', false))
         this.hTag.clear_event({});
     __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_jumpWork).call(this, fn, hArg.label);
@@ -73530,7 +73514,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
 }, _ScriptIterator_callSub = function _ScriptIterator_callSub(csa) {
     __classPrivateFieldGet(this, _ScriptIterator_script, "f").aLNum[__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f")] = __classPrivateFieldGet(this, _ScriptIterator_lineNum, "f");
     if (!__classPrivateFieldGet(this, _ScriptIterator_resvToken, "f")) {
-        csa.resvToken = '';
+        csa[':resvToken'] = '';
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
     }
     __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").push(new CallStack_1.CallStack(__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"), __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"), csa));
@@ -73586,14 +73570,12 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").pop();
     if (!cs)
         throw '[return] スタックが空です';
-    const csArg = cs.csArg;
-    if (!csArg)
-        return false;
+    const csa = cs.csArg;
     __classPrivateFieldGet(this, _ScriptIterator_aIfStk, "f").shift();
-    const hMp = csArg.hMp;
+    const hMp = csa[':hMp'];
     if (hMp)
         this.val.setMp(hMp);
-    const after_token = csArg.resvToken;
+    const after_token = csa[':resvToken'];
     if (after_token)
         this.nextToken = () => {
             __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
@@ -73601,8 +73583,8 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         };
     else
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_clearResvToken).call(this);
-    if (csArg.hEvt1Time)
-        __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").pushLocalEvts(csArg.hEvt1Time);
+    if (csa[':hEvt1Time'])
+        __classPrivateFieldGet(this, _ScriptIterator_evtMng, "f").pushLocalEvts(csa[':hEvt1Time']);
     if (cs.fn in __classPrivateFieldGet(this, _ScriptIterator_hScript, "f")) {
         __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_jump_light).call(this, cs);
         return false;
@@ -73732,6 +73714,14 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     for (let i = 0; i < len; ++i) {
         st.aLNum[i] ||= ln;
         const tkn = st.aToken[i];
+        if (in_let_ml) {
+            __classPrivateFieldGet(this, _ScriptIterator_REG_TAG_ENDLET_ML, "f").lastIndex = 0;
+            if (__classPrivateFieldGet(this, _ScriptIterator_REG_TAG_ENDLET_ML, "f").test(tkn))
+                in_let_ml = false;
+            else
+                ln += (tkn.match(/\n/g) ?? []).length;
+            continue;
+        }
         const uc = tkn.charCodeAt(0);
         if (uc === 10) {
             ln += tkn.length;
@@ -73745,17 +73735,9 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
         if (uc !== 91)
             continue;
         ln += (tkn.match(/\n/g) ?? []).length;
-        if (in_let_ml) {
-            __classPrivateFieldGet(this, _ScriptIterator_REG_TAG_ENDLET_ML, "f").lastIndex = 0;
-            if (__classPrivateFieldGet(this, _ScriptIterator_REG_TAG_ENDLET_ML, "f").test(tkn))
-                in_let_ml = false;
-        }
-        else {
-            __classPrivateFieldGet(this, _ScriptIterator_REG_TAG_LET_ML, "f").lastIndex = 0;
-            if (__classPrivateFieldGet(this, _ScriptIterator_REG_TAG_LET_ML, "f").test(tkn))
-                in_let_ml = true;
-        }
-        continue;
+        __classPrivateFieldGet(this, _ScriptIterator_REG_TAG_LET_ML, "f").lastIndex = 0;
+        if (__classPrivateFieldGet(this, _ScriptIterator_REG_TAG_LET_ML, "f").test(tkn))
+            in_let_ml = true;
     }
     if (in_let_ml)
         throw '[let_ml]の終端・[endlet_ml]がありません';
@@ -73839,7 +73821,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     __classPrivateFieldSet(this, _ScriptIterator_REGSTEPIN, new RegExp(`\\[(${__classPrivateFieldGet(this, _ScriptIterator_strStepin, "f")})\\b`), "f");
     this.hTag[name] = hArgM => {
         hArgM.design_unit = hArg.design_unit;
-        __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_callSub).call(this, { ...hArgM, hMp: this.val.cloneMp() });
+        __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_callSub).call(this, { ...hArgM, ':hMp': this.val.cloneMp() });
         this.val.setMp(hArgM);
         this.val.setVal_Nochk('mp', 'const.sn.macro', JSON.stringify(hArg));
         this.val.setVal_Nochk('mp', 'const.sn.me_call_scriptFn', __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"));
@@ -73941,7 +73923,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
             fn: __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"),
             idx: __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f"),
         };
-    const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[len - 1];
+    const cs = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[0];
     return {
         fn: cs.fn,
         idx: cs.idx,
@@ -73950,7 +73932,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
     if (!('place' in hArg))
         throw 'placeは必須です';
     const place = Number(hArg.place);
-    delete hArg.タグ名;
+    delete hArg[':タグ名'];
     delete hArg.place;
     hArg.text = (hArg.text ?? '').replace(/^(<br\/>)+/, '');
     __classPrivateFieldGet(this, _ScriptIterator_mark, "f").json = hArg;
@@ -76194,10 +76176,13 @@ class TxtStage extends pixi_js_1.Container {
         __classPrivateFieldSet(this, _TxtStage_fncEndChIn, () => {
             __classPrivateFieldSet(this, _TxtStage_isChInIng, false, "f");
             chs.forEach(v => v.className = v.className.replace(/ go_ch_in_[^\s"]+/g, ''));
-            if (__classPrivateFieldGet(this, _TxtStage_break_fixed, "f"))
-                __classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_cntBreak).position.set(__classPrivateFieldGet(this, _TxtStage_break_fixed_left, "f"), __classPrivateFieldGet(this, _TxtStage_break_fixed_top, "f"));
-            else
-                __classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_cntBreak).position.set(rctLastCh.x + (__classPrivateFieldGet(this, _TxtStage_isTategaki, "f") ? 0 : rctLastCh.width), rctLastCh.y + (__classPrivateFieldGet(this, _TxtStage_isTategaki, "f") ? rctLastCh.height : 0));
+            if (begin !== len) {
+                __classPrivateFieldSet(this, _TxtStage_break_fixed_left, rctLastCh.x
+                    + (__classPrivateFieldGet(this, _TxtStage_isTategaki, "f") ? 0 : rctLastCh.width), "f");
+                __classPrivateFieldSet(this, _TxtStage_break_fixed_top, rctLastCh.y
+                    + (__classPrivateFieldGet(this, _TxtStage_isTategaki, "f") ? rctLastCh.height : 0), "f");
+            }
+            __classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_cntBreak).position.set(__classPrivateFieldGet(this, _TxtStage_break_fixed_left, "f"), __classPrivateFieldGet(this, _TxtStage_break_fixed_top, "f"));
             __classPrivateFieldGet(TxtStage, _a, "f", _TxtStage_cntBreak).visible = true;
             __classPrivateFieldSet(this, _TxtStage_fncEndChIn, () => { }, "f");
         }, "f");