store the accusative as well as the dative clitics in Bulgarian

lib/src/bulgarian/CatBul.gf

@@ -51,7 +51,7 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv] ** open ResBul, Prelude, Predef,
 
     CN = {s : NForm => Str; g : AGender} ;
     NP = {s : Role => Str; a : Agr; p : Polarity} ;
-    Pron = {s : Role => Str; gen : AForm => Str; a : Agr} ;
+    Pron = {s : Role => Str; clit : Case => Str; gen : AForm => Str; a : Agr} ;
     Det = {s : Bool => AGender => Role => Str; nn : NNumber; spec : Species; p : Polarity} ;
     Predet = {s : GenNum => Str} ;
     Ord = {s : AForm => Str} ;

lib/src/bulgarian/ExtraBul.gf

@@ -31,8 +31,8 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
       role = RObj Acc
       } ;
 
-    i8fem_Pron  = mkPron "àç" "ìåí" "ìè" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Fem)  P1 ;
+    i8fem_Pron  = mkPron "àç" "ìåí" "ìå" "ìè" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Fem)  P1 ;
-    i8neut_Pron = mkPron "àç" "ìåí" "ìè" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Neut) P1 ;
+    i8neut_Pron = mkPron "àç" "ìåí" "ìå" "ìè" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Neut) P1 ;
     
     whatSg8fem_IP  = mkIP "êàêâà" "êàêâà" (GSg Fem) ;
     whatSg8neut_IP = mkIP "êàêâî" "êàêâî" (GSg Neut) ;
@@ -40,8 +40,8 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
     whoSg8fem_IP  = mkIP "êîÿ" "êîãî" (GSg Fem) ;
     whoSg8neut_IP = mkIP "êîå" "êîãî" (GSg Neut) ;
     
-    youSg8fem_Pron  = mkPron "òè" "òåá" "òè" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg Fem) P2 ;
+    youSg8fem_Pron  = mkPron "òè" "òåá" "òå" "òè" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg Fem) P2 ;
-    youSg8neut_Pron = mkPron "òè" "òåá" "òè" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg Neut) P2 ;
+    youSg8neut_Pron = mkPron "òè" "òåá" "òå" "òè" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg Neut) P2 ;
 
     onePl_Num = {s = table {
                        CFMasc Indef _ | CFFem Indef | CFNeut Indef            => "åäíè" ;

lib/src/bulgarian/ResBul.gf

@@ -641,14 +641,23 @@ resource ResBul = ParamX ** open Prelude, Predef in {
       gn = gn
       } ;
 
-    mkPron : (az,men,mi,moj,moia,moiat,moia_,moiata,moe,moeto,moi,moite : Str) -> GenNum -> Person -> {s : Role => Str; gen : AForm => Str; a : Agr} =
+    mkPron : (az,men,me,mi,moj,moia,moiat,moia_,moiata,moe,moeto,moi,moite : Str) -> 
-      \az,men,mi,moj,moia,moiat,moia_,moiata,moe,moeto,moi,moite,gn,p -> {
+             GenNum -> Person -> {s    : Role => Str; 
+                                  clit : Case => Str;
+                                  gen  : AForm => Str; 
+                                  a : Agr
+                                 } =
+      \az,men,me,mi,moj,moia,moiat,moia_,moiata,moe,moeto,moi,moite,gn,p -> {
       s = table {
             RSubj    => az ;
             RObj Acc => men ;
-            RObj Dat => mi ;
+            RObj Dat => "íà" ++ men ;
             RVoc     => az
           } ;
+      clit = table {
+               Acc => me;
+               Dat => mi
+             } ;
       gen = table {
               ASg Masc Indef => moj ;
               ASg Masc Def   => moia ;

lib/src/bulgarian/StructuralBul.gf

@@ -34,7 +34,7 @@ concrete StructuralBul of Structural = CatBul **
 ---  first_Ord = ss "first" ; DEPRECATED
   for_Prep = mkPrep "çà" Acc ;
   from_Prep = mkPrep "îò" Acc ;
-  he_Pron = mkPron "òîé" "íåãî" "ìó" "íåãîâ" "íåãîâèÿ" "íåãîâèÿò" "íåãîâà" "íåãîâàòà" "íåãîâî" "íåãîâîòî" "íåãîâè" "íåãîâèòå" (GSg Masc) P3 ;
+  he_Pron = mkPron "òîé" "íåãî" "ãî" "ìó" "íåãîâ" "íåãîâèÿ" "íåãîâèÿò" "íåãîâà" "íåãîâàòà" "íåãîâî" "íåãîâîòî" "íåãîâè" "íåãîâèòå" (GSg Masc) P3 ;
   here_Adv = ss "òóê" ;
   here7to_Adv = ss ["äî òóê"] ;
   here7from_Adv = ss ["îò òóê"] ;
@@ -43,11 +43,11 @@ concrete StructuralBul of Structural = CatBul **
   how8many_IDet = {s = \\_ => table QForm ["êîëêî";"êîëêîòî"]; n = Pl; nonEmpty = False} ;
   if_Subj = ss "àêî" ;
   in8front_Prep = mkPrep "ïðåä" Acc ;
-  i_Pron  = mkPron "àç" "ìåí" "ìè" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Masc) P1 ;
+  i_Pron  = mkPron "àç" "ìåí" "ìå" "ìè" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Masc) P1 ;
   in_Prep = mkPrep (pre { "â" ; 
                           "âúâ" / strs {"â" ; "ô" ; "Â" ; "Ô"}
                         }) Acc ;
-  it_Pron  = mkPron "òî" "íåãî" "ìó" "íåãîâ" "íåãîâèÿ" "íåãîâèÿò" "íåãîâà" "íåãîâàòà" "íåãîâî" "íåãîâîòî" "íåãîâè" "íåãîâèòå" (GSg Neut) P3 ;
+  it_Pron  = mkPron "òî" "íåãî" "ãî" "ìó" "íåãîâ" "íåãîâèÿ" "íåãîâèÿò" "íåãîâà" "íåãîâàòà" "íåãîâî" "íåãîâîòî" "íåãîâè" "íåãîâèòå" (GSg Neut) P3 ;
   less_CAdv = {s="íå"; sn="ïî-ìàëêî"} ;
   many_Det = mkDeterminerPl "ìíîãî" ;
   more_CAdv = {s=[]; sn="ïîâå÷å"} ;
@@ -81,7 +81,7 @@ concrete StructuralBul of Structural = CatBul **
   please_Voc = ss "ìîëÿ" ;
   possess_Prep = mkPrep [] Dat ;
   quite_Adv = ss "äîñòà" ;
-  she_Pron = mkPron "òÿ" "íåÿ" "è" "íåèí" "íåéíèÿ" "íåéíèÿò" "íåéíà" "íåéíàòà" "íåéíî" "íåéíîòî" "íåéíè" "íåéíèòå" (GSg Fem) P3 ;
+  she_Pron = mkPron "òÿ" "íåÿ" "ÿ" "è" "íåèí" "íåéíèÿ" "íåéíèÿò" "íåéíà" "íåéíàòà" "íåéíî" "íåéíîòî" "íåéíè" "íåéíèòå" (GSg Fem) P3 ;
   so_AdA = ss "òîëêîâà" ;
   somebody_NP = mkNP "íÿêîé" (GSg Masc) P3 Pos;
   someSg_Det = mkDeterminerSg "íÿêîé" "íÿêîÿ" "íÿêîå" ;
@@ -94,7 +94,7 @@ concrete StructuralBul of Structural = CatBul **
   there7to_Adv = ss ["äî òàì"] ;
   there7from_Adv = ss ["îò òàì"] ;
   therefore_PConj = ss ["òàêà ÷å"] ;
-  they_Pron = mkPron "òå" "òÿõ" "èì" "òåõåí" "òåõíèÿ" "òåõíèÿò" "òÿõíà" "òÿõíàòà" "òÿõíî" "òÿõíîòî" "òåõíè" "òåõíèòå" GPl P3 ; 
+  they_Pron = mkPron "òå" "òÿõ" "ãè" "èì" "òåõåí" "òåõíèÿ" "òåõíèÿò" "òÿõíà" "òÿõíàòà" "òÿõíî" "òÿõíîòî" "òåõíè" "òåõíèòå" GPl P3 ; 
   this_Quant = mkQuant "òîçè" "òàçè" "òîâà" "òåçè" ;
   through_Prep = mkPrep "ïðåç" Acc ;
   too_AdA = ss "ïðåêàëåíî" ;
@@ -102,7 +102,7 @@ concrete StructuralBul of Structural = CatBul **
   under_Prep = mkPrep "ïîä" Acc ;
   very_AdA = ss "ìíîãî" ;
   want_VV = mkVV (stateV (mkV186 "èñêàì")) ;
-  we_Pron = mkPron "íèå" "íàñ" "íè" "íàø" "íàøèÿ" "íàøèÿò" "íàøà" "íàøàòà" "íàøå" "íàøåòî" "íàøè" "íàøèòå" GPl P1 ;
+  we_Pron = mkPron "íèå" "íàñ" "íè" "íè" "íàø" "íàøèÿ" "íàøèÿò" "íàøà" "íàøàòà" "íàøå" "íàøåòî" "íàøè" "íàøèòå" GPl P1 ;
   whatPl_IP = mkIP "êàêâè" "êàêâè" GPl ;
   whatSg_IP = mkIP "êàêúâ" "êàêúâ" (GSg Masc) ;
   when_IAdv = mkIAdv "êîãà" ;
@@ -120,9 +120,9 @@ concrete StructuralBul of Structural = CatBul **
                             "ñúñ" / strs {"ñ" ; "ç" ; "Ñ" ; "Ç"}
                           }) Acc ;
   yes_Utt = ss "äà" ;
-  youSg_Pron = mkPron "òè" "òåá" "òè" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg Masc) P2 ;
+  youSg_Pron = mkPron "òè" "òåá" "òå" "òè" "òâîé" "òâîÿ" "òâîÿò" "òâîÿ" "òâîÿòà" "òâîå" "òâîåòî" "òâîè" "òâîèòå" (GSg Masc) P2 ;
-  youPl_Pron = mkPron "âèå" "âàñ" "âè" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl P2 ;
+  youPl_Pron = mkPron "âèå" "âàñ" "âè" "âè" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl P2 ;
-  youPol_Pron = mkPron "âèå" "âàñ" "âè" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl P2 ;
+  youPol_Pron = mkPron "âèå" "âàñ" "âè" "âè" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl P2 ;
 
   have_V2 = dirV2 (stateV (mkV186 "èìàì")) ;
 

lib/src/translator/DictionaryBul.gf

@@ -1,4 +1,4 @@
-concrete DictionaryBul of Dictionary = CatBul ** open MorphoBul, ResBul, (S = StructuralBul), ParadigmsBul, Prelude in {
+concrete DictionaryBul of Dictionary = CatBul ** open MorphoBul, ResBul, (S = StructuralBul), (E = ExtraBul), ParadigmsBul, Prelude in {
 
 flags
   coding=utf8 ;
@@ -26181,7 +26181,7 @@ lin hazel_PN = mkPN "Хазел" Masc;
 lin hazelnut_N = dualN (mkN014 "лешник") (mkA076 "лешников");
 lin haziness_N = variants {mkN049 "мъгливост"; mkN049 "мъглявост"}; ----
 lin hazy_A = variants {mkA076 "мъглив"; mkA079 "смътен"}; ----
-lin he_Pron = mkPron "той" "него" "му" "негов" "неговия" "неговият" "негова" "неговата" "негово" "неговото" "негови" "неговите" (GSg Masc) P3;
+lin he_Pron = S.he_Pron;
 lin he_goat_N = mkN008 "козел";
 lin he_man_N = variants {};
 lin head_A = mkA079 "главен" ;
@@ -28064,8 +28064,8 @@ lin hysterosalpingogram_N = mkN047 "хистеросалпингография";
 lin hysteroscopy_N = mkN047 "хистероскопия";
 lin hysterotomy_N = mkN039 "хистеротомия";
 lin hythe_PN = mkPN "Хитхе" Masc;
-lin i_Pron = mkPron "аз" "мен" "ми" "мой" "моя" "моят" "моя" "моята" "мое" "моето" "мои" "моите" (GSg Masc) P1;
+lin i_Pron = S.i_Pron;
-lin iFem_Pron = mkPron "аз" "мен" "ми" "мой" "моя" "моят" "моя" "моята" "мое" "моето" "мои" "моите" (GSg Fem) P1;
+lin iFem_Pron = E.i8fem_Pron;
 lin i_e__Adv = variants {};
 lin iamb_N = mkN001 "ямб";
 lin iambic_A = mkA079 "ямбичен";
@@ -30323,7 +30323,7 @@ lin issuer_N = mkN007 "емитент";
 lin istanbul_PN = mkPN "Истанбул" Masc;
 lin isthmian_A = variants {};
 lin isthmus_N = mkN014 "провлак"; ----
-lin it_Pron = mkPron "то" "него" "му" "негов" "неговия" "неговият" "негова" "неговата" "негово" "неговото" "негови" "неговите" (GSg Neut) P3 ;
+lin it_Pron = S.it_Pron;
 lin italian_A = mkA078 "италиански";
 lin italianMasc_N = dualN (mkN008a "италианец") (mkA078 "италиански");
 lin italianFem_N = dualN (mkN041 "италианка") (mkA078 "италиански");
@@ -51697,7 +51697,7 @@ lin shavian_N = mkN065 "шоу";
 lin shaving_brush_N = variants {};
 lin shawl_N = mkN001 "шал" ;
 lin shawm_N = variants {};
-lin she_Pron = mkPron "тя" "нея" "и" "неин" "нейния" "нейният" "нейна" "нейната" "нейно" "нейното" "нейни" "нейните" (GSg Fem) P3;
+lin she_Pron = S.she_Pron;
 lin she_goat_N = variants {};
 lin sheaf_N = mkN007 "сноп" ;
 lin shear_N = mkN071 "срязване";
@@ -58430,8 +58430,8 @@ lin thessaloniki_PN = mkPN "Тесалоники" Masc;
 lin theta_N = mkN074 "тета";
 lin thetford_PN = mkPN "Тетфорд" Masc;
 lin theurgy_N = mkN047 "магия"; ----
-lin theyFem_Pron = mkPron "те" "тях" "им" "техен" "техния" "техният" "тяхна" "тяхната" "тяхно" "тяхното" "техни" "техните" GPl P3;
+lin theyFem_Pron = S.they_Pron;
-lin they_Pron = mkPron "те" "тях" "им" "техен" "техния" "техният" "тяхна" "тяхната" "тяхно" "тяхното" "техни" "техните" GPl P3;
+lin they_Pron = S.they_Pron;
 lin thiabendazole_N = mkN007 "тиабендазол";
 lin thiazide_N = mkN033 "тиазиден";
 lin thiazine_N = mkN007 "тиазин";
@@ -64064,8 +64064,8 @@ lin ways_N = mkN007 "начин" ; ----
 lin wayside_N = variants {};
 lin wayward_A = variants {mkA076 "дръпнат"; mkA079 "капризен"; mkA079 "своенравен"}; ----
 lin wc_N = mkN041 "тоалетна";
-lin weFem_Pron = mkPron "ние" "нас" "ни" "наш" "нашия" "нашият" "наша" "нашата" "наше" "нашето" "наши" "нашите" GPl P1;
+lin weFem_Pron = S.we_Pron;
-lin we_Pron = mkPron "ние" "нас" "ни" "наш" "нашия" "нашият" "наша" "нашата" "наше" "нашето" "наши" "нашите" GPl P1;
+lin we_Pron = S.we_Pron;
 lin weak_A = mkA076 "слаб" ;
 lin weak_kneed_A = variants {};
 lin weaken_V = dualV (mkV186 "отслабвам") (mkV173 "отслабя");
@@ -65496,12 +65496,12 @@ lin yorkley_PN = mkPN "Йоркли" Masc;
 lin yorkshire_PN = mkPN "Йоркшир" Masc;
 lin yottabit_N = variants {};
 lin yottabyte_N = variants {};
-lin youPl_Pron = mkPron "вие" "вас" "ви" "ваш" "вашия" "вашият" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" GPl P2;
+lin youPl_Pron = S.youPl_Pron;
-lin youPlFem_Pron = mkPron "вие" "вас" "ви" "ваш" "вашия" "вашият" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" GPl P2;
+lin youPlFem_Pron = S.youPl_Pron;
-lin youPol_Pron = mkPron "вие" "вас" "ви" "ваш" "вашия" "вашият" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" GPl P2;
+lin youPol_Pron = S.youPol_Pron;
-lin youPolFem_Pron = mkPron "вие" "вас" "ви" "ваш" "вашия" "вашият" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" GPl P2;
+lin youPolFem_Pron = S.youPol_Pron;
-lin youSg_Pron = mkPron "ти" "теб" "ти" "твой" "твоя" "твоят" "твоя" "твоята" "твое" "твоето" "твои" "твоите" (GSg Masc) P2;
+lin youSg_Pron = S.youSg_Pron;
-lin youSgFem_Pron = mkPron "ти" "теб" "ти" "твой" "твоя" "твоят" "твоя" "твоята" "твое" "твоето" "твои" "твоите" (GSg Masc) P2;
+lin youSgFem_Pron = E.youSg8fem_Pron;
 lin young_A = mkA076 "млад" ;
 lin young_N = dualN (mkN042 "младеж") (mkA078 "младежки");
 lin younger_A = mkA078 "младши"; ----