summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/nkf/lib/kconv.rb8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e774963915..e4dedebf0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 4 17:34:17 2007 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/lib/kconv.rb (tojis, tosjis, toeuc, toutf8):
+ set encoding. [ruby-dev:32447]
+
Tue Dec 4 17:07:25 2007 NARUSE, Yui <naruse@ruby-lang.org>
* lib/json.rb, lib/json/*: moved to ext/json/lib.
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index 91553228fe..f3c84d6517 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -146,7 +146,7 @@ module Kconv
# convert halfwidth katakana to fullwidth katakana.
# If you don't want it, use NKF.nkf('-jxm0', str).
def tojis(str)
- ::NKF::nkf('-jm', str)
+ ::NKF::nkf('-jm', str).force_encoding("iso-2022-JP")
end
module_function :tojis
@@ -160,7 +160,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('-em', str)
+ ::NKF::nkf('-em', str).force_encoding("EUC-JP")
end
module_function :toeuc
@@ -174,7 +174,7 @@ module Kconv
# convert halfwidth katakana to fullwidth katakana.
# If you don't want it, use NKF.nkf('-sxm0', str).
def tosjis(str)
- ::NKF::nkf('-sm', str)
+ ::NKF::nkf('-sm', str).force_encoding("Shift_JIS")
end
module_function :tosjis
@@ -188,7 +188,7 @@ module Kconv
# convert halfwidth katakana to fullwidth katakana.
# If you don't want it, use NKF.nkf('-wxm0', str).
def toutf8(str)
- ::NKF::nkf('-wm', str)
+ ::NKF::nkf('-wm', str).force_encoding("UTF-8")
end
module_function :toutf8