Demos updated, rewritten, enhanced, tested.

Some code cleanups.

Bugs fixed, scanner and encoder improved:
count.rb: marked Streamable
html_css.rb: style for inline numbers
html.rb: changed options; :line_numbers_offset is now :line_number_start
html_output.rb: offset for inline numbers fixed
html.rb: token text no longer changed by gsub! while highlighting (this is even faster!)
text.rb, plugin.rb: reindented
ruby.rb: eleminated multiple assignments for speed

tokens.rb: reindented, Tokens#to_s added, #<< returns self

Plugin system: bugs fixed, error messages improved.

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index 58fdd86..15120a2 100644
--- a/lib/coderay/encoders/html.rb
+++ b/lib/coderay/encoders/html.rb
@@ -17,7 +17,7 @@ module Encoders
 			:wrap => :page,

 

 			:line_numbers => nil,

-			:line_numbers_offset => 1,

+			:line_number_start => 1,

 			:bold_every => 10,

 		}

 		NUMERIZABLE_WRAPPINGS = [:div, :page]

@@ -133,8 +133,9 @@ module Encoders
 

 		def token text, type

 			if text.is_a? String

-				# be careful when streaming: text is changed!

-				text.gsub!(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] }

+				if text =~ /#{HTML_ESCAPE_PATTERN}/o

+					text = text.gsub(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] }

+				end

 				@opened[0] = type

 				style = @css_style[@opened]

 				if style