diff --git a/src/dutch/LexiconDut.gf b/src/dutch/LexiconDut.gf index a5d7016c8..9f66babc6 100644 --- a/src/dutch/LexiconDut.gf +++ b/src/dutch/LexiconDut.gf @@ -3,7 +3,7 @@ -- work by Aarne Ranta concrete LexiconDut of Lexicon = CatDut ** - open Prelude, ParadigmsDut, IrregDut in { + open Prelude, ParadigmsDut, IrregDut, StructuralDut in { flags coding=utf8 ; @@ -32,9 +32,9 @@ lin die_V = sterven_V ; distance_N3 = mkN3 (mkN "afstand") van_Prep (mkPrep "naar") ; drink_V2 = mkV2 drinken_V ; - easy_A2V = mkA2 (mkA "gemakkelijk") noPrep ; + easy_A2V = mkA2 (mkA "gemakkelijk") for_Prep ; -- "gemakkelijk voor me" or "gemakkelijk te doen"? eat_V2 = mkV2 eten_V ; - father_N2 = mkN2 (mkN "vader") van_Prep ; + father_N2 = mkN2 (mkN "vader") ; fear_VS = mkVS (mkV "vrezen") ; fish_N = mkN "vis" ; go_V = zijnV gaan_V ; @@ -42,7 +42,7 @@ lin house_N = mkN "huis" neuter ; know_VQ = mkVQ weten_V ; know_VS = mkVS weten_V ; - married_A2 = mkA2 (mkA "getrouwd") (mkPrep "met") ; + married_A2 = mkA2 (mkA "getrouwd") with_Prep ; mother_N2 = mkN2 (mkN "moeder") ; now_Adv = mkAdv "nu" ; paint_V2A = mkV2A (mkV "schilderen" "schildert") ; diff --git a/src/dutch/ParadigmsDut.gf b/src/dutch/ParadigmsDut.gf index 9a8d218e2..6b25a6546 100644 --- a/src/dutch/ParadigmsDut.gf +++ b/src/dutch/ParadigmsDut.gf @@ -115,7 +115,6 @@ oper van_Prep : Prep ; te_Prep : Prep ; - -- --2 Verbs @@ -231,7 +230,7 @@ oper mkN2 = overload { mkN2 : N -> N2 - = \n -> lin N2 (n ** {c2 = mkPrep "van"}) ; + = \n -> lin N2 (n ** {c2 = van_Prep}) ; mkN2 : N -> Prep -> N2 = \n,p -> lin N2 (n ** {c2 = p}) ; } ; diff --git a/src/dutch/ResDut.gf b/src/dutch/ResDut.gf index 9b7860a5a..2867e079b 100644 --- a/src/dutch/ResDut.gf +++ b/src/dutch/ResDut.gf @@ -364,7 +364,7 @@ param VPastSg => "kon" ; --# notpresent VPastPl => "konden" ; --# notpresent VImp2 => "kan" ; ---- not used - VImp3 => "kant" ; + VImp3 => "kan" ; VImpPl => "kunnen" ; ---- VPerf => "gekund" ; VPresPart => "kunnende" ; @@ -396,7 +396,7 @@ param het_Pron : Pronoun = mkPronoun "het" "het" "ze" "hij" "hem" "zijn" "zijne" Neutr Sg P3 ; -- cunger: 't -> het - MergesWithPrep = { mergesWithPrep : Bool ; mergeForm : Str } ; + MergesWithPrep : Type = { mergesWithPrep : Bool ; mergeForm : Str } ; noMerge : MergesWithPrep = { mergesWithPrep = False ; mergeForm = [] } ; -- Complex $CN$s, like adjectives, have strong and weak forms. @@ -432,7 +432,7 @@ param -- Applying a preposition to a noun phrase -- In order to decide whether to merge, have to check both NP and Prep: - -- e.g. deze + met -> hiermee , but zonder + deze -> "zonder deze" + -- e.g. met + deze -> hiermee , but zonder + deze -> "zonder deze" appPrep : Preposition -> NPLite -> Str = \prep,np -> case of {