Fixing sample tests.

1 files changed, 36 insertions, 15 deletions

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; }
+
   </style>
 </head>
 <body style="background-color: white;">
@@ -123,7 +144,7 @@ ol.CodeRay li { white-space: pre }
 <span class="no"> 2</span> tokens = <span class="co">CodeRay</span>.scan <span class="co">File</span>.read(<span class="pc">__FILE__</span>), <span class="sy">:ruby</span>
 <span class="no"> 3</span> html = tokens.html(<span class="sy">:tab_width</span> =&gt; <span class="i">2</span>, <span class="sy">:line_numbers</span> =&gt; <span class="sy">:inline</span>, <span class="sy">:line_number_start</span> =&gt; <span class="i">-1</span>)
 <span class="no"> 4</span> 
-<span class="no"> 5</span> puts html.page
+<span class="no"> 5</span> puts html.page(<span class="sy">:title</span> =&gt; <span class="s"><span class="dl">'</span><span class="k">CodeRay HTML Encoder Example</span><span class="dl">'</span></span>)
 <span class="no"> 6</span> 
 <span class="no"> 7</span> commment = <span class="s"><span class="dl">&lt;&lt;_</span></span><span class="s"><span class="k">
 <span class="no"> 8</span> This code must be &gt; 10 lines