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

Merge pull request #2148 from jekyll/error-when-pygments-errors

This commit is contained in:
Parker Moore 2014-03-20 13:25:13 -04:00
parent 96bb687fcc 1b8205245e
commit cf37591200
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,10 +56,20 @@ eos
@options[:encoding] = 'utf-8' @options[:encoding] = 'utf-8'
output = add_code_tags( highlighted_code = Pygments.highlight(code, :lexer => @lang, :options => @options)
Pygments.highlight(code, :lexer => @lang, :options => @options),
@lang.to_s.gsub("+", "-") if highlighted_code.nil?
) Jekyll.logger.error "There was an error highlighting your code:"
puts
Jekyll.logger.error code
puts
Jekyll.logger.error "While attempting to convert the above code, Pygments.rb" +
" returned an unacceptable value."
Jekyll.logger.error "This is usually a timeout problem solved by running `jekyll build` again."
raise ArgumentError.new("Pygments.rb returned an unacceptable value when attempting to highlight some code.")
end
output = add_code_tags(highlighted_code, @lang)
output = context["highlighter_prefix"] + output if context["highlighter_prefix"] output = context["highlighter_prefix"] + output if context["highlighter_prefix"]
output << context["highlighter_suffix"] if context["highlighter_suffix"] output << context["highlighter_suffix"] if context["highlighter_suffix"]
@ -89,14 +99,14 @@ eos
#The div is required because RDiscount blows ass #The div is required because RDiscount blows ass
<<-HTML <<-HTML
<div> <div>
<pre><code class='#{@lang}'>#{h(code).strip}</code></pre> <pre><code class='#{@lang.to_s.gsub("+", "-")}'>#{h(code).strip}</code></pre>
</div> </div>
HTML HTML
end end
def add_code_tags(code, lang) def add_code_tags(code, lang)
# Add nested <code> tags to code blocks # Add nested <code> tags to code blocks
code = code.sub(/<pre>/,'<pre><code class="' + lang + '">') code = code.sub(/<pre>/,'<pre><code class="' + lang.to_s.gsub("+", "-") + '">')
code = code.sub(/<\/pre>/,"</code></pre>") code = code.sub(/<\/pre>/,"</code></pre>")
end end