summaryrefslogtreecommitdiff
path: root/demo
diff options
context:
space:
mode:
Diffstat (limited to 'demo')
-rw-r--r--demo/demo_cache.out2
-rw-r--r--demo/demo_cache.rb12
-rw-r--r--demo/demo_css.out168
-rw-r--r--demo/demo_div.out24
-rw-r--r--demo/demo_highlight.out182
-rw-r--r--demo/demo_html.out150
-rw-r--r--demo/demo_html2.out198
-rw-r--r--demo/demo_html_list.out170
-rw-r--r--demo/demo_load_scanner.out2
-rw-r--r--demo/demo_more.out2
-rw-r--r--demo/demo_simple.out3
11 files changed, 479 insertions, 434 deletions
diff --git a/demo/demo_cache.out b/demo/demo_cache.out
new file mode 100644
index 0000000..4dee329
--- /dev/null
+++ b/demo/demo_cache.out
@@ -0,0 +1,2 @@
+test <test>
+test <span class="ta">&lt;test&gt;</span>
diff --git a/demo/demo_cache.rb b/demo/demo_cache.rb
new file mode 100644
index 0000000..0c0b847
--- /dev/null
+++ b/demo/demo_cache.rb
@@ -0,0 +1,12 @@
+require 'coderay'
+
+html_encoder = CodeRay.encoder :html
+
+scanner = Hash.new do |h, lang|
+ h[lang] = CodeRay.scanner lang
+end
+
+for lang in [:ruby, :html]
+ tokens = scanner[lang].tokenize 'test <test>'
+ puts html_encoder.encode_tokens(tokens)
+end
diff --git a/demo/demo_css.out b/demo/demo_css.out
index 1429a8f..d1c6259 100644
--- a/demo/demo_css.out
+++ b/demo/demo_css.out
@@ -4,95 +4,101 @@
font-family: 'Courier New', 'Terminal', monospace;
color: #100;
}
-.CodeRay pre { margin: 0px; }
+.CodeRay pre { margin: 0px }
div.CodeRay { }
-span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
-table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
-table.CodeRay td { padding: 2px 4px; vertical-align: top; }
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
.CodeRay .line_numbers, .CodeRay .no {
background-color: #def;
color: gray;
text-align: right;
}
-.CodeRay .line_numbers tt { font-weight: bold; }
-.CodeRay .no { padding: 0px 4px; }
-.CodeRay .code { width: 100%; }
-
-ol.CodeRay { font-size: 10pt; }
-ol.CodeRay li { white-space: pre; }
-
-.CodeRay .code pre { overflow: auto; }
-
-.CodeRay .af { color:#00C; }
-.CodeRay .an { color:#007; }
-.CodeRay .av { color:#700; }
-.CodeRay .aw { color:#C00; }
-.CodeRay .bi { color:#509; font-weight:bold; }
-.CodeRay .c { color:#888; }
-
-.CodeRay .ch { color:#04D; }
-.CodeRay .ch .k { color:#04D; }
-.CodeRay .ch .dl { color:#039; }
-
-.CodeRay .cl { color:#B06; font-weight:bold; }
-.CodeRay .co { color:#036; font-weight:bold; }
-.CodeRay .cr { color:#0A0; }
-.CodeRay .cv { color:#369; }
-.CodeRay .df { color:#099; font-weight:bold; }
-.CodeRay .di { color:#088; font-weight:bold; }
-.CodeRay .dl { color:black; }
-.CodeRay .do { color:#970; }
-.CodeRay .ds { color:#D42; font-weight:bold; }
-.CodeRay .e { color:#666; font-weight:bold; }
-.CodeRay .er { color:#F00; background-color:#FAA; }
-.CodeRay .ex { color:#F00; font-weight:bold; }
-.CodeRay .fl { color:#60E; font-weight:bold; }
-.CodeRay .fu { color:#06B; font-weight:bold; }
-.CodeRay .gv { color:#d70; font-weight:bold; }
-.CodeRay .hx { color:#058; font-weight:bold; }
-.CodeRay .i { color:#00D; font-weight:bold; }
-.CodeRay .ic { color:#B44; font-weight:bold; }
-.CodeRay .il { }
-.CodeRay .in { color:#B2B; font-weight:bold; }
-.CodeRay .iv { color:#33B; }
-.CodeRay .la { color:#970; font-weight:bold; }
-.CodeRay .lv { color:#963; }
-.CodeRay .oc { color:#40E; font-weight:bold; }
-.CodeRay .on { color:#000; font-weight:bold; }
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .no { padding: 0px 4px }
+.CodeRay .code { width: 100% }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .code pre { overflow: auto }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c { color:#888 }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#F00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #eee }
+.CodeRay .il .il { background: #ddd }
+.CodeRay .il .il .il { background: #ccc }
+.CodeRay .il .dl { font-weight: bold ! important; color: #888 ! important }
+
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .on { color:#000; font-weight:bold }
.CodeRay .op { }
-.CodeRay .pc { color:#038; font-weight:bold; }
-.CodeRay .pd { color:#369; font-weight:bold; }
-.CodeRay .pp { color:#579; }
-.CodeRay .pt { color:#339; font-weight:bold; }
-.CodeRay .r { color:#080; font-weight:bold; }
-
-.CodeRay .rx { background-color:#fff0ff; }
-.CodeRay .rx .k { color:#808; }
-.CodeRay .rx .dl { color:#404; }
-.CodeRay .rx .mod { color:#C2C; }
-.CodeRay .rx .fu { color:#404; font-weight: bold; }
-
-.CodeRay .s { background-color:#fff0f0; }
-.CodeRay .s .s { background-color:#ffe0e0; }
-.CodeRay .s .s .s { background-color:#ffd0d0; }
-.CodeRay .s .k { color:#D20; }
-.CodeRay .s .dl { color:#710; }
-
-.CodeRay .sh { background-color:#f0fff0; }
-.CodeRay .sh .k { color:#2B2; }
-.CodeRay .sh .dl { color:#161; }
-
-.CodeRay .sy { color:#A60; }
-.CodeRay .sy .k { color:#A60; }
-.CodeRay .sy .dl { color:#630; }
-
-.CodeRay .ta { color:#070; }
-.CodeRay .tf { color:#070; font-weight:bold; }
-.CodeRay .ts { color:#D70; font-weight:bold; }
-.CodeRay .ty { color:#339; font-weight:bold; }
-.CodeRay .v { color:#036; }
-.CodeRay .xt { color:#444; }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579 }
+.CodeRay .pt { color:#339; font-weight:bold }
+.CodeRay .r { color:#080; font-weight:bold }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu { color:#404; font-weight: bold }
+
+.CodeRay .s { background-color:#fff0f0 }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s .s { background-color:#ffd0d0 }
+.CodeRay .s .k { color:#D20 }
+.CodeRay .s .dl { color:#710 }
+
+.CodeRay .sh { background-color:#f0fff0 }
+.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v { color:#036 }
+.CodeRay .xt { color:#444 }
diff --git a/demo/demo_div.out b/demo/demo_div.out
index 5ae922f..c85062e 100644
--- a/demo/demo_div.out
+++ b/demo/demo_div.out
@@ -1,17 +1,17 @@
<div class="CodeRay">
- <div class="code"><pre><span style="color:#080; font-weight:bold;">for</span> a <span style="color:#080; font-weight:bold;">in</span> <span style="color:#00D; font-weight:bold;">0</span>..<span style="color:#00D; font-weight:bold;">255</span>
+ <div class="code"><pre><span style="color:#080; font-weight:bold">for</span> a <span style="color:#080; font-weight:bold">in</span> <span style="color:#00D; font-weight:bold">0</span>..<span style="color:#00D; font-weight:bold">255</span>
a = a.chr
- <span style="color:#080; font-weight:bold;">begin</span>
- x = eval(<span style="background-color:#fff0f0;"><span style="color:#710;">&quot;</span><span style="color:#D20;">?</span><span style="color:#04D;">\\</span><span style="background-color:#fff0f0;"><span style="color:#710;">#{</span>a<span style="color:#710;">}</span></span><span style="color:#710;">&quot;</span></span>)
- <span style="color:#080; font-weight:bold;">if</span> x == a[<span style="color:#00D; font-weight:bold;">0</span>]
- <span style="color:#080; font-weight:bold;">next</span>
- <span style="color:#080; font-weight:bold;">else</span>
- print <span style="background-color:#fff0f0;"><span style="color:#710;">&quot;</span><span style="background-color:#fff0f0;"><span style="color:#710;">#{</span>a<span style="color:#710;">}</span></span><span style="color:#D20;">: </span><span style="background-color:#fff0f0;"><span style="color:#710;">#{</span>x<span style="color:#710;">}</span></span><span style="color:#710;">&quot;</span></span>
- <span style="color:#080; font-weight:bold;">end</span>
- <span style="color:#080; font-weight:bold;">rescue</span> <span style="color:#036; font-weight:bold;">SyntaxError</span> =&gt; boom
- print <span style="background-color:#fff0f0;"><span style="color:#710;">&quot;</span><span style="background-color:#fff0f0;"><span style="color:#710;">#{</span>a<span style="color:#710;">}</span></span><span style="color:#D20;">: error</span><span style="color:#710;">&quot;</span></span>
- <span style="color:#080; font-weight:bold;">end</span>
+ <span style="color:#080; font-weight:bold">begin</span>
+ x = eval(<span style="background-color:#fff0f0"><span style="color:#710">&quot;</span><span style="color:#D20">?</span><span style="color:#04D">\\</span><span style="background-color:#fff0f0"><span style="color:#710">#{</span>a<span style="color:#710">}</span></span><span style="color:#710">&quot;</span></span>)
+ <span style="color:#080; font-weight:bold">if</span> x == a[<span style="color:#00D; font-weight:bold">0</span>]
+ <span style="color:#080; font-weight:bold">next</span>
+ <span style="color:#080; font-weight:bold">else</span>
+ print <span style="background-color:#fff0f0"><span style="color:#710">&quot;</span><span style="background-color:#fff0f0"><span style="color:#710">#{</span>a<span style="color:#710">}</span></span><span style="color:#D20">: </span><span style="background-color:#fff0f0"><span style="color:#710">#{</span>x<span style="color:#710">}</span></span><span style="color:#710">&quot;</span></span>
+ <span style="color:#080; font-weight:bold">end</span>
+ <span style="color:#080; font-weight:bold">rescue</span> <span style="color:#036; font-weight:bold">SyntaxError</span> =&gt; boom
+ print <span style="background-color:#fff0f0"><span style="color:#710">&quot;</span><span style="background-color:#fff0f0"><span style="color:#710">#{</span>a<span style="color:#710">}</span></span><span style="color:#D20">: error</span><span style="color:#710">&quot;</span></span>
+ <span style="color:#080; font-weight:bold">end</span>
puts
-<span style="color:#080; font-weight:bold;">end</span>
+<span style="color:#080; font-weight:bold">end</span>
</pre></div>
</div>
diff --git a/demo/demo_highlight.out b/demo/demo_highlight.out
index f7a686e..193faa7 100644
--- a/demo/demo_highlight.out
+++ b/demo/demo_highlight.out
@@ -10,98 +10,104 @@
font-family: 'Courier New', 'Terminal', monospace;
color: #100;
}
-.CodeRay pre { margin: 0px; }
+.CodeRay pre { margin: 0px }
div.CodeRay { }
-span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
-table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
-table.CodeRay td { padding: 2px 4px; vertical-align: top; }
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
.CodeRay .line_numbers, .CodeRay .no {
background-color: #def;
color: gray;
text-align: right;
}
-.CodeRay .line_numbers tt { font-weight: bold; }
-.CodeRay .no { padding: 0px 4px; }
-.CodeRay .code { width: 100%; }
-
-ol.CodeRay { font-size: 10pt; }
-ol.CodeRay li { white-space: pre; }
-
-.CodeRay .code pre { overflow: auto; }
-
-.CodeRay .af { color:#00C; }
-.CodeRay .an { color:#007; }
-.CodeRay .av { color:#700; }
-.CodeRay .aw { color:#C00; }
-.CodeRay .bi { color:#509; font-weight:bold; }
-.CodeRay .c { color:#888; }
-
-.CodeRay .ch { color:#04D; }
-.CodeRay .ch .k { color:#04D; }
-.CodeRay .ch .dl { color:#039; }
-
-.CodeRay .cl { color:#B06; font-weight:bold; }
-.CodeRay .co { color:#036; font-weight:bold; }
-.CodeRay .cr { color:#0A0; }
-.CodeRay .cv { color:#369; }
-.CodeRay .df { color:#099; font-weight:bold; }
-.CodeRay .di { color:#088; font-weight:bold; }
-.CodeRay .dl { color:black; }
-.CodeRay .do { color:#970; }
-.CodeRay .ds { color:#D42; font-weight:bold; }
-.CodeRay .e { color:#666; font-weight:bold; }
-.CodeRay .er { color:#F00; background-color:#FAA; }
-.CodeRay .ex { color:#F00; font-weight:bold; }
-.CodeRay .fl { color:#60E; font-weight:bold; }
-.CodeRay .fu { color:#06B; font-weight:bold; }
-.CodeRay .gv { color:#d70; font-weight:bold; }
-.CodeRay .hx { color:#058; font-weight:bold; }
-.CodeRay .i { color:#00D; font-weight:bold; }
-.CodeRay .ic { color:#B44; font-weight:bold; }
-.CodeRay .il { }
-.CodeRay .in { color:#B2B; font-weight:bold; }
-.CodeRay .iv { color:#33B; }
-.CodeRay .la { color:#970; font-weight:bold; }
-.CodeRay .lv { color:#963; }
-.CodeRay .oc { color:#40E; font-weight:bold; }
-.CodeRay .on { color:#000; font-weight:bold; }
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .no { padding: 0px 4px }
+.CodeRay .code { width: 100% }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .code pre { overflow: auto }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c { color:#888 }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#F00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #eee }
+.CodeRay .il .il { background: #ddd }
+.CodeRay .il .il .il { background: #ccc }
+.CodeRay .il .dl { font-weight: bold ! important; color: #888 ! important }
+
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .on { color:#000; font-weight:bold }
.CodeRay .op { }
-.CodeRay .pc { color:#038; font-weight:bold; }
-.CodeRay .pd { color:#369; font-weight:bold; }
-.CodeRay .pp { color:#579; }
-.CodeRay .pt { color:#339; font-weight:bold; }
-.CodeRay .r { color:#080; font-weight:bold; }
-
-.CodeRay .rx { background-color:#fff0ff; }
-.CodeRay .rx .k { color:#808; }
-.CodeRay .rx .dl { color:#404; }
-.CodeRay .rx .mod { color:#C2C; }
-.CodeRay .rx .fu { color:#404; font-weight: bold; }
-
-.CodeRay .s { background-color:#fff0f0; }
-.CodeRay .s .s { background-color:#ffe0e0; }
-.CodeRay .s .s .s { background-color:#ffd0d0; }
-.CodeRay .s .k { color:#D20; }
-.CodeRay .s .dl { color:#710; }
-
-.CodeRay .sh { background-color:#f0fff0; }
-.CodeRay .sh .k { color:#2B2; }
-.CodeRay .sh .dl { color:#161; }
-
-.CodeRay .sy { color:#A60; }
-.CodeRay .sy .k { color:#A60; }
-.CodeRay .sy .dl { color:#630; }
-
-.CodeRay .ta { color:#070; }
-.CodeRay .tf { color:#070; font-weight:bold; }
-.CodeRay .ts { color:#D70; font-weight:bold; }
-.CodeRay .ty { color:#339; font-weight:bold; }
-.CodeRay .v { color:#036; }
-.CodeRay .xt { color:#444; }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579 }
+.CodeRay .pt { color:#339; font-weight:bold }
+.CodeRay .r { color:#080; font-weight:bold }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu { color:#404; font-weight: bold }
+
+.CodeRay .s { background-color:#fff0f0 }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s .s { background-color:#ffd0d0 }
+.CodeRay .s .k { color:#D20 }
+.CodeRay .s .dl { color:#710 }
+
+.CodeRay .sh { background-color:#f0fff0 }
+.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v { color:#036 }
+.CodeRay .xt { color:#444 }
</style>
@@ -122,19 +128,19 @@ ol.CodeRay li { white-space: pre; }
</tt>13<tt>
</tt>14<tt>
</tt></pre></td>
- <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }">require <span style="background-color:#fff0f0;"><span style="color:#710;">'</span><span style="color:#D20;">coderay</span><span style="color:#710;">'</span></span><tt>
+ <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }">require <span style="background-color:#fff0f0"><span style="color:#710">'</span><span style="color:#D20">coderay</span><span style="color:#710">'</span></span><tt>
</tt><tt>
-</tt>puts <span style="color:#036; font-weight:bold;">CodeRay</span>.highlight(<span style="background-color:#fff0f0;"><span style="color:#710;">'</span><span style="color:#D20;">puts &quot;Hello, World!&quot;</span><span style="color:#710;">'</span></span>, <span style="color:#A60;">:ruby</span>)<tt>
+</tt>puts <span style="color:#036; font-weight:bold">CodeRay</span>.highlight(<span style="background-color:#fff0f0"><span style="color:#710">'</span><span style="color:#D20">puts &quot;Hello, World!&quot;</span><span style="color:#710">'</span></span>, <span style="color:#A60">:ruby</span>)<tt>
</tt><tt>
-</tt>output = <span style="color:#036; font-weight:bold;">CodeRay</span>.highlight_file(<span style="color:#d70; font-weight:bold;">$0</span>, <span style="color:#A60;">:line_numbers</span> =&gt; <span style="color:#A60;">:table</span>)<tt>
-</tt>puts <span style="background-color:#fff0f0;"><span style="color:#710;">&lt;&lt;HTML</span></span><span style="background-color:#fff0f0;"><span style="color:#D20;"><tt>
+</tt>output = <span style="color:#036; font-weight:bold">CodeRay</span>.highlight_file(<span style="color:#d70; font-weight:bold">$0</span>, <span style="color:#A60">:line_numbers</span> =&gt; <span style="color:#A60">:table</span>)<tt>
+</tt>puts <span style="background-color:#fff0f0"><span style="color:#710">&lt;&lt;HTML</span></span><span style="background-color:#fff0f0"><span style="color:#D20"><tt>
</tt>&lt;html&gt;<tt>
</tt>&lt;head&gt;<tt>
-</tt></span><span style="background-color:#fff0f0;"><span style="color:#710;">#{</span>output.stylesheet <span style="color:#038; font-weight:bold;">true</span><span style="color:#710;">}</span></span><span style="color:#D20;"><tt>
+</tt></span><span style="background-color:#fff0f0"><span style="color:#710">#{</span>output.stylesheet <span style="color:#038; font-weight:bold">true</span><span style="color:#710">}</span></span><span style="color:#D20"><tt>
</tt>&lt;body&gt;<tt>
-</tt></span><span style="background-color:#fff0f0;"><span style="color:#710;">#{</span>output<span style="color:#710;">}</span></span><span style="color:#D20;"><tt>
+</tt></span><span style="background-color:#fff0f0"><span style="color:#710">#{</span>output<span style="color:#710">}</span></span><span style="color:#D20"><tt>
</tt>&lt;/body&gt;<tt>
-</tt>&lt;/html&gt;</span><span style="color:#710;"><tt>
+</tt>&lt;/html&gt;</span><span style="color:#710"><tt>
</tt>HTML</span></span><tt>
</tt></pre></td>
</tr></table>
diff --git a/demo/demo_html.out b/demo/demo_html.out
index c0efc3c..0014d49 100644
--- a/demo/demo_html.out
+++ b/demo/demo_html.out
@@ -2,7 +2,7 @@
"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">
.CodeRay {
@@ -11,98 +11,104 @@
font-family: 'Courier New', 'Terminal', monospace;
color: #100;
}
-.CodeRay pre { margin: 0px; }
+.CodeRay pre { margin: 0px }
div.CodeRay { }
-span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
-table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
-table.CodeRay td { padding: 2px 4px; vertical-align: top; }
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
.CodeRay .line_numbers, .CodeRay .no {
background-color: #def;
color: gray;
text-align: right;
}
-.CodeRay .line_numbers tt { font-weight: bold; }
-.CodeRay .no { padding: 0px 4px; }
-.CodeRay .code { width: 100%; }
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .no { padding: 0px 4px }
+.CodeRay .code { width: 100% }
-ol.CodeRay { font-size: 10pt; }
-ol.CodeRay li { white-space: pre; }
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
-.CodeRay .code pre { overflow: auto; }
+.CodeRay .code pre { overflow: auto }
-.CodeRay .af { color:#00C; }
-.CodeRay .an { color:#007; }
-.CodeRay .av { color:#700; }
-.CodeRay .aw { color:#C00; }
-.CodeRay .bi { color:#509; font-weight:bold; }
-.CodeRay .c { color:#888; }
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c { color:#888 }
-.CodeRay .ch { color:#04D; }
-.CodeRay .ch .k { color:#04D; }
-.CodeRay .ch .dl { color:#039; }
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
-.CodeRay .cl { color:#B06; font-weight:bold; }
-.CodeRay .co { color:#036; font-weight:bold; }
-.CodeRay .cr { color:#0A0; }
-.CodeRay .cv { color:#369; }
-.CodeRay .df { color:#099; font-weight:bold; }
-.CodeRay .di { color:#088; font-weight:bold; }
-.CodeRay .dl { color:black; }
-.CodeRay .do { color:#970; }
-.CodeRay .ds { color:#D42; font-weight:bold; }
-.CodeRay .e { color:#666; font-weight:bold; }
-.CodeRay .er { color:#F00; background-color:#FAA; }
-.CodeRay .ex { color:#F00; font-weight:bold; }
-.CodeRay .fl { color:#60E; font-weight:bold; }
-.CodeRay .fu { color:#06B; font-weight:bold; }
-.CodeRay .gv { color:#d70; font-weight:bold; }
-.CodeRay .hx { color:#058; font-weight:bold; }
-.CodeRay .i { color:#00D; font-weight:bold; }
-.CodeRay .ic { color:#B44; font-weight:bold; }
-.CodeRay .il { }
-.CodeRay .in { color:#B2B; font-weight:bold; }
-.CodeRay .iv { color:#33B; }
-.CodeRay .la { color:#970; font-weight:bold; }
-.CodeRay .lv { color:#963; }
-.CodeRay .oc { color:#40E; font-weight:bold; }
-.CodeRay .on { color:#000; font-weight:bold; }
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#F00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #eee }
+.CodeRay .il .il { background: #ddd }
+.CodeRay .il .il .il { background: #ccc }
+.CodeRay .il .dl { font-weight: bold ! important; color: #888 ! important }
+
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .on { color:#000; font-weight:bold }
.CodeRay .op { }
-.CodeRay .pc { color:#038; font-weight:bold; }
-.CodeRay .pd { color:#369; font-weight:bold; }
-.CodeRay .pp { color:#579; }
-.CodeRay .pt { color:#339; font-weight:bold; }
-.CodeRay .r { color:#080; font-weight:bold; }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579 }
+.CodeRay .pt { color:#339; font-weight:bold }
+.CodeRay .r { color:#080; font-weight:bold }
-.CodeRay .rx { background-color:#fff0ff; }
-.CodeRay .rx .k { color:#808; }
-.CodeRay .rx .dl { color:#404; }
-.CodeRay .rx .mod { color:#C2C; }
-.CodeRay .rx .fu { color:#404; font-weight: bold; }
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu { color:#404; font-weight: bold }
-.CodeRay .s { background-color:#fff0f0; }
-.CodeRay .s .s { background-color:#ffe0e0; }
-.CodeRay .s .s .s { background-color:#ffd0d0; }
-.CodeRay .s .k { color:#D20; }
-.CodeRay .s .dl { color:#710; }
+.CodeRay .s { background-color:#fff0f0 }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s .s { background-color:#ffd0d0 }
+.CodeRay .s .k { color:#D20 }
+.CodeRay .s .dl { color:#710 }
-.CodeRay .sh { background-color:#f0fff0; }
-.CodeRay .sh .k { color:#2B2; }
-.CodeRay .sh .dl { color:#161; }
+.CodeRay .sh { background-color:#f0fff0 }
+.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh .dl { color:#161 }
-.CodeRay .sy { color:#A60; }
-.CodeRay .sy .k { color:#A60; }
-.CodeRay .sy .dl { color:#630; }
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
-.CodeRay .ta { color:#070; }
-.CodeRay .tf { color:#070; font-weight:bold; }
-.CodeRay .ts { color:#D70; font-weight:bold; }
-.CodeRay .ty { color:#339; font-weight:bold; }
-.CodeRay .v { color:#036; }
-.CodeRay .xt { color:#444; }
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v { color:#036 }
+.CodeRay .xt { color:#444 }
</style>
</head>
diff --git a/demo/demo_html2.out b/demo/demo_html2.out
index 7bcf11f..326be92 100644
--- a/demo/demo_html2.out
+++ b/demo/demo_html2.out
@@ -2,7 +2,7 @@
"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">
.CodeRay {
@@ -11,98 +11,104 @@
font-family: 'Courier New', 'Terminal', monospace;
color: #100;
}
-.CodeRay pre { margin: 0px; }
+.CodeRay pre { margin: 0px }
div.CodeRay { }
-span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
-table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
-table.CodeRay td { padding: 2px 4px; vertical-align: top; }
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
.CodeRay .line_numbers, .CodeRay .no {
background-color: #def;
color: gray;
text-align: right;
}
-.CodeRay .line_numbers tt { font-weight: bold; }
-.CodeRay .no { padding: 0px 4px; }
-.CodeRay .code { width: 100%; }
-
-ol.CodeRay { font-size: 10pt; }
-ol.CodeRay li { white-space: pre; }
-
-.CodeRay .code pre { overflow: auto; }
-
-.CodeRay .af { color:#00C; }
-.CodeRay .an { color:#007; }
-.CodeRay .av { color:#700; }
-.CodeRay .aw { color:#C00; }
-.CodeRay .bi { color:#509; font-weight:bold; }
-.CodeRay .c { color:#888; }
-
-.CodeRay .ch { color:#04D; }
-.CodeRay .ch .k { color:#04D; }
-.CodeRay .ch .dl { color:#039; }
-
-.CodeRay .cl { color:#B06; font-weight:bold; }
-.CodeRay .co { color:#036; font-weight:bold; }
-.CodeRay .cr { color:#0A0; }
-.CodeRay .cv { color:#369; }
-.CodeRay .df { color:#099; font-weight:bold; }
-.CodeRay .di { color:#088; font-weight:bold; }
-.CodeRay .dl { color:black; }
-.CodeRay .do { color:#970; }
-.CodeRay .ds { color:#D42; font-weight:bold; }
-.CodeRay .e { color:#666; font-weight:bold; }
-.CodeRay .er { color:#F00; background-color:#FAA; }
-.CodeRay .ex { color:#F00; font-weight:bold; }
-.CodeRay .fl { color:#60E; font-weight:bold; }
-.CodeRay .fu { color:#06B; font-weight:bold; }
-.CodeRay .gv { color:#d70; font-weight:bold; }
-.CodeRay .hx { color:#058; font-weight:bold; }
-.CodeRay .i { color:#00D; font-weight:bold; }
-.CodeRay .ic { color:#B44; font-weight:bold; }
-.CodeRay .il { }
-.CodeRay .in { color:#B2B; font-weight:bold; }
-.CodeRay .iv { color:#33B; }
-.CodeRay .la { color:#970; font-weight:bold; }
-.CodeRay .lv { color:#963; }
-.CodeRay .oc { color:#40E; font-weight:bold; }
-.CodeRay .on { color:#000; font-weight:bold; }
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .no { padding: 0px 4px }
+.CodeRay .code { width: 100% }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .code pre { overflow: auto }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c { color:#888 }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#F00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #eee }
+.CodeRay .il .il { background: #ddd }
+.CodeRay .il .il .il { background: #ccc }
+.CodeRay .il .dl { font-weight: bold ! important; color: #888 ! important }
+
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .on { color:#000; font-weight:bold }
.CodeRay .op { }
-.CodeRay .pc { color:#038; font-weight:bold; }
-.CodeRay .pd { color:#369; font-weight:bold; }
-.CodeRay .pp { color:#579; }
-.CodeRay .pt { color:#339; font-weight:bold; }
-.CodeRay .r { color:#080; font-weight:bold; }
-
-.CodeRay .rx { background-color:#fff0ff; }
-.CodeRay .rx .k { color:#808; }
-.CodeRay .rx .dl { color:#404; }
-.CodeRay .rx .mod { color:#C2C; }
-.CodeRay .rx .fu { color:#404; font-weight: bold; }
-
-.CodeRay .s { background-color:#fff0f0; }
-.CodeRay .s .s { background-color:#ffe0e0; }
-.CodeRay .s .s .s { background-color:#ffd0d0; }
-.CodeRay .s .k { color:#D20; }
-.CodeRay .s .dl { color:#710; }
-
-.CodeRay .sh { background-color:#f0fff0; }
-.CodeRay .sh .k { color:#2B2; }
-.CodeRay .sh .dl { color:#161; }
-
-.CodeRay .sy { color:#A60; }
-.CodeRay .sy .k { color:#A60; }
-.CodeRay .sy .dl { color:#630; }
-
-.CodeRay .ta { color:#070; }
-.CodeRay .tf { color:#070; font-weight:bold; }
-.CodeRay .ts { color:#D70; font-weight:bold; }
-.CodeRay .ty { color:#339; font-weight:bold; }
-.CodeRay .v { color:#036; }
-.CodeRay .xt { color:#444; }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579 }
+.CodeRay .pt { color:#339; font-weight:bold }
+.CodeRay .r { color:#080; font-weight:bold }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu { color:#404; font-weight: bold }
+
+.CodeRay .s { background-color:#fff0f0 }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s .s { background-color:#ffd0d0 }
+.CodeRay .s .k { color:#D20 }
+.CodeRay .s .dl { color:#710 }
+
+.CodeRay .sh { background-color:#f0fff0 }
+.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v { color:#036 }
+.CodeRay .xt { color:#444 }
</style>
</head>
@@ -121,29 +127,29 @@ ol.CodeRay li { white-space: pre; }
</tt><strong>10</strong><tt>
</tt>11<tt>
</tt></pre></td>
- <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }">require <span style="background-color:#fff0f0;"><span style="color:#710;">'</span><span style="color:#D20;">coderay</span><span style="color:#710;">'</span></span><tt>
+ <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }">require <span style="background-color:#fff0f0"><span style="color:#710">'</span><span style="color:#D20">coderay</span><span style="color:#710">'</span></span><tt>
</tt><tt>
-</tt><span style="color:#888;"># scan this file</span><tt>
-</tt>tokens = <span style="color:#036; font-weight:bold;">CodeRay</span>.scan(<span style="color:#036; font-weight:bold;">File</span>.read(<span style="color:#d70; font-weight:bold;">$0</span>) * <span style="color:#00D; font-weight:bold;">1</span>, <span style="color:#A60;">:ruby</span>)<tt>
+</tt><span style="color:#888"># scan this file</span><tt>
+</tt>tokens = <span style="color:#036; font-weight:bold">CodeRay</span>.scan(<span style="color:#036; font-weight:bold">File</span>.read(<span style="color:#d70; font-weight:bold">$0</span>) * <span style="color:#00D; font-weight:bold">1</span>, <span style="color:#A60">:ruby</span>)<tt>
</tt><tt>
-</tt><span style="color:#888;"># output it with two styles of line numbers</span><tt>
-</tt>out = tokens.div(<span style="color:#A60;">:line_numbers</span> =&gt; <span style="color:#A60;">:table</span>)<tt>
-</tt>out &lt;&lt; <span style="background-color:#fff0f0;"><span style="color:#710;">'</span><span style="color:#D20;">&lt;hr /&gt;</span><span style="color:#710;">'</span></span><tt>
-</tt>out &lt;&lt; tokens.div(<span style="color:#A60;">:line_numbers</span> =&gt; <span style="color:#A60;">:inline</span>, <span style="color:#A60;">:line_number_start</span> =&gt; <span style="color:#00D; font-weight:bold;">8</span>)<tt>
+</tt><span style="color:#888"># output it with two styles of line numbers</span><tt>
+</tt>out = tokens.div(<span style="color:#A60">:line_numbers</span> =&gt; <span style="color:#A60">:table</span>)<tt>
+</tt>out &lt;&lt; <span style="background-color:#fff0f0"><span style="color:#710">'</span><span style="color:#D20">&lt;hr /&gt;</span><span style="color:#710">'</span></span><tt>
+</tt>out &lt;&lt; tokens.div(<span style="color:#A60">:line_numbers</span> =&gt; <span style="color:#A60">:inline</span>, <span style="color:#A60">:line_number_start</span> =&gt; <span style="color:#00D; font-weight:bold">8</span>)<tt>
</tt><tt>
</tt>puts out.page<tt>
</tt></pre></td>
</tr></table>
<hr /><div class="CodeRay">
- <div class="code"><pre><span class="no"> 8</span> require <span style="background-color:#fff0f0;"><span style="color:#710;">'</span><span style="color:#D20;">coderay</span><span style="color:#710;">'</span></span>
+ <div class="code"><pre><span class="no"> 8</span> require <span style="background-color:#fff0f0"><span style="color:#710">'</span><span style="color:#D20">coderay</span><span style="color:#710">'</span></span>
<span class="no"> 9</span>
-<span class="no"><strong>10</strong></span> <span style="color:#888;"># scan this file</span>
-<span class="no">11</span> tokens = <span style="color:#036; font-weight:bold;">CodeRay</span>.scan(<span style="color:#036; font-weight:bold;">File</span>.read(<span style="color:#d70; font-weight:bold;">$0</span>) * <span style="color:#00D; font-weight:bold;">1</span>, <span style="color:#A60;">:ruby</span>)
+<span class="no"><strong>10</strong></span> <span style="color:#888"># scan this file</span>
+<span class="no">11</span> tokens = <span style="color:#036; font-weight:bold">CodeRay</span>.scan(<span style="color:#036; font-weight:bold">File</span>.read(<span style="color:#d70; font-weight:bold">$0</span>) * <span style="color:#00D; font-weight:bold">1</span>, <span style="color:#A60">:ruby</span>)
<span class="no">12</span>
-<span class="no">13</span> <span style="color:#888;"># output it with two styles of line numbers</span>
-<span class="no">14</span> out = tokens.div(<span style="color:#A60;">:line_numbers</span> =&gt; <span style="color:#A60;">:table</span>)
-<span class="no">15</span> out &lt;&lt; <span style="background-color:#fff0f0;"><span style="color:#710;">'</span><span style="color:#D20;">&lt;hr /&gt;</span><span style="color:#710;">'</span></span>
-<span class="no">16</span> out &lt;&lt; tokens.div(<span style="color:#A60;">:line_numbers</span> =&gt; <span style="color:#A60;">:inline</span>, <span style="color:#A60;">:line_number_start</span> =&gt; <span style="color:#00D; font-weight:bold;">8</span>)
+<span class="no">13</span> <span style="color:#888"># output it with two styles of line numbers</span>
+<span class="no">14</span> out = tokens.div(<span style="color:#A60">:line_numbers</span> =&gt; <span style="color:#A60">:table</span>)
+<span class="no">15</span> out &lt;&lt; <span style="background-color:#fff0f0"><span style="color:#710">'</span><span style="color:#D20">&lt;hr /&gt;</span><span style="color:#710">'</span></span>
+<span class="no">16</span> out &lt;&lt; tokens.div(<span style="color:#A60">:line_numbers</span> =&gt; <span style="color:#A60">:inline</span>, <span style="color:#A60">:line_number_start</span> =&gt; <span style="color:#00D; font-weight:bold">8</span>)
<span class="no">17</span>
<span class="no">18</span> puts out.page
</pre></div>
diff --git a/demo/demo_html_list.out b/demo/demo_html_list.out
index e9c99b2..81a687d 100644
--- a/demo/demo_html_list.out
+++ b/demo/demo_html_list.out
@@ -2,7 +2,7 @@
"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">
.CodeRay {
@@ -11,98 +11,104 @@
font-family: 'Courier New', 'Terminal', monospace;
color: #100;
}
-.CodeRay pre { margin: 0px; }
+.CodeRay pre { margin: 0px }
div.CodeRay { }
-span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
-table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
-table.CodeRay td { padding: 2px 4px; vertical-align: top; }
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
.CodeRay .line_numbers, .CodeRay .no {
background-color: #def;
color: gray;
text-align: right;
}
-.CodeRay .line_numbers tt { font-weight: bold; }
-.CodeRay .no { padding: 0px 4px; }
-.CodeRay .code { width: 100%; }
-
-ol.CodeRay { font-size: 10pt; }
-ol.CodeRay li { white-space: pre; }
-
-.CodeRay .code pre { overflow: auto; }
-
-.CodeRay .af { color:#00C; }
-.CodeRay .an { color:#007; }
-.CodeRay .av { color:#700; }
-.CodeRay .aw { color:#C00; }
-.CodeRay .bi { color:#509; font-weight:bold; }
-.CodeRay .c { color:#888; }
-
-.CodeRay .ch { color:#04D; }
-.CodeRay .ch .k { color:#04D; }
-.CodeRay .ch .dl { color:#039; }
-
-.CodeRay .cl { color:#B06; font-weight:bold; }
-.CodeRay .co { color:#036; font-weight:bold; }
-.CodeRay .cr { color:#0A0; }
-.CodeRay .cv { color:#369; }
-.CodeRay .df { color:#099; font-weight:bold; }
-.CodeRay .di { color:#088; font-weight:bold; }
-.CodeRay .dl { color:black; }
-.CodeRay .do { color:#970; }
-.CodeRay .ds { color:#D42; font-weight:bold; }
-.CodeRay .e { color:#666; font-weight:bold; }
-.CodeRay .er { color:#F00; background-color:#FAA; }
-.CodeRay .ex { color:#F00; font-weight:bold; }
-.CodeRay .fl { color:#60E; font-weight:bold; }
-.CodeRay .fu { color:#06B; font-weight:bold; }
-.CodeRay .gv { color:#d70; font-weight:bold; }
-.CodeRay .hx { color:#058; font-weight:bold; }
-.CodeRay .i { color:#00D; font-weight:bold; }
-.CodeRay .ic { color:#B44; font-weight:bold; }
-.CodeRay .il { }
-.CodeRay .in { color:#B2B; font-weight:bold; }
-.CodeRay .iv { color:#33B; }
-.CodeRay .la { color:#970; font-weight:bold; }
-.CodeRay .lv { color:#963; }
-.CodeRay .oc { color:#40E; font-weight:bold; }
-.CodeRay .on { color:#000; font-weight:bold; }
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .no { padding: 0px 4px }
+.CodeRay .code { width: 100% }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .code pre { overflow: auto }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c { color:#888 }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#F00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #eee }
+.CodeRay .il .il { background: #ddd }
+.CodeRay .il .il .il { background: #ccc }
+.CodeRay .il .dl { font-weight: bold ! important; color: #888 ! important }
+
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .on { color:#000; font-weight:bold }
.CodeRay .op { }
-.CodeRay .pc { color:#038; font-weight:bold; }
-.CodeRay .pd { color:#369; font-weight:bold; }
-.CodeRay .pp { color:#579; }
-.CodeRay .pt { color:#339; font-weight:bold; }
-.CodeRay .r { color:#080; font-weight:bold; }
-
-.CodeRay .rx { background-color:#fff0ff; }
-.CodeRay .rx .k { color:#808; }
-.CodeRay .rx .dl { color:#404; }
-.CodeRay .rx .mod { color:#C2C; }
-.CodeRay .rx .fu { color:#404; font-weight: bold; }
-
-.CodeRay .s { background-color:#fff0f0; }
-.CodeRay .s .s { background-color:#ffe0e0; }
-.CodeRay .s .s .s { background-color:#ffd0d0; }
-.CodeRay .s .k { color:#D20; }
-.CodeRay .s .dl { color:#710; }
-
-.CodeRay .sh { background-color:#f0fff0; }
-.CodeRay .sh .k { color:#2B2; }
-.CodeRay .sh .dl { color:#161; }
-
-.CodeRay .sy { color:#A60; }
-.CodeRay .sy .k { color:#A60; }
-.CodeRay .sy .dl { color:#630; }
-
-.CodeRay .ta { color:#070; }
-.CodeRay .tf { color:#070; font-weight:bold; }
-.CodeRay .ts { color:#D70; font-weight:bold; }
-.CodeRay .ty { color:#339; font-weight:bold; }
-.CodeRay .v { color:#036; }
-.CodeRay .xt { color:#444; }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579 }
+.CodeRay .pt { color:#339; font-weight:bold }
+.CodeRay .r { color:#080; font-weight:bold }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu { color:#404; font-weight: bold }
+
+.CodeRay .s { background-color:#fff0f0 }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s .s { background-color:#ffd0d0 }
+.CodeRay .s .k { color:#D20 }
+.CodeRay .s .dl { color:#710 }
+
+.CodeRay .sh { background-color:#f0fff0 }
+.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v { color:#036 }
+.CodeRay .xt { color:#444 }
</style>
</head>
diff --git a/demo/demo_load_scanner.out b/demo/demo_load_scanner.out
index 67ecac3..ea374f9 100644
--- a/demo/demo_load_scanner.out
+++ b/demo/demo_load_scanner.out
@@ -5,4 +5,4 @@ Require is also possible: CodeRay::Scanners::C
See?
Now load some mapped scanners: cpp and plain.
Require all Scanners:
-[[:c, CodeRay::Scanners::C], [:cpp, :c], [:delphi, CodeRay::Scanners::Delphi], [:irb, :ruby], [:pascal, :delphi], [:plain, CodeRay::Scanners::Plaintext], [:plaintext, CodeRay::Scanners::Plaintext], [:ruby, CodeRay::Scanners::Ruby]]
+[[nil, :plain], [:c, CodeRay::Scanners::C], [:cpp, :c], [:delphi, CodeRay::Scanners::Delphi], [:html, CodeRay::Scanners::HTML], [:irb, :ruby], [:nitro_html, CodeRay::Scanners::NitroHTML], [:pascal, :delphi], [:plain, CodeRay::Scanners::Plaintext], [:plaintext, CodeRay::Scanners::Plaintext], [:rhtml, CodeRay::Scanners::RHTML], [:ruby, CodeRay::Scanners::Ruby], [:xhtml, :nitro_html], [:xml, :html]]
diff --git a/demo/demo_more.out b/demo/demo_more.out
index f945854..d960ae7 100644
--- a/demo/demo_more.out
+++ b/demo/demo_more.out
@@ -1,2 +1,2 @@
-Input: 4983B, Output: 22382B
+Input: 4983B, Output: 22528B
Take a look with your browser.
diff --git a/demo/demo_simple.out b/demo/demo_simple.out
index 5e349d5..4e41e3d 100644
--- a/demo/demo_simple.out
+++ b/demo/demo_simple.out
@@ -1 +1,2 @@
-<span class="CodeRay">puts <span style="background-color:#fff0f0;"><span style="color:#710;">'</span><span style="color:#D20;">Hello, world!</span><span style="color:#710;">'</span></span></span>
+<span class="CodeRay">puts <span style="background-color:#fff0f0"><span style="color:#710">'</span><span style="color:#D20">Hello, world!</span><span style="color:#710">'</span></span></span>
+