diff --git a/lib/src/bulgarian/DictEngBul.gf b/lib/src/bulgarian/DictEngBul.gf index 6b3307ade..82cadb3c7 100644 --- a/lib/src/bulgarian/DictEngBul.gf +++ b/lib/src/bulgarian/DictEngBul.gf @@ -1848,6 +1848,7 @@ lin aryan_A = mkA078 "арийски"; lin aryanMasc_N = mkN013 "ариец"; lin aryanFem_N = mkN041 "арийка"; lin as_Prep = mkPrep "като" Acc; +lin as_well_Adv = mkAdv "също"; lin asap_PN = mkPN "АСАП" Masc; lin asbestos_N = mkN007 "азбест"; lin ascend_V = variants {}; @@ -4388,6 +4389,7 @@ lin brindled_A = variants {}; lin brine_N = variants {}; lin bring_V2 = variants {}; lin bring_V2V = variants {}; +lin bring_V3 = variants {}; lin brink_N = variants {}; lin brinkmanship_N = variants {}; lin briny_A = variants {}; @@ -4988,6 +4990,7 @@ lin call_N = mkN014 "повик" ; lin call_V = variants {}; lin call_V2 = variants {}; lin call_V2V = variants {}; +lin call_V2A = variants {}; lin call_V3 = variants {}; lin call_VS = variants {}; lin call_box_N = variants {}; @@ -7500,7 +7503,7 @@ lin consider_V = actionV (mkV186 "разглеждам") (mkV186 "разглед lin consider_V2 = dirV2 (actionV (mkV186 "разглеждам") (mkV186 "разгледам")); lin consider_V3 = mkV3 (actionV (mkV186 "разглеждам") (mkV186 "разгледам")) noPrep (mkPrep "като" Acc); lin consider_V2V = mkV2V (actionV (mkV186 "разглеждам") (mkV186 "разгледам")) noPrep noPrep; -lin consider_VA = mkVA (actionV (mkV186 "разглеждам") (mkV186 "разгледам")); +lin consider_V2A = mkV2A (actionV (mkV186 "разглеждам") (mkV186 "разгледам")) noPrep; lin consider_VV = mkVV (actionV (mkV186 "разглеждам") (mkV186 "разгледам")); lin consider_VS = mkVS (actionV (mkV186 "разглеждам") (mkV186 "разгледам")); lin considerable_A = mkA076 "особен" ; @@ -9322,7 +9325,8 @@ lin deed_N = mkN041 "постъпка" ; lin deed_box_N = variants {}; lin deedpoll_N = variants {}; lin deem_V2 = variants {}; -lin deem_VS = variants {}; +lin deem_V2V = variants {}; +lin deem_V2A = variants {}; lin deep_A = mkA076 "дълбок" ; lin deep_Adv = variants {}; lin deep_N = variants {}; @@ -9762,8 +9766,7 @@ lin desideratum_N = variants {}; lin design_N = mkN071 "проектиране" ; lin design_V = variants {}; lin design_V2 = variants {}; -lin design_VV = variants {}; -lin design_VS = variants {}; +lin design_V2V = variants {}; lin designate_A = variants {}; lin designate_V = variants {}; lin designate_V2 = variants {}; @@ -11226,7 +11229,6 @@ lin dss_N = variants {}; lin dti_N = variants {}; lin dual_A = mkA085 "двоен" ; lin dub_V2 = variants {}; -lin dub_VS = variants {}; lin dubbin_N = variants {}; lin dubiety_N = variants {}; lin dubious_A = variants {}; @@ -12610,6 +12612,7 @@ lin excitingly_Adv = variants {}; lin excl_PN = variants {}; lin exclaim_V = variants {}; lin exclaim_V2 = variants {}; +lin exclaim_VQ = variants {}; lin exclamation_N = variants {}; lin exclamatory_A = variants {}; lin exclude_V2 = variants {}; @@ -14680,6 +14683,7 @@ lin fumbler_N = variants {}; lin fume_N = variants {}; lin fume_V = variants {}; lin fume_V2 = variants {}; +lin fume_VS = variants {}; lin fumigate_V2 = variants {}; lin fumigation_N = variants {}; lin fun_N = variants {}; @@ -18265,7 +18269,6 @@ lin inclose_V2 = variants {}; lin inclosure_N = variants {}; lin include_V = variants {}; lin include_V2 = variants {}; -lin include_VS = variants {}; lin include_VV = variants {}; lin inclusion_N = mkN071 "включване" ; lin inclusive_A = variants {}; @@ -25050,6 +25053,7 @@ lin offensiveness_N = variants {}; lin offer_N = mkN041 "оферта" ; lin offer_V = variants {}; lin offer_V2 = variants {}; +lin offer_V2V = variants {}; lin offer_VV = variants {}; lin offer_VS = variants {}; lin offering_N = variants {}; @@ -25302,6 +25306,7 @@ lin opprobrium_N = variants {}; lin oppugn_V2 = variants {}; lin opt_V = variants {}; lin opt_V2V = variants {}; +lin opt_VV = variants {}; lin opt_VS = variants {}; lin optative_A = variants {}; lin optative_N = variants {}; @@ -28947,6 +28952,7 @@ lin prop_V2 = variants {}; lin propaganda_N = variants {}; lin propagandist_N = variants {}; lin propagandize_V = variants {}; +lin propagandize_V2 = variants {}; lin propagate_V = variants {}; lin propagate_V2 = variants {}; lin propagation_N = variants {}; @@ -29187,17 +29193,17 @@ lin pub_crawl_N = variants {}; lin pub_crawl_V = variants {}; lin puberty_N = variants {}; lin pubic_A = variants {}; -lin public_A = mkA079 "явен" ; -lin public_N = mkN041 "публика" ; +lin public_A = mkA076 "обществен"; +lin public_N = mkN041 "публика"; lin public_spirited_A = variants {}; lin publican_N = variants {}; -lin publication_N = mkN047 "публикация" ; +lin publication_N = mkN047 "публикация"; lin publicist_N = variants {}; lin publicity_N = variants {}; lin publicize_V2 = variants {}; lin publish_V = variants {}; lin publish_V2 = variants {}; -lin publisher_N = mkN054 "книгоиздателство" ; +lin publisher_N = mkN054 "книгоиздателство"; lin puce_N = variants {}; lin puck_N = variants {}; lin pucker_N = variants {}; @@ -29827,6 +29833,7 @@ lin rainwater_N = variants {}; lin rainy_A = variants {}; lin raise_N = variants {}; lin raise_V2 = variants {}; +lin raise_V2V = variants {}; lin raiser_N = variants {}; lin raisin_N = variants {}; lin raison_d'etre_N = variants {}; @@ -33849,6 +33856,7 @@ lin show_V = variants {}; lin show_V2 = variants {}; lin show_V2V = variants {}; lin show_VS = variants {}; +lin show_VQ = variants {}; lin show_up_V = variants {}; lin show_business_N = variants {}; lin show_off_N = variants {}; @@ -36616,6 +36624,7 @@ lin stump_V2 = variants {}; lin stumper_N = variants {}; lin stumpy_A = variants {}; lin stun_V2 = variants {}; +lin stun_V2S = variants {}; lin stunne_V2V = variants {}; lin stunner_N = variants {}; lin stunning_A = variants {}; @@ -39636,7 +39645,7 @@ lin turn_N = mkN071 "обръщане"; lin turn_V = actionV (mkV186 "обръщам") (mkV152 "обърна"); lin turn_V2 = variants {}; lin turn_VA = variants {}; -lin turn_VS = variants {}; +lin turn_V2A = variants {}; lin turn_off_N = variants {}; lin turn_on_N = variants {}; lin turn_out_N = variants {}; @@ -42282,7 +42291,7 @@ lin whet_V2 = variants {}; lin whether_Prep = variants {}; lin whetstone_N = variants {}; lin whey_N = variants {}; -lin which_A = variants {}; +lin which_IP = variants {}; lin whichever_A = variants {}; lin whichsoever_A = variants {}; lin whiff_N = variants {}; diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index bc1f97e5c..2cab5d4bd 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -1854,6 +1854,7 @@ lin arum_N = mkN "arum" "arums"; lin aryan_A = compoundA (mkA "aryan"); lin aryan_N = mkN "aryan" "aryans"; lin as_Prep = mkPrep "as"; +lin as_well_Adv = mkAdv "as well"; lin asap_PN = mkPN "Asap"; lin asbestos_N = mkN "asbestos" ; lin ascend_V = mkV "ascend" "ascends" "ascended" "ascended" "ascending"; @@ -4394,6 +4395,7 @@ lin brindled_A = compoundA (mkA "brindled"); lin brine_N = mkN "brine" "brines"; lin bring_V2 = mkV2 (IrregEng.bring_V); lin bring_V2V = mkV2V (mkV "bring") noPrep to_Prep ; +lin bring_V3 = mkV3 (IrregEng.bring_V); lin brink_N = mkN "brink" "brinks"; lin brinkmanship_N = mkN "brinkmanship" ; lin briny_A = mkA "briny" "brinier"; @@ -4994,6 +4996,7 @@ lin call_N = mkN "call" "calls"; lin call_V = mkV "call" "calls" "called" "called" "calling"; lin call_V2 = mkV2 (mkV "call" "calls" "called" "called" "calling"); lin call_V2V = mkV2V (mkV "call" "calls" "called" "called" "calling") noPrep to_Prep ; +lin call_V2A = mkV2A (mkV "call" "calls" "called" "called" "calling") noPrep; lin call_V3 = mkV3 (mkV "call" "calls" "called" "called" "calling"); lin call_VS = mkVS (mkV "call" "calls" "called" "called" "calling"); lin call_box_N = mkN "call - box" "call - boxes"; @@ -6920,7 +6923,7 @@ lin colonizer_N = mkN "colonizer" "colonizers"; lin colonnade_N = mkN "colonnade" "colonnades"; lin colonnaded_A = compoundA (mkA "colonnaded"); lin colony_N = mkN "colony" "colonies"; -lin color_V2 = mkV2 (mkV "color"); +lin color_V2 = mkV2 (mkV "color" (variants {"colorred"; "colored"})); lin color_code_V2 = mkV2 (mkV "color - code"); lin colorado_PN = mkPN "Colorado"; lin coloratura_N = mkN "coloratura" ; @@ -7515,7 +7518,7 @@ lin consider_V = mkV "consider" "considers" "considered" "considered" "consideri lin consider_V2 = mkV2 (mkV "consider" "considers" "considered" "considered" "considering"); lin consider_V3 = mkV3 (mkV "consider" "considers" "considered" "considered" "considering"); lin consider_V2V = mkV2V (mkV "consider" "considers" "considered" "considered" "considering") noPrep to_Prep ; -lin consider_VA = mkVA (mkV "consider" "considers" "considered" "considered" "considering"); +lin consider_V2A = mkV2A (mkV "consider" "considers" "considered" "considered" "considering") noPrep; lin consider_VV = mkVV (mkV "consider" "considers" "considered" "considered" "considering"); lin consider_VS = mkVS (mkV "consider" "considers" "considered" "considered" "considering"); lin considerable_A = compoundA (mkA "considerable"); @@ -8335,7 +8338,7 @@ lin crass_A = compoundA (mkA "crass"); lin crate_N = mkN "crate" "crates"; lin crate_V2 = mkV2 (mkV "crate" "crates" "crated" "crated" "crating"); lin crater_N = mkN "crater" "craters"; -lin crater_V = mkV "crater"; +lin crater_V = mkV "crater" (variants {"craterred"; "cratered"}); lin cravat_N = mkN "cravat" "cravats"; lin crave_V = mkV "crave" "craves" "craved" "craved" "craving"; lin crave_V2 = mkV2 (mkV "crave" "craves" "craved" "craved" "craving"); @@ -9336,7 +9339,8 @@ lin deed_N = mkN "deed" "deeds"; lin deed_box_N = mkN "deed - box" "deed - boxes"; lin deedpoll_N = mkN "deedpoll" "deedpolls"; lin deem_V2 = mkV2 (mkV "deem" "deems" "deemed" "deemed" "deeming"); -lin deem_VS = mkVS (mkV "deem"); +lin deem_V2V = mkV2V (mkV "deem") noPrep to_Prep; +lin deem_V2A = mkV2V (mkV "deem") noPrep to_Prep; lin deep_A = mkA "deep" "deeper"; lin deep_Adv = mkAdv "deep"; lin deep_N = mkN "deep" "deeps"; @@ -9629,6 +9633,7 @@ lin denude_V2 = mkV2 (mkV "denude" "denudes" "denuded" "denuded" "denuding"); lin denunciation_N = mkN "denunciation" "denunciations"; lin denver_PN = mkPN "Denver"; lin deny_V2 = mkV2 (mkV "deny" "denies" "denied" "denied" "denying"); +lin deny_V3 = mkV3 (mkV "deny" "denies" "denied" "denied" "denying"); lin deny_VS = mkVS (mkV "deny"); lin deodar_N = mkN "deodar" "deodars"; lin deodorant_N = mkN "deodorant" "deodorants"; @@ -9776,8 +9781,7 @@ lin desideratum_N = mkN "desideratum" "desiderata"; lin design_N = mkN "design" "designs"; lin design_V = mkV "design" "designs" "designed" "designed" "designing"; lin design_V2 = mkV2 (mkV "design" "designs" "designed" "designed" "designing"); -lin design_VV = mkVV (mkV "design" "designs" "designed" "designed" "designing"); -lin design_VS = mkVS (mkV "design" "designs" "designed" "designed" "designing"); +lin design_V2V = mkV2V (mkV "design" "designs" "designed" "designed" "designing") noPrep to_Prep; lin designate_A = compoundA (mkA "designate"); lin designate_V = mkV "designate"; lin designate_V2 = mkV2 (mkV "designate" "designates" "designated" "designated" "designating"); @@ -11241,7 +11245,7 @@ lin dss_N = mkN "dss" ; lin dti_N = mkN "dti" ; lin dual_A = compoundA (mkA "dual"); lin dub_V2 = mkV2 (mkV "dub" "dubs" "dubbed" "dubbed" "dubbing"); -lin dub_VS = mkVS (mkV "dub"); +lin dub_V3 = mkV3 (mkV "dub" "dubs" "dubbed" "dubbed" "dubbing"); lin dubbin_N = mkN "dubbin" ; lin dubiety_N = mkN "dubiety" "dubieties"; lin dubious_A = compoundA (mkA "dubious"); @@ -12626,6 +12630,7 @@ lin excitingly_Adv = mkAdv "excitingly"; lin excl_PN = mkPN "Excl"; lin exclaim_V = mkV "exclaim" "exclaims" "exclaimed" "exclaimed" "exclaiming"; lin exclaim_V2 = mkV2 (mkV "exclaim" "exclaims" "exclaimed" "exclaimed" "exclaiming"); +lin exclaim_VQ = mkVQ (mkV "exclaim" "exclaims" "exclaimed" "exclaimed" "exclaiming"); lin exclamation_N = mkN "exclamation" "exclamations"; lin exclamatory_A = compoundA (mkA "exclamatory"); lin exclude_V2 = mkV2 (mkV "exclude" "excludes" "excluded" "excluded" "excluding"); @@ -13211,11 +13216,11 @@ lin faversham_PN = mkPN "Faversham"; lin favor_V = mkV "favor"; lin favor_V2 = mkV2 (mkV "favor" "favored"); lin favor_VS = mkVS (mkV "favor" "favored"); -lin favour_N = mkN "favour" "favours"; +lin favour_N = mkN (variants {"favour"; "favor"}); lin favour_V2 = mkV2 (mkV "favour" "favours" "favoured" "favoured" "favouring"); lin favourable_A = compoundA (mkA "favourable"); -lin favourite_A = compoundA (mkA "favourite"); -lin favourite_N = mkN "favourite" "favourites"; +lin favourite_A = compoundA (mkA (variants {"favourite"; "favorite"})); +lin favourite_N = mkN (variants {"favourite"; "favorite"}); lin favouritism_N = mkN "favouritism" ; lin fawley_PN = mkPN "Fawley"; lin fawn_N = mkN "fawn" "fawns"; @@ -13774,7 +13779,7 @@ lin flatulence_N = mkN "flatulence" ; lin flaunt_V = mkV "flaunt" "flaunts" "flaunted" "flaunted" "flaunting"; lin flaunt_V2 = mkV2 (mkV "flaunt" "flaunts" "flaunted" "flaunted" "flaunting"); lin flautist_N = mkN "flautist" "flautists"; -lin flavour_N = mkN "flavour" "flavours"; +lin flavour_N = mkN (variants {"flavour"; "flavor"}); lin flavour_V2 = mkV2 (mkV "flavour" "flavours" "flavoured" "flavoured" "flavouring"); lin flavouring_N = mkN "flavouring" "flavourings"; lin flavourless_A = compoundA (mkA "flavourless"); @@ -14693,6 +14698,7 @@ lin fumbler_N = mkN "fumbler" "fumblers"; lin fume_N = mkN "fume" "fumes"; lin fume_V = mkV "fume" "fumes" "fumed" "fumed" "fuming"; lin fume_V2 = mkV2 (mkV "fume" "fumes" "fumed" "fumed" "fuming"); +lin fume_VS = mkVS (mkV "fume" "fumes" "fumed" "fumed" "fuming"); lin fumigate_V2 = mkV2 (mkV "fumigate" "fumigates" "fumigated" "fumigated" "fumigating"); lin fumigation_N = mkN "fumigation" "fumigations"; lin fun_N = mkN "fun" ; @@ -18273,7 +18279,6 @@ lin inclose_V2 = mkV2 (mkV "inclose" "incloses" "inclosed" "inclosed" "inclosing lin inclosure_N = mkN "inclosure" "inclosures"; lin include_V = mkV "include"; lin include_V2 = mkV2 (mkV "include" "includes" "included" "included" "including"); -lin include_VS = mkVS (mkV "include"); lin include_VV = ingVV (mkV "include"); lin inclusion_N = mkN "inclusion" ; lin inclusive_A = compoundA (mkA "inclusive"); @@ -20191,7 +20196,7 @@ lin lab_N = mkN "lab" "labs"; lin lab_PN = mkPN "Lab"; lin label_N = mkN "label" "labels"; lin label_V = mkV "label"; -lin label_V2 = mkV2 (mkV "label" "labels" "labelled" "labelled" "labelling"); +lin label_V2 = mkV2 (mkV "label" (variants {"labelled"; "labeled"})); lin label_VS = mkVS (mkV "label"); lin labial_A = compoundA (mkA "labial"); lin labor_V = mkV "labor" "labors" "labored" "labored" "laboring"; @@ -25064,6 +25069,7 @@ lin offensiveness_N = mkN "offensiveness" ; lin offer_N = mkN "offer" "offers"; lin offer_V = mkV "offer" "offers" "offered" "offered" "offering"; lin offer_V2 = mkV2 (mkV "offer" "offers" "offered" "offered" "offering"); +lin offer_V2V = mkV2V (mkV "offer" "offers" "offered" "offered" "offering") noPrep to_Prep; lin offer_VV = mkVV (mkV "offer" "offers" "offered" "offered" "offering"); lin offer_VS = mkVS (mkV "offer" "offers" "offered" "offered" "offering"); lin offering_N = mkN "offering" "offerings"; @@ -25314,6 +25320,7 @@ lin opprobrium_N = mkN "opprobrium" ; lin oppugn_V2 = mkV2 (mkV "oppugn" "oppugns" "oppugned" "oppugned" "oppugning"); lin opt_V = mkV "opt" "opts" "opted" "opted" "opting"; lin opt_V2V = mkV2V (mkV "opt" "opts" "opted" "opted" "opting") noPrep to_Prep ; +lin opt_VV = mkVV (mkV "opt" "opts" "opted" "opted" "opting"); lin opt_VS = mkVS (mkV "opt" "opts" "opted" "opted" "opting"); lin optative_A = compoundA (mkA "optative"); lin optative_N = mkN "optative" "optatives"; @@ -28950,6 +28957,7 @@ lin prop_V2 = mkV2 (mkV "prop" "props" "propped" "propped" "propping"); lin propaganda_N = mkN "propaganda" ; lin propagandist_N = mkN "propagandist" "propagandists"; lin propagandize_V = mkV "propagandize" "propagandizes" "propagandized" "propagandized" "propagandizing"; +lin propagandize_V2 = mkV2 (mkV "propagandize" "propagandizes" "propagandized" "propagandized" "propagandizing"); lin propagate_V = mkV "propagate" "propagates" "propagated" "propagated" "propagating"; lin propagate_V2 = mkV2 (mkV "propagate" "propagates" "propagated" "propagated" "propagating"); lin propagation_N = mkN "propagation" ; @@ -29830,6 +29838,7 @@ lin rainwater_N = mkN "rainwater" ; lin rainy_A = mkA "rainy" "rainier"; lin raise_N = mkN "raise" "raises"; lin raise_V2 = mkV2 (mkV "raise" "raises" "raised" "raised" "raising"); +lin raise_V2V = mkV2V (mkV "raise" "raises" "raised" "raised" "raising") noPrep to_Prep; lin raiser_N = mkN "raiser" "raisers"; lin raisin_N = mkN "raisin" "raisins"; lin raison_d'etre_N = mkN "raison d'être" "IRREG"; @@ -29846,7 +29855,7 @@ lin rallentando_Adv = mkAdv "rallentando"; lin rally_N = mkN "rally" "rallies"; lin rally_V = mkV "rally" "rallies" "rallied" "rallied" "rallying"; lin rally_V2 = mkV2 (mkV "rally" "rallies" "rallied" "rallied" "rallying"); -lin rally_V2V = mkV2V (mkV "rally" "rallies" "rallied" "rallied" "rallying") noPrep to_Prep ; +lin rally_V2V = mkV2V (mkV "rally" "rallies" "rallied" "rallied" "rallying") noPrep to_Prep; lin ralph_PN = mkPN "Ralph"; lin ram_N = mkN "ram" "rams"; lin ram_V2 = mkV2 (mkV "ram" "rams" "rammed" "rammed" "ramming"); @@ -33853,6 +33862,7 @@ lin show_V = IrregEng.show_V; lin show_V2 = mkV2 IrregEng.show_V; lin show_V2V = mkV2V IrregEng.show_V noPrep to_Prep ; lin show_VS = mkVS IrregEng.show_V; +lin show_VQ = mkVQ IrregEng.show_V; lin show_up_V = partV IrregEng.show_V "up"; lin show_business_N = mkN "show - business" ; lin show_off_N = mkN "show - off" "show - offs"; @@ -36616,6 +36626,7 @@ lin stump_V2 = mkV2 (mkV "stump" "stumps" "stumped" "stumped" "stumping"); lin stumper_N = mkN "stumper" "stumpers"; lin stumpy_A = mkA "stumpy" "stumpier"; lin stun_V2 = mkV2 (mkV "stun" "stuns" "stunned" "stunned" "stunning"); +lin stun_V2S = mkV2S (mkV "stun" "stuns" "stunned" "stunned" "stunning") noPrep; lin stunne_V2V = mkV2V (mkV "stunne") noPrep to_Prep ; lin stunner_N = mkN "stunner" "stunners"; lin stunning_A = compoundA (mkA "stunning"); @@ -37341,7 +37352,7 @@ lin swish_A = compoundA (mkA "swish"); lin swish_N = mkN "swish" "swishes"; lin swish_V = mkV "swish" "swishes" "swished" "swished" "swishing"; lin swish_V2 = mkV2 (mkV "swish" "swishes" "swished" "swished" "swishing"); -lin swiss_A = compoundA (mkA "swiss"); +lin swiss_A = compoundA (mkA "Swiss"); lin swiss_N = mkN "swiss" "swiss"; lin switch_N = mkN "switch" "switches"; lin switch_V = mkV "switch" "switches" "switched" "switched" "switching"; @@ -39640,7 +39651,7 @@ lin turn_N = mkN "turn" "turns"; lin turn_V = mkV "turn" "turns" "turned" "turned" "turning"; lin turn_V2 = mkV2 (mkV "turn" "turns" "turned" "turned" "turning"); lin turn_VA = mkVA (mkV "turn" "turns" "turned" "turned" "turning"); -lin turn_VS = mkVS (mkV "turn" "turns" "turned" "turned" "turning"); +lin turn_V2A = mkV2A (mkV "turn" "turns" "turned" "turned" "turning") noPrep; lin turn_off_N = mkN "turn - off" "turn - offs"; lin turn_on_N = mkN "turn - on" "turn - ons"; lin turn_out_N = mkN "turn - out" "turn - outs"; @@ -42286,7 +42297,7 @@ lin whet_V2 = mkV2 (mkV "whet" "whets" "whetted" "whetted" "whetting"); lin whether_Prep = mkPrep "whether"; lin whetstone_N = mkN "whetstone" "whetstones"; lin whey_N = mkN "whey" ; -lin which_A = compoundA (mkA "which"); +lin which_IP = mkIP "which" "which" "which" singular; lin whichever_A = compoundA (mkA "whichever"); lin whichsoever_A = compoundA (mkA "whichsoever"); lin whiff_N = mkN "whiff" "whiffs"; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index 57af88839..408151bee 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -1848,7 +1848,8 @@ fun arty_crafty_A : A; fun arum_N : N; fun aryan_A : A; fun aryan_N : N; -fun as_Prep : Prep ; +fun as_Prep : Prep; +fun as_well_Adv : Adv; fun asap_PN : PN; fun asbestos_N : N; fun ascend_V : V; @@ -4389,6 +4390,7 @@ fun brindled_A : A; fun brine_N : N; fun bring_V2 : V2; fun bring_V2V : V2V; +fun bring_V3 : V3; fun brink_N : N; fun brinkmanship_N : N; fun briny_A : A; @@ -4989,6 +4991,7 @@ fun call_N : N; fun call_V : V; fun call_V2 : V2; fun call_V2V : V2V; +fun call_V2A : V2A; fun call_V3 : V3; fun call_VS : VS; fun call_box_N : N; @@ -7497,7 +7500,7 @@ fun consider_V : V; fun consider_V2 : V2; fun consider_V3 : V3; fun consider_V2V : V2V; -fun consider_VA : VA; +fun consider_V2A : V2A; fun consider_VV : VV; fun consider_VS : VS; fun considerable_A : A; @@ -9318,7 +9321,8 @@ fun deed_N : N; fun deed_box_N : N; fun deedpoll_N : N; fun deem_V2 : V2; -fun deem_VS : VS; +fun deem_V2V : V2V; +fun deem_V2A : V2A; fun deep_A : A; fun deep_Adv : Adv; fun deep_N : N; @@ -9611,6 +9615,7 @@ fun denude_V2 : V2; fun denunciation_N : N; fun denver_PN : PN; fun deny_V2 : V2; +fun deny_V3 : V3; fun deny_VS : VS; fun deodar_N : N; fun deodorant_N : N; @@ -9758,8 +9763,7 @@ fun desideratum_N : N; fun design_N : N; fun design_V : V; fun design_V2 : V2; -fun design_VV : VV; -fun design_VS : VS; +fun design_V2V : V2V; fun designate_A : A; fun designate_V : V; fun designate_V2 : V2; @@ -11222,7 +11226,7 @@ fun dss_N : N; fun dti_N : N; fun dual_A : A; fun dub_V2 : V2; -fun dub_VS : VS; +fun dub_V3 : V3; fun dubbin_N : N; fun dubiety_N : N; fun dubious_A : A; @@ -12606,6 +12610,7 @@ fun excitingly_Adv : Adv; fun excl_PN : PN; fun exclaim_V : V; fun exclaim_V2 : V2; +fun exclaim_VQ : VQ; fun exclamation_N : N; fun exclamatory_A : A; fun exclude_V2 : V2; @@ -14669,6 +14674,7 @@ fun fumbler_N : N; fun fume_N : N; fun fume_V : V; fun fume_V2 : V2; +fun fume_VS : VS; fun fumigate_V2 : V2; fun fumigation_N : N; fun fun_N : N; @@ -18249,7 +18255,6 @@ fun inclose_V2 : V2; fun inclosure_N : N; fun include_V : V; fun include_V2 : V2; -fun include_VS : VS; fun include_VV : VV; fun inclusion_N : N; fun inclusive_A : A; @@ -25012,6 +25017,7 @@ fun offensiveness_N : N; fun offer_N : N; fun offer_V : V; fun offer_V2 : V2; +fun offer_V2V : V2V; fun offer_VV : VV; fun offer_VS : VS; fun offering_N : N; @@ -25262,6 +25268,7 @@ fun opprobrium_N : N; fun oppugn_V2 : V2; fun opt_V : V; fun opt_V2V : V2V; +fun opt_VV : VV; fun opt_VS : VS; fun optative_A : A; fun optative_N : N; @@ -28898,6 +28905,7 @@ fun prop_V2 : V2; fun propaganda_N : N; fun propagandist_N : N; fun propagandize_V : V; +fun propagandize_V2 : V2; fun propagate_V : V; fun propagate_V2 : V2; fun propagation_N : N; @@ -29778,6 +29786,7 @@ fun rainwater_N : N; fun rainy_A : A; fun raise_N : N; fun raise_V2 : V2; +fun raise_V2V : V2V; fun raiser_N : N; fun raisin_N : N; fun raison_d'etre_N : N; @@ -33788,6 +33797,7 @@ fun show_V : V; fun show_V2 : V2; fun show_V2V : V2V; fun show_VS : VS; +fun show_VQ : VQ; fun show_up_V : V; fun show_business_N : N; fun show_off_N : N; @@ -36551,6 +36561,7 @@ fun stump_V2 : V2; fun stumper_N : N; fun stumpy_A : A; fun stun_V2 : V2; +fun stun_V2S : V2S; fun stunne_V2V : V2V; fun stunner_N : N; fun stunning_A : A; @@ -39570,7 +39581,7 @@ fun turn_N : N; fun turn_V : V; fun turn_V2 : V2; fun turn_VA : VA; -fun turn_VS : VS; +fun turn_V2A : V2A; fun turn_off_N : N; fun turn_on_N : N; fun turn_out_N : N; @@ -42216,7 +42227,7 @@ fun whet_V2 : V2; fun whether_Prep : Prep ; fun whetstone_N : N; fun whey_N : N; -fun which_A : A; +fun which_IP : IP; fun whichever_A : A; fun whichsoever_A : A; fun whiff_N : N; diff --git a/lib/src/english/ParseEng.gf b/lib/src/english/ParseEng.gf index 10ccd54c2..0dd1ddbd3 100644 --- a/lib/src/english/ParseEng.gf +++ b/lib/src/english/ParseEng.gf @@ -71,6 +71,11 @@ lin infVP v.typ vp a) (predVc v) ; + SlashVPIV2V v p vpi = insertObjc (\\a => p.s ++ case p.p of {CPos => ""; _ => "not"} ++ + v.c3 ++ + vpi.s ! VVAux ! a) + (predVc v) ; + PredVPosv np vp = { s = \\t,a,b,o => let @@ -125,7 +130,7 @@ lin s = let be = predAux auxBe ; ppt = vps.ptp - in \\c => np.s ! c ++ vps.ptp ++ vps.s2 ! np.a ; + in \\c => np.s ! c ++ vps.ad ++ vps.ptp ++ vps.s2 ! np.a ; a = np.a } ; diff --git a/lib/src/english/ParseEngAbs.gf b/lib/src/english/ParseEngAbs.gf index e62368dae..db1b9610d 100644 --- a/lib/src/english/ParseEngAbs.gf +++ b/lib/src/english/ParseEngAbs.gf @@ -42,6 +42,7 @@ fun CompoundCN : Num -> N -> CN -> CN ; UseQuantPN : Quant -> PN -> NP; SlashV2V : V2V -> Pol -> VP -> VPSlash ; + SlashVPIV2V : V2V -> Pol -> VPI -> VPSlash ; PredVPosv,PredVPovs : NP -> VP -> Cl ;