patched elsewhere - ugly hack, but it should do

tjk · tjk · commit a53f94dcba47 · 2012-07-08T18:21:30.000-07:00
diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
@@ -172,7 +172,6 @@ def self.token_path_to_hint hint, kinds
     def setup options
       super
 
-      @line_number = 1
       if options[:wrap] || options[:line_numbers]
         @real_out = @out
         @out = ''
@@ -298,9 +297,6 @@ def end_group kind
 
     # whole lines to be highlighted, eg. a deleted line in a diff
     def begin_line kind
-      @out << '<div class="line'
-      @out << ' odd' if @line_number.odd?
-      @out << '">'
       if style = @span_for_kind[@last_opened ? [kind, *@opened] : kind]
         if style['class="']
           @out << style.sub('class="', 'class="line ')
@@ -323,8 +319,6 @@ def end_line kind
         @out << '</span>'
         @last_opened = @opened.last if @last_opened
       end
-      @out << '</div>'
-      @line_number += 1
     end
 
   end
diff --git a/lib/coderay/encoders/html/numbering.rb b/lib/coderay/encoders/html/numbering.rb
@@ -14,7 +14,7 @@ def self.number! output, mode = :table, options = {}
         unless start.is_a? Integer
           raise ArgumentError, "Invalid value %p for :line_number_start; Integer expected." % start
         end
-        
+
         anchor_prefix = options[:line_number_anchors]
         anchor_prefix = 'line' if anchor_prefix == true
         anchor_prefix = anchor_prefix.to_s[/\w+/] if anchor_prefix
@@ -28,7 +28,7 @@ def self.number! output, mode = :table, options = {}
           else
             proc { |line| line.to_s }  # :to_s.to_proc in Ruby 1.8.7+
           end
-        
+
         bold_every = options[:bold_every]
         highlight_lines = options[:highlight_lines]
         bolding =
@@ -55,15 +55,15 @@ def self.number! output, mode = :table, options = {}
           else
             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
           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
         end
-        
+
         case mode
         when :inline
           max_width = (start + line_count).to_s.size
@@ -72,7 +72,7 @@ def self.number! output, mode = :table, options = {}
             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>#{line}"
+            "<div class=\"line#{" odd" if line_number.odd?}\"><span class=\"line-numbers\">#{indent}#{line_number_text}</span>#{line}</div>"
           end
 
         when :table
