@windrun-huaiin/third-ui 7.6.1 → 10.1.0

package/dist/node_modules/.pnpm/{mermaid@11.9.0/node_modules/mermaid/dist/chunks/mermaid.core/blockDiagram-6J76NXCF.mjs → mermaid@11.12.1/node_modules/mermaid/dist/chunks/mermaid.core/blockDiagram-VD42YOAC.mjs}

@@ -1,13 +1,14 @@
-import { getIconStyles } from './chunk-E2GYISFI.mjs';
-import { getLineFunctionsWithOffset } from './chunk-MXNHSMXR.mjs';
-import { getSubGraphTitleMargins } from './chunk-AC5SNWB5.mjs';
-import { createText, replaceIconSubstring } from './chunk-QESNASVV.mjs';
-import { utils_default, decodeEntities, getStylesFromArray } from './chunk-55PJQP7W.mjs';
-import { __name, getConfig, configureSvgSize, log, clear, getConfig2, getUrl, evaluate, common_default, sanitizeText } from './chunk-3XYRH5AP.mjs';
+import { getIconStyles } from './chunk-FMBD7UC4.mjs';
+import { getLineFunctionsWithOffset } from './chunk-HN2XXSSU.mjs';
+import { getSubGraphTitleMargins } from './chunk-CVBHYZKI.mjs';
+import { createText, replaceIconSubstring } from './chunk-JA3XYJ7Z.mjs';
+import { utils_default, decodeEntities, getStylesFromArray } from './chunk-S3R3BYOJ.mjs';
+import { getConfig, configureSvgSize, clear, getConfig2, getUrl, evaluate, common_default, sanitizeText } from './chunk-ABZYJK2D.mjs';
+import { __name, log } from './chunk-AGHRB4JF.mjs';
 import clone from '../../../../../../lodash-es@4.17.21/node_modules/lodash-es/clone.mjs';
 import '../../../../../../d3-transition@3.0.1_d3-selection@3.0.0/node_modules/d3-transition/src/selection/index.mjs';
 import '../../../../../../d3-zoom@3.0.0/node_modules/d3-zoom/src/transform.mjs';
-import { Graph } from '../../../../../../dagre-d3-es@7.0.11/node_modules/dagre-d3-es/src/graphlib/graph.mjs';
+import { Graph } from '../../../../../../dagre-d3-es@7.0.13/node_modules/dagre-d3-es/src/graphlib/graph.mjs';
 import channel from '../../../../../../khroma@2.1.0/node_modules/khroma/dist/methods/channel.mjs';
 import rgba from '../../../../../../khroma@2.1.0/node_modules/khroma/dist/methods/rgba.mjs';
 import select from '../../../../../../d3-selection@3.0.0/node_modules/d3-selection/src/select.mjs';
@@ -15,18 +16,18 @@ import line from '../../../../../../d3-shape@3.2.0/node_modules/d3-shape/src/lin
 import curveBasis from '../../../../../../d3-shape@3.2.0/node_modules/d3-shape/src/curve/basis.mjs';
 
 // src/diagrams/block/parser/block.jison
-var parser = function() {
+var parser = (function() {
   var o = /* @__PURE__ */ __name(function(k, v, o2, l) {
     for (o2 = o2 || {}, l = k.length; l--; o2[k[l]] = v) ;
     return o2;
-  }, "o"), $V0 = [1, 7], $V1 = [1, 13], $V2 = [1, 14], $V3 = [1, 15], $V4 = [1, 19], $V5 = [1, 16], $V6 = [1, 17], $V7 = [1, 18], $V8 = [8, 30], $V9 = [8, 21, 28, 29, 30, 31, 32, 40, 44, 47], $Va = [1, 23], $Vb = [1, 24], $Vc = [8, 15, 16, 21, 28, 29, 30, 31, 32, 40, 44, 47], $Vd = [8, 15, 16, 21, 27, 28, 29, 30, 31, 32, 40, 44, 47], $Ve = [1, 49];
+  }, "o"), $V0 = [1, 15], $V1 = [1, 7], $V2 = [1, 13], $V3 = [1, 14], $V4 = [1, 19], $V5 = [1, 16], $V6 = [1, 17], $V7 = [1, 18], $V8 = [8, 30], $V9 = [8, 10, 21, 28, 29, 30, 31, 39, 43, 46], $Va = [1, 23], $Vb = [1, 24], $Vc = [8, 10, 15, 16, 21, 28, 29, 30, 31, 39, 43, 46], $Vd = [8, 10, 15, 16, 21, 27, 28, 29, 30, 31, 39, 43, 46], $Ve = [1, 49];
   var parser2 = {
     trace: /* @__PURE__ */ __name(function trace() {
     }, "trace"),
     yy: {},
-    symbols_: { "error": 2, "spaceLines": 3, "SPACELINE": 4, "NL": 5, "separator": 6, "SPACE": 7, "EOF": 8, "start": 9, "BLOCK_DIAGRAM_KEY": 10, "document": 11, "stop": 12, "statement": 13, "link": 14, "LINK": 15, "START_LINK": 16, "LINK_LABEL": 17, "STR": 18, "nodeStatement": 19, "columnsStatement": 20, "SPACE_BLOCK": 21, "blockStatement": 22, "classDefStatement": 23, "cssClassStatement": 24, "styleStatement": 25, "node": 26, "SIZE": 27, "COLUMNS": 28, "id-block": 29, "end": 30, "block": 31, "NODE_ID": 32, "nodeShapeNLabel": 33, "dirList": 34, "DIR": 35, "NODE_DSTART": 36, "NODE_DEND": 37, "BLOCK_ARROW_START": 38, "BLOCK_ARROW_END": 39, "classDef": 40, "CLASSDEF_ID": 41, "CLASSDEF_STYLEOPTS": 42, "DEFAULT": 43, "class": 44, "CLASSENTITY_IDS": 45, "STYLECLASS": 46, "style": 47, "STYLE_ENTITY_IDS": 48, "STYLE_DEFINITION_DATA": 49, "$accept": 0, "$end": 1 },
-    terminals_: { 2: "error", 4: "SPACELINE", 5: "NL", 7: "SPACE", 8: "EOF", 10: "BLOCK_DIAGRAM_KEY", 15: "LINK", 16: "START_LINK", 17: "LINK_LABEL", 18: "STR", 21: "SPACE_BLOCK", 27: "SIZE", 28: "COLUMNS", 29: "id-block", 30: "end", 31: "block", 32: "NODE_ID", 35: "DIR", 36: "NODE_DSTART", 37: "NODE_DEND", 38: "BLOCK_ARROW_START", 39: "BLOCK_ARROW_END", 40: "classDef", 41: "CLASSDEF_ID", 42: "CLASSDEF_STYLEOPTS", 43: "DEFAULT", 44: "class", 45: "CLASSENTITY_IDS", 46: "STYLECLASS", 47: "style", 48: "STYLE_ENTITY_IDS", 49: "STYLE_DEFINITION_DATA" },
-    productions_: [0, [3, 1], [3, 2], [3, 2], [6, 1], [6, 1], [6, 1], [9, 3], [12, 1], [12, 1], [12, 2], [12, 2], [11, 1], [11, 2], [14, 1], [14, 4], [13, 1], [13, 1], [13, 1], [13, 1], [13, 1], [13, 1], [13, 1], [19, 3], [19, 2], [19, 1], [20, 1], [22, 4], [22, 3], [26, 1], [26, 2], [34, 1], [34, 2], [33, 3], [33, 4], [23, 3], [23, 3], [24, 3], [25, 3]],
+    symbols_: { "error": 2, "spaceLines": 3, "SPACELINE": 4, "NL": 5, "separator": 6, "SPACE": 7, "EOF": 8, "start": 9, "BLOCK_DIAGRAM_KEY": 10, "document": 11, "stop": 12, "statement": 13, "link": 14, "LINK": 15, "START_LINK": 16, "LINK_LABEL": 17, "STR": 18, "nodeStatement": 19, "columnsStatement": 20, "SPACE_BLOCK": 21, "blockStatement": 22, "classDefStatement": 23, "cssClassStatement": 24, "styleStatement": 25, "node": 26, "SIZE": 27, "COLUMNS": 28, "id-block": 29, "end": 30, "NODE_ID": 31, "nodeShapeNLabel": 32, "dirList": 33, "DIR": 34, "NODE_DSTART": 35, "NODE_DEND": 36, "BLOCK_ARROW_START": 37, "BLOCK_ARROW_END": 38, "classDef": 39, "CLASSDEF_ID": 40, "CLASSDEF_STYLEOPTS": 41, "DEFAULT": 42, "class": 43, "CLASSENTITY_IDS": 44, "STYLECLASS": 45, "style": 46, "STYLE_ENTITY_IDS": 47, "STYLE_DEFINITION_DATA": 48, "$accept": 0, "$end": 1 },
+    terminals_: { 2: "error", 4: "SPACELINE", 5: "NL", 7: "SPACE", 8: "EOF", 10: "BLOCK_DIAGRAM_KEY", 15: "LINK", 16: "START_LINK", 17: "LINK_LABEL", 18: "STR", 21: "SPACE_BLOCK", 27: "SIZE", 28: "COLUMNS", 29: "id-block", 30: "end", 31: "NODE_ID", 34: "DIR", 35: "NODE_DSTART", 36: "NODE_DEND", 37: "BLOCK_ARROW_START", 38: "BLOCK_ARROW_END", 39: "classDef", 40: "CLASSDEF_ID", 41: "CLASSDEF_STYLEOPTS", 42: "DEFAULT", 43: "class", 44: "CLASSENTITY_IDS", 45: "STYLECLASS", 46: "style", 47: "STYLE_ENTITY_IDS", 48: "STYLE_DEFINITION_DATA" },
+    productions_: [0, [3, 1], [3, 2], [3, 2], [6, 1], [6, 1], [6, 1], [9, 3], [12, 1], [12, 1], [12, 2], [12, 2], [11, 1], [11, 2], [14, 1], [14, 4], [13, 1], [13, 1], [13, 1], [13, 1], [13, 1], [13, 1], [13, 1], [19, 3], [19, 2], [19, 1], [20, 1], [22, 4], [22, 3], [26, 1], [26, 2], [33, 1], [33, 2], [32, 3], [32, 4], [23, 3], [23, 3], [24, 3], [25, 3]],
     performAction: /* @__PURE__ */ __name(function anonymous(yytext, yyleng, yylineno, yy, yystate, $$, _$) {
       var $0 = $$.length - 1;
       switch (yystate) {
@@ -144,7 +145,7 @@ var parser = function() {
           break;
       }
     }, "anonymous"),
-    table: [{ 9: 1, 10: [1, 2] }, { 1: [3] }, { 11: 3, 13: 4, 19: 5, 20: 6, 21: $V0, 22: 8, 23: 9, 24: 10, 25: 11, 26: 12, 28: $V1, 29: $V2, 31: $V3, 32: $V4, 40: $V5, 44: $V6, 47: $V7 }, { 8: [1, 20] }, o($V8, [2, 12], { 13: 4, 19: 5, 20: 6, 22: 8, 23: 9, 24: 10, 25: 11, 26: 12, 11: 21, 21: $V0, 28: $V1, 29: $V2, 31: $V3, 32: $V4, 40: $V5, 44: $V6, 47: $V7 }), o($V9, [2, 16], { 14: 22, 15: $Va, 16: $Vb }), o($V9, [2, 17]), o($V9, [2, 18]), o($V9, [2, 19]), o($V9, [2, 20]), o($V9, [2, 21]), o($V9, [2, 22]), o($Vc, [2, 25], { 27: [1, 25] }), o($V9, [2, 26]), { 19: 26, 26: 12, 32: $V4 }, { 11: 27, 13: 4, 19: 5, 20: 6, 21: $V0, 22: 8, 23: 9, 24: 10, 25: 11, 26: 12, 28: $V1, 29: $V2, 31: $V3, 32: $V4, 40: $V5, 44: $V6, 47: $V7 }, { 41: [1, 28], 43: [1, 29] }, { 45: [1, 30] }, { 48: [1, 31] }, o($Vd, [2, 29], { 33: 32, 36: [1, 33], 38: [1, 34] }), { 1: [2, 7] }, o($V8, [2, 13]), { 26: 35, 32: $V4 }, { 32: [2, 14] }, { 17: [1, 36] }, o($Vc, [2, 24]), { 11: 37, 13: 4, 14: 22, 15: $Va, 16: $Vb, 19: 5, 20: 6, 21: $V0, 22: 8, 23: 9, 24: 10, 25: 11, 26: 12, 28: $V1, 29: $V2, 31: $V3, 32: $V4, 40: $V5, 44: $V6, 47: $V7 }, { 30: [1, 38] }, { 42: [1, 39] }, { 42: [1, 40] }, { 46: [1, 41] }, { 49: [1, 42] }, o($Vd, [2, 30]), { 18: [1, 43] }, { 18: [1, 44] }, o($Vc, [2, 23]), { 18: [1, 45] }, { 30: [1, 46] }, o($V9, [2, 28]), o($V9, [2, 35]), o($V9, [2, 36]), o($V9, [2, 37]), o($V9, [2, 38]), { 37: [1, 47] }, { 34: 48, 35: $Ve }, { 15: [1, 50] }, o($V9, [2, 27]), o($Vd, [2, 33]), { 39: [1, 51] }, { 34: 52, 35: $Ve, 39: [2, 31] }, { 32: [2, 15] }, o($Vd, [2, 34]), { 39: [2, 32] }],
+    table: [{ 9: 1, 10: [1, 2] }, { 1: [3] }, { 10: $V0, 11: 3, 13: 4, 19: 5, 20: 6, 21: $V1, 22: 8, 23: 9, 24: 10, 25: 11, 26: 12, 28: $V2, 29: $V3, 31: $V4, 39: $V5, 43: $V6, 46: $V7 }, { 8: [1, 20] }, o($V8, [2, 12], { 13: 4, 19: 5, 20: 6, 22: 8, 23: 9, 24: 10, 25: 11, 26: 12, 11: 21, 10: $V0, 21: $V1, 28: $V2, 29: $V3, 31: $V4, 39: $V5, 43: $V6, 46: $V7 }), o($V9, [2, 16], { 14: 22, 15: $Va, 16: $Vb }), o($V9, [2, 17]), o($V9, [2, 18]), o($V9, [2, 19]), o($V9, [2, 20]), o($V9, [2, 21]), o($V9, [2, 22]), o($Vc, [2, 25], { 27: [1, 25] }), o($V9, [2, 26]), { 19: 26, 26: 12, 31: $V4 }, { 10: $V0, 11: 27, 13: 4, 19: 5, 20: 6, 21: $V1, 22: 8, 23: 9, 24: 10, 25: 11, 26: 12, 28: $V2, 29: $V3, 31: $V4, 39: $V5, 43: $V6, 46: $V7 }, { 40: [1, 28], 42: [1, 29] }, { 44: [1, 30] }, { 47: [1, 31] }, o($Vd, [2, 29], { 32: 32, 35: [1, 33], 37: [1, 34] }), { 1: [2, 7] }, o($V8, [2, 13]), { 26: 35, 31: $V4 }, { 31: [2, 14] }, { 17: [1, 36] }, o($Vc, [2, 24]), { 10: $V0, 11: 37, 13: 4, 14: 22, 15: $Va, 16: $Vb, 19: 5, 20: 6, 21: $V1, 22: 8, 23: 9, 24: 10, 25: 11, 26: 12, 28: $V2, 29: $V3, 31: $V4, 39: $V5, 43: $V6, 46: $V7 }, { 30: [1, 38] }, { 41: [1, 39] }, { 41: [1, 40] }, { 45: [1, 41] }, { 48: [1, 42] }, o($Vd, [2, 30]), { 18: [1, 43] }, { 18: [1, 44] }, o($Vc, [2, 23]), { 18: [1, 45] }, { 30: [1, 46] }, o($V9, [2, 28]), o($V9, [2, 35]), o($V9, [2, 36]), o($V9, [2, 37]), o($V9, [2, 38]), { 36: [1, 47] }, { 33: 48, 34: $Ve }, { 15: [1, 50] }, o($V9, [2, 27]), o($Vd, [2, 33]), { 38: [1, 51] }, { 33: 52, 34: $Ve, 38: [2, 31] }, { 31: [2, 15] }, o($Vd, [2, 34]), { 38: [2, 32] }],
     defaultActions: { 20: [2, 7], 23: [2, 14], 50: [2, 15], 52: [2, 32] },
     parseError: /* @__PURE__ */ __name(function parseError(str, hash) {
       if (hash.recoverable) {
@@ -292,7 +293,7 @@ var parser = function() {
       return true;
     }, "parse")
   };
-  var lexer = /* @__PURE__ */ function() {
+  var lexer = /* @__PURE__ */ (function() {
     var lexer2 = {
       EOF: 1,
       parseError: /* @__PURE__ */ __name(function parseError(str, hash) {
@@ -575,130 +576,132 @@ var parser = function() {
       performAction: /* @__PURE__ */ __name(function anonymous(yy, yy_, $avoiding_name_collisions, YY_START) {
         switch ($avoiding_name_collisions) {
           case 0:
+            yy.getLogger().debug("Found block-beta");
             return 10;
           case 1:
-            yy.getLogger().debug("Found space-block");
-            return 31;
+            yy.getLogger().debug("Found id-block");
+            return 29;
           case 2:
-            yy.getLogger().debug("Found nl-block");
-            return 31;
+            yy.getLogger().debug("Found block");
+            return 10;
           case 3:
-            yy.getLogger().debug("Found space-block");
-            return 29;
-          case 4:
             yy.getLogger().debug(".", yy_.yytext);
             break;
-          case 5:
+          case 4:
             yy.getLogger().debug("_", yy_.yytext);
             break;
-          case 6:
+          case 5:
             return 5;
-          case 7:
+          case 6:
             yy_.yytext = -1;
             return 28;
-          case 8:
+          case 7:
             yy_.yytext = yy_.yytext.replace(/columns\s+/, "");
             yy.getLogger().debug("COLUMNS (LEX)", yy_.yytext);
             return 28;
-          case 9:
+          case 8:
             this.pushState("md_string");
             break;
-          case 10:
+          case 9:
             return "MD_STR";
-          case 11:
+          case 10:
             this.popState();
             break;
-          case 12:
+          case 11:
             this.pushState("string");
             break;
-          case 13:
+          case 12:
             yy.getLogger().debug("LEX: POPPING STR:", yy_.yytext);
             this.popState();
             break;
-          case 14:
+          case 13:
             yy.getLogger().debug("LEX: STR end:", yy_.yytext);
             return "STR";
-          case 15:
+          case 14:
             yy_.yytext = yy_.yytext.replace(/space\:/, "");
             yy.getLogger().debug("SPACE NUM (LEX)", yy_.yytext);
             return 21;
-          case 16:
+          case 15:
             yy_.yytext = "1";
             yy.getLogger().debug("COLUMNS (LEX)", yy_.yytext);
             return 21;
+          case 16:
+            return 42;
           case 17:
-            return 43;
-          case 18:
             return "LINKSTYLE";
-          case 19:
+          case 18:
             return "INTERPOLATE";
-          case 20:
+          case 19:
             this.pushState("CLASSDEF");
-            return 40;
-          case 21:
+            return 39;
+          case 20:
             this.popState();
             this.pushState("CLASSDEFID");
             return "DEFAULT_CLASSDEF_ID";
-          case 22:
+          case 21:
             this.popState();
             this.pushState("CLASSDEFID");
+            return 40;
+          case 22:
+            this.popState();
             return 41;
           case 23:
-            this.popState();
-            return 42;
-          case 24:
             this.pushState("CLASS");
+            return 43;
+          case 24:
+            this.popState();
+            this.pushState("CLASS_STYLE");
             return 44;
           case 25:
             this.popState();
-            this.pushState("CLASS_STYLE");
             return 45;
           case 26:
-            this.popState();
+            this.pushState("STYLE_STMNT");
             return 46;
           case 27:
-            this.pushState("STYLE_STMNT");
+            this.popState();
+            this.pushState("STYLE_DEFINITION");
             return 47;
           case 28:
             this.popState();
-            this.pushState("STYLE_DEFINITION");
             return 48;
           case 29:
-            this.popState();
-            return 49;
-          case 30:
             this.pushState("acc_title");
             return "acc_title";
-          case 31:
+          case 30:
             this.popState();
             return "acc_title_value";
-          case 32:
+          case 31:
             this.pushState("acc_descr");
             return "acc_descr";
-          case 33:
+          case 32:
             this.popState();
             return "acc_descr_value";
-          case 34:
+          case 33:
             this.pushState("acc_descr_multiline");
             break;
-          case 35:
+          case 34:
             this.popState();
             break;
-          case 36:
+          case 35:
             return "acc_descr_multiline_value";
-          case 37:
+          case 36:
             return 30;
+          case 37:
+            this.popState();
+            yy.getLogger().debug("Lex: ((");
+            return "NODE_DEND";
           case 38:
             this.popState();
             yy.getLogger().debug("Lex: ((");
             return "NODE_DEND";
           case 39:
             this.popState();
-            yy.getLogger().debug("Lex: ((");
+            yy.getLogger().debug("Lex: ))");
             return "NODE_DEND";
           case 40:
             this.popState();
-            yy.getLogger().debug("Lex: ))");
+            yy.getLogger().debug("Lex: ((");
             return "NODE_DEND";
           case 41:
             this.popState();
@@ -706,198 +709,197 @@ var parser = function() {
             return "NODE_DEND";
           case 42:
             this.popState();
-            yy.getLogger().debug("Lex: ((");
+            yy.getLogger().debug("Lex: (-");
             return "NODE_DEND";
           case 43:
             this.popState();
-            yy.getLogger().debug("Lex: (-");
+            yy.getLogger().debug("Lex: -)");
             return "NODE_DEND";
           case 44:
             this.popState();
-            yy.getLogger().debug("Lex: -)");
+            yy.getLogger().debug("Lex: ((");
             return "NODE_DEND";
           case 45:
             this.popState();
-            yy.getLogger().debug("Lex: ((");
+            yy.getLogger().debug("Lex: ]]");
             return "NODE_DEND";
           case 46:
             this.popState();
-            yy.getLogger().debug("Lex: ]]");
+            yy.getLogger().debug("Lex: (");
             return "NODE_DEND";
           case 47:
             this.popState();
-            yy.getLogger().debug("Lex: (");
+            yy.getLogger().debug("Lex: ])");
             return "NODE_DEND";
           case 48:
             this.popState();
-            yy.getLogger().debug("Lex: ])");
+            yy.getLogger().debug("Lex: /]");
             return "NODE_DEND";
           case 49:
             this.popState();
             yy.getLogger().debug("Lex: /]");
             return "NODE_DEND";
           case 50:
-            this.popState();
-            yy.getLogger().debug("Lex: /]");
-            return "NODE_DEND";
-          case 51:
             this.popState();
             yy.getLogger().debug("Lex: )]");
             return "NODE_DEND";
-          case 52:
+          case 51:
             this.popState();
             yy.getLogger().debug("Lex: )");
             return "NODE_DEND";
-          case 53:
+          case 52:
             this.popState();
             yy.getLogger().debug("Lex: ]>");
             return "NODE_DEND";
-          case 54:
+          case 53:
             this.popState();
             yy.getLogger().debug("Lex: ]");
             return "NODE_DEND";
-          case 55:
+          case 54:
             yy.getLogger().debug("Lexa: -)");
             this.pushState("NODE");
-            return 36;
-          case 56:
+            return 35;
+          case 55:
             yy.getLogger().debug("Lexa: (-");
             this.pushState("NODE");
-            return 36;
-          case 57:
+            return 35;
+          case 56:
             yy.getLogger().debug("Lexa: ))");
             this.pushState("NODE");
-            return 36;
-          case 58:
+            return 35;
+          case 57:
             yy.getLogger().debug("Lexa: )");
             this.pushState("NODE");
-            return 36;
-          case 59:
+            return 35;
+          case 58:
             yy.getLogger().debug("Lex: (((");
             this.pushState("NODE");
-            return 36;
+            return 35;
+          case 59:
+            yy.getLogger().debug("Lexa: )");
+            this.pushState("NODE");
+            return 35;
           case 60:
             yy.getLogger().debug("Lexa: )");
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 61:
             yy.getLogger().debug("Lexa: )");
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 62:
-            yy.getLogger().debug("Lexa: )");
+            yy.getLogger().debug("Lexc: >");
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 63:
-            yy.getLogger().debug("Lexc: >");
+            yy.getLogger().debug("Lexa: ([");
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 64:
-            yy.getLogger().debug("Lexa: ([");
+            yy.getLogger().debug("Lexa: )");
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 65:
-            yy.getLogger().debug("Lexa: )");
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 66:
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 67:
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 68:
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 69:
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 70:
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 71:
             this.pushState("NODE");
-            return 36;
+            return 35;
           case 72:
-            this.pushState("NODE");
-            return 36;
-          case 73:
             yy.getLogger().debug("Lexa: [");
             this.pushState("NODE");
-            return 36;
-          case 74:
+            return 35;
+          case 73:
             this.pushState("BLOCK_ARROW");
             yy.getLogger().debug("LEX ARR START");
-            return 38;
-          case 75:
+            return 37;
+          case 74:
             yy.getLogger().debug("Lex: NODE_ID", yy_.yytext);
-            return 32;
-          case 76:
+            return 31;
+          case 75:
             yy.getLogger().debug("Lex: EOF", yy_.yytext);
             return 8;
-          case 77:
+          case 76:
             this.pushState("md_string");
             break;
-          case 78:
+          case 77:
             this.pushState("md_string");
             break;
-          case 79:
+          case 78:
             return "NODE_DESCR";
-          case 80:
+          case 79:
             this.popState();
             break;
-          case 81:
+          case 80:
             yy.getLogger().debug("Lex: Starting string");
             this.pushState("string");
             break;
-          case 82:
+          case 81:
             yy.getLogger().debug("LEX ARR: Starting string");
             this.pushState("string");
             break;
-          case 83:
+          case 82:
             yy.getLogger().debug("LEX: NODE_DESCR:", yy_.yytext);
             return "NODE_DESCR";
-          case 84:
+          case 83:
             yy.getLogger().debug("LEX POPPING");
             this.popState();
             break;
-          case 85:
+          case 84:
             yy.getLogger().debug("Lex: =>BAE");
             this.pushState("ARROW_DIR");
             break;
-          case 86:
+          case 85:
             yy_.yytext = yy_.yytext.replace(/^,\s*/, "");
             yy.getLogger().debug("Lex (right): dir:", yy_.yytext);
             return "DIR";
-          case 87:
+          case 86:
             yy_.yytext = yy_.yytext.replace(/^,\s*/, "");
             yy.getLogger().debug("Lex (left):", yy_.yytext);
             return "DIR";
-          case 88:
+          case 87:
             yy_.yytext = yy_.yytext.replace(/^,\s*/, "");
             yy.getLogger().debug("Lex (x):", yy_.yytext);
             return "DIR";
-          case 89:
+          case 88:
             yy_.yytext = yy_.yytext.replace(/^,\s*/, "");
             yy.getLogger().debug("Lex (y):", yy_.yytext);
             return "DIR";
-          case 90:
+          case 89:
             yy_.yytext = yy_.yytext.replace(/^,\s*/, "");
             yy.getLogger().debug("Lex (up):", yy_.yytext);
             return "DIR";
-          case 91:
+          case 90:
             yy_.yytext = yy_.yytext.replace(/^,\s*/, "");
             yy.getLogger().debug("Lex (down):", yy_.yytext);
             return "DIR";
-          case 92:
+          case 91:
             yy_.yytext = "]>";
             yy.getLogger().debug("Lex (ARROW_DIR end):", yy_.yytext);
             this.popState();
             this.popState();
             return "BLOCK_ARROW_END";
-          case 93:
+          case 92:
             yy.getLogger().debug("Lex: LINK", "#" + yy_.yytext + "#");
             return 15;
+          case 93:
+            yy.getLogger().debug("Lex: LINK", yy_.yytext);
+            return 15;
           case 94:
             yy.getLogger().debug("Lex: LINK", yy_.yytext);
             return 15;
@@ -905,50 +907,47 @@ var parser = function() {
             yy.getLogger().debug("Lex: LINK", yy_.yytext);
             return 15;
           case 96:
-            yy.getLogger().debug("Lex: LINK", yy_.yytext);
-            return 15;
-          case 97:
             yy.getLogger().debug("Lex: START_LINK", yy_.yytext);
             this.pushState("LLABEL");
             return 16;
-          case 98:
+          case 97:
             yy.getLogger().debug("Lex: START_LINK", yy_.yytext);
             this.pushState("LLABEL");
             return 16;
-          case 99:
+          case 98:
             yy.getLogger().debug("Lex: START_LINK", yy_.yytext);
             this.pushState("LLABEL");
             return 16;
-          case 100:
+          case 99:
             this.pushState("md_string");
             break;
-          case 101:
+          case 100:
             yy.getLogger().debug("Lex: Starting string");
             this.pushState("string");
             return "LINK_LABEL";
-          case 102:
+          case 101:
             this.popState();
             yy.getLogger().debug("Lex: LINK", "#" + yy_.yytext + "#");
             return 15;
-          case 103:
+          case 102:
             this.popState();
             yy.getLogger().debug("Lex: LINK", yy_.yytext);
             return 15;
-          case 104:
+          case 103:
             this.popState();
             yy.getLogger().debug("Lex: LINK", yy_.yytext);
             return 15;
-          case 105:
+          case 104:
             yy.getLogger().debug("Lex: COLON", yy_.yytext);
             yy_.yytext = yy_.yytext.slice(1);
             return 27;
         }
       }, "anonymous"),
-      rules: [/^(?:block-beta\b)/, /^(?:block\s+)/, /^(?:block\n+)/, /^(?:block:)/, /^(?:[\s]+)/, /^(?:[\n]+)/, /^(?:((\u000D\u000A)|(\u000A)))/, /^(?:columns\s+auto\b)/, /^(?:columns\s+[\d]+)/, /^(?:["][`])/, /^(?:[^`"]+)/, /^(?:[`]["])/, /^(?:["])/, /^(?:["])/, /^(?:[^"]*)/, /^(?:space[:]\d+)/, /^(?:space\b)/, /^(?:default\b)/, /^(?:linkStyle\b)/, /^(?:interpolate\b)/, /^(?:classDef\s+)/, /^(?:DEFAULT\s+)/, /^(?:\w+\s+)/, /^(?:[^\n]*)/, /^(?:class\s+)/, /^(?:(\w+)+((,\s*\w+)*))/, /^(?:[^\n]*)/, /^(?:style\s+)/, /^(?:(\w+)+((,\s*\w+)*))/, /^(?:[^\n]*)/, /^(?:accTitle\s*:\s*)/, /^(?:(?!\n||)*[^\n]*)/, /^(?:accDescr\s*:\s*)/, /^(?:(?!\n||)*[^\n]*)/, /^(?:accDescr\s*\{\s*)/, /^(?:[\}])/, /^(?:[^\}]*)/, /^(?:end\b\s*)/, /^(?:\(\(\()/, /^(?:\)\)\))/, /^(?:[\)]\))/, /^(?:\}\})/, /^(?:\})/, /^(?:\(-)/, /^(?:-\))/, /^(?:\(\()/, /^(?:\]\])/, /^(?:\()/, /^(?:\]\))/, /^(?:\\\])/, /^(?:\/\])/, /^(?:\)\])/, /^(?:[\)])/, /^(?:\]>)/, /^(?:[\]])/, /^(?:-\))/, /^(?:\(-)/, /^(?:\)\))/, /^(?:\))/, /^(?:\(\(\()/, /^(?:\(\()/, /^(?:\{\{)/, /^(?:\{)/, /^(?:>)/, /^(?:\(\[)/, /^(?:\()/, /^(?:\[\[)/, /^(?:\[\|)/, /^(?:\[\()/, /^(?:\)\)\))/, /^(?:\[\\)/, /^(?:\[\/)/, /^(?:\[\\)/, /^(?:\[)/, /^(?:<\[)/, /^(?:[^\(\[\n\-\)\{\}\s\<\>:]+)/, /^(?:$)/, /^(?:["][`])/, /^(?:["][`])/, /^(?:[^`"]+)/, /^(?:[`]["])/, /^(?:["])/, /^(?:["])/, /^(?:[^"]+)/, /^(?:["])/, /^(?:\]>\s*\()/, /^(?:,?\s*right\s*)/, /^(?:,?\s*left\s*)/, /^(?:,?\s*x\s*)/, /^(?:,?\s*y\s*)/, /^(?:,?\s*up\s*)/, /^(?:,?\s*down\s*)/, /^(?:\)\s*)/, /^(?:\s*[xo<]?--+[-xo>]\s*)/, /^(?:\s*[xo<]?==+[=xo>]\s*)/, /^(?:\s*[xo<]?-?\.+-[xo>]?\s*)/, /^(?:\s*~~[\~]+\s*)/, /^(?:\s*[xo<]?--\s*)/, /^(?:\s*[xo<]?==\s*)/, /^(?:\s*[xo<]?-\.\s*)/, /^(?:["][`])/, /^(?:["])/, /^(?:\s*[xo<]?--+[-xo>]\s*)/, /^(?:\s*[xo<]?==+[=xo>]\s*)/, /^(?:\s*[xo<]?-?\.+-[xo>]?\s*)/, /^(?::\d+)/],
-      conditions: { "STYLE_DEFINITION": { "rules": [29], "inclusive": false }, "STYLE_STMNT": { "rules": [28], "inclusive": false }, "CLASSDEFID": { "rules": [23], "inclusive": false }, "CLASSDEF": { "rules": [21, 22], "inclusive": false }, "CLASS_STYLE": { "rules": [26], "inclusive": false }, "CLASS": { "rules": [25], "inclusive": false }, "LLABEL": { "rules": [100, 101, 102, 103, 104], "inclusive": false }, "ARROW_DIR": { "rules": [86, 87, 88, 89, 90, 91, 92], "inclusive": false }, "BLOCK_ARROW": { "rules": [77, 82, 85], "inclusive": false }, "NODE": { "rules": [38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 78, 81], "inclusive": false }, "md_string": { "rules": [10, 11, 79, 80], "inclusive": false }, "space": { "rules": [], "inclusive": false }, "string": { "rules": [13, 14, 83, 84], "inclusive": false }, "acc_descr_multiline": { "rules": [35, 36], "inclusive": false }, "acc_descr": { "rules": [33], "inclusive": false }, "acc_title": { "rules": [31], "inclusive": false }, "INITIAL": { "rules": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 15, 16, 17, 18, 19, 20, 24, 27, 30, 32, 34, 37, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 93, 94, 95, 96, 97, 98, 99, 105], "inclusive": true } }
+      rules: [/^(?:block-beta\b)/, /^(?:block:)/, /^(?:block\b)/, /^(?:[\s]+)/, /^(?:[\n]+)/, /^(?:((\u000D\u000A)|(\u000A)))/, /^(?:columns\s+auto\b)/, /^(?:columns\s+[\d]+)/, /^(?:["][`])/, /^(?:[^`"]+)/, /^(?:[`]["])/, /^(?:["])/, /^(?:["])/, /^(?:[^"]*)/, /^(?:space[:]\d+)/, /^(?:space\b)/, /^(?:default\b)/, /^(?:linkStyle\b)/, /^(?:interpolate\b)/, /^(?:classDef\s+)/, /^(?:DEFAULT\s+)/, /^(?:\w+\s+)/, /^(?:[^\n]*)/, /^(?:class\s+)/, /^(?:(\w+)+((,\s*\w+)*))/, /^(?:[^\n]*)/, /^(?:style\s+)/, /^(?:(\w+)+((,\s*\w+)*))/, /^(?:[^\n]*)/, /^(?:accTitle\s*:\s*)/, /^(?:(?!\n||)*[^\n]*)/, /^(?:accDescr\s*:\s*)/, /^(?:(?!\n||)*[^\n]*)/, /^(?:accDescr\s*\{\s*)/, /^(?:[\}])/, /^(?:[^\}]*)/, /^(?:end\b\s*)/, /^(?:\(\(\()/, /^(?:\)\)\))/, /^(?:[\)]\))/, /^(?:\}\})/, /^(?:\})/, /^(?:\(-)/, /^(?:-\))/, /^(?:\(\()/, /^(?:\]\])/, /^(?:\()/, /^(?:\]\))/, /^(?:\\\])/, /^(?:\/\])/, /^(?:\)\])/, /^(?:[\)])/, /^(?:\]>)/, /^(?:[\]])/, /^(?:-\))/, /^(?:\(-)/, /^(?:\)\))/, /^(?:\))/, /^(?:\(\(\()/, /^(?:\(\()/, /^(?:\{\{)/, /^(?:\{)/, /^(?:>)/, /^(?:\(\[)/, /^(?:\()/, /^(?:\[\[)/, /^(?:\[\|)/, /^(?:\[\()/, /^(?:\)\)\))/, /^(?:\[\\)/, /^(?:\[\/)/, /^(?:\[\\)/, /^(?:\[)/, /^(?:<\[)/, /^(?:[^\(\[\n\-\)\{\}\s\<\>:]+)/, /^(?:$)/, /^(?:["][`])/, /^(?:["][`])/, /^(?:[^`"]+)/, /^(?:[`]["])/, /^(?:["])/, /^(?:["])/, /^(?:[^"]+)/, /^(?:["])/, /^(?:\]>\s*\()/, /^(?:,?\s*right\s*)/, /^(?:,?\s*left\s*)/, /^(?:,?\s*x\s*)/, /^(?:,?\s*y\s*)/, /^(?:,?\s*up\s*)/, /^(?:,?\s*down\s*)/, /^(?:\)\s*)/, /^(?:\s*[xo<]?--+[-xo>]\s*)/, /^(?:\s*[xo<]?==+[=xo>]\s*)/, /^(?:\s*[xo<]?-?\.+-[xo>]?\s*)/, /^(?:\s*~~[\~]+\s*)/, /^(?:\s*[xo<]?--\s*)/, /^(?:\s*[xo<]?==\s*)/, /^(?:\s*[xo<]?-\.\s*)/, /^(?:["][`])/, /^(?:["])/, /^(?:\s*[xo<]?--+[-xo>]\s*)/, /^(?:\s*[xo<]?==+[=xo>]\s*)/, /^(?:\s*[xo<]?-?\.+-[xo>]?\s*)/, /^(?::\d+)/],
+      conditions: { "STYLE_DEFINITION": { "rules": [28], "inclusive": false }, "STYLE_STMNT": { "rules": [27], "inclusive": false }, "CLASSDEFID": { "rules": [22], "inclusive": false }, "CLASSDEF": { "rules": [20, 21], "inclusive": false }, "CLASS_STYLE": { "rules": [25], "inclusive": false }, "CLASS": { "rules": [24], "inclusive": false }, "LLABEL": { "rules": [99, 100, 101, 102, 103], "inclusive": false }, "ARROW_DIR": { "rules": [85, 86, 87, 88, 89, 90, 91], "inclusive": false }, "BLOCK_ARROW": { "rules": [76, 81, 84], "inclusive": false }, "NODE": { "rules": [37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 77, 80], "inclusive": false }, "md_string": { "rules": [9, 10, 78, 79], "inclusive": false }, "space": { "rules": [], "inclusive": false }, "string": { "rules": [12, 13, 82, 83], "inclusive": false }, "acc_descr_multiline": { "rules": [34, 35], "inclusive": false }, "acc_descr": { "rules": [32], "inclusive": false }, "acc_title": { "rules": [30], "inclusive": false }, "INITIAL": { "rules": [0, 1, 2, 3, 4, 5, 6, 7, 8, 11, 14, 15, 16, 17, 18, 19, 23, 26, 29, 31, 33, 36, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 92, 93, 94, 95, 96, 97, 98, 104], "inclusive": true } }
     };
     return lexer2;
-  }();
+  })();
   parser2.lexer = lexer;
   function Parser() {
     this.yy = {};
@@ -957,7 +956,7 @@ var parser = function() {
   Parser.prototype = parser2;
   parser2.Parser = Parser;
   return new Parser();
-}();
+})();
 parser.parser = parser;
 var block_default = parser;
 var blockDatabase = /* @__PURE__ */ new Map();
@@ -1011,7 +1010,14 @@ var setCssClass = /* @__PURE__ */ __name(function(itemIds, cssClassName) {
 var populateBlockDatabase = /* @__PURE__ */ __name((_blockList, parent) => {
   const blockList = _blockList.flat();
   const children = [];
+  const columnSettingBlock = blockList.find((b) => b?.type === "column-setting");
+  const column = columnSettingBlock?.columns ?? -1;
   for (const block of blockList) {
+    if (typeof column === "number" && column > 0 && block.type !== "column-setting" && typeof block.widthInColumns === "number" && block.widthInColumns > column) {
+      log.warn(
+        `Block ${block.id} width ${block.widthInColumns} exceeds configured column width ${column}`
+      );
+    }
     if (block.label) {
       block.label = sanitizeText2(block.label);
     }
@@ -1135,13 +1141,15 @@ function edgeTypeStr2Type(typeStr) {
 }
 __name(edgeTypeStr2Type, "edgeTypeStr2Type");
 function edgeStrToEdgeData(typeStr) {
-  switch (typeStr.trim()) {
-    case "--x":
+  switch (typeStr.replace(/^[\s-]+|[\s-]+$/g, "")) {
+    case "x":
       return "arrow_cross";
-    case "--o":
+    case "o":
       return "arrow_circle";
-    default:
+    case ">":
       return "arrow_point";
+    default:
+      return "";
   }
 }
 __name(edgeStrToEdgeData, "edgeStrToEdgeData");
@@ -1588,7 +1596,11 @@ function layoutBlocks(block, db2) {
       if (child.children) {
         layoutBlocks(child);
       }
-      columnPos += child?.widthInColumns ?? 1;
+      let columnsFilled = child?.widthInColumns ?? 1;
+      if (columns > 0) {
+        columnsFilled = Math.min(columnsFilled, columns - columnPos % columns);
+      }
+      columnPos += columnsFilled;
       log.debug("abc88 columnsPos", child, columnPos);
     }
   }
@@ -1641,13 +1653,13 @@ function applyStyle(dom, styleFn) {
   }
 }
 __name(applyStyle, "applyStyle");
-function addHtmlLabel(node) {
+function addHtmlLabel(node, config2) {
   const fo = select(document.createElementNS("http://www.w3.org/2000/svg", "foreignObject"));
   const div = fo.append("xhtml:div");
   const label = node.label;
   const labelClass = node.isNode ? "nodeLabel" : "edgeLabel";
   const span = div.append("span");
-  span.html(label);
+  span.html(sanitizeText(label, config2));
   applyStyle(span, node.labelStyle);
   span.attr("class", labelClass);
   applyStyle(div, node.labelStyle);
@@ -1662,7 +1674,8 @@ var createLabel = /* @__PURE__ */ __name(async (_vertexText, style, isTitle, isN
   if (typeof vertexText === "object") {
     vertexText = vertexText[0];
   }
-  if (evaluate(getConfig2().flowchart.htmlLabels)) {
+  const config2 = getConfig2();
+  if (evaluate(config2.flowchart.htmlLabels)) {
     vertexText = vertexText.replace(/\\n|\n/g, "<br />");
     log.debug("vertexText" + vertexText);
     const label = await replaceIconSubstring(decodeEntities(vertexText));
@@ -1671,7 +1684,7 @@ var createLabel = /* @__PURE__ */ __name(async (_vertexText, style, isTitle, isN
       label,
       labelStyle: style.replace("fill:", "color:")
     };
-    let vertexNode = addHtmlLabel(node);
+    let vertexNode = addHtmlLabel(node, config2);
     return vertexNode;
   } else {
     const svgLabel = document.createElementNS("http://www.w3.org/2000/svg", "text");