From ad89cc7cc2a3451d713fdcb478718cb6838bd25d Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Sun, 8 Nov 2009 20:23:21 +0000
Subject: [PATCH] subordination in Dutch

---
 lib/src/dutch/AdverbDut.gf     | 31 +++++++++++++------------------
 lib/src/dutch/SentenceDut.gf   |  6 +++---
 lib/src/dutch/StructuralDut.gf |  4 ++--
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/lib/src/dutch/AdverbDut.gf b/lib/src/dutch/AdverbDut.gf
index 837c1f37c..f4f9e6d0f 100644
--- a/lib/src/dutch/AdverbDut.gf
+++ b/lib/src/dutch/AdverbDut.gf
@@ -1,27 +1,22 @@
-concrete AdverbDut of Adverb = CatDut ** open ResDut, Prelude in 
-{
---{
---
---  lin
---    PositAdvAdj a = {s = a.s ! Posit ! APred} ;
---
+concrete AdverbDut of Adverb = CatDut ** open ResDut, Prelude in {
+
+
+  lin
+    PositAdvAdj a = {s = a.s ! Posit ! APred} ;
+
 --    ComparAdvAdj cadv a np = {
 --      s = cadv.s ++ a.s ! Posit ! APred ++ cadv.p ++ np.s ! Nom
 --      } ;
 --    ComparAdvAdjS cadv a s = {
 --      s = cadv.s ++ a.s ! Posit ! APred ++ cadv.p ++ s.s ! Sub
 --      } ;
---
---    PrepNP prep np = {s = appPrep prep np.s} ;
---
---    AdAdv = cc2 ;
---
---    SubjS subj s = {s = subj.s ++ s.s ! Sub} ;
---
+
+    PrepNP prep np = {s = appPrep prep.s np.s} ;
+
+    AdAdv = cc2 ;
+
+    SubjS subj s = {s = subj.s ++ s.s ! Sub} ;
+
 --    AdnCAdv cadv = {s = cadv.s ++ conjThan} ;
 --
---}
---
------b    AdvSC s = s ;
-
 }
diff --git a/lib/src/dutch/SentenceDut.gf b/lib/src/dutch/SentenceDut.gf
index 437c58350..10c161447 100644
--- a/lib/src/dutch/SentenceDut.gf
+++ b/lib/src/dutch/SentenceDut.gf
@@ -59,9 +59,9 @@ concrete SentenceDut of Sentence = CatDut ** open ResDut, Prelude in {
 --      s = \\o => t.s ++ p.s ++ cl.s ! t.m ! t.t ! t.a ! p.p ! o ;
 --      c2 = cl.c2
 --      } ;
---
---    AdvS a s = {s = \\o => a.s ++ s.s ! Inv} ;
---
+
+    AdvS a s = {s = \\o => a.s ++ s.s ! Inv} ;
+
 --    RelS s r = {s = \\o => s.s ! o ++ "," ++ r.s ! gennum Neutr Sg} ; --- "welches"
 --
 --}
diff --git a/lib/src/dutch/StructuralDut.gf b/lib/src/dutch/StructuralDut.gf
index 4b6c64ab3..df8447463 100644
--- a/lib/src/dutch/StructuralDut.gf
+++ b/lib/src/dutch/StructuralDut.gf
@@ -1,4 +1,4 @@
-concrete StructuralDut of Structural = CatDut ** 
+concrete StructuralDut of Structural = CatDut, Prelude ** 
 
   open ResDut in
 {
@@ -45,7 +45,7 @@ concrete StructuralDut of Structural = CatDut **
 --  here_Adv = ss "hier" ;
 --  how_IAdv = ss "wie" ;
 --  how8many_IDet = detLikeAdj Pl "wieviel" ;
---  if_Subj = ss "wenn" ;
+  if_Subj = ss "als" ;
 --  in8front_Prep = mkPrep "vor" Dat ;
   i_Pron = mkPronoun "ik" "me" "m'n" "ik" "mij" "mijn" "mijne" Utr Sg P1 ;
 --  in_Prep = mkPrep "in" Dat ;