* Added the lower-case Shift-JIS files to the manifest. The upper-case ones

  should be deprecated, but I need a Shift-JIS encoded XML file to test
  against, first.
* Added support for maintaining external entity occurances in DTDs
* Deprecated the use of Document::DECLARATION.  The new default declaration
  can be gotten with XMLDecl::default()
* Refactored the encoding support code.  It should be more robust now,
  and fixes a few bugs.
* The XPath string() function now deals with Element nodes properly.
* Serialization with Output objects now works as would be expected.
* Various code cleanups, some reducing the number of warnings that Ruby 1.8.x
  produces with REXML.


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

1 files changed, 38 insertions, 5 deletions

diff --git a/lib/rexml/xmldecl.rb b/lib/rexml/xmldecl.rb
index 6a6cc31a53..1c0bde8f4d 100644
--- a/lib/rexml/xmldecl.rb
+++ b/lib/rexml/xmldecl.rb
@@ -13,13 +13,16 @@ module REXML
 		STOP = '\?>';
 
 		attr_accessor :version, :standalone
+    attr_reader :writeencoding
 
 		def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
-			@encoding_set = !encoding.nil?
+      @writethis = true
+      @writeencoding = !encoding.nil?
 			if version.kind_of? XMLDecl
 				super()
 				@version = version.version
 				self.encoding = version.encoding
+        @writeencoding = version.writeencoding
 				@standalone = version.standalone
 			else
 				super()
@@ -35,9 +38,14 @@ module REXML
 		end
 
 		def write writer, indent=-1, transitive=false, ie_hack=false
+      return "" unless @writethis or writer.kind_of? Output
 			indent( writer, indent )
 			writer << START.sub(/\\/u, '')
-			writer << " #{content}"
+      if writer.kind_of? Output
+        writer << " #{content writer.encoding}"
+      else
+        writer << " #{content encoding}"
+      end
 			writer << STOP.sub(/\\/u, '')
 		end
 
@@ -50,7 +58,6 @@ module REXML
 
 		def xmldecl version, encoding, standalone
 			@version = version
-			@encoding_set = !encoding.nil?
 			self.encoding = encoding
 			@standalone = standalone
 		end
@@ -60,11 +67,37 @@ module REXML
 		end
 
 		alias :stand_alone? :standalone
+    alias :old_enc= :encoding=
+
+    def encoding=( enc )
+      if enc.nil?
+        self.old_enc = "UTF-8"
+        @writeencoding = false
+      else
+        self.old_enc = enc
+        @writeencoding = true
+      end
+      self.dowrite
+    end
+
+    def XMLDecl.default
+      rv = XMLDecl.new( "1.0" )
+      rv.nowrite
+      rv
+    end
+
+    def nowrite
+      @writethis = false
+    end
+
+    def dowrite
+      @writethis = true
+    end
 
 		private
-		def content
+		def content(enc)
 			rv = "version='#@version'"
-			rv << " encoding='#{encoding}'" if @encoding_set
+			rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
 			rv << " standalone='#@standalone'" if @standalone
 			rv
 		end