From fd907fa63105f66d3c96222b80e22b3a660cc1ca Mon Sep 17 00:00:00 2001 From: "maul.esel" Date: Mon, 22 Jul 2013 15:29:36 +0200 Subject: [PATCH] simplify coderay option handling --- lib/jekyll/converters/markdown/kramdown_parser.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb index b4237881..1d4d2d3a 100644 --- a/lib/jekyll/converters/markdown/kramdown_parser.rb +++ b/lib/jekyll/converters/markdown/kramdown_parser.rb @@ -14,14 +14,10 @@ module Jekyll def convert(content) # Check for use of coderay if @config['kramdown']['use_coderay'] - @config['kramdown'].merge!({ - :coderay_wrap => @config['kramdown']['coderay']['coderay_wrap'], - :coderay_line_numbers => @config['kramdown']['coderay']['coderay_line_numbers'], - :coderay_line_number_start => @config['kramdown']['coderay']['coderay_line_number_start'], - :coderay_tab_width => @config['kramdown']['coderay']['coderay_tab_width'], - :coderay_bold_every => @config['kramdown']['coderay']['coderay_bold_every'], - :coderay_css => @config['kramdown']['coderay']['coderay_css'] - }) + %w[wrap line_numbers line_numbers_start tab_width bold_every css].each do |opt| + key = "coderay_#{opt}" + @config['kramdown'][key.to_sym] = @config['kramdown']['coderay'][key] unless @config['kramdown'].has_key? key + end end Kramdown::Document.new(content, @config["kramdown"].symbolize_keys).to_html