coderay 1.0.5 → 1.0.6.rc1

data/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 @@ module Encoders
       :wrap  => nil,
       :title => 'CodeRay output',
       
+      :break_lines => false,
+      
       :line_numbers        => nil,
       :line_number_anchors => 'n',
       :line_number_start   => 1,
@@ -168,6 +177,10 @@ module Encoders
         @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 @@ module Encoders
       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

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

@@ -68,23 +68,11 @@ module Encoders
         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

data/lib/coderay/helpers/file_type.rb

@@ -90,8 +90,8 @@ module CodeRay
       '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 @@ module CodeRay
       'sql'      => :sql,
       # 'ss'       => :scheme,
       'tmproj'   => :xml,
-      'xhtml'    => :page,
+      'xhtml'    => :html,
       'xml'      => :xml,
       'yaml'     => :yaml,
       'yml'      => :yaml,

data/lib/coderay/scanners/css.rb

@@ -144,7 +144,7 @@ module Scanners
           encoder.end_group :string
           
         elsif match = scan(/#{RE::Function}/o)
-          encoder.begin_group :string
+          encoder.begin_group :function
           start = match[/^\w+\(/]
           encoder.text_token start, :delimiter
           if match[-1] == ?)
@@ -153,7 +153,7 @@ module Scanners
           else
             encoder.text_token match[start.size..-1], :content
           end
-          encoder.end_group :string
+          encoder.end_group :function
           
         elsif match = scan(/(?: #{RE::Dimension} | #{RE::Percentage} | #{RE::Num} )/ox)
           encoder.text_token match, :float

data/lib/coderay/scanners/php.rb

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

data/lib/coderay/scanners/python.rb

@@ -61,7 +61,7 @@ module Scanners
       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:
     

data/lib/coderay/version.rb

@@ -1,3 +1,3 @@
 module CodeRay
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

metadata

@@ -1,34 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: coderay
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 5
-  version: 1.0.5
+version: !ruby/object:Gem::Version
+  version: 1.0.6.rc1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Kornelius Kalnbach
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-28 00:00:00 +01:00
-default_executable: 
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies: []
-
-description: Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.
-email: 
+description: Fast and easy syntax highlighting for selected languages, written in
+  Ruby. Comes with RedCloth integration and LOC counter.
+email:
 - murphy@rubychan.de
-executables: 
+executables:
 - coderay
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README_INDEX.rdoc
-files: 
+files:
 - LICENSE
 - README_INDEX.rdoc
 - Rakefile
@@ -99,46 +91,36 @@ files:
 - test/functional/examples.rb
 - test/functional/for_redcloth.rb
 - test/functional/suite.rb
-- bin/coderay
-has_rdoc: true
+- !binary |-
+  YmluL2NvZGVyYXk=
 homepage: http://coderay.rubychan.de
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -SNw2
 - -mREADME_INDEX.rdoc
 - -t CodeRay Documentation
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: coderay
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Fast syntax highlighting for selected languages.
-test_files: 
+test_files:
 - test/functional/basic.rb
 - test/functional/examples.rb
 - test/functional/for_redcloth.rb