From 99a2902da9b16ca568489905ffc083c01dea42db Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Sun, 5 Jun 2016 16:54:02 +0000
Subject: [PATCH] restored a suppressed ClSlash field in Scandinavian
 preposition stranding

---
 lib/src/scandinavian/ExtraScand.gf    | 9 +++++----
 lib/src/scandinavian/QuestionScand.gf | 7 ++++---
 lib/src/scandinavian/RelativeScand.gf | 2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/src/scandinavian/ExtraScand.gf b/lib/src/scandinavian/ExtraScand.gf
index 6801558e9..4d3667021 100644
--- a/lib/src/scandinavian/ExtraScand.gf
+++ b/lib/src/scandinavian/ExtraScand.gf
@@ -39,7 +39,7 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand **
 
     StrandRelSlash rp slash  = {
       s = \\t,a,p,ag,_ => 
-          rp.s ! ag.g ! ag.n ! RNom ++ slash.s ! t ! a ! p ! Sub ++ slash.c2.s ;
+          rp.s ! ag.g ! ag.n ! RNom ++ slash.s ! t ! a ! p ! Sub ++ slash.n3 ! ag ++ slash.c2.s ;
       c = NPAcc
       } ;
     EmptyRelSlash slash = {
@@ -52,10 +52,11 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand **
       s = \\t,a,p => 
             let 
               cls = slash.s ! t ! a ! p ;
-              who = ip.s ! accusative
+              who = ip.s ! accusative ;
+	      agr = agrP3 ip.g ip.n ;
             in table {
-              QDir   => who ++ cls ! Inv ++ slash.c2.s ;
-              QIndir => who ++ cls ! Sub ++ slash.c2.s
+              QDir   => who ++ cls ! Inv ++ slash.n3 ! agr ++ slash.c2.s ;
+              QIndir => who ++ cls ! Sub ++ slash.n3 ! agr ++ slash.c2.s
               }
       } ;
 
diff --git a/lib/src/scandinavian/QuestionScand.gf b/lib/src/scandinavian/QuestionScand.gf
index adcb1e0da..2171656c3 100644
--- a/lib/src/scandinavian/QuestionScand.gf
+++ b/lib/src/scandinavian/QuestionScand.gf
@@ -31,10 +31,11 @@ incomplete concrete QuestionScand of Question =
       s = \\t,a,p => 
             let 
               cls = slash.s ! t ! a ! p ;
-              who = ip.s ! accusative
+              who = ip.s ! accusative ;
+	      agr = agrP3 ip.g ip.n ;
             in table {
-              QDir   => who ++ cls ! Inv ++ slash.c2.s ;
-              QIndir => who ++ cls ! Sub ++ slash.c2.s
+              QDir   => who ++ cls ! Inv ++ slash.n3 ! agr ++ slash.c2.s ;
+              QIndir => who ++ cls ! Sub ++ slash.n3 ! agr ++ slash.c2.s
               }
       } ;
 
diff --git a/lib/src/scandinavian/RelativeScand.gf b/lib/src/scandinavian/RelativeScand.gf
index 31869f26e..423e46669 100644
--- a/lib/src/scandinavian/RelativeScand.gf
+++ b/lib/src/scandinavian/RelativeScand.gf
@@ -31,7 +31,7 @@ incomplete concrete RelativeScand of Relative =
 
     RelSlash rp slash = {
           s = \\t,a,p,ag,_ => 
-          rp.s ! ag.g ! ag.n ! RAcc ++ slash.s ! t ! a ! p ! Sub ++ slash.c2.s ;
+          rp.s ! ag.g ! ag.n ! RAcc ++ slash.s ! t ! a ! p ! Sub ++ slash.n3 ! ag ++ slash.c2.s ;
       c = NPAcc
       } ;