From 7b16116b67985e8b9eb676413e0d03b000f1ab34 Mon Sep 17 00:00:00 2001 From: Andrey Kislyuk Date: Tue, 31 Jul 2012 08:44:38 -0700 Subject: [PATCH] Proceed with highlighting if one code block fails --- lib/gollum/markup.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb index 170d95c4..aec95c81 100644 --- a/lib/gollum/markup.rb +++ b/lib/gollum/markup.rb @@ -504,15 +504,17 @@ module Gollum blocks << [spec[:lang], code] end - highlighted = begin + highlighted = [] + blocks.each do |lang, code| encoding ||= 'utf-8' - blocks.map { |lang, code| - Pygments.highlight(code, :lexer => lang, :options => {:encoding => encoding.to_s}) - } - rescue ::RubyPython::PythonError - [] + begin + hl_code = Pygments.highlight(code, :lexer => lang, :options => {:encoding => encoding.to_s}) + rescue ::RubyPython::PythonError + hl_code = code + end + highlighted << hl_code end - + @codemap.each do |id, spec| body = spec[:output] || begin if (body = highlighted.shift.to_s).size > 0