From dd0b3efe48a007f9fae7cdb67be399354fcacdd1 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 6 Sep 2006 03:13:54 +0000 Subject: * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for euc-jp [ruby-dev:29344] * ext/nkf/lib/kconv.rb (Kconv::toeuc): remove -m0 [ruby-dev:29505] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/nkf/lib/kconv.rb | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c15461f4f1..f554175760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Sep 06 12:05:19 2006 NARUSE, Yui + + * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for euc-jp + [ruby-dev:29344] + + * ext/nkf/lib/kconv.rb (Kconv::toeuc): remove -m0 [ruby-dev:29505] + Tue Sep 5 06:47:22 2006 Nobuyoshi Nakada * time.c (time_to_s): variable declaration after an execution diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb index 091b88b1c0..4ffe8d984e 100644 --- a/ext/nkf/lib/kconv.rb +++ b/ext/nkf/lib/kconv.rb @@ -63,8 +63,8 @@ module Kconv RegexpEucjp = /\A(?: [\x00-\x7f] | \x8e [\xa1-\xdf] | - \x8f [\xa1-\xdf] [\xa1-\xfe] | - [\xa1-\xdf] [\xa1-\xfe] + \x8f [\xa1-\xfe] [\xa1-\xfe] | + [\xa1-\xfe] [\xa1-\xfe] )*\z/nx # Regexp of UTF-8 string (private constant) @@ -156,7 +156,7 @@ module Kconv # convert halfwidth katakana to fullwidth katakana. # If you don't want it, use NKF.nkf('-exm0', str). def toeuc(str) - ::NKF::nkf('-em0', str) + ::NKF::nkf('-em', str) end module_function :toeuc -- cgit v1.2.3