New Style system added - still beta.

Demos adjusted

coderay.rb, encoders/html.rb, encoders/div.rb adjusted.

encoders/html/* files rebuild.

7 files changed, 15 insertions, 7 deletions

diff --git a/demo/demo_css.out b/demo/demo_css.out
index 658610d..1429a8f 100644
--- a/demo/demo_css.out
+++ b/demo/demo_css.out
@@ -2,7 +2,7 @@
 	background-color: #f8f8f8;

 	border: 1px solid silver;

 	font-family: 'Courier New', 'Terminal', monospace;

-	color: black;

+	color: #100;

 }

 .CodeRay pre { margin: 0px; }

 

@@ -26,6 +26,7 @@ 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; }

@@ -62,6 +63,7 @@ ol.CodeRay li { white-space: pre; }
 .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; }

diff --git a/demo/demo_css.rb b/demo/demo_css.rb
index 93a6ef0..52e4bcc 100644
--- a/demo/demo_css.rb
+++ b/demo/demo_css.rb
@@ -1,4 +1,4 @@
 require 'coderay'

 

 # print the default stylesheet for HTML codes

-puts CodeRay::Encoders[:html]::CSS::DEFAULT_STYLESHEET

+puts CodeRay::Encoders[:html]::CSS.new.stylesheet

diff --git a/demo/demo_highlight.out b/demo/demo_highlight.out
index e6236af..4121009 100644
--- a/demo/demo_highlight.out
+++ b/demo/demo_highlight.out
@@ -8,7 +8,7 @@
 	background-color: #f8f8f8;

 	border: 1px solid silver;

 	font-family: 'Courier New', 'Terminal', monospace;

-	color: black;

+	color: #100;

 }

 .CodeRay pre { margin: 0px; }

 

@@ -32,6 +32,7 @@ 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; }

@@ -68,6 +69,7 @@ ol.CodeRay li { white-space: pre; }
 .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; }

diff --git a/demo/demo_html.out b/demo/demo_html.out
index b82e456..d687bb1 100644
--- a/demo/demo_html.out
+++ b/demo/demo_html.out
@@ -9,7 +9,7 @@
 	background-color: #f8f8f8;

 	border: 1px solid silver;

 	font-family: 'Courier New', 'Terminal', monospace;

-	color: black;

+	color: #100;

 }

 .CodeRay pre { margin: 0px; }

 

@@ -33,6 +33,7 @@ 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; }

@@ -69,6 +70,7 @@ ol.CodeRay li { white-space: pre; }
 .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; }

diff --git a/demo/demo_html2.out b/demo/demo_html2.out
index d748b85..01e4bdd 100644
--- a/demo/demo_html2.out
+++ b/demo/demo_html2.out
@@ -9,7 +9,7 @@
 	background-color: #f8f8f8;

 	border: 1px solid silver;

 	font-family: 'Courier New', 'Terminal', monospace;

-	color: black;

+	color: #100;

 }

 .CodeRay pre { margin: 0px; }

 

@@ -33,6 +33,7 @@ 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; }

@@ -69,6 +70,7 @@ ol.CodeRay li { white-space: pre; }
 .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; }

diff --git a/demo/demo_more.out b/demo/demo_more.out
index 21d6755..10f4ec6 100644
--- a/demo/demo_more.out
+++ b/demo/demo_more.out
@@ -1,2 +1,2 @@
-Input: 4975B, Output: 22363B

+Input: 4983B, Output: 22388B

 Take a look with your browser.

diff --git a/demo/demo_more.rb b/demo/demo_more.rb
index fb718dd..0db7ba4 100644
--- a/demo/demo_more.rb
+++ b/demo/demo_more.rb
@@ -17,7 +17,7 @@ time = Benchmark.realtime do
 	body = %w[C Ruby Genereated\ by].zip([c, ruby, me]).map do |title, code|
 		"<h1>#{title}</h1>\n#{code}"
 	end.join
-	body = hl.class::Output.new(body, :div).page!
+	body = hl.class::Output.new(body, hl.css, :div).page!
 
 	# CodeRay also provides a simple page generator
 	$output = body #hl.class.wrap_in_page body