mermaid - npm Package Compare versions

Comparing version 0.5.8 to 6.0.0

bin/mermaid.js

@@ -7,3 +7,3 @@ #!/usr/bin/env node
   , cli = require('../lib/cli.js')
-  , lib = require('../lib')
+  , lib = require('../lib');
 
@@ -28,2 +28,2 @@ cli.parse(process.argv.slice(2), function(err, message, options) {
   lib.process(options.files, options, process.exit)
-})
+});

build/content/index.md

@@ -87,2 +87,4 @@ ---
 * [Plugin for atom](https://atom.io/packages/atom-mermaid)
+* [Markdown Plus](http://mdp.tylingsoft.com/)
+* [Vim Plugin](https://github.com/kannokanno/previm)
 
@@ -89,0 +91,0 @@ # Online live editor

build/content/mermaidAPI.md

@@ -59,3 +59,3 @@ ---
 **topPadding** - margin between title and gantt diagram and between axis and gantt diagram.
-**sidePadding** - the space allocated for the section name to the left of the activities.
+**leftPadding** - the space allocated for the section name to the left of the activities.
 **gridLineStartPadding** - Vertical starting position of the grid lines
@@ -62,0 +62,0 @@ **fontSize** - font size ...

build/content/sequenceDiagram.md

@@ -75,2 +75,51 @@ ---
 
+## Activations
+It is possible to activate and deactivate an actor. (de)activation can be dedicated declarations:
+
+```
+sequenceDiagram
+    Alice->>John: Hello John, how are you?
+    activate John
+    John-->>Alice: Great!
+    deactivate John
+```
+
+Renders to the diagram below:
+
+```mermaid
+sequenceDiagram
+    Alice->>John: Hello John, how are you?
+    activate John
+    John-->>Alice: Great!
+    deactivate John
+```
+
+There is also a shortcut notation by appending `+`/`-` suffix to the message arrow:  
+
+```
+sequenceDiagram
+    Alice->>+John: Hello John, how are you?
+    John-->>-Alice: Great!
+```
+
+Activations can be stacked for same actor:
+
+```
+sequenceDiagram
+    Alice->>+John: Hello John, how are you?
+    Alice->>+John: John, can yoy hear me?
+    John-->>-Alice: Hi Alice, I can hear you!
+    John-->>-Alice: I feel great!
+```
+
+Stacked activations look like this:
+
+```mermaid
+sequenceDiagram
+    Alice->>+John: Hello John, how are you?
+    Alice->>+John: John, can yoy hear me?
+    John-->>-Alice: Hi Alice, I can hear you!
+    John-->>-Alice: I feel great!
+```
+
 ## Notes
@@ -77,0 +126,0 @@ It is possible to add notes to a sequence diagram. This is done by the notation

CONTRIBUTING.md

@@ -56,3 +56,3 @@ # How to contribute
 
-Then the dependencies will have been installed. You use gulp as build tool.
+Then the dependencies will have been installed. You use gulp and npm calls as build tools.
 
@@ -62,9 +62,17 @@ The following targets are probably interesting:
 * jison - compiles the jison grammars to parser files
-* jasmine - runs the jasmine tests (will trigger the jison target)
-* dist - complies files to the dist catalog
 
 for instance:
 ```
-gulp jasmine
+gulp jison
 ```
+To run the tests:
+```
+npm run karma
+```
+
+To build the /dist directory
+```
+npm run dist
+```
+
 Thanks, Knut Sveidqvist

docs/content/index.md

@@ -87,2 +87,4 @@ ---
 * [Plugin for atom](https://atom.io/packages/atom-mermaid)
+* [Markdown Plus](http://mdp.tylingsoft.com/)
+* [Vim Plugin](https://github.com/kannokanno/previm)
 
@@ -89,0 +91,0 @@ # Online live editor

docs/content/sequenceDiagram.md

@@ -75,2 +75,51 @@ ---
 
+## Activations
+It is possible to activate and deactivate an actor. (de)activation can be dedicated declarations:
+
+```
+sequenceDiagram
+    Alice->>John: Hello John, how are you?
+    activate John
+    John-->>Alice: Great!
+    deactivate John
+```
+
+Renders to the diagram below:
+
+```mermaid
+sequenceDiagram
+    Alice->>John: Hello John, how are you?
+    activate John
+    John-->>Alice: Great!
+    deactivate John
+```
+
+There is also a shortcut notation by appending `+`/`-` suffix to the message arrow:  
+
+```
+sequenceDiagram
+    Alice->>+John: Hello John, how are you?
+    John-->>-Alice: Great!
+```
+
+Activations can be stacked for same actor:
+
+```
+sequenceDiagram
+    Alice->>+John: Hello John, how are you?
+    Alice->>+John: John, can yoy hear me?
+    John-->>-Alice: Hi Alice, I can hear you!
+    John-->>-Alice: I feel great!
+```
+
+Stacked activations look like this:
+
+```mermaid
+sequenceDiagram
+    Alice->>+John: Hello John, how are you?
+    Alice->>+John: John, can yoy hear me?
+    John-->>-Alice: Hi Alice, I can hear you!
+    John-->>-Alice: I feel great!
+```
+
 ## Notes
@@ -77,0 +126,0 @@ It is possible to add notes to a sequence diagram. This is done by the notation

gulp/tasks/jison.js

@@ -20,2 +20,3 @@ var gulp = require('gulp');
         'node node_modules/jison/lib/cli.js src/diagrams/flowchart/parser/dot.jison                  -o src/diagrams/flowchart/parser/dot.js',
+        'node node_modules/jison/lib/cli.js src/diagrams/gitGraph/parser/gitGraph.jison               -o src/diagrams/gitGraph/parser/gitGraph.js',
         'node node_modules/jison/lib/cli.js src/diagrams/gantt/parser/gantt.jison                     -o src/diagrams/gantt/parser/gantt.js'
@@ -22,0 +23,0 @@ ]);

karma.conf.js

@@ -22,3 +22,4 @@ // Karma configuration
             './src/diagrams/classDiagram/**/*.spec.js',
-            './src/diagrams/gantt/**/*.spec.js'
+            './src/diagrams/gantt/**/*.spec.js',
+            './src/diagrams/gitGraph/**/*.spec.js'
         ],
@@ -25,0 +26,0 @@

lib/cli.js

@@ -9,3 +9,3 @@ var fs = require('fs')
 
-var PHANTOM_VERSION = "^1.9.0"
+var PHANTOM_VERSION = "^2.1.0"
 
@@ -186,3 +186,3 @@ var info = chalk.blue.bold
     // If we have phantompath, see if its version satisfies our requirements
-    exec(phantomPath + ' --version', function(err, stdout, stderr) {
+    exec('"' + phantomPath + '" --version', function(err, stdout, stderr) {
       if (err) {
@@ -189,0 +189,0 @@ next(new Error("Could not find phantomjs at the specified path."))

lib/index.js

@@ -28,9 +28,6 @@ var os = require('os')
 
-
   files.forEach(function(file) {
     phantomArgs.push(file)
   })
-    console.log('phantomArgs');
-    console.log(JSON.stringify(phantomArgs));
-  //
+
   mkdirp(outputDir, function(err) {
@@ -37,0 +34,0 @@ if (err) {

lib/phantomscript.js

@@ -32,22 +32,17 @@ /**
 
-console.log('phantom.args');
-console.log(phantom.args.length);
-console.log(JSON.stringify(phantom.args));
-
 var page = webpage.create()
-  , files = phantom.args.slice(8, phantom.args.length)
-  , width = phantom.args[7]
+  , files = system.args.slice(9, system.args.length)
+  , width = system.args[8]
 
-if(typeof width === 'undefined'){
+if(typeof width === 'undefined' || width==='undefined'){
   width = 1200;
 }
-
 var options = {
-        outputDir: phantom.args[0]
-      , png: phantom.args[1] === 'true' ? true : false
-      , svg: phantom.args[2] === 'true' ? true : false
-      , css: phantom.args[3] !== '' ? phantom.args[3] : '* { margin: 0; padding: 0; }'
-      , sequenceConfig: phantom.args[4]
-      , ganttConfig: phantom.args[5]
-      , verbose: phantom.args[6] === 'true' ? true : false
+        outputDir: system.args[1]
+      , png: system.args[2] === 'true' ? true : false
+      , svg: system.args[3] === 'true' ? true : false
+      , css: system.args[4] !== '' ? system.args[4] : '* {  margin: 0; padding: 0; }'
+      , sequenceConfig: system.args[5]
+      , ganttConfig: system.args[6]
+      , verbose: system.args[7] === 'true' ? true : false
       , width: width
@@ -58,3 +53,3 @@ }
   // If no css is suuplied make sure a fixed witdth is given to the gant renderer
-  if(phantom.args[3] !== ''){
+  if(system.args[3] !== ''){
     if(typeof options.ganttConfig === 'undefined'){
@@ -69,3 +64,3 @@ options.ganttConfig = {};
   , '<head>'
-  , '<style type="text/css">'
+  , '<style type="text/css">body {background:white;font-family: Arial;}'
   , options.css
@@ -79,5 +74,2 @@ , '</style>'
 
-//console.log('page.content');
-//console.log(JSON.stringify(page.content));
-//console.log(phantom.args[3]);
 
@@ -99,3 +91,3 @@ page.injectJs('../dist/mermaid.js')
 
-  console.log('ready to execute png: ' + filename + '.png')
+  console.log('ready to execute png: ' + filename + '.png ')
 
@@ -111,2 +103,3 @@ // this JS is executed in this statement is sandboxed, even though it doesn't
   })
+
   oDOM = oParser.parseFromString(svgContent, "text/xml")
@@ -132,3 +125,3 @@
   }
-  console.log('After png save: ' + filename + '.png')
+
   if (options.svg) {
@@ -209,2 +202,3 @@ var serialize = new XMLSerializer();
 function resolveForeignObjects(element) {
+    return;
   var children
@@ -258,2 +252,3 @@ , textElement
   el.appendChild(elContent)
+  //el.innerText = '<b>hello</b>\uD800' //contents;
 
@@ -264,4 +259,6 @@ document.body.appendChild(el)
     sequenceDiagram:{useMaxWidth:false},
-    flowchart:{useMaxWidth:false}
+    flowchart:{useMaxWidth:false},
+    logLevel:1
   });
+  //console.log('after initialize',sequenceConfig);
 
@@ -279,2 +276,3 @@ if(typeof sequenceConfig !== undefined && sequenceConfig !== 'undefined'){
 
+  //console.log('after initialize 2');
     if(typeof ganttConfig !== undefined && ganttConfig !== 'undefined'){
@@ -294,5 +292,2 @@ sc = document.createElement("script")
 
-  console.log('Generated head');
-  console.log(document.head.innerHTML);
-  //console.log(document.body.innerHTML);
   mermaid.init();
@@ -306,2 +301,3 @@
 
+
   var scalefactor = confWidth/(width-8);
@@ -308,0 +304,0 @@

package.json

 {
   "name": "mermaid",
-  "version": "0.5.8",
+  "version": "6.0.0",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams and gantt charts.",
@@ -30,2 +30,3 @@ "main": "src/mermaid.js",
     "dist-mermaid": "node node_modules/browserify/bin/cmd.js src/mermaid.js  -t babelify  -s mermaid    -o dist/mermaid.js         && cat dist/mermaid.js         | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaid.min.js",
+    "dist-mermaid-nomin": "node node_modules/browserify/bin/cmd.js src/mermaid.js  -t babelify  -s mermaid    -o dist/mermaid.js && node bin/mermaid -v -s testgitgraph.mm && testgitgraph.mm.svg",
     "dist-mermaidAPI": "node node_modules/browserify/bin/cmd.js src/mermaidAPI.js -t babelify -s mermaidAPI -o dist/mermaidAPI.js      && cat dist/mermaidAPI.js      | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaidAPI.min.js",
@@ -46,2 +47,3 @@ "dist": "npm run dist-slim-mermaid && npm run dist-slim-mermaidAPI && npm run dist-mermaid && npm run dist-mermaidAPI"
     "he": "^0.5.0",
+    "lodash": "^4.6.1",
     "minimist": "^1.1.0",
@@ -112,3 +114,3 @@ "mkdirp": "^0.5.0",
     "path": "^0.4.9",
-    "phantomjs": "^1.9.18",
+    "phantomjs": "^2.1.3",
     "proxyquire": "^1.7.3",
@@ -115,0 +117,0 @@ "proxyquire-universal": "^1.0.8",

src/diagrams/classDiagram/parser/classDiagram.js

@@ -1,2 +0,2 @@
-/* parser generated by jison 0.4.15 */
+/* parser generated by jison 0.4.17 */
 /*
@@ -74,3 +74,3 @@ Returns a Parser object of the following structure:
 */
-var classDiagram = (function(){
+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,11],$V1=[1,12],$V2=[1,13],$V3=[1,15],$V4=[1,16],$V5=[1,17],$V6=[6,8],$V7=[1,26],$V8=[1,27],$V9=[1,28],$Va=[1,29],$Vb=[1,30],$Vc=[1,31],$Vd=[6,8,13,17,23,26,27,28,29,30,31],$Ve=[6,8,13,17,23,26,27,28,29,30,31,45,46,47],$Vf=[23,45,46,47],$Vg=[23,30,31,45,46,47],$Vh=[23,26,27,28,29,45,46,47],$Vi=[6,8,13],$Vj=[1,46];
@@ -174,3 +174,3 @@ var parser = {trace: function trace() { },
         }
-        _parseError.prototype = new Error();
+        _parseError.prototype = Error;
 
@@ -729,5 +729,5 @@ throw new _parseError(str, hash);
 if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
-exports.parser = classDiagram;
-exports.Parser = classDiagram.Parser;
-exports.parse = function () { return classDiagram.parse.apply(classDiagram, arguments); };
+exports.parser = parser;
+exports.Parser = parser.Parser;
+exports.parse = function () { return parser.parse.apply(parser, arguments); };
 exports.main = function commonjsMain(args) {
@@ -734,0 +734,0 @@ if (!args[1]) {

src/diagrams/example/parser/example.js

@@ -1,2 +0,2 @@
-/* parser generated by jison 0.4.15 */
+/* parser generated by jison 0.4.17 */
 /*
@@ -74,3 +74,3 @@ Returns a Parser object of the following structure:
 */
-var example = (function(){
+var parser = (function(){
 var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[6,9,10,12];
@@ -114,3 +114,3 @@ var parser = {trace: function trace() { },
         }
-        _parseError.prototype = new Error();
+        _parseError.prototype = Error;
 
@@ -618,5 +618,5 @@ throw new _parseError(str, hash);
 if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
-exports.parser = example;
-exports.Parser = example.Parser;
-exports.parse = function () { return example.parse.apply(example, arguments); };
+exports.parser = parser;
+exports.Parser = parser.Parser;
+exports.parse = function () { return parser.parse.apply(parser, arguments); };
 exports.main = function commonjsMain(args) {
@@ -623,0 +623,0 @@ if (!args[1]) {

src/diagrams/flowchart/flowRenderer.js

@@ -86,4 +86,22 @@ /**
         } else {
-            verticeText = verticeText.replace(/<br>/g, '\n');
-            labelTypeStr = 'text';
+            var svg_label = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+
+            var rows = verticeText.split(/<br>/);
+
+            var j = 0;
+            for(j=0;j<rows.length;j++){
+                var tspan = document.createElementNS('http://www.w3.org/2000/svg','tspan');
+                tspan.setAttributeNS('http://www.w3.org/XML/1998/namespace', 'xml:space', 'preserve');
+                tspan.setAttribute('dy', '1em');
+                tspan.setAttribute('x', '1');
+                tspan.textContent = rows[j];
+                svg_label.appendChild(tspan);
+            }
+
+            labelTypeStr = 'svg';
+            verticeText = svg_label;
+
+
+            //verticeText = verticeText.replace(/<br\/>/g, '\n');
+            //labelTypeStr = 'text';
         }
@@ -137,3 +155,2 @@
     var cnt=0;
-    var aHead;
     
@@ -143,3 +160,2 @@ var defaultStyle;
         defaultStyle = edges.defaultStyle.toString().replace(/,/g , ';');
-
     }
@@ -149,9 +165,10 @@
         cnt++;
+        var edgeData = {};
 
         // Set link type for rendering
         if(edge.type === 'arrow_open'){
-            aHead = 'none';
+            edgeData.arrowhead = 'none';
         }
         else{
-            aHead = 'normal';
+            edgeData.arrowhead = 'normal';
         }
@@ -183,28 +200,34 @@
         }
+        edgeData.style = style;
+        
+        if (typeof edge.interpolate !== 'undefined') {
+            edgeData.lineInterpolate = edge.interpolate;
+        } else {
+            if (typeof edges.defaultInterpolate !== 'undefined') {
+                edgeData.lineInterpolate = edges.defaultInterpolate;
+            }
+        }
 
-        // Add the edge to the graph
         if (typeof edge.text === 'undefined') {
-            if(typeof edge.style === 'undefined'){
-                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
-                },cnt);
+            if (typeof edge.style !== 'undefined') {
+                edgeData.arrowheadStyle = 'fill: #333';
             }
-        }
-        // Edge with text
-        else {
-            var edgeText = edge.text.replace(/<br>/g, '\n');
-            if(typeof edge.style === 'undefined'){
-                if (conf.htmlLabels){
-                    g.setEdge(edge.start, edge.end,{labelType: 'html',style: style, labelpos:'c', label: '<span class="edgeLabel">'+edge.text+'</span>', arrowheadStyle: 'fill: #333', arrowhead: aHead},cnt);
-                }else{
-                    g.setEdge(edge.start, edge.end,{labelType: 'text', style: 'stroke: #333; stroke-width: 1.5px;fill:none', labelpos:'c', label: edgeText, arrowheadStyle: 'fill: #333', arrowhead: aHead},cnt);
+        } else {
+            edgeData.arrowheadStyle = 'fill: #333';
+            if(typeof edge.style === 'undefined') {
+                edgeData.labelpos = 'c';
+                if (conf.htmlLabels) {
+                    edgeData.labelType = 'html';
+                    edgeData.label = '<span class="edgeLabel">'+edge.text+'</span>';
+                } else {
+                    edgeData.labelType = 'text';
+                    edgeData.style = 'stroke: #333; stroke-width: 1.5px;fill:none';
+                    edgeData.label = edge.text.replace(/<br>/g, '\n');
                 }
-             }else{
-                g.setEdge(edge.start, edge.end, {
-                    labelType: 'text', style: style, arrowheadStyle: 'fill: #333', label: edgeText, arrowhead: aHead
-                },cnt);
+             } else {
+                edgeData.label = edge.text.replace(/<br>/g, '\n');
             }
         }
+        // Add the edge to the graph
+        g.setEdge(edge.start, edge.end, edgeData, cnt);
     });
@@ -488,3 +511,25 @@ };
     }
+
+    // Add label rects for non html labels
+    if(!conf.htmlLabels){
+        var labels = document.querySelectorAll('#' + id +' .edgeLabel .label');
+        var i;
+        for(i=0;i<labels.length;i++){
+            var label = labels[i];
+
+            // Get dimensions of label
+            var dim = label.getBBox();
+
+            var rect =  document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+            rect.setAttribute('rx',0);
+            rect.setAttribute('ry',0);
+            rect.setAttribute('width',dim.width);
+            rect.setAttribute('height',dim.height);
+            rect.setAttribute('style','fill:#e8e8e8;');
+
+            label.insertBefore(rect, label.firstChild);
+        }
+    }
+
 };
 

src/diagrams/flowchart/graphDb.js

@@ -89,3 +89,17 @@ /**
 };
+
 /**
+ * Updates a link's line interpolation algorithm
+ * @param pos
+ * @param interpolate
+ */
+exports.updateLinkInterpolate = function (pos, interp) {
+    if(pos === 'default'){
+        edges.defaultInterpolate = interp;
+    }else{
+        edges[pos].interpolate = interp;
+    }
+};
+
+/**
  * Updates a link with a style
@@ -92,0 +106,0 @@ * @param pos

src/diagrams/flowchart/parser/dot.js

@@ -1,2 +0,2 @@
-/* parser generated by jison 0.4.15 */
+/* parser generated by jison 0.4.17 */
 /*
@@ -74,3 +74,3 @@ Returns a Parser object of the following structure:
 */
-var dot = (function(){
+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,5],$V1=[1,6],$V2=[1,12],$V3=[1,13],$V4=[1,14],$V5=[1,15],$V6=[1,16],$V7=[1,17],$V8=[1,18],$V9=[1,19],$Va=[1,20],$Vb=[1,21],$Vc=[1,22],$Vd=[8,16,17,18,19,20,21,22,23,24,25,26],$Ve=[1,37],$Vf=[1,33],$Vg=[1,34],$Vh=[1,35],$Vi=[1,36],$Vj=[8,10,16,17,18,19,20,21,22,23,24,25,26,28,32,37,39,40,45,57,58],$Vk=[10,28],$Vl=[10,28,37,57,58],$Vm=[2,49],$Vn=[1,45],$Vo=[1,48],$Vp=[1,49],$Vq=[1,52],$Vr=[2,65],$Vs=[1,65],$Vt=[1,66],$Vu=[1,67],$Vv=[1,68],$Vw=[1,69],$Vx=[1,70],$Vy=[1,71],$Vz=[1,72],$VA=[1,73],$VB=[8,16,17,18,19,20,21,22,23,24,25,26,47],$VC=[10,28,37];
@@ -154,3 +154,3 @@ var parser = {trace: function trace() { },
         }
-        _parseError.prototype = new Error();
+        _parseError.prototype = Error;
 
@@ -729,5 +729,5 @@ throw new _parseError(str, hash);
 if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
-exports.parser = dot;
-exports.Parser = dot.Parser;
-exports.parse = function () { return dot.parse.apply(dot, arguments); };
+exports.parser = parser;
+exports.Parser = parser.Parser;
+exports.parse = function () { return parser.parse.apply(parser, arguments); };
 exports.main = function commonjsMain(args) {
@@ -734,0 +734,0 @@ if (!args[1]) {

src/diagrams/flowchart/parser/flow.js

@@ -1,2 +0,2 @@
-/* parser generated by jison 0.4.15 */
+/* parser generated by jison 0.4.17 */
 /*
@@ -74,9 +74,9 @@ Returns a Parser object of the following structure:
 */
-var flow = (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,85,87,88,90,91,93,94,95,96,97],$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,85,87,88,90,91,93,94,95,96,97],$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,85,87,88,90,91,93,94,95,96,97],$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,83,85,87,88,90,91,93,94,95,96,97],$VW=[1,117],$VX=[1,118],$VY=[8,9,10,11,13,18,30,32,46,71,72,73,74,75,81,85,87,88,90,91,93,94,95,96,97],$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,83,85,87,88,90,91,93,94,95,96,97],$V_=[13,18,46,81,85,87,88,90,91,93,94,95,96,97],$V$=[13,18,46,49,65,81,85,87,88,90,91,93,94,95,96,97],$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,211],$Vc1=[8,9,11,85],$Vd1=[8,9,10,11,46,71,80,81,83,85,87,88,89,90,91];
+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 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,"commentStatement":82,"PCT":83,"style":84,"COMMA":85,"styleComponent":86,"ALPHA":87,"COLON":88,"UNIT":89,"BRKT":90,"DOT":91,"graphCodeTokens":92,"PUNCTUATION":93,"UNICODE_TEXT":94,"PLUS":95,"EQUALS":96,"MULT":97,"TAG_START":98,"TAG_END":99,"QUOTE":100,"$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",83:"PCT",85:"COMMA",87:"ALPHA",88:"COLON",89:"UNIT",90:"BRKT",91:"DOT",93:"PUNCTUATION",94:"UNICODE_TEXT",95:"PLUS",96:"EQUALS",97:"MULT",98:"TAG_START",99:"TAG_END",100:"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],[82,3],[79,1],[79,3],[84,1],[84,2],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,1],[86,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],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,1],[92,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,"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]],
 performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
@@ -292,9 +292,15 @@ /* this == yyval */
 break;
-case 122:
+case 121: case 122:
+this.$ = $$[$0-8];yy.updateLinkInterpolate($$[$0-6],$$[$0-2]);yy.updateLink($$[$0-6],$$[$0]);
+break;
+case 123: case 124:
+this.$ = $$[$0-6];yy.updateLinkInterpolate($$[$0-4],$$[$0]);
+break;
+case 126:
 this.$ = [$$[$0]]
 break;
-case 123:
+case 127:
 $$[$0-2].push($$[$0]);this.$ = $$[$0-2];
 break;
-case 125:
+case 129:
 this.$ = $$[$0-1] + $$[$0];
@@ -304,3 +310,3 @@ 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,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs}),o($VU,[2,57]),o($VU,[2,59]),o($VU,[2,60]),o($VU,[2,61]),o($VU,[2,62]),o($VV,[2,150]),o($VV,[2,151]),o($VV,[2,152]),o($VV,[2,153]),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]),{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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},o($VY,$V4,{5:126}),o($VZ,[2,92]),o($VZ,[2,94]),o($VZ,[2,139]),o($VZ,[2,140]),o($VZ,[2,141]),o($VZ,[2,142]),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,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,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},{78:[1,136],81:[1,137]},{13:$V9,18:$Va,35:139,44:30,45:32,46:$Vc,78:[1,138],81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},{13:$V9,18:$Va,35:140,44:30,45:32,46:$Vc,81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},{13:$V9,18:$Va,35:141,44:30,45:32,46:$Vc,81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},{10:[1,167],13:$V9,18:$Va,44:114,45:32,46:$Vc,81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},{10:[1,173],13:$V9,18:$Va,44:114,45:32,46:$Vc,81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},{10:[1,174],13:$V9,18:$Va,44:114,45:32,46:$Vc,81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$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,83:$V51,84:184,86:185,87:$V61,88:$V71,89:$V81,90:$V91,91:$Va1},{10:$V01,46:$V11,71:$V21,79:197,80:$V31,81:$V41,83:$V51,84:184,86:185,87:$V61,88:$V71,89:$V81,90:$V91,91:$Va1},{10:$V01,46:$V11,71:$V21,79:198,80:$V31,81:$V41,83:$V51,84:184,86:185,87:$V61,88:$V71,89:$V81,90:$V91,91:$Va1},{10:$V01,46:$V11,71:$V21,79:199,80:$V31,81:$V41,83:$V51,84:184,86:185,87:$V61,88:$V71,89:$V81,90:$V91,91:$Va1},{10:$V01,46:$V11,71:$V21,79:200,80:$V31,81:$V41,83:$V51,84:184,86:185,87:$V61,88:$V71,89:$V81,90:$V91,91:$Va1},{10:$V01,46:$V11,71:$V21,79:201,80:$V31,81:$V41,83:$V51,84:184,86:185,87:$V61,88:$V71,89:$V81,90:$V91,91:$Va1},{13:$V9,18:$Va,35:202,44:30,45:32,46:$Vc,81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},{13:$V9,18:$Va,35:203,44:30,45:32,46:$Vc,67:[1,204],81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},o($VS,[2,43],{21:205,10:$VT}),{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,39:[1,206],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,83:$VQ,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs},o($VS,[2,49],{21:207,10:$VT}),o($VS,[2,47],{21:208,10:$VT}),o($VS,[2,51],{21:209,10:$VT}),o($VS,[2,53],{21:210,10:$VT}),o($Vt,[2,36]),o([10,13,18,46,81,85,87,88,90,91,93,94,95,96,97],[2,91]),o($VR,[2,117],{85:$Vb1}),o($Vc1,[2,122],{86:212,10:$V01,46:$V11,71:$V21,80:$V31,81:$V41,83:$V51,87:$V61,88:$V71,89:$V81,90:$V91,91:$Va1}),o($Vd1,[2,124]),o($Vd1,[2,126]),o($Vd1,[2,127]),o($Vd1,[2,128]),o($Vd1,[2,129]),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($VR,[2,118],{85:$Vb1}),o($VR,[2,119],{85:$Vb1}),o($VR,[2,120],{85:$Vb1}),o($VR,[2,110],{85:$Vb1}),o($VR,[2,111],{85:$Vb1}),o($VR,[2,112],{45:32,44:114,13:$V9,18:$Va,46:$Vc,81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs}),o($VR,[2,113],{45:32,44:114,10:[1,213],13:$V9,18:$Va,46:$Vc,81:$Vi,85:$Vj,87:$Vk,88:$Vl,90:$Vm,91:$Vn,93:$Vo,94:$Vp,95:$Vq,96:$Vr,97:$Vs}),o($VR,[2,115],{10:[1,214]}),o($VS,[2,44]),{39:[1,215]},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,83:$V51,84:216,86:185,87:$V61,88:$V71,89:$V81,90:$V91,91:$Va1},o($Vd1,[2,125]),{67:[1,217]},{67:[1,218]},o($VS,[2,45],{21:219,10:$VT}),o($Vc1,[2,123],{86:212,10:$V01,46:$V11,71:$V21,80:$V31,81:$V41,83:$V51,87:$V61,88:$V71,89:$V81,90:$V91,91:$Va1}),o($VR,[2,114]),o($VR,[2,116]),o($VS,[2,46])],
+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})],
 defaultActions: {},
@@ -315,3 +321,3 @@ parseError: function parseError(str, hash) {
         }
-        _parseError.prototype = new Error();
+        _parseError.prototype = Error;
 
@@ -801,15 +807,15 @@ throw new _parseError(str, hash);
 break;
-case 7:return 73;
+case 7:return 82;
 break;
-case 8:return 74;
+case 8:return 73;
 break;
-case 9:return 75;
+case 9:return 74;
 break;
-case 10:return 12;
+case 10:return 75;
 break;
-case 11:return 30;
+case 11:return 12;
 break;
-case 12:return 32;
+case 12:return 30;
 break;
-case 13:return 13;
+case 13:return 32;
 break;
@@ -826,108 +832,110 @@ case 14:return 13;
 break;
-case 19:return 81;
+case 19:return 13;
 break;
-case 20:return 90;
+case 20:return 81;
 break;
-case 21:return 88;
+case 21:return 91;
 break;
-case 22:return 8;
+case 22:return 89;
 break;
-case 23:return 85;
+case 23:return 8;
 break;
-case 24:return 97;
+case 24:return 86;
 break;
-case 25:return 16;
+case 25:return 98;
 break;
-case 26:return 15;
+case 26:return 16;
 break;
-case 27:return 17;
+case 27:return 15;
 break;
-case 28:return 18;
+case 28:return 17;
 break;
-case 29:return 53;
+case 29:return 18;
 break;
-case 30:return 51;
+case 30:return 53;
 break;
-case 31:return 52;
+case 31:return 51;
 break;
-case 32:return 54;
+case 32:return 52;
 break;
-case 33:return 58;
+case 33:return 54;
 break;
-case 34:return 56;
+case 34:return 58;
 break;
-case 35:return 57;
+case 35:return 56;
 break;
-case 36:return 59;
+case 36:return 57;
 break;
-case 37:return 58;
+case 37:return 59;
 break;
-case 38:return 56;
+case 38:return 58;
 break;
-case 39:return 57;
+case 39:return 56;
 break;
-case 40:return 59;
+case 40:return 57;
 break;
-case 41:return 63;
+case 41:return 59;
 break;
-case 42:return 61;
+case 42:return 63;
 break;
-case 43:return 62;
+case 43:return 61;
 break;
-case 44:return 64;
+case 44:return 62;
 break;
-case 45:return 50;
+case 45:return 64;
 break;
-case 46:return 55;
+case 46:return 50;
 break;
-case 47:return 60;
+case 47:return 55;
 break;
-case 48:return 40;
+case 48:return 60;
 break;
-case 49:return 41;
+case 49:return 40;
 break;
-case 50:return 46;
+case 50:return 41;
 break;
-case 51:return 91;
+case 51:return 46;
 break;
-case 52:return 95;
+case 52:return 92;
 break;
-case 53:return 83;
+case 53:return 96;
 break;
-case 54:return 96;
+case 54:return 84;
 break;
-case 55:return 96;
+case 55:return 97;
 break;
-case 56:return 87;
+case 56:return 97;
 break;
-case 57:return 93;
+case 57:return 88;
 break;
 case 58:return 94;
 break;
-case 59:return 65;
+case 59:return 95;
 break;
-case 60:return 38;
+case 60:return 65;
 break;
-case 61:return 39;
+case 61:return 38;
 break;
-case 62:return 36;
+case 62:return 39;
 break;
-case 63:return 37;
+case 63:return 36;
 break;
-case 64:return 42
+case 64:return 37;
 break;
-case 65:return 43
+case 65:return 42
 break;
-case 66:return 100;
+case 66:return 43
 break;
-case 67:return 9;
+case 67:return 101;
 break;
-case 68:return 10;
+case 68:return 9;
 break;
-case 69:return 11;
+case 69:return 10;
 break;
+case 70:return 11;
+break;
 }
 },
-rules: [/^(?:%%[^\n]*)/,/^(?:["])/,/^(?:["])/,/^(?:[^"]*)/,/^(?:style\b)/,/^(?:default\b)/,/^(?:linkStyle\b)/,/^(?:classDef\b)/,/^(?:class\b)/,/^(?:click\b)/,/^(?:graph\b)/,/^(?:subgraph\b)/,/^(?:end\b\s*)/,/^(?:LR\b)/,/^(?:RL\b)/,/^(?:TB\b)/,/^(?:BT\b)/,/^(?:TD\b)/,/^(?:BR\b)/,/^(?:[0-9]+)/,/^(?:#)/,/^(?::)/,/^(?:;)/,/^(?:,)/,/^(?:\*)/,/^(?:<)/,/^(?:>)/,/^(?:\^)/,/^(?:v\b)/,/^(?:\s*--[x]\s*)/,/^(?:\s*-->\s*)/,/^(?:\s*--[o]\s*)/,/^(?:\s*---\s*)/,/^(?:\s*-\.-[x]\s*)/,/^(?:\s*-\.->\s*)/,/^(?:\s*-\.-[o]\s*)/,/^(?:\s*-\.-\s*)/,/^(?:\s*.-[x]\s*)/,/^(?:\s*\.->\s*)/,/^(?:\s*\.-[o]\s*)/,/^(?:\s*\.-\s*)/,/^(?:\s*==[x]\s*)/,/^(?:\s*==>\s*)/,/^(?:\s*==[o]\s*)/,/^(?:\s*==[\=]\s*)/,/^(?:\s*--\s*)/,/^(?:\s*-\.\s*)/,/^(?:\s*==\s*)/,/^(?:\(-)/,/^(?:-\))/,/^(?:-)/,/^(?:\.)/,/^(?:\+)/,/^(?:%)/,/^(?:=)/,/^(?:=)/,/^(?:[A-Za-z]+)/,/^(?:[!"#$%&'*+,-.`?\\_\/])/,/^(?:[\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: {"string":{"rules":[2,3],"inclusive":false},"INITIAL":{"rules":[0,1,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,61,62,63,64,65,66,67,68,69],"inclusive":true}}
+rules: [/^(?:%%[^\n]*)/,/^(?:["])/,/^(?:["])/,/^(?:[^"]*)/,/^(?:style\b)/,/^(?:default\b)/,/^(?:linkStyle\b)/,/^(?:interpolate\b)/,/^(?:classDef\b)/,/^(?:class\b)/,/^(?:click\b)/,/^(?:graph\b)/,/^(?:subgraph\b)/,/^(?:end\b\s*)/,/^(?:LR\b)/,/^(?:RL\b)/,/^(?:TB\b)/,/^(?:BT\b)/,/^(?:TD\b)/,/^(?:BR\b)/,/^(?:[0-9]+)/,/^(?:#)/,/^(?::)/,/^(?:;)/,/^(?:,)/,/^(?:\*)/,/^(?:<)/,/^(?:>)/,/^(?:\^)/,/^(?:v\b)/,/^(?:\s*--[x]\s*)/,/^(?:\s*-->\s*)/,/^(?:\s*--[o]\s*)/,/^(?:\s*---\s*)/,/^(?:\s*-\.-[x]\s*)/,/^(?:\s*-\.->\s*)/,/^(?:\s*-\.-[o]\s*)/,/^(?:\s*-\.-\s*)/,/^(?:\s*.-[x]\s*)/,/^(?:\s*\.->\s*)/,/^(?:\s*\.-[o]\s*)/,/^(?:\s*\.-\s*)/,/^(?:\s*==[x]\s*)/,/^(?:\s*==>\s*)/,/^(?:\s*==[o]\s*)/,/^(?:\s*==[\=]\s*)/,/^(?:\s*--\s*)/,/^(?:\s*-\.\s*)/,/^(?:\s*==\s*)/,/^(?:\(-)/,/^(?:-\))/,/^(?:-)/,/^(?:\.)/,/^(?:\+)/,/^(?:%)/,/^(?:=)/,/^(?:=)/,/^(?:[A-Za-z]+)/,/^(?:[!"#$%&'*+,-.`?\\_\/])/,/^(?:[\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: {"string":{"rules":[2,3],"inclusive":false},"INITIAL":{"rules":[0,1,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,61,62,63,64,65,66,67,68,69,70],"inclusive":true}}
 });
@@ -946,5 +954,5 @@ return lexer;
 if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
-exports.parser = flow;
-exports.Parser = flow.Parser;
-exports.parse = function () { return flow.parse.apply(flow, arguments); };
+exports.parser = parser;
+exports.Parser = parser.Parser;
+exports.parse = function () { return parser.parse.apply(parser, arguments); };
 exports.main = function commonjsMain(args) {
@@ -951,0 +959,0 @@ if (!args[1]) {

src/diagrams/flowchart/parser/flow.spec.js

@@ -458,2 +458,54 @@ /**
 
+    it('should handle line interpolation default definitions',function(){
+        var res = flow.parser.parse('graph TD\n' +
+        'A-->B\n' +
+        'linkStyle default interpolate basis');
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+
+
+        expect(edges.defaultInterpolate).toBe('basis');
+    });
+
+    it('should handle line interpolation numbered definitions',function(){
+        var res = flow.parser.parse('graph TD\n' +
+        'A-->B\n' +
+        'A-->C\n' +
+        'linkStyle 0 interpolate basis\n' +
+        'linkStyle 1 interpolate cardinal');
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+
+        expect(edges[0].interpolate).toBe('basis');
+        expect(edges[1].interpolate).toBe('cardinal');
+    });
+
+    it('should handle line interpolation default with style',function(){
+        var res = flow.parser.parse('graph TD\n' +
+        'A-->B\n' +
+        'linkStyle default interpolate basis stroke-width:1px;');
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+
+
+        expect(edges.defaultInterpolate).toBe('basis');
+    });
+
+    it('should handle line interpolation numbered with style',function(){
+        var res = flow.parser.parse('graph TD\n' +
+        'A-->B\n' +
+        'A-->C\n' +
+        'linkStyle 0 interpolate basis stroke-width:1px;\n' +
+        'linkStyle 1 interpolate cardinal stroke-width:1px;');
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+
+        expect(edges[0].interpolate).toBe('basis');
+        expect(edges[1].interpolate).toBe('cardinal');
+    });
+
     describe('it should handle interaction, ',function(){
@@ -460,0 +512,0 @@

src/diagrams/gantt/ganttRenderer.js

@@ -13,3 +13,4 @@ var gantt = require('./parser/gantt').parser;
     topPadding: 50,
-    sidePadding: 75,
+    rightPadding: 75,
+    leftPadding: 75,
     gridLineStartPadding: 35,
@@ -72,3 +73,3 @@ fontSize: 11,
             })])
-        .rangeRound([0, w - 150]);
+        .rangeRound([0, w - conf.leftPadding - conf.rightPadding]);
         //.nice(d3.time.monday);
@@ -107,3 +108,3 @@
         var topPadding = conf.topPadding;
-        var sidePadding = conf.sidePadding;
+        var leftPadding = conf.leftPadding;
 
@@ -115,6 +116,6 @@ var colorScale = d3.scale.linear()
 
-        makeGrid(sidePadding, topPadding, pageWidth, pageHeight);
-        drawRects(tasks, gap, topPadding, sidePadding, barHeight, colorScale, pageWidth, pageHeight);
-        vertLabels(gap, topPadding, sidePadding, barHeight, colorScale);
-        drawToday(sidePadding, topPadding, pageWidth, pageHeight);
+        makeGrid(leftPadding, topPadding, pageWidth, pageHeight);
+        drawRects(tasks, gap, topPadding, leftPadding, barHeight, colorScale, pageWidth, pageHeight);
+        vertLabels(gap, topPadding, leftPadding, barHeight, colorScale);
+        drawToday(leftPadding, topPadding, pageWidth, pageHeight);
 
@@ -136,3 +137,3 @@ }
             .attr('width', function () {
-                return w - theSidePad / 2;
+                return w - conf.rightPadding / 2;
             })
@@ -219,3 +220,3 @@ .attr('height', theGap)
                 if (textWidth > (endX - startX)) {
-                    if (endX + textWidth  + 1.5*conf.sidePadding> w) {
+                    if (endX + textWidth  + 1.5*conf.leftPadding> w) {
                         return startX + theSidePad - 5;
@@ -268,3 +269,3 @@ } else {
                 if (textWidth > (endX - startX)) {
-                    if (endX + textWidth + 1.5*conf.sidePadding > w) {
+                    if (endX + textWidth + 1.5*conf.leftPadding > w) {
                         return 'taskTextOutsideLeft taskTextOutside' + secNum + ' ' + taskType;
@@ -434,2 +435,2 @@ } else {
     }
-};
+};

src/diagrams/gantt/parser/gantt.js

@@ -1,2 +0,2 @@
-/* parser generated by jison 0.4.15 */
+/* parser generated by jison 0.4.17 */
 /*
@@ -74,3 +74,3 @@ Returns a Parser object of the following structure:
 */
-var gantt = (function(){
+var parser = (function(){
 var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[6,8,10,11,12,13,14],$V1=[1,9],$V2=[1,10],$V3=[1,11],$V4=[1,12];
@@ -126,3 +126,3 @@ var parser = {trace: function trace() { },
         }
-        _parseError.prototype = new Error();
+        _parseError.prototype = Error;
 
@@ -644,5 +644,5 @@ throw new _parseError(str, hash);
 if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
-exports.parser = gantt;
-exports.Parser = gantt.Parser;
-exports.parse = function () { return gantt.parse.apply(gantt, arguments); };
+exports.parser = parser;
+exports.Parser = parser.Parser;
+exports.parse = function () { return parser.parse.apply(parser, arguments); };
 exports.main = function commonjsMain(args) {
@@ -649,0 +649,0 @@ if (!args[1]) {

src/diagrams/sequenceDiagram/parser/sequenceDiagram.js

@@ -1,2 +0,2 @@
-/* parser generated by jison 0.4.15 */
+/* parser generated by jison 0.4.17 */
 /*
@@ -74,9 +74,9 @@ Returns a Parser object of the following structure:
 */
-var sequenceDiagram = (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[2,2],$V1=[1,5],$V2=[1,7],$V3=[1,8],$V4=[1,11],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,16],$V9=[1,17],$Va=[1,7,9,10,16,18,19,20,21,22,23,33],$Vb=[7,9,10,16,18,19,20,21,23,33],$Vc=[1,53];
+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,2],$V1=[1,3],$V2=[1,4],$V3=[2,4],$V4=[1,9],$V5=[1,11],$V6=[1,12],$V7=[1,14],$V8=[1,15],$V9=[1,17],$Va=[1,18],$Vb=[1,19],$Vc=[1,20],$Vd=[1,22],$Ve=[1,23],$Vf=[1,4,5,10,15,16,18,20,21,22,23,24,25,36],$Vg=[1,31],$Vh=[4,5,10,15,16,18,20,21,22,23,25,36],$Vi=[34,35,36];
 var parser = {trace: function trace() { },
 yy: {},
-symbols_: {"error":2,"start":3,"SD":4,"document":5,"line":6,"SPACE":7,"statement":8,"NL":9,"participant":10,"actor":11,"AS":12,"restOfLine":13,"signal":14,"note_statement":15,"title":16,"text":17,"loop":18,"end":19,"opt":20,"alt":21,"else":22,"note":23,"placement":24,"text2":25,"over":26,"actor_pair":27,"spaceList":28,",":29,"left_of":30,"right_of":31,"signaltype":32,"ACTOR":33,"SOLID_OPEN_ARROW":34,"DOTTED_OPEN_ARROW":35,"SOLID_ARROW":36,"DOTTED_ARROW":37,"SOLID_CROSS":38,"DOTTED_CROSS":39,"TXT":40,"$accept":0,"$end":1},
-terminals_: {2:"error",4:"SD",7:"SPACE",9:"NL",10:"participant",12:"AS",13:"restOfLine",16:"title",17:"text",18:"loop",19:"end",20:"opt",21:"alt",22:"else",23:"note",26:"over",29:",",30:"left_of",31:"right_of",33:"ACTOR",34:"SOLID_OPEN_ARROW",35:"DOTTED_OPEN_ARROW",36:"SOLID_ARROW",37:"DOTTED_ARROW",38:"SOLID_CROSS",39:"DOTTED_CROSS",40:"TXT"},
-productions_: [0,[3,2],[5,0],[5,2],[6,2],[6,1],[6,1],[8,5],[8,3],[8,2],[8,2],[8,4],[8,4],[8,4],[8,7],[15,4],[15,4],[28,2],[28,1],[27,3],[27,1],[24,1],[24,1],[14,4],[11,1],[32,1],[32,1],[32,1],[32,1],[32,1],[32,1],[25,1]],
+symbols_: {"error":2,"start":3,"SPACE":4,"NL":5,"SD":6,"document":7,"line":8,"statement":9,"participant":10,"actor":11,"AS":12,"restOfLine":13,"signal":14,"activate":15,"deactivate":16,"note_statement":17,"title":18,"text2":19,"loop":20,"end":21,"opt":22,"alt":23,"else":24,"note":25,"placement":26,"over":27,"actor_pair":28,"spaceList":29,",":30,"left_of":31,"right_of":32,"signaltype":33,"+":34,"-":35,"ACTOR":36,"SOLID_OPEN_ARROW":37,"DOTTED_OPEN_ARROW":38,"SOLID_ARROW":39,"DOTTED_ARROW":40,"SOLID_CROSS":41,"DOTTED_CROSS":42,"TXT":43,"$accept":0,"$end":1},
+terminals_: {2:"error",4:"SPACE",5:"NL",6:"SD",10:"participant",12:"AS",13:"restOfLine",15:"activate",16:"deactivate",18:"title",20:"loop",21:"end",22:"opt",23:"alt",24:"else",25:"note",27:"over",30:",",31:"left_of",32:"right_of",34:"+",35:"-",36:"ACTOR",37:"SOLID_OPEN_ARROW",38:"DOTTED_OPEN_ARROW",39:"SOLID_ARROW",40:"DOTTED_ARROW",41:"SOLID_CROSS",42:"DOTTED_CROSS",43:"TXT"},
+productions_: [0,[3,2],[3,2],[3,2],[7,0],[7,2],[8,2],[8,1],[8,1],[9,5],[9,3],[9,2],[9,3],[9,3],[9,2],[9,3],[9,4],[9,4],[9,7],[17,4],[17,4],[29,2],[29,1],[28,3],[28,1],[26,1],[26,1],[14,5],[14,5],[14,4],[11,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[19,1]],
 performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
@@ -87,24 +87,33 @@ /* this == yyval */
 switch (yystate) {
-case 1:
+case 3:
  yy.apply($$[$0]);return $$[$0]; 
 break;
-case 2:
+case 4:
  this.$ = [] 
 break;
-case 3:
+case 5:
 $$[$0-1].push($$[$0]);this.$ = $$[$0-1]
 break;
-case 4: case 5:
+case 6: case 7:
  this.$ = $$[$0] 
 break;
-case 6:
+case 8:
  this.$=[];
 break;
-case 7:
+case 9:
 $$[$0-3].description=$$[$0-1]; this.$=$$[$0-3];
 break;
-case 8:
+case 10:
 this.$=$$[$0-1];
 break;
 case 12:
+this.$={type: 'activeStart', signalType: yy.LINETYPE.ACTIVE_START, actor: $$[$0-1]};
+break;
+case 13:
+this.$={type: 'activeEnd', signalType: yy.LINETYPE.ACTIVE_END, actor: $$[$0-1]};
+break;
+case 15:
+this.$=[{type:'setTitle', text:$$[$0-1]}]
+break;
+case 16:
 
@@ -115,3 +124,3 @@ $$[$0-1].unshift({type: 'loopStart', loopText:$$[$0-2], signalType: yy.LINETYPE.LOOP_START});
 break;
-case 13:
+case 17:
 
@@ -122,3 +131,3 @@ $$[$0-1].unshift({type: 'optStart', optText:$$[$0-2], signalType: yy.LINETYPE.OPT_START});
 break;
-case 14:
+case 18:
 
@@ -137,7 +146,7 @@ // Alt start
 break;
-case 15:
+case 19:
 
 		this.$ = [$$[$0-1], {type:'addNote', placement:$$[$0-2], actor:$$[$0-1].actor, text:$$[$0]}];
 break;
-case 16:
+case 20:
 
@@ -150,39 +159,49 @@ // Coerce actor_pair into a [to, from, ...] array
 break;
-case 19:
+case 23:
  this.$ = [$$[$0-2], $$[$0]]; 
 break;
-case 20:
+case 24:
  this.$ = $$[$0]; 
 break;
-case 21:
+case 25:
  this.$ = yy.PLACEMENT.LEFTOF; 
 break;
-case 22:
+case 26:
  this.$ = yy.PLACEMENT.RIGHTOF; 
 break;
-case 23:
-this.$ = [$$[$0-3],$$[$0-1],{type: 'addMessage', from:$$[$0-3].actor, to:$$[$0-1].actor, signalType:$$[$0-2], msg:$$[$0]}]
+case 27:
+ this.$ = [$$[$0-4],$$[$0-1],{type: 'addMessage', from:$$[$0-4].actor, to:$$[$0-1].actor, signalType:$$[$0-3], msg:$$[$0]},
+	              {type: 'activeStart', signalType: yy.LINETYPE.ACTIVE_START, actor: $$[$0-1]}
+	             ]
 break;
-case 24:
+case 28:
+ this.$ = [$$[$0-4],$$[$0-1],{type: 'addMessage', from:$$[$0-4].actor, to:$$[$0-1].actor, signalType:$$[$0-3], msg:$$[$0]},
+	             {type: 'activeEnd', signalType: yy.LINETYPE.ACTIVE_END, actor: $$[$0-4]}
+	             ]
+break;
+case 29:
+ this.$ = [$$[$0-3],$$[$0-1],{type: 'addMessage', from:$$[$0-3].actor, to:$$[$0-1].actor, signalType:$$[$0-2], msg:$$[$0]}]
+break;
+case 30:
 this.$={type: 'addActor', actor:$$[$0]}
 break;
-case 25:
+case 31:
  this.$ = yy.LINETYPE.SOLID_OPEN; 
 break;
-case 26:
+case 32:
  this.$ = yy.LINETYPE.DOTTED_OPEN; 
 break;
-case 27:
+case 33:
  this.$ = yy.LINETYPE.SOLID; 
 break;
-case 28:
+case 34:
  this.$ = yy.LINETYPE.DOTTED; 
 break;
-case 29:
+case 35:
  this.$ = yy.LINETYPE.SOLID_CROSS; 
 break;
-case 30:
+case 36:
  this.$ = yy.LINETYPE.DOTTED_CROSS; 
 break;
-case 31:
+case 37:
 this.$ = $$[$0].substring(1).trim().replace(/\\n/gm, "\n");
@@ -192,4 +211,4 @@ break;
 },
-table: [{3:1,4:[1,2]},{1:[3]},o([1,7,9,10,16,18,20,21,23,33],$V0,{5:3}),{1:[2,1],6:4,7:$V1,8:6,9:$V2,10:$V3,11:15,14:9,15:10,16:$V4,18:$V5,20:$V6,21:$V7,23:$V8,33:$V9},o($Va,[2,3]),{8:18,10:$V3,11:15,14:9,15:10,16:$V4,18:$V5,20:$V6,21:$V7,23:$V8,33:$V9},o($Va,[2,5]),o($Va,[2,6]),{11:19,33:$V9},{9:[1,20]},{9:[1,21]},{7:[1,22]},{13:[1,23]},{13:[1,24]},{13:[1,25]},{32:26,34:[1,27],35:[1,28],36:[1,29],37:[1,30],38:[1,31],39:[1,32]},{24:33,26:[1,34],30:[1,35],31:[1,36]},o([9,12,29,34,35,36,37,38,39,40],[2,24]),o($Va,[2,4]),{9:[1,38],12:[1,37]},o($Va,[2,9]),o($Va,[2,10]),{17:[1,39]},o($Vb,$V0,{5:40}),o($Vb,$V0,{5:41}),o([7,9,10,16,18,20,21,22,23,33],$V0,{5:42}),{11:43,33:$V9},{33:[2,25]},{33:[2,26]},{33:[2,27]},{33:[2,28]},{33:[2,29]},{33:[2,30]},{11:44,33:$V9},{11:46,27:45,33:$V9},{33:[2,21]},{33:[2,22]},{13:[1,47]},o($Va,[2,8]),{9:[1,48]},{6:4,7:$V1,8:6,9:$V2,10:$V3,11:15,14:9,15:10,16:$V4,18:$V5,19:[1,49],20:$V6,21:$V7,23:$V8,33:$V9},{6:4,7:$V1,8:6,9:$V2,10:$V3,11:15,14:9,15:10,16:$V4,18:$V5,19:[1,50],20:$V6,21:$V7,23:$V8,33:$V9},{6:4,7:$V1,8:6,9:$V2,10:$V3,11:15,14:9,15:10,16:$V4,18:$V5,20:$V6,21:$V7,22:[1,51],23:$V8,33:$V9},{25:52,40:$Vc},{25:54,40:$Vc},{25:55,40:$Vc},{29:[1,56],40:[2,20]},{9:[1,57]},o($Va,[2,11]),o($Va,[2,12]),o($Va,[2,13]),{13:[1,58]},{9:[2,23]},{9:[2,31]},{9:[2,15]},{9:[2,16]},{11:59,33:$V9},o($Va,[2,7]),o($Vb,$V0,{5:60}),{40:[2,19]},{6:4,7:$V1,8:6,9:$V2,10:$V3,11:15,14:9,15:10,16:$V4,18:$V5,19:[1,61],20:$V6,21:$V7,23:$V8,33:$V9},o($Va,[2,14])],
-defaultActions: {27:[2,25],28:[2,26],29:[2,27],30:[2,28],31:[2,29],32:[2,30],35:[2,21],36:[2,22],52:[2,23],53:[2,31],54:[2,15],55:[2,16],59:[2,19]},
+table: [{3:1,4:$V0,5:$V1,6:$V2},{1:[3]},{3:5,4:$V0,5:$V1,6:$V2},{3:6,4:$V0,5:$V1,6:$V2},o([1,4,5,10,15,16,18,20,22,23,25,36],$V3,{7:7}),{1:[2,1]},{1:[2,2]},{1:[2,3],4:$V4,5:$V5,8:8,9:10,10:$V6,11:21,14:13,15:$V7,16:$V8,17:16,18:$V9,20:$Va,22:$Vb,23:$Vc,25:$Vd,36:$Ve},o($Vf,[2,5]),{9:24,10:$V6,11:21,14:13,15:$V7,16:$V8,17:16,18:$V9,20:$Va,22:$Vb,23:$Vc,25:$Vd,36:$Ve},o($Vf,[2,7]),o($Vf,[2,8]),{11:25,36:$Ve},{5:[1,26]},{11:27,36:$Ve},{11:28,36:$Ve},{5:[1,29]},{19:30,43:$Vg},{13:[1,32]},{13:[1,33]},{13:[1,34]},{33:35,37:[1,36],38:[1,37],39:[1,38],40:[1,39],41:[1,40],42:[1,41]},{26:42,27:[1,43],31:[1,44],32:[1,45]},o([5,12,30,37,38,39,40,41,42,43],[2,30]),o($Vf,[2,6]),{5:[1,47],12:[1,46]},o($Vf,[2,11]),{5:[1,48]},{5:[1,49]},o($Vf,[2,14]),{5:[1,50]},{5:[2,37]},o($Vh,$V3,{7:51}),o($Vh,$V3,{7:52}),o([4,5,10,15,16,18,20,22,23,24,25,36],$V3,{7:53}),{11:56,34:[1,54],35:[1,55],36:$Ve},o($Vi,[2,31]),o($Vi,[2,32]),o($Vi,[2,33]),o($Vi,[2,34]),o($Vi,[2,35]),o($Vi,[2,36]),{11:57,36:$Ve},{11:59,28:58,36:$Ve},{36:[2,25]},{36:[2,26]},{13:[1,60]},o($Vf,[2,10]),o($Vf,[2,12]),o($Vf,[2,13]),o($Vf,[2,15]),{4:$V4,5:$V5,8:8,9:10,10:$V6,11:21,14:13,15:$V7,16:$V8,17:16,18:$V9,20:$Va,21:[1,61],22:$Vb,23:$Vc,25:$Vd,36:$Ve},{4:$V4,5:$V5,8:8,9:10,10:$V6,11:21,14:13,15:$V7,16:$V8,17:16,18:$V9,20:$Va,21:[1,62],22:$Vb,23:$Vc,25:$Vd,36:$Ve},{4:$V4,5:$V5,8:8,9:10,10:$V6,11:21,14:13,15:$V7,16:$V8,17:16,18:$V9,20:$Va,22:$Vb,23:$Vc,24:[1,63],25:$Vd,36:$Ve},{11:64,36:$Ve},{11:65,36:$Ve},{19:66,43:$Vg},{19:67,43:$Vg},{19:68,43:$Vg},{30:[1,69],43:[2,24]},{5:[1,70]},o($Vf,[2,16]),o($Vf,[2,17]),{13:[1,71]},{19:72,43:$Vg},{19:73,43:$Vg},{5:[2,29]},{5:[2,19]},{5:[2,20]},{11:74,36:$Ve},o($Vf,[2,9]),o($Vh,$V3,{7:75}),{5:[2,27]},{5:[2,28]},{43:[2,23]},{4:$V4,5:$V5,8:8,9:10,10:$V6,11:21,14:13,15:$V7,16:$V8,17:16,18:$V9,20:$Va,21:[1,76],22:$Vb,23:$Vc,25:$Vd,36:$Ve},o($Vf,[2,18])],
+defaultActions: {5:[2,1],6:[2,2],31:[2,37],44:[2,25],45:[2,26],66:[2,29],67:[2,19],68:[2,20],72:[2,27],73:[2,28],74:[2,23]},
 parseError: function parseError(str, hash) {
@@ -203,3 +222,3 @@ if (hash.recoverable) {
         }
-        _parseError.prototype = new Error();
+        _parseError.prototype = Error;
 
@@ -675,3 +694,3 @@ throw new _parseError(str, hash);
 switch($avoiding_name_collisions) {
-case 0:return 9;
+case 0:return 5;
 break;
@@ -688,60 +707,68 @@ case 1:/* skip all whitespace */
 break;
-case 6: this.begin('ALIAS'); return 33; 
+case 6: this.begin('ALIAS'); return 36; 
 break;
 case 7: this.popState(); this.popState(); this.begin('LINE'); return 12; 
 break;
-case 8: this.popState(); this.popState(); return 9; 
+case 8: this.popState(); this.popState(); return 5; 
 break;
-case 9: this.begin('LINE'); return 18; 
+case 9: this.begin('LINE'); return 20; 
 break;
-case 10: this.begin('LINE'); return 20; 
+case 10: this.begin('LINE'); return 22; 
 break;
-case 11: this.begin('LINE'); return 21; 
+case 11: this.begin('LINE'); return 23; 
 break;
-case 12: this.begin('LINE'); return 22; 
+case 12: this.begin('LINE'); return 24; 
 break;
 case 13: this.popState(); return 13; 
 break;
-case 14:return 19;
+case 14:return 21;
 break;
-case 15:return 30;
+case 15:return 31;
 break;
-case 16:return 31;
+case 16:return 32;
 break;
-case 17:return 26;
+case 17:return 27;
 break;
-case 18:return 23;
+case 18:return 25;
 break;
-case 19:return 16;
+case 19: this.begin('ID'); return 15; 
 break;
-case 20:return 4;
+case 20: this.begin('ID'); return 16; 
 break;
-case 21:return 29;
+case 21:return 18;
 break;
-case 22:return 9;
+case 22:return 6;
 break;
-case 23:return 33;
+case 23:return 30;
 break;
-case 24:return 36;
+case 24:return 5;
 break;
-case 25:return 37;
+case 25: yy_.yytext = yy_.yytext.trim(); return 36; 
 break;
-case 26:return 34;
+case 26:return 39;
 break;
-case 27:return 35;
+case 27:return 40;
 break;
-case 28:return 38;
+case 28:return 37;
 break;
-case 29:return 39;
+case 29:return 38;
 break;
-case 30:return 40;
+case 30:return 41;
 break;
-case 31:return 9;
+case 31:return 42;
 break;
-case 32:return 'INVALID';
+case 32:return 43;
 break;
+case 33:return 34;
+break;
+case 34:return 35;
+break;
+case 35:return 5;
+break;
+case 36:return 'INVALID';
+break;
 }
 },
-rules: [/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:((?!\n)\s)+)/i,/^(?:#[^\n]*)/i,/^(?:%[^\n]*)/i,/^(?:participant\b)/i,/^(?:[^\->:\n,;]+?(?=((?!\n)\s)+as(?!\n)\s|[#\n;]|$))/i,/^(?:as\b)/i,/^(?:(?:))/i,/^(?:loop\b)/i,/^(?:opt\b)/i,/^(?:alt\b)/i,/^(?:else\b)/i,/^(?:[^#\n;]*)/i,/^(?:end\b)/i,/^(?:left of\b)/i,/^(?:right of\b)/i,/^(?:over\b)/i,/^(?:note\b)/i,/^(?:title\b)/i,/^(?:sequenceDiagram\b)/i,/^(?:,)/i,/^(?:;)/i,/^(?:[^\->:\n,;]+)/i,/^(?:->>)/i,/^(?:-->>)/i,/^(?:->)/i,/^(?:-->)/i,/^(?:-[x])/i,/^(?:--[x])/i,/^(?::[^#\n;]+)/i,/^(?:$)/i,/^(?:.)/i],
-conditions: {"LINE":{"rules":[2,3,13],"inclusive":false},"ALIAS":{"rules":[2,3,7,8],"inclusive":false},"ID":{"rules":[2,3,6],"inclusive":false},"INITIAL":{"rules":[0,1,3,4,5,9,10,11,12,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32],"inclusive":true}}
+rules: [/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:((?!\n)\s)+)/i,/^(?:#[^\n]*)/i,/^(?:%[^\n]*)/i,/^(?:participant\b)/i,/^(?:[^\->:\n,;]+?(?=((?!\n)\s)+as(?!\n)\s|[#\n;]|$))/i,/^(?:as\b)/i,/^(?:(?:))/i,/^(?:loop\b)/i,/^(?:opt\b)/i,/^(?:alt\b)/i,/^(?:else\b)/i,/^(?:[^#\n;]*)/i,/^(?:end\b)/i,/^(?:left of\b)/i,/^(?:right of\b)/i,/^(?:over\b)/i,/^(?:note\b)/i,/^(?:activate\b)/i,/^(?:deactivate\b)/i,/^(?:title\b)/i,/^(?:sequenceDiagram\b)/i,/^(?:,)/i,/^(?:;)/i,/^(?:[^\+\->:\n,;]+)/i,/^(?:->>)/i,/^(?:-->>)/i,/^(?:->)/i,/^(?:-->)/i,/^(?:-[x])/i,/^(?:--[x])/i,/^(?::[^#\n;]+)/i,/^(?:\+)/i,/^(?:-)/i,/^(?:$)/i,/^(?:.)/i],
+conditions: {"LINE":{"rules":[2,3,13],"inclusive":false},"ALIAS":{"rules":[2,3,7,8],"inclusive":false},"ID":{"rules":[2,3,6],"inclusive":false},"INITIAL":{"rules":[0,1,3,4,5,9,10,11,12,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36],"inclusive":true}}
 });
@@ -760,5 +787,5 @@ return lexer;
 if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
-exports.parser = sequenceDiagram;
-exports.Parser = sequenceDiagram.Parser;
-exports.parse = function () { return sequenceDiagram.parse.apply(sequenceDiagram, arguments); };
+exports.parser = parser;
+exports.Parser = parser.Parser;
+exports.parse = function () { return parser.parse.apply(parser, arguments); };
 exports.main = function commonjsMain(args) {
@@ -765,0 +792,0 @@ if (!args[1]) {

src/diagrams/sequenceDiagram/sequenceDb.js

@@ -7,2 +7,3 @@ /**
 var notes     = [];
+var title = '';
 var Logger = require('../../logger');
@@ -49,2 +50,5 @@ var log = new Logger.Log();
 };
+exports.getTitle = function() {
+  return title;
+}
 
@@ -70,3 +74,5 @@ exports.clear = function(){
     OPT_START    : 15 ,
-    OPT_END      : 16
+    OPT_END      : 16 ,
+    ACTIVE_START : 17 ,
+    ACTIVE_END   : 18
 };
@@ -95,3 +101,7 @@
 
+exports.setTitle = function(titleText){
+  title = titleText;
+}
 
+
 exports.parseError = function(err,hash){
@@ -107,3 +117,3 @@ global.mermaidAPI.parseError(err,hash);
     } else {
-        // log.debug(param);
+        // console.info(param);
         switch(param.type){
@@ -113,2 +123,8 @@ case 'addActor':
                 break;
+            case 'activeStart':
+                exports.addSignal(param.actor, undefined, undefined, param.signalType);
+                break;
+            case 'activeEnd':
+                exports.addSignal(param.actor, undefined, undefined, param.signalType);
+                break;
             case 'addNote':
@@ -147,4 +163,6 @@ exports.addNote(param.actor,param.placement, param.text);
                 break;
+            case 'setTitle': 
+                exports.setTitle(param.text);
         }
     }
 };

src/diagrams/sequenceDiagram/sequenceDiagram.spec.js

@@ -54,2 +54,22 @@ var proxyquire = require('proxyquire');
     });
+		it('it should handle a sequenceDiagram definition with a title', function () {
+        str = 'sequenceDiagram\n' +
+        'title: Diagram Title\n' + 
+        'Alice->Bob:Hello Bob, how are you?\n' +
+        'Note right of Bob: Bob thinks\n' +
+        'Bob-->Alice: I am good thanks!';
+
+        sq.parse(str);
+        var actors = sq.yy.getActors();
+        expect(actors.Alice.description).toBe('Alice');
+        actors.Bob.description = 'Bob';
+
+        var messages = sq.yy.getMessages();
+        var title = sq.yy.getTitle();
+
+        expect(messages.length).toBe(3);
+        expect(messages[0].from).toBe('Alice');
+        expect(messages[2].from).toBe('Bob');
+        expect(title).toBe('Diagram Title');
+    });
     it('it should space in actor names', function () {
@@ -134,3 +154,3 @@ str = 'sequenceDiagram\n' +
         var str = 'sequenceDiagram\n' +
-            'Alice-->>Bob:Hello Bob, how are you?';
+          'Alice-->>Bob:Hello Bob, how are you?';
 
@@ -147,2 +167,80 @@ sq.parse(str);
     });
+    it('it should handle actor activation', function () {
+        var str = 'sequenceDiagram\n' +
+          'Alice-->>Bob:Hello Bob, how are you?\n' +
+          'activate Bob\n' +
+          'Bob-->>Alice:Hello Alice, I\'m fine and  you?\n' +
+          'deactivate Bob';
+
+        sq.parse(str);
+        var actors = sq.yy.getActors();
+        expect(actors.Alice.description).toBe('Alice');
+        expect(actors.Bob.description).toBe('Bob');
+
+        var messages = sq.yy.getMessages();
+
+        expect(messages.length).toBe(4);
+        expect(messages[0].type).toBe(sq.yy.LINETYPE.DOTTED);
+        expect(messages[1].type).toBe(sq.yy.LINETYPE.ACTIVE_START);
+        expect(messages[1].from.actor).toBe('Bob');
+        expect(messages[2].type).toBe(sq.yy.LINETYPE.DOTTED);
+        expect(messages[3].type).toBe(sq.yy.LINETYPE.ACTIVE_END);
+        expect(messages[3].from.actor).toBe('Bob');
+    });
+    it('it should handle actor one line notation activation', function () {
+        var str = 'sequenceDiagram\n' +
+          'Alice-->>+Bob:Hello Bob, how are you?\n' +
+          'Bob-->>- Alice:Hello Alice, I\'m fine and  you?';
+
+        sq.parse(str);
+        var actors = sq.yy.getActors();
+        expect(actors.Alice.description).toBe('Alice');
+        expect(actors.Bob.description).toBe('Bob');
+
+        var messages = sq.yy.getMessages();
+
+        expect(messages.length).toBe(4);
+        console.log('msg', messages[0]);
+        expect(messages[0].type).toBe(sq.yy.LINETYPE.DOTTED);
+        console.log('msg', messages[1]);
+        expect(messages[1].type).toBe(sq.yy.LINETYPE.ACTIVE_START);
+        expect(messages[1].from.actor).toBe('Bob');
+        console.log('msg', messages[2]);
+        expect(messages[2].type).toBe(sq.yy.LINETYPE.DOTTED);
+        console.log('msg', messages[3]);
+        expect(messages[3].type).toBe(sq.yy.LINETYPE.ACTIVE_END);
+        expect(messages[3].from.actor).toBe('Bob');
+    });
+    it('it should handle stacked activations', function () {
+        var str = 'sequenceDiagram\n' +
+          'Alice-->>+Bob:Hello Bob, how are you?\n' +
+          'Bob-->>+Carol:Carol, let me introduce Alice?\n' +
+          'Bob-->>- Alice:Hello Alice, please meet Carol?\n' +
+          'Carol->>- Bob:Oh Bob, I\'m so happy to be here!';
+
+        sq.parse(str);
+        var actors = sq.yy.getActors();
+        expect(actors.Alice.description).toBe('Alice');
+        expect(actors.Bob.description).toBe('Bob');
+
+        var messages = sq.yy.getMessages();
+
+        expect(messages.length).toBe(8);
+        console.log('msg', messages[0]);
+        expect(messages[0].type).toBe(sq.yy.LINETYPE.DOTTED);
+        console.log('msg', messages[1]);
+        expect(messages[1].type).toBe(sq.yy.LINETYPE.ACTIVE_START);
+        expect(messages[1].from.actor).toBe('Bob');
+        console.log('msg', messages[2]);
+        expect(messages[2].type).toBe(sq.yy.LINETYPE.DOTTED);
+        console.log('msg', messages[3]);
+        expect(messages[3].type).toBe(sq.yy.LINETYPE.ACTIVE_START);
+        expect(messages[3].from.actor).toBe('Carol');
+        console.log('msg', messages[5]);
+        expect(messages[5].type).toBe(sq.yy.LINETYPE.ACTIVE_END);
+        expect(messages[5].from.actor).toBe('Bob');
+        console.log('msg', messages[7]);
+        expect(messages[7].type).toBe(sq.yy.LINETYPE.ACTIVE_END);
+        expect(messages[7].from.actor).toBe('Carol');
+    });
     it('it should handle comments in a sequenceDiagram', function () {
@@ -149,0 +247,0 @@ str = 'sequenceDiagram\n' +

src/diagrams/sequenceDiagram/sequenceRenderer.js

@@ -15,6 +15,6 @@ /**
     diagramMarginX:50,
-    diagramMarginY:10,
+    diagramMarginY:30,
     // Margin between actors
     actorMargin:50,
-    // Width of actor moxes
+    // Width of actor boxes
     width:150,
@@ -33,3 +33,6 @@ // Height of actor boxes
     // Prolongs the edge of the diagram downwards
-    bottomMarginAdj:1
+    bottomMarginAdj:1,
+
+    // width of activation box
+    activationWidth:10
 };
@@ -47,5 +50,7 @@
 
-    list: [],
+    sequenceItems: [],
+    activations: [],
     init    : function(){
-        this.list = [];
+        this.sequenceItems = [];
+        this.activations = [];
         this.data = {
@@ -66,20 +71,27 @@ startx:undefined,
     },
-    updateLoops:function(startx,starty,stopx,stopy){
+    updateBounds:function(startx,starty,stopx,stopy){
         var _self = this;
         var cnt = 0;
-        this.list.forEach(function(loop){
+        function updateFn(type) { return function updateItemBounds(item) {
             cnt++;
-            // The loop list is a stack so the biggest margins in the beginning of the list
-            var n = _self.list.length-cnt+1;
+            // The loop sequenceItems is a stack so the biggest margins in the beginning of the sequenceItems
+            var n = _self.sequenceItems.length-cnt+1;
 
-            _self.updateVal(loop, 'startx',startx - n*conf.boxMargin, Math.min);
-            _self.updateVal(loop, 'starty',starty - n*conf.boxMargin, Math.min);
-            _self.updateVal(loop, 'stopx' ,stopx  + n*conf.boxMargin, Math.max);
-            _self.updateVal(loop, 'stopy' ,stopy  + n*conf.boxMargin, Math.max);
+            _self.updateVal(item, 'starty',starty - n*conf.boxMargin, Math.min);
+            _self.updateVal(item, 'stopy' ,stopy  + n*conf.boxMargin, Math.max);
 
-            _self.updateVal(exports.bounds.data,'startx',startx - n*conf.boxMargin ,Math.min);
-            _self.updateVal(exports.bounds.data,'starty',starty - n*conf.boxMargin ,Math.min);
-            _self.updateVal(exports.bounds.data,'stopx' ,stopx  + n*conf.boxMargin ,Math.max);
-            _self.updateVal(exports.bounds.data,'stopy' ,stopy  + n*conf.boxMargin ,Math.max);
-        });
+            _self.updateVal(exports.bounds.data, 'startx', startx - n * conf.boxMargin, Math.min);
+            _self.updateVal(exports.bounds.data, 'stopx', stopx + n * conf.boxMargin, Math.max);
+
+            if (!(type == 'activation')) {
+                _self.updateVal(item, 'startx',startx - n*conf.boxMargin, Math.min);
+                _self.updateVal(item, 'stopx' ,stopx  + n*conf.boxMargin, Math.max);
+
+                _self.updateVal(exports.bounds.data, 'starty', starty - n * conf.boxMargin, Math.min);
+                _self.updateVal(exports.bounds.data, 'stopy', stopy + n * conf.boxMargin, Math.max);
+            }
+        }}
+
+        this.sequenceItems.forEach(updateFn());
+        this.activations.forEach(updateFn('activation'));
     },
@@ -100,18 +112,34 @@ insert:function(startx,starty,stopx,stopy){
 
-        this.updateLoops(_startx,_starty,_stopx,_stopy);
+        this.updateBounds(_startx,_starty,_stopx,_stopy);
 
     },
+    newActivation:function(message, diagram){
+        var actorRect = sq.yy.getActors()[message.from.actor];
+        var stackedSize = actorActivations(message.from.actor).length;
+        var x = actorRect.x + conf.width/2 + (stackedSize-1)*conf.activationWidth/2;
+        this.activations.push({startx:x,starty:this.verticalPos+2,stopx:x+conf.activationWidth,stopy:undefined,
+            actor: message.from.actor,
+            anchored: svgDraw.anchorElement(diagram)
+        });
+    },
+    endActivation:function(message){
+        // find most recent activation for given actor
+        var lastActorActivationIdx = this.activations
+          .map(function(activation) { return activation.actor })
+          .lastIndexOf(message.from.actor);
+        var activation = this.activations.splice(lastActorActivationIdx, 1)[0];
+        return activation;
+    },
     newLoop:function(title){
-        this.list.push({startx:undefined,starty:this.verticalPos,stopx:undefined,stopy:undefined, title:title});
+        this.sequenceItems.push({startx:undefined,starty:this.verticalPos,stopx:undefined,stopy:undefined, title:title});
     },
     endLoop:function(){
-        var loop = this.list.pop();
-        //loop.stopy =  exports.bounds.getVerticalPos();
+        var loop = this.sequenceItems.pop();
         return loop;
     },
     addElseToLoop:function(message){
-        var loop = this.list.pop();
+        var loop = this.sequenceItems.pop();
         loop.elsey =  exports.bounds.getVerticalPos();
         loop.elseText = message;
-        this.list.push(loop);
+        this.sequenceItems.push(loop);
     },
@@ -262,3 +290,3 @@ bumpVerticalPos:function(bump){
         actors[key].y = verticalPos;
-        actors[key].width = conf.diagramMarginY;
+        actors[key].width = conf.diagramMarginX;
         actors[key].height = conf.diagramMarginY;
@@ -285,2 +313,19 @@
 };
+
+var actorActivations = function(actor) {
+    return module.exports.bounds.activations.filter(function(activation) {
+        return activation.actor == actor;
+    });
+};
+
+var actorFlowVerticaBounds = function(actor) {
+    // handle multiple stacked activations for same actor
+    var actors = sq.yy.getActors();
+    var activations = actorActivations(actor);
+
+    var left = activations.reduce(function(acc,activation) { return Math.min(acc,activation.startx)}, actors[actor].x + conf.width/2);
+    var right = activations.reduce(function(acc,activation) { return Math.max(acc,activation.stopx)}, actors[actor].x + conf.width/2);
+    return [left,right];
+};
+
 /**
@@ -306,2 +351,3 @@ * Draws a flowchart in the tag with id: id based on the graph definition in text.
     var messages = sq.yy.getMessages();
+    var title = sq.yy.getTitle();
     module.exports.drawActors(diagram, actors, actorKeys, 0);
@@ -313,2 +359,15 @@
 
+    function activeEnd(msg, verticalPos) {
+        var activationData = exports.bounds.endActivation(msg);
+        if(activationData.starty + 18 > verticalPos) {
+            activationData.starty = verticalPos - 6;
+            verticalPos += 12;
+        }
+        svgDraw.drawActivation(diagram, activationData, verticalPos, conf);
+
+        exports.bounds.insert(activationData.startx, verticalPos -10, activationData.stopx,  verticalPos);
+    }
+
+    var lastMsg;
+
     // Draw the messages/signals
@@ -340,2 +399,8 @@ messages.forEach(function(msg){
                 break;
+            case sq.yy.LINETYPE.ACTIVE_START:
+                exports.bounds.newActivation(msg, diagram);
+                break;
+            case sq.yy.LINETYPE.ACTIVE_END:
+                activeEnd(msg, exports.bounds.getVerticalPos());
+                break;
             case sq.yy.LINETYPE.LOOP_START:
@@ -382,11 +447,23 @@ exports.bounds.bumpVerticalPos(conf.boxMargin);
             default:
+              try {
+                lastMsg = msg;
                 exports.bounds.bumpVerticalPos(conf.messageMargin);
-                startx = actors[msg.from].x + conf.width/2;
-                stopx = actors[msg.to].x + conf.width/2;
+                var fromBounds = actorFlowVerticaBounds(msg.from);
+                var toBounds = actorFlowVerticaBounds(msg.to);
+                var fromIdx = fromBounds[0] <= toBounds[0]?1:0;
+                var toIdx = fromBounds[0] < toBounds[0]?0:1;
+                startx = fromBounds[fromIdx];
+                stopx = toBounds[toIdx];
 
-                drawMessage(diagram, startx, stopx, exports.bounds.getVerticalPos(), msg);
-
+                var verticalPos = exports.bounds.getVerticalPos();
+                drawMessage(diagram, startx, stopx, verticalPos, msg);
+                var allBounds = fromBounds.concat(toBounds);
+                exports.bounds.insert(Math.min.apply(null, allBounds), verticalPos, Math.max.apply(null, allBounds), verticalPos);
+              } catch (e) {
+                  console.error('error while drawing message', e);
+              }
         }
     });
 
+
     if(conf.mirrorActors){
@@ -412,3 +489,11 @@ // Draw actors below diagram
 
-    var width  = box.stopx-box.startx+2*conf.diagramMarginX;
+    var width = (box.stopx - box.startx) + (2 * conf.diagramMarginX);
+    
+    if(title) {
+      diagram.append('text')
+        .text(title)
+        .attr('x', ( ( box.stopx-box.startx) / 2 ) - ( 2 * conf.diagramMarginX ) )
+        .attr('y', -25);
+    }
+    
     if(conf.useMaxWidth) {
@@ -422,3 +507,4 @@ diagram.attr('height', '100%');
     }
-    diagram.attr('viewBox', (box.startx-conf.diagramMarginX) + ' -' +conf.diagramMarginY + ' ' + width + ' ' + height);
+    var extraVertForTitle = title ? 40 : 0;
+    diagram.attr('viewBox', (box.startx - conf.diagramMarginX) + ' -' + (conf.diagramMarginY + extraVertForTitle) + ' ' + width + ' ' + (height + extraVertForTitle));
 };

src/diagrams/sequenceDiagram/svgDraw.js

@@ -124,4 +124,24 @@ /**
 
+exports.anchorElement = function(elem) {
+    return elem.append('g');  
+};
 /**
  * Draws an actor in the diagram with the attaced line
+ * @param elem - element to append activation rect
+ * @param bounds - activation box bounds
+ * @param verticalPos - precise y cooridnate of bottom activation box edge
+ */
+exports.drawActivation = function(elem,bounds,verticalPos){
+    var rect = exports.getNoteRect();
+    var g = bounds.anchored;
+    rect.x = bounds.startx;
+    rect.y = bounds.starty;
+    rect.fill = '#f4f4f4';
+    rect.width = bounds.stopx - bounds.startx;
+    rect.height = verticalPos - bounds.starty;
+    exports.drawRect(g, rect);
+};
+
+/**
+ * Draws an actor in the diagram with the attaced line
  * @param center - The center of the the actor
@@ -155,4 +175,4 @@ * @param pos The position if the actor in the list of actors
     txt.y = bounds.starty;
-    txt.labelMargin =  1.5 * conf.boxMargin;
-    txt.class =  'labelText';
+    txt.labelMargin =  1.5 * 10; // This is the small box that says "loop"
+    txt.class =  'labelText';    // Its size & position are fixed.
     txt.fill =  'white';
@@ -159,0 +179,0 @@

src/logger.js

@@ -60,3 +60,5 @@ /**
 
-    this.log = function(str, level) {
+    this.log = function() {
+        var args = Array.prototype.slice.call(arguments);
+        var level = args.shift();
         var logLevel = this.level;
@@ -69,3 +71,8 @@ if(typeof logLevel === 'undefined'){
                 if (typeof console.log !== 'undefined') { //eslint-disable-line no-console
-                    return console.log('[' + formatTime(new Date()) + '] ' + str); //eslint-disable-line no-console
+                    //return console.log('[' + formatTime(new Date()) + '] ' , str); //eslint-disable-line no-console
+                    args.unshift('[' + formatTime(new Date()) + '] ');
+                    console.log.apply(console, args.map(function(a){
+                        if (typeof a === "object") return JSON.stringify(a, null, 2);
+                        return a;
+                    }));
                 }
@@ -77,22 +84,32 @@ }
     this.trace = function(str) {
-        this.log(str, LEVELS.trace);
+        var args = Array.prototype.slice.call(arguments);
+        args.unshift(LEVELS.trace);
+        this.log.apply(this, args);
     };
 
     this.debug = function(str) {
-        this.log(str, LEVELS.debug);
+        var args = Array.prototype.slice.call(arguments);
+        args.unshift(LEVELS.debug);
+        this.log.apply(this, args);
     };
 
     this.info = function(str) {
-        this.log(str, LEVELS.info);
+        var args = Array.prototype.slice.call(arguments);
+        args.unshift(LEVELS.info);
+        this.log.apply(this, args);
     };
 
     this.warn = function(str) {
-        this.log(str, LEVELS.warn);
+        var args = Array.prototype.slice.call(arguments);
+        args.unshift(LEVELS.warn);
+        this.log.apply(this, args);
     };
 
     this.error = function(str) {
-        this.log(str, LEVELS.error);
+        var args = Array.prototype.slice.call(arguments);
+        args.unshift(LEVELS.error);
+        this.log.apply(this, args);
     };
 }
 
-exports.Log = Log;
+exports.Log = Log;

src/mermaid.js

@@ -70,4 +70,3 @@ /**
         : nodes instanceof Node ? [nodes]
-        /*! Last case  - sequence config was passed pick next */
-        : nodes;
+        : nodes;  // Last case  - sequence config was passed pick next
 
@@ -74,0 +73,0 @@ var i;

src/mermaid.spec.js

@@ -159,2 +159,18 @@ /**
         });
+        it('should handle edges with interpolation defined', function () {
+            flow.parser.parse('graph TD;A---B; linkStyle 0 interpolate basis');
+            flow.parser.yy.getVertices();
+            var edges = flow.parser.yy.getEdges();
+
+            var mockG = {
+                setEdge:function(start, end,options){
+                    expect(start).toBe('A');
+                    expect(end).toBe('B');
+                    expect(options.arrowhead).toBe('none');
+                    expect(options.lineInterpolate).toBe('basis');
+                }
+            };
+
+            flowRend.addEdges(edges,mockG);
+        });
         it('should handle edges with text and styles defined', function () {
@@ -161,0 +177,0 @@ flow.parser.parse('graph TD;A---|the text|B; linkStyle 0 stroke:val1,stroke-width:val2;');

src/mermaidAPI.js

@@ -34,2 +34,5 @@ /**
 var classDb = require('./diagrams/classDiagram/classDb');
+var gitGraphParser = require('./diagrams/gitGraph/parser/gitGraph');
+var gitGraphRenderer = require('./diagrams/gitGraph/gitGraphRenderer');
+var gitGraphAst = require('./diagrams/gitGraph/gitGraphAst');
 var d3 = require('./d3');
@@ -165,30 +168,30 @@
      * The object containing configurations specific for gantt diagrams*
-     */ 
+     */
     gantt:{
         /**
          * **titleTopMargin** - margin top for the text over the gantt diagram
-         */ 
+         */
         titleTopMargin: 25,
 
-        /** 
+        /**
          * **barHeight** - the height of the bars in the graph
-         */ 
+         */
         barHeight: 20,
 
-        /** 
+        /**
          * **barGap** - the margin between the different activities in the gantt diagram
-         */ 
+         */
         barGap: 4,
 
-        /** 
+        /**
          *  **topPadding** - margin between title and gantt diagram and between axis and gantt diagram.
-         */  
+         */
         topPadding: 50,
 
-        /** 
-         *  **sidePadding** - the space allocated for the section name to the left of the activities.
-         */  
-        sidePadding: 75,
+        /**
+         *  **leftPadding** - the space allocated for the section name to the left of the activities.
+         */
+        leftPadding: 75,
 
-        /** 
+        /**
          *  **gridLineStartPadding** - Vertical starting position of the grid lines
@@ -198,3 +201,3 @@ */
 
-        /** 
+        /**
          *  **fontSize** - font size ...
@@ -204,3 +207,3 @@ */
 
-        /** 
+        /**
          * **fontFamily** - font family ...
@@ -210,3 +213,3 @@ */
 
-        /** 
+        /**
          * **numberSectionStyles** - the number of alternating section styles
@@ -216,5 +219,5 @@ */
 
-        /** 
+        /**
          * **axisFormatter** - formatting of the axis, this might need adjustment to match your locale and preferences
-         */  
+         */
         axisFormatter: [
@@ -245,2 +248,3 @@
     classDiagram:{},
+    gitGraph: {},
     info:{}
@@ -263,2 +267,6 @@ };
     switch(graphType){
+        case 'gitGraph':
+            parser = gitGraphParser;
+            parser.parser.yy = gitGraphAst;
+            break;
         case 'graph':
@@ -406,2 +414,11 @@ parser = flowParser;
     switch(graphType){
+        case 'gitGraph':
+            config.flowchart.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
+            gitGraphRenderer.setConf(config.gitGraph);
+            gitGraphRenderer.draw(txt, id, false);
+            //if(config.cloneCssStyles){
+                //classes = gitGraphRenderer.getClasses(txt, false);
+                //utils.cloneCssStyles(element.firstChild, classes);
+            //}
+            break;
         case 'graph':
@@ -524,3 +541,3 @@ config.flowchart.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
                 if(typeof config[lvl1Keys[i]] === 'undefined'){
-                    
+
                     config[lvl1Keys[i]] = {};
@@ -527,0 +544,0 @@ }

src/utils.js

@@ -50,2 +50,6 @@ /**
 
+    if(text.match(/^\s*gitGraph/)) {
+        log.debug('Detected gitGraph syntax');
+        return 'gitGraph';
+    }
     return 'graph';
@@ -89,3 +93,3 @@ };
             }
-        } 
+        }
     }
@@ -92,0 +96,0 @@

src/utils.spec.js

@@ -32,2 +32,8 @@ /**
     });
+    it('should handle a graph defintion for gitGraph', function () {
+        str = '  \n  gitGraph TB:\nbfs1:queue';
+
+        var type = utils.detectType(str);
+        expect(type).toBe('gitGraph');
+    });
 });
@@ -156,3 +162,3 @@
         utils.cloneCssStyles(svg, {});
-        expect(stylesToArray(svg)).toEqual(['.node { stroke: #eeeeee; }', '.node-square { stroke: #bbbbbb; }']);
+        expect(stylesToArray(svg)).toEqual(['.node { stroke: #eeeeee;}', '.node-square { stroke: #bbbbbb;}']);
     });
@@ -165,3 +171,3 @@
         utils.cloneCssStyles(svg, {});
-        expect(stylesToArray(svg)).toEqual(['.node { stroke: #eeeeee; }', '.node-square { stroke: #bbbbbb; }', '.node-square { stroke: #bbeebb; }']);
+        expect(stylesToArray(svg)).toEqual(['.node { stroke: #eeeeee;}', '.node-square { stroke: #bbbbbb;}', '.node-square { stroke: #bbeebb;}']);
     });
@@ -175,3 +181,3 @@
         utils.cloneCssStyles(svg, {});
-        expect(stylesToArray(svg)).toEqual(['.node { stroke: #eeeeee; }', '.node-square { stroke: #bbbbbb; }', '.node-square { stroke: #bbeebb; }']);
+        expect(stylesToArray(svg)).toEqual(['.node { stroke: #eeeeee;}', '.node-square { stroke: #bbbbbb;}', '.node-square { stroke: #bbeebb;}']);
     });
@@ -183,3 +189,3 @@
         utils.cloneCssStyles(svg, {'default': {'styles': ['stroke:#ffffff', 'stroke-width:1.5px']}});
-        expect(stylesToArray(svg)).toEqual(['#mermaid-01 .node>rect { stroke:#ffffff; stroke-width:1.5px; }', '.node { stroke: #eeeeee; }', '.node-square { stroke: #bbbbbb; }']);
+        expect(stylesToArray(svg)).toEqual(['#mermaid-01 .node>rect { stroke:#ffffff; stroke-width:1.5px; }', '.node { stroke: #eeeeee;}', '.node-square { stroke: #bbbbbb;}']);
     });
@@ -196,4 +202,4 @@
         expect(stylesToArray(svg)).toEqual(['#mermaid-01 .node>rect { stroke:#ffffff; stroke-width:1.5px; }',
-            '.node { stroke: #eeeeee; }',
-            '.node-square { stroke: #bbbbbb; }',
+            '.node { stroke: #eeeeee;}',
+            '.node-square { stroke: #bbbbbb;}',
             '#mermaid-01 .node-square>rect, .node-square>polygon, .node-square>ellipse { fill:#eeeeee; stroke:#aaaaaa; }',
@@ -200,0 +206,0 @@ '#mermaid-01 .node-circle>rect, .node-circle>polygon, .node-circle>ellipse { fill:#444444; stroke:#111111; }'

test/gconf.json

@@ -6,6 +6,6 @@ {
   "topPadding":50,
-  "sidePadding":75,
+  "leftPadding":75,
   "gridLineStartPadding":35,
   "fontSize":11,
   "numberSectionStyles":3
-}
+}

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Uses eval

Supply chain risk

Package uses eval() which is a dangerous function. This prevents the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

15633213

increased by29.58%

Number of package files

241

increased by8.56%

Lines of code

287020

increased by45.87%

Number of low quality alerts

9

decreased by-10%

Worsened metrics

Dependency count

11

increased by10%

Number of low supply chain risk alerts

48

increased by2.13%

Number of medium supply chain risk alerts

21

increased by61.54%

Dependency changes

• + Addedlodash@^4.6.1

• + Addedlodash@4.17.21(transitive)