coderay 0.5.0.115 → 0.5.0.121

data/README

@@ -18,13 +18,13 @@ And with line numbers.
 * is what everybody should have on their website
 * solves all your problems and makes the girls run after you
 
-Version: 0.5.0 (2005.november.5)
+Version: 0.5.0 (2006.march.16)
 Author:: murphy
 Idea:: licenser
 Website:: rd.cYcnus.de/coderay[http://rd.cYcnus.de/coderay]
-Copyright:: (c) 2005 by cYcnus
+Copyright:: (c) 2006 by cYcnus
 License:: GNU LGPL; see LICENSE file in the main directory.
-Subversion:: $Id: README 111 2006-03-15 22:51:50Z murphy $
+Subversion:: $Id: README 119 2006-03-16 00:43:02Z murphy $
 
 -----
 

data/demo/suite.rb

@@ -22,7 +22,7 @@ class CodeRaySuite < TestCase
 	
 	def test_ALL
 		dir do
-			for input in Dir["demo_*.rb"] - ['demo_server.rb', 'demo_stream.rb']
+			for input in Dir["demo_*.rb"] - %w(demo_server.rb demo_stream.rb)
 				puts "[ testing #{input}... ]"
 				name = File.basename(input, ".rb")
 				output = name + '.out'

data/lib/coderay.rb

@@ -1,6 +1,6 @@
 # = CodeRay Library
 #
-# $Id: coderay.rb 96 2005-11-13 06:24:54Z murphy $
+# $Id: coderay.rb 120 2006-03-16 18:35:43Z murphy $
 #
 # CodeRay is a Ruby library for syntax highlighting.
 #
@@ -69,10 +69,10 @@
 # * Input and language are always sorted in this order: +code+, +lang+.
 # 	(This is in alphabetical order, if you need a mnemonic ;)
 # 
-# You should be able to highlight everything you want just using this methods;
+# You should be able to highlight everything you want just using these methods;
 # so there is no need to dive into CodeRay's deep class hierarchy.
 #
-# The exmaples in the demo/ directory demonstrate common cases using this interface.
+# The examples in the demo directory demonstrate common cases using this interface.
 #	
 # = Basic Access Ways
 #
@@ -84,7 +84,7 @@
 #	Each Token knows about what type it is: string, comment, class name, etc.
 #
 #	Each +lang+ (language) has its own Scanner; for example, <tt>:ruby</tt> code is
-#	handled by CodeRay::Scanners::RubyScanner.
+#	handled by CodeRay::Scanners::Ruby.
 # 
 # CodeRay.scan:: Scan a string in a given language into Tokens.
 #                This is the most common method to use.

data/lib/coderay/encoders/html.rb

@@ -100,16 +100,17 @@ module Encoders
 			'<' => '&lt;',
 		}
 
-		# This is to prevent illegal HTML.
+		# This was to prevent illegal HTML.
 		# Strange chars should still be avoided in codes.
-		evil_chars = Array(0x00...0x20) - [?n, ?t]
+		evil_chars = Array(0x00...0x20) - [?\n, ?\t, ?\s]
 		evil_chars.each { |i| HTML_ESCAPE[i.chr] = ' ' }
-		ansi_chars = Array(0x7f..0xff)
-		ansi_chars.each { |i| HTML_ESCAPE[i.chr] = '&#%d;' % i }
+		#ansi_chars = Array(0x7f..0xff)
+		#ansi_chars.each { |i| HTML_ESCAPE[i.chr] = '&#%d;' % i }
 		# \x9 (\t) and \xA (\n) not included
-		HTML_ESCAPE_PATTERN = /[\t&"><\xB-\x1f\x7f-\xff\0-\x8]/
+		#HTML_ESCAPE_PATTERN = /[\t&"><\0-\x8\xB-\x1f\x7f-\xff]/
+		HTML_ESCAPE_PATTERN = /[\t"&><\0-\x8\xB-\x1f]/
 
-		TOKEN_KIND_TO_INFO = Hash.new do |h, kind|
+		TOKEN_KIND_TO_INFO = Hash.new { |h, kind|
 			h[kind] =
 				case kind
 				when :pre_constant
@@ -117,8 +118,11 @@ module Encoders
 				else
 					kind.to_s.gsub(/_/, ' ').gsub(/\b\w/) { $&.capitalize }
 				end
-		end
+		}
 
+		# Generate a hint about the given +classes+ in a +hint+ style.
+		# 
+		# +hint+ may be :info, :info_long or :debug.
 		def self.token_path_to_hint hint, classes
 			return '' unless hint
 			title =
@@ -126,9 +130,9 @@ module Encoders
 				when :info
 					TOKEN_KIND_TO_INFO[classes.first]
 				when :info_long
-					classes.map { |kind| TOKEN_KIND_TO_INFO[kind] }.join('/')
+					classes.reverse.map { |kind| TOKEN_KIND_TO_INFO[kind] }.join('/')
 				when :debug
-					k.inspect
+					classes.inspect
 				end
 			" title=\"#{title}\""
 		end
@@ -145,7 +149,7 @@ module Encoders
 			@css = CSS.new options[:style]
 
 			hint = options[:hint]
-			if hint and not [:debug, :info].include? hint
+			if hint and not [:debug, :info, :info_long].include? hint
 				raise ArgumentError, "Unknown value %p for :hint; expected :info, :debug, false or nil." % hint
 			end
 
@@ -179,7 +183,9 @@ module Encoders
 					if classes.first == :NO_HIGHLIGHT and not hint
 						h[k] = false
 					else
+						styles.shift if [:delimiter, :modifier, :content, :escape].include? styles.first
 						title = HTML.token_path_to_hint hint, styles
+						classes.delete 'il'
 						style = @css[*classes]
 						h[k] =
 							if style

data/lib/coderay/tokens.rb

@@ -161,12 +161,11 @@ module CodeRay
 		# This can not be undone, but should yield the same output
 		# in most Encoders.  It basically makes the output smaller.
 		#
-		# Combined with dump, it saves space for the cost
-		# calculating time.
+		# Combined with dump, it saves space for the cost of time.
 		#
 		# If the scanner is written carefully, this is not required - 
-		# for example, consecutive //-comment lines can already be 
-		# joined in one token by the Scanner.
+		# for example, consecutive //-comment lines could already be 
+		# joined in one comment token by the Scanner.
 		def optimize
 			print ' Tokens#optimize: before: %d - ' % size if $DEBUG
 			last_kind = last_text = nil
@@ -219,7 +218,7 @@ module CodeRay
 			dump.extend Undumping
 		end
 
-		# The total size of the tokens;
+		# The total size of the tokens.
 		# Should be equal to the input size before
 		# scanning.
 		def text_size

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: coderay
 version: !ruby/object:Gem::Version 
-  version: 0.5.0.115
+  version: 0.5.0.121
 date: 2006-03-16 00:00:00 +01:00
 summary: CodeRay is a fast syntax highlighter engine for many languages.
 require_paths: