markdown-it-any-block 3.2.12 → 3.3.1

package/dist/mdit-any-block.cjs

@@ -189,12 +189,14 @@ const ABReg = {
    */
   // 有前缀版本（给选择器用）
   reg_header: /^((\s|>\s|-\s|\*\s|\+\s)*)(%%)?(\[((?!toc|TOC|\!|< )[\|\!#:;\(\)\s0-9a-zA-Z\u4e00-\u9fa5].*)\]):?(%%)?\s*$/,
+  // 向上检查标志的 头部选择器
+  reg_mdit_head: /^((\s|>\s|-\s|\*\s|\+\s)*)(::::*)\s?(.*)/,
   //: /^\s*(>\s)*-\s(.*)$/
-  reg_code: /^((\s|>\s|-\s|\*\s|\+\s)*)(```|~~~)(.*)/,
-  //: /^\s*(>\s|-\s)*(```|~~~)(.*)$/ // TODO 应改成` "```*")
+  reg_code: /^((\s|>\s|-\s|\*\s|\+\s)*)(````*|~~~~*)(.*)/,
+  //: /^\s*(>\s|-\s)*(````*|~~~~*)(.*)$/
   reg_quote: /^((\s|>\s|-\s|\*\s|\+\s)*)(>\s)(.*)/,
   reg_list_noprefix: /^((\s)*)(-\s|\*\s|\+\s)(.*)/,
-  reg_code_noprefix: /^((\s)*)(```|~~~)(.*)/,
+  reg_code_noprefix: /^((\s)*)(````*|~~~~*)(.*)/,
   reg_quote_noprefix: /^((\s)*)(>\s)(.*)/,
   reg_heading_noprefix: /^((\s)*)(\#+\s)(.*)/,
   reg_table_noprefix: /^((\s)*)(\|(.*)\|)/,
@@ -202,30 +204,33 @@ const ABReg = {
   // 内联切分。`|`或全角符号+一空格，半角符号+两空格 (后者由于空格压缩，若经历了重渲染可能有问题)
 };
 const ABCSetting = {
-  env: "obsidian"
+  env: "obsidian",
+  // MarkdownPostProcessorContext类型, obsidian专用
+  mermaid: void 0
+  // obsidian专用，表示使用哪种方式渲染mermaid
 };
 function autoABAlias(header, selectorName, content) {
   if (!header.trimEnd().endsWith("|")) header = header + "|";
   if (!header.trimStart().startsWith("|")) header = "|" + header;
   if (selectorName == "mdit") {
-    header = "|::: 140lne" + header.trimStart();
+    header = "|:::_140lne" + header.trimStart();
   } else if (selectorName == "list" || ABReg.reg_list_noprefix.test(content.trimStart())) {
-    header = "|list 140lne" + header;
+    header = "|list_140lne" + header;
   } else if (selectorName == "heading" || ABReg.reg_heading_noprefix.test(content.trimStart())) {
-    header = "|heading 140lne" + header;
+    header = "|heading_140lne" + header;
   } else if (selectorName == "code" || ABReg.reg_code_noprefix.test(content.trimStart())) {
-    header = "|code 140lne" + header;
+    header = "|code_140lne" + header;
   } else if (selectorName == "quote" || ABReg.reg_quote_noprefix.test(content.trimStart())) {
-    header = "|quote 140lne" + header;
+    header = "|quote_140lne" + header;
   } else if (selectorName == "table" || ABReg.reg_table_noprefix.test(content.trimStart())) {
-    header = "|table 140lne" + header;
+    header = "|table_140lne" + header;
   }
   for (const item of ABAlias_json) {
     header = header.replace(item.regex, item.replacement);
   }
   for (const item of ABAlias_json_withSub) {
     header = header.replace(item.regex, (match, ...groups) => {
-      return item.replacement.replace(/\$(\d+)/g, (_, number) => groups[number - 1]);
+      return item.replacement.replace(/\$(\d+)/g, (_, number) => groups[number - 1] ?? "");
     });
   }
   for (const item of ABAlias_json_end) {
@@ -234,73 +239,93 @@ function autoABAlias(header, selectorName, content) {
   return header;
 }
 const ABAlias_json_withSub = [
-  { regex: /\|(info|note|warning|caution|attention|error|danger|tips|tip|hint|example|abstract|summary|tldr|quote|cite|todo|success|check|done)\s?(.*?)\|/, replacement: "|add([!$1] $2)|addQuote|" },
-  { regex: /\|quote (\S+)\s?(.*)\|/, replacement: "|add([!$1] $2)|addQuote|" }
-  // 注意避免和callout语法冲突，以及自身递归
+  // 分下类，排下序
+  // `gfm` 就支持五种: note, tip, important, warning, caution
+  // `vuepress` 比gfm多了个: info
+  // `obsidian` 不完全是gfm超集，其important和tip一样，caution和warning一样
+  //   note
+  //   abstract, summary, tldr
+  //   info
+  //   todo
+  //   tip. hint, Important
+  //   succcess, check, done
+  //   question, help, faq
+  //   warning, caution, attention
+  //   failure, fail, missing
+  //   danger, error
+  //   bug
+  //   example
+  //   quote, cite
+  // `其他` 避免错字, 我之前加过 warn, tips。后面又删了
+  { regex: /\|(note|warning|caution|attention|error|info|danger|tip|hint|example|abstract|summary|tldr|quote|cite|todo|success|check|done|important|question|help|faq|failure|fail|missing|bug)([+-]?)(\s.*)?\|/, replacement: "|add([!$1]$2$3)|addQuote|" },
+  { regex: /\|(callout|alert) ([^+-\s]+)([+-]?)\s?(.*)\|/, replacement: "|add([!$2]$3 $4)|addQuote|" }
+  // 注意避免和原上/上面的callout语法冲突，以及自身递归
 ];
 const ABAlias_json_mdit = [
-  { regex: /\|::: 140lne\|(2?tabs?|标签页?)\|/, replacement: "|mditTabs|" },
-  { regex: "|::: 140lne|demo|", replacement: "|mditDemo|" },
-  { regex: "|::: 140lne|abDemo|", replacement: "|mditABDemo|" },
-  { regex: /\|::: 140lne\|(2?col|分栏)\|/, replacement: "|mditCol|" },
-  { regex: /\|::: 140lne\|(2?card|卡片)\|/, replacement: "|mditCard|" },
-  { regex: /\|::: 140lne\|(2?chat|聊天)\|/, replacement: "|mditChat|code(chat)|" }
+  { regex: /\|:::_140lne\|(2?tabs?|标签页?)\|/, replacement: "|mditTabs|" },
+  { regex: "|:::_140lne|demo|", replacement: "|mditDemo|" },
+  { regex: "|:::_140lne|abDemo|", replacement: "|mditABDemo|" },
+  { regex: /\|:::_140lne\|(2?col|分栏)\|/, replacement: "|mditCol|" },
+  { regex: /\|:::_140lne\|(2?card|卡片)\|/, replacement: "|mditCard|" },
+  { regex: /\|:::_140lne\|(2?chat|聊天)\|/, replacement: "|mditChat|code(chat)|" }
 ];
 const ABAlias_json_title = [
   { regex: "|title2list|", replacement: "|title2listdata|listdata2strict|listdata2list|" },
   // title - list&title
-  { regex: /\|heading 140lne\|2?(timeline|时间线)\|/, replacement: "|title2timeline|" },
-  { regex: /\|heading 140lne\|2?(tabs?|标签页?)\||\|title2tabs?\|/, replacement: "|title2c2listdata|c2listdata2tab|" },
-  { regex: /\|heading 140lne\|2?(col|分栏)\||\|title2col\|/, replacement: "|title2c2listdata|c2listdata2items|addClass(ab-col)|" },
-  { regex: /\|heading 140lne\|2?(card|卡片)\||\|title2card\|/, replacement: "|title2c2listdata|c2listdata2items|addClass(ab-card)|addClass(ab-lay-vfall)|" },
-  { regex: /\|heading 140lne\|2?(nodes?|节点)\||\|(title2node|title2abMindmap)\|/, replacement: "|title2listdata|listdata2strict|listdata2nodes|" },
+  { regex: /\|heading_140lne\|2?(timeline|时间线)\|/, replacement: "|title2timeline|" },
+  { regex: /\|heading_140lne\|2?(tabs?|标签页?)\||\|title2tabs?\|/, replacement: "|title2c2listdata|c2listdata2tab|" },
+  { regex: /\|heading_140lne\|2?(col|分栏)\||\|title2col\|/, replacement: "|title2c2listdata|c2listdata2items|addClass(ab-col)|" },
+  { regex: /\|heading_140lne\|2?(card|卡片)\||\|title2card\|/, replacement: "|title2c2listdata|c2listdata2items|addClass(ab-card)|addClass(ab-lay-vfall)|" },
+  { regex: /\|heading_140lne\|2?(nodes?|节点)\||\|(title2node|title2abMindmap)\|/, replacement: "|title2listdata|listdata2strict|listdata2nodes|" },
   // list  - 多叉多层树
-  { regex: /\|heading 140lne\|2?(mermaid|flow|流程图)\|/, replacement: "|title2list|list2mermaid|" },
-  { regex: /\|heading 140lne\|2?(mehrmaid|mdmermaid)\|/, replacement: "|title2list|list2mehrmaidText|code(mehrmaid)|" },
-  { regex: /\|heading 140lne\|2?(puml)?(plantuml|mindmap|脑图|思维导图)\|/, replacement: "|title2list|list2pumlMindmap|" },
-  { regex: /\|heading 140lne\|2?(markmap|mdMindmap|md脑图|md思维导图)\|/, replacement: "|title2list|list2markmap|" },
-  { regex: /\|heading 140lne\|2?(wbs|(工作)?分解(图|结构))\|/, replacement: "|title2list|list2pumlWBS|" },
-  { regex: /\|heading 140lne\|2?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|title2list|list2table|" },
+  { regex: /\|heading_140lne\|2?(mermaid|flow|流程图)\|/, replacement: "|title2list|list2mermaid|" },
+  { regex: /\|heading_140lne\|2?(mehrmaid|mdmermaid)\|/, replacement: "|title2list|list2mehrmaidText|code(mehrmaid)|" },
+  { regex: /\|heading_140lne\|2?(puml)?(plantuml|mindmap|脑图|思维导图)\|/, replacement: "|title2list|list2pumlMindmap|" },
+  { regex: /\|heading_140lne\|2?(markmap|mdMindmap|md脑图|md思维导图)\|/, replacement: "|title2list|list2markmap|" },
+  { regex: /\|heading_140lne\|2?(wbs|(工作)?分解(图|结构))\|/, replacement: "|title2list|list2pumlWBS|" },
+  { regex: /\|heading_140lne\|2?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|title2list|list2table|" },
   // list - lt树 (属于多层一叉树)
-  { regex: /\|heading 140lne\|2?(lt|listTable|treeTable|listGrid|treeGrid|列表格|树形表格?)\|/, replacement: "|title2list|list2lt|" },
-  { regex: /\|heading 140lne\|2?(list|列表)\|/, replacement: "|title2list|list2lt|addClass(ab-listtable-likelist)|" },
-  { regex: /\|heading 140lne\|2?(dir|dirTree|目录树?|目录结构)\|/, replacement: "|title2list|list2dt|" },
+  { regex: /\|heading_140lne\|2?(lt|listTable|treeTable|listGrid|treeGrid|列表格|树形表格?)\|/, replacement: "|title2list|list2lt|" },
+  { regex: /\|heading_140lne\|2?(list|列表)\|/, replacement: "|title2list|list2lt|addClass(ab-listtable-likelist)|" },
+  { regex: /\|heading_140lne\|2?(dir|dirTree|目录树?|目录结构)\|/, replacement: "|title2list|list2dt|" },
   // list - 二层树
-  { regex: /\|heading 140lne\|(fakeList|仿列表)\|/, replacement: "|title2list|list2table|addClass(ab-table-fc)|addClass(ab-table-likelist)|" }
+  { regex: /\|heading_140lne\|(fakeList|仿列表)\|/, replacement: "|title2list|list2table|addClass(ab-table-fc)|addClass(ab-table-likelist)|" }
 ];
 const ABAlias_json_list = [
   { regex: "|listXinline|", replacement: "|list2listdata|listdata2list|" },
   // list - list&title
-  { regex: /\|list 140lne\|2?(timeline|时间线)\|/, replacement: "|list2timeline|" },
-  { regex: /\|list 140lne\|2?(tabs?|标签页?)\||\|list2tabs?\|/, replacement: "|list2c2listdata|c2listdata2tab|" },
-  { regex: /\|list 140lne\|2?(col|分栏)\||\|list2col\|/, replacement: "|list2c2listdata|c2listdata2items|addClass(ab-col)|" },
-  { regex: /\|list 140lne\|2?(card|卡片)\||\|list2card\|/, replacement: "|list2c2listdata|c2listdata2items|addClass(ab-card)|addClass(ab-lay-vfall)|" },
-  { regex: /\|list 140lne\|2?(nodes?|节点)\||\|(list2node|list2abMindmap)\|/, replacement: "|list2listdata|listdata2strict|listdata2nodes|" },
+  { regex: /\|list_140lne\|2?(timeline|时间线)\|/, replacement: "|list2timeline|" },
+  { regex: /\|list_140lne\|2?(tabs?|标签页?)\||\|list2tabs?\|/, replacement: "|list2c2listdata|c2listdata2tab|" },
+  { regex: /\|list_140lne\|2?(col|分栏)\||\|list2col\|/, replacement: "|list2c2listdata|c2listdata2items|addClass(ab-col)|" },
+  { regex: /\|list_140lne\|2?(card|卡片)\||\|list2card\|/, replacement: "|list2c2listdata|c2listdata2items|addClass(ab-card)|addClass(ab-lay-vfall)|" },
+  { regex: /\|list_140lne\|2?(nodes?|节点)\||\|(list2node|list2abMindmap)\|/, replacement: "|list2listdata|listdata2strict|listdata2nodes|" },
   // list  - 多叉多层树
-  { regex: /\|list 140lne\|2?(mermaid|flow|流程图)\|/, replacement: "|list2mermaid|" },
-  { regex: /\|list 140lne\|2?(mehrmaid|mdmermaid)\|/, replacement: "|list2mehrmaidText|code(mehrmaid)|" },
-  { regex: /\|list 140lne\|2?(puml)?(plantuml|mindmap|脑图|思维导图)\|/, replacement: "|list2pumlMindmap|" },
-  { regex: /\|list 140lne\|2?(markmap|mdMindmap|md脑图|md思维导图)\|/, replacement: "|list2markmap|" },
-  { regex: /\|list 140lne\|2?(wbs|(工作)?分解(图|结构))\|/, replacement: "|list2pumlWBS|" },
-  { regex: /\|list 140lne\|2?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|list2table|" },
+  { regex: /\|list_140lne\|2?(mermaid|flow|流程图)\|/, replacement: "|list2mermaid|" },
+  { regex: /\|list_140lne\|2?(mehrmaid|mdmermaid)\|/, replacement: "|list2mehrmaidText|code(mehrmaid)|" },
+  { regex: /\|list_140lne\|2?(puml)?(plantuml|mindmap|脑图|思维导图)\|/, replacement: "|list2pumlMindmap|" },
+  { regex: /\|list_140lne\|2?(markmap|mdMindmap|md脑图|md思维导图)\|/, replacement: "|list2markmap|" },
+  { regex: /\|list_140lne\|2?(wbs|(工作)?分解(图|结构))\|/, replacement: "|list2pumlWBS|" },
+  { regex: /\|list_140lne\|2?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|list2table|" },
   // list - lt树 (属于多层一叉树)
-  { regex: /\|list 140lne\|2?(lt|listTable|treeTable|listGrid|treeGrid|列表格|树形表格?)\|/, replacement: "|list2lt|" },
-  { regex: /\|list 140lne\|2?(list|列表)\|/, replacement: "|list2lt|addClass(ab-listtable-likelist)|" },
-  { regex: /\|list 140lne\|2?(dir|dirTree|目录树?|目录结构)\|/, replacement: "|list2dt|" },
+  { regex: /\|list_140lne\|2?(lt|listTable|treeTable|listGrid|treeGrid|列表格|树形表格?)\|/, replacement: "|list2lt|" },
+  { regex: /\|list_140lne\|2?(list|列表)\|/, replacement: "|list2lt|addClass(ab-listtable-likelist)|" },
+  { regex: /\|list_140lne\|2?(dir|dirTree|目录树?|目录结构)\|/, replacement: "|list2dt|" },
   // list - 二层树
-  { regex: /\|list 140lne\|(fakeList|仿列表)\|/, replacement: "|list2table|addClass(ab-table-fc)|addClass(ab-table-likelist)|" }
+  { regex: /\|list_140lne\|(fakeList|仿列表)\|/, replacement: "|list2table|addClass(ab-table-fc)|addClass(ab-table-likelist)|" }
 ];
 const ABAlias_json_code = [
-  { regex: "|code 140lne|X|", replacement: "|Xcode|" },
-  { regex: "|code2list|", replacement: "|Xcode|region2indent|addList|" },
+  { regex: "|code_140lne|X|", replacement: "|xCode|" },
+  { regex: "|code_140lne|x|", replacement: "|xCode|" },
+  { regex: "|code2list|", replacement: "|xCode|region2indent|addList|" },
   { regex: "|list2code|", replacement: "|xList|code(js)|" }
 ];
 const ABAlias_json_quote = [
-  { regex: "|quote 140lne|X|", replacement: "|Xquote|" }
+  // {regex: "|quote_140lne|X|", replacement: "|xQuote|"},
+  // {regex: "|quote_140lne|x|", replacement: "|xQuote|"},
 ];
 const ABAlias_json_table = [];
 const ABAlias_json_general = [
-  { regex: "|黑幕|", replacement: "|add_class(ab-deco-heimu)|" },
+  { regex: "|黑幕|", replacement: "|addClass(ab-deco-heimu)|" },
   { regex: "|折叠|", replacement: "|fold|" },
   { regex: "|滚动|", replacement: "|scroll|" },
   { regex: "|超出折叠|", replacement: "|overfold|" },
@@ -356,12 +381,12 @@ let ABAlias_json = [
   // 设置决定是否停用
 ];
 const ABAlias_json_end = [
-  { regex: "|::: 140lne", replacement: "" },
-  { regex: "|heading 140lne", replacement: "" },
-  { regex: "|list 140lne", replacement: "" },
-  { regex: "|code 140lne", replacement: "" },
-  { regex: "|qutoe 140lne", replacement: "" },
-  { regex: "|table 140lne", replacement: "" }
+  { regex: "|:::_140lne", replacement: "" },
+  { regex: "|heading_140lne", replacement: "" },
+  { regex: "|list_140lne", replacement: "" },
+  { regex: "|code_140lne", replacement: "" },
+  { regex: "|qutoe_140lne", replacement: "" },
+  { regex: "|table_140lne", replacement: "" }
 ];
 class ABConvertManager {
   /// 构造函数
@@ -567,7 +592,7 @@ ABConvert.factory({
 const abc_xQuote = ABConvert.factory({
   id: "xQuote",
   name: "去除引用块",
-  match: "/^(xQuote|Xquote)$/",
+  match: /^(xQuote|Xquote)$/,
   detail: "在文本的每行前面删除 `> `",
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.text,
@@ -777,6 +802,34 @@ ABConvert.factory({
     return newContent.slice(1);
   }
 });
+ABConvert.factory({
+  id: "mdit2code",
+  name: "mdit转代码块",
+  detail: "mdit转代码块 (允许嵌套)。注意 `:*n` 会转化为 `~*(n+3)`, `@aaa bbb` 会转换为 `# bbb` (h1标题)",
+  process_param: ABConvert_IOEnum.text,
+  process_return: ABConvert_IOEnum.text,
+  process: (el, header, content) => {
+    const lists = content.trimEnd().split("\n");
+    let newContent = "";
+    for (let i = 0; i < lists.length; i++) {
+      const item = lists[i];
+      const match = item.match(ABReg.reg_mdit_head);
+      const match2 = item.trim().match(/^@(\S*?)\s(.*?)$/);
+      if (match2) {
+        newContent += "\n# " + match2[2];
+      } else if (match) {
+        const flag = "~".repeat(match[3].length + 3);
+        if (match[4].trim() !== "") newContent += "\n" + flag + "anyblock\n[" + match[4].trimStart() + "]";
+        else newContent += "\n" + flag;
+        continue;
+      } else {
+        newContent += "\n" + item;
+        continue;
+      }
+    }
+    return newContent.slice(1);
+  }
+});
 class ListProcess {
   // ----------------------- str -> listData ------------------------
   /** 
@@ -952,7 +1005,7 @@ class ListProcess {
     let codeBlockFlag = "";
     for (let line of list_text) {
       if (codeBlockFlag == "") {
-        const match = line.match(/^((\s|>\s|-\s|\*\s|\+\s)*)(````*|~~~~*)(.*)/);
+        const match = line.match(ABReg.reg_code);
         if (match && match[3]) {
           codeBlockFlag = match[1] + match[3];
           list_itemInfo[list_itemInfo.length - 1].content = list_itemInfo[list_itemInfo.length - 1].content + "\n" + line;
@@ -1453,7 +1506,7 @@ class C2ListProcess {
     let codeBlockFlag = "";
     for (const line of list_text) {
       if (codeBlockFlag == "") {
-        const match = line.match(/^((\s|>\s|-\s|\*\s|\+\s)*)(````*|~~~~*)(.*)/);
+        const match = line.match(ABReg.reg_code);
         if (match && match[3]) {
           codeBlockFlag = match[1] + match[3];
           current_content += line + "\n";
@@ -1915,8 +1968,8 @@ class DirProcess {
           }
         }
         list_itemInfo2.push({
-          content: list_column_item[column_index],
-          // modi
+          content: list_column_item[column_index].trimEnd(),
+          // modi, 使用内联分割符时，尾空白应该总是无用的
           level: row_item.level,
           tableRow: row_index,
           // modi
@@ -1989,7 +2042,7 @@ class DirProcess {
           if (!is_head) {
             if (cell_item.type == "folder") {
               td_svg.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M64 480H448c35.3 0 64-28.7 64-64V160c0-35.3-28.7-64-64-64H288c-10.1 0-19.6-4.7-25.6-12.8L243.2 57.6C231.1 41.5 212.1 32 192 32H64C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64z"/></svg>`;
-              cell_item.content = cell_item.content.slice(0, -1);
+              cell_item.content = cell_item.content.trimEnd().slice(0, -1);
             } else {
               td_svg.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M320 464c8.8 0 16-7.2 16-16l0-288-80 0c-17.7 0-32-14.3-32-32l0-80L64 48c-8.8 0-16 7.2-16 16l0 384c0 8.8 7.2 16 16 16l256 0zM0 64C0 28.7 28.7 0 64 0L229.5 0c17 0 33.3 6.7 45.3 18.7l90.5 90.5c12 12 18.7 28.3 18.7 45.3L384 448c0 35.3-28.7 64-64 64L64 512c-35.3 0-64-28.7-64-64L0 64z"/></svg>`;
             }
@@ -1998,7 +2051,11 @@ class DirProcess {
         const td_cell = document.createElement("div");
         td.appendChild(td_cell);
         td_cell.classList.add("ab-list-table-witharrow");
-        ABConvertManager.getInstance().m_renderMarkdownFn(cell_item.content, td_cell);
+        if (cell_item.tableColumn == 0 && is_folder) {
+          td_cell.innerHTML = cell_item.content;
+        } else {
+          ABConvertManager.getInstance().m_renderMarkdownFn(cell_item.content, td_cell);
+        }
       }
     }
     {
@@ -2162,7 +2219,7 @@ function listdata2dirdata(list) {
   for (let i = 0; i < list.length; i++) {
     const item = list[i];
     let type;
-    if (item.content.endsWith("/")) {
+    if (item.content.trimEnd().endsWith("/")) {
       type = "folder";
     } else {
       const parts = item.content.split(".");
@@ -2278,23 +2335,22 @@ ABConvert.factory({
     sub_button.onclick = fn_fold;
     mid_el.appendChild(sub_button);
     mid_el.appendChild(sub_el);
-    if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
-      if (sub_el.classList.contains("ab-list-table")) {
-        const btn = sub_el.querySelector(":scope>.ab-table-fold");
-        if (btn) {
-          fn_fold();
-          sub_button.textContent = "全部折叠/展开";
-          const fn_fold2 = () => {
-            const clickEvent = new MouseEvent("click", {
-              view: window,
-              bubbles: true,
-              cancelable: true
-            });
-            btn.dispatchEvent(clickEvent);
-          };
-          fn_fold2();
-          sub_button.onclick = fn_fold2;
-        }
+    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") {
+        fn_fold();
+        sub_button.textContent = "折叠/展开";
+        const fn_fold2 = () => {
+          const clickEvent = new MouseEvent("click", {
+            view: window,
+            bubbles: true,
+            cancelable: true
+          });
+          listTable_btn.dispatchEvent(clickEvent);
+        };
+        fn_fold2();
+        sub_button.onclick = fn_fold2;
       }
     }
     return content;
@@ -2303,18 +2359,17 @@ ABConvert.factory({
 ABConvert.factory({
   id: "scroll",
   name: "滚动",
-  match: /^scroll(\((\d+)\))?(T)?$/,
+  match: /^scroll(X)?(\((\d+)\))?$/,
   default: "scroll(460)",
+  detail: "默认是纵向滚动。可以指定溢出滚动的范围，可以使用scrollX进行横向滚动",
   process_param: ABConvert_IOEnum.el,
   process_return: ABConvert_IOEnum.el,
   process: (el, header, content) => {
-    const matchs = header.match(/^scroll(\((\d+)\))?(T)?$/);
+    const matchs = header.match(/^scroll(X)?(\((\d+)\))?$/);
     if (!matchs) return content;
-    let arg1;
-    if (!matchs[1]) arg1 = 460;
-    else {
-      if (!matchs[2]) return content;
-      arg1 = Number(matchs[2]);
+    let arg1 = 0;
+    if (matchs[2] && matchs[3]) {
+      arg1 = Number(matchs[3]);
       if (isNaN(arg1)) return content;
     }
     if (content.children.length != 1) return content;
@@ -2323,13 +2378,14 @@ ABConvert.factory({
     const mid_el = document.createElement("div");
     content.appendChild(mid_el);
     mid_el.classList.add("ab-deco-scroll");
-    if (!matchs[3]) {
+    mid_el.appendChild(sub_el);
+    if (!matchs[1]) {
       mid_el.classList.add("ab-deco-scroll-y");
-      mid_el.setAttribute("style", `max-height: ${arg1}px`);
+      mid_el.setAttribute("style", `max-height: ${arg1 !== 0 ? arg1 + "px" : "460px"}`);
     } else {
       mid_el.classList.add("ab-deco-scroll-x");
+      mid_el.setAttribute("style", `max-height: ${arg1 !== 0 ? arg1 + "px" : "100%"}`);
     }
-    mid_el.appendChild(sub_el);
     return content;
   }
 });
@@ -2407,7 +2463,7 @@ ABConvert.factory({
       }
       return content;
     }
-    const table = content.children[0].querySelector("table");
+    const table = content.querySelector("table");
     if (table !== null) {
       table.style.tableLayout = "fixed";
       table.style.width = args.some((arg) => arg.endsWith("%")) ? "100%" : "fit-content";
@@ -2850,9 +2906,8 @@ ABConvert.factory({
   }
 });
 ABConvert.factory({
-  id: "info",
+  id: "info_converter",
   name: "INFO",
-  match: "info",
   detail: "查看当前软件版本下的注册处理器表",
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.el,
@@ -3017,7 +3072,27 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.el,
   process: (el, header, content) => {
-    const newContent = `@tab show
+    if (ABCSetting.env == "vuepress") {
+      ABConvertManager.getInstance().m_renderMarkdownFn(`::::: tabs
+
+@tab show
+
+${content}
+
+@tab withoutPlugin
+
+(noPlugin)${content.trimStart()}
+
+@tab mdSource
+
+~~~~~md
+${content}
+~~~~~
+
+:::::`, el);
+      return el;
+    } else {
+      const newContent = `@tab show
 ${content}
 @tab withoutPlugin
 (noPlugin)${content.trimStart()}
@@ -3025,8 +3100,9 @@ ${content}
 ~~~~~md
 ${content}
 ~~~~~`;
-    abc_mditTabs.process(el, header, newContent);
-    return el;
+      abc_mditTabs.process(el, header, newContent);
+      return el;
+    }
   }
 });
 ABConvert.factory({
@@ -7828,11 +7904,6 @@ function list2ActivityDiagramText(listdata) {
   let result = "@startuml\n";
   const stats = listdata.map((item) => new Stat(item.content.trim(), item.level));
   const { result: bodyResult } = processBlock(stats, 0, -1);
-  const swimLanes = bodyResult.split("\n").filter((line) => line.startsWith("|") && line.endsWith("|"));
-  if (swimLanes.length > 0) {
-    result += swimLanes.join("\n");
-    result += "\n";
-  }
   result += bodyResult;
   result += "@enduml";
   return result;
@@ -7911,7 +7982,6 @@ async function render_pumlText(text2, div) {
   div.innerHTML = `<img src="${url}">`;
   return div;
 }
-let mermaid = null;
 function getID(length = 16) {
   return Number(Math.random().toString().substr(3, length) + Date.now()).toString(36);
 }
@@ -8084,21 +8154,17 @@ async function data2mindmap(list_itemInfo, div) {
   return render_mermaidText(mermaidText, div);
 }
 async function render_mermaidText(mermaidText, div) {
-  if (ABCSetting.env == "obsidian") {
-    await init_mermaid();
-    const { svg } = await mermaid?.render("ab-mermaid-" + getID(), mermaidText);
-    div.innerHTML = svg;
-  } else if (ABCSetting.env == "obsidian-min") {
-    ABConvertManager.getInstance().m_renderMarkdownFn("```mermaid\n" + mermaidText + "\n```", div);
+  if ((ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") && ABCSetting.mermaid) {
+    ABCSetting.mermaid.then(async (mermaid) => {
+      const { svg } = await mermaid.render("ab-mermaid-" + getID(), mermaidText);
+      div.innerHTML = svg;
+    });
   } else {
     div.classList.add("ab-raw");
     div.innerHTML = `<div class="ab-raw-data" type-data="mermaid" content-data='${mermaidText}'></div>`;
   }
   return div;
 }
-async function init_mermaid() {
-  if (ABCSetting.env !== "obsidian" || true) return;
-}
 function abConvertEvent(d, isCycle = false) {
   if (d.querySelector(".ab-super-width")) {
     const els_note = d.querySelectorAll(".ab-note");
@@ -42437,13 +42503,13 @@ function abSelector_squareInline(md, options) {
         return;
       }
       if (text2.trim() == "") {
-        if (ab_blankLine_counter < 1) {
+        if (ab_blockType == "list" && ab_blankLine_counter >= 1) {
+          return;
+        } else {
           ab_blankLine_counter++;
           ab_content += "\n";
           state.line += 1;
           return findAbEnd();
-        } else {
-          return;
         }
       } else {
         ab_blankLine_counter = 0;
@@ -42485,7 +42551,7 @@ function abSelector_squareInline(md, options) {
         }
       } else if (ab_blockType == "heading") {
         if (codeBlockFlag == "") {
-          const match = text2.match(/^((\s|>\s|-\s|\*\s|\+\s)*)(````*|~~~~*)(.*)/);
+          const match = text2.match(ABReg.reg_code);
           if (match && match[3]) {
             codeBlockFlag = match[1] + match[3];
             ab_content += "\n" + text2;
@@ -42523,62 +42589,62 @@ function abSelector_squareInline(md, options) {
   });
 }
 function abSelector_container(md, options) {
-  md.block.ruler.before("fence", "AnyBlockMditContainer", (state, startLine, endLine, silent) => {
-    const typeNames = ["mditABDemo"];
-    let start = state.bMarks[startLine];
-    let max = state.eMarks[startLine];
-    if (state.src[start] !== ":") return false;
-    let pos = start + 1;
-    while (pos <= max) {
-      if (state.src[pos] !== ":") break;
-      pos++;
-    }
-    const markerCount = pos - start;
-    if (markerCount < 3) return false;
-    const markup = state.src.slice(start, pos);
-    const ab_mdit_header = state.src.slice(pos, max);
-    if (!typeNames.includes(ab_mdit_header.split("|")[0].trim())) return false;
-    if (silent) return true;
-    const ab_startLine = startLine;
-    let nextLine = startLine;
-    let autoClosed = false;
-    let ab_content = "";
-    while (
-      // unclosed block should be auto closed by end of document.
-      // also block seems to be auto closed by end of parent
-      nextLine < endLine
-    ) {
-      nextLine++;
-      start = state.bMarks[nextLine];
-      max = state.eMarks[nextLine];
-      if (start < max && state.sCount[nextLine] < state.blkIndent)
-        break;
-      if (
-        // match start
-        state.src[start] === ":" && // closing fence should be indented less than 4 spaces
-        state.sCount[nextLine] - state.blkIndent < 4
-      ) {
-        for (pos = start + 1; pos <= max; pos++)
-          if (state.src[pos] !== ":") break;
-        if (pos - start >= markerCount) {
-          pos = state.skipSpaces(pos);
-          if (pos >= max) {
-            autoClosed = true;
-            break;
-          }
-        }
+  md.block.ruler.before("fence", "AnyBlockMditContainer", (state, startLine, endLine) => {
+    const mdit_whitelist = ["mditABDemo"];
+    const mdit_blacklist = [
+      // "left", "center", "right", "justify", // https://mdit-plugins.github.io/zh/align.html
+      // "note", "warning", "tip", "info",     // https://mdit-plugins.github.io/zh/container.html
+      // "demo", "md-demo", "codedemo",
+      // "tabs", // TODO: 可能是 `tabs#fruit` 这种形式的，应该改成手动循环判断，不能以这些开头
+    ];
+    let mdit_header;
+    let mdit_match;
+    {
+      state.line = startLine;
+      const pos = state.bMarks[state.line];
+      const max = state.eMarks[state.line];
+      mdit_header = state.src.substring(pos, max);
+      mdit_match = mdit_header.match(ABReg.reg_mdit_head);
+      if (!mdit_match || !mdit_match.length) return false;
+      if (mdit_whitelist.length && !mdit_whitelist.includes(mdit_match[4].split("|")[0].trim())) {
+        return false;
+      }
+      if (mdit_blacklist.length && mdit_blacklist.includes(mdit_match[4].split("|")[0].trim())) {
+        return false;
       }
-      ab_content += "\n" + state.src.substring(start, max);
     }
-    state.line = nextLine + (autoClosed ? 1 : 0);
+    const mdit_flag = mdit_match[3];
+    const mdit_type = mdit_match[4];
+    const mdit_startLine = state.line;
+    let mdit_content = "";
+    state.line += 1;
+    findMditEnd();
+    const mdit_endLine = state.line;
     const token = state.push("fence", "code", 0);
     token.info = "AnyBlock";
-    token.content = `[${ab_mdit_header}]
-${ab_content}`;
-    token.map = [ab_startLine, nextLine];
-    token.markup = markup;
+    token.content = `[${mdit_type}]
+${mdit_content}`;
+    token.map = [mdit_startLine, mdit_endLine];
+    token.markup = mdit_flag;
     token.nesting = 0;
     return true;
+    function findMditEnd() {
+      const pos = state.bMarks[state.line];
+      const max = state.eMarks[state.line];
+      const text2 = state.src.substring(pos, max);
+      if (state.line > endLine) {
+        state.line = endLine + 1;
+        return;
+      }
+      if (text2.trim() == mdit_flag) {
+        state.line += 1;
+        return;
+      } else {
+        mdit_content += "\n" + text2;
+        state.line += 1;
+        return findMditEnd();
+      }
+    }
   });
 }
 function abRender_fence(md, options) {