From 78e41a193f75913228c213b9f3cbdbbf22a0c4f0 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Fri, 10 Feb 2012 08:22:37 +0000
Subject: [PATCH] Afrikaans fixes by Laurette and Laurette

---
 lib/doc/status.html         | 10 +++++-----
 lib/doc/status.txt          |  2 +-
 lib/src/afrikaans/ResAfr.gf | 10 +++++-----
 lib/src/mini/Makefile       |  4 ++--
 lib/src/mini/MkMini.hs      |  5 ++---
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/doc/status.html b/lib/doc/status.html
index 1dfce6831..984fe8044 100644
--- a/lib/doc/status.html
+++ b/lib/doc/status.html
@@ -7,7 +7,7 @@
 <CENTER>
 <H1>The Status of the GF Resource Grammar Library</H1>
 <FONT SIZE="4"><I>Aarne Ranta</I></FONT><BR>
-<FONT SIZE="4">20120104</FONT>
+<FONT SIZE="4">20120210</FONT>
 </CENTER>
 
 <P>
@@ -38,10 +38,10 @@ are marked in the table
 <TD>Afr</TD>
 <TD>+</TD>
 <TD>-</TD>
-<TD>-</TD>
-<TD>-</TD>
-<TD>-</TD>
-<TD>-</TD>
+<TD>++</TD>
+<TD>+</TD>
+<TD>+</TD>
+<TD>+</TD>
 <TD>-</TD>
 <TD>-</TD>
 <TD>-</TD>
diff --git a/lib/doc/status.txt b/lib/doc/status.txt
index ecfc8ac56..5941ecae2 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/afrikaans/ResAfr.gf b/lib/src/afrikaans/ResAfr.gf
index 1d3488767..f6ca741b8 100644
--- a/lib/src/afrikaans/ResAfr.gf
+++ b/lib/src/afrikaans/ResAfr.gf
@@ -217,7 +217,7 @@ resource ResAfr = ParamX ** open Prelude in {
     s = table {
        VInf      => "het" ;
        VPres     => "het" ; 
-       VPast     => "had" ; --# notpresent
+       VPast     => "het" ; --# notpresent
        VPerf     => "gehad" 
        } ;
     aux = VHebben ;
@@ -297,7 +297,7 @@ param
   oper
     vForm : Tense -> VForm = \t -> case t of {
       Pres  => VPres 
-     ; Fut   => VPres  --# notpresent
+     ;  Fut   => VPres  --# notpresent
      ;  Past | Cond => VPast   -- Fut and Cond affect zullen --# notpresent
       } ;
 
@@ -448,12 +448,12 @@ param
           neg   = vp.a1 ! b ;
           obj0  = vp.n0 ! agr ;
           obj   = vp.n2 ! agr ;
-          compl = obj0 ++ neg ++ obj ++ vp.a2 ++ vp.s.prefix ++ neg;
+          compl = obj0 ++ neg ++ obj ++ vp.a2 ++ vp.s.prefix ;
           inf   = 
             case <vp.isAux, vp.inf.p2, a> of {                  --# notpresent
               <True,True,Anter> => vp.s.s ! VInf ++ vp.inf.p1 ; --# notpresent
               _ =>                                              --# notpresent
-                 vp.inf.p1 ++ verb.p2
+                 vp.inf.p1 ++ verb.p2 ++ neg
               }                                                 --# notpresent
               ;
           extra = vp.ext ;
@@ -480,7 +480,7 @@ param
     <
      \\agr => vp.n0 ! agr ++  vp.n2 ! agr ++  vp.a2,
      vp.a1 ! Pos ++ 
-     if_then_Str isAux [] "te" ++ vp.s.s ! VInf,
+     if_then_Str isAux [] "om" ++ "te" ++ vp.s.s ! VInf,
      vp.inf.p1 ++ vp.ext
     > ;
 
diff --git a/lib/src/mini/Makefile b/lib/src/mini/Makefile
index 265d04891..4a8e8bed8 100644
--- a/lib/src/mini/Makefile
+++ b/lib/src/mini/Makefile
@@ -6,7 +6,7 @@ src:
 	runghc MkMini.hs
 
 compdemo:
-	$(compile) Afr Bul Cat Dan Dut Eng Fin Fre Ger Ita Nep Nor Pes Pnb Pol Ron Rus Spa Swe Tha Urd
+	$(compile) Afr Bul Cat Dan Dut Eng Fin Fre Ger Ita Lav Nep Nor Pes Pnb Pol Ron Rus Spa Swe Tha Urd
 
 linkdemo:
-	$(compile) -link Afr Bul Cat Dan Dut Eng Fin Fre Ger Ita Nep Nor Pes Pnb Pol Ron Rus Spa Swe Tha Urd
+	$(compile) -link Afr Bul Cat Dan Dut Eng Fin Fre Ger Ita Lav Nep Nor Pes Pnb Pol Ron Rus Spa Swe Tha Urd
diff --git a/lib/src/mini/MkMini.hs b/lib/src/mini/MkMini.hs
index c53f5920a..a23bd8125 100644
--- a/lib/src/mini/MkMini.hs
+++ b/lib/src/mini/MkMini.hs
@@ -1,10 +1,9 @@
 src = "Eng"
 langs = [
   "Afr", "Bul", "Cat","Dan","Dut",
-  "Fin","Fre","Ger","Ita", -- "Lav",
+  "Fin","Fre","Ger","Ita", "Lav",
   "Nep","Nor","Pes","Pol","Pnb",
-  "Ron",
-  "Rus","Spa","Swe","Tha",
+  "Ron","Rus","Spa","Swe","Tha",
   "Urd"
   ]