Merge branch 'release/v1.5.2'

lib/config.js

@@ -1,18 +1,18 @@
 var extend = require('util')._extend;
-var fs = require('fs');
-var Renderer = require('marked').Renderer;
+var fs     = require('fs');
+var marked = require('marked');
 
 module.exports = function(opts) {
   var fileData;
 
   this.options = extend({
-    config: {},
-    data: {},
-    extension: 'html',
-    handlebars: require('handlebars'),
-    marked: new Renderer(),
-    pageRoot: process.cwd(),
-    silent: false
+    config     : {},
+    data       : {},
+    extension  : 'html',
+    handlebars : require('handlebars'),
+    marked     : new marked.Renderer(),
+    pageRoot   : process.cwd(),
+    silent     : false
   }, opts);
 
   // A template is required

lib/parse.js

@@ -7,6 +7,7 @@ var glob        = require('glob');
 var globAll     = require('glob-all');
 var marked      = require('marked');
 var path        = require('path');
+var hljs        = require('highlight.js');
 
 // Parses files according to the options passed to the constructor.
 module.exports = function(file, opts, cb) {
@@ -28,8 +29,16 @@ module.exports = function(file, opts, cb) {
 
   // Catch Markdown errors
   if (this.options.marked) {
+    marked.setOptions({
+      renderer  : this.options.marked,
+      highlight : (code, language) => {
+        const validLanguage = hljs.getLanguage(language) ? language : 'html';
+        return hljs.highlight(validLanguage, code).value;
+      }
+    });
+
     try {
-      page.docs = marked(pageData.body, { renderer: _this.options.marked });
+      page.docs = marked(pageData.body);
     }
     catch (e) {
       throw new Error('Marked error: ' + e.message);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "supercollider",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Documentation generator that can combine data from multiple parsers, such as SassDoc and JSDoc.",
   "keywords": [
     "documentation",