Merge branch 'ashmaroli-kramdown-warning-config'

docs/_docs/configuration.md

@@ -688,6 +688,7 @@ kramdown:
   input:          GFM
   hard_wrap:      false
   footnote_nr:    1
+  show_warnings:  false
 ```
 
 ## Liquid Options

lib/jekyll/configuration.rb

@@ -80,6 +80,7 @@ module Jekyll
         "input"         => "GFM",
         "hard_wrap"     => false,
         "footnote_nr"   => 1,
+        "show_warnings" => false,
       },
     }.map { |k, v| [k, v.freeze] }].freeze
 

lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -39,9 +39,11 @@ module Jekyll
         def convert(content)
           document = Kramdown::Document.new(content, @config)
           html_output = document.to_html
+          if @config["show_warnings"]
             document.warnings.each do |warning|
               Jekyll.logger.warn "Kramdown warning:", warning
             end
+          end
           html_output
         end
 

lib/jekyll/converters/smartypants.rb

@@ -36,8 +36,10 @@ module Jekyll
       def convert(content)
         document = Kramdown::Document.new(content, @config)
         html_output = document.to_html.chomp
+        if @config["show_warnings"]
           document.warnings.each do |warning|
-          Jekyll.logger.warn "Kramdown warning:", warning
+            Jekyll.logger.warn "Kramdown warning:", warning.sub(%r!^Warning:\s+!, "")
+          end
         end
         html_output
       end

test/test_kramdown.rb

@@ -13,6 +13,7 @@ class TestKramdown < JekyllUnitTest
           "toc_levels"              => "1..6",
           "auto_ids"                => false,
           "footnote_nr"             => 1,
+          "show_warnings"           => true,
 
           "syntax_highlighter"      => "rouge",
           "syntax_highlighter_opts" => {