Another batch of small Russian Phrasebook fixes

examples/phrasebook/WordsRus.gf

@@ -14,7 +14,7 @@ flags coding = utf8 ;
     Bread = mkCN L.bread_N ;
     Cheese = mkCN L.cheese_N ;
     Chicken = mkCN (P.mkN "курица") ;
-    Coffee = mkCN (P.mkN "кофе") ;
+    Coffee = mkCN (P.mkIndeclinableNoun "кофе" P.masculine P.inanimate) ;
     Fish = mkCN L.fish_N ;
     Meat = mkCN (P.mkN "мясо") ;
     Milk = mkCN L.milk_N ; 
@@ -76,25 +76,25 @@ flags coding = utf8 ;
 
 -- currencies
 
-    DanishCrown = mkCN (P.mkA "датский") (P.mkN "крона") ;
+    DanishCrown = mkCN (P.mkA "датский") (P.mkN "крона" P.inanimate) ;
-    Dollar = mkCN (P.mkN "доллар") ;
+    Dollar = mkCN (P.mkN "доллар" P.inanimate) ;
-    Euro = mkCN (P.mkN "евро") ;
+    Euro = mkCN (P.mkIndeclinableNoun "евро" P.neuter P.inanimate) ;
-    Lei = mkCN (P.mkN "лей") ;
+    Lei = mkCN (P.mkN "лей" P.inanimate) ;
-    Leva = mkCN (P.mkN "лев") ;
+    Leva = mkCN (P.mkN "лев" P.inanimate) ;
-    NorwegianCrown = mkCN (P.mkA "норвежский") (P.mkN "крона") ;  
+    NorwegianCrown = mkCN (P.mkA "норвежский") (P.mkN "крона" P.inanimate) ;  
-    Pound = mkCN (P.mkN "фунт");
+    Pound = mkCN (P.mkN "фунт" P.inanimate);
-    Rouble = mkCN (P.mkN "рубль") ;
+    Rouble = mkCN (P.mkN "рубль" P.inanimate) ;
-    SwedishCrown = mkCN (P.mkA "шведский") (P.mkN "крона") ;
+    SwedishCrown = mkCN (P.mkA "шведский") (P.mkN "крона" P.inanimate) ;
-    Zloty = mkCN (P.mkN "злотый") ;
+    Zloty = mkCN (P.mkN "злотый" P.inanimate) ;
 
 
 -- Nationalities
 
 --    Belgian = mkNat "бельгийский" (P.mkPN "Бельгия" P.feminine P.singular P.inanimate) ;
-    Bulgarian = mkNat "болгарский" (P.mkPN "Болгария" P.feminine P.singular P.inanimate) ;
+    Bulgarian = mkNat "болгарский" (P.mkPN "Болгария" P.feminine P.singular P.animate) ;
-    Catalan = mkNat "каталонский" (P.mkPN "Каталония" P.feminine P.singular P.inanimate) ;
+    Catalan = mkNat "каталонский" (P.mkPN "Каталония" P.feminine P.singular P.animate) ;
-    Danish = mkNat "датский" (P.mkPN "Дания" P.feminine P.singular P.inanimate) ;
+    Danish = mkNat "датский" (P.mkPN "Дания" P.feminine P.singular P.animate) ;
-    Dutch = mkNat "нидерландский" (P.mkPN "Нидерланды" P.neuter P.plural P.animate) ;
+    Dutch = mkNat "нидерландский" (P.mkPN "Нидерланды" P.neuter P.plural P.inanimate) ;
     English = mkNat "английский" (P.mkPN "Англия" P.feminine P.singular P.animate) ;
     Finnish = mkNat "финский" (P.mkPN "Финляндия" P.feminine P.singular P.animate) ;
 --    Flemish = mkNat "фландрийский" (P.mkPN "Фландрия" P.feminine P.singular P.animate) ;
@@ -181,9 +181,9 @@ flags coding = utf8 ;
 -- below. Languages without productive genitives must use an equivalent of
 -- "the wife of my son" for non-pronouns.
 
-    Wife = xOf sing (P.mkN "жена") ; 
+    Wife = xOf sing (P.mkN "жена" P.animate) ; 
-    Husband = xOf sing (P.mkN "муж") ;
+    Husband = xOf sing (P.mkN "муж" P.animate) ;
-    Son = xOf sing (P.mkN "сын") ;
+    Son = xOf sing (P.mkN "сын" P.animate) ;
     Daughter = xOf sing (P.mkN "дочь" "дочери" "дочери" "дочь" "дочерью" "дочери" "дочь" "дочери" "дочерей" "дочерям" "дочерей" "дочерьми" "дочерях" P.feminine P.animate) ;
 --    Daughter = xOf sing E.daughter_N ;
     Children = xOf plur L.child_N ; 
@@ -231,7 +231,7 @@ flags coding = utf8 ;
 
   oper
     mkNat : Str -> PN -> NPNationality = \la,co -> 
-      mkNPNationality (mkNP (P.mkPN la P.masculine P.singular P.animate)) (mkNP co) (P.mkA la) ;
+      mkNPNationality (mkNP (mkCN (P.mkA la) (P.mkN "язык"))) (mkNP co) (P.mkA la) ;
 
     mkDay : Str -> P.Gender -> {name : NP ; point : Adv ; habitual : Adv} =
       \d,g -> mkNPDay (mkNP (P.mkPN d g P.singular P.inanimate)) (mkAdv (P.mkPrep "в" P.accusative) (mkNP (P.mkPN d g P.singular P.inanimate))) 

lib/src/russian/LexiconRus.gf

@@ -11,7 +11,7 @@ lin
   animal_N = mkN "животное" animate;
   answer_V2S = dirV2 (regV imperfective first "отвеча" "ю" "отвечал" "отвечай" "отвечать" );
   apartment_N = mkN "квартира" ;
-  apple_N = mkN "яблоко" ;
+  apple_N = mkN "яблоко" inanimate ;
   art_N = mkN "искусство" ;
   ashes_N = mkN "пепел" ;
   ask_V2Q = dirV2 (regV imperfective first "спрашива" "ю" "спрашивал" "спрашивай" "спрашивать") ;
@@ -22,7 +22,7 @@ lin
   bark_N = mkN "кора";
   beautiful_A = mkA "красивый";
   become_VA = regV perfective second "станов" "лю" "стал" "стань" "стать" ;
-  beer_N = mkN "пиво" ;
+  beer_N = mkIndeclinableNoun "пиво" neuter inanimate ;
   beg_V2V = dirV2 (mkV imperfective "прошу" "просишь" "просит" "просим" "просите" "просят" "просил" "проси" "просить" );
   belly_N = mkN "живот" ;
   big_A = mkA "большой" "больше" ;

lib/src/russian/NounRus.gf

@@ -8,13 +8,8 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
     DetCN kazhduj okhotnik = {
       s = \\c => case kazhduj.size of {
 	nom =>
-	  case kazhduj.c of {
-	    Nom => 
               kazhduj.s ! AF (extCase c) okhotnik.anim (gennum okhotnik.g kazhduj.n) ++ 
-              okhotnik.s ! NF kazhduj.n (extCase c) nom ; 
+              okhotnik.s ! NF kazhduj.n (extCase c) nom  ;
-	    _ => 
-              kazhduj.s ! AF (extCase c) okhotnik.anim (gennum okhotnik.g kazhduj.n) ++ 
-              okhotnik.s ! NF kazhduj.n kazhduj.c nom } ;
 	sgg =>
 	  case kazhduj.c of {
 	    Nom => 
@@ -155,7 +150,7 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
     PossPron p = {s = \\af => p.s ! mkPronForm (caseAF af) No (Poss (gennum (genAF af) (numAF af) )); c=Nom; g = PNoGen; size = nom} ;
 
    NumCard c = c ;
-   NumSg = {s = \\_,_,_ => [] ; n = Sg ; size = sgg} ;
+   NumSg = {s = \\_,_,_ => [] ; n = Sg ; size = nom} ;
    NumPl = {s = \\_,_,_ => [] ; n = Pl ; size = plg} ;
 
    OrdNumeral numeral = variants {} ; ---- TODO; needed to compile Constructors