markdown-it-any-block 3.3.2-beta1 → 3.3.3

package/dist/mdit-any-block.cjs

@@ -45,6 +45,7 @@ async function jsdom_init() {
   global.HTMLScriptElement = dom.window.HTMLScriptElement;
   dom.window.scrollTo = () => {
   };
+  global.MutationObserver = dom.window.MutationObserver;
 }
 var ABConvert_IOEnum = /* @__PURE__ */ ((ABConvert_IOEnum2) => {
   ABConvert_IOEnum2["text"] = "string";
@@ -112,61 +113,6 @@ class ABConvert {
       ABConvertManager.getInstance().list_abConvert.splice(index2, 1);
     }
   }
-  /** --------------------------------- 处理器容器管理 (旧) --------------- */
-  /*
-    /// 用户注册处理器
-    public static registerABProcessor(process: ABProcessorSpec| ABProcessorSpecSimp| ABProcessorSpecUser){
-      ABConvertManager.getInstance().list_abConvert.push(ABProcessorSpec.registerABProcessor_adapt(process));
-    }
-  
-    public static registerABProcessor_adapt(process: ABProcessorSpec| ABProcessorSpecSimp| ABProcessorSpecUser): ABProcessorSpec{
-      if ('is_disable' in process) {    // 严格版 存储版
-        return process
-      }
-      else if ('process' in process) {  // 用户版 注册版
-        return this.registerABProcessor_adapt_simp(process)
-      }
-      else {                            // 别名版 无代码版
-        return this.registerABProcessor_adapt_user(process)
-      }
-    }
-  
-    private static registerABProcessor_adapt_simp(sim: ABProcessorSpecSimp):ABProcessorSpec{
-      //type t_param = Parameters<typeof sim.process>
-      //type t_return = ReturnType<typeof sim.process>
-      const abProcessorSpec: ABProcessorSpec = {
-        id: sim.id,
-        name: sim.name,
-        match: sim.match??sim.id,
-        default: sim.default??(!sim.match||typeof(sim.match)=="string")?sim.id:null,
-        detail: sim.detail??"",
-        process_alias: sim.process_alias??"",
-        process_param: sim.process_param??null,
-        process_return: sim.process_return??null,
-        process: sim.process,
-        is_disable: false,
-        register_from: "内置",
-      }
-      return abProcessorSpec
-    }
-  
-    private static registerABProcessor_adapt_user(sim: ABProcessorSpecUser):ABProcessorSpec{
-      const abProcessorSpec: ABProcessorSpec = {
-        id: sim.id,
-        name: sim.name,
-        match: /^\//.test(sim.match)?RegExp(sim.match):sim.match,
-        default: null,
-        detail: "",
-        process_alias: sim.process_alias,
-        process_param: null,
-        process_return: null,
-        process: ()=>{},
-        is_disable: false,
-        register_from: "用户",
-      }
-      return abProcessorSpec
-    }
-    */
 }
 const ABReg = {
   /**
@@ -292,7 +238,10 @@ const ABAlias_json_title = [
   { regex: /\|heading_140lne\|(fakeList|仿列表)\|/, replacement: "|title2list|list2table|addClass(ab-table-fc)|addClass(ab-table-likelist)|" }
 ];
 const ABAlias_json_list = [
-  { regex: "|listXinline|", replacement: "|list2listdata|listdata2list|" },
+  // 特殊
+  { regex: "|listXinline|", replacement: "|list2listdata|listdata2strict|listdata2list|" },
+  { regex: "|list2task|", replacement: "|list2listdata|listdata2task|listdata2list|" },
+  { regex: "|task2", replacement: "|list2listdata|listdata2task|listdata2list|list2" },
   // list - list&title
   { regex: /\|list_140lne\|2?(timeline|时间线)\|/, replacement: "|list2timeline|" },
   { regex: /\|list_140lne\|2?(tabs?|标签页?)\||\|list2tabs?\|/, replacement: "|list2c2listdata|c2listdata2tab|" },
@@ -394,7 +343,7 @@ class ABConvertManager {
     this.list_abConvert = [];
     this.m_renderMarkdownFn = (markdown, el) => {
       el.classList.add("markdown-rendered");
-      console.error("AnyBlockError: 请先制定/重定义md渲染器");
+      console.error("Please use renderMarkdownFn redefine render function");
     };
     if (typeof obsidian == "undefined" && typeof app == "undefined") {
       console.log("[environment]: markdown-it, without obsidian");
@@ -438,7 +387,7 @@ class ABConvertManager {
    * @param selectorName 选择器名，空表示未知
    * @return 等于el，无用，后面可以删了
    */
-  static autoABConvert(el, header, content, selectorName = "") {
+  static autoABConvert(el, header, content, selectorName = "", ctx) {
     let prev_result = content;
     let prev_type = "string";
     let prev_type2 = ABConvert_IOEnum.text;
@@ -453,8 +402,8 @@ class ABConvertManager {
     {
       header = autoABAlias(header, selectorName, prev_result);
       let list_header = header.split("|");
-      prev_result = this.autoABConvert_runConvert(el, list_header, prev2);
-      this.autoABConvert_last(el, header, selectorName, prev2);
+      prev_result = this.autoABConvert_runConvert(el, list_header, prev2, ctx);
+      this.autoABConvert_last(el, header, selectorName, prev2, ctx);
     }
   }
   /**
@@ -466,7 +415,7 @@ class ABConvertManager {
    * @param prev_type2  上次转换后的结果的类型 (接口声明而来, IOEnum类型)
    * @returns           递归转换后的结果
    */
-  static autoABConvert_runConvert(el, list_header, prev2) {
+  static autoABConvert_runConvert(el, list_header, prev2, ctx) {
     for (let item_header of list_header) {
       for (let abReplaceProcessor of ABConvertManager.getInstance().list_abConvert) {
         if (typeof abReplaceProcessor.match == "string") {
@@ -488,7 +437,7 @@ class ABConvertManager {
               alias = alias.replace(RegExp(`%${i}`), matchs[i]);
             }
           })();
-          prev2.prev_result = this.autoABConvert_runConvert(el, alias.split("|"), prev2);
+          prev2.prev_result = this.autoABConvert_runConvert(el, alias.split("|"), prev2, ctx);
         } else if (abReplaceProcessor.process) {
           if (abReplaceProcessor.process_param != prev2.prev_type2) {
             if (abReplaceProcessor.process_param == ABConvert_IOEnum.el && prev2.prev_type2 == ABConvert_IOEnum.text) {
@@ -512,7 +461,7 @@ class ABConvertManager {
               break;
             }
           }
-          prev2.prev_result = abReplaceProcessor.process(el, item_header, prev2.prev_result);
+          prev2.prev_result = abReplaceProcessor.process(el, item_header, prev2.prev_result, ctx);
           prev2.prev_type = typeof prev2.prev_result;
           prev2.prev_type2 = abReplaceProcessor.process_return;
           prev2.prev_processor = abReplaceProcessor.process;
@@ -526,7 +475,7 @@ class ABConvertManager {
   /**
    * 子函数，后处理/尾处理，主要进行末尾追加指令
    */
-  static autoABConvert_last(el, header, selectorName, prev2) {
+  static autoABConvert_last(el, header, selectorName, prev2, ctx) {
     if (prev2.prev_type == "string" && prev2.prev_type2 == ABConvert_IOEnum.text) {
       const subEl = document.createElement("div");
       el.appendChild(subEl);
@@ -856,10 +805,12 @@ class ListProcess {
       return total_comp;
     }
     let list_itemInfo = [];
+    let m_line_cache = null;
     const list_text = text2.split("\n");
     for (let line of list_text) {
       const m_line = line.match(ABReg.reg_list_noprefix);
       if (m_line) {
+        m_line_cache = m_line;
         let list_inline = m_line[4].split(ABReg.inline_split);
         let level_inline = m_line[1].length;
         let inline_comp = update_inline_comp(level_inline, list_inline.length - 1);
@@ -872,8 +823,13 @@ class ListProcess {
       } else {
         let itemInfo = list_itemInfo.pop();
         if (itemInfo) {
+          if (m_line_cache && /^\s*$/.test(line.slice(0, m_line_cache[1].length + 2))) {
+            line = line.slice(m_line_cache[1].length + 2);
+          } else {
+            line = line.trim();
+          }
           list_itemInfo.push({
-            content: itemInfo.content + "\n" + line.trim(),
+            content: itemInfo.content + "\n" + line,
             level: itemInfo.level
           });
         }
@@ -1147,6 +1103,19 @@ class ListProcess {
     }
     return list_itemInfo2;
   }
+  // 修复任务列表转列表结构后，任务项丢失
+  static data2taskData(list_itemInfo) {
+    for (let item of list_itemInfo) {
+      item.content = item.content.split("\n").map((line) => {
+        const match = line.match(/\[.\] /);
+        if (match) {
+          return "- " + line;
+        }
+        return line;
+      }).join("\n");
+    }
+    return list_itemInfo;
+  }
   /** 二层树转多层一叉树 
    * example:
    * - 1
@@ -1186,7 +1155,7 @@ class ListProcess {
   static data2list(list_itemInfo) {
     let list_newcontent = [];
     for (let item of list_itemInfo) {
-      const str_indent = " ".repeat(item.level);
+      const str_indent = "  ".repeat(item.level);
       let list_content = item.content.split("\n");
       for (let i = 0; i < list_content.length; i++) {
         if (i == 0) list_newcontent.push(str_indent + "- " + list_content[i]);
@@ -1291,11 +1260,21 @@ ABConvert.factory({
   name: "listdata严格化",
   process_param: ABConvert_IOEnum.list_stream,
   process_return: ABConvert_IOEnum.list_stream,
-  detail: "将列表数据转化为更规范的列表数据。统一缩进符(2空格 4空格 tab混用)、禁止跳等级(h1直接就到h3)",
+  detail: "将列表数据转化为更规范的列表数据。统一缩进符(2空格 4空格 tab混用)为level 1、禁止跳等级(h1直接就到h3)",
   process: (el, header, content) => {
     return ListProcess.data2strict(content);
   }
 });
+ABConvert.factory({
+  id: "listdata2task",
+  name: "listdata支持任务列表",
+  process_param: ABConvert_IOEnum.list_stream,
+  process_return: ABConvert_IOEnum.list_stream,
+  detail: "当列表中存在任务列表项时，令此列表项支持任务项",
+  process: (el, header, content) => {
+    return ListProcess.data2taskData(content);
+  }
+});
 ABConvert.factory({
   id: "list2listnode",
   name: "列表到listnode (beta)",
@@ -1543,72 +1522,72 @@ class C2ListProcess {
    * 两列列表数据转标签栏
    */
   static c2data2tab(list_itemInfo, div, modeT) {
-    {
-      const tab = document.createElement("div");
-      div.appendChild(tab);
-      tab.classList.add("ab-tab-root");
-      if (modeT) tab.setAttribute("modeT", "true");
-      const nav = document.createElement("div");
-      tab.appendChild(nav);
-      nav.classList.add("ab-tab-nav");
-      const content = document.createElement("div");
-      tab.appendChild(content);
-      content.classList.add("ab-tab-content");
-      let current_dom = null;
-      for (let i = 0; i < list_itemInfo.length; i++) {
-        const itemInfo = list_itemInfo[i];
-        if (!current_dom) {
-          if (itemInfo.level == 0) {
-            const nav_item = document.createElement("button");
-            nav.appendChild(nav_item);
-            nav_item.classList.add("ab-tab-nav-item");
-            nav_item.textContent = itemInfo.content.slice(0, 20);
-            nav_item.setAttribute("is_activate", i == 0 ? "true" : "false");
-            current_dom = document.createElement("div");
-            content.appendChild(current_dom);
-            current_dom.classList.add("ab-tab-content-item");
-            current_dom.setAttribute("style", i == 0 ? "display:block" : "display:none");
-            current_dom.setAttribute("is_activate", i == 0 ? "true" : "false");
+    const tab = document.createElement("div");
+    div.appendChild(tab);
+    tab.classList.add("ab-tab-root");
+    if (modeT) tab.setAttribute("modeT", "true");
+    const nav = document.createElement("div");
+    tab.appendChild(nav);
+    nav.classList.add("ab-tab-nav");
+    const content = document.createElement("div");
+    tab.appendChild(content);
+    content.classList.add("ab-tab-content");
+    let current_dom = null;
+    for (let i = 0; i < list_itemInfo.length; i++) {
+      const item = list_itemInfo[i];
+      if (item.level == 0) {
+        const nav_item = document.createElement("button");
+        nav.appendChild(nav_item);
+        nav_item.classList.add("ab-tab-nav-item");
+        nav_item.setAttribute("is_activate", i == 0 ? "true" : "false");
+        nav_item.setAttribute("data_index", i.toString());
+        nav_item.textContent = item.content.slice(0, 20);
+        current_dom = document.createElement("div");
+        content.appendChild(current_dom);
+        current_dom.classList.add("ab-tab-content-item");
+        current_dom.setAttribute("style", i == 0 ? "display:block" : "display:none");
+        current_dom.setAttribute("is_activate", i == 0 ? "true" : "false");
+      } else if (current_dom) {
+        current_dom.setAttribute("data_index", i.toString());
+        ABConvertManager.getInstance().m_renderMarkdownFn(item.content, current_dom);
+        current_dom = null;
+      } else {
+        continue;
+      }
+    }
+    const lis = tab.querySelectorAll(":scope>.ab-tab-nav>.ab-tab-nav-item");
+    const contents2 = tab.querySelectorAll(":scope>.ab-tab-content>.ab-tab-content-item");
+    if (lis.length != contents2.length) console.warn("ab-tab-nav-item和ab-tab-content-item的数量不一致");
+    for (let i = 0; i < lis.length; i++) {
+      if (ABCSetting.env.startsWith("obsidian")) {
+        lis[i].onclick = () => {
+          for (let j = 0; j < contents2.length; j++) {
+            lis[j].setAttribute("is_activate", "false");
+            contents2[j].setAttribute("is_activate", "false");
+            contents2[j].setAttribute("style", "display:none");
           }
-        } else {
-          ABConvertManager.getInstance().m_renderMarkdownFn(itemInfo.content, current_dom);
-          current_dom = null;
-        }
-      }
-      const lis = tab.querySelectorAll(":scope>.ab-tab-nav>.ab-tab-nav-item");
-      const contents2 = tab.querySelectorAll(":scope>.ab-tab-content>.ab-tab-content-item");
-      if (lis.length != contents2.length) console.warn("ab-tab-nav-item和ab-tab-content-item的数量不一致");
-      for (let i = 0; i < lis.length; i++) {
-        if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
-          lis[i].onclick = () => {
-            for (let j = 0; j < contents2.length; j++) {
-              lis[j].setAttribute("is_activate", "false");
-              contents2[j].setAttribute("is_activate", "false");
-              contents2[j].setAttribute("style", "display:none");
-            }
-            lis[i].setAttribute("is_activate", "true");
-            contents2[i].setAttribute("is_activate", "true");
-            contents2[i].setAttribute("style", "display:block");
-          };
-        } else {
-          lis[i].setAttribute("onclick", `
-            const i = ${i}
-            const tab_current = this
-            const tab_nav = this.parentNode
-            const tab_root = tab_nav.parentNode
-            const tab_content = tab_root.querySelector(":scope>.ab-tab-content")
-            const tab_nav_items = tab_nav.querySelectorAll(":scope>.ab-tab-nav-item")
-            const tab_content_items = tab_content.querySelectorAll(":scope>.ab-tab-content-item")
-            for (let j=0; j<tab_content_items.length; j++){
-              tab_nav_items[j].setAttribute("is_activate", "false")
-              tab_content_items[j].setAttribute("is_activate", "false")
-              tab_content_items[j].setAttribute("style", "display:none")
-            }
-            tab_current.setAttribute("is_activate", "true")
-            tab_content_items[i].setAttribute("is_activate", "true")
-            tab_content_items[i].setAttribute("style", "display:block")
-          `);
-        }
+          lis[i].setAttribute("is_activate", "true");
+          contents2[i].setAttribute("is_activate", "true");
+          contents2[i].setAttribute("style", "display:block");
+        };
+      } else {
+        lis[i].setAttribute("onclick", `
+          const i = ${i}
+          const tab_current = this
+          const tab_nav = this.parentNode
+          const tab_root = tab_nav.parentNode
+          const tab_content = tab_root.querySelector(":scope>.ab-tab-content")
+          const tab_nav_items = tab_nav.querySelectorAll(":scope>.ab-tab-nav-item")
+          const tab_content_items = tab_content.querySelectorAll(":scope>.ab-tab-content-item")
+          for (let j=0; j<tab_content_items.length; j++){
+            tab_nav_items[j].setAttribute("is_activate", "false")
+            tab_content_items[j].setAttribute("is_activate", "false")
+            tab_content_items[j].setAttribute("style", "display:none")
+          }
+          tab_current.setAttribute("is_activate", "true")
+          tab_content_items[i].setAttribute("is_activate", "true")
+          tab_content_items[i].setAttribute("style", "display:block")
+        `);
       }
     }
     return div;
@@ -1628,12 +1607,13 @@ class C2ListProcess {
         el_item.appendChild(el_title);
         el_title.classList.add("ab-items-title");
         ABConvertManager.getInstance().m_renderMarkdownFn(item.content, el_title);
-      } else {
-        if (!el_item) continue;
+      } else if (el_item) {
         const el_content = document.createElement("div");
         el_item.appendChild(el_content);
         el_content.classList.add("ab-items-content");
         ABConvertManager.getInstance().m_renderMarkdownFn(item.content, el_content);
+      } else {
+        continue;
       }
     }
     return el;
@@ -2063,7 +2043,7 @@ class DirProcess {
       for (let i = 0; i < l_tr.length; i++) {
         const tr = l_tr[i];
         const targetEl = tr.querySelector(":scope>td:first-child") ?? tr;
-        if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
+        if (ABCSetting.env.startsWith("obsidian")) {
           targetEl.onclick = () => {
             const tr_level = Number(tr.getAttribute("tr_level"));
             if (isNaN(tr_level)) return;
@@ -2094,7 +2074,8 @@ class DirProcess {
               const tr2 = l_tr[j]
               const tr_level2 = Number(tr2.getAttribute("tr_level"))
               if (isNaN(tr_level2)) break
-              if (tr_level2<=tr_level) break
+              if (tr_level2 <= tr_level) break // 影响所有后代级
+              // if (tr_level2 != tr_level+1) break // 影响下一级的 (话说这里可能有列表规范性问题?)
               (tr_isfold == "true") ? tr2.style.display = "" : tr2.style.display = "none"
               flag_do_fold = true
             }
@@ -2111,35 +2092,23 @@ class DirProcess {
       const svgStr_unfold = `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-unfold-vertical-icon lucide-unfold-vertical"><path d="M12 22v-6"/><path d="M12 8V2"/><path d="M4 12H2"/><path d="M10 12H8"/><path d="M16 12h-2"/><path d="M22 12h-2"/><path d="m15 19-3 3-3-3"/><path d="m15 5-3-3-3 3"/></svg>`;
       btn.setAttribute("is_fold", "false");
       btn.innerHTML = svgStr_fold;
-      if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
+      if (ABCSetting.env.startsWith("obsidian")) {
         btn.onclick = () => {
-          const l_tr = table.querySelectorAll("tr");
-          for (let i = 0; i < l_tr.length; i++) {
-            const tr = l_tr[i];
-            (() => {
-              const tr_level = Number(tr.getAttribute("tr_level"));
-              if (isNaN(tr_level)) return;
-              const tr_isfold = btn.getAttribute("is_fold");
-              if (!tr_isfold) return;
-              let flag_do_fold = false;
-              for (let j = i + 1; j < l_tr.length; j++) {
-                const tr2 = l_tr[j];
-                const tr_level2 = Number(tr2.getAttribute("tr_level"));
-                if (isNaN(tr_level2)) break;
-                if (tr_level2 <= tr_level) break;
-                tr_isfold == "true" ? tr2.style.display = "" : tr2.style.display = "none";
-                flag_do_fold = true;
-              }
-              if (flag_do_fold) tr.setAttribute("is_fold", tr_isfold == "true" ? "false" : "true");
-            })();
-          }
           const is_all_fold = btn.getAttribute("is_fold");
           if (is_all_fold == "true") {
             btn.setAttribute("is_fold", "false");
             btn.innerHTML = svgStr_fold;
+            const btn_subs = table.querySelectorAll("tr[is_fold='true']>td:first-child");
+            btn_subs.forEach((btn_sub) => {
+              btn_sub.click();
+            });
           } else {
             btn.setAttribute("is_fold", "true");
             btn.innerHTML = svgStr_unfold;
+            const btn_subs = table.querySelectorAll("tr[is_fold='false']>td:first-child");
+            btn_subs.forEach((btn_sub) => {
+              btn_sub.click();
+            });
           }
         };
       } else {
@@ -2151,34 +2120,17 @@ class DirProcess {
           const table = btn.parentNode?.querySelector("table");
           if (!table) return;
           
-          const l_tr = table.querySelectorAll("tr");
-          for (let i=0; i<l_tr.length; i++) {
-            const tr = l_tr[i]
-            ;(()=>{
-              const tr_level = Number(tr.getAttribute("tr_level"))
-              if (isNaN(tr_level)) return
-              const tr_isfold = btn.getAttribute("is_fold"); // [!code] tr->btn
-              if (!tr_isfold) return
-              let flag_do_fold = false  // 防止折叠最小层
-              for (let j=i+1; j<l_tr.length; j++){
-                const tr2 = l_tr[j]
-                const tr_level2 = Number(tr2.getAttribute("tr_level"))
-                if (isNaN(tr_level2)) break
-                if (tr_level2<=tr_level) break
-                (tr_isfold == "true") ? tr2.style.display = "" : tr2.style.display = "none"
-                flag_do_fold = true
-              }
-              if (flag_do_fold) tr.setAttribute("is_fold", tr_isfold=="true"?"false":"true")
-            })()
-          }
           const is_all_fold = btn.getAttribute("is_fold")
           if (is_all_fold=="true") {
             btn.setAttribute("is_fold", "false"); btn.innerHTML = svgStr_fold;
+            const btn_subs = table.querySelectorAll("tr[is_fold='true']>td:first-child");
+              btn_subs.forEach((btn_sub) => { btn_sub.click() }) // 注意setAttr版本无断言
           }
           else {
             btn.setAttribute("is_fold", "true"); btn.innerHTML = svgStr_unfold;
-          }
-          `
+            const btn_subs = table.querySelectorAll("tr[is_fold='false']>td:first-child");
+              btn_subs.forEach((btn_sub) => { btn_sub.click() }) // 注意setAttr版本无断言
+          }`
         );
       }
     }
@@ -2338,7 +2290,7 @@ ABConvert.factory({
     const isListTable = sub_el.classList.contains("ab-list-table-parent");
     const listTable_btn = sub_el.querySelector(".ab-table-fold");
     if (isListTable && listTable_btn) {
-      if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
+      if (ABCSetting.env.startsWith("obsidian")) {
         fn_fold();
         sub_button.textContent = "折叠/展开";
         const fn_fold2 = () => {
@@ -2597,7 +2549,7 @@ ABConvert.factory({
   id: "transposition",
   name: "表格转置",
   match: "transposition",
-  detail: "将表格进行转置，就像矩阵转置那样。该版本不支持有跨行跨列单元格",
+  detail: "将表格进行转置，就像矩阵转置那样。该版本不支持有跨行跨列单元格。若复杂表格，请换用trs版本",
   process_param: ABConvert_IOEnum.el,
   process_return: ABConvert_IOEnum.el,
   process: (el, header, content) => {
@@ -2636,72 +2588,21 @@ ABConvert.factory({
   process: (el, header, content) => {
     const origi_table = content.querySelector("table");
     if (!origi_table) return content;
-    const origi_rows = origi_table.rows;
-    const origi_rowCount = origi_rows.length;
-    let origi_colCount = 0;
-    for (let relRow = 0; relRow < origi_rowCount; relRow++) {
-      let colCount = 0;
-      for (const cell of origi_rows[relRow].cells) {
-        colCount += cell.colSpan || 1;
-      }
-      if (colCount > origi_colCount) {
-        origi_colCount = colCount;
-      }
-    }
-    const map_table = new Array(origi_rowCount).fill(null).map(() => new Array(origi_colCount).fill(null));
-    for (let relRow = 0; relRow < origi_rowCount; relRow++) {
-      for (let relCol = 0; relCol < origi_rows[relRow].cells.length; relCol++) {
-        const cell = origi_rows[relRow].cells[relCol];
-        const rowIndex = relRow;
-        let colIndex = relCol;
-        while (true) {
-          if (colIndex >= map_table[rowIndex].length) {
-            console.error("表格解析错误: colIndex超出范围", map_table, rowIndex, colIndex, relRow, relCol);
-            return content;
-          }
-          if (!map_table[rowIndex][colIndex]) {
-            break;
-          } else colIndex++;
-        }
-        if (cell.rowSpan > 1) {
-          for (let i = 1; i < cell.rowSpan; i++) {
-            if (rowIndex + i >= map_table.length) {
-              break;
-            }
-            map_table[rowIndex + i][colIndex] = "^";
-          }
-        }
-        if (cell.colSpan > 1) {
-          for (let i = 1; i < cell.rowSpan; i++) {
-            if (colIndex + i >= map_table[rowIndex].length) {
-              break;
-            }
-            map_table[rowIndex][colIndex + i] = "<";
-          }
-        }
-        map_table[rowIndex][colIndex] = {
-          html: cell,
-          rowSpan: cell.rowSpan,
-          colSpan: cell.colSpan,
-          rowIndex,
-          colIndex
-        };
-      }
-    }
-    const map_table2 = new Array(origi_colCount).fill(null).map(() => new Array(origi_rowCount).fill(null));
+    let { tableMap, origi_rowCount, origi_colCount } = table2tableMap(origi_table);
+    const tableMap2 = new Array(origi_colCount).fill(null).map(() => new Array(origi_rowCount).fill(null));
     for (let i = 0; i < origi_rowCount; i++) {
       for (let j = 0; j < origi_colCount; j++) {
-        const origi_cell = map_table[i][j];
+        const origi_cell = tableMap[i][j];
         if (!origi_cell) continue;
         else if (origi_cell == "<") {
-          map_table2[j][i] = "^";
+          tableMap2[j][i] = "^";
         } else if (origi_cell == "^") {
-          map_table2[j][i] = "<";
+          tableMap2[j][i] = "<";
         } else {
           let content2 = origi_cell.html;
           if (content2.innerHTML == "<" || content2.innerHTML == "&lt;") content2.innerHTML = "^";
           else if (content2.innerHTML == "^") content2.innerHTML = "<";
-          map_table2[j][i] = {
+          tableMap2[j][i] = {
             html: origi_cell.html,
             rowSpan: origi_cell.colSpan || 1,
             colSpan: origi_cell.rowSpan || 1,
@@ -2711,27 +2612,14 @@ ABConvert.factory({
         }
       }
     }
-    const trans_table = document.createElement("table");
-    origi_table.classList.add("ab-transposition", "ab-table");
+    const tmp = origi_colCount;
+    origi_colCount = origi_rowCount;
+    origi_rowCount = tmp;
+    const trans_table = tableMap2table(tableMap2, origi_rowCount, origi_colCount);
     origi_table.classList.forEach((className) => {
       trans_table.classList.add(className);
     });
-    const trans_body = document.createElement("tbody");
-    trans_table.appendChild(trans_body);
-    for (let i = 0; i < origi_colCount; i++) {
-      const newRow = trans_body.insertRow();
-      for (let j = 0; j < origi_rowCount; j++) {
-        const cell = map_table2[i][j];
-        if (!cell) continue;
-        if (cell == "<" || cell == "^") continue;
-        const newCell = newRow.insertCell();
-        newCell.innerHTML = cell.html.innerHTML;
-        newCell.rowSpan = cell.rowSpan;
-        newCell.colSpan = cell.colSpan;
-        newCell.setAttribute("rowIndex", String(cell.rowIndex));
-        newCell.setAttribute("colIndex", String(cell.colIndex));
-      }
-    }
+    trans_table.classList.add("ab-transposition", "ab-table");
     origi_table.innerHTML = trans_table.innerHTML;
     return content;
   }
@@ -2746,53 +2634,107 @@ ABConvert.factory({
   process: (el, header, content) => {
     const origi_table = content.querySelector("table");
     if (!origi_table) return content;
-    const origi_rows = origi_table.rows;
-    const origi_rowCount = origi_rows.length;
-    let origi_colCount = 0;
+    let { tableMap, origi_rowCount, origi_colCount } = table2tableMap(origi_table, true);
+    const map_table2 = tableMap;
+    const trans_table = tableMap2table(map_table2, origi_rowCount, origi_colCount);
+    origi_table.classList.forEach((className) => {
+      trans_table.classList.add(className);
+    });
+    trans_table.classList.add("ab-extable", "ab-table");
+    origi_table.innerHTML = trans_table.innerHTML;
+    return content;
+  }
+});
+ABConvert.factory({
+  id: "strictTable",
+  name: "正规化表格",
+  match: "strictTable",
+  detail: "补全表格的尾丢失项，list2table|trs时，可以有效避免bug",
+  process_param: ABConvert_IOEnum.el,
+  process_return: ABConvert_IOEnum.el,
+  process: (el, header, content) => {
+    const origi_table = content.querySelector("table");
+    if (!origi_table) return content;
+    let { tableMap, origi_rowCount, origi_colCount } = table2tableMap(origi_table);
+    for (let i = 0; i < origi_rowCount; i++) {
+      for (let j = 0; j < origi_colCount; j++) {
+        const origi_cell = tableMap[i][j];
+        if (!origi_cell) {
+          tableMap[i][j] = {
+            html: document.createElement("td"),
+            // 空单元格
+            rowSpan: 1,
+            colSpan: 1,
+            rowIndex: i,
+            colIndex: j
+          };
+        }
+      }
+    }
+    const trans_table = tableMap2table(tableMap, origi_rowCount, origi_colCount);
+    origi_table.classList.forEach((className) => {
+      trans_table.classList.add(className);
+    });
+    trans_table.classList.add("ab-extable", "ab-table");
+    origi_table.innerHTML = trans_table.innerHTML;
+    return content;
+  }
+});
+function table2tableMap(origi_table, useMergeFlag = false) {
+  const origi_rows = origi_table.rows;
+  let origi_rowCount = origi_rows.length;
+  let origi_colCount = 0;
+  {
+    let map_colCount = [];
     for (let relRow = 0; relRow < origi_rowCount; relRow++) {
-      let colCount = 0;
       for (const cell of origi_rows[relRow].cells) {
-        colCount += cell.colSpan || 1;
-      }
-      if (colCount > origi_colCount) {
-        origi_colCount = colCount;
+        const colSpan = cell.colSpan || 1;
+        const rowSpan = cell.rowSpan || 1;
+        for (let relRowSpan = relRow; relRowSpan < relRow + rowSpan; relRowSpan++) {
+          if (!map_colCount[relRowSpan]) map_colCount[relRowSpan] = colSpan;
+          else map_colCount[relRowSpan] += colSpan;
+        }
       }
     }
-    const map_table = new Array(origi_rowCount).fill(null).map(() => new Array(origi_colCount).fill(null));
-    for (let relRow = 0; relRow < origi_rowCount; relRow++) {
-      for (let relCol = 0; relCol < origi_rows[relRow].cells.length; relCol++) {
-        const cell = origi_rows[relRow].cells[relCol];
-        const rowIndex = relRow;
-        let colIndex = relCol;
-        while (true) {
-          if (colIndex >= map_table[rowIndex].length) {
-            console.error("表格解析错误: colIndex超出范围", map_table, rowIndex, colIndex, relRow, relCol);
-            return content;
-          }
-          if (!map_table[rowIndex][colIndex]) {
-            break;
-          } else colIndex++;
+    origi_rowCount = map_colCount.length;
+    origi_colCount = Math.max(...map_colCount);
+  }
+  const tableMap = new Array(origi_rowCount).fill(null).map(() => new Array(origi_colCount).fill(null));
+  for (let relRow = 0; relRow < origi_rowCount; relRow++) {
+    for (let relCol = 0; relCol < origi_rows[relRow].cells.length; relCol++) {
+      const cell = origi_rows[relRow].cells[relCol];
+      const rowIndex = relRow;
+      let colIndex = relCol;
+      while (true) {
+        if (colIndex >= tableMap[rowIndex].length) {
+          console.error(`表格解析错误: colIndex超出范围: [${rowIndex}][${colIndex}] overflow tableMap[${origi_rowCount - 1}][${origi_colCount - 1}]`, tableMap);
+          throw new Error("表格解析错误: colIndex超出范围");
         }
-        if (cell.rowSpan > 1) {
-          for (let i = 1; i < cell.rowSpan; i++) {
-            if (rowIndex + i >= map_table.length) {
-              break;
-            }
-            map_table[rowIndex + i][colIndex] = "^";
+        if (!tableMap[rowIndex][colIndex]) {
+          break;
+        } else colIndex++;
+      }
+      if (cell.rowSpan > 1) {
+        for (let i = 1; i < cell.rowSpan; i++) {
+          if (rowIndex + i >= tableMap.length) {
+            break;
           }
+          tableMap[rowIndex + i][colIndex] = "^";
         }
-        if (cell.colSpan > 1) {
-          for (let i = 1; i < cell.rowSpan; i++) {
-            if (colIndex + i >= map_table[rowIndex].length) {
-              break;
-            }
-            map_table[rowIndex][colIndex + i] = "<";
+      }
+      if (cell.colSpan > 1) {
+        for (let i = 1; i < cell.rowSpan; i++) {
+          if (colIndex + i >= tableMap[rowIndex].length) {
+            break;
           }
+          tableMap[rowIndex][colIndex + i] = "<";
         }
+      }
+      if (useMergeFlag) {
         if (cell.rowSpan == 1 && cell.colSpan == 1 && cell.textContent == "^") {
-          map_table[rowIndex][colIndex] = "^";
+          tableMap[rowIndex][colIndex] = "^";
           for (let i = rowIndex - 1; i >= 0; i--) {
-            const item = map_table[i][colIndex];
+            const item = tableMap[i][colIndex];
             if (!item) break;
             if (item == "<") break;
             if (item == "^") continue;
@@ -2803,9 +2745,9 @@ ABConvert.factory({
             }
           }
         } else if (cell.rowSpan == 1 && cell.colSpan == 1 && cell.textContent == "<") {
-          map_table[rowIndex][colIndex] = "<";
+          tableMap[rowIndex][colIndex] = "<";
           for (let j = colIndex - 1; j >= 0; j--) {
-            const item = map_table[rowIndex][j];
+            const item = tableMap[rowIndex][j];
             if (!item) break;
             if (item == "^") break;
             if (item == "<") continue;
@@ -2816,7 +2758,7 @@ ABConvert.factory({
             }
           }
         } else {
-          map_table[rowIndex][colIndex] = {
+          tableMap[rowIndex][colIndex] = {
             html: cell,
             rowSpan: cell.rowSpan,
             colSpan: cell.colSpan,
@@ -2824,34 +2766,43 @@ ABConvert.factory({
             colIndex
           };
         }
+      } else {
+        tableMap[rowIndex][colIndex] = {
+          html: cell,
+          rowSpan: cell.rowSpan,
+          colSpan: cell.colSpan,
+          rowIndex,
+          colIndex
+        };
       }
     }
-    const map_table2 = map_table;
-    const trans_table = document.createElement("table");
-    origi_table.classList.add("ab-transposition", "ab-table");
-    origi_table.classList.forEach((className) => {
-      trans_table.classList.add(className);
-    });
-    const trans_body = document.createElement("tbody");
-    trans_table.appendChild(trans_body);
-    for (let i = 0; i < origi_rowCount; i++) {
-      const newRow = trans_body.insertRow();
-      for (let j = 0; j < origi_colCount; j++) {
-        const cell = map_table2[i][j];
-        if (!cell) continue;
-        if (cell == "<" || cell == "^") continue;
-        const newCell = newRow.insertCell();
-        newCell.innerHTML = cell.html.innerHTML;
-        newCell.rowSpan = cell.rowSpan;
-        newCell.colSpan = cell.colSpan;
-        newCell.setAttribute("rowIndex", String(cell.rowIndex));
-        newCell.setAttribute("colIndex", String(cell.colIndex));
-      }
-    }
-    origi_table.innerHTML = trans_table.innerHTML;
-    return content;
   }
-});
+  return {
+    tableMap,
+    origi_rowCount,
+    origi_colCount
+  };
+}
+function tableMap2table(tableMap, origi_rowCount, origi_colCount) {
+  const trans_table = document.createElement("table");
+  const trans_body = document.createElement("tbody");
+  trans_table.appendChild(trans_body);
+  for (let i = 0; i < origi_rowCount; i++) {
+    const newRow = trans_body.insertRow();
+    for (let j = 0; j < origi_colCount; j++) {
+      const cell = tableMap[i][j];
+      if (!cell) continue;
+      if (cell == "<" || cell == "^") continue;
+      const newCell = newRow.insertCell();
+      newCell.innerHTML = cell.html.innerHTML;
+      newCell.rowSpan = cell.rowSpan;
+      newCell.colSpan = cell.colSpan;
+      newCell.setAttribute("rowIndex", String(cell.rowIndex));
+      newCell.setAttribute("colIndex", String(cell.colIndex));
+    }
+  }
+  return trans_table;
+}
 ABConvert.factory({
   id: "faq",
   name: "FAQ",
@@ -2867,7 +2818,7 @@ ABConvert.factory({
     let mode_qa = "";
     let last_content = "";
     for (let line of list_content) {
-      const m_line = line.match(/^([a-zA-Z])(: |：)(.*)/);
+      const m_line = line.match(/^([\S]+)(:|：)(.*)/);
       if (!m_line) {
         if (mode_qa) {
           last_content = last_content + "\n" + line;
@@ -7732,8 +7683,9 @@ const KEYWORD_WHILE = "while ";
 const KEYWORD_GROUP = "group ";
 const KEYWORD_PARTITION = "partition ";
 const KEYWORD_LANE = "lane ";
-const KEYWORD_ELSE = "else";
 const KEYWORD_ELIF = "elif ";
+const KEYWORD_ELSEIF = "else if ";
+const KEYWORD_ELSE = "else";
 const KEYWORD_DEFAULT = "default";
 const KEYWORD_DEFAULT2 = "case _";
 const KEYWORD_CASE = "case ";
@@ -7778,7 +7730,7 @@ function processBlock(stats, index2, parentLevel) {
     let processed = false;
     for (const [statType, processor] of Object.entries(statementTypes)) {
       if (stat.isStatementOfType(statType)) {
-        const { result: processedResult, nextIndex: nextNext } = processor(stats, next2);
+        const { result: processedResult, nextIndex: nextNext } = processor(stats, next2, statType);
         result += processedResult;
         next2 = nextNext;
         processed = true;
@@ -7806,9 +7758,13 @@ function processIfStatement(stats, index2) {
     result += indentContent(result2);
     nextIndex = nextIndex2;
   }
-  while (nextIndex < stats.length && stats[nextIndex].level === stat.level && stats[nextIndex].isStatementOfType(KEYWORD_ELIF, KEYWORD_ELSE)) {
+  while (nextIndex < stats.length && stats[nextIndex].level === stat.level && stats[nextIndex].isStatementOfType(KEYWORD_ELIF, KEYWORD_ELSEIF, KEYWORD_ELSE)) {
     const branch = stats[nextIndex];
-    if (branch.isStatementOfType(KEYWORD_ELIF)) {
+    if (branch.isStatementOfType(KEYWORD_ELSEIF)) {
+      const condition2 = branch.takeTagOfStat(KEYWORD_ELSEIF);
+      result += `else if(${condition2}) then (yes)
+`;
+    } else if (branch.isStatementOfType(KEYWORD_ELIF)) {
       const condition2 = branch.takeTagOfStat(KEYWORD_ELIF);
       result += `else if(${condition2}) then (yes)
 `;
@@ -7823,10 +7779,10 @@ function processIfStatement(stats, index2) {
   result += "endif\n";
   return { result, nextIndex };
 }
-function processSwitchStatement(stats, index2) {
-  let result = KEYWORD_SWITCH;
+function processSwitchStatement(stats, index2, statType) {
+  let result = `switch `;
   const stat = stats[index2];
-  const condition = stat.takeTagOfStat(KEYWORD_SWITCH);
+  const condition = stat.takeTagOfStat(statType);
   let nextIndex = index2 + 1;
   result += `(${condition})
 `;
@@ -8154,7 +8110,7 @@ async function data2mindmap(list_itemInfo, div) {
   return render_mermaidText(mermaidText, div);
 }
 async function render_mermaidText(mermaidText, div) {
-  if ((ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") && ABCSetting.mermaid) {
+  if (ABCSetting.env.startsWith("obsidian") && ABCSetting.mermaid) {
     ABCSetting.mermaid.then(async (mermaid) => {
       const { svg } = await mermaid.render("ab-mermaid-" + getID(), mermaidText);
       div.innerHTML = svg;
@@ -42445,7 +42401,7 @@ ABConvert.factory({
 function list2markmap(markdown, div) {
   const { root: root2, features } = transformer.transform(markdown.trim());
   transformer.getUsedAssets(features);
-  if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
+  if (ABCSetting.env.startsWith("obsidian")) {
     let height_adapt = 30 + markdown.split("\n").length * 15;
     if (height_adapt > 1e3) height_adapt = 1e3;
     const id = Math.random().toString(36).substring(2);