More or less complete Latvian RG (by Peteris Paikens and Normunds Gruzitis)

lib/src/latvian/ConjunctionLav.gf

@@ -1,6 +1,6 @@
 concrete ConjunctionLav of Conjunction = 
   CatLav ** open ResLav, Coordination, Prelude in {
-{-
+
   flags optimize=all_subs ;
 
   lin
@@ -10,16 +10,12 @@ concrete ConjunctionLav of Conjunction =
     ConjAdv = conjunctDistrSS ;
 
     ConjNP conj ss = conjunctDistrTable Case conj ss ** {
-      a = conjAgr (agrP3 conj.n) ss.a
-      } ;
+      a = toAgr (conjNumber (fromAgr ss.a).n conj.n) (fromAgr ss.a).p (fromAgr ss.a).g
+    } ;  
 
-    ConjAP conj ss = conjunctDistrTable Agr conj ss ** {
-      isPre = ss.isPre
-      } ;
+    ConjAP conj ss = conjunctDistrTable4 Definite Gender Number Case conj ss;
 
-    ConjRS conj ss = conjunctDistrTable Agr conj ss ** {
-      c = ss.c
-      } ;
+    ConjRS conj ss = conjunctDistrTable Agr conj ss;
 
 -- These fun's are generated from the list cat's.
 
@@ -27,18 +23,21 @@ concrete ConjunctionLav of Conjunction =
     ConsS = consrSS comma ;
     BaseAdv = twoSS ;
     ConsAdv = consrSS comma ;
+	
     BaseNP x y = twoTable Case x y ** {a = conjAgr x.a y.a} ;
     ConsNP xs x = consrTable Case comma xs x ** {a = conjAgr xs.a x.a} ;
-    BaseAP x y = twoTable Agr x y ** {isPre = andB x.isPre y.isPre} ;
-    ConsAP xs x = consrTable Agr comma xs x ** {isPre = andB xs.isPre x.isPre} ;
-    BaseRS x y = twoTable Agr x y ** {c = y.c} ;
-    ConsRS xs x = consrTable Agr comma xs x ** {c = xs.c} ;
+	
+	BaseAP x y = twoTable4 Definite Gender Number Case x y ;
+    ConsAP xs x = consrTable4 Definite Gender Number Case comma xs x ;
+		
+    BaseRS x y = twoTable Agr x y ;
+    ConsRS xs x = consrTable Agr comma xs x  ; 
 
   lincat
     [S] = {s1,s2 : Str} ;
     [Adv] = {s1,s2 : Str} ;
     [NP] = {s1,s2 : Case => Str ; a : Agr} ;
-    [AP] = {s1,s2 : Agr => Str ; isPre : Bool} ;
-    [RS] = {s1,s2 : Agr => Str ; c : Case} ;
--}
+    [AP] = {s1,s2 : Definite => Gender => Number => Case => Str } ;
+    [RS] = {s1,s2 : Agr => Str } ;
+
 }