added ConjRS and things needed for it

1 files changed, 5 insertions, 19 deletions

diff --git a/next-lib/src/german/ConjunctionGer.gf b/next-lib/src/german/ConjunctionGer.gf
index d46a32839..3aea69d1d 100644
--- a/next-lib/src/german/ConjunctionGer.gf
+++ b/next-lib/src/german/ConjunctionGer.gf
@@ -17,27 +17,10 @@ concrete ConjunctionGer of Conjunction =
       isPre = ss.isPre
       } ;
 
-{- ---b
-    ConjS conj ss =  conjunctTable Order conj ss ;
-    DConjS conj ss = conjunctDistrTable Order conj ss ;
-
-    ConjAdv conj ss = conjunctSS conj ss ;
-    DConjAdv conj ss = conjunctDistrSS conj ss ;
-
-    ConjNP conj ss = conjunctTable Case conj ss ** {
-      a = {g = Fem ; n = conjNumber conj.n ss.a.n ; p = ss.a.p}
-      } ;
-    DConjNP conj ss = conjunctDistrTable Case conj ss ** {
-      a = {g = Fem ; n = conjNumber conj.n ss.a.n ; p = ss.a.p}
+    ConjRS conj ss = conjunctDistrTable GenNum conj ss ** {
+      c = ss.c
       } ;
 
-    ConjAP conj ss = conjunctTable AForm conj ss ** {
-      isPre = ss.isPre
-      } ;
-    DConjAP conj ss = conjunctDistrTable AForm conj ss ** {
-      isPre = ss.isPre
-      } ;
--}
 
 -- These fun's are generated from the list cat's.
 
@@ -49,11 +32,14 @@ concrete ConjunctionGer of Conjunction =
     ConsNP xs x = consrTable Case comma xs x ** {a = conjAgr xs.a x.a} ;
     BaseAP x y = twoTable AForm x y ** {isPre = andB x.isPre y.isPre} ;
     ConsAP xs x = consrTable AForm comma xs x ** {isPre = andB xs.isPre x.isPre} ;
+    BaseRS x y = twoTable GenNum x y ** {c = y.c} ;
+    ConsRS xs x = consrTable GenNum comma xs x ** {c = xs.c} ;
 
   lincat
     [S] = {s1,s2 : Order => Str} ;
     [Adv] = {s1,s2 : Str} ;
     [NP] = {s1,s2 : Case => Str ; a : Agr} ;
     [AP] = {s1,s2 : AForm => Str ; isPre : Bool} ;
+    [RS] = {s1,s2 : GenNum => Str ; c : Case} ;
 
 }