From 39ff12b40e0b8b3a892aea63eddfae87531f5d10 Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Sat, 29 Oct 2005 16:09:17 +0000
Subject: Version 0.4.6!

coderay.rb: Added highlight functions
new demo/demo_highlight.rb

encoders/helpers/html_output.rb: Improved stylesheet method
Rakefile: smarter progress info on uploading
---
 lib/coderay.rb                              | 24 ++++++++++++++++++++++--
 lib/coderay/encoders/helpers/html_output.rb | 14 ++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/coderay.rb b/lib/coderay.rb
index 9a18a32..5e9f3f8 100644
--- a/lib/coderay.rb
+++ b/lib/coderay.rb
@@ -128,7 +128,7 @@
 #	The scanning methods provide more flexibility; we recommend to use these.
 module CodeRay
 	
-	Version = '0.4.4'
+	Version = '0.4.6'
 	
 	require 'coderay/tokens'
 	require 'coderay/scanner'
@@ -201,6 +201,16 @@ module CodeRay
 			encoder(format, options).encode code, lang, options
 		end
 		
+		# Highlight a string into a HTML <div>.
+		#
+		# CSS styles use classes, so you have to include a stylesheet
+		# in your output.
+		# 
+		# See encode.
+		def highlight code, lang, options = { :css => :class }, format = :div
+			encode code, lang, format, options
+		end
+		
 		# Encode pre-scanned Tokens.
 		# Use this together with CodeRay.scan:
 		# 
@@ -223,10 +233,20 @@ module CodeRay
 		#  require 'coderay'
 		#  page = CodeRay.encode_file 'some_c_code.c', :html
 		def encode_file filename, format, options = {}
-			tokens = scan_file filename, auto, get_scanner_options(options)
+			tokens = scan_file filename, :auto, get_scanner_options(options)
 			encode_tokens tokens, format, options
 		end
 
+		# Highlight a file into a HTML <div>.
+		#
+		# CSS styles use classes, so you have to include a stylesheet
+		# in your output.
+		# 
+		# See encode.
+		def highlight_file filename, options = { :css => :class }, format = :div
+			encode_file filename, format, options
+		end
+		
 		# Finds the Encoder class for +format+ and creates an instance, passing
 		# +options+ to it.
 		# 
diff --git a/lib/coderay/encoders/helpers/html_output.rb b/lib/coderay/encoders/helpers/html_output.rb
index 2ff5c19..c6012f7 100644
--- a/lib/coderay/encoders/helpers/html_output.rb
+++ b/lib/coderay/encoders/helpers/html_output.rb
@@ -35,8 +35,14 @@ module CodeRay
 					warn "The Output module is intended to extend instances of String, not #{o.class}." unless o.respond_to? :to_str
 				end
 
-				def stylesheet
-					CSS::DEFAULT_STYLESHEET
+				def stylesheet in_tag = false
+					ss = CSS::DEFAULT_STYLESHEET
+					ss = <<-CSS if in_tag
+<style type="text/css">
+#{ss}
+</style>
+					CSS
+					ss
 				end
 
 				def page_template_for_css css = :default
@@ -174,6 +180,10 @@ module CodeRay
 				clone.numerize!(*args)
 			end
 
+			def stylesheet in_tag = false
+				Output.stylesheet in_tag
+			end
+
 			class Template < String
 
 				def self.wrap! str, template, target
-- 
cgit v1.2.1