nishiTV/sj3
1
0
Fork 0
Code Pull requests Activity

Normalize romanized identifiers to Hepburn

Browse source
This commit is contained in:
Nishi 2026-06-18 13:53:25 +09:00
commit 787febbd07
72 changed files with 871 additions and 871 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -44,10 +44,10 @@ KANAKAN_OBJS = adddic.o addelcmn.o alloc.o charsize.o chrtbl.o cl2knj.o \
clstudy.o cmpstr.o conjunc.o connect.o cvtclknj.o cvtdict.o \
cvtkanji.o deldic.o depend.o dict.o functbl.o fuzoku.o \
fzkyomi.o getkanji.o getrank.o global2.o hzstrlen.o init.o \
istrcmp.o memory2.o mk2claus.o mkbunset.o mkjiritu.o mkkouho.o \
istrcmp.o memory2.o mk2claus.o mkbunsetsu.o mkjiritsu.o mkkouho.o \
mknumber.o mvmemd.o mvmemi.o peepdic.o ph2knj.o ph_khtbl.o \
priority.o prtytbl.o s2ctbl.o selclrec.o selsuuji.o setconj.o \
setjrec.o setkouho.o setubi.o sj2code.o skiphblk.o skipkstr.o \
setjrec.o setkouho.o setsubi.o sj2code.o skiphblk.o skipkstr.o \
srchdict.o srchhead.o srchidx.o srchnum.o stbtbl.o stttbl.o \
study.o suujitbl.o terminat.o termtbl.o wakachi.o
SJ3RKCV_OBJS = rk_conv.o sj3_rkcv.o wc16_str.o
@ -58,9 +58,9 @@ SJ3_OBJS = code.o common.o conv.o display.o douon.o edit.o etc.o \
eucmessage.o funckey.o henkan.o kigou.o libif.o nmttyslot.o \
romaji.o screen.o sj3.o sj3ver.o sjgetchar.o sjrc2.o \
stat_conv.o term.o toroku.o version2.o
SJ3DIC_OBJS = codecnv.o dictdisp.o dictmake.o hinsi.o sj3dic.o sj3err.o \
SJ3DIC_OBJS = codecnv.o dictdisp.o dictmake.o hinshi.o sj3dic.o sj3err.o \
sjrc.o
SJ3MKDIC_OBJS = char.o cnvhinsi.o file.o global.o hindo.o knjcvt.o makedict.o \
SJ3MKDIC_OBJS = char.o cnvhinshi.o file.o global.o hindo.o knjcvt.o makedict.o \
makelist.o makeseg.o memory.o offset.o readline.o string2.o
SJ3STAT_OBJS = sj3stat.o

36
Makefile.depend
View file

@ -4,7 +4,7 @@ adddic.o: adddic.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
addelcmn.o: addelcmn.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
sj_struct.h Struct.h const.h Paths.h sj_global.h \
sj_hinsi.h sj_yomi.h kanakan.h
sj_hinshi.h sj_yomi.h kanakan.h
alloc.o: alloc.c sj_rename.h sj_typedef.h const.h Paths.h sj_euc.h \
sj_sysvdef.h sj_var.h sj_struct.h kanakan.h Struct.h sj_dict.h
char.o: char.c sj_euc.h sj_sysvdef.h const.h Paths.h
@ -20,7 +20,7 @@ clstudy.o: clstudy.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h kanakan.h
cmpstr.o: cmpstr.c sj_rename.h const.h Paths.h sj_euc.h sj_sysvdef.h \
sj_typedef.h
cnvhinsi.o: cnvhinsi.c dicttool.h sj_struct2.h const.h Paths.h sj_euc.h \
cnvhinshi.o: cnvhinshi.c dicttool.h sj_struct2.h const.h Paths.h sj_euc.h \
sj_sysvdef.h GramTable
code.o: code.c sj_sysvdef.h wchar16.h key.h kctype.h sj2.h rk.h
codecnv.o: codecnv.c sjctype.h sj_sysvdef.h sjtool.h
@ -79,7 +79,7 @@ functbl.o: functbl.c sj_rename.h sj_func.h sj_typedef.h sj_struct.h \
kanakan.h
fuzoku.o: fuzoku.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
sj_euc.h sj_sysvdef.h sj_global.h sj_hinsi.h sj_right.h \
sj_euc.h sj_sysvdef.h sj_global.h sj_hinshi.h sj_right.h \
sj_yomi.h
fzkyomi.o: fzkyomi.c const.h Paths.h sj_euc.h sj_sysvdef.h sj_rename.h \
sj_typedef.h sj_yomi.h sj_right.h sj_left.h
@ -96,7 +96,7 @@ henkan.o: henkan.c common.h conversion.h sj2.h wchar16.h key.h \
sj_sysvdef.h sj3libsj3.h sj3lib.h henkan.h kctype.h
hindo.o: hindo.c sj_struct.h sj_typedef.h dicttool.h sj_struct2.h const.h \
Paths.h sj_euc.h sj_sysvdef.h
hinsi.o: hinsi.c sj_hinsi.h
hinshi.o: hinshi.c sj_hinshi.h
hzstrlen.o: hzstrlen.c sj_euc.h sj_sysvdef.h sj_rename.h sj_typedef.h \
const.h Paths.h sj_dict.h kanakan.h sj_struct.h Struct.h sj_var.h
init.o: init.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
@ -128,17 +128,17 @@ memory2.o: memory2.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
mk2claus.o: mk2claus.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_right.h
mkbunset.o: mkbunset.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
mkbunsetsu.o: mkbunsetsu.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_hinsi.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_hinshi.h \
kanakan.h
mkjiritu.o: mkjiritu.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
mkjiritsu.o: mkjiritsu.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h kanakan.h
mkkouho.o: mkkouho.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
sj_struct.h Struct.h const.h Paths.h sj_global.h \
sj_hinsi.h sj_suuji.h kanakan.h
sj_hinshi.h sj_suuji.h kanakan.h
mknumber.o: mknumber.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_yomi.h \
@ -160,7 +160,7 @@ ph_khtbl.o: ph_khtbl.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h kanakan.h
priority.o: priority.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_hinsi.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_hinshi.h \
sj_right.h sj_prty.h
prtytbl.o: prtytbl.c sj_rename.h sj_typedef.h
readline.o: readline.c sj_euc.h sj_sysvdef.h const.h Paths.h sj_macro.h \
@ -179,18 +179,18 @@ selsuuji.o: selsuuji.c sj_rename.h sj_typedef.h const.h Paths.h sj_euc.h \
setconj.o: setconj.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_right.h \
sj_hinsi.h sj_yomi.h kanakan.h
sj_hinshi.h sj_yomi.h kanakan.h
setjrec.o: setjrec.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
sj_struct.h Struct.h const.h Paths.h sj_global.h \
sj_hinsi.h kanakan.h
sj_hinshi.h kanakan.h
setkouho.o: setkouho.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
sj_struct.h Struct.h const.h Paths.h sj_global.h \
sj_hinsi.h kanakan.h
setubi.o: setubi.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
sj_hinshi.h kanakan.h
setsubi.o: setsubi.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
sj_euc.h sj_sysvdef.h sj_global.h sj_hinsi.h kanakan.h
sj_euc.h sj_sysvdef.h sj_global.h sj_hinshi.h kanakan.h
setup.o: setup.c sj_sysvdef.h sj_typedef.h sj_var.h sj_dict.h sj_struct.h \
sj_rename.h const.h Paths.h sj_euc.h Struct.h sj_global.h kanakan.h \
server.h
@ -204,7 +204,7 @@ sj3_rkcv.o: sj3_rkcv.c wchar16.h key.h sj2.h sj_sysvdef.h kana.h rk.h \
sj3dic.o: sj3dic.c sj_sysvdef.h sjtool.h sj3lib.h sj3dic.h
sj3err.o: sj3err.c sj3err.h
sj3lib.o: sj3lib.c config.h const.h Paths.h sj_euc.h sj_sysvdef.h \
sj3err.h sj_hinsi.h sj3lib.h
sj3err.h sj_hinshi.h sj3lib.h
sj3stat.o: sj3stat.c const.h Paths.h sj_euc.h sj_sysvdef.h sj3err.h \
sj3lib.h
sj3ver.o: sj3ver.c sj2.h wchar16.h key.h sj_sysvdef.h
@ -229,10 +229,10 @@ srchidx.o: srchidx.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
srchnum.o: srchnum.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_yomi.h \
sj_hinsi.h sj_suuji.h kanakan.h
sj_hinshi.h sj_suuji.h kanakan.h
stat_conv.o: stat_conv.c common.h conversion.h sj2.h wchar16.h key.h \
sj_sysvdef.h sj3libsj3.h sj3lib.h henkan.h rk.h
stbtbl.o: stbtbl.c sj_rename.h sj_typedef.h sj_yomi.h sj_hinsi.h
stbtbl.o: stbtbl.c sj_rename.h sj_typedef.h sj_yomi.h sj_hinshi.h
string.o: string.c config.h sj_euc.h sj_sysvdef.h sj3lib.h
string2.o: string2.c const.h Paths.h sj_euc.h sj_sysvdef.h dicttool.h \
sj_struct2.h
@ -255,5 +255,5 @@ version2.o: version2.c sj2.h wchar16.h key.h sj_sysvdef.h
wakachi.o: wakachi.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_right.h \
sj_hinsi.h kanakan.h
sj_hinshi.h kanakan.h
wc16_str.o: wc16_str.c sj_sysvdef.h sj_euc.h wchar16.h key.h

4
Sjrc
View file

@ -42,7 +42,7 @@
.key.right ^F
.key.left ^B
.key.kakuchou ^O
.key.syukusyou ^I
.key.shukushou ^I
.key.wrap ^N
.key.wrapback ^P
.key.saihenkan ^Y
@ -75,7 +75,7 @@
# その他キーが押されたときのコマンド・キーの指定
#.etckey.toroku hira
#.etckey.syoukyo zkatakana
#.etckey.shoukyo zkatakana
#.etckey.help hkatakana
#.etckey.sjrc zalpha

24
adddic.c
View file

@ -40,7 +40,7 @@ static void sprt_seg(TypeDicSeg seg, TypeDicOfs ofs);
static void apnd_uidx(TypeDicSeg seg, unsigned char* yomi, int len);
unsigned int
adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinshi) {
unsigned int err;
unsigned char yptr[MaxWdYomiLen + 1];
unsigned char kptr[MaxWdKanjiLen + 1];
@ -66,14 +66,14 @@ adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
STDYIN* stdy;
STDYOUT stdydat;
if((err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr))) != 0)
if((err = addel_arg(yomi, kanji, hinshi, yptr, sizeof(yptr))) != 0)
return err;
inputyomi = yomi;
cnvstart = ystart = yptr;
cnvlen = strlen(yptr);
if((err = checkdict(kanji, hinsi)) != 0)
if((err = checkdict(kanji, hinshi)) != 0)
return err;
if(!curdict->maxunit) return AD_NotUserDict;
@ -93,11 +93,11 @@ adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
dstofs = douofs = p1 - dicbuf;
hnsofs = knjofs = 0;
if(i) {
i = srchgram(p1, &p1, hinsi);
i = srchgram(p1, &p1, hinshi);
dstofs = hnsofs = p1 - dicbuf;
if(i) {
srchkanji(&p1, kptr, klen);
if(*p1 != HinsiBlkTerm) return AD_ArExist;
if(*p1 != HinshiBlkTerm) return AD_ArExist;
dstofs = knjofs = p1 - dicbuf;
}
}
@ -191,7 +191,7 @@ adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
nlen = getnlen(douptr) - nxtask;
*douptr = (size >> 8);
if(nlen & 0x10) *douptr |= NokoriYomiTop;
if(plen & 0x10) *douptr |= AssyukuYomiTop;
if(plen & 0x10) *douptr |= AsshukuYomiTop;
*(douptr + 1) = size;
*(douptr + 2) = ((nlen & 0x0f) | ((plen & 0x0f) << 4));
@ -213,7 +213,7 @@ adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
*dstptr = 0;
nlen = cnvlen - saml;
if(nlen & 0x10) *dstptr |= NokoriYomiTop;
if(saml & 0x10) *dstptr |= AssyukuYomiTop;
if(saml & 0x10) *dstptr |= AsshukuYomiTop;
*dstptr++ |= (size >> 8);
*dstptr++ = size;
*dstptr++ = ((nlen & 0x0f) | ((saml & 0x0f) << 4));
@ -226,18 +226,18 @@ adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
nlen = getnlen(douptr);
*douptr = (newsiz >> 8);
if(nlen & 0x10) *douptr |= NokoriYomiTop;
if(plen & 0x10) *douptr |= AssyukuYomiTop;
if(plen & 0x10) *douptr |= AsshukuYomiTop;
*(douptr + 1) = newsiz;
*(douptr + 2) = ((nlen & 0x0f) | ((plen & 0x0f) << 4));
}
if(!knjofs) *dstptr++ = hinsi;
if(!knjofs) *dstptr++ = hinshi;
stdydat.stdy1.offset = dstptr - dicbuf;
for(saml = 0; saml < klen;) *dstptr++ = kptr[saml++];
if(klen > 0) *dstptr++ = KanjiStrEnd;
if(!knjofs) *dstptr++ = HinsiBlkTerm;
if(!knjofs) *dstptr++ = HinshiBlkTerm;
(*curdict->putdic)(curdict, segnum);
@ -268,7 +268,7 @@ adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
stdydat.stdy1.sttkj = 0;
stdydat.stdy1.ka_kj = 0;
stdydat.stdy1.nmflg = 0;
stdydat.hinshi = hinsi;
stdydat.hinshi = hinshi;
stdydat.len = cnvlen;
stdydat.sttlen = 0;
stdydat.sttfg = 0;
@ -303,7 +303,7 @@ checksub(unsigned char* kanji, TypeGram grm) {
while(ptr < endp) {
flg = (grm == *ptr++);
while(*ptr != HinsiBlkTerm) {
while(*ptr != HinshiBlkTerm) {
if(flg) {
buf[getkanji(inputyomi, cnvlen, ptr, buf)] = 0;
if(cmpstr(kanji, buf)) return -1;

28
addelcmn.c
View file

@ -30,7 +30,7 @@
#include <string.h>
#include "sj_euc.h"
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "sj_yomi.h"
#include "kanakan.h"
@ -40,7 +40,7 @@ void mvmemi(), mvmemd(), mkidxtbl();
void set_size(unsigned char* p, int size, int plen, int nlen) {
*p = (unsigned char)(size >> 8);
if(nlen & 0x10) *p |= NokoriYomiTop;
if(plen & 0x10) *p |= AssyukuYomiTop;
if(plen & 0x10) *p |= AsshukuYomiTop;
*(p + 1) = (unsigned char)size;
*(p + 2) = (unsigned char)((nlen & 0x0f) | ((plen & 0x0f) << 4));
}
@ -91,9 +91,9 @@ static int
isgrm(TypeGram gram) {
int grm = gram;
if(MEISI_1 <= grm && grm <= D_MEISI_6) return TRUE;
if(MYOUJI <= grm && grm <= JOSUUSI2) return TRUE;
if(KEIYOUSI_1 <= grm && grm <= DO_ZAHEN) return TRUE;
if(MEISHI_1 <= grm && grm <= D_MEISHI_6) return TRUE;
if(MYOUJI <= grm && grm <= JOSUUSHI2) return TRUE;
if(KEIYOUSHI_1 <= grm && grm <= DO_ZAHEN) return TRUE;
if(DO_1DAN_1 <= grm && grm <= DO_WAGO_2) return TRUE;
if(DO_KAGO_5 <= grm && grm <= DO_WAGO_5) return TRUE;
if(DO_KAGO_6 <= grm && grm <= DO_WAGO_6) return TRUE;
@ -113,7 +113,7 @@ addel_arg(unsigned char* yp, unsigned char* kp, TypeGram grm, unsigned char* nyp
if(!sj2cd_str(yp, nyp, len)) err |= AD_BadYomi;
if(!isvyomi(nyp)) err |= AD_BadYomi;
if(!isvknj(kp)) err |= AD_BadKanji;
if(!isgrm(grm)) err |= AD_BadHinsi;
if(!isgrm(grm)) err |= AD_BadHinshi;
return err;
}
@ -169,9 +169,9 @@ int cvtknj(unsigned char* yomi, unsigned char* knj, unsigned char* dst) {
yomi2kata(yomi, kana);
if((len = top_strcmp(yomi, knj)) != 0) {
*dst = (unsigned char)(ZenHiraAssyuku | (len - 1));
*dst = (unsigned char)(ZenHiraAsshuku | (len - 1));
} else if((len = top_strcmp(kana, knj)) != 0) {
*dst = (unsigned char)(ZenKataAssyuku | (len - 1));
*dst = (unsigned char)(ZenKataAsshuku | (len - 1));
}
if(len) {
@ -182,10 +182,10 @@ int cvtknj(unsigned char* yomi, unsigned char* knj, unsigned char* dst) {
if(*knj) {
for(;;) {
if((len = last_strcmp(yomi, knj)) != 0) {
*dst++ = (unsigned char)(ZenHiraAssyuku | (len - 1));
*dst++ = (unsigned char)(ZenHiraAsshuku | (len - 1));
break;
} else if((len = last_strcmp(kana, knj)) != 0) {
*dst++ = (unsigned char)(ZenKataAssyuku | (len - 1));
*dst++ = (unsigned char)(ZenKataAsshuku | (len - 1));
break;
} else if(*knj == SS2) {
knj++;
@ -253,7 +253,7 @@ int srchkana(unsigned char** ptr, int* saml) {
return 0;
}
int srchgram(unsigned char* ptr, unsigned char** dst, TypeGram hinsi) {
int srchgram(unsigned char* ptr, unsigned char** dst, TypeGram hinshi) {
unsigned char* endp;
int cnt = 0, nlen;
int flg = FALSE;
@ -263,14 +263,14 @@ int srchgram(unsigned char* ptr, unsigned char** dst, TypeGram hinsi) {
nlen = getnlen(ptr);
ptr += DouonBlkSizeNumber + nlen;
while(ptr < endp) {
if(*ptr == hinsi) {
if(*ptr == hinshi) {
*dst = ptr;
flg = TRUE;
}
do {
ptr += codesize(*ptr);
} while(*ptr != HinsiBlkTerm);
} while(*ptr != HinshiBlkTerm);
ptr++;
cnt++;
}
@ -290,7 +290,7 @@ int srchkanji(unsigned char** dst, unsigned char* knj, int klen) {
ptr = *dst + 1;
while(*ptr != HinsiBlkTerm) {
while(*ptr != HinshiBlkTerm) {
for(p = ptr, q = knj, len = klen; len; len--)
if(*p++ != *q++) break;

16
char.c
View file

@ -114,13 +114,13 @@ int h2kcode(int code) {
int codesize(unsigned char code) {
switch(code & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenKataAssyuku:
case KanjiAssyuku:
case ZenHiraAsshuku:
case ZenKataAsshuku:
case KanjiAsshuku:
case KanjiStrEnd:
return 1;
case LeadingHankaku:
case OffsetAssyuku:
case OffsetAsshuku:
case AiAttribute:
return 2;
default:
@ -131,15 +131,15 @@ int codesize(unsigned char code) {
void output_knj(FILE* fp, unsigned char* p, int l) {
while(l > 0) {
switch(*p & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
fprintf(fp, "\244\322%d", (*p++ & 0x0f) + 1);
l--;
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
fprintf(fp, "\245\253%d", (*p++ & 0x0f) + 1);
l--;
break;
case KanjiAssyuku:
case KanjiAsshuku:
fprintf(fp, "\260\265%1x", (*p++ & 0x0f));
l--;
break;
@ -154,7 +154,7 @@ void output_knj(FILE* fp, unsigned char* p, int l) {
l--;
#endif
break;
case OffsetAssyuku:
case OffsetAsshuku:
fprintf(fp, "ofs%1x", (*p++ & 0x0f));
l--;
fprintf(fp, "%02x", *p++);

8
charsize.c
View file

@ -35,13 +35,13 @@
int codesize(unsigned char code) {
switch(code & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenKataAssyuku:
case KanjiAssyuku:
case ZenHiraAsshuku:
case ZenKataAsshuku:
case KanjiAsshuku:
case KanjiStrEnd:
return 1;
case LeadingHankaku:
case OffsetAssyuku:
case OffsetAsshuku:
case AiAttribute:
return 2;
default:

4
cl2knj.c
View file

@ -69,8 +69,8 @@ int cl2knj(unsigned char* yomi, int len, unsigned char* kouho) {
cnvstart = ystart = hyomi;
cnvlen = strlen(hyomi);
mkjiritu(0);
mkbunsetu();
mkjiritsu(0);
mkbunsetsu();
if(!maxclptr) wakachi();
jrt1st = maxjptr;

4
cnvhinsi.c → cnvhinshi.c
View file

@ -56,7 +56,7 @@ int u_strcmp(unsigned char* a, unsigned char* b) {
return 1;
}
int cnvhinsi(unsigned char* buf) {
int cnvhinshi(unsigned char* buf) {
int min;
int max;
int mid;
@ -86,7 +86,7 @@ int cnvhinsi(unsigned char* buf) {
return 0;
}
char* hinsi_str(int code) {
char* hinshi_str(int code) {
int i;
for(i = 0; i <= GramMax; i++) {

100
conjunc.c
View file

@ -483,7 +483,7 @@ static unsigned char keiyou2[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _SA, R_FZKMEISI,
0x01, _SA, R_FZKMEISHI,
0xff};
static unsigned char keiyou3[] = {
@ -494,7 +494,7 @@ static unsigned char keiyou3[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _GE, R_DMEISI,
0x01, _GE, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -505,7 +505,7 @@ static unsigned char keiyou3[] = {
0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI,
0x01, _SA, R_FZKMEISHI,
0xff};
static unsigned char keiyou4[] = {
@ -522,7 +522,7 @@ static unsigned char keiyou4[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _SA, R_FZKMEISI,
0x01, _SA, R_FZKMEISHI,
0xff};
static unsigned char keiyou5[] = {
@ -539,7 +539,7 @@ static unsigned char keiyou5[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _GE, R_DMEISI,
0x01, _GE, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -550,7 +550,7 @@ static unsigned char keiyou5[] = {
0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI,
0x01, _SA, R_FZKMEISHI,
0xff};
static unsigned char keiyou6[] = {
@ -561,7 +561,7 @@ static unsigned char keiyou6[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _GE, R_DMEISI,
0x01, _GE, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -572,8 +572,8 @@ static unsigned char keiyou6[] = {
0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI,
0x01, _ME, R_DMEISI,
0x01, _SA, R_FZKMEISHI,
0x01, _ME, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -600,7 +600,7 @@ static unsigned char keiyou7[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _GE, R_DMEISI,
0x01, _GE, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -611,8 +611,8 @@ static unsigned char keiyou7[] = {
0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI,
0x01, _ME, R_DMEISI,
0x01, _SA, R_FZKMEISHI,
0x01, _ME, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -639,7 +639,7 @@ static unsigned char keiyou8[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _GE, R_DMEISI,
0x01, _GE, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -650,9 +650,9 @@ static unsigned char keiyou8[] = {
0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI,
0x01, _MI, R_FZKMEISI,
0x01, _ME, R_DMEISI,
0x01, _SA, R_FZKMEISHI,
0x01, _MI, R_FZKMEISHI,
0x01, _ME, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -679,7 +679,7 @@ static unsigned char keiyou9[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _GE, R_DMEISI,
0x01, _GE, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -690,7 +690,7 @@ static unsigned char keiyou9[] = {
0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI,
0x01, _SA, R_FZKMEISHI,
0xff};
static unsigned char keiyou10[] = {
@ -707,7 +707,7 @@ static unsigned char keiyou10[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _GE, R_DMEISI,
0x01, _GE, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -718,8 +718,8 @@ static unsigned char keiyou10[] = {
0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI,
0x01, _ME, R_DMEISI,
0x01, _SA, R_FZKMEISHI,
0x01, _ME, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -740,9 +740,9 @@ static unsigned char keiyou11[] = {
0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2,
0x01, _SA, R_FZKMEISI,
0x01, _MI, R_FZKMEISI,
0x01, _ME, R_DMEISI,
0x01, _SA, R_FZKMEISHI,
0x01, _MI, R_FZKMEISHI,
0x01, _ME, R_DMEISHI,
0x11, _DA, R_DSHUUSI1,
0x21, _XTU, R_ONBIN1,
0x22, _RO, _U, R_DAROU,
@ -778,7 +778,7 @@ static unsigned char keidou2[] = {
static unsigned char keidou4[] = {
0x80, R_DGOKAN,
0x01, _SA, R_FZKMEISI,
0x01, _SA, R_FZKMEISHI,
0x01, _DA, R_DSHUUSI1,
0x11, _XTU, R_ONBIN1,
0x12, _RO, _U, R_DAROU,
@ -808,7 +808,7 @@ static unsigned char keidou9[] = {
0xff};
static unsigned char sahenmeisi1[] = {
0x00, R_SMEISI1,
0x00, R_SMEISHI1,
0x01, _SA, R_MIZEN1,
0x01, _SI, R_SI1,
0x11, _RO, R_MEIREI1,
@ -820,7 +820,7 @@ static unsigned char sahenmeisi1[] = {
0xff};
static unsigned char sahenmeisi2[] = {
0x00, R_SMEISI1,
0x00, R_SMEISHI1,
0x01, _SA, R_MIZEN1,
0x01, _SI, R_SI1,
0x11, _RO, R_MEIREI1,
@ -832,8 +832,8 @@ static unsigned char sahenmeisi2[] = {
0xff};
static unsigned char keidoumeisi[] = {
0x00, R_DMEISI,
0x01, _SA, R_FZKMEISI,
0x00, R_DMEISHI,
0x01, _SA, R_FZKMEISHI,
0x01, _DA, R_DSHUUSI1,
0x11, _XTU, R_ONBIN1,
0x12, _RO, _U, R_DAROU,
@ -857,7 +857,7 @@ static unsigned char keiyoustb[] = {
0xff};
static unsigned char ichistb[] = {
0x00, R_ICHISETUBI,
0x00, R_ICHISETSUBI,
0x01, _YO, R_MEIREI2,
0x01, _RU, R_SHUUSI,
0x01, _RE, R_KATEI2,
@ -865,14 +865,14 @@ static unsigned char ichistb[] = {
0xff};
static unsigned char fukusi2[] = {
0x00, R_FUKUSI,
0x01, _TO, R_F_FUKUSI,
0x00, R_FUKUSHI,
0x01, _TO, R_F_FUKUSHI,
0x11, _SI, R_SI1,
0x11, _HA, R_F_FUKUSI,
0x11, _HA, R_F_FUKUSHI,
0xff};
static unsigned char fukusi3[] = {
0x00, R_FUKUSI,
0x00, R_FUKUSHI,
0x01, _SA, R_MIZEN1,
0x01, _SI, R_SI1,
0x11, _RO, R_MEIREI1,
@ -881,13 +881,13 @@ static unsigned char fukusi3[] = {
0x11, _RE, R_KATEI2,
0x01, _SE, R_MIZEN2,
0x11, _YO, R_MEIREI2,
0x01, _TO, R_F_FUKUSI,
0x01, _TO, R_F_FUKUSHI,
0x11, _SI, R_SI1,
0x11, _HA, R_F_FUKUSI,
0x11, _HA, R_F_FUKUSHI,
0xff};
static unsigned char fukusi4[] = {
0x00, R_FUKUSI,
0x00, R_FUKUSHI,
0x01, _SA, R_MIZEN1,
0x01, _SI, R_SI1,
0x11, _RO, R_MEIREI1,
@ -899,35 +899,35 @@ static unsigned char fukusi4[] = {
0xff};
static unsigned char fukusi5[] = {
0x00, R_FUKUSI,
0x01, _NI, R_F_FUKUSI,
0x00, R_FUKUSHI,
0x01, _NI, R_F_FUKUSHI,
0xff};
static unsigned char fukusi6[] = {
0x00, R_FUKUSI,
0x01, _MO, R_F_FUKUSI,
0x00, R_FUKUSHI,
0x01, _MO, R_F_FUKUSHI,
0xff};
static unsigned char fukusi7[] = {
0x00, R_FUKUSI,
0x01, _NO, R_F_FUKUSI,
0x00, R_FUKUSHI,
0x01, _NO, R_F_FUKUSHI,
0xff};
static unsigned char fukusi8[] = {
0x00, R_FUKUSI,
0x00, R_FUKUSHI,
0x01, _DA, R_DSHUUSI1,
0x11, _XTU, R_ONBIN1,
0x02, _DE, _SI, R_DESHI,
0x21, _XYO, R_SHO,
0x31, _U, R_DESHOU,
0x11, _SU, R_DESU,
0x01, _TO, R_F_FUKUSI,
0x01, _TO, R_F_FUKUSHI,
0x11, _SI, R_SI1,
0x11, _HA, R_F_FUKUSI,
0x11, _HA, R_F_FUKUSHI,
0xff};
static unsigned char fukusi9[] = {
0x00, R_FUKUSI,
0x00, R_FUKUSHI,
0x01, _SA, R_MIZEN1,
0x01, _SI, R_SI1,
0x11, _RO, R_MEIREI1,
@ -942,10 +942,10 @@ static unsigned char fukusi9[] = {
0x21, _XYO, R_SHO,
0x31, _U, R_DESHOU,
0x11, _SU, R_DESU,
0x01, _TO, R_F_FUKUSI,
0x01, _TO, R_F_FUKUSHI,
0x11, _SI, R_SI1,
0x11, _HA, R_F_FUKUSI,
0x01, _NO, R_F_FUKUSI,
0x11, _HA, R_F_FUKUSHI,
0x01, _NO, R_F_FUKUSHI,
0xff};
unsigned char* conjadr[] = {

58
connect.c
View file

@ -3938,7 +3938,7 @@ static unsigned char kstb[] = {
tamau_x + tayu_x + timau_x + dekiru_x + naru_x + nasai_x + nasaru_x + nikui_x,
yasui_x + yoi_x + yaru_x + ttarasii_x};
static unsigned char ichisetubi[] = {
static unsigned char ichisetsubi[] = {
wo_o + ttatte_x + ttara_o + tte1_o + tte2_x + ppanasi_o + ppoi_o + ue_x,
uti_x + oite_x + okeru_x + ori_x + ka1_o + ka2_x + kai_x + kasira_o,
katagata_x + kadouka_o + kana_o + kane_o + kamo_o + kara1_o + kara2_x + ga1_o,
@ -7381,39 +7381,39 @@ static unsigned char n_si[] = {
unsigned char connadr[] = {
0,
R_MEISI,
R_MEISI,
R_MEISI,
R_MEISI,
R_MEISHI,
R_MEISHI,
R_MEISHI,
R_MEISHI,
0,
0,
0,
0,
0,
0,
R_MEISI,
R_MEISHI,
R_DAIMEISI,
R_DAIMEISI,
R_WO_MEISI,
R_DAIMEISHI,
R_DAIMEISHI,
R_WO_MEISHI,
0,
0,
R_DAIMEISI6,
R_DAIMEISHI6,
0,
0,
0,
R_MEISI,
R_MEISI,
R_MEISI,
R_MEISI,
R_MEISI,
R_RENTAISI,
R_SETUZOKU,
R_MEISHI,
R_MEISHI,
R_MEISHI,
R_MEISHI,
R_MEISHI,
R_RENTAISHI,
R_SETSUZOKU,
R_KANDOU,
R_JOSUUSI,
R_SUUSI,
R_JOSUUSHI,
R_SUUSHI,
R_SETTOU,
R_SETTOU,
@ -7421,17 +7421,17 @@ unsigned char connadr[] = {
R_SETTOU,
R_SETTOU,
R_MEISI,
R_MEISI,
R_MEISI,
R_MEISI,
R_MEISHI,
R_MEISHI,
R_MEISHI,
R_MEISHI,
0,
0,
0,
0,
R_MEISI,
R_MEISHI,
R_FUKUSI,
R_FUKUSHI,
0,
0,
0,
@ -7440,7 +7440,7 @@ unsigned char connadr[] = {
0,
0,
0,
R_JOSUUSI,
R_JOSUUSHI,
0,
0,
@ -7589,7 +7589,7 @@ unsigned char connadr[] = {
R_GOZAI,
R_ONBIN2,
R_KOSODO,
R_AISATU,
R_AISATSU,
R_KSHUUSI,
R_TANKAN,
0,
@ -7602,7 +7602,7 @@ unsigned char connadr[] = {
0,
0,
0,
R_MEISI};
R_MEISHI};
unsigned char* rigtadr[] = {
0,
@ -7856,7 +7856,7 @@ unsigned char* rigtadr[] = {
smeisi1,
smeisi2,
kstb,
ichisetubi,
ichisetsubi,
josuusi,
rentaisi,
cut};

38
const.h
View file

@ -90,7 +90,7 @@
#define AD_NotUserDict 0x0001
#define AD_BadYomi 0x0002
#define AD_BadKanji 0x0004
#define AD_BadHinsi 0x0008
#define AD_BadHinshi 0x0008
#define AD_ArExist 0x0010
#define AD_OvflwDouBlk 0x0020
@ -99,12 +99,12 @@
#define AD_OvflwIndex 0x0100
#define AD_NoMidasi 0x0010
#define AD_NoHinsi 0x0020
#define AD_NoHinshi 0x0020
#define AD_NoKanji 0x0040
#define C_WAKACHI 0x00
#define C_MINASI 0x01
#define C_BUNSETU 0x02
#define C_BUNSETSU 0x02
#define C_DICT 0x03
#define C_N_ARABIA 0x04
#define C_N_ARACMA 0x05
@ -134,8 +134,8 @@
#define K_DOUSHI 1
#define K_YOUGEN 2
#define K_TAIGEN 3
#define K_FUKUSI 4
#define K_RENTAISI 5
#define K_FUKUSHI 4
#define K_RENTAISHI 5
#define K_SONOTA 6
#define EUC_a1 (unsigned char)0xa1
@ -195,7 +195,7 @@
#define MaxYomiLength 32
#define MaxKanjiLength 32
#define MaxHinsiNumber 16
#define MaxHinshiNumber 16
#define MaxAtrNumber 16
#define MaxJosiNumber 16
@ -205,20 +205,20 @@
#define DouonBlkSizeNumber 3
#define DouonBlkTerm 0xff
#define HinsiBlkTerm 0xff
#define HinshiBlkTerm 0xff
#define NormalKanjiMask 0x7f
#define SS3Kanji 0x0080
#define ZenHiraAssyuku 0x80
#define OffsetAssyuku 0x90
#define ZenKataAssyuku 0xa0
#define ZenHiraAsshuku 0x80
#define OffsetAsshuku 0x90
#define ZenKataAsshuku 0xa0
#define AiAttribute 0xb0
#define KanjiAssyuku 0xc0
#define KanjiAsshuku 0xc0
#define LeadingHankaku 0xd0
#define KanjiStrEnd 0x00
#define IsAssyuku 0x80
#define IsAsshuku 0x80
#define AssukuUse2byte 0x90
#define KnjAssyukuMask 0x0f
#define KnjAsshukuMask 0x0f
#define KanjiCodeMask 0x0f
#define KanjiModeMask 0xf0
#define AtrMsKanjiOfs 0xc0c0
@ -229,29 +229,29 @@
#define IllegalFormat "\245\325\245\251\241\274\245\336\245\303\245\310\244\254\260\333\276\357\244\307\244\271"
#define TooLongYomi "\306\311\244\337\312\270\273\372\316\363\244\254\304\271\244\271\244\256\244\336\244\271"
#define TooLongKanji "\264\301\273\372\312\270\273\372\316\363\244\254\304\271\244\271\244\256\244\336\244\271"
#define TooLongHinsi "\311\312\273\354\312\270\273\372\316\363\244\254\304\271\244\271\244\256\244\336\244\271"
#define TooLongHinshi "\311\312\273\354\312\270\273\372\316\363\244\254\304\271\244\271\244\256\244\336\244\271"
#define TooLongGroup "\245\260\245\353\241\274\245\327\314\276\244\254\260\333\276\357\244\307\244\271"
#define TooLongJosi "\275\365\273\354\312\270\273\372\316\363\244\254\260\333\276\357\244\307\244\271"
#define BadHinsi "\305\320\317\277\244\265\244\354\244\306\244\244\244\312\244\244\311\312\273\354\244\307\244\271"
#define BadHinshi "\305\320\317\277\244\265\244\354\244\306\244\244\244\312\244\244\311\312\273\354\244\307\244\271"
#define BadGroup "\305\320\317\277\244\265\244\354\244\306\244\244\244\312\244\244\245\260\245\353\241\274\245\327\244\307\244\271"
#define BadJosi "\305\320\317\277\244\265\244\354\244\306\244\244\244\312\244\244\275\365\273\354\244\307\244\271"
#define NoYomiString "\306\311\244\337\312\270\273\372\316\363\244\254\274\350\306\300\244\307\244\255\244\336\244\273\244\363"
#define NoKanjiString "\264\301\273\372\312\270\273\372\316\363\244\254\274\350\306\300\244\307\244\255\244\336\244\273\244\363"
#define TooManyAtr "\302\260\300\255\244\316\277\364\244\254\302\277\244\271\244\256\244\336\244\271"
#define TooManyHinsi "\311\312\273\354\244\316\277\364\244\254\302\277\244\271\244\256\244\336\244\271"
#define TooManyHinshi "\311\312\273\354\244\316\277\364\244\254\302\277\244\271\244\256\244\336\244\271"
#define TooManyJosi "\275\365\273\354\244\316\277\364\244\254\302\277\244\271\244\256\244\336\244\271"
#define NoDataInMain "\245\341\245\244\245\363\274\255\275\361\244\313\302\270\272\337\244\267\244\336\244\273\244\363"
#define TooManyTarget "\311\312\273\354\244\362\243\261\244\304\273\330\304\352\244\267\244\306\244\257\244\300\244\265\244\244"
#define HinsiTankan cnvhinsi("\303\261\264\301")
#define HinshiTankan cnvhinshi("\303\261\264\301")
#define DIVLIST 1
#define ASSYUKUREC 2
#define ASSHUKUREC 2
#define STRING 3
#define HINDOREC 4
#define OFFSETREC 5
#define KANJIREC 6
#define HINSIREC 7
#define HINSHIREC 7
#define DOUONREC 8
#endif /* SJ3_CONST_H_ */

4
conversion.h
View file

@ -31,7 +31,7 @@
#include "sj3libsj3.h"
#include "henkan.h"
typedef struct bunsetu_sj3 Bunsetu;
typedef struct bunsetsu_sj3 Bunsetsu;
typedef struct _Conversion {
unsigned short out_mode[BUFFLENGTH * 2];
@ -68,7 +68,7 @@ typedef struct _Conversion {
short CurBun;
short PreBun;
Bunsetu Bun[BUFFLENGTH];
Bunsetsu Bun[BUFFLENGTH];
wchar16_t out_buf[BUFFLENGTH * 2];
unsigned char in_mode[BUFFLENGTH * 2];

2
cvtdict.c
View file

@ -89,7 +89,7 @@ void cvtdict(KHREC* krec, CLREC* clrec, int flg) {
stblen = 0;
}
else if((i = jrec->stbofs) && (fptr = getstb(jrec->hinsi))) {
else if((i = jrec->stbofs) && (fptr = getstb(jrec->hinshi))) {
fptr += i - 1;
stblen = StbYomiLen(fptr);
jlen -= stblen;

6
cvtkanji.c
View file

@ -112,7 +112,7 @@ void cvtkouho(KHREC* krec) {
cvtdict(krec, clrec, TRUE);
break;
case C_BUNSETU:
case C_BUNSETSU:
case C_MINASI:
cvtminasi((int)clrec->cllen);
break;
@ -155,12 +155,12 @@ void setstyrec(KHREC* krec) {
}
stdy.stdy1.sttkj = krec->sttkj;
stdy.stdy1.ka_kj = krec->ka_kj;
stdy.hinshi = jrec->hinsi;
stdy.hinshi = jrec->hinshi;
stdy.len = jrec->jlen;
stdy.sttfg = krec->sttfg;
stdy.ka_fg = krec->ka_fg;
if(jrec->stbofs && (fptr = getstb(jrec->hinsi)) != NULL)
if(jrec->stbofs && (fptr = getstb(jrec->hinshi)) != NULL)
stdy.len -= StbYomiLen(fptr + jrec->stbofs - 1);
if((fptr = Settou_ptr(jrec->sttofs)) != NULL)

8
deldic.c
View file

@ -41,7 +41,7 @@ static void del_uidx(TypeDicSeg seg);
static void del_stdy(TypeDicSeg seg, TypeDicOfs ofs, int size);
unsigned int
deldic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
deldic(unsigned char* yomi, unsigned char* kanji, TypeGram hinshi) {
unsigned char yptr[MaxWdYomiLen + 1];
unsigned char kptr[MaxWdKanjiLen + 1];
unsigned int err;
@ -56,7 +56,7 @@ deldic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
unsigned char *stp, *edp;
int size, len;
if((err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr))) != 0)
if((err = addel_arg(yomi, kanji, hinshi, yptr, sizeof(yptr))) != 0)
return err;
if((curdict->maxunit) == 0) return AD_NotUserDict;
@ -71,11 +71,11 @@ deldic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi) {
if((dblknum = srchkana(&p1, &samlen)) == 0) return AD_NoMidasi;
if((hblknum = srchgram(p1, &p2, hinsi)) == 0) return AD_NoHinsi;
if((hblknum = srchgram(p1, &p2, hinshi)) == 0) return AD_NoHinshi;
p3 = p2;
kblknum = srchkanji(&p3, kptr, knjlen);
if(*p3 == HinsiBlkTerm) return AD_NoKanji;
if(*p3 == HinshiBlkTerm) return AD_NoKanji;
ofs = p3 - dicbuf;
edp = skipkstr(p3);

2
dictmake.c
View file

@ -108,7 +108,7 @@ static void touroku(y, k, h) char *y, *k, *h;
if(force_flag) break;
exit(1);
case SJ3_BAD_HINSI_CODE:
case SJ3_BAD_HINSHI_CODE:
error_out("\305\320\317\277\244\307\244\255\244\312\244\244\311\312\273\354\244\307\244\271 %s:%s:%s", y, k, h);
if(force_flag) break;
exit(1);

8
dicttool.h
View file

@ -47,8 +47,8 @@ void output_str(FILE* fp, char* p);
void output_int(FILE* fp, int* p);
void output_yomi(FILE* fp, unsigned char* p);
/* cnvhinsi.c */
int cnvhinsi(unsigned char* buf);
/* cnvhinshi.c */
int cnvhinshi(unsigned char* buf);
/* file.c */
FILE* Fopen(char* filename, char* type);
@ -67,7 +67,7 @@ void knjhnd_set(unsigned char* p, int l);
void knjhnd_reset(unsigned char* p, int l);
int decide_knjask(void);
void clear_hindo(void);
void clear_assyuku(void);
void clear_asshuku(void);
/* knjcvt.c */
unsigned char* knjofscvt(unsigned char* ptr, int len, int* ret);
@ -82,7 +82,7 @@ void mark_file(FILE* out);
/* makelist.c */
void clear_list(void);
void flush_douon(void);
void makelist(int* yomi, int* kanji, int hinsi, int* atr);
void makelist(int* yomi, int* kanji, int hinshi, int* atr);
/* makeseg.c */
size_t make_knjstr(unsigned char* src, int len, unsigned char* dst);

18
douon.c
View file

@ -37,7 +37,7 @@ static int Dpoint;
static struct douon_sj3 HenkanDouon[DOUON_N];
static wchar16_t Dkanji[BUFFLENGTH * 2];
void go_gakusyuu();
void go_gakushuu();
SJ_getdouon(s, d, n, choice, reconv)
wchar16_t* s;
@ -118,13 +118,13 @@ int gnum;
char tmp[BUFFLENGTH], tmp2[BUFFLENGTH * 2];
wchar16_t wtmp[BUFFLENGTH], wtmp2[BUFFLENGTH * 2];
int gakusyuu;
int gakushuu;
unsigned short row, col;
Conversion* cv;
cv = current_conversion;
gakusyuu = SJ_getdouon(yomi, HenkanDouon, gnum, 0, 0);
gakushuu = SJ_getdouon(yomi, HenkanDouon, gnum, 0, 0);
dispnum = DNUM;
if(dispnum > Dcount)
@ -221,7 +221,7 @@ int gnum;
if(HenkanDouon[Dpoint].valid)
PushGD(gnum, &HenkanDouon[Dpoint].dcid);
if(gakusyuu)
if(gakushuu)
if(HenkanDouon[Dpoint].valid)
SJ2_study(&HenkanDouon[Dpoint].dcid);
else
@ -418,7 +418,7 @@ struct studyrec* wordid;
Gdata[num] = *wordid;
}
cl_gakusyuu() {
cl_gakushuu() {
Conversion* cv;
int i, j;
int o_point, n_point;
@ -436,13 +436,13 @@ cl_gakusyuu() {
break;
}
j--;
check_and_gakusyuu(i, j);
check_and_gakushuu(i, j);
i = j;
}
}
}
check_and_gakusyuu(m, n) int m, n;
check_and_gakushuu(m, n) int m, n;
{
Conversion* cv;
int i, j;
@ -452,14 +452,14 @@ check_and_gakusyuu(m, n) int m, n;
j = i + 1;
while(j <= n && j < cv->Bnum) {
if(cv->Bkettei[i] & Bedit && !(cv->Bkettei[i] & Bmuhenkan))
go_gakusyuu(i);
go_gakushuu(i);
i++;
j++;
}
}
void
go_gakusyuu(n) int n;
go_gakushuu(n) int n;
{
Conversion* cv;
int i, j;

8
etc.c
View file

@ -81,7 +81,7 @@ exec_etc(key) int key;
break;
case 's':
if(!IsCflag())
chbun = exec_syoukyo();
chbun = exec_shoukyo();
break;
case 'v':
case 'd':
@ -101,9 +101,9 @@ exec_etc(key) int key;
if(!IsCflag())
chbun = exec_toroku();
break;
case KEY_SYOUKYO:
case KEY_SHOUKYO:
if(!IsCflag())
chbun = exec_syoukyo();
chbun = exec_shoukyo();
break;
case KEY_SJRC:
if(IsCflag())
@ -184,7 +184,7 @@ etc_map(key) int key;
val = KEY_TOROKU;
break;
case KEY_MUHENKAN:
val = KEY_SYOUKYO;
val = KEY_SHOUKYO;
break;
case KEY_ETC:
val = KEY_HELP;

6
eucmessage.c
View file

@ -172,7 +172,7 @@ unsigned char* EucMessages[] = {
(unsigned char*)"right",
(unsigned char*)"left",
(unsigned char*)"kaku",
(unsigned char*)"syuku",
(unsigned char*)"shuku",
(unsigned char*)"edit",
(unsigned char*)"toggle",
(unsigned char*)"wrapback",
@ -180,7 +180,7 @@ unsigned char* EucMessages[] = {
(unsigned char*)"sjrc",
(unsigned char*)"buffer",
(unsigned char*)"toroku",
(unsigned char*)"syoukyo",
(unsigned char*)"shoukyo",
(unsigned char*)"help",
(unsigned char*)"ha-kettei",
(unsigned char*)"flush",
@ -312,7 +312,7 @@ int init_comstr() {
comstr[19] = WCSjrc;
comstr[20] = WCBuffer;
comstr[21] = WCToroku;
comstr[22] = WCSyoukyo;
comstr[22] = WCShoukyo;
comstr[23] = WCHelp;
comstr[24] = WCHaKettei;
comstr[25] = WCFlush;

10
execute.c
View file

@ -918,8 +918,8 @@ void exec_adddict(int mb_flag) {
err = SJ3_BadYomiString;
else if(err & AD_BadKanji)
err = SJ3_BadKanjiString;
else if(err & AD_BadHinsi)
err = SJ3_BadHinsiCode;
else if(err & AD_BadHinshi)
err = SJ3_BadHinshiCode;
else if(err & AD_ArExist)
err = SJ3_AlreadyExistWord;
else if(err & AD_OvflwDouBlk)
@ -984,11 +984,11 @@ void exec_deldict(int mb_flag) {
err = SJ3_BadYomiString;
else if(err & AD_BadKanji)
err = SJ3_BadKanjiString;
else if(err & AD_BadHinsi)
err = SJ3_BadHinsiCode;
else if(err & AD_BadHinshi)
err = SJ3_BadHinshiCode;
else if(err & AD_NoMidasi)
err = SJ3_NoSuchWord;
else if(err & AD_NoHinsi)
else if(err & AD_NoHinshi)
err = SJ3_NoSuchWord;
else if(err & AD_NoKanji)
err = SJ3_NoSuchWord;

2
funckey.c
View file

@ -93,7 +93,7 @@ int comstrvalue[KEY_OTHER] = {
KEY_LEFT, KEY_UP, KEY_DOWN,
KEY_EDIT, KEY_TOGGLE, KEY_WRAPBACK,
KEY_WRAP, KEY_SJRC, KEY_BUFFER,
KEY_TOROKU, KEY_SYOUKYO, KEY_HELP,
KEY_TOROKU, KEY_SHOUKYO, KEY_HELP,
KEY_HA_KET, KEY_FLUSH, KEY_DEBUG,
KEY_CANCEL, KEY_RECONV, KEY_IGNORE,
KEY_TOP, KEY_END, KEY_RECONNECT,

40
fuzoku.c
View file

@ -28,7 +28,7 @@
*/
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "sj_right.h"
#include "sj_yomi.h"
@ -78,7 +78,7 @@ unsigned char* yptr;
TypeCnct right;
{
CLREC* new;
TypeGram hinsi;
TypeGram hinshi;
int len;
if(!(len = yptr - cnvstart)) return;
@ -93,48 +93,48 @@ TypeCnct right;
new->fzk_ka = fzk_ka_flg;
(jrec->count)++;
hinsi = jrec->hinsi;
hinshi = jrec->hinshi;
if(hinsi >= DO_SAHEN && hinsi <= SP_KA_ONB)
if(hinshi >= DO_SAHEN && hinshi <= SP_KA_ONB)
new->kubun = K_DOUSHI;
else if((hinsi >= KEIYOUSI_1 && hinsi <= KE_DOUSI_9) ||
(hinsi == SP_KEIYOUSI)) {
if(right == R_FZKMEISI)
else if((hinshi >= KEIYOUSHI_1 && hinshi <= KE_DOUSHI_9) ||
(hinshi == SP_KEIYOUSHI)) {
if(right == R_FZKMEISHI)
new->kubun = K_TAIGEN;
else
new->kubun = K_YOUGEN;
}
else if(hinsi == RENTAISI)
new->kubun = K_RENTAISI;
else if(hinshi == RENTAISHI)
new->kubun = K_RENTAISHI;
else if((hinsi >= FUKUSI_1 && hinsi <= FUKUSI_9) ||
(hinsi == SP_FUKUSI))
new->kubun = K_FUKUSI;
else if((hinshi >= FUKUSHI_1 && hinshi <= FUKUSHI_9) ||
(hinshi == SP_FUKUSHI))
new->kubun = K_FUKUSHI;
else if(hinsi == SETUZOKU || hinsi == KANDOUSI ||
hinsi == TANKANJI || hinsi == AISATU)
else if(hinshi == SETSUZOKU || hinshi == KANDOUSHI ||
hinshi == TANKANJI || hinshi == AISATSU)
new->kubun = K_SONOTA;
else if(gobilen) {
if(hinsi >= MEISI_5 && hinsi <= MEISI_7)
if(hinshi >= MEISHI_5 && hinshi <= MEISHI_7)
new->kubun = K_DOUSHI;
else if(hinsi == D_MEISI_4)
else if(hinshi == D_MEISHI_4)
new->kubun = K_DOUSHI;
else if(hinsi == SETUBI_7 || hinsi == SETUBI_8)
else if(hinshi == SETSUBI_7 || hinshi == SETSUBI_8)
new->kubun = K_DOUSHI;
else if(hinsi == D_MEISI_5)
else if(hinshi == D_MEISHI_5)
new->kubun = K_YOUGEN;
else if(hinsi == SETUBI_5 || hinsi == SETUBI_6)
else if(hinshi == SETSUBI_5 || hinshi == SETSUBI_6)
new->kubun = K_YOUGEN;
else
new->kubun = K_TAIGEN;
} else if(hinsi >= MEISI_5 && hinsi <= MEISI_7) {
} else if(hinshi >= MEISHI_5 && hinshi <= MEISHI_7) {
if(right >= R_I && right <= R_ITADAKE)
new->kubun = K_DOUSHI;

8
fzkyomi.c
View file

@ -48,7 +48,7 @@ static unsigned char fzk_xtu[] = {
(4 << 5) + 2, _RO, _U, L_TTARASII, R_KAROU,
(3 << 5) + 1, _KU, L_TTARASII, R_KRENYOU,
(3 << 5) + 2, _KE, _RE, L_TTARASII, R_KATEI1,
(3 << 5) + 1, _SA, L_TTARASII, R_FZKMEISI,
(3 << 5) + 1, _SA, L_TTARASII, R_FZKMEISHI,
(0 << 5) + 1, _TE, L_TTE1, R_TTE1,
(1 << 5) + 0, L_TTE2, R_TTE2,
(0 << 5) + 3, _PA, _NA, _SI, L_PPANASI, R_PPANASI,
@ -481,7 +481,7 @@ static unsigned char fzk_ni[] = {
(2 << 5) + 2, _RO, _U, L_NIKUI, R_KAROU,
(1 << 5) + 1, _KU, L_NIKUI, R_TAKU,
(1 << 5) + 2, _KE, _RE, L_NIKUI, R_KATEI3,
(1 << 5) + 1, _SA, L_NIKUI, R_FZKMEISI,
(1 << 5) + 1, _SA, L_NIKUI, R_FZKMEISHI,
(0 << 5) + 1, _TE, L_NITE, R_NITE,
(0 << 5) + 2, _DE, _MO, L_NI1, R_MO1,
(0 << 5) + 1, _MO, L_NIMO, R_NIMO,
@ -609,7 +609,7 @@ static unsigned char fzk_ya[] = {
(2 << 5) + 2, _RO, _U, L_YASUI, R_KAROU,
(1 << 5) + 1, _KU, L_YASUI, R_TAKU,
(1 << 5) + 2, _KE, _RE, L_YASUI, R_KATEI3,
(1 << 5) + 1, _SA, L_YASUI, R_FZKMEISI,
(1 << 5) + 1, _SA, L_YASUI, R_FZKMEISHI,
(0 << 5) + 1, _XTU, L_YOUGEN, R_ONBIN2,
(0 << 5) + 1, _RA, L_YARA, R_YARA,
(1 << 5) + 0, L_YOUGEN, R_MIZEN5,
@ -643,7 +643,7 @@ static unsigned char fzk_yo[] = {
(1 << 5) + 2, _RO, _U, L_YOI, R_KAROU,
(0 << 5) + 1, _KU, L_YOI, R_TAKU,
(0 << 5) + 2, _KE, _RE, L_YOI, R_KATEI3,
(0 << 5) + 1, _SA, L_YOI, R_FZKMEISI,
(0 << 5) + 1, _SA, L_YOI, R_FZKMEISHI,
(0 << 5) + 2, _XTU, _TE, L_YORU, R_YOTTE,
(0 << 5) + 2, _NA, _XA, L_YO, R_SHUUJO,
(1 << 5) + 1, _A, L_YO, R_SHUUJO,

18
getkanji.c
View file

@ -89,7 +89,7 @@ getkan_kata(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int f
unsigned char*
getkan_knj(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int flg) {
return code2kanji(askknj[*s & KnjAssyukuMask], d, ym, yl, flg);
return code2kanji(askknj[*s & KnjAsshukuMask], d, ym, yl, flg);
}
unsigned char*
@ -135,15 +135,15 @@ code2kanji(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int fl
csize = codesize(*s);
if(s[csize] == KanjiStrEnd) {
switch(*s & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
d = getkan_hira(s, d, ym, yl, flg);
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
d = getkan_kata(s, d, ym, yl, flg);
break;
case OffsetAssyuku:
case OffsetAsshuku:
d = getkan_ofs(s, d, ym, yl, flg);
break;
@ -155,7 +155,7 @@ code2kanji(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int fl
d = getkan_ascii(s, d, ym, yl, flg);
break;
case KanjiAssyuku:
case KanjiAsshuku:
d = getkan_knj(s, d, ym, yl, flg);
break;
@ -165,15 +165,15 @@ code2kanji(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int fl
break;
} else
switch(*s & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
d = getkan_hira(s, d, ym, yl, FALSE);
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
d = getkan_kata(s, d, ym, yl, FALSE);
break;
case OffsetAssyuku:
case OffsetAsshuku:
d = getkan_ofs(s, d, ym, yl, FALSE);
break;
@ -185,7 +185,7 @@ code2kanji(unsigned char* s, unsigned char* d, unsigned char* ym, int yl, int fl
d = getkan_ascii(s, d, ym, yl, FALSE);
break;
case KanjiAssyuku:
case KanjiAsshuku:
d = getkan_knj(s, d, ym, yl, FALSE);
break;

4
global.c
View file

@ -34,7 +34,7 @@
DouonRec* douon_ptr = NULL;
int douon_num = 0;
int yomi_len = 0;
int hinsi_num = 0;
int hinshi_num = 0;
int kanji_len = 0;
HindoRec* hindo[MaxHindoNumber];
@ -43,7 +43,7 @@ int hindo_num = 0;
OffsetRec* ofsrec[MaxOffsetNumber];
int ofsrec_num = 0;
AssyukuRec* assyuku = NULL;
AsshukuRec* asshuku = NULL;
HindoRec* askknj[MaxKnjAskNumber];
int askknj_num = 0;

76
hindo.c
View file

@ -35,7 +35,7 @@
extern HindoRec* hindo[];
extern int hindo_num;
extern AssyukuRec* assyuku;
extern AsshukuRec* asshuku;
extern HindoRec* askknj[];
extern int askknj_num;
extern int kanji_num;
@ -62,11 +62,11 @@ int check_hindo(unsigned char* ptr, int len) {
return 0;
}
static AssyukuRec*
makeassyuku(int num) {
AssyukuRec* arec;
static AsshukuRec*
makeasshuku(int num) {
AsshukuRec* arec;
arec = (AssyukuRec*)Malloc(sizeof(AssyukuRec));
arec = (AsshukuRec*)Malloc(sizeof(AsshukuRec));
if(!arec) {
fprintf(stderr, "\245\341\245\342\245\352\244\254\302\255\244\352\244\336\244\273\244\363\n");
exit(1);
@ -80,13 +80,13 @@ makeassyuku(int num) {
}
static int
assyuku_len(HindoRec* hrec) {
asshuku_len(HindoRec* hrec) {
int org;
int old;
int new;
OffsetRec* p;
if(((*(hrec->kptr) & KanjiModeMask) == OffsetAssyuku) &&
if(((*(hrec->kptr) & KanjiModeMask) == OffsetAsshuku) &&
(hrec->klen == 2)) {
p = real_ofsrec(hrec->kptr);
@ -109,16 +109,16 @@ assyuku_len(HindoRec* hrec) {
}
static void
set_assyuku(HindoRec* hrec) {
AssyukuRec* arec;
AssyukuRec* aprev;
set_asshuku(HindoRec* hrec) {
AsshukuRec* arec;
AsshukuRec* aprev;
int len;
len = assyuku_len(hrec);
len = asshuku_len(hrec);
if(len <= 0) return;
arec = assyuku;
arec = asshuku;
aprev = NULL;
while(arec) {
@ -137,7 +137,7 @@ set_assyuku(HindoRec* hrec) {
arec = arec->anext;
}
arec = makeassyuku(len);
arec = makeasshuku(len);
hrec->anext = NULL;
hrec->arec = arec;
@ -147,16 +147,16 @@ set_assyuku(HindoRec* hrec) {
arec->anext = aprev->anext;
aprev->anext = arec;
} else {
arec->anext = assyuku;
assyuku = arec;
arec->anext = asshuku;
asshuku = arec;
}
}
static void
reset_assyuku(HindoRec* hrec) {
AssyukuRec* arec;
AssyukuRec* aptr;
AssyukuRec* aprev;
reset_asshuku(HindoRec* hrec) {
AsshukuRec* arec;
AsshukuRec* aptr;
AsshukuRec* aprev;
HindoRec* hptr;
HindoRec* hprev;
@ -187,8 +187,8 @@ reset_assyuku(HindoRec* hrec) {
return;
}
if(!assyuku) return;
aptr = assyuku;
if(!asshuku) return;
aptr = asshuku;
aprev = NULL;
while(aptr) {
if(aptr == arec) break;
@ -202,7 +202,7 @@ reset_assyuku(HindoRec* hrec) {
aprev->anext = arec->anext;
else
assyuku = arec->anext;
asshuku = arec->anext;
Free(arec);
@ -254,7 +254,7 @@ set_hindo(unsigned char* ptr, int len, int alen) {
hindo[0] = hrec;
hindo_num = 1;
set_assyuku(hrec);
set_asshuku(hrec);
return;
}
@ -288,7 +288,7 @@ set_hindo(unsigned char* ptr, int len, int alen) {
else {
hrec = hindo[mid];
reset_assyuku(hrec);
reset_asshuku(hrec);
if(hrec->exist > 0)
hrec->exist += 1;
@ -302,7 +302,7 @@ set_hindo(unsigned char* ptr, int len, int alen) {
hrec->hindo += 1;
}
set_assyuku(hrec);
set_asshuku(hrec);
}
static void
@ -326,7 +326,7 @@ reset_hindo(unsigned char* p, int l) {
else {
hrec = hindo[mid];
reset_assyuku(hrec);
reset_asshuku(hrec);
if(hrec->exist > 0)
hrec->exist -= 1;
@ -342,7 +342,7 @@ reset_hindo(unsigned char* p, int l) {
Free(hrec);
} else {
set_assyuku(hrec);
set_asshuku(hrec);
}
return;
@ -408,7 +408,7 @@ void knjhnd_reset(unsigned char* p, int l) {
}
static int
check_assyuku(HindoRec* p, HindoRec* q) {
check_asshuku(HindoRec* p, HindoRec* q) {
unsigned char ptmp[128], qtmp[128];
int plen;
int qlen;
@ -429,14 +429,14 @@ check_assyuku(HindoRec* p, HindoRec* q) {
int decide_knjask(void) {
int i, j;
AssyukuRec* p;
AsshukuRec* p;
HindoRec* q;
unsigned char* r;
int len = 0;
askknj_num = 0;
for(p = assyuku; p; p = p->anext) {
for(p = asshuku; p; p = p->anext) {
if(p->len <= 0) break;
@ -446,7 +446,7 @@ int decide_knjask(void) {
r = q->kptr;
if(i > 2) {
while(i > 0) {
if((*r & KanjiModeMask) == OffsetAssyuku) {
if((*r & KanjiModeMask) == OffsetAsshuku) {
break;
}
j = codesize(*r);
@ -459,7 +459,7 @@ int decide_knjask(void) {
if(askknj_num) {
for(i = 0; i < askknj_num; i++) {
if(check_assyuku(askknj[i], q))
if(check_asshuku(askknj[i], q))
break;
}
@ -485,7 +485,7 @@ end:
p = askknj[i]->kptr;
if(len <= 2) continue;
while(len > 0) {
if((*p & KanjiModeMask) == OffsetAssyuku) {
if((*p & KanjiModeMask) == OffsetAsshuku) {
printf("\245\252\245\325\245\273\245\303\245\310\260\265\275\314\244\362\264\336\244\340 %d\n", i);
}
j = codesize(*p);
@ -508,12 +508,12 @@ void clear_hindo(void) {
kanji_num = 0;
}
void clear_assyuku(void) {
AssyukuRec* p;
void clear_asshuku(void) {
AsshukuRec* p;
while(assyuku) {
p = assyuku;
assyuku = assyuku->anext;
while(asshuku) {
p = asshuku;
asshuku = asshuku->anext;
Free(p);
}
}

160
hinsi.c → hinshi.c
View file

@ -27,95 +27,95 @@
*
*/
#include "sj_hinsi.h"
#include "sj_hinshi.h"
static struct hlist {
int code;
char* str;
} hinsi[] = {
{MEISI_1, "\314\276\273\354"},
{MEISI_1, "\314\276\243\261"},
{MEISI_2, "\314\276\243\262"},
{MEISI_3, "\314\276\243\263"},
{MEISI_4, "\314\276\243\264"},
{MEISI_5, "\314\276\243\265"},
{MEISI_6, "\314\276\243\266"},
{MEISI_7, "\314\276\243\267"},
{MEISI_8, "\314\276\243\270"},
{MEISI_9, "\314\276\243\271"},
{MEISI_10, "\314\276\243\261\243\260"},
{MEISI_11, "\314\276\243\261\243\261"},
{MEISI_20, "\314\276\243\262\243\260"},
{D_MEISI_1, "\302\345\314\276\273\354"},
{D_MEISI_1, "\302\345\243\261"},
{D_MEISI_2, "\302\345\243\262"},
{D_MEISI_3, "\302\345\243\263"},
{D_MEISI_4, "\302\345\243\264"},
{D_MEISI_5, "\302\345\243\265"},
{D_MEISI_6, "\302\345\243\266"},
} hinshi[] = {
{MEISHI_1, "\314\276\273\354"},
{MEISHI_1, "\314\276\243\261"},
{MEISHI_2, "\314\276\243\262"},
{MEISHI_3, "\314\276\243\263"},
{MEISHI_4, "\314\276\243\264"},
{MEISHI_5, "\314\276\243\265"},
{MEISHI_6, "\314\276\243\266"},
{MEISHI_7, "\314\276\243\267"},
{MEISHI_8, "\314\276\243\270"},
{MEISHI_9, "\314\276\243\271"},
{MEISHI_10, "\314\276\243\261\243\260"},
{MEISHI_11, "\314\276\243\261\243\261"},
{MEISHI_20, "\314\276\243\262\243\260"},
{D_MEISHI_1, "\302\345\314\276\273\354"},
{D_MEISHI_1, "\302\345\243\261"},
{D_MEISHI_2, "\302\345\243\262"},
{D_MEISHI_3, "\302\345\243\263"},
{D_MEISHI_4, "\302\345\243\264"},
{D_MEISHI_5, "\302\345\243\265"},
{D_MEISHI_6, "\302\345\243\266"},
{MYOUJI, "\311\304\273\372"},
{NAMAE, "\314\276\301\260"},
{KIGYOU, "\264\353\266\310"},
{TIMEI, "\303\317\314\276"},
{KEN_KU, "\270\251\241\277\266\350\314\276"},
{KEN_KU, "\270\251\266\350"},
{RENTAISI, "\317\242\302\316\273\354"},
{RENTAISI, "\317\242\302\316"},
{SETUZOKU, "\300\334\302\263\273\354"},
{SETUZOKU, "\300\334\302\263"},
{KANDOUSI, "\264\266\306\260"},
{JOSUUSI, "\275\365\277\364\273\354"},
{JOSUUSI, "\275\365\277\364"},
{SUUSI, "\277\364\273\354"},
{RENTAISHI, "\317\242\302\316\273\354"},
{RENTAISHI, "\317\242\302\316"},
{SETSUZOKU, "\300\334\302\263\273\354"},
{SETSUZOKU, "\300\334\302\263"},
{KANDOUSHI, "\264\266\306\260"},
{JOSUUSHI, "\275\365\277\364\273\354"},
{JOSUUSHI, "\275\365\277\364"},
{SUUSHI, "\277\364\273\354"},
{SETTOU_1, "\300\334\306\254\270\354"},
{SETTOU_1, "\300\334\306\254\243\261"},
{SETTOU_2, "\300\334\306\254\243\262"},
{SETTOU_3, "\300\334\306\254\243\263"},
{SETTOU_4, "\300\334\306\254\243\264"},
{SETTOU_5, "\300\334\306\254\243\265"},
{SETUBI_1, "\300\334\310\370\270\354"},
{SETUBI_1, "\300\334\310\370\243\261"},
{SETUBI_2, "\300\334\310\370\243\262"},
{SETUBI_3, "\300\334\310\370\243\263"},
{SETUBI_4, "\300\334\310\370\243\264"},
{SETUBI_5, "\300\334\310\370\243\265"},
{SETUBI_6, "\300\334\310\370\243\266"},
{SETUBI_7, "\300\334\310\370\243\267"},
{SETUBI_8, "\300\334\310\370\243\270"},
{SETUBI_9, "\300\334\310\370\243\271"},
{FUKUSI_1, "\311\373\273\354"},
{FUKUSI_1, "\311\373\243\261"},
{FUKUSI_2, "\311\373\243\262"},
{FUKUSI_3, "\311\373\243\263"},
{FUKUSI_4, "\311\373\243\264"},
{FUKUSI_5, "\311\373\243\265"},
{FUKUSI_6, "\311\373\243\266"},
{FUKUSI_7, "\311\373\243\267"},
{FUKUSI_8, "\311\373\243\270"},
{FUKUSI_9, "\311\373\243\271"},
{JOSUUSI2, "\275\365\277\364\243\262"},
{KEIYOUSI_1, "\267\301\315\306\273\354"},
{KEIYOUSI_1, "\267\301\243\261"},
{KEIYOUSI_2, "\267\301\243\262"},
{KEIYOUSI_3, "\267\301\243\263"},
{KEIYOUSI_4, "\267\301\243\264"},
{KEIYOUSI_5, "\267\301\243\265"},
{KEIYOUSI_6, "\267\301\243\266"},
{KEIYOUSI_7, "\267\301\243\267"},
{KEIYOUSI_8, "\267\301\243\270"},
{KEIYOUSI_9, "\267\301\243\271"},
{KEIYOUSI_10, "\267\301\243\261\243\260"},
{KEIYOUSI_11, "\267\301\243\261\243\261"},
{KE_DOUSI_1, "\267\301\315\306\306\260\273\354"},
{KE_DOUSI_1, "\267\301\306\260\243\261"},
{KE_DOUSI_2, "\267\301\306\260\243\262"},
{KE_DOUSI_3, "\267\301\306\260\243\263"},
{KE_DOUSI_4, "\267\301\306\260\243\264"},
{KE_DOUSI_5, "\267\301\306\260\243\265"},
{KE_DOUSI_6, "\267\301\306\260\243\266"},
{KE_DOUSI_7, "\267\301\306\260\243\267"},
{KE_DOUSI_8, "\267\301\306\260\243\270"},
{KE_DOUSI_9, "\267\301\306\260\243\271"},
{SETSUBI_1, "\300\334\310\370\270\354"},
{SETSUBI_1, "\300\334\310\370\243\261"},
{SETSUBI_2, "\300\334\310\370\243\262"},
{SETSUBI_3, "\300\334\310\370\243\263"},
{SETSUBI_4, "\300\334\310\370\243\264"},
{SETSUBI_5, "\300\334\310\370\243\265"},
{SETSUBI_6, "\300\334\310\370\243\266"},
{SETSUBI_7, "\300\334\310\370\243\267"},
{SETSUBI_8, "\300\334\310\370\243\270"},
{SETSUBI_9, "\300\334\310\370\243\271"},
{FUKUSHI_1, "\311\373\273\354"},
{FUKUSHI_1, "\311\373\243\261"},
{FUKUSHI_2, "\311\373\243\262"},
{FUKUSHI_3, "\311\373\243\263"},
{FUKUSHI_4, "\311\373\243\264"},
{FUKUSHI_5, "\311\373\243\265"},
{FUKUSHI_6, "\311\373\243\266"},
{FUKUSHI_7, "\311\373\243\267"},
{FUKUSHI_8, "\311\373\243\270"},
{FUKUSHI_9, "\311\373\243\271"},
{JOSUUSHI2, "\275\365\277\364\243\262"},
{KEIYOUSHI_1, "\267\301\315\306\273\354"},
{KEIYOUSHI_1, "\267\301\243\261"},
{KEIYOUSHI_2, "\267\301\243\262"},
{KEIYOUSHI_3, "\267\301\243\263"},
{KEIYOUSHI_4, "\267\301\243\264"},
{KEIYOUSHI_5, "\267\301\243\265"},
{KEIYOUSHI_6, "\267\301\243\266"},
{KEIYOUSHI_7, "\267\301\243\267"},
{KEIYOUSHI_8, "\267\301\243\270"},
{KEIYOUSHI_9, "\267\301\243\271"},
{KEIYOUSHI_10, "\267\301\243\261\243\260"},
{KEIYOUSHI_11, "\267\301\243\261\243\261"},
{KE_DOUSHI_1, "\267\301\315\306\306\260\273\354"},
{KE_DOUSHI_1, "\267\301\306\260\243\261"},
{KE_DOUSHI_2, "\267\301\306\260\243\262"},
{KE_DOUSHI_3, "\267\301\306\260\243\263"},
{KE_DOUSHI_4, "\267\301\306\260\243\264"},
{KE_DOUSHI_5, "\267\301\306\260\243\265"},
{KE_DOUSHI_6, "\267\301\306\260\243\266"},
{KE_DOUSHI_7, "\267\301\306\260\243\267"},
{KE_DOUSHI_8, "\267\301\306\260\243\270"},
{KE_DOUSHI_9, "\267\301\306\260\243\271"},
{DO_SAHEN, "\306\260\241\246\245\265\312\321"},
{DO_SAHEN, "\245\265\312\321"},
{DO_ZAHEN, "\306\260\241\246\245\266\312\321"},
@ -202,21 +202,21 @@ static struct hlist {
{SP_SA_MI1, "\245\265\312\321\314\244\243\261"},
{SP_SA_MI2, "\245\265\312\321\314\244\243\262"},
{SP_SA_YOU, "\245\265\312\321\314\244\315\321"},
{SP_SA_SYU, "\245\265\312\321\275\252\302\316"},
{SP_SA_SHU, "\245\265\312\321\275\252\302\316"},
{SP_SA_KAT, "\245\265\312\321\262\276"},
{SP_SA_ME1, "\245\265\312\321\314\277\243\261"},
{SP_SA_ME2, "\245\265\312\321\314\277\243\262"},
{SP_KA_MIZ, "\245\253\312\321\314\244"},
{SP_KA_YOU, "\245\253\312\321\315\321"},
{SP_KA_SYU, "\245\253\312\321\275\252\302\316"},
{SP_KA_SHU, "\245\253\312\321\275\252\302\316"},
{SP_KA_KAT, "\245\253\312\321\262\276"},
{SP_KA_MEI, "\245\253\312\321\314\277"},
{TEINEI1, "\303\372\307\253\243\261"},
{TEINEI2, "\303\372\307\253\243\262"},
{SP_KA_ONB, "\245\253\270\336\262\273\312\330"},
{SP_FUKUSI, "\306\303\274\354\311\373"},
{AISATU, "\260\247\273\242"},
{SP_KEIYOUSI, "\306\303\274\354\267\301\315\306"},
{SP_FUKUSHI, "\306\303\274\354\311\373"},
{AISATSU, "\260\247\273\242"},
{SP_KEIYOUSHI, "\306\303\274\354\267\301\315\306"},
{TANKANJI, "\303\261\264\301\273\372"},
{TANKANJI, "\303\261\264\301"},
{IKKATU, "\260\354\263\347"},
@ -227,7 +227,7 @@ int code;
{
struct hlist* p;
for(p = hinsi; p->code; p++) {
for(p = hinshi; p->code; p++) {
if(p->code == code)
return p->str;
}
@ -240,7 +240,7 @@ char* str;
{
struct hlist* p;
for(p = hinsi; p->code; p++) {
for(p = hinshi; p->code; p++) {
if(strcmp(p->str, str) == 0)
return p->code;
}

22
kanakan.h
View file

@ -38,14 +38,14 @@
#include "Struct.h"
/* adddic.c */
unsigned int adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi);
unsigned int adddic(unsigned char* yomi, unsigned char* kanji, TypeGram hinshi);
/* addelcmn.c */
void set_size(unsigned char* p, int size, int plen, int nlen);
unsigned int addel_arg(unsigned char* yp, unsigned char* kp, TypeGram grm, unsigned char* nyp, int len);
int cvtknj(unsigned char* yomi, unsigned char* knj, unsigned char* dst);
int srchkana(unsigned char** ptr, int* saml);
int srchgram(unsigned char* ptr, unsigned char** dst, TypeGram hinsi);
int srchgram(unsigned char* ptr, unsigned char** dst, TypeGram hinshi);
int srchkanji(unsigned char** dst, unsigned char* knj, int klen);
TypeIdxOfs count_uidx(void);
void chg_uidx(TypeDicSeg seg, unsigned char* yomi, int len);
@ -81,7 +81,7 @@ void cvtkouho(KHREC* krec);
void setstyrec(KHREC* krec);
/* deldic.c */
unsigned int deldic(unsigned char* yomi, unsigned char* kanji, TypeGram hinsi);
unsigned int deldic(unsigned char* yomi, unsigned char* kanji, TypeGram hinshi);
/* depend.c */
DictFile* opendict(char* name, char* passwd);
@ -124,12 +124,12 @@ void getrank(void);
int euc_codesize(unsigned char c);
int hzstrlen(unsigned char* ptr, int len);
/* mkbunset.c */
void mkbunsetu(void);
/* mkbunsetsu.c */
void mkbunsetsu(void);
CLREC* argclrec(int len);
/* mkjiritu.c */
void mkjiritu(int mode);
/* mkjiritsu.c */
void mkjiritsu(int mode);
JREC* argjrec(int len, JREC* rec);
/* mkkouho.c */
@ -171,7 +171,7 @@ int ph2knj(unsigned char* zyomi, unsigned char* kanji, int knjlen);
int ph_khtbl(CLREC* clrec);
/* setconj.c */
int setconj(TypeGram hinsi, JREC* jrec, CREC* crec);
int setconj(TypeGram hinshi, JREC* jrec, CREC* crec);
/* setjrec.c */
int setj_atrb(unsigned char* p);
@ -195,9 +195,9 @@ int hiraknj_kask(unsigned char*, int*);
int hiraknj_norm(unsigned char*, int*);
int hiraknj_hira(unsigned char*, int*);
/* setubi.c */
unsigned char* getstb(TypeGram hinsi);
void setubi(JREC* rec, unsigned char* stbtbl);
/* setsubi.c */
unsigned char* getstb(TypeGram hinshi);
void setsubi(JREC* rec, unsigned char* stbtbl);
/* skipkstr.c */
unsigned char* skipkstr(unsigned char* ptr);

2
key.h
View file

@ -50,7 +50,7 @@
#define KEY_WRAPBACK 19
#define KEY_HELP 20
#define KEY_TOROKU 21
#define KEY_SYOUKYO 22
#define KEY_SHOUKYO 22
#define KEY_SJRC 23
#define KEY_HA_KET 24

4
knjcvt.c
View file

@ -115,7 +115,7 @@ make_divlist(DivList* parent, unsigned char* knj, int len) {
if(j <= 2 || !(num = isknjexist(knj, j))) continue;
tmprec.len = 2;
tmprec.code[0] = (OffsetAssyuku | ((num >> 8) & 0xff));
tmprec.code[0] = (OffsetAsshuku | ((num >> 8) & 0xff));
tmprec.code[1] = (num & 0xff);
tmprec.child = NULL;
tmplen = make_divlist(&tmprec, knj + j, len - j) + 2;
@ -137,7 +137,7 @@ make_divlist(DivList* parent, unsigned char* knj, int len) {
if(string_cmp(askknj[i]->kptr, j, knj, j)) continue;
tmprec.len = 1;
tmprec.code[0] = (KanjiAssyuku | i);
tmprec.code[0] = (KanjiAsshuku | i);
tmprec.child = NULL;
tmplen = make_divlist(&tmprec, knj + j, len - j) + 1;

16
level1.c
View file

@ -658,7 +658,7 @@ error1:
return ReadErrorFlag ? ERROR : result;
}
int sj3_bunsetu_henkan(SJ3_CLIENT_ENV* client,
int sj3_bunsetsu_henkan(SJ3_CLIENT_ENV* client,
unsigned char* yomi,
int len,
unsigned char* kanji,
@ -692,7 +692,7 @@ int sj3_bunsetu_henkan(SJ3_CLIENT_ENV* client,
return ReadErrorFlag ? ERROR : result;
}
int sj3_bunsetu_jikouho(SJ3_CLIENT_ENV* client,
int sj3_bunsetsu_jikouho(SJ3_CLIENT_ENV* client,
unsigned char* kanji,
int mode,
int mb_flag) {
@ -716,7 +716,7 @@ int sj3_bunsetu_jikouho(SJ3_CLIENT_ENV* client,
return ReadErrorFlag ? ERROR : result;
}
int sj3_bunsetu_maekouho(SJ3_CLIENT_ENV* client,
int sj3_bunsetsu_maekouho(SJ3_CLIENT_ENV* client,
unsigned char* kanji, int mode, int mb_flag) {
int result;
@ -738,7 +738,7 @@ int sj3_bunsetu_maekouho(SJ3_CLIENT_ENV* client,
return ReadErrorFlag ? ERROR : result;
}
int sj3_bunsetu_kouhosuu(SJ3_CLIENT_ENV* client,
int sj3_bunsetsu_kouhosuu(SJ3_CLIENT_ENV* client,
unsigned char* yomi,
int len,
int mb_flag) {
@ -770,7 +770,7 @@ int sj3_bunsetu_kouhosuu(SJ3_CLIENT_ENV* client,
return ReadErrorFlag ? ERROR : result;
}
int sj3_bunsetu_zenkouho(SJ3_CLIENT_ENV* client,
int sj3_bunsetsu_zenkouho(SJ3_CLIENT_ENV* client,
unsigned char* yomi,
int len,
SJ3_DOUON* douon,
@ -810,7 +810,7 @@ int sj3_bunsetu_zenkouho(SJ3_CLIENT_ENV* client,
return ReadErrorFlag ? ERROR : cnt;
}
int sj3_tango_gakusyuu(SJ3_CLIENT_ENV* client, SJ3_STUDYREC* stdy) {
int sj3_tango_gakushuu(SJ3_CLIENT_ENV* client, SJ3_STUDYREC* stdy) {
int buflen;
client_init(client);
@ -831,7 +831,7 @@ int sj3_tango_gakusyuu(SJ3_CLIENT_ENV* client, SJ3_STUDYREC* stdy) {
return ReadErrorFlag ? ERROR : 0;
}
int sj3_bunsetu_gakusyuu(SJ3_CLIENT_ENV* client,
int sj3_bunsetsu_gakushuu(SJ3_CLIENT_ENV* client,
unsigned char* yomi1,
unsigned char* yomi2,
SJ3_STUDYREC* stdy,
@ -943,7 +943,7 @@ int sj3_tango_sakujo(SJ3_CLIENT_ENV* client,
return ReadErrorFlag ? ERROR : 0;
}
int sj3_tango_syutoku(SJ3_CLIENT_ENV* client,
int sj3_tango_shutoku(SJ3_CLIENT_ENV* client,
int dicid,
unsigned char* buf,
int mb_flag) {

18
libif.c
View file

@ -50,12 +50,12 @@ int (*len_func[3])() = {0, sjislen, euclen};
#define YOMILEN 32
#define KLEN 64
SJ2_henkan(yomiout, bun, kanjiout, kanjilen) struct bunsetu_sj3* bun;
SJ2_henkan(yomiout, bun, kanjiout, kanjilen) struct bunsetsu_sj3* bun;
wchar16_t *yomiout, *kanjiout;
int kanjilen;
{
int retv;
SJ3_BUNSETU sbun[BUFFLENGTH];
SJ3_BUNSETSU sbun[BUFFLENGTH];
int i, sentou, saigo;
unsigned char yomi[BUFFLENGTH * 3];
unsigned char kanji[BUFFLENGTH * 6];
@ -157,7 +157,7 @@ int reconv;
(void)memcpy(&(d[i].dcid),
&(d_sjis[i].dcid), SJ3_WORD_ID_SIZE);
d[i].wlen = (int)mbstowcs(d[i].ddata, (char*)d_sjis[i].ddata,
SJ3_BUNSETU_KANJI * 2);
SJ3_BUNSETSU_KANJI * 2);
d[i].dlen = wcbyte(d[i].ddata);
d[i].valid = (char)1;
}
@ -176,7 +176,7 @@ int reconv;
SJ2_study(dcid) struct studyrec* dcid;
{
sj3_gakusyuu(dcid);
sj3_gakushuu(dcid);
}
SJ2_clstudy(yomi1, yomi2, dcid)
@ -191,9 +191,9 @@ struct studyrec* dcid;
(void)wcstombs((char*)y2, yomi2, BUFFLENGTH * 2);
if(current_locale == LC_CTYPE_SHIFTJIS) {
sj3_gakusyuu2(y1, y2, dcid);
sj3_gakushuu2(y1, y2, dcid);
} else {
sj3_gakusyuu2_euc(y1, y2, dcid);
sj3_gakushuu2_euc(y1, y2, dcid);
}
}
@ -216,7 +216,7 @@ int hinshi;
return (ret);
}
SJ2_syoukyo(yomi, kanji, hinshi)
SJ2_shoukyo(yomi, kanji, hinshi)
wchar16_t* yomi,
*kanji;
int hinshi;
@ -228,9 +228,9 @@ int hinshi;
(void)wcstombs((char*)y, yomi, (YOMILEN + 1) * 3);
(void)wcstombs((char*)k, kanji, (KLEN + 1) * 3);
if(current_locale == LC_CTYPE_SHIFTJIS) {
ret = sj3_syoukyo(y, k, hinshi);
ret = sj3_shoukyo(y, k, hinshi);
} else {
ret = sj3_syoukyo_euc(y, k, hinshi);
ret = sj3_shoukyo_euc(y, k, hinshi);
}
return (ret);
}

54
makelist.c
View file

@ -41,13 +41,13 @@
extern DouonRec* douon_ptr;
extern int douon_num;
extern int yomi_len;
extern int hinsi_num;
extern int hinshi_num;
extern int kanji_len;
extern HindoRec* hindo[];
extern int hindo_num;
extern HindoRec* askknj[];
extern int askknj_num;
extern HindoRec* assyuku;
extern HindoRec* asshuku;
static DouonRec* drectmp = NULL;
@ -68,8 +68,8 @@ clearklist(KanjiRec* krec) {
}
static void
clearhlist(HinsiRec* hrec) {
HinsiRec* p;
clearhlist(HinshiRec* hrec) {
HinshiRec* p;
while(hrec) {
@ -125,24 +125,24 @@ makekanji(int* yomi, int* kanji, int* atr, int* len) {
if((i = top_strcmp(yomi, kanji)) != 0) {
kanji += i;
ktmp[pos++] = (ZenHiraAssyuku | (i - 1));
ktmp[pos++] = (ZenHiraAsshuku | (i - 1));
}
else if((i = top_strcmp(kana, kanji)) != 0) {
kanji += i;
ktmp[pos++] = (ZenKataAssyuku | (i - 1));
ktmp[pos++] = (ZenKataAsshuku | (i - 1));
}
while(*kanji) {
if((i = last_strcmp(yomi, kanji)) != 0) {
kanji += i;
ktmp[pos++] = (ZenHiraAssyuku | (i - 1));
ktmp[pos++] = (ZenHiraAsshuku | (i - 1));
}
else if((i = last_strcmp(kana, kanji)) != 0) {
kanji += i;
ktmp[pos++] = (ZenKataAssyuku | (i - 1));
ktmp[pos++] = (ZenKataAsshuku | (i - 1));
}
else if(((*kanji >> 8) & 0xff) == SS2 || *kanji < 0x100) {
@ -230,17 +230,17 @@ make_krec(unsigned char* kcode, int klen) {
return krec;
}
static HinsiRec*
make_hrec(int hinsi) {
HinsiRec* hrec;
static HinshiRec*
make_hrec(int hinshi) {
HinshiRec* hrec;
hrec = (HinsiRec*)Malloc(sizeof(HinsiRec));
hrec = (HinshiRec*)Malloc(sizeof(HinshiRec));
if(!hrec) {
fprintf(stderr, "\245\341\245\342\245\352\244\254\311\324\302\255\244\267\244\336\244\267\244\277");
exit(1);
}
hrec->hinsi = hinsi;
hrec->hinshi = hinshi;
hrec->krec = NULL;
hrec->hnext = NULL;
@ -317,7 +317,7 @@ douon_knj(DouonRec* drec) {
int len = 0;
unsigned char* p;
unsigned char* knjofscvt();
HinsiRec* hrec;
HinshiRec* hrec;
KanjiRec* krec;
for(hrec = drec->hrec; hrec; hrec = hrec->hnext) {
@ -343,7 +343,7 @@ douon_knj(DouonRec* drec) {
static void
make_d_list(DouonRec* drec) {
DouonRec *dptr, *dprev;
HinsiRec* hptr;
HinshiRec* hptr;
KanjiRec* kptr;
int ylen;
int klen;
@ -356,9 +356,9 @@ start:
if(douon_ptr == NULL) {
douon_num = 0;
yomi_len = 0;
hinsi_num = 0;
hinshi_num = 0;
kanji_len = 0;
assyuku = NULL;
asshuku = NULL;
}
klen = douon_knj(drec);
@ -372,8 +372,8 @@ start:
douon_num * DouonBlkSizeNumber + DouonBlkSizeNumber +
yomi_len + ylen +
hinsi_num + hnum +
hinsi_num + hnum +
hinshi_num + hnum +
hinshi_num + hnum +
kanji_len + klen;
len = (i <= MainSegmentLength) ? 0 : decide_knjask();
@ -404,7 +404,7 @@ start:
yomi_len += ylen;
hinsi_num += hnum;
hinshi_num += hnum;
kanji_len += klen;
@ -438,7 +438,7 @@ start:
askknj_num = 0;
clear_assyuku();
clear_asshuku();
goto start;
}
@ -467,11 +467,11 @@ void flush_douon(void) {
}
}
void makelist(int* yomi, int* kanji, int hinsi, int* atr) {
void makelist(int* yomi, int* kanji, int hinshi, int* atr) {
unsigned char* ycode;
unsigned char* kcode;
int klen;
HinsiRec* hrec;
HinshiRec* hrec;
KanjiRec * krec, *kprev;
ycode = makeyomi(yomi);
@ -489,7 +489,7 @@ void makelist(int* yomi, int* kanji, int hinsi, int* atr) {
drectmp = make_drec(ycode);
hrec = make_hrec(hinsi);
hrec = make_hrec(hinshi);
drectmp->hrec = hrec;
drectmp->hrec_num = 1;
@ -500,9 +500,9 @@ void makelist(int* yomi, int* kanji, int hinsi, int* atr) {
}
for(hrec = drectmp->hrec; hrec->hnext; hrec = hrec->hnext)
if(hrec->hinsi == hinsi) break;
if(hrec->hinshi == hinshi) break;
if(hrec->hinsi == hinsi) {
if(hrec->hinshi == hinshi) {
for(krec = hrec->krec; krec; krec = krec->knext) {
@ -528,7 +528,7 @@ void makelist(int* yomi, int* kanji, int hinsi, int* atr) {
return;
}
hrec->hnext = make_hrec(hinsi);
hrec->hnext = make_hrec(hinshi);
hrec = hrec->hnext;
drectmp->hrec_num += 1;

22
makeseg.c
View file

@ -57,9 +57,9 @@ set_ofsask(unsigned char* src, unsigned char* dst) {
for(len = ofsrec->klen, ptr = ofsrec->kptr; len > 0;) {
switch(*ptr & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenKataAssyuku:
case KanjiAssyuku:
case ZenHiraAsshuku:
case ZenKataAsshuku:
case KanjiAsshuku:
*dst++ = *ptr++;
len -= 1;
break;
@ -73,7 +73,7 @@ set_ofsask(unsigned char* src, unsigned char* dst) {
len -= 2;
break;
#endif
case OffsetAssyuku:
case OffsetAsshuku:
fprintf(stderr, "\306\363\275\305\244\313\245\252\245\325\245\273\245\303\245\310\244\254\273\262\276\310\244\265\244\354\244\306\244\244\244\353\n");
exit(1);
case AiAttribute:
@ -101,9 +101,9 @@ make_knjstr(unsigned char* src, int len, unsigned char* dst) {
while(len > 0) {
switch(*src & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenKataAssyuku:
case KanjiAssyuku:
case ZenHiraAsshuku:
case ZenKataAsshuku:
case KanjiAsshuku:
*dst++ = *src++;
len -= 1;
break;
@ -117,7 +117,7 @@ make_knjstr(unsigned char* src, int len, unsigned char* dst) {
len -= 2;
break;
#endif
case OffsetAssyuku:
case OffsetAsshuku:
dst = set_ofsask(src, dst);
src += 2;
len -= 2;
@ -173,7 +173,7 @@ make_knjask(void) {
void makeseg(void) {
unsigned char buf[MainSegmentLength];
DouonRec* drec;
HinsiRec* hrec;
HinshiRec* hrec;
KanjiRec* krec;
int i, j, k;
int slen;
@ -242,7 +242,7 @@ void makeseg(void) {
for(hrec = drec->hrec; hrec; hrec = hrec->hnext) {
datset(hrec->hinsi);
datset(hrec->hinshi);
for(krec = hrec->krec; krec; krec = krec->knext) {
@ -259,7 +259,7 @@ void makeseg(void) {
Free(q);
}
datset(HinsiBlkTerm);
datset(HinshiBlkTerm);
}
i = dst - sdst;

6
mk2claus.c
View file

@ -31,7 +31,7 @@
#include "sj_right.h"
int terminate(), priority();
void mkjiritu(), mkbunsetu(), wakachi(), pritiny();
void mkjiritsu(), mkbunsetsu(), wakachi(), pritiny();
void free_clall(), free_jall();
static int set2nd(clrec)
@ -40,9 +40,9 @@ CLREC* clrec;
CLREC* rec2;
mkjiritu(DO_IKKATU | DO_CLSTUDY);
mkjiritsu(DO_IKKATU | DO_CLSTUDY);
mkbunsetu();
mkbunsetsu();
if(!maxclptr) {
wakachi();

20
mkbunset.c → mkbunsetsu.c
View file

@ -30,15 +30,15 @@
#include <sys/types.h>
#include <string.h>
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "kanakan.h"
int terminate();
void setclrec(), srchfzk();
void mkbunsetu(void) {
void mkbunsetsu(void) {
JREC* jrec;
TypeGram hinsi;
TypeGram hinshi;
unsigned char* cnj;
CREC crec[4];
int count;
@ -54,12 +54,12 @@ void mkbunsetu(void) {
while(jrec) {
if(jrec->stbofs && (cnj = getstb(jrec->hinsi)))
hinsi = StbHinsi(cnj + jrec->stbofs - 1);
if(jrec->stbofs && (cnj = getstb(jrec->hinshi)))
hinshi = StbHinshi(cnj + jrec->stbofs - 1);
else
hinsi = jrec->hinsi;
hinshi = jrec->hinshi;
if((right = Connadr[hinsi]) != '\0') {
if((right = Connadr[hinshi]) != '\0') {
gobilen = 0;
next = cnvstart + jrec->jlen;
@ -71,7 +71,7 @@ void mkbunsetu(void) {
srchfzk(jrec, next, right, 0);
}
else if((count = setconj(hinsi, jrec, crec)) != 0) {
else if((count = setconj(hinshi, jrec, crec)) != 0) {
for(i = count; i-- > 0;) {
@ -131,7 +131,7 @@ argclrec(int len) {
if(((int)ptr->cllen < len) ||
(((int)ptr->cllen == len) &&
(ptr->jnode->hinsi == TANKANJI))) {
(ptr->jnode->hinshi == TANKANJI))) {
rec->clsort = maxclptr;
maxclptr = rec;
return rec;
@ -140,7 +140,7 @@ argclrec(int len) {
while((child = ptr->clsort) != NULL) {
if((int)child->cllen < len ||
((int)child->cllen == len &&
child->jnode->hinsi == TANKANJI)) {
child->jnode->hinshi == TANKANJI)) {
ptr->clsort = rec;
rec->clsort = child;
return rec;

6
mkjiritu.c → mkjiritsu.c
View file

@ -37,7 +37,7 @@ int srchhead();
static void dic_mu(int mode);
static void dic_cl(void);
void mkjiritu(int mode) {
void mkjiritsu(int mode) {
unsigned char chkind1;
unsigned char chkind2;
JREC* jrec;
@ -76,8 +76,8 @@ void mkjiritu(int mode) {
}
for(jrec = maxjptr; jrec; jrec = jrec->jsort) {
if((stb = getstb(jrec->hinsi)) != NULL)
setubi(jrec, stb);
if((stb = getstb(jrec->hinshi)) != NULL)
setsubi(jrec, stb);
}
}

36
mkkouho.c
View file

@ -29,7 +29,7 @@
#include "sj_euc.h"
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "sj_suuji.h"
#include "sj_dict.h"
#include "kanakan.h"
@ -80,7 +80,7 @@ getkhtbl(CLREC* clrec) {
cl_numcmn(jrec, clrec);
break;
case C_BUNSETU:
case C_BUNSETSU:
break;
@ -102,7 +102,7 @@ cl_kanji(JREC* jrec, CLREC* clrec) {
get_askknj();
while(*ptr != HinsiBlkTerm) {
while(*ptr != HinshiBlkTerm) {
if(diffknj(jrec, ptr, kcount)) {
@ -124,10 +124,10 @@ makekan_none(unsigned char* s, unsigned char* d, int flg) {
unsigned char*
makekan_1byte(unsigned char* s, unsigned char* d, int flg) {
if((*s & KanjiModeMask) == ZenHiraAssyuku)
*d++ = 0x10 | (*s & KnjAssyukuMask);
if((*s & KanjiModeMask) == ZenHiraAsshuku)
*d++ = 0x10 | (*s & KnjAsshukuMask);
else
*d++ = 0x90 | (*s & KnjAssyukuMask);
*d++ = 0x90 | (*s & KnjAsshukuMask);
if(flg) *d++ = KanjiStrEnd;
return d;
@ -136,7 +136,7 @@ makekan_1byte(unsigned char* s, unsigned char* d, int flg) {
unsigned char*
makekan_knj(unsigned char* s, unsigned char* d, int flg) {
return makekan(askknj[*s & KnjAssyukuMask], d, flg);
return makekan(askknj[*s & KnjAsshukuMask], d, flg);
}
unsigned char*
@ -186,15 +186,15 @@ makekan(unsigned char* s, unsigned char* d, int flg) {
csize = codesize(*s);
if(s[csize] == KanjiStrEnd) {
switch(*s & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
d = makekan_1byte(s, d, flg);
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
d = makekan_1byte(s, d, flg);
break;
case OffsetAssyuku:
case OffsetAsshuku:
d = makekan_ofs(s, d, flg);
break;
@ -206,7 +206,7 @@ makekan(unsigned char* s, unsigned char* d, int flg) {
d = makekan_ascii(s, d, flg);
break;
case KanjiAssyuku:
case KanjiAsshuku:
d = makekan_knj(s, d, flg);
break;
@ -216,15 +216,15 @@ makekan(unsigned char* s, unsigned char* d, int flg) {
break;
} else
switch(*s & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
d = makekan_1byte(s, d, FALSE);
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
d = makekan_1byte(s, d, FALSE);
break;
case OffsetAssyuku:
case OffsetAsshuku:
d = makekan_ofs(s, d, FALSE);
break;
@ -236,7 +236,7 @@ makekan(unsigned char* s, unsigned char* d, int flg) {
d = makekan_ascii(s, d, FALSE);
break;
case KanjiAssyuku:
case KanjiAsshuku:
d = makekan_knj(s, d, FALSE);
break;
@ -318,7 +318,7 @@ diffknj(JREC* jrec, unsigned char* ptr, int num) {
unsigned char kbuf1[MaxWdKanjiLen];
unsigned char kbuf2[MaxWdKanjiLen];
if(jrec->hinsi == TANKANJI) return TRUE;
if(jrec->hinshi == TANKANJI) return TRUE;
makekan(ptr, kbuf1, TRUE);
@ -326,7 +326,7 @@ diffknj(JREC* jrec, unsigned char* ptr, int num) {
if((jptr = kptr->clrec->jnode) == jrec)
return FALSE;
if(jptr->hinsi == TANKANJI) continue;
if(jptr->hinshi == TANKANJI) continue;
if(jptr->class != jrec->class) continue;
@ -417,7 +417,7 @@ cl_numcmn(JREC* jrec, CLREC* clrec) {
p = dicbuf + jrec->jofsst + 1;
while(*p != HinsiBlkTerm) {
while(*p != HinshiBlkTerm) {
setkouho(clrec, (TypeDicOfs)(p - dicbuf), i);

2
offset.c
View file

@ -136,7 +136,7 @@ real_ofsrec(unsigned char* ptr) {
int i;
OffsetRec** p;
ofs = (*ptr++ & KnjAssyukuMask);
ofs = (*ptr++ & KnjAsshukuMask);
ofs <<= 8;
ofs += *ptr;

16
peepdic.c
View file

@ -36,10 +36,10 @@ unsigned char* skiphblk();
static void add_yomi(void);
static void cd2sjh_chr(unsigned char ch, unsigned char* dst);
static int next_douon(void);
static int next_hinsi(void);
static int next_hinshi(void);
static int next_kanji(void);
static int prev_douon(void);
static int prev_hinsi(void);
static int prev_hinshi(void);
static int prev_kanji(void);
static void set_buf(unsigned char* buf);
static void set_idxyomi(void);
@ -132,7 +132,7 @@ prev_kanji(void) {
unsigned char* p2;
p1 = peephptr + 1;
if(peepkptr <= p1) return prev_hinsi();
if(peepkptr <= p1) return prev_hinshi();
p2 = peepkptr;
while(p1 < p2) {
@ -144,7 +144,7 @@ prev_kanji(void) {
}
static int
prev_hinsi(void) {
prev_hinshi(void) {
unsigned char* p1;
unsigned char* p2;
int nlen;
@ -163,7 +163,7 @@ prev_hinsi(void) {
peepgrm = *peephptr;
p1 = peephptr + 1;
while(*p1 != HinsiBlkTerm) {
while(*p1 != HinshiBlkTerm) {
peepkptr = p1;
p1 = skipkstr(p1);
}
@ -218,7 +218,7 @@ prev_douon(void) {
do {
peepkptr = p1;
p1 = skipkstr(p1);
} while(*p1 != HinsiBlkTerm);
} while(*p1 != HinshiBlkTerm);
return -1;
}
@ -228,13 +228,13 @@ next_kanji(void) {
unsigned char* p1;
p1 = skipkstr(peepkptr);
if(*p1 == HinsiBlkTerm) return next_hinsi();
if(*p1 == HinshiBlkTerm) return next_hinshi();
peepkptr = p1;
return -1;
}
static int
next_hinsi(void) {
next_hinshi(void) {
unsigned char* p1;
p1 = skiphblk(peephptr);

6
ph2knj.c
View file

@ -69,8 +69,8 @@ int ph2knj(unsigned char* zyomi, unsigned char* kanji, int knjlen) {
while(cnvlen && kanjilen) {
if(!clt1st) {
mkjiritu(DO_CLSTUDY | DO_IKKATU);
mkbunsetu();
mkjiritsu(DO_CLSTUDY | DO_IKKATU);
mkbunsetsu();
if(!maxclptr) wakachi();
jrt1st = maxjptr;
clt1st = maxclptr;
@ -80,7 +80,7 @@ int ph2knj(unsigned char* zyomi, unsigned char* kanji, int knjlen) {
selclrec();
prevclgrm = selcl->jnode->hinsi;
prevclgrm = selcl->jnode->hinshi;
prevclrow = selcl->right;
clt1st = free_clst(clt1st, (int)selcl->cllen);

4
ph_khtbl.c
View file

@ -46,7 +46,7 @@ ph_setsty(CLREC* clrec) {
(*curdict->getdic)(curdict, jrec->jseg);
ptr = dicbuf + jrec->jofsst + 1;
for(; *ptr != HinsiBlkTerm; ptr = skipkstr(ptr)) {
for(; *ptr != HinshiBlkTerm; ptr = skipkstr(ptr)) {
offset = ptr - dicbuf;
sptr = srchstdy(jrec->jseg, offset, jrec->dicid);
@ -92,7 +92,7 @@ int ph_khtbl(CLREC* clrec) {
break;
} else
flg = TRUE;
case C_BUNSETU:
case C_BUNSETSU:
case C_MINASI:
case C_WAKACHI:
if(!khcount) ph_setkouho(clrec, (TypeDicOfs)0, (STDYIN*)0);

88
priority.c
View file

@ -28,16 +28,16 @@
*/
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "sj_right.h"
#include "sj_prty.h"
static int isfukusi(hinsi)
TypeGram hinsi;
static int isfukusi(hinshi)
TypeGram hinshi;
{
if(FUKUSI_1 <= hinsi && hinsi <= FUKUSI_7)
if(FUKUSHI_1 <= hinshi && hinshi <= FUKUSHI_7)
return TRUE;
else if(hinsi == MEISI_11 || hinsi == D_MEISI_6)
else if(hinshi == MEISHI_11 || hinshi == D_MEISHI_6)
return TRUE;
return FALSE;
}
@ -45,49 +45,49 @@ TypeGram hinsi;
static int istaigen(right)
TypeCnct right;
{
if(right == R_MEISI || right == R_DMEISI || right == R_SMEISI1)
if(right == R_MEISHI || right == R_DMEISHI || right == R_SMEISHI1)
return TRUE;
if(right == R_WO_MEISI || right == R_DAIMEISI || right == R_JOSUUSI)
if(right == R_WO_MEISHI || right == R_DAIMEISHI || right == R_JOSUUSHI)
return TRUE;
if(right == R_RENYOU1 || (R_RENYOU3 <= right && right <= R_SA5RENYOU4))
return TRUE;
return FALSE;
}
static int taicnt(hinsi1, hinsi2)
TypeGram hinsi1;
TypeGram hinsi2;
static int taicnt(hinshi1, hinshi2)
TypeGram hinshi1;
TypeGram hinshi2;
{
if(hinsi2 == TANKANJI) return 0;
if(hinshi2 == TANKANJI) return 0;
if(MYOUJI <= hinsi1 && hinsi1 <= KEN_KU) {
if(MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9)
return Taipri(hinsi1 - MYOUJI, hinsi2);
if(MYOUJI <= hinshi1 && hinshi1 <= KEN_KU) {
if(MEISHI_1 <= hinshi2 && hinshi2 <= SETSUBI_9)
return Taipri(hinshi1 - MYOUJI, hinshi2);
else
return 3;
} else if((MEISI_1 <= hinsi1 && hinsi1 <= MEISI_11) ||
hinsi1 == D_MEISI_2) {
if(MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9) {
return Taipri(5, hinsi2);
} else if((MEISHI_1 <= hinshi1 && hinshi1 <= MEISHI_11) ||
hinshi1 == D_MEISHI_2) {
if(MEISHI_1 <= hinshi2 && hinshi2 <= SETSUBI_9) {
return Taipri(5, hinshi2);
} else
return 5;
}
else {
if(MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9)
return Taipri(6, hinsi2);
if(MEISHI_1 <= hinshi2 && hinshi2 <= SETSUBI_9)
return Taipri(6, hinshi2);
else
return 4;
}
}
static int sttcnt(hinsi1, hinsi2)
TypeGram hinsi1;
TypeGram hinsi2;
static int sttcnt(hinshi1, hinshi2)
TypeGram hinshi1;
TypeGram hinshi2;
{
if(SETTOU_1 <= hinsi1 && hinsi1 <= SETTOU_5) {
if(MEISI_1 <= hinsi2 && hinsi2 <= SUUSI)
return Sttpri(hinsi1 - SETTOU_1, hinsi2);
if(SETTOU_1 <= hinshi1 && hinshi1 <= SETTOU_5) {
if(MEISHI_1 <= hinshi2 && hinshi2 <= SUUSHI)
return Sttpri(hinshi1 - SETTOU_1, hinshi2);
}
return 4;
}
@ -98,29 +98,29 @@ CLREC* clrec;
int prty;
CLREC* cl2rec;
int keeplen;
TypeGram hinsi1;
TypeGram hinshi1;
int i;
int prev = 0;
if(clrec->cllen == clrec->cl2len) return 0xff;
if(clrec->jnode->class == C_BUNSETU) {
if(clrec->jnode->class == C_BUNSETSU) {
prty = Termtbl[clrec->right] & GETPRI;
return (0xf0 + prty);
}
hinsi1 = clrec->jnode->hinsi;
hinshi1 = clrec->jnode->hinshi;
if(prevclrow == R_WO || prevclrow == R_WO_S ||
prevclrow == R_NI1 || prevclrow == R_DRENYOU2) {
if(clrec->kubun == K_DOUSHI || isfukusi(hinsi1))
if(clrec->kubun == K_DOUSHI || isfukusi(hinshi1))
prev = 5;
}
else if(istaigen(prevclrow)) {
if(clrec->kubun == K_TAIGEN)
prev = taicnt(prevclgrm, hinsi1);
prev = taicnt(prevclgrm, hinshi1);
else
prev = 0;
@ -130,10 +130,10 @@ CLREC* clrec;
if(clrec->jnode->sttofs)
prty = 2;
else
prty = sttcnt(prevclgrm, hinsi1);
prty = sttcnt(prevclgrm, hinshi1);
}
if(hinsi1 >= SETUBI_1 && hinsi1 <= SETUBI_9 && (!prev)) {
if(hinshi1 >= SETSUBI_1 && hinshi1 <= SETSUBI_9 && (!prev)) {
prty = 1;
goto finish;
}
@ -158,7 +158,7 @@ CLREC* clrec;
if(cl2rec->jnode->sttofs)
i = 2;
else
i = sttcnt(hinsi1, cl2rec->jnode->hinsi);
i = sttcnt(hinshi1, cl2rec->jnode->hinshi);
if(i > prty)
prty = i;
@ -170,7 +170,7 @@ CLREC* clrec;
else if(istaigen(clrec->right)) {
prty = 0;
while(cl2rec && (int)cl2rec->cllen == keeplen) {
i = taicnt(hinsi1, cl2rec->jnode->hinsi);
i = taicnt(hinshi1, cl2rec->jnode->hinshi);
if(i > prty)
prty = i;
cl2rec = cl2rec->clsort;
@ -203,8 +203,8 @@ CLREC* clrec;
if(cl2rec->kubun == K_DOUSHI) {
prty = 6;
goto finish;
} else if(cl2rec->jnode->hinsi == SETUBI_1 ||
cl2rec->jnode->hinsi == SETUBI_2) {
} else if(cl2rec->jnode->hinshi == SETSUBI_1 ||
cl2rec->jnode->hinshi == SETSUBI_2) {
prty = 7;
goto finish;
}
@ -217,16 +217,16 @@ CLREC* clrec;
finish:
cl2rec = maxclptr;
if(hinsi1 == SUUSI) prty -= 4;
if(hinshi1 == SUUSHI) prty -= 4;
if(cl2rec->jnode->hinsi == SUUSI) prty -= 3;
if(cl2rec->jnode->hinshi == SUUSHI) prty -= 3;
if(cl2rec->jnode->class == C_DICT &&
cl2rec->jnode->jlen == 1 && (cl2rec->kubun != K_DOUSHI)) {
prty -= 2;
}
if((!istaigen(clrec->right)) && (cl2rec->jnode->hinsi == SETUBI_2)) {
if((!istaigen(clrec->right)) && (cl2rec->jnode->hinshi == SETSUBI_2)) {
prty -= 4;
}
@ -244,7 +244,7 @@ void pritiny() {
if(istaigen(prevclrow)) {
while(clrec && (int)clrec->cllen == keeplen) {
i = taicnt(prevclgrm, clrec->jnode->hinsi);
i = taicnt(prevclgrm, clrec->jnode->hinshi);
if(i > prty) {
selcl = clrec;
prty = i;
@ -256,11 +256,11 @@ void pritiny() {
else {
while(clrec && (int)clrec->cllen == keeplen) {
if(clrec->jnode->hinsi >= MYOUJI &&
clrec->jnode->hinsi <= KEN_KU)
if(clrec->jnode->hinshi >= MYOUJI &&
clrec->jnode->hinshi <= KEN_KU)
clrec = clrec->clsort;
else if(clrec->jnode->hinsi == TANKANJI)
else if(clrec->jnode->hinshi == TANKANJI)
return;
else {
selcl = clrec;

62
readline.c
View file

@ -37,7 +37,7 @@
/* static long lineloc; */
static int yomi[MaxYomiLength + 1];
static int kanji[MaxKanjiLength + 1];
static int hinsi[MaxHinsiNumber + 1];
static int hinshi[MaxHinshiNumber + 1];
static int atr[MaxAtrNumber + 1];
static void
@ -85,10 +85,10 @@ skip_blank(void) {
}
static int
readhinsi(void) {
readhinshi(void) {
static int c = 0;
int i;
unsigned char hinsi[128];
unsigned char hinshi[128];
int flg;
retry:
@ -108,48 +108,48 @@ retry:
if(c == '\n' || c == ':') break;
if(Isillegal(c)) error(IllegalFormat);
if(c > 0xffffff) {
if(i >= 126) error(TooLongHinsi);
hinsi[i++] = ((c >> 24) & 0xff);
if(i >= 126) error(TooLongHinsi);
hinsi[i++] = ((c >> 16) & 0xff);
if(i >= 126) error(TooLongHinsi);
hinsi[i++] = ((c >> 8) & 0xff);
if(i >= 126) error(TooLongHinshi);
hinshi[i++] = ((c >> 24) & 0xff);
if(i >= 126) error(TooLongHinshi);
hinshi[i++] = ((c >> 16) & 0xff);
if(i >= 126) error(TooLongHinshi);
hinshi[i++] = ((c >> 8) & 0xff);
} else if(c > 0xffff) {
if(i >= 126) error(TooLongHinsi);
hinsi[i++] = ((c >> 16) & 0xff);
if(i >= 126) error(TooLongHinsi);
hinsi[i++] = ((c >> 8) & 0xff);
if(i >= 126) error(TooLongHinshi);
hinshi[i++] = ((c >> 16) & 0xff);
if(i >= 126) error(TooLongHinshi);
hinshi[i++] = ((c >> 8) & 0xff);
} else if(c > 0xff) {
if(i >= 126) error(TooLongHinsi);
hinsi[i++] = ((c >> 8) & 0xff);
if(i >= 126) error(TooLongHinshi);
hinshi[i++] = ((c >> 8) & 0xff);
}
if(i >= 127) error(TooLongHinsi);
hinsi[i++] = (c & 0xff);
if(i >= 127) error(TooLongHinshi);
hinshi[i++] = (c & 0xff);
c = readchar();
}
if(i == 0) return 0;
if(hinsi[0] == '[' && hinsi[i - 1] == ']') {
hinsi[i - 1] = 0;
i = cnvhinsi(hinsi + 1);
if(hinshi[0] == '[' && hinshi[i - 1] == ']') {
hinshi[i - 1] = 0;
i = cnvhinshi(hinshi + 1);
if(i > 0) {
fprintf(stderr, "\311\312\273\354 \"%s\" \244\313\263\347\270\314\244\254\244\304\244\244\244\306\244\244\244\353\n",
hinsi + 1);
hinshi + 1);
} else if(!i) {
fprintf(stderr, "\"%s\" \244\254\245\263\241\274\245\311\262\275\244\307\244\255\244\336\244\273\244\363\n",
hinsi + 1);
hinshi + 1);
goto retry;
}
}
else {
hinsi[i] = 0;
i = cnvhinsi(hinsi);
hinshi[i] = 0;
i = cnvhinshi(hinshi);
if(!i) {
fprintf(stderr, "\"%s\" \244\254\245\263\241\274\245\311\262\275\244\307\244\255\244\336\244\273\244\363\n", hinsi);
fprintf(stderr, "\"%s\" \244\254\245\263\241\274\245\311\262\275\244\307\244\255\244\336\244\273\244\363\n", hinshi);
goto retry;
}
}
@ -208,18 +208,18 @@ int* readline(void) {
if(i == 0) error(NoKanjiString);
i = j = 0;
while((c = readhinsi()) != 0) {
while((c = readhinshi()) != 0) {
if(c < 0) {
if(i >= MaxAtrNumber) error(TooManyAtr);
atr[i++] = -c;
} else {
if(j >= MaxHinsiNumber) error(TooManyHinsi);
hinsi[j++] = c;
if(j >= MaxHinshiNumber) error(TooManyHinshi);
hinshi[j++] = c;
}
}
atr[i] = 0;
if(j == 0) hinsi[j++] = HinsiTankan;
hinsi[j] = 0;
if(j == 0) hinshi[j++] = HinshiTankan;
hinshi[j] = 0;
return yomi;
}
@ -227,5 +227,5 @@ int* readline(void) {
void setline(void (*func)(int*, int*, int, int*)) {
int i;
for(i = 0; hinsi[i]; i++) (*func)(yomi, kanji, hinsi[i], atr);
for(i = 0; hinshi[i]; i++) (*func)(yomi, kanji, hinshi[i], atr);
}

8
selclrec.c
View file

@ -29,7 +29,7 @@
#include "sj_kcnv.h"
void free_clall(), free_jall(), mkjiritu(), mkbunsetu();
void free_clall(), free_jall(), mkjiritsu(), mkbunsetsu();
void wakachi();
void selclrec() {
@ -47,7 +47,7 @@ void selclrec() {
while(rec) {
if(len > (unsigned int)rec->cllen) return;
if(rec->jnode->class == C_BUNSETU) break;
if(rec->jnode->class == C_BUNSETSU) break;
rec = rec->clsort;
}
if(!rec) return;
@ -83,9 +83,9 @@ void selclrec() {
ch = *(cnvstart + len);
*(cnvstart + len) = 0;
mkjiritu(DO_IKKATU);
mkjiritsu(DO_IKKATU);
mkbunsetu();
mkbunsetsu();
if(!maxclptr) wakachi();
jrt1st = maxjptr;

16
setconj.c
View file

@ -29,7 +29,7 @@
#include "sj_kcnv.h"
#include "sj_right.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "sj_yomi.h"
#include "kanakan.h"
@ -70,10 +70,10 @@ cnjstrcmp(unsigned char* yptr, unsigned char* cnjp, int* saml) {
static TypeCnct
cnvrow(JREC* rec, TypeCnct row) {
TypeGram hinsi;
TypeGram hinshi;
int stt;
hinsi = rec->hinsi;
hinshi = rec->hinshi;
if((stt = rec->sttofs) == SETTOU_O) {
@ -83,8 +83,8 @@ cnvrow(JREC* rec, TypeCnct row) {
else if(R_RENYOU3 <= row && row <= R_SA5RENYOU3)
row += 3;
else if((hinsi >= KEIYOUSI_1 && hinsi <= KE_DOUSI_9) ||
(hinsi == MEISI_5) || (hinsi == MEISI_9))
else if((hinshi >= KEIYOUSHI_1 && hinshi <= KE_DOUSHI_9) ||
(hinshi == MEISHI_5) || (hinshi == MEISHI_9))
;
else
@ -93,14 +93,14 @@ cnvrow(JREC* rec, TypeCnct row) {
else if(stt == SETTOU_GO) {
if(hinsi == MEISI_7 && row == R_SMEISI1)
if(hinshi == MEISHI_7 && row == R_SMEISHI1)
row++;
}
return row;
}
int setconj(TypeGram hinsi, JREC* jrec, CREC* crec) {
int setconj(TypeGram hinshi, JREC* jrec, CREC* crec) {
unsigned char* yptr;
int cmp;
TypeCnct right;
@ -109,7 +109,7 @@ int setconj(TypeGram hinsi, JREC* jrec, CREC* crec) {
int count = 0;
unsigned char* cnj;
if((cnj = Conjadr(hinsi)) != NULL) {
if((cnj = Conjadr(hinshi)) != NULL) {
saml = ofslen = 0;
yptr = cnvstart + jrec->jlen;

48
setjrec.c
View file

@ -29,7 +29,7 @@
#include "sj_euc.h"
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "kanakan.h"
int setj_atrb(unsigned char* p) {
@ -44,15 +44,15 @@ int setj_ofs(unsigned char* p) {
do {
if(p[codesize(*p)] == KanjiStrEnd) contf = FALSE;
switch(*p & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
p += setj_norm1(p);
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
p += setj_norm1(p);
break;
case OffsetAssyuku:
case OffsetAsshuku:
p += setj_ofs(p);
break;
@ -64,7 +64,7 @@ int setj_ofs(unsigned char* p) {
p += setj_norm2(p);
break;
case KanjiAssyuku:
case KanjiAsshuku:
p += setj_knj(p);
break;
@ -83,20 +83,20 @@ int setj_ofs(unsigned char* p) {
int setj_knj(unsigned char* p) {
int contf = TRUE;
p = askknj[*p & KnjAssyukuMask];
p = askknj[*p & KnjAsshukuMask];
do {
if(p[codesize(*p)] == KanjiStrEnd) contf = FALSE;
switch(*p & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
p += setj_norm1(p);
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
p += setj_norm1(p);
break;
case OffsetAssyuku:
case OffsetAsshuku:
p += setj_ofs(p);
break;
@ -108,7 +108,7 @@ int setj_knj(unsigned char* p) {
p += setj_norm2(p);
break;
case KanjiAssyuku:
case KanjiAsshuku:
p += setj_knj(p);
break;
@ -143,7 +143,7 @@ chkhead(TypeGram gram) {
if(headcode == SETTOU_DAI) {
if(gram == SUUSI) return TRUE;
if(gram == SUUSHI) return TRUE;
}
else {
@ -179,17 +179,17 @@ void setjrec(unsigned char* tagp, int mode) {
for(; ptr < endp; ptr = tmp + 1) {
for(tmp = ptr + 1; *tmp != HinsiBlkTerm;) {
for(tmp = ptr + 1; *tmp != HinshiBlkTerm;) {
switch(*tmp & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
tmp += setj_norm1(tmp);
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
tmp += setj_norm1(tmp);
break;
case OffsetAssyuku:
case OffsetAsshuku:
tmp += setj_ofs(tmp);
break;
@ -201,7 +201,7 @@ void setjrec(unsigned char* tagp, int mode) {
tmp += setj_norm2(tmp);
break;
case KanjiAssyuku:
case KanjiAsshuku:
tmp += setj_knj(tmp);
break;
@ -225,7 +225,7 @@ void setjrec(unsigned char* tagp, int mode) {
rec->jofsed = tmp - dicbuf;
rec->class = C_DICT;
rec->dicid = curdict->dicid;
rec->hinsi = gram;
rec->hinshi = gram;
rec->sttofs = headcode;
}
}
@ -248,17 +248,17 @@ void setnumrec(unsigned char* tagp, JREC* rec, TypeGram gram) {
for(; ptr < endp; ptr = tmp + 1) {
for(tmp = ptr + 1; *tmp != HinsiBlkTerm;) {
for(tmp = ptr + 1; *tmp != HinshiBlkTerm;) {
switch(*tmp & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
tmp += setj_norm1(tmp);
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
tmp += setj_norm1(tmp);
break;
case OffsetAssyuku:
case OffsetAsshuku:
tmp += setj_ofs(tmp);
break;
@ -270,7 +270,7 @@ void setnumrec(unsigned char* tagp, JREC* rec, TypeGram gram) {
tmp += setj_norm2(tmp);
break;
case KanjiAssyuku:
case KanjiAsshuku:
tmp += setj_knj(tmp);
break;
@ -300,6 +300,6 @@ void setcrec(unsigned char* tagp) {
if(!(rec = argjrec((int)ClYomiLen(tagp), (JREC*)NULL))) return;
rec->jofsst = tagp - ClStudyDict;
rec->class = C_BUNSETU;
rec->hinsi = ClGramCode(tagp);
rec->class = C_BUNSETSU;
rec->hinshi = ClGramCode(tagp);
}

12
setkouho.c
View file

@ -29,7 +29,7 @@
#include "sj_euc.h"
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "kanakan.h"
static int hiraknj(unsigned char* p);
@ -165,15 +165,15 @@ hiraknj(unsigned char* p) {
do {
if(p[codesize(*p)] == KanjiStrEnd) flg = FALSE;
switch(*p & KanjiModeMask) {
case ZenHiraAssyuku:
case ZenHiraAsshuku:
result = hiraknj_hask(p, &i);
break;
case ZenKataAssyuku:
case ZenKataAsshuku:
result = hiraknj_kask(p, &i);
break;
case OffsetAssyuku:
case OffsetAsshuku:
result = hiraknj_ofs(p, &i);
break;
@ -185,7 +185,7 @@ hiraknj(unsigned char* p) {
result = hiraknj_norm(p, &i);
break;
case KanjiAssyuku:
case KanjiAsshuku:
result = hiraknj_knj(p, &i);
break;
@ -213,7 +213,7 @@ int hiraknj_ofs(unsigned char* p, int* len) {
int hiraknj_knj(unsigned char* p, int* len) {
*len = 1;
return hiraknj(askknj[*p & KnjAssyukuMask]);
return hiraknj(askknj[*p & KnjAsshukuMask]);
}
int hiraknj_hask(unsigned char* p, int* len) {

10
setubi.c → setsubi.c
View file

@ -29,17 +29,17 @@
#include <string.h>
#include "sj_kcnv.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "kanakan.h"
unsigned char*
getstb(TypeGram hinsi) {
if(hinsi < MEISI_1 || hinsi > TIMEI) return NULL;
getstb(TypeGram hinshi) {
if(hinshi < MEISHI_1 || hinshi > TIMEI) return NULL;
return Stbadr(hinsi);
return Stbadr(hinshi);
}
void setubi(JREC* rec, unsigned char* stbtbl) {
void setsubi(JREC* rec, unsigned char* stbtbl) {
unsigned char* stb;
unsigned char* yptr;
unsigned char* sptr;

2
sj3err.c
View file

@ -80,7 +80,7 @@ int code;
CASE(SJ3_DictLocked, "\274\255\275\361\244\254\245\355\245\303\245\257\244\265\244\354\244\306\244\244\244\336\244\271");
CASE(SJ3_BadYomiString, "\265\366\244\265\244\354\244\312\244\244\306\311\244\337\312\270\273\372\316\363\244\307\244\271");
CASE(SJ3_BadKanjiString, "\265\366\244\265\244\354\244\312\244\244\264\301\273\372\312\270\273\372\316\363\244\307\244\271");
CASE(SJ3_BadHinsiCode, "\311\312\273\354\245\263\241\274\245\311\260\333\276\357\244\307\244\271");
CASE(SJ3_BadHinshiCode, "\311\312\273\354\245\263\241\274\245\311\260\333\276\357\244\307\244\271");
CASE(SJ3_AddDictFailed, "\274\255\275\361\305\320\317\277\244\362\274\272\307\324\244\267\244\336\244\267\244\277");
CASE(SJ3_AlreadyExistWord, "\244\271\244\307\244\313\302\270\272\337\244\267\244\306\244\244\244\336\244\271");
CASE(SJ3_NoMoreDouonWord, "\244\263\244\354\260\312\276\345\306\261\262\273\270\354\244\362\305\320\317\277\244\307\244\255\244\336\244\273\244\363");

2
sj3err.h
View file

@ -73,7 +73,7 @@
#define SJ3_DictLocked 73
#define SJ3_BadYomiString 74
#define SJ3_BadKanjiString 75
#define SJ3_BadHinsiCode 76
#define SJ3_BadHinshiCode 76
#define SJ3_AddDictFailed 81
#define SJ3_AlreadyExistWord 82

82
sj3lib.c
View file

@ -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;

50
sj3lib.h
View file

@ -57,7 +57,7 @@
#define SJ3_DICT_LOCKED 2
#define SJ3_BAD_YOMI_STR 3
#define SJ3_BAD_KANJI_STR 4
#define SJ3_BAD_HINSI_CODE 5
#define SJ3_BAD_HINSHI_CODE 5
#define SJ3_WORD_EXIST 6
#define SJ3_DOUON_FULL 7
@ -66,12 +66,12 @@
#define SJ3_TOUROKU_FAILED 10
#define SJ3_WORD_NOT_EXIST 6
#define SJ3_SYOUKYO_FAILED 10
#define SJ3_SHOUKYO_FAILED 10
#define SJ3_IKKATU_YOMI 512
#define SJ3_BUNSETU_YOMI 128
#define SJ3_BUNSETU_KANJI 512
#define SJ3_BUNSETSU_YOMI 128
#define SJ3_BUNSETSU_KANJI 512
#ifndef SJ3_WORD_ID_SIZE
#define SJ3_WORD_ID_SIZE 32
@ -81,16 +81,16 @@ typedef struct studyrec {
unsigned char dummy[SJ3_WORD_ID_SIZE];
} SJ3_STUDYREC;
typedef struct bunsetu {
typedef struct bunsetsu {
int srclen;
int destlen;
unsigned char* srcstr;
unsigned char* deststr;
struct studyrec dcid;
} SJ3_BUNSETU;
} SJ3_BUNSETSU;
typedef struct douon {
unsigned char ddata[SJ3_BUNSETU_KANJI];
unsigned char ddata[SJ3_BUNSETSU_KANJI];
int dlen;
SJ3_STUDYREC dcid;
} SJ3_DOUON;
@ -158,17 +158,17 @@ int sj3_get_id_size(SJ3_CLIENT_ENV*);
int sj3_lock_server(SJ3_CLIENT_ENV*);
int sj3_unlock_server(SJ3_CLIENT_ENV*);
int sj3_ikkatu_henkan(SJ3_CLIENT_ENV*, unsigned char*, unsigned char*, int, int);
int sj3_bunsetu_henkan(SJ3_CLIENT_ENV*, unsigned char*, int, unsigned char*, int);
int sj3_bunsetu_jikouho(SJ3_CLIENT_ENV*, unsigned char*, int, int);
int sj3_bunsetu_maekouho(SJ3_CLIENT_ENV*, unsigned char*, int, int);
int sj3_bunsetu_kouhosuu(SJ3_CLIENT_ENV*, unsigned char*, int, int);
int sj3_bunsetu_zenkouho(SJ3_CLIENT_ENV*, unsigned char*, int, SJ3_DOUON*, int);
int sj3_tango_gakusyuu(SJ3_CLIENT_ENV*, SJ3_STUDYREC*);
int sj3_bunsetu_gakusyuu(SJ3_CLIENT_ENV*, unsigned char*, unsigned char*, SJ3_STUDYREC*,
int sj3_bunsetsu_henkan(SJ3_CLIENT_ENV*, unsigned char*, int, unsigned char*, int);
int sj3_bunsetsu_jikouho(SJ3_CLIENT_ENV*, unsigned char*, int, int);
int sj3_bunsetsu_maekouho(SJ3_CLIENT_ENV*, unsigned char*, int, int);
int sj3_bunsetsu_kouhosuu(SJ3_CLIENT_ENV*, unsigned char*, int, int);
int sj3_bunsetsu_zenkouho(SJ3_CLIENT_ENV*, unsigned char*, int, SJ3_DOUON*, int);
int sj3_tango_gakushuu(SJ3_CLIENT_ENV*, SJ3_STUDYREC*);
int sj3_bunsetsu_gakushuu(SJ3_CLIENT_ENV*, unsigned char*, unsigned char*, SJ3_STUDYREC*,
int);
int sj3_tango_touroku(SJ3_CLIENT_ENV*, long, unsigned char*, unsigned char*, int, int);
int sj3_tango_sakujo(SJ3_CLIENT_ENV*, long, unsigned char*, unsigned char*, int, int);
int sj3_tango_syutoku(SJ3_CLIENT_ENV*, int, unsigned char*, int);
int sj3_tango_shutoku(SJ3_CLIENT_ENV*, int, unsigned char*, int);
int sj3_tango_jikouho(SJ3_CLIENT_ENV*, int, unsigned char*, int);
int sj3_tango_maekouho(SJ3_CLIENT_ENV*, int, unsigned char*, int);
int sj3_make_dict_file(SJ3_CLIENT_ENV*, char*, int, int, int);
@ -184,25 +184,25 @@ int sj3_version(SJ3_CLIENT_ENV*, char*, int);
int sj3_open(char*, char*);
int sj3_open_with_list(char*, char*, int, char**, int*, int**);
int sj3_close(void);
int sj3_getkan(unsigned char*, SJ3_BUNSETU*, unsigned char*, int);
int sj3_getkan_euc(unsigned char*, SJ3_BUNSETU*, unsigned char*, int);
int sj3_getkan_mb(unsigned char*, SJ3_BUNSETU*, unsigned char*, int);
int sj3_getkan(unsigned char*, SJ3_BUNSETSU*, unsigned char*, int);
int sj3_getkan_euc(unsigned char*, SJ3_BUNSETSU*, unsigned char*, int);
int sj3_getkan_mb(unsigned char*, SJ3_BUNSETSU*, unsigned char*, int);
int sj3_douoncnt(unsigned char*);
int sj3_douoncnt_euc(unsigned char*);
int sj3_douoncnt_mb(unsigned char*);
int sj3_getdouon(unsigned char*, SJ3_DOUON*);
int sj3_getdouon_euc(unsigned char*, SJ3_DOUON*);
int sj3_getdouon_mb(unsigned char*, SJ3_DOUON*);
int sj3_gakusyuu(SJ3_STUDYREC*);
int sj3_gakusyuu2(unsigned char*, unsigned char*, SJ3_STUDYREC*);
int sj3_gakusyuu2_euc(unsigned char*, unsigned char*, SJ3_STUDYREC*);
int sj3_gakusyuu2_mb(unsigned char*, unsigned char*, SJ3_STUDYREC*);
int sj3_gakushuu(SJ3_STUDYREC*);
int sj3_gakushuu2(unsigned char*, unsigned char*, SJ3_STUDYREC*);
int sj3_gakushuu2_euc(unsigned char*, unsigned char*, SJ3_STUDYREC*);
int sj3_gakushuu2_mb(unsigned char*, unsigned char*, SJ3_STUDYREC*);
int sj3_touroku(unsigned char*, unsigned char*, int);
int sj3_touroku_euc(unsigned char*, unsigned char*, int);
int sj3_touroku_mb(unsigned char*, unsigned char*, int);
int sj3_syoukyo(unsigned char*, unsigned char*, int);
int sj3_syoukyo_euc(unsigned char*, unsigned char*, int);
int sj3_syoukyo_mb(unsigned char*, unsigned char*, int);
int sj3_shoukyo(unsigned char*, unsigned char*, int);
int sj3_shoukyo_euc(unsigned char*, unsigned char*, int);
int sj3_shoukyo_mb(unsigned char*, unsigned char*, int);
int sj3_getdict(unsigned char*);
int sj3_getdict_euc(unsigned char*);
int sj3_getdict_mb(unsigned char*);

6
sj3libsj3.h
View file

@ -30,20 +30,20 @@
#include "wchar16.h"
#include "sj3lib.h"
typedef struct bunsetu_sj3 {
typedef struct bunsetsu_sj3 {
int srclen;
int destlen;
wchar16_t* srcstr;
wchar16_t* deststr;
struct studyrec dcid;
} SJ3_BUNSETU_SJ3;
} SJ3_BUNSETSU_SJ3;
#ifdef valid
#undef valid
#endif
typedef struct douon_sj3 {
wchar16_t ddata[SJ3_BUNSETU_KANJI];
wchar16_t ddata[SJ3_BUNSETSU_KANJI];
int dlen;
SJ3_STUDYREC dcid;
int wlen;

18
sj_dict.h
View file

@ -39,21 +39,21 @@
#define DouonBlkSizeNumber 3
#define DicSegTerm 0xff
#define DouonBlkTerm 0xff
#define HinsiBlkTerm 0xff
#define HinshiBlkTerm 0xff
#define MaxSegmentNumber 0xffff
#define NormalKanjiMask 0x7f
#define SS3Kanji 0x0080
#define ZenHiraAssyuku 0x80
#define OffsetAssyuku 0x90
#define ZenKataAssyuku 0xa0
#define ZenHiraAsshuku 0x80
#define OffsetAsshuku 0x90
#define ZenKataAsshuku 0xa0
#define AiAttribute 0xb0
#define KanjiAssyuku 0xc0
#define KanjiAsshuku 0xc0
#define LeadingHankaku 0xd0
#define KanjiStrEnd 0x00
#define IsAssyuku 0x80
#define IsAsshuku 0x80
#define AssukuUse2byte 0x90
#define KnjAssyukuMask 0x0f
#define KnjAsshukuMask 0x0f
#define KanjiCodeMask 0x0f
#define KanjiModeMask 0xf0
#define AtrMsKanjiOfs 0xc0c0
@ -64,14 +64,14 @@
#define MaxWdYomiLen 31
#define MaxWdKanjiLen 64
#define AssyukuYomiTop 0x80
#define AsshukuYomiTop 0x80
#define NokoriYomiTop 0x40
#define getsize(p) (((int)(*(p) & 0x0f) * 0x100) + *((p) + 1))
#define getntag(p) ((*(p) == DicSegTerm) ? (p) : (p) + getsize(p))
#define getplen(p) (((*(p) & AssyukuYomiTop) ? 0x10 : 0) + (*((p) + 2) >> 4))
#define getplen(p) (((*(p) & AsshukuYomiTop) ? 0x10 : 0) + (*((p) + 2) >> 4))
#define getnlen(p) (((*(p) & NokoriYomiTop) ? 0x10 : 0) + (*((p) + 2) & 0x0f))

134
sj_hinsi.h → sj_hinshi.h
View file

@ -31,80 +31,80 @@
#define _SJ_HINSHI
#define MEISI_1 1
#define MEISI_2 2
#define MEISI_3 3
#define MEISI_4 4
#define MEISI_5 5
#define MEISI_6 6
#define MEISI_7 7
#define MEISI_8 8
#define MEISI_9 9
#define MEISI_10 10
#define MEISI_11 11
#define D_MEISI_1 12
#define D_MEISI_2 13
#define D_MEISI_3 14
#define D_MEISI_4 15
#define D_MEISI_5 16
#define D_MEISI_6 17
#define MEISI_20 18
#define MEISHI_1 1
#define MEISHI_2 2
#define MEISHI_3 3
#define MEISHI_4 4
#define MEISHI_5 5
#define MEISHI_6 6
#define MEISHI_7 7
#define MEISHI_8 8
#define MEISHI_9 9
#define MEISHI_10 10
#define MEISHI_11 11
#define D_MEISHI_1 12
#define D_MEISHI_2 13
#define D_MEISHI_3 14
#define D_MEISHI_4 15
#define D_MEISHI_5 16
#define D_MEISHI_6 17
#define MEISHI_20 18
#define MYOUJI 21
#define NAMAE 22
#define KIGYOU 23
#define TIMEI 24
#define KEN_KU 25
#define RENTAISI 26
#define SETUZOKU 27
#define KANDOUSI 28
#define JOSUUSI 29
#define SUUSI 30
#define RENTAISHI 26
#define SETSUZOKU 27
#define KANDOUSHI 28
#define JOSUUSHI 29
#define SUUSHI 30
#define SETTOU_1 31
#define SETTOU_2 32
#define SETTOU_3 33
#define SETTOU_4 34
#define SETTOU_5 35
#define SETUBI_1 36
#define SETUBI_2 37
#define SETUBI_3 38
#define SETUBI_4 39
#define SETUBI_5 40
#define SETUBI_6 41
#define SETUBI_7 42
#define SETUBI_8 43
#define SETUBI_9 44
#define FUKUSI_1 45
#define FUKUSI_2 46
#define FUKUSI_3 47
#define FUKUSI_4 48
#define FUKUSI_5 49
#define FUKUSI_6 50
#define FUKUSI_7 51
#define FUKUSI_8 52
#define FUKUSI_9 53
#define JOSUUSI2 54
#define SETSUBI_1 36
#define SETSUBI_2 37
#define SETSUBI_3 38
#define SETSUBI_4 39
#define SETSUBI_5 40
#define SETSUBI_6 41
#define SETSUBI_7 42
#define SETSUBI_8 43
#define SETSUBI_9 44
#define FUKUSHI_1 45
#define FUKUSHI_2 46
#define FUKUSHI_3 47
#define FUKUSHI_4 48
#define FUKUSHI_5 49
#define FUKUSHI_6 50
#define FUKUSHI_7 51
#define FUKUSHI_8 52
#define FUKUSHI_9 53
#define JOSUUSHI2 54
#define KEIYOUSI_1 60
#define KEIYOUSI_2 61
#define KEIYOUSI_3 62
#define KEIYOUSI_4 63
#define KEIYOUSI_5 64
#define KEIYOUSI_6 65
#define KEIYOUSI_7 66
#define KEIYOUSI_8 67
#define KEIYOUSI_9 68
#define KEIYOUSI_10 69
#define KEIYOUSI_11 70
#define KE_DOUSI_1 71
#define KE_DOUSI_2 72
#define KE_DOUSI_3 73
#define KE_DOUSI_4 74
#define KE_DOUSI_5 75
#define KE_DOUSI_6 76
#define KE_DOUSI_7 77
#define KE_DOUSI_8 78
#define KE_DOUSI_9 79
#define KEIYOUSHI_1 60
#define KEIYOUSHI_2 61
#define KEIYOUSHI_3 62
#define KEIYOUSHI_4 63
#define KEIYOUSHI_5 64
#define KEIYOUSHI_6 65
#define KEIYOUSHI_7 66
#define KEIYOUSHI_8 67
#define KEIYOUSHI_9 68
#define KEIYOUSHI_10 69
#define KEIYOUSHI_11 70
#define KE_DOUSHI_1 71
#define KE_DOUSHI_2 72
#define KE_DOUSHI_3 73
#define KE_DOUSHI_4 74
#define KE_DOUSHI_5 75
#define KE_DOUSHI_6 76
#define KE_DOUSHI_7 77
#define KE_DOUSHI_8 78
#define KE_DOUSHI_9 79
#define DO_SAHEN 80
#define DO_ZAHEN 81
@ -189,22 +189,22 @@
#define SP_SA_MI1 171
#define SP_SA_MI2 172
#define SP_SA_YOU 173
#define SP_SA_SYU 174
#define SP_SA_SHU 174
#define SP_SA_KAT 175
#define SP_SA_ME1 176
#define SP_SA_ME2 177
#define SP_KA_MIZ 178
#define SP_KA_YOU 179
#define SP_KA_SYU 180
#define SP_KA_SHU 180
#define SP_KA_KAT 181
#define SP_KA_MEI 182
#define TEINEI1 183
#define TEINEI2 184
#define SP_KA_ONB 185
#define SP_FUKUSI 186
#define AISATU 187
#define SP_KEIYOUSI 188
#define SP_FUKUSHI 186
#define AISATSU 187
#define SP_KEIYOUSHI 188
#define TANKANJI 189
#define IKKATU 200

18
sj_prty.h
View file

@ -41,8 +41,8 @@
#define P_KATEI 2
#define P_KAMEI 2
#define P_DAIMEISI 4
#define P_MEISI 6
#define P_DAIMEISHI 4
#define P_MEISHI 6
#define P_KEISIKI 4
#define P_RENYOU_F 3
#define P_RENYOU_J 11
@ -55,14 +55,14 @@
#define P_JOSHI_A 9
#define P_SETTOU 6
#define P_SETUBI 6
#define P_SUUSI 4
#define P_FUKUSI 13
#define P_F_FUKUSI 10
#define P_RENTAISI 10
#define P_SETSUBI 6
#define P_SUUSHI 4
#define P_FUKUSHI 13
#define P_F_FUKUSHI 10
#define P_RENTAISHI 10
#define P_KANDOU 6
#define P_SETUZOKU 14
#define P_SETSUZOKU 14
#define P_FZKKGU 9
#define P_JOSUUSI 10
#define P_JOSUUSHI 10
#endif

10
sj_rename.h
View file

@ -202,10 +202,10 @@
#define set2nd Jset2nd
#define mk2claus Jmk2claus
#define mkbunsetu Jmkbunsetu
#define mkbunsetsu Jmkbunsetsu
#define argclrec Jargclrec
#define mkjiritu Jmkjiritu
#define mkjiritsu Jmkjiritsu
#define dic_mu Jdic_mu
#define argjrec Jargjrec
#define dic_cl Jdic_cl
@ -246,10 +246,10 @@
#define set_kanji Jset_kanji
#define set_buf Jset_buf
#define prev_kanji Jprev_kanji
#define prev_hinsi Jprev_hinsi
#define prev_hinshi Jprev_hinshi
#define prev_douon Jprev_douon
#define next_kanji Jnext_kanji
#define next_hinsi Jnext_hinsi
#define next_hinshi Jnext_hinshi
#define next_douon Jnext_douon
#define add_yomi Jadd_yomi
#define cd2sjh_chr Jcd2sjh_chr
@ -309,7 +309,7 @@
#define hiraknj_hira Jhiraknj_hira
#define getstb Jgetstb
#define setubi Jsetubi
#define setsubi Jsetsubi
#define sj2cd_chr Jsj2cd_chr
#define sj2cd_str Jsj2cd_str

32
sj_right.h
View file

@ -165,25 +165,25 @@
#define R_YOU2 119
#define R_SHO 120
#define R_FZKMEISI 121
#define R_FZKMEISHI 121
#define R_AISATU 122
#define R_AISATSU 122
#define R_KOSODO 123
#define R_YOU1 124
#define R_HASI 125
#define R_DAIMEISI 126
#define R_DAIMEISI6 127
#define R_DAIMEISHI 126
#define R_DAIMEISHI6 127
#define R_FZKKI 128
#define R_DEHA 129
#define R_NAGARA2 130
#define R_WO_S 131
#define R_WO_MEISI 132
#define R_WO_MEISHI 132
#define R_SITE 133
#define R_N_SI 134
#define R_F_FUKUSI 135
#define R_F_FUKUSHI 135
#define R_CUT 137
#define R_MIZEN2 140
@ -298,20 +298,20 @@
#define R_NN1 240
#define R_SUUSI 241
#define R_SETUZOKU 242
#define R_SUUSHI 241
#define R_SETSUZOKU 242
#define R_KANDOU 243
#define R_SETTOU 244
#define R_FUKUSI 245
#define R_FUKUSHI 245
#define R_FZKKGU 246
#define R_MEISI 247
#define R_DMEISI 248
#define R_SMEISI1 249
#define R_SMEISI2 250
#define R_MEISHI 247
#define R_DMEISHI 248
#define R_SMEISHI1 249
#define R_SMEISHI2 250
#define R_KSTB 251
#define R_ICHISETUBI 252
#define R_JOSUUSI 253
#define R_RENTAISI 254
#define R_ICHISETSUBI 252
#define R_JOSUUSHI 253
#define R_RENTAISHI 254
#define R_TANKAN 255
#endif

10
sj_struct.h
View file

@ -33,8 +33,8 @@
#include <sys/types.h>
#include "sj_typedef.h"
typedef struct jiritu {
struct jiritu* jsort;
typedef struct jiritsu {
struct jiritsu* jsort;
TypeDicSeg jseg;
TypeDicOfs jofsst;
TypeDicOfs jofsed;
@ -42,16 +42,16 @@ typedef struct jiritu {
TypeClass class;
TypeDicID dicid;
unsigned char jlen;
TypeGram hinsi;
TypeGram hinshi;
unsigned char sttofs;
unsigned char stbofs;
unsigned char count;
unsigned char numlen;
} JREC;
typedef struct bunsetu {
typedef struct bunsetsu {
JREC* jnode;
struct bunsetu* clsort;
struct bunsetsu* clsort;
unsigned char gobiln;
unsigned char cllen;

18
sj_struct2.h
View file

@ -40,17 +40,17 @@ typedef struct kanji_rec {
struct kanji_rec* knext;
} KanjiRec;
typedef struct hinsi_rec {
int hinsi;
typedef struct hinshi_rec {
int hinshi;
KanjiRec* krec;
struct hinsi_rec* hnext;
} HinsiRec;
struct hinshi_rec* hnext;
} HinshiRec;
typedef struct douon_rec {
unsigned char* yptr;
int dlen;
int hrec_num;
HinsiRec* hrec;
HinshiRec* hrec;
struct douon_rec* dnext;
} DouonRec;
@ -63,14 +63,14 @@ typedef struct hindo_rec {
int offset;
struct hindo_rec* anext;
struct assyuku_rec* arec;
struct asshuku_rec* arec;
} HindoRec;
typedef struct assyuku_rec {
typedef struct asshuku_rec {
int len;
HindoRec* nrec;
struct assyuku_rec* anext;
} AssyukuRec;
struct asshuku_rec* anext;
} AsshukuRec;
typedef struct offset_rec {
int klen;

2
sj_table.h
View file

@ -67,7 +67,7 @@
#define StbBakeru(p) (*(p) & 0x08)
#define StbHinsi(p) (*((p) + 1))
#define StbHinshi(p) (*((p) + 1))
extern unsigned char charsize[], chrtbl[], *conjadr[], connadr[];
extern unsigned char * fzkadr[], kigou[], kurai1_tbl[], kurai2_tbl[];

2
skiphblk.c
View file

@ -38,7 +38,7 @@ unsigned char* ptr;
{
ptr++;
while(*ptr != HinsiBlkTerm) ptr = skipkstr(ptr);
while(*ptr != HinshiBlkTerm) ptr = skipkstr(ptr);
ptr++;

8
srchnum.c
View file

@ -31,7 +31,7 @@
#include <string.h>
#include "sj_kcnv.h"
#include "sj_yomi.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "sj_suuji.h"
#include "kanakan.h"
@ -67,9 +67,9 @@ srch_josuu(JREC* jrec) {
cnvstart += (len = jrec->numlen);
cnvlen -= len;
srch_josuu_sub(jrec, JOSUUSI);
srch_josuu_sub(jrec, JOSUUSHI);
if(!headcode) srch_josuu_sub(jrec, JOSUUSI2);
if(!headcode) srch_josuu_sub(jrec, JOSUUSHI2);
cnvstart = kp;
cnvlen = klen;
@ -99,7 +99,7 @@ setnrec_sub(unsigned char* p, unsigned short flag, int stb) {
if((rec = argjrec(len1, (JREC*)NULL)) != NULL) {
rec->class = suuji_class;
rec->hinsi = SUUSI;
rec->hinshi = SUUSHI;
rec->sttofs = headcode;
rec->stbofs = (unsigned char)stb;
rec->flags = flag;

4
stat_conv.c
View file

@ -223,7 +223,7 @@ exec_kettei() {
cv->word_regist = 0;
} else {
if(is_bstudy()) {
cl_gakusyuu();
cl_gakushuu();
}
}
} else if(isspaned()) {
@ -595,7 +595,7 @@ stat_conv() {
break;
case KEY_EDIT:
case KEY_TOROKU:
case KEY_SYOUKYO:
case KEY_SHOUKYO:
small = 0;
if(IsCflag() && (inc = get_pseq()) != 0)
exec_ctrl(inc);

72
stbtbl.c
View file

@ -30,92 +30,92 @@
#include "sj_rename.h"
#include "sj_typedef.h"
#include "sj_yomi.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
static unsigned char name_stb[] = {
0x22, MEISI_1, _KU, _NN,
0x22, MEISHI_1, _KU, _NN,
0xb7, 0xaf,
0x22, MEISI_1, _SA, _MA,
0x22, MEISHI_1, _SA, _MA,
0xcd, 0xcd,
0x24, MEISI_1, _SA, _NN,
0x24, MEISHI_1, _SA, _NN,
0xa4, 0xb5, 0xa4, 0xf3,
0x12, MEISI_1, _SI,
0x12, MEISHI_1, _SI,
0xbb, 0xe1,
0x36, MEISI_1, _TI, _XYA, _NN,
0x36, MEISHI_1, _TI, _XYA, _NN,
0xa4, 0xc1, 0xa4, 0xe3, 0xa4, 0xf3,
0x22, MEISI_1, _DO, _NO,
0x22, MEISHI_1, _DO, _NO,
0xc5, 0xc2,
0x00};
static unsigned char timei_stb[] = {
0x22, MEISI_1, _E, _KI,
0x22, MEISHI_1, _E, _KI,
0xb1, 0xd8,
0x44, MEISI_1, _E, _KI, _HA, _TU,
0x44, MEISHI_1, _E, _KI, _HA, _TU,
0xb1, 0xd8, 0xc8, 0xaf,
0x44, MEISI_1, _E, _KI, _YU, _KI,
0x44, MEISHI_1, _E, _KI, _YU, _KI,
0xb1, 0xd8, 0xb9, 0xd4,
0x22, MEISI_1, _GU, _NN,
0x22, MEISHI_1, _GU, _NN,
0xb7, 0xb4,
0x12, MEISI_1, _SI,
0x12, MEISHI_1, _SI,
0xbb, 0xd4,
0x32, MEISI_1, _TI, _XYO, _U,
0x32, MEISHI_1, _TI, _XYO, _U,
0xc4, 0xae,
0x22, MEISI_1, _HA, _TU,
0x22, MEISHI_1, _HA, _TU,
0xc8, 0xaf,
0x22, MEISI_1, _MA, _TI,
0x22, MEISHI_1, _MA, _TI,
0xc4, 0xae,
0x22, MEISI_1, _MU, _RA,
0x22, MEISHI_1, _MU, _RA,
0xc2, 0xbc,
0x00};
static unsigned char meisi_stb[] = {
0x44, MEISI_6, _A, _TU, _KA, _I,
0x44, MEISHI_6, _A, _TU, _KA, _I,
0xb0, 0xb7, 0xa4, 0xa4,
0x1a, MEISI_6, _KA,
0x1a, MEISHI_6, _KA,
0xb2, 0xbd,
0x22, MEISI_8, _TE, _KI,
0x22, MEISHI_8, _TE, _KI,
0xc5, 0xaa,
0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _I,
0x56, FUKUSHI_1, _NI, _TO, _MO, _NA, _I,
0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa4,
0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _U,
0x56, FUKUSHI_1, _NI, _TO, _MO, _NA, _U,
0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa6,
0x22, MEISI_8, _HU, _U,
0x22, MEISHI_8, _HU, _U,
0xc9, 0xf7,
0x00};
static unsigned char sahen_stb[] = {
0x44, MEISI_6, _A, _TU, _KA, _I,
0x44, MEISHI_6, _A, _TU, _KA, _I,
0xb0, 0xb7, 0xa4, 0xa4,
0x1a, MEISI_6, _KA,
0x1a, MEISHI_6, _KA,
0xb2, 0xbd,
0x12, MEISI_11, _GO,
0x12, MEISHI_11, _GO,
0xb8, 0xe5,
0x22, MEISI_11, _GO, _TO,
0x22, MEISHI_11, _GO, _TO,
0xcb, 0xe8,
0x32, MEISI_11, _ZI, _XYO, _U,
0x32, MEISHI_11, _ZI, _XYO, _U,
0xbe, 0xe5,
0x32, MEISI_11, _TI, _XYU, _U,
0x32, MEISHI_11, _TI, _XYU, _U,
0xc3, 0xe6,
0x22, MEISI_8, _TE, _KI,
0x22, MEISHI_8, _TE, _KI,
0xc5, 0xaa,
0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _I,
0x56, FUKUSHI_1, _NI, _TO, _MO, _NA, _I,
0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa4,
0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _U,
0x56, FUKUSHI_1, _NI, _TO, _MO, _NA, _U,
0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa6,
0x22, MEISI_8, _HU, _U,
0x22, MEISHI_8, _HU, _U,
0xc9, 0xf7,
0x22, MEISI_11, _MA, _E,
0x22, MEISHI_11, _MA, _E,
0xc1, 0xb0,
0x00};
static unsigned char human_stb[] = {
0x24, MEISI_1, _SA, _NN,
0x24, MEISHI_1, _SA, _NN,
0xa4, 0xb5, 0xa4, 0xf3,
0x00};
static unsigned char ippan_stb[] = {
0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _I,
0x56, FUKUSHI_1, _NI, _TO, _MO, _NA, _I,
0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa4,
0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _U,
0x56, FUKUSHI_1, _NI, _TO, _MO, _NA, _U,
0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa6,
0x00};

44
termtbl.c
View file

@ -155,33 +155,33 @@ unsigned char termtbl[] = {
T_SHUUJO + P_MEIREI,
T_SHUUJO + P_MEIREI,
T_KANOU + P_MEISI,
T_KANOU + P_MEISHI,
0 + P_FUKA,
T_KANOU + P_FUKA,
T_KANOU + P_MEISI,
T_KANOU + P_DAIMEISI,
T_KANOU + P_DAIMEISI,
T_KANOU + P_MEISI,
T_KANOU + P_MEISHI,
T_KANOU + P_DAIMEISHI,
T_KANOU + P_DAIMEISHI,
T_KANOU + P_MEISHI,
T_KANOU + P_JOSHI_D,
T_KANOU + P_JOSHI_E,
T_KANOU + P_SHUUSI,
T_KANOU + P_DAIMEISI,
T_KANOU + P_FUKUSI,
T_KANOU + P_FUKUSI,
T_KANOU + P_DAIMEISHI,
T_KANOU + P_FUKUSHI,
T_KANOU + P_FUKUSHI,
T_KANOU + P_SHUUSI,
0 + P_FUKA,
T_KANOU + P_DAIMEISI,
T_KANOU + P_DAIMEISHI,
T_KANOU + 7,
0 + P_FUKA,
T_SHUUJO + P_JOSHI_E,
T_KANOU + P_JOSHI_B,
T_KANOU + P_JOSHI_A,
T_KANOU + P_MEISI,
T_KANOU + P_MEISHI,
T_KANOU + P_JOSHI_B,
T_KANOU + P_RENYOU_F,
T_KANOU + P_F_FUKUSI,
T_KANOU + P_F_FUKUSHI,
0,
T_KANOU + P_JOSHI_F,
0,
@ -298,19 +298,19 @@ unsigned char termtbl[] = {
T_KANOU + P_KEISIKI,
0 + P_JOSHI_C,
T_KANOU + P_SUUSI,
T_KANOU + P_SETUZOKU,
T_KANOU + P_SUUSHI,
T_KANOU + P_SETSUZOKU,
T_KANOU + P_KANDOU,
T_KANOU + P_SETTOU,
T_KANOU + P_FUKUSI,
T_KANOU + P_FUKUSHI,
T_KANOU + P_FZKKGU,
T_KANOU + P_MEISI,
T_KANOU + P_MEISI,
T_KANOU + P_MEISI,
T_KANOU + P_MEISHI,
T_KANOU + P_MEISHI,
T_KANOU + P_MEISHI,
T_KANOU + P_MEISI,
0 + P_SETUBI,
T_KANOU + P_SETUBI,
T_KANOU + P_JOSUUSI,
T_KANOU + P_RENTAISI,
T_KANOU + P_MEISHI,
0 + P_SETSUBI,
T_KANOU + P_SETSUBI,
T_KANOU + P_JOSUUSHI,
T_KANOU + P_RENTAISHI,
T_KANOU + P_TANKAN};

20
toroku.c
View file

@ -211,7 +211,7 @@ getcheck(yomi, kanji, hinshi, prompt)
if(hinshi == NULL) {
(void)wcstombs((char*)ktmp, kanji, KLEN + 1);
(void)wcstombs((char*)ytmp, yomi, YOMILEN + 1);
(void)wcstombs((char*)ttmp, WCSYOUKYO_OK, BUFFLENGTH);
(void)wcstombs((char*)ttmp, WCSHOUKYO_OK, BUFFLENGTH);
sprintf((char*)tmp, (char*)ttmp, ktmp, ytmp);
} else {
(void)wcstombs((char*)ktmp, kanji, KLEN + 1);
@ -268,7 +268,7 @@ int lim;
if(cv->Bnum > 1) {
Ssbun(0);
chbun++;
plen = getbunsetu(tmp, guide);
plen = getbunsetsu(tmp, guide);
} else
plen = Bkanji(tmp);
} else if(isspaned()) {
@ -283,7 +283,7 @@ int lim;
return (chbun);
}
getbunsetu(kanji, guide)
getbunsetsu(kanji, guide)
wchar16_t* kanji,
*guide;
{
@ -373,7 +373,7 @@ getbunsetu(kanji, guide)
return (len);
}
exec_syoukyo() {
exec_shoukyo() {
int i;
wchar16_t yomi[YOMILEN + 1], kanji[KLEN + 1];
wchar16_t tmp[BUFFLENGTH], tmp2[BUFFLENGTH * 2];
@ -385,24 +385,24 @@ exec_syoukyo() {
if(IsDcflag())
return (0);
val = getkstr(kanji, KLEN, WCGsyoukyo);
val = getkstr(kanji, KLEN, WCGshoukyo);
if(*kanji == '\0')
return (val);
while(1) {
if(getyomi(yomi, YOMILEN, WCGsyoukyo, kanji) || *yomi == '\0')
if(getyomi(yomi, YOMILEN, WCGshoukyo, kanji) || *yomi == '\0')
break;
if(getcheck(yomi, kanji, NULL, WCGsyoukyo))
if(getcheck(yomi, kanji, NULL, WCGshoukyo))
break;
}
if(*yomi == '\0')
return (val);
TopGuide();
printR(WCGsyoukyo);
printR(WCGshoukyo);
tmp[0] = '\0';
for(i = 0; i < 5; i++) {
retv = SJ2_syoukyo(yomi, kanji, hin_val[i].ivalue);
retv = SJ2_shoukyo(yomi, kanji, hin_val[i].ivalue);
if(retv == 0) {
wscat(tmp, hin_val[i].keyword);
wscat(tmp, WCKanma);
@ -436,7 +436,7 @@ exec_syoukyo() {
(void)wcstombs((char*)mtmp, tmp, BUFFLENGTH);
(void)wcstombs((char*)ytmp, yomi, YOMILEN + 1);
(void)wcstombs((char*)ktmp, kanji, KLEN + 1);
(void)wcstombs((char*)ttmp, WCSYOUKYO_SUCC, BUFFLENGTH);
(void)wcstombs((char*)ttmp, WCSHOUKYO_SUCC, BUFFLENGTH);
sprintf((char*)mtmp2, (char*)ttmp, ktmp, ytmp, mtmp);
(void)mbstowcs(tmp2, (char*)mtmp2, BUFFLENGTH * 2);
SJ_print(tmp2);

12
wakachi.c
View file

@ -29,7 +29,7 @@
#include "sj_kcnv.h"
#include "sj_right.h"
#include "sj_hinsi.h"
#include "sj_hinshi.h"
#include "kanakan.h"
int terminate();
@ -65,21 +65,21 @@ void wakachi(void) {
if(!(jrec = argjrec(i, (JREC*)NULL))) return;
jrec->class = C_WAKACHI;
jrec->hinsi = D_MEISI_1;
jrec->hinshi = D_MEISHI_1;
if(Chrtbl[*(next - 1)] & TAI_KGU)
srchfzk(jrec, next, R_DAIMEISI, 0);
srchfzk(jrec, next, R_DAIMEISHI, 0);
}
else {
if(!(jrec = argjrec(0, (JREC*)NULL))) return;
jrec->class = C_WAKACHI;
jrec->hinsi = MEISI_6;
jrec->hinshi = MEISHI_6;
while((int)jrec->jlen < maxlen) {
count = setconj((TypeGram)MEISI_6, jrec, crec);
count = setconj((TypeGram)MEISHI_6, jrec, crec);
for(i = count; i-- > 0;) {
@ -113,7 +113,7 @@ void wakachi(void) {
if(jrec->jlen) {
if((clrec = argclrec((int)jrec->jlen)) != NULL) {
clrec->jnode = jrec;
clrec->right = R_MEISI;
clrec->right = R_MEISHI;
clrec->kubun = K_TAIGEN;
(jrec->count)++;
}

8
wchar16.h
View file

@ -166,7 +166,7 @@ typedef unsigned short wchar16_t;
#define WCMhani WcMessages[21]
#define WCMyomi WcMessages[22]
#define WCTOUROKU_OK WcMessages[23]
#define WCSYOUKYO_OK WcMessages[24]
#define WCSHOUKYO_OK WcMessages[24]
#define WCTOUROKU_HIN WcMessages[25]
#define WCTOUROKU_SUCC WcMessages[26]
#define WCYomi WcMessages[27]
@ -181,8 +181,8 @@ typedef unsigned short wchar16_t;
#define WCSystemError WcMessages[36]
#define WCKanma WcMessages[37]
#define WCGsyoukyo WcMessages[38]
#define WCSYOUKYO_SUCC WcMessages[39]
#define WCGshoukyo WcMessages[38]
#define WCSHOUKYO_SUCC WcMessages[39]
#define WCNotExist WcMessages[40]
#define WCUserLock WcMessages[41]
#define WCYomiShokyo WcMessages[42]
@ -280,7 +280,7 @@ typedef unsigned short wchar16_t;
#define WCSjrc WcMessages[124]
#define WCBuffer WcMessages[125]
#define WCToroku WcMessages[126]
#define WCSyoukyo WcMessages[127]
#define WCShoukyo WcMessages[127]
#define WCHelp WcMessages[128]
#define WCHaKettei WcMessages[129]
#define WCFlush WcMessages[130]