summaryrefslogtreecommitdiff
path: root/lib/coderay/encoders/html
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
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')
-rw-r--r--lib/coderay/encoders/html/classes.rb1
-rw-r--r--lib/coderay/encoders/html/output.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/coderay/encoders/html/classes.rb b/lib/coderay/encoders/html/classes.rb
index 4a01920..3d40a42 100644
--- a/lib/coderay/encoders/html/classes.rb
+++ b/lib/coderay/encoders/html/classes.rb
@@ -20,6 +20,7 @@ module CodeRay module Encoders
:directive => 'di',
:doc => 'do',
:doc_string => 'ds',
+ :entity => 'en',
:error => 'er',
:escape => 'e',
:exception => 'ex',
diff --git a/lib/coderay/encoders/html/output.rb b/lib/coderay/encoders/html/output.rb
index 80ab4f1..e9a3a41 100644
--- a/lib/coderay/encoders/html/output.rb
+++ b/lib/coderay/encoders/html/output.rb
@@ -174,7 +174,7 @@ module CodeRay
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="de">
<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>CodeRay HTML Encoder Example</title>
<style type="text/css">
<%CSS%>