From 34c87d0de0800c8c5bc1797ba3711753eabf14b9 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Mon, 7 May 2018 16:32:12 +0200 Subject: [PATCH] (Dut) misc. small fixes --- src/dutch/LexiconDut.gf | 2 +- src/dutch/ResDut.gf | 2 +- src/dutch/StructuralDut.gf | 2 +- src/dutch/VerbDut.gf | 13 +++++++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/dutch/LexiconDut.gf b/src/dutch/LexiconDut.gf index cce59cc5..89a4d279 100644 --- a/src/dutch/LexiconDut.gf +++ b/src/dutch/LexiconDut.gf @@ -16,7 +16,7 @@ lin ask_V2Q = mkV2Q vragen_V noPrep ; bad_A = mkA "slecht" ; beautiful_A = mkA "mooi" ; - become_VA = mkVA worden_V ; + become_VA = mkVA (zijnV worden_V) ; beer_N = mkN "bier" "bieren" neuter ; beg_V2V = mkV2V (mkV "smeken") noPrep ; ---- om te big_A = mkA "groot" ; diff --git a/src/dutch/ResDut.gf b/src/dutch/ResDut.gf index 6d5e369c..7ce7ef0c 100644 --- a/src/dutch/ResDut.gf +++ b/src/dutch/ResDut.gf @@ -610,7 +610,7 @@ param -- To be used for ExtendDut.PastPartAP -- If we need more variants, extend mkClause' infClause : Str -> Agr -> VP -> AForm -> Clause = \subj,agr,vp,af -> - mkClause' subj agr vp af Inf ; + mkClause' subj agr vp af Inf ; -- Added a possibility to choose a participle verb form. -- This is so far only used in ExtendDut.PastPartAP. /IL2018 diff --git a/src/dutch/StructuralDut.gf b/src/dutch/StructuralDut.gf index cadf5f3b..0bceb4f3 100644 --- a/src/dutch/StructuralDut.gf +++ b/src/dutch/StructuralDut.gf @@ -92,7 +92,7 @@ concrete StructuralDut of Structural = CatDut, Prelude ** we_Pron = mkPronoun "we" "ons" "ons" "wij" "ons" "onze" "onze" Utr Pl P1 ; whatSg_IP = {s = \\_ => "wat" ; n = Sg ; mergesWithPrep = True ; mergeForm = "waar"} ; - whatPl_IP = {s = \\_ => "wat" ; n = Pl ; mergesWithPrep = True ; mergeForm = "waar"} ; + whatPl_IP = {s = \\_ => "welke" ; n = Pl ; mergesWithPrep = True ; mergeForm = "waar"} ; when_IAdv = ss "wanneer" ; when_Subj = ss "als" ; diff --git a/src/dutch/VerbDut.gf b/src/dutch/VerbDut.gf index 08241aff..77d7e137 100644 --- a/src/dutch/VerbDut.gf +++ b/src/dutch/VerbDut.gf @@ -49,10 +49,15 @@ concrete VerbDut of Verb = CatDut ** open Prelude, ResDut in { -- and choose its agreement based on the new object. -- Otherwise, keep the old VP. newVP : VP = case hasInf of { - True => let emptyObjVP : VP = vp ** {n0, n2 = \\_ => [] } ; - infCompl = vp.n0 ! np.a ++ vp.n2 ! np.a ; - in insertInf infCompl emptyObjVP ; - _ => vp } ; + True => let emptyObjVP : VP = vp ** {n0, n2 = \\_ => [] } ; + infCompl = vp.n0 ! np.a ++ vp.n2 ! np.a ; + in insertInf infCompl emptyObjVP ; + _ => case hasPrep of { + True => vp ; + False => vp ** { n0 = \\_ => vp.n0 ! np.a ; + n2 = \\_ => vp.n2 ! np.a } + } + } ; in insertArg newVP ;