From e18ebab2c3419675212ccf6e2dec70497bee2b7f Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Mon, 11 Mar 2013 01:18:51 +0100
Subject: vastly improve Debug encoder speed on Ruby 1.9.3

---
 lib/coderay/encoders/debug.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/coderay/encoders')

diff --git a/lib/coderay/encoders/debug.rb b/lib/coderay/encoders/debug.rb
index 95d6138..62f9f0a 100644
--- a/lib/coderay/encoders/debug.rb
+++ b/lib/coderay/encoders/debug.rb
@@ -28,7 +28,7 @@ module Encoders
         @out << text
       else
         # TODO: Escape (
-        text = text.gsub(/[)\\]/, '\\\\\0')  # escape ) and \
+        text = text.gsub(/[)\\]/, '\\\\\0') if text.index(/[)\\]/)
         @out << kind.to_s << '(' << text << ')'
       end
     end
-- 
cgit v1.2.1


From 2347f995a70d7607fc0e417c5c7323eacfdcc341 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 9 Jun 2013 06:23:48 +0200
Subject: treat empty token as error in Debug encoder

---
 lib/coderay/encoders/debug.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/coderay/encoders')

diff --git a/lib/coderay/encoders/debug.rb b/lib/coderay/encoders/debug.rb
index 62f9f0a..c03d3fb 100644
--- a/lib/coderay/encoders/debug.rb
+++ b/lib/coderay/encoders/debug.rb
@@ -24,6 +24,7 @@ module Encoders
     end
     
     def text_token text, kind
+      raise 'empty token' if $CODERAY_DEBUG && text.empty?
       if kind == :space
         @out << text
       else
-- 
cgit v1.2.1


From 8a95c0a59eab55caaa4aff142f6448ede91db4d7 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 9 Jun 2013 21:11:29 +0200
Subject: whitespace

---
 lib/coderay/encoders/html.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/coderay/encoders')

diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index 635a4d8..0fd1317 100644
--- a/lib/coderay/encoders/html.rb
+++ b/lib/coderay/encoders/html.rb
@@ -286,8 +286,7 @@ module Encoders
     
     def end_group kind
       if $CODERAY_DEBUG && (@opened.empty? || @opened.last != kind)
-        warn 'Malformed token stream: Trying to close a token (%p) ' \
-          'that is not open. Open are: %p.' % [kind, @opened[1..-1]]
+        warn 'Malformed token stream: Trying to close a token group (%p) that is not open. Open are: %p.' % [kind, @opened[1..-1]]
       end
       if @opened.pop
         @out << '</span>'
@@ -312,8 +311,7 @@ module Encoders
     
     def end_line kind
       if $CODERAY_DEBUG && (@opened.empty? || @opened.last != kind)
-        warn 'Malformed token stream: Trying to close a line (%p) ' \
-          'that is not open. Open are: %p.' % [kind, @opened[1..-1]]
+        warn 'Malformed token stream: Trying to close a line (%p) that is not open. Open are: %p.' % [kind, @opened[1..-1]]
       end
       if @opened.pop
         @out << '</span>'
-- 
cgit v1.2.1