From e6af6c2714ff616fda0dfccc0be24dc43c5ba861 Mon Sep 17 00:00:00 2001 From: bjorn Date: Wed, 25 Jun 2008 13:30:05 +0000 Subject: [PATCH] russian: fix neutral adjective-declined nouns --- lib/resource-1.4/russian/MorphoRus.gf | 20 -------------------- lib/resource-1.4/russian/ParadigmsRus.gf | 6 +++--- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/lib/resource-1.4/russian/MorphoRus.gf b/lib/resource-1.4/russian/MorphoRus.gf index cfbc215cd..c440af2c5 100644 --- a/lib/resource-1.4/russian/MorphoRus.gf +++ b/lib/resource-1.4/russian/MorphoRus.gf @@ -606,26 +606,6 @@ oper nullEndAnimateDeclBrat: Str -> CommNoun = \brat -> g = Masc ; anim = Animate } ; ---oper obezbolivauchee : CommNoun = eeEndInAnimateDecl "обезболивающ" ; - -oper eeEndInAnimateDecl: Str -> CommNoun = \obezbolivauch -> - { s = table - { SF Sg Nom => obezbolivauch +"ее"; - SF Sg Gen => obezbolivauch+"его" ; - SF Sg Dat => obezbolivauch+"ему" ; - SF Sg Acc => obezbolivauch +"ее"; - SF Sg Inst => obezbolivauch+"им" ; - SF Sg (Prepos _) => obezbolivauch+"ем" ; - SF Pl Nom => obezbolivauch+"ие" ; - SF Pl Gen => obezbolivauch+"их" ; - SF Pl Dat => obezbolivauch+"им" ; - SF Pl Acc => obezbolivauch+"ие" ; - SF Pl Inst => obezbolivauch+"ими" ; - SF Pl (Prepos _) => obezbolivauch+"их" - } ; - g = Neut ; anim = Inanimate - } ; - oper irregPl_StemInAnimateDecl: Str -> CommNoun = \derev -> { s = table { SF Sg Nom => derev+"о" ; diff --git a/lib/resource-1.4/russian/ParadigmsRus.gf b/lib/resource-1.4/russian/ParadigmsRus.gf index daa41380d..b4f556bc2 100644 --- a/lib/resource-1.4/russian/ParadigmsRus.gf +++ b/lib/resource-1.4/russian/ParadigmsRus.gf @@ -332,12 +332,12 @@ foreign = Foreign; -- +++ MG_UR: added +++ stem@(_+"и")+"й" => nDecl7Masc stem; stem@(_+"и")+"я" => nDecl7Fem stem; stem@(_+"и")+"е" => nDecl7Neut stem; - stem@(_+("а"|"е"|"ё"|"о"|"у"|"ы"|"э"|"ю"|"я"))+"й" => nDecl6Masc stem ; - stem@(_+("а"|"е"|"ё"|"о"|"у"|"ы"|"э"|"ю"|"я"))+"е" => nDecl6Neut stem ; - stem@(_+("а"|"е"|"ё"|"о"|"у"|"ы"|"э"|"ю"|"я"))+"я" => nDecl6Fem stem ; stem+"ее" => nAdj { s = (mk1A (stem+"ий")).s!Posit } Neut; stem+"ое" => nAdj { s = (mk1A (stem+(iAfter stem)+"й")).s!Posit } Neut; stem+"мя" => nDecl9 stem ; + stem@(_+("а"|"е"|"ё"|"о"|"у"|"ы"|"э"|"ю"|"я"))+"й" => nDecl6Masc stem ; + stem@(_+("а"|"е"|"ё"|"о"|"у"|"ы"|"э"|"ю"|"я"))+"е" => nDecl6Neut stem ; + stem@(_+("а"|"е"|"ё"|"о"|"у"|"ы"|"э"|"ю"|"я"))+"я" => nDecl6Fem stem ; stem@(_+("ч"|"щ"|"ш"|"ж"|"п"|"эн"|"м"|"ф"))+"ь" => nDecl8 stem ; stem@(_+("д"|"т"|"ст"|"с"|"в"|"б"))+"ь" => nDecl8 stem ; stem@(_+"ш"|"ж"|"ч"|"щ"|"ц")+"е" => nRegHardNeut stem;