Normalize romanized identifiers to Hepburn
This commit is contained in:
parent
7935e5e7ea
commit
787febbd07
72 changed files with 871 additions and 871 deletions
82
sj3lib.c
82
sj3lib.c
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
#include "const.h"
|
||||
#include "sj3err.h"
|
||||
#include "sj_hinsi.h"
|
||||
#include "sj_hinshi.h"
|
||||
|
||||
#include "sj3lib.h"
|
||||
|
||||
|
|
@ -371,7 +371,7 @@ server_dead:
|
|||
return SJ3_SERVER_DEAD;
|
||||
}
|
||||
|
||||
int sj3_getkan(unsigned char* yomi, SJ3_BUNSETU* bun, unsigned char* knj, int knjsiz) {
|
||||
int sj3_getkan(unsigned char* yomi, SJ3_BUNSETSU* bun, unsigned char* knj, int knjsiz) {
|
||||
unsigned char* src;
|
||||
int buncnt = 0;
|
||||
int len;
|
||||
|
|
@ -424,14 +424,14 @@ int sj3_getkan(unsigned char* yomi, SJ3_BUNSETU* bun, unsigned char* knj, int kn
|
|||
return buncnt;
|
||||
}
|
||||
|
||||
int sj3_getkan_euc(unsigned char* yomi, SJ3_BUNSETU* bun, unsigned char* knj, int knjsiz) {
|
||||
int sj3_getkan_euc(unsigned char* yomi, SJ3_BUNSETSU* bun, unsigned char* knj, int knjsiz) {
|
||||
unsigned char *src, *yp, *kp, *khp;
|
||||
int buncnt = 0, i;
|
||||
int len, flag, mflag = 0;
|
||||
int stysiz = client.stdy_size;
|
||||
int sentou, saigo;
|
||||
int knjorg = knjsiz;
|
||||
SJ3_BUNSETU* hbun = bun;
|
||||
SJ3_BUNSETSU* hbun = bun;
|
||||
|
||||
if((len = strlen(yomi)) > SJ3_IKKATU_YOMI)
|
||||
return 0;
|
||||
|
|
@ -524,7 +524,7 @@ int sj3_getkan_euc(unsigned char* yomi, SJ3_BUNSETU* bun, unsigned char* knj, in
|
|||
return buncnt;
|
||||
}
|
||||
|
||||
int sj3_getkan_mb(unsigned char* yomi, SJ3_BUNSETU* bun, unsigned char* knj, int knjsiz) {
|
||||
int sj3_getkan_mb(unsigned char* yomi, SJ3_BUNSETSU* bun, unsigned char* knj, int knjsiz) {
|
||||
if(_sys_code == SYS_NOTDEF)
|
||||
_sys_code = set_sys_code();
|
||||
if(_sys_code == SYS_EUC)
|
||||
|
|
@ -536,10 +536,10 @@ int sj3_getkan_mb(unsigned char* yomi, SJ3_BUNSETU* bun, unsigned char* knj, int
|
|||
int sj3_douoncnt(unsigned char* yomi) {
|
||||
int i;
|
||||
|
||||
if((i = strlen(yomi)) > SJ3_BUNSETU_YOMI)
|
||||
if((i = strlen(yomi)) > SJ3_BUNSETSU_YOMI)
|
||||
return 0;
|
||||
|
||||
i = sj3_bunsetu_kouhosuu(&client, yomi, i, MBCODE_SJIS);
|
||||
i = sj3_bunsetsu_kouhosuu(&client, yomi, i, MBCODE_SJIS);
|
||||
if(i == ERROR) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
|
|
@ -556,7 +556,7 @@ int sj3_douoncnt_euc(unsigned char* yomi) {
|
|||
int i, l, flag;
|
||||
unsigned char* yp;
|
||||
|
||||
if((i = strlen(yomi)) > SJ3_BUNSETU_YOMI)
|
||||
if((i = strlen(yomi)) > SJ3_BUNSETSU_YOMI)
|
||||
return 0;
|
||||
|
||||
if(client.svr_version == 1) {
|
||||
|
|
@ -571,7 +571,7 @@ int sj3_douoncnt_euc(unsigned char* yomi) {
|
|||
yp = yomi;
|
||||
flag = MBCODE_EUC;
|
||||
}
|
||||
i = sj3_bunsetu_kouhosuu(&client, yp, i, flag);
|
||||
i = sj3_bunsetsu_kouhosuu(&client, yp, i, flag);
|
||||
if(i == ERROR) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
|
|
@ -596,10 +596,10 @@ int sj3_douoncnt_mb(unsigned char* yomi) {
|
|||
int sj3_getdouon(unsigned char* yomi, SJ3_DOUON* dou) {
|
||||
int i;
|
||||
|
||||
if((i = strlen(yomi)) > SJ3_BUNSETU_YOMI)
|
||||
if((i = strlen(yomi)) > SJ3_BUNSETSU_YOMI)
|
||||
return 0;
|
||||
|
||||
i = sj3_bunsetu_zenkouho(&client, yomi, i, dou, MBCODE_SJIS);
|
||||
i = sj3_bunsetsu_zenkouho(&client, yomi, i, dou, MBCODE_SJIS);
|
||||
if(i == ERROR) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
|
|
@ -614,7 +614,7 @@ int sj3_getdouon(unsigned char* yomi, SJ3_DOUON* dou) {
|
|||
int sj3_getdouon_euc(unsigned char* yomi, SJ3_DOUON* dou) {
|
||||
int i, j, l;
|
||||
|
||||
if((i = strlen(yomi)) > SJ3_BUNSETU_YOMI)
|
||||
if((i = strlen(yomi)) > SJ3_BUNSETSU_YOMI)
|
||||
return 0;
|
||||
|
||||
if(client.svr_version == 1) {
|
||||
|
|
@ -623,7 +623,7 @@ int sj3_getdouon_euc(unsigned char* yomi, SJ3_DOUON* dou) {
|
|||
client.default_char, &defuse);
|
||||
if((l < 0) || defuse)
|
||||
return 0;
|
||||
i = sj3_bunsetu_zenkouho(&client, buf1, i, dou, MBCODE_SJIS);
|
||||
i = sj3_bunsetsu_zenkouho(&client, buf1, i, dou, MBCODE_SJIS);
|
||||
if(i == ERROR) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
|
|
@ -641,7 +641,7 @@ int sj3_getdouon_euc(unsigned char* yomi, SJ3_DOUON* dou) {
|
|||
dou[j].dlen = l;
|
||||
}
|
||||
} else {
|
||||
i = sj3_bunsetu_zenkouho(&client, yomi, i, dou, MBCODE_EUC);
|
||||
i = sj3_bunsetsu_zenkouho(&client, yomi, i, dou, MBCODE_EUC);
|
||||
if(i == ERROR) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
|
|
@ -662,8 +662,8 @@ int sj3_getdouon_mb(unsigned char* yomi, SJ3_DOUON* dou) {
|
|||
return sj3_getdouon(yomi, dou);
|
||||
}
|
||||
|
||||
int sj3_gakusyuu(SJ3_STUDYREC* dcid) {
|
||||
if(sj3_tango_gakusyuu(&client, dcid) == ERROR) {
|
||||
int sj3_gakushuu(SJ3_STUDYREC* dcid) {
|
||||
if(sj3_tango_gakushuu(&client, dcid) == ERROR) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
return -1;
|
||||
|
|
@ -673,8 +673,8 @@ int sj3_gakusyuu(SJ3_STUDYREC* dcid) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int sj3_gakusyuu2(unsigned char* yomi1, unsigned char* yomi2, SJ3_STUDYREC* dcid) {
|
||||
if(sj3_bunsetu_gakusyuu(&client, yomi1, yomi2, dcid, MBCODE_SJIS) ==
|
||||
int sj3_gakushuu2(unsigned char* yomi1, unsigned char* yomi2, SJ3_STUDYREC* dcid) {
|
||||
if(sj3_bunsetsu_gakushuu(&client, yomi1, yomi2, dcid, MBCODE_SJIS) ==
|
||||
ERROR) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
|
|
@ -685,7 +685,7 @@ int sj3_gakusyuu2(unsigned char* yomi1, unsigned char* yomi2, SJ3_STUDYREC* dcid
|
|||
return 0;
|
||||
}
|
||||
|
||||
int sj3_gakusyuu2_euc(unsigned char* yomi1, unsigned char* yomi2, SJ3_STUDYREC* dcid) {
|
||||
int sj3_gakushuu2_euc(unsigned char* yomi1, unsigned char* yomi2, SJ3_STUDYREC* dcid) {
|
||||
int l, flag;
|
||||
unsigned char *y1p, *y2p;
|
||||
|
||||
|
|
@ -708,7 +708,7 @@ int sj3_gakusyuu2_euc(unsigned char* yomi1, unsigned char* yomi2, SJ3_STUDYREC*
|
|||
y2p = yomi2;
|
||||
flag = MBCODE_EUC;
|
||||
}
|
||||
if(sj3_bunsetu_gakusyuu(&client, y1p, y2p, dcid, flag) == ERROR) {
|
||||
if(sj3_bunsetsu_gakushuu(&client, y1p, y2p, dcid, flag) == ERROR) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
return -1;
|
||||
|
|
@ -718,13 +718,13 @@ int sj3_gakusyuu2_euc(unsigned char* yomi1, unsigned char* yomi2, SJ3_STUDYREC*
|
|||
return 0;
|
||||
}
|
||||
|
||||
int sj3_gakusyuu2_mb(unsigned char* yomi1, unsigned char* yomi2, SJ3_STUDYREC* dcid) {
|
||||
int sj3_gakushuu2_mb(unsigned char* yomi1, unsigned char* yomi2, SJ3_STUDYREC* dcid) {
|
||||
if(_sys_code == SYS_NOTDEF)
|
||||
_sys_code = set_sys_code();
|
||||
if(_sys_code == SYS_EUC)
|
||||
return sj3_gakusyuu2_euc(yomi1, yomi2, dcid);
|
||||
return sj3_gakushuu2_euc(yomi1, yomi2, dcid);
|
||||
else
|
||||
return sj3_gakusyuu2(yomi1, yomi2, dcid);
|
||||
return sj3_gakushuu2(yomi1, yomi2, dcid);
|
||||
}
|
||||
|
||||
int sj3_touroku(unsigned char* yomi, unsigned char* kanji, int code) {
|
||||
|
|
@ -744,8 +744,8 @@ int sj3_touroku(unsigned char* yomi, unsigned char* kanji, int code) {
|
|||
return SJ3_BAD_YOMI_STR;
|
||||
case SJ3_BadKanjiString:
|
||||
return SJ3_BAD_KANJI_STR;
|
||||
case SJ3_BadHinsiCode:
|
||||
return SJ3_BAD_HINSI_CODE;
|
||||
case SJ3_BadHinshiCode:
|
||||
return SJ3_BAD_HINSHI_CODE;
|
||||
case SJ3_AlreadyExistWord:
|
||||
return SJ3_WORD_EXIST;
|
||||
case SJ3_NoMoreDouonWord:
|
||||
|
|
@ -800,8 +800,8 @@ int sj3_touroku_euc(unsigned char* yomi, unsigned char* kanji, int code) {
|
|||
return SJ3_BAD_YOMI_STR;
|
||||
case SJ3_BadKanjiString:
|
||||
return SJ3_BAD_KANJI_STR;
|
||||
case SJ3_BadHinsiCode:
|
||||
return SJ3_BAD_HINSI_CODE;
|
||||
case SJ3_BadHinshiCode:
|
||||
return SJ3_BAD_HINSHI_CODE;
|
||||
case SJ3_AlreadyExistWord:
|
||||
return SJ3_WORD_EXIST;
|
||||
case SJ3_NoMoreDouonWord:
|
||||
|
|
@ -827,7 +827,7 @@ int sj3_touroku_mb(unsigned char* yomi, unsigned char* kanji, int code) {
|
|||
return sj3_touroku(yomi, kanji, code);
|
||||
}
|
||||
|
||||
int sj3_syoukyo(unsigned char* yomi, unsigned char* kanji, int code) {
|
||||
int sj3_shoukyo(unsigned char* yomi, unsigned char* kanji, int code) {
|
||||
if(sj3_tango_sakujo(&client, udicid, yomi, kanji, code, MBCODE_SJIS)) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
|
|
@ -843,18 +843,18 @@ int sj3_syoukyo(unsigned char* yomi, unsigned char* kanji, int code) {
|
|||
return SJ3_BAD_YOMI_STR;
|
||||
case SJ3_BadKanjiString:
|
||||
return SJ3_BAD_KANJI_STR;
|
||||
case SJ3_BadHinsiCode:
|
||||
return SJ3_BAD_HINSI_CODE;
|
||||
case SJ3_BadHinshiCode:
|
||||
return SJ3_BAD_HINSHI_CODE;
|
||||
case SJ3_NoSuchWord:
|
||||
return SJ3_WORD_NOT_EXIST;
|
||||
default:
|
||||
return SJ3_SYOUKYO_FAILED;
|
||||
return SJ3_SHOUKYO_FAILED;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sj3_syoukyo_euc(unsigned char* yomi, unsigned char* kanji, int code) {
|
||||
int sj3_shoukyo_euc(unsigned char* yomi, unsigned char* kanji, int code) {
|
||||
int l, flag;
|
||||
unsigned char* yp;
|
||||
unsigned char* kp;
|
||||
|
|
@ -892,28 +892,28 @@ int sj3_syoukyo_euc(unsigned char* yomi, unsigned char* kanji, int code) {
|
|||
return SJ3_BAD_YOMI_STR;
|
||||
case SJ3_BadKanjiString:
|
||||
return SJ3_BAD_KANJI_STR;
|
||||
case SJ3_BadHinsiCode:
|
||||
return SJ3_BAD_HINSI_CODE;
|
||||
case SJ3_BadHinshiCode:
|
||||
return SJ3_BAD_HINSHI_CODE;
|
||||
case SJ3_NoSuchWord:
|
||||
return SJ3_WORD_NOT_EXIST;
|
||||
default:
|
||||
return SJ3_SYOUKYO_FAILED;
|
||||
return SJ3_SHOUKYO_FAILED;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sj3_syoukyo_mb(unsigned char* yomi, unsigned char* kanji, int code) {
|
||||
int sj3_shoukyo_mb(unsigned char* yomi, unsigned char* kanji, int code) {
|
||||
if(_sys_code == SYS_NOTDEF)
|
||||
_sys_code = set_sys_code();
|
||||
if(_sys_code == SYS_EUC)
|
||||
return sj3_syoukyo_euc(yomi, kanji, code);
|
||||
return sj3_shoukyo_euc(yomi, kanji, code);
|
||||
else
|
||||
return sj3_syoukyo(yomi, kanji, code);
|
||||
return sj3_shoukyo(yomi, kanji, code);
|
||||
}
|
||||
|
||||
int sj3_getdict(unsigned char* buf) {
|
||||
if(sj3_tango_syutoku(&client, udicid, buf, MBCODE_SJIS)) {
|
||||
if(sj3_tango_shutoku(&client, udicid, buf, MBCODE_SJIS)) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
return -1;
|
||||
|
|
@ -927,7 +927,7 @@ int sj3_getdict_euc(unsigned char* buf) {
|
|||
int l, ll, slen;
|
||||
|
||||
if(client.svr_version == 1) {
|
||||
if(sj3_tango_syutoku(&client, udicid, buf, MBCODE_SJIS)) {
|
||||
if(sj3_tango_shutoku(&client, udicid, buf, MBCODE_SJIS)) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
return -1;
|
||||
|
|
@ -952,7 +952,7 @@ int sj3_getdict_euc(unsigned char* buf) {
|
|||
l += 4;
|
||||
memcpy(buf, kbuf, l);
|
||||
} else {
|
||||
if(sj3_tango_syutoku(&client, udicid, buf, MBCODE_EUC)) {
|
||||
if(sj3_tango_shutoku(&client, udicid, buf, MBCODE_EUC)) {
|
||||
if(client.fd < 0) {
|
||||
mdicid = udicid = 0;
|
||||
return -1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue