From e6f89074d421232aed67f9e9f5306ccb53cc1f33 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 22 Sep 2014 23:03:49 -0700 Subject: [PATCH 1/2] Rouge's Redcarpet plugin now has a different API See for more: - https://github.com/jneen/rouge/commit/18ec938e9ca9463fb424c3d706f8fc761dad2460 - https://github.com/jneen/rouge/issues/182 --- lib/jekyll/converters/markdown/redcarpet_parser.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb index b69df9b8..468069e9 100644 --- a/lib/jekyll/converters/markdown/redcarpet_parser.rb +++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb @@ -48,8 +48,8 @@ module Jekyll end protected - def rouge_formatter(opts = {}) - Rouge::Formatters::HTML.new(opts.merge(wrap: false)) + def rouge_formatter(lexer) + Rouge::Formatters::HTML.new(:wrap => false) end end From 8990d7199e941229cd12540977df8c399b65fa03 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 22 Sep 2014 23:04:51 -0700 Subject: [PATCH 2/2] Latest version of Rouge so we know the API is right. --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 8371c91e..91173067 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -62,5 +62,5 @@ Gem::Specification.new do |s| s.add_development_dependency('activesupport', '~> 3.2.13') s.add_development_dependency('jekyll_test_plugin') s.add_development_dependency('jekyll_test_plugin_malicious') - s.add_development_dependency('rouge', '~> 1.3') + s.add_development_dependency('rouge', '~> 1.7') end