diff --git a/src/russian/NamesRus.gf b/src/russian/NamesRus.gf index 720543be..29fee814 100644 --- a/src/russian/NamesRus.gf +++ b/src/russian/NamesRus.gf @@ -26,7 +26,7 @@ lin PlSurname sn = } ; -- Does NP need animacy? lin FullName gn sn = - { s=\\cas => gn.s ! Nom ++ sn.s ! gn.g ! cas ; + { s=\\cas => gn.s ! cas ++ sn.s ! gn.g ! cas ; pron=False; a=let g = case gn.g of { Male => Masc ; diff --git a/src/russian/ParadigmsRus.gf b/src/russian/ParadigmsRus.gf index 8284b133..36f7917b 100644 --- a/src/russian/ParadigmsRus.gf +++ b/src/russian/ParadigmsRus.gf @@ -511,6 +511,10 @@ oper = \a, ln -> ln ** { s = \\cas => (adjFormsAdjective a).s ! (gennum ln.g ln.n) ! ln.anim ! cas ++ ln.s ! cas } ; + mkLN : LN -> Str -> LN + = \ln, suffix -> ln ** { + s = \\cas => ln.s ! cas ++ suffix + } ; } ; invarLN : Str -> Gender -> Number -> LN diff --git a/src/russian/VerbRus.gf b/src/russian/VerbRus.gf index 88d53563..e37732f7 100644 --- a/src/russian/VerbRus.gf +++ b/src/russian/VerbRus.gf @@ -188,15 +188,15 @@ lin }; -- : NP -> Comp ; -- (be) the man - CompNP np = {s=\\a=>np.s ! Ins ; adv=[] ; cop=InsCopula} ; + CompNP np = {s=\\a=>np.s ! Nom ; adv=[] ; cop=NomCopula} ; -- : Adv -> Comp ; -- (be) here CompAdv adv = {s=\\a=>[] ; adv=adv.s ; cop=ExplicitCopula} ; -- : CN -> Comp ; -- (be) a man/men CompCN cn = { - s=\\a=>cn.s ! numGenNum (agrGenNum a) ! Ins ; + s=\\a=>cn.s ! numGenNum (agrGenNum a) ! Nom ; adv=[] ; - cop=InsCopula + cop=NomCopula } ; -- : VP ; -- be