From a103898980dd40d32b1516c34f12f52c9d0b4e9f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 26 Dec 2014 22:16:33 -0500 Subject: [PATCH 1/5] Set 'use_coderay' to 'enable_coderay' --- lib/jekyll/configuration.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index c64f3a89..377e799b 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -75,12 +75,12 @@ module Jekyll }, 'kramdown' => { - 'auto_ids' => true, - 'footnote_nr' => 1, - 'entity_output' => 'as_char', - 'toc_levels' => '1..6', - 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo', - 'use_coderay' => false, + 'auto_ids' => true, + 'footnote_nr' => 1, + 'entity_output' => 'as_char', + 'toc_levels' => '1..6', + 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo', + 'enable_coderay' => false, 'coderay' => { 'coderay_wrap' => 'div', From f6bff6fb614d9ad04119fd99ad8dd55c14bee0c3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 26 Dec 2014 22:16:47 -0500 Subject: [PATCH 2/5] Have a deprecation fallback for 'use_coderay' --- lib/jekyll/configuration.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 377e799b..7ba9359b 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -254,6 +254,12 @@ module Jekyll config[option].map!(&:to_s) end + if (config['kramdown'] || {}).key?('use_coderay') + Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" + + " to 'enable_coderay' in your configuration file." + config['kramdown']['use_coderay'] = config['kramdown'].delete('enable_coderay') + end + if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku") Jekyll::Deprecator.deprecation_message "You're using the 'maruku' " + "Markdown processor. Maruku support has been deprecated and will " + From d35af9c1f36c9189bb4c6970c7c75d102fbf7a21 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 26 Dec 2014 22:16:57 -0500 Subject: [PATCH 3/5] Read 'enable_coderay' in the Kramdown parser --- lib/jekyll/converters/markdown/kramdown_parser.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb index 097c9212..a9dbec96 100644 --- a/lib/jekyll/converters/markdown/kramdown_parser.rb +++ b/lib/jekyll/converters/markdown/kramdown_parser.rb @@ -13,14 +13,14 @@ module Jekyll def convert(content) # Check for use of coderay - if @config['kramdown']['use_coderay'] + if @config['kramdown']['enable_coderay'] %w[wrap line_numbers line_numbers_start tab_width bold_every css default_lang].each do |opt| key = "coderay_#{opt}" @config['kramdown'][key] = @config['kramdown']['coderay'][key] unless @config['kramdown'].key?(key) end end - Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config["kramdown"])).to_html + Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config['kramdown'])).to_html end end From 039c521e8c85d8f774fe0ab4498c9c258c7e599d Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 26 Dec 2014 22:17:07 -0500 Subject: [PATCH 4/5] Update the documentation. --- site/_docs/configuration.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md index e4d55524..c9ddd915 100644 --- a/site/_docs/configuration.md +++ b/site/_docs/configuration.md @@ -527,12 +527,12 @@ redcarpet: extensions: [] kramdown: - auto_ids: true - footnote_nr: 1 - entity_output: as_char - toc_levels: 1..6 - smart_quotes: lsquo,rsquo,ldquo,rdquo - use_coderay: false + auto_ids: true + footnote_nr: 1 + entity_output: as_char + toc_levels: 1..6 + smart_quotes: lsquo,rsquo,ldquo,rdquo + enable_coderay: false coderay: coderay_wrap: div From c24c6b7f3d2607cb6b7e138c66e504d43e73da63 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 26 Dec 2014 22:17:33 -0500 Subject: [PATCH 5/5] Use 'enable_coderay' in the tests. --- test/test_kramdown.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb index f2bd8a0b..3998e9d3 100644 --- a/test/test_kramdown.rb +++ b/test/test_kramdown.rb @@ -14,7 +14,7 @@ class TestKramdown < Test::Unit::TestCase 'toc_levels' => '1..6', 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo', - 'use_coderay' => true, + 'enable_coderay' => true, 'coderay_bold_every'=> 12, 'coderay' => { 'coderay_css' => :style,