From 49924883f9081866fbcc90e71dbe6db34b216c23 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 10 May 2016 17:49:14 +0000 Subject: [PATCH] place verb particle after negation in Scandinavian --- lib/src/scandinavian/CommonScand.gf | 4 ++-- lib/src/scandinavian/ResScand.gf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/scandinavian/CommonScand.gf b/lib/src/scandinavian/CommonScand.gf index 0ed6c3f1c..7a82e8978 100644 --- a/lib/src/scandinavian/CommonScand.gf +++ b/lib/src/scandinavian/CommonScand.gf @@ -302,8 +302,8 @@ oper insertObjPron : Bool -> (Agr => Str) -> VP -> VP = \isPron,obj,vp -> vp ** { - n1 = \\a => if_then_Str isPron (obj ! a ++ vp.n2 ! a) [] ; - n2 = \\a => if_then_Str isPron [] (obj ! a ++ vp.n2 ! a) ; + n1 = \\a => vp.n1 ! a ++ if_then_Str isPron (obj ! a) [] ; + n2 = \\a => vp.n2 ! a ++ if_then_Str isPron [] (obj ! a) ; en2 = notB isPron ; } ; diff --git a/lib/src/scandinavian/ResScand.gf b/lib/src/scandinavian/ResScand.gf index 062d92773..6211e2d0e 100644 --- a/lib/src/scandinavian/ResScand.gf +++ b/lib/src/scandinavian/ResScand.gf @@ -44,7 +44,7 @@ interface ResScand = DiffScand ** open CommonScand, Prelude in { vf : Bool -> Str -> Str -> {fin,inf : Str ; a1 : Polarity => Agr => Str * Str} = \hasInf, fin,inf -> { fin = fin ; - inf = inf ++ verb.part ; --- not always right after the verb: hon ser (inte) vacker ut ; spotta ut snusen + inf = inf ; a1 : Polarity => Agr => Str*Str = \\p,a => case hasInf of { True => ; False => <[], negation ! p> @@ -79,7 +79,7 @@ interface ResScand = DiffScand ** open CommonScand, Prelude in { VRefl => reflPron a ; _ => [] } ; - n2 : Agr => Str = \\a => [] ; + n2 : Agr => Str = \\a => verb.part ; ---- check: hon ser (inte) vacker ut ; spotta (inte) ut snusen a2 : Str = [] ; ext : Str = [] ; en2,ea2,eext : Bool = False -- indicate if the field exists