From cb1a633dc5823e412875c3ac5960c39eebb7cb2b Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Fri, 14 Dec 2012 19:09:48 -0700 Subject: [PATCH] Fix #607 --- lib/gollum/markup.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb index 7b3d60b0..006c2877 100644 --- a/lib/gollum/markup.rb +++ b/lib/gollum/markup.rb @@ -475,7 +475,7 @@ module Gollum # # Returns the placeholder'd String data. def extract_code(data) - data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)\r?$/m) do + data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)[ \t\r]*$/m) do m_indent = $1 m_start = $2 # ~~~ m_lang = $3 @@ -504,7 +504,7 @@ module Gollum "#{m_indent}#{id}" # print the SHA1 ID with the proper indentation end - data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```\r?$/m) do + data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```[ \t\r]*$/m) do lang = $2 ? $2.strip : nil id = Digest::SHA1.hexdigest("#{lang}.#{$3}") cached = check_cache(:code, id)