From 0e8008ad88b4f56e35d71c3029d02ffb4e21120f Mon Sep 17 00:00:00 2001
From: Etienne Massip <etienne.massip@gmail.com>
Date: Thu, 26 Jan 2012 21:14:59 +0100
Subject: Extracted code making HTML lines independent from numbering code to a
 specific option in encoder.

---
 lib/coderay/encoders/html.rb | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'lib/coderay/encoders/html.rb')

diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index c32dbd1..14d1307 100644
--- 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 @@ module Encoders
       :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 @@ module Encoders
         @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 @@ module Encoders
       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 @@ module Encoders
   end
   
 end
-end
+end
\ No newline at end of file
-- 
cgit v1.2.1


From a2e9acc4dabd2ec2d33ac17d83f92ef370354eb7 Mon Sep 17 00:00:00 2001
From: Etienne Massip <etienne.massip@gmail.com>
Date: Thu, 29 Mar 2012 20:46:07 +0200
Subject: Fixed handling of eols inside token content.

---
 lib/coderay/encoders/html.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'lib/coderay/encoders/html.rb')

diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index 14d1307..0d91cdf 100644
--- a/lib/coderay/encoders/html.rb
+++ b/lib/coderay/encoders/html.rb
@@ -256,19 +256,23 @@ module Encoders
       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"
+
+      style = @span_for_kind[@last_opened ? [kind, *@opened] : kind]
+
+      if @independent_lines && (i = text.index("\n")) && (c = @opened.size + (style ? 1 : 0)) > 0
+        close = '</span>' * c
+        reopen = ''
         @opened.each_with_index do |k, index|
-          close_eol_reopen << (@span_for_kind[index > 0 ? [k, *@opened[0 ... index ]] : k] || '<span>')
+          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 = @span_for_kind[@last_opened ? [kind, *@opened] : kind]
+
+      if style
         @out << style << text << '</span>'
       else
         @out << text
       end
-      @out << close_eol_reopen if close_eol_reopen
     end
 
     # token groups, eg. strings
-- 
cgit v1.2.1