diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-28 06:26:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-28 06:26:34 +0000 |
| commit | 6d516d712a78b2118cb0550b0eeac605938e5d6c (patch) | |
| tree | 03bdc28cf9626363d9a278b27b61a78fceebf1bc /ext/nkf/lib/kconv.rb | |
| parent | aa16b1de7d37a451ea966cdc3504fcebf8a5750a (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
Diffstat (limited to 'ext/nkf/lib/kconv.rb')
| -rw-r--r-- | ext/nkf/lib/kconv.rb | 10 |
1 files changed, 6 insertions, 4 deletions
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 |