2 files changed, 9 insertions, 45 deletions
diff --git a/lib/utils/code.js b/lib/utils/code.js
deleted file mode 100644
index 0d98869..0000000
--- a/lib/utils/code.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var hljs = require('highlight.js');
-
-var MAP = {
-    'py': 'python',
-    'js': 'javascript',
-    'json': 'javascript',
-    'rb': 'ruby',
-    'csharp': 'cs',
-};
-
-function normalize(lang) {
-    if(!lang) { return null; }
-
-    var lower = lang.toLowerCase();
-    return MAP[lower] || lower;
-}
-
-function highlight(lang, code) {
-    if(!lang) return code;
-
-    // Normalize lang
-    lang = normalize(lang);
-
-    try {
-        return hljs.highlight(lang, code).value;
-    } catch(e) { }
-
-    return code;
-}
-
-// Exports
-module.exports = {
-    highlight: highlight,
-    normalize: normalize,
-    MAP: MAP
-};
diff --git a/lib/utils/page.js b/lib/utils/page.js
index e2a7cd5..5b4eca8 100644
--- a/lib/utils/page.js
+++ b/lib/utils/page.js
@@ -11,7 +11,6 @@ var links = require('./links');
 var imgUtils = require('./images');
 var fs = require('./fs');
 var batch = require('./batch');
-var code = require('./code');
 
 var parsableExtensions = require('gitbook-parsers').extensions;
 
@@ -224,7 +223,7 @@ function normalizeHtml(src, options) {
 
     // Highlight code blocks
     $("code").each(function() {
-        // Extract language
+        // Normalize language
         var lang = _.chain(
                 ($(this).attr("class") || "").split(" ")
             )
@@ -241,14 +240,15 @@ function normalizeHtml(src, options) {
             .first()
             .value();
 
-        if (lang) {
-            var html = code.highlight(
-                lang,
-                $(this).text()
-            );
+        var source = $(this).text();
+        var html = options.book.template.applyBlock('code', {
+            body: source,
+            kwargs: {
+                language: lang
+            }
+        }).body;
 
-            $(this).html(html);
-        }
+        $(this).html(html);
     });
 
     // Replace glossary terms