From 69c1ff669cce076f4177ca4dacf4412c0dd000a6 Mon Sep 17 00:00:00 2001 From: Roman Suzi Date: Sat, 23 May 2020 18:24:03 +0300 Subject: [PATCH 1/4] Removed special variant of Second conj, but left one in hasConj as it is used for a different purpose --- src/russian/MorphoRus.gf | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/russian/MorphoRus.gf b/src/russian/MorphoRus.gf index 4ca46fe7a..1e02fceba 100644 --- a/src/russian/MorphoRus.gf +++ b/src/russian/MorphoRus.gf @@ -1058,7 +1058,7 @@ oper ti_j_EndDecl : Str -> Adjective = \s ->{s = table { ---- patterns in the present tense in the indicative mood. -- +++ MG_UR: new conjugation class 'Foreign' introduced +++ -param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ; +param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ; -- SecondA deprecated oper hasConj : Verbum -> Conjugation = \ v -> case v.s ! VFORM Act VINF of { @@ -1176,19 +1176,8 @@ oper presentConjMixed: Str -> Str -> PresentVerb = \del, sgP1End -> PRF GPl P2 => del+ "тите" ; PRF GPl P3 => del+ "тят" }; - --- +++ MG_UR: changed! (+ д) +++ -oper presentConj2: 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+ "дят" - }; -oper presentConj2a: Str -> Str -> PresentVerb = \del, sgP1End -> +oper presentConj2: Str -> Str -> PresentVerb = \del, sgP1End -> table { PRF (GSg _) P1 => del+ sgP1End ; -- sgP1End "жу" PRF (GSg _) P2 => del+ "ишь" ; @@ -1277,7 +1266,7 @@ oper verbDecl: Aspect -> Conjugation -> Str -> Str -> Str -> Str -> Str -> Verbu First => ; FirstE => ; Second => ; - SecondA => ; + SecondA => ; Mixed => ; Dolzhen => ; Foreign => } in From 20f703e09c229e697eea32d5519d1b804d7c4f2e Mon Sep 17 00:00:00 2001 From: Roman Suzi Date: Sat, 23 May 2020 18:31:25 +0300 Subject: [PATCH 2/4] Fix fly_V --- src/russian/LexiconRus.gf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/russian/LexiconRus.gf b/src/russian/LexiconRus.gf index 904c80891..253f1baad 100644 --- a/src/russian/LexiconRus.gf +++ b/src/russian/LexiconRus.gf @@ -113,7 +113,7 @@ lin floor_N = mkN "пол" ; flow_V = regV imperfective firstE "тек" "у" "тёк" "теки" "течь" ; flower_N = mkN "цветок"; - fly_V = regV imperfective second "лета" "ю" "летал" "летай" "летать" ; + fly_V = regV imperfective first "лета" "ю" "летал" "летай" "летать" ; fog_N = mkN "туман" ; foot_N = mkN "ступня" ; forest_N = mkN "лес" ; -- prepos -u From d62a48a8e87e276aa4c823f4a7a8b3a0960906a1 Mon Sep 17 00:00:00 2001 From: Roman Suzi Date: Sat, 23 May 2020 18:35:58 +0300 Subject: [PATCH 3/4] Redefined leave --- src/russian/LexiconRus.gf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/russian/LexiconRus.gf b/src/russian/LexiconRus.gf index 253f1baad..e67bb640c 100644 --- a/src/russian/LexiconRus.gf +++ b/src/russian/LexiconRus.gf @@ -173,7 +173,7 @@ lin leaf_N = mkN "лист" ; -- irregular pl learn_V2= dirV2 (regV imperfective second "уч" "у" "учил" "учи" "учить" ); leather_N = mkN "кожа" ; - leave_V2= dirV2 (regV imperfective second "ухож" "у" "уходил" "уходи" "уходить" ); + leave_V2= dirV2 (mkV imperfective "ухожу" "уходишь" "уходит" "уходим" "уходите" "уходят" "уходил" "уходи" "уходить" ); left_Ord = (uy_j_EndDecl "лев" ) ** {lock_A = <>}; leg_N = mkN "нога" ; lie_V = regV imperfective firstE "лг" "у" "лгал" "лги" "лгать" ; From 8fbcd04421b623815b71ea2b248863b2e260473a Mon Sep 17 00:00:00 2001 From: Roman Suzi Date: Sat, 23 May 2020 18:38:48 +0300 Subject: [PATCH 4/4] redefined go, see, hate as they are not regular --- src/russian/LexiconRus.gf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/russian/LexiconRus.gf b/src/russian/LexiconRus.gf index e67bb640c..b5da54099 100644 --- a/src/russian/LexiconRus.gf +++ b/src/russian/LexiconRus.gf @@ -128,7 +128,7 @@ lin girl_N = mkN "девочка" animate; -- vowel change give_V3 = tvDirDir (regV imperfective firstE "да" "ю" "давал" "давай" "давать" ) ; glove_N = mkN "перчатка" ; -- vowel change - go_V= regV imperfective second "хо" "жу" "ходил" "ходи" "ходить" ; + go_V = mkV imperfective "хожу" "ходишь" "ходит" "ходим" "ходите" "ходят" "ходил" "ходи" "ходить" ; gold_N = mkN "золото" ; good_A = mkA "хороший" "лучше" ; grammar_N = mkN "грамматика"; @@ -139,7 +139,7 @@ lin hand_N = mkN "рука" ; harbour_N = mkN "порт" ; -- prepos -u hat_N = mkN "шляпа" ; - hate_V2= dirV2 (regV imperfective second "ненави" "жу" "ненавидел" "ненавидь" "ненавидеть" ); + hate_V2= dirV2 (mkV imperfective "ненавижу" "ненавидишь" "ненавидит" "ненавидим" "ненавидите" "ненавидят" "ненавидел" "ненавидь" "ненавидеть" ); head_N = mkN "голова" ; hear_V2= dirV2 (regV imperfective first "слуша" "ю" "слушал" "слушай" "слушать" ); heart_N = mkN "сердце" "сердца" "сердцу" "сердца" "сердцем" "сердце" "сердце" "сердца" "сердец" "сердцам" "сердец" "сердцами" "сердцах" neuter inanimate ; @@ -257,7 +257,7 @@ lin science_N = mkN "наука" ; scratch_V2 = dirV2 (regV imperfective first "чеш" "у" "чесал" "чеши" "чесать" ) ; sea_N = mkN "море" ; - see_V2 = dirV2 (regV imperfective second "ви" "жу" "видел" "видь" "видеть" ); + see_V2 = dirV2 (mkV imperfective "вижу" "видишь" "видит" "видим" "видите" "видят" "видел" "видь" "видеть"); seed_N = mkN "семя"; seek_V2 = dirV2 (regV imperfective first "ищ" "у" "искал" "ищи" "искать" ); sell_V3 = tvDirDir (regV imperfective firstE "прода" "ю" "продавал" "продавай" "продавать" );