From 9e4b393b7a77b3fa782edfb2ced0f5776f05997c Mon Sep 17 00:00:00 2001
From: Aaron O'Mullan <aaron.omullan@friendco.de>
Date: Wed, 16 Apr 2014 13:07:35 -0700
Subject: [PATCH] In parse/page remove global marked settings

Highlighter settings were global, moved them to the render function
(where they should have been)
---
 lib/parse/page.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/parse/page.js b/lib/parse/page.js
index eb118e43d..efadf824a 100644
--- a/lib/parse/page.js
+++ b/lib/parse/page.js
@@ -8,17 +8,6 @@ var renderer = require('./renderer');
 var lnormalize = require('../utils/lang').normalize;
 
 
-// Synchronous highlighting with highlight.js
-marked.setOptions({
-    highlight: function (code, lang) {
-        try {
-            return hljs.highlight(lang, code).value;
-        } catch(e) {
-            return hljs.highlightAuto(code).value;
-        }
-    }
-});
-
 
 // Render a section using our custom renderer
 function render(section, _options) {
@@ -30,7 +19,16 @@ function render(section, _options) {
 
     // Build options using defaults and our custom renderer
     var options = _.extend({}, marked.defaults, {
-        renderer: renderer(null, _options)
+        renderer: renderer(null, _options),
+
+        // Synchronous highlighting with highlight.js
+        highlight: function (code, lang) {
+            try {
+                return hljs.highlight(lang, code).value;
+            } catch(e) {
+                return hljs.highlightAuto(code).value;
+            }
+        }
     });
 
     return marked.parser(section, options);