Merge pull request #237 from spect88/ellipse-syntax

Ellipse syntax
mermaid-js · Oct 27, 2015 · d3a025a · d3a025a
2 parents 1a60b6e + 51d5c90
commit d3a025a
Show file tree

Hide file tree

Showing 17 changed files with 791 additions and 697 deletions.
diff --git a/dist/mermaid.css b/dist/mermaid.css
@@ -2,13 +2,14 @@
 /* Sequence Diagram variables */
 /* Gantt chart variables */
 .mermaid .label {
-  color: #333333;
+  color: #333;
 }
 .node rect,
 .node circle,
+.node ellipse,
 .node polygon {
-  fill: #ececff;
-  stroke: #ccccff;
+  fill: #ECECFF;
+  stroke: #CCCCFF;
   stroke-width: 1px;
 }
 .edgePath .path {
@@ -21,11 +22,11 @@
   stroke-width: 1px !important;
 }
 .cluster text {
-  fill: #333333;
+  fill: #333;
 }
 .actor {
-  stroke: #ccccff;
-  fill: #ececff;
+  stroke: #CCCCFF;
+  fill: #ECECFF;
 }
 text.actor {
   fill: black;
@@ -38,27 +39,27 @@ text.actor {
   stroke-width: 1.5;
   stroke-dasharray: "2 2";
   marker-end: "url(#arrowhead)";
-  stroke: #333333;
+  stroke: #333;
 }
 .messageLine1 {
   stroke-width: 1.5;
   stroke-dasharray: "2 2";
-  stroke: #333333;
+  stroke: #333;
 }
 #arrowhead {
-  fill: #333333;
+  fill: #333;
 }
 #crosshead path {
-  fill: #333333 !important;
-  stroke: #333333 !important;
+  fill: #333 !important;
+  stroke: #333 !important;
 }
 .messageText {
-  fill: #333333;
+  fill: #333;
   stroke: none;
 }
 .labelBox {
-  stroke: #ccccff;
-  fill: #ececff;
+  stroke: #CCCCFF;
+  fill: #ECECFF;
 }
 .labelText {
   fill: black;
@@ -72,7 +73,7 @@ text.actor {
   stroke-width: 2;
   stroke-dasharray: "2 2";
   marker-end: "url(#arrowhead)";
-  stroke: #ccccff;
+  stroke: #CCCCFF;
 }
 .note {
   stroke: #aaaa33;
@@ -101,16 +102,16 @@ text.actor {
   opacity: 0.2;
 }
 .sectionTitle0 {
-  fill: #333333;
+  fill: #333;
 }
 .sectionTitle1 {
-  fill: #333333;
+  fill: #333;
 }
 .sectionTitle2 {
-  fill: #333333;
+  fill: #333;
 }
 .sectionTitle3 {
-  fill: #333333;
+  fill: #333;
 }
 .sectionTitle {
   text-anchor: start;

diff --git a/dist/mermaid.forest.css b/dist/mermaid.forest.css
@@ -3,10 +3,11 @@
 /* Gantt chart variables */
 .mermaid .label {
   font-family: 'trebuchet ms', verdana, arial;
-  color: #333333;
+  color: #333;
 }
 .node rect,
 .node circle,
+.node ellipse,
 .node polygon {
   fill: #cde498;
   stroke: #13540c;
@@ -23,7 +24,7 @@
   stroke-width: 1px !important;
 }
 .cluster text {
-  fill: #333333;
+  fill: #333;
 }
 .actor {
   stroke: #13540c;
@@ -40,22 +41,22 @@ text.actor {
   stroke-width: 1.5;
   stroke-dasharray: "2 2";
   marker-end: "url(#arrowhead)";
-  stroke: #333333;
+  stroke: #333;
 }
 .messageLine1 {
   stroke-width: 1.5;
   stroke-dasharray: "2 2";
-  stroke: #333333;
+  stroke: #333;
 }
 #arrowhead {
-  fill: #333333;
+  fill: #333;
 }
 #crosshead path {
-  fill: #333333 !important;
-  stroke: #333333 !important;
+  fill: #333 !important;
+  stroke: #333 !important;
 }
 .messageText {
-  fill: #333333;
+  fill: #333;
   stroke: none;
 }
 .labelBox {
@@ -103,16 +104,16 @@ text.actor {
   opacity: 0.2;
 }
 .sectionTitle0 {
-  fill: #333333;
+  fill: #333;
 }
 .sectionTitle1 {
-  fill: #333333;
+  fill: #333;
 }
 .sectionTitle2 {
-  fill: #333333;
+  fill: #333;
 }
 .sectionTitle3 {
-  fill: #333333;
+  fill: #333;
 }
 .sectionTitle {
   text-anchor: start;

diff --git a/dist/mermaid.js b/dist/mermaid.js
diff --git a/dist/mermaid.min.js b/dist/mermaid.min.js
diff --git a/dist/mermaid.slim.js b/dist/mermaid.slim.js
diff --git a/dist/mermaid.slim.min.js b/dist/mermaid.slim.min.js
diff --git a/dist/mermaidAPI.js b/dist/mermaidAPI.js
diff --git a/dist/mermaidAPI.min.js b/dist/mermaidAPI.min.js
diff --git a/dist/mermaidAPI.slim.js b/dist/mermaidAPI.slim.js
diff --git a/dist/mermaidAPI.slim.min.js b/dist/mermaidAPI.slim.min.js
diff --git a/editor/css/editor.css b/editor/css/editor.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans);
 body {
   margin: 0;
   font-family: 'Open sans', sans-serif;

diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js
@@ -111,6 +111,9 @@ exports.addVertices = function (vert, g) {
             case 'circle':
                 _shape = 'circle';
                 break;
+            case 'ellipse':
+                _shape = 'ellipse';
+                break;
             case 'group':
                 _shape = 'rect';
                 verticeText = '';

diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison
@@ -57,6 +57,8 @@
 \s*\-\-\s*               return '--';
 \s*\-\.\s*               return '-.';
 \s*\=\=\s*               return '==';
+"(-"                  return '(-';
+"-)"                  return '-)';
 \-                    return 'MINUS';
 "."                   return 'DOT';
 \+                    return 'PLUS';
@@ -245,6 +247,10 @@ vertex:  alphaNum SQS text SQE
         {$$ = $1;yy.addVertex($1,$4,'circle');}
     | alphaNum PS PS text PE PE spaceList
         {$$ = $1;yy.addVertex($1,$4,'circle');}
+    | alphaNum '(-' text '-)'
+        {$$ = $1;yy.addVertex($1,$3,'ellipse');}
+    | alphaNum '(-' text '-)' spaceList
+        {$$ = $1;yy.addVertex($1,$3,'ellipse');}
     | alphaNum PS text PE
         {$$ = $1;yy.addVertex($1,$3,'round');}
     | alphaNum PS text PE spaceList