diff --git a/src/russian/DictRus.gf b/src/russian/DictRus.gf index 83b5e68a7..93ba627ca 100644 --- a/src/russian/DictRus.gf +++ b/src/russian/DictRus.gf @@ -2975,4 +2975,8 @@ lin shshsh_Interj = mkInterj "ш-ш-ш" ; uh_Interj = mkInterj "ух" ; + skoree_Adv = mkAdv skoryj_A.comp ; + skoro_Adv = mkAdv skoryj_A.sn ; + skoraja_N = mkN skoryj_A feminine inanimate ; + } \ No newline at end of file diff --git a/src/russian/DictRusAbs.gf b/src/russian/DictRusAbs.gf index 031383235..97ad19368 100644 --- a/src/russian/DictRusAbs.gf +++ b/src/russian/DictRusAbs.gf @@ -2959,4 +2959,8 @@ fun shshsh_Interj : Interj; shshsh_Interj : Interj; uh_Interj : Interj; + + skoree_Adv : Adv ; + skoro_Adv : Adv ; + skoraja_N : N ; } \ No newline at end of file diff --git a/src/russian/ExtraRus.gf b/src/russian/ExtraRus.gf index 4ff4d874a..2f43e820b 100644 --- a/src/russian/ExtraRus.gf +++ b/src/russian/ExtraRus.gf @@ -1,7 +1,7 @@ -- Seems like this is deprecated - need to use ExtendRus instead concrete ExtraRus of ExtraRusAbs = CatRus ** - open ResRus, MorphoRus, (P=ParadigmsRus), Prelude, NounRus in { + open ResRus, MorphoRus, (P=ParadigmsRus), (X = ConstructX), Prelude, NounRus in { flags optimize=all ; coding=utf8 ; lin obj_no_Prep = {s="" ; c=Acc ; neggen=True ; hasPrep=False} ; @@ -99,6 +99,8 @@ lin have_not_V3 = P.mkV3 net_V obj_neg_Prep u_Prep; be_V3 = P.mkV3 be_ell_V nom_Prep dat_Prep; + rather_CAdv = X.mkCAdv "скорее" "чем" ; + -- : A -> A -> A ; CompoundA a1 a2 = mkCompoundA a1 "-" a2 ; diff --git a/src/russian/ExtraRusAbs.gf b/src/russian/ExtraRusAbs.gf index 552f68786..88c11d987 100644 --- a/src/russian/ExtraRusAbs.gf +++ b/src/russian/ExtraRusAbs.gf @@ -79,5 +79,7 @@ fun nechto_NP : NP ; anybody_NP : NP ; + rather_CAdv : CAdv ; + CompoundA : A -> A -> A ; } diff --git a/src/russian/test_rus_grammar.gfs b/src/russian/test_rus_grammar.gfs index 2ed960e17..f2683cf6f 100644 --- a/src/russian/test_rus_grammar.gfs +++ b/src/russian/test_rus_grammar.gfs @@ -124,6 +124,10 @@ gt TFullStop (PhrUtt NoPConj (UttS (UseCl (TTAnt TFut AAnter) PPos (PredVP (UseP gt UseCl (TTAnt TPast ASimul) PPos (PredVP (MassNP (UseN boy_N)) (AdvVP (UseV fly_V) (PrepCN on_Prep (UseN (CompoundN carpet_N airplane_N))))) |l -treebank gt UseQCl ? ? (QuestIAdv how8much_IAdv (PredVP ( DetCN (DetQuant this_Quant NumSg) (UseN woman_N)) (UseV walk_V))) | l -treebank +gt UseCl (TTAnt TPres ASimul) PPos (PredVP (AdvNP (UsePron he_Pron) ( PositAdvAdj correct_A )) (UseV fall_V)) | l -treebank +gt UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron she_Pron) (ComplVA become_VA (AdAP (PositAdAAdj clean_A) (PositA old_A))))) | l -treebank +gt UttAdv (ComparAdvAdj rather_CAdv warm_A (UsePron he_Pron)) | l -treebank -unlextext + gt UseCl ? ? (married_Cl (MassNP (UseN man_N)) (MassNP (UseN woman_N))) |l -treebank gt UseCl ? ? (married_Cl (MassNP (UseN woman_N)) (MassNP (UseN man_N))) |l -treebank gt UseCl ? ? (married_Cl ((DetCN (DetQuant (PossPron i_Pron) NumPl)) (UseN man_N)) (MassNP (UseN woman_N))) |l -treebank