ConjCN,BaseCN,ConsCN in Dutch and Slovenian

src/dutch/ConjunctionDut.gf

@@ -19,6 +19,10 @@ concrete ConjunctionDut of Conjunction =
 
     ConjRS conj ss = conjunctDistrTable2 Gender Number conj ss ;
 
+    ConjCN conj ss = conjunctDistrTable2 Adjf NForm conj ss ** {
+      g = Utr
+      } ;
+
 -- These fun's are generated from the list cat's.
 
     BaseS = twoTable Order ;
@@ -31,6 +35,8 @@ concrete ConjunctionDut of Conjunction =
     ConsAP xs x = consrTable2 Agr AForm comma xs x ** {isPre = andB xs.isPre x.isPre} ;
     BaseRS x y = twoTable2 Gender Number x y ** {c = y.c} ;
     ConsRS xs x = consrTable2 Gender Number comma xs x ;
+    BaseCN x y = twoTable2 Adjf NForm x y ;
+    ConsCN xs x = consrTable2 Adjf NForm comma xs x ;
 
   lincat
     [S] = {s1,s2 : Order => Str} ;
@@ -38,5 +44,6 @@ concrete ConjunctionDut of Conjunction =
     [NP] = {s1,s2 : NPCase => Str ; a : Agr} ;
     [AP] = {s1,s2 : Agr => AForm => Str ; isPre : Bool} ;
     [RS] = {s1,s2 : Gender => Number => Str} ;
+    [CN] = {s1,s2 : Adjf => NForm => Str} ;
 
 }

src/slovenian/ConjunctionSlv.gf

@@ -10,6 +10,10 @@ concrete ConjunctionSlv of Conjunction =
     ConjAP conj xs = {
       s = \\sp,g,c,n => xs.s1 ! sp ! g ! c ! n ++ conj.s ++ xs.s2 ! sp ! g ! c ! n
     } ;
+    ConjCN conj xs = {
+      s = \\s,c,n => xs.s1 ! s ! c ! n ++ conj.s ++ xs.s2 ! s ! c ! n ;
+      g = xs.g ;
+    } ;
 
 -- These fun's are generated from the list cat's.
 
@@ -28,9 +32,20 @@ concrete ConjunctionSlv of Conjunction =
       s1 = \\sp,g,c,n => x.s ! sp ! g ! c ! n ++ xs.s1 ! sp ! g ! c ! n ;
       s2 = xs.s2
     } ;
+    BaseCN x y = {
+      s1 = x.s ;
+      s2 = y.s ;
+      g  = y.g
+    } ;
+    ConsCN x xs = {
+      s1 = \\s,c,n => x.s ! s ! c ! n ++ "," ++ xs.s1 ! s ! c ! n ;
+      s2 = xs.s2 ;
+      g  = xs.g
+    } ;
 
   lincat
     [NP] = {s1,s2 : Case => Str; a : Agr} ;
     [AP] = {s1,s2 : Species => AGender => Case => Number => Str} ;
+    [CN] = {s1,s2 : Species => Case => Number => Str; g : AGender} ;
 
 }