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 | 42c99028bf1ed3e7adffd4d643362d5e75a5a7af (patch) | |
| tree | 03bdc28cf9626363d9a278b27b61a78fceebf1bc | |
| parent | 87f8596bd778e6266003f0c13ba661c672123f12 (diff) | |
| download | ruby-42c99028bf1ed3e7adffd4d643362d5e75a5a7af.tar.gz ruby-42c99028bf1ed3e7adffd4d643362d5e75a5a7af.tar.xz ruby-42c99028bf1ed3e7adffd4d643362d5e75a5a7af.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/branches/ruby_1_8@7672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/nkf/lib/kconv.rb | 10 |
2 files changed, 14 insertions, 4 deletions
@@ -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 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 |