diff --git a/src/bulgarian/DictEngBul.gf b/src/bulgarian/DictEngBul.gf index 165bbb9d7..a84d359fd 100644 --- a/src/bulgarian/DictEngBul.gf +++ b/src/bulgarian/DictEngBul.gf @@ -1548,12 +1548,12 @@ lin algometry_N = variants {}; lin algophobia_N = variants {}; lin algophobic_A = variants {}; lin algorism_N = variants {}; -lin algorithm_N = variants {}; -lin algorithmic_A = variants {}; +lin algorithm_N = mkN009 "алгоритъм"; +lin algorithmic_A = mkA079 "алгоритмичен"; lin ali_PN = variants {}; lin alias_Adv = variants {}; -lin alias_N = mkN007 "псевдоним" ; ---- -lin alibi_N = variants {}; +lin alias_N = mkN007 "псевдоним"; +lin alibi_N = mkN065 "алиби"; lin alicante_PN = variants {}; lin alice_PN = variants {}; lin alidade_N = variants {}; @@ -3857,6 +3857,7 @@ lin asynergic_A = variants {}; lin asynergy_N = variants {}; lin asystole_N = variants {}; lin at_N = variants {}; +lin at_all_Adv = mkAdv "въобще"; lin at_Prep = mkPrep "на" Acc; lin at_home_N = variants {}; lin at_least_AdN = ss "поне"; @@ -4770,7 +4771,7 @@ lin banish_V2 = variants {}; lin banishment_N = mkN071 "прогонване" ; ---- lin banister_N = variants {}; lin banjo_N = variants {}; -lin bank_N = mkN041 "банка" ; +lin bank_N = relativeN (mkN041 "банка") (mkA076 "банков"); lin bank_V = variants {}; lin bank_V2 = variants {}; lin bank_bill_N = variants {}; @@ -6382,10 +6383,8 @@ lin blockish_A = variants {}; lin blogger_N = variants {}; lin bloke_N = variants {}; lin blolly_N = variants {}; -lin blond_A = mkA076 "рус" ; ---- -lin blond_N = mkN041 "блондинка" ; ---- -lin blonde_A = variants {}; -lin blonde_N = variants {}; +lin blonde_A = mkA076 "рус"; +lin blonde_N = mkN041 "блондинка"; lin blood_N = mkN053 "кръв" ; lin blood_V2 = variants {}; lin blood_bath_N = variants {}; @@ -11263,29 +11262,26 @@ lin colorcast_N = variants {}; lin colorectal_A = variants {}; lin colored_A = variants {}; lin colorfast_A = variants {}; -lin colorful_A = variants {}; lin colorimeter_N = variants {}; lin colorimetric_A = variants {}; lin colorimetry_N = variants {}; lin colorist_N = variants {}; -lin colorless_A = variants {}; -lin colorlessness_N = variants {}; -lin colors_N = variants {}; lin colossal_A = mkA079 "колосален"; lin colossus_N = mkN007 "колос"; lin colostomy_N = variants {}; lin colostrum_N = variants {}; -lin colour_N = variants {}; -lin colour_V = variants {}; +lin colour_N = relativeN (mkN002 "цвят") (mkA079 "цветен"); +lin colour_V = actionV (mkV186 "оцветявам") (mkV174 "оцветя"); lin colour_V2 = dirV2 (actionV (mkV186 "оцветявам") (mkV174 "оцветя")); lin colour_V2A = variants {}; lin colour_bar_N = variants {}; lin colour_blind_A = variants {}; lin colour_code_V2 = variants {}; lin colour_wash_N = variants {}; -lin colourful_A = variants {}; +lin colourful_A = mkA079 "цветен"; lin colouring_N = variants {}; lin colourless_A = mkA079 "безцветен"; +lin colourlessness_N = mkN049 "безцветност"; lin colpitis_N = variants {}; lin colpocele_N = variants {}; lin colpocystitis_N = variants {}; @@ -11342,11 +11338,14 @@ lin combustibility_N = variants {}; lin combustible_A = variants {}; lin combustible_N = variants {}; lin combustion_N = mkN030 "огън"; -lin come_V = actionV (mkV186 "идвам") (mkV146a "дойда"); -lin come_V2 = variants {}; +lin come_V = actionV (mkV186 "идвам") (table { -- special case "дойди", "дойдете" are archaic + VImperative Sg => "ела"; + VImperative Pl => "елате"; + vform => mkV146a "дойда" ! vform}); +lin come_V2 = dirV2 come_V; lin come_VA = variants {}; lin come_VS = variants {}; -lin come_VV = mkVV (actionV (mkV186 "идвам") (mkV146a "дойда")); +lin come_VV = mkVV come_V; lin come_at_able_A = variants {}; lin come_on_N = variants {}; lin comeback_N = mkN071 "връщане"; @@ -11805,7 +11804,7 @@ lin confederation_N = mkN047 "конфедерация" ; lin confer_V = actionV (mkV186 "дарявам") (mkV174 "даря") ; ---- lin confer_V2 = variants {}; lin conferee_N = variants {}; -lin conference_N = mkN047 "конференция" ; +lin conference_N = relativeN (mkN047 "конференция") (mkA079 "конферентен") ; lin conferment_N = variants {}; lin conferrer_N = variants {}; lin conferva_N = variants {}; @@ -14174,7 +14173,7 @@ lin darenth_PN = variants {}; lin darfield_PN = variants {}; lin daring_N = variants {}; lin daringly_Adv = variants {}; -lin dark_A = mkA076 "затворен" ; +lin dark_A = mkA079 "тъмен"; lin dark_N = mkN072 "незнание" ; ---- lin darken_V = actionV (mkV186 "потъмнявам") (mkV174 "потъмня") ; ---- lin darken_V2 = variants {}; @@ -16280,9 +16279,9 @@ lin dissuasive_A = variants {}; lin dissyllable_N = variants {}; lin distaff_N = variants {}; lin distal_A = variants {}; -lin distance_N = mkN049 "отдалеченост" ; +lin distance_N = mkN072 "разстояние"; lin distance_V2 = variants {}; -lin distant_A = mkA079 "далечен" ; +lin distant_A = mkA079 "далечен"; lin distaste_N = variants {}; lin distasteful_A = mkA079 "неприятен"; lin distastefulness_N = variants {}; @@ -18514,9 +18513,9 @@ lin entozoic_A = variants {}; lin entr'acte_N = variants {}; lin entrain_V = variants {}; lin entrain_V2 = variants {}; -lin entrance_N = variants {}; +lin entrance_N = relativeN (mkN001 "вход") (mkA079 "входен"); lin entrance_V2 = variants {}; -lin entrance_fee_N = variants {}; +lin entrance_fee_N = compoundN (mkA079 "входен") (mkN041 "такса"); lin entrance_money_N = variants {}; lin entrancement_N = variants {}; lin entrant_N = variants {}; @@ -18524,8 +18523,8 @@ lin entrap_V2 = variants {}; lin entrapment_N = variants {}; lin entreat_V2 = variants {}; lin entreatingly_Adv = variants {}; -lin entreaty_N = mkN047 "петиция" ; ---- -lin entrecote_N = variants {}; +lin entreaty_N = mkN047 "петиция"; +lin entrecote_N = mkN072 "предястие"; lin entree_N = mkN007 "достъп" ; ---- lin entrench_V2 = variants {}; lin entrenchment_N = mkN071 "окопаване" ; @@ -19282,6 +19281,7 @@ lin excursionist_N = variants {}; lin excusable_A = variants {}; lin excuse_N = variants {}; lin excuse_V2 = variants {}; +lin excuse_me_Interj = ss "извинете ме"; lin execrable_A = variants {}; lin execrate_V2 = variants {}; lin execration_N = mkN041 "анатема" ; ---- @@ -20536,11 +20536,11 @@ lin financing_N = variants {}; lin finback_N = variants {}; lin finch_N = variants {}; lin find_N = variants {}; -lin find_V = stateV (mkV186 "намирам"); -lin find_V2 = dirV2 (stateV (mkV186 "намирам")); -lin find_V2A = mkV2A (stateV (mkV186 "намирам")) noPrep; -lin find_V2V = mkV2V (stateV (mkV186 "намирам")) noPrep noPrep; -lin find_VS = mkVS (stateV (mkV186 "намирам")); +lin find_V = actionV (mkV186 "намирам") (mkV173 "намеря"); +lin find_V2 = dirV2 (actionV (mkV186 "намирам") (mkV173 "намеря")); +lin find_V2A = mkV2A (actionV (mkV186 "намирам") (mkV173 "намеря")) noPrep; +lin find_V2V = mkV2V (actionV (mkV186 "намирам") (mkV173 "намеря")) noPrep noPrep; +lin find_VS = mkVS (actionV (mkV186 "намирам") (mkV173 "намеря")); lin finder_N = variants {}; lin finding_N = mkN072 "заключение" ; lin findings_N = variants {}; @@ -20577,9 +20577,9 @@ lin finial_N = variants {}; lin finical_A = variants {}; lin finicky_A = variants {}; lin finis_N = variants {}; -lin finish_N = mkN036 "край" ; ---- +lin finish_N = mkN007 "финал"; lin finish_V = variants {}; -lin finish_V2 = variants {}; +lin finish_V2 = dirV2 (actionV (mkV186 "завършвам") (mkV176 "завърша")); lin finish_VA = variants {}; lin finisher_N = variants {}; lin finite_A = variants {}; @@ -21210,16 +21210,16 @@ lin follicle_N = variants {}; lin follicular_A = variants {}; lin folliculitis_N = variants {}; lin follies_N = variants {}; -lin follow_V = stateV (mkV186 "последвам"); -lin follow_V2 = dirV2 (stateV (mkV186 "последвам")); +lin follow_V = actionV (mkV186 "следвам") (mkV186 "последвам"); +lin follow_V2 = dirV2 (actionV (mkV186 "следвам") (mkV186 "последвам")); lin follow_VS = variants {}; lin follow_on_N = variants {}; lin follow_through_N = variants {}; -lin follow_up_N = variants {}; -lin follower_N = variants {}; -lin following_A = mkA076 "друг" ; ---- +lin follow_up_N = mkN072 "последствие"; +lin follower_N = mkN031a "последовател"; +lin following_A = mkA079 "следен"; lin following_N = mkN071 "проследяване" ; -lin folly_N = mkN047 "щуротия" ; ---- +lin folly_N = mkN047 "щуротия"; lin foment_V2 = variants {}; lin fomentation_N = variants {}; lin fomite_N = variants {}; @@ -21815,7 +21815,7 @@ lin frictional_A = variants {}; lin frictionless_A = variants {}; lin friday_N = mkN014 "петък" ; lin friday_PN = variants {}; -lin fridge_N = variants {}; +lin fridge_N = relativeN (mkN014 "хладилник") (mkA079 "хладилен"); lin friedcake_N = variants {}; lin friend_N = mkN031a "приятел" ; lin friendless_A = variants {}; @@ -23309,6 +23309,7 @@ lin good_for_nothing_A = variants {}; lin good_for_nothing_N = variants {}; lin good_humoured_A = variants {}; lin good_looking_A = variants {}; +lin good_luck_Interj = ss "късмет"; lin good_morning_Interj = ss "добро утро"; lin good_natured_A = variants {}; lin good_night_Interj = ss "лека нощ"; @@ -23589,8 +23590,8 @@ lin gravity_N = mkN049 "тържественост" ; ---- lin gravure_N = variants {}; lin gravy_N = variants {}; lin gravy_boat_N = variants {}; -lin gray_A = variants {}; -lin gray_N = variants {}; +lin gray_A = mkA076 "сив"; +lin gray_N = substantiveN (mkA076 "сив") (AMasc NonHuman); lin gray_V = variants {}; lin gray_V2 = variants {}; lin grayly_Adv = variants {}; @@ -26060,7 +26061,7 @@ lin hovel_N = mkN032 "бордей"; lin hover_V = variants {}; lin hovercraft_N = variants {}; lin how8many_IDet = {s = \\_ => table QForm ["колко";"колкото"]; n = Pl; nonEmpty = False}; -lin how8much_IDet = {s = \\_ => table QForm ["колко";"колкото"]; n = Pl; nonEmpty = False}; +lin how8much_IDet = {s = \\_ => table QForm ["колко";"колкото"]; n = Sg; nonEmpty = False}; lin how_IAdv = mkIAdv "как"; lin how_d'ye_do_N = variants {}; lin howard_PN = variants {}; @@ -30242,7 +30243,7 @@ lin lappet_N = variants {}; lin lapse_N = variants {}; lin lapse_V = variants {}; lin lapsed_A = variants {}; -lin laptop_N = variants {}; +lin laptop_N = mkN007 "лаптоп"; lin lapwing_N = variants {}; lin larboard_A = variants {}; lin larboard_N = variants {}; @@ -31289,7 +31290,8 @@ lin lissom_A = variants {}; lin lissome_A = mkA076 "гъвкав" ; ---- lin lissomeness_N = variants {}; lin lissomness_N = variants {}; -lin list_N = mkN014 "списък" ; +lin list_N = mkN014 "списък"; +lin list_of_N2 = prepN2 (mkN014 "списък") with_Prep; lin list_V = variants {}; lin list_V2 = dirV2 (actionV (mkV186 "изреждам") (mkV174 "изредя")); lin list_V2V = variants {}; @@ -31655,12 +31657,27 @@ lin loo_N = variants {}; lin loofa_N = variants {}; lin loofah_N = variants {}; lin look_N = mkN066 "лице" ; ---- -lin look_V = variants {}; +lin look_V = actionV (mkV186 "гледам") (mkV181 "видя"); lin look_V2 = variants {}; lin look_V2V = variants {}; lin look_VA = mkVA (actionV (mkV186 "изглеждам") (mkV186 "изгледам")) ; lin look_VV = variants {}; +lin look_ahead_to_V2 = dirV2 (stateV (mkV186 "очаквам")); +lin look_around_at_V2 = prepV2 (medialV (actionV (mkV186 "оглеждам") (mkV186 "огледам")) Acc) in_Prep; +lin look_after_V2 = prepV2 (medialV (actionV (mkV176 "грижа") (mkV176 "погрижа")) Acc) (mkPrep "за" Acc); +lin look_at_V2 = dirV2 (actionV (mkV186 "гледам") (mkV152 "погледна")); +lin look_back_V = variants {}; +lin look_back_on_V2 = variants {}; +lin look_down_V = variants {}; +lin look_for_V2 = dirV2 (stateV (mkV173 "търся")); +lin look_forward_to_V2 = dirV2 (stateV (mkV186 "очаквам")); +lin look_into_V2 = variants {}; +lin look_on_V = variants {}; lin look_over_N = variants {}; +lin look_to_V2 = variants {}; +lin look_toward_V2 = variants {}; +lin look_up_V = actionV (mkV186 "намирам") (mkV173 "намеря"); +lin look_upon_as_V3 = mkV3 (actionV (mkV186 "гледам") (mkV152 "погледна")) (mkPrep "на" Acc) (mkPrep "като на" Acc); lin lookdown_N = variants {}; lin looker_N = variants {}; lin looker_on_N = variants {}; @@ -32203,8 +32220,8 @@ lin mag_N = variants {}; lin magazine_N = mkN072 "списание"; lin magdalen_N = variants {}; lin magdeburg_PN = variants {}; -lin magenta_A = variants {}; -lin magenta_N = variants {}; +lin magenta_A = mkA076 "виолетов"; +lin magenta_N = substantiveN (mkA076 "виолетов") (AMasc NonHuman); lin maggie_PN = variants {}; lin maggot_N = variants {}; lin maggoty_A = variants {}; @@ -32212,7 +32229,7 @@ lin maghull_PN = variants {}; lin magic_A = mkA078 "магически"; lin magic_N = relativeN (mkN047 "магия") (mkA078 "магически"); lin magical_A = mkA078 "магически"; -lin magician_N = mkN031a "заклинател" ; ---- +lin magician_N = relativeN (mkN014a "магьосник") (mkA078 "магьоснически"); lin magisterial_A = variants {}; lin magistracy_N = mkN041 "магистратура" ; ---- lin magistrate_N = mkN007a "магистрат"; @@ -33919,7 +33936,7 @@ lin military_N = mkN041 "войска" ; lin militate_V = variants {}; lin militia_N = mkN047 "милиция" ; lin militiaman_N = variants {}; -lin milk_N = mkN057 "мляко"; +lin milk_N = relativeN (mkN057 "мляко") (mkA079 "млечен"); lin milk_V = stateV (mkV175 "доя"); lin milk_V2 = dirV2 (stateV (mkV175 "доя")); lin milk_churn_N = variants {}; @@ -34609,10 +34626,10 @@ lin monocarp_N = variants {}; lin monocarpic_A = variants {}; lin monochromacy_N = variants {}; lin monochromat_N = variants {}; -lin monochromatic_A = variants {}; -lin monochrome_A = variants {}; +lin monochromatic_A = mkA079 "монохромен"; +lin monochrome_A = mkA079 "монохромен"; lin monochrome_N = variants {}; -lin monocle_N = variants {}; +lin monocle_N = mkN009 "монокъл"; lin monocled_A = variants {}; lin monoclinal_A = variants {}; lin monocline_N = variants {}; @@ -34843,7 +34860,7 @@ lin morphophoneme_N = variants {}; lin morphophonemic_A = variants {}; lin morphophonemics_N = variants {}; lin morris_dance_N = variants {}; -lin morrow_N = mkN054 "утро" ; ---- +lin morrow_N = mkN049 "утрин"; lin morse_N = variants {}; lin morsel_N = variants {}; lin mortal_A = variants {}; @@ -39503,10 +39520,10 @@ lin peaky_A = variants {}; lin peal_N = variants {}; lin peal_V = variants {}; lin peal_V2 = variants {}; -lin peanut_N = mkN014 "фъстък" ; ---- +lin peanut_N = relativeN (mkN014 "фъстък") (mkA076 "фъстъчен"); lin peanuts_N = variants {}; -lin pear_N = mkN041 "круша" ; ---- -lin pearl_N = mkN041 "перла" ; +lin pear_N = relativeN (mkN041 "круша") (mkA076 "крушов"); +lin pearl_N = relativeN (mkN041 "перла") (mkA076 "перлен"); lin pearl_PN = variants {}; lin pearl_V = variants {}; lin pearl_barley_N = variants {}; @@ -40734,8 +40751,8 @@ lin pining_N = variants {}; lin pinion_N = variants {}; lin pinion_V2 = variants {}; lin pinite_N = variants {}; -lin pink_A = variants {}; -lin pink_N = variants {}; +lin pink_A = mkA076 "розов"; +lin pink_N = substantiveN (mkA076 "розов") (AMasc NonHuman); lin pink_V = variants {}; lin pink_V2 = variants {}; lin pinkish_A = variants {}; @@ -41656,7 +41673,7 @@ lin pop_Adv = variants {}; lin pop_N = variants {}; lin pop_V = variants {}; lin pop_V2 = variants {}; -lin popcorn_N = variants {}; +lin popcorn_N = mkN041 "пуканка"; lin pope_N = mkN038 "папа" ; lin popery_N = variants {}; lin popeyed_A = variants {}; @@ -42578,12 +42595,12 @@ lin prison_N = mkN007 "затвор" ; lin prison_breaking_N = variants {}; lin prisoner_N = mkN014a "затворник" ; lin prisonlike_A = variants {}; -lin pristine_A = variants {}; -lin privacy_N = variants {}; -lin private_A = mkA079 "частен" ; -lin private_N = mkN014a "редник" ; ---- +lin pristine_A = mkA079 "първичен"; +lin privacy_N = mkN072 "уединение"; +lin private_A = mkA079 "частен"; +lin private_N = mkN014a "редник"; lin privateer_N = variants {}; -lin privation_N = mkN071 "отнемане" ; ---- +lin privation_N = mkN072 "лишение"; lin privatization_N = mkN047 "приватизация"; lin privatize_V2 = variants {}; lin privet_N = variants {}; @@ -42768,19 +42785,19 @@ lin programme_N = mkN041 "програма" ; lin programme_V2 = variants {}; lin programmerFem_N = mkN041 "програмистка" ; lin programmerMasc_N = mkN007 "програмист" ; -lin programming_N = variants {}; -lin progress_N = mkN014 "напредък" ; -lin progress_V = variants {}; -lin progress_V2 = variants {}; -lin progression_N = variants {}; +lin programming_N = relativeN (mkN071 "програмиране") (mkA079 "програмен"); +lin progress_N = mkN014 "напредък"; +lin progress_V = actionV (mkV186 "напредвам") (mkV152 "напредна"); +lin progress_V2 = dirV2 (actionV (mkV186 "напредвам") (mkV152 "напредна")); +lin progression_N = mkN047 "прогресия"; lin progressive_A = variants {}; lin progressive_N = variants {}; lin progressiveness_N = variants {}; lin progressivism_N = variants {}; lin progymnosperm_N = variants {}; -lin prohibit_V = variants {}; -lin prohibit_V2 = variants {}; -lin prohibition_N = mkN041 "забрана" ; +lin prohibit_V = actionV (mkV186 "забранявам") (mkV174 "забраня"); +lin prohibit_V2 = dirV2 (actionV (mkV186 "забранявам") (mkV174 "забраня")); +lin prohibition_N = mkN041 "забрана"; lin prohibitionist_N = variants {}; lin prohibitive_A = variants {}; lin prohibitory_A = variants {}; @@ -45295,10 +45312,10 @@ lin remember_VS = variants {}; lin remembrance_N = mkN071 "припомняне" ; ---- lin remilitarization_N = variants {}; lin remilitarize_V2 = variants {}; -lin remind_V2 = variants {}; -lin reminder_N = variants {}; +lin remind_V2 = prepV2 (actionV (mkV187 "напомням") (mkV173 "напомня")) (mkPrep "на" Acc); +lin reminder_N = mkN071 "напомняне"; lin reminisce_V = variants {}; -lin reminiscence_N = variants {}; +lin reminiscence_N = mkN007 "спомен"; lin reminiscent_A = variants {}; lin remise_N = variants {}; lin remiss_A = variants {}; @@ -51059,7 +51076,8 @@ lin sorrel_N = variants {}; lin sorrow_N = mkN049 "жалост" ; lin sorrow_V = actionV (mkV164 "жалея") (mkV173 "жаля"); lin sorrowful_A = mkA079 "жален"; -lin sorry_A = variants {}; +lin sorry_A = mkA080 "жалък"; +lin sorry_Interj = ss "съжалявам"; lin sort_N = mkN001 "сорт"; lin sort_V = stateV (mkV186 "сортирам"); lin sort_V2 = dirV2 (stateV (mkV186 "сортирам")); @@ -55176,7 +55194,7 @@ lin thank_offering_N = variants {}; lin thankful_A = variants {}; lin thankfulness_N = variants {}; lin thankless_A = variants {}; -lin thanks_N = variants {}; +lin thanks_Interj = ss "благодаря"; lin thanks_to_Prep = mkPrep "благодарение на" Acc; lin thanksgiving_N = variants {}; lin that_Quant = mkQuant "онзи" "онази" "онова" "онези"; @@ -59976,10 +59994,10 @@ lin viola_PN = variants {}; lin violable_A = variants {}; lin violate_V2 = dirV2 (actionV (mkV186 "нарушавам") (mkV176 "наруша")); lin violation_N = mkN072 "нарушение" ; -lin violator_N = variants {}; +lin violator_N = mkN031a "нарушител"; lin violence_N = mkN072 "насилие" ; -lin violent_A = variants {}; -lin violet_N = variants {}; +lin violent_A = mkA076 "виолетов"; +lin violet_N = substantiveN (mkA076 "виолетов") (AMasc NonHuman); lin violet_PN = variants {}; lin violin_N = mkN041 "цигулка"; lin violinistMasc_N = mkN031a "цигулар"; @@ -61054,8 +61072,8 @@ lin whet_V2 = variants {}; lin whether_Prep = variants {}; lin whetstone_N = variants {}; lin whey_N = mkN041 "суроватка"; -lin whichPl_IDet = variants {}; -lin whichSg_IDet = variants {}; +lin whichPl_IDet = {s = \\_ => table QForm ["кои";"които"]; n = Pl; nonEmpty = False}; +lin whichSg_IDet = {s = \\_ => table QForm ["кой";"който"]; n = Sg; nonEmpty = False}; lin whichever_A = variants {}; lin whichsoever_A = variants {}; lin whiff_N = variants {}; @@ -62017,11 +62035,9 @@ lin yodeling_N = variants {}; lin yodeller_N = variants {}; lin yodh_N = variants {}; lin yoga_N = mkN038 "йога"; -lin yoghourt_N = variants {}; -lin yoghurt_N = variants {}; -lin yogi_N = variants {}; -lin yogistic_A = variants {}; -lin yogurt_N = variants {}; +lin yoghourt_N = compoundN (mkA076 "кисел") (relativeN (mkN057 "мляко") (mkA079 "млечен")); +lin yogi_N = mkN038 "йога"; +lin yogistic_A = mkA078 "йогийски"; lin yoke_N = mkN007 "ярем"; lin yoke_V = actionV (mkV186 "впрягам") (mkV152 "впрегна"); lin yoke_V2 = dirV2 (actionV (mkV186 "впрягам") (mkV152 "впрегна")); @@ -63552,17 +63568,11 @@ lin log_into_V2 = variants {}; lin log_off_V2 = variants {}; lin log_on_V2 = variants {}; lin log_out_V = variants {}; -lin look_after_V2 = variants {}; lin look_around_V = variants {}; -lin look_back_V = variants {}; -lin look_back_on_V2 = variants {}; lin look_down_on_V2 = variants {}; -lin look_for_V2 = variants {}; lin look_forward_V = variants {}; -lin look_forward_to_V2 = variants {}; lin look_in_V2 = variants {}; lin look_in_on_V2 = variants {}; -lin look_into_V2 = variants {}; lin look_on_V = variants {}; lin look_on_as_V3 = variants {}; lin look_out_V = variants {}; @@ -63570,11 +63580,8 @@ lin look_out_for_V2 = variants {}; lin look_over_V2 = variants {}; lin look_round_V2 = variants {}; lin look_through_V2 = variants {}; -lin look_to_V2 = variants {}; -lin look_up_V = variants {}; lin look_up_V2 = variants {}; lin look_up_to_V2 = variants {}; -lin look_upon_as_V2 = variants {}; lin loosen_up_V = variants {}; lin lord_it_over_V2 = variants {}; lin lose_out_V = variants {}; @@ -64828,7 +64835,7 @@ lin wire_up_V2 = variants {}; lin wise_up_V = variants {}; lin word_up_V2 = variants {}; lin work_off_V2 = variants {}; -lin work_on_V2 = variants {}; +lin work_on_V2 = prepV2 (stateV (mkV173 "работя")) (mkPrep "върху" Acc); lin work_out_V = variants {}; lin work_out_V2 = variants {}; lin work_over_V2 = variants {}; diff --git a/src/english/DictEng.gf b/src/english/DictEng.gf index a5a386f18..2fecc48ee 100644 --- a/src/english/DictEng.gf +++ b/src/english/DictEng.gf @@ -3835,6 +3835,7 @@ lin asynergic_A = mkA "asynergic" ; lin asynergy_N = mkN "asynergy" ; lin asystole_N = mkN "asystole" ; lin at_N = mkN "at" ; +lin at_all_Adv = mkAdv "at all"; lin at_Prep = mkPrep "at"; lin at_home_N = mkN "at - home" "at - homes"; lin at_least_AdN = mkAdN "at least"; @@ -6355,10 +6356,8 @@ lin blockish_A = mkA "blockish" ; lin blogger_N = mkN "blogger" ; lin bloke_N = mkN "bloke" "blokes"; lin blolly_N = mkN "blolly" ; -lin blond_A = mkA "blond" "blonder"; -lin blond_N = mkN "blond" "blonds"; -lin blonde_A = compoundA (mkA "blonde"); -lin blonde_N = mkN "blonde" "blondes"; +lin blonde_A = variants {compoundA (mkA "blonde"); mkA "blond" "blonder"}; +lin blonde_N = variants {mkN "blonde" "blondes"; mkN "blond" "blonds"}; lin blood_N = mkN "blood" "bloods"; lin blood_V2 = mkV2 (variants {mkV "blood" "bloods" "blooded" "blooded" "blooding"; mkV "blood" "bloods" "bloodied" "bloodied" "blooding"}); @@ -11241,14 +11240,10 @@ lin colorcast_N = mkN "colorcast" ; lin colorectal_A = mkA "colorectal" ; lin colored_A = mkA "colored" ; lin colorfast_A = mkA "colorfast" ; -lin colorful_A = mkA "colorful" ; lin colorimeter_N = mkN "colorimeter" ; lin colorimetric_A = mkA "colorimetric" ; lin colorimetry_N = mkN "colorimetry" ; lin colorist_N = mkN "colorist" ; -lin colorless_A = mkA "colorless" ; -lin colorlessness_N = mkN "colorlessness" ; -lin colors_N = mkN "colors" ; lin colossal_A = compoundA (mkA "colossal"); lin colossus_N = mkN "colossus" "colossi"; lin colostomy_N = mkN "colostomy" ; @@ -11264,6 +11259,7 @@ lin colour_wash_N = mkN (variants {"colour - wash"; "color - wash"}); lin colourful_A = compoundA (mkA (variants {"colourful"; "colorful"})); lin colouring_N = mkN (variants {"colouring"; "coloring"}) ; lin colourless_A = compoundA (mkA (variants {"colourless"; "colorless"})); +lin colorlessness_N = mkN (variants {"colourlessness"; "colorlessness"}); lin colpitis_N = mkN "colpitis" ; lin colpocele_N = mkN "colpocele" ; lin colpocystitis_N = mkN "colpocystitis" ; @@ -14070,7 +14066,7 @@ lin damask_A = mkA "damask" ; lin damask_N = mkN "damask" ; lin dame_N = mkN "dame" "dames"; lin dammar_N = mkN "dammar" ; -lin damn_A = compoundA (mkA "damn"); +lin damn_A = irregAdv (compoundA (mkA "damn")) "damn"; lin damn_Interj = ss "damn"; lin damn_N = mkN "damn" "damns"; lin damn_V2 = mkV2 (mkV "damn" "damns" "damned" "damned" "damning"); @@ -19258,6 +19254,7 @@ lin excursionist_N = mkN "excursionist" "excursionists"; lin excusable_A = compoundA (mkA "excusable"); lin excuse_N = mkN "excuse" "excuses"; lin excuse_V2 = mkV2 (mkV "excuse" "excuses" "excused" "excused" "excusing"); +lin excuse_me_Interj = ss "excuse me"; lin execrable_A = compoundA (mkA "execrable"); lin execrate_V2 = mkV2 (mkV "execrate" "execrates" "execrated" "execrated" "execrating"); lin execration_N = mkN "execration" "execrations"; @@ -23272,6 +23269,7 @@ lin good_for_nothing_A = compoundA (mkA "good - for - nothing"); lin good_for_nothing_N = mkN "good - for - nothing" "good - for - nothings"; lin good_humoured_A = compoundA (mkA "good - humoured"); lin good_looking_A = compoundA (mkA "good - looking"); +lin good_luck_Interj = ss "good luck"; lin good_morning_Interj = ss "good morning"; lin good_natured_A = compoundA (mkA "good - natured"); lin good_neighbourliness_N = mkN "good - neighbourliness" ; @@ -31230,6 +31228,7 @@ lin lissome_A = compoundA (mkA "lissome"); lin lissomeness_N = mkN "lissomeness" ; lin lissomness_N = mkN "lissomness" ; lin list_N = mkN "list" "lists"; +lin list_of_N2 = mkN2 (mkN "list") (mkPrep "of"); lin list_V = mkV "list" "lists" "listed" "listed" "listing"; lin list_V2 = mkV2 (mkV "list" "lists" "listed" "listed" "listing"); lin list_V2V = mkV2V (mkV "list" "lists" "listed" "listed" "listing") noPrep to_Prep ; @@ -31601,7 +31600,23 @@ lin look_V2 = mkV2 (mkV "look" "looks" "looked" "looked" "looking"); lin look_V2V = mkV2V (mkV "look" "looks" "looked" "looked" "looking") noPrep to_Prep ; lin look_VA = mkVA (mkV "look" "looks" "looked" "looked" "looking"); lin look_VV = mkVV (mkV "look" "looks" "looked" "looked" "looking"); -lin look_over_N = mkN "look - over" "IRREG"; +lin look_ahead_to_V2 = mkV2 (partV (mkV "look") "ahead") (mkPrep "to"); +lin look_after_V2 = prepV2 (mkV "look") (mkPrep "after"); +lin look_around_V = partV (mkV "look") "around"; +lin look_around_at_V2 = mkV2 (partV (mkV "look") "around") (mkPrep "at"); +lin look_at_V2 = mkV2 (mkV "look" "looks" "looked" "looked" "looking") (mkPrep "at"); +lin look_back_V = partV (mkV "look") "back"; +lin look_back_on_V2 = prepV2 (partV (mkV "look") "back") (mkPrep "on"); +lin look_down_V = partV (mkV "look") "down"; +lin look_for_V2 = mkV2 (mkV "look" "looks" "looked" "looked" "looking") (mkPrep "for"); +lin look_forward_to_V2 = prepV2 (partV (mkV "look") "forward") (mkPrep "to"); +lin look_into_V2 = prepV2 (mkV "look") (mkPrep "into"); +lin look_on_V = partV (mkV "look") "on"; +lin look_over_N = mkN "look - over" "look - overs"; +lin look_to_V2 = prepV2 (mkV "look") (mkPrep "to"); +lin look_toward_V2 = prepV2 (mkV "look") (mkPrep "toward"); +lin look_up_V = partV (mkV "look") "up"; +lin look_upon_as_V3 = mkV3 (partV (mkV "look") "upon") noPrep (mkPrep "as"); lin lookdown_N = mkN "lookdown" ; lin looker_N = mkN "looker" "lookers"; lin looker_on_N = mkN "looker - on" "looker - a" {- FIXME: guessed plural form -}; @@ -50984,6 +50999,7 @@ lin sorrow_N = mkN "sorrow" "sorrows"; lin sorrow_V = mkV "sorrow" "sorrows" "sorrowed" "sorrowed" "sorrowing"; lin sorrowful_A = compoundA (mkA "sorrowful"); lin sorry_A = mkA "sorry" "sorrier"; +lin sorry_Interj = ss "sorry"; lin sort_N = mkN "sort" "sorts"; lin sort_V = mkV "sort" "sorts" "sorted" "sorted" "sorting"; lin sort_V2 = mkV2 (mkV "sort" "sorts" "sorted" "sorted" "sorting"); @@ -55091,7 +55107,7 @@ lin thank_offering_N = mkN "thank - offering" "thank - offerings"; lin thankful_A = compoundA (mkA "thankful"); lin thankfulness_N = mkN "thankfulness" ; lin thankless_A = compoundA (mkA "thankless"); -lin thanks_N = mkN "thanks" ; +lin thanks_Interj = ss "thanks"; lin thanksgiving_N = mkN "thanksgiving" "thanksgivings"; lin that_Quant = mkQuant "that" "those" ; lin that_Subj = mkSubj "that"; @@ -61928,11 +61944,9 @@ lin yodeling_N = mkN "yodeling" ; lin yodeller_N = mkN "yodeller" "yodellers"; lin yodh_N = mkN "yodh" ; lin yoga_N = mkN "yoga" ; -lin yoghourt_N = mkN "yoghourt" "yoghourts"; -lin yoghurt_N = mkN "yoghurt" "yoghurts"; +lin yoghourt_N = mkN (variants {"yoghourt"; "yoghurt"; "yogurt"}); lin yogi_N = mkN "yogi" "yogis"; -lin yogistic_A = mkA "yogistic" ; -lin yogurt_N = mkN "yogurt" "yogurts"; +lin yogistic_A = mkA "yogistic"; lin yoke_N = mkN "yoke" "yokes"; lin yoke_V = mkV "yoke" "yokes" "yoked" "yoked" "yoking"; lin yoke_V2 = mkV2 (mkV "yoke" "yokes" "yoked" "yoked" "yoking"); @@ -63551,29 +63565,18 @@ lin log_into_V2 = prepV2 (mkV "log") (mkPrep "into"); lin log_off_V2 = prepV2 (mkV "log") (mkPrep "off"); lin log_on_V2 = prepV2 (mkV "log") (mkPrep "on"); lin log_out_V = partV (mkV "log") "out"; -lin look_after_V2 = prepV2 (mkV "look") (mkPrep "after"); -lin look_around_V = partV (mkV "look") "around"; -lin look_back_V = partV (mkV "look") "back"; -lin look_back_on_V2 = prepV2 (partV (mkV "look") "back") (mkPrep "on"); lin look_down_on_V2 = prepV2 (partV (mkV "look") "down") (mkPrep "on"); -lin look_for_V2 = prepV2 (mkV "look") (mkPrep "for"); lin look_forward_V = partV (mkV "look") "forward"; -lin look_forward_to_V2 = prepV2 (partV (mkV "look") "forward") (mkPrep "to"); lin look_in_V2 = prepV2 (mkV "look") (mkPrep "in"); lin look_in_on_V2 = prepV2 (partV (mkV "look") "in") (mkPrep "on"); -lin look_into_V2 = prepV2 (mkV "look") (mkPrep "into"); -lin look_on_V = partV (mkV "look") "on"; lin look_on_as_V3 = mkV3 (mkV "look") (mkPrep "on") (mkPrep "as"); lin look_out_V = partV (mkV "look") "out"; lin look_out_for_V2 = prepV2 (partV (mkV "look") "out") (mkPrep "for"); lin look_over_V2 = mkV2 (partV (mkV "look") "over"); lin look_round_V2 = prepV2 (mkV "look") (mkPrep "round"); lin look_through_V2 = prepV2 (mkV "look") (mkPrep "through"); -lin look_to_V2 = prepV2 (mkV "look") (mkPrep "to"); -lin look_up_V = partV (mkV "look") "up"; lin look_up_V2 = mkV2 (partV (mkV "look") "up"); lin look_up_to_V2 = prepV2 (partV (mkV "look") "up") (mkPrep "to"); -lin look_upon_as_V2 = mkV2 (partV (mkV "look") "upon as"); lin loosen_up_V = partV (mkV "loosen") "up"; lin lord_it_over_V2 = prepV2 (partV (mkV "lord") "it") (mkPrep "over"); lin lose_out_V = partV IrregEng.lose_V "out"; diff --git a/src/english/DictEngAbs.gf b/src/english/DictEngAbs.gf index 605987558..8a12b3ea8 100644 --- a/src/english/DictEngAbs.gf +++ b/src/english/DictEngAbs.gf @@ -3832,6 +3832,7 @@ fun asynergic_A : A; fun asynergy_N : N; fun asystole_N : N; fun at_N : N; +fun at_all_Adv : Adv; fun at_Prep : Prep ; fun at_home_N : N; fun at_least_AdN : AdN; @@ -6351,8 +6352,6 @@ fun blockish_A : A; fun blogger_N : N; fun bloke_N : N; fun blolly_N : N; -fun blond_A : A; -fun blond_N : N; fun blonde_A : A; fun blonde_N : N; fun blood_N : N; @@ -11222,14 +11221,11 @@ fun colorcast_N : N; fun colorectal_A : A; fun colored_A : A; fun colorfast_A : A; -fun colorful_A : A; fun colorimeter_N : N; fun colorimetric_A : A; fun colorimetry_N : N; fun colorist_N : N; -fun colorless_A : A; fun colorlessness_N : N; -fun colors_N : N; fun colossal_A : A; fun colossus_N : N; fun colostomy_N : N; @@ -19236,6 +19232,7 @@ fun excursionist_N : N; fun excusable_A : A; fun excuse_N : N; fun excuse_V2 : V2; +fun excuse_me_Interj : Interj; fun execrable_A : A; fun execrate_V2 : V2; fun execration_N : N; @@ -23246,6 +23243,7 @@ fun good_for_nothing_A : A; fun good_for_nothing_N : N; fun good_humoured_A : A; fun good_looking_A : A; +fun good_luck_Interj : Interj; fun good_morning_Interj : Interj; fun good_natured_A : A; fun good_neighbourliness_N : N; @@ -31201,6 +31199,7 @@ fun lissome_A : A; fun lissomeness_N : N; fun lissomness_N : N; fun list_N : N; +fun list_of_N2 : N2; fun list_V : V; fun list_V2 : V2; fun list_V2V : V2V; @@ -31570,7 +31569,20 @@ fun look_V2 : V2; fun look_V2V : V2V; fun look_VA : VA; fun look_VV : VV; +fun look_ahead_to_V2 : V2; +fun look_around_at_V2 : V2; +fun look_at_V2 : V2; +fun look_back_on_V2 : V2; +fun look_down_V : V; +fun look_for_V2 : V2; +fun look_forward_to_V2 : V2; +fun look_into_V2 : V2; +fun look_on_V : V; fun look_over_N : N; +fun look_to_V2 : V2; +fun look_toward_V2 : V2; +fun look_up_V : V; +fun look_upon_as_V3 : V3; fun lookdown_N : N; fun looker_N : N; fun looker_on_N : N; @@ -50908,6 +50920,7 @@ fun sorrow_N : N; fun sorrow_V : V; fun sorrowful_A : A; fun sorry_A : A; +fun sorry_Interj : Interj; fun sort_N : N; fun sort_V : V; fun sort_V2 : V2; @@ -55013,7 +55026,7 @@ fun thank_offering_N : N; fun thankful_A : A; fun thankfulness_N : N; fun thankless_A : A; -fun thanks_N : N; +fun thanks_Interj : Interj; fun thanksgiving_N : N; fun that_Quant : Quant; fun that_Subj : Subj; @@ -61847,10 +61860,8 @@ fun yodeller_N : N; fun yodh_N : N; fun yoga_N : N; fun yoghourt_N : N; -fun yoghurt_N : N; fun yogi_N : N; fun yogistic_A : A; -fun yogurt_N : N; fun yoke_N : N; fun yoke_V : V; fun yoke_V2 : V2; @@ -63474,26 +63485,19 @@ fun log_out_V : V; fun look_after_V2 : V2; fun look_around_V : V; fun look_back_V : V; -fun look_back_on_V2 : V2; fun look_down_on_V2 : V2; fun look_for_V2 : V2; fun look_forward_V : V; -fun look_forward_to_V2 : V2; fun look_in_V2 : V2; fun look_in_on_V2 : V2; -fun look_into_V2 : V2; -fun look_on_V : V; fun look_on_as_V3 : V3; fun look_out_V : V; fun look_out_for_V2 : V2; fun look_over_V2 : V2; fun look_round_V2 : V2; fun look_through_V2 : V2; -fun look_to_V2 : V2; -fun look_up_V : V; fun look_up_V2 : V2; fun look_up_to_V2 : V2; -fun look_upon_as_V2 : V2; fun loosen_up_V : V; fun lord_it_over_V2 : V2; fun lose_out_V : V;