From ed65e6df3b6191afc306c0ea21fe59fca11f2a89 Mon Sep 17 00:00:00 2001
From: knsv <knut@sveido.com>
Date: Wed, 7 Oct 2015 18:35:30 +0200
Subject: [PATCH] Draft of font-awesome support as described in issue #49.

---
 src/diagrams/flowchart/flowRenderer.js | 6 ++++++
 src/mermaidAPI.js                      | 4 ----
 test/examples/fontAwesome.html         | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js
index a23867594..a76ed37ba 100644
--- a/src/diagrams/flowchart/flowRenderer.js
+++ b/src/diagrams/flowchart/flowRenderer.js
@@ -73,9 +73,15 @@ exports.addVertices = function (vert, g) {
             verticeText = vertice.text;
         }
 
+
+
         var labelTypeStr = '';
         if(conf.htmlLabels) {
             labelTypeStr = 'html';
+            verticeText = verticeText.replace(/fa:fa[\w\-]+/g,function(s,t,u){
+                return '<i class="fa '+ s.substring(3)+'">&nbsp';
+            });
+
         } else {
             verticeText = verticeText.replace(/<br>/g, "\n");
             labelTypeStr = 'text';
diff --git a/src/mermaidAPI.js b/src/mermaidAPI.js
index 291721139..8016d8d25 100644
--- a/src/mermaidAPI.js
+++ b/src/mermaidAPI.js
@@ -303,10 +303,6 @@ exports.encodeEntities = function(text){
 
     });
 
-    //txt = txt.replace(/fa:fa[\w\-]+/g,function(s,t,u){
-    //    return 'fa:¢';
-    //});
-
     return txt;
 };
 
diff --git a/test/examples/fontAwesome.html b/test/examples/fontAwesome.html
index 55d27dea3..015d4a6a7 100644
--- a/test/examples/fontAwesome.html
+++ b/test/examples/fontAwesome.html
@@ -18,10 +18,10 @@
         <h1><i class="fa fa-camera-retro"></i> Font awesome support</h1>
         <div class="mermaid" id="i211">
         graph LR
-            A["A double quote:#quot;"] -->B["A dec char:#9829;"]
-            B                          -->C["#9829; ;^; #60;"]
-            C-->                          D(fa:fa-camera-retro);
-            D-->                          E(tjo);
+            A["A double quote:#quot;"] -->B["fa:fa-twitter nu springer vi"]
+            B                          -->C[fa:fa-ban nu springer vi]
+            C-->                          D(fa:fa-spinner);
+            D-->                          E(En fa:fa-camera-retro kanske?);
         </div>
         <div class="mermaid" id="i211">
             sequenceDiagram