1
0
forked from GitHub/gf-core

removed some clashes from Dictionary ; corrected the probability of IdRP after elimination of that_RP

This commit is contained in:
aarne
2014-05-06 21:43:51 +00:00
parent b0504d2c4a
commit f4ca89a416
21 changed files with 451 additions and 459 deletions

View File

@@ -167,11 +167,11 @@ lin down_Adv = mkAdv "en bas" ;
lin yeah_Interj = mkInterj "oui" ; ----
lin so_Subj = M.mkSubjSubj "de façon que" ;
lin thing_N = mkN "chose" feminine ;
lin tell_VV = variants{}; -- mkV2V (mkV I.dire_V2) P.dative P.genitive ;
lin tell_VS = variants{}; -- mkV2S (mkV "raconter") ;
lin tell_V3 = mkV3 (mkV I.dire_V2) ;
lin tell_1_V3 = mkV3 (mkV "raconter") P.accusative P.dative ;
lin tell_2_V3 = mkV3 (mkV "distinguer") P.accusative P.genitive ;
lin tell_VV = mkVV (mkV "raconter") ;
lin tell_VS = mkVS (mkV "raconter") ;
lin tell_V3 = mkV3 (mkV "raconter") P.accusative P.dative ;
lin tell_1_V3 = variants{} ; --
lin tell_2_V3 = variants{} ; --
lin tell_V2V = mkV2V (mkV I.dire_V2) P.dative P.genitive ;
lin tell_V2S = mkV2S (mkV "raconter") ;
lin tell_V2Q = mkV2Q (mkV "raconter") P.dative ;
@@ -456,7 +456,7 @@ lin meet_V = reflV (mkV I.voir_V2) ;
lin level_N = mkN "niveau" masculine ;
lin level_2_N = mkN "niveau" masculine | mkN "plan" ;
lin level_1_N = mkN "niveau" masculine ;
lin until_Subj = M.mkSubjSubj ("jusqu´à ce" ++ Ph.elisQue) ;
lin until_Subj = M.mkSubjSubj ("jusqu'à ce" ++ Ph.elisQue) ;
lin though_Subj = M.mkSubjSubj ("bien" + Ph.elisQue) | M.mkSubjSubj ("quoi" + Ph.elisQue) ;
lin policy_N = mkN "politique" feminine ;
lin include_VV = deVV (mkV I.inclure_V2) ; --- subcat
@@ -2151,7 +2151,7 @@ lin insist_VS = variants{}; -- mkV2 (mkV "insister") ; -- tocheck
lin insist_V2 = mkV2 (mkV "insister") ; -- tocheck
lin insist_V = variants{}; -- mkV2 (mkV "insister") ; -- tocheck
lin farmer_N = mkN "agriculteur" masculine ; -- tocheck
lin until_Prep = variants{} ; --
lin until_Prep = mkPrep ("jusqu'à ce" ++ Ph.elisQue) ;
lin traffic_N = mkN "traite" feminine | mkN "circulation" feminine ; -- tocheck
lin dinner_N = mkN "dîner" masculine | mkN "déjeuner" masculine ; -- tocheck
lin consumer_N = mkN "consommateur" ; -- tocheck
@@ -7215,7 +7215,7 @@ lin manipulation_N = variants{} ; --
lin inquest_N = variants{} ; --
lin decrease_N = variants{} ; --
lin cellar_N = mkN "cellier" masculine ; -- tocheck
lin counsellor_N = variants{} ; --
lin counsellor_N = mkN "conseiller" masculine;
lin avenue_N = mkN "avenue" feminine ; -- tocheck
lin rubber_A = variants{} ; --
lin labourer_N = variants{} ; --