diff --git a/src/bulgarian/CatBul.gf b/src/bulgarian/CatBul.gf index 0a73fdc07..0304cb282 100644 --- a/src/bulgarian/CatBul.gf +++ b/src/bulgarian/CatBul.gf @@ -74,8 +74,8 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv,SC] ** open ResBul, Prelude, Prede -- Open lexical classes, e.g. Lexicon V, VS, VQ, VA = Verb ; - V2, V2A = Verb ** {c2 : Preposition} ; - V2V, V2S, V2Q = Verb ** {c2, c3 : Preposition} ; --- AR + V2 = Verb ** {c2 : Preposition} ; + V2A, V2V, V2S, V2Q = Verb ** {c2, c3 : Preposition} ; V3 = Verb ** {c2, c3 : Preposition} ; VV = Verb ** {typ : VVType}; @@ -95,8 +95,8 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv,SC] ** open ResBul, Prelude, Prede VPSlash = \s -> slashV {s = \\_,_ => s; vtype = VNormal} {s=""; c=Acc}; V, VS, VQ, VA = \s -> {s = \\_,_ => s; vtype = VNormal}; - V2, V2A = \s -> {s = \\_,_ => s; vtype = VNormal; c2 = {s=""; c=Acc}}; - V2V, V2S, V2Q = \s -> {s = \\_,_ => s; vtype = VNormal; c2,c3 = {s=""; c=Acc}}; + V2 = \s -> {s = \\_,_ => s; vtype = VNormal; c2 = {s=""; c=Acc}}; + V2A, V2V, V2S, V2Q = \s -> {s = \\_,_ => s; vtype = VNormal; c2,c3 = {s=""; c=Acc}}; V3 = \s -> {s = \\_,_ => s; vtype = VNormal; c2,c3 = {s=""; c=Acc}}; VV = \s -> {s = \\_,_ => s; vtype = VNormal; typ = VVInf}; @@ -128,9 +128,9 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv,SC] ** open ResBul, Prelude, Prede } ; V, VS, VQ, VA = \v -> linrefVP (predV v); - V2, V2A = \v -> linrefVP (predV v) ++ v.c2.s; + V2 = \v -> linrefVP (predV v) ++ v.c2.s; V2V = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s ++ "да"; - V2S, V2Q = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s; + V2A, V2S, V2Q = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s; V3 = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s; VV = \v -> linrefVP (predV v); diff --git a/src/bulgarian/MorphoFunsBul.gf b/src/bulgarian/MorphoFunsBul.gf index 465a5f609..1221c566d 100644 --- a/src/bulgarian/MorphoFunsBul.gf +++ b/src/bulgarian/MorphoFunsBul.gf @@ -128,9 +128,14 @@ oper mkV2V : V -> Prep -> Prep -> V2V ; mkV2V v p t = prepV2 v p ** {c3 = t ; lock_V2V = <>} ; - mkV2A : V -> Prep -> V2A ; - mkV2A v p = prepV2 v p ** {lock_V2A = <>} ; + mkV2A = overload { + mkV2A : V -> Prep -> V2A + = \v, p -> prepV2 v p ** {c3 = noPrep ; lock_V2A = <>} ; + mkV2A : V -> Prep -> Prep -> V2A + = \v, p, t -> prepV2 v p ** {c3 = t ; lock_V2A = <>} ; + } ; + mkV2Q : V -> Prep -> Prep -> V2Q ; mkV2Q v p t = prepV2 v p ** {c3 = t ; lock_V2Q = <>} ; diff --git a/src/bulgarian/VerbBul.gf b/src/bulgarian/VerbBul.gf index c7181bac7..5cb8ba190 100644 --- a/src/bulgarian/VerbBul.gf +++ b/src/bulgarian/VerbBul.gf @@ -31,7 +31,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in { SlashV2A v ap = - insertSlashObj2 (\\a => ap.s ! aform a.gn Indef (RObj Acc) ! a.p) Pos (slashV v v.c2) ; + insertSlashObj2 (\\a => v.c3.s ++ ap.s ! aform a.gn Indef (RObj Acc) ! a.p) Pos (slashV v v.c2) ; -- test: I saw a boy to whom she said that they are here SlashV2S v s = insertSlashObj2 (\\_ => comma ++ "÷å" ++ s.s) Pos (slashV v v.c2) ;