kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/nkf/nkf-utf8/nkf.c (kanji_convert): Fix guess fallback.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2007-06-05 05:11:04 +00:00
parent 243cd204df
commit 3c17590061
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Jun 05 14:11:15 2007 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c (kanji_convert): Fix guess fallback.
Tue Jun 5 13:32:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Jun 5 13:32:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c, * compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,

7
ext/nkf/nkf-utf8/nkf.c
View file

@ -41,7 +41,7 @@
***********************************************************************/ ***********************************************************************/
/* $Id$ */ /* $Id$ */
#define NKF_VERSION "2.0.8" #define NKF_VERSION "2.0.8"
#define NKF_RELEASE_DATE "2007-05-28" #define NKF_RELEASE_DATE "2007-06-05"
#include "config.h" #include "config.h"
#include "utf8tbl.h" #include "utf8tbl.h"
@ -3052,12 +3052,12 @@ h_conv(FILE *f, nkf_char c2, nkf_char c1)
code_status(c1); code_status(c1);
} }
while (p->name){ while (p->name){
if (p->score < result->score){ if (p->status_func && p->score < result->score){
result = p; result = p;
} }
++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 : ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_3bytes_mac :
utf8_to_euc_3bytes; utf8_to_euc_3bytes;
ret = w_iconv_common(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1); 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; }else return -1;
#ifdef SHIFTJIS_CP932 #ifdef SHIFTJIS_CP932
if (!ret && !cp932inv_f && is_eucg3(*p2)) { if (!ret && !cp932inv_f && is_eucg3(*p2)) {