Merge pull request #56 from vijay40/master

Improves readablity discussed in issue #38
mermaid-js · Dec 13, 2014 · bfd9362 · bfd9362
2 parents 3f3e23b + d4451ef
commit bfd9362
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 31 deletions.
diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison
@@ -168,18 +168,30 @@ verticeStatement:
 
 vertex:  alphaNum SQS text SQE
         {$$ = $1;yy.addVertex($1,$3,'square');}
+    |  alphaNum SQS text SQE SPACE
+        {$$ = $1;yy.addVertex($1,$3,'square');}
     | alphaNum PS PS text PE PE
         {$$ = $1;yy.addVertex($1,$4,'circle');}
+    | alphaNum PS PS text PE PE SPACE
+        {$$ = $1;yy.addVertex($1,$4,'circle');}
     | alphaNum PS text PE
         {$$ = $1;yy.addVertex($1,$3,'round');}
+    | alphaNum PS text PE SPACE
+        {$$ = $1;yy.addVertex($1,$3,'round');}
     | alphaNum DIAMOND_START text DIAMOND_STOP
         {$$ = $1;yy.addVertex($1,$3,'diamond');}
+    | alphaNum DIAMOND_START text DIAMOND_STOP SPACE
+        {$$ = $1;yy.addVertex($1,$3,'diamond');}
     | alphaNum TAGEND text SQE
         {$$ = $1;yy.addVertex($1,$3,'odd');}
+    | alphaNum TAGEND text SQE SPACE
+        {$$ = $1;yy.addVertex($1,$3,'odd');}
     | alphaNum TAGSTART text TAGEND
         {$$ = $1;yy.addVertex($1,$3,'diamond');}
     | alphaNum
         {$$ = $1;yy.addVertex($1);}
+    | alphaNum SPACE
+        {$$ = $1;yy.addVertex($1);}
     ;
 
 alphaNum
@@ -218,9 +230,13 @@ alphaNumToken
     ;
 
 link: linkStatement arrowText
+    {$1.text = $2;$$ = $1;}
+    | linkStatement arrowText SPACE
     {$1.text = $2;$$ = $1;}
     | linkStatement
     {$$ = $1;}
+    | linkStatement SPACE
+    {$$ = $1;}
     ;
 
 linkStatement: ARROW_POINT