yugui	2011-07-03 21:23:48 +0900 (Sun, 03 Jul 2011)

  New Revision: 32379

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32379

  Log:
    merges r31997 from trunk into ruby_1_9_2.
    --
    * lib/rexml/formatters/pretty.rb
      (REXML::Formatters::Pretty#write_text),
      test/rexml/test_core.rb
      (Tester#test_pretty_format_long_text_finite): don't ignore
      'width' parameter in pretty formatter. fixes #4498
      Reported by Michael Frasca. Thanks!!!

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/rexml/formatters/pretty.rb
    branches/ruby_1_9_2/test/rexml/test_core.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32378)
+++ ruby_1_9_2/ChangeLog	(revision 32379)
@@ -1,3 +1,12 @@
+Sat Jun 11 16:28:25 2011  Kouhei Sutou  <kou@c...>
+
+	* lib/rexml/formatters/pretty.rb
+	  (REXML::Formatters::Pretty#write_text),
+	  test/rexml/test_core.rb
+	  (Tester#test_pretty_format_long_text_finite): don't ignore
+	  'width' parameter in pretty formatter. fixes #4498
+	  Reported by Michael Frasca. Thanks!!!
+
 Sat Jun 11 16:04:03 2011  Kouhei Sutou  <kou@c...>
 
 	* lib/rexml/parsers/xpathparser.rb
Index: ruby_1_9_2/lib/rexml/formatters/pretty.rb
===================================================================
--- ruby_1_9_2/lib/rexml/formatters/pretty.rb	(revision 32378)
+++ ruby_1_9_2/lib/rexml/formatters/pretty.rb	(revision 32379)
@@ -88,7 +88,7 @@
         s = node.to_s()
         s.gsub!(/\s/,' ')
         s.squeeze!(" ")
-        s = wrap(s, 80-@level)
+        s = wrap(s, @width - @level)
         s = indent_text(s, @level, " ", true)
         output << (' '*@level + s)
       end
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32378)
+++ ruby_1_9_2/version.h	(revision 32379)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 278
+#define RUBY_PATCHLEVEL 279
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/rexml/test_core.rb
===================================================================
--- ruby_1_9_2/test/rexml/test_core.rb	(revision 32378)
+++ ruby_1_9_2/test/rexml/test_core.rb	(revision 32379)
@@ -1151,6 +1151,67 @@
   end
 
 
+  def test_pretty_format_deep_indent
+    n = 6
+    elements = ""
+    n.times do |i|
+      elements << "<element#{i}>"
+      elements << "element#{i} " * 5
+    end
+    (n - 1).downto(0) do |i|
+      elements << "</element#{i}>"
+    end
+    xml = "<doc>#{elements}</doc>"
+    document = REXML::Document.new(xml)
+    formatter = REXML::Formatters::Pretty.new
+    formatter.width = 20
+    output = ""
+    formatter.write(document, output)
+    assert_equal(<<-XML.strip, output)
+<doc>
+  <element0>
+    element0
+    element0
+    element0
+    element0
+    element0 
+    <element1>
+      element1
+      element1
+      element1
+      element1
+      element1 
+      <element2>
+        element2
+        element2
+        element2
+        element2
+        element2 
+        <element3>
+          element3
+          element3
+          element3
+          element3
+          element3 
+          <element4>
+            element4
+            element4
+            element4
+            element4
+            element4
+            
+            <element5>
+              element5 element5 element5 element5 element5 
+            </element5>
+          </element4>
+        </element3>
+      </element2>
+    </element1>
+  </element0>
+</doc>
+    XML
+  end
+
   def test_ticket_58
     doc = REXML::Document.new
     doc << REXML::XMLDecl.default

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/