diff options
| author | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-02 03:26:19 +0000 |
|---|---|---|
| committer | ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-02 03:26:19 +0000 |
| commit | f5fb445b6d83d74f7809062d7965ce75b6efda97 (patch) | |
| tree | b9d253eea1aa685030ce0fabc203bc2076191ed4 /lib/rexml/encodings | |
| parent | 5c4872b0ca73232dc701d86e6d76194d5fc6255e (diff) | |
REXML changes backported from the 1.9 branch:
* Minor source documentation changes
* Changes to the pretty-printing code, including the addition of the word-
wrap submission.
* Bug fix for missing quotations in NOTATION DTD items
* Bug fixes and improvements to whitespace handling in text nodes
* Refactoring and bug fixes in encoding support
* Minor speed optimizations in the core parser
* Bug fixes in the SAX2 parserthe core parser
* Copyright fixes
* Version bump to REXML 3.0.0
* A change that caused speed degredation has been reversed
* Addition of a value=() method in Text, for replacing the contents of
a text node
* Fixed the document order of the descendant-or-self axis in XPath
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml/encodings')
| -rw-r--r-- | lib/rexml/encodings/ISO-8859-1.rb | 4 | ||||
| -rw-r--r-- | lib/rexml/encodings/SHIFT_JIS.rb | 34 | ||||
| -rw-r--r-- | lib/rexml/encodings/US-ASCII.rb | 4 |
3 files changed, 5 insertions, 37 deletions
diff --git a/lib/rexml/encodings/ISO-8859-1.rb b/lib/rexml/encodings/ISO-8859-1.rb index 32ddfbc90..f4e4527c2 100644 --- a/lib/rexml/encodings/ISO-8859-1.rb +++ b/lib/rexml/encodings/ISO-8859-1.rb @@ -1,6 +1,6 @@ module REXML module Encoding - @@__REXML_encoding_methods =<<-'EOL' + @@__REXML_encoding_methods = %q~ # Convert from UTF-8 def encode content array_utf8 = content.unpack('U*') @@ -20,6 +20,6 @@ module REXML def decode(str) str.unpack('C*').pack('U*') end - EOL + ~ end end diff --git a/lib/rexml/encodings/SHIFT_JIS.rb b/lib/rexml/encodings/SHIFT_JIS.rb index 27e456940..e355704a7 100644 --- a/lib/rexml/encodings/SHIFT_JIS.rb +++ b/lib/rexml/encodings/SHIFT_JIS.rb @@ -1,33 +1 @@ -begin - require 'uconv' - - module REXML - module Encoding - def to_shift_jis content - Uconv::u8tosjis(content) - end - - def from_shift_jis(str) - Uconv::sjistou8(str) - end - end - end -rescue LoadError - begin - require 'iconv' - module REXML - module Encoding - def from_shift_jis(str) - return Iconv::iconv("utf-8", "shift_jis", str).join('') - end - - def to_shift_jis content - return Iconv::iconv("shift_jis", "utf-8", content).join('') - end - end - end - rescue LoadError - raise "uconv or iconv is required for Japanese encoding support." - end - -end +require 'rexml/encodings/SHIFT-JIS' diff --git a/lib/rexml/encodings/US-ASCII.rb b/lib/rexml/encodings/US-ASCII.rb index 32ddfbc90..f4e4527c2 100644 --- a/lib/rexml/encodings/US-ASCII.rb +++ b/lib/rexml/encodings/US-ASCII.rb @@ -1,6 +1,6 @@ module REXML module Encoding - @@__REXML_encoding_methods =<<-'EOL' + @@__REXML_encoding_methods = %q~ # Convert from UTF-8 def encode content array_utf8 = content.unpack('U*') @@ -20,6 +20,6 @@ module REXML def decode(str) str.unpack('C*').pack('U*') end - EOL + ~ end end |