coderay 0.8.303 → 0.8.312

data/lib/README

@@ -18,7 +18,7 @@ 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.2
+Version: 0.8.3
 Author:: murphy (Kornelius Kalnbach)
 Contact:: murphy rubychan de
 Website:: coderay.rubychan.de[http://coderay.rubychan.de]
@@ -87,6 +87,7 @@ Please report errors in this documentation to <murphy rubychan de>.
 * 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.
+* Andreas Neuhaus for pointing out a markup bug in coderay/for_redcloth.
 * 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 &

data/lib/coderay/duo.rb

@@ -2,8 +2,6 @@ module CodeRay
   
   # = Duo
   #
-  # $Id: scanner.rb 123 2006-03-21 14:46:34Z murphy $
-  #
   # A Duo is a convenient way to use CodeRay. You just create a Duo,
   # giving it a lang (language of the input code) and a format (desired
   # output format), and call Duo#highlight with the code.

data/lib/coderay/for_redcloth.rb

@@ -48,6 +48,7 @@ module CodeRay
           opts[:lang] ? '' : "<pre#{pba(opts)}>"
         end
         def bc_close(opts)  # :nodoc:
+          opts = @in_bc
           @in_bc = nil
           opts[:lang] ? '' : "</pre>\n"
         end

data/lib/coderay/helpers/plugin.rb

@@ -2,8 +2,6 @@ module CodeRay
   
 # = PluginHost
 #
-# $Id: plugin.rb 272 2009-01-01 13:57:08Z murphy $
-#
 # A simple subclass plugin system.
 #
 #  Example:

data/lib/coderay/scanner.rb

@@ -4,8 +4,6 @@ module CodeRay
 
   # = Scanners
   #
-  # $Id: scanner.rb 270 2009-01-01 03:19:28Z murphy $
-  #
   # This module holds the Scanner class and its subclasses.
   # For example, the Ruby scanner is named CodeRay::Scanners::Ruby
   # can be found in coderay/scanners/ruby.

data/lib/coderay/scanners/java.rb

@@ -76,7 +76,7 @@ module Scanners
               class_name_follows = false
             else
               import_clause = true if match == 'import'
-              class_name_follows = true if match == 'class'
+              class_name_follows = true if match == 'class' || match == 'interface'
             end
           
           elsif scan(/ \.(?!\d) | [,?:(\[)\]}] | -- | \+\+ | && | \|\| | \*\*=? | [-+*\/%^~&|<>=!]=? | <<<?=? | >>>?=? /x)

data/lib/coderay/scanners/java_script.rb

@@ -42,6 +42,10 @@ module Scanners
       '"' => /[^\\"]+/,
       '/' => /[^\\\/]+/,
     }
+    KEY_CHECK_PATTERN = {
+      "'" => / [^\\']* (?: \\.? [^\\']* )* '? \s* : /x,
+      '"' => / [^\\"]* (?: \\.? [^\\"]* )* "? \s* : /x,
+    }
 
     def scan_tokens tokens, options
 
@@ -103,8 +107,12 @@ module Scanners
             key_expected = false
 
           elsif match = scan(/["']/)
-            tokens << [:open, :string]
-            state = :string
+            if key_expected && check(KEY_CHECK_PATTERN[match])
+              state = :key
+            else
+              state = :string
+            end
+            tokens << [:open, state]
             string_delimiter = match
             kind = :delimiter
 
@@ -125,7 +133,7 @@ module Scanners
 
           end
 
-        when :string, :regexp
+        when :string, :regexp, :key
           if scan(STRING_CONTENT_PATTERN[string_delimiter])
             kind = :content
           elsif match = scan(/["'\/]/)
@@ -139,7 +147,7 @@ module Scanners
             key_expected = value_expected = false
             state = :initial
             next
-          elsif state == :string && (match = scan(/ \\ (?: #{ESCAPE} | #{UNICODE_ESCAPE} ) /mox))
+          elsif state != :regexp && (match = scan(/ \\ (?: #{ESCAPE} | #{UNICODE_ESCAPE} ) /mox))
             if string_delimiter == "'" && !(match == "\\\\" || match == "\\'")
               kind = :content
             else
@@ -155,20 +163,20 @@ module Scanners
             key_expected = value_expected = false
             state = :initial
           else
-            raise_inspect "else case \" reached; %p not handled." % peek(1), tokens
+            raise_inspect "else case \" reached; %p not handled." % peek(1), tokens, state
           end
 
         else
-          raise_inspect 'Unknown state', tokens
+          raise_inspect 'Unknown state', tokens, state
 
         end
 
         match ||= matched
         if $DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
-            [[match, kind], line], tokens
+            [[match, kind], line], tokens, state
         end
-        raise_inspect 'Empty token', tokens unless match
+        raise_inspect 'Empty token', tokens, state unless match
         
         tokens << [match, kind]
 

data/lib/coderay/scanners/nitro_xhtml.rb

@@ -5,8 +5,6 @@ module Scanners
   load :ruby
 
   # Nitro XHTML Scanner
-  #
-  # $Id$
   class NitroXHTML < Scanner
 
     include Streamable

data/lib/coderay/scanners/rhtml.rb

@@ -5,8 +5,6 @@ module Scanners
   load :ruby
 
   # RHTML Scanner
-  #
-  # $Id$
   class RHTML < Scanner
 
     include Streamable

data/lib/coderay/scanners/xml.rb

@@ -5,8 +5,6 @@ module Scanners
 
   # XML Scanner
   #
-  # $Id$
-  #
   # Currently this is the same scanner as Scanners::HTML.
   class XML < HTML
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: coderay
 version: !ruby/object:Gem::Version 
-  version: 0.8.303
+  version: 0.8.312
 platform: ruby
 authors: 
 - murphy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-16 00:00:00 +01:00
+date: 2009-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: []