diff options
| author | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-28 13:24:46 +0000 |
|---|---|---|
| committer | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-28 13:24:46 +0000 |
| commit | 8fddf85361f628f298b5cecb6f83dcd91bc689bc (patch) | |
| tree | b44cb54a96b07fa6293e11383c8297e9274af37e | |
| parent | 61fec2d310cd669c2fd5a85bb9751a0e77bf4cb1 (diff) | |
Fixes a bug in the pretty printer related to an incomplete refactoring.
Merge code cleanups
Fixes another bug related to the formatting code refactoring in 3.1.7
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/rexml/formatters/pretty.rb | 7 | ||||
| -rw-r--r-- | lib/rexml/node.rb | 2 | ||||
| -rw-r--r-- | lib/rexml/rexml.rb | 10 |
3 files changed, 12 insertions, 7 deletions
diff --git a/lib/rexml/formatters/pretty.rb b/lib/rexml/formatters/pretty.rb index 78eab27402..22b6d857cd 100644 --- a/lib/rexml/formatters/pretty.rb +++ b/lib/rexml/formatters/pretty.rb @@ -57,8 +57,11 @@ module REXML if compact if node.children.inject(true) {|s,c| s & c.kind_of?(Text)} string = "" - node.children.each { |child| write( child, string, 0 ) } - if string.length + @level < @width + old_level = @level + @level = 0 + node.children.each { |child| write( child, string ) } + @level = old_level + if string.length < @width output << string skip = true end diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb index ebdbd44ff2..9780376829 100644 --- a/lib/rexml/node.rb +++ b/lib/rexml/node.rb @@ -1,4 +1,6 @@ require "rexml/parseexception" +require "rexml/formatters/pretty" +require "rexml/formatters/default" module REXML # Represents a node in the tree. Nodes are never encountered except as diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb index 132261ed95..19805d61e1 100644 --- a/lib/rexml/rexml.rb +++ b/lib/rexml/rexml.rb @@ -10,8 +10,8 @@ # # Main page:: http://www.germane-software.com/software/rexml # Author:: Sean Russell <serATgermaneHYPHENsoftwareDOTcom> -# Version:: 3.1.7 -# Date:: 2007/206 +# Version:: 3.1.7.1 +# Date:: 2007/209 # # This API documentation can be downloaded from the REXML home page, or can # be accessed online[http://www.germane-software.com/software/rexml_doc] @@ -21,9 +21,9 @@ # online[http://www.germane-software.com/software/rexml/docs/tutorial.html] module REXML COPYRIGHT = "Copyright © 2001-2007 Sean Russell <ser@germane-software.com>" - DATE = "2007/206" - VERSION = "3.1.7" - REVISION = "$Revision$".gsub(/\$Revision:|\$/,'').strip + DATE = "2007/209" + VERSION = "3.1.7.1" + REVISION = "$Revision: 1270$".gsub(/\$Revision:|\$/,'').strip Copyright = COPYRIGHT Version = VERSION |