(Pes) Add premodifier APs

src/persian/ConjunctionPes.gf

@@ -17,7 +17,7 @@ concrete ConjunctionPes of Conjunction =
       animacy = ss.animacy ;
       } ;
 
-    ConjAP conj ss = conjunctDistrTable Mod conj ss ** {adv = ss.adv};
+    ConjAP conj ss = ss ** conjunctDistrTable Mod conj ss ; -- Adv isn't changed
     ConjRS conj rs = conjunctDistrTable Agr conj rs ** { c = rs.c};
 
 ---- These fun's are generated from the list cat's.
@@ -32,15 +32,14 @@ concrete ConjunctionPes of Conjunction =
     BaseRS x y = twoTable Agr x y ** {c = x.c};
     ConsNP xs x = xs ** consrTable Mod comma xs x ** {a = conjAgr xs.a x.a ; animacy = xs.animacy } ; --  InaandB xs.animacy x.animacy} ;
     ConsRS xs x = consrTable Agr comma xs x ** { c = xs.c};
---    BaseAP x y = twoTable3 Number Gender Case x y ; -- ** {isPre = andB x.isPre y.isPre} ;
-    BaseAP x y = twoTable Mod x y ** {adv = x.adv};
-    ConsAP xs x = consrTable Mod comma xs x ** {adv = x.adv}; -- Table3 Number Gender Case comma xs x ;-- ** {isPre = andB xs.isPre x.isPre} ;
+    BaseAP x y = y ** twoTable Mod x y ;
+    ConsAP xs x = xs ** consrTable Mod comma xs x ; -- Table3 Number Gender Case comma xs x ;-- ** {isPre = andB xs.isPre x.isPre} ;
 
   lincat
     [S] = {s1,s2 : VVForm => Str} ;
     [Adv] = {s1,s2 : Str} ;
     [NP] = {s1,s2 : Mod => Str ; a : Agr ; animacy : Animacy ; hasAdj : Bool; compl:Str} ;
-    [AP] = {s1,s2 :  Mod => Str ; adv : Str} ;
+    [AP] = {s1,s2 :  Mod => Str ; adv : Str ; isPre : Bool} ;
     [RS] = {s1,s2 : Agr => Str };
 
 }