diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-13 11:37:55 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-13 11:37:55 +0000 |
commit | 4392ea3527c595f81ae06cb7f252a3b5b43530d4 (patch) | |
tree | bf2415adb520b9111c041fe0feb775902a51f64f | |
parent | 5d8c8b46bb763e2c4cdf68079b9eaede860be5b7 (diff) |
* ext/nkf/nkf-utf8/nkf.c: Fix: Windows Codepages wrongly convert
Halfwidth Katakana. [nkf-bug:21393]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 14 |
2 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Tue Apr 13 20:36:50 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c: Fix: Windows Codepages wrongly convert + Halfwidth Katakana. [nkf-bug:21393] + Tue Apr 13 15:00:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * random.c (make_seed_value): fix leading-zero-guard condition on diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 7944d62f44..bcf408f445 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -21,7 +21,7 @@ * 3. This notice may not be removed or altered from any source distribution. */ #define NKF_VERSION "2.1.1" -#define NKF_RELEASE_DATE "2010-03-15" +#define NKF_RELEASE_DATE "2010-04-13" #define COPY_RIGHT \ "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \ "Copyright (C) 1996-2010, The nkf Project." @@ -1209,7 +1209,7 @@ set_input_encoding(nkf_encoding *enc) case CP50220: case CP50221: case CP50222: - x0201_f = TRUE; + x0201_f = FALSE; #ifdef SHIFTJIS_CP932 cp51932_f = TRUE; #endif @@ -1231,7 +1231,7 @@ set_input_encoding(nkf_encoding *enc) case SHIFT_JIS: break; case WINDOWS_31J: - x0201_f = TRUE; + x0201_f = FALSE; #ifdef SHIFTJIS_CP932 cp51932_f = TRUE; #endif @@ -1253,7 +1253,7 @@ set_input_encoding(nkf_encoding *enc) case EUCJP_NKF: break; case CP51932: - x0201_f = TRUE; + x0201_f = FALSE; #ifdef SHIFTJIS_CP932 cp51932_f = TRUE; #endif @@ -1333,7 +1333,7 @@ set_output_encoding(nkf_encoding *enc) #endif break; case CP50221: - x0201_f = TRUE; + x0201_f = FALSE; #ifdef SHIFTJIS_CP932 if (cp932inv_f == TRUE) cp932inv_f = FALSE; #endif @@ -1362,7 +1362,7 @@ set_output_encoding(nkf_encoding *enc) case SHIFT_JIS: break; case WINDOWS_31J: - x0201_f = TRUE; + x0201_f = FALSE; #ifdef UTF8_OUTPUT_ENABLE ms_ucs_map_f = UCS_MAP_CP932; #endif @@ -1391,7 +1391,7 @@ set_output_encoding(nkf_encoding *enc) #endif break; case CP51932: - x0201_f = TRUE; + x0201_f = FALSE; #ifdef SHIFTJIS_CP932 if (cp932inv_f == TRUE) cp932inv_f = FALSE; #endif |