From f2ed30dff50d7c03be1ec315c9d1aae039c9a71b Mon Sep 17 00:00:00 2001 From: Ben Hanzl Date: Mon, 31 Mar 2014 19:48:18 -0400 Subject: [PATCH] Move rouge loading --- .../converters/markdown/redcarpet_parser.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index edbfaf9a..d43eb140 100644 --- a/lib/jekyll/converters/markdown/redcarpet_parser.rb +++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb @@ -39,16 +39,6 @@ module Jekyll end module WithRouge - require 'rouge' - require 'rouge/plugins/redcarpet' - - if Rouge.version < '1.3.0' - abort "Please install Rouge 1.3.0 or greater and try running Jekyll again." - end - - include Rouge::Plugins::Redcarpet - include CommonMethods - def block_code(code, lang) code = "
#{super}
" @@ -77,6 +67,15 @@ module Jekyll end when 'rouge' Class.new(Redcarpet::Render::HTML) do + require 'rouge' + require 'rouge/plugins/redcarpet' + + if Rouge.version < '1.3.0' + abort "Please install Rouge 1.3.0 or greater and try running Jekyll again." + end + + include Rouge::Plugins::Redcarpet + include CommonMethods include WithRouge end else