diff --git a/src/russian/LexiconRus.gf b/src/russian/LexiconRus.gf index d04e67dd6..03849b277 100644 --- a/src/russian/LexiconRus.gf +++ b/src/russian/LexiconRus.gf @@ -163,6 +163,8 @@ lin king_N = mkN "король" "короля" "королю" "короля" "королем" "короле" "короле" "короли" "королей" "королям" "королей" "королями" "королях" masculine animate ; knee_N = mkN "колено" "колена" "колену" "колена" "коленом" "колене" "колене" "колени" "колен" "коленам" "колен" "коленями" "коленях" neuter inanimate ; know_V2= dirV2 (regV imperfective first "зна" "ю" "знал" "знай" "знать" ); + know_VS= mkVQ (regV imperfective first "зна" "ю" "знал" "знай" "знать" ); + know_VQ= mkVQ (regV imperfective first "зна" "ю" "знал" "знай" "знать" ); lake_N = mkN "озеро" ; -- gen pl "озёр" lamp_N = mkN "лампа" ; language_N = mkN "язык" ; diff --git a/src/russian/ParadigmsRus.gf b/src/russian/ParadigmsRus.gf index 2ebaf4f63..5ec414fda 100644 --- a/src/russian/ParadigmsRus.gf +++ b/src/russian/ParadigmsRus.gf @@ -157,6 +157,9 @@ oper mkAdv : Str -> Adv ; +--2 Prepositions + mkPrep : Str -> Case -> Prep ; -- as in German + --2 Verbs -- -- In our lexicon description ("Verbum") there are 62 forms: @@ -218,6 +221,8 @@ perfective: Aspect ; mkV2 : V -> Str -> Case -> V2 ; -- "войти в дом"; "в", accusative mkV3 : V -> Str -> Str -> Case -> Case -> V3 ; -- "сложить письмо в конверт" + mkVS : V -> VS ; + mkVQ : V -> VQ ; dirV2 : V -> V2 ; -- "видеть", "любить" tvDirDir : V -> V3 ; @@ -412,6 +417,9 @@ foreign = Foreign; -- +++ MG_UR: added +++ mkAdv x = ss x ** {lock_Adv = <>} ; +-- Prepositions definitions + mkPrep s c = {s = s ; c = c ; lock_Prep = <>} ; + -- Verb definitions -- mkVerbum = \asp, sgP1, sgP2, sgP3, plP1, plP2, plP3, @@ -463,5 +471,9 @@ foreign = Foreign; -- +++ MG_UR: added +++ mkV3 v s1 s2 c1 c2 = v ** {c2 = {s=s1; c=c1}; c3={s=s2; c=c2}; lock_V3 = <>}; + + mkVS v = v ** {lock_VS = <>} ; + mkVQ v = v ** {lock_VQ = <>} ; + } ; diff --git a/src/russian/StructuralRus.gf b/src/russian/StructuralRus.gf index 70075ed23..8dd4792db 100644 --- a/src/russian/StructuralRus.gf +++ b/src/russian/StructuralRus.gf @@ -39,6 +39,7 @@ lin everywhere_Adv = ss "везде" ; few_Det = nemnogoSgDet **{lock_Det= <>; n= Sg; g = PNoGen; c = Nom}; --- DEPREC first_Ord = (uy_j_EndDecl "перв" ) ** {lock_A = <>}; --AStaruyj + for_Prep = { s = "для" ; c = Gen }; from_Prep = { s = "от" ; c = Gen }; he_Pron = pronOn ; here_Adv = ss "здесь" ;