Merge pull request #928 from GitbookIO/feature/highlight_block

Code highlighting extended by plugins

1 files changed, 9 insertions, 9 deletions

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