From 8334a3fab3d1c7879d273e0f37acf800db9ae6d9 Mon Sep 17 00:00:00 2001 From: Aarne Ranta Date: Tue, 9 Oct 2018 10:44:46 +0200 Subject: [PATCH] fixed the place of AP in Scand.CompAP so that it is before the particle but after negation: 'det ser inte bra ut' --- src/scandinavian/CommonScand.gf | 6 +++++- src/scandinavian/VerbScand.gf | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/scandinavian/CommonScand.gf b/src/scandinavian/CommonScand.gf index c556f5b28..8645ea19b 100644 --- a/src/scandinavian/CommonScand.gf +++ b/src/scandinavian/CommonScand.gf @@ -309,7 +309,11 @@ oper isSimple = False } ; - insertObj : (Agr => Str) -> VP -> VP = insertObjPron False ; + insertObj : (Agr => Str) -> VP -> VP = insertObjPron False ; + + insertObjPre : (Agr => Str) -> VP -> VP = \obj,vp -> vp ** { + n2 = \\a => obj ! a ++ vp.n2 ! a -- e.g. ser inte *bra* ut + } ; insertObjPost : (Agr => Str) -> VP -> VP = \obj,vp -> vp ** { n2 = \\a => vp.n2 ! a ++ obj ! a ; diff --git a/src/scandinavian/VerbScand.gf b/src/scandinavian/VerbScand.gf index ab9742255..83f10b0a5 100644 --- a/src/scandinavian/VerbScand.gf +++ b/src/scandinavian/VerbScand.gf @@ -18,7 +18,7 @@ incomplete concrete VerbScand of Verb = CatScand ** open CommonScand, ResScand, ComplVV v vp = insertObjPost (\\a => v.c2.s ++ infVP vp a) (predV v) ; ComplVS v s = insertObjPost (\\_ => conjThat ++ s.s ! Sub) (predV v) ; --- insertExt ? ComplVQ v q = insertObjPost (\\_ => q.s ! QIndir) (predV v) ; - ComplVA v ap = insertObjPost (\\a => ap.s ! agrAdjNP a DIndef) (predV v) ; + ComplVA v ap = insertObjPre (\\a => ap.s ! agrAdjNP a DIndef) (predV v) ; SlashV2V v vp = predV v ** { n3 = \\a => v.c3.s ++ infVP vp a ;