New version

dist/mermaid.js

@@ -38070,6 +38070,15 @@ exports.version = function(){
 exports.encodeEntities = function(text){
     var txt = text;
 
+    txt = txt.replace(/style.*:\S*#.*;/g,function(s,t,u){
+        var innerTxt = s.substring(0,s.length-1);
+        return innerTxt;
+    });
+    txt = txt.replace(/classDef.*:\S*#.*;/g,function(s,t,u){
+        var innerTxt = s.substring(0,s.length-1);
+        return innerTxt;
+    });
+
     txt = txt.replace(/#\w+\;/g,function(s,t,u){
         var innerTxt = s.substring(1,s.length-1);
 
@@ -38150,7 +38159,7 @@ var render = function(id, txt, cb, container){
             .append('g');
     }
 
-
+    window.txt = txt;
     txt = exports.encodeEntities(txt);
     //console.warn('mermaid encode: ');
     //console.warn(txt);
@@ -38160,6 +38169,7 @@ var render = function(id, txt, cb, container){
     var classes = {};
     switch(graphType){
         case 'graph':
+
             flowRenderer.setConf(config.flowchart);
             flowRenderer.draw(txt, id, false);
             if(config.cloneCssStyles){

dist/mermaid.slim.js

@@ -28854,6 +28854,15 @@ exports.version = function(){
 exports.encodeEntities = function(text){
     var txt = text;
 
+    txt = txt.replace(/style.*:\S*#.*;/g,function(s,t,u){
+        var innerTxt = s.substring(0,s.length-1);
+        return innerTxt;
+    });
+    txt = txt.replace(/classDef.*:\S*#.*;/g,function(s,t,u){
+        var innerTxt = s.substring(0,s.length-1);
+        return innerTxt;
+    });
+
     txt = txt.replace(/#\w+\;/g,function(s,t,u){
         var innerTxt = s.substring(1,s.length-1);
 
@@ -28934,7 +28943,7 @@ var render = function(id, txt, cb, container){
             .append('g');
     }
 
-
+    window.txt = txt;
     txt = exports.encodeEntities(txt);
     //console.warn('mermaid encode: ');
     //console.warn(txt);
@@ -28944,6 +28953,7 @@ var render = function(id, txt, cb, container){
     var classes = {};
     switch(graphType){
         case 'graph':
+
             flowRenderer.setConf(config.flowchart);
             flowRenderer.draw(txt, id, false);
             if(config.cloneCssStyles){

dist/mermaidAPI.js

@@ -37355,6 +37355,15 @@ exports.version = function(){
 exports.encodeEntities = function(text){
     var txt = text;
 
+    txt = txt.replace(/style.*:\S*#.*;/g,function(s,t,u){
+        var innerTxt = s.substring(0,s.length-1);
+        return innerTxt;
+    });
+    txt = txt.replace(/classDef.*:\S*#.*;/g,function(s,t,u){
+        var innerTxt = s.substring(0,s.length-1);
+        return innerTxt;
+    });
+
     txt = txt.replace(/#\w+\;/g,function(s,t,u){
         var innerTxt = s.substring(1,s.length-1);
 
@@ -37435,7 +37444,7 @@ var render = function(id, txt, cb, container){
             .append('g');
     }
 
-
+    window.txt = txt;
     txt = exports.encodeEntities(txt);
     //console.warn('mermaid encode: ');
     //console.warn(txt);
@@ -37445,6 +37454,7 @@ var render = function(id, txt, cb, container){
     var classes = {};
     switch(graphType){
         case 'graph':
+
             flowRenderer.setConf(config.flowchart);
             flowRenderer.draw(txt, id, false);
             if(config.cloneCssStyles){

dist/www/javascripts/lib/mermaid.js

@@ -37451,6 +37451,7 @@ module.exports.mermaidAPI = mermaidAPI;
  * @param nodes a css selector or an array of nodes
  */
 var init = function () {
+    var conf= mermaidAPI.getConfig();
     log.debug('Starting rendering diagrams');
     var nodes;
     if(arguments.length >= 2){
@@ -37471,7 +37472,6 @@ var init = function () {
         callback = arguments[arguments.length-1];
         log.debug('Callback function found');
     }else{
-        var conf= mermaidAPI.getConfig();
         if(typeof conf.mermaid !== 'undefined'){
             if(typeof conf.mermaid.callback === 'function'){
                 callback = conf.mermaid.callback;
@@ -37775,10 +37775,12 @@ Logger.levels = {
     warn: 3,
     error: 4,
     fatal: 5,
-    default:1
+    default:5
 };
-
-exports.create = function(type, options) {
+exports.setLogLevel = function(level){
+    Logger.levels.default = level;
+}
+exports.create = function(options) {
     return new Logger(options);
 };
 }).call(this,_dereq_("1YiZ5S"))
@@ -37814,7 +37816,7 @@ var ganttParser = _dereq_('./diagrams/gantt/parser/gantt');
 var ganttDb = _dereq_('./diagrams/gantt/ganttDb');
 var d3 = _dereq_('./d3');
 var nextId = 0;
-var log = _dereq_('./logger').create();
+
 
 /**
  * ## Configuration
@@ -37828,6 +37830,15 @@ var log = _dereq_('./logger').create();
  * ```
  */
 var config = {
+    /**
+     * logLevel , decides the amount of logging to be used.
+     *    * debug: 1
+     *    * info: 2
+     *    * warn: 3
+     *    * error: 4
+     *    * fatal: 5
+     */
+    logLevel: 3,
     /**
      * **cloneCssStyles** - This options controls whether or not the css rules should be copied into the generated svg
      */
@@ -38002,6 +38013,8 @@ var config = {
     }
 };
 
+var log = _dereq_('./logger').create({level:config.logLevel});
+
 /**
  * ## parse
  * Function that parses a mermaid diagram definition. If parsing fails the parseError callback is called and an error is
@@ -38057,7 +38070,14 @@ exports.version = function(){
 exports.encodeEntities = function(text){
     var txt = text;
 
-    txt = txt.replace(/#\w*;?/g,function(s,t,u){
+    txt = txt.replace(/[style|classDef].*:\S*#.*;/g,function(s,t,u){
+
+        var innerTxt = s.substring(0,s.length-1);
+        return innerTxt;
+
+    });
+
+    txt = txt.replace(/#\w+\;/g,function(s,t,u){
         var innerTxt = s.substring(1,s.length-1);
 
         var isInt = /^\+?\d+$/.test(innerTxt);
@@ -38137,7 +38157,7 @@ var render = function(id, txt, cb, container){
             .append('g');
     }
 
-
+    window.txt = txt;
     txt = exports.encodeEntities(txt);
     //console.warn('mermaid encode: ');
     //console.warn(txt);
@@ -38147,6 +38167,7 @@ var render = function(id, txt, cb, container){
     var classes = {};
     switch(graphType){
         case 'graph':
+
             flowRenderer.setConf(config.flowchart);
             flowRenderer.draw(txt, id, false);
             if(config.cloneCssStyles){
@@ -38184,6 +38205,10 @@ var render = function(id, txt, cb, container){
             break;
     }
 
+    d3.select('#d'+id).selectAll('foreignobject div').attr('xmlns','http://www.w3.org/1999/xhtml');
+
+
+
     // Fix for when the base tag is used
     var svgCode = d3.select('#d'+id).node().innerHTML.replace(/url\(#arrowhead/g,'url('+ window.location.protocol+'//'+location.host+location.pathname +'#arrowhead','g');
 
@@ -38226,7 +38251,7 @@ var setConf = function(cnf){
 
             var j;
             for(j=0;j<lvl2Keys.length;j++) {
-                //log.debug('Setting conf ',lvl1Keys[i],'-',lvl2Keys[j]);
+                log.debug('Setting conf ',lvl1Keys[i],'-',lvl2Keys[j]);
                 if(typeof config[lvl1Keys[i]] === 'undefined'){
 
                     config[lvl1Keys[i]] = {};
@@ -38240,6 +38265,7 @@ var setConf = function(cnf){
     }
 };
 exports.initialize = function(options){
+    log.debug('Initializing mermaidAPI');
     // Update default config with options supplied at initialization
     if(typeof options === 'object'){
         setConf(options);
@@ -38292,20 +38318,11 @@ var log = _dereq_('./logger').create();
  * @returns {string} A graph definition key
  */
 module.exports.detectType = function(text,a){
+    text = text.replace(/^\s*%%.*\n/g,'\n');
     if(text.match(/^\s*sequenceDiagram/)){
         return "sequenceDiagram";
     }
 
-    if(text.match(/^\s*sequence/)){
-    /* ```mermaid
-     graph TB
-        a-->b
-        b-->c
-        ``` 
-     */
-        return "sequence";
-    }
-
     if(text.match(/^\s*digraph/)) {
         //log.debug('Detected dot syntax');
         return "dotGraph";

gulp/tasks/release.js

@@ -1,4 +1,5 @@
 var gulp = require('gulp');
+var bump = require('gulp-bump');
 
 gulp.task('bump', function(){
     gulp.src('./bw.json')
@@ -28,7 +29,7 @@ gulp.task('tag', function() {
 
 function inc(importance) {
     // get all the files to bump version in
-    return gulp.src(['./package.json', './bower.json'])
+    return gulp.src(['./package.json'])
         // bump the version number in those files
         .pipe(bump({type: importance}))
         // save it back to filesystem

lib/phantomscript.js

@@ -227,13 +227,19 @@ function executeInPage(data) {
   el.appendChild(elContent)
 
   document.body.appendChild(el)
-
-    if(typeof sequenceConfig !== undefined && sequenceConfig !== 'undefined'){
-        sc = document.createElement("script")
-        scContent = document.createTextNode('mermaid.sequenceConfig = JSON.parse(' + JSON.stringify(sequenceConfig) + ');')
-        sc.appendChild(scContent)
+  mermaid.initialize({
+    sequenceDiagram:{useMaxWidth:false}
+  });
 
-        document.body.appendChild(sc)
+    if(typeof sequenceConfig !== undefined && sequenceConfig !== 'undefined'){
+        //sc = document.createElement("script")
+        //scContent = document.createTextNode('mermaid.sequenceConfig = JSON.parse(' + JSON.stringify(sequenceConfig) + ');')
+        //sc.appendChild(scContent)
+
+        //document.body.appendChild(sc)
+      mermaid.initialize({
+        sequenceDiagram:JSON.parse(sequenceConfig)
+      });
     }
 
     if(typeof ganttConfig !== undefined && ganttConfig !== 'undefined'){
@@ -250,9 +256,7 @@ function executeInPage(data) {
         document.body.appendChild(sc)
     }
 
-  mermaid.initialize({
-      sequenceDiagram:{useMaxWidth:false}
-    });
+
   mermaid.init();
 
   svg = document.querySelector('svg')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mermaid",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams and gantt charts.",
   "main": "src/mermaid.js",
   "keywords": [
@@ -15,8 +15,8 @@
   },
   "scripts": {
     "watch": "watchify src/mermaid.js -o dist/mermaid.js",
-    "doc"  : "rm -r build;rm -r dist/www;gulp vartree;cp dist/www/all.html ../mermaid-pages/index.html;cp dist/mermaid.js ../mermaid-pages/javascripts/lib;cp dist/mermaid.forest.css ../mermaid-pages/stylesheets",
-    "test" : "./node_modules/.bin/gulp dist && ./node_modules/.bin/gulp test"
+    "doc": "rm -r build;rm -r dist/www;gulp vartree;cp dist/www/all.html ../mermaid-pages/index.html;cp dist/mermaid.js ../mermaid-pages/javascripts/lib;cp dist/mermaid.forest.css ../mermaid-pages/stylesheets",
+    "test": "./node_modules/.bin/gulp dist && ./node_modules/.bin/gulp test"
   },
   "repository": {
     "type": "git",

src/mermaidAPI.js

@@ -282,6 +282,15 @@ exports.version = function(){
 exports.encodeEntities = function(text){
     var txt = text;
 
+    txt = txt.replace(/style.*:\S*#.*;/g,function(s,t,u){
+        var innerTxt = s.substring(0,s.length-1);
+        return innerTxt;
+    });
+    txt = txt.replace(/classDef.*:\S*#.*;/g,function(s,t,u){
+        var innerTxt = s.substring(0,s.length-1);
+        return innerTxt;
+    });
+
     txt = txt.replace(/#\w+\;/g,function(s,t,u){
         var innerTxt = s.substring(1,s.length-1);
 
@@ -362,7 +371,7 @@ var render = function(id, txt, cb, container){
             .append('g');
     }
 
-
+    window.txt = txt;
     txt = exports.encodeEntities(txt);
     //console.warn('mermaid encode: ');
     //console.warn(txt);
@@ -372,6 +381,7 @@ var render = function(id, txt, cb, container){
     var classes = {};
     switch(graphType){
         case 'graph':
+
             flowRenderer.setConf(config.flowchart);
             flowRenderer.draw(txt, id, false);
             if(config.cloneCssStyles){

test/examples/leadingComments.html

@@ -27,14 +27,5 @@ <h1>The diagrams below have leading comments</h1>
             Ali#45;ce->>John: Hello John, how are you? #60;
             John-->>Alice: Great!#quot;
         </div>
-        <div class="mermaid" id="i211">
-            graph LR;
-            A[Hard edge]-->|Link text|B(Round edge);
-            B-->C{Decision};
-            C-->|One|D[Result one];
-            C-->|Two|E[Result two];
-            classDef pink fill:#f9f,stroke:#333,stroke-width:4px;
-            class C pink;
-        </div>
     </body>
 </html>

test/sconf.json

@@ -3,9 +3,10 @@
   "diagramMarginY": 10,
   "actorMargin": 50,
   "width": 150,
-  "height": 165,
+  "height": 15,
   "boxMargin": 10,
   "boxTextMargin": 5,
   "noteMargin": 10,
-  "messageMargin": 35
+  "messageMargin": 35,
+  "mirrorActors":false
 }