summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-28 06:26:34 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-28 06:26:34 +0000
commit6d516d712a78b2118cb0550b0eeac605938e5d6c (patch)
tree03bdc28cf9626363d9a278b27b61a78fceebf1bc
parentaa16b1de7d37a451ea966cdc3504fcebf8a5750a (diff)
* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
0xfe. * ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16 properly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--ext/nkf/lib/kconv.rb10
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 914a8e6d3c..80901b5c2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Dec 28 15:25:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
+ 0xfe.
+
+ * ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16
+ properly.
+
Tue Dec 28 13:35:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate): ensure
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index 1fd28a5a59..df2f25c399 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -74,8 +74,8 @@ module Kconv
RegexpEucjp = /\A(?:
[\x00-\x7f] |
\x8e [\xa1-\xdf] |
- \x8f [\xa1-\xdf] [\xa1-\xdf] |
- [\xa1-\xdf] [\xa1-\xdf]
+ \x8f [\xa1-\xdf] [\xa1-\xfe] |
+ [\xa1-\xdf] [\xa1-\xfe]
)*\z/nx
RegexpUtf8 = /\A(?:
[\x00-\x7f] |
@@ -101,8 +101,9 @@ module Kconv
when ::NKF::SJIS
opt << 'S'
when ::NKF::UTF8
- when ::NKF::UTF16
opt << 'W'
+ when ::NKF::UTF16
+ opt << 'W16'
end
case out_code
@@ -113,8 +114,9 @@ module Kconv
when ::NKF::SJIS
opt << 's'
when ::NKF::UTF8
- when ::NKF::UTF16
opt << 'w'
+ when ::NKF::UTF16
+ opt << 'w16'
when ::NKF::NOCONV
return str
end