Merge pull request #313 from michmech/master

improvements to czech, mostly morphological

src/czech/ResCze.gf

@@ -36,7 +36,7 @@ oper
       ) ;
 
   dropFleetingE : Str -> Str = \s -> case s of {
-    x + "e" + c@("k"|"c") => x + c ;
+    x + "e" + c@("k"|"c"|"n") => x + c ;
     x + "e" + "ň" => x + "n" ;
     _ => s
     } ;
@@ -85,7 +85,7 @@ oper
   shortFemPlGen : Str -> Str = \s -> case s of {
     ul  + "ice" => ul + "ic" ;
     koleg + "yně" => koleg + "yň" ;
-    ruz + "e" => ruz + "i" ;
+    ruz + "e" => ruz + "í" ;
     _ => Predef.error ("shortFemPlGen does not apply to" ++ s)
     } ;
 
@@ -284,7 +284,7 @@ oper
       sins      = muz + "em" ;
 
       pnom = case muz_ of {
-        uci + "tel" => uci + "tele" ;
+        uci + "tel" => uci + "telé" ;
         _ => muz + "i"  --- muzové
 	} ;
       pgen = muz + "ů" ;
@@ -332,7 +332,8 @@ oper
     in
     {
       snom,sgen,svoc      = ruze ; --- pnom,pacc
-      sdat,sacc,sloc,sins = ruz + "i" ; 
+      sdat,sacc,sloc = ruz + "i" ;
+      sins = ruz + "í" ;
 
       pnom,pacc = ruze ;
       pgen      = shortFemPlGen ruze ;
@@ -810,7 +811,7 @@ oper
       } ;
 
   -- example: number 1
-  oneNumeral : Determiner = numeralFormsDeterminer (mkDemPronForms "jed") Num1 ;
+  oneNumeral : Determiner = numeralFormsDeterminer ((mkDemPronForms "jedn") ** {msnom = "jeden"}) Num1 ;
 
   -- numbers 2,3,4 ---- to check if everything comes out right with the determiner type
   twoNumeral : Determiner =

src/czech/StructuralCze.gf

@@ -2,7 +2,7 @@ concrete StructuralCze of Structural = CatCze **
   open ParadigmsCze, ResCze, Prelude in {
 
 lin
-    and_Conj = mkConj "i" ; 
+    and_Conj = mkConj "a" ;
     by8agent_Prep = mkPrep "od" Gen ; ---- TODO this means "from", there might be no good translation
     few_Det = invarNumeral "málo" ; -- CEG 6.8 --- TODO genitive mála
     for_Prep = mkPrep "pro" accusative ;