From 32d5fd154c065537fbef8979caff32a020ba88f9 Mon Sep 17 00:00:00 2001
From: Joe Workman <joe@workmanmail.com>
Date: Thu, 23 Jul 2020 14:46:29 -0700
Subject: [PATCH 1/5] have marked use highlightJS and default to html

---
 lib/config.js | 18 +++++++++---------
 lib/parse.js  | 10 +++++++++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/config.js b/lib/config.js
index 67ae3d2..7028570 100644
--- a/lib/config.js
+++ b/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
diff --git a/lib/parse.js b/lib/parse.js
index c35d07c..519021d 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -28,8 +28,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);

From e9a6ad79814d0739f72a40d4613fade3a8f9a861 Mon Sep 17 00:00:00 2001
From: Joe Workman <joe@workmanmail.com>
Date: Thu, 23 Jul 2020 14:54:32 -0700
Subject: [PATCH 2/5] default to plaintext instead of html

---
 lib/parse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/parse.js b/lib/parse.js
index 519021d..5eb6a94 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -31,7 +31,7 @@ module.exports = function(file, opts, cb) {
     marked.setOptions({
       renderer  : this.options.marked,
       highlight : (code, language) => {
-        const validLanguage = hljs.getLanguage(language) ? language : 'html';
+        const validLanguage = hljs.getLanguage(language) ? language : 'plaintext';
         return hljs.highlight(validLanguage, code).value;
       }
     });

From c26c5041d25d2abd6700bc11abdae40ea9d70f49 Mon Sep 17 00:00:00 2001
From: Joe Workman <joe@workmanmail.com>
Date: Thu, 23 Jul 2020 14:57:44 -0700
Subject: [PATCH 3/5] Revert "default to plaintext instead of html"

This reverts commit e9a6ad79814d0739f72a40d4613fade3a8f9a861.
---
 lib/parse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/parse.js b/lib/parse.js
index 5eb6a94..519021d 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -31,7 +31,7 @@ module.exports = function(file, opts, cb) {
     marked.setOptions({
       renderer  : this.options.marked,
       highlight : (code, language) => {
-        const validLanguage = hljs.getLanguage(language) ? language : 'plaintext';
+        const validLanguage = hljs.getLanguage(language) ? language : 'html';
         return hljs.highlight(validLanguage, code).value;
       }
     });

From 9dd9d26a16c36662de4abb7795cd40af4c25fd66 Mon Sep 17 00:00:00 2001
From: Joe Workman <joe@workmanmail.com>
Date: Thu, 23 Jul 2020 14:58:25 -0700
Subject: [PATCH 4/5] import hljs

---
 lib/parse.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/parse.js b/lib/parse.js
index 519021d..1c642e2 100644
--- a/lib/parse.js
+++ b/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) {

From 4e4d7b70574a429da2a6bd2031c5731e1d3d82df Mon Sep 17 00:00:00 2001
From: Joe Workman <joe@workmanmail.com>
Date: Thu, 23 Jul 2020 15:01:32 -0700
Subject: [PATCH 5/5] Update version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ff831c9..01b16bf 100644
--- a/package.json
+++ b/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",