From a3b4ad06b992bd418a1d34bfb271c09fd9bedf11 Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Tue, 21 Mar 2006 14:46:34 +0000
Subject: =?UTF-8?q?CodeRay::Duo=20added=20for=20cool=20caching!=20bench/ca?=
 =?UTF-8?q?ching.rb=20added=20t=C2=B4for=20demonstrating=20this.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

HTML Encoder: creates unwrapped output by default (still problems with that.)
Numerizing changed (doesn't try to prevent nesting errors)
Speedup: "::String" is faster.
---
 lib/coderay/encoders/html.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'lib/coderay/encoders/html.rb')

diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index b75f9e5..11fa84c 100644
--- a/lib/coderay/encoders/html.rb
+++ b/lib/coderay/encoders/html.rb
@@ -36,7 +36,7 @@ module Encoders
 	# 
 	# You can also use Encoders::Div and Encoders::Span.
 	# 
-	# Default: :page
+	# Default: nil
 	# 
 	# === :line_numbers
 	# Include line numbers in :table, :inline, :list or nil (no line numbers)
@@ -73,7 +73,7 @@ module Encoders
 
 			:style => :cycnus,
 			
-			:wrap => :page,
+			:wrap => nil,
 
 			:line_numbers => nil,
 			:line_number_start => 1,
@@ -208,17 +208,14 @@ module Encoders
 
 			@out.extend Output
 			@out.css = @css
-			@out.numerize! options[:line_numbers], options # if options[:line_numbers]
-			@out.wrap! options[:wrap] # if options[:wrap]
-
-			#require 'pp'
-			#pp @css_style, @css_style.size
+			@out.numerize! options[:line_numbers], options
+			@out.wrap! options[:wrap]
 
 			super
 		end
 
 		def token text, type
-			if text.is_a? String
+			if text.is_a? ::String
 				if text =~ /#{HTML_ESCAPE_PATTERN}/o
 					text = text.gsub(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] }
 				end
-- 
cgit v1.2.1