New release

mermaid-js · Jan 11, 2015 · 911cd09 · 911cd09
1 parent 27687fc
commit 911cd09
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "mermaid",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "authors": [
     "knsv <knut@sveido.com>"
   ],

diff --git a/dist/mermaid.full.js b/dist/mermaid.full.js
@@ -13001,7 +13001,7 @@ process.chdir = function (dir) {
 },{}],102:[function(require,module,exports){
 module.exports={
   "name": "mermaid",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Markdownish syntax for generating flowcharts",
   "main": "src/main.js",
   "bin": {
@@ -13142,6 +13142,8 @@ exports.addVertices = function (vert, g) {
             verticeText = vertice.text;
         }
 
+        console.log(verticeText);
+
         var radious = 0;
         var _shape = '';
 
@@ -13700,6 +13702,7 @@ exports.addSubGraph = function (list, title) {
     var subG = [];
 
     subG = uniq(subG.concat.apply(subG,list));
+    //console.log(subG);
 
     subGraphs.push({nodes:subG,title:title});
 };
@@ -14576,7 +14579,7 @@ case 36:
  yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]];
 break;
 case 37:
-this.$ = 'yo';
+this.$ = [$$[$0]];
 break;
 case 38:
 this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square');

diff --git a/dist/mermaid.full.min.js b/dist/mermaid.full.min.js
diff --git a/dist/mermaid.slim.js b/dist/mermaid.slim.js
@@ -12969,7 +12969,7 @@ process.chdir = function (dir) {
 },{}],102:[function(require,module,exports){
 module.exports={
   "name": "mermaid",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Markdownish syntax for generating flowcharts",
   "main": "src/main.js",
   "bin": {
@@ -13110,6 +13110,8 @@ exports.addVertices = function (vert, g) {
             verticeText = vertice.text;
         }
 
+        console.log(verticeText);
+
         var radious = 0;
         var _shape = '';
 
@@ -13668,6 +13670,7 @@ exports.addSubGraph = function (list, title) {
     var subG = [];
 
     subG = uniq(subG.concat.apply(subG,list));
+    //console.log(subG);
 
     subGraphs.push({nodes:subG,title:title});
 };
@@ -14544,7 +14547,7 @@ case 36:
  yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]];
 break;
 case 37:
-this.$ = 'yo';
+this.$ = [$$[$0]];
 break;
 case 38:
 this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square');

diff --git a/dist/mermaid.slim.min.js b/dist/mermaid.slim.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mermaid",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Markdownish syntax for generating flowcharts",
   "main": "src/main.js",
   "bin": {

diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js
@@ -60,6 +60,8 @@ exports.addVertices = function (vert, g) {
             verticeText = vertice.text;
         }
 
+        console.log(verticeText);
+
         var radious = 0;
         var _shape = '';
 

diff --git a/src/diagrams/flowchart/graphDb.js b/src/diagrams/flowchart/graphDb.js
@@ -228,6 +228,7 @@ exports.addSubGraph = function (list, title) {
     var subG = [];
 
     subG = uniq(subG.concat.apply(subG,list));
+    //console.log(subG);
 
     subGraphs.push({nodes:subG,title:title});
 };

diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison
@@ -220,7 +220,7 @@ verticeStatement:
      vertex link vertex
         { yy.addLink($1,$3,$2);$$ = [$1,$3];}
      | vertex
-        {$$ = 'yo';}
+        {$$ = [$1];}
     ;
 
 vertex:  alphaNum SQS text SQE

diff --git a/src/diagrams/flowchart/parser/flow.js b/src/diagrams/flowchart/parser/flow.js
diff --git a/test/web.html b/test/web.html
@@ -39,7 +39,29 @@ <h1>Shapes</h1>
         class green B;
     </div>
     <h1>Sub graphs</h1>
-    <div class="mermaid">graph TB
+    <div class="mermaid">graph LR
+        subgraph old sys 1
+            a1(new client)-->b1(sys1 server)
+            oc1(Old client)-->b2
+        end
+
+        subgraph old sys 2
+            a2(new client)-->b2(sys2 server)
+            oc2(Old client)-->b2
+        end
+
+        subgraph old sys 3
+            a3(new client)-->b3(sys3 server)
+        end
+
+        subgraph New sys
+            a1
+            a2
+            a3
+        end
+
+    </div>
+    <div class="mermaid2">graph TB
         subgraph one
         a1-->a2
         end
@@ -52,7 +74,7 @@ <h1>Sub graphs</h1>
         c1-->a2
 
     </div>
-    <div class="mermaid">graph TB
+    <div class="mermaid2">graph TB
         subgraph
             sq[Square shape] -.-> ci((Circle shape))
             od>Odd shape]-. Two line<br>edge comment .-> ro