From fe12224a7fd586fe6eb30db35168a9f8ffd77c16 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Wed, 27 Mar 2013 20:46:42 +0000 Subject: [PATCH] added a few more multiword expressions in DictEng and a few words in the abstract syntax are not tagged with their senses. There is a new statistical model too --- src/bulgarian/DictEngBul.gf | 146 +++++++++++++++++++++--------------- src/english/DictEng.gf | 42 ++++++++--- src/english/DictEngAbs.gf | 40 ++++++++-- 3 files changed, 150 insertions(+), 78 deletions(-) diff --git a/src/bulgarian/DictEngBul.gf b/src/bulgarian/DictEngBul.gf index be065958e..4efd080df 100644 --- a/src/bulgarian/DictEngBul.gf +++ b/src/bulgarian/DictEngBul.gf @@ -956,12 +956,12 @@ lin advertent_A = variants {}; lin advertise_V = stateV (mkV186 "рекламирам"); lin advertise_V2 = dirV2 (stateV (mkV186 "рекламирам")); lin advertisement_N = mkN041 "реклама"; -lin advertiser_N = mkN039 "рекламаджия"; +lin advertiser_N = mkN031a "рекламодател"; lin advertising_N = variants {}; lin advertorial_N = variants {}; lin advice_N = mkN007 "съвет"; lin advisability_N = variants {}; -lin advisable_A = mkA079 "препоръчителен" ; ---- +lin advisable_A = mkA079 "препоръчителен"; lin advise_V = stateV (mkV186 "съветвам"); lin advise_V2 = dirV2 (stateV (mkV186 "съветвам")); lin advise_VS = variants {}; @@ -3266,7 +3266,12 @@ lin ardrossan_PN = variants {}; lin arduous_A = mkA080 "тежък"; lin arduousness_N = variants {}; lin are_N = variants {}; -lin area_N = mkN041 "повърхнина" ; +lin area_1_N = mkN007 "район"; +lin area_2_N = mkN049 "област"; +lin area_3_N = mkN049 "област"; +lin area_4_N = mkN072 "обкръжение"; +lin area_5_N = mkN007 "район"; +lin area_6_N = mkN049 "площ"; lin areal_A = variants {}; lin areaway_N = variants {}; lin areca_N = variants {}; @@ -5255,7 +5260,7 @@ lin beaver_V = variants {}; lin bebington_PN = variants {}; lin becalmed_A = variants {}; lin because_Subj = ss "защото"; -lin because_of_Prep = variants {}; +lin because_of_Prep = mkPrep "заради" Acc; lin beccles_PN = variants {}; lin beck_N = variants {}; lin becket_N = variants {}; @@ -6799,14 +6804,14 @@ lin bookmarker_N = variants {}; lin bookmobile_N = variants {}; lin bookplate_N = variants {}; lin bookseller_N = variants {}; -lin bookshelf_N = variants {}; -lin bookshop_N = mkN041 "книжарница" ; ---- +lin bookshelf_N = mkN041 "лавица"; +lin bookshop_N = mkN041 "книжарница"; lin bookstall_N = variants {}; lin bookworm_N = variants {}; -lin boom_N = mkN041 "гръмотевица" ; ---- +lin boom_N = mkN001 "бум"; lin boom_V = variants {}; lin boom_V2 = variants {}; -lin boomerang_N = variants {}; +lin boomerang_N = mkN007 "бумеранг"; lin boon_A = variants {}; lin boon_N = variants {}; lin boondoggle_N = variants {}; @@ -6816,11 +6821,11 @@ lin boorishness_N = variants {}; lin boost_N = mkN071 "подпомагане" ; ---- lin boost_V2 = variants {}; lin booster_N = variants {}; -lin boot_N = mkN007 "ботуш" ; ---- +lin boot_N = mkN007 "ботуш"; lin boot_V2 = variants {}; lin bootblack_N = variants {}; lin bootee_N = variants {}; -lin booth_N = mkN041 "будка" ; ---- +lin booth_N = mkN041 "будка"; lin boothose_N = variants {}; lin bootjack_N = variants {}; lin bootlace_N = variants {}; @@ -8048,11 +8053,11 @@ lin buyerFem_N = mkN041 "купувачка"; lin buyerMasc_N = mkN007b "купувач"; lin buying_N = variants {}; lin buyout_N = variants {}; -lin buzz_N = mkN071 "бръмчене" ; ---- -lin buzz_V = stateV (mkV178 "жужа") ; ---- +lin buzz_N = mkN071 "жужене"; +lin buzz_V = stateV (mkV178 "жужа"); lin buzz_V2 = variants {}; lin buzzard_N = variants {}; -lin buzzer_N = mkN007 "зумер" ; ---- +lin buzzer_N = mkN007 "зумер"; lin buzzword_N = variants {}; lin bvm_N = variants {}; lin by_Adv = variants {}; @@ -11694,12 +11699,12 @@ lin conciliate_V2 = variants {}; lin conciliation_N = mkN071 "помиряване" ; lin conciliator_N = variants {}; lin conciliatory_A = variants {}; -lin concise_A = mkA076 "стегнат" ; ---- -lin conciseness_N = mkN049 "стегнатост" ; ---- +lin concise_A = mkA076 "стегнат"; +lin conciseness_N = mkN049 "стегнатост"; lin conclave_N = variants {}; lin conclude_V = actionV (mkV186 "заключавам") (mkV176 "заключа"); lin conclude_V2 = dirV2 (actionV (mkV186 "заключавам") (mkV176 "заключа")); -lin conclude_VS = variants {}; +lin conclude_VS = mkVS (actionV (mkV186 "заключавам") (mkV176 "заключа")); lin conclusion_N = mkN072 "заключение" ; lin conclusive_A = mkA079 "заключителен"; lin concoct_V2 = variants {}; @@ -12102,12 +12107,12 @@ lin consul_N = variants {}; lin consular_A = variants {}; lin consulate_N = mkN054 "консулство" ; lin consulship_N = variants {}; -lin consult_V = variants {}; -lin consult_V2 = variants {}; -lin consultancy_N = variants {}; -lin consultant_N = mkN007a "консултант" ; -lin consultation_N = mkN047 "консултация" ; -lin consultative_A = variants {}; +lin consult_V = stateV (mkV186 "консултирам"); +lin consult_V2 = dirV2 (stateV (mkV186 "консултирам")); +lin consultancy_N = mkN071 "консултиране"; +lin consultant_N = mkN007a "консултант"; +lin consultation_N = mkN047 "консултация"; +lin consultative_A = mkA079 "консумативен"; lin consumable_A = variants {}; lin consume_V = actionV (mkV186 "изтощавам") (mkV174 "изтощя") ; ---- lin consume_V2 = variants {}; @@ -12187,13 +12192,13 @@ lin continue_V = variants {}; lin continue_V2 = variants {}; lin continue_VS = variants {}; lin continue_VV = mkVV (actionV (mkV186 "продължавам") (mkV178 "продължа")); -lin continuity_N = mkN049 "непрекъснатост" ; ---- -lin continuous_A = mkA079 "продължителен" ; +lin continuity_N = mkN049 "непрекъснатост"; +lin continuous_A = mkA079 "продължителен"; lin continuousness_N = variants {}; lin continuum_N = variants {}; lin conto_N = variants {}; lin contort_V2 = variants {}; -lin contortion_N = mkN071 "кривене" ; ---- +lin contortion_N = mkN071 "кривене"; lin contortionist_N = variants {}; lin contour_N = variants {}; lin contour_V2 = variants {}; @@ -17587,8 +17592,8 @@ lin ecology_N = mkN047 "екология"; lin econometric_A = variants {}; lin econometrician_N = variants {}; lin econometrics_N = variants {}; -lin economic_A = mkA079 "икономичен" ; -lin economical_A = mkA078 "икономически"; +lin economic_A = mkA078 "икономически"; +lin economical_A = mkA079 "икономичен" ; lin economics_N = mkN041 "икономика" ; lin economist_N = mkN007a "икономист"; lin economize_V = variants {}; @@ -21296,6 +21301,7 @@ lin foppishness_N = variants {}; lin for_Prep = mkPrep "за" Acc; lin for_example_Adv = mkAdv "например"; lin for_instance_Adv = mkAdv "например"; +lin for_starters_Adv = mkAdv "за начало"; lin forage_N = variants {}; lin forage_V = variants {}; lin forager_N = variants {}; @@ -23151,7 +23157,7 @@ lin gnu_N = mkN065 "гну"; lin go_A = variants {}; lin go_N = variants {}; lin go_V = actionV (mkV186 "отивам") (mkV146 "отида"); -lin go_V2 = dirV2 (actionV (mkV186 "отивам") (mkV146 "отида")); +lin go_V2 = dirV2 (actionV (mkV186 "минавам") (mkV152 "мина")); lin go_VA = mkVA (actionV (mkV186 "ставам") (mkV186 "оставам")); lin go_VS = mkVS (actionV (mkV186 "отивам") (mkV146 "отида")); lin go_VV = mkVV (actionV (mkV186 "отивам") (mkV146 "отида")); @@ -26246,7 +26252,7 @@ lin husbandly_A = variants {}; lin husbandman_N = variants {}; lin husbandry_N = mkN054 "съпружество"; lin hush_N = variants {}; -lin hush_V = stateV (mkV178 "мълча") ; ---- +lin hush_V = stateV (mkV178 "мълча"); lin hush_V2 = variants {}; lin hush_hush_A = variants {}; lin hush_money_N = variants {}; @@ -29956,7 +29962,7 @@ lin laborer_N = variants {}; lin laborious_A = variants {}; lin laboriousness_N = variants {}; lin laborsaving_A = variants {}; -lin labour_N = mkN001 "труд" ; +lin labour_N = mkN001 "труд"; lin labour_V = variants {}; lin labour_V2 = variants {}; lin labour_saving_A = variants {}; @@ -33003,9 +33009,11 @@ lin maturate_V = variants {}; lin maturation_N = mkN071 "узряване"; lin maturational_A = variants {}; lin mature_A = mkA081 "узрял" ; -lin mature_V = variants {}; -lin mature_V2 = variants {}; -lin maturity_N = mkN049 "зрелост" ; +lin mature_V = actionV (mkV186 "узрявам") (mkV160 "узрея"); +lin mature_V2 = dirV2 (actionV (mkV186 "узрявам") (mkV160 "узрея")); +lin maturity_1_N = mkN049 "зрелост"; +lin maturity_2_N = mkN049 "зрелост"; +lin maturity_3_N = mkN007 "падеж"; lin matutinal_A = variants {}; lin matzo_N = variants {}; lin maud_PN = variants {}; @@ -35154,7 +35162,7 @@ lin multiplexer_N = variants {}; lin multiplicand_N = variants {}; lin multiplication_N = mkN072 "умножение"; lin multiplicative_A = variants {}; -lin multiplicity_N = mkN049 "многостранност" ; ---- +lin multiplicity_N = mkN049 "многостранност"; lin multiplier_N = variants {}; lin multiply_Adv = variants {}; lin multiply_V = actionV (mkV186 "умножавам") (mkV178 "умножа"); @@ -36787,7 +36795,7 @@ lin notice_V = variants {}; lin notice_V2 = variants {}; lin notice_VS = variants {}; lin notice_board_N = variants {}; -lin noticeable_A = mkA079 "очевиден" ; ---- +lin noticeable_A = mkA079 "очевиден"; lin noticer_N = variants {}; lin notifiable_A = variants {}; lin notification_N = mkN071 "известяване" ; @@ -37693,8 +37701,8 @@ lin orang_outan_N = mkN007 "орангутан"; lin orang_outang_N = mkN007 "орангутан"; lin orang_utan_N = mkN007 "орангутан"; lin orange_A = mkA076 "оранжев"; -lin orange_N = mkN054 "оранжево"; -lin orange_fruit_N = mkN007 "портокал"; +lin orange_1_N = mkN007 "портокал"; +lin orange_2_N = mkN054 "оранжево"; lin orangeade_N = mkN041 "оранжада"; lin orangeman_N = variants {}; lin orangery_N = variants {}; @@ -39127,7 +39135,8 @@ lin parsnip_N = variants {}; lin parson_N = variants {}; lin parsonage_N = variants {}; lin part_Adv = variants {}; -lin part_N = mkN049 "част" ; +lin part_N = mkN049 "част"; +lin part_of_N2 = prepN2 (mkN049 "част") (mkPrep "от" Acc); lin part_V = variants {}; lin part_V2 = variants {}; lin part_owner_N = variants {}; @@ -40052,6 +40061,7 @@ lin perspire_V = variants {}; lin perspirer_N = variants {}; lin persuadable_A = variants {}; lin persuade_V2 = dirV2 (actionV (mkV186 "убеждавам") (mkV174 "убедя")); +lin persuade_V2V = mkV2V (actionV (mkV186 "убеждавам") (mkV174 "убедя")) noPrep (mkPrep "да" Acc); lin persuader_N = variants {}; lin persuasion_N = variants {}; lin persuasive_A = variants {}; @@ -42792,10 +42802,10 @@ lin proliferate_V2 = variants {}; lin proliferation_N = mkN047 "пролиферация" ; lin prolific_A = variants {}; lin proline_N = variants {}; -lin prolix_A = mkA079 "многословен" ; ---- -lin prolixity_N = variants {}; +lin prolix_A = mkA079 "многословен"; +lin prolixity_N = mkN072 "многословие"; lin prologue_N = variants {}; -lin prolong_V2 = variants {}; +lin prolong_V2 = dirV2 (actionV (mkV186 "продължавам") (mkV178 "продължа")); lin prolongation_N = variants {}; lin prolonge_N = variants {}; lin prolusory_A = variants {}; @@ -42964,7 +42974,8 @@ lin proscription_N = variants {}; lin prose_N = variants {}; lin prosecute_V2 = variants {}; lin prosecution_N = mkN071 "преследване" ; -lin prosecutor_N = mkN041 "обвинителка" ; +lin prosecutorMasc_N = mkN031a "обвинител"; +lin prosecutorFem_N = mkN041 "обвинителка"; lin proselyte_N = variants {}; lin proselytism_N = variants {}; lin proselytize_V = variants {}; @@ -43279,6 +43290,7 @@ lin publish_V = stateV (mkV186 "публикувам"); lin publish_V2 = dirV2 (stateV (mkV186 "публикувам")); lin publishable_A = variants {}; lin publisher_N = mkN031a "издател"; +lin publishing_A = mkA078 "издателски"; lin puccoon_N = variants {}; lin puce_N = variants {}; lin puck_N = variants {}; @@ -43506,8 +43518,8 @@ lin purser_N = variants {}; lin purslane_N = variants {}; lin pursuance_N = variants {}; lin pursuant_A = variants {}; -lin pursue_V = actionV (mkV186 "преследвам") (mkV174 "преследя") ; ---- -lin pursue_V2 = variants {}; +lin pursue_V = actionV (mkV186 "преследвам") (mkV174 "преследя"); +lin pursue_V2 = dirV2 (actionV (mkV186 "продължавам") (mkV178 "продължа")); lin pursued_N = variants {}; lin pursuer_N = variants {}; lin pursuit_N = variants {}; @@ -45618,7 +45630,7 @@ lin resign_V = actionV (mkV186 "напускам") (mkV152 "напусна"); lin resign_V2 = dirV2 (actionV (mkV186 "напускам") (mkV152 "напусна")); lin resign_V2V = variants {}; lin resign_VS = variants {}; -lin resign_VV = variants {}; +lin resign_VV = mkVV (medialV (actionV (mkV186 "отказвам") (mkV156 "откажа")) Acc); lin resignation_N = mkN072 "уволнение" ; lin resignedly_Adv = variants {}; lin resilience_N = mkN049 "еластичност" ; ---- @@ -50344,8 +50356,8 @@ lin slug_V = variants {}; lin slug_V2 = variants {}; lin sluggard_N = variants {}; lin slugger_N = variants {}; -lin sluggish_A = variants {}; -lin sluggishness_N = variants {}; +lin sluggish_A = mkA079 "муден"; +lin sluggishness_N = mkN049 "мудност"; lin sluice_N = variants {}; lin sluice_V = variants {}; lin sluice_V2 = variants {}; @@ -52135,7 +52147,13 @@ lin start_V = actionV (mkV186 "започвам") (mkV152 "започна"); lin start_V2 = dirV2 (actionV (mkV186 "започвам") (mkV152 "започна")); lin start_ing_VV = mkVV (actionV (mkV186 "започвам") (mkV152 "започна")); lin start_to_VV = mkVV (actionV (mkV186 "започвам") (mkV152 "започна")); -lin starter_N = mkN007 "стартер"; +lin starter_1_N = mkN007 "стартер"; +lin starter_2_N = mkN007 "стартер"; +lin starter_3_N = mkN007 "стартер"; +lin starter_4_N = mkN014 "новак"; +lin starter_5_N = mkN072 "предястие"; +lin starter_6_N = mkN041 "манивела"; +lin starter_7_N = mkN047 "мая"; lin starting_gate_N = variants {}; lin starting_point_N = variants {}; lin starting_post_N = variants {}; @@ -52602,7 +52620,7 @@ lin stoop_V2 = variants {}; lin stooper_N = variants {}; lin stop_N = mkN071 "запиране" ; lin stop_V = variants {}; -lin stop_V2 = variants {}; +lin stop_V2 = dirV2 (actionV (mkV186 "спирам") (mkV150 "спра")); lin stop_VV = variants {}; lin stopcock_N = variants {}; lin stopgap_N = variants {}; @@ -54921,10 +54939,10 @@ lin tensity_N = variants {}; lin tensor_N = variants {}; lin tent_N = variants {}; lin tent_peg_N = variants {}; -lin tentacle_N = mkN054 "пипало" ; ---- +lin tentacle_N = mkN054 "пипало"; lin tentacled_A = variants {}; lin tentacular_A = variants {}; -lin tentative_A = variants {}; +lin tentative_A = mkA079 "пробен"; lin tenter_N = variants {}; lin tenterden_PN = variants {}; lin tenterhook_N = variants {}; @@ -57333,9 +57351,11 @@ lin typesetter_N = variants {}; lin typewriter_N = variants {}; lin typewritten_A = variants {}; lin typhoid_N = variants {}; -lin typhoon_N = mkN007 "тайфун" ; ---- +lin typhoon_N = mkN007 "тайфун"; lin typhus_N = variants {}; -lin typical_A = mkA079 "типичен" ; +lin typical_1_A = mkA079 "типичен"; +lin typical_2_A = mkA079 "характерен"; +lin typical_3_A = mkA076 "обикновен"; lin typicality_N = variants {}; lin typification_N = variants {}; lin typify_V2 = variants {}; @@ -58365,12 +58385,17 @@ lin unironed_A = variants {}; lin unisex_A = variants {}; lin unisexual_A = variants {}; lin unison_N = variants {}; -lin unit_N = mkN041 "единица" ; +lin unit_1_N = mkN041 "единица"; +lin unit_2_N = mkN054 "звено"; +lin unit_3_N = mkN054 "звено"; +lin unit_4_N = mkN054 "звено"; +lin unit_5_N = mkN054 "звено"; +lin unit_6_N = mkN054 "звено"; lin unit_V2V = variants {}; lin unitarian_A = variants {}; lin unitarian_N = variants {}; lin unitarianism_N = variants {}; -lin unitary_A = mkA079 "единен" ; ---- +lin unitary_A = mkA079 "единен"; lin unite_V = variants {}; lin unite_V2 = variants {}; lin unitization_N = variants {}; @@ -61771,8 +61796,8 @@ lin wristlet_N = mkN041 "гривна" ; ---- lin wristwatch_N = variants {}; lin writ_N = variants {}; lin writ_large_A = variants {}; -lin write_V = stateV (mkV159 "пиша"); -lin write_V2 = variants {}; +lin write_V = actionV (mkV159 "пиша") (mkV159 "напиша"); +lin write_V2 = dirV2 (actionV (mkV159 "пиша") (mkV159 "напиша")); lin write_VS = variants {}; lin write_VV = variants {}; lin write_off_N = variants {}; @@ -63223,7 +63248,7 @@ lin hang_onto_V2 = variants {}; lin hang_out_V = variants {}; lin hang_out_V2 = variants {}; lin hang_out_for_V2 = variants {}; -lin hang_over_V2 = variants {}; +lin hang_over_V2 = prepV2 (stateV (mkV177 "вися")) (mkPrep "над" Acc); lin hang_together_V = variants {}; lin hang_up_V = variants {}; lin hang_up_V2 = variants {}; @@ -63547,7 +63572,7 @@ lin make_away_with_V2 = variants {}; lin make_do_with_V2 = variants {}; lin make_for_V2 = variants {}; lin make_into_V2 = variants {}; -lin make_it_V = variants {}; +lin make_it_V = actionV (mkV186 "успявам") (mkV164 "успея"); lin make_it_up_to_V2 = variants {}; lin make_of_V3 = mkV3 (actionV (mkV173 "правя") (mkV173 "направя")) noPrep (mkPrep "от" Acc); lin make_off_V = variants {}; @@ -64319,11 +64344,10 @@ lin spring_on_V3 = variants {}; lin spring_up_V = variants {}; lin sprout_up_V = variants {}; lin spruce_up_V2 = variants {}; -lin spun_off_V = variants {}; lin spur_on_V2 = variants {}; lin square_away_V2 = variants {}; lin square_off_V = variants {}; -lin square_off_against_V2 = variants {}; +lin square_off_against_V3 = variants {}; lin square_up_V = variants {}; lin square_up_to_V2 = variants {}; lin square_with_V2 = variants {}; diff --git a/src/english/DictEng.gf b/src/english/DictEng.gf index 80e5dcdf6..2a6702dd8 100644 --- a/src/english/DictEng.gf +++ b/src/english/DictEng.gf @@ -3244,7 +3244,12 @@ lin ardrossan_PN = mkPN "Ardrossan"; lin arduous_A = compoundA (mkA "arduous"); lin arduousness_N = mkN "arduousness" ; lin are_N = mkN "are" "ares"; -lin area_N = mkN "area" "areas"; +lin area_1_N = mkN "area" "areas"; +lin area_2_N = mkN "area" "areas"; +lin area_3_N = mkN "area" "areas"; +lin area_4_N = mkN "area" "areas"; +lin area_5_N = mkN "area" "areas"; +lin area_6_N = mkN "area" "areas"; lin areal_A = mkA "areal" ; lin areaway_N = mkN "areaway" ; lin areca_N = mkN "areca" "arecas"; @@ -21261,6 +21266,7 @@ lin foppishness_N = mkN "foppishness" ; lin for_Prep = mkPrep "for"; lin for_example_Adv = mkAdv "for example"; lin for_instance_Adv = mkAdv "for instance"; +lin for_starters_Adv = mkAdv "for starters"; lin forage_N = mkN "forage" ; lin forage_V = mkV "forage" "forages" "foraged" "foraged" "foraging"; lin forager_N = mkN "forager" ; @@ -32953,7 +32959,9 @@ lin maturational_A = mkA "maturational" ; lin mature_A = compoundA (mkA "mature"); lin mature_V = mkV "mature" "matures" "matured" "matured" "maturing"; lin mature_V2 = mkV2 (mkV "mature" "matures" "matured" "matured" "maturing"); -lin maturity_N = mkN "maturity" ; +lin maturity_1_N = mkN "maturity"; +lin maturity_2_N = mkN "maturity"; +lin maturity_3_N = mkN "maturity"; lin matutinal_A = compoundA (mkA "matutinal"); lin matzo_N = mkN "matzo" ; lin maud_PN = mkPN "Maud"; @@ -37647,9 +37655,10 @@ lin orang_outan_N = mkN "orang - outan" "orang - outans"; lin orang_outang_N = mkN "orang - outang" "orang - outangs"; lin orang_utan_N = mkN "orang - utan" "orang - utans"; lin orange_A = compoundA (mkA "orange"); -lin orange_N = mkN "orange" "oranges"; +lin orange_1_N = mkN "orange" "oranges"; +lin orange_2_N = mkN "orange" "oranges"; lin orangeade_N = mkN "orangeade" ; -lin orangeman_N = mkN "orangeman" "orangemen" {- FIXME: guessed plural form -}; +lin orangeman_N = mkN "orangeman" "orangemen"; lin orangery_N = mkN "orangery" ; lin orangewood_N = mkN "orangewood" ; lin orangutan_N = mkN "orangutan" ; @@ -39075,6 +39084,7 @@ lin parson_N = mkN "parson" "parsons"; lin parsonage_N = mkN "parsonage" "parsonages"; lin part_Adv = mkAdv "part"; lin part_N = mkN "part" "parts"; +lin part_of_N2 = mkN2 (mkN "part" "parts") (mkPrep "of"); lin part_V = mkV "part" "parts" "parted" "parted" "parting"; lin part_V2 = mkV2 (mkV "part" "parts" "parted" "parted" "parting"); lin part_owner_N = mkN "part - owner" "part - owners"; @@ -39998,6 +40008,7 @@ lin perspire_V = mkV "perspire" "perspires" "perspired" "perspired" "perspiring" lin perspirer_N = mkN "perspirer" ; lin persuadable_A = compoundA (mkA "persuadable"); lin persuade_V2 = mkV2 (mkV "persuade" "persuades" "persuaded" "persuaded" "persuading"); +lin persuade_V2V = mkV2V (mkV "persuade" "persuades" "persuaded" "persuaded" "persuading") noPrep to_Prep; lin persuader_N = mkN "persuader" ; lin persuasion_N = mkN "persuasion" "persuasions"; lin persuasive_A = compoundA (mkA "persuasive"); @@ -43223,6 +43234,7 @@ lin publish_V = mkV "publish"; lin publish_V2 = mkV2 (mkV "publish" "publishes" "published" "published" "publishing"); lin publishable_A = mkA "publishable" ; lin publisher_N = mkN "publisher" "publishers"; +lin publishing_A = mkA "publishing"; lin puccoon_N = mkN "puccoon" ; lin puce_N = mkN "puce" ; lin puck_N = mkN "puck" "pucks"; @@ -52073,7 +52085,13 @@ lin start_V = mkV "start" "starts" "started" "started" "starting"; lin start_V2 = mkV2 (mkV "start" "starts" "started" "started" "starting"); lin start_ing_VV = ingVV (mkV "start" "starts" "started" "started" "starting"); lin start_to_VV = mkVV (mkV "start" "starts" "started" "started" "starting"); -lin starter_N = mkN "starter" "starters"; +lin starter_1_N = mkN "starter" "starters"; +lin starter_2_N = mkN human (mkN "starter" "starters"); +lin starter_3_N = mkN human (mkN "starter" "starters"); +lin starter_4_N = mkN "starter" "starters"; +lin starter_5_N = mkN "starter" "starters"; +lin starter_6_N = mkN "starter" "starters"; +lin starter_7_N = mkN "starter" "starters"; lin starting_gate_N = mkN "starting - gate" "starting - gates"; lin starting_point_N = mkN "starting - point" "starting - points"; lin starting_post_N = mkN "starting - post" "starting - posts"; @@ -57274,7 +57292,9 @@ lin typewritten_A = compoundA (mkA "typewritten"); lin typhoid_N = mkN "typhoid" ; lin typhoon_N = mkN "typhoon" "typhoons"; lin typhus_N = mkN "typhus" ; -lin typical_A = compoundA (mkA "typical"); +lin typical_1_A = compoundA (mkA "typical"); +lin typical_2_A = compoundA (mkA "typical"); +lin typical_3_A = compoundA (mkA "typical"); lin typicality_N = mkN "typicality" ; lin typification_N = mkN "typification" ; lin typify_V2 = mkV2 (mkV "typify" "typifies" "typified" "typified" "typifying"); @@ -58304,7 +58324,12 @@ lin unironed_A = mkA "unironed" ; lin unisex_A = compoundA (mkA "unisex"); lin unisexual_A = mkA "unisexual" ; lin unison_N = mkN "unison" ; -lin unit_N = mkN "unit" "units"; +lin unit_1_N = mkN "unit" "units"; +lin unit_2_N = mkN "unit" "units"; +lin unit_3_N = mkN "unit" "units"; +lin unit_4_N = mkN "unit" "units"; +lin unit_5_N = mkN "unit" "units"; +lin unit_6_N = mkN "unit" "units"; lin unit_V2V = mkV2V (mkV "unit") noPrep to_Prep ; lin unitarian_A = compoundA (mkA "unitarian"); lin unitarian_N = mkN "unitarian" "unitarians"; @@ -64345,11 +64370,10 @@ lin spring_on_V3 = mkV3 IrregEng.spring_V noPrep (mkPrep "on"); lin spring_up_V = partV IrregEng.spring_V "up"; lin sprout_up_V = partV (mkV "sprout") "up"; lin spruce_up_V2 = mkV2 (partV (mkV "spruce") "up"); -lin spun_off_V = partV (mkV "spun") "off"; lin spur_on_V2 = mkV2 (partV (mkV "spur") "on"); lin square_away_V2 = mkV2 (partV (mkV "square") "away"); lin square_off_V = partV (mkV "square") "off"; -lin square_off_against_V2 = prepV2 (partV (mkV "square") "off") (mkPrep "against"); +lin square_off_against_V3 = mkV3 (partV (mkV "square") "off") noPrep (mkPrep "against"); lin square_up_V = partV (mkV "square") "up"; lin square_up_to_V2 = prepV2 (partV (mkV "square") "up") (mkPrep "to"); lin square_with_V2 = prepV2 (mkV "square") (mkPrep "with"); diff --git a/src/english/DictEngAbs.gf b/src/english/DictEngAbs.gf index aa390ba39..6f8c3737b 100644 --- a/src/english/DictEngAbs.gf +++ b/src/english/DictEngAbs.gf @@ -3241,7 +3241,12 @@ fun ardrossan_PN : PN; fun arduous_A : A; fun arduousness_N : N; fun are_N : N; -fun area_N : N; +fun area_1_N : N; +fun area_2_N : N; +fun area_3_N : N; +fun area_4_N : N; +fun area_5_N : N; +fun area_6_N : N; fun areal_A : A; fun areaway_N : N; fun areca_N : N; @@ -21239,6 +21244,7 @@ fun foppishness_N : N; fun for_Prep : Prep; fun for_example_Adv : Adv; fun for_instance_Adv : Adv; +fun for_starters_Adv : Adv; fun forage_N : N; fun forage_V : V; fun forager_N : N; @@ -32922,7 +32928,9 @@ fun maturational_A : A; fun mature_A : A; fun mature_V : V; fun mature_V2 : V2; -fun maturity_N : N; +fun maturity_1_N : N; +fun maturity_2_N : N; +fun maturity_3_N : N; fun matutinal_A : A; fun matzo_N : N; fun maud_PN : PN; @@ -37586,7 +37594,8 @@ fun orang_outan_N : N; fun orang_outang_N : N; fun orang_utan_N : N; fun orange_A : A; -fun orange_N : N; +fun orange_1_N : N; +fun orange_2_N : N; fun orangeade_N : N; fun orangeman_N : N; fun orangery_N : N; @@ -39014,6 +39023,7 @@ fun parson_N : N; fun parsonage_N : N; fun part_Adv : Adv; fun part_N : N; +fun part_of_N2 : N2; fun part_V : V; fun part_V2 : V2; fun part_owner_N : N; @@ -39937,6 +39947,7 @@ fun perspire_V : V; fun perspirer_N : N; fun persuadable_A : A; fun persuade_V2 : V2; +fun persuade_V2V : V2V; fun persuader_N : N; fun persuasion_N : N; fun persuasive_A : A; @@ -43162,6 +43173,7 @@ fun publish_V : V; fun publish_V2 : V2; fun publishable_A : A; fun publisher_N : N; +fun publishing_A : A; fun puccoon_N : N; fun puce_N : N; fun puck_N : N; @@ -51996,7 +52008,13 @@ fun start_V : V; fun start_V2 : V2; fun start_ing_VV : VV; fun start_to_VV : VV; -fun starter_N : N; +fun starter_1_N : N; +fun starter_2_N : N; +fun starter_3_N : N; +fun starter_4_N : N; +fun starter_5_N : N; +fun starter_6_N : N; +fun starter_7_N : N; fun starting_gate_N : N; fun starting_point_N : N; fun starting_post_N : N; @@ -57192,7 +57210,9 @@ fun typewritten_A : A; fun typhoid_N : N; fun typhoon_N : N; fun typhus_N : N; -fun typical_A : A; +fun typical_1_A : A; +fun typical_2_A : A; +fun typical_3_A : A; fun typicality_N : N; fun typification_N : N; fun typify_V2 : V2; @@ -58222,7 +58242,12 @@ fun unironed_A : A; fun unisex_A : A; fun unisexual_A : A; fun unison_N : N; -fun unit_N : N; +fun unit_1_N : N; +fun unit_2_N : N; +fun unit_3_N : N; +fun unit_4_N : N; +fun unit_5_N : N; +fun unit_6_N : N; fun unit_V2V : V2V; fun unitarian_A : A; fun unitarian_N : N; @@ -64266,11 +64291,10 @@ fun spring_on_V3 : V3; fun spring_up_V : V; fun sprout_up_V : V; fun spruce_up_V2 : V2; -fun spun_off_V : V; fun spur_on_V2 : V2; fun square_away_V2 : V2; fun square_off_V : V; -fun square_off_against_V2 : V2; +fun square_off_against_V3 : V3; fun square_up_V : V; fun square_up_to_V2 : V2; fun square_with_V2 : V2;