From d6c11c45e1beca7320537e50c2fc45d63e806c04 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 5 Jun 2016 10:17:34 +0000 Subject: [PATCH] fixed the lost AdV in scandinavian after correction of negation/pronoun placement --- lib/src/scandinavian/CommonScand.gf | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/src/scandinavian/CommonScand.gf b/lib/src/scandinavian/CommonScand.gf index 7a82e8978..68166c550 100644 --- a/lib/src/scandinavian/CommonScand.gf +++ b/lib/src/scandinavian/CommonScand.gf @@ -327,9 +327,20 @@ oper insertAdV : Str -> VP -> VP = \adv -> insertAdVAgr (\\_ => adv) ; insertAdVAgr : (Agr => Str) -> VP -> VP = \adv,vp ->vp ** { - a1 = \\b,a => vp.a1 ! b ! a ++ adv ! a ; + s = \\vo,vpf => + let vps = vp.s ! vo ! vpf + in { + fin = vps.fin ; + inf = vps.inf ; + a1 = \\b,a => case vpf of { + VPFinite (SPres | SPast) Simul | VPImperat => + <(vps.a1 ! b ! a).p1, (vps.a1 ! b ! a).p2 ++ adv ! a> ; + _ => <(vps.a1 ! b ! a).p1 ++ adv ! a, (vps.a1 ! b ! a).p2> + } + } } ; + passiveVP : VP -> VP = \vp -> vp ** { s = \\_ => vp.s ! Pass ; -- forms the s-passive } ;