diff --git a/src/bulgarian/AdjectiveBul.gf b/src/bulgarian/AdjectiveBul.gf index 9480889f8..d73efab06 100644 --- a/src/bulgarian/AdjectiveBul.gf +++ b/src/bulgarian/AdjectiveBul.gf @@ -30,12 +30,12 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in { } ; ComplA2 a np = { - s = \\aform,p => a.s ! aform ++ a.c2 ++ np.s ! RObj CPrep ; + s = \\aform,p => a.s ! aform ++ a.c2.s ++ np.s ! RObj a.c2.c ; isPre = False } ; ReflA2 a = { - s = \\aform,_ => a.s ! aform ++ a.c2 ++ ["себе си"] ; + s = \\aform,_ => a.s ! aform ++ linPrep a.c2 ++ ["себе си"] ; isPre = False } ; diff --git a/src/bulgarian/CatBul.gf b/src/bulgarian/CatBul.gf index ff9dae153..3a323bcb9 100644 --- a/src/bulgarian/CatBul.gf +++ b/src/bulgarian/CatBul.gf @@ -81,7 +81,7 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef VV = Verb ** {typ : VVType}; A = {s : AForm => Str; adv : Str; isPre : Bool} ; - A2 = {s : AForm => Str; adv : Str; c2 : Str} ; + A2 = {s : AForm => Str; adv : Str; c2 : Preposition} ; N = {s : NForm => Str; rel : AForm => Str; relPost : Bool; g : AGender} ; N2 = {s : NForm => Str; rel : AForm => Str; relPost : Bool; g : AGender} ** {c2 : Preposition} ; @@ -103,7 +103,7 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef VV = \s -> {s = \\_,_ => s; vtype = VNormal; typ = VVInf Perf}; A = \s -> {s = \\_ => s; adv = s; isPre = True}; - A2 = \s -> {s = \\_ => s; adv = s; c2 = ""}; + A2 = \s -> {s = \\_ => s; adv = s; c2 = {s=""; c=Acc}}; N = \s -> {s = \\_ => s; rel = \\_ => s; relPost = False; g = AMasc NonHuman}; N2 = \s -> {s = \\_ => s; rel = \\_ => s; relPost = False; g = AMasc NonHuman; c2 = {s=""; c=Acc}}; @@ -141,7 +141,7 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef Prep = linPrep ; A = \a -> a.s ! ASg Masc Indef; - A2 = \a -> a.s ! ASg Masc Indef ++ a.c2; + A2 = \a -> a.s ! ASg Masc Indef ++ linPrep a.c2; N = \n -> n.s ! NF Sg Indef; N2 = \n -> n.s ! NF Sg Indef ++ linPrep n.c2; diff --git a/src/bulgarian/MorphoFunsBul.gf b/src/bulgarian/MorphoFunsBul.gf index 39b9fb81d..7b363594f 100644 --- a/src/bulgarian/MorphoFunsBul.gf +++ b/src/bulgarian/MorphoFunsBul.gf @@ -30,7 +30,7 @@ oper A2V : Type = A2 ; mkA2 : A -> Prep -> A2 ; - mkA2 a p = a ** {c2 = p.s ; lock_A2 = <>} ; + mkA2 a p = a ** {c2 = p ; lock_A2 = <>} ; mkAS : A -> AS ; mkAS v = v ** {lock_A = <>} ;