diff --git a/src/russian/LexiconRus.gf b/src/russian/LexiconRus.gf index 904c80891..938f07bb2 100644 --- a/src/russian/LexiconRus.gf +++ b/src/russian/LexiconRus.gf @@ -208,7 +208,7 @@ lin oil_N = mkN "нефть" ; old_A = mkA "старый" "старше" ; open_V2= dirV2 (regV imperfective first "открыва" "ю" "открывал" "открывай" "открывать" ); ---- organise_V2 = dirV2 (regV imperfective foreign "организу" "ю" "организовал" "организуй" "организовать" ); -- +++ MG_UR: added +++ +--- organise_V2 = dirV2 (regV imperfective first "организу" "ю" "организовал" "организуй" "организовать" ); paint_V2A = dirV2 (regV imperfective first "рису" "ю" "рисовал" "рисуй" "рисовать" ) ; --- palace_N = nDvorec "двор" ; -- +++ MG_UR: added +++ paper_N = mkN "бумага" ; diff --git a/src/russian/MorphoRus.gf b/src/russian/MorphoRus.gf index 4ca46fe7a..c4d34016a 100644 --- a/src/russian/MorphoRus.gf +++ b/src/russian/MorphoRus.gf @@ -1057,7 +1057,7 @@ oper ti_j_EndDecl : Str -> Adjective = \s ->{s = table { ---- (according to the number and the person of the subject) ---- patterns in the present tense in the indicative mood. --- +++ MG_UR: new conjugation class 'Foreign' introduced +++ +-- Foreign coincides with First. Deprecated param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ; oper hasConj : Verbum -> Conjugation = \ v -> @@ -1147,7 +1147,7 @@ oper verbDolzhen : Verbum = verbDecl Imperfective Dolzhen "долж" "ен" "д -- further conjugation class added by Magda Gerritsen and Ulrich Real: -- foreign words introduced in Russian -oper verbOrganisuet : Verbum = verbDecl Imperfective Foreign "организу" "ю" "организовал" "организуй" "организовать"; +oper verbOrganisuet : Verbum = verbDecl Imperfective First "организу" "ю" "организовал" "организуй" "организовать"; oper idetDozhd: Verbum -> Verbum = \idet -> {s = \\vf=>idet.s!vf ++ "дождь"; asp = Imperfective}; @@ -1256,17 +1256,6 @@ oper pastConjDolzhen: Str -> PastVerb = \del -> PSF GPl => "были" ++ del + "ны" }; --- further class added by Magda Gerritsen and Ulrich Real -oper presentConjForeign: Str -> Str -> PresentVerb = \del, sgP1End -> - table { - PRF (GSg _) P1 => del+ sgP1End ; -- sgP1End "ю" - PRF (GSg _) P2 => del+ "ешь" ; - PRF (GSg _) P3 => del+ "ет" ; - PRF GPl P1 => del+ "ем" ; - PRF GPl P2 => del+ "ете" ; - PRF GPl P3 => del+ "ют" -}; - -- "verbDecl" sorts out verbs according to the aspect and voice parameters. -- It produces the full conjugation table for a verb entry @@ -1280,7 +1269,7 @@ oper verbDecl: Aspect -> Conjugation -> Str -> Str -> Str -> Str -> Str -> Verbu SecondA => ; Mixed => ; Dolzhen => ; - Foreign => } in + Foreign => } in let patt = case a of { Perfective => mkVerbPerfective; Imperfective => mkVerbImperfective } in diff --git a/src/russian/ParadigmsRus.gf b/src/russian/ParadigmsRus.gf index 57aea5a59..09c645de0 100644 --- a/src/russian/ParadigmsRus.gf +++ b/src/russian/ParadigmsRus.gf @@ -184,7 +184,7 @@ firstE: Conjugation; -- Verbs with vowel "ё": "даёшь" (give), "пьёшь second: Conjugation; -- "вид-Ишь, вид-Им" mixed: Conjugation; -- "хоч-Ешь - хот-Им" dolzhen: Conjugation; -- irregular -foreign: Conjugation; -- foreign words which are used in Russian, +++ MG_UR: added +++ +foreign: Conjugation; -- deprecated, not needed true: Bool; @@ -252,7 +252,7 @@ second = Second ; secondA = SecondA ; mixed = Mixed ; dolzhen = Dolzhen; -foreign = Foreign; -- +++ MG_UR: added +++ +foreign = Foreign; -- deprecated. Not needed true = True; false = False ;