diff --git a/src/bulgarian/CatBul.gf b/src/bulgarian/CatBul.gf index a9d7ca17a..fae79ac0f 100644 --- a/src/bulgarian/CatBul.gf +++ b/src/bulgarian/CatBul.gf @@ -83,9 +83,9 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV] ** open ResBul, Prelude, Predef, ( A = {s : AForm => Str; adv : Str; isPre : Bool} ; 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} ; - N3 = {s : NForm => Str; rel : AForm => Str; relPost : Bool; g : AGender} ** {c2,c3 : Preposition} ; + N = {s : NForm => Str; rel : AForm => Str; relType : NRelType; g : AGender} ; + N2 = {s : NForm => Str; rel : AForm => Str; relType : NRelType; g : AGender} ** {c2 : Preposition} ; + N3 = {s : NForm => Str; rel : AForm => Str; relType : NRelType; g : AGender} ** {c2,c3 : Preposition} ; PN = {s : Str; g : Gender} ; lindef @@ -105,9 +105,9 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV] ** open ResBul, Prelude, Predef, ( A = \s -> {s = \\_ => s; adv = s; isPre = True}; 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}}; - N3 = \s -> {s = \\_ => s; rel = \\_ => s; relPost = False; g = AMasc NonHuman; c2,c3 = {s=""; c=Acc}}; + N = \s -> {s = \\_ => s; rel = \\_ => s; relType = Pref; g = AMasc NonHuman}; + N2 = \s -> {s = \\_ => s; rel = \\_ => s; relType = Pref; g = AMasc NonHuman; c2 = {s=""; c=Acc}}; + N3 = \s -> {s = \\_ => s; rel = \\_ => s; relType = Pref; g = AMasc NonHuman; c2,c3 = {s=""; c=Acc}}; linref SSlash = \ss -> ss.s ! agrP3 (GSg Masc) ++ ss.c2.s; diff --git a/src/bulgarian/ConstructionBul.gf b/src/bulgarian/ConstructionBul.gf index 50fc7cbd1..619bc01b9 100644 --- a/src/bulgarian/ConstructionBul.gf +++ b/src/bulgarian/ConstructionBul.gf @@ -133,7 +133,7 @@ lin oper mkMonth : Str -> Str -> N = \n,a -> lin N { s = \\_ => n ; - rel = (mkA078 a).s ; relPost = False ; + rel = (mkA078 a).s ; relType = R.AdjMod ; g = R.AMasc R.NonHuman } ; } diff --git a/src/bulgarian/DocumentationBul.gf b/src/bulgarian/DocumentationBul.gf index fe8fe2308..6e617eb9e 100644 --- a/src/bulgarian/DocumentationBul.gf +++ b/src/bulgarian/DocumentationBul.gf @@ -31,24 +31,29 @@ lin tr (intagAttr "th" "colspan=\"2\"" "звателна форма" ++ td (n.s ! NFVocative)) ++ tr (intagAttr "th" "colspan=\"2\"" "бройна форма" ++ td (n.s ! NFPlCount)) ) ; - s3= heading1 ("Прилагателно") ++ - frameTable ( - tr (intagAttr "th" "rowspan=\"7\"" "ед.ч." ++ - intagAttr "th" "rowspan=\"3\"" "мн.ч." ++ - th "нечленувано" ++ - td (n.rel ! (ASg Masc Indef))) ++ - tr (th "непълен член" ++ td (n.rel ! (ASg Masc Def))) ++ - tr (th "пълен член" ++ td (n.rel ! ASgMascDefNom)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "ж.р." ++ - th "нечленувано" ++ td (n.rel ! (ASg Fem Indef))) ++ - tr (th "членувано" ++ td (n.rel ! (ASg Fem Def))) ++ - tr (intagAttr "th" "rowspan=\"2\"" "ср.р." ++ - th "нечленувано" ++ td (n.rel ! (ASg Neut Indef))) ++ - tr (th "членувано" ++ td (n.rel ! (ASg Neut Def))) ++ - tr (intagAttr "th" "colspan=\"2\" rowspan=\"2\"" "мн.ч." ++ - th "нечленувано" ++ td (n.rel ! (APl Indef))) ++ - tr (th "членувано" ++ td (n.rel ! (APl Def))) - ) + s3= case n.relType of { + Pref => [] ; + AdjMod => heading1 ("Прилагателно") ++ + frameTable ( + tr (intagAttr "th" "rowspan=\"7\"" "ед.ч." ++ + intagAttr "th" "rowspan=\"3\"" "мн.ч." ++ + th "нечленувано" ++ + td (n.rel ! (ASg Masc Indef))) ++ + tr (th "непълен член" ++ td (n.rel ! (ASg Masc Def))) ++ + tr (th "пълен член" ++ td (n.rel ! ASgMascDefNom)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "ж.р." ++ + th "нечленувано" ++ td (n.rel ! (ASg Fem Indef))) ++ + tr (th "членувано" ++ td (n.rel ! (ASg Fem Def))) ++ + tr (intagAttr "th" "rowspan=\"2\"" "ср.р." ++ + th "нечленувано" ++ td (n.rel ! (ASg Neut Indef))) ++ + tr (th "членувано" ++ td (n.rel ! (ASg Neut Def))) ++ + tr (intagAttr "th" "colspan=\"2\" rowspan=\"2\"" "мн.ч." ++ + th "нечленувано" ++ td (n.rel ! (APl Indef))) ++ + tr (th "членувано" ++ td (n.rel ! (APl Def))) + ) ; + AdvMod => heading1 ("Наречие") ++ + paragraph (n.rel ! (ASg Masc Def)) + } } ; InflectionN2,InflectionN3 = \n -> { diff --git a/src/bulgarian/ExtendBul.gf b/src/bulgarian/ExtendBul.gf index 69f728ef0..1033fed58 100644 --- a/src/bulgarian/ExtendBul.gf +++ b/src/bulgarian/ExtendBul.gf @@ -12,13 +12,14 @@ lin CompoundN n1 n2 = let comp : NForm => Str - = \\nf => case n1.relPost of { - True => n2.s ! nf ++ n1.rel ! nform2aform nf n2.g ; - False => n1.rel ! nform2aform nf n2.g ++ n2.s ! indefNForm nf + = \\nf => case n1.relType of { + Pref => n1.rel ! nform2aform nf n2.g ++ n2.s ! nf ; + AdjMod => n1.rel ! nform2aform nf n2.g ++ n2.s ! indefNForm nf ; + AdvMod => n2.s ! nf ++ n1.rel ! nform2aform nf n2.g } in { s = comp ; - rel = \\af => "на" ++ comp ! NF Sg Def ; relPost = True ; + rel = \\af => "на" ++ comp ! NF Sg Def ; relType = AdvMod ; g = n2.g } ; diff --git a/src/bulgarian/MorphoFunsBul.gf b/src/bulgarian/MorphoFunsBul.gf index 7f82f11ac..478d378ab 100644 --- a/src/bulgarian/MorphoFunsBul.gf +++ b/src/bulgarian/MorphoFunsBul.gf @@ -198,9 +198,9 @@ oper compoundN = overload { compoundN : Str -> N -> N - = \s,n -> {s = \\nform => s ++ n.s ! nform ; rel = \\aform => s ++ n.rel ! aform; relPost = True; g=n.g ; anim=n.anim ; lock_N = <>} ; + = \s,n -> {s = \\nform => s ++ n.s ! nform ; rel = \\aform => s ++ n.rel ! aform; relType = AdvMod; g=n.g ; anim=n.anim ; lock_N = <>} ; compoundN : N -> Str -> N - = \n,s -> {s = \\nform => n.s ! nform ++ s; rel = \\aform => n.rel ! aform ++ s; relPost = True; g=n.g ; anim=n.anim ; lock_N = <>} ; + = \n,s -> {s = \\nform => n.s ! nform ++ s; rel = \\aform => n.rel ! aform ++ s; relType = AdvMod; g=n.g ; anim=n.anim ; lock_N = <>} ; compoundN : N -> N -> N = \n1,n2 -> lin N {s = table { @@ -209,14 +209,14 @@ oper NFPlCount => n1.s ! NFPlCount ++ n2.s ! (NF Pl Indef) ; NFVocative => n1.s ! NFVocative ++ n2.s ! (NF Sg Indef) } ; - rel = \\aform => n1.rel ! aform; relPost = True; + rel = \\aform => n1.rel ! aform; relType = AdvMod; g = n1.g } ; compoundN : A -> N -> N = \a,n -> lin N {s = \\nf => (a.s ! nform2aform nf n.g) ++ (n.s ! (indefNForm nf)) ; rel = \\aform => a.s ! aform ++ n.rel ! indefAForm aform ; - relPost = False ; + relType = AdjMod ; g = n.g } ; } ; @@ -224,7 +224,7 @@ oper dualN = overload { dualN : N -> A -> N = \n,a -> lin N { s = n.s; - rel = a.s; relPost = False; + rel = a.s; relType = AdjMod; g = n.g } ; @@ -232,14 +232,14 @@ oper = \n,p -> lin N { s = n.s; rel = \\_ => linPrep p ++ n.s ! NF Sg Def ; - relPost = True; + relType = AdvMod; g = n.g } ; dualN : N -> Str -> N = \n,adv -> lin N { s = n.s; rel = \\_ => adv ; - relPost = True; + relType = AdvMod; g = n.g } @@ -250,7 +250,7 @@ oper substantiveN : A -> AGender -> N; substantiveN a g = lin N { s = \\nform => a.s ! nform2aform nform g; - rel = a.s; relPost = False; + rel = a.s; relType = AdjMod; g = g } ; diff --git a/src/bulgarian/NounBul.gf b/src/bulgarian/NounBul.gf index 9dce948e0..aa2784850 100644 --- a/src/bulgarian/NounBul.gf +++ b/src/bulgarian/NounBul.gf @@ -171,10 +171,10 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in { UseN2 noun = noun ; ComplN2 f x = {s = \\nf => f.s ! nf ++ f.c2.s ++ x.s ! RObj f.c2.c; g=f.g} ; - ComplN3 f x = {s = \\nf => f.s ! nf ++ f.c2.s ++ x.s ! RObj f.c2.c; rel = \\af => f.rel ! af ++ f.c2.s ++ x.s ! RObj f.c2.c; relPost = True; c2 = f.c3; g=f.g} ; + ComplN3 f x = {s = \\nf => f.s ! nf ++ f.c2.s ++ x.s ! RObj f.c2.c; rel = \\af => f.rel ! af ++ f.c2.s ++ x.s ! RObj f.c2.c; relType = AdvMod; c2 = f.c3; g=f.g} ; - Use2N3 f = {s = f.s ; rel = f.rel ; relPost = f.relPost ; g=f.g ; c2 = f.c2} ; - Use3N3 f = {s = f.s ; rel = f.rel ; relPost = f.relPost ; g=f.g ; c2 = f.c3} ; + Use2N3 f = {s = f.s ; rel = f.rel ; relType = f.relType ; g=f.g ; c2 = f.c2} ; + Use3N3 f = {s = f.s ; rel = f.rel ; relType = f.relType ; g=f.g ; c2 = f.c3} ; AdjCN ap cn = { diff --git a/src/bulgarian/ParadigmsBul.gf b/src/bulgarian/ParadigmsBul.gf index 7253379c6..e486b6d22 100644 --- a/src/bulgarian/ParadigmsBul.gf +++ b/src/bulgarian/ParadigmsBul.gf @@ -22,7 +22,7 @@ oper NFPlCount => base+"" ; NFVocative => base+"" } ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = AMasc NonHuman ; lock_N = <> } ; @@ -36,7 +36,7 @@ oper NFPlCount => base+"" ; NFVocative => base+"" } ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = AMasc Human ; lock_N = <> } ; @@ -53,7 +53,7 @@ oper NFPlCount => v0+""+v1+"" ; NFVocative => v0+""+v1 } ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> } ; @@ -70,7 +70,7 @@ oper NFPlCount => v0+""+v1+"" ; NFVocative => v0+""+v1 } ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> } ; @@ -87,7 +87,7 @@ oper NFPlCount => v0+""+v1+"" ; NFVocative => v0+""+v1 } ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> } ; @@ -99,7 +99,7 @@ oper (v0+"") (v0+"") g; - rel = \\_ => base; relPost = False; + rel = \\_ => base; relType = Pref; g = g ; lock_N = <> } ; @@ -111,7 +111,7 @@ oper (v0+"") (v0) g; - rel = \\_ => base; relPost = False; + rel = \\_ => base; relType = Pref; g = g ; lock_N = <> } ; @@ -123,7 +123,7 @@ oper (v0+"") (v0) g; - rel = \\_ => base; relPost = False; + rel = \\_ => base; relType = Pref; g = g ; lock_N = <> } ; @@ -137,7 +137,7 @@ oper NFPlCount => base+"" ; NFVocative => base+"" } ; - rel = \\_ => base; relPost = False; + rel = \\_ => base; relType = Pref; g = AMasc NonHuman; lock_N = <> } ; @@ -149,7 +149,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base; relPost = False; + rel = \\_ => base; relType = Pref; g = g ; lock_N = <> } ; @@ -163,7 +163,7 @@ oper NFPlCount => base+"" ; NFVocative => base+"" } ; - rel = (mkA078 (base+"")).s; relPost = False; + rel = (mkA078 (base+"")).s; relType = AdjMod; g = AMasc Human ; lock_N = <> } ; @@ -176,7 +176,7 @@ oper (v0+""+v1+"") (v0+""+v1+"") g ; - rel = \\_ => base; relPost = False; + rel = \\_ => base; relType = Pref; g = g ; lock_N = <> } ; @@ -189,7 +189,7 @@ oper (v0+""+v1+"") (v0+""+v1+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> } ; @@ -202,7 +202,7 @@ oper (v0+""+v1+"") (v0+v1+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> } ; @@ -214,7 +214,7 @@ oper (v0+"") (v0+"") g ; - rel = (mkA078 (v0+"")).s ; relPost = False; + rel = (mkA078 (v0+"")).s ; relType = AdjMod; g = g ; lock_N = <> } ; @@ -227,7 +227,7 @@ oper (v0+""+v1+"") (v0+v1+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> } ; @@ -239,7 +239,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> } ; @@ -251,7 +251,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -267,7 +267,7 @@ oper NFPlCount => v0+"" ; NFVocative => v0+"" } ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -279,7 +279,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -291,7 +291,7 @@ oper (v0+"") (v0+"") g ; - rel = (mkA078 (base+"")).s; relPost = False; + rel = (mkA078 (base+"")).s; relType = AdjMod; g = g ; lock_N = <> }; @@ -303,7 +303,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -315,7 +315,7 @@ oper (v0+"") (v0+"") g ; - rel = (mkA078 (v0+"")).s; relPost = False; + rel = (mkA078 (v0+"")).s; relType = AdjMod; g = g ; lock_N = <> }; @@ -327,7 +327,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -339,7 +339,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -351,7 +351,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -363,7 +363,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -375,7 +375,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -387,7 +387,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -400,7 +400,7 @@ oper (v0+"") (v0+""+v1+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -412,7 +412,7 @@ oper (v0+"") (v0+"") g ; - rel = (mkA078 (v0+"")).s; relPost = False; + rel = (mkA078 (v0+"")).s; relType = AdjMod; g = g ; lock_N = <> }; @@ -424,7 +424,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -437,7 +437,7 @@ oper (v0+""+v1+"") (v0+v1+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -449,7 +449,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -461,7 +461,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -473,7 +473,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -485,7 +485,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -497,7 +497,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -509,7 +509,7 @@ oper (v0+"") (v0+"") g ; - rel = (mkA078 (base+"")).s; relPost = False; + rel = (mkA078 (base+"")).s; relType = AdjMod; g = g ; lock_N = <> }; @@ -521,7 +521,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -533,7 +533,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -545,7 +545,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -557,7 +557,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -569,7 +569,7 @@ oper (v0+"") (v0+"") g ; - rel = (mkA078 (base+"")).s; relPost = False; + rel = (mkA078 (base+"")).s; relType = AdjMod; g = g ; lock_N = <> }; @@ -581,7 +581,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -593,7 +593,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -605,7 +605,7 @@ oper (v0+"") (v0+"") g ; - rel = (mkA078 (base+"")).s ; relPost = False ; + rel = (mkA078 (base+"")).s ; relType = AdjMod ; g = g ; lock_N = <> }; @@ -618,7 +618,7 @@ oper (v1+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -630,7 +630,7 @@ oper (v0+"") (v0+"") g ; - rel = (mkA078 (base+"")).s ; relPost = False ; + rel = (mkA078 (base+"")).s ; relType = AdjMod ; g = g ; lock_N = <> }; @@ -642,7 +642,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -654,7 +654,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -666,7 +666,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -678,7 +678,7 @@ oper (v0+"") (v0+"") g ; - rel = (mkA078 (base+"")).s ; relPost = False ; + rel = (mkA078 (base+"")).s ; relType = AdjMod ; g = g ; lock_N = <> }; @@ -690,7 +690,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -702,7 +702,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -715,7 +715,7 @@ oper (v0+"") g ; rel = (mkAdjective base (base+"") (base+"") base (base+"") base (base+"") (v0+"") (v0+"")).s ; - relPost = False ; + relType = AdjMod ; g = g ; lock_N = <> }; @@ -727,7 +727,7 @@ oper (v0+"") (v0+"o") g ; - rel = (mkA078 (v0+"")).s ; relPost = False ; + rel = (mkA078 (v0+"")).s ; relType = AdjMod ; g = g ; lock_N = <> }; @@ -739,7 +739,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -751,7 +751,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -763,7 +763,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -775,7 +775,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -787,7 +787,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -799,7 +799,7 @@ oper (v0) (v0) g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -812,7 +812,7 @@ oper (v0+""+v1+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -825,7 +825,7 @@ oper (v0+""+v1+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -837,7 +837,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -849,7 +849,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -861,7 +861,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -873,7 +873,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -885,7 +885,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -897,7 +897,7 @@ oper (v0+"") (v0) g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -909,7 +909,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -922,7 +922,7 @@ oper (v0+v1+"") (v0+""+v1) g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -934,7 +934,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -946,7 +946,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -959,7 +959,7 @@ oper (v0+""+v1+"") (v0+""+v1) g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -971,7 +971,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -983,7 +983,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -995,7 +995,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1008,7 +1008,7 @@ oper (v0+""+v1+"") (v0+""+v1+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1020,7 +1020,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1032,7 +1032,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1044,7 +1044,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1056,7 +1056,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1068,7 +1068,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1080,7 +1080,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1092,7 +1092,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1104,7 +1104,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g; lock_N = <> }; @@ -1116,7 +1116,7 @@ oper (v0+"") (v0) g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1128,7 +1128,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1140,7 +1140,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1152,7 +1152,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1164,7 +1164,7 @@ oper (v0+"") (v0) g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1176,7 +1176,7 @@ oper (v0+"") (v0) g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1188,7 +1188,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1200,7 +1200,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1212,7 +1212,7 @@ oper (v0+"") (v0) g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1226,7 +1226,7 @@ oper NFPlCount => v0 ; NFVocative => v0 } ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = ANeut ; lock_N = <> } ; @@ -1240,7 +1240,7 @@ oper NFPlCount => v0 ; NFVocative => v0 } ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = ANeut ; lock_N = <> } ; @@ -1252,7 +1252,7 @@ oper (v0+"") (v0+"") g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; @@ -1264,7 +1264,7 @@ oper nonExist (v0) g ; - rel = \\_ => base ; relPost = False ; + rel = \\_ => base ; relType = Pref ; g = g ; lock_N = <> }; diff --git a/src/bulgarian/ResBul.gf b/src/bulgarian/ResBul.gf index 13ce1c015..da5d50653 100644 --- a/src/bulgarian/ResBul.gf +++ b/src/bulgarian/ResBul.gf @@ -30,7 +30,9 @@ resource ResBul = ParamX ** open Prelude, Predef in { | NFPlCount | NFVocative ; - + + NRelType = Pref | AdjMod | AdvMod ; + NNumber = NNum Number | NCountable