From 6fa1d913e9b033d9e94a09610b84586e1cac4d75 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Mon, 24 Jan 2011 15:01:43 +0000
Subject: [PATCH] bug fix in Dutch infinitive vp

---
 lib/doc/status.html          | 2 +-
 lib/doc/status.txt           | 2 +-
 lib/src/dutch/ResDut.gf      | 2 +-
 lib/src/parse/ParseEng.gf    | 6 +++---
 lib/src/parse/ParseEngAbs.gf | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/doc/status.html b/lib/doc/status.html
index 892dfe10c..7f5230646 100644
--- a/lib/doc/status.html
+++ b/lib/doc/status.html
@@ -35,7 +35,7 @@ are marked in the table
 </TR>
 <TR>
 <TD>Afr</TD>
-<TD>-</TD>
+<TD>+</TD>
 <TD>-</TD>
 <TD>-</TD>
 <TD>-</TD>
diff --git a/lib/doc/status.txt b/lib/doc/status.txt
index d115bc075..f296b6304 100644
--- a/lib/doc/status.txt
+++ b/lib/doc/status.txt
@@ -13,7 +13,7 @@ are marked in the table
 
 
 || Lang | Darcs | Mini | Parad | Lex | Lang | API | Symb | Irreg | Dict | authors       ||
-| Afr   | -     | -    | -     | -   | -    | -   | -    | -     | -    | *LPs,LPj
+| Afr   | +     | -    | -     | -   | -    | -   | -    | -     | -    | *LPs,LPj
 | Amh   | +     | +    | ++    | +   | +    | -   | -    | -     | -    | *MK
 | Ara   | +     | +    | +     | +   | -    | -   | -    | -     | -    | AD
 | Bul   | +     | +    | +     | +   | +    | +   | +    | +     | +    | *KA
diff --git a/lib/src/dutch/ResDut.gf b/lib/src/dutch/ResDut.gf
index 25a7a0ece..77ca8bd63 100644
--- a/lib/src/dutch/ResDut.gf
+++ b/lib/src/dutch/ResDut.gf
@@ -598,7 +598,7 @@ param
 
   infVP : Bool -> VP -> ((Agr => Str) * Str * Str) = \isAux, vp -> 
     <
-     \\agr => vp.n2 ! agr ++  vp.a2,
+     \\agr => vp.n0 ! agr ++  vp.n2 ! agr ++  vp.a2,
      vp.a1 ! Pos ++ 
      if_then_Str isAux [] "te" ++ vp.s.s ! VInf,
      vp.inf.p1 ++ vp.ext
diff --git a/lib/src/parse/ParseEng.gf b/lib/src/parse/ParseEng.gf
index 432dab689..1bbf4acbf 100644
--- a/lib/src/parse/ParseEng.gf
+++ b/lib/src/parse/ParseEng.gf
@@ -127,8 +127,8 @@ lin
       a = agrP3 Sg
       } ;
 
-    CompCN cn = { s = \\a => let n = (fromAgr a).n
-		              in IndefArt.s ! False ! n ++ cn.s ! n ! Acc} ;
+--    CompCN cn = { s = \\a => let n = (fromAgr a).n
+--		              in IndefArt.s ! False ! n ++ cn.s ! n ! Acc} ;
 
 -- Lexical additions
 
@@ -154,7 +154,7 @@ lin
 	VVPastNeg => ["shouldn't have"] ;
 	VVPresNeg => "shouldn't"
 	} ;
-      isAux = True
+      typ = VVAux
     } ;
     several_Det = mkDeterminer plural "several" ;
 
diff --git a/lib/src/parse/ParseEngAbs.gf b/lib/src/parse/ParseEngAbs.gf
index 9ef44cd82..4786c08ef 100644
--- a/lib/src/parse/ParseEngAbs.gf
+++ b/lib/src/parse/ParseEngAbs.gf
@@ -27,7 +27,7 @@ fun NumOfNP : Num -> NP -> NP ; -- ten of the dogs
 fun CAdvNP  : CAdv -> CN -> NP -> NP ; -- more wine than the professor
 fun CAdvSSlash  : CAdv -> CN -> SSlash -> NP ; -- more wine than the professor drank
 
-fun CompCN : CN -> Comp ; -- "(every man is) a dog", "(all men are) dogs"
+--fun CompCN : CN -> Comp ; -- "(every man is) a dog", "(all men are) dogs"
 
 -- Lexical additions