dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3779 from jekyll/move-highlight-div-to-figure 

Merge pull request 3779
This commit is contained in:
Parker Moore 2015-06-10 14:13:25 -07:00
parent 32cb87af90 137efdc9f4
commit b6e15977de
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/converters/markdown/redcarpet_parser.rb
View File

@ -29,7 +29,7 @@ module Jekyll
include CommonMethods include CommonMethods
def code_wrap(code) def code_wrap(code)
"<div class=\"highlight\"><pre>#{CGI::escapeHTML(code)}</pre></div>" "<figure class=\"highlight\"><pre>#{CGI::escapeHTML(code)}</pre></figure>"
end end
def block_code(code, lang) def block_code(code, lang)

2
lib/jekyll/tags/highlight.rb
View File

@ -113,7 +113,7 @@ eos
"class=\"language-#{@lang.to_s.gsub('+', '-')}\"", "class=\"language-#{@lang.to_s.gsub('+', '-')}\"",
"data-lang=\"#{@lang.to_s}\"" "data-lang=\"#{@lang.to_s}\""
].join(" ") ].join(" ")
"<div class=\"highlight\"><pre><code #{code_attributes}>#{code.chomp}</code></pre></div>" "<figure class=\"highlight\"><pre><code #{code_attributes}>#{code.chomp}</code></pre></figure>"
end end
end end

2
test/test_redcarpet.rb
View File

@ -75,7 +75,7 @@ puts "Hello world"
end end
should "render fenced code blocks without syntax highlighting" do should "render fenced code blocks without syntax highlighting" do
assert_equal "<div class=\"highlight\"><pre><code class=\"language-ruby\" data-lang=\"ruby\">puts &quot;Hello world&quot;\n</code></pre></div>", @markdown.convert( assert_equal "<figure class=\"highlight\"><pre><code class=\"language-ruby\" data-lang=\"ruby\">puts &quot;Hello world&quot;\n</code></pre></figure>", @markdown.convert(
<<-EOS <<-EOS
```ruby ```ruby
puts "Hello world" puts "Hello world"