Merge branch 'master' into paint-integration

4 files changed, 52 insertions, 34 deletions

diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index c32dbd1..635a4d8 100644
--- a/lib/coderay/encoders/html.rb
+++ b/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
diff --git a/lib/coderay/encoders/html/numbering.rb b/lib/coderay/encoders/html/numbering.rb
index 15ce11b..332145b 100644
--- a/lib/coderay/encoders/html/numbering.rb
+++ b/lib/coderay/encoders/html/numbering.rb
@@ -1,15 +1,15 @@
 module CodeRay
 module Encoders
-
+  
   class HTML
-
+    
     module Numbering  # :nodoc:
-
+      
       def self.number! output, mode = :table, options = {}
         return self unless mode
-
+        
         options = DEFAULT_OPTIONS.merge options
-
+        
         start = options[:line_number_start]
         unless start.is_a? Integer
           raise ArgumentError, "Invalid value %p for :line_number_start; Integer expected." % start
@@ -17,7 +17,7 @@ module Encoders
         
         anchor_prefix = options[:line_number_anchors]
         anchor_prefix = 'line' if anchor_prefix == true
-        anchor_prefix = anchor_prefix.to_s[/\w+/] if anchor_prefix
+        anchor_prefix = anchor_prefix.to_s[/[\w-]+/] if anchor_prefix
         anchoring =
           if anchor_prefix
             proc do |line|
@@ -56,60 +56,53 @@ module Encoders
             raise ArgumentError, 'Invalid value %p for :bolding; false or Integer expected.' % bold_every
           end
         
-        line_count = output.count("\n")
-        position_of_last_newline = output.rindex(RUBY_VERSION >= '1.9' ? /\n/ : ?\n)
-        if position_of_last_newline
+        if position_of_last_newline = output.rindex(RUBY_VERSION >= '1.9' ? /\n/ : ?\n)
           after_last_newline = output[position_of_last_newline + 1 .. -1]
           ends_with_newline = after_last_newline[/\A(?:<\/span>)*\z/]
-          line_count += 1 if not ends_with_newline
+          
+          if ends_with_newline
+            line_count = output.count("\n")
+          else
+            line_count = output.count("\n") + 1
+          end
+        else
+          line_count = 1
         end
         
         case mode
         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
           line_numbers = (start ... start + line_count).map(&bolding).join("\n")
           line_numbers << "\n"
           line_numbers_table_template = Output::TABLE.apply('LINE_NUMBERS', line_numbers)
-
+          
           output.gsub!(/<\/div>\n/, '</div>')
           output.wrap_in! line_numbers_table_template
           output.wrapped_in = :div
-
+        
         when :list
           raise NotImplementedError, 'The :list option is no longer available. Use :table.'
-
+        
         else
           raise ArgumentError, 'Unknown value %p for mode: expected one of %p' %
             [mode, [:table, :inline]]
         end
-
+        
         output
       end
-
+      
     end
-
+    
   end
-
+  
 end
 end
diff --git a/lib/coderay/encoders/html/output.rb b/lib/coderay/encoders/html/output.rb
index 9132d94..de6f6ea 100644
--- a/lib/coderay/encoders/html/output.rb
+++ b/lib/coderay/encoders/html/output.rb
@@ -124,7 +124,7 @@ module Encoders
 
       TABLE = Template.new <<-TABLE
 <table class="CodeRay"><tr>
-  <td class="line-numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre><%LINE_NUMBERS%></pre></td>
+  <td class="line-numbers"><pre><%LINE_NUMBERS%></pre></td>
   <td class="code"><pre><%CONTENT%></pre></td>
 </tr></table>
       TABLE
diff --git a/lib/coderay/encoders/terminal.rb b/lib/coderay/encoders/terminal.rb
index 005032d..a0ceb3c 100644
--- a/lib/coderay/encoders/terminal.rb
+++ b/lib/coderay/encoders/terminal.rb
@@ -62,7 +62,6 @@ module CodeRay
           :content => '31',
           :delimiter => '1;29',
           :modifier => '35',
-          :function => '1;29'
         },
         :reserved => '1;31',
         :shell => {
@@ -75,6 +74,7 @@ module CodeRay
           :modifier => '1;32',
           :escape => '1;36',
           :delimiter => '1;32',
+          :char => '1;36',
         },
         :symbol => '1;32',
         :tag => '1;34',