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

lib/src/dutch/RelativeDut.gf

@@ -1,52 +1,46 @@
-concrete RelativeDut of Relative = CatDut ** open ResDut in 
-{
---{
---
---  flags optimize=all_subs ;
---
---  lin
---
+concrete RelativeDut of Relative = CatDut ** open ResDut in {
+
+
+  flags optimize=all_subs ;
+
+  lin
+
 --    RelCl cl = {
 --      s = \\m,t,a,b,_ => "derart" ++ conjThat ++ cl.s ! m ! t ! a ! b ! Sub ;
 --      c = Nom
 --      } ;
 --
---    RelVP rp vp = {
---      s = \\m,t,ant,b,gn => 
---        let 
---          agr = case rp.a of {
---            RNoAg => agrP3 (numGenNum gn) ;
---            RAg a => a ** {g = Neutr}
---            } ;
---          cl = mkClause (rp.s ! gn ! Nom) agr vp
---        in
---        cl.s ! m ! t ! ant ! b ! Sub ;
---      c = Nom
---      } ;
---
---    RelSlash rp slash = {
---      s = \\m,t,a,p,gn => 
---          appPrep slash.c2 (rp.s ! gn) ++ slash.s ! m ! t ! a ! p ! Sub ;
---      c = slash.c2.c
---      } ;
---
+    RelVP rp vp = {
+      s = \\t,ant,b,g,n => 
+        let 
+          agr = case rp.a of {
+            RNoAg   => agrgP3 g n ;
+            RAg rn p => {g = Utr ; n = rn ; p = p} ---- g 
+            } ;
+          cl = mkClause (rp.s ! g ! n) agr vp
+        in
+        cl.s ! t ! ant ! b ! Sub ;
+      c = Nom
+      } ;
+
+    RelSlash rp slash = {
+      s = \\t,a,p,g,n => 
+          appPrep slash.c2 (\\_ => rp.s ! g ! n) ++ slash.s ! t ! a ! p ! Sub ;
+      c = slash.c2.c
+      } ;
+
 --    FunRP p np rp = {
 --      s = \\gn,c => np.s ! c ++ appPrep p (rp.s ! gn) ;
 --      a = RAg {n = np.a.n ; p = np.a.p}
 --      } ;
 --
---    IdRP = {s = relPron ; a = RNoAg} ;
---
---  oper
---      relPron :  GenNum => Case => Str = \\gn,c =>
---    case <gn,c> of {
---      <GSg Fem,Gen> => "deren" ;
---      <GSg g,Gen>   => "dessen" ;
---      <GPl,Dat>     => "denen" ;
---      <GPl,Gen>     => "deren" ;
---      _ => artDef ! gn ! c
---      } ;
---
---}
+    IdRP = {s = relPron ; a = RNoAg} ;
+
+  oper
+    relPron : Gender => Number => Str = \\g,n =>
+      case <g,n> of {
+        <Neutr,Sg> => "dat" ;
+        _ => "die"
+      } ;
 
 }