questions, relatives, numerals - most of Dutch syntax soon in place

lib/src/dutch/SentenceDut.gf

@@ -5,30 +5,30 @@ concrete SentenceDut of Sentence = CatDut ** open ResDut, Prelude in {
   lin
 
     PredVP np vp = mkClause (np.s ! NPNom) np.a vp ;
---
---    PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp ;
---
---    ImpVP vp =  let vps = useVP vp in {
---      s = \\pol,n => 
---        let 
---          ps = case n of {
---            ImpF _ True => <P3,"Sie",True> ; -- setzen Sie sich
---            _ => <P2,[],False>
---            } ;
---          agr  = {g = Fem ; n = numImp n ; p = ps.p1} ; --- g does not matter
---          verb = vps.s ! False ! agr ! VPImperat ps.p3 ;
---          inf  = vp.inf ++ verb.inf ;
---        in
---        verb.fin ++ ps.p2 ++ 
---        vp.n2 ! agr ++ vp.a1 ! pol ++ vp.a2 ++ inf ++ vp.ext
---    } ;
---
---    SlashVP np vp = 
---      mkClause 
---        (np.s ! Nom) np.a 
---        vp **
---      {c2 = vp.c2} ;
---
+
+    PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp ;
+
+    ImpVP vp = {
+      s = \\pol,im => 
+        let 
+          ps = case im of {
+            ImpF n True  => <VImp3,"u",n> ;
+            ImpF n False => <VImp2,[],n>   ---- also plural?
+            } ;
+          agr  = {g = Utr ; n = ps.p3 ; p = P2} ; ---- P2? -- g does not matter
+          verb = vp.s.s ! ps.p1 ;
+          inf  = vp.inf ;
+        in
+        verb ++ ps.p2 ++ 
+        vp.n2 ! agr ++ vp.a1 ! pol ++ vp.a2 ++ inf ++ vp.ext
+    } ;
+
+    SlashVP np vp = 
+      mkClause 
+        (np.s ! NPNom) np.a 
+        vp **
+      {c2 = vp.c2} ;
+
 --    AdvSlash slash adv = {
 --      s  = \\m,t,a,b,o => slash.s ! m ! t ! a ! b ! o ++ adv.s ;
 --      c2 = slash.c2
@@ -51,14 +51,13 @@ concrete SentenceDut of Sentence = CatDut ** open ResDut, Prelude in {
     UseQCl t p cl = {
       s = \\q => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! q
       } ;
---    UseRCl t p cl = {
---      s = \\r => t.s ++ p.s ++ cl.s ! t.m ! t.t ! t.a ! p.p ! r ;
---      c = cl.c
---      } ;
---    UseSlash t p cl = {
---      s = \\o => t.s ++ p.s ++ cl.s ! t.m ! t.t ! t.a ! p.p ! o ;
---      c2 = cl.c2
---      } ;
+    UseRCl t p cl = {
+      s = \\g,n => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! g ! n
+      } ;
+    UseSlash t p cl = {
+      s = \\o => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! o ;
+      c2 = cl.c2
+      } ;
 
     AdvS a s = {s = \\o => a.s ++ s.s ! Inv} ;