diff --git a/lib/src/bulgarian/CatBul.gf b/lib/src/bulgarian/CatBul.gf index 27b620231..b0b5ea718 100644 --- a/lib/src/bulgarian/CatBul.gf +++ b/lib/src/bulgarian/CatBul.gf @@ -76,7 +76,7 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv] ** open ResBul, Prelude, Predef, V, VS, VQ, VA = Verb ; V2, V2A = Verb ** {c2 : Preposition} ; - V2V, V2S, V2Q = Verb ** {c2 : Preposition} ; --- AR + V2V, V2S, V2Q = Verb ** {c2, c3 : Preposition} ; --- AR V3 = Verb ** {c2, c3 : Preposition} ; VV = Verb ** {typ : VVType}; diff --git a/lib/src/bulgarian/DictEngBul.gf b/lib/src/bulgarian/DictEngBul.gf index b72fae99b..2282cf71a 100644 --- a/lib/src/bulgarian/DictEngBul.gf +++ b/lib/src/bulgarian/DictEngBul.gf @@ -309,7 +309,7 @@ lin acquiescence_N = variants {}; lin acquiescent_A = variants {}; lin acquire_V2 = dirV2 (actionV (mkV186 "придобивам") (mkV163 "придобия")); lin acquirement_N = mkN071 "придобиване"; -lin acquisition_N = mkN071 "набавяне" ; +lin acquisition_N = mkN071 "придобиване"; lin acquisitive_A = variants {}; lin acquit_V2 = variants {}; lin acquittal_N = variants {}; @@ -1459,6 +1459,7 @@ lin anyPl_Det = variants {}; lin anySg_Det = variants {}; lin anybody_NP = variants {}; lin anyhow_Adv = variants {}; +lin anymore_Adv = variants {}; lin anyone_NP = variants {}; lin anyplace_Adv = variants {}; lin anything_NP = variants {}; @@ -2650,7 +2651,7 @@ lin baptismal_A = variants {}; lin baptist_A = variants {}; lin baptist_N = variants {}; lin baptize_V2 = variants {}; -lin bar_N = variants {}; +lin bar_N = mkN001 "бар"; lin bar_V2 = variants {}; lin bar_Prep = variants {}; lin baracaldo_PN = variants {}; @@ -3093,12 +3094,12 @@ lin belgian_N = variants {}; lin belgium_PN = variants {}; lin belgrade_PN = variants {}; lin belie_V2 = variants {}; -lin belief_N = variants {}; +lin belief_N = mkN043 "вяра"; lin believable_A = mkA079 "вероятен" ; lin believe_V = stateV (mkV186 "вярвам"); lin believe_V2 = prepV2 (stateV (mkV186 "вярвам")) (mkPrep "на" Acc); lin believe_V2V = variants {}; -lin believe_VS = variants {}; +lin believe_VS = mkVS (stateV (mkV186 "вярвам")); lin believer_N = variants {}; lin believing_N = variants {}; lin belike_Adv = variants {}; @@ -3351,11 +3352,11 @@ lin bier_N = variants {}; lin biff_N = variants {}; lin biff_V2 = variants {}; lin bifocal_A = variants {}; -lin bifurcate_A = variants {}; -lin bifurcate_V = variants {}; -lin bifurcate_V2 = variants {}; -lin bifurcated_A = variants {}; -lin bifurcation_N = variants {}; +lin bifurcate_A = mkA079 "разклонен"; +lin bifurcate_V = actionV (mkV186 "разклонявам") (mkV174 "разклоня"); +lin bifurcate_V2 = dirV2 (actionV (mkV186 "разклонявам") (mkV174 "разклоня")); +lin bifurcated_A = mkA079 "разклонен"; +lin bifurcation_N = mkN071 "разклоняване"; lin big_A = mkA081 "голям"; lin big_boned_A = variants {}; lin bigamist_N = variants {}; @@ -6285,11 +6286,11 @@ lin cirrhosis_N = variants {}; lin cirrus_N = variants {}; lin cissy_A = variants {}; lin cissy_N = variants {}; -lin cistern_N = variants {}; -lin citadel_N = variants {}; -lin citation_N = variants {}; -lin cite_V2 = variants {}; -lin citizen_N = mkN031a "жител" ; +lin cistern_N = mkN041 "цистерна"; +lin citadel_N = mkN041 "цитадела"; +lin citation_N = mkN007 "цитат"; +lin cite_V2 = dirV2 (stateV (mkV186 "цитирам")); +lin citizen_N = mkN018 "гражданин" ; lin citizenship_N = mkN054 "гражданство" ; lin citric_A = variants {}; lin citron_N = variants {}; @@ -7126,15 +7127,15 @@ lin complacence_N = variants {}; lin complacency_N = variants {}; lin complacent_A = variants {}; lin complain_V = actionV (mkV186 "възразявам") (mkV174 "възразя"); -lin complain_VS = variants {}; +lin complain_VS = mkVS (actionV (mkV186 "възразявам") (mkV174 "възразя")); lin complainant_N = variants {}; lin complainingly_Adv = variants {}; lin complaint_N = mkN041 "жалба" ; lin complaisance_N = variants {}; lin complaisant_A = variants {}; -lin complement_N = variants {}; -lin complement_V2 = variants {}; -lin complementary_A = variants {}; +lin complement_N = mkN072 "допълнение"; +lin complement_V2 = dirV2 (actionV (mkV186 "допълвам") (mkV173 "допълня")); +lin complementary_A = mkA079 "допълнителен"; lin complete_A = mkA076 "завършен" ; lin complete_V = actionV (mkV186 "завършвам") (mkV176 "завърша"); lin complete_V2 = dirV2 (actionV (mkV186 "завършвам") (mkV176 "завърша")); @@ -8147,9 +8148,9 @@ lin countervail_V = variants {}; lin countervail_V2 = variants {}; lin countess_N = variants {}; lin counting_house_N = variants {}; -lin countless_A = variants {}; +lin countless_A = mkA085 "безброен"; lin countrified_A = variants {}; -lin country_N = mkN047 "земя" ; +lin country_N = mkN041 "страна"; lin country_house_N = variants {}; lin country_seat_N = variants {}; lin countryman_N = variants {}; @@ -8751,7 +8752,7 @@ lin cure_all_N = variants {}; lin curfew_N = variants {}; lin curio_N = variants {}; lin curiosity_N = mkN054 "любопитство" ; -lin curious_A = variants {}; +lin curious_A = mkA079 "любопитен"; lin curitiba_PN = variants {}; lin curl_N = variants {}; lin curl_V = variants {}; @@ -13670,8 +13671,8 @@ lin fivepenny_A = variants {}; lin fiver_N = variants {}; lin fives_N = variants {}; lin fix_N = variants {}; -lin fix_V = variants {}; -lin fix_V2 = variants {}; +lin fix_V = stateV (mkV186 "фиксирам"); +lin fix_V2 = dirV2 (stateV (mkV186 "фиксирам")); lin fixate_V2 = variants {}; lin fixation_N = variants {}; lin fixative_N = variants {}; @@ -13904,25 +13905,25 @@ lin floury_A = variants {}; lin flout_V2 = variants {}; lin flow_N = mkN007 "прилив" ; lin flow_V = variants {}; -lin flower_N = variants {}; +lin flower_N = mkN072 "цвете"; lin flower_V = variants {}; -lin flower_girl_N = variants {}; +lin flower_girl_N = mkN041 "цветарка"; lin flowerbed_N = variants {}; lin flowered_A = variants {}; -lin flowerless_A = variants {}; +lin flowerless_A = mkA079 "безцветен"; lin flowerpot_N = variants {}; -lin flowery_A = mkA079 "цветен" ; +lin flowery_A = mkA079 "цветен"; lin flu_N = mkN001 "грип" ; lin fluctuate_V = variants {}; -lin fluctuation_N = variants {}; +lin fluctuation_N = mkN047 "флунктуация"; lin flue_N = variants {}; lin fluency_N = variants {}; lin fluent_A = variants {}; lin fluff_N = variants {}; lin fluff_V2 = variants {}; lin fluffy_A = variants {}; -lin fluid_A = variants {}; -lin fluid_N = variants {}; +lin fluid_A = mkA079 "течен"; +lin fluid_N = mkN049 "течност"; lin fluidity_N = variants {}; lin fluke_N = variants {}; lin flume_N = variants {}; @@ -13931,8 +13932,8 @@ lin flunk_V = variants {}; lin flunk_V2 = variants {}; lin flunkey_N = variants {}; lin flunky_N = variants {}; -lin fluorescence_N = variants {}; -lin fluorescent_A = variants {}; +lin fluorescence_N = mkN047 "флуоресценция"; +lin fluorescent_A = mkA079 "флуоресцентен"; lin fluoridate_V2 = variants {}; lin fluoridation_N = variants {}; lin fluoride_N = variants {}; @@ -14729,7 +14730,7 @@ lin furlough_N = variants {}; lin furnace_N = variants {}; lin furnish_V2 = variants {}; lin furniture_N = variants {}; -lin furore_N = variants {}; +lin furore_N = mkN007 "фурор"; lin furrier_N = variants {}; lin furrow_N = mkN041 "бразда" ; lin furrow_V = variants {}; @@ -16225,10 +16226,10 @@ lin hair_slide_N = variants {}; lin hair_trigger_N = variants {}; lin hairbrush_N = variants {}; lin haircloth_N = variants {}; -lin haircut_N = variants {}; +lin haircut_N = mkN041 "прическа"; lin hairdo_N = variants {}; -lin hairdresser_N = variants {}; -lin hairdressing_N = variants {}; +lin hairdresser_N = mkN007 "фризьор"; +lin hairdressing_N = mkN054 "фризьорство"; lin hairiness_N = variants {}; lin hairless_A = variants {}; lin hairlike_A = variants {}; @@ -16241,7 +16242,7 @@ lin hairsplitting_N = variants {}; lin hairspring_N = variants {}; lin hairstyle_N = variants {}; lin hairstylist_N = variants {}; -lin hairy_A = variants {}; +lin hairy_A = mkA076 "космат"; lin haiti_PN = variants {}; lin haitian_A = variants {}; lin haitian_N = variants {}; @@ -16582,8 +16583,42 @@ lin havana_PN = variants {}; lin have_V = stateV (mkV186 "имам"); lin have_V2 = dirV2 (stateV (mkV186 "имам")); lin have_VS = variants {}; -lin have_VV = variants {}; -lin have_V2V = mkV2V (stateV (mkV186 "имам")) noPrep noPrep; +lin have_VV = + mkVV { + s = \\_=>table { + VPres _ _ => "трябва" ; + VAorist _ _ => "трябваше" ; + VImperfect _ _ => "трябвало" ; + VPerfect _ => "трябвало" ; + VPluPerfect _ => "трябвало" ; + VPassive _ => "трябвало" ; + VPresPart _ => "трябвало" ; + VImperative Sg => "трябвай" ; + VImperative Pl => "трябвайте" ; + VNoun _ => "трябване" ; + VGerund => "трябвайки" + } ; + vtype=VNormal ; + lock_V=<> + } ; +lin have_V2V = + mkV2V { + s = \\_=>table { + VPres _ _ => "трябва" ; + VAorist _ _ => "трябваше" ; + VImperfect _ _ => "трябвало" ; + VPerfect _ => "трябвало" ; + VPluPerfect _ => "трябвало" ; + VPassive _ => "трябвало" ; + VPresPart _ => "трябвало" ; + VImperative Sg => "трябвай" ; + VImperative Pl => "трябвайте" ; + VNoun _ => "трябване" ; + VGerund => "трябвайки" + } ; + vtype=VNormal ; + lock_V=<> + } noPrep noPrep ; lin haven_N = mkN028a "рай"; lin haverfordwest_PN = variants {}; lin haverhill_PN = variants {}; @@ -17487,6 +17522,7 @@ lin hover_V = variants {}; lin hovercraft_N = variants {}; lin how_IAdv = mkIAdv "как"; lin how8many_IDet = {s = \\_ => table QForm ["колко";"колкото"]; n = Pl; nonEmpty = False}; +lin how8much_IDet = {s = \\_ => table QForm ["колко";"колкото"]; n = Pl; nonEmpty = False}; lin how_d'ye_do_N = variants {}; lin howard_PN = variants {}; lin howdah_N = variants {}; @@ -21622,7 +21658,7 @@ lin lumpy_A = variants {}; lin lunacy_N = variants {}; lin lunar_A = variants {}; lin lunatic_N = variants {}; -lin lunch_N = variants {}; +lin lunch_N = mkN040a "обяд"; lin lunch_V = variants {}; lin lunch_V2 = variants {}; lin luncheon_N = variants {}; @@ -21875,7 +21911,7 @@ lin make_VV = variants {}; lin make_VS = variants {}; lin make_believe_N = variants {}; lin make_up_N = variants {}; -lin maker_N = variants {}; +lin maker_N = mkN031a "производител"; lin makeshift_N = variants {}; lin makeweight_N = variants {}; lin making_N = variants {}; @@ -26798,19 +26834,19 @@ lin penzance_PN = variants {}; lin peon_N = variants {}; lin peonage_N = variants {}; lin peony_N = variants {}; -lin people_N = mkN007a "народ" ; +lin people_N = mkN074 "хора"; lin people_V2 = variants {}; lin pep_N = variants {}; lin pep_V2 = variants {}; -lin pepper_N = variants {}; +lin pepper_N = mkN007 "пипер"; lin pepper_V2 = variants {}; lin pepper_and_salt_N = variants {}; lin pepper_mill_N = variants {}; lin pepper_pot_N = variants {}; lin peppercorn_N = variants {}; -lin peppermint_N = variants {}; +lin peppermint_N = mkN041 "мента"; lin peppery_A = variants {}; -lin pepsin_N = variants {}; +lin pepsin_N = mkN007 "пепсин"; lin peptic_A = variants {}; lin per_Prep = variants {}; lin peradventure_Adv = variants {}; @@ -26823,8 +26859,8 @@ lin perceive_V2 = variants {}; lin perceive_V2V = variants {}; lin perceive_VS = variants {}; lin perceiver_N = variants {}; -lin percent_N = variants {}; -lin percentage_N = mkN007 "процент" ; +lin percent_N = mkN007 "процент"; +lin percentage_N = mkN007 "процент"; lin perceptibility_N = variants {}; lin perceptible_A = variants {}; lin perception_N = mkN072 "възприятие" ; @@ -27830,6 +27866,7 @@ lin poinsettia_N = variants {}; lin point_N = mkN041 "точка"; lin point_V = variants {}; lin point_V2 = variants {}; +lin pointedly_AdV = variants {}; lin point_blank_A = variants {}; lin point_blank_Adv = variants {}; lin point_duty_N = variants {}; @@ -28065,7 +28102,7 @@ lin portentous_A = variants {}; lin porter_N = variants {}; lin porterage_N = variants {}; lin porterhouse_N = variants {}; -lin portfolio_N = variants {}; +lin portfolio_N = mkN054 "портфолио"; lin porthcawl_PN = variants {}; lin porthmadog_PN = variants {}; lin porthole_N = variants {}; @@ -28798,8 +28835,8 @@ lin prodigality_N = variants {}; lin prodigious_A = variants {}; lin prodigy_N = variants {}; lin produce_N = variants {}; -lin produce_V = variants {}; -lin produce_V2 = variants {}; +lin produce_V = actionV (mkV186 "произвеждам") (mkV145 "произведа"); +lin produce_V2 = dirV2 (actionV (mkV186 "произвеждам") (mkV145 "произведа")); lin producer_N = mkN031a "производител" ; lin product_N = mkN007 "продукт" ; lin production_N = mkN047 "продукция" ; @@ -29533,7 +29570,7 @@ lin quarry_V = variants {}; lin quarry_V2 = variants {}; lin quarryman_N = variants {}; lin quart_N = variants {}; -lin quarter_N = variants {}; +lin quarter_N = mkN049 "четвърт"; lin quarter_V2 = variants {}; lin quarter_day_N = variants {}; lin quarter_deck_N = variants {}; @@ -33055,14 +33092,14 @@ lin seduction_N = variants {}; lin seductive_A = variants {}; lin sedulous_A = variants {}; lin see_N = variants {}; -lin see_V = variants {}; -lin see_V2 = variants {}; -lin see_V2V = variants {}; -lin see_VA = variants {}; -lin see_VS = variants {}; -lin see_VQ = variants {}; +lin see_V = stateV (mkV186 "виждам"); +lin see_V2 = dirV2 (stateV (mkV186 "виждам")); +lin see_V2V = mkV2V (stateV (mkV186 "виждам")) noPrep noPrep; +lin see_VA = mkVA (stateV (mkV186 "виждам")); +lin see_VS = mkVS (stateV (mkV186 "виждам")); +lin see_VQ = mkVQ (stateV (mkV186 "виждам")); lin see_through_A = variants {}; -lin seed_N = mkN054 "семенарство" ; +lin seed_N = mkN069 "семе"; lin seed_V = variants {}; lin seed_V2 = variants {}; lin seed_corn_N = variants {}; @@ -33075,15 +33112,15 @@ lin seedling_N = variants {}; lin seedsman_N = variants {}; lin seedtime_N = variants {}; lin seedy_A = variants {}; -lin seek_V2 = variants {}; -lin seek_VV = variants {}; -lin seek_VS = variants {}; -lin seeker_N = variants {}; -lin seem_V = variants {}; -lin seem_V2 = variants {}; -lin seem_VA = variants {}; +lin seek_V2 = dirV2 (stateV (mkV173 "търся")); +lin seek_VV = mkVV (stateV (mkV173 "търся")); +lin seek_VS = mkVS (stateV (mkV173 "търся")); +lin seeker_N = mkN007b "търсач"; +lin seem_V = actionV (mkV186 "изглеждам") (mkV186 "изгледам"); +lin seem_V2 = dirV2 (actionV (mkV186 "изглеждам") (mkV186 "изгледам")); +lin seem_VA = mkVA (actionV (mkV186 "изглеждам") (mkV186 "изгледам")); lin seem_VV = mkVV (actionV (mkV186 "изглеждам") (mkV186 "изгледам")); -lin seem_VS = variants {}; +lin seem_VS = mkVS (actionV (mkV186 "изглеждам") (mkV186 "изгледам")); lin seeming_A = variants {}; lin seemliness_N = variants {}; lin seemly_A = variants {}; @@ -33269,7 +33306,7 @@ lin senescent_A = variants {}; lin seneschal_N = variants {}; lin senile_A = variants {}; lin senility_N = variants {}; -lin senior_A = mkA076 "висок" ; +lin senior_A = mkA078 "старши"; lin senior_N = variants {}; lin seniority_N = variants {}; lin senna_N = variants {}; @@ -34669,7 +34706,7 @@ lin smack_V = variants {}; lin smack_V2 = variants {}; lin smacker_N = variants {}; lin smacking_N = variants {}; -lin small_A = mkA076 "малокалибрен" ; +lin small_A = mkA080 "малък"; lin small_Adv = variants {}; lin small_N = variants {}; lin small_minded_A = variants {}; @@ -34738,10 +34775,10 @@ lin smoking_compartment_N = variants {}; lin smoking_mixture_N = variants {}; lin smoking_room_N = variants {}; lin smoky_A = variants {}; -lin smooth_A = mkA079 "мазен" ; +lin smooth_A = mkA080 "гладък"; lin smooth_N = variants {}; lin smooth_V = variants {}; -lin smooth_V2 = variants {}; +lin smooth_V2 = dirV2 (actionV (mkV186 "изглаждам") (mkV173 "изгладя")); lin smooth_bore_A = variants {}; lin smooth_faced_A = variants {}; lin smooth_spoken_A = variants {}; @@ -35668,7 +35705,7 @@ lin spray_gun_N = variants {}; lin sprayer_N = variants {}; lin spread_N = mkN072 "разпространение" ; lin spread_V = variants {}; -lin spread_V2 = variants {}; +lin spread_V2 = dirV2 (actionV (mkV186 "разпространявам") (mkV174 "разпространя")); lin spread_V2V = variants {}; lin spread_VS = variants {}; lin spread_over_N = variants {}; @@ -36128,7 +36165,7 @@ lin steersman_N = variants {}; lin stele_N = variants {}; lin stella_PN = variants {}; lin stellar_A = variants {}; -lin stem_N = variants {}; +lin stem_N = mkN054 "стъбло"; lin stem_V = variants {}; lin stem_V2 = variants {}; lin stemmed_A = variants {}; @@ -36273,7 +36310,7 @@ lin stitch_V2 = variants {}; lin stoat_N = variants {}; lin stochastic_A = variants {}; lin stochastically_Adv = variants {}; -lin stock_N = variants {}; +lin stock_N = mkN041 "стока"; lin stock_V2 = variants {}; lin stock_cube_N = variants {}; lin stock_farmer_N = variants {}; @@ -40963,7 +41000,7 @@ lin usage_N = mkN041 "употреба" ; lin use_N = mkN041 "употреба" ; lin use_V = variants {}; lin use_V2 = variants {}; -lin use_V2V = mkV2V (stateV (mkV186 "използвам")) noPrep noPrep; +lin use_V2V = mkV2V (stateV (mkV186 "използвам")) noPrep (mkPrep "за" Acc); lin use_VV = mkVV (stateV (mkV186 "използвам")); lin useful_A = mkA079 "полезен" ; lin usefulness_N = variants {}; @@ -41994,7 +42031,7 @@ lin waxen_A = variants {}; lin waxwork_N = variants {}; lin waxy_A = variants {}; lin way_Adv = variants {}; -lin way_N = mkN007 "начин" ; +lin way_N = mkN037 "път"; lin way_out_A = variants {}; lin waybill_N = variants {}; lin wayfarer_N = variants {}; @@ -42603,11 +42640,11 @@ lin wipe_N = variants {}; lin wipe_V = variants {}; lin wipe_V2 = variants {}; lin wiper_N = variants {}; -lin wire_N = variants {}; +lin wire_N = mkN041 "жица"; lin wire_V = variants {}; lin wire_V2 = variants {}; lin wire_haired_A = variants {}; -lin wireless_A = variants {}; +lin wireless_A = mkA079 "безжичен"; lin wireless_N = variants {}; lin wirepuller_N = variants {}; lin wireworm_N = variants {}; @@ -42617,19 +42654,19 @@ lin wisbech_PN = variants {}; lin wisconsin_PN = variants {}; lin wisdom_N = mkN049 "мъдрост" ; lin wisdom_tooth_N = variants {}; -lin wise_A = variants {}; +lin wise_A = mkA080 "мъдър"; lin wise_N = variants {}; lin wiseacre_N = variants {}; lin wisecrack_N = variants {}; lin wisecrack_V = variants {}; lin wish_N = mkN072 "желание" ; -lin wish_V = variants {}; -lin wish_V2 = variants {}; -lin wish_V2V = variants {}; -lin wish_VV = variants {}; -lin wish_VS = variants {}; +lin wish_V = stateV (mkV161 "желая"); +lin wish_V2 = dirV2 (stateV (mkV161 "желая")); +lin wish_V2V = mkV2V (stateV (mkV161 "желая")) noPrep noPrep; +lin wish_VV = mkVV (stateV (mkV161 "желая")); +lin wish_VS = mkVS (stateV (mkV161 "желая")); lin wishbone_N = variants {}; -lin wishful_A = variants {}; +lin wishful_A = mkA079 "пожелателен"; lin wishing_cap_N = variants {}; lin wishy_washy_A = variants {}; lin wisp_N = variants {}; @@ -42650,8 +42687,8 @@ lin with_Prep = mkPrep (pre { "с" ; }) Acc; lin withal_Adv = variants {}; lin witham_PN = variants {}; -lin withdraw_V = variants {}; -lin withdraw_V2 = variants {}; +lin withdraw_V = actionV (mkV187 "оттеглям") (mkV173 "оттегля"); +lin withdraw_V2 = dirV2 (actionV (mkV187 "оттеглям") (mkV173 "оттегля")); lin withdrawal_N = mkN071 "оттегляне" ; lin withe_N = variants {}; lin wither_V = variants {}; @@ -42771,7 +42808,7 @@ lin word_painter_N = variants {}; lin word_perfect_A = variants {}; lin word_picture_N = variants {}; lin word_splitting_N = variants {}; -lin wordbook_N = variants {}; +lin wordbook_N = mkN014 "речник"; lin wordily_Adv = variants {}; lin wordiness_N = variants {}; lin wording_N = variants {}; @@ -42784,7 +42821,7 @@ lin work_VV = variants {}; lin work_in_N = variants {}; lin work_out_N = variants {}; lin work_study_N = variants {}; -lin workable_A = variants {}; +lin workable_A = mkA079 "работоспособен"; lin workaday_A = variants {}; lin workbag_N = variants {}; lin workbasket_N = variants {}; @@ -42853,8 +42890,8 @@ lin worthwhile_A = variants {}; lin worthy_A = variants {}; lin worthy_N = variants {}; lin would_be_A = variants {}; -lin wound_N = mkN071 "нараняване" ; -lin wound_V2 = variants {}; +lin wound_N = mkN041 "рана"; +lin wound_V2 = dirV2 (actionV (mkV186 "ранявам") (mkV174 "раня")); lin wow_N = variants {}; lin wpb_N = variants {}; lin wpm_N = variants {}; @@ -42867,8 +42904,8 @@ lin wrangle_N = variants {}; lin wrangle_V = variants {}; lin wrap_N = mkN007 "вързоп"; lin wrap_V = stateV (mkV186 "опаковам"); -lin wrap_V2 = variants {}; -lin wrapper_N = variants {}; +lin wrap_V2 = dirV2 (stateV (mkV186 "опаковам")); +lin wrapper_N = mkN041 "обвивка"; lin wrapping_N = variants {}; lin wrath_N = variants {}; lin wrathful_A = variants {}; diff --git a/lib/src/bulgarian/LexiconBul.gf b/lib/src/bulgarian/LexiconBul.gf index a8bb9dcf3..a70d9cf55 100644 --- a/lib/src/bulgarian/LexiconBul.gf +++ b/lib/src/bulgarian/LexiconBul.gf @@ -10,11 +10,11 @@ flags lin airplane_N = mkN007 "" ; - answer_V2S = mkV2S (actionV (mkV187 "") (mkV173 "")) naP ; + answer_V2S = mkV2S (actionV (mkV187 "") (mkV173 "")) naP noPrep ; apartment_N = mkN007 "" ; apple_N = mkN041 "" ; art_N = mkN054 "" ; - ask_V2Q = mkV2Q (stateV (mkV186 "")) noPrep ; + ask_V2Q = mkV2Q (stateV (mkV186 "")) noPrep noPrep ; baby_N = mkN065 "" ; bad_A = mkA076 "" ; bank_N = mkN041 "" ; diff --git a/lib/src/bulgarian/MorphoFunsBul.gf b/lib/src/bulgarian/MorphoFunsBul.gf index 502519c1c..0fbee310e 100644 --- a/lib/src/bulgarian/MorphoFunsBul.gf +++ b/lib/src/bulgarian/MorphoFunsBul.gf @@ -117,17 +117,17 @@ oper -- V2S, V2V, V2Q : Type = V2 ; - mkV2S : V -> Prep -> V2S ; - mkV2S v p = prepV2 v p ** {lock_V2S = <>} ; + mkV2S : V -> Prep -> Prep -> V2S ; + mkV2S v p t = prepV2 v p ** {c3 = t ; lock_V2S = <>} ; mkV2V : V -> Prep -> Prep -> V2V ; - mkV2V v p t = prepV2 v p ** {s4 = t ; lock_V2V = <>} ; + mkV2V v p t = prepV2 v p ** {c3 = t ; lock_V2V = <>} ; mkV2A : V -> Prep -> V2A ; mkV2A v p = prepV2 v p ** {lock_V2A = <>} ; - mkV2Q : V -> Prep -> V2Q ; - mkV2Q v p = prepV2 v p ** {lock_V2Q = <>} ; + mkV2Q : V -> Prep -> Prep -> V2Q ; + mkV2Q v p t = prepV2 v p ** {c3 = t ; lock_V2Q = <>} ; mkVS : V -> VS ; mkVS v = v ** {lock_VS = <>} ; diff --git a/lib/src/bulgarian/ParseEngBul.gf b/lib/src/bulgarian/ParseEngBul.gf index 525e522f8..e9f977921 100644 --- a/lib/src/bulgarian/ParseEngBul.gf +++ b/lib/src/bulgarian/ParseEngBul.gf @@ -71,7 +71,7 @@ lin } ; SlashV2V vv ant p vp = - insertSlashObj2 (\\agr => ant.s ++ p.s ++ + insertSlashObj2 (\\agr => ant.s ++ p.s ++ vv.c3.s ++ daComplex ant.a p.p vp ! Perf ! agr) (slashV vv vv.c2) ; diff --git a/lib/src/bulgarian/QuestionBul.gf b/lib/src/bulgarian/QuestionBul.gf index 351dcaf68..bfb907b49 100644 --- a/lib/src/bulgarian/QuestionBul.gf +++ b/lib/src/bulgarian/QuestionBul.gf @@ -27,7 +27,7 @@ concrete QuestionBul of Question = CatBul ** open ResBul, Prelude in { QuestIAdv iadv cl = mkQuestion iadv cl ; QuestIComp icomp np = - mkQuestion icomp (mkClause (np.s ! RSubj) np.a (predV verbBe)) ; + mkQuestion icomp (mkClause (np.s ! RObj Acc) np.a (predV verbBe)) ; PrepIP p ip = {s = \\qform => p.s ++ case p.c of {Dat=>"";_=>[]} ++ ip.s ! RSubj ! qform} ; diff --git a/lib/src/bulgarian/VerbBul.gf b/lib/src/bulgarian/VerbBul.gf index 98d733685..af4958d21 100644 --- a/lib/src/bulgarian/VerbBul.gf +++ b/lib/src/bulgarian/VerbBul.gf @@ -40,7 +40,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in { -- test: I saw a boy whom she begged to walk SlashV2V vv vp = - insertSlashObj2 (daComplex Simul Pos vp ! Perf) (slashV vv vv.c2) ; + insertSlashObj2 (\\agr => vv.c3.s ++ daComplex Simul Pos vp ! Perf ! agr) (slashV vv vv.c2) ; -- test: I saw a car whom she wanted to buy SlashVV vv slash = { @@ -66,7 +66,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in { ComplSlash slash np = { s = slash.s ; ad = slash.ad ; - compl = \\a => slash.compl1 ! a ++ slash.c2.s ++ np.s ! RObj slash.c2.c ++ slash.compl2 ! np.a ; + compl = \\a => slash.compl1 ! a ++ slash.c2.s ++ np.s ! RObj slash.c2.c ++ slash.compl2 ! a ; vtype = slash.vtype } ; diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index fea975700..bd922b684 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -1466,6 +1466,7 @@ lin anyPl_Det = mkDeterminer plural "any"; lin anySg_Det = mkDeterminer singular "any"; lin anybody_NP = mkNP "anybody" "anybody" "anybody's" singular P3 human; lin anyhow_Adv = mkAdv "anyhow"; +lin anymore_Adv = mkAdv "anymore"; lin anyone_NP = mkNP "anyone" "anyone" "anyone's" singular P3 human; lin anyplace_Adv = mkAdv "anyplace"; lin anything_NP = regNP "anything" singular; @@ -3362,7 +3363,7 @@ lin bifurcate_V = mkV "bifurcate" "bifurcates" "bifurcated" "bifurcated" "bifurc lin bifurcate_V2 = mkV2 (mkV "bifurcate" "bifurcates" "bifurcated" "bifurcated" "bifurcating"); lin bifurcated_A = compoundA (mkA "bifurcated"); lin bifurcation_N = mkN "bifurcation" "bifurcations"; -lin big_A = mkA "big" "bigger*"; +lin big_A = mkA "big" "bigger" "biggest" "big"; lin big_boned_A = compoundA (mkA "big - boned"); lin bigamist_N = mkN "bigamist" "bigamists"; lin bigamous_A = compoundA (mkA "bigamous"); @@ -14743,7 +14744,7 @@ lin furlough_N = mkN "furlough" "furloughs"; lin furnace_N = mkN "furnace" "furnaces"; lin furnish_V2 = mkV2 (mkV "furnish" "furnishes" "furnished" "furnished" "furnishing"); lin furniture_N = mkN "furniture" ; -lin furore_N = mkN "furore" "furores"; +lin furore_N = mkN (variants {"furore"; "furor"}); lin furrier_N = mkN "furrier" "furriers"; lin furrow_N = mkN "furrow" "furrows"; lin furrow_V = mkV "furrow"; @@ -15452,7 +15453,7 @@ lin gnat_N = mkN "gnat" "gnats"; lin gnaw_V = mkV "gnaw" "gnaws" "gnawed" "gnawed" "gnawing"; lin gnaw_V2 = mkV2 (mkV "gnaw" "gnaws" "gnawed" "gnawed" "gnawing"); lin gnome_N = mkN "gnome" "gnomes"; -lin gnp_N = mkN "gnp" ; +lin gnp_N = mkN "GNP" ; lin gnu_N = mkN "gnu" "gnus"; lin go_N = mkN "go" "gi" {- FIXME: guessed plural form -}; lin go_V = IrregEng.go_V; @@ -17188,6 +17189,7 @@ lin hold_N = mkN "hold" "holds"; lin hold_V = IrregEng.hold_V; lin hold_V2 = mkV2 (IrregEng.hold_V); lin hold_V2V = mkV2V (IrregEng.hold_V) noPrep to_Prep ; +lin hold_V3 = mkV3 (IrregEng.hold_V) noPrep noPrep; lin hold_VS = mkVS (IrregEng.hold_V); lin hold_up_N = mkN "hold - up" "hold - ups"; lin holdall_N = mkN "holdall" "holdalls"; @@ -20883,7 +20885,7 @@ lin libretto_N = mkN "libretto" "librettos"; lin libya_PN = mkPN "Libya"; lin libyan_A = compoundA (mkA "libyan"); lin libyan_N = mkN "libyan" "libyans"; -lin licence_N = mkN "licence" "licences"; +lin licence_N = mkN (variants {"licence"; "license"}); lin licence_V2 = mkV2 (mkV "licence" "licences" "licenced" "licenced" "licencing"); lin license_V2 = mkV2 (mkV "license" "licenses" "licensed" "licensed" "licensing"); lin licensee_N = mkN "licensee" "licensees"; @@ -33065,7 +33067,7 @@ lin see_VA = mkVA (IrregEng.see_V); lin see_VS = mkVS (IrregEng.see_V); lin see_VQ = mkVQ (IrregEng.see_V); lin see_through_A = compoundA (mkA "see - through"); -lin seed_N = mkN "seed" "seed"; +lin seed_N = mkN "seed" "seeds"; lin seed_V = mkV "seed" "seeds" "seeded" "seeded" "seeding"; lin seed_V2 = mkV2 (mkV "seed" "seeds" "seeded" "seeded" "seeding"); lin seed_corn_N = mkN "seed - corn" ; @@ -35272,7 +35274,7 @@ lin souvenir_N = mkN "souvenir" "souvenirs"; lin sovereign_A = compoundA (mkA "sovereign"); lin sovereign_N = mkN "sovereign" "sovereigns"; lin sovereignty_N = mkN "sovereignty" ; -lin soviet_A = compoundA (mkA "soviet"); +lin soviet_A = compoundA (mkA "Soviet"); lin soviet_N = mkN "soviet" "soviets"; lin sovietize_V2 = mkV2 (mkV "sovietize" "sovietizes" "sovietized" "sovietized" "sovietizing"); lin sow_N = mkN "sow" "sows"; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index 3ea16e66c..fc5513a8a 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -1461,6 +1461,7 @@ fun anyPl_Det : Det ; fun anySg_Det : Det ; fun anybody_NP : NP; fun anyhow_Adv : Adv; +fun anymore_Adv : Adv; fun anyone_NP : NP; fun anyplace_Adv : Adv; fun anything_NP : NP; @@ -17164,6 +17165,7 @@ fun hold_N : N; fun hold_V : V; fun hold_V2 : V2; fun hold_V2V : V2V; +fun hold_V3 : V3; fun hold_VS : VS; fun hold_up_N : N; fun holdall_N : N;