diff --git a/dist/index.html b/dist/index.html index e4b7d5dd1..dbf08e4ae 100644 --- a/dist/index.html +++ b/dist/index.html @@ -206,6 +206,35 @@ graph TB a1-->a2 end +
+ graph TB + A + B + subgraph foo[Foo SubGraph] + C + D + end + subgraph bar[Bar SubGraph] + E + F + end + G + + A-->B + B-->C + C-->D + B-->D + D-->E + E-->A + E-->F + F-->D + F-->G + B-->G + G-->D + + style foo fill:#F99,stroke-width:2px,stroke:#F0F + style bar fill:#999,stroke-width:10px,stroke:#0F0 +
graph LR 456ac9b0d15a8b7f1e71073221059886[1051 AAA fa:fa-check] diff --git a/src/diagrams/flowchart/flowDb.js b/src/diagrams/flowchart/flowDb.js index b42e9e558..78f74c213 100644 --- a/src/diagrams/flowchart/flowDb.js +++ b/src/diagrams/flowchart/flowDb.js @@ -7,6 +7,7 @@ let vertices = {} let edges = [] let classes = [] let subGraphs = [] +let subGraphLookup = {} let tooltips = {} let subCount = 0 let direction @@ -18,8 +19,9 @@ let funs = [] * @param text * @param type * @param style + * @param classes */ -export const addVertex = function (id, text, type, style) { +export const addVertex = function (id, text, type, style, classes) { let txt if (typeof id === 'undefined') { @@ -52,6 +54,13 @@ export const addVertex = function (id, text, type, style) { }) } } + if (typeof classes !== 'undefined') { + if (classes !== null) { + classes.forEach(function (s) { + vertices[id].classes.push(s) + }) + } + } } /** @@ -143,6 +152,10 @@ export const setClass = function (ids, className) { if (typeof vertices[id] !== 'undefined') { vertices[id].classes.push(className) } + + if (typeof subGraphLookup[id] !== 'undefined') { + subGraphLookup[id].classes.push(className) + } }) } @@ -283,6 +296,7 @@ export const clear = function () { funs = [] funs.push(setupToolTips) subGraphs = [] + subGraphLookup = {} subCount = 0 tooltips = [] } @@ -297,7 +311,7 @@ export const defaultStyle = function () { /** * Clears the internal graph db so that a new graph can be parsed. */ -export const addSubGraph = function (list, title) { +export const addSubGraph = function (id, list, title) { function uniq (a) { const prims = { 'boolean': {}, 'number': {}, 'string': {} } const objs = [] @@ -315,10 +329,13 @@ export const addSubGraph = function (list, title) { nodeList = uniq(nodeList.concat.apply(nodeList, list)) - const subGraph = { id: 'subGraph' + subCount, nodes: nodeList, title: title.trim() } - subGraphs.push(subGraph) + id = id || ('subGraph' + subCount) + title = title || '' subCount = subCount + 1 - return subGraph.id + const subGraph = { id: id, nodes: nodeList, title: title.trim(), classes: [] } + subGraphs.push(subGraph) + subGraphLookup[id] = subGraph + return id } const getPosForId = function (id) { diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js index ae6b1caed..0c607bbce 100644 --- a/src/diagrams/flowchart/flowRenderer.js +++ b/src/diagrams/flowchart/flowRenderer.js @@ -272,7 +272,7 @@ export const draw = function (text, id) { const subGraphs = flowDb.getSubGraphs() for (let i = subGraphs.length - 1; i >= 0; i--) { subG = subGraphs[i] - flowDb.addVertex(subG.id, subG.title, 'group', undefined) + flowDb.addVertex(subG.id, subG.title, 'group', undefined, subG.classes) } // Fetch the verices/nodes and edges/links from the parsed graph definition diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison index fa14fc7cd..e869dec3a 100644 --- a/src/diagrams/flowchart/parser/flow.jison +++ b/src/diagrams/flowchart/parser/flow.jison @@ -225,10 +225,14 @@ statement {$$=[];} | clickStatement separator {$$=[];} - | subgraph text separator document end - {$$=yy.addSubGraph($4,$2);} + | subgraph SPACE alphaNum SQS text SQE separator document end + {$$=yy.addSubGraph($3,$8,$5);} + | subgraph SPACE STR separator document end + {$$=yy.addSubGraph(undefined,$5,$3);} + | subgraph SPACE alphaNum separator document end + {$$=yy.addSubGraph($3,$5,$3);} | subgraph separator document end - {$$=yy.addSubGraph($3,undefined);} + {$$=yy.addSubGraph(undefined,$3,undefined);} ; separator: NEWLINE | SEMI | EOF ; diff --git a/src/diagrams/flowchart/parser/flow.js b/src/diagrams/flowchart/parser/flow.js index a6f4aa644..cc98359c1 100644 --- a/src/diagrams/flowchart/parser/flow.js +++ b/src/diagrams/flowchart/parser/flow.js @@ -72,12 +72,12 @@ } */ var parser = (function(){ -var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,4],$V1=[1,3],$V2=[1,5],$V3=[1,8,9,10,11,13,18,30,46,71,72,73,74,75,81,86,88,89,91,92,94,95,96,97,98],$V4=[2,2],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,15],$V9=[1,31],$Va=[1,33],$Vb=[1,22],$Vc=[1,34],$Vd=[1,24],$Ve=[1,25],$Vf=[1,26],$Vg=[1,27],$Vh=[1,28],$Vi=[1,38],$Vj=[1,40],$Vk=[1,35],$Vl=[1,39],$Vm=[1,45],$Vn=[1,44],$Vo=[1,36],$Vp=[1,37],$Vq=[1,41],$Vr=[1,42],$Vs=[1,43],$Vt=[1,8,9,10,11,13,18,30,32,46,71,72,73,74,75,81,86,88,89,91,92,94,95,96,97,98],$Vu=[1,53],$Vv=[1,52],$Vw=[1,54],$Vx=[1,72],$Vy=[1,80],$Vz=[1,81],$VA=[1,66],$VB=[1,65],$VC=[1,85],$VD=[1,84],$VE=[1,82],$VF=[1,83],$VG=[1,73],$VH=[1,68],$VI=[1,67],$VJ=[1,63],$VK=[1,75],$VL=[1,76],$VM=[1,77],$VN=[1,78],$VO=[1,79],$VP=[1,70],$VQ=[1,69],$VR=[8,9,11],$VS=[8,9,11,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64],$VT=[1,115],$VU=[8,9,10,11,13,15,18,36,38,40,42,46,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,81,86,88,89,91,92,94,95,96,97,98],$VV=[8,9,10,11,12,13,15,16,17,18,30,32,36,37,38,39,40,41,42,43,46,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,71,72,73,74,75,78,81,84,86,88,89,91,92,94,95,96,97,98],$VW=[1,117],$VX=[1,118],$VY=[8,9,10,11,13,18,30,32,46,71,72,73,74,75,81,86,88,89,91,92,94,95,96,97,98],$VZ=[8,9,10,11,12,13,15,16,17,18,30,32,37,39,41,43,46,50,51,52,53,54,56,57,58,59,60,61,62,63,64,65,71,72,73,74,75,78,81,84,86,88,89,91,92,94,95,96,97,98],$V_=[13,18,46,81,86,88,89,91,92,94,95,96,97,98],$V$=[13,18,46,49,65,81,86,88,89,91,92,94,95,96,97,98],$V01=[1,191],$V11=[1,188],$V21=[1,195],$V31=[1,192],$V41=[1,189],$V51=[1,196],$V61=[1,186],$V71=[1,187],$V81=[1,190],$V91=[1,193],$Va1=[1,194],$Vb1=[1,213],$Vc1=[8,9,11,86],$Vd1=[8,9,10,11,46,71,80,81,84,86,88,89,90,91,92]; +var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,4],$V1=[1,3],$V2=[1,5],$V3=[1,8,9,10,11,13,18,30,47,71,72,73,74,75,81,86,88,89,91,92,94,95,96,97,98],$V4=[2,2],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,15],$V9=[1,31],$Va=[1,33],$Vb=[1,22],$Vc=[1,34],$Vd=[1,24],$Ve=[1,25],$Vf=[1,26],$Vg=[1,27],$Vh=[1,28],$Vi=[1,38],$Vj=[1,40],$Vk=[1,35],$Vl=[1,39],$Vm=[1,45],$Vn=[1,44],$Vo=[1,36],$Vp=[1,37],$Vq=[1,41],$Vr=[1,42],$Vs=[1,43],$Vt=[1,8,9,10,11,13,18,30,35,47,71,72,73,74,75,81,86,88,89,91,92,94,95,96,97,98],$Vu=[1,53],$Vv=[1,52],$Vw=[1,54],$Vx=[8,9,11],$Vy=[8,9,11,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65],$Vz=[1,91],$VA=[8,9,10,11,13,15,18,32,39,41,43,47,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,81,86,88,89,91,92,94,95,96,97,98],$VB=[8,9,10,11,12,13,15,16,17,18,30,32,34,35,39,40,41,42,43,44,47,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,71,72,73,74,75,78,81,84,86,88,89,91,92,94,95,96,97,98],$VC=[1,93],$VD=[1,94],$VE=[8,9,10,11,13,18,30,35,47,71,72,73,74,75,81,86,88,89,91,92,94,95,96,97,98],$VF=[13,18,47,81,86,88,89,91,92,94,95,96,97,98],$VG=[1,118],$VH=[1,126],$VI=[1,127],$VJ=[1,112],$VK=[1,111],$VL=[1,131],$VM=[1,130],$VN=[1,128],$VO=[1,129],$VP=[1,109],$VQ=[1,119],$VR=[1,114],$VS=[1,113],$VT=[1,121],$VU=[1,122],$VV=[1,123],$VW=[1,124],$VX=[1,125],$VY=[1,116],$VZ=[1,115],$V_=[13,18,47,50,66,81,86,88,89,91,92,94,95,96,97,98],$V$=[10,12,13,15,16,17,18,30,34,35,40,42,44,47,51,52,53,54,55,57,58,59,60,61,62,63,64,65,66,71,72,73,74,75,78,81,84,86,88,89,91,92,94,95,96,97,98],$V01=[1,196],$V11=[1,193],$V21=[1,200],$V31=[1,197],$V41=[1,194],$V51=[1,201],$V61=[1,191],$V71=[1,192],$V81=[1,195],$V91=[1,198],$Va1=[1,199],$Vb1=[1,221],$Vc1=[8,9,11,86],$Vd1=[8,9,10,11,47,71,80,81,84,86,88,89,90,91,92]; var parser = {trace: function trace () { }, yy: {}, -symbols_: {"error":2,"mermaidDoc":3,"graphConfig":4,"document":5,"line":6,"statement":7,"SEMI":8,"NEWLINE":9,"SPACE":10,"EOF":11,"GRAPH":12,"DIR":13,"FirstStmtSeperator":14,"TAGEND":15,"TAGSTART":16,"UP":17,"DOWN":18,"ending":19,"endToken":20,"spaceList":21,"spaceListNewline":22,"verticeStatement":23,"separator":24,"styleStatement":25,"linkStyleStatement":26,"classDefStatement":27,"classStatement":28,"clickStatement":29,"subgraph":30,"text":31,"end":32,"vertex":33,"link":34,"alphaNum":35,"SQS":36,"SQE":37,"PS":38,"PE":39,"(-":40,"-)":41,"DIAMOND_START":42,"DIAMOND_STOP":43,"alphaNumStatement":44,"alphaNumToken":45,"MINUS":46,"linkStatement":47,"arrowText":48,"TESTSTR":49,"--":50,"ARROW_POINT":51,"ARROW_CIRCLE":52,"ARROW_CROSS":53,"ARROW_OPEN":54,"-.":55,"DOTTED_ARROW_POINT":56,"DOTTED_ARROW_CIRCLE":57,"DOTTED_ARROW_CROSS":58,"DOTTED_ARROW_OPEN":59,"==":60,"THICK_ARROW_POINT":61,"THICK_ARROW_CIRCLE":62,"THICK_ARROW_CROSS":63,"THICK_ARROW_OPEN":64,"PIPE":65,"textToken":66,"STR":67,"commentText":68,"commentToken":69,"keywords":70,"STYLE":71,"LINKSTYLE":72,"CLASSDEF":73,"CLASS":74,"CLICK":75,"textNoTags":76,"textNoTagsToken":77,"DEFAULT":78,"stylesOpt":79,"HEX":80,"NUM":81,"INTERPOLATE":82,"commentStatement":83,"PCT":84,"style":85,"COMMA":86,"styleComponent":87,"ALPHA":88,"COLON":89,"UNIT":90,"BRKT":91,"DOT":92,"graphCodeTokens":93,"PUNCTUATION":94,"UNICODE_TEXT":95,"PLUS":96,"EQUALS":97,"MULT":98,"TAG_START":99,"TAG_END":100,"QUOTE":101,"$accept":0,"$end":1}, -terminals_: {2:"error",8:"SEMI",9:"NEWLINE",10:"SPACE",11:"EOF",12:"GRAPH",13:"DIR",15:"TAGEND",16:"TAGSTART",17:"UP",18:"DOWN",30:"subgraph",32:"end",36:"SQS",37:"SQE",38:"PS",39:"PE",40:"(-",41:"-)",42:"DIAMOND_START",43:"DIAMOND_STOP",46:"MINUS",49:"TESTSTR",50:"--",51:"ARROW_POINT",52:"ARROW_CIRCLE",53:"ARROW_CROSS",54:"ARROW_OPEN",55:"-.",56:"DOTTED_ARROW_POINT",57:"DOTTED_ARROW_CIRCLE",58:"DOTTED_ARROW_CROSS",59:"DOTTED_ARROW_OPEN",60:"==",61:"THICK_ARROW_POINT",62:"THICK_ARROW_CIRCLE",63:"THICK_ARROW_CROSS",64:"THICK_ARROW_OPEN",65:"PIPE",67:"STR",71:"STYLE",72:"LINKSTYLE",73:"CLASSDEF",74:"CLASS",75:"CLICK",78:"DEFAULT",80:"HEX",81:"NUM",82:"INTERPOLATE",84:"PCT",86:"COMMA",88:"ALPHA",89:"COLON",90:"UNIT",91:"BRKT",92:"DOT",94:"PUNCTUATION",95:"UNICODE_TEXT",96:"PLUS",97:"EQUALS",98:"MULT",99:"TAG_START",100:"TAG_END",101:"QUOTE"}, -productions_: [0,[3,2],[5,0],[5,2],[6,1],[6,1],[6,1],[6,1],[6,1],[4,2],[4,2],[4,4],[4,4],[4,4],[4,4],[4,4],[19,2],[19,1],[20,1],[20,1],[20,1],[14,1],[14,1],[14,2],[22,2],[22,2],[22,1],[22,1],[21,2],[21,1],[7,2],[7,2],[7,2],[7,2],[7,2],[7,2],[7,5],[7,4],[24,1],[24,1],[24,1],[23,3],[23,1],[33,4],[33,5],[33,6],[33,7],[33,4],[33,5],[33,4],[33,5],[33,4],[33,5],[33,4],[33,5],[33,1],[33,2],[35,1],[35,2],[44,1],[44,1],[44,1],[44,1],[34,2],[34,3],[34,3],[34,1],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[47,1],[47,1],[47,1],[47,1],[47,1],[47,1],[47,1],[47,1],[47,1],[47,1],[47,1],[47,1],[48,3],[31,1],[31,2],[31,1],[68,1],[68,2],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[76,1],[76,2],[27,5],[27,5],[28,5],[29,5],[29,7],[29,5],[29,7],[25,5],[25,5],[26,5],[26,5],[26,9],[26,9],[26,7],[26,7],[83,3],[79,1],[79,3],[85,1],[85,2],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[69,1],[69,1],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[77,1],[77,1],[77,1],[77,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1]], +symbols_: {"error":2,"mermaidDoc":3,"graphConfig":4,"document":5,"line":6,"statement":7,"SEMI":8,"NEWLINE":9,"SPACE":10,"EOF":11,"GRAPH":12,"DIR":13,"FirstStmtSeperator":14,"TAGEND":15,"TAGSTART":16,"UP":17,"DOWN":18,"ending":19,"endToken":20,"spaceList":21,"spaceListNewline":22,"verticeStatement":23,"separator":24,"styleStatement":25,"linkStyleStatement":26,"classDefStatement":27,"classStatement":28,"clickStatement":29,"subgraph":30,"alphaNum":31,"SQS":32,"text":33,"SQE":34,"end":35,"STR":36,"vertex":37,"link":38,"PS":39,"PE":40,"(-":41,"-)":42,"DIAMOND_START":43,"DIAMOND_STOP":44,"alphaNumStatement":45,"alphaNumToken":46,"MINUS":47,"linkStatement":48,"arrowText":49,"TESTSTR":50,"--":51,"ARROW_POINT":52,"ARROW_CIRCLE":53,"ARROW_CROSS":54,"ARROW_OPEN":55,"-.":56,"DOTTED_ARROW_POINT":57,"DOTTED_ARROW_CIRCLE":58,"DOTTED_ARROW_CROSS":59,"DOTTED_ARROW_OPEN":60,"==":61,"THICK_ARROW_POINT":62,"THICK_ARROW_CIRCLE":63,"THICK_ARROW_CROSS":64,"THICK_ARROW_OPEN":65,"PIPE":66,"textToken":67,"commentText":68,"commentToken":69,"keywords":70,"STYLE":71,"LINKSTYLE":72,"CLASSDEF":73,"CLASS":74,"CLICK":75,"textNoTags":76,"textNoTagsToken":77,"DEFAULT":78,"stylesOpt":79,"HEX":80,"NUM":81,"INTERPOLATE":82,"commentStatement":83,"PCT":84,"style":85,"COMMA":86,"styleComponent":87,"ALPHA":88,"COLON":89,"UNIT":90,"BRKT":91,"DOT":92,"graphCodeTokens":93,"PUNCTUATION":94,"UNICODE_TEXT":95,"PLUS":96,"EQUALS":97,"MULT":98,"TAG_START":99,"TAG_END":100,"QUOTE":101,"$accept":0,"$end":1}, +terminals_: {2:"error",8:"SEMI",9:"NEWLINE",10:"SPACE",11:"EOF",12:"GRAPH",13:"DIR",15:"TAGEND",16:"TAGSTART",17:"UP",18:"DOWN",30:"subgraph",32:"SQS",34:"SQE",35:"end",36:"STR",39:"PS",40:"PE",41:"(-",42:"-)",43:"DIAMOND_START",44:"DIAMOND_STOP",47:"MINUS",50:"TESTSTR",51:"--",52:"ARROW_POINT",53:"ARROW_CIRCLE",54:"ARROW_CROSS",55:"ARROW_OPEN",56:"-.",57:"DOTTED_ARROW_POINT",58:"DOTTED_ARROW_CIRCLE",59:"DOTTED_ARROW_CROSS",60:"DOTTED_ARROW_OPEN",61:"==",62:"THICK_ARROW_POINT",63:"THICK_ARROW_CIRCLE",64:"THICK_ARROW_CROSS",65:"THICK_ARROW_OPEN",66:"PIPE",71:"STYLE",72:"LINKSTYLE",73:"CLASSDEF",74:"CLASS",75:"CLICK",78:"DEFAULT",80:"HEX",81:"NUM",82:"INTERPOLATE",84:"PCT",86:"COMMA",88:"ALPHA",89:"COLON",90:"UNIT",91:"BRKT",92:"DOT",94:"PUNCTUATION",95:"UNICODE_TEXT",96:"PLUS",97:"EQUALS",98:"MULT",99:"TAG_START",100:"TAG_END",101:"QUOTE"}, +productions_: [0,[3,2],[5,0],[5,2],[6,1],[6,1],[6,1],[6,1],[6,1],[4,2],[4,2],[4,4],[4,4],[4,4],[4,4],[4,4],[19,2],[19,1],[20,1],[20,1],[20,1],[14,1],[14,1],[14,2],[22,2],[22,2],[22,1],[22,1],[21,2],[21,1],[7,2],[7,2],[7,2],[7,2],[7,2],[7,2],[7,9],[7,6],[7,6],[7,4],[24,1],[24,1],[24,1],[23,3],[23,1],[37,4],[37,5],[37,6],[37,7],[37,4],[37,5],[37,4],[37,5],[37,4],[37,5],[37,4],[37,5],[37,1],[37,2],[31,1],[31,2],[45,1],[45,1],[45,1],[45,1],[38,2],[38,3],[38,3],[38,1],[38,3],[38,3],[38,3],[38,3],[38,3],[38,3],[38,3],[38,3],[38,3],[38,3],[38,3],[38,3],[48,1],[48,1],[48,1],[48,1],[48,1],[48,1],[48,1],[48,1],[48,1],[48,1],[48,1],[48,1],[49,3],[33,1],[33,2],[33,1],[68,1],[68,2],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[70,1],[76,1],[76,2],[27,5],[27,5],[28,5],[29,5],[29,7],[29,5],[29,7],[25,5],[25,5],[26,5],[26,5],[26,9],[26,9],[26,7],[26,7],[83,3],[79,1],[79,3],[85,1],[85,2],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[87,1],[69,1],[69,1],[67,1],[67,1],[67,1],[67,1],[67,1],[67,1],[67,1],[77,1],[77,1],[77,1],[77,1],[46,1],[46,1],[46,1],[46,1],[46,1],[46,1],[46,1],[46,1],[46,1],[46,1],[46,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1],[93,1]], performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) { /* this == yyval */ @@ -93,7 +93,7 @@ case 3: } this.$=$$[$0-1]; break; -case 4: case 57: case 59: case 60: case 92: case 94: case 95: case 108: +case 4: case 59: case 61: case 62: case 94: case 96: case 97: case 110: this.$=$$[$0]; break; case 11: @@ -118,194 +118,200 @@ case 31: case 32: case 33: case 34: case 35: this.$=[]; break; case 36: -this.$=yy.addSubGraph($$[$0-1],$$[$0-3]); +this.$=yy.addSubGraph($$[$0-6],$$[$0-1],$$[$0-4]); break; case 37: -this.$=yy.addSubGraph($$[$0-1],undefined); +this.$=yy.addSubGraph(undefined,$$[$0-1],$$[$0-3]); break; -case 41: - yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]]; +case 38: +this.$=yy.addSubGraph($$[$0-3],$$[$0-1],$$[$0-3]); break; -case 42: -this.$ = [$$[$0]]; +case 39: +this.$=yy.addSubGraph(undefined,$$[$0-1],undefined); break; case 43: -this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square'); + yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]]; break; case 44: -this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'square'); +this.$ = [$$[$0]]; break; case 45: -this.$ = $$[$0-5];yy.addVertex($$[$0-5],$$[$0-2],'circle'); +this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square'); break; case 46: -this.$ = $$[$0-6];yy.addVertex($$[$0-6],$$[$0-3],'circle'); +this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'square'); break; case 47: -this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'ellipse'); +this.$ = $$[$0-5];yy.addVertex($$[$0-5],$$[$0-2],'circle'); break; case 48: -this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'ellipse'); +this.$ = $$[$0-6];yy.addVertex($$[$0-6],$$[$0-3],'circle'); break; case 49: -this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'round'); +this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'ellipse'); break; case 50: -this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'round'); +this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'ellipse'); break; case 51: -this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'diamond'); +this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'round'); break; case 52: -this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'diamond'); +this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'round'); break; case 53: -this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'odd'); +this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'diamond'); break; case 54: -this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'odd'); +this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'diamond'); break; case 55: -this.$ = $$[$0];yy.addVertex($$[$0]); +this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'odd'); break; case 56: +this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'odd'); +break; +case 57: +this.$ = $$[$0];yy.addVertex($$[$0]); +break; +case 58: this.$ = $$[$0-1];yy.addVertex($$[$0-1]); break; -case 58: case 93: case 96: case 109: +case 60: case 95: case 98: case 111: this.$=$$[$0-1]+''+$$[$0]; break; -case 61: +case 63: this.$='v'; break; -case 62: +case 64: this.$='-'; break; -case 63: +case 65: $$[$0-1].text = $$[$0];this.$ = $$[$0-1]; break; -case 64: case 65: +case 66: case 67: $$[$0-2].text = $$[$0-1];this.$ = $$[$0-2]; break; -case 66: +case 68: this.$ = $$[$0]; break; -case 67: +case 69: this.$ = {"type":"arrow","stroke":"normal","text":$$[$0-1]}; break; -case 68: +case 70: this.$ = {"type":"arrow_circle","stroke":"normal","text":$$[$0-1]}; break; -case 69: +case 71: this.$ = {"type":"arrow_cross","stroke":"normal","text":$$[$0-1]}; break; -case 70: +case 72: this.$ = {"type":"arrow_open","stroke":"normal","text":$$[$0-1]}; break; -case 71: +case 73: this.$ = {"type":"arrow","stroke":"dotted","text":$$[$0-1]}; break; -case 72: +case 74: this.$ = {"type":"arrow_circle","stroke":"dotted","text":$$[$0-1]}; break; -case 73: +case 75: this.$ = {"type":"arrow_cross","stroke":"dotted","text":$$[$0-1]}; break; -case 74: +case 76: this.$ = {"type":"arrow_open","stroke":"dotted","text":$$[$0-1]}; break; -case 75: +case 77: this.$ = {"type":"arrow","stroke":"thick","text":$$[$0-1]}; break; -case 76: +case 78: this.$ = {"type":"arrow_circle","stroke":"thick","text":$$[$0-1]}; break; -case 77: +case 79: this.$ = {"type":"arrow_cross","stroke":"thick","text":$$[$0-1]}; break; -case 78: +case 80: this.$ = {"type":"arrow_open","stroke":"thick","text":$$[$0-1]}; break; -case 79: +case 81: this.$ = {"type":"arrow","stroke":"normal"}; break; -case 80: +case 82: this.$ = {"type":"arrow_circle","stroke":"normal"}; break; -case 81: +case 83: this.$ = {"type":"arrow_cross","stroke":"normal"}; break; -case 82: +case 84: this.$ = {"type":"arrow_open","stroke":"normal"}; break; -case 83: +case 85: this.$ = {"type":"arrow","stroke":"dotted"}; break; -case 84: +case 86: this.$ = {"type":"arrow_circle","stroke":"dotted"}; break; -case 85: +case 87: this.$ = {"type":"arrow_cross","stroke":"dotted"}; break; -case 86: +case 88: this.$ = {"type":"arrow_open","stroke":"dotted"}; break; -case 87: +case 89: this.$ = {"type":"arrow","stroke":"thick"}; break; -case 88: +case 90: this.$ = {"type":"arrow_circle","stroke":"thick"}; break; -case 89: +case 91: this.$ = {"type":"arrow_cross","stroke":"thick"}; break; -case 90: +case 92: this.$ = {"type":"arrow_open","stroke":"thick"}; break; -case 91: +case 93: this.$ = $$[$0-1]; break; -case 110: case 111: +case 112: case 113: this.$ = $$[$0-4];yy.addClass($$[$0-2],$$[$0]); break; -case 112: +case 114: this.$ = $$[$0-4];yy.setClass($$[$0-2], $$[$0]); break; -case 113: +case 115: this.$ = $$[$0-4];yy.setClickEvent($$[$0-2], $$[$0], undefined); break; -case 114: +case 116: this.$ = $$[$0-6];yy.setClickEvent($$[$0-4], $$[$0-2], $$[$0]) ; break; -case 115: +case 117: this.$ = $$[$0-4];yy.setLink($$[$0-2], $$[$0], undefined); break; -case 116: +case 118: this.$ = $$[$0-6];yy.setLink($$[$0-4], $$[$0-2], $$[$0] ); break; -case 117: +case 119: this.$ = $$[$0-4];yy.addVertex($$[$0-2],undefined,undefined,$$[$0]); break; -case 118: case 119: case 120: +case 120: case 121: case 122: this.$ = $$[$0-4];yy.updateLink($$[$0-2],$$[$0]); break; -case 121: case 122: +case 123: case 124: this.$ = $$[$0-8];yy.updateLinkInterpolate($$[$0-6],$$[$0-2]);yy.updateLink($$[$0-6],$$[$0]); break; -case 123: case 124: +case 125: case 126: this.$ = $$[$0-6];yy.updateLinkInterpolate($$[$0-4],$$[$0]); break; -case 126: +case 128: this.$ = [$$[$0]] break; -case 127: +case 129: $$[$0-2].push($$[$0]);this.$ = $$[$0-2]; break; -case 129: +case 131: this.$ = $$[$0-1] + $$[$0]; break; } }, -table: [{3:1,4:2,9:$V0,10:$V1,12:$V2},{1:[3]},o($V3,$V4,{5:6}),{4:7,9:$V0,10:$V1,12:$V2},{4:8,9:$V0,10:$V1,12:$V2},{10:[1,9]},{1:[2,1],6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,33:23,35:29,44:30,45:32,46:$Vc,71:$Vd,72:$Ve,73:$Vf,74:$Vg,75:$Vh,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($V3,[2,9]),o($V3,[2,10]),{13:[1,46],15:[1,47],16:[1,48],17:[1,49],18:[1,50]},o($Vt,[2,3]),o($Vt,[2,4]),o($Vt,[2,5]),o($Vt,[2,6]),o($Vt,[2,7]),o($Vt,[2,8]),{8:$Vu,9:$Vv,11:$Vw,24:51},{8:$Vu,9:$Vv,11:$Vw,24:55},{8:$Vu,9:$Vv,11:$Vw,24:56},{8:$Vu,9:$Vv,11:$Vw,24:57},{8:$Vu,9:$Vv,11:$Vw,24:58},{8:$Vu,9:$Vv,11:$Vw,24:59},{8:$Vu,9:$Vv,10:$Vx,11:$Vw,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,24:61,30:$VE,31:60,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VR,[2,42],{34:86,47:87,50:[1,88],51:[1,91],52:[1,92],53:[1,93],54:[1,94],55:[1,89],56:[1,95],57:[1,96],58:[1,97],59:[1,98],60:[1,90],61:[1,99],62:[1,100],63:[1,101],64:[1,102]}),{10:[1,103]},{10:[1,104]},{10:[1,105]},{10:[1,106]},{10:[1,107]},o($VS,[2,55],{45:32,21:113,44:114,10:$VT,13:$V9,15:[1,112],18:$Va,36:[1,108],38:[1,109],40:[1,110],42:[1,111],46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($VU,[2,57]),o($VU,[2,59]),o($VU,[2,60]),o($VU,[2,61]),o($VU,[2,62]),o($VV,[2,154]),o($VV,[2,155]),o($VV,[2,156]),o($VV,[2,157]),o($VV,[2,158]),o($VV,[2,159]),o($VV,[2,160]),o($VV,[2,161]),o($VV,[2,162]),o($VV,[2,163]),o($VV,[2,164]),{8:$VW,9:$VX,10:$VT,14:116,21:119},{8:$VW,9:$VX,10:$VT,14:120,21:119},{8:$VW,9:$VX,10:$VT,14:121,21:119},{8:$VW,9:$VX,10:$VT,14:122,21:119},{8:$VW,9:$VX,10:$VT,14:123,21:119},o($Vt,[2,30]),o($Vt,[2,38]),o($Vt,[2,39]),o($Vt,[2,40]),o($Vt,[2,31]),o($Vt,[2,32]),o($Vt,[2,33]),o($Vt,[2,34]),o($Vt,[2,35]),{8:$Vu,9:$Vv,10:$Vx,11:$Vw,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,24:124,30:$VE,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VY,$V4,{5:126}),o($VZ,[2,92]),o($VZ,[2,94]),o($VZ,[2,143]),o($VZ,[2,144]),o($VZ,[2,145]),o($VZ,[2,146]),o($VZ,[2,147]),o($VZ,[2,148]),o($VZ,[2,149]),o($VZ,[2,150]),o($VZ,[2,151]),o($VZ,[2,152]),o($VZ,[2,153]),o($VZ,[2,97]),o($VZ,[2,98]),o($VZ,[2,99]),o($VZ,[2,100]),o($VZ,[2,101]),o($VZ,[2,102]),o($VZ,[2,103]),o($VZ,[2,104]),o($VZ,[2,105]),o($VZ,[2,106]),o($VZ,[2,107]),{13:$V9,18:$Va,33:127,35:29,44:30,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($V_,[2,66],{48:128,49:[1,129],65:[1,130]}),{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:131,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:132,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:133,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($V$,[2,79]),o($V$,[2,80]),o($V$,[2,81]),o($V$,[2,82]),o($V$,[2,83]),o($V$,[2,84]),o($V$,[2,85]),o($V$,[2,86]),o($V$,[2,87]),o($V$,[2,88]),o($V$,[2,89]),o($V$,[2,90]),{13:$V9,18:$Va,35:134,44:30,45:32,46:$Vc,80:[1,135],81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{78:[1,136],81:[1,137]},{13:$V9,18:$Va,35:139,44:30,45:32,46:$Vc,78:[1,138],81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{13:$V9,18:$Va,35:140,44:30,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{13:$V9,18:$Va,35:141,44:30,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:142,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:144,32:$VF,38:[1,143],45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:145,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:146,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:147,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VS,[2,56]),o($VU,[2,58]),o($VS,[2,29],{21:148,10:$VT}),o($V3,[2,11]),o($V3,[2,21]),o($V3,[2,22]),{9:[1,149]},o($V3,[2,12]),o($V3,[2,13]),o($V3,[2,14]),o($V3,[2,15]),o($VY,$V4,{5:150}),o($VZ,[2,93]),{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,32:[1,151],33:23,35:29,44:30,45:32,46:$Vc,71:$Vd,72:$Ve,73:$Vf,74:$Vg,75:$Vh,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VR,[2,41]),o($V_,[2,63],{10:[1,152]}),{10:[1,153]},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:154,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,45:71,46:$VG,50:$VH,51:[1,155],52:[1,156],53:[1,157],54:[1,158],60:$VI,66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,45:71,46:$VG,50:$VH,56:[1,159],57:[1,160],58:[1,161],59:[1,162],60:$VI,66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,45:71,46:$VG,50:$VH,60:$VI,61:[1,163],62:[1,164],63:[1,165],64:[1,166],66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:[1,167],13:$V9,18:$Va,44:114,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:[1,168]},{10:[1,169]},{10:[1,170]},{10:[1,171]},{10:[1,172],13:$V9,18:$Va,44:114,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:[1,173],13:$V9,18:$Va,44:114,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:[1,174],13:$V9,18:$Va,44:114,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,37:[1,175],45:71,46:$VG,50:$VH,60:$VI,66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:176,32:$VF,45:71,46:$VG,50:$VH,60:$VI,66:62,67:$VJ,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,39:[1,177],45:71,46:$VG,50:$VH,60:$VI,66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,41:[1,178],45:71,46:$VG,50:$VH,60:$VI,66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,43:[1,179],45:71,46:$VG,50:$VH,60:$VI,66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,37:[1,180],45:71,46:$VG,50:$VH,60:$VI,66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VS,[2,28]),o($V3,[2,23]),{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,32:[1,181],33:23,35:29,44:30,45:32,46:$Vc,71:$Vd,72:$Ve,73:$Vf,74:$Vg,75:$Vh,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($Vt,[2,37]),o($V_,[2,65]),o($V_,[2,64]),{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,45:71,46:$VG,50:$VH,60:$VI,65:[1,182],66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($V_,[2,67]),o($V_,[2,68]),o($V_,[2,69]),o($V_,[2,70]),o($V_,[2,71]),o($V_,[2,72]),o($V_,[2,73]),o($V_,[2,74]),o($V_,[2,75]),o($V_,[2,76]),o($V_,[2,77]),o($V_,[2,78]),{10:$V01,46:$V11,71:$V21,79:183,80:$V31,81:$V41,84:$V51,85:184,87:185,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,46:$V11,71:$V21,79:197,80:$V31,81:$V41,84:$V51,85:184,87:185,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,46:$V11,71:$V21,79:198,80:$V31,81:$V41,82:[1,199],84:$V51,85:184,87:185,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,46:$V11,71:$V21,79:200,80:$V31,81:$V41,82:[1,201],84:$V51,85:184,87:185,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,46:$V11,71:$V21,79:202,80:$V31,81:$V41,84:$V51,85:184,87:185,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,46:$V11,71:$V21,79:203,80:$V31,81:$V41,84:$V51,85:184,87:185,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{13:$V9,18:$Va,35:204,44:30,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{13:$V9,18:$Va,35:205,44:30,45:32,46:$Vc,67:[1,206],81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VS,[2,43],{21:207,10:$VT}),{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,39:[1,208],45:71,46:$VG,50:$VH,60:$VI,66:125,70:74,71:$VK,72:$VL,73:$VM,74:$VN,75:$VO,77:64,78:$VP,81:$Vi,84:$VQ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VS,[2,49],{21:209,10:$VT}),o($VS,[2,47],{21:210,10:$VT}),o($VS,[2,51],{21:211,10:$VT}),o($VS,[2,53],{21:212,10:$VT}),o($Vt,[2,36]),o([10,13,18,46,81,86,88,89,91,92,94,95,96,97,98],[2,91]),o($VR,[2,117],{86:$Vb1}),o($Vc1,[2,126],{87:214,10:$V01,46:$V11,71:$V21,80:$V31,81:$V41,84:$V51,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1}),o($Vd1,[2,128]),o($Vd1,[2,130]),o($Vd1,[2,131]),o($Vd1,[2,132]),o($Vd1,[2,133]),o($Vd1,[2,134]),o($Vd1,[2,135]),o($Vd1,[2,136]),o($Vd1,[2,137]),o($Vd1,[2,138]),o($Vd1,[2,139]),o($Vd1,[2,140]),o($VR,[2,118],{86:$Vb1}),o($VR,[2,119],{86:$Vb1}),{10:[1,215]},o($VR,[2,120],{86:$Vb1}),{10:[1,216]},o($VR,[2,110],{86:$Vb1}),o($VR,[2,111],{86:$Vb1}),o($VR,[2,112],{45:32,44:114,13:$V9,18:$Va,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($VR,[2,113],{45:32,44:114,10:[1,217],13:$V9,18:$Va,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($VR,[2,115],{10:[1,218]}),o($VS,[2,44]),{39:[1,219]},o($VS,[2,50]),o($VS,[2,48]),o($VS,[2,52]),o($VS,[2,54]),{10:$V01,46:$V11,71:$V21,80:$V31,81:$V41,84:$V51,85:220,87:185,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},o($Vd1,[2,129]),{13:$V9,18:$Va,35:221,44:30,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{13:$V9,18:$Va,35:222,44:30,45:32,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{67:[1,223]},{67:[1,224]},o($VS,[2,45],{21:225,10:$VT}),o($Vc1,[2,127],{87:214,10:$V01,46:$V11,71:$V21,80:$V31,81:$V41,84:$V51,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1}),o($VR,[2,123],{45:32,44:114,10:[1,226],13:$V9,18:$Va,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($VR,[2,124],{45:32,44:114,10:[1,227],13:$V9,18:$Va,46:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($VR,[2,114]),o($VR,[2,116]),o($VS,[2,46]),{10:$V01,46:$V11,71:$V21,79:228,80:$V31,81:$V41,84:$V51,85:184,87:185,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,46:$V11,71:$V21,79:229,80:$V31,81:$V41,84:$V51,85:184,87:185,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},o($VR,[2,121],{86:$Vb1}),o($VR,[2,122],{86:$Vb1})], +table: [{3:1,4:2,9:$V0,10:$V1,12:$V2},{1:[3]},o($V3,$V4,{5:6}),{4:7,9:$V0,10:$V1,12:$V2},{4:8,9:$V0,10:$V1,12:$V2},{10:[1,9]},{1:[2,1],6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,31:29,37:23,45:30,46:32,47:$Vc,71:$Vd,72:$Ve,73:$Vf,74:$Vg,75:$Vh,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($V3,[2,9]),o($V3,[2,10]),{13:[1,46],15:[1,47],16:[1,48],17:[1,49],18:[1,50]},o($Vt,[2,3]),o($Vt,[2,4]),o($Vt,[2,5]),o($Vt,[2,6]),o($Vt,[2,7]),o($Vt,[2,8]),{8:$Vu,9:$Vv,11:$Vw,24:51},{8:$Vu,9:$Vv,11:$Vw,24:55},{8:$Vu,9:$Vv,11:$Vw,24:56},{8:$Vu,9:$Vv,11:$Vw,24:57},{8:$Vu,9:$Vv,11:$Vw,24:58},{8:$Vu,9:$Vv,11:$Vw,24:59},{8:$Vu,9:$Vv,10:[1,60],11:$Vw,24:61},o($Vx,[2,44],{38:62,48:63,51:[1,64],52:[1,67],53:[1,68],54:[1,69],55:[1,70],56:[1,65],57:[1,71],58:[1,72],59:[1,73],60:[1,74],61:[1,66],62:[1,75],63:[1,76],64:[1,77],65:[1,78]}),{10:[1,79]},{10:[1,80]},{10:[1,81]},{10:[1,82]},{10:[1,83]},o($Vy,[2,57],{46:32,21:89,45:90,10:$Vz,13:$V9,15:[1,88],18:$Va,32:[1,84],39:[1,85],41:[1,86],43:[1,87],47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($VA,[2,59]),o($VA,[2,61]),o($VA,[2,62]),o($VA,[2,63]),o($VA,[2,64]),o($VB,[2,156]),o($VB,[2,157]),o($VB,[2,158]),o($VB,[2,159]),o($VB,[2,160]),o($VB,[2,161]),o($VB,[2,162]),o($VB,[2,163]),o($VB,[2,164]),o($VB,[2,165]),o($VB,[2,166]),{8:$VC,9:$VD,10:$Vz,14:92,21:95},{8:$VC,9:$VD,10:$Vz,14:96,21:95},{8:$VC,9:$VD,10:$Vz,14:97,21:95},{8:$VC,9:$VD,10:$Vz,14:98,21:95},{8:$VC,9:$VD,10:$Vz,14:99,21:95},o($Vt,[2,30]),o($Vt,[2,40]),o($Vt,[2,41]),o($Vt,[2,42]),o($Vt,[2,31]),o($Vt,[2,32]),o($Vt,[2,33]),o($Vt,[2,34]),o($Vt,[2,35]),{13:$V9,18:$Va,31:100,36:[1,101],45:30,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VE,$V4,{5:102}),{13:$V9,18:$Va,31:29,37:103,45:30,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VF,[2,68],{49:104,50:[1,105],66:[1,106]}),{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:107,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:132,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:133,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($V_,[2,81]),o($V_,[2,82]),o($V_,[2,83]),o($V_,[2,84]),o($V_,[2,85]),o($V_,[2,86]),o($V_,[2,87]),o($V_,[2,88]),o($V_,[2,89]),o($V_,[2,90]),o($V_,[2,91]),o($V_,[2,92]),{13:$V9,18:$Va,31:134,45:30,46:32,47:$Vc,80:[1,135],81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{78:[1,136],81:[1,137]},{13:$V9,18:$Va,31:139,45:30,46:32,47:$Vc,78:[1,138],81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{13:$V9,18:$Va,31:140,45:30,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{13:$V9,18:$Va,31:141,45:30,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:142,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:144,35:$VO,36:$VP,39:[1,143],46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:145,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:146,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:147,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($Vy,[2,58]),o($VA,[2,60]),o($Vy,[2,29],{21:148,10:$Vz}),o($V3,[2,11]),o($V3,[2,21]),o($V3,[2,22]),{9:[1,149]},o($V3,[2,12]),o($V3,[2,13]),o($V3,[2,14]),o($V3,[2,15]),{8:$Vu,9:$Vv,11:$Vw,13:$V9,18:$Va,24:151,32:[1,150],45:90,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{8:$Vu,9:$Vv,11:$Vw,24:152},{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,31:29,35:[1,153],37:23,45:30,46:32,47:$Vc,71:$Vd,72:$Ve,73:$Vf,74:$Vg,75:$Vh,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($Vx,[2,43]),o($VF,[2,65],{10:[1,154]}),{10:[1,155]},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:156,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,35:$VO,46:117,47:$VQ,51:$VR,52:[1,157],53:[1,158],54:[1,159],55:[1,160],61:$VS,67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($V$,[2,94]),o($V$,[2,96]),o($V$,[2,145]),o($V$,[2,146]),o($V$,[2,147]),o($V$,[2,148]),o($V$,[2,149]),o($V$,[2,150]),o($V$,[2,151]),o($V$,[2,152]),o($V$,[2,153]),o($V$,[2,154]),o($V$,[2,155]),o($V$,[2,99]),o($V$,[2,100]),o($V$,[2,101]),o($V$,[2,102]),o($V$,[2,103]),o($V$,[2,104]),o($V$,[2,105]),o($V$,[2,106]),o($V$,[2,107]),o($V$,[2,108]),o($V$,[2,109]),{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,35:$VO,46:117,47:$VQ,51:$VR,57:[1,162],58:[1,163],59:[1,164],60:[1,165],61:$VS,67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,35:$VO,46:117,47:$VQ,51:$VR,61:$VS,62:[1,166],63:[1,167],64:[1,168],65:[1,169],67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:[1,170],13:$V9,18:$Va,45:90,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:[1,171]},{10:[1,172]},{10:[1,173]},{10:[1,174]},{10:[1,175],13:$V9,18:$Va,45:90,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:[1,176],13:$V9,18:$Va,45:90,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:[1,177],13:$V9,18:$Va,45:90,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,34:[1,178],35:$VO,46:117,47:$VQ,51:$VR,61:$VS,67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:179,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,35:$VO,40:[1,180],46:117,47:$VQ,51:$VR,61:$VS,67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,35:$VO,42:[1,181],46:117,47:$VQ,51:$VR,61:$VS,67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,35:$VO,44:[1,182],46:117,47:$VQ,51:$VR,61:$VS,67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,34:[1,183],35:$VO,46:117,47:$VQ,51:$VR,61:$VS,67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($Vy,[2,28]),o($V3,[2,23]),{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,33:184,35:$VO,36:$VP,46:117,47:$VQ,51:$VR,61:$VS,67:108,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VE,$V4,{5:185}),o($VE,$V4,{5:186}),o($Vt,[2,39]),o($VF,[2,67]),o($VF,[2,66]),{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,35:$VO,46:117,47:$VQ,51:$VR,61:$VS,66:[1,187],67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($VF,[2,69]),o($VF,[2,70]),o($VF,[2,71]),o($VF,[2,72]),o($V$,[2,95]),o($VF,[2,73]),o($VF,[2,74]),o($VF,[2,75]),o($VF,[2,76]),o($VF,[2,77]),o($VF,[2,78]),o($VF,[2,79]),o($VF,[2,80]),{10:$V01,47:$V11,71:$V21,79:188,80:$V31,81:$V41,84:$V51,85:189,87:190,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,47:$V11,71:$V21,79:202,80:$V31,81:$V41,84:$V51,85:189,87:190,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,47:$V11,71:$V21,79:203,80:$V31,81:$V41,82:[1,204],84:$V51,85:189,87:190,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,47:$V11,71:$V21,79:205,80:$V31,81:$V41,82:[1,206],84:$V51,85:189,87:190,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,47:$V11,71:$V21,79:207,80:$V31,81:$V41,84:$V51,85:189,87:190,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,47:$V11,71:$V21,79:208,80:$V31,81:$V41,84:$V51,85:189,87:190,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{13:$V9,18:$Va,31:209,45:30,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{13:$V9,18:$Va,31:210,36:[1,211],45:30,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($Vy,[2,45],{21:212,10:$Vz}),{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,35:$VO,40:[1,213],46:117,47:$VQ,51:$VR,61:$VS,67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o($Vy,[2,51],{21:214,10:$Vz}),o($Vy,[2,49],{21:215,10:$Vz}),o($Vy,[2,53],{21:216,10:$Vz}),o($Vy,[2,55],{21:217,10:$Vz}),{10:$VG,12:$VH,13:$VI,15:$VJ,16:$VK,17:$VL,18:$VM,30:$VN,34:[1,218],35:$VO,46:117,47:$VQ,51:$VR,61:$VS,67:161,70:120,71:$VT,72:$VU,73:$VV,74:$VW,75:$VX,77:110,78:$VY,81:$Vi,84:$VZ,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,31:29,35:[1,219],37:23,45:30,46:32,47:$Vc,71:$Vd,72:$Ve,73:$Vf,74:$Vg,75:$Vh,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,31:29,35:[1,220],37:23,45:30,46:32,47:$Vc,71:$Vd,72:$Ve,73:$Vf,74:$Vg,75:$Vh,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},o([10,13,18,47,81,86,88,89,91,92,94,95,96,97,98],[2,93]),o($Vx,[2,119],{86:$Vb1}),o($Vc1,[2,128],{87:222,10:$V01,47:$V11,71:$V21,80:$V31,81:$V41,84:$V51,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1}),o($Vd1,[2,130]),o($Vd1,[2,132]),o($Vd1,[2,133]),o($Vd1,[2,134]),o($Vd1,[2,135]),o($Vd1,[2,136]),o($Vd1,[2,137]),o($Vd1,[2,138]),o($Vd1,[2,139]),o($Vd1,[2,140]),o($Vd1,[2,141]),o($Vd1,[2,142]),o($Vx,[2,120],{86:$Vb1}),o($Vx,[2,121],{86:$Vb1}),{10:[1,223]},o($Vx,[2,122],{86:$Vb1}),{10:[1,224]},o($Vx,[2,112],{86:$Vb1}),o($Vx,[2,113],{86:$Vb1}),o($Vx,[2,114],{46:32,45:90,13:$V9,18:$Va,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($Vx,[2,115],{46:32,45:90,10:[1,225],13:$V9,18:$Va,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($Vx,[2,117],{10:[1,226]}),o($Vy,[2,46]),{40:[1,227]},o($Vy,[2,52]),o($Vy,[2,50]),o($Vy,[2,54]),o($Vy,[2,56]),{8:$Vu,9:$Vv,11:$Vw,24:228},o($Vt,[2,38]),o($Vt,[2,37]),{10:$V01,47:$V11,71:$V21,80:$V31,81:$V41,84:$V51,85:229,87:190,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},o($Vd1,[2,131]),{13:$V9,18:$Va,31:230,45:30,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{13:$V9,18:$Va,31:231,45:30,46:32,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{36:[1,232]},{36:[1,233]},o($Vy,[2,47],{21:234,10:$Vz}),o($VE,$V4,{5:235}),o($Vc1,[2,129],{87:222,10:$V01,47:$V11,71:$V21,80:$V31,81:$V41,84:$V51,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1}),o($Vx,[2,125],{46:32,45:90,10:[1,236],13:$V9,18:$Va,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($Vx,[2,126],{46:32,45:90,10:[1,237],13:$V9,18:$Va,47:$Vc,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs}),o($Vx,[2,116]),o($Vx,[2,118]),o($Vy,[2,48]),{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,31:29,35:[1,238],37:23,45:30,46:32,47:$Vc,71:$Vd,72:$Ve,73:$Vf,74:$Vg,75:$Vh,81:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,94:$Vo,95:$Vp,96:$Vq,97:$Vr,98:$Vs},{10:$V01,47:$V11,71:$V21,79:239,80:$V31,81:$V41,84:$V51,85:189,87:190,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},{10:$V01,47:$V11,71:$V21,79:240,80:$V31,81:$V41,84:$V51,85:189,87:190,88:$V61,89:$V71,90:$V81,91:$V91,92:$Va1},o($Vt,[2,36]),o($Vx,[2,123],{86:$Vb1}),o($Vx,[2,124],{86:$Vb1})], defaultActions: {}, parseError: function parseError (str, hash) { if (hash.recoverable) { @@ -811,7 +817,7 @@ case 11:return 12; break; case 12:return 30; break; -case 13:return 32; +case 13:return 35; break; case 14:return 13; break; @@ -845,49 +851,49 @@ case 28:return 17; break; case 29:return 18; break; -case 30:return 53; +case 30:return 54; break; -case 31:return 51; +case 31:return 52; break; -case 32:return 52; +case 32:return 53; break; -case 33:return 54; +case 33:return 55; break; -case 34:return 58; +case 34:return 59; break; -case 35:return 56; +case 35:return 57; break; -case 36:return 57; +case 36:return 58; break; -case 37:return 59; +case 37:return 60; break; -case 38:return 58; +case 38:return 59; break; -case 39:return 56; +case 39:return 57; break; -case 40:return 57; +case 40:return 58; break; -case 41:return 59; +case 41:return 60; break; -case 42:return 63; +case 42:return 64; break; -case 43:return 61; +case 43:return 62; break; -case 44:return 62; +case 44:return 63; break; -case 45:return 64; +case 45:return 65; break; -case 46:return 50; +case 46:return 51; break; -case 47:return 55; +case 47:return 56; break; -case 48:return 60; +case 48:return 61; break; -case 49:return 40; +case 49:return 41; break; -case 50:return 41; +case 50:return 42; break; -case 51:return 46; +case 51:return 47; break; case 52:return 92; break; @@ -905,19 +911,19 @@ case 58:return 94; break; case 59:return 95; break; -case 60:return 65; +case 60:return 66; break; -case 61:return 38; +case 61:return 39; break; -case 62:return 39; +case 62:return 40; break; -case 63:return 36; +case 63:return 32; break; -case 64:return 37; +case 64:return 34; break; -case 65:return 42 +case 65:return 43 break; -case 66:return 43 +case 66:return 44 break; case 67:return 101; break; diff --git a/src/diagrams/flowchart/parser/flow.spec.js b/src/diagrams/flowchart/parser/flow.spec.js index 6c408de06..d41e7b8a8 100644 --- a/src/diagrams/flowchart/parser/flow.spec.js +++ b/src/diagrams/flowchart/parser/flow.spec.js @@ -31,8 +31,33 @@ describe('when parsing ', function () { expect(subgraph.nodes[0]).toBe('a1') expect(subgraph.nodes[1]).toBe('a2') expect(subgraph.title).toBe('One') + expect(subgraph.id).toBe('One') }) + it('should handle subgraph with multiple words in title', function () { + const res = flow.parser.parse('graph TB\nsubgraph "Some Title"\n\ta1-->a2\nend') + const subgraphs = flow.parser.yy.getSubGraphs() + expect(subgraphs.length).toBe(1) + const subgraph = subgraphs[0] + expect(subgraph.nodes.length).toBe(2) + expect(subgraph.nodes[0]).toBe('a1') + expect(subgraph.nodes[1]).toBe('a2') + expect(subgraph.title).toBe('Some Title') + expect(subgraph.id).toBe('subGraph0') + }); + + it('should handle subgraph with id and title notation', function () { + const res = flow.parser.parse('graph TB\nsubgraph some-id[Some Title]\n\ta1-->a2\nend') + const subgraphs = flow.parser.yy.getSubGraphs() + expect(subgraphs.length).toBe(1) + const subgraph = subgraphs[0] + expect(subgraph.nodes.length).toBe(2) + expect(subgraph.nodes[0]).toBe('a1') + expect(subgraph.nodes[1]).toBe('a2') + expect(subgraph.title).toBe('Some Title') + expect(subgraph.id).toBe('some-id') + }); + it("should handle angle bracket ' > ' as direction LR", function () { const res = flow.parser.parse('graph >;A-->B;') diff --git a/src/themes/flowchart.scss b/src/themes/flowchart.scss index edafcf5e7..7f8a98f9d 100644 --- a/src/themes/flowchart.scss +++ b/src/themes/flowchart.scss @@ -30,9 +30,9 @@ } .cluster rect { - fill: $secondBkg !important; - stroke: $clusterBorder !important; - stroke-width: 1px !important; + fill: $secondBkg; + stroke: $clusterBorder; + stroke-width: 1px; } .cluster text {