RussianSwadesh

lib/resource/russian/MorphoRus.gf

@@ -342,7 +342,7 @@ oper pronVseInanimate: Pronoun =
   { s = table {
     PF Nom _ _  => "всё"  ; 
     PF Gen _ _ => "всего" ;
-    PF Dat _  _ => "всему" ; 
+    PF Dat _  _ => "всему" ; 
     PF Acc _  _ => "всё" ; 
     PF Inst _ _ => "всем" ;
 
@@ -488,6 +488,24 @@ oper restoran : CommNoun = nullEndInAnimateDecl1 "ресторан" ;
   } ;
 
 oper gripp : CommNoun = nullEndInAnimateDecl1 "грипп" ; 
+oper bar : CommNoun = nullEndInAnimateDecl1 "бар" ;
+oper telefon: CommNoun = nullEndInAnimateDecl1 "телефон" ;
+oper restoran : CommNoun = nullEndInAnimateDecl1 "ресторан" ;
+
+-- Note: Plural form of the "грипп" (influenza) is a bit doubious
+-- However, according to http://starling.rinet.ru/morph.htm it exists.
+-- so we also keep it.
+oper nullEndInAnimateDeclPepel: Str -> CommNoun =  \gripp ->
+  {s  =  table  
+      { SF Sg Nom =>  gripp +"ел"; 
+        SF Sg Gen => gripp+"ла" ;
+        SF Sg Dat => gripp+"лу" ; 
+        SF Sg Acc => gripp +"ел"; 
+        SF Sg Inst => gripp+"лом" ;
+        SF Sg Prepos => gripp+"ле" ; 
+        SF Pl Nom => gripp+"лы" ; 
+        SF Pl Gen => gripp+"лов" ;
+        SF Pl Dat => gripp+"лам" ; 
         SF Pl Acc => gripp +"лы"; 
         SF Pl Inst => gripp+"лами" ;
         SF Pl Prepos => gripp+"лах"
@@ -620,6 +638,24 @@ oper oeEndInAnimateDecl: Str -> CommNoun =  \snotvorn ->
     g = Neut  ; anim = Inanimate 
   } ; 
 
+oper oeEndInAnimateDecl: Str -> CommNoun =  \snotvorn ->
+  {  s  =  table  
+      { SF Sg Nom =>  snotvorn +"ое"; 
+        SF Sg Gen => snotvorn+"ого" ;
+        SF Sg Dat => snotvorn+"ому" ; 
+        SF Sg Acc => snotvorn +"ое"; 
+        SF Sg Inst => snotvorn+"ым" ;
+        SF Sg Prepos => snotvorn+"ом" ; 
+        SF Pl Nom => snotvorn+"ые" ; 
+        SF Pl Gen => snotvorn+"ых" ;
+        SF Pl Dat => snotvorn+"ым" ; 
+        SF Pl Acc => snotvorn+"ые" ; 
+        SF Pl Inst => snotvorn+"ыми" ;
+        SF Pl Prepos => snotvorn+"ых"
+    } ;
+    g = Neut  ; anim = Inanimate 
+  } ; 
+oper oeEndAnimateDecl: Str -> CommNoun =  \snotvorn ->
   {  s  =  table  
       { SF Sg Nom =>  snotvorn +"ое"; 
         SF Sg Gen => snotvorn+"ого" ;
@@ -887,7 +923,7 @@ oper ej_aEndInAnimateDecl: Str -> CommNoun =  \ediniz ->
       SF Pl Inst => nog+"ами" ;
 
       SF Pl Prepos => nog+"ах"
-} ;
+    } ;
     g = Fem  ; anim = Inanimate 
 } ;
 
@@ -1043,6 +1079,7 @@ oper
       SF Sg Acc => vs+"ех" ; 
       SF Sg Inst => vs+"еми" ;
       SF Sg Prepos => vs+"ех" ;
+      SF Pl Nom => vs+"е" ; 
       SF Pl Gen => vs +"ех";
 
       SF Pl Dat => vs+"ем" ; 
@@ -1188,7 +1225,7 @@ oper uy_j_EndDecl : Str -> Adjective = \s ->{s = table {
       AF Nom _ (ASg Neut) => "всё";
       AF Nom _ APl => "все";
       AF Acc  Animate (ASg Masc) => "весь"; 
-      AF Acc  Inanimate APl => "все";
+      AF Acc  Inanimate (ASg Masc) => "всего"; 
       AF Acc  _ (ASg Fem) => "всю"; 
       AF Acc  _ (ASg Neut) => "всё";
       AF Acc  Inanimate APl => "все";
@@ -1513,7 +1550,7 @@ oper pastConj: Str -> PastVerb = \del ->
   table {
     PRF APl _ => del+ "ны" ;
     PRF (ASg Masc) P1 => del+ sgP1End ;
-    PRF (ASg Neut) P2 => del+ "но" ;
+    PRF (ASg Fem) P1 => del+ "на" ;
     PRF (ASg Neut) P1 => del+ "но" ;
     PRF (ASg Masc) P2 => del+ sgP1End ;
     PRF (ASg Fem) P2 => del+ "на" ;
@@ -1521,7 +1558,7 @@ oper pastConjDolzhen: Str -> PastVerb = \del ->
     PRF (ASg Masc) P3 => del+ sgP1End ;
     PRF (ASg Fem) P3 => del+ "на" ;
     PRF (ASg Neut) P3 => del+ "но"   };
-    PRF (ASg _) P2 => del+ "ешь" ;
+
 oper presentConjMixed: Str -> Str -> PresentVerb = \del, sgP1End ->
   table {
     PRF (ASg _) P1 => del+ sgP1End ;
@@ -1548,6 +1585,7 @@ oper verbDeclMoch: Aspect -> Conjugation -> Str -> Str -> Str -> Str ->Str -> St
     PRF (ASg _) P3  => del+ "ёт" ;
     PRF APl P1 => del+ "ём" ;
 
+    PRF APl P2 => del+ "ёте" ;
     PRF APl P3 => del+ sgP1End + "т"   
   };
 oper presentConj1: Str -> Str -> PresentVerb = \del, sgP1End ->

lib/resource/russian/ParadigmsRus.gf

@@ -91,10 +91,13 @@ oper
   nObezbolivauchee : Str -> N ;   -- neutral, inanimate, ending with "-ee" 
   nProizvedenie : Str -> N ;   -- neutral, inanimate, ending with "-e" 
   nChislo : Str -> N ;   -- neutral, inanimate, ending with "-o" 
+  nZhivotnoe : Str -> N ;    -- masculine, inanimate, ending with "-ень"
 
 -- Masculine patterns. 
 
 --Ending with consonant: 
+nPepel : Str -> N ;    -- masculine, inanimate, ending with "-ел"- "пеп-ла"
+
   nBrat: Str -> N ;   -- animate, брат-ья
   nStul: Str -> N ;    -- same as above, but inanimate
   nMalush : Str -> N ; -- малышей
@@ -207,11 +210,11 @@ Tense : Type;
 Bool: Type;
 Conjugation: Type ;
 
-first: Conjugation;
+first: Conjugation; -- "гуля-Ешь, гуля-Ем"
-firstE: Conjugation;
+firstE: Conjugation; -- Verbs with vowel "ё": "даёшь" (give), "пьёшь" (drink)  
-second: Conjugation;
+second: Conjugation; -- "вид-Ишь, вид-Им"
-mixed: Conjugation;
+mixed: Conjugation; -- "хоч-Ешь - хот-Им"
-dolzhen: Conjugation;
+dolzhen: Conjugation; -- irregular
 
 true: Bool;
 false: Bool;
@@ -350,6 +353,7 @@ dolzhen = Dolzhen;
 -- Neuter patterns. 
 
   nObezbolivauchee = \s -> eeEndInAnimateDecl s ** {lock_N = <>};
+  nZhivotnoe = \s -> oeEndAnimateDecl s ** {lock_N = <>};
   nProizvedenie = \s -> eEndInAnimateDecl s ** {lock_N = <>};
   nChislo = \s -> oEndInAnimateDecl s ** {lock_N = <>};
 
@@ -365,6 +369,7 @@ dolzhen = Dolzhen;
 
   nAdres     = \s -> nullEndInAnimateDecl2 s ** {lock_N = <>}; 
   nTelefon   = \s -> nullEndInAnimateDecl1 s ** {lock_N = <>}; 
+  nPepel   = \s -> nullEndInAnimateDeclPepel s ** {lock_N = <>}; 
 
   nNol       = \s -> softSignEndDeclMasc s ** {lock_N = <>};
   nUroven    = \s -> EN_softSignEndDeclMasc s ** {lock_N = <>};