[Anthy-dev 2542] patch and git (3)

Back to archive index

NIIBE Yutaka gniib****@m17n*****
2005年 10月 15日 (土) 08:53:56 JST


On Sat, 15 Oct 2005 06:37:23 +0900
	NIIBE Yutaka <gniib****@m17n*****> wrote:
 > 続けて、もう一個。

さらに。もう一個。

commit しました。

	http://www.gniibe.org/oitoite/anthy/

から取れます(.git はやめました)。

2005-10-15  NIIBE Yutaka  <gniib****@fsij*****>

	* src-diclib/wtype.c (struct PTab): Change order of members.
	* src-diclib/ptab.h: Follow the change.

diff --git a/src-diclib/ptab.h b/src-diclib/ptab.h
--- a/src-diclib/ptab.h
+++ b/src-diclib/ptab.h
@@ -1,150 +1,150 @@
 /* POS(Part of Speech) table */
-{"名詞",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_INDEP},
-{"名詞0",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T0,WF_INDEP|WF_SV},
-{"名詞2",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T2,WF_INDEP|WF_SV},
-{"名詞3",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T3,WF_INDEP|WF_SV},
-{"名詞4",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T4,WF_INDEP|WF_SV},
-{"名詞5",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T5,WF_INDEP},
-{"名詞7",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T7,WF_INDEP},
-{"名詞8",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T8,WF_INDEP},
-{"名詞9",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T9,WF_INDEP},
-{"名詞10",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T10,WF_INDEP|WF_SV},
-{"名詞12",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T12,WF_INDEP|WF_SV},
-{"名詞13",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T13,WF_INDEP|WF_SV},
-{"名詞14",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T14,WF_INDEP|WF_SV},
-{"名詞15",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T15,WF_INDEP},
-{"名詞17",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T17,WF_INDEP},
-{"名詞18",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T18,WF_INDEP},
-{"名詞19",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T19,WF_INDEP},
-{"名詞20",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T20,WF_INDEP|WF_SV},
-{"名詞22",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T22,WF_INDEP|WF_SV},
-{"名詞23",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T23,WF_INDEP|WF_SV},
-{"名詞24",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T24,WF_INDEP|WF_SV},
-{"名詞25",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T25,WF_INDEP},
-{"名詞27",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T27,WF_INDEP},
-{"名詞28",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T28,WF_INDEP},
-{"名詞29",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T29,WF_INDEP},
-{"名詞30",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T30,WF_INDEP|WF_SV},
-{"名詞32",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T32,WF_INDEP|WF_SV},
-{"名詞33",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T33,WF_INDEP|WF_SV},
-{"名詞34",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T34,WF_INDEP|WF_SV},
-{"名詞35",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T35,WF_INDEP},
-{"名詞37",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T37,WF_INDEP},
-{"名詞38",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T38,WF_INDEP},
-{"名詞39",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T39,WF_INDEP},
-{"名詞化接尾語",POS_NOUN,CT_NONE,CC_NONE,COS_NONE,SCOS_T40,WF_INDEP},
-{"名詞接尾語",POS_N2T,CT_NONE,CC_NONE,COS_NONE,SCOS_T41,WF_INDEP},
-{"数詞",POS_NUMBER,CT_NONE,CC_NONE,COS_NN,SCOS_NONE,WF_INDEP},
-{"数詞1",POS_NUMBER,CT_NONE,CC_NONE,COS_NN,SCOS_N1,WF_INDEP},
-{"数詞10",POS_NUMBER,CT_NONE,CC_NONE,COS_NN,SCOS_N10,WF_INDEP},
-{"数詞100",POS_NUMBER,CT_NONE,CC_NONE,COS_NN,SCOS_N100,WF_INDEP},
-{"数詞1000",POS_NUMBER,CT_NONE,CC_NONE,COS_NN,SCOS_N1000,WF_INDEP},
-{"数詞10000",POS_NUMBER,CT_NONE,CC_NONE,COS_NN,SCOS_N10000,WF_INDEP},
-{"人名",POS_NOUN,CT_NONE,CC_NONE,COS_JN,SCOS_NONE,WF_INDEP},
-{"地名",POS_NOUN,CT_NONE,CC_NONE,COS_CN,SCOS_NONE,WF_INDEP},
-{"団体名",POS_NOUN,CT_NONE,CC_NONE,COS_KK,SCOS_NONE,WF_INDEP},
-{"開き括弧",POS_OPEN,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_INDEP},
-{"閉じ括弧",POS_CLOSE,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_INDEP},
-{"名詞接頭辞",POS_PRE,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"人名接尾辞",POS_SUC,CT_NONE,CC_NONE,COS_JN,SCOS_NONE,WF_NONE},
-{"名詞接尾辞",POS_SUC,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"数接頭辞",POS_PRE,CT_NONE,CC_NONE,COS_NN,SCOS_NONE,WF_NONE},
-{"数接尾辞",POS_SUC,CT_NONE,CC_NONE,COS_NN,SCOS_NONE,WF_NONE},
-{"地名接頭辞",POS_PRE,CT_NONE,CC_NONE,COS_CN,SCOS_NONE,WF_NONE},
-{"地名接尾辞",POS_SUC,CT_NONE,CC_NONE,COS_CN,SCOS_NONE,WF_NONE},
-{"サ変接尾辞",POS_SUC,CT_NONE,CC_NONE,COS_SVSUFFIX,SCOS_NONE,WF_NONE},
-{"助詞",POS_PRT,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"副詞",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_INDEP},
-{"副詞0",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F0,WF_INDEP},
-{"副詞1",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F1,WF_INDEP},
-{"副詞2",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F2,WF_INDEP},
-{"副詞3",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F3,WF_INDEP},
-{"副詞4",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F4,WF_INDEP},
-{"副詞5",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F5,WF_INDEP},
-{"副詞6",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F6,WF_INDEP},
-{"副詞7",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F7,WF_INDEP},
-{"副詞8",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F8,WF_INDEP},
-{"副詞9",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F9,WF_INDEP},
-{"副詞10",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F10,WF_INDEP},
-{"副詞11",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F11,WF_INDEP},
-{"副詞12",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F12,WF_INDEP},
-{"副詞13",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F13,WF_INDEP},
-{"副詞14",POS_AV,CT_NONE,CC_NONE,COS_NONE,SCOS_F14,WF_INDEP},
-{"副詞語幹",POS_AV,CT_HEAD,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"動詞",POS_V,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"動詞語幹",POS_V,CT_HEAD,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"接続詞",POS_CONJ,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"動詞未然形",POS_V,CT_MIZEN,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"動詞連用形",POS_V,CT_RENYOU,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"動詞終止形",POS_V,CT_SYUSI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"動詞連体形",POS_V,CT_RENTAI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"動詞仮定形",POS_V,CT_KATEI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"動詞命令形",POS_V,CT_MEIREI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"カ行5段活用動詞語幹",POS_V,CT_HEAD,CC_K5,COS_NONE,SCOS_NONE,WF_NONE},
-{"カ行C5段活用動詞語幹",POS_V,CT_HEAD,CC_C5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ガ行5段活用動詞語幹",POS_V,CT_HEAD,CC_G5,COS_NONE,SCOS_NONE,WF_NONE},
-{"サ行5段活用動詞語幹",POS_V,CT_HEAD,CC_S5,COS_NONE,SCOS_NONE,WF_NONE},
-{"タ行5段活用動詞語幹",POS_V,CT_HEAD,CC_T5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ナ行5段活用動詞語幹",POS_V,CT_HEAD,CC_N5,COS_NONE,SCOS_NONE,WF_NONE},
-{"マ行5段活用動詞語幹",POS_V,CT_HEAD,CC_M5,COS_NONE,SCOS_NONE,WF_NONE},
-{"バ行5段活用動詞語幹",POS_V,CT_HEAD,CC_B5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ラ行5段活用動詞語幹",POS_V,CT_HEAD,CC_R5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ラ行L5段活用動詞語幹",POS_V,CT_HEAD,CC_L5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ワ行5段活用動詞語幹",POS_V,CT_HEAD,CC_W5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ワ行U5段活用動詞語幹",POS_V,CT_HEAD,CC_U5,COS_NONE,SCOS_NONE,WF_NONE},
-{"上下一段活用動詞語幹",POS_V,CT_HEAD,CC_KS1,COS_NONE,SCOS_NONE,WF_NONE},
-{"カ行5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_K5,COS_NONE,SCOS_NONE,WF_NONE},
-{"カ行C5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_C5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ガ行5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_G5,COS_NONE,SCOS_NONE,WF_NONE},
-{"サ行5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_S5,COS_NONE,SCOS_NONE,WF_NONE},
-{"タ行5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_T5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ナ行5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_N5,COS_NONE,SCOS_NONE,WF_NONE},
-{"マ行5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_M5,COS_NONE,SCOS_NONE,WF_NONE},
-{"バ行5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_B5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ラ行5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_R5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ラ行L5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_L5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ワ行5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_W5,COS_NONE,SCOS_NONE,WF_NONE},
-{"ワ行U5段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_U5,COS_NONE,SCOS_NONE,WF_NONE},
-{"上下一段活用動詞名詞化語幹",POS_V,CT_MEISIKA,CC_KS1,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"ラ変活用動詞語幹",POS_V,CT_HEAD,CC_RV,COS_NONE,SCOS_NONE,WF_NONE},
-{"カ変活用動詞語幹",POS_V,CT_HEAD,CC_KV,COS_NONE,SCOS_NONE,WF_NONE},
-{"サ変活用動詞語幹",POS_V,CT_HEAD,CC_SV,COS_NONE,SCOS_NONE,WF_NONE},
-{"ザ変活用動詞語幹",POS_V,CT_HEAD,CC_ZV,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"カ変活用動詞未然形",POS_V,CT_MIZEN,CC_KV,COS_NONE,SCOS_NONE,WF_NONE},
-{"カ変活用動詞連用形",POS_V,CT_RENYOU,CC_KV,COS_NONE,SCOS_NONE,WF_NONE},
-{"カ変活用動詞終止形",POS_V,CT_SYUSI,CC_KV,COS_NONE,SCOS_NONE,WF_NONE},
-{"カ変活用動詞仮定形",POS_V,CT_KATEI,CC_KV,COS_NONE,SCOS_NONE,WF_NONE},
-{"カ変活用動詞命令形",POS_V,CT_MEIREI,CC_KV,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"する未然形「し」",POS_V,CT_MIZEN,CC_SV,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"形容詞",POS_A,CT_NONE,CC_NONE,COS_NONE,SCOS_A0,WF_NONE},
-{"形容詞化接尾語",POS_D2KY,CT_NONE,CC_NONE,COS_NONE,SCOS_A1,WF_NONE},
-{"形容詞未然形",POS_A,CT_MIZEN,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容詞連用形",POS_A,CT_RENYOU,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容詞終止形",POS_A,CT_SYUSI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容詞連体形",POS_A,CT_RENTAI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容詞仮定形",POS_A,CT_KATEI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容詞語幹",POS_A,CT_HEAD,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"形容動詞未然形",POS_AJV,CT_MIZEN,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容動詞連用形",POS_AJV,CT_RENYOU,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容動詞終止形",POS_AJV,CT_SYUSI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容動詞連体形",POS_AJV,CT_RENTAI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容動詞仮定形",POS_AJV,CT_KATEI,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"形容動詞原形",POS_AJV,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},/*形容動詞の原形*/
-{"形容動詞語幹",POS_AJV,CT_HEAD,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-  /**/
-{"単漢字",POS_TANKANJI,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"連体詞",POS_ME,CT_NONE,CC_NONE,COS_NONE,SCOS_NONE,WF_NONE},
-{"動詞丁寧表現語幹",POS_V,CT_NONE,CC_SV,COS_NONE,SCOS_NONE,WF_INDEP},
+{"名詞",POS_NOUN,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞0",POS_NOUN,COS_NONE,SCOS_T0,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞2",POS_NOUN,COS_NONE,SCOS_T2,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞3",POS_NOUN,COS_NONE,SCOS_T3,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞4",POS_NOUN,COS_NONE,SCOS_T4,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞5",POS_NOUN,COS_NONE,SCOS_T5,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞7",POS_NOUN,COS_NONE,SCOS_T7,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞8",POS_NOUN,COS_NONE,SCOS_T8,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞9",POS_NOUN,COS_NONE,SCOS_T9,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞10",POS_NOUN,COS_NONE,SCOS_T10,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞12",POS_NOUN,COS_NONE,SCOS_T12,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞13",POS_NOUN,COS_NONE,SCOS_T13,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞14",POS_NOUN,COS_NONE,SCOS_T14,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞15",POS_NOUN,COS_NONE,SCOS_T15,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞17",POS_NOUN,COS_NONE,SCOS_T17,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞18",POS_NOUN,COS_NONE,SCOS_T18,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞19",POS_NOUN,COS_NONE,SCOS_T19,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞20",POS_NOUN,COS_NONE,SCOS_T20,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞22",POS_NOUN,COS_NONE,SCOS_T22,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞23",POS_NOUN,COS_NONE,SCOS_T23,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞24",POS_NOUN,COS_NONE,SCOS_T24,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞25",POS_NOUN,COS_NONE,SCOS_T25,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞27",POS_NOUN,COS_NONE,SCOS_T27,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞28",POS_NOUN,COS_NONE,SCOS_T28,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞29",POS_NOUN,COS_NONE,SCOS_T29,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞30",POS_NOUN,COS_NONE,SCOS_T30,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞32",POS_NOUN,COS_NONE,SCOS_T32,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞33",POS_NOUN,COS_NONE,SCOS_T33,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞34",POS_NOUN,COS_NONE,SCOS_T34,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"名詞35",POS_NOUN,COS_NONE,SCOS_T35,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞37",POS_NOUN,COS_NONE,SCOS_T37,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞38",POS_NOUN,COS_NONE,SCOS_T38,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞39",POS_NOUN,COS_NONE,SCOS_T39,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞化接尾語",POS_NOUN,COS_NONE,SCOS_T40,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞接尾語",POS_N2T,COS_NONE,SCOS_T41,CC_NONE,CT_NONE,WF_INDEP},
+{"数詞",POS_NUMBER,COS_NN,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"数詞1",POS_NUMBER,COS_NN,SCOS_N1,CC_NONE,CT_NONE,WF_INDEP},
+{"数詞10",POS_NUMBER,COS_NN,SCOS_N10,CC_NONE,CT_NONE,WF_INDEP},
+{"数詞100",POS_NUMBER,COS_NN,SCOS_N100,CC_NONE,CT_NONE,WF_INDEP},
+{"数詞1000",POS_NUMBER,COS_NN,SCOS_N1000,CC_NONE,CT_NONE,WF_INDEP},
+{"数詞10000",POS_NUMBER,COS_NN,SCOS_N10000,CC_NONE,CT_NONE,WF_INDEP},
+{"人名",POS_NOUN,COS_JN,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"地名",POS_NOUN,COS_CN,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"団体名",POS_NOUN,COS_KK,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"開き括弧",POS_OPEN,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"閉じ括弧",POS_CLOSE,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"名詞接頭辞",POS_PRE,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"人名接尾辞",POS_SUC,COS_JN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"名詞接尾辞",POS_SUC,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"数接頭辞",POS_PRE,COS_NN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"数接尾辞",POS_SUC,COS_NN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"地名接頭辞",POS_PRE,COS_CN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"地名接尾辞",POS_SUC,COS_CN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"サ変接尾辞",POS_SUC,COS_SVSUFFIX,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"助詞",POS_PRT,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"副詞",POS_AV,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞0",POS_AV,COS_NONE,SCOS_F0,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞1",POS_AV,COS_NONE,SCOS_F1,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞2",POS_AV,COS_NONE,SCOS_F2,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞3",POS_AV,COS_NONE,SCOS_F3,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞4",POS_AV,COS_NONE,SCOS_F4,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞5",POS_AV,COS_NONE,SCOS_F5,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞6",POS_AV,COS_NONE,SCOS_F6,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞7",POS_AV,COS_NONE,SCOS_F7,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞8",POS_AV,COS_NONE,SCOS_F8,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞9",POS_AV,COS_NONE,SCOS_F9,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞10",POS_AV,COS_NONE,SCOS_F10,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞11",POS_AV,COS_NONE,SCOS_F11,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞12",POS_AV,COS_NONE,SCOS_F12,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞13",POS_AV,COS_NONE,SCOS_F13,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞14",POS_AV,COS_NONE,SCOS_F14,CC_NONE,CT_NONE,WF_INDEP},
+{"副詞語幹",POS_AV,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
+{"動詞",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
+{"接続詞",POS_CONJ,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+  /**/
+{"動詞未然形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_MIZEN,WF_NONE},
+  /**/
+{"動詞連用形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_RENYOU,WF_NONE},
+  /**/
+{"動詞終止形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_SYUSI,WF_NONE},
+  /**/
+{"動詞連体形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_RENTAI,WF_NONE},
+  /**/
+{"動詞仮定形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_KATEI,WF_NONE},
+  /**/
+{"動詞命令形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_MEIREI,WF_NONE},
+  /**/
+{"カ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_K5,CT_HEAD,WF_NONE},
+{"カ行C5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_C5,CT_HEAD,WF_NONE},
+{"ガ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_G5,CT_HEAD,WF_NONE},
+{"サ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_S5,CT_HEAD,WF_NONE},
+{"タ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_T5,CT_HEAD,WF_NONE},
+{"ナ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_N5,CT_HEAD,WF_NONE},
+{"マ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_M5,CT_HEAD,WF_NONE},
+{"バ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_B5,CT_HEAD,WF_NONE},
+{"ラ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_R5,CT_HEAD,WF_NONE},
+{"ラ行L5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_L5,CT_HEAD,WF_NONE},
+{"ワ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_W5,CT_HEAD,WF_NONE},
+{"ワ行U5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_U5,CT_HEAD,WF_NONE},
+{"上下一段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_KS1,CT_HEAD,WF_NONE},
+{"カ行5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_K5,CT_MEISIKA,WF_NONE},
+{"カ行C5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_C5,CT_MEISIKA,WF_NONE},
+{"ガ行5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_G5,CT_MEISIKA,WF_NONE},
+{"サ行5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_S5,CT_MEISIKA,WF_NONE},
+{"タ行5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_T5,CT_MEISIKA,WF_NONE},
+{"ナ行5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_N5,CT_MEISIKA,WF_NONE},
+{"マ行5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_M5,CT_MEISIKA,WF_NONE},
+{"バ行5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_B5,CT_MEISIKA,WF_NONE},
+{"ラ行5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_R5,CT_MEISIKA,WF_NONE},
+{"ラ行L5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_L5,CT_MEISIKA,WF_NONE},
+{"ワ行5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_W5,CT_MEISIKA,WF_NONE},
+{"ワ行U5段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_U5,CT_MEISIKA,WF_NONE},
+{"上下一段活用動詞名詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_KS1,CT_MEISIKA,WF_NONE},
+  /**/
+{"ラ変活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_RV,CT_HEAD,WF_NONE},
+{"カ変活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_HEAD,WF_NONE},
+{"サ変活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_SV,CT_HEAD,WF_NONE},
+{"ザ変活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_ZV,CT_HEAD,WF_NONE},
+  /**/
+{"カ変活用動詞未然形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_MIZEN,WF_NONE},
+{"カ変活用動詞連用形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_RENYOU,WF_NONE},
+{"カ変活用動詞終止形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_SYUSI,WF_NONE},
+{"カ変活用動詞仮定形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_KATEI,WF_NONE},
+{"カ変活用動詞命令形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_MEIREI,WF_NONE},
+  /**/
+{"する未然形「し」",POS_V,COS_NONE,SCOS_NONE,CC_SV,CT_MIZEN,WF_NONE},
+  /**/
+{"形容詞",POS_A,COS_NONE,SCOS_A0,CC_NONE,CT_NONE,WF_NONE},
+{"形容詞化接尾語",POS_D2KY,COS_NONE,SCOS_A1,CC_NONE,CT_NONE,WF_NONE},
+{"形容詞未然形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_MIZEN,WF_NONE},
+{"形容詞連用形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_RENYOU,WF_NONE},
+{"形容詞終止形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_SYUSI,WF_NONE},
+{"形容詞連体形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_RENTAI,WF_NONE},
+{"形容詞仮定形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_KATEI,WF_NONE},
+{"形容詞語幹",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
+  /**/
+{"形容動詞未然形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_MIZEN,WF_NONE},
+{"形容動詞連用形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_RENYOU,WF_NONE},
+{"形容動詞終止形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_SYUSI,WF_NONE},
+{"形容動詞連体形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_RENTAI,WF_NONE},
+{"形容動詞仮定形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_KATEI,WF_NONE},
+{"形容動詞原形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},/*形容動詞の原形*/
+{"形容動詞語幹",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
+  /**/
+{"単漢字",POS_TANKANJI,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"連体詞",POS_ME,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"動詞丁寧表現語幹",POS_V,COS_NONE,SCOS_NONE,CC_SV,CT_NONE,WF_INDEP},
 {0,0,0,0,0,0,0},
diff --git a/src-diclib/wtype.c b/src-diclib/wtype.c
--- a/src-diclib/wtype.c
+++ b/src-diclib/wtype.c
@@ -16,10 +16,10 @@ wtype_t anthy_wt_none, anthy_wt_all;
 static struct PTab {
   const char *name;
   int pos;
-  int ct;
-  int cc;
   int cos;
   int scos;
+  int cc;
+  int ct;
   int flags;
 } ptab[]= {
 #include "ptab.h"



Anthy-dev メーリングリストの案内
Back to archive index