diff --git a/lib/src/chinese/DictEngChi.gf b/lib/src/chinese/DictEngChi.gf index 4a5c0e4ee..6027c8ee5 100644 --- a/lib/src/chinese/DictEngChi.gf +++ b/lib/src/chinese/DictEngChi.gf @@ -502,7 +502,7 @@ analyst_N = mkN "分析人士" ; make_V2 = mkV2 "使" ; cent_N = mkN "一分钱" ; only_Adv = mkAdv "只有" ; -anyPl_Det = mkDet "" ; --?? Don't understand +anyPl_Det = mkpDet "" ; --?? Don't understand not_Adv = mkAdv "不" ; interest_N = mkN "利息" ; group_N = mkN "团" ; @@ -582,14 +582,14 @@ real_A = mkA "真正" ; fall_V = mkV "下降" ; among_Prep = mkPrep "其中" ; friday_PN = mkPN "星期五" ; -most_Det = mkDet "最" ; +most_Det = mkpDet "最" ; future_N = mkN "未来" ; -both_Det = mkDet "双" ; +both_Det = mkpDet "双" ; give_V = mkV "给" ; include_V = mkV "包括" ; however_Adv = mkAdv "不过" ; buy_V = mkV "买" ; -each_Det = mkDet "每" ; +each_Det = mkpDet "每" ; sell_V = mkV "卖" ; bid_N = mkN "出价" ; then_Adv = mkAdv "然后" ; @@ -768,7 +768,7 @@ private_A = mkA "私人" ; research_N = mkN "探究" ; account_N = mkN "账户" ; plan_VV = mkVV "计划" ; -less_Det = mkDet "较少" ; +less_Det = mkpDet "较少" ; control_N = mkN "管制" ; bring_V2 = mkV2 "带来" ; dividend_N = mkN "胜利" ; @@ -1873,7 +1873,7 @@ post_V = mkV "寄" ; litigation_N = mkN "诉讼" ; lender_N = mkN "贷款人" ; employment_N = mkN "雇用" ; -either_Det = mkDet "或" ; +either_Det = mkpDet "或" ; duty_N = mkN "责任" ; doubt_N = mkN "怀疑" ; core_N = mkN "核心" ; @@ -2899,7 +2899,7 @@ prominent_A = mkA "突出" ; presidential_A = mkA "总统" ; petroleum_N = mkN "石油" ; obstacle_N = mkN "障碍" ; -neither_Det = mkDet "也不" ; +neither_Det = mkpDet "也不" ; negotiable_A = mkA "转让" ; mistake_N = mkN "错误" ; lock_V = mkV "锁" ; @@ -2954,7 +2954,7 @@ occasional_A = mkA "偶然" ; note_V = mkV "注意" ; nice_A = mkA "好看" ; mount_V = mkV "安装" ; -moreSg_Det = mkDet "更多" ; +moreSg_Det = mkpDet "更多" ; merge_V2 = mkV2 "合并" ; maximum_N = mkN "最大" ; mature_V = mkV "成熟" ; @@ -3898,7 +3898,7 @@ orderly_A = mkA "秩序" ; nerve_N = mkN "神经" ; nearby_A = mkA "附近" ; move_VV = mkVV "移动" ; -morePl_Det = mkDet "更多" ; +morePl_Det = mkpDet "更多" ; monopoly_N = mkN "垄断" ; minimal_A = mkA "最小" ; middleman_N = mkN "中间人" ; @@ -4548,7 +4548,7 @@ mechanical_A = mkA "机械" ; manipulation_N = mkN "操纵" ; loom_V = mkV "织机" ; long_distance_A = mkA "长途" ; -little_Det = mkDet "小" ; +little_Det = mkpDet "小" ; listener_N = mkN "倾听者" ; link_V = mkV "链接" ; lift_N = mkN "举起" ; diff --git a/lib/src/chinese/ParadigmsChi.gf b/lib/src/chinese/ParadigmsChi.gf index 4dd033acc..87870f8fd 100644 --- a/lib/src/chinese/ParadigmsChi.gf +++ b/lib/src/chinese/ParadigmsChi.gf @@ -132,34 +132,37 @@ oper = \s,t -> lin Prep (ResChi.mkPreposition s t) ; } ; + mkInterj : Str -> Interj + = \s -> lin Interj {s = word s} ; + emptyPrep : Preposition = mkPrep [] ; - mkNP : Str -> CatChi.NP - = \s -> lin NP {s = s} ; + mkpNP : Str -> CatChi.NP + = \s -> lin NP {s = word s} ; mkAdV : Str -> AdV - = \s -> lin AdV {s = s} ; + = \s -> lin AdV {s = word s} ; mkAdN : Str -> AdN - = \s -> lin AdN {s = s} ; + = \s -> lin AdN {s = word s} ; mkSubj : Str -> Subj = \s -> lin Subj (ResChi.mkSubj s []) ; mkConj : Str -> Conj = \s -> lin Conj {s = \\_ => mkConjForm s} ; - mkDet : Str -> Det - = \s -> lin Det {s = s ; detType = DTFull Sg} ; + mkpDet : Str -> Det + = \s -> lin Det {s = word s ; detType = DTFull Sg} ; mkQuant : Str -> Quant = \s -> lin Quant {s,pl = s ; detType = DTFull Sg} ; mkAdA : Str -> AdA - = \s -> lin AdA {s = s} ; + = \s -> lin AdA {s = word s} ; mkNum : Str -> Num - = \s -> lin Num {s = s ; numType = NTFull} ; + = \s -> lin Num {s = word s ; numType = NTFull} ; mkPredet : Str -> Predet - = \s -> lin Predet {s = s} ; + = \s -> lin Predet {s = word s} ; mkIDet : Str -> IDet - = \s -> lin IDet {s = s} ; + = \s -> lin IDet {s = word s} ; mkPConj : Str -> PConj - = \s -> lin PConj {s = s} ; + = \s -> lin PConj {s = word s} ; mkRP : Str -> RP - = \s -> lin RP {s = s} ; + = \s -> lin RP {s = word s} ; --. auxiliary