added ConjRS and things needed for it

next-lib/src/english/ConjunctionEng.gf

@@ -17,28 +17,9 @@ concrete ConjunctionEng of Conjunction =
       isPre = ss.isPre
       } ;
 
-{---b
-
-    ConjS = conjunctSS ;
-    DConjS = conjunctDistrSS ;
-
-    ConjAdv = conjunctSS ;
-    DConjAdv = conjunctDistrSS ;
-
-    ConjNP conj ss = conjunctTable Case conj ss ** {
-      a = conjAgr (agrP3 conj.n) ss.a 
+    ConjRS conj ss = conjunctDistrTable Agr conj ss ** {
+      c = ss.c
       } ;
-    DConjNP conj ss = conjunctDistrTable Case conj ss ** {
-      a = conjAgr (agrP3 conj.n) ss.a
-      } ;
-
-    ConjAP conj ss = conjunctTable Agr conj ss ** {
-      isPre = ss.isPre
-      } ;
-    DConjAP conj ss = conjunctDistrTable Agr conj ss ** {
-      isPre = ss.isPre
-      } ;
--}
 
 -- These fun's are generated from the list cat's.
 
@@ -50,11 +31,14 @@ concrete ConjunctionEng of Conjunction =
     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} ;
 
   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} ;
 
 }