From b47683c2dab6cda2e08b4810ed0b3a0855049de5 Mon Sep 17 00:00:00 2001
From: inari <inari@chalmers.se>
Date: Fri, 17 Oct 2014 14:52:49 +0000
Subject: [PATCH] small changes in DocumentationFunctorEst and ConstructionEst

---
 lib/src/estonian/ConstructionEst.gf         |  8 +++++---
 lib/src/estonian/DocumentationEstFunctor.gf | 19 ++++++-------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/lib/src/estonian/ConstructionEst.gf b/lib/src/estonian/ConstructionEst.gf
index 647287027..d81d60854 100644
--- a/lib/src/estonian/ConstructionEst.gf
+++ b/lib/src/estonian/ConstructionEst.gf
@@ -1,4 +1,4 @@
---# -path=alltenses:.:../abstract
+--# -path=alltenses:.:../abstract:../api
 
 concrete ConstructionEst of Construction = CatEst ** 
   open SyntaxEst, SymbolicEst, ParadigmsEst, (L = LexiconEst), (E = ExtraEst), (R = ResEst), Prelude  in {
@@ -7,7 +7,9 @@ flags coding=utf8 ;
 lin
   hungry_VP = mkVP have_V2 (lin NP (mkNP (mkPN "kõht tühi"))) ;
   thirsty_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsEst.mkN "janu"))) ;
-  has_age_VP card = mkVP (mkAP (lin AdA (mkUtt (lin NP (mkNP <lin Card card : Card> L.year_N)))) L.old_A) ;
+  has_age_VP card = 
+    let n_years_AdA : AdA = lin AdA (mkUtt (lin NP (mkNP <lin Card card : Card> L.year_N)))
+    in  mkVP (mkAP n_years_AdA L.old_A) ;
 
   have_name_Cl x y = mkCl (mkNP (E.GenNP x) L.name_N) (lin NP y) ;
   married_Cl x y = mkCl (mkNP and_Conj (lin NP x) (lin NP y)) (ParadigmsEst.mkAdv "abielus") ;
@@ -19,7 +21,7 @@ lin
 -- some more things
   weather_adjCl ap = mkCl (mkVP (lin AP ap)) ;
    
-  is_right_VP =  mkVP have_V2 (lin NP (mkNP (ParadigmsEst.mkN "õigus"))) ;
+  is_right_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsEst.mkN "õigus"))) ;
   is_wrong_VP = mkVP (ParadigmsEst.mkV "eksima") ;
 
   n_units_AP card cn a = mkAP (lin AdA (mkUtt (lin NP (mkNP <lin Card card : Card> (lin CN cn))))) (lin A a) ;
diff --git a/lib/src/estonian/DocumentationEstFunctor.gf b/lib/src/estonian/DocumentationEstFunctor.gf
index 338f6fd5c..c1eb44704 100644
--- a/lib/src/estonian/DocumentationEstFunctor.gf
+++ b/lib/src/estonian/DocumentationEstFunctor.gf
@@ -209,12 +209,9 @@ oper
              ++ th (heading passive_Parameter) --# notpresent
             ) ++ 
          tr (th "1.p"  ++ td "" ++ td (vfin ImperP1Pl) ++
-             intagAttr "td" "rowspan=3" "TODO passive imperative") ++
+             intagAttr "td" "rowspan=3" (vfin ImperPass)) ++
          tr (th "2.p"  ++ td (vfin (Imper Sg)) ++ td (vfin (Imper Pl))) ++
-         tr (th "3.p"  ++ td (vfin (ImperP3))) ++
-         tr (th (heading negative_Parameter) ++
-             td (vfin (Imper Sg)) ++ 
-             td (vfin ImpNegPl)) 
+         tr (th "3.p"  ++ td (vfin (ImperP3))  ++ td (vfin ImperP3)) 
          ) ++
        heading2 (nounPluralHeading nominal_form_ParameterType).s ++
        heading3 (heading infinitive_Parameter) ++
@@ -223,16 +220,12 @@ oper
              th (heading nominative_Parameter) ++ td (vfin (Inf InfDa))) ++
          tr (th (heading inessive_Parameter) ++ td (vfin (Inf InfDes)))  ++
 
-         tr (intagAttr "th" "rowspan=6" "ma" ++         
-             th (heading inessive_Parameter) ++ td (vfin (Inf InfMas))) ++
+         tr (intagAttr "th" "rowspan=5" "ma" ++         
+             th (heading illative_Parameter) ++ td (vfin (Inf InfMa))) ++
+         tr (th (heading inessive_Parameter) ++ td (vfin (Inf InfMas))) ++
          tr (th (heading elative_Parameter)  ++ td (vfin (Inf InfMast))) ++
-         tr (th (heading illative_Parameter) ++ td (vfin (Inf InfMa))) ++
          tr (th (heading abessive_Parameter) ++ td (vfin (Inf InfMata))) ++ 
-         tr (th (heading adessive_Parameter) ++ td "TODO InfMa adessive") ++
-         tr (th (heading translative_Parameter) ++ td (vfin (Inf InfMaks))) ++
-         tr (intagAttr "th" "rowspan=2" "mine" ++         
-              th (heading nominative_Parameter) ++ td "TODO mine") ++
-          tr (th (heading partitive_Parameter) ++ td "TODO mist")
+         tr (th (heading translative_Parameter) ++ td (vfin (Inf InfMaks)))
 
        ) ++ 
        heading3 (heading participle_Parameter) ++