diff --git a/lib/src/chinese/DictEngChi.gf b/lib/src/chinese/DictEngChi.gf index 5c00749d1..4a5c0e4ee 100644 --- a/lib/src/chinese/DictEngChi.gf +++ b/lib/src/chinese/DictEngChi.gf @@ -3,10 +3,15 @@ concrete DictEngChi of DictEngAbs = CatChi ** open ParadigmsChi, (S = StructuralChi), (L = LexiconChi), + (R = ResChi), ParadigmsChi, Prelude in { flags coding=utf8 ; +oper + mkNPword : Str -> NP = \s -> ss (R.word s) ; -- to be used in lexicon building only + + lin @@ -827,7 +832,7 @@ force_N = mkN "力量" ; dealer_N = mkN "零售商" ; commercial_A = mkA "商业" ; ask_V = mkV "问" ; -themselves_NP = mkNP "他们自己" ; +themselves_NP = mkNPword "他们自己" ; for_example_Adv = mkAdv "举例" ; follow_V = mkV "跟随" ; remain_V = mkV "留下" ; @@ -922,7 +927,7 @@ drop_V2 = mkV2 "下降" ; construction_N = mkN "施工" ; performance_N = mkN "表现" ; approval_N = mkN "赞同" ; -itself_NP = mkNP "自身" ; +itself_NP = mkNPword "自身" ; side_N = mkN "边" ; mark_N = mkN "标记" ; show_N = mkN "演出" ; @@ -1210,7 +1215,7 @@ sure_A = mkA "肯定" ; size_N = mkN "大小" ; out_Prep = mkPrep "到。。。外面" ; face_N = mkN "面对" ; -anything_NP = mkNP "无论何事" ; +anything_NP = mkNPword "无论何事" ; version_N = mkN "版本" ; trend_N = mkN "趋势" ; tough_A = mkA "粗暴" ; @@ -1277,7 +1282,7 @@ quake_N = mkN "地震" ; past_N = mkN "过去" ; meet_V = mkV "会见" ; improvement_N = mkN "改善" ; -himself_NP = mkNP "他自己" ; +himself_NP = mkNPword "他自己" ; commodity_N = mkN "商品" ; attract_V2 = mkV2 "吸引" ; unchanged_A = mkA "" ; @@ -1591,7 +1596,7 @@ cost_V2 = mkV2 "成本" ; collapse_N = mkN "崩溃" ; close_Adv = mkAdv "关闭" ; tomorrow_N = mkN "明天" ; -someone_NP = mkNP "谁" ; +someone_NP = mkNPword "谁" ; retirement_N = mkN "退休" ; representativeMasc_N = mkN "代表" ; reporter_N = mkN "记者" ; @@ -1642,7 +1647,7 @@ expand_V = mkV "扩大" ; emerge_V = mkV "出现" ; complete_A = mkA "完整" ; appear_V = mkV "出现" ; -anyone_NP = mkNP "任何人" ; +anyone_NP = mkNPword "任何人" ; aim_V2 = mkV2 "瞄准" ; voter_N = mkN "选民" ; safe_A = mkA "安全" ; @@ -1679,7 +1684,7 @@ help_N = mkN "帮助" ; fraud_N = mkN "舞弊" ; finish_V = mkV "完成" ; experience_N = mkN "经验" ; -everyone_NP = mkNP "大家" ; +everyone_NP = mkNPword "大家" ; black_N = mkN "黑色" ; stem_V = mkV "阻止" ; publisher_N = mkN "发行人" ; @@ -2927,7 +2932,7 @@ broadcast_N = mkN "播放" ; border_N = mkN "边境" ; bloc_N = mkN "集团" ; as_Subj = mkSubj "如" ; -anybody_NP = mkNP "任何人" ; +anybody_NP = mkNPword "任何人" ; accident_N = mkN "事故" ; youth_N = mkN "青年" ; welcome_V2 = mkV2 "欢迎" ; @@ -4202,7 +4207,7 @@ hopeful_A = mkA "怀抱希望" ; homeless_A = mkA "无家可归" ; home_Adv = mkAdv "家" ; highlight_V2 = mkV2 "突出" ; -herself_NP = mkNP "她自己" ; +herself_NP = mkNPword "她自己" ; hazard_N = mkN "风险" ; grim_A = mkA "严峻" ; greenhouse_N = mkN "温室" ; @@ -4534,7 +4539,7 @@ nomination_N = mkN "提名" ; newcomer_N = mkN "新人" ; neat_A = mkA "整齐" ; nasty_A = mkA "讨厌" ; -myself_NP = mkNP "我自己" ; +myself_NP = mkNPword "我自己" ; musical_A = mkA "音乐" ; mouse_N = mkN "鼠标" ; motive_N = mkN "动机" ; @@ -4662,7 +4667,7 @@ advertise_V2 = mkV2 "广告" ; acknowledge_V2 = mkV2 "承认" ; achievement_N = mkN "成就" ; zero_N = mkN "零" ; -yourselfPl_NP = mkNP "你自己" ; +yourselfPl_NP = mkNPword "你自己" ; wise_A = mkA "明智" ; widow_N = mkN "寡妇" ; white_collar_A = mkA "白领" ; diff --git a/lib/src/chinese/ParseChi.gf b/lib/src/chinese/ParseChi.gf index 15b387426..d1c049aaf 100644 --- a/lib/src/chinese/ParseChi.gf +++ b/lib/src/chinese/ParseChi.gf @@ -1,4 +1,4 @@ ---# -path=.:english:alltenses +--# -path=.:../english:alltenses concrete ParseChi of ParseEngAbs = TenseChi, --- CatChi, diff --git a/lib/src/chinese/ResChi.gf b/lib/src/chinese/ResChi.gf index c51f66a64..06b51f645 100644 --- a/lib/src/chinese/ResChi.gf +++ b/lib/src/chinese/ResChi.gf @@ -229,7 +229,7 @@ oper -- added by AR - mkNP : Str -> NP = ss ; + mkNP : Str -> NP = ss ; -- not to be used in lexicon building appPrep : Preposition -> Str -> Str = \prep,s -> prep.prepPre ++ s ++ prep.prepMain ;