summaryrefslogtreecommitdiffstats
path: root/lib/parse/page.js
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2014-04-01 23:00:22 -0700
committerSamy Pessé <samypesse@gmail.com>2014-04-01 23:00:22 -0700
commiteb09f6102946a16251b44bc37a3d803d4e8cf168 (patch)
treed311d8c5fb15303b297bcd9cf768cb56b11d88d6 /lib/parse/page.js
parent2cee253be43096ad6ef28d940ed3ab0362e4825f (diff)
downloadgitbook-eb09f6102946a16251b44bc37a3d803d4e8cf168.zip
gitbook-eb09f6102946a16251b44bc37a3d803d4e8cf168.tar.gz
gitbook-eb09f6102946a16251b44bc37a3d803d4e8cf168.tar.bz2
Fix usage of highlight.js
Diffstat (limited to 'lib/parse/page.js')
-rw-r--r--lib/parse/page.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/parse/page.js b/lib/parse/page.js
index b28135c..09670b8 100644
--- a/lib/parse/page.js
+++ b/lib/parse/page.js
@@ -1,12 +1,17 @@
var _ = require('lodash');
var marked = require('marked');
+var hljs = require('highlight.js');
var renderer = require('./renderer');
// Synchronous highlighting with highlight.js
marked.setOptions({
- highlight: function (code) {
- return require('highlight.js').highlightAuto(code).value;
+ highlight: function (code, lang) {
+ try {
+ return hljs.highlight(lang, code).value;
+ } catch(e) {
+ return hljs.highlightAuto(code).value;
+ }
}
});