rename :independent_lines option to :break_lines

korny · korny · commit 5c4124559127 · 2012-04-02T00:15:20.000+02:00
diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
@@ -47,7 +47,8 @@ module Encoders
   #
   # Default: 'CodeRay output'
   #
-  # === :independent_lines
+  # === :break_lines
+  # 
   # Split multiline blocks at line breaks.
   # Forced to true if :line_numbers option is set to :inline.
   #
@@ -106,7 +107,7 @@ class HTML < Encoder
       :wrap  => nil,
       :title => 'CodeRay output',
       
-      :independent_lines => false,
+      :break_lines => false,
       
       :line_numbers        => nil,
       :line_number_anchors => 'n',
@@ -176,9 +177,9 @@ def setup options
         @out = ''
       end
       
-      options[:independent_lines] = true if options[:line_numbers] == :inline
+      options[:break_lines] = true if options[:line_numbers] == :inline
       
-      @independent_lines = (options[:independent_lines] == true)
+      @break_lines = (options[:break_lines] == true)
       
       @HTML_ESCAPE = HTML_ESCAPE.dup
       @HTML_ESCAPE["\t"] = ' ' * options[:tab_width]
@@ -260,7 +261,7 @@ def text_token text, kind
       
       style = @span_for_kind[@last_opened ? [kind, *@opened] : kind]
       
-      if @independent_lines && (i = text.index("\n")) && (c = @opened.size + (style ? 1 : 0)) > 0
+      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|
diff --git a/test/unit/html.rb b/test/unit/html.rb
@@ -3,7 +3,7 @@
 
 class HtmlTest < Test::Unit::TestCase
   
-  def test_independent_lines_option
+  def test_break_lines_option
     snippets = {}
     
     snippets[:ruby] = {}
@@ -96,8 +96,8 @@ def test_independent_lines_option
       tokens = CodeRay.scan code[:in], lang
       
       assert_equal code[:expected_with_option_off], tokens.html
-      assert_equal code[:expected_with_option_off], tokens.html(:independent_lines => false)
-      assert_equal code[:expected_with_option_on],  tokens.html(:independent_lines => true)
+      assert_equal code[:expected_with_option_off], tokens.html(:break_lines => false)
+      assert_equal code[:expected_with_option_on],  tokens.html(:break_lines => true)
     end
   end
 end
