@famibee/skynovel 1.25.2 → 1.25.6

package/web.js

@@ -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_stopSkip, _EventMng_set_cancel_skip, _EventMng_set_focus, _EventMng_wait, _EventMng_cancelWait, _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");
@@ -69001,7 +69001,8 @@ class EventMng {
         _EventMng_procWheel4wle.set(this, (_elc, _fnc) => { });
         _EventMng_elcWLE.set(this, new EventListenerCtn_1.EventListenerCtn);
         _EventMng_goTxt.set(this, () => this.layMng.goTxt());
-        _EventMng_fncCancelSkip.set(this, () => { });
+        _EventMng_stopSkip.set(this, () => false);
+        _EventMng_cancelWait.set(this, () => { });
         _EventMng_hDownKeys.set(this, {
             'Alt': 0,
             'Meta': 0,
@@ -69202,26 +69203,23 @@ class EventMng {
         __classPrivateFieldGet(this, _EventMng_cvsHint, "f")?.parentElement.removeChild(__classPrivateFieldGet(this, _EventMng_cvsHint, "f"));
     }
     fire(KEY, e) {
-        if (__classPrivateFieldGet(this, _EventMng_isDbgBreak, "f"))
-            return;
-        if (!__classPrivateFieldGet(this, _EventMng_isWait, "f"))
+        if (__classPrivateFieldGet(this, _EventMng_stopSkip, "f").call(this)
+            || !__classPrivateFieldGet(this, _EventMng_isWait, "f") || __classPrivateFieldGet(this, _EventMng_isDbgBreak, "f"))
             return;
         const key = KEY.toLowerCase();
         if (CmnLib_1.CmnLib.debugLog)
             console.log(`👺 fire<(key:\`${key}\` type:${e.type} e:%o)`, { ...e });
         if (key === 'enter') {
             const em = __classPrivateFieldGet(this, _EventMng_fcs, "f").getFocus();
-            if (em && em instanceof pixi_js_1.Container) {
+            if (em instanceof pixi_js_1.Container) {
                 em.emit('pointerdown', new Event('pointerdown'));
                 return;
             }
         }
         const ke = __classPrivateFieldGet(this, _EventMng_getEvt2Fnc, "f").call(this, key);
         if (!ke) {
-            if (key.slice(0, 5) === 'swipe') {
-                const esw = e;
-                globalThis.scrollBy(-esw.deltaX ?? 0, -esw.deltaY ?? 0);
-            }
+            if (key.slice(0, 5) === 'swipe')
+                globalThis.scrollBy(-e.deltaX ?? 0, -e.deltaY ?? 0);
             return;
         }
         if (key.slice(-5) !== 'wheel')
@@ -69243,12 +69241,12 @@ class EventMng {
         if (canskip && global)
             throw `canskipとglobalを同時にtrue指定できません`;
         if (this.val.getVal('tmp:sn.skip.enabled')) {
-            if (this.val.getVal('tmp:sn.skip.all')
-                || this.scrItr.isNextKidoku) {
+            if (this.val.getVal('tmp:sn.skip.all') ||
+                this.scrItr.isNextKidoku) {
                 onFinish();
                 return false;
             }
-            __classPrivateFieldGet(this, _EventMng_fncCancelSkip, "f").call(this);
+            __classPrivateFieldGet(this, _EventMng_stopSkip, "f").call(this);
         }
         __classPrivateFieldGet(this, _EventMng_instances, "m", _EventMng_waitEventBase).call(this, onFinish, canskip, global);
         return true;
@@ -69341,9 +69339,9 @@ class EventMng {
         this.val.saveKidoku();
         const fnc = () => { __classPrivateFieldGet(this, _EventMng_elcWLE, "f").clear(); onFinish(); };
         if (this.val.getVal('tmp:sn.skip.enabled')) {
-            if (!this.val.getVal('tmp:sn.skip.all')
-                && !this.scrItr.isNextKidoku)
-                __classPrivateFieldGet(this, _EventMng_fncCancelSkip, "f").call(this);
+            if (!this.val.getVal('tmp:sn.skip.all') &&
+                !this.scrItr.isNextKidoku)
+                __classPrivateFieldGet(this, _EventMng_stopSkip, "f").call(this);
             else {
                 fnc();
                 return false;
@@ -69361,17 +69359,17 @@ class EventMng {
         __classPrivateFieldGet(this, _EventMng_procWheel4wle, "f").call(this, __classPrivateFieldGet(this, _EventMng_elcWLE, "f"), fnc);
         return true;
     }
-    isSkipKeyDown() {
+    isSkippingByKeyDown() {
         if (this.scrItr.skip4page)
             return true;
-        for (const v in __classPrivateFieldGet(this, _EventMng_hDownKeys, "f"))
-            if (__classPrivateFieldGet(this, _EventMng_hDownKeys, "f")[v] === 2)
+        for (const k in __classPrivateFieldGet(this, _EventMng_hDownKeys, "f"))
+            if (__classPrivateFieldGet(this, _EventMng_hDownKeys, "f")[k] === 2)
                 return true;
         return false;
     }
 }
 exports.EventMng = EventMng;
-_EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picHint_w = new WeakMap(), _EventMng_picHint_h = new WeakMap(), _EventMng_padHint = new WeakMap(), _EventMng_grpHint = new WeakMap(), _EventMng_gamepad = new WeakMap(), _EventMng_fcs = new WeakMap(), _EventMng_resvFlameEvent4Wheel = new WeakMap(), _EventMng_wheeling = new WeakMap(), _EventMng_extend_wheel = new WeakMap(), _EventMng_hLocalEvt2Fnc = new WeakMap(), _EventMng_hGlobalEvt2Fnc = new WeakMap(), _EventMng_isDbgBreak = new WeakMap(), _EventMng_isWait = new WeakMap(), _EventMng_getEvt2Fnc = new WeakMap(), _EventMng_firstWait = new WeakMap(), _EventMng_dispHint_hArg = new WeakMap(), _EventMng_dispHint_ctnBtn = new WeakMap(), _EventMng_dispHint_masume = new WeakMap(), _EventMng_procWheel4wle = new WeakMap(), _EventMng_elcWLE = new WeakMap(), _EventMng_goTxt = new WeakMap(), _EventMng_fncCancelSkip = new WeakMap(), _EventMng_hDownKeys = new WeakMap(), _EventMng_instances = new WeakSet(), _EventMng_ev_keydown = function _EventMng_ev_keydown(e) {
+_EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picHint_w = new WeakMap(), _EventMng_picHint_h = new WeakMap(), _EventMng_padHint = new WeakMap(), _EventMng_grpHint = new WeakMap(), _EventMng_gamepad = new WeakMap(), _EventMng_fcs = new WeakMap(), _EventMng_resvFlameEvent4Wheel = new WeakMap(), _EventMng_wheeling = new WeakMap(), _EventMng_extend_wheel = new WeakMap(), _EventMng_hLocalEvt2Fnc = new WeakMap(), _EventMng_hGlobalEvt2Fnc = new WeakMap(), _EventMng_isDbgBreak = new WeakMap(), _EventMng_isWait = new WeakMap(), _EventMng_getEvt2Fnc = new WeakMap(), _EventMng_firstWait = new WeakMap(), _EventMng_dispHint_hArg = new WeakMap(), _EventMng_dispHint_ctnBtn = new WeakMap(), _EventMng_dispHint_masume = new WeakMap(), _EventMng_procWheel4wle = new WeakMap(), _EventMng_elcWLE = new WeakMap(), _EventMng_goTxt = new WeakMap(), _EventMng_stopSkip = new WeakMap(), _EventMng_cancelWait = new WeakMap(), _EventMng_hDownKeys = new WeakMap(), _EventMng_instances = new WeakSet(), _EventMng_ev_keydown = function _EventMng_ev_keydown(e) {
     if (e['isComposing'])
         return;
     if (e.key in __classPrivateFieldGet(this, _EventMng_hDownKeys, "f"))
@@ -69415,10 +69413,10 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
     __classPrivateFieldGet(this, _EventMng_goTxt, "f").call(this);
     this.val.saveKidoku();
     if (canskip) {
-        __classPrivateFieldGet(this, _EventMng_hLocalEvt2Fnc, "f")['click'] = onFinish;
-        __classPrivateFieldGet(this, _EventMng_hLocalEvt2Fnc, "f")['enter'] = onFinish;
-        __classPrivateFieldGet(this, _EventMng_hLocalEvt2Fnc, "f")['arrowdown'] = onFinish;
-        __classPrivateFieldGet(this, _EventMng_hLocalEvt2Fnc, "f")['wheel.y>0'] = onFinish;
+        __classPrivateFieldGet(this, _EventMng_hLocalEvt2Fnc, "f")['click'] =
+            __classPrivateFieldGet(this, _EventMng_hLocalEvt2Fnc, "f")['enter'] =
+                __classPrivateFieldGet(this, _EventMng_hLocalEvt2Fnc, "f")['arrowdown'] =
+                    __classPrivateFieldGet(this, _EventMng_hLocalEvt2Fnc, "f")['wheel.y>0'] = onFinish;
     }
     else {
         delete __classPrivateFieldGet(this, _EventMng_hLocalEvt2Fnc, "f")['click'];
@@ -69574,10 +69572,10 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
         return false;
     }
     if (this.val.getVal('tmp:sn.skip.enabled')) {
-        if (!this.val.getVal('tmp:sn.skip.all')
-            && !this.scrItr.isNextKidoku)
-            __classPrivateFieldGet(this, _EventMng_fncCancelSkip, "f").call(this);
-        else if ('ps'.includes(String(this.val.getVal('sys:sn.skip.mode'))))
+        if (!this.val.getVal('tmp:sn.skip.all') &&
+            !this.scrItr.isNextKidoku)
+            __classPrivateFieldGet(this, _EventMng_stopSkip, "f").call(this);
+        else if ('ps'.includes(this.val.getVal('sys:sn.skip.mode')))
             return false;
     }
     if (this.val.getVal('tmp:sn.auto.enabled'))
@@ -69593,10 +69591,10 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
 }, _EventMng_p = function _EventMng_p(hArg) {
     this.scrItr.recodePage();
     if (this.val.getVal('tmp:sn.skip.enabled')) {
-        if (!this.val.getVal('tmp:sn.skip.all')
-            && !this.scrItr.isNextKidoku)
-            __classPrivateFieldGet(this, _EventMng_fncCancelSkip, "f").call(this);
-        else if ('s' === String(this.val.getVal('sys:sn.skip.mode'))) {
+        if (!this.val.getVal('tmp:sn.skip.all') &&
+            !this.scrItr.isNextKidoku)
+            __classPrivateFieldGet(this, _EventMng_stopSkip, "f").call(this);
+        else if ('s' == this.val.getVal('sys:sn.skip.mode')) {
             __classPrivateFieldGet(this, _EventMng_goTxt, "f").call(this);
             return false;
         }
@@ -69610,35 +69608,22 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
     if ((0, CmnLib_1.argChk_Boolean)(hArg, 'visible', true))
         this.layMng.breakPage();
     const fnc = () => { this.sndMng.clearCache(); this.main.resume(); };
-    __classPrivateFieldGet(this, _EventMng_instances, "m", _EventMng_waitEventBase).call(this, this.layMng.getCurrentTxtlayFore()
-        && (0, CmnLib_1.argChk_Boolean)(hArg, 'er', false)
+    __classPrivateFieldGet(this, _EventMng_instances, "m", _EventMng_waitEventBase).call(this, (0, CmnLib_1.argChk_Boolean)(hArg, 'er', false)
+        && this.layMng.currentTxtlayFore
         ? () => { this.hTag.er(hArg); fnc(); }
         : fnc);
     return true;
 }, _EventMng_set_cancel_skip = function _EventMng_set_cancel_skip() {
-    __classPrivateFieldSet(this, _EventMng_fncCancelSkip, () => {
-        __classPrivateFieldSet(this, _EventMng_fncCancelSkip, () => { }, "f");
+    __classPrivateFieldSet(this, _EventMng_stopSkip, () => {
+        __classPrivateFieldSet(this, _EventMng_stopSkip, () => false, "f");
         this.val.setVal_Nochk('tmp', 'sn.tagL.enabled', true);
         this.val.setVal_Nochk('tmp', 'sn.skip.enabled', false);
         this.val.setVal_Nochk('tmp', 'sn.auto.enabled', false);
-        this.layMng.setNormalWaitTxtLayer();
+        this.layMng.setNormalChWait();
+        __classPrivateFieldGet(this, _EventMng_cancelWait, "f").call(this);
+        return true;
     }, "f");
-    __classPrivateFieldGet(this, _EventMng_instances, "m", _EventMng_unregisterClickEvts).call(this);
     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=') {
@@ -69680,27 +69665,31 @@ _EventMng_elc = new WeakMap(), _EventMng_cvsHint = new WeakMap(), _EventMng_picH
     if (this.scrItr.skip4page)
         return false;
     if (this.val.getVal('tmp:sn.skip.enabled')) {
-        if (!this.val.getVal('tmp:sn.skip.all')
-            && !this.scrItr.isNextKidoku)
-            __classPrivateFieldGet(this, _EventMng_fncCancelSkip, "f").call(this);
-        else
-            return false;
+        if (!this.val.getVal('tmp:sn.skip.all') &&
+            !this.scrItr.isNextKidoku)
+            __classPrivateFieldGet(this, _EventMng_stopSkip, "f").call(this);
+        return false;
     }
+    if (this.val.getVal('tmp:sn.auto.enabled'))
+        __classPrivateFieldSet(this, _EventMng_cancelWait, () => {
+            this.scrItr.subIdxToken();
+            tw.end();
+        }, "f");
     const tw = new tween_js_1.Tween({})
         .to({}, (0, CmnLib_1.uint)((0, CmnLib_1.argChk_Num)(hArg, 'time', NaN)))
-        .onComplete(() => { tw.stop(); this.main.resume(); })
+        .onComplete(() => {
+        __classPrivateFieldSet(this, _EventMng_cancelWait, () => { }, "f");
+        tw.stop();
+        this.main.resume();
+    })
         .start();
     return this.waitEvent(() => tw.end(), (0, CmnLib_1.argChk_Boolean)(hArg, 'canskip', true), (0, CmnLib_1.argChk_Boolean)(hArg, 'global', false));
 }, _EventMng_waitclick = function _EventMng_waitclick() {
     if (this.scrItr.skip4page)
         return false;
-    if (this.val.getVal('tmp:sn.skip.enabled')) {
-        if (!this.val.getVal('tmp:sn.skip.all')
-            && !this.scrItr.isNextKidoku)
-            __classPrivateFieldGet(this, _EventMng_fncCancelSkip, "f").call(this);
-        else
-            return false;
-    }
+    if (this.val.getVal('tmp:sn.skip.enabled')
+        || this.val.getVal('tmp:sn.auto.enabled'))
+        __classPrivateFieldGet(this, _EventMng_stopSkip, "f").call(this);
     __classPrivateFieldGet(this, _EventMng_instances, "m", _EventMng_waitEventBase).call(this, () => this.main.resume());
     return true;
 };
@@ -70222,8 +70211,8 @@ _FrameMng_evtMng = new WeakMap(), _FrameMng_hIfrm = new WeakMap(), _FrameMng_hDi
     this.appPixi.stage.interactive = false;
     const tw_nm = `frm\n${hArg.id}`;
     const tw = new tween_js_1.Tween(hNow)
-        .to(hTo, (0, CmnLib_1.argChk_Num)(hArg, 'time', NaN)
-        * (Boolean(this.val.getVal('tmp:sn.skip.enabled')) ? 0 : 1))
+        .to(hTo, (0, CmnLib_1.argChk_Num)(hArg, 'time', NaN) * (Boolean(this.val.getVal('tmp:sn.skip.enabled')
+        || __classPrivateFieldGet(this, _FrameMng_evtMng, "f").isSkippingByKeyDown()) ? 0 : 1))
         .delay((0, CmnLib_1.argChk_Num)(hArg, 'delay', 0))
         .easing(CmnTween_1.CmnTween.ease(hArg.ease))
         .repeat(repeat === 0 ? Infinity : (repeat - 1))
@@ -71116,7 +71105,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 _LayerMng_instances, _a, _LayerMng_stage, _LayerMng_fore, _LayerMng_back, _LayerMng_frmMng, _LayerMng_fncTicker, _LayerMng_hProcDbgRes, _LayerMng_modeLn, _LayerMng_modeLnSub, _LayerMng_selectNode, _LayerMng_grpCover, _LayerMng_evtMng, _LayerMng_foreachRedrawTxtLayBack, _LayerMng_cmdTxt, _LayerMng_snapshot, _LayerMng_loadplugin, _LayerMng_add_lay, _LayerMng_hPages, _LayerMng_aLayName, _LayerMng_curTxtlay, _LayerMng_firstGrplay, _LayerMng_lay, _LayerMng_rebuildLayerRankInfo, _LayerMng_clear_lay, _LayerMng_srcRuleTransFragment, _LayerMng_ufRuleTrans, _LayerMng_fltRule, _LayerMng_rtTransBack, _LayerMng_spTransBack, _LayerMng_rtTransFore, _LayerMng_spTransFore, _LayerMng_aBackTransAfter, _LayerMng_trans, _LayerMng_tiTrans, _LayerMng_getLayers, _LayerMng_foreachLayers, _LayerMng_sortLayers, _LayerMng_wt, _LayerMng_finish_trans, _LayerMng_quake, _LayerMng_hTwInf, _LayerMng_tsy, _LayerMng_wait_tsy, _LayerMng_stop_tsy, _LayerMng_pause_tsy, _LayerMng_resume_tsy, _LayerMng_msecChWait, _LayerMng_ch, _LayerMng_getTxtLayer, _LayerMng_$getTxtLayer, _LayerMng_current, _LayerMng_$current, _LayerMng_pgTxtlay, _LayerMng_fncChkTxtLay, _LayerMng_argChk_layer, _LayerMng_oLastPage, _LayerMng_aTxtLog, _LayerMng_clear_text, _LayerMng_endlink, _LayerMng_er, _LayerMng_graph, _LayerMng_link, _LayerMng_r, _LayerMng_rec_r, _LayerMng_rec_ch, _LayerMng_reset_rec, _LayerMng_ruby2, _LayerMng_span, _LayerMng_tcy, _LayerMng_dump_lay, _LayerMng_enable_event, _LayerMng_button;
+var _LayerMng_instances, _a, _LayerMng_stage, _LayerMng_fore, _LayerMng_back, _LayerMng_frmMng, _LayerMng_fncTicker, _LayerMng_hProcDbgRes, _LayerMng_modeLn, _LayerMng_modeLnSub, _LayerMng_selectNode, _LayerMng_grpCover, _LayerMng_evtMng, _LayerMng_foreachRedrawTxtLayBack, _LayerMng_cmdTxt, _LayerMng_snapshot, _LayerMng_loadplugin, _LayerMng_add_lay, _LayerMng_hPages, _LayerMng_aLayName, _LayerMng_curTxtlay, _LayerMng_firstGrplay, _LayerMng_lay, _LayerMng_rebuildLayerRankInfo, _LayerMng_clear_lay, _LayerMng_srcRuleTransFragment, _LayerMng_ufRuleTrans, _LayerMng_fltRule, _LayerMng_rtTransBack, _LayerMng_spTransBack, _LayerMng_rtTransFore, _LayerMng_spTransFore, _LayerMng_aBackTransAfter, _LayerMng_trans, _LayerMng_tiTrans, _LayerMng_getLayers, _LayerMng_foreachLayers, _LayerMng_sortLayers, _LayerMng_wt, _LayerMng_finish_trans, _LayerMng_quake, _LayerMng_hTwInf, _LayerMng_tsy, _LayerMng_wait_tsy, _LayerMng_stop_tsy, _LayerMng_pause_tsy, _LayerMng_resume_tsy, _LayerMng_msecChWait, _LayerMng_ch, _LayerMng_getTxtLayer, _LayerMng_$getTxtLayer, _LayerMng_current, _LayerMng_$current, _LayerMng_pgTxtlay, _LayerMng_chkTxtLay, _LayerMng_argChk_layer, _LayerMng_oLastPage, _LayerMng_aTxtLog, _LayerMng_clear_text, _LayerMng_endlink, _LayerMng_er, _LayerMng_graph, _LayerMng_link, _LayerMng_r, _LayerMng_rec_r, _LayerMng_rec_ch, _LayerMng_reset_rec, _LayerMng_ruby2, _LayerMng_span, _LayerMng_tcy, _LayerMng_dump_lay, _LayerMng_enable_event, _LayerMng_button;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.LayerMng = void 0;
 const CmnLib_1 = __webpack_require__(/*! ./CmnLib */ "./core/src/sn/CmnLib.ts");
@@ -71173,7 +71162,7 @@ class LayerMng {
         this.getFrmDisabled = (id) => __classPrivateFieldGet(this, _LayerMng_frmMng, "f").getFrmDisabled(id);
         _LayerMng_grpCover.set(this, null);
         _LayerMng_evtMng.set(this, void 0);
-        _LayerMng_cmdTxt.set(this, (cmd, tl = this.getCurrentTxtlayForeNeedErr(), _record = true) => tl.tagCh('｜　《' + cmd + '》'));
+        _LayerMng_cmdTxt.set(this, (cmd, tl = this.currentTxtlayForeNeedErr, _record = true) => tl.tagCh('｜　《' + cmd + '》'));
         this.goTxt = () => { };
         this.breakLine = () => { };
         this.breakPage = () => { };
@@ -71231,10 +71220,10 @@ void main(void) {
         _LayerMng_aBackTransAfter.set(this, []);
         _LayerMng_tiTrans.set(this, { tw: null, resume: false });
         _LayerMng_hTwInf.set(this, {});
-        _LayerMng_getTxtLayer.set(this, (_hArg) => { __classPrivateFieldGet(this, _LayerMng_fncChkTxtLay, "f").call(this); throw 0; });
-        _LayerMng_current.set(this, (_hArg) => { __classPrivateFieldGet(this, _LayerMng_fncChkTxtLay, "f").call(this); throw 0; });
+        _LayerMng_getTxtLayer.set(this, (_hArg) => { __classPrivateFieldGet(this, _LayerMng_chkTxtLay, "f").call(this); throw 0; });
+        _LayerMng_current.set(this, (_hArg) => { __classPrivateFieldGet(this, _LayerMng_chkTxtLay, "f").call(this); throw 0; });
         _LayerMng_pgTxtlay.set(this, void 0);
-        _LayerMng_fncChkTxtLay.set(this, () => { throw '文字レイヤーがありません。文字表示や操作する前に、[add_lay layer=（レイヤ名） class=txt]で文字レイヤを追加して下さい'; });
+        _LayerMng_chkTxtLay.set(this, () => { throw '文字レイヤーがありません。文字表示や操作する前に、[add_lay layer=（レイヤ名） class=txt]で文字レイヤを追加して下さい'; });
         _LayerMng_oLastPage.set(this, { text: '' });
         _LayerMng_aTxtLog.set(this, []);
         const cvs = document.getElementById(CmnLib_1.CmnLib.SN_ID);
@@ -71332,7 +71321,7 @@ void main(void) {
         val.defTmp('const.sn.log.json', () => JSON.stringify((__classPrivateFieldGet(this, _LayerMng_oLastPage, "f").text)
             ? [...__classPrivateFieldGet(this, _LayerMng_aTxtLog, "f"), __classPrivateFieldGet(this, _LayerMng_oLastPage, "f")]
             : __classPrivateFieldGet(this, _LayerMng_aTxtLog, "f")));
-        val.defTmp('const.sn.last_page_text', () => this.getCurrentTxtlayFore()?.pageText ?? '');
+        val.defTmp('const.sn.last_page_text', () => this.currentTxtlayFore?.pageText ?? '');
         if (CmnLib_1.CmnLib.isDbg) {
             DesignCast_1.DesignCast.init(this.appPixi, sys, scrItr, prpPrs, alzTagArg, this.cfg, __classPrivateFieldGet(this, _LayerMng_hPages, "f"));
             this.cvsResizeDesign = () => DesignCast_1.DesignCast.cvsResizeDesign();
@@ -71375,13 +71364,13 @@ void main(void) {
     }
     stopAllTw() { __classPrivateFieldSet(this, _LayerMng_hTwInf, {}, "f"); (0, tween_js_1.removeAll)(); }
     clearBreak() {
-        if (!this.getCurrentTxtlayFore())
+        if (!this.currentTxtlayFore)
             return;
         this.clearBreak = () => __classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, 'del｜break');
         this.clearBreak();
     }
     clickTxtLay() {
-        if (!this.getCurrentTxtlayFore())
+        if (!this.currentTxtlayFore)
             return;
         const vct = __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this);
         const len = vct.length;
@@ -71397,12 +71386,12 @@ void main(void) {
     }
     static get msecChWait() { return __classPrivateFieldGet(LayerMng, _a, "f", _LayerMng_msecChWait); }
     static set msecChWait(v) { __classPrivateFieldSet(LayerMng, _a, v, "f", _LayerMng_msecChWait); }
-    setNormalWaitTxtLayer() { __classPrivateFieldSet(LayerMng, _a, this.scrItr.normalWait, "f", _LayerMng_msecChWait); }
-    getCurrentTxtlayForeNeedErr() {
-        __classPrivateFieldGet(this, _LayerMng_fncChkTxtLay, "f").call(this);
-        return this.getCurrentTxtlayFore();
+    setNormalChWait() { __classPrivateFieldSet(LayerMng, _a, this.scrItr.normalWait, "f", _LayerMng_msecChWait); }
+    get currentTxtlayForeNeedErr() {
+        __classPrivateFieldGet(this, _LayerMng_chkTxtLay, "f").call(this);
+        return this.currentTxtlayFore;
     }
-    getCurrentTxtlayFore() {
+    get currentTxtlayFore() {
         if (!__classPrivateFieldGet(this, _LayerMng_pgTxtlay, "f"))
             return undefined;
         return __classPrivateFieldGet(this, _LayerMng_pgTxtlay, "f").fore;
@@ -71470,7 +71459,7 @@ void main(void) {
     }
 }
 exports.LayerMng = LayerMng;
-_a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(), _LayerMng_back = new WeakMap(), _LayerMng_frmMng = new WeakMap(), _LayerMng_fncTicker = new WeakMap(), _LayerMng_hProcDbgRes = new WeakMap(), _LayerMng_modeLn = new WeakMap(), _LayerMng_modeLnSub = new WeakMap(), _LayerMng_grpCover = new WeakMap(), _LayerMng_evtMng = new WeakMap(), _LayerMng_cmdTxt = new WeakMap(), _LayerMng_hPages = new WeakMap(), _LayerMng_aLayName = new WeakMap(), _LayerMng_curTxtlay = new WeakMap(), _LayerMng_firstGrplay = new WeakMap(), _LayerMng_srcRuleTransFragment = new WeakMap(), _LayerMng_ufRuleTrans = new WeakMap(), _LayerMng_fltRule = new WeakMap(), _LayerMng_rtTransBack = new WeakMap(), _LayerMng_spTransBack = new WeakMap(), _LayerMng_rtTransFore = new WeakMap(), _LayerMng_spTransFore = new WeakMap(), _LayerMng_aBackTransAfter = new WeakMap(), _LayerMng_tiTrans = new WeakMap(), _LayerMng_hTwInf = new WeakMap(), _LayerMng_getTxtLayer = new WeakMap(), _LayerMng_current = new WeakMap(), _LayerMng_pgTxtlay = new WeakMap(), _LayerMng_fncChkTxtLay = new WeakMap(), _LayerMng_oLastPage = new WeakMap(), _LayerMng_aTxtLog = new WeakMap(), _LayerMng_instances = new WeakSet(), _LayerMng_selectNode = function _LayerMng_selectNode(node) {
+_a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(), _LayerMng_back = new WeakMap(), _LayerMng_frmMng = new WeakMap(), _LayerMng_fncTicker = new WeakMap(), _LayerMng_hProcDbgRes = new WeakMap(), _LayerMng_modeLn = new WeakMap(), _LayerMng_modeLnSub = new WeakMap(), _LayerMng_grpCover = new WeakMap(), _LayerMng_evtMng = new WeakMap(), _LayerMng_cmdTxt = new WeakMap(), _LayerMng_hPages = new WeakMap(), _LayerMng_aLayName = new WeakMap(), _LayerMng_curTxtlay = new WeakMap(), _LayerMng_firstGrplay = new WeakMap(), _LayerMng_srcRuleTransFragment = new WeakMap(), _LayerMng_ufRuleTrans = new WeakMap(), _LayerMng_fltRule = new WeakMap(), _LayerMng_rtTransBack = new WeakMap(), _LayerMng_spTransBack = new WeakMap(), _LayerMng_rtTransFore = new WeakMap(), _LayerMng_spTransFore = new WeakMap(), _LayerMng_aBackTransAfter = new WeakMap(), _LayerMng_tiTrans = new WeakMap(), _LayerMng_hTwInf = new WeakMap(), _LayerMng_getTxtLayer = new WeakMap(), _LayerMng_current = new WeakMap(), _LayerMng_pgTxtlay = new WeakMap(), _LayerMng_chkTxtLay = new WeakMap(), _LayerMng_oLastPage = new WeakMap(), _LayerMng_aTxtLog = new WeakMap(), _LayerMng_instances = new WeakSet(), _LayerMng_selectNode = function _LayerMng_selectNode(node) {
     var _b, _c;
     _b = this, _c = this, [({ set value(_a) { __classPrivateFieldSet(_b, _LayerMng_modeLn, _a, "f"); } }).value, ({ set value(_a) { __classPrivateFieldSet(_c, _LayerMng_modeLnSub, _a, "f"); } }).value = ''] = node.split('/');
     const pages = __classPrivateFieldGet(this, _LayerMng_hPages, "f")[__classPrivateFieldGet(this, _LayerMng_modeLn, "f")];
@@ -71573,7 +71562,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
     switch (cls) {
         case 'txt':
             if (!__classPrivateFieldGet(this, _LayerMng_curTxtlay, "f")) {
-                __classPrivateFieldSet(this, _LayerMng_fncChkTxtLay, () => { }, "f");
+                __classPrivateFieldSet(this, _LayerMng_chkTxtLay, () => { }, "f");
                 __classPrivateFieldSet(this, _LayerMng_getTxtLayer, __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_$getTxtLayer), "f");
                 __classPrivateFieldSet(this, _LayerMng_current, __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_$current), "f");
                 this.hTag.current({ layer: layer });
@@ -71582,7 +71571,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
                         __classPrivateFieldSet(LayerMng, _a, 0, "f", _LayerMng_msecChWait);
                     }
                     else {
-                        this.setNormalWaitTxtLayer();
+                        this.setNormalChWait();
                     }
                     __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this).forEach(name => {
                         const pg = __classPrivateFieldGet(this, _LayerMng_hPages, "f")[name];
@@ -71707,7 +71696,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
     };
     __classPrivateFieldSet(this, _LayerMng_tiTrans, { tw: null, resume: false }, "f");
     const time = (0, CmnLib_1.argChk_Num)(hArg, 'time', 0);
-    if (time === 0 || __classPrivateFieldGet(this, _LayerMng_evtMng, "f").isSkipKeyDown()) {
+    if (time === 0 || __classPrivateFieldGet(this, _LayerMng_evtMng, "f").isSkippingByKeyDown()) {
         comp();
         return false;
     }
@@ -71781,7 +71770,7 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
     __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_finish_trans).call(this);
     if (this.val.getVal('tmp:sn.skip.enabled'))
         return false;
-    if (__classPrivateFieldGet(this, _LayerMng_evtMng, "f").isSkipKeyDown())
+    if (__classPrivateFieldGet(this, _LayerMng_evtMng, "f").isSkippingByKeyDown())
         return false;
     const aDo = [];
     __classPrivateFieldGet(this, _LayerMng_instances, "m", _LayerMng_getLayers).call(this, hArg.layer).forEach(lay_nm => {
@@ -71837,8 +71826,8 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
     const repeat = (0, CmnLib_1.argChk_Num)(hArg, 'repeat', 1);
     const tw_nm = hArg.name ?? hArg.layer;
     const tw = new tween_js_1.Tween(foreLay)
-        .to(hTo, (0, CmnLib_1.argChk_Num)(hArg, 'time', NaN) * (__classPrivateFieldGet(this, _LayerMng_evtMng, "f").isSkipKeyDown()
-        || Boolean(this.val.getVal('tmp:sn.skip.enabled')) ? 0 : 1))
+        .to(hTo, (0, CmnLib_1.argChk_Num)(hArg, 'time', NaN) * (Boolean(this.val.getVal('tmp:sn.skip.enabled')
+        || __classPrivateFieldGet(this, _LayerMng_evtMng, "f").isSkippingByKeyDown()) ? 0 : 1))
         .delay((0, CmnLib_1.argChk_Num)(hArg, 'delay', 0))
         .easing(CmnTween_1.CmnTween.ease(hArg.ease))
         .repeat(repeat === 0 ? Infinity : (repeat - 1))
@@ -71906,11 +71895,10 @@ _a = LayerMng, _LayerMng_stage = new WeakMap(), _LayerMng_fore = new WeakMap(),
         throw 'textは必須です';
     const tl = __classPrivateFieldGet(this, _LayerMng_getTxtLayer, "f").call(this, hArg);
     delete hArg.text;
-    if ('wait' in hArg) {
+    if (this.val.getVal('tmp:sn.skip.enabled'))
+        hArg.wait = 0;
+    else if ('wait' in hArg)
         (0, CmnLib_1.argChk_Num)(hArg, 'wait', NaN);
-        if (this.val.getVal('tmp:sn.skip.enabled'))
-            hArg.wait = 0;
-    }
     __classPrivateFieldGet(this, _LayerMng_cmdTxt, "f").call(this, 'add｜' + JSON.stringify(hArg), tl);
     const record = (0, CmnLib_1.argChk_Boolean)(hArg, 'record', true);
     const doRecLog = this.val.doRecLog();
@@ -72276,7 +72264,7 @@ _Main_cfg = new WeakMap(), _Main_appPixi = new WeakMap(), _Main_hTag = new WeakM
         else if (uc === 42 && token.length > 1)
             continue;
         try {
-            const tl = __classPrivateFieldGet(this, _Main_layMng, "f").getCurrentTxtlayForeNeedErr();
+            const tl = __classPrivateFieldGet(this, _Main_layMng, "f").currentTxtlayForeNeedErr;
             tl.tagCh(token);
         }
         catch (err) {
@@ -72834,7 +72822,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 +72873,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 +72976,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,17 +73024,13 @@ 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 lastCSArg() { return __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f")[this.lenCallStk - 1].csArg; }
-    ;
     destroy() { this.isBreak = () => false; }
     ;
     タグ解析(tagToken) {
@@ -73069,19 +73052,20 @@ class ScriptIterator {
             if (!p)
                 return false;
         }
-        let hArg = { ':タグ名': tag_name };
-        const lenStk = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
+        let hArg = {};
+        const len = __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length;
         if (this.alzTagArg.isKomeParam) {
-            if (lenStk === 0)
+            if (len === 0)
                 throw '属性「*」はマクロのみ有効です';
-            hArg = { ...hArg, ...this.lastCSArg };
+            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?.charAt(0) === '%') {
-                if (lenStk === 0)
+                if (len === 0)
                     throw '属性「%」はマクロ定義内でのみ使用できます（そのマクロの引数を示す簡略文法であるため）';
-                const mac = this.lastCSArg[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;
@@ -73204,7 +73188,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;
         }
@@ -73239,7 +73223,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);
@@ -73260,7 +73244,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, 'ステップ実行');
@@ -73377,8 +73361,8 @@ _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];
-            const csa = cs.csArg[':hMp'];
-            const from_macro_nm = csa ? csa[':タグ名'] : null;
+            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 + ']マクロ内）' : ' ') +
@@ -73579,12 +73563,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;
+    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);
@@ -73592,8 +73576,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;
@@ -73723,6 +73707,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;
@@ -73736,17 +73728,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]がありません';
@@ -73932,7 +73916,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,
@@ -74142,7 +74126,7 @@ _a = SoundMng, _SoundMng_hSndBuf = new WeakMap(), _SoundMng_hLP = new WeakMap(),
     if (!fn)
         throw '[playse] fnは必須です(buf=' + buf + ')';
     if ((0, CmnLib_1.argChk_Boolean)(hArg, 'canskip', true)
-        && __classPrivateFieldGet(this, _SoundMng_evtMng, "f").isSkipKeyDown())
+        && __classPrivateFieldGet(this, _SoundMng_evtMng, "f").isSkippingByKeyDown())
         return false;
     const loop = (0, CmnLib_1.argChk_Boolean)(hArg, 'loop', false);
     __classPrivateFieldGet(this, _SoundMng_instances, "m", _SoundMng_addLoopPlay).call(this, buf, loop);
@@ -75089,7 +75073,7 @@ class TxtLayer extends Layer_1.Layer {
                 console.log(`🖊 文字表示 text:\`${ch}\` ruby:\`${ruby}\` name:\`${this.name_}\``);
             const a_ruby = ruby.split('｜');
             let add_htm = '';
-            const isSkip = __classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_evtMng).isSkipKeyDown();
+            const isSkip = __classPrivateFieldGet(TxtLayer, _a, "f", _TxtLayer_evtMng).isSkippingByKeyDown();
             switch (a_ruby.length) {
                 case 1:
                     __classPrivateFieldSet(this, _TxtLayer_needGoTxt, true, "f");