English and Swedish resource functions for Query

lib/src/english/ConjunctionEng.gf

@@ -21,6 +21,10 @@ concrete ConjunctionEng of Conjunction =
       c = ss.c
       } ;
 
+    ConjIAdv = conjunctDistrSS ;   
+
+    ConjCN co ns = conjunctDistrTable2 Number Case co ns ** {g = Neutr} ; --- gender?
+
 -- These fun's are generated from the list cat's.
 
     BaseS = twoSS ;
@@ -33,12 +37,18 @@ concrete ConjunctionEng of Conjunction =
     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} ;
+    BaseIAdv = twoSS ;
+    ConsIAdv = consrSS comma ;
+    BaseCN = twoTable2 Number Case ;
+    ConsCN = consrTable2 Number Case comma ;
 
   lincat
     [S] = {s1,s2 : Str} ;
     [Adv] = {s1,s2 : Str} ;
+    [IAdv] = {s1,s2 : Str} ;
     [NP] = {s1,s2 : Case => Str ; a : Agr} ;
     [AP] = {s1,s2 : Agr => Str ; isPre : Bool} ;
     [RS] = {s1,s2 : Agr => Str ; c : Case} ;
+    [CN] = {s1,s2 : Number => Case => Str} ;
 
 }