coderay 0.4.5.73 → 0.5.0.100

data/lib/coderay/helpers/word_list.rb

@@ -0,0 +1,108 @@
+module CodeRay
+	module Scanners
+
+		class Scanner
+
+			# A WordList is a Hash with some additional features.
+			# It is intended to be used for keyword recognition.
+			#
+			# WordList is highly optimized to be used in Scanners,
+			# typically to decide whether a given ident is a keyword.
+			#
+			# For case insensitive words use CaseIgnoringWordList.
+			#
+			# Example:
+			# 
+			#  # define word arrays
+			#  RESERVED_WORDS = %w[
+			#    asm break case continue default do else
+			#    ...		
+			#  ]
+			#  
+			#  PREDEFINED_TYPES = %w[
+			#    int long short char void
+			#    ...
+			#  ]
+			#  
+			#  PREDEFINED_CONSTANTS = %w[
+			#    EOF NULL ...
+			#  ]
+			#  
+			#  # make a WordList
+			#  IDENT_KIND = WordList.new(:ident).
+			#    add(RESERVED_WORDS, :reserved).
+			#    add(PREDEFINED_TYPES, :pre_type).
+			#    add(PREDEFINED_CONSTANTS, :pre_constant)
+			#
+			#  ...
+			#
+			#  def scan_tokens tokens, options
+			#    ...
+			#    
+			#    elsif scan(/[A-Za-z_][A-Za-z_0-9]*/)
+			#      # use it
+			#      kind = IDENT_KIND[match]
+			#      ...
+			#  
+			class WordList < Hash
+
+				# Creates a new WordList with +default+ as default value.
+				def initialize default = false, &block
+					super default, &block
+				end
+
+				# Checks if a word is included.
+				def include? word
+					has_key? word
+				end
+
+				# Add words to the list and associate them with +kind+.
+				def add words, kind = true
+					words.each do |word|
+						self[word] = kind
+					end
+					self
+				end
+
+			end
+			
+
+			# A WordList is a Hash with some additional features.
+			# It is intended to be used for keyword recognition.
+			#
+			# Keys are compared case-insensitively.
+			#
+			# See WordList.
+			class CaseIgnoringWordList < WordList
+
+				# Creates a new WordList with +default+ as default value.
+				#
+				# Text case is ignored.
+				def initialize default = false, &block
+					block ||= proc do |h, k|
+						h[k] = h.fetch k.downcase, default
+					end
+					super default 
+				end
+
+				# Checks if a word is included.
+				def include? word
+					has_key? word.downcase
+				end
+
+				# Add words to the list and associate them with +kind+.
+				def add words, kind = true
+					words.each do |word|
+						self[word.downcase] = kind
+					end
+					self
+				end
+
+			end		
+
+		end
+
+	end
+end
+
+# vim:sw=2:ts=2:noet:tw=78

data/lib/coderay/scanner.rb

@@ -4,7 +4,7 @@ module CodeRay
 
 	# = Scanners
 	# 
-	# $Id: scanner.rb 39 2005-09-29 04:35:37Z murphy $
+	# $Id: scanner.rb 90 2005-11-05 14:37:40Z murphy $
 	# 
 	# This module holds the Scanner class and its subclasses.
 	# For example, the Ruby scanner is named CodeRay::Scanners::Ruby
@@ -17,7 +17,7 @@ module CodeRay
 	# See PluginHost.
 	module Scanners
 		extend PluginHost
-		plugin_path 'coderay/scanners'
+		plugin_path File.dirname(__FILE__), 'scanners'
 
 		require 'strscan'
 
@@ -51,7 +51,7 @@ module CodeRay
 			# Raised if a Scanner fails while scanning
 			ScanError = Class.new(Exception)
 
-			require 'coderay/helpers/scanner_helper'
+			require 'coderay/helpers/word_list'
 
 			# The default options for all scanner classes.
 			# 

data/lib/coderay/scanners/_map.rb

@@ -0,0 +1,10 @@
+module CodeRay
+	module Scanners
+		
+		map :cpp => :c,
+			:plain => :plaintext,
+			:pascal => :delphi,
+			:irb => :ruby
+		
+	end
+end

data/lib/coderay/scanners/c.rb

@@ -25,7 +25,7 @@ module CodeRay module Scanners
 			'true', 'false',  # C99
 		]
 
-		IDENT_KIND = Scanner::WordList.new(:ident).
+		IDENT_KIND = WordList.new(:ident).
 			add(RESERVED_WORDS, :reserved).
 			add(PREDEFINED_TYPES, :pre_type).
 			add(PREDEFINED_CONSTANTS, :pre_constant)

data/lib/coderay/scanners/delphi.rb

@@ -28,7 +28,7 @@ module CodeRay module Scanners
 			'virtual', 'write', 'writeonly'
 		]
 
-		IDENT_KIND = Scanner::WordList.new(:ident, :case_ignore).
+		IDENT_KIND = CaseIgnoringWordList.new(:ident).
 			add(RESERVED_WORDS, :reserved).
 			add(DIRECTIVES, :directive)
 

data/lib/coderay/scanners/ruby.rb

@@ -18,7 +18,7 @@ module CodeRay module Scanners
 
 		register_for :ruby
 
-		require 'coderay/scanners/helpers/ruby_helper'
+		helper :patterns
 		
 		DEFAULT_OPTIONS = {
 			:parse_regexps => true,

data/lib/coderay/style.rb

@@ -0,0 +1,20 @@
+module CodeRay
+
+	# This module holds the Style class and its subclasses.
+	#
+	# See Plugin.
+	module Styles
+		extend PluginHost
+		plugin_path File.dirname(__FILE__), 'styles'
+
+		class Style
+			extend Plugin
+			plugin_host Styles
+
+			DEFAULT_OPTIONS = { }
+
+		end	
+
+	end
+
+end

data/lib/coderay/{encoders/helpers/html_css.rb → styles/cycnus.rb}

@@ -1,65 +1,33 @@
-module CodeRay module Encoders
-
-	class HTML
-		class CSS
-			
-			def initialize stylesheet = TOKENS
-				@classes = Hash.new
-				parse stylesheet
-			end
-
-			def [] *styles
-				cl = @classes[styles.first]
-				return '' unless cl
-				style = false
-				1.upto(cl.size + 1) do |offset|
-					break if style = cl[styles[offset .. -1]]
-				end
-				return style
-			end
+module CodeRay
+	module Styles
+		
+		class CYcnus < Style
 			
-		private
+			register_for :cycnus
 			
-			CSS_CLASS_PATTERN = /
-				( (?:                # $1 = classes
-					\s* \. [-\w]+
-				)+ )
-				\s* \{
-				( [^\}]* )           # $2 = style
-				\} \s*
-			|
-				( . )                # $3 = error
-			/mx
-			def parse stylesheet
-				stylesheet.scan CSS_CLASS_PATTERN do |classes, style, error|
-					raise "CSS parse error: '#{error.inspect}' not recognized" if error
-					styles = classes.scan(/[-\w]+/)
-					cl = styles.pop
-					@classes[cl] ||= Hash.new
-					@classes[cl][styles] = style.strip
-				end
-			end
+			code_background = '#f8f8f8'
+			numbers_background = '#def'
+			border_color = 'silver'
+			normal_color = '#100'
 			
-			MAIN = <<-'MAIN'
+			CSS_MAIN_STYLES = <<-MAIN
 .CodeRay {
-	background-color: #f8f8f8;
-	border: 1px solid silver;
+	background-color: #{code_background};
+	border: 1px solid #{border_color};
 	font-family: 'Courier New', 'Terminal', monospace;
-	color: black;
-	width: 100%;
-	padding: 2px;
+	color: #{normal_color};
 }
 .CodeRay pre { margin: 0px; }
 
 div.CodeRay { }
 
-span.CodeRay { white-space: pre; border: 0; }
+span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
 
-table.CodeRay { border-collapse: collapse; }
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
 table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 
 .CodeRay .line_numbers, .CodeRay .no {
-	background-color: #def;
+	background-color: #{numbers_background};
 	color: gray;
 	text-align: right;
 }
@@ -67,12 +35,13 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .CodeRay .no { padding: 0px 4px; }
 .CodeRay .code { width: 100%; }
 
-.CodeRay .code {
-}
+ol.CodeRay { font-size: 10pt; }
+ol.CodeRay li { white-space: pre; }
+
 .CodeRay .code pre { overflow: auto; }
 			MAIN
 
-			TOKENS = <<-'TOKENS'
+			TOKEN_COLORS = <<-'TOKENS'
 .af { color:#00C; }
 .an { color:#007; }
 .av { color:#700; }
@@ -109,6 +78,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .lv { color:#963; }
 .oc { color:#40E; font-weight:bold; }
 .on { color:#000; font-weight:bold; }
+.op { }
 .pc { color:#038; font-weight:bold; }
 .pd { color:#369; font-weight:bold; }
 .pp { color:#579; }
@@ -143,14 +113,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .xt { color:#444; }
 			TOKENS
 			
-			DEFAULT_STYLESHEET = MAIN + TOKENS.gsub(/^(?!$)/, '.CodeRay ')
-		
 		end
+		
 	end
-	
-end end
-
-if $0 == __FILE__
-	require 'pp'
-	pp CodeRay::Encoders::HTML::CSS.new
 end

data/lib/coderay/styles/murphy.rb

@@ -0,0 +1,119 @@
+module CodeRay
+	module Styles
+		
+		class Murphy < Style
+			
+			register_for :murphy
+			
+			code_background = '#001129'
+			numbers_background = code_background
+			border_color = 'silver'
+			normal_color = '#C0C0C0'
+			
+			CSS_MAIN_STYLES = <<-MAIN
+.CodeRay {
+	background-color: #{code_background};
+	border: 1px solid #{border_color};
+	font-family: 'Courier New', 'Terminal', monospace;
+	color: #{normal_color};
+}
+.CodeRay pre { margin: 0px; }
+
+div.CodeRay { }
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
+table.CodeRay td { padding: 2px 4px; vertical-align: top; }
+
+.CodeRay .line_numbers, .CodeRay .no {
+	background-color: #{numbers_background};
+	color: gray;
+	text-align: right;
+}
+.CodeRay .line_numbers tt { font-weight: bold; }
+.CodeRay .no { padding: 0px 4px; }
+.CodeRay .code { width: 100%; }
+
+ol.CodeRay { font-size: 10pt; }
+ol.CodeRay li { white-space: pre; }
+
+.CodeRay .code pre { overflow: auto; }
+			MAIN
+
+			TOKEN_COLORS = <<-'TOKENS'
+.af { color:#00C; }
+.an { color:#007; }
+.av { color:#700; }
+.aw { color:#C00; }
+.bi { color:#509; font-weight:bold; }
+.c  { color:#666; }
+
+.ch { color:#88F; }
+.ch .k { color:#04D; }
+.ch .dl { color:#039; }
+
+.cl { color:#e9e; font-weight:bold; }
+.co { color:#5ED; font-weight:bold; }
+.cr { color:#0A0; }
+.cv { color:#ccf; }
+.df { color:#099; font-weight:bold; }
+.di { color:#088; font-weight:bold; }
+.dl { color:black; }
+.do { color:#970; }
+.ds { color:#D42; font-weight:bold; }
+.e  { color:#666; font-weight:bold; }
+.er { color:#F00; background-color:#FAA; }
+.ex { color:#F00; font-weight:bold; }
+.fl { color:#60E; font-weight:bold; }
+.fu { color:#5ed; font-weight:bold; }
+.gv { color:#f84; }
+.hx { color:#058; font-weight:bold; }
+.i  { color:#66f; font-weight:bold; }
+.ic { color:#B44; font-weight:bold; }
+.il { }
+.in { color:#B2B; font-weight:bold; }
+.iv { color:#aaf; }
+.la { color:#970; font-weight:bold; }
+.lv { color:#963; }
+.oc { color:#40E; font-weight:bold; }
+.on { color:#000; font-weight:bold; }
+.op { }
+.pc { color:#08f; font-weight:bold; }
+.pd { color:#369; font-weight:bold; }
+.pp { color:#579; }
+.pt { color:#66f; font-weight:bold; }
+.r  { color:#5de; font-weight:bold; }
+
+.rx { background-color:#221133; }
+.rx .k { color:#f8f; }
+.rx .dl { color:#f0f; }
+.rx .mod { color:#f0b; }
+.rx .fu  { color:#404; font-weight: bold; }
+
+.s  { background-color:#331122; }
+.s  .s { background-color:#ffe0e0; }
+.s  .s  .s { background-color:#ffd0d0; }
+.s  .k { color:#F88; }
+.s  .dl { color:#f55; }
+
+.sh { background-color:#f0fff0; }
+.sh .k { color:#2B2; }
+.sh .dl { color:#161; }
+
+.sy { color:#Fc8; }
+.sy .k { color:#Fc8; }
+.sy .dl { color:#F84; }
+
+.ta { color:#070; }
+.tf { color:#070; font-weight:bold; }
+.ts { color:#D70; font-weight:bold; }
+.ty { color:#339; font-weight:bold; }
+.v  { color:#036; }
+.xt { color:#444; }
+			TOKENS
+			
+		end
+		
+	end
+end

data/lib/coderay/tokens.rb

@@ -101,7 +101,7 @@ module CodeRay
 			unless kind_filter
 				super(&block)
 			else
-				super do |text, kind|
+				super() do |text, kind|
 					next unless kind == kind_filter
 					yield text, kind
 				end