coderay 0.7.1.147 → 0.7.2.165

data/lib/coderay/encoders/html/classes.rb

@@ -1,73 +1,73 @@
-module CodeRay
-module Encoders
-
-	class HTML
-
-		ClassOfKind = {
-			:attribute_name => 'an',
-			:attribute_name_fat => 'af',
-			:attribute_value => 'av',
-			:attribute_value_fat => 'aw',
-			:bin => 'bi',
-			:char => 'ch',
-			:class => 'cl',
-			:class_variable => 'cv',
-			:color => 'cr',
-			:comment => 'c',
-			:constant => 'co',
-			:content => 'k',
-			:definition => 'df',
-			:delimiter => 'dl',
-			:directive => 'di',
-			:doc => 'do',
-			:doc_string => 'ds',
-			:entity => 'en',
-			:error => 'er',
-			:escape => 'e',
-			:exception => 'ex',
-			:float => 'fl',
-			:function => 'fu',
-			:global_variable => 'gv',
-			:hex => 'hx',
-			:include => 'ic',
-			:inline => 'il',
-			:instance_variable => 'iv',
-			:integer => 'i',
-			:interpreted => 'in',
-			:label => 'la',
-			:local_variable => 'lv',
-			:modifier => 'mod',
-			:oct => 'oc',
-			:operator_name => 'on',
-			:pre_constant => 'pc',
-			:pre_type => 'pt',
-			:predefined => 'pd',
-			:preprocessor => 'pp',
-			:regexp => 'rx',
-			:reserved => 'r',
-			:shell => 'sh',
-			:string => 's',
-			:symbol => 'sy',
-			:tag => 'ta',
-			:tag_fat => 'tf',
-			:tag_special => 'ts',
-			:type => 'ty',
-			:variable => 'v',
-			:xml_text => 'xt',
-
-			:ident => :NO_HIGHLIGHT, # 'id'
-			#:operator => 'op',			
-			:operator => :NO_HIGHLIGHT,  # 'op'
-			:space => :NO_HIGHLIGHT,  # 'sp'
-			:plain => :NO_HIGHLIGHT,
-		}
-		ClassOfKind[:procedure] = ClassOfKind[:method] = ClassOfKind[:function]
-		ClassOfKind[:open] = ClassOfKind[:close] = ClassOfKind[:delimiter]
-		ClassOfKind[:nesting_delimiter] = ClassOfKind[:delimiter]
-		ClassOfKind[:escape] = ClassOfKind[:delimiter]
-		ClassOfKind.default = ClassOfKind[:error] or raise 'no class found for :error!'
-
-	end
-
-end
-end
+module CodeRay
+module Encoders
+
+  class HTML
+
+    ClassOfKind = {
+      :attribute_name => 'an',
+      :attribute_name_fat => 'af',
+      :attribute_value => 'av',
+      :attribute_value_fat => 'aw',
+      :bin => 'bi',
+      :char => 'ch',
+      :class => 'cl',
+      :class_variable => 'cv',
+      :color => 'cr',
+      :comment => 'c',
+      :constant => 'co',
+      :content => 'k',
+      :definition => 'df',
+      :delimiter => 'dl',
+      :directive => 'di',
+      :doc => 'do',
+      :doc_string => 'ds',
+      :entity => 'en',
+      :error => 'er',
+      :escape => 'e',
+      :exception => 'ex',
+      :float => 'fl',
+      :function => 'fu',
+      :global_variable => 'gv',
+      :hex => 'hx',
+      :include => 'ic',
+      :inline => 'il',
+      :instance_variable => 'iv',
+      :integer => 'i',
+      :interpreted => 'in',
+      :label => 'la',
+      :local_variable => 'lv',
+      :modifier => 'mod',
+      :oct => 'oc',
+      :operator_name => 'on',
+      :pre_constant => 'pc',
+      :pre_type => 'pt',
+      :predefined => 'pd',
+      :preprocessor => 'pp',
+      :regexp => 'rx',
+      :reserved => 'r',
+      :shell => 'sh',
+      :string => 's',
+      :symbol => 'sy',
+      :tag => 'ta',
+      :tag_fat => 'tf',
+      :tag_special => 'ts',
+      :type => 'ty',
+      :variable => 'v',
+      :xml_text => 'xt',
+
+      :ident => :NO_HIGHLIGHT, # 'id'
+      #:operator => 'op',
+      :operator => :NO_HIGHLIGHT,  # 'op'
+      :space => :NO_HIGHLIGHT,  # 'sp'
+      :plain => :NO_HIGHLIGHT,
+    }
+    ClassOfKind[:procedure] = ClassOfKind[:method] = ClassOfKind[:function]
+    ClassOfKind[:open] = ClassOfKind[:close] = ClassOfKind[:delimiter]
+    ClassOfKind[:nesting_delimiter] = ClassOfKind[:delimiter]
+    ClassOfKind[:escape] = ClassOfKind[:delimiter]
+    ClassOfKind.default = ClassOfKind[:error] or raise 'no class found for :error!'
+
+  end
+
+end
+end

data/lib/coderay/encoders/html/css.rb

@@ -1,65 +1,65 @@
-module CodeRay
-module Encoders
-
-	class HTML
-		class CSS
-
-			attr :stylesheet
-
-			def CSS.load_stylesheet style = nil
-				CodeRay::Styles[style]
-			end
-			
-			def initialize style = :default
-				@classes = Hash.new
-				style = CSS.load_stylesheet style
-				@stylesheet = [
-					style::CSS_MAIN_STYLES,
-					style::TOKEN_COLORS.gsub(/^(?!$)/, '.CodeRay ')
-				].join("\n")
-				parse style::TOKEN_COLORS
-			end
-
-			def [] *styles
-				cl = @classes[styles.first]
-				return '' unless cl
-				style = ''
-				1.upto(styles.size) do |offset|
-					break if style = cl[styles[offset .. -1]]
-				end
-				raise 'Style not found: %p' % [styles] if $DEBUG and style.empty?
-				return style
-			end
-			
-		private
-			
-			CSS_CLASS_PATTERN = /
-				( (?:                # $1 = classes
-					\s* \. [-\w]+
-				)+ )
-				\s* \{ \s*
-				( [^\}]+ )?          # $2 = style
-				\s* \} \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.to_s.strip
-				end
-			end
-			
-		end
-	end
-	
-end
-end
-
-if $0 == __FILE__
-	require 'pp'
-	pp CodeRay::Encoders::HTML::CSS.new
-end
+module CodeRay
+module Encoders
+
+  class HTML
+    class CSS
+
+      attr :stylesheet
+
+      def CSS.load_stylesheet style = nil
+        CodeRay::Styles[style]
+      end
+
+      def initialize style = :default
+        @classes = Hash.new
+        style = CSS.load_stylesheet style
+        @stylesheet = [
+          style::CSS_MAIN_STYLES,
+          style::TOKEN_COLORS.gsub(/^(?!$)/, '.CodeRay ')
+        ].join("\n")
+        parse style::TOKEN_COLORS
+      end
+
+      def [] *styles
+        cl = @classes[styles.first]
+        return '' unless cl
+        style = ''
+        1.upto(styles.size) do |offset|
+          break if style = cl[styles[offset .. -1]]
+        end
+        raise 'Style not found: %p' % [styles] if $DEBUG and style.empty?
+        return style
+      end
+
+    private
+
+      CSS_CLASS_PATTERN = /
+        ( (?:                # $1 = classes
+          \s* \. [-\w]+
+        )+ )
+        \s* \{ \s*
+        ( [^\}]+ )?          # $2 = style
+        \s* \} \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.to_s.strip
+        end
+      end
+
+    end
+  end
+
+end
+end
+
+if $0 == __FILE__
+  require 'pp'
+  pp CodeRay::Encoders::HTML::CSS.new
+end

data/lib/coderay/encoders/html/numerization.rb

@@ -1,122 +1,122 @@
-module CodeRay
-module Encoders
-
-	class HTML
-		
-		module Output
-
-			def numerize *args
-				clone.numerize!(*args)
-			end
-
-=begin			NUMERIZABLE_WRAPPINGS = {
-				:table => [:div, :page, nil],
-				:inline => :all,
-				:list => [:div, :page, nil]
-			}
-			NUMERIZABLE_WRAPPINGS.default = :all
-=end			
-			def numerize! mode = :table, options = {}
-				return self unless mode
-
-				options = DEFAULT_OPTIONS.merge options
-
-				start = options[:line_number_start]
-				unless start.is_a? Integer
-					raise ArgumentError, "Invalid value %p for :line_number_start; Integer expected." % start
-				end
-				
-				#allowed_wrappings = NUMERIZABLE_WRAPPINGS[mode]
-				#unless allowed_wrappings == :all or allowed_wrappings.include? options[:wrap]
-				#	raise ArgumentError, "Can't numerize, :wrap must be in %p, but is %p" % [NUMERIZABLE_WRAPPINGS, options[:wrap]]
-				#end
-				
-				bold_every = options[:bold_every]
-				bolding = 
-					if bold_every == false
-						proc { |line| line.to_s }
-					elsif bold_every.is_a? Integer
-						raise ArgumentError, ":bolding can't be 0." if bold_every == 0
-						proc do |line|
-							if line % bold_every == 0
-								"<strong>#{line}</strong>"  # every bold_every-th number in bold
-							else
-								line.to_s
-							end
-						end
-					else
-						raise ArgumentError, 'Invalid value %p for :bolding; false or Integer expected.' % bold_every
-					end
-				
-				case mode				
-				when :inline
-					max_width = (start + line_count).to_s.size
-					line = start
-					gsub!(/^/) do
-						line_number = bolding.call line
-						indent = ' ' * (max_width - line.to_s.size)
-						res = "<span class=\"no\">#{indent}#{line_number}</span> "
-						line += 1
-						res
-					end
-					
-				when :table
-					# This is really ugly.
-					# Because even monospace fonts seem to have different heights when bold, 
-					# I make the newline bold, both in the code and the line numbers.
-					# FIXME Still not working perfect for Mr. Internet Exploder
-					# FIXME Firefox struggles with very long codes (> 200 lines)
-					line_numbers = (start ... start + line_count).to_a.map(&bolding).join("\n")
-					line_numbers << "\n"  # also for Mr. MS Internet Exploder :-/
-					line_numbers.gsub!(/\n/) { "<tt>\n</tt>" }
-					
-					line_numbers_table_tpl = TABLE.apply('LINE_NUMBERS', line_numbers)
-					gsub!(/\n/) { "<tt>\n</tt>" }
-					wrap_in! line_numbers_table_tpl
-					@wrapped_in = :div
-					
-				when :list
-					opened_tags = []
-					gsub!(/^.*$\n?/) do |line|
-						line.chomp!
-						
-						open = opened_tags.join
-						line.scan(%r!<(/)?span[^>]*>?!) do |close,|
-							if close
-								opened_tags.pop
-							else
-								opened_tags << $&
-							end
-						end
-						close = '</span>' * opened_tags.size
-						
-						"<li>#{open}#{line}#{close}</li>"
-					end
-					wrap_in! LIST
-					@wrapped_in = :div
-					
-				else
-					raise ArgumentError, 'Unknown value %p for mode: expected one of %p' %
-						[mode, [:table, :list, :inline]]
-				end
-
-				self
-			end
-
-			def line_count
-				line_count = count("\n")
-				position_of_last_newline = rindex(?\n)
-				if position_of_last_newline
-					after_last_newline = self[position_of_last_newline + 1 .. -1]
-					ends_with_newline = after_last_newline[/\A(?:<\/span>)*\z/]
-					line_count += 1 if not ends_with_newline
-				end
-				line_count
-			end
-
-		end
-
-	end
-
-end
-end
+module CodeRay
+module Encoders
+
+  class HTML
+
+    module Output
+
+      def numerize *args
+        clone.numerize!(*args)
+      end
+
+=begin      NUMERIZABLE_WRAPPINGS = {
+        :table => [:div, :page, nil],
+        :inline => :all,
+        :list => [:div, :page, nil]
+      }
+      NUMERIZABLE_WRAPPINGS.default = :all
+=end
+      def numerize! mode = :table, options = {}
+        return self unless mode
+
+        options = DEFAULT_OPTIONS.merge options
+
+        start = options[:line_number_start]
+        unless start.is_a? Integer
+          raise ArgumentError, "Invalid value %p for :line_number_start; Integer expected." % start
+        end
+
+        #allowed_wrappings = NUMERIZABLE_WRAPPINGS[mode]
+        #unless allowed_wrappings == :all or allowed_wrappings.include? options[:wrap]
+        #  raise ArgumentError, "Can't numerize, :wrap must be in %p, but is %p" % [NUMERIZABLE_WRAPPINGS, options[:wrap]]
+        #end
+
+        bold_every = options[:bold_every]
+        bolding =
+          if bold_every == false
+            proc { |line| line.to_s }
+          elsif bold_every.is_a? Integer
+            raise ArgumentError, ":bolding can't be 0." if bold_every == 0
+            proc do |line|
+              if line % bold_every == 0
+                "<strong>#{line}</strong>"  # every bold_every-th number in bold
+              else
+                line.to_s
+              end
+            end
+          else
+            raise ArgumentError, 'Invalid value %p for :bolding; false or Integer expected.' % bold_every
+          end
+
+        case mode
+        when :inline
+          max_width = (start + line_count).to_s.size
+          line = start
+          gsub!(/^/) do
+            line_number = bolding.call line
+            indent = ' ' * (max_width - line.to_s.size)
+            res = "<span class=\"no\">#{indent}#{line_number}</span> "
+            line += 1
+            res
+          end
+
+        when :table
+          # This is really ugly.
+          # Because even monospace fonts seem to have different heights when bold,
+          # I make the newline bold, both in the code and the line numbers.
+          # FIXME Still not working perfect for Mr. Internet Exploder
+          # FIXME Firefox struggles with very long codes (> 200 lines)
+          line_numbers = (start ... start + line_count).to_a.map(&bolding).join("\n")
+          line_numbers << "\n"  # also for Mr. MS Internet Exploder :-/
+          line_numbers.gsub!(/\n/) { "<tt>\n</tt>" }
+
+          line_numbers_table_tpl = TABLE.apply('LINE_NUMBERS', line_numbers)
+          gsub!(/\n/) { "<tt>\n</tt>" }
+          wrap_in! line_numbers_table_tpl
+          @wrapped_in = :div
+
+        when :list
+          opened_tags = []
+          gsub!(/^.*$\n?/) do |line|
+            line.chomp!
+
+            open = opened_tags.join
+            line.scan(%r!<(/)?span[^>]*>?!) do |close,|
+              if close
+                opened_tags.pop
+              else
+                opened_tags << $&
+              end
+            end
+            close = '</span>' * opened_tags.size
+
+            "<li>#{open}#{line}#{close}</li>"
+          end
+          wrap_in! LIST
+          @wrapped_in = :div
+
+        else
+          raise ArgumentError, 'Unknown value %p for mode: expected one of %p' %
+            [mode, [:table, :list, :inline]]
+        end
+
+        self
+      end
+
+      def line_count
+        line_count = count("\n")
+        position_of_last_newline = rindex(?\n)
+        if position_of_last_newline
+          after_last_newline = self[position_of_last_newline + 1 .. -1]
+          ends_with_newline = after_last_newline[/\A(?:<\/span>)*\z/]
+          line_count += 1 if not ends_with_newline
+        end
+        line_count
+      end
+
+    end
+
+  end
+
+end
+end