Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ellipse syntax #237

Merged
merged 2 commits into from
Oct 27, 2015
Merged

Ellipse syntax #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d25ed
Add support for node(-ellipse shape-) in flow charts
spect88 Oct 24, 2015
51d5c90
Add build with new ellipse syntax
spect88 Oct 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions dist/mermaid.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -72,7 +73,7 @@ text.actor {
stroke-width: 2;
stroke-dasharray: "2 2";
marker-end: "url(#arrowhead)";
stroke: #ccccff;
stroke: #CCCCFF;
}
.note {
stroke: #aaaa33;
Expand Down Expand Up @@ -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;
Expand Down
25 changes: 13 additions & 12 deletions dist/mermaid.forest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,7 +24,7 @@
stroke-width: 1px !important;
}
.cluster text {
fill: #333333;
fill: #333;
}
.actor {
stroke: #13540c;
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
279 changes: 147 additions & 132 deletions dist/mermaid.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/mermaid.min.js
View file
Open in desktop

Large diffs are not rendered by default.

279 changes: 147 additions & 132 deletions dist/mermaid.slim.js
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions dist/mermaid.slim.min.js
View file
Open in desktop

Large diffs are not rendered by default.

279 changes: 147 additions & 132 deletions dist/mermaidAPI.js
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions dist/mermaidAPI.min.js
View file
Open in desktop

Large diffs are not rendered by default.

279 changes: 147 additions & 132 deletions dist/mermaidAPI.slim.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions dist/mermaidAPI.slim.min.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion editor/css/editor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans);
body {
margin: 0;
font-family: 'Open sans', sans-serif;
Expand Down
3 changes: 3 additions & 0 deletions src/diagrams/flowchart/flowRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ exports.addVertices = function (vert, g) {
case 'circle':
_shape = 'circle';
break;
case 'ellipse':
_shape = 'ellipse';
break;
case 'group':
_shape = 'rect';
verticeText = '';
Expand Down
6 changes: 6 additions & 0 deletions src/diagrams/flowchart/parser/flow.jison
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
\s*\-\-\s* return '--';
\s*\-\.\s* return '-.';
\s*\=\=\s* return '==';
"(-" return '(-';
"-)" return '-)';
\- return 'MINUS';
"." return 'DOT';
\+ return 'PLUS';
Expand Down Expand Up @@ -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
Expand Down
Loading