1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

REXML changes:

* Took out the duplicate Shift-JIS entries, for OSes that don't understand
  case sensitive file names.
* Fixed some bugs in the encodings


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ser 2003-12-12 21:17:41 +00:00
parent ff2a47eb99
commit 47c59bb62b
8 changed files with 44 additions and 48 deletions

View file

@ -276,8 +276,6 @@ lib/rexml/encoding.rb
lib/rexml/encodings/EUC-JP.rb lib/rexml/encodings/EUC-JP.rb
lib/rexml/encodings/ICONV.rb lib/rexml/encodings/ICONV.rb
lib/rexml/encodings/ISO-8859-1.rb lib/rexml/encodings/ISO-8859-1.rb
lib/rexml/encodings/Shift-JIS.rb
lib/rexml/encodings/Shift_JIS.rb
lib/rexml/encodings/SHIFT-JIS.rb lib/rexml/encodings/SHIFT-JIS.rb
lib/rexml/encodings/SHIFT_JIS.rb lib/rexml/encodings/SHIFT_JIS.rb
lib/rexml/encodings/UNILE.rb lib/rexml/encodings/UNILE.rb

View file

@ -1 +1,37 @@
require 'rexml/encodings/SHIFT_JIS' begin
require 'iconv'
module REXML
module Encoding
@@__REXML_encoding_methods =<<-EOL
def decode(str)
return Iconv::iconv("utf-8", "shift-jis", str)[0]
end
def encode content
return Iconv::iconv("shift-jis", "utf-8", content)[0]
end
EOL
end
end
rescue LoadError
begin
require 'uconv'
module REXML
module Encoding
@@__REXML_encoding_methods =<<-EOL
def to_shift_jis content
Uconv::u8tosjis(content)
end
def from_shift_jis(str)
Uconv::sjistou8(str)
end
EOL
end
end
rescue LoadError
raise "uconv or iconv is required for Japanese encoding support."
end
end

View file

@ -1,37 +0,0 @@
begin
require 'iconv'
module REXML
module Encoding
@@__REXML_encoding =<<-EOL
def decode(str)
return Iconv::iconv("utf-8", "shift-jis", str)[0]
end
def encode content
return Iconv::iconv("shift-jis", "utf-8", content)[0]
end
EOL
end
end
rescue LoadError
begin
require 'uconv'
module REXML
module Encoding
@@__REXML_encoding_methods =<<-EOL
def to_shift_jis content
Uconv::u8tosjis(content)
end
def from_shift_jis(str)
Uconv::sjistou8(str)
end
EOL
end
end
rescue LoadError
raise "uconv or iconv is required for Japanese encoding support."
end
end

View file

@ -1 +0,0 @@
require 'rexml/encodings/Shift-JIS'

View file

@ -1,6 +1,6 @@
module REXML module REXML
module Encoding module Encoding
@@__REXML_encoding_string =<<-EOL @@__REXML_encoding_methods =<<-EOL
def encode content def encode content
array_utf8 = content.unpack("U*") array_utf8 = content.unpack("U*")
array_enc = [] array_enc = []

View file

@ -1,6 +1,6 @@
module REXML module REXML
module Encoding module Encoding
@@__REXML_encoding_string =<<-EOL @@__REXML_encoding_methods =<<-EOL
# Convert from UTF-8 # Convert from UTF-8
def encode content def encode content
array_utf8 = content.unpack('U*') array_utf8 = content.unpack('U*')

View file

@ -1,6 +1,6 @@
module REXML module REXML
module Encoding module Encoding
@@__REXML_encoding_string =<<-EOL @@__REXML_encoding_methods =<<-EOL
def encode content def encode content
array_utf8 = content.unpack("U*") array_utf8 = content.unpack("U*")
array_enc = [] array_enc = []

View file

@ -2,8 +2,8 @@
# #
# URL: http://www.germane-software.com/software/rexml # URL: http://www.germane-software.com/software/rexml
# Author: Sean Russell <ser@germane-software.com> # Author: Sean Russell <ser@germane-software.com>
# Version: 2.7.2 # Version: @ANT_VERSION@
# Date: +2003/343 # Date: @ANT_DATE@
@ -21,6 +21,6 @@
# A tutorial is available in docs/tutorial.html # A tutorial is available in docs/tutorial.html
module REXML module REXML
Copyright = "Copyright #{Time.now.year} Sean Russell <ser@germane-software.com>" Copyright = "Copyright #{Time.now.year} Sean Russell <ser@germane-software.com>"
Date = "+2003/343" Date = "+2003/346"
Version = "2.7.2" Version = "2.7.3"
end end