summaryrefslogtreecommitdiff
path: root/lib/coderay/encoders/html.rb
diff options
context:
space:
mode:
authormurphy <murphy@rubychan.de>2006-04-10 03:06:50 +0000
committermurphy <murphy@rubychan.de>2006-04-10 03:06:50 +0000
commit5ee15661dbc2da70927f588e310315233aff6eea (patch)
tree08c959a52080e4cbcc873b49c8e5f1ed42a75ccf /lib/coderay/encoders/html.rb
parent132b75e58dba4c93278721d60f177cfbee7d0e46 (diff)
downloadcoderay-5ee15661dbc2da70927f588e310315233aff6eea.tar.gz
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.
Diffstat (limited to 'lib/coderay/encoders/html.rb')
-rw-r--r--lib/coderay/encoders/html.rb5
1 files changed, 3 insertions, 2 deletions
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