Extracted code making HTML lines independent from numbering code to a specific option in encoder.

Etienne Massip · Etienne Massip · commit 0e8008ad88b4 · 2012-01-26T21:14:59.000+01:00
diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
@@ -47,6 +47,12 @@ module Encoders
   #
   # Default: 'CodeRay output'
   #
+  # === :independent_lines
+  # Split multilines blocks into line-wide blocks.
+  # 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)
   #
@@ -99,7 +105,8 @@ class HTML < Encoder
       :style => :alpha,
       :wrap  => nil,
       :title => 'CodeRay output',
-      
+
+      :independent_lines   => false,
       :line_numbers        => nil,
       :line_number_anchors => 'n',
       :line_number_start   => 1,
@@ -167,7 +174,11 @@ def setup options
         @real_out = @out
         @out = ''
       end
-      
+
+      options[:independent_lines] = true if options[:line_numbers] == :inline
+
+      @independent_lines = (options[:independent_lines] == true)
+
       @HTML_ESCAPE = HTML_ESCAPE.dup
       @HTML_ESCAPE["\t"] = ' ' * options[:tab_width]
       
@@ -245,13 +256,21 @@ def text_token text, kind
       if text =~ /#{HTML_ESCAPE_PATTERN}/o
         text = text.gsub(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] }
       end
+      if @independent_lines && @opened.any? && text.end_with?("\n")
+        text.chomp!
+        close_eol_reopen = "#{'</span>' * @opened.size}\n"
+        @opened.each_with_index do |k, index|
+          close_eol_reopen << (@span_for_kind[index > 0 ? [k, *@opened[0 ... index ]] : k] || '<span>')
+        end
+      end
       if style = @span_for_kind[@last_opened ? [kind, *@opened] : kind]
         @out << style << text << '</span>'
       else
         @out << text
       end
+      @out << close_eol_reopen if close_eol_reopen
     end
-    
+
     # token groups, eg. strings
     def begin_group kind
       @out << (@span_for_kind[@last_opened ? [kind, *@opened] : kind] || '<span>')
@@ -299,4 +318,4 @@ def end_line kind
   end
   
 end
-end
+end
diff --git a/lib/coderay/encoders/html/numbering.rb b/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
@@ -112,4 +100,4 @@ def self.number! output, mode = :table, options = {}
   end
 
 end
-end
+end
