1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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/trunk@12854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ser 2007-07-28 13:28:30 +00:00
parent 0e83f22cf5
commit 7e168983ce
3 changed files with 12 additions and 7 deletions

View file

@ -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

View file

@ -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

View file

@ -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
REVISION = "$Revision$".gsub(/\$Revision:|\$/,'').strip
Copyright = COPYRIGHT