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 | b36c72d0a12937b24a8226113f4b79794b961355 (patch) | |
| tree | d832fba6d09d616766d31fb2048e1376069bbb92 /ext/nkf/lib | |
| parent | 82c769bec9e7e09da994066e4bbf4ee720963741 (diff) | |
| download | ruby-b36c72d0a12937b24a8226113f4b79794b961355.tar.gz ruby-b36c72d0a12937b24a8226113f4b79794b961355.tar.xz ruby-b36c72d0a12937b24a8226113f4b79794b961355.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@7672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf/lib')
| -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 1fd28a5a5..df2f25c39 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 |