Merge pull request #2189 from benhanzl/move_rouge_loading

This commit is contained in:
Parker Moore 2014-04-02 22:38:05 -04:00
commit f3c54fcf50
1 changed files with 9 additions and 10 deletions

View File

@ -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 = "<pre>#{super}</pre>"
@ -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