diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-05 05:11:04 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-05 05:11:04 +0000 |
| commit | 3c175900610215905772fc27cd63d3c7bf2d41f8 (patch) | |
| tree | 946f8a4cc639d2a2393eccf70410ddd53fef46c3 /ext | |
| parent | 243cd204df3c949fb689078a73a82aaabddf1f63 (diff) | |
* ext/nkf/nkf-utf8/nkf.c (kanji_convert): Fix guess fallback.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 30bb6c47b8..de297ad187 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -41,7 +41,7 @@ ***********************************************************************/ /* $Id$ */ #define NKF_VERSION "2.0.8" -#define NKF_RELEASE_DATE "2007-05-28" +#define NKF_RELEASE_DATE "2007-06-05" #include "config.h" #include "utf8tbl.h" @@ -3052,12 +3052,12 @@ h_conv(FILE *f, nkf_char c2, nkf_char c1) code_status(c1); } while (p->name){ - if (p->score < result->score){ + if (p->status_func && p->score < result->score){ result = p; } ++p; } - set_iconv(FALSE, result->iconv_func); + set_iconv(TRUE, result->iconv_func); } @@ -3638,7 +3638,6 @@ nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char * ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_3bytes_mac : utf8_to_euc_3bytes; ret = w_iconv_common(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1); -// fprintf(stderr, "wret: %X %X %X -> %X %X\n",c2,c1,c0,*p2,*p1,ret); }else return -1; #ifdef SHIFTJIS_CP932 if (!ret && !cp932inv_f && is_eucg3(*p2)) { |