cardinal numbers in Slovenian

lib/src/slovenian/CatSlv.gf

@@ -16,10 +16,14 @@ lincat
 
   Pron = {s : Case => Str ; a : Agr} ;
 
-  Det = {s : Case => Str; spec : Species; n : Number} ;
+  Det = {s : Gender => Case => Str; spec : Species; n : NumAgr} ;
-  Num  = {s : Case => Str ; n : Number} ;
+  Num  = {s : Gender => Case => Str ; n : NumAgr} ;
+  Card = {s : Gender => Case => Str ; n : NumAgr} ;
   Quant = {s : Str; spec : Species} ;
 
+  -- Numeral
+  Numeral = {s : Gender => Case => Str ; n : NumAgr} ;
+
   -- Structural
   Prep = {s : Str; c : Case} ;
 

lib/src/slovenian/GrammarSlv.gf

@@ -4,18 +4,17 @@ concrete GrammarSlv of Grammar =
   NounSlv,
   VerbSlv,
   AdjectiveSlv,
-{-  AdverbEng,
+{-  AdverbSlv,-}
-  NumeralEng,
+  NumeralSlv,
--}
   SentenceSlv,
-{-  QuestionEng,
+{-  QuestionSlv,
-  RelativeEng,
+  RelativeSlv,
-  ConjunctionEng,-}
+  ConjunctionSlv,-}
   PhraseSlv,
   TextX - [Pol,PPos,PNeg],
-  StructuralSlv
+  StructuralSlv,
-{-  IdiomEng,
+{-  IdiomSlv,  -}
-  TenseX  -}
+  TenseX
   ** {
 
 flags startcat = Phr ; unlexer = text ; lexer = text ;

lib/src/slovenian/NounSlv.gf

@@ -2,20 +2,34 @@ concrete NounSlv of Noun = CatSlv ** open ResSlv in {
 
   lin
     DetCN det cn = {
-      s = \\c => det.s ! c ++ cn.s ! det.spec ! c ! det.n ; 
+      s = \\c => det.s ! cn.g ! c ++ 
-      a = {g=cn.g; n=det.n; p=P3}
+                 case det.n of {
+                   UseNum n => cn.s ! det.spec ! c ! n ;
+                   UseGen   => cn.s ! det.spec ! Gen ! Pl
+                 } ;
+      a = {g = cn.g ;
+           n = case det.n of {
+                 UseNum n => n ;
+                 UseGen   => Pl
+               } ;
+           p = P3
+          }
       } ;
 
     UsePron p = p ;
 
     DetQuant quant num = {
-      s    = \\c => quant.s ++ num.s ! c;
+      s    = \\c,g => quant.s ++ num.s ! c ! g;
       spec = quant.spec ;
       n    = num.n ;
       } ;
 
-    NumSg = {s = \\_ => []; n = Sg} ;
+    NumSg = {s = \\_,_ => []; n = UseNum Sg} ;
-    NumPl = {s = \\_ => []; n = Pl} ;
+    NumPl = {s = \\_,_ => []; n = UseNum Pl} ;
+
+    NumCard n = n ;
+
+    NumNumeral numeral = {s = numeral.s; n = numeral.n} ;
 
     DefArt = {
       s    = "" ;

lib/src/slovenian/PhraseSlv.gf

@@ -7,6 +7,7 @@ concrete PhraseSlv of Phrase = CatSlv ** open Prelude, ResSlv in {
     UttNP np = {s = np.s ! Nom} ;
     UttAdv adv = adv ;
     UttCN n = {s = n.s ! Indef ! Nom ! Sg} ;
+    UttCard n = {s = n.s ! Fem ! Nom} ;
     UttAP ap = {s = ap.s ! Indef ! Masc ! Nom ! Sg} ;
     UttInterj i = i ;
 

lib/src/slovenian/ResSlv.gf

@@ -6,7 +6,10 @@ param
   Gender = Masc | Fem | Neut ;
   Person = P1 | P2 | P3 ;
   Species = Indef | Def ;
-  
+
+  NumAgr = UseNum Number | UseGen;
+  DForm = Unit Gender | Teen | Ten | Hundred;
+
   VForm = VInf
         | VSup
         | VPastPart Gender Number