coderay 0.8.273 → 0.8.303

data/bin/coderay

@@ -13,7 +13,7 @@ begin
 
   if ARGV.empty?
     puts <<-USAGE
-CodeRay #{CodeRay::VERSION} (http://rd.cYcnus.de/coderay)
+CodeRay #{CodeRay::VERSION} (http://coderay.rubychan.de)
 Usage:
   coderay -<lang> [-<format>] < file > output
   coderay file [-<format>]

data/{README → lib/README}

@@ -1,7 +1,7 @@
 = CodeRay
 
 [- Tired of blue'n'gray? Try the original version of this documentation on
-http://rd.cYcnus.de/coderay/doc (use Ctrl+Click to open it in its own frame.) -]
+coderay.rubychan.de[http://coderay.rubychan.de/doc/] (use Ctrl+Click to open it in its own frame.) -]
 
 == About
 CodeRay is a Ruby library for syntax highlighting.
@@ -18,12 +18,11 @@ 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.8.1
+Version: 0.8.2
 Author:: murphy (Kornelius Kalnbach)
 Contact:: murphy rubychan de
 Website:: coderay.rubychan.de[http://coderay.rubychan.de]
 License:: GNU LGPL; see LICENSE file in the main directory.
-Subversion:: $Id: README 272 2009-01-01 13:57:08Z murphy $
 
 == Installation
 
@@ -34,7 +33,7 @@ You need RubyGems[http://rubyforge.org/frs/?group_id=126].
 
 === Dependencies
 
-CodeRay needs Ruby 1.8.6 or later. It should also run with Ruby 1.9 and JRuby.
+CodeRay needs Ruby 1.8.6 or later. It also runs with Ruby 1.9.1+ and JRuby 1.1+.
 
 
 == Example Usage
@@ -51,7 +50,7 @@ CodeRay needs Ruby 1.8.6 or later. It should also run with Ruby 1.9 and JRuby.
 
 See CodeRay.
 
-Please report errors in this documentation to <coderay cycnus de>.
+Please report errors in this documentation to <murphy rubychan de>.
 
 
 == Credits
@@ -75,8 +74,7 @@ Please report errors in this documentation to <coderay cycnus de>.
 * Doug Kearns and everyone else who worked on ruby.vim - it not only helped me
   coding CodeRay, but also gave me a wonderful target to reach for the Ruby
   scanner.
-* everyone who uses CodeBB on http://www.rubyforen.de, http://www.python-forum.de, and
-  http://www.infhu.de/mx (down)
+* everyone who uses CodeBB on http://www.rubyforen.de and http://www.python-forum.de
 * iGEL, magichisoka, manveru, WoNáDo and everyone I forgot from rubyforen.de
 * Dethix from ruby-mine.de
 * zickzackw
@@ -88,6 +86,7 @@ Please report errors in this documentation to <coderay cycnus de>.
 * Josh Goebel for another version of the JavaScript scanner and a Diff scanner.
 * Jonathan Younger for pointing out the licence confusion caused by wrong LICENSE file.
 * Jeremy Hinegardner for finding the shebang-on-empty-file bug in FileType.
+* Charles Oliver Nutter and Yehuda Katz for helping me benchmark CodeRay on JRuby.
 * The folks at redmine.org - thank you for using and fixing CodeRay!
 * matz and all Ruby gods and gurus
 * The inventors of: the computer, the internet, the true color display, HTML &
@@ -99,9 +98,11 @@ Where would we be without all those people?
 === Created using
 
 * Ruby[http://ruby-lang.org/]
-* Chihiro (my Sony VAIO laptop); Henrietta (my old MacBook); Triella, born Rico (my new MacBook); as well as
+* Chihiro (my Sony VAIO laptop); Henrietta (my old MacBook);
+  Triella, born Rico (my new MacBook); as well as
   Seras and Hikari (my PCs)
-* RDE[http://homepage2.nifty.com/sakazuki/rde_e.html], VIM[http://vim.org] and TextMate[http://macromates.com]
+* RDE[http://homepage2.nifty.com/sakazuki/rde_e.html],
+  VIM[http://vim.org] and TextMate[http://macromates.com]
 * Subversion[http://subversion.tigris.org/]
 * Redmine[http://redmine.org/]
 * Firefox[http://www.mozilla.org/products/firefox/],

data/lib/coderay.rb

@@ -1,7 +1,5 @@
 # = CodeRay Library
 #
-# $Id: coderay.rb 260 2008-10-08 20:18:31Z murphy $
-#
 # CodeRay is a Ruby library for syntax highlighting.
 #
 # I try to make CodeRay easy to use and intuitive, but at the same time fully featured, complete,
@@ -130,10 +128,10 @@
 module CodeRay
 
   # Version: Major.Minor.Teeny[.Revision]
-  # Major: 0 for pre-release
-  # Minor: odd for beta, even for stable
-  # Teeny: development state
-  # Revision: Subversion Revision number (generated on rake)
+  # Major: 0 for pre-stable, 1 for stable
+  # Minor: feature milestone
+  # Teeny: development state, 0 for pre-release
+  # Revision: Subversion Revision number (generated on rake gem:make)
   VERSION = '0.8'
 
   require 'coderay/tokens'

data/lib/coderay/for_redcloth.rb

@@ -1,4 +1,4 @@
-module CodeRay  # :nodoc:
+module CodeRay
   
   # A little hack to enable CodeRay highlighting in RedCloth.
   # 

data/lib/coderay/helpers/gzip_simple.rb

@@ -2,7 +2,7 @@
 #
 # A simplified interface to the gzip library +zlib+ (from the Ruby Standard Library.)
 #
-# Author: murphy (mail to murphy cYcnus de)
+# Author: murphy (mail to murphy rubychan de)
 #
 # Version: 0.2 (2005.may.28)
 #

data/lib/coderay/scanners/_map.rb

@@ -7,6 +7,7 @@ module Scanners
     :irb => :ruby,
     :xhtml => :nitro_xhtml,
     :javascript => :java_script,
+    :js => :java_script,
     :nitro => :nitro_xhtml,
     :yml => :yaml
 

data/lib/coderay/scanners/css.rb

@@ -38,6 +38,7 @@ module Scanners
       Id = /##{Name}/
       Class = /\.#{Name}/
       PseudoClass = /:#{Name}/
+      AttributeSelector = /\[[^\]]*\]?/
 
     end
 
@@ -55,8 +56,8 @@ module Scanners
           kind = :space
 
         elsif case states.last
-          when :initial
-            if scan(/#{RE::Ident}|\*/ox)
+          when :initial, :media
+            if scan(/(?>#{RE::Ident})(?!\()|\*/ox)
               kind = :keyword
             elsif scan RE::Class
               kind = :class
@@ -64,10 +65,19 @@ module Scanners
               kind = :constant
             elsif scan RE::PseudoClass
               kind = :pseudo_class
-            elsif scan RE::Name
-              kind = :identifier
+            elsif match = scan(RE::AttributeSelector)
+              # TODO: Improve highlighting inside of attribute selectors.
+              tokens << [:open, :string]
+              tokens << [match[0,1], :delimiter]
+              tokens << [match[1..-2], :content] if match.size > 2
+              tokens << [match[-1,1], :delimiter] if match[-1] == ?]
+              tokens << [:close, :string]
+              next
+            elsif match = scan(/@media/)
+              kind = :directive
+              states.push :media_before_name
             end
-
+          
           when :block
             if scan(/(?>#{RE::Ident})(?!\()/ox)
               if value_expected
@@ -77,6 +87,18 @@ module Scanners
               end
             end
 
+          when :media_before_name
+            if scan RE::Ident
+              kind = :type
+              states[-1] = :media_after_name
+            end
+          
+          when :media_after_name
+            if scan(/\{/)
+              kind = :operator
+              states[-1] = :media
+            end
+          
           when :comment
             if scan(/(?:[^*\s]|\*(?!\/))+/)
               kind = :comment
@@ -103,7 +125,7 @@ module Scanners
 
         elsif scan(/\}/)
           value_expected = false
-          if states.last == :block
+          if states.last == :block || states.last == :media
             kind = :operator
             states.pop
           else

data/lib/coderay/scanners/java.rb

@@ -30,12 +30,11 @@ module Scanners
       add(KEYWORDS, :keyword).
       add(MAGIC_VARIABLES, :local_variable).
       add(TYPES, :type).
-      add(BuiltinTypes::List, :type).
+      add(BuiltinTypes::List, :pre_type).
       add(DIRECTIVES, :directive)
 
     ESCAPE = / [bfnrtv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x
     UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x
-    REGEXP_ESCAPE =  / [bBdDsSwW] /x
     STRING_CONTENT_PATTERN = {
       "'" => /[^\\']+/,
       '"' => /[^\\"]+/,
@@ -117,15 +116,11 @@ module Scanners
 
           end
 
-        when :string, :regexp
+        when :string
           if scan(STRING_CONTENT_PATTERN[string_delimiter])
             kind = :content
           elsif match = scan(/["'\/]/)
             tokens << [match, :delimiter]
-            if state == :regexp
-              modifiers = scan(/[gim]+/)
-              tokens << [modifiers, :modifier] if modifiers && !modifiers.empty?
-            end
             tokens << [:close, state]
             string_delimiter = nil
             state = :initial
@@ -136,8 +131,6 @@ module Scanners
             else
               kind = :char
             end
-          elsif state == :regexp && scan(/ \\ (?: #{ESCAPE} | #{REGEXP_ESCAPE} | #{UNICODE_ESCAPE} ) /mox)
-            kind = :char
           elsif scan(/\\./m)
             kind = :content
           elsif scan(/ \\ | $ /x)
@@ -166,7 +159,7 @@ module Scanners
 
       end
 
-      if [:string, :regexp].include? state
+      if state == :string
         tokens << [:close, state]
       end
 

data/lib/coderay/scanners/ruby.rb

@@ -147,6 +147,10 @@ module Scanners
             tokens << [match, kind]
             next
           
+          elsif bol? && match = scan(/\#!.*/)
+            tokens << [match, :doctype]
+            next
+            
           elsif match = scan(/\#.*/) or
             ( bol? and match = scan(/#{patterns::RUBYDOC_OR_DATA}/o) )
               kind = :comment
@@ -191,6 +195,7 @@ module Scanners
                   depth -= 1
                   if depth == 0  # closing brace of inline block reached
                     state, depth, heredocs = inline_block_stack.pop
+                    heredocs = nil if heredocs && heredocs.empty?
                     tokens << [match, :inline_delimiter]
                     kind = :inline
                     match = :close
@@ -346,7 +351,7 @@ module Scanners
             value_expected = value_expected == :set
             last_token_dot = last_token_dot == :set
           end
-
+          
           if $DEBUG and not kind
             raise_inspect 'Error token %p in line %d' %
               [[match, kind], line], tokens, state

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

@@ -81,25 +81,30 @@ module Scanners
     /ox
     METHOD_NAME_OR_SYMBOL = / #{METHOD_NAME_EX} | #{SYMBOL} /ox
 
-    # TODO investigste \M, \c and \C escape sequences
-    # (?: M-\\C-|C-\\M-|M-\\c|c\\M-|c|C-|M-)? (?: \\ (?: [0-7]{3} | x[0-9A-Fa-f]{2} | . ) )
-    # assert_equal(225, ?\M-a)
-    # assert_equal(129, ?\M-\C-a)
-    ESCAPE = /
+    SIMPLE_ESCAPE = /
         [abefnrstv]
-      | M-\\C-|C-\\M-|M-\\c|c\\M-|c|C-|M-
       |  [0-7]{1,3}
       | x[0-9A-Fa-f]{1,2}
-      | .
+      | .?
     /mx
-
+    
+    CONTROL_META_ESCAPE = /
+      (?: M-|C-|c )
+      (?: \\ (?: M-|C-|c ) )*
+      (?: [^\\] | \\ #{SIMPLE_ESCAPE} )?
+    /mox
+    
+    ESCAPE = /
+      #{CONTROL_META_ESCAPE} | #{SIMPLE_ESCAPE}
+    /mox
+    
     CHARACTER = /
       \?
       (?:
         [^\s\\]
       | \\ #{ESCAPE}
       )
-    /mx
+    /mox
 
     # NOTE: This is not completely correct, but
     # nobody needs heredoc delimiters ending with \n.

data/lib/coderay/scanners/sql.Keith.rb

@@ -1,7 +1,7 @@
-# by Keith Pitt
 module CodeRay
 module Scanners
   
+  # by Keith Pitt
   class SQL < Scanner
 
     register_for :sql

data/lib/coderay/scanners/sql.rb

@@ -1,6 +1,6 @@
-# by Josh Goebel
 module CodeRay module Scanners
   
+  # by Josh Goebel
   class SQL < Scanner
 
     register_for :sql

data/lib/coderay/styles/cycnus.rb

@@ -8,7 +8,7 @@ module Styles
     code_background = '#f8f8f8'
     numbers_background = '#def'
     border_color = 'silver'
-    normal_color = '#100'
+    normal_color = '#000'
 
     CSS_MAIN_STYLES = <<-MAIN
 .CodeRay {
@@ -50,7 +50,7 @@ ol.CodeRay li { white-space: pre }
 .av { color:#700 }
 .aw { color:#C00 }
 .bi { color:#509; font-weight:bold }
-.c  { color:#666; }
+.c  { color:#888; }
 
 .ch { color:#04D }
 .ch .k { color:#04D }
@@ -77,10 +77,10 @@ ol.CodeRay li { white-space: pre }
 .i  { color:#00D; font-weight:bold }
 .ic { color:#B44; font-weight:bold }
 
-.il { background: #eee }
+.il { background: #eee; color: black }
 .il .il { background: #ddd }
 .il .il .il { background: #ccc }
-.il .idl { font-weight: bold; color: #888 }
+.il .idl { font-weight: bold; color: #777 }
 
 .im { color:#f00; }
 .in { color:#B2B; font-weight:bold }
@@ -94,7 +94,7 @@ ol.CodeRay li { white-space: pre }
 .pd { color:#369; font-weight:bold }
 .pp { color:#579; }
 .ps { color:#00C; font-weight: bold; }
-.pt { color:#339; font-weight:bold }
+.pt { color:#349; font-weight:bold }
 .r, .kw  { color:#080; font-weight:bold }
 
 .ke { color: #808; }

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: coderay
 version: !ruby/object:Gem::Version 
-  version: 0.8.273
+  version: 0.8.303
 platform: ruby
 authors: 
 - murphy
-autorequire: coderay
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 +01:00
+date: 2009-02-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
 description: "CodeRay is a Ruby library for syntax highlighting. I try to make CodeRay easy to use and intuitive, but at the same time fully featured, complete, fast and efficient.  Usage is simple: require 'coderay' code = 'some %q(weird (Ruby) can't shock) me!' puts CodeRay.scan(code, :ruby).html"
-email: murphy@cYcnus.de
+email: murphy@rubychan.de
 executables: 
 - coderay
 - coderay_stylesheet
 extensions: []
 
 extra_rdoc_files: 
-- ./README
+- ./lib/README
 - ./FOLDERS
 files: 
 - ./lib/coderay/duo.rb
@@ -77,7 +77,7 @@ files:
 - ./lib/coderay/tokens.rb
 - ./lib/coderay.rb
 - ./lib/term/ansicolor.rb
-- ./README
+- ./lib/README
 - ./LICENSE
 - ./FOLDERS
 has_rdoc: true
@@ -85,7 +85,7 @@ homepage: http://coderay.rubychan.de
 post_install_message: 
 rdoc_options: 
 - -SNw2
-- -mREADME
+- -mlib/README
 - -a
 - -t CodeRay Documentation
 require_paths: 
@@ -102,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: 
-- strscan
+requirements: []
+
 rubyforge_project: coderay
 rubygems_version: 1.3.1
 signing_key: