From 5ee15661dbc2da70927f588e310315233aff6eea Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Mon, 10 Apr 2006 03:06:50 +0000
Subject: Large update: Scanners for HTML, RHTML and Nitro-XHTML added.

CSS style changes/enhancments (mainly the new background color for inline code, affects all Ruby code.)
Demos and tests adjusted.

Plugin: new PluginHost::default method.

Scanner:
- New setup method
- ability to re-use a scanner
- ability to keep the tokens
- minor changes to token caching and string flattening

Encoder: Error if token content is neither String nor Symbol.

HTML encoder:
- more warnings for unclosed tokens
- output now UTF-8

Ruby Scanner:
- bug: symbols before => now do not include =; {:foo=>bar} is valid Ruby code
- try to close all open tokens
- constants now all with specific namespace (for speed, I hope)

Styles: new :entity/en class.

Test suite now gives hinted HTML output.
---
 lib/coderay/encoders/html.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index 11fa84c..0b43c0c 100644
--- a/lib/coderay/encoders/html.rb
+++ b/lib/coderay/encoders/html.rb
@@ -205,6 +205,7 @@ module Encoders
 		def finish options
 			not_needed = @opened.shift
 			@out << '</span>' * @opened.size
+			warn '%d tokens still open' % @opened.size unless @opened.empty?
 
 			@out.extend Output
 			@out.css = @css
@@ -230,11 +231,11 @@ module Encoders
 				case text
 				when :open
 					@opened[0] = type
-					@out << @css_style[@opened]
+					@out << (@css_style[@opened] || '<span>')
 					@opened << type
 				when :close
 					unless @opened.empty?
-						raise 'Not Token to be closed.' unless @opened.size > 1
+						raise 'Malformed token stream: Trying to close a token that was never opened.' unless @opened.size > 1
 						@out << '</span>'
 						@opened.pop
 					end
-- 
cgit v1.2.1