diff --git a/resource/doc/index.html b/resource/doc/index.html index 139e7f55..371a3388 100644 --- a/resource/doc/index.html +++ b/resource/doc/index.html @@ -14,7 +14,7 @@ Last update: Fri Dec 21 18:15:24 2007

- +

diff --git a/resource/russian/LexiconRus.gf b/resource/russian/LexiconRus.gf index dea1dc4b..3d30c766 100644 --- a/resource/russian/LexiconRus.gf +++ b/resource/russian/LexiconRus.gf @@ -317,7 +317,8 @@ lin sock_N = nPotolok "нос" ; --- son_N = nSyn "сын" ; -- +++ MG_UR: added +++ song_N = nTetya "песн" ; - speak_V2 = dirV2 (regV imperfective second "говор" "ю" "говорил" "говори" "говорить" ); + speak_V2 = mkV2 (regV imperfective secondA "говор" "ю" "говорил" "говори" "говорить") + "на" prepositional ; spit_V = regV imperfective firstE "плю" "ю" "плевал" "плюй" "плевать" ; split_V2 = dirV2 (regV imperfective first "разбива" "ю" "разбивал" "разбей" "разбивать" ) ; squeeze_V2 = dirV2 (regV imperfective first "сжима" "ю" "сжимал" "сжимай" "сжимать" ) ; diff --git a/resource/russian/MorphoRus.gf b/resource/russian/MorphoRus.gf index e642cf43..14f44655 100644 --- a/resource/russian/MorphoRus.gf +++ b/resource/russian/MorphoRus.gf @@ -2266,7 +2266,7 @@ oper uy_oj_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 | Mixed | Dolzhen | Foreign ; +param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ; --3 First conjugation (in Present) verbs : @@ -2367,6 +2367,16 @@ table { PRF APl P3 => del+ "дят" }; +oper presentConj2a: Str -> Str -> PresentVerb = \del, sgP1End -> +table { + PRF (ASg _) P1 => del+ sgP1End ; -- sgP1End "жу" + PRF (ASg _) P2 => del+ "ишь" ; + PRF (ASg _) P3 => del+ "ит" ; + PRF APl P1 => del+ "им" ; + PRF APl P2 => del+ "ите" ; + PRF APl P3 => del+ "ят" + }; + oper presentConj1E: Str -> Str -> PresentVerb = \del, sgP1End -> table { PRF (ASg _) P1 => del+ sgP1End ; @@ -2438,6 +2448,7 @@ oper verbDecl: Aspect -> Conjugation -> Str -> Str -> Str -> Str ->Str -> Verbum First => mkVerb (perfectiveActivePattern inf imperSgP2 (presentConj1 del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast); FirstE => mkVerb (perfectiveActivePattern inf imperSgP2 (presentConj1E del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast); Second => mkVerb (perfectiveActivePattern inf imperSgP2 (presentConj2 del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast); + SecondA => mkVerb (perfectiveActivePattern inf imperSgP2 (presentConj2a del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast); Mixed => mkVerb (perfectiveActivePattern inf imperSgP2 (presentConjMixed del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast); Dolzhen => mkVerb (perfectiveActivePattern inf imperSgP2 (presentConjDolzhen del sgP1End) (pastConjDolzhen sgMascPast)) (pastConjDolzhen sgMascPast); Foreign => mkVerb (perfectiveActivePattern inf imperSgP2 (presentConjForeign del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast) @@ -2446,6 +2457,7 @@ oper verbDecl: Aspect -> Conjugation -> Str -> Str -> Str -> Str ->Str -> Verbum First => mkVerb (imperfectiveActivePattern inf imperSgP2 (presentConj1 del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast); FirstE => mkVerb (imperfectiveActivePattern inf imperSgP2 (presentConj1E del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast); Second => mkVerb (imperfectiveActivePattern inf imperSgP2 (presentConj2 del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast); + SecondA => mkVerb (imperfectiveActivePattern inf imperSgP2 (presentConj2a del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast); Mixed => mkVerb (imperfectiveActivePattern inf imperSgP2 (presentConjMixed del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast) ; Dolzhen => mkVerb (imperfectiveActivePattern inf imperSgP2 (presentConjDolzhen del sgP1End) (pastConjDolzhen sgMascPast)) (pastConjDolzhen sgMascPast); Foreign => mkVerb (imperfectiveActivePattern inf imperSgP2 (presentConjForeign del sgP1End) (pastConj sgMascPast)) (pastConj sgMascPast) diff --git a/resource/russian/NumeralRus.gf b/resource/russian/NumeralRus.gf index ce2647a8..c1900358 100644 --- a/resource/russian/NumeralRus.gf +++ b/resource/russian/NumeralRus.gf @@ -72,7 +72,8 @@ lin pot01 = lin pot0 d = {s = table {_ => d.s} ; size = d.size} ; lin pot110 = - {s = table {_ => gg "десять"} ; size = plg} ; + {s = table {_ => gg "десяти"} ; size = plg} ; +-- {s = table {_ => gg "десять"} ; size = plg} ; lin pot111 = {s = table {_ => gg "одиннадцать"} ; size = plg} ; --- 11 lin pot1to19 d = diff --git a/resource/russian/ParadigmsRus.gf b/resource/russian/ParadigmsRus.gf index 5357f415..6671635f 100644 --- a/resource/russian/ParadigmsRus.gf +++ b/resource/russian/ParadigmsRus.gf @@ -330,6 +330,7 @@ perfective: Aspect ; first = First ; firstE = FirstE ; second = Second ; +secondA = SecondA ; mixed = Mixed ; dolzhen = Dolzhen; foreign = Foreign; -- +++ MG_UR: added +++