(Hun) Adjust types for numerals

src/hungarian/CatHun.gf

@@ -76,7 +76,7 @@ concrete CatHun of Cat = CommonX ** open ResHun, Prelude in {
 
 -- Constructed in NumeralHun.
 
-    Card = ResHun.Num ;
+    Card = ResHun.Numeral ;
     Numeral = ResHun.Numeral ;
     Digits = {s : CardOrd => Str ; n : Number} ;
 

src/hungarian/NounHun.gf

@@ -82,7 +82,9 @@ concrete NounHun of Noun = CatHun ** open ResHun, Prelude in {
   NumPl = baseNum ** {n = Pl} ;
 
   -- : Card -> Num ;
-  NumCard card = card ;
+  NumCard card = card ** {
+    n = Sg -- Numerals take noun in Sg: e.g. öt város, literally 'five city'
+    } ;
 
   -- : Digits  -> Card ;
   --  NumDigits dig =

src/hungarian/ResHun.gf

@@ -120,24 +120,24 @@ oper
     numtype : NumType ; -- Whether its Num component is digit, numeral or Sg/Pl
     } ;
 
-  Num : Type = {
+  Numeral : Type = {
     s : Place => Str ;  -- Independent or attribute
-    n : Number ;        -- Singular or plural
     numtype : NumType ; -- Digit, numeral or Sg/Pl : makes a difference in many languages
-    } ;
+    -- TODO add ordinal
-
-  baseNum : Num = {
-    s = \\_ => [] ;
-    n = Sg ;
-    numtype = NoNum
     } ;
 
   {- Numeral can become Num via
       Noun.gf:    NumNumeral : Numeral -> Card ;
       Noun.gf:    NumCard : Card -> Num ;
   -}
-  Numeral : Type = Num ** {
+  Num : Type = Numeral ** {
-    -- TODO add ordinal
+    n : Number ;        -- Singular or plural
+  } ;
+
+  baseNum : Num = {
+    s = \\_ => [] ;
+    n = Sg ;
+    numtype = NoNum
     } ;
 
 --------------------------------------------------------------------------------