coderay 1.0.0.598.pre → 1.0.0.738.pre

data/lib/coderay/scanners/ruby/patterns.rb

@@ -65,7 +65,6 @@ module Scanners
     QUOTE_TO_TYPE.default = :string
 
     REGEXP_MODIFIERS = /[mousenix]*/
-    REGEXP_SYMBOLS = /[|?*+(){}\[\].^$]/
 
     DECIMAL = /\d+(?:_\d+)*/
     OCTAL = /0_?[0-7]+(?:_[0-7]+)*/
@@ -91,7 +90,7 @@ module Scanners
         [abefnrstv]
       |  [0-7]{1,3}
       | x[0-9A-Fa-f]{1,2}
-      | .?
+      | .
     /mx
     
     CONTROL_META_ESCAPE = /
@@ -157,86 +156,20 @@ module Scanners
       while elsif if not return
       yield
     ])
-
-    FANCY_START = / % ( [qQwWxsr] | (?![a-zA-Z0-9]) ) ([^a-zA-Z0-9]) /mx
-
-    FancyStringType = {
-      'q' => [:string, false],
-      'Q' => [:string, true],
-      'r' => [:regexp, true],
-      's' => [:symbol, false],
-      'x' => [:shell, true]
-    }
-    FancyStringType['w'] = FancyStringType['q']
-    FancyStringType['W'] = FancyStringType[''] = FancyStringType['Q']
-
-    class StringState < Struct.new :type, :interpreted, :delim, :heredoc,
-      :opening_paren, :paren_depth, :pattern, :next_state
-
-      CLOSING_PAREN = Hash[ *%w[
-        ( )
-        [ ]
-        < >
-        { }
-      ] ]
-
-      CLOSING_PAREN.each { |k,v| k.freeze; v.freeze }  # debug, if I try to change it with <<
-      OPENING_PAREN = CLOSING_PAREN.invert
-
-      STRING_PATTERN = Hash.new do |h, k|
-        delim, interpreted = *k
-        delim_pattern = Regexp.escape(delim.dup)  # dup: workaround for old Ruby
-        if closing_paren = CLOSING_PAREN[delim]
-          delim_pattern = delim_pattern[0..-1] if defined? JRUBY_VERSION  # JRuby fix
-          delim_pattern << Regexp.escape(closing_paren)
-        end
-        delim_pattern << '\\\\' unless delim == '\\'
-        
-        special_escapes =
-          case interpreted
-          when :regexp_symbols
-            '| ' + REGEXP_SYMBOLS.source
-          when :words
-            '| \s'
-          end
-        
-        h[k] =
-          if interpreted and not delim == '#'
-            / (?= [#{delim_pattern}] | \# [{$@] #{special_escapes} ) /mx
-          else
-            / (?= [#{delim_pattern}] #{special_escapes} ) /mx
-          end
-      end
-
-      HEREDOC_PATTERN = Hash.new do |h, k|
-        delim, interpreted, indented = *k
-        delim_pattern = Regexp.escape(delim.dup)  # dup: workaround for old Ruby
-        delim_pattern = / \n #{ '(?>[\ \t]*)' if indented } #{ Regexp.new delim_pattern } $ /x
-        h[k] =
-          if interpreted
-            / (?= #{delim_pattern}() | \\ | \# [{$@] ) /mx  # $1 set == end of heredoc
-          else
-            / (?= #{delim_pattern}() | \\ ) /mx
-          end
-      end
-
-      def initialize kind, interpreted, delim, heredoc = false
-        if heredoc
-          pattern = HEREDOC_PATTERN[ [delim, interpreted, heredoc == :indented] ]
-          delim = nil
-        else
-          pattern = STRING_PATTERN[ [delim, interpreted] ]
-          if closing_paren = CLOSING_PAREN[delim]
-            opening_paren = delim
-            delim = closing_paren
-            paren_depth = 1
-          end
-        end
-        super kind, interpreted, delim, heredoc, opening_paren, paren_depth, pattern, :initial
-      end
-    end unless defined? StringState
-
+    
+    FANCY_STRING_START = / % ( [QqrsWwx] | (?![a-zA-Z0-9]) ) ([^a-zA-Z0-9]) /x
+    FANCY_STRING_KIND = Hash.new(:string).merge({
+      'r' => :regexp,
+      's' => :symbol,
+      'x' => :shell,
+    })
+    FANCY_STRING_INTERPRETED = Hash.new(true).merge({
+      'q' => false,
+      's' => false,
+      'w' => false,
+    })
+    
   end
-
+  
 end
 end

data/lib/coderay/scanners/ruby/string_state.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+module CodeRay
+module Scanners
+  
+  class Ruby
+    
+    class StringState < Struct.new :type, :interpreted, :delim, :heredoc,
+      :opening_paren, :paren_depth, :pattern, :next_state  # :nodoc: all
+      
+      CLOSING_PAREN = Hash[ *%w[
+        ( )
+        [ ]
+        < >
+        { }
+      ] ].each { |k,v| k.freeze; v.freeze }  # debug, if I try to change it with <<
+      
+      STRING_PATTERN = Hash.new do |h, k|
+        delim, interpreted = *k
+        # delim = delim.dup  # workaround for old Ruby
+        delim_pattern = Regexp.escape(delim)
+        if closing_paren = CLOSING_PAREN[delim]
+          delim_pattern << Regexp.escape(closing_paren)
+        end
+        delim_pattern << '\\\\' unless delim == '\\'
+        
+        # special_escapes =
+        #   case interpreted
+        #   when :regexp_symbols
+        #     '| [|?*+(){}\[\].^$]'
+        #   end
+        
+        h[k] =
+          if interpreted && delim != '#'
+            / (?= [#{delim_pattern}] | \# [{$@] ) /mx
+          else
+            / (?= [#{delim_pattern}] ) /mx
+          end
+      end
+      
+      def initialize kind, interpreted, delim, heredoc = false
+        if heredoc
+          pattern = heredoc_pattern delim, interpreted, heredoc == :indented
+          delim = nil
+        else
+          pattern = STRING_PATTERN[ [delim, interpreted] ]
+          if closing_paren = CLOSING_PAREN[delim]
+            opening_paren = delim
+            delim = closing_paren
+            paren_depth = 1
+          end
+        end
+        super kind, interpreted, delim, heredoc, opening_paren, paren_depth, pattern, :initial
+      end
+      
+      def heredoc_pattern delim, interpreted, indented
+        # delim = delim.dup  # workaround for old Ruby
+        delim_pattern = Regexp.escape(delim)
+        delim_pattern = / \n #{ '(?>[ \t]*)' if indented } #{ Regexp.new delim_pattern } $ /x
+        if interpreted
+          / (?= #{delim_pattern}() | \\ | \# [{$@] ) /mx  # $1 set == end of heredoc
+        else
+          / (?= #{delim_pattern}() | \\ ) /mx
+        end
+      end
+      
+    end
+    
+  end
+  
+end
+end

data/lib/coderay/scanners/sql.rb

@@ -64,7 +64,7 @@ module CodeRay module Scanners
           if match = scan(/ \s+ | \\\n /x)
             encoder.text_token match, :space
           
-          elsif match = scan(/^(?:--\s?|#).*/)
+          elsif match = scan(/(?:--\s?|#).*/)
             encoder.text_token match, :comment
             
           elsif match = scan(%r( /\* (!)? (?: .*? \*/ | .* ) )mx)

data/lib/coderay/scanners/yaml.rb

@@ -60,9 +60,11 @@ module Scanners
             encoder.end_group :string
             next
           when match = scan(/(?![!"*&]).+?(?=$|\s+#)/)
-            encoder.text_token match, :string
+            encoder.begin_group :string
+            encoder.text_token match, :content
             string_indent = key_indent || column(pos - match.size - 1)
-            encoder.text_token matched, :string if scan(/(?:\n+ {#{string_indent + 1}}.*)+/)
+            encoder.text_token matched, :content if scan(/(?:\n+ {#{string_indent + 1}}.*)+/)
+            encoder.end_group :string
             next
           end
           

data/lib/coderay/styles/_map.rb

@@ -1,7 +1,7 @@
 module CodeRay
 module Styles
-
+  
   default :alpha
-
+  
 end
 end

data/lib/coderay/styles/alpha.rb

@@ -6,19 +6,20 @@ module Styles
 
     register_for :alpha
 
-    code_background = '#f8f8f8'
-    numbers_background = '#def'
+    code_background = 'hsl(0,0%,95%)'
+    numbers_background = 'hsl(180,65%,90%)'
     border_color = 'silver'
-    normal_color = '#000'
+    normal_color = 'black'
 
     CSS_MAIN_STYLES = <<-MAIN  # :nodoc:
 .CodeRay {
   background-color: #{code_background};
   border: 1px solid #{border_color};
-  font-family: 'Courier New', 'Terminal', monospace;
   color: #{normal_color};
 }
-.CodeRay pre { margin: 0px; }
+.CodeRay pre {
+  margin: 0px;
+}
 
 span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
 
@@ -29,88 +30,97 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
   background-color: #{numbers_background};
   color: gray;
   text-align: right;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+}
+.CodeRay .line_numbers a, .CodeRay .no a {
+  background-color: #{numbers_background} !important;
+  color: gray !important;
+  text-decoration: none !important;
 }
-.CodeRay .line_numbers a:target, .CodeRay .no a:target { color: blue; }
-.CodeRay .line_numbers .highlighted, .CodeRay .no .highlighted { color: red; }
+.CodeRay .line_numbers a:target, .CodeRay .no a:target { color: blue !important; }
+.CodeRay .line_numbers .highlighted, .CodeRay .no .highlighted { color: red !important; }
+.CodeRay .line_numbers .highlighted a, .CodeRay .no .highlighted a { color: red !important; }
 .CodeRay .no { padding: 0px 4px; }
+.CodeRay .line { display: block; float: left; width: 100%; }
 .CodeRay .code { width: 100%; }
 .CodeRay .code pre { overflow: auto; }
     MAIN
 
     TOKEN_COLORS = <<-'TOKENS'
-.debug { color:white ! important; background:blue ! important; }
+.debug { color: white !important; background: blue !important; }
 
 .an { color:#007 }
 .at { color:#f08 }
 .av { color:#700 }
-.bi { color:#509; font-weight:bold }
-.c  { color:#888; }
-.c .dl { color:#444; }
-.c .ch { color:#444; }
+.bi { color:#509 }
+.c  { color:#888 }
+.c .dl { color:#444 }
+.c .ch { color:#444 }
 
 .ch { color:#04D }
 .ch .k { color:#04D }
 .ch .dl { color:#039 }
 
 .cl { color:#B06; font-weight:bold }
-.cm { color:#A08; font-weight:bold }
+.cm { color:#A08 }
 .co { color:#036; font-weight:bold }
 .cr { color:#0A0 }
 .cv { color:#369 }
-.de { color:#B0B; }
+.de { color:#B0B }
 .df { color:#099; font-weight:bold }
 .di { color:#088; font-weight:bold }
 .dl { color:black }
 .do { color:#970 }
 .dt { color:#34b }
 .ds { color:#D42; font-weight:bold }
-.e  { color:#666; font-weight:bold }
+.e  { color:#666 }
 .en { color:#800; font-weight:bold }
 .er { color:#F00; background-color:#FAA }
 .ex { color:#C00; font-weight:bold }
-.fl { color:#60E; font-weight:bold }
+.fl { color:#60E }
 .fu { color:#06B; font-weight:bold }
-.gv { color:#d70; font-weight:bold }
-.hx { color:#058; font-weight:bold }
-.i  { color:#00D; font-weight:bold }
+.gv { color:#d70 }
+.hx { color:#02b }
+.i  { color:#00D }
 .ic { color:#B44; font-weight:bold }
 
 .il { background-color: hsla(0,0%,0%,0.1); color: black }
-.il .idl { font-weight: bold; color: #666 }
-.idl { font-weight: bold; background-color: hsla(0,0%,0%,0.1); color: #666; }
+.idl { font-weight: bold; color: #666 }
 
-.im { color:#f00; }
+.im { color:#f00 }
 .in { color:#B2B; font-weight:bold }
 .iv { color:#33B }
 .la { color:#970; font-weight:bold }
 .lv { color:#963 }
 .ns { color:#707; font-weight:bold }
-.oc { color:#40E; font-weight:bold }
+.oc { color:#40E }
 .op { }
-.pc { color:#058; font-weight:bold }
+.pc { color:#069 }
 .pd { color:#369; font-weight:bold }
-.pp { color:#579; }
+.pp { color:#579 }
 .ps { color:#00C; font-weight:bold }
 .pt { color:#074; font-weight:bold }
-.r, .kw  { color:#080; font-weight:bold }
+.r  { color:#080; font-weight:bold }
+.kw { color:#080; font-weight:bold }
 
-.ke { color: #808; }
-.ke .dl { color: #606; }
-.ke .ch { color: #80f; }
+.ke { color: #606 }
+.ke .dl { color: #404 }
+.ke .ch { color: #60f }
 .vl { color: #088; }
 
-.rx { background-color:hsla(300,100%,50%,0.1); }
+.rx { background-color:hsla(300,100%,50%,0.09); }
 .rx .k { color:#808 }
 .rx .dl { color:#404 }
 .rx .mod { color:#C2C }
-.rx .fu  { color:#404; font-weight: bold }
 
-.s { background-color:hsla(0,100%,50%,0.1); }
-.s .k { color: #D20; }
-.s .ch { color: #b0b; }
-.s .dl { color: #710; }
+.s { background-color:hsla(0,100%,50%,0.08); }
+.s .k { color: #D20 }
+.s .ch { color: #b0b }
+.s .dl { color: #710 }
+.s .mod { color: #E40 }
 
-.sh { background-color:hsla(120,100%,50%,0.1); }
+.sh { background-color:hsla(120,100%,50%,0.09); }
 .sh .k { color:#2B2 }
 .sh .dl { color:#161 }
 
@@ -135,8 +145,8 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 
 .ins .ins { color: #080; background:transparent; font-weight:bold }
 .del .del { color: #800; background:transparent; font-weight:bold }
-.chg .chg { color: #66f; }
-.head .head { color: #f4f; }
+.chg .chg { color: #66f }
+.head .head { color: #f4f }
     TOKENS
 
   end

data/lib/coderay/styles/cycnus.rb

@@ -32,12 +32,13 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 }
 .CodeRay .line_numbers .highlighted, .CodeRay .no .highlighted { color: red; }
 .CodeRay .no { padding: 0px 4px; }
+.CodeRay .line { display: block; float: left; width: 100%; }
 .CodeRay .code { width: 100%; }
 .CodeRay .code pre { overflow: auto; }
     MAIN
 
     TOKEN_COLORS = <<-'TOKENS'
-.debug { color:white ! important; background:blue ! important; }
+.debug { color: white !important; background: blue !important; }
 
 .an { color:#007 }
 .at { color:#f08 }

data/lib/coderay/token_kinds.rb

@@ -1,89 +1,91 @@
 module CodeRay
-  class Tokens
-    AbbreviationForKind = Hash.new do |h, k|  # :nodoc:
-      if $CODERAY_DEBUG
-        raise 'Undefined Token kind: %p' % [k]  # :nodoc:
-      else
-        :NO_HIGHLIGHT
-      end
-    end
-    AbbreviationForKind.update with = {  # :nodoc:
-      :annotation => 'at',
-      :attribute_name => 'an',
-      :attribute_value => 'av',
-      :bin => 'bi',
-      :char => 'ch',
-      :class => 'cl',
-      :class_variable => 'cv',
-      :color => 'cr',
-      :comment => 'c',
-      :complex => 'cm',
-      :constant => 'co',
-      :content => 'k',
-      :decorator => 'de',
-      :definition => 'df',
-      :delimiter => 'dl',
-      :directive => 'di',
-      :doc => 'do',
-      :doctype => 'dt',
-      :doc_string => 'ds',
-      :entity => 'en',
-      :error => 'er',
-      :escape => 'e',
-      :exception => 'ex',
-      :filename => 'filename',
-      :float => 'fl',
-      :function => 'fu',
-      :global_variable => 'gv',
-      :hex => 'hx',
-      :imaginary => 'cm',
-      :important => 'im',
-      :include => 'ic',
-      :inline => 'il',
-      :inline_delimiter => 'idl',
-      :instance_variable => 'iv',
-      :integer => 'i',
-      :interpreted => 'in',
-      :key => 'ke',
-      :keyword => 'kw',
-      :label => 'la',
-      :local_variable => 'lv',
-      :modifier => 'mod',
-      :namespace => 'ns',
-      :oct => 'oc',
-      :predefined => 'pd',
-      :preprocessor => 'pp',
-      :pre_constant => 'pc',
-      :pre_type => 'pt',
-      :pseudo_class => 'ps',
-      :regexp => 'rx',
-      :reserved => 'r',
-      :shell => 'sh',
-      :string => 's',
-      :symbol => 'sy',
-      :tag => 'ta',
-      :tag_special => 'ts',
-      :type => 'ty',
-      :value => 'vl',
-      :variable => 'v',
-      
-      :insert => 'ins',
-      :delete => 'del',
-      :change => 'chg',
-      :head => 'head',
-      
-      :eyecatcher => 'eye',
-      
-      :ident => :NO_HIGHLIGHT, # 'id'
-      #:operator => 'op',
-      :operator => :NO_HIGHLIGHT,  # 'op'
-      :space => :NO_HIGHLIGHT,  # 'sp'
-      :plain => :NO_HIGHLIGHT,
-    }
-    AbbreviationForKind[:method] = AbbreviationForKind[:function]
-    AbbreviationForKind[:nesting_delimiter] = AbbreviationForKind[:delimiter]
-    AbbreviationForKind[:escape] = AbbreviationForKind[:delimiter]
-    AbbreviationForKind[:docstring] = AbbreviationForKind[:comment]
-    #AbbreviationForKind.default = AbbreviationForKind[:error] or raise 'no class found for :error!'
+  
+  # A Hash of all known token kinds and their associated CSS classes.
+  TokenKinds = Hash.new do |h, k|
+    warn 'Undefined Token kind: %p' % [k] if $CODERAY_DEBUG
+    false
   end
+  
+  # speedup
+  TokenKinds.compare_by_identity if TokenKinds.respond_to? :compare_by_identity
+  
+  TokenKinds.update with = {  # :nodoc:
+    :annotation => 'at',
+    :attribute_name => 'an',
+    :attribute_value => 'av',
+    :bin => 'bi',
+    :char => 'ch',
+    :class => 'cl',
+    :class_variable => 'cv',
+    :color => 'cr',
+    :comment => 'c',
+    :complex => 'cm',
+    :constant => 'co',
+    :content => 'k',
+    :decorator => 'de',
+    :definition => 'df',
+    :delimiter => 'dl',
+    :directive => 'di',
+    :doc => 'do',
+    :doctype => 'dt',
+    :doc_string => 'ds',
+    :entity => 'en',
+    :error => 'er',
+    :escape => 'e',
+    :exception => 'ex',
+    :filename => 'filename',
+    :float => 'fl',
+    :function => 'fu',
+    :global_variable => 'gv',
+    :hex => 'hx',
+    :imaginary => 'cm',
+    :important => 'im',
+    :include => 'ic',
+    :inline => 'il',
+    :inline_delimiter => 'idl',
+    :instance_variable => 'iv',
+    :integer => 'i',
+    :interpreted => 'in',
+    :key => 'ke',
+    :keyword => 'kw',
+    :label => 'la',
+    :local_variable => 'lv',
+    :modifier => 'mod',
+    :namespace => 'ns',
+    :oct => 'oc',
+    :predefined => 'pd',
+    :preprocessor => 'pp',
+    :pre_constant => 'pc',  # FIXME: rename to :predefined_constant
+    :pre_type => 'pt',  # FIXME: rename to :predefined_type
+    :pseudo_class => 'ps',
+    :regexp => 'rx',
+    :reserved => 'r',
+    :shell => 'sh',
+    :string => 's',
+    :symbol => 'sy',
+    :tag => 'ta',
+    :tag_special => 'ts',
+    :type => 'ty',
+    :value => 'vl',
+    :variable => 'v',
+    
+    :insert => 'ins',
+    :delete => 'del',
+    :change => 'chg',
+    :head => 'head',
+    
+    :eyecatcher => 'eye',
+    
+    :ident => false, # 'id'
+    :operator => false,  # 'op'
+    
+    :space => false,  # 'sp'
+    :plain => false,
+  }
+  
+  TokenKinds[:method]    = TokenKinds[:function]
+  TokenKinds[:escape]    = TokenKinds[:delimiter]
+  TokenKinds[:docstring] = TokenKinds[:comment]
+  
+  TokenKinds.freeze
 end