* 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, 26 insertions, 24 deletions

diff --git a/lib/rexml/encodings/UTF-16.rb b/lib/rexml/encodings/UTF-16.rb
index 31f2d81a5b..ecfc4f9945 100644
--- a/lib/rexml/encodings/UTF-16.rb
+++ b/lib/rexml/encodings/UTF-16.rb
@@ -1,27 +1,29 @@
 module REXML
-	module Encoding
-		def encode content
-			array_utf8 = content.unpack("U*")
-			array_enc = []
-			array_utf8.each do |num|
-				if ((num>>16) > 0)
-					array_enc << 0
-					array_enc << ??
-				else
-					array_enc << (num >> 8)
-					array_enc << (num & 0xFF)
-				end
-			end
-			array_enc.pack('C*')
-		end
+  module Encoding
+    @@__REXML_encoding_string =<<-EOL
+    def encode content
+      array_utf8 = content.unpack("U*")
+      array_enc = []
+      array_utf8.each do |num|
+        if ((num>>16) > 0)
+          array_enc << 0
+          array_enc << ??
+        else
+          array_enc << (num >> 8)
+          array_enc << (num & 0xFF)
+        end
+      end
+      array_enc.pack('C*')
+    end
 
-		def decode(str)
-			array_enc=str.unpack('C*')
-			array_utf8 = []
-			2.step(arrayEnc.size-1, 2){|i| 
-				array_utf8 << (array_enc.at(i+1) + array_enc.at(i)*0x100)
-			}
-			array_utf8.pack('U*')
-		end
-	end
+    def decode(str)
+      array_enc=str.unpack('C*')
+      array_utf8 = []
+      2.step(array_enc.size-1, 2){|i| 
+        array_utf8 << (array_enc.at(i+1) + array_enc.at(i)*0x100)
+      }
+      array_utf8.pack('U*')
+    end
+    EOL
+  end
 end