From b4a4f4148a1627aed63c602f43bd4b5ef5093c4f Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Thu, 11 May 2006 23:32:49 +0000
Subject: new version: 0.7.1 improved bin/coderay and included it into package
 added gem:install task added Duo#highlight (alias for encode) fixed a Plugin
 bug

---
 lib/coderay/duo.rb            |  1 +
 lib/coderay/encoders/page.rb  | 21 +++++++++++++++++++++
 lib/coderay/helpers/plugin.rb |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 lib/coderay/encoders/page.rb

(limited to 'lib/coderay')

diff --git a/lib/coderay/duo.rb b/lib/coderay/duo.rb
index 1957c95..e4e80df 100644
--- a/lib/coderay/duo.rb
+++ b/lib/coderay/duo.rb
@@ -22,6 +22,7 @@ module CodeRay
 			@scanner.string = code
 			@encoder.encode_tokens(scanner.tokenize)
 		end
+		alias highlight encode
 		
 	end
 	
diff --git a/lib/coderay/encoders/page.rb b/lib/coderay/encoders/page.rb
new file mode 100644
index 0000000..74bdc55
--- /dev/null
+++ b/lib/coderay/encoders/page.rb
@@ -0,0 +1,21 @@
+module CodeRay
+module Encoders
+	
+	load :html
+
+	class Page < HTML
+
+		FILE_EXTENSION = 'html'
+
+		register_for :page
+
+		DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge({
+			:css => :class,
+			:wrap => :page,
+			:line_numbers => :table
+		})
+
+	end
+
+end
+end
diff --git a/lib/coderay/helpers/plugin.rb b/lib/coderay/helpers/plugin.rb
index 2b47d8e..938d1a8 100644
--- a/lib/coderay/helpers/plugin.rb
+++ b/lib/coderay/helpers/plugin.rb
@@ -235,7 +235,7 @@ protected
 	# Raises +ArgumentError+ for all other objects, or if the
 	# given String includes non-alphanumeric characters (\W).
 	def validate_id id
-		if id.is_a? Symbol
+		if id.is_a? Symbol or id.nil?
 			id
 		elsif id.is_a? String
 			if id[/\w+/] == id
-- 
cgit v1.2.1