Merge branch 'master' into multiline-inline-diff

Author: korny

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 .bundle

.travis.yml

@@ -2,11 +2,13 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  # - rbx-19mode  # test again later
   - ruby-head
-  - rbx
-  - rbx-2.0
+  - jruby-head
   - ree
-  - jruby
 branches:
   only:
     - master

Changes.textile

@@ -4,6 +4,17 @@ p=. _This files lists all changes in the CodeRay library since the 0.9.8 release
 
 {{toc}}
 
+h2. Changes in 1.0.7
+ 
+* Fix issue with plugin files not being loaded. [GH-20, thanks to Will Read]
+
+h2. Changes in 1.0.6
+ 
+* New option @:break_lines@ for the HTML encoder (splits tokens at line breaks). [GH-15, thanks to Etienne Massip]
+* Improved speed of @:line_numbers => :inline@ option for the HTML encoder.
+* Fixed wrong HTML file type. (was @:page@) [GH-16, thanks to Doug Hammond]
+* The CSS Scanner now highlights tokens like @url(...)@ as @:function@ instead of @:string@. [GH-13, thanks to Joel Holdbrooks]
+
 h2. Changes in 1.0.5
 
 Fixes:

bench/bench.rb

@@ -79,6 +79,7 @@ def here fn = nil
 
   options = {
     :tab_width => 2,
+    # :line_numbers => :inline,
     :css => $style ? :style : :class,
   }
   $hl = CodeRay.encoder(format, options) unless $dump_output

lib/coderay/encoders/html.rb

@@ -47,6 +47,13 @@ module Encoders
   #
   # Default: 'CodeRay output'
   #
+  # === :break_lines
+  # 
+  # Split multiline blocks at line breaks.
+  # Forced to true if :line_numbers option is set to :inline.
+  #
+  # Default: false
+  #
   # === :line_numbers
   # Include line numbers in :table, :inline, or nil (no line numbers)
   #
@@ -100,6 +107,8 @@ class HTML < Encoder
       :wrap  => nil,
       :title => 'CodeRay output',
 
+      :break_lines => false,
+      
       :line_numbers        => nil,
       :line_number_anchors => 'n',
       :line_number_start   => 1,
@@ -168,6 +177,10 @@ def setup options
         @out = ''
       end
 
+      options[:break_lines] = true if options[:line_numbers] == :inline
+      
+      @break_lines = (options[:break_lines] == true)
+      
       @HTML_ESCAPE = HTML_ESCAPE.dup
       @HTML_ESCAPE["\t"] = ' ' * options[:tab_width]
 
@@ -245,7 +258,19 @@ def text_token text, kind
       if text =~ /#{HTML_ESCAPE_PATTERN}/o
         text = text.gsub(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] }
       end
-      if style = @span_for_kind[@last_opened ? [kind, *@opened] : kind]
+      
+      style = @span_for_kind[@last_opened ? [kind, *@opened] : kind]
+      
+      if @break_lines && (i = text.index("\n")) && (c = @opened.size + (style ? 1 : 0)) > 0
+        close = '</span>' * c
+        reopen = ''
+        @opened.each_with_index do |k, index|
+          reopen << (@span_for_kind[index > 0 ? [k, *@opened[0 ... index ]] : k] || '<span>')
+        end
+        text[i .. -1] = text[i .. -1].gsub("\n", "#{close}\n#{reopen}#{style}")
+      end
+      
+      if style
         @out << style << text << '</span>'
       else
         @out << text

lib/coderay/encoders/html/numbering.rb

@@ -68,23 +68,11 @@ def self.number! output, mode = :table, options = {}
         when :inline
           max_width = (start + line_count).to_s.size
           line_number = start
-          nesting = []
           output.gsub!(/^.*$\n?/) do |line|
-            line.chomp!
-            open = nesting.join
-            line.scan(%r!<(/)?span[^>]*>?!) do |close,|
-              if close
-                nesting.pop
-              else
-                nesting << $&
-              end
-            end
-            close = '</span>' * nesting.size
-            
             line_number_text = bolding.call line_number
             indent = ' ' * (max_width - line_number.to_s.size)  # TODO: Optimize (10^x)
             line_number += 1
-            "<span class=\"line-numbers\">#{indent}#{line_number_text}</span>#{open}#{line}#{close}\n"
+            "<span class=\"line-numbers\">#{indent}#{line_number_text}</span>#{line}"
           end
 
         when :table

lib/coderay/helpers/file_type.rb

@@ -90,8 +90,8 @@ def shebang filename
       'gvy'      => :groovy,
       'h'        => :c,
       'haml'     => :haml,
-      'htm'      => :page,
-      'html'     => :page,
+      'htm'      => :html,
+      'html'     => :html,
       'html.erb' => :erb,
       'java'     => :java,
       'js'       => :java_script,
@@ -120,7 +120,7 @@ def shebang filename
       'sql'      => :sql,
       # 'ss'       => :scheme,
       'tmproj'   => :xml,
-      'xhtml'    => :page,
+      'xhtml'    => :html,
       'xml'      => :xml,
       'yaml'     => :yaml,
       'yml'      => :yaml,

lib/coderay/helpers/plugin.rb

@@ -176,7 +176,6 @@ def make_plugin_hash
         id = validate_id(plugin_id)
         path = path_to id
         begin
-          raise LoadError, "#{path} not found" unless File.exist? path
           require path
         rescue LoadError => boom
           if @plugin_map_loaded

lib/coderay/scanners/php.rb

@@ -1,3 +1,4 @@
+# encoding: ASCII-8BIT
 module CodeRay
 module Scanners
 

lib/coderay/scanners/python.rb

@@ -61,7 +61,7 @@ class Python < Scanner
       add(PREDEFINED_VARIABLES_AND_CONSTANTS, :predefined_constant).
       add(PREDEFINED_EXCEPTIONS, :exception)  # :nodoc:
 
-    NAME = / [^\W\d] \w* /x  # :nodoc:
+    NAME = / [[:alpha:]_] \w* /x  # :nodoc:
     ESCAPE = / [abfnrtv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x  # :nodoc:
     UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} | N\{[-\w ]+\} /x  # :nodoc: