X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmule-canna.c;h=224acc389dd309e28cda53f6a5aff0a65b0c6c59;hb=44ea030ec31ae441e59974eb9f6b2a9404611cd8;hp=931e93c165ae7257c3c67c012e75483f2e636b65;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git.1 diff --git a/src/mule-canna.c b/src/mule-canna.c index 931e93c..7ad6409 100644 --- a/src/mule-canna.c +++ b/src/mule-canna.c @@ -169,21 +169,21 @@ extern char *jrKanjiError; static unsigned char buf[KEYTOSTRSIZE]; static char **warning; -static int canna_empty_info, canna_through_info; -static int canna_underline; -static int canna_inhibit_hankakukana; +static int Vcanna_empty_info, Vcanna_through_info; +static int Vcanna_underline; +static int Vcanna_inhibit_hankakukana; static Lisp_Object Vcanna_kakutei_string; static Lisp_Object Vcanna_kakutei_yomi; static Lisp_Object Vcanna_kakutei_romaji; static Lisp_Object Vcanna_henkan_string; -static int canna_henkan_length; -static int canna_henkan_revPos; -static int canna_henkan_revLen; +static int Vcanna_henkan_length; +static int Vcanna_henkan_revPos; +static int Vcanna_henkan_revLen; static Lisp_Object Vcanna_ichiran_string; -static int canna_ichiran_length; -static int canna_ichiran_revPos; -static int canna_ichiran_revLen; +static int Vcanna_ichiran_length; +static int Vcanna_ichiran_revPos; +static int Vcanna_ichiran_revLen; static Lisp_Object Vcanna_mode_string; static int IRCP_context; @@ -259,21 +259,21 @@ storeResults (unsigned char *buf, int len, jrKanjiStatus *ks) { Vcanna_henkan_string = make_string (ks->echoStr, ks->length); #ifndef CANNA_MULE - canna_henkan_length = ks->length; - canna_henkan_revPos = ks->revPos; - canna_henkan_revLen = ks->revLen; + Vcanna_henkan_length = ks->length; + Vcanna_henkan_revPos = ks->revPos; + Vcanna_henkan_revLen = ks->revLen; #else /* CANNA_MULE */ - if (canna_underline) + if (Vcanna_underline) { - canna_henkan_length = mule_strlen (ks->echoStr,ks->length); - canna_henkan_revPos = mule_strlen (ks->echoStr,ks->revPos); - canna_henkan_revLen = mule_strlen (ks->echoStr+ks->revPos,ks->revLen); + Vcanna_henkan_length = mule_strlen (ks->echoStr,ks->length); + Vcanna_henkan_revPos = mule_strlen (ks->echoStr,ks->revPos); + Vcanna_henkan_revLen = mule_strlen (ks->echoStr+ks->revPos,ks->revLen); } else { count_char (ks->echoStr, ks->length, ks->revPos, ks->revLen, - &canna_henkan_length, &canna_henkan_revPos, - &canna_henkan_revLen); + &Vcanna_henkan_length, &Vcanna_henkan_revPos, + &Vcanna_henkan_revLen); } #endif /* CANNA_MULE */ } @@ -284,13 +284,13 @@ storeResults (unsigned char *buf, int len, jrKanjiStatus *ks) { Vcanna_ichiran_string = make_string (ks->gline.line, ks->gline.length); #ifndef CANNA_MULE - canna_ichiran_length = ks->gline.length; - canna_ichiran_revPos = ks->gline.revPos; - canna_ichiran_revLen = ks->gline.revLen; + Vcanna_ichiran_length = ks->gline.length; + Vcanna_ichiran_revPos = ks->gline.revPos; + Vcanna_ichiran_revLen = ks->gline.revLen; #else /* CANNA_MULE */ count_char (ks->gline.line, ks->gline.length, - ks->gline.revPos, ks->gline.revLen, &canna_ichiran_length, - &canna_ichiran_revPos, &canna_ichiran_revLen); + ks->gline.revPos, ks->gline.revLen, &Vcanna_ichiran_length, + &Vcanna_ichiran_revPos, &Vcanna_ichiran_revLen); #endif /* CANNA_MULE */ } @@ -302,8 +302,8 @@ storeResults (unsigned char *buf, int len, jrKanjiStatus *ks) } /* ¤½¤Î¾¤Î¾ðÊó */ - canna_empty_info = (ks->info & KanjiEmptyInfo) ? 1 : 0; - canna_through_info = (ks->info & KanjiThroughInfo) ? 1 : 0; + Vcanna_empty_info = (ks->info & KanjiEmptyInfo) ? 1 : 0; + Vcanna_through_info = (ks->info & KanjiThroughInfo) ? 1 : 0; } return val; @@ -372,8 +372,8 @@ If nil is specified for each arg, the default value will be used. char servername[256]; CHECK_STRING (server); - strncpy (servername, XSTRING_DATA (server), XSTRING_LENGTH (server)); - servername[XSTRING_LENGTH (server)] = '\0'; + strncpy (servername, XSTRING (server)->_data, XSTRING (server)->_size); + servername[XSTRING (server)->_size] = '\0'; jrKanjiControl (0, KC_SETSERVERNAME, servername); } @@ -386,8 +386,8 @@ If nil is specified for each arg, the default value will be used. char rcname[256]; CHECK_STRING (rcfile); - strncpy (rcname, XSTRING_DATA (rcfile), XSTRING_LENGTH (rcfile)); - rcname[XSTRING_LENGTH (rcfile)] = '\0'; + strncpy (rcname, XSTRING (rcfile)->_data, XSTRING (rcfile)->_size); + rcname[XSTRING (rcfile)->_size] = '\0'; jrKanjiControl (0, KC_SETINITFILENAME, rcname); } @@ -414,7 +414,7 @@ If nil is specified for each arg, the default value will be used. if (res == -1) { - val = Fcons (make_string ((unsigned char*) jrKanjiError, + val = Fcons (make_string ((unsigned char*) jrKanjiError, strlen (jrKanjiError)), val); /* ¥¤¥Ë¥·¥ã¥é¥¤¥º¤Ç¼ºÇÔ¤·¤¿¾ì¹ç¡£ */ return Fcons (Qnil, val); @@ -440,7 +440,7 @@ If nil is specified for each arg, the default value will be used. jrKanjiControl (0, KC_INHIBITHANKAKUKANA, (char *) 1); #else /* mule ¤À¤Ã¤¿¤éȾ³Ñ¥«¥¿¥«¥Ê¤â»È¤¨¤ë */ - if (canna_inhibit_hankakukana) + if (Vcanna_inhibit_hankakukana) jrKanjiControl (0, KC_INHIBITHANKAKUKANA, (char *) 1); #endif jrKanjiControl (0, KC_YOMIINFO, (char *) 2); /* ¢¨£²: ¥í¡¼¥Þ»ú¤Þ¤ÇÊÖ¤¹ */ @@ -490,10 +490,10 @@ Register Kanji words into kana-to-kanji conversion dictionary. ksv.buffer = (unsigned char *) buf; ksv.bytes_buffer = KEYTOSTRSIZE; #ifndef CANNA_MULE - ks.echoStr = XSTRING_DATA (str); - ks.length = XSTRING_LENGTH (str); + ks.echoStr = XSTRING (str)->_data; + ks.length = XSTRING (str)->_size; #else /* CANNA_MULE */ - m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), cbuf); + m2c (XSTRING (str)->_data, XSTRING (str)->_size, cbuf); ks.echoStr = cbuf; ks.length = strlen (cbuf); #endif /* CANNA_MULE */ @@ -504,7 +504,7 @@ Register Kanji words into kana-to-kanji conversion dictionary. } DEFUN ("canna-set-width", Fcanna_set_width, 1, 1, 0, /* -Set status-line width information, which is used to display +Set status-line width information, which is used to display kanji candidates. */ (num)) @@ -564,11 +564,11 @@ Store yomi characters as a YOMI of kana-to-kanji conversion. CHECK_STRING (yomi); #ifndef CANNA_MULE - strncpy (buf, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi)); - ks.length = XSTRING_LENGTH (yomi); + strncpy (buf, XSTRING (yomi)->_data, XSTRING (yomi)->_size); + ks.length = XSTRING (yomi)->_size; buf[ks.length] = '\0'; #else /* CANNA_MULE */ - m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), buf); + m2c (XSTRING (yomi)->_data, XSTRING (yomi)->_size, buf); ks.length = strlen (buf); #endif /* CANNA_MULE */ @@ -581,13 +581,13 @@ Store yomi characters as a YOMI of kana-to-kanji conversion. CHECK_STRING (roma); #ifndef CANNA_MULE - strncpy (buf + XSTRING_LENGTH (yomi) + 1, XSTRING_DATA (roma), - XSTRING_LENGTH (roma)); - buf[XSTRING_LENGTH (yomi) + 1 + XSTRING_LENGTH (roma)] = '\0'; - ks.mode = (unsigned char *)(buf + XSTRING_LENGTH (yomi) + 1); + strncpy (buf + XSTRING (yomi)->_size + 1, XSTRING (roma)->_data, + XSTRING (roma)->_size); + buf[XSTRING (yomi)->_size + 1 + XSTRING (roma)->_size] = '\0'; + ks.mode = (unsigned char *)(buf + XSTRING (yomi)->_size + 1); #else /* CANNA_MULE */ ks.mode = (unsigned char *)(buf + ks.length + 1); - m2c (XSTRING_DATA (roma), XSTRING_LENGTH (roma), ks.mode); + m2c (XSTRING (roma)->_data, XSTRING (roma)->_size, ks.mode); #endif /* CANNA_MULE */ } @@ -643,10 +643,10 @@ Parse customize string. CHECK_STRING (str); #ifndef CANNA_MULE - strncpy (buf, XSTRING_DATA (str), XSTRING_LENGTH (str)); - buf[XSTRING_LENGTH (str)] = '\0'; + strncpy (buf, XSTRING (str)->_data, XSTRING (str)->_size); + buf[XSTRING (str)->_size] = '\0'; #else /* CANNA_MULE */ - m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), buf); + m2c (XSTRING (str)->_data, XSTRING (str)->_size, buf); #endif /* CANNA_MULE */ p = (unsigned char**) buf; n = jrKanjiControl (0, KC_PARSE, (char *) &p); @@ -730,12 +730,12 @@ DEFUN ("canna-henkan-begin", Fcanna_henkan_begin, 1, 1, 0, /* return Qnil; } #ifndef CANNA_MULE - strncpy (yomibuf, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi)); - yomibuf[XSTRING_LENGTH (yomi)] = '\0'; - nbun = RkBgnBun (IRCP_context, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), + strncpy (yomibuf, XSTRING (yomi)->_data, XSTRING (yomi)->_size); + yomibuf[XSTRING (yomi)->_size] = '\0'; + nbun = RkBgnBun (IRCP_context, XSTRING (yomi)->_data, XSTRING (yomi)->_size, (RK_XFER << RK_XFERBITS) | RK_KFER); #else /* CANNA_MULE */ - m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), yomibuf); + m2c (XSTRING (yomi)->_data, XSTRING (yomi)->_size, yomibuf); nbun = RkBgnBun (IRCP_context, (char *) yomibuf, strlen (yomibuf), (RK_XFER << RK_XFERBITS) | RK_KFER); #endif /* CANNA_MULE */ @@ -814,7 +814,7 @@ DEFUN ("canna-bunsetu-henkou", Fcanna_bunsetu_henkou, 2, 2, 0, /* CHECK_INT (bunsetsu); CHECK_INT (bunlen); - + nbun = XINT (bunsetsu); if (confirmContext () == 0) { @@ -872,149 +872,150 @@ DEFUN ("canna-henkan-quit", Fcanna_henkan_quit, 0, 0, 0, /* /* variables below this line is constants of Canna */ -static int canna_mode_AlphaMode; -static int canna_mode_EmptyMode; -static int canna_mode_KigoMode; -static int canna_mode_YomiMode; -static int canna_mode_JishuMode; -static int canna_mode_TankouhoMode; -static int canna_mode_IchiranMode; -static int canna_mode_YesNoMode; -static int canna_mode_OnOffMode; +static int Vcanna_mode_AlphaMode = IROHA_MODE_AlphaMode; +static int Vcanna_mode_EmptyMode = IROHA_MODE_EmptyMode; +static int Vcanna_mode_KigoMode = IROHA_MODE_KigoMode; +static int Vcanna_mode_YomiMode = IROHA_MODE_YomiMode; +static int Vcanna_mode_JishuMode = IROHA_MODE_JishuMode; +static int Vcanna_mode_TankouhoMode = IROHA_MODE_TankouhoMode; +static int Vcanna_mode_IchiranMode = IROHA_MODE_IchiranMode; +static int Vcanna_mode_YesNoMode = IROHA_MODE_YesNoMode; +static int Vcanna_mode_OnOffMode = IROHA_MODE_OnOffMode; #ifdef CANNA_MODE_AdjustBunsetsuMode -static int canna_mode_AdjustBunsetsuMode; +static int Vcanna_mode_AdjustBunsetsuMode = CANNA_MODE_AdjustBunsetsuMode; #endif #ifdef CANNA_MODE_ChikujiYomiMode -static int canna_mode_ChikujiYomiMode; -static int canna_mode_ChikujiTanMode; +static int Vcanna_mode_ChikujiYomiMode = CANNA_MODE_ChikujiYomiMode; +static int Vcanna_mode_ChikujiTanMode = CANNA_MODE_ChikujiTanMode; #endif -static int canna_mode_HenkanMode; +static int Vcanna_mode_HenkanMode = IROHA_MODE_HenkanMode; #ifdef CANNA_MODE_HenkanNyuryokuMode -static int canna_mode_HenkanNyuryokuMode; +static int Vcanna_mode_HenkanNyuryokuMode = CANNA_MODE_HenkanNyuryokuMode; #endif #ifdef CANNA_MODE_ZenHiraHenkanMode -static int canna_mode_ZenHiraHenkanMode; +static int Vcanna_mode_ZenHiraHenkanMode = CANNA_MODE_ZenHiraHenkanMode; #ifdef CANNA_MODE_HanHiraHenkanMode -static int canna_mode_HanHiraHenkanMode; +static int Vcanna_mode_HanHiraHenkanMode = CANNA_MODE_HanHiraHenkanMode; #endif -static int canna_mode_ZenKataHenkanMode; -static int canna_mode_HanKataHenkanMode; -static int canna_mode_ZenAlphaHenkanMode; -static int canna_mode_HanAlphaHenkanMode; +static int Vcanna_mode_ZenKataHenkanMode = CANNA_MODE_ZenKataHenkanMode; +static int Vcanna_mode_HanKataHenkanMode = CANNA_MODE_HanKataHenkanMode; +static int Vcanna_mode_ZenAlphaHenkanMode = CANNA_MODE_ZenAlphaHenkanMode; +static int Vcanna_mode_HanAlphaHenkanMode = CANNA_MODE_HanAlphaHenkanMode; #endif -static int canna_mode_ZenHiraKakuteiMode; +static int Vcanna_mode_ZenHiraKakuteiMode = IROHA_MODE_ZenHiraKakuteiMode; #ifdef CANNA_MODE_HanHiraKakuteiMode -static int canna_mode_HanHiraKakuteiMode; +static int Vcanna_mode_HanHiraKakuteiMode = CANNA_MODE_HanHiraKakuteiMode; #endif -static int canna_mode_ZenKataKakuteiMode; -static int canna_mode_HanKataKakuteiMode; -static int canna_mode_ZenAlphaKakuteiMode; -static int canna_mode_HanAlphaKakuteiMode; -static int canna_mode_HexMode; -static int canna_mode_BushuMode; -static int canna_mode_ExtendMode; -static int canna_mode_RussianMode; -static int canna_mode_GreekMode; -static int canna_mode_LineMode; -static int canna_mode_ChangingServerMode; -static int canna_mode_HenkanMethodMode; -static int canna_mode_DeleteDicMode; -static int canna_mode_TourokuMode; -static int canna_mode_TourokuEmptyMode; -static int canna_mode_TourokuHinshiMode; -static int canna_mode_TourokuDicMode; -static int canna_mode_QuotedInsertMode; -static int canna_mode_BubunMuhenkanMode; -static int canna_mode_MountDicMode; - -static int canna_fn_SelfInsert; -static int canna_fn_FunctionalInsert; -static int canna_fn_QuotedInsert; -static int canna_fn_JapaneseMode; -static int canna_fn_AlphaMode; -static int canna_fn_HenkanNyuryokuMode; -static int canna_fn_Forward; -static int canna_fn_Backward; -static int canna_fn_Next; -static int canna_fn_Prev; -static int canna_fn_BeginningOfLine; -static int canna_fn_EndOfLine; -static int canna_fn_DeleteNext; -static int canna_fn_DeletePrevious; -static int canna_fn_KillToEndOfLine; -static int canna_fn_Henkan; -static int canna_fn_Kakutei; -static int canna_fn_Extend; -static int canna_fn_Shrink; +static int Vcanna_mode_ZenKataKakuteiMode = IROHA_MODE_ZenKataKakuteiMode; +static int Vcanna_mode_HanKataKakuteiMode = IROHA_MODE_HanKataKakuteiMode; +static int Vcanna_mode_ZenAlphaKakuteiMode = IROHA_MODE_ZenAlphaKakuteiMode; +static int Vcanna_mode_HanAlphaKakuteiMode = IROHA_MODE_HanAlphaKakuteiMode; +static int Vcanna_mode_HexMode = IROHA_MODE_HexMode; +static int Vcanna_mode_BushuMode = IROHA_MODE_BushuMode; +static int Vcanna_mode_ExtendMode = IROHA_MODE_ExtendMode; +static int Vcanna_mode_RussianMode = IROHA_MODE_RussianMode; +static int Vcanna_mode_GreekMode = IROHA_MODE_GreekMode; +static int Vcanna_mode_LineMode = IROHA_MODE_LineMode; +static int Vcanna_mode_ChangingServerMode = IROHA_MODE_ChangingServerMode; +static int Vcanna_mode_HenkanMethodMode = IROHA_MODE_HenkanMethodMode; +static int Vcanna_mode_DeleteDicMode = IROHA_MODE_DeleteDicMode; +static int Vcanna_mode_TourokuMode = IROHA_MODE_TourokuMode; +static int Vcanna_mode_TourokuEmptyMode = IROHA_MODE_TourokuEmptyMode; +static int Vcanna_mode_TourokuHinshiMode = IROHA_MODE_TourokuHinshiMode; +static int Vcanna_mode_TourokuDicMode = IROHA_MODE_TourokuDicMode; +static int Vcanna_mode_QuotedInsertMode = IROHA_MODE_QuotedInsertMode; +static int Vcanna_mode_BubunMuhenkanMode = IROHA_MODE_BubunMuhenkanMode; +static int Vcanna_mode_MountDicMode = IROHA_MODE_MountDicMode; + +static int Vcanna_fn_SelfInsert = IROHA_FN_SelfInsert; +static int Vcanna_fn_FunctionalInsert = IROHA_FN_FunctionalInsert; +static int Vcanna_fn_QuotedInsert = IROHA_FN_QuotedInsert; +static int Vcanna_fn_JapaneseMode = IROHA_FN_JapaneseMode; +static int Vcanna_fn_AlphaMode = IROHA_FN_AlphaMode; +static int Vcanna_fn_HenkanNyuryokuMode = IROHA_FN_HenkanNyuryokuMode; +static int Vcanna_fn_Forward = IROHA_FN_Forward; +static int Vcanna_fn_Backward = IROHA_FN_Backward; +static int Vcanna_fn_Next = IROHA_FN_Next; +static int Vcanna_fn_Prev = IROHA_FN_Prev; +static int Vcanna_fn_BeginningOfLine = IROHA_FN_BeginningOfLine; +static int Vcanna_fn_EndOfLine = IROHA_FN_EndOfLine; +static int Vcanna_fn_DeleteNext = IROHA_FN_DeleteNext; +static int Vcanna_fn_DeletePrevious = IROHA_FN_DeletePrevious; +static int Vcanna_fn_KillToEndOfLine = IROHA_FN_KillToEndOfLine; +static int Vcanna_fn_Henkan = IROHA_FN_Henkan; +static int Vcanna_fn_Kakutei = IROHA_FN_Kakutei; +static int Vcanna_fn_Extend = IROHA_FN_Extend; +static int Vcanna_fn_Shrink = IROHA_FN_Shrink; #ifdef CANNA_FN_AdjustBunsetsu -static int canna_fn_AdjustBunsetsu; +static int Vcanna_fn_AdjustBunsetsu = CANNA_FN_AdjustBunsetsu; #endif -static int canna_fn_Quit; -static int canna_fn_ConvertAsHex; -static int canna_fn_ConvertAsBushu; -static int canna_fn_KouhoIchiran; -static int canna_fn_BubunMuhenkan; -static int canna_fn_Zenkaku; -static int canna_fn_Hankaku; -static int canna_fn_ToUpper; -static int canna_fn_Capitalize; -static int canna_fn_ToLower; -static int canna_fn_Hiragana; -static int canna_fn_Katakana; -static int canna_fn_Romaji; +static int Vcanna_fn_Quit = IROHA_FN_Quit; +static int Vcanna_fn_ConvertAsHex = IROHA_FN_ConvertAsHex; +static int Vcanna_fn_ConvertAsBushu = IROHA_FN_ConvertAsBushu; +static int Vcanna_fn_KouhoIchiran = IROHA_FN_KouhoIchiran; +static int Vcanna_fn_BubunMuhenkan = IROHA_FN_BubunMuhenkan; +static int Vcanna_fn_Zenkaku = IROHA_FN_Zenkaku; +static int Vcanna_fn_Hankaku = IROHA_FN_Hankaku; +static int Vcanna_fn_ToUpper = IROHA_FN_ToUpper; +static int Vcanna_fn_Capitalize = IROHA_FN_Capitalize; +static int Vcanna_fn_ToLower = IROHA_FN_ToLower; +static int Vcanna_fn_Hiragana = IROHA_FN_Hiragana; +static int Vcanna_fn_Katakana = IROHA_FN_Katakana; +static int Vcanna_fn_Romaji = IROHA_FN_Romaji; #ifdef CANNA_FN_BaseHiragana -static int canna_fn_BaseHiragana; -static int canna_fn_BaseKatakana; -static int canna_fn_BaseEisu; -static int canna_fn_BaseZenkaku; -static int canna_fn_BaseHankaku; -static int canna_fn_BaseKana; -static int canna_fn_BaseKakutei; -static int canna_fn_BaseHenkan; -static int canna_fn_BaseHiraKataToggle; -static int canna_fn_BaseZenHanToggle; -static int canna_fn_BaseKanaEisuToggle; -static int canna_fn_BaseKakuteiHenkanToggle; -static int canna_fn_BaseRotateForward; -static int canna_fn_BaseRotateBackward; +static int Vcanna_fn_BaseHiragana = CANNA_FN_BaseHiragana; +static int Vcanna_fn_BaseKatakana = CANNA_FN_BaseKatakana; +static int Vcanna_fn_BaseEisu = CANNA_FN_BaseEisu; +static int Vcanna_fn_BaseZenkaku = CANNA_FN_BaseZenkaku; +static int Vcanna_fn_BaseHankaku = CANNA_FN_BaseHankaku; +static int Vcanna_fn_BaseKana = CANNA_FN_BaseKana; +static int Vcanna_fn_BaseKakutei = CANNA_FN_BaseKakutei; +static int Vcanna_fn_BaseHenkan = CANNA_FN_BaseHenkan; +static int Vcanna_fn_BaseHiraKataToggle = CANNA_FN_BaseHiraKataToggle; +static int Vcanna_fn_BaseZenHanToggle = CANNA_FN_BaseZenHanToggle; +static int Vcanna_fn_BaseKanaEisuToggle = CANNA_FN_BaseKanaEisuToggle; +static int Vcanna_fn_BaseKakuteiHenkanToggle = + CANNA_FN_BaseKakuteiHenkanToggle; +static int Vcanna_fn_BaseRotateForward = CANNA_FN_BaseRotateForward; +static int Vcanna_fn_BaseRotateBackward = CANNA_FN_BaseRotateBackward; #endif -static int canna_fn_ExtendMode; -static int canna_fn_Touroku; -static int canna_fn_HexMode; -static int canna_fn_BushuMode; -static int canna_fn_KigouMode; +static int Vcanna_fn_ExtendMode = IROHA_FN_ExtendMode; +static int Vcanna_fn_Touroku = IROHA_FN_Touroku; +static int Vcanna_fn_HexMode = IROHA_FN_HexMode; +static int Vcanna_fn_BushuMode = IROHA_FN_BushuMode; +static int Vcanna_fn_KigouMode = IROHA_FN_KigouMode; #ifdef CANNA_FN_Mark -static int canna_fn_Mark; +static int Vcanna_fn_Mark = CANNA_FN_Mark; #endif #ifdef CANNA_FN_TemporalMode -static int canna_fn_TemporalMode; +static int Vcanna_fn_TemporalMode = CANNA_FN_TemporalMode; #endif -static int canna_key_Nfer; -static int canna_key_Xfer; -static int canna_key_Up; -static int canna_key_Left; -static int canna_key_Right; -static int canna_key_Down; -static int canna_key_Insert; -static int canna_key_Rollup; -static int canna_key_Rolldown; -static int canna_key_Home; -static int canna_key_Help; -static int canna_key_KP_Key; -static int canna_key_Shift_Nfer; -static int canna_key_Shift_Xfer; -static int canna_key_Shift_Up; -static int canna_key_Shift_Left; -static int canna_key_Shift_Right; -static int canna_key_Shift_Down; -static int canna_key_Cntrl_Nfer; -static int canna_key_Cntrl_Xfer; -static int canna_key_Cntrl_Up; -static int canna_key_Cntrl_Left; -static int canna_key_Cntrl_Right; -static int canna_key_Cntrl_Down; +static int Vcanna_key_Nfer = IROHA_KEY_Nfer; +static int Vcanna_key_Xfer = IROHA_KEY_Xfer; +static int Vcanna_key_Up = IROHA_KEY_Up; +static int Vcanna_key_Left = IROHA_KEY_Left; +static int Vcanna_key_Right = IROHA_KEY_Right; +static int Vcanna_key_Down = IROHA_KEY_Down; +static int Vcanna_key_Insert = IROHA_KEY_Insert; +static int Vcanna_key_Rollup = IROHA_KEY_Rollup; +static int Vcanna_key_Rolldown = IROHA_KEY_Rolldown; +static int Vcanna_key_Home = IROHA_KEY_Home; +static int Vcanna_key_Help = IROHA_KEY_Help; +static int Vcanna_key_KP_Key = IROHA_KEY_KP_Key; +static int Vcanna_key_Shift_Nfer = IROHA_KEY_Shift_Nfer; +static int Vcanna_key_Shift_Xfer = IROHA_KEY_Shift_Xfer; +static int Vcanna_key_Shift_Up = IROHA_KEY_Shift_Up; +static int Vcanna_key_Shift_Left = IROHA_KEY_Shift_Left; +static int Vcanna_key_Shift_Right = IROHA_KEY_Shift_Right; +static int Vcanna_key_Shift_Down = IROHA_KEY_Shift_Down; +static int Vcanna_key_Cntrl_Nfer = IROHA_KEY_Cntrl_Nfer; +static int Vcanna_key_Cntrl_Xfer = IROHA_KEY_Cntrl_Xfer; +static int Vcanna_key_Cntrl_Up = IROHA_KEY_Cntrl_Up; +static int Vcanna_key_Cntrl_Left = IROHA_KEY_Cntrl_Left; +static int Vcanna_key_Cntrl_Right = IROHA_KEY_Cntrl_Right; +static int Vcanna_key_Cntrl_Down = IROHA_KEY_Cntrl_Down; Lisp_Object VCANNA; /* by MORIOKA Tomohiko 1996/6/7 */ @@ -1024,7 +1025,7 @@ syms_of_mule_canna (void) { DEFVAR_LISP ("CANNA", &VCANNA); /* hir@nec, 1992.5.21 */ VCANNA = Qt; /* hir@nec, 1992.5.21 */ - + DEFSUBR (Fcanna_key_proc); DEFSUBR (Fcanna_initialize); DEFSUBR (Fcanna_finalize); @@ -1051,721 +1052,464 @@ vars_of_mule_canna (void) DEFVAR_LISP ("canna-kakutei-string", &Vcanna_kakutei_string /* */ ); - Vcanna_kakutei_string = Qnil; - DEFVAR_LISP ("canna-kakutei-yomi", &Vcanna_kakutei_yomi /* */ ); - Vcanna_kakutei_yomi = Qnil; - DEFVAR_LISP ("canna-kakutei-romaji", &Vcanna_kakutei_romaji /* */ ); - Vcanna_kakutei_romaji = Qnil; - DEFVAR_LISP ("canna-henkan-string", &Vcanna_henkan_string /* */ ); - Vcanna_henkan_string = Qnil; - - DEFVAR_INT ("canna-henkan-length", &canna_henkan_length /* + DEFVAR_INT ("canna-henkan-length", &Vcanna_henkan_length /* */ ); - canna_henkan_length = 0; - - DEFVAR_INT ("canna-henkan-revpos", &canna_henkan_revPos /* + DEFVAR_INT ("canna-henkan-revpos", &Vcanna_henkan_revPos /* */ ); - canna_henkan_revPos = 0; - - DEFVAR_INT ("canna-henkan-revlen", &canna_henkan_revLen /* + DEFVAR_INT ("canna-henkan-revlen", &Vcanna_henkan_revLen /* */ ); - canna_henkan_revLen = 0; - DEFVAR_LISP ("canna-ichiran-string", &Vcanna_ichiran_string /* */ ); - Vcanna_ichiran_string = Qnil; - - DEFVAR_INT ("canna-ichiran-length", &canna_ichiran_length /* + DEFVAR_INT ("canna-ichiran-length", &Vcanna_ichiran_length /* */ ); - canna_ichiran_length = 0; - - DEFVAR_INT ("canna-ichiran-revpos", &canna_ichiran_revPos /* + DEFVAR_INT ("canna-ichiran-revpos", &Vcanna_ichiran_revPos /* */ ); - canna_ichiran_revPos = 0; - - DEFVAR_INT ("canna-ichiran-revlen", &canna_ichiran_revLen /* + DEFVAR_INT ("canna-ichiran-revlen", &Vcanna_ichiran_revLen /* */ ); - canna_ichiran_revLen = 0; - DEFVAR_LISP ("canna-mode-string", &Vcanna_mode_string /* */ ); - Vcanna_mode_string = Qnil; - DEFVAR_BOOL ("canna-empty-info", &canna_empty_info /* + DEFVAR_BOOL ("canna-empty-info", &Vcanna_empty_info /* For canna */ ); - canna_empty_info = 0; - - DEFVAR_BOOL ("canna-through-info", &canna_through_info /* + DEFVAR_BOOL ("canna-through-info", &Vcanna_through_info /* For canna */ ); - canna_through_info = 0; - - DEFVAR_BOOL ("canna-underline", &canna_underline /* + DEFVAR_BOOL ("canna-underline", &Vcanna_underline /* For canna */ ); - canna_underline = 0; - - DEFVAR_BOOL ("canna-inhibit-hankakukana", &canna_inhibit_hankakukana /* + DEFVAR_BOOL ("canna-inhibit-hankakukana", &Vcanna_inhibit_hankakukana /* For canna */ ); - canna_inhibit_hankakukana = 0; - DEFVAR_INT ("canna-mode-alpha-mode", &canna_mode_AlphaMode /* + DEFVAR_INT ("canna-mode-alpha-mode", &Vcanna_mode_AlphaMode /* */ ); - canna_mode_AlphaMode = IROHA_MODE_AlphaMode; - - DEFVAR_INT ("canna-mode-empty-mode", &canna_mode_EmptyMode /* + DEFVAR_INT ("canna-mode-empty-mode", &Vcanna_mode_EmptyMode /* */ ); - canna_mode_EmptyMode = IROHA_MODE_EmptyMode; - - DEFVAR_INT ("canna-mode-kigo-mode", &canna_mode_KigoMode /* + DEFVAR_INT ("canna-mode-kigo-mode", &Vcanna_mode_KigoMode /* */ ); - canna_mode_KigoMode = IROHA_MODE_KigoMode; - - DEFVAR_INT ("canna-mode-yomi-mode", &canna_mode_YomiMode /* + DEFVAR_INT ("canna-mode-yomi-mode", &Vcanna_mode_YomiMode /* */ ); - canna_mode_YomiMode = IROHA_MODE_YomiMode; - - DEFVAR_INT ("canna-mode-jishu-mode", &canna_mode_JishuMode /* + DEFVAR_INT ("canna-mode-jishu-mode", &Vcanna_mode_JishuMode /* */ ); - canna_mode_JishuMode = IROHA_MODE_JishuMode; - - DEFVAR_INT ("canna-mode-tankouho-mode", &canna_mode_TankouhoMode /* + DEFVAR_INT ("canna-mode-tankouho-mode", &Vcanna_mode_TankouhoMode /* */ ); - canna_mode_TankouhoMode = IROHA_MODE_TankouhoMode; - - DEFVAR_INT ("canna-mode-ichiran-mode", &canna_mode_IchiranMode /* + DEFVAR_INT ("canna-mode-ichiran-mode", &Vcanna_mode_IchiranMode /* */ ); - canna_mode_IchiranMode = IROHA_MODE_IchiranMode; - - DEFVAR_INT ("canna-mode-yes-no-mode", &canna_mode_YesNoMode /* + DEFVAR_INT ("canna-mode-yes-no-mode", &Vcanna_mode_YesNoMode /* */ ); - canna_mode_YesNoMode = IROHA_MODE_YesNoMode; - - DEFVAR_INT ("canna-mode-on-off-mode", &canna_mode_OnOffMode /* + DEFVAR_INT ("canna-mode-on-off-mode", &Vcanna_mode_OnOffMode /* */ ); - canna_mode_OnOffMode = IROHA_MODE_OnOffMode; - #ifdef CANNA_MODE_AdjustBunsetsuMode DEFVAR_INT ("canna-mode-adjust-bunsetsu-mode", - &canna_mode_AdjustBunsetsuMode /* + &Vcanna_mode_AdjustBunsetsuMode /* */ ); - canna_mode_AdjustBunsetsuMode = CANNA_MODE_AdjustBunsetsuMode; #endif #ifdef CANNA_MODE_ChikujiYomiMode - DEFVAR_INT ("canna-mode-chikuji-yomi-mode", &canna_mode_ChikujiYomiMode /* + DEFVAR_INT ("canna-mode-chikuji-yomi-mode", &Vcanna_mode_ChikujiYomiMode /* */ ); - canna_mode_ChikujiYomiMode = CANNA_MODE_ChikujiYomiMode; - DEFVAR_INT ("canna-mode-chikuji-bunsetsu-mode", - &canna_mode_ChikujiTanMode /* + &Vcanna_mode_ChikujiTanMode /* */ ); - canna_mode_ChikujiTanMode = CANNA_MODE_ChikujiTanMode; #endif - DEFVAR_INT ("canna-mode-henkan-mode", &canna_mode_HenkanMode /* + DEFVAR_INT ("canna-mode-henkan-mode", &Vcanna_mode_HenkanMode /* */ ); - canna_mode_HenkanMode = IROHA_MODE_HenkanMode; - #ifdef CANNA_MODE_HenkanNyuryokuMode DEFVAR_INT ("canna-mode-henkan-nyuuryoku-mode", - &canna_mode_HenkanNyuryokuMode /* + &Vcanna_mode_HenkanNyuryokuMode /* */ ); - canna_mode_HenkanNyuryokuMode = CANNA_MODE_HenkanNyuryokuMode; #endif #ifdef CANNA_MODE_ZenHiraHenkanMode DEFVAR_INT ("canna-mode-zen-hira-henkan-mode", - &canna_mode_ZenHiraHenkanMode /* + &Vcanna_mode_ZenHiraHenkanMode /* */ ); - canna_mode_ZenHiraHenkanMode = CANNA_MODE_ZenHiraHenkanMode; #ifdef CANNA_MODE_HanHiraHenkanMode DEFVAR_INT ("canna-mode-han-hira-henkan-mode", - &canna_mode_HanHiraHenkanMode /* + &Vcanna_mode_HanHiraHenkanMode /* */ ); - canna_mode_HanHiraHenkanMode = CANNA_MODE_HanHiraHenkanMode; #endif DEFVAR_INT ("canna-mode-zen-kata-henkan-mode", - &canna_mode_ZenKataHenkanMode /* + &Vcanna_mode_ZenKataHenkanMode /* */ ); - canna_mode_ZenKataHenkanMode = CANNA_MODE_ZenKataHenkanMode; - DEFVAR_INT ("canna-mode-han-kata-henkan-mode", - &canna_mode_HanKataHenkanMode /* + &Vcanna_mode_HanKataHenkanMode /* */ ); - canna_mode_HanKataHenkanMode = CANNA_MODE_HanKataHenkanMode; - DEFVAR_INT ("canna-mode-zen-alpha-henkan-mode", - &canna_mode_ZenAlphaHenkanMode /* + &Vcanna_mode_ZenAlphaHenkanMode /* */ ); - canna_mode_ZenAlphaHenkanMode = CANNA_MODE_ZenAlphaHenkanMode; - DEFVAR_INT ("canna-mode-han-alpha-henkan-mode", - &canna_mode_HanAlphaHenkanMode /* + &Vcanna_mode_HanAlphaHenkanMode /* */ ); - canna_mode_HanAlphaHenkanMode = CANNA_MODE_HanAlphaHenkanMode; #endif DEFVAR_INT ("canna-mode-zen-hira-kakutei-mode", - &canna_mode_ZenHiraKakuteiMode /* + &Vcanna_mode_ZenHiraKakuteiMode /* */ ); - canna_mode_ZenHiraKakuteiMode = IROHA_MODE_ZenHiraKakuteiMode; #ifdef CANNA_MODE_HanHiraKakuteiMode DEFVAR_INT ("canna-mode-han-hira-kakutei-mode", - &canna_mode_HanHiraKakuteiMode /* + &Vcanna_mode_HanHiraKakuteiMode /* */ ); - canna_mode_HanHiraKakuteiMode = CANNA_MODE_HanHiraKakuteiMode; #endif DEFVAR_INT ("canna-mode-zen-kata-kakutei-mode", - &canna_mode_ZenKataKakuteiMode /* + &Vcanna_mode_ZenKataKakuteiMode /* */ ); - canna_mode_ZenKataKakuteiMode = IROHA_MODE_ZenKataKakuteiMode; - DEFVAR_INT ("canna-mode-han-kata-kakutei-mode", - &canna_mode_HanKataKakuteiMode /* + &Vcanna_mode_HanKataKakuteiMode /* */ ); - canna_mode_HanKataKakuteiMode = IROHA_MODE_HanKataKakuteiMode; - DEFVAR_INT ("canna-mode-zen-alpha-kakutei-mode", - &canna_mode_ZenAlphaKakuteiMode /* + &Vcanna_mode_ZenAlphaKakuteiMode /* */ ); - canna_mode_ZenAlphaKakuteiMode = IROHA_MODE_ZenAlphaKakuteiMode; - DEFVAR_INT ("canna-mode-han-alpha-kakutei-mode", - &canna_mode_HanAlphaKakuteiMode /* + &Vcanna_mode_HanAlphaKakuteiMode /* */ ); - canna_mode_HanAlphaKakuteiMode = IROHA_MODE_HanAlphaKakuteiMode; - - DEFVAR_INT ("canna-mode-hex-mode", &canna_mode_HexMode /* + DEFVAR_INT ("canna-mode-hex-mode", &Vcanna_mode_HexMode /* */ ); - canna_mode_HexMode = IROHA_MODE_HexMode; - - DEFVAR_INT ("canna-mode-bushu-mode", &canna_mode_BushuMode /* + DEFVAR_INT ("canna-mode-bushu-mode", &Vcanna_mode_BushuMode /* */ ); - canna_mode_BushuMode = IROHA_MODE_BushuMode; - - DEFVAR_INT ("canna-mode-extend-mode", &canna_mode_ExtendMode /* + DEFVAR_INT ("canna-mode-extend-mode", &Vcanna_mode_ExtendMode /* */ ); - canna_mode_ExtendMode = IROHA_MODE_ExtendMode; - - DEFVAR_INT ("canna-mode-russian-mode", &canna_mode_RussianMode /* + DEFVAR_INT ("canna-mode-russian-mode", &Vcanna_mode_RussianMode /* */ ); - canna_mode_RussianMode = IROHA_MODE_RussianMode; - - DEFVAR_INT ("canna-mode-greek-mode", &canna_mode_GreekMode /* + DEFVAR_INT ("canna-mode-greek-mode", &Vcanna_mode_GreekMode /* */ ); - canna_mode_GreekMode = IROHA_MODE_GreekMode; - - DEFVAR_INT ("canna-mode-line-mode", &canna_mode_LineMode /* + DEFVAR_INT ("canna-mode-line-mode", &Vcanna_mode_LineMode /* */ ); - canna_mode_LineMode = IROHA_MODE_LineMode; - DEFVAR_INT ("canna-mode-changing-server-mode", - &canna_mode_ChangingServerMode /* + &Vcanna_mode_ChangingServerMode /* */ ); - canna_mode_ChangingServerMode = IROHA_MODE_ChangingServerMode; - DEFVAR_INT ("canna-mode-henkan-method-mode", - &canna_mode_HenkanMethodMode /* + &Vcanna_mode_HenkanMethodMode /* */ ); - canna_mode_HenkanMethodMode = IROHA_MODE_HenkanMethodMode; - - DEFVAR_INT ("canna-mode-delete-dic-mode", &canna_mode_DeleteDicMode /* + DEFVAR_INT ("canna-mode-delete-dic-mode", &Vcanna_mode_DeleteDicMode /* */ ); - canna_mode_DeleteDicMode = IROHA_MODE_DeleteDicMode; - - DEFVAR_INT ("canna-mode-touroku-mode", &canna_mode_TourokuMode /* + DEFVAR_INT ("canna-mode-touroku-mode", &Vcanna_mode_TourokuMode /* */ ); - canna_mode_TourokuMode = IROHA_MODE_TourokuMode; - DEFVAR_INT ("canna-mode-touroku-empty-mode", - &canna_mode_TourokuEmptyMode /* + &Vcanna_mode_TourokuEmptyMode /* */ ); - canna_mode_TourokuEmptyMode = IROHA_MODE_TourokuEmptyMode; - DEFVAR_INT ("canna-mode-touroku-hinshi-mode", - &canna_mode_TourokuHinshiMode /* + &Vcanna_mode_TourokuHinshiMode /* */ ); - canna_mode_TourokuHinshiMode = IROHA_MODE_TourokuHinshiMode; - - DEFVAR_INT ("canna-mode-touroku-dic-mode", &canna_mode_TourokuDicMode /* + DEFVAR_INT ("canna-mode-touroku-dic-mode", &Vcanna_mode_TourokuDicMode /* */ ); - canna_mode_TourokuDicMode = IROHA_MODE_TourokuDicMode; - DEFVAR_INT ("canna-mode-quoted-insert-mode", - &canna_mode_QuotedInsertMode /* + &Vcanna_mode_QuotedInsertMode /* */ ); - canna_mode_QuotedInsertMode = IROHA_MODE_QuotedInsertMode; - DEFVAR_INT ("canna-mode-bubun-muhenkan-mode", - &canna_mode_BubunMuhenkanMode /* + &Vcanna_mode_BubunMuhenkanMode /* */ ); - canna_mode_BubunMuhenkanMode = IROHA_MODE_BubunMuhenkanMode; - - DEFVAR_INT ("canna-mode-mount-dic-mode", &canna_mode_MountDicMode /* + DEFVAR_INT ("canna-mode-mount-dic-mode", &Vcanna_mode_MountDicMode /* */ ); - canna_mode_MountDicMode = IROHA_MODE_MountDicMode; - DEFVAR_INT ("canna-func-self-insert", &canna_fn_SelfInsert /* + DEFVAR_INT ("canna-func-self-insert", &Vcanna_fn_SelfInsert /* */ ); - canna_fn_SelfInsert = IROHA_FN_SelfInsert; - - DEFVAR_INT ("canna-func-functional-insert", &canna_fn_FunctionalInsert /* + DEFVAR_INT ("canna-func-functional-insert", &Vcanna_fn_FunctionalInsert /* */ ); - canna_fn_FunctionalInsert = IROHA_FN_FunctionalInsert; - - DEFVAR_INT ("canna-func-quoted-insert", &canna_fn_QuotedInsert /* + DEFVAR_INT ("canna-func-quoted-insert", &Vcanna_fn_QuotedInsert /* */ ); - canna_fn_QuotedInsert = IROHA_FN_QuotedInsert; - - DEFVAR_INT ("canna-func-japanese-mode", &canna_fn_JapaneseMode /* + DEFVAR_INT ("canna-func-japanese-mode", &Vcanna_fn_JapaneseMode /* */ ); - canna_fn_JapaneseMode = IROHA_FN_JapaneseMode; - - DEFVAR_INT ("canna-func-alpha-mode", &canna_fn_AlphaMode /* + DEFVAR_INT ("canna-func-alpha-mode", &Vcanna_fn_AlphaMode /* */ ); - canna_fn_AlphaMode = IROHA_FN_AlphaMode; - DEFVAR_INT ("canna-func-henkan-nyuryoku-mode", - &canna_fn_HenkanNyuryokuMode /* + &Vcanna_fn_HenkanNyuryokuMode /* */ ); - canna_fn_HenkanNyuryokuMode = IROHA_FN_HenkanNyuryokuMode; - - DEFVAR_INT ("canna-func-forward", &canna_fn_Forward /* + DEFVAR_INT ("canna-func-forward", &Vcanna_fn_Forward /* */ ); - canna_fn_Forward = IROHA_FN_Forward; - - DEFVAR_INT ("canna-func-backward", &canna_fn_Backward /* + DEFVAR_INT ("canna-func-backward", &Vcanna_fn_Backward /* */ ); - canna_fn_Backward = IROHA_FN_Backward; - - DEFVAR_INT ("canna-func-next", &canna_fn_Next /* + DEFVAR_INT ("canna-func-next", &Vcanna_fn_Next /* */ ); - canna_fn_Next = IROHA_FN_Next; - - DEFVAR_INT ("canna-func-previous", &canna_fn_Prev /* + DEFVAR_INT ("canna-func-previous", &Vcanna_fn_Prev /* */ ); - canna_fn_Prev = IROHA_FN_Prev; - - DEFVAR_INT ("canna-func-beginning-of-line", &canna_fn_BeginningOfLine /* + DEFVAR_INT ("canna-func-beginning-of-line", &Vcanna_fn_BeginningOfLine /* */ ); - canna_fn_BeginningOfLine = IROHA_FN_BeginningOfLine; - - DEFVAR_INT ("canna-func-end-of-line", &canna_fn_EndOfLine /* + DEFVAR_INT ("canna-func-end-of-line", &Vcanna_fn_EndOfLine /* */ ); - canna_fn_EndOfLine = IROHA_FN_EndOfLine; - - DEFVAR_INT ("canna-func-delete-next", &canna_fn_DeleteNext /* + DEFVAR_INT ("canna-func-delete-next", &Vcanna_fn_DeleteNext /* */ ); - canna_fn_DeleteNext = IROHA_FN_DeleteNext; - - DEFVAR_INT ("canna-func-delete_previous", &canna_fn_DeletePrevious /* + DEFVAR_INT ("canna-func-delete_previous", &Vcanna_fn_DeletePrevious /* */ ); - canna_fn_DeletePrevious = IROHA_FN_DeletePrevious; - - DEFVAR_INT ("canna-func-kill-to-end-of-line", &canna_fn_KillToEndOfLine /* + DEFVAR_INT ("canna-func-kill-to-end-of-line", &Vcanna_fn_KillToEndOfLine /* */ ); - canna_fn_KillToEndOfLine = IROHA_FN_KillToEndOfLine; - - DEFVAR_INT ("canna-func-henkan", &canna_fn_Henkan /* + DEFVAR_INT ("canna-func-henkan", &Vcanna_fn_Henkan /* */ ); - canna_fn_Henkan = IROHA_FN_Henkan; - - DEFVAR_INT ("canna-func-kakutei", &canna_fn_Kakutei /* + DEFVAR_INT ("canna-func-kakutei", &Vcanna_fn_Kakutei /* */ ); - canna_fn_Kakutei = IROHA_FN_Kakutei; - - DEFVAR_INT ("canna-func-extend", &canna_fn_Extend /* + DEFVAR_INT ("canna-func-extend", &Vcanna_fn_Extend /* */ ); - canna_fn_Extend = IROHA_FN_Extend; - - DEFVAR_INT ("canna-func-shrink", &canna_fn_Shrink /* + DEFVAR_INT ("canna-func-shrink", &Vcanna_fn_Shrink /* */ ); - canna_fn_Shrink = IROHA_FN_Shrink; - #ifdef CANNA_FN_AdjustBunsetsu - DEFVAR_INT ("canna-func-adjust-bunsetsu", &canna_fn_AdjustBunsetsu /* + DEFVAR_INT ("canna-func-adjust-bunsetsu", &Vcanna_fn_AdjustBunsetsu /* */ ); - canna_fn_AdjustBunsetsu = CANNA_FN_AdjustBunsetsu; #endif - DEFVAR_INT ("canna-func-quit", &canna_fn_Quit /* + DEFVAR_INT ("canna-func-quit", &Vcanna_fn_Quit /* */ ); - canna_fn_Quit = IROHA_FN_Quit; - - DEFVAR_INT ("canna-func-convert-as-hex", &canna_fn_ConvertAsHex /* + DEFVAR_INT ("canna-func-convert-as-hex", &Vcanna_fn_ConvertAsHex /* */ ); - canna_fn_ConvertAsHex = IROHA_FN_ConvertAsHex; - - DEFVAR_INT ("canna-func-convert-as-bushu", &canna_fn_ConvertAsBushu /* + DEFVAR_INT ("canna-func-convert-as-bushu", &Vcanna_fn_ConvertAsBushu /* */ ); - canna_fn_ConvertAsBushu = IROHA_FN_ConvertAsBushu; - - DEFVAR_INT ("canna-func-kouho-ichiran", &canna_fn_KouhoIchiran /* + DEFVAR_INT ("canna-func-kouho-ichiran", &Vcanna_fn_KouhoIchiran /* */ ); - canna_fn_KouhoIchiran = IROHA_FN_KouhoIchiran; - - DEFVAR_INT ("canna-func-bubun-muhenkan", &canna_fn_BubunMuhenkan /* + DEFVAR_INT ("canna-func-bubun-muhenkan", &Vcanna_fn_BubunMuhenkan /* */ ); - canna_fn_BubunMuhenkan = IROHA_FN_BubunMuhenkan; - - DEFVAR_INT ("canna-func-zenkaku", &canna_fn_Zenkaku /* + DEFVAR_INT ("canna-func-zenkaku", &Vcanna_fn_Zenkaku /* */ ); - canna_fn_Zenkaku = IROHA_FN_Zenkaku; - - DEFVAR_INT ("canna-func-hankaku", &canna_fn_Hankaku /* + DEFVAR_INT ("canna-func-hankaku", &Vcanna_fn_Hankaku /* */ ); - canna_fn_Hankaku = IROHA_FN_Hankaku; - - DEFVAR_INT ("canna-func-to-upper", &canna_fn_ToUpper /* + DEFVAR_INT ("canna-func-to-upper", &Vcanna_fn_ToUpper /* */ ); - canna_fn_ToUpper = IROHA_FN_ToUpper; - - DEFVAR_INT ("canna-func-capitalize", &canna_fn_Capitalize /* + DEFVAR_INT ("canna-func-capitalize", &Vcanna_fn_Capitalize /* */ ); - canna_fn_Capitalize = IROHA_FN_Capitalize; - - DEFVAR_INT ("canna-func-to-lower", &canna_fn_ToLower /* + DEFVAR_INT ("canna-func-to-lower", &Vcanna_fn_ToLower /* */ ); - canna_fn_ToLower = IROHA_FN_ToLower; - - DEFVAR_INT ("canna-func-hiragana", &canna_fn_Hiragana /* + DEFVAR_INT ("canna-func-hiragana", &Vcanna_fn_Hiragana /* */ ); - canna_fn_Hiragana = IROHA_FN_Hiragana; - - DEFVAR_INT ("canna-func-katakana", &canna_fn_Katakana /* + DEFVAR_INT ("canna-func-katakana", &Vcanna_fn_Katakana /* */ ); - canna_fn_Katakana = IROHA_FN_Katakana; - - DEFVAR_INT ("canna-func-romaji", &canna_fn_Romaji /* + DEFVAR_INT ("canna-func-romaji", &Vcanna_fn_Romaji /* */ ); - canna_fn_Romaji = IROHA_FN_Romaji; - #ifdef CANNA_FN_BaseHiragana - DEFVAR_INT ("canna-func-base-hiragana", &canna_fn_BaseHiragana /* + DEFVAR_INT ("canna-func-base-hiragana", &Vcanna_fn_BaseHiragana /* */ ); - canna_fn_BaseHiragana = CANNA_FN_BaseHiragana; - - DEFVAR_INT ("canna-func-base-katakana", &canna_fn_BaseKatakana /* + DEFVAR_INT ("canna-func-base-katakana", &Vcanna_fn_BaseKatakana /* */ ); - canna_fn_BaseKatakana = CANNA_FN_BaseKatakana; - - DEFVAR_INT ("canna-func-base-eisu", &canna_fn_BaseEisu /* + DEFVAR_INT ("canna-func-base-eisu", &Vcanna_fn_BaseEisu /* */ ); - canna_fn_BaseEisu = CANNA_FN_BaseEisu; - - DEFVAR_INT ("canna-func-base-zenkaku", &canna_fn_BaseZenkaku /* + DEFVAR_INT ("canna-func-base-zenkaku", &Vcanna_fn_BaseZenkaku /* */ ); - canna_fn_BaseZenkaku = CANNA_FN_BaseZenkaku; - - DEFVAR_INT ("canna-func-base-hankaku", &canna_fn_BaseHankaku /* + DEFVAR_INT ("canna-func-base-hankaku", &Vcanna_fn_BaseHankaku /* */ ); - canna_fn_BaseHankaku = CANNA_FN_BaseHankaku; - - DEFVAR_INT ("canna-func-base-kana", &canna_fn_BaseKana /* + DEFVAR_INT ("canna-func-base-kana", &Vcanna_fn_BaseKana /* */ ); - canna_fn_BaseKana = CANNA_FN_BaseKana; - - DEFVAR_INT ("canna-func-base-kakutei", &canna_fn_BaseKakutei /* + DEFVAR_INT ("canna-func-base-kakutei", &Vcanna_fn_BaseKakutei /* */ ); - canna_fn_BaseKakutei = CANNA_FN_BaseKakutei; - - DEFVAR_INT ("canna-func-base-henkan", &canna_fn_BaseHenkan /* + DEFVAR_INT ("canna-func-base-henkan", &Vcanna_fn_BaseHenkan /* */ ); - canna_fn_BaseHenkan = CANNA_FN_BaseHenkan; - DEFVAR_INT ("canna-func-base-hiragana-katakana-toggle", - &canna_fn_BaseHiraKataToggle /* + &Vcanna_fn_BaseHiraKataToggle /* */ ); - canna_fn_BaseHiraKataToggle = CANNA_FN_BaseHiraKataToggle; - DEFVAR_INT ("canna-func-base-zenkaku-hankaku-toggle", - &canna_fn_BaseZenHanToggle /* + &Vcanna_fn_BaseZenHanToggle /* */ ); - canna_fn_BaseZenHanToggle = CANNA_FN_BaseZenHanToggle; - DEFVAR_INT ("canna-func-base-kana-eisu-toggle", - &canna_fn_BaseKanaEisuToggle /* + &Vcanna_fn_BaseKanaEisuToggle /* */ ); - canna_fn_BaseKanaEisuToggle = CANNA_FN_BaseKanaEisuToggle; - DEFVAR_INT ("canna-func-base-kakutei-henkan-toggle", - &canna_fn_BaseKakuteiHenkanToggle /* + &Vcanna_fn_BaseKakuteiHenkanToggle /* */ ); - canna_fn_BaseKakuteiHenkanToggle = CANNA_FN_BaseKakuteiHenkanToggle; - DEFVAR_INT ("canna-func-base-rotate-forward", - &canna_fn_BaseRotateForward /* + &Vcanna_fn_BaseRotateForward /* */ ); - canna_fn_BaseRotateForward = CANNA_FN_BaseRotateForward; - DEFVAR_INT ("canna-func-base-rotate-backward", - &canna_fn_BaseRotateBackward /* + &Vcanna_fn_BaseRotateBackward /* */ ); - canna_fn_BaseRotateBackward = CANNA_FN_BaseRotateBackward; - #endif - DEFVAR_INT ("canna-func-extend-mode", &canna_fn_ExtendMode /* + DEFVAR_INT ("canna-func-extend-mode", &Vcanna_fn_ExtendMode /* */ ); - canna_fn_ExtendMode = IROHA_FN_ExtendMode; - - DEFVAR_INT ("canna-func-touroku", &canna_fn_Touroku /* + DEFVAR_INT ("canna-func-touroku", &Vcanna_fn_Touroku /* */ ); - canna_fn_Touroku = IROHA_FN_Touroku; - - DEFVAR_INT ("canna-func-hex-mode", &canna_fn_HexMode /* + DEFVAR_INT ("canna-func-hex-mode", &Vcanna_fn_HexMode /* */ ); - canna_fn_HexMode = IROHA_FN_HexMode; - - DEFVAR_INT ("canna-func-bushu-mode", &canna_fn_BushuMode /* + DEFVAR_INT ("canna-func-bushu-mode", &Vcanna_fn_BushuMode /* */ ); - canna_fn_BushuMode = IROHA_FN_BushuMode; - - DEFVAR_INT ("canna-func-kigo-mode", &canna_fn_KigouMode /* + DEFVAR_INT ("canna-func-kigo-mode", &Vcanna_fn_KigouMode /* */ ); - canna_fn_KigouMode = IROHA_FN_KigouMode; - #ifdef CANNA_FN_Mark - DEFVAR_INT ("canna-func-mark", &canna_fn_Mark /* + DEFVAR_INT ("canna-func-mark", &Vcanna_fn_Mark /* */ ); - canna_fn_Mark = CANNA_FN_Mark; #endif #ifdef CANNA_FN_TemporalMode - DEFVAR_INT ("canna-func-temporal-mode", &canna_fn_TemporalMode /* + DEFVAR_INT ("canna-func-temporal-mode", &Vcanna_fn_TemporalMode /* */ ); - canna_fn_TemporalMode = CANNA_FN_TemporalMode; #endif - DEFVAR_INT ("canna-key-nfer", &canna_key_Nfer /* + DEFVAR_INT ("canna-key-nfer", &Vcanna_key_Nfer /* */ ); - canna_key_Nfer = IROHA_KEY_Nfer; - - DEFVAR_INT ("canna-key-xfer", &canna_key_Xfer /* + DEFVAR_INT ("canna-key-xfer", &Vcanna_key_Xfer /* */ ); - canna_key_Xfer = IROHA_KEY_Xfer; - - DEFVAR_INT ("canna-key-up", &canna_key_Up /* + DEFVAR_INT ("canna-key-up", &Vcanna_key_Up /* */ ); - canna_key_Up = IROHA_KEY_Up; - - DEFVAR_INT ("canna-key-left", &canna_key_Left /* + DEFVAR_INT ("canna-key-left", &Vcanna_key_Left /* */ ); - canna_key_Left = IROHA_KEY_Left; - - DEFVAR_INT ("canna-key-right", &canna_key_Right /* + DEFVAR_INT ("canna-key-right", &Vcanna_key_Right /* */ ); - canna_key_Right = IROHA_KEY_Right; - - DEFVAR_INT ("canna-key-down", &canna_key_Down /* + DEFVAR_INT ("canna-key-down", &Vcanna_key_Down /* */ ); - canna_key_Down = IROHA_KEY_Down; - - DEFVAR_INT ("canna-key-insert", &canna_key_Insert /* + DEFVAR_INT ("canna-key-insert", &Vcanna_key_Insert /* */ ); - canna_key_Insert = IROHA_KEY_Insert; - - DEFVAR_INT ("canna-key-rollup", &canna_key_Rollup /* + DEFVAR_INT ("canna-key-rollup", &Vcanna_key_Rollup /* */ ); - canna_key_Rollup = IROHA_KEY_Rollup; - - DEFVAR_INT ("canna-key-rolldown", &canna_key_Rolldown /* + DEFVAR_INT ("canna-key-rolldown", &Vcanna_key_Rolldown /* */ ); - canna_key_Rolldown = IROHA_KEY_Rolldown; - - DEFVAR_INT ("canna-key-home", &canna_key_Home /* + DEFVAR_INT ("canna-key-home", &Vcanna_key_Home /* */ ); - canna_key_Home = IROHA_KEY_Home; - - DEFVAR_INT ("canna-key-help", &canna_key_Help /* + DEFVAR_INT ("canna-key-help", &Vcanna_key_Help /* */ ); - canna_key_Help = IROHA_KEY_Help; - - DEFVAR_INT ("canna-key-kp-key", &canna_key_KP_Key /* + DEFVAR_INT ("canna-key-kp-key", &Vcanna_key_KP_Key /* */ ); - canna_key_KP_Key = IROHA_KEY_KP_Key; - - DEFVAR_INT ("canna-key-shift-nfer", &canna_key_Shift_Nfer /* + DEFVAR_INT ("canna-key-shift-nfer", &Vcanna_key_Shift_Nfer /* */ ); - canna_key_Shift_Nfer = IROHA_KEY_Shift_Nfer; - - DEFVAR_INT ("canna-key-shift-xfer", &canna_key_Shift_Xfer /* + DEFVAR_INT ("canna-key-shift-xfer", &Vcanna_key_Shift_Xfer /* */ ); - canna_key_Shift_Xfer = IROHA_KEY_Shift_Xfer; - - DEFVAR_INT ("canna-key-shift-up", &canna_key_Shift_Up /* + DEFVAR_INT ("canna-key-shift-up", &Vcanna_key_Shift_Up /* */ ); - canna_key_Shift_Up = IROHA_KEY_Shift_Up; - - DEFVAR_INT ("canna-key-shift-left", &canna_key_Shift_Left /* + DEFVAR_INT ("canna-key-shift-left", &Vcanna_key_Shift_Left /* */ ); - canna_key_Shift_Left = IROHA_KEY_Shift_Left; - - DEFVAR_INT ("canna-key-shift-right", &canna_key_Shift_Right /* + DEFVAR_INT ("canna-key-shift-right", &Vcanna_key_Shift_Right /* */ ); - canna_key_Shift_Right = IROHA_KEY_Shift_Right; - - DEFVAR_INT ("canna-key-shift-down", &canna_key_Shift_Down /* + DEFVAR_INT ("canna-key-shift-down", &Vcanna_key_Shift_Down /* */ ); - canna_key_Shift_Down = IROHA_KEY_Shift_Down; - - DEFVAR_INT ("canna-key-control-nfer", &canna_key_Cntrl_Nfer /* + DEFVAR_INT ("canna-key-control-nfer", &Vcanna_key_Cntrl_Nfer /* */ ); - canna_key_Cntrl_Nfer = IROHA_KEY_Cntrl_Nfer; - - DEFVAR_INT ("canna-key-control-xfer", &canna_key_Cntrl_Xfer /* + DEFVAR_INT ("canna-key-control-xfer", &Vcanna_key_Cntrl_Xfer /* */ ); - canna_key_Cntrl_Xfer = IROHA_KEY_Cntrl_Xfer; - - DEFVAR_INT ("canna-key-control-up", &canna_key_Cntrl_Up /* + DEFVAR_INT ("canna-key-control-up", &Vcanna_key_Cntrl_Up /* */ ); - canna_key_Cntrl_Up = IROHA_KEY_Cntrl_Up; - - DEFVAR_INT ("canna-key-control-left", &canna_key_Cntrl_Left /* + DEFVAR_INT ("canna-key-control-left", &Vcanna_key_Cntrl_Left /* */ ); - canna_key_Cntrl_Left = IROHA_KEY_Cntrl_Left; - - DEFVAR_INT ("canna-key-control-right", &canna_key_Cntrl_Right /* + DEFVAR_INT ("canna-key-control-right", &Vcanna_key_Cntrl_Right /* */ ); - canna_key_Cntrl_Right = IROHA_KEY_Cntrl_Right; - - DEFVAR_INT ("canna-key-control-down", &canna_key_Cntrl_Down /* + DEFVAR_INT ("canna-key-control-down", &Vcanna_key_Cntrl_Down /* */ ); - canna_key_Cntrl_Down = IROHA_KEY_Cntrl_Down; Fprovide(intern("CANNA")); } @@ -1780,7 +1524,7 @@ static void c2mu (char *cp, int l, char *mp) { char ch, *ep = cp+l; - + while ((cp < ep) && (ch = *cp)) { if ((unsigned char) ch == ISO_CODE_SS2) @@ -1809,8 +1553,8 @@ c2mu (char *cp, int l, char *mp) static void m2c (unsigned char *mp, int l, unsigned char *cp) { - unsigned char ch, *ep = mp + l; - + unsigned char ch, *ep = mp + l;; + while ((mp < ep) && (ch = *mp++)) { switch (ch) @@ -1829,7 +1573,7 @@ m2c (unsigned char *mp, int l, unsigned char *cp) *cp++ = ch; break; } - } + } *cp = 0; } @@ -1840,10 +1584,10 @@ static Lisp_Object mule_make_string (unsigned char *p, int l) { unsigned char cbuf[4096]; - + c2mu (p,l,cbuf); return (make_string (cbuf,strlen (cbuf))); -} +} /* return the MULE internal string length of EUC string */ /* Modified by sb to return a character count not byte count. */ @@ -1852,7 +1596,7 @@ mule_strlen (unsigned char *p, int l) { unsigned char ch, *cp = p; int len = 0; - + while ((cp < p + l) && (ch = *cp)) { if ((unsigned char) ch == ISO_CODE_SS2) @@ -1873,7 +1617,7 @@ mule_strlen (unsigned char *p, int l) else { len++; - cp++; + cp++; } } return (len); @@ -1885,7 +1629,7 @@ count_char (unsigned char *p, int len, int pos, int rev, int *clen, int *cpos, int *crev) { unsigned char *q = p; - + *clen = *cpos = *crev = 0; if (len == 0) return; while (q < p + pos) @@ -1899,7 +1643,7 @@ count_char (unsigned char *p, int len, int pos, int rev, int *clen, int *cpos, (*clen)++; (*crev)++; if (*q++ & 0x80) q++; - } + } while (q < p + len) { (*clen)++;