@@ Fix for the XPath descendant* result set ordering bug @@

@@ SAX2 listener bug fixes @@
@@ Undid a code change that caused a 10x speed regression @@
@@ Indentation fixes, and a new word wrapping feature for text nodes
  was contributed by Devin Bayer (documentation forthcoming; see the
  change logs for now) @@

The XPath bug fix is really ugly and inefficient, but I spent two days hacking
at it and this was the best I could come up with.

The SAX2 listener fixes had to do with crashes in certain conditions, like when
there was a carriage return at the end of a document

Several people submitted patches for the speed regression; it is embarrassing
how long it took me to get around to looking at this.  To this day, I don't
know where the offending code came from.

Encoding fixes

Added a contributed word wrapping option for text formatting.  Devin Bayer
contributed this.  Here's his comment:
"Setting :wordwrapping to :all, wordwraps all text nodes longer than 60
  characters.
  Setting :indentstyle to aString, make aString used as indentation,
  instead of the default '  '.
  And as long as :respect_whitespace isn't set for the element,
  multiline text nodes will be indented."


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb
index 084676afa9..506952312a 100644
--- a/lib/rexml/doctype.rb
+++ b/lib/rexml/doctype.rb
@@ -109,7 +109,7 @@ module REXML
 			output << " #@long_name" if @long_name
 			output << " #@uri" if @uri
 			unless @children.empty?
-				next_indent = indent + 2
+				next_indent = indent + 1
 				output << ' ['
 				child = nil		# speed
 				@children.each { |child|
@@ -123,6 +123,10 @@ module REXML
 			output << STOP
 		end
 
+    def context
+      @parent.context
+    end
+
 		def entity( name )
 			@entities[name].unnormalized if @entities[name]
 		end