0&&(r+=o.selectorText+" { "+o.style.cssText+" }\n")}}}var c="",l="";for(var h in t)t.hasOwnProperty(h)&&"undefined"!=typeof h&&("default"===h?c=".node { "+t[h].styles.join("; ")+"; }\n":l+="."+h+" { "+t[h].styles.join("; ")+"; }\n");if(""!==r||""!==c||""!==l){var d=document.createElement("style");d.setAttribute("type","text/css"),d.setAttribute("title","mermaid-svg-internal-css"),d.innerHTML="/* */\n",e.insertBefore(d,e.firstChild)}}},{}]},{},[111]);
\ No newline at end of file
diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js
index 835eede02..8e6234084 100644
--- a/src/diagrams/flowchart/flowRenderer.js
+++ b/src/diagrams/flowchart/flowRenderer.js
@@ -109,16 +109,34 @@ exports.addEdges = function (edges, g) {
}
var style = '';
+
+
+
if(typeof edge.style !== 'undefined'){
edge.style.forEach(function(s){
style = style + s +';';
});
}
+ else{
+ switch(edge.stroke){
+ case 'normal':
+ style = 'stroke: #333; stroke-width: 1.5px;fill:none';
+ break;
+ case 'dotted':
+ style = 'stroke: #333; fill:none;stroke-width:2px;stroke-dasharray:3;';
+ break;
+ case 'thick':
+ style = 'stroke: #333; stroke-width: 3.5px;fill:none';
+ break;
+ }
+
+
+ }
// Add the edge to the graph
if (typeof edge.text === 'undefined') {
if(typeof edge.style === 'undefined'){
- g.setEdge(edge.start, edge.end,{ style: "stroke: #333; stroke-width: 1.5px;fill:none", arrowheadStyle: "fill: #333", arrowhead: aHead},cnt);
+ g.setEdge(edge.start, edge.end,{ style: style, arrowhead: aHead},cnt);
}else{
g.setEdge(edge.start, edge.end, {
style: style, arrowheadStyle: "fill: #333", arrowhead: aHead
@@ -129,7 +147,7 @@ exports.addEdges = function (edges, g) {
else {
if(typeof edge.style === 'undefined'){
- g.setEdge(edge.start, edge.end,{labelType: "html",style: "stroke: #333; stroke-width: 1.5px;fill:none", labelpos:'c', label: ''+edge.text+'', arrowheadStyle: "fill: #333", arrowhead: aHead},cnt);
+ g.setEdge(edge.start, edge.end,{labelType: "html",style: style, labelpos:'c', label: ''+edge.text+'', arrowheadStyle: "fill: #333", arrowhead: aHead},cnt);
}else{
g.setEdge(edge.start, edge.end, {
labelType: "html",style: style, arrowheadStyle: "fill: #333", label: edge.text, arrowhead: aHead
diff --git a/src/diagrams/flowchart/graphDb.js b/src/diagrams/flowchart/graphDb.js
index f2f94657e..5141f3c6c 100644
--- a/src/diagrams/flowchart/graphDb.js
+++ b/src/diagrams/flowchart/graphDb.js
@@ -64,6 +64,7 @@ exports.addLink = function (start, end, type, linktext) {
if (typeof type !== 'undefined') {
edge.type = type.type;
+ edge.stroke = type.stroke;
}
edges.push(edge);
};
diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison
index acf9bad44..96ff027e6 100644
--- a/src/diagrams/flowchart/parser/flow.jison
+++ b/src/diagrams/flowchart/parser/flow.jison
@@ -18,14 +18,12 @@
"BT" return 'DIR';
"TD" return 'DIR';
"BR" return 'DIR';
-[0-9] return 'NUM';
+[0-9]+ return 'NUM';
\# return 'BRKT';
":" return 'COLON';
";" return 'SEMI';
"," return 'COMMA';
-"=" return 'EQUALS';
"*" return 'MULT';
-"." return 'DOT';
"<" return 'TAGSTART';
">" return 'TAGEND';
"^" return 'UP';
@@ -34,10 +32,26 @@
\-\-\> return 'ARROW_POINT';
\-\-[o] return 'ARROW_CIRCLE';
\-\-\- return 'ARROW_OPEN';
+\-\.\-[x] return 'DOTTED_ARROW_CROSS';
+\-\.\-\> return 'DOTTED_ARROW_POINT';
+\-\.\-[o] return 'DOTTED_ARROW_CIRCLE';
+\-\.\- return 'DOTTED_ARROW_OPEN';
+.\-[x] return 'DOTTED_ARROW_CROSS';
+\.\-\> return 'DOTTED_ARROW_POINT';
+\.\-[o] return 'DOTTED_ARROW_CIRCLE';
+\.\- return 'DOTTED_ARROW_OPEN';
+\=\=[x] return 'THICK_ARROW_CROSS';
+\=\=\> return 'THICK_ARROW_POINT';
+\=\=[o] return 'THICK_ARROW_CIRCLE';
+\=\=[\=] return 'THICK_ARROW_OPEN';
\-\- return '--';
+\-\. return '-.';
+\=\= return '==';
\- return 'MINUS';
+"." return 'DOT';
\+ return 'PLUS';
\% return 'PCT';
+"=" return 'EQUALS';
\= return 'EQUALS';
[\u0021-\u0027\u002A-\u002E\u003F\u0041-\u005A\u005C\u005F-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]|
[\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377]|
@@ -227,8 +241,6 @@ vertex: alphaNum SQS text SQE
{$$ = $1;yy.addVertex($1,$3,'odd');}
| alphaNum TAGEND text SQE SPACE
{$$ = $1;yy.addVertex($1,$3,'odd');}
- | alphaNum TAGSTART text TAGEND
- {$$ = $1;yy.addVertex($1,$3,'diamond');}
| alphaNum
{$$ = $1;yy.addVertex($1);}
| alphaNum SPACE
@@ -238,7 +250,7 @@ vertex: alphaNum SQS text SQE
alphaNum
: alphaNumStatement
{$$=$1;}
- | alphaNumStatement alphaNum
+ | alphaNum alphaNumStatement
{$$=$1+''+$2;}
;
@@ -262,17 +274,41 @@ link: linkStatement arrowText
{$5.text = $3;$$ = $5;}
| '--' SPACE text SPACE linkStatement SPACE
{$5.text = $3;$$ = $5;}
+ | '-.' SPACE text SPACE linkStatement
+ {$5.text = $3;$$ = $5;}
+ | '-.' SPACE text SPACE linkStatement SPACE
+ {$5.text = $3;$$ = $5;}
+ | '==' SPACE text SPACE linkStatement
+ {$5.text = $3;$$ = $5;}
+ | '==' SPACE text SPACE linkStatement SPACE
+ {$5.text = $3;$$ = $5;}
;
linkStatement: ARROW_POINT
- {$$ = {"type":"arrow"};}
+ {$$ = {"type":"arrow","stroke":"normal"};}
| ARROW_CIRCLE
- {$$ = {"type":"arrow_circle"};}
+ {$$ = {"type":"arrow_circle","stroke":"normal"};}
| ARROW_CROSS
- {$$ = {"type":"arrow_cross"};}
+ {$$ = {"type":"arrow_cross","stroke":"normal"};}
| ARROW_OPEN
- {$$ = {"type":"arrow_open"};}
- ;
+ {$$ = {"type":"arrow_open","stroke":"normal"};}
+ | DOTTED_ARROW_POINT
+ {$$ = {"type":"arrow","stroke":"dotted"};}
+ | DOTTED_ARROW_CIRCLE
+ {$$ = {"type":"arrow_circle","stroke":"dotted"};}
+ | DOTTED_ARROW_CROSS
+ {$$ = {"type":"arrow_cross","stroke":"dotted"};}
+ | DOTTED_ARROW_OPEN
+ {$$ = {"type":"arrow_open","stroke":"dotted"};}
+ | THICK_ARROW_POINT
+ {$$ = {"type":"arrow","stroke":"thick"};}
+ | THICK_ARROW_CIRCLE
+ {$$ = {"type":"arrow_circle","stroke":"thick"};}
+ | THICK_ARROW_CROSS
+ {$$ = {"type":"arrow_cross","stroke":"thick"};}
+ | THICK_ARROW_OPEN
+ {$$ = {"type":"arrow_open","stroke":"thick"};}
+ ;
arrowText:
PIPE text PIPE
@@ -347,7 +383,7 @@ styleComponent: ALPHA | COLON | MINUS | NUM | UNIT | SPACE | HEX | BRKT | DOT |
commentToken : textToken | graphCodeTokens ;
-textToken : textNoTagsToken | TAGSTART | TAGEND ;
+textToken : textNoTagsToken | TAGSTART | TAGEND | '==' | '--' ;
textNoTagsToken: alphaNumToken | SPACE | MINUS | keywords ;
diff --git a/src/diagrams/flowchart/parser/flow.js b/src/diagrams/flowchart/parser/flow.js
index 440fd5846..dc25ac3f7 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,9,10,12,19,29,57,58,59,60,61,66,67,69,71,72,74,75,77,78,79],$V1=[2,2],$V2=[1,9],$V3=[1,10],$V4=[1,11],$V5=[1,12],$V6=[1,20],$V7=[1,23],$V8=[1,24],$V9=[1,25],$Va=[1,26],$Vb=[1,27],$Vc=[1,32],$Vd=[1,21],$Ve=[1,34],$Vf=[1,31],$Vg=[1,33],$Vh=[1,39],$Vi=[1,38],$Vj=[1,35],$Vk=[1,36],$Vl=[1,37],$Vm=[1,9,10,12,19,29,31,57,58,59,60,61,66,67,69,71,72,74,75,77,78,79],$Vn=[29,57,58,59,60,61,66,67,69,71,72,74,75,77,78,79],$Vo=[2,19],$Vp=[1,51],$Vq=[1,52],$Vr=[1,50],$Vs=[9,10,19],$Vt=[1,63],$Vu=[1,64],$Vv=[1,65],$Vw=[1,66],$Vx=[9,10,19,47,48,49,50,51],$Vy=[9,10,12,15,16,19,35,38,40,47,48,49,50,51],$Vz=[9,10,12,15,16,19,35,38,40,47,48,49,50,51,66,69,71,72,74,75,77,78,79],$VA=[9,10,11,12,13,15,16,19,29,31,35,37,38,39,40,41,44,47,48,49,50,51,52,57,58,59,60,61,66,69,71,72,74,75,77,78,79,80,81,82],$VB=[1,81],$VC=[1,84],$VD=[1,82],$VE=[1,91],$VF=[1,90],$VG=[1,113],$VH=[1,123],$VI=[1,115],$VJ=[1,124],$VK=[1,98],$VL=[1,97],$VM=[1,125],$VN=[1,126],$VO=[1,102],$VP=[1,103],$VQ=[1,100],$VR=[1,101],$VS=[1,104],$VT=[1,105],$VU=[1,116],$VV=[1,109],$VW=[1,110],$VX=[1,108],$VY=[1,111],$VZ=[1,99],$V_=[1,118],$V$=[1,119],$V01=[1,120],$V11=[1,121],$V21=[1,122],$V31=[1,106],$V41=[1,107],$V51=[1,112],$V61=[66,69,71,72,74,75,77,78,79],$V71=[12,52,66,69,71,72,74,75,77,78,79],$V81=[9,11,12,13,15,16,19,29,31,35,37,38,39,40,41,44,48,49,50,51,52,57,58,59,60,61,66,69,71,72,74,75,77,78,79,80,81,82],$V91=[2,106],$Va1=[2,108],$Vb1=[11,12,13,15,16,29,31,37,39,41,44,52,57,58,59,60,61,66,69,71,72,74,75,77,78,79],$Vc1=[1,177],$Vd1=[1,174],$Ve1=[1,181],$Vf1=[1,178],$Vg1=[1,175],$Vh1=[1,182],$Vi1=[1,172],$Vj1=[1,173],$Vk1=[1,176],$Vl1=[1,179],$Vm1=[1,180],$Vn1=[11,12,13,15,16,29,31,44,57,58,59,60,61,66,69,71,72,74,75,77,78,79],$Vo1=[2,47],$Vp1=[1,194],$Vq1=[9,10,19,69],$Vr1=[9,10,12,19,44,57,65,66,67,69,71,72,73,74,75];
+var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,9,10,12,19,29,67,68,69,70,71,76,77,79,81,82,84,85,87,88,89],$V1=[2,2],$V2=[1,9],$V3=[1,10],$V4=[1,11],$V5=[1,12],$V6=[1,20],$V7=[1,23],$V8=[1,24],$V9=[1,25],$Va=[1,26],$Vb=[1,27],$Vc=[1,32],$Vd=[1,21],$Ve=[1,34],$Vf=[1,31],$Vg=[1,33],$Vh=[1,39],$Vi=[1,38],$Vj=[1,35],$Vk=[1,36],$Vl=[1,37],$Vm=[1,9,10,12,19,29,31,67,68,69,70,71,76,77,79,81,82,84,85,87,88,89],$Vn=[29,67,68,69,70,71,76,77,79,81,82,84,85,87,88,89],$Vo=[2,19],$Vp=[1,51],$Vq=[1,52],$Vr=[1,50],$Vs=[9,10,19],$Vt=[1,65],$Vu=[1,66],$Vv=[1,67],$Vw=[1,68],$Vx=[1,69],$Vy=[1,70],$Vz=[1,71],$VA=[1,72],$VB=[1,73],$VC=[1,74],$VD=[1,75],$VE=[1,76],$VF=[9,10,19,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61],$VG=[9,10,12,15,19,35,38,40,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,76,79,81,82,84,85,87,88,89],$VH=[9,10,11,12,13,15,16,19,29,31,35,37,38,39,40,41,44,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,67,68,69,70,71,76,79,81,82,84,85,87,88,89,90,91,92],$VI=[1,90],$VJ=[1,93],$VK=[1,91],$VL=[1,100],$VM=[1,99],$VN=[1,124],$VO=[1,134],$VP=[1,126],$VQ=[1,135],$VR=[1,107],$VS=[1,106],$VT=[1,136],$VU=[1,137],$VV=[1,113],$VW=[1,114],$VX=[1,111],$VY=[1,112],$VZ=[1,115],$V_=[1,116],$V$=[1,127],$V01=[1,109],$V11=[1,108],$V21=[1,120],$V31=[1,121],$V41=[1,119],$V51=[1,122],$V61=[1,110],$V71=[1,129],$V81=[1,130],$V91=[1,131],$Va1=[1,132],$Vb1=[1,133],$Vc1=[1,117],$Vd1=[1,118],$Ve1=[1,123],$Vf1=[76,79,81,82,84,85,87,88,89],$Vg1=[12,62,76,79,81,82,84,85,87,88,89],$Vh1=[9,11,12,13,15,16,19,29,31,35,37,38,39,40,41,44,47,49,50,51,52,53,62,67,68,69,70,71,76,79,81,82,84,85,87,88,89,90,91,92],$Vi1=[2,121],$Vj1=[11,12,13,15,16,29,31,37,39,41,44,47,49,62,67,68,69,70,71,76,79,81,82,84,85,87,88,89],$Vk1=[1,192],$Vl1=[1,189],$Vm1=[1,196],$Vn1=[1,193],$Vo1=[1,190],$Vp1=[1,197],$Vq1=[1,187],$Vr1=[1,188],$Vs1=[1,191],$Vt1=[1,194],$Vu1=[1,195],$Vv1=[11,12,13,15,16,29,31,44,47,49,67,68,69,70,71,76,79,81,82,84,85,87,88,89],$Vw1=[1,211],$Vx1=[9,10,19,79],$Vy1=[9,10,12,19,44,67,75,76,77,79,81,82,83,84,85];
var parser = {trace: function trace() { },
yy: {},
-symbols_: {"error":2,"mermaidDoc":3,"graphConfig":4,"document":5,"line":6,"spaceListNewline":7,"statement":8,"SEMI":9,"EOF":10,"GRAPH":11,"SPACE":12,"DIR":13,"FirstStmtSeperator":14,"TAGEND":15,"TAGSTART":16,"UP":17,"DOWN":18,"NEWLINE":19,"spaceList":20,"commentStatement":21,"verticeStatement":22,"separator":23,"styleStatement":24,"linkStyleStatement":25,"classDefStatement":26,"classStatement":27,"clickStatement":28,"subgraph":29,"endStatement":30,"end":31,"vertex":32,"link":33,"alphaNum":34,"SQS":35,"text":36,"SQE":37,"PS":38,"PE":39,"DIAMOND_START":40,"DIAMOND_STOP":41,"alphaNumStatement":42,"alphaNumToken":43,"MINUS":44,"linkStatement":45,"arrowText":46,"--":47,"ARROW_POINT":48,"ARROW_CIRCLE":49,"ARROW_CROSS":50,"ARROW_OPEN":51,"PIPE":52,"textToken":53,"commentText":54,"commentToken":55,"keywords":56,"STYLE":57,"LINKSTYLE":58,"CLASSDEF":59,"CLASS":60,"CLICK":61,"textNoTags":62,"textNoTagsToken":63,"stylesOpt":64,"HEX":65,"NUM":66,"PCT":67,"style":68,"COMMA":69,"styleComponent":70,"ALPHA":71,"COLON":72,"UNIT":73,"BRKT":74,"DOT":75,"graphCodeTokens":76,"PLUS":77,"EQUALS":78,"MULT":79,"TAG_START":80,"TAG_END":81,"QUOTE":82,"$accept":0,"$end":1},
-terminals_: {2:"error",9:"SEMI",10:"EOF",11:"GRAPH",12:"SPACE",13:"DIR",15:"TAGEND",16:"TAGSTART",17:"UP",18:"DOWN",19:"NEWLINE",29:"subgraph",31:"end",35:"SQS",37:"SQE",38:"PS",39:"PE",40:"DIAMOND_START",41:"DIAMOND_STOP",44:"MINUS",47:"--",48:"ARROW_POINT",49:"ARROW_CIRCLE",50:"ARROW_CROSS",51:"ARROW_OPEN",52:"PIPE",57:"STYLE",58:"LINKSTYLE",59:"CLASSDEF",60:"CLASS",61:"CLICK",65:"HEX",66:"NUM",67:"PCT",69:"COMMA",71:"ALPHA",72:"COLON",73:"UNIT",74:"BRKT",75:"DOT",77:"PLUS",78:"EQUALS",79:"MULT",80:"TAG_START",81:"TAG_END",82:"QUOTE"},
-productions_: [0,[3,2],[5,0],[5,2],[6,2],[6,1],[6,1],[6,1],[4,4],[4,4],[4,4],[4,4],[4,4],[14,1],[14,1],[14,2],[7,2],[7,2],[7,1],[7,1],[20,2],[20,1],[8,2],[8,2],[8,2],[8,2],[8,2],[8,2],[8,2],[8,4],[30,1],[30,2],[23,1],[23,1],[23,1],[22,3],[22,1],[32,4],[32,5],[32,6],[32,7],[32,4],[32,5],[32,4],[32,5],[32,4],[32,5],[32,4],[32,1],[32,2],[34,1],[34,2],[42,1],[42,3],[33,2],[33,3],[33,1],[33,2],[33,5],[33,6],[45,1],[45,1],[45,1],[45,1],[46,3],[36,1],[36,2],[54,1],[54,2],[56,1],[56,1],[56,1],[56,1],[56,1],[56,1],[56,1],[56,1],[56,1],[62,1],[62,2],[26,5],[27,5],[28,5],[24,5],[24,5],[25,5],[21,3],[64,1],[64,3],[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],[55,1],[55,1],[53,1],[53,1],[53,1],[63,1],[63,1],[63,1],[63,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1],[76,1]],
+symbols_: {"error":2,"mermaidDoc":3,"graphConfig":4,"document":5,"line":6,"spaceListNewline":7,"statement":8,"SEMI":9,"EOF":10,"GRAPH":11,"SPACE":12,"DIR":13,"FirstStmtSeperator":14,"TAGEND":15,"TAGSTART":16,"UP":17,"DOWN":18,"NEWLINE":19,"spaceList":20,"commentStatement":21,"verticeStatement":22,"separator":23,"styleStatement":24,"linkStyleStatement":25,"classDefStatement":26,"classStatement":27,"clickStatement":28,"subgraph":29,"endStatement":30,"end":31,"vertex":32,"link":33,"alphaNum":34,"SQS":35,"text":36,"SQE":37,"PS":38,"PE":39,"DIAMOND_START":40,"DIAMOND_STOP":41,"alphaNumStatement":42,"alphaNumToken":43,"MINUS":44,"linkStatement":45,"arrowText":46,"--":47,"-.":48,"==":49,"ARROW_POINT":50,"ARROW_CIRCLE":51,"ARROW_CROSS":52,"ARROW_OPEN":53,"DOTTED_ARROW_POINT":54,"DOTTED_ARROW_CIRCLE":55,"DOTTED_ARROW_CROSS":56,"DOTTED_ARROW_OPEN":57,"THICK_ARROW_POINT":58,"THICK_ARROW_CIRCLE":59,"THICK_ARROW_CROSS":60,"THICK_ARROW_OPEN":61,"PIPE":62,"textToken":63,"commentText":64,"commentToken":65,"keywords":66,"STYLE":67,"LINKSTYLE":68,"CLASSDEF":69,"CLASS":70,"CLICK":71,"textNoTags":72,"textNoTagsToken":73,"stylesOpt":74,"HEX":75,"NUM":76,"PCT":77,"style":78,"COMMA":79,"styleComponent":80,"ALPHA":81,"COLON":82,"UNIT":83,"BRKT":84,"DOT":85,"graphCodeTokens":86,"PLUS":87,"EQUALS":88,"MULT":89,"TAG_START":90,"TAG_END":91,"QUOTE":92,"$accept":0,"$end":1},
+terminals_: {2:"error",9:"SEMI",10:"EOF",11:"GRAPH",12:"SPACE",13:"DIR",15:"TAGEND",16:"TAGSTART",17:"UP",18:"DOWN",19:"NEWLINE",29:"subgraph",31:"end",35:"SQS",37:"SQE",38:"PS",39:"PE",40:"DIAMOND_START",41:"DIAMOND_STOP",44:"MINUS",47:"--",48:"-.",49:"==",50:"ARROW_POINT",51:"ARROW_CIRCLE",52:"ARROW_CROSS",53:"ARROW_OPEN",54:"DOTTED_ARROW_POINT",55:"DOTTED_ARROW_CIRCLE",56:"DOTTED_ARROW_CROSS",57:"DOTTED_ARROW_OPEN",58:"THICK_ARROW_POINT",59:"THICK_ARROW_CIRCLE",60:"THICK_ARROW_CROSS",61:"THICK_ARROW_OPEN",62:"PIPE",67:"STYLE",68:"LINKSTYLE",69:"CLASSDEF",70:"CLASS",71:"CLICK",75:"HEX",76:"NUM",77:"PCT",79:"COMMA",81:"ALPHA",82:"COLON",83:"UNIT",84:"BRKT",85:"DOT",87:"PLUS",88:"EQUALS",89:"MULT",90:"TAG_START",91:"TAG_END",92:"QUOTE"},
+productions_: [0,[3,2],[5,0],[5,2],[6,2],[6,1],[6,1],[6,1],[4,4],[4,4],[4,4],[4,4],[4,4],[14,1],[14,1],[14,2],[7,2],[7,2],[7,1],[7,1],[20,2],[20,1],[8,2],[8,2],[8,2],[8,2],[8,2],[8,2],[8,2],[8,4],[30,1],[30,2],[23,1],[23,1],[23,1],[22,3],[22,1],[32,4],[32,5],[32,6],[32,7],[32,4],[32,5],[32,4],[32,5],[32,4],[32,5],[32,1],[32,2],[34,1],[34,2],[42,1],[42,3],[33,2],[33,3],[33,1],[33,2],[33,5],[33,6],[33,5],[33,6],[33,5],[33,6],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[46,3],[36,1],[36,2],[64,1],[64,2],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[72,1],[72,2],[26,5],[27,5],[28,5],[24,5],[24,5],[25,5],[21,3],[74,1],[74,3],[78,1],[78,2],[80,1],[80,1],[80,1],[80,1],[80,1],[80,1],[80,1],[80,1],[80,1],[80,1],[80,1],[65,1],[65,1],[63,1],[63,1],[63,1],[63,1],[63,1],[73,1],[73,1],[73,1],[73,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,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 5: case 50: case 52: case 65: case 67: case 78:
+case 4: case 5: case 49: case 51: case 76: case 78: case 89:
this.$=$$[$0];
break;
case 8:
@@ -144,7 +144,7 @@ break;
case 42:
this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'round');
break;
-case 43: case 47:
+case 43:
this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'diamond');
break;
case 44:
@@ -156,76 +156,100 @@ break;
case 46:
this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'odd');
break;
-case 48:
+case 47:
this.$ = $$[$0];yy.addVertex($$[$0]);
break;
-case 49:
+case 48:
this.$ = $$[$0-1];yy.addVertex($$[$0-1]);
break;
-case 51: case 66: case 68: case 79:
+case 50: case 77: case 79: case 90:
this.$=$$[$0-1]+''+$$[$0];
break;
-case 53:
+case 52:
this.$=$$[$0-2]+'-'+$$[$0];
break;
-case 54:
+case 53:
$$[$0-1].text = $$[$0];this.$ = $$[$0-1];
break;
-case 55:
+case 54:
$$[$0-2].text = $$[$0-1];this.$ = $$[$0-2];
break;
-case 56:
+case 55:
this.$ = $$[$0];
break;
-case 57: case 64:
+case 56: case 75:
this.$ = $$[$0-1];
break;
-case 58:
+case 57: case 59: case 61:
$$[$0].text = $$[$0-2];this.$ = $$[$0];
break;
-case 59:
+case 58: case 60: case 62:
$$[$0-1].text = $$[$0-3];this.$ = $$[$0-1];
break;
-case 60:
-this.$ = {"type":"arrow"};
-break;
-case 61:
-this.$ = {"type":"arrow_circle"};
-break;
-case 62:
-this.$ = {"type":"arrow_cross"};
-break;
case 63:
-this.$ = {"type":"arrow_open"};
+this.$ = {"type":"arrow","stroke":"normal"};
break;
-case 80:
+case 64:
+this.$ = {"type":"arrow_circle","stroke":"normal"};
+break;
+case 65:
+this.$ = {"type":"arrow_cross","stroke":"normal"};
+break;
+case 66:
+this.$ = {"type":"arrow_open","stroke":"normal"};
+break;
+case 67:
+this.$ = {"type":"arrow","stroke":"dotted"};
+break;
+case 68:
+this.$ = {"type":"arrow_circle","stroke":"dotted"};
+break;
+case 69:
+this.$ = {"type":"arrow_cross","stroke":"dotted"};
+break;
+case 70:
+this.$ = {"type":"arrow_open","stroke":"dotted"};
+break;
+case 71:
+this.$ = {"type":"arrow","stroke":"thick"};
+break;
+case 72:
+this.$ = {"type":"arrow_circle","stroke":"thick"};
+break;
+case 73:
+this.$ = {"type":"arrow_cross","stroke":"thick"};
+break;
+case 74:
+this.$ = {"type":"arrow_open","stroke":"thick"};
+break;
+case 91:
this.$ = $$[$0-4];yy.addClass($$[$0-2],$$[$0]);
break;
-case 81:
+case 92:
this.$ = $$[$0-4];yy.setClass($$[$0-2], $$[$0]);
break;
-case 82:
+case 93:
this.$ = $$[$0-4];yy.setClickEvent($$[$0-2], $$[$0]);
break;
-case 83:
+case 94:
this.$ = $$[$0-4];yy.addVertex($$[$0-2],undefined,undefined,$$[$0]);
break;
-case 84: case 85:
+case 95: case 96:
this.$ = $$[$0-4];yy.updateLink($$[$0-2],$$[$0]);
break;
-case 87:
+case 98:
this.$ = [$$[$0]]
break;
-case 88:
+case 99:
$$[$0-2].push($$[$0]);this.$ = $$[$0-2];
break;
-case 90:
+case 101:
this.$ = $$[$0-1] + $$[$0];
break;
}
},
-table: [{3:1,4:2,11:[1,3]},{1:[3]},o($V0,$V1,{5:4}),{12:[1,5]},{1:[2,1],6:6,7:7,8:8,9:$V2,10:$V3,12:$V4,19:$V5,21:13,22:14,24:15,25:16,26:17,27:18,28:19,29:$V6,32:22,34:28,42:29,43:30,57:$V7,58:$V8,59:$V9,60:$Va,61:$Vb,66:$Vc,67:$Vd,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{13:[1,40],15:[1,41],16:[1,42],17:[1,43],18:[1,44]},o($Vm,[2,3]),{8:45,21:13,22:14,24:15,25:16,26:17,27:18,28:19,29:$V6,32:22,34:28,42:29,43:30,57:$V7,58:$V8,59:$V9,60:$Va,61:$Vb,66:$Vc,67:$Vd,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},o($Vm,[2,5]),o($Vm,[2,6]),o($Vm,[2,7]),o($Vn,$Vo,{7:46,12:$V4,19:$V5}),o($Vn,[2,18],{7:47,12:$V4,19:$V5}),{19:[1,48]},{9:$Vp,10:$Vq,19:$Vr,23:49},{9:$Vp,10:$Vq,19:$Vr,23:53},{9:$Vp,10:$Vq,19:$Vr,23:54},{9:$Vp,10:$Vq,19:$Vr,23:55},{9:$Vp,10:$Vq,19:$Vr,23:56},{9:$Vp,10:$Vq,19:$Vr,23:57},o([9,10,12,19,29,31,57,58,59,60,61,66,67,69,71,72,74,75,77,78,79],$V1,{5:58}),{67:[1,59]},o($Vs,[2,36],{33:60,45:61,47:[1,62],48:$Vt,49:$Vu,50:$Vv,51:$Vw}),{12:[1,67]},{12:[1,68]},{12:[1,69]},{12:[1,70]},{12:[1,71]},o($Vx,[2,48],{12:[1,77],15:[1,75],16:[1,76],35:[1,72],38:[1,73],40:[1,74]}),o($Vy,[2,50],{42:29,43:30,34:78,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl}),o($Vz,[2,52],{44:[1,79]}),o($VA,[2,111]),o($VA,[2,112]),o($VA,[2,113]),o($VA,[2,114]),o($VA,[2,115]),o($VA,[2,116]),o($VA,[2,117]),o($VA,[2,118]),o($VA,[2,119]),{9:$VB,12:$VC,14:80,19:$VD,20:83},{9:$VB,12:$VC,14:85,19:$VD,20:83},{9:$VB,12:$VC,14:86,19:$VD,20:83},{9:$VB,12:$VC,14:87,19:$VD,20:83},{9:$VB,12:$VC,14:88,19:$VD,20:83},o($Vm,[2,4]),o($Vn,[2,16]),o($Vn,[2,17]),o($Vm,[2,22]),o($Vm,[2,23]),o($Vm,[2,32]),o($Vm,[2,33]),o($Vm,[2,34]),o($Vm,[2,24]),o($Vm,[2,25]),o($Vm,[2,26]),o($Vm,[2,27]),o($Vm,[2,28]),{6:6,7:7,8:8,9:$V2,10:$V3,12:$VE,19:$V5,21:13,22:14,24:15,25:16,26:17,27:18,28:19,29:$V6,30:89,31:$VF,32:22,34:28,42:29,43:30,57:$V7,58:$V8,59:$V9,60:$Va,61:$Vb,66:$Vc,67:$Vd,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{9:$VG,11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,35:$VO,37:$VP,38:$VQ,39:$VR,40:$VS,41:$VT,43:114,44:$VU,48:$VV,49:$VW,50:$VX,51:$VY,52:$VZ,53:94,54:92,55:93,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,76:95,77:$Vj,78:$Vk,79:$Vl,80:$V31,81:$V41,82:$V51},{32:127,34:28,42:29,43:30,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},o($V61,[2,56],{46:128,12:[1,129],52:[1,130]}),{12:[1,131]},o($V71,[2,60]),o($V71,[2,61]),o($V71,[2,62]),o($V71,[2,63]),{34:132,42:29,43:30,65:[1,133],66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{66:[1,134]},{34:135,42:29,43:30,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{34:136,42:29,43:30,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{34:137,42:29,43:30,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,36:138,43:114,44:$VU,53:139,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,36:141,38:[1,140],43:114,44:$VU,53:139,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,36:142,43:114,44:$VU,53:139,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,36:143,43:114,44:$VU,53:139,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,36:144,43:114,44:$VU,53:139,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},o($Vx,[2,49]),o($Vy,[2,51]),{43:145,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},o($V0,[2,8]),o($V0,[2,13]),o($V0,[2,14]),{19:[1,146]},{12:$VC,19:[2,21],20:147},o($V0,[2,9]),o($V0,[2,10]),o($V0,[2,11]),o($V0,[2,12]),{9:$Vp,10:$Vq,19:$Vr,23:148},o($Vs,[2,30]),o($Vn,$Vo,{7:46,30:149,12:$VE,19:$V5,31:$VF}),{9:$VG,11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,19:[2,86],29:$VM,31:$VN,35:$VO,37:$VP,38:$VQ,39:$VR,40:$VS,41:$VT,43:114,44:$VU,48:$VV,49:$VW,50:$VX,51:$VY,52:$VZ,53:94,55:150,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,76:95,77:$Vj,78:$Vk,79:$Vl,80:$V31,81:$V41,82:$V51},o($V81,[2,67]),o($V81,[2,102]),o($V81,[2,103]),o($V81,[2,104]),o($V81,[2,105]),o($V81,$V91),o($V81,[2,120]),o($V81,[2,121]),o($V81,[2,122]),o($V81,[2,123]),o($V81,[2,124]),o($V81,[2,125]),o($V81,[2,126]),o($V81,[2,127]),o($V81,[2,128]),o($V81,[2,129]),o($V81,[2,130]),o($V81,[2,131]),o($V81,[2,132]),o($V81,[2,133]),o($V81,[2,134]),o($V81,[2,107]),o($V81,$Va1),o($V81,[2,109]),o($V81,[2,110]),o($V81,[2,69]),o($V81,[2,70]),o($V81,[2,71]),o($V81,[2,72]),o($V81,[2,73]),o($V81,[2,74]),o($V81,[2,75]),o($V81,[2,76]),o($V81,[2,77]),o($Vs,[2,35]),o($V61,[2,54],{12:[1,151]}),o($V61,[2,57]),{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,36:152,43:114,44:$VU,53:139,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,36:153,43:114,44:$VU,53:139,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{12:[1,154]},{12:[1,155]},{12:[1,156]},{12:[1,157]},{12:[1,158]},{12:[1,159]},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,37:[1,160],43:114,44:$VU,53:161,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},o($Vb1,[2,65]),{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,36:162,43:114,44:$VU,53:139,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,39:[1,163],43:114,44:$VU,53:161,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,41:[1,164],43:114,44:$VU,53:161,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,37:[1,165],43:114,44:$VU,53:161,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:$VI,13:$VJ,15:[1,166],16:$VL,29:$VM,31:$VN,43:114,44:$VU,53:161,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},o($Vz,[2,53]),o($V0,[2,15]),{19:[2,20]},o($Vm,[2,29]),o($Vs,[2,31]),o($V81,[2,68]),o($V61,[2,55]),{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,43:114,44:$VU,52:[1,167],53:161,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{11:$VH,12:[1,168],13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,43:114,44:$VU,53:161,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{12:$Vc1,44:$Vd1,57:$Ve1,64:169,65:$Vf1,66:$Vg1,67:$Vh1,68:170,70:171,71:$Vi1,72:$Vj1,73:$Vk1,74:$Vl1,75:$Vm1},{12:$Vc1,44:$Vd1,57:$Ve1,64:183,65:$Vf1,66:$Vg1,67:$Vh1,68:170,70:171,71:$Vi1,72:$Vj1,73:$Vk1,74:$Vl1,75:$Vm1},{12:$Vc1,44:$Vd1,57:$Ve1,64:184,65:$Vf1,66:$Vg1,67:$Vh1,68:170,70:171,71:$Vi1,72:$Vj1,73:$Vk1,74:$Vl1,75:$Vm1},{12:$Vc1,44:$Vd1,57:$Ve1,64:185,65:$Vf1,66:$Vg1,67:$Vh1,68:170,70:171,71:$Vi1,72:$Vj1,73:$Vk1,74:$Vl1,75:$Vm1},{34:186,42:29,43:30,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},{34:187,42:29,43:30,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},o($Vx,[2,37],{12:[1,188]}),o($Vb1,[2,66]),{11:$VH,12:$VI,13:$VJ,15:$VK,16:$VL,29:$VM,31:$VN,39:[1,189],43:114,44:$VU,53:161,56:117,57:$V_,58:$V$,59:$V01,60:$V11,61:$V21,63:96,66:$Vc,69:$Ve,71:$Vf,72:$Vg,74:$Vh,75:$Vi,77:$Vj,78:$Vk,79:$Vl},o($Vx,[2,41],{12:[1,190]}),o($Vx,[2,43],{12:[1,191]}),o($Vx,[2,45],{12:[1,192]}),o($Vn1,$V91,{9:$Vo1,10:$Vo1,19:$Vo1,47:$Vo1,48:$Vo1,49:$Vo1,50:$Vo1,51:$Vo1}),o([12,66,69,71,72,74,75,77,78,79],[2,64]),o($Vn1,$Va1,{45:193,48:$Vt,49:$Vu,50:$Vv,51:$Vw}),o($Vs,[2,83],{69:$Vp1}),o($Vq1,[2,87],{70:195,12:$Vc1,44:$Vd1,57:$Ve1,65:$Vf1,66:$Vg1,67:$Vh1,71:$Vi1,72:$Vj1,73:$Vk1,74:$Vl1,75:$Vm1}),o($Vr1,[2,89]),o($Vr1,[2,91]),o($Vr1,[2,92]),o($Vr1,[2,93]),o($Vr1,[2,94]),o($Vr1,[2,95]),o($Vr1,[2,96]),o($Vr1,[2,97]),o($Vr1,[2,98]),o($Vr1,[2,99]),o($Vr1,[2,100]),o($Vr1,[2,101]),o($Vs,[2,84],{69:$Vp1}),o($Vs,[2,85],{69:$Vp1}),o($Vs,[2,80],{69:$Vp1}),o($Vs,[2,81]),o($Vs,[2,82]),o($Vx,[2,38]),{39:[1,196]},o($Vx,[2,42]),o($Vx,[2,44]),o($Vx,[2,46]),o($V61,[2,58],{12:[1,197]}),{12:$Vc1,44:$Vd1,57:$Ve1,65:$Vf1,66:$Vg1,67:$Vh1,68:198,70:171,71:$Vi1,72:$Vj1,73:$Vk1,74:$Vl1,75:$Vm1},o($Vr1,[2,90]),o($Vx,[2,39],{12:[1,199]}),o($V61,[2,59]),o($Vq1,[2,88],{70:195,12:$Vc1,44:$Vd1,57:$Ve1,65:$Vf1,66:$Vg1,67:$Vh1,71:$Vi1,72:$Vj1,73:$Vk1,74:$Vl1,75:$Vm1}),o($Vx,[2,40])],
-defaultActions: {147:[2,20]},
+table: [{3:1,4:2,11:[1,3]},{1:[3]},o($V0,$V1,{5:4}),{12:[1,5]},{1:[2,1],6:6,7:7,8:8,9:$V2,10:$V3,12:$V4,19:$V5,21:13,22:14,24:15,25:16,26:17,27:18,28:19,29:$V6,32:22,34:28,42:29,43:30,67:$V7,68:$V8,69:$V9,70:$Va,71:$Vb,76:$Vc,77:$Vd,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{13:[1,40],15:[1,41],16:[1,42],17:[1,43],18:[1,44]},o($Vm,[2,3]),{8:45,21:13,22:14,24:15,25:16,26:17,27:18,28:19,29:$V6,32:22,34:28,42:29,43:30,67:$V7,68:$V8,69:$V9,70:$Va,71:$Vb,76:$Vc,77:$Vd,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},o($Vm,[2,5]),o($Vm,[2,6]),o($Vm,[2,7]),o($Vn,$Vo,{7:46,12:$V4,19:$V5}),o($Vn,[2,18],{7:47,12:$V4,19:$V5}),{19:[1,48]},{9:$Vp,10:$Vq,19:$Vr,23:49},{9:$Vp,10:$Vq,19:$Vr,23:53},{9:$Vp,10:$Vq,19:$Vr,23:54},{9:$Vp,10:$Vq,19:$Vr,23:55},{9:$Vp,10:$Vq,19:$Vr,23:56},{9:$Vp,10:$Vq,19:$Vr,23:57},o([9,10,12,19,29,31,67,68,69,70,71,76,77,79,81,82,84,85,87,88,89],$V1,{5:58}),{77:[1,59]},o($Vs,[2,36],{33:60,45:61,47:[1,62],48:[1,63],49:[1,64],50:$Vt,51:$Vu,52:$Vv,53:$Vw,54:$Vx,55:$Vy,56:$Vz,57:$VA,58:$VB,59:$VC,60:$VD,61:$VE}),{12:[1,77]},{12:[1,78]},{12:[1,79]},{12:[1,80]},{12:[1,81]},o($VF,[2,47],{43:30,42:87,12:[1,86],15:[1,85],35:[1,82],38:[1,83],40:[1,84],76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl}),o($VG,[2,49]),o($VG,[2,51],{44:[1,88]}),o($VH,[2,124]),o($VH,[2,125]),o($VH,[2,126]),o($VH,[2,127]),o($VH,[2,128]),o($VH,[2,129]),o($VH,[2,130]),o($VH,[2,131]),o($VH,[2,132]),{9:$VI,12:$VJ,14:89,19:$VK,20:92},{9:$VI,12:$VJ,14:94,19:$VK,20:92},{9:$VI,12:$VJ,14:95,19:$VK,20:92},{9:$VI,12:$VJ,14:96,19:$VK,20:92},{9:$VI,12:$VJ,14:97,19:$VK,20:92},o($Vm,[2,4]),o($Vn,[2,16]),o($Vn,[2,17]),o($Vm,[2,22]),o($Vm,[2,23]),o($Vm,[2,32]),o($Vm,[2,33]),o($Vm,[2,34]),o($Vm,[2,24]),o($Vm,[2,25]),o($Vm,[2,26]),o($Vm,[2,27]),o($Vm,[2,28]),{6:6,7:7,8:8,9:$V2,10:$V3,12:$VL,19:$V5,21:13,22:14,24:15,25:16,26:17,27:18,28:19,29:$V6,30:98,31:$VM,32:22,34:28,42:29,43:30,67:$V7,68:$V8,69:$V9,70:$Va,71:$Vb,76:$Vc,77:$Vd,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{9:$VN,11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,35:$VV,37:$VW,38:$VX,39:$VY,40:$VZ,41:$V_,43:125,44:$V$,47:$V01,49:$V11,50:$V21,51:$V31,52:$V41,53:$V51,62:$V61,63:103,64:101,65:102,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,86:104,87:$Vj,88:$Vk,89:$Vl,90:$Vc1,91:$Vd1,92:$Ve1},{32:138,34:28,42:29,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},o($Vf1,[2,55],{46:139,12:[1,140],62:[1,141]}),{12:[1,142]},{12:[1,143]},{12:[1,144]},o($Vg1,[2,63]),o($Vg1,[2,64]),o($Vg1,[2,65]),o($Vg1,[2,66]),o($Vg1,[2,67]),o($Vg1,[2,68]),o($Vg1,[2,69]),o($Vg1,[2,70]),o($Vg1,[2,71]),o($Vg1,[2,72]),o($Vg1,[2,73]),o($Vg1,[2,74]),{34:145,42:29,43:30,75:[1,146],76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{76:[1,147]},{34:148,42:29,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{34:149,42:29,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{34:150,42:29,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,36:151,43:125,44:$V$,47:$V01,49:$V11,63:152,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,36:154,38:[1,153],43:125,44:$V$,47:$V01,49:$V11,63:152,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,36:155,43:125,44:$V$,47:$V01,49:$V11,63:152,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,36:156,43:125,44:$V$,47:$V01,49:$V11,63:152,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},o($VF,[2,48]),o($VG,[2,50]),{43:157,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},o($V0,[2,8]),o($V0,[2,13]),o($V0,[2,14]),{19:[1,158]},{12:$VJ,19:[2,21],20:159},o($V0,[2,9]),o($V0,[2,10]),o($V0,[2,11]),o($V0,[2,12]),{9:$Vp,10:$Vq,19:$Vr,23:160},o($Vs,[2,30]),o($Vn,$Vo,{7:46,30:161,12:$VL,19:$V5,31:$VM}),{9:$VN,11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,19:[2,97],29:$VT,31:$VU,35:$VV,37:$VW,38:$VX,39:$VY,40:$VZ,41:$V_,43:125,44:$V$,47:$V01,49:$V11,50:$V21,51:$V31,52:$V41,53:$V51,62:$V61,63:103,65:162,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,86:104,87:$Vj,88:$Vk,89:$Vl,90:$Vc1,91:$Vd1,92:$Ve1},o($Vh1,[2,78]),o($Vh1,[2,113]),o($Vh1,[2,114]),o($Vh1,[2,115]),o($Vh1,[2,116]),o($Vh1,[2,117]),o($Vh1,[2,118]),o($Vh1,[2,119]),o($Vh1,[2,133]),o($Vh1,[2,134]),o($Vh1,[2,135]),o($Vh1,[2,136]),o($Vh1,[2,137]),o($Vh1,[2,138]),o($Vh1,[2,139]),o($Vh1,[2,140]),o($Vh1,[2,141]),o($Vh1,[2,142]),o($Vh1,[2,143]),o($Vh1,[2,144]),o($Vh1,[2,145]),o($Vh1,[2,146]),o($Vh1,[2,147]),o($Vh1,[2,120]),o($Vh1,$Vi1),o($Vh1,[2,122]),o($Vh1,[2,123]),o($Vh1,[2,80]),o($Vh1,[2,81]),o($Vh1,[2,82]),o($Vh1,[2,83]),o($Vh1,[2,84]),o($Vh1,[2,85]),o($Vh1,[2,86]),o($Vh1,[2,87]),o($Vh1,[2,88]),o($Vs,[2,35]),o($Vf1,[2,53],{12:[1,163]}),o($Vf1,[2,56]),{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,36:164,43:125,44:$V$,47:$V01,49:$V11,63:152,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,36:165,43:125,44:$V$,47:$V01,49:$V11,63:152,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,36:166,43:125,44:$V$,47:$V01,49:$V11,63:152,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,36:167,43:125,44:$V$,47:$V01,49:$V11,63:152,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{12:[1,168],42:87,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{12:[1,169]},{12:[1,170]},{12:[1,171],42:87,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{12:[1,172],42:87,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{12:[1,173],42:87,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,37:[1,174],43:125,44:$V$,47:$V01,49:$V11,63:175,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},o($Vj1,[2,76]),{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,36:176,43:125,44:$V$,47:$V01,49:$V11,63:152,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,39:[1,177],43:125,44:$V$,47:$V01,49:$V11,63:175,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,41:[1,178],43:125,44:$V$,47:$V01,49:$V11,63:175,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,37:[1,179],43:125,44:$V$,47:$V01,49:$V11,63:175,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},o($VG,[2,52]),o($V0,[2,15]),{19:[2,20]},o($Vm,[2,29]),o($Vs,[2,31]),o($Vh1,[2,79]),o($Vf1,[2,54]),{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,43:125,44:$V$,47:$V01,49:$V11,62:[1,180],63:175,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:[1,181],13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,43:125,44:$V$,47:$V01,49:$V11,63:175,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:[1,182],13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,43:125,44:$V$,47:$V01,49:$V11,63:175,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{11:$VO,12:[1,183],13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,43:125,44:$V$,47:$V01,49:$V11,63:175,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{12:$Vk1,44:$Vl1,67:$Vm1,74:184,75:$Vn1,76:$Vo1,77:$Vp1,78:185,80:186,81:$Vq1,82:$Vr1,83:$Vs1,84:$Vt1,85:$Vu1},{12:$Vk1,44:$Vl1,67:$Vm1,74:198,75:$Vn1,76:$Vo1,77:$Vp1,78:185,80:186,81:$Vq1,82:$Vr1,83:$Vs1,84:$Vt1,85:$Vu1},{12:$Vk1,44:$Vl1,67:$Vm1,74:199,75:$Vn1,76:$Vo1,77:$Vp1,78:185,80:186,81:$Vq1,82:$Vr1,83:$Vs1,84:$Vt1,85:$Vu1},{12:$Vk1,44:$Vl1,67:$Vm1,74:200,75:$Vn1,76:$Vo1,77:$Vp1,78:185,80:186,81:$Vq1,82:$Vr1,83:$Vs1,84:$Vt1,85:$Vu1},{34:201,42:29,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},{34:202,42:29,43:30,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},o($VF,[2,37],{12:[1,203]}),o($Vj1,[2,77]),{11:$VO,12:$VP,13:$VQ,15:$VR,16:$VS,29:$VT,31:$VU,39:[1,204],43:125,44:$V$,47:$V01,49:$V11,63:175,66:128,67:$V71,68:$V81,69:$V91,70:$Va1,71:$Vb1,73:105,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl},o($VF,[2,41],{12:[1,205]}),o($VF,[2,43],{12:[1,206]}),o($VF,[2,45],{12:[1,207]}),o([12,76,79,81,82,84,85,87,88,89],[2,75]),o($Vv1,$Vi1,{45:208,50:$Vt,51:$Vu,52:$Vv,53:$Vw,54:$Vx,55:$Vy,56:$Vz,57:$VA,58:$VB,59:$VC,60:$VD,61:$VE}),o($Vv1,$Vi1,{45:209,50:$Vt,51:$Vu,52:$Vv,53:$Vw,54:$Vx,55:$Vy,56:$Vz,57:$VA,58:$VB,59:$VC,60:$VD,61:$VE}),o($Vv1,$Vi1,{45:210,50:$Vt,51:$Vu,52:$Vv,53:$Vw,54:$Vx,55:$Vy,56:$Vz,57:$VA,58:$VB,59:$VC,60:$VD,61:$VE}),o($Vs,[2,94],{79:$Vw1}),o($Vx1,[2,98],{80:212,12:$Vk1,44:$Vl1,67:$Vm1,75:$Vn1,76:$Vo1,77:$Vp1,81:$Vq1,82:$Vr1,83:$Vs1,84:$Vt1,85:$Vu1}),o($Vy1,[2,100]),o($Vy1,[2,102]),o($Vy1,[2,103]),o($Vy1,[2,104]),o($Vy1,[2,105]),o($Vy1,[2,106]),o($Vy1,[2,107]),o($Vy1,[2,108]),o($Vy1,[2,109]),o($Vy1,[2,110]),o($Vy1,[2,111]),o($Vy1,[2,112]),o($Vs,[2,95],{79:$Vw1}),o($Vs,[2,96],{79:$Vw1}),o($Vs,[2,91],{79:$Vw1}),o($Vs,[2,92],{43:30,42:87,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl}),o($Vs,[2,93],{43:30,42:87,76:$Vc,79:$Ve,81:$Vf,82:$Vg,84:$Vh,85:$Vi,87:$Vj,88:$Vk,89:$Vl}),o($VF,[2,38]),{39:[1,213]},o($VF,[2,42]),o($VF,[2,44]),o($VF,[2,46]),o($Vf1,[2,57],{12:[1,214]}),o($Vf1,[2,59],{12:[1,215]}),o($Vf1,[2,61],{12:[1,216]}),{12:$Vk1,44:$Vl1,67:$Vm1,75:$Vn1,76:$Vo1,77:$Vp1,78:217,80:186,81:$Vq1,82:$Vr1,83:$Vs1,84:$Vt1,85:$Vu1},o($Vy1,[2,101]),o($VF,[2,39],{12:[1,218]}),o($Vf1,[2,58]),o($Vf1,[2,60]),o($Vf1,[2,62]),o($Vx1,[2,99],{80:212,12:$Vk1,44:$Vl1,67:$Vm1,75:$Vn1,76:$Vo1,77:$Vp1,81:$Vq1,82:$Vr1,83:$Vs1,84:$Vt1,85:$Vu1}),o($VF,[2,40])],
+defaultActions: {159:[2,20]},
parseError: function parseError(str, hash) {
if (hash.recoverable) {
this.trace(str);
@@ -699,15 +723,15 @@ options: {},
performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
var YYSTATE=YY_START;
switch($avoiding_name_collisions) {
-case 0:return 57;
+case 0:return 67;
break;
-case 1:return 58;
+case 1:return 68;
break;
-case 2:return 59;
+case 2:return 69;
break;
-case 3:return 60;
+case 3:return 70;
break;
-case 4:return 61;
+case 4:return 71;
break;
case 5:return 11;
break;
@@ -727,76 +751,104 @@ case 12:return 13;
break;
case 13:return 13;
break;
-case 14:return 66;
+case 14:return 76;
break;
-case 15:return 74;
+case 15:return 84;
break;
-case 16:return 72;
+case 16:return 82;
break;
case 17:return 9;
break;
-case 18:return 69;
+case 18:return 79;
break;
-case 19:return 78;
+case 19:return 89;
break;
-case 20:return 79;
+case 20:return 16;
break;
-case 21:return 75;
+case 21:return 15;
break;
-case 22:return 16;
+case 22:return 17;
break;
-case 23:return 15;
+case 23:return 18;
break;
-case 24:return 17;
+case 24:return 52;
break;
-case 25:return 18;
+case 25:return 50;
break;
-case 26:return 50;
+case 26:return 51;
break;
-case 27:return 48;
+case 27:return 53;
break;
-case 28:return 49;
+case 28:return 56;
break;
-case 29:return 51;
+case 29:return 54;
break;
-case 30:return 47;
+case 30:return 55;
break;
-case 31:return 44;
+case 31:return 57;
break;
-case 32:return 77;
+case 32:return 56;
break;
-case 33:return 67;
+case 33:return 54;
break;
-case 34:return 78;
+case 34:return 55;
break;
-case 35:return 71;
+case 35:return 57;
break;
-case 36:return 52;
+case 36:return 60;
break;
-case 37:return 38;
+case 37:return 58;
break;
-case 38:return 39;
+case 38:return 59;
break;
-case 39:return 35;
+case 39:return 61;
break;
-case 40:return 37;
+case 40:return 47;
break;
-case 41:return 40
+case 41:return 48;
break;
-case 42:return 41
+case 42:return 49;
break;
-case 43:return 82;
+case 43:return 44;
break;
-case 44:return 19;
+case 44:return 85;
break;
-case 45:return 12;
+case 45:return 87;
break;
-case 46:return 10;
+case 46:return 77;
+break;
+case 47:return 88;
+break;
+case 48:return 88;
+break;
+case 49:return 81;
+break;
+case 50:return 62;
+break;
+case 51:return 38;
+break;
+case 52:return 39;
+break;
+case 53:return 35;
+break;
+case 54:return 37;
+break;
+case 55:return 40
+break;
+case 56:return 41
+break;
+case 57:return 92;
+break;
+case 58:return 19;
+break;
+case 59:return 12;
+break;
+case 60:return 10;
break;
}
},
-rules: [/^(?:style\b)/,/^(?:linkStyle\b)/,/^(?:classDef\b)/,/^(?:class\b)/,/^(?:click\b)/,/^(?:graph\b)/,/^(?:subgraph\b)/,/^(?:end\b)/,/^(?:LR\b)/,/^(?:RL\b)/,/^(?:TB\b)/,/^(?:BT\b)/,/^(?:TD\b)/,/^(?:BR\b)/,/^(?:[0-9])/,/^(?:#)/,/^(?::)/,/^(?:;)/,/^(?:,)/,/^(?:=)/,/^(?:\*)/,/^(?:\.)/,/^(?:<)/,/^(?:>)/,/^(?:\^)/,/^(?:v\b)/,/^(?:--[x])/,/^(?:-->)/,/^(?:--[o])/,/^(?:---)/,/^(?:--)/,/^(?:-)/,/^(?:\+)/,/^(?:%)/,/^(?:=)/,/^(?:[\u0021-\u0027\u002A-\u002E\u003F\u0041-\u005A\u005C\u005F-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]|[\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377]|[\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5]|[\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA]|[\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE]|[\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA]|[\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0]|[\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977]|[\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2]|[\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A]|[\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39]|[\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8]|[\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C]|[\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C]|[\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99]|[\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0]|[\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D]|[\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3]|[\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10]|[\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1]|[\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81]|[\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3]|[\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6]|[\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A]|[\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081]|[\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D]|[\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0]|[\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310]|[\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C]|[\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711]|[\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7]|[\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C]|[\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16]|[\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF]|[\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC]|[\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D]|[\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D]|[\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3]|[\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F]|[\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128]|[\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184]|[\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3]|[\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6]|[\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE]|[\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C]|[\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D]|[\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC]|[\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B]|[\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788]|[\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805]|[\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB]|[\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28]|[\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5]|[\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4]|[\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E]|[\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D]|[\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36]|[\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D]|[\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC]|[\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF]|[\uFFD2-\uFFD7\uFFDA-\uFFDC_\/])/,/^(?:\|)/,/^(?:\()/,/^(?:\))/,/^(?:\[)/,/^(?:\])/,/^(?:\{)/,/^(?:\})/,/^(?:")/,/^(?:\n)/,/^(?:\s)/,/^(?:$)/],
-conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46],"inclusive":true}}
+rules: [/^(?:style\b)/,/^(?:linkStyle\b)/,/^(?:classDef\b)/,/^(?:class\b)/,/^(?:click\b)/,/^(?:graph\b)/,/^(?:subgraph\b)/,/^(?:end\b)/,/^(?:LR\b)/,/^(?:RL\b)/,/^(?:TB\b)/,/^(?:BT\b)/,/^(?:TD\b)/,/^(?:BR\b)/,/^(?:[0-9]+)/,/^(?:#)/,/^(?::)/,/^(?:;)/,/^(?:,)/,/^(?:\*)/,/^(?:<)/,/^(?:>)/,/^(?:\^)/,/^(?:v\b)/,/^(?:--[x])/,/^(?:-->)/,/^(?:--[o])/,/^(?:---)/,/^(?:-\.-[x])/,/^(?:-\.->)/,/^(?:-\.-[o])/,/^(?:-\.-)/,/^(?:.-[x])/,/^(?:\.->)/,/^(?:\.-[o])/,/^(?:\.-)/,/^(?:==[x])/,/^(?:==>)/,/^(?:==[o])/,/^(?:==[\=])/,/^(?:--)/,/^(?:-\.)/,/^(?:==)/,/^(?:-)/,/^(?:\.)/,/^(?:\+)/,/^(?:%)/,/^(?:=)/,/^(?:=)/,/^(?:[\u0021-\u0027\u002A-\u002E\u003F\u0041-\u005A\u005C\u005F-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]|[\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377]|[\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5]|[\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA]|[\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE]|[\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA]|[\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0]|[\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977]|[\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2]|[\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A]|[\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39]|[\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8]|[\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C]|[\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C]|[\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99]|[\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0]|[\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D]|[\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3]|[\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10]|[\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1]|[\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81]|[\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3]|[\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6]|[\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A]|[\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081]|[\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D]|[\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0]|[\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310]|[\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C]|[\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711]|[\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7]|[\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C]|[\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16]|[\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF]|[\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC]|[\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D]|[\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D]|[\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3]|[\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F]|[\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128]|[\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184]|[\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3]|[\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6]|[\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE]|[\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C]|[\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D]|[\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC]|[\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B]|[\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788]|[\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805]|[\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB]|[\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28]|[\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5]|[\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4]|[\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E]|[\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D]|[\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36]|[\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D]|[\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC]|[\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF]|[\uFFD2-\uFFD7\uFFDA-\uFFDC_\/])/,/^(?:\|)/,/^(?:\()/,/^(?:\))/,/^(?:\[)/,/^(?:\])/,/^(?:\{)/,/^(?:\})/,/^(?:")/,/^(?:\n)/,/^(?:\s)/,/^(?:$)/],
+conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60],"inclusive":true}}
});
return lexer;
})();
diff --git a/src/diagrams/flowchart/parser/flow.spec.js b/src/diagrams/flowchart/parser/flow.spec.js
index cea9f00c7..5a7cbaf68 100644
--- a/src/diagrams/flowchart/parser/flow.spec.js
+++ b/src/diagrams/flowchart/parser/flow.spec.js
@@ -308,6 +308,28 @@ describe('when parsing ',function(){
expect(edges[0].type).toBe('arrow');
});
+ it('should handle style definitons with more then 1 digit in a row',function(){
+ var res = flow.parser.parse('graph TD\n' +
+ 'A-->B1\n' +
+ 'A-->B2\n' +
+ 'A-->B3\n' +
+ 'A-->B4\n' +
+ 'A-->B5\n' +
+ 'A-->B6\n' +
+ 'A-->B7\n' +
+ 'A-->B8\n' +
+ 'A-->B9\n' +
+ 'A-->B10\n' +
+ 'A-->B11\n' +
+ 'linkStyle 10 stroke-width:1px;');
+
+ var vert = flow.parser.yy.getVertices();
+ var edges = flow.parser.yy.getEdges();
+
+
+ expect(edges[0].type).toBe('arrow');
+ });
+
describe("it should handle text on edges",function(){
it('it should handle text without space',function(){
var res = flow.parser.parse('graph TD;A--x|textNoSpace|B;');
@@ -405,6 +427,61 @@ describe('when parsing ',function(){
});
+ describe("it should handle new line type notation",function() {
+ it('it should handle regular lines', function () {
+ var res = flow.parser.parse('graph TD;A-->B;');
+
+ var vert = flow.parser.yy.getVertices();
+ var edges = flow.parser.yy.getEdges();
+
+ expect(edges[0].stroke).toBe('normal');
+ });
+ it('it should handle dotted lines', function () {
+ var res = flow.parser.parse('graph TD;A-.->B;');
+
+ var vert = flow.parser.yy.getVertices();
+ var edges = flow.parser.yy.getEdges();
+
+
+ expect(edges[0].stroke).toBe('dotted');
+ });
+ it('it should handle dotted lines', function () {
+ var res = flow.parser.parse('graph TD;A==>B;');
+
+ var vert = flow.parser.yy.getVertices();
+ var edges = flow.parser.yy.getEdges();
+
+
+ expect(edges[0].stroke).toBe('thick');
+ });
+ it('it should handle text on lines', function () {
+ var res = flow.parser.parse('graph TD;A-- test text with == -->B;');
+
+ var vert = flow.parser.yy.getVertices();
+ var edges = flow.parser.yy.getEdges();
+
+
+ expect(edges[0].stroke).toBe('normal');
+ });
+ it('it should handle text on lines', function () {
+ var res = flow.parser.parse('graph TD;A-. test text with == .->B;');
+
+ var vert = flow.parser.yy.getVertices();
+ var edges = flow.parser.yy.getEdges();
+
+
+ expect(edges[0].stroke).toBe('dotted');
+ });
+ it('it should handle text on lines', function () {
+ var res = flow.parser.parse('graph TD;A== test text with -- ==>B;');
+
+ var vert = flow.parser.yy.getVertices();
+ var edges = flow.parser.yy.getEdges();
+
+
+ expect(edges[0].stroke).toBe('thick');
+ });
+ });
describe("it should handle text on edges using the new notation",function(){
it('it should handle text without space',function(){
diff --git a/test/web.html b/test/web.html
index a6f362f2c..4da3af107 100644
--- a/test/web.html
+++ b/test/web.html
@@ -41,9 +41,9 @@
Sub graphs
graph TB
subgraph
- sq[Square shape] --> ci((Circle shape))
- od>Odd shape]-- Two line
edge comment --> ro
- di{Diamond with
line break} --> ro(Rounded
square
shape)
+ sq[Square shape] -.-> ci((Circle shape))
+ od>Odd shape]-. Two line
edge comment .-> ro
+ di{Diamond with
line break} ==> ro(Rounded
square
shape)
di-->ro2(Rounded square shape)
end