diff --git a/lib/resource/bulgarian/CatBul.gf b/lib/resource/bulgarian/CatBul.gf index 9ccbe45ad..c294ad7b4 100644 --- a/lib/resource/bulgarian/CatBul.gf +++ b/lib/resource/bulgarian/CatBul.gf @@ -41,7 +41,8 @@ concrete CatBul of Cat = CommonX ** open ResBul, Prelude in { NP = {s : Case => Str; a : Agr} ; Pron = {s : Case => Str; gen : AForm => Str; a : Agr} ; Det = {s : DGender => Case => Str ; n : Number; countable : Bool; spec : Species} ; - Predet, Ord = {s : AForm => Str; nonEmpty : Bool} ; + Predet = {s : GenNum => Str} ; + Ord = {s : AForm => Str; nonEmpty : Bool} ; Num = {s : DGenderSpecies => Str; n : Number; nonEmpty : Bool} ; Quant = {s : GenNum => Str; spec : Species} ; diff --git a/lib/resource/bulgarian/NounBul.gf b/lib/resource/bulgarian/NounBul.gf index 11170b7c0..61fccaff3 100644 --- a/lib/resource/bulgarian/NounBul.gf +++ b/lib/resource/bulgarian/NounBul.gf @@ -21,6 +21,16 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in { UsePN pn = {s = \\_ => pn.s; a = {gn = GSg pn.g; p = P3}} ; UsePron p = {s = p.s; a=p.a} ; + PredetNP pred np = { + s = \\c => pred.s ! np.a.gn ++ np.s ! c ; + a = np.a + } ; + + PPartNP np v2 = { + s = \\c => np.s ! c ++ v2.s ! VPassive (aform np.a.gn Indef c) ; + a = np.a + } ; + DetSg quant ord = { s = \\g,c => quant.s ! gennum g Sg ++ ord.s ! aform (gennum g Sg) quant.spec c ; diff --git a/lib/resource/bulgarian/StructuralBul.gf b/lib/resource/bulgarian/StructuralBul.gf index 6b19968b4..57dc4c8cc 100644 --- a/lib/resource/bulgarian/StructuralBul.gf +++ b/lib/resource/bulgarian/StructuralBul.gf @@ -6,9 +6,9 @@ concrete StructuralBul of Structural = CatBul ** lin above_Prep = ss "над" ; after_Prep = ss "след" ; -{- all_Predet = ss "all" ; - almost_AdA, almost_AdN = ss "almost" ; - although_Subj = ss "although" ; + all_Predet = {s = table GenNum ["всичкия";"всичката";"всичкото";"всичките"]} ; + almost_AdA, almost_AdN = ss "почти" ; +{- although_Subj = ss "although" ; always_AdV = ss "always" ; and_Conj = ss "and" ** {n = Pl} ; -} @@ -65,10 +65,8 @@ concrete StructuralBul of Structural = CatBul ** it_Pron = mkNP "то" "него" "негов" "неговия" "неговият" "негова" "неговата" "негово" "неговото" "негови" "неговите" (GSg Neut) P3 ; less_CAdv = ss "помалко" ; many_Det = mkDeterminerPl "много" ; - more_CAdv = ss "повече" ; -{- - most_Predet = ss "most" ; --} + more_CAdv = ss "още" ; + most_Predet = {s = \\_ => "повечето"} ; much_Det = mkDeterminerSg "много" "много" "много"; {- must_VV = { @@ -86,9 +84,9 @@ concrete StructuralBul of Structural = CatBul ** -} no_Phr = ss "не" ; on_Prep = ss "на" ; -{- ---- one_Quant = mkDeterminer Sg "one" ; -- DEPRECATED - only_Predet = ss "only" ; + only_Predet = {s = \\_ => "само"} ; +{- or_Conj = ss "or" ** {n = Sg} ; otherwise_PConj = ss "otherwise" ; -}