* 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, 27 insertions, 22 deletions

diff --git a/lib/rexml/encodings/EUC-JP.rb b/lib/rexml/encodings/EUC-JP.rb
index 8b146e5f0a..a1314d0856 100644
--- a/lib/rexml/encodings/EUC-JP.rb
+++ b/lib/rexml/encodings/EUC-JP.rb
@@ -1,31 +1,36 @@
 begin
-	require 'uconv'
+  require 'iconv'
 
-	module REXML
-		module Encoding
-			def decode(str)
-				return Uconv::euctou8(str)
-			end
+  module REXML
+    module Encoding
+      @@__REXML_encoding_methods =<<-EOL
+      def decode(str)
+        return Iconv::iconv("utf-8", "euc-jp", str)[0]
+      end
 
-			def encode content
-				return Uconv::u8toeuc(content)
-			end
-		end
-	end
+      def encode content
+        return Iconv::iconv("euc-jp", "utf-8", content)[0]
+      end
+      EOL
+    end
+  end
 rescue LoadError
   begin
-		require 'iconv'
-		module REXML
-			module Encoding
-				def decode(str)
-					return Iconv::iconv("utf-8", "euc-jp", str)[0]
-				end
+    require 'uconv'
+
+    module REXML
+      module Encoding
+        @@__REXML_encoding_methods =<<-EOL
+        def decode(str)
+          return Uconv::euctou8(str)
+        end
 
-				def encode content
-					return Iconv::iconv("euc-jp", "utf-8", content)[0]
-				end
-			end
-		end
+        def encode content
+          return Uconv::u8toeuc(content)
+        end
+        EOL
+      end
+    end
   rescue LoadError
 		raise "uconv or iconv is required for Japanese encoding support."
   end