From d6d19bb78824977a2a95751e7c6aeaa5996ea807 Mon Sep 17 00:00:00 2001 From: murphy Date: Tue, 14 Apr 2009 01:31:51 +0000 Subject: Fixing sample tests. --- sample/css.expected | 49 +++++++++++++++++++++--------- sample/div.expected | 24 +++++++-------- sample/highlight.expected | 61 +++++++++++++++++++++++++------------ sample/html.expected | 49 +++++++++++++++++++++--------- sample/html.rb | 4 +-- sample/html2.expected | 77 ++++++++++++++++++++++++++++++----------------- sample/html2.rb | 2 +- sample/html_list.expected | 51 ++++++++++++++++++++++--------- sample/html_list.rb | 2 +- sample/more.expected | 2 +- sample/simple.expected | 2 +- 11 files changed, 214 insertions(+), 109 deletions(-) (limited to 'sample') diff --git a/sample/css.expected b/sample/css.expected index bda52ff..c101aee 100644 --- a/sample/css.expected +++ b/sample/css.expected @@ -2,7 +2,7 @@ background-color: #f8f8f8; border: 1px solid silver; font-family: 'Courier New', 'Terminal', monospace; - color: #100; + color: #000; } .CodeRay pre { margin: 0px } @@ -19,6 +19,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top } text-align: right; } .CodeRay .line_numbers tt { font-weight: bold } +.CodeRay .line_numbers .highlighted { color: red } .CodeRay .no { padding: 0px 4px } .CodeRay .code { width: 100% } @@ -31,10 +32,11 @@ ol.CodeRay li { white-space: pre } .CodeRay .af { color:#00C } .CodeRay .an { color:#007 } +.CodeRay .at { color:#f08 } .CodeRay .av { color:#700 } .CodeRay .aw { color:#C00 } .CodeRay .bi { color:#509; font-weight:bold } -.CodeRay .c { color:#666; } +.CodeRay .c { color:#888; } .CodeRay .ch { color:#04D } .CodeRay .ch .k { color:#04D } @@ -48,6 +50,7 @@ ol.CodeRay li { white-space: pre } .CodeRay .di { color:#088; font-weight:bold } .CodeRay .dl { color:black } .CodeRay .do { color:#970 } +.CodeRay .dt { color:#34b } .CodeRay .ds { color:#D42; font-weight:bold } .CodeRay .e { color:#666; font-weight:bold } .CodeRay .en { color:#800; font-weight:bold } @@ -60,11 +63,12 @@ ol.CodeRay li { white-space: pre } .CodeRay .i { color:#00D; font-weight:bold } .CodeRay .ic { color:#B44; font-weight:bold } -.CodeRay .il { background: #eee } +.CodeRay .il { background: #eee; color: black } .CodeRay .il .il { background: #ddd } .CodeRay .il .il .il { background: #ccc } -.CodeRay .il .idl { font-weight: bold; color: #888 } +.CodeRay .il .idl { font-weight: bold; color: #777 } +.CodeRay .im { color:#f00; } .CodeRay .in { color:#B2B; font-weight:bold } .CodeRay .iv { color:#33B } .CodeRay .la { color:#970; font-weight:bold } @@ -74,9 +78,15 @@ ol.CodeRay li { white-space: pre } .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 .pp { color:#579; } +.CodeRay .ps { color:#00C; font-weight: bold; } +.CodeRay .pt { color:#349; font-weight:bold } +.CodeRay .r, .kw { color:#080; font-weight:bold } + +.CodeRay .ke { color: #808; } +.CodeRay .ke .dl { color: #606; } +.CodeRay .ke .ch { color: #80f; } +.CodeRay .vl { color: #088; } .CodeRay .rx { background-color:#fff0ff } .CodeRay .rx .k { color:#808 } @@ -84,14 +94,15 @@ ol.CodeRay li { white-space: pre } .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; color: #D20; } +.CodeRay .s .s { background-color:#ffe0e0 } +.CodeRay .s .s .s { background-color:#ffd0d0 } +.CodeRay .s .k { } +.CodeRay .s .ch { color: #b0b; } +.CodeRay .s .dl { color: #710; } -.CodeRay .sh { background-color:#f0fff0 } -.CodeRay .sh .k { color:#2B2 } +.CodeRay .sh { background-color:#f0fff0; color:#2B2 } +.CodeRay .sh .k { } .CodeRay .sh .dl { color:#161 } .CodeRay .sy { color:#A60 } @@ -104,3 +115,13 @@ ol.CodeRay li { white-space: pre } .CodeRay .ty { color:#339; font-weight:bold } .CodeRay .v { color:#036 } .CodeRay .xt { color:#444 } + +.CodeRay .ins { background: #afa; } +.CodeRay .del { background: #faa; } +.CodeRay .chg { color: #aaf; background: #007; } +.CodeRay .head { color: #f8f; background: #505 } + +.CodeRay .ins .ins { color: #080; font-weight:bold } +.CodeRay .del .del { color: #800; font-weight:bold } +.CodeRay .chg .chg { color: #66f; } +.CodeRay .head .head { color: #f4f; } diff --git a/sample/div.expected b/sample/div.expected index ef5ff90..9ad26cb 100644 --- a/sample/div.expected +++ b/sample/div.expected @@ -1,17 +1,17 @@
- 
for a in 0..255
+  
for a in 0..255
         a = a.chr
-        begin
-                x = eval("?\\#{a}")
-                if x == a[0]
-                        next
-                else
-                        print "#{a}: #{x}"
-                end
-        rescue SyntaxError => boom
-                print "#{a}: error"
-        end
+        begin
+                x = eval("?\\#{a}")
+                if x == a[0]
+                        next
+                else
+                        print "#{a}: #{x}"
+                end
+        rescue SyntaxError => boom
+                print "#{a}: error"
+        end
         puts
-end
+end
diff --git a/sample/highlight.expected b/sample/highlight.expected index 07956ad..afcdd1d 100644 --- a/sample/highlight.expected +++ b/sample/highlight.expected @@ -8,7 +8,7 @@ background-color: #f8f8f8; border: 1px solid silver; font-family: 'Courier New', 'Terminal', monospace; - color: #100; + color: #000; } .CodeRay pre { margin: 0px } @@ -25,6 +25,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top } text-align: right; } .CodeRay .line_numbers tt { font-weight: bold } +.CodeRay .line_numbers .highlighted { color: red } .CodeRay .no { padding: 0px 4px } .CodeRay .code { width: 100% } @@ -37,10 +38,11 @@ ol.CodeRay li { white-space: pre } .CodeRay .af { color:#00C } .CodeRay .an { color:#007 } +.CodeRay .at { color:#f08 } .CodeRay .av { color:#700 } .CodeRay .aw { color:#C00 } .CodeRay .bi { color:#509; font-weight:bold } -.CodeRay .c { color:#666; } +.CodeRay .c { color:#888; } .CodeRay .ch { color:#04D } .CodeRay .ch .k { color:#04D } @@ -54,6 +56,7 @@ ol.CodeRay li { white-space: pre } .CodeRay .di { color:#088; font-weight:bold } .CodeRay .dl { color:black } .CodeRay .do { color:#970 } +.CodeRay .dt { color:#34b } .CodeRay .ds { color:#D42; font-weight:bold } .CodeRay .e { color:#666; font-weight:bold } .CodeRay .en { color:#800; font-weight:bold } @@ -66,11 +69,12 @@ ol.CodeRay li { white-space: pre } .CodeRay .i { color:#00D; font-weight:bold } .CodeRay .ic { color:#B44; font-weight:bold } -.CodeRay .il { background: #eee } +.CodeRay .il { background: #eee; color: black } .CodeRay .il .il { background: #ddd } .CodeRay .il .il .il { background: #ccc } -.CodeRay .il .idl { font-weight: bold; color: #888 } +.CodeRay .il .idl { font-weight: bold; color: #777 } +.CodeRay .im { color:#f00; } .CodeRay .in { color:#B2B; font-weight:bold } .CodeRay .iv { color:#33B } .CodeRay .la { color:#970; font-weight:bold } @@ -80,9 +84,15 @@ ol.CodeRay li { white-space: pre } .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 .pp { color:#579; } +.CodeRay .ps { color:#00C; font-weight: bold; } +.CodeRay .pt { color:#349; font-weight:bold } +.CodeRay .r, .kw { color:#080; font-weight:bold } + +.CodeRay .ke { color: #808; } +.CodeRay .ke .dl { color: #606; } +.CodeRay .ke .ch { color: #80f; } +.CodeRay .vl { color: #088; } .CodeRay .rx { background-color:#fff0ff } .CodeRay .rx .k { color:#808 } @@ -90,14 +100,15 @@ ol.CodeRay li { white-space: pre } .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; color: #D20; } +.CodeRay .s .s { background-color:#ffe0e0 } +.CodeRay .s .s .s { background-color:#ffd0d0 } +.CodeRay .s .k { } +.CodeRay .s .ch { color: #b0b; } +.CodeRay .s .dl { color: #710; } -.CodeRay .sh { background-color:#f0fff0 } -.CodeRay .sh .k { color:#2B2 } +.CodeRay .sh { background-color:#f0fff0; color:#2B2 } +.CodeRay .sh .k { } .CodeRay .sh .dl { color:#161 } .CodeRay .sy { color:#A60 } @@ -111,6 +122,16 @@ ol.CodeRay li { white-space: pre } .CodeRay .v { color:#036 } .CodeRay .xt { color:#444 } +.CodeRay .ins { background: #afa; } +.CodeRay .del { background: #faa; } +.CodeRay .chg { color: #aaf; background: #007; } +.CodeRay .head { color: #f8f; background: #505 } + +.CodeRay .ins .ins { color: #080; font-weight:bold } +.CodeRay .del .del { color: #800; font-weight:bold } +.CodeRay .chg .chg { color: #66f; } +.CodeRay .head .head { color: #f4f; } + @@ -130,17 +151,17 @@ ol.CodeRay li { white-space: pre } 13 14 - 
require 'coderay'
+  
require 'coderay'
 
-puts CodeRay.highlight('puts "Hello, World!"', :ruby)
+puts CodeRay.highlight('puts "Hello, World!"', :ruby)
 
-output = CodeRay.highlight_file($0, :line_numbers => :table)
-puts <<HTML
+output = CodeRay.highlight_file($0, :line_numbers => :table)
+puts <<HTML
 <html>
 <head>
-#{output.stylesheet true}
+#{output.stylesheet true}
 <body>
-#{output}
+#{output}
 </body>
 </html>
 HTML
diff --git a/sample/html.expected b/sample/html.expected
index 4e4c99a..25616dc 100644
--- a/sample/html.expected
+++ b/sample/html.expected
@@ -9,7 +9,7 @@
   background-color: #f8f8f8;
   border: 1px solid silver;
   font-family: 'Courier New', 'Terminal', monospace;
-  color: #100;
+  color: #000;
 }
 .CodeRay pre { margin: 0px }
 
@@ -26,6 +26,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top }
   text-align: right;
 }
 .CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .line_numbers .highlighted { color: red }
 .CodeRay .no { padding: 0px 4px }
 .CodeRay .code { width: 100% }
 
@@ -38,10 +39,11 @@ ol.CodeRay li { white-space: pre }
 
 .CodeRay .af { color:#00C }
 .CodeRay .an { color:#007 }
+.CodeRay .at { color:#f08 }
 .CodeRay .av { color:#700 }
 .CodeRay .aw { color:#C00 }
 .CodeRay .bi { color:#509; font-weight:bold }
-.CodeRay .c  { color:#666; }
+.CodeRay .c  { color:#888; }
 
 .CodeRay .ch { color:#04D }
 .CodeRay .ch .k { color:#04D }
@@ -55,6 +57,7 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .di { color:#088; font-weight:bold }
 .CodeRay .dl { color:black }
 .CodeRay .do { color:#970 }
+.CodeRay .dt { color:#34b }
 .CodeRay .ds { color:#D42; font-weight:bold }
 .CodeRay .e  { color:#666; font-weight:bold }
 .CodeRay .en { color:#800; font-weight:bold }
@@ -67,11 +70,12 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .i  { color:#00D; font-weight:bold }
 .CodeRay .ic { color:#B44; font-weight:bold }
 
-.CodeRay .il { background: #eee }
+.CodeRay .il { background: #eee; color: black }
 .CodeRay .il .il { background: #ddd }
 .CodeRay .il .il .il { background: #ccc }
-.CodeRay .il .idl { font-weight: bold; color: #888 }
+.CodeRay .il .idl { font-weight: bold; color: #777 }
 
+.CodeRay .im { color:#f00; }
 .CodeRay .in { color:#B2B; font-weight:bold }
 .CodeRay .iv { color:#33B }
 .CodeRay .la { color:#970; font-weight:bold }
@@ -81,9 +85,15 @@ ol.CodeRay li { white-space: pre }
 .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 .pp { color:#579; }
+.CodeRay .ps { color:#00C; font-weight: bold; }
+.CodeRay .pt { color:#349; font-weight:bold }
+.CodeRay .r, .kw  { color:#080; font-weight:bold }
+
+.CodeRay .ke { color: #808; }
+.CodeRay .ke .dl { color: #606; }
+.CodeRay .ke .ch { color: #80f; }
+.CodeRay .vl { color: #088; }
 
 .CodeRay .rx { background-color:#fff0ff }
 .CodeRay .rx .k { color:#808 }
@@ -91,14 +101,15 @@ ol.CodeRay li { white-space: pre }
 .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; color: #D20; }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s  .s { background-color:#ffd0d0 }
+.CodeRay .s .k { }
+.CodeRay .s .ch { color: #b0b; }
+.CodeRay .s .dl { color: #710; }
 
-.CodeRay .sh { background-color:#f0fff0 }
-.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh { background-color:#f0fff0; color:#2B2 }
+.CodeRay .sh .k { }
 .CodeRay .sh .dl { color:#161 }
 
 .CodeRay .sy { color:#A60 }
@@ -112,6 +123,16 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .v  { color:#036 }
 .CodeRay .xt { color:#444 }
 
+.CodeRay .ins { background: #afa; }
+.CodeRay .del { background: #faa; }
+.CodeRay .chg { color: #aaf; background: #007; }
+.CodeRay .head { color: #f8f; background: #505 }
+
+.CodeRay .ins .ins { color: #080; font-weight:bold }
+.CodeRay .del .del { color: #800; font-weight:bold }
+.CodeRay .chg .chg { color: #66f; }
+.CodeRay .head .head { color: #f4f; }
+
   
 
 
diff --git a/sample/html.rb b/sample/html.rb
index c854635..c18284a 100644
--- a/sample/html.rb
+++ b/sample/html.rb
@@ -2,9 +2,9 @@ $: << '..'
 require 'coderay'
 
 tokens = CodeRay.scan DATA.read, :ruby
-html = tokens.html(:tab_width => 2, :line_numbers => :table)
+html = tokens.page(:tab_width => 2, :line_numbers => :table, :title => 'CodeRay HTML Encoder Example')
 
-puts html.page
+puts html
 
 __END__
 require 'scanner'
diff --git a/sample/html2.expected b/sample/html2.expected
index e276d3e..829ffbf 100644
--- a/sample/html2.expected
+++ b/sample/html2.expected
@@ -9,7 +9,7 @@
   background-color: #f8f8f8;
   border: 1px solid silver;
   font-family: 'Courier New', 'Terminal', monospace;
-  color: #100;
+  color: #000;
 }
 .CodeRay pre { margin: 0px }
 
@@ -26,6 +26,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top }
   text-align: right;
 }
 .CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .line_numbers .highlighted { color: red }
 .CodeRay .no { padding: 0px 4px }
 .CodeRay .code { width: 100% }
 
@@ -38,10 +39,11 @@ ol.CodeRay li { white-space: pre }
 
 .CodeRay .af { color:#00C }
 .CodeRay .an { color:#007 }
+.CodeRay .at { color:#f08 }
 .CodeRay .av { color:#700 }
 .CodeRay .aw { color:#C00 }
 .CodeRay .bi { color:#509; font-weight:bold }
-.CodeRay .c  { color:#666; }
+.CodeRay .c  { color:#888; }
 
 .CodeRay .ch { color:#04D }
 .CodeRay .ch .k { color:#04D }
@@ -55,6 +57,7 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .di { color:#088; font-weight:bold }
 .CodeRay .dl { color:black }
 .CodeRay .do { color:#970 }
+.CodeRay .dt { color:#34b }
 .CodeRay .ds { color:#D42; font-weight:bold }
 .CodeRay .e  { color:#666; font-weight:bold }
 .CodeRay .en { color:#800; font-weight:bold }
@@ -67,11 +70,12 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .i  { color:#00D; font-weight:bold }
 .CodeRay .ic { color:#B44; font-weight:bold }
 
-.CodeRay .il { background: #eee }
+.CodeRay .il { background: #eee; color: black }
 .CodeRay .il .il { background: #ddd }
 .CodeRay .il .il .il { background: #ccc }
-.CodeRay .il .idl { font-weight: bold; color: #888 }
+.CodeRay .il .idl { font-weight: bold; color: #777 }
 
+.CodeRay .im { color:#f00; }
 .CodeRay .in { color:#B2B; font-weight:bold }
 .CodeRay .iv { color:#33B }
 .CodeRay .la { color:#970; font-weight:bold }
@@ -81,9 +85,15 @@ ol.CodeRay li { white-space: pre }
 .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 .pp { color:#579; }
+.CodeRay .ps { color:#00C; font-weight: bold; }
+.CodeRay .pt { color:#349; font-weight:bold }
+.CodeRay .r, .kw  { color:#080; font-weight:bold }
+
+.CodeRay .ke { color: #808; }
+.CodeRay .ke .dl { color: #606; }
+.CodeRay .ke .ch { color: #80f; }
+.CodeRay .vl { color: #088; }
 
 .CodeRay .rx { background-color:#fff0ff }
 .CodeRay .rx .k { color:#808 }
@@ -91,14 +101,15 @@ ol.CodeRay li { white-space: pre }
 .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; color: #D20; }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s  .s { background-color:#ffd0d0 }
+.CodeRay .s .k { }
+.CodeRay .s .ch { color: #b0b; }
+.CodeRay .s .dl { color: #710; }
 
-.CodeRay .sh { background-color:#f0fff0 }
-.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh { background-color:#f0fff0; color:#2B2 }
+.CodeRay .sh .k { }
 .CodeRay .sh .dl { color:#161 }
 
 .CodeRay .sy { color:#A60 }
@@ -112,6 +123,16 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .v  { color:#036 }
 .CodeRay .xt { color:#444 }
 
+.CodeRay .ins { background: #afa; }
+.CodeRay .del { background: #faa; }
+.CodeRay .chg { color: #aaf; background: #007; }
+.CodeRay .head { color: #f8f; background: #505 }
+
+.CodeRay .ins .ins { color: #080; font-weight:bold }
+.CodeRay .del .del { color: #800; font-weight:bold }
+.CodeRay .chg .chg { color: #66f; }
+.CodeRay .head .head { color: #f4f; }
+
   
 
 
@@ -129,31 +150,31 @@ ol.CodeRay li { white-space: pre }
 10
 11
 

-  
require 'coderay'
+  
require 'coderay'
 
-# scan this file
-tokens = CodeRay.scan(File.read($0) * 1, :ruby)
+# scan this file
+tokens = CodeRay.scan(File.read($0) * 1, :ruby)
 
-# output it with two styles of line numbers
+# output it with two styles of line numbers
 out = tokens.div(:line_numbers => :table)
-out << '<hr />'
-out << tokens.div(:line_numbers => :inline, :line_number_start => 8)
+out << '<hr />'
+out << tokens.div(:line_numbers => :inline, :line_number_start => 8)
 
-puts out.page
+puts out.page(:title => 'CodeRay HTML Encoder Example')
 

 
 

-  
 8 require 'coderay'
+  
 8 require 'coderay'
  9 
-10 # scan this file
-11 tokens = CodeRay.scan(File.read($0) * 1, :ruby)
+10 # scan this file
+11 tokens = CodeRay.scan(File.read($0) * 1, :ruby)
 12 
-13 # output it with two styles of line numbers
+13 # output it with two styles of line numbers
 14 out = tokens.div(:line_numbers => :table)
-15 out << '<hr />'
-16 out << tokens.div(:line_numbers => :inline, :line_number_start => 8)
+15 out << '<hr />'
+16 out << tokens.div(:line_numbers => :inline, :line_number_start => 8)
 17 
-18 puts out.page
+18 puts out.page(:title => 'CodeRay HTML Encoder Example')
 

 

 
diff --git a/sample/html2.rb b/sample/html2.rb
index 7ce9d60..618d168 100644
--- a/sample/html2.rb
+++ b/sample/html2.rb
@@ -8,4 +8,4 @@ out = tokens.div(:line_numbers => :table)
 out << '
'
 out << tokens.div(:line_numbers => :inline, :line_number_start => 8)
 
-puts out.page
+puts out.page(:title => 'CodeRay HTML Encoder Example')
diff --git a/sample/html_list.expected b/sample/html_list.expected
index 9065842..5351672 100644
--- a/sample/html_list.expected
+++ b/sample/html_list.expected
@@ -9,7 +9,7 @@
   background-color: #f8f8f8;
   border: 1px solid silver;
   font-family: 'Courier New', 'Terminal', monospace;
-  color: #100;
+  color: #000;
 }
 .CodeRay pre { margin: 0px }
 
@@ -26,6 +26,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top }
   text-align: right;
 }
 .CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .line_numbers .highlighted { color: red }
 .CodeRay .no { padding: 0px 4px }
 .CodeRay .code { width: 100% }
 
@@ -38,10 +39,11 @@ ol.CodeRay li { white-space: pre }
 
 .CodeRay .af { color:#00C }
 .CodeRay .an { color:#007 }
+.CodeRay .at { color:#f08 }
 .CodeRay .av { color:#700 }
 .CodeRay .aw { color:#C00 }
 .CodeRay .bi { color:#509; font-weight:bold }
-.CodeRay .c  { color:#666; }
+.CodeRay .c  { color:#888; }
 
 .CodeRay .ch { color:#04D }
 .CodeRay .ch .k { color:#04D }
@@ -55,6 +57,7 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .di { color:#088; font-weight:bold }
 .CodeRay .dl { color:black }
 .CodeRay .do { color:#970 }
+.CodeRay .dt { color:#34b }
 .CodeRay .ds { color:#D42; font-weight:bold }
 .CodeRay .e  { color:#666; font-weight:bold }
 .CodeRay .en { color:#800; font-weight:bold }
@@ -67,11 +70,12 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .i  { color:#00D; font-weight:bold }
 .CodeRay .ic { color:#B44; font-weight:bold }
 
-.CodeRay .il { background: #eee }
+.CodeRay .il { background: #eee; color: black }
 .CodeRay .il .il { background: #ddd }
 .CodeRay .il .il .il { background: #ccc }
-.CodeRay .il .idl { font-weight: bold; color: #888 }
+.CodeRay .il .idl { font-weight: bold; color: #777 }
 
+.CodeRay .im { color:#f00; }
 .CodeRay .in { color:#B2B; font-weight:bold }
 .CodeRay .iv { color:#33B }
 .CodeRay .la { color:#970; font-weight:bold }
@@ -81,9 +85,15 @@ ol.CodeRay li { white-space: pre }
 .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 .pp { color:#579; }
+.CodeRay .ps { color:#00C; font-weight: bold; }
+.CodeRay .pt { color:#349; font-weight:bold }
+.CodeRay .r, .kw  { color:#080; font-weight:bold }
+
+.CodeRay .ke { color: #808; }
+.CodeRay .ke .dl { color: #606; }
+.CodeRay .ke .ch { color: #80f; }
+.CodeRay .vl { color: #088; }
 
 .CodeRay .rx { background-color:#fff0ff }
 .CodeRay .rx .k { color:#808 }
@@ -91,14 +101,15 @@ ol.CodeRay li { white-space: pre }
 .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; color: #D20; }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s  .s { background-color:#ffd0d0 }
+.CodeRay .s .k { }
+.CodeRay .s .ch { color: #b0b; }
+.CodeRay .s .dl { color: #710; }
 
-.CodeRay .sh { background-color:#f0fff0 }
-.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh { background-color:#f0fff0; color:#2B2 }
+.CodeRay .sh .k { }
 .CodeRay .sh .dl { color:#161 }
 
 .CodeRay .sy { color:#A60 }
@@ -112,6 +123,16 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .v  { color:#036 }
 .CodeRay .xt { color:#444 }
 
+.CodeRay .ins { background: #afa; }
+.CodeRay .del { background: #faa; }
+.CodeRay .chg { color: #aaf; background: #007; }
+.CodeRay .head { color: #f8f; background: #505 }
+
+.CodeRay .ins .ins { color: #080; font-weight:bold }
+.CodeRay .del .del { color: #800; font-weight:bold }
+.CodeRay .chg .chg { color: #66f; }
+.CodeRay .head .head { color: #f4f; }
+
   
 
 
@@ -123,7 +144,7 @@ ol.CodeRay li { white-space: pre }
  2 tokens = CodeRay.scan File.read(__FILE__), :ruby
  3 html = tokens.html(:tab_width => 2, :line_numbers => :inline, :line_number_start => -1)
  4 
- 5 puts html.page
+ 5 puts html.page(:title => 'CodeRay HTML Encoder Example')
  6 
  7 commment = <<_
  8 This code must be > 10 lines
diff --git a/sample/html_list.rb b/sample/html_list.rb
index 97724f2..fdfa512 100644
--- a/sample/html_list.rb
+++ b/sample/html_list.rb
@@ -4,7 +4,7 @@ require 'coderay'
 tokens = CodeRay.scan File.read(__FILE__), :ruby
 html = tokens.html(:tab_width => 2, :line_numbers => :inline, :line_number_start => -1)
 
-puts html.page
+puts html.page(:title => 'CodeRay HTML Encoder Example')
 
 commment = <<_
 This code must be > 10 lines
diff --git a/sample/more.expected b/sample/more.expected
index 72632d3..61fabe6 100644
--- a/sample/more.expected
+++ b/sample/more.expected
@@ -1,2 +1,2 @@
-Input: 4983B, Output: 22625B
+Input: 4983B, Output: 23316B
 Take a look with your browser.
diff --git a/sample/simple.expected b/sample/simple.expected
index 7e9206a..b3d7875 100644
--- a/sample/simple.expected
+++ b/sample/simple.expected
@@ -1 +1 @@
-puts 'Hello, world!'
+puts 'Hello, world!'
-- 
cgit v1.2.1