diff --git a/lib/resource-1.0/russian/NounRus.gf b/lib/resource-1.0/russian/NounRus.gf index 2e232ffdc..de5140b89 100644 --- a/lib/resource-1.0/russian/NounRus.gf +++ b/lib/resource-1.0/russian/NounRus.gf @@ -1,4 +1,4 @@ ---# -path=.:../abstract:../common:../../prelude +# -path=.:../abstract:../common:../../prelude concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in { @@ -41,7 +41,7 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in { n = quant.n; g = quant.g; c = quant.c - } ; + } ; DetPl quant num ord = { s = \\af => quant.s !af ++ num.s! (caseAF af) ! (genAF af) ++ ord.s!af ; @@ -62,13 +62,13 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in { -- so just leave a decimal representation, without case-suffixes: NumInt i = {s = table { _ => table {_ => i.s } } } ; --- OrdInt n = case n of { --- 0|2|6 => (uy_oj_EndDecl n.s) ; --- 3 => (ti_j_EndDecl n.s) ; --- _ => uy_j_EndDecl n.s } ; + OrdInt n = case n of { + 0|2|6 => (uy_oj_EndDecl n.s) ; + 3 => (ti_j_EndDecl n.s) ; + _ => uy_j_EndDecl n.s } ; --- OrdNumeral numeral = --- {s = \\ af => (uy_j_EndDecl (numeral.s ! caseAF af ! genAF af)).s!af} ; + OrdNumeral numeral = + {s = \\ af => (uy_j_EndDecl (numeral.s ! caseAF af ! genAF af)).s!af} ; NumNumeral n = n ; diff --git a/lib/resource-1.0/russian/StructuralRus.gf b/lib/resource-1.0/russian/StructuralRus.gf index 19d6cfb18..73064eb8c 100644 --- a/lib/resource-1.0/russian/StructuralRus.gf +++ b/lib/resource-1.0/russian/StructuralRus.gf @@ -1,4 +1,4 @@ ---# -path=.:../abstract:../common:../../prelude +--# -path=.:../abstract:../common:../../prelude concrete StructuralRus of Structural = CatRus ** open ResRus, MorphoRus, (P = ParadigmsRus), Prelude, NounRus, in { @@ -78,10 +78,10 @@ lin somePl_Det = nekotorujDet ** {n = Pl; g = PNoGen; c= Nom} ; something_NP = UsePron (pronChtoTo** {lock_Pron=<> }) ; somewhere_Adv = ss "где-нибудь" ; ---- these_NP n = { s =\\_ => [] ; n = Pl; p = P3; g= PGen Fem ; ---- anim = Animate ; pron = True} ; -- missing in Russian ---- those_NP n = { s =\\_ => [] ; n = Pl; p = P3; g=PGen Fem ; ---- anim = Animate ; pron = True} ; -- missing in Russian + these_NP n = { s =\\_ => “”; n = Pl; p = P3; g= PGen Fem ; + anim = Animate ; pron = True} ; -- missing in Russian + those_NP n = { s =\\_ => “” ; n = Pl; p = P3; g=PGen Fem ; + anim = Animate ; pron = True} ; -- missing in Russian that_Quant = totDet ** {n = Sg; g = PNoGen; c= Nom} ; that_NP = det2NounPhrase totDet ; -- inanimate form only there_Adv = ss "там" ;