3 files changed, 74 insertions, 32 deletions

diff --git a/lib/output/createTemplateEngine.js b/lib/output/createTemplateEngine.js
index 9b29b2a..523c850 100644
--- a/lib/output/createTemplateEngine.js
+++ b/lib/output/createTemplateEngine.js
@@ -3,6 +3,8 @@ var Immutable = require('immutable');
 var Templating = require('../templating');
 var TemplateEngine = require('../models/templateEngine');
 
+var Plugins = require('../plugins');
+
 var defaultBlocks = require('../constants/defaultBlocks');
 var defaultFilters = require('../constants/defaultFilters');
 
@@ -19,19 +21,11 @@ function createTemplateEngine(output) {
     var rootFolder = book.getContentRoot();
     var logger = book.getLogger();
 
-    var filters = plugins
-        .reduce(function(result, plugin) {
-            return result.merge(plugin.getFilters());
-        }, Immutable.Map());
-
-    var blocks = plugins
-        .map(function(plugin) {
-            return plugin.getBlocks();
-        })
-        .flatten(1);
+    var filters = Plugins.listFilters(plugins);
+    var blocks = Plugins.listBlocks(plugins);
 
     // Extend with default
-    blocks = defaultBlocks.concat(blocks);
+    blocks = defaultBlocks.merge(blocks);
     filters = defaultFilters.merge(filters);
 
     // Create loader
diff --git a/lib/output/getModifiers.js b/lib/output/getModifiers.js
index 34a0b9e..1dd62ba 100644
--- a/lib/output/getModifiers.js
+++ b/lib/output/getModifiers.js
@@ -1,25 +1,61 @@
 var Modifiers = require('./modifiers');
 var resolveFileToURL = require('./helper/resolveFileToURL');
+var Api = require('../api');
+var Plugins = require('../plugins');
+var Promise = require('../utils/promise');
+var defaultBlocks = require('../constants/defaultBlocks');
+
+var CODEBLOCK = 'code';
 
 /**
-    Return default modifier to prepare a page
+    Return default modifier to prepare a page for
+    rendering.
 
     @return <Array>
 */
 function getModifiers(output, page) {
     var book = output.getBook();
+    var plugins = output.getPlugins();
     var glossary = book.getGlossary();
     var entries = glossary.getEntries();
-
     var file = page.getFile();
 
+    // Get TemplateBlock for highlighting
+    var blocks = Plugins.listBlocks(plugins);
+    var code = blocks.get(CODEBLOCK) || defaultBlocks.get(CODEBLOCK);
+
+    // Current context
+    var context = Api.encodeGlobal(output);
+
     return [
+        // Normalize IDs on headings
         Modifiers.addHeadingId,
+
+        // Resolve links (.md -> .html)
         Modifiers.resolveLinks.bind(null,
             file.getPath(),
             resolveFileToURL.bind(null, output)
         ),
-        Modifiers.annotateText.bind(null, entries)
+
+        // Annotate text with glossary entries
+        Modifiers.annotateText.bind(null, entries),
+
+        // Highlight code blocks using "code" block
+        Modifiers.highlightCode.bind(null, function(lang, source) {
+            return Promise(code.applyBlock({
+                body: source,
+                kwargs: {
+                    language: lang
+                }
+            }, context))
+            .then(function(result) {
+                if (result.html === false) {
+                    return { text: result.body };
+                } else {
+                    return { html: result.body };
+                }
+            });
+        })
     ];
 }
 
diff --git a/lib/output/modifiers/highlightCode.js b/lib/output/modifiers/highlightCode.js
index deabd68..dcd9d24 100644
--- a/lib/output/modifiers/highlightCode.js
+++ b/lib/output/modifiers/highlightCode.js
@@ -1,7 +1,35 @@
+var is = require('is');
 var Promise = require('../../utils/promise');
 var editHTMLElement = require('./editHTMLElement');
 
 /**
+    Return language for a code blocks from a list of class names
+
+    @param {Array<String>}
+    @return {String}
+*/
+function getLanguageForClass(classNames) {
+    return classNames
+        .map(function(cl) {
+            // Markdown
+            if (cl.search('lang-') === 0) {
+                return cl.slice('lang-'.length);
+            }
+
+            // Asciidoc
+            if (cl.search('language-') === 0) {
+                return cl.slice('language-'.length);
+            }
+
+            return null;
+        })
+        .find(function(cl) {
+            return Boolean(cl);
+        });
+}
+
+
+/**
     Highlight all code elements
 
     @param {Function(lang, body) -> String} highlight
@@ -11,28 +39,12 @@ var editHTMLElement = require('./editHTMLElement');
 function highlightCode(highlight, $) {
     return editHTMLElement($, 'code', function($code) {
         var classNames = ($code.attr('class') || '').split(' ');
-        var lang = classNames
-            .map(function(cl) {
-                // Markdown
-                if (cl.search('lang-') === 0) {
-                    return cl.slice('lang-'.length);
-                }
-
-                // Asciidoc
-                if (cl.search('language-') === 0) {
-                    return cl.slice('language-'.length);
-                }
-
-                return null;
-            })
-            .find(function(cl) {
-                return Boolean(cl);
-            });
+        var lang = getLanguageForClass(classNames);
         var source = $code.text();
 
         return Promise(highlight(lang, source))
         .then(function(r) {
-            if (r.html) {
+            if (is.string(r.html)) {
                 $code.html(r.html);
             } else {
                 $code.text(r.text);