From ec6ef1aff44b7bf7c1daf067d65e10f50991f774 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Mon, 28 Oct 2013 12:41:03 +0000 Subject: [PATCH] minor fixes in DictEng and DictEngBul --- lib/src/bulgarian/DictEngBul.gf | 10 +++---- lib/src/english/DictEng.gf | 50 ++++++++++++++++----------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/lib/src/bulgarian/DictEngBul.gf b/lib/src/bulgarian/DictEngBul.gf index 698f9e845..ca54e737e 100644 --- a/lib/src/bulgarian/DictEngBul.gf +++ b/lib/src/bulgarian/DictEngBul.gf @@ -556,7 +556,7 @@ lin acoustic_N = variants {}; lin acoustically_Adv = variants {}; lin acoustician_N = variants {}; lin acoustics_N = mkN041 "акустика"; -lin acquaint_V2 = prepV2 (medialV (dualV (mkV186 "запознавам") (mkV161 "запозная")) Acc) (mkPrep "с" Acc); +lin acquaint_V2 = prepV2 (medialV (dualV (mkV186 "запознавам") (mkV161 "запозная")) Acc) with_Prep; lin acquaintance_N = mkN054 "познанство" ; lin acquaintanceship_N = mkN054 "познанство"; lin acquiesce_V = dualV (mkV186 "приемам") (mkV171 "приема"); @@ -4185,7 +4185,7 @@ lin automatically_Adv = mkAdv "автоматично"; lin automation_N = mkN047 "автоматизация"; lin automatism_N = variants {}; lin automaton_N = mkN007 "автомат"; -lin automobile_N = mkN007 "автомобил" ; +lin automobile_N = dualN (mkN007 "автомобил") (mkA079 "автомобилен"); lin automotive_A = mkA079 "автомобилен"; lin automysophobia_N = variants {}; lin autonomic_A = variants {}; @@ -8658,7 +8658,7 @@ lin capuchin_N = variants {}; lin capulin_N = variants {}; lin caput_N = variants {}; lin capybara_N = variants {}; -lin car_N = mkN007 "автомобил" ; +lin car_N = mkN041 "кола"; lin car_ferry_N = variants {}; lin carabao_N = variants {}; lin carabiner_N = variants {}; @@ -28347,7 +28347,7 @@ lin intimate_V2 = dirV2 (singleV (mkV176 "интимнича")); lin intimation_N = mkN049 "интимност"; lin intimidate_V2 = variants {}; lin intimidation_N = mkN071 "заплашване" ; -lin into_Prep = mkPrep "в" Acc; +lin into_Prep = in_Prep; lin intolerable_A = variants {}; lin intolerance_N = mkN049 "нетърпимост" ; lin intolerant_A = mkA079 "нетолерантен"; @@ -32192,7 +32192,7 @@ lin madagascar_PN = variants {}; lin madam_N = variants {}; lin madame_N = variants {}; lin madcap_N = variants {}; -lin madden_V2 = variants {}; +lin madden_V2 = dirV2 (actionV (mkV186 "подлудявам") (mkV174 "подлудя")); lin madder_N = variants {}; lin madderwort_N = variants {}; lin maddy_PN = variants {}; diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index 2fc8c933d..9e9c5f552 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -7369,7 +7369,7 @@ lin brimstone_N = mkN "brimstone" ; 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_V2V = mkV2V (IrregEng.bring_V) noPrep to_Prep ; lin bring_V3 = mkV3 (IrregEng.bring_V); lin brininess_N = mkN "brininess" ; lin brink_N = mkN "brink" "brinks"; @@ -13455,7 +13455,7 @@ lin crude_A = mkA "crude" "cruder"; lin crudeness_N = mkN "crudeness" ; lin crudites_N = mkN "crudites" ; lin crudity_N = mkN "crudity" "crudities"; -lin cruel_A = mkA "cruel" "crueller*"; +lin cruel_A = mkA "cruel" "crueller"; lin cruelty_N = mkN "cruelty" "cruelties"; lin cruet_N = mkN "cruet" "cruets"; lin cruet_stand_N = mkN "cruet - stand" "cruet - stands"; @@ -15653,7 +15653,7 @@ lin dilute_V = mkV "dilute"; lin dilute_V2 = mkV2 (mkV "dilute" "dilutes" "diluted" "diluted" "diluting"); lin dilution_N = mkN "dilution" "dilutions"; lin diluvian_A = mkA "diluvian" ; -lin dim_A = mkA "dim" "dimmer*"; +lin dim_A = mkA "dim" "dimmer"; lin dim_V = mkV "dim" "dims" "dimmed" "dimmed" "dimming"; lin dim_V2 = mkV2 (mkV "dim" "dims" "dimmed" "dimmed" "dimming"); lin dime_N = mkN "dime" "dimes"; @@ -16824,7 +16824,7 @@ lin doze_V = mkV "doze" "dozes" "dozed" "dozed" "dozing"; lin dozen_N = mkN "dozen" "dozens"; lin dphil_N = mkN "dphil" ; lin dr_PN = mkPN "Dr"; -lin drab_A = mkA "drab" "drabber*"; +lin drab_A = mkA "drab" "drabber"; lin draba_N = mkN "draba" ; lin drabness_N = mkN "drabness" ; lin dracaena_N = mkN "dracaena" ; @@ -20791,7 +20791,7 @@ lin flashover_N = mkN "flashover" ; lin flashpoint_N = mkN "flashpoint" "flashpoints"; lin flashy_A = mkA "flashy" "flashier"; lin flask_N = mkN "flask" "flasks"; -lin flat_A = mkA "flat" "flatter*"; +lin flat_A = mkA "flat" "flatter"; lin flat_Adv = mkAdv "flat"; lin flat_N = mkN "flat" "flats"; lin flat_bottomed_A = compoundA (mkA "flat - bottomed"); @@ -22883,7 +22883,7 @@ lin glacial_A = compoundA (mkA "glacial"); lin glaciated_A = mkA "glaciated" ; lin glaciation_N = mkN "glaciation" ; lin glacier_N = mkN "glacier" "glaciers"; -lin glad_A = mkA "glad" "gladder*"; +lin glad_A = mkA "glad" "gladder"; lin gladden_V2 = mkV2 (mkV "gladden" "gladdens" "gladdened" "gladdened" "gladdening"); lin glade_N = mkN "glade" "glades"; lin gladiator_N = mkN "gladiator" "gladiators"; @@ -22949,7 +22949,7 @@ lin glen_PN = mkPN "Glen"; lin glengarry_N = mkN "glengarry" "glengarries"; lin glenrothes_PN = mkPN "Glenrothes"; lin glial_A = mkA "glial" ; -lin glib_A = mkA "glib" "glibber*"; +lin glib_A = mkA "glib" "glibber"; lin glibness_N = mkN "glibness" ; lin glide_N = mkN "glide" "glides"; lin glide_V = mkV "glide" "glides" "glided" "glided" "gliding"; @@ -23053,7 +23053,7 @@ lin glue_N = mkN "glue" "glues"; lin glue_V2 = mkV2 (mkV "glue" "IRREG" "IRREG" "IRREG" "IRREG"); lin glued_A = mkA "glued" ; lin gluey_A = compoundA (mkA "gluey"); -lin glum_A = mkA "glum" "glummer*"; +lin glum_A = mkA "glum" "glummer"; lin glume_N = mkN "glume" ; lin glumness_N = mkN "glumness" ; lin gluon_N = mkN "gluon" ; @@ -23282,7 +23282,7 @@ lin goodwill_N = mkN "goodwill" ; lin goody_N = mkN "goody" "goodies"; lin goody_goody_A = compoundA (mkA "goody - goody"); lin goody_goody_N = mkN "goody - goody" "goody - goodies"; -lin gooey_A = mkA "gooey" "gooeyyer*"; +lin gooey_A = mkA "gooey" "gooeyyer"; lin goof_N = mkN "goof" "goofs"; lin goof_V = mkV "goof" "goofs" "goofed" "goofed" "goofing"; lin goof_V2 = mkV2 (mkV "goof" "goofs" "goofed" "goofed" "goofing"); @@ -23668,7 +23668,7 @@ lin grill_V = mkV "grill" "grills" "grilled" "grilled" "grilling"; lin grill_V2 = mkV2 (mkV "grill" "grills" "grilled" "grilled" "grilling"); lin grille_N = mkN "grille" "grilles"; lin grillroom_N = mkN "grillroom" "grillrooms"; -lin grim_A = mkA "grim" "grimmer*"; +lin grim_A = mkA "grim" "grimmer"; lin grimace_N = mkN "grimace" "grimaces"; lin grimace_V = mkV "grimace" "grimaces" "grimaced" "grimaced" "grimacing"; lin grime_N = mkN "grime" ; @@ -31798,12 +31798,12 @@ lin lowness_N = mkN "lowness" ; lin lowset_A = mkA "lowset" ; lin lox_N = mkN "lox" ; lin loxapine_N = mkN "loxapine" ; -lin loyal_A = mkA "loyal" "loyaller*"; +lin loyal_A = mkA "loyal" "loyaller"; lin loyalist_N = mkN "loyalist" "loyalists"; lin loyalty_N = mkN "loyalty" "loyalties"; lin loyang_PN = mkPN "Loyang"; lin lozenge_N = mkN "lozenge" "lozenges"; -lin lp_N = mkN "lp" "lps" {- FIXME: no plural form -}; +lin lp_N = mkN "lp" "lps"; lin lsd_N = mkN "lsd" ; lin lt_PN = mkPN "Lt"; lin ltd_PN = mkPN "Ltd"; @@ -32117,7 +32117,7 @@ lin maculate_A = mkA "maculate" ; lin macule_N = mkN "macule" ; lin macumba_N = mkN "macumba" ; lin macushla_N = mkN "macushla" ; -lin mad_A = mkA "mad" "madder*"; +lin mad_A = mkA "mad" "madder"; lin madagascan_A = compoundA (mkA "madagascan"); lin madagascan_N = mkN "madagascan" "madagascans"; lin madagascar_PN = mkPN "Madagascar"; @@ -42414,7 +42414,7 @@ lin price_control_N = mkN "price - control" "price - controls"; lin price_controlled_A = compoundA (mkA "price - controlled"); lin priceless_A = compoundA (mkA "priceless"); lin pricelist_N = mkN "pricelist" "pricelists"; -lin pricey_A = mkA "pricey" "priceyyer*"; +lin pricey_A = mkA "pricey" "priceyyer"; lin pricing_N = mkN "pricing" ; lin prick_N = mkN "prick" "pricks"; lin prick_V = mkV "prick" "pricks" "pricked" "pricked" "pricking"; @@ -42442,7 +42442,7 @@ lin priestly_A = mkA "priestly" "priestlier"; lin prig_N = mkN "prig" "prigs"; lin priggish_A = compoundA (mkA "priggish"); lin priggishness_N = mkN "priggishness" ; -lin prim_A = mkA "prim" "primmer*"; +lin prim_A = mkA "prim" "primmer"; lin prim_V2 = mkV2 (mkV "prim" "prims" "primmed" "primmed" "primming"); lin prima_A = compoundA (mkA "prima"); lin prima_ballerina_N = mkN "prima ballerina" "prima ballerinas"; @@ -44793,7 +44793,7 @@ lin recusant_N = mkN "recusant" "recusants"; lin recusation_N = mkN "recusation" ; lin recycle_V2 = mkV2 (mkV "recycle" "recycles" "recycled" "recycled" "recycling"); lin recycling_N = mkN "recycling" ; -lin red_A = mkA "red" "redder*"; +lin red_A = mkA "red" "redder"; lin red_N = mkN "red" "reds"; lin red_hot_A = compoundA (mkA "red - hot"); lin red_rimmed_A = compoundA (mkA "red - rimmed"); @@ -46502,7 +46502,7 @@ lin roper_N = mkN "roper" ; lin ropewalk_N = mkN "ropewalk" "ropewalks"; lin ropewalker_N = mkN "ropewalker" "ropewalkers"; lin ropeway_N = mkN "ropeway" "ropeways"; -lin ropey_A = mkA "ropey" "ropeyyer*"; +lin ropey_A = mkA "ropey" "ropeyyer"; lin roping_N = mkN "roping" ; lin ropy_A = mkA "ropy" ; lin roquefort_N = mkN "roquefort" ; @@ -46969,7 +46969,7 @@ lin sacristan_N = mkN "sacristan" "sacristans"; lin sacristy_N = mkN "sacristy" "sacristies"; lin sacrosanct_A = compoundA (mkA "sacrosanct"); lin sacrum_N = mkN "sacrum" ; -lin sad_A = mkA "sad" "sadder*"; +lin sad_A = mkA "sad" "sadder"; lin sadden_V = mkV "sadden" "saddens" "saddened" "saddened" "saddening"; lin sadden_V2 = mkV2 (mkV "sadden" "saddens" "saddened" "saddened" "saddening"); lin saddle_N = mkN "saddle" "saddles"; @@ -50193,7 +50193,7 @@ lin slight_V2 = mkV2 (mkV "slight" "slights" "slighted" "slighted" "slighting"); lin slightingly_Adv = mkAdv "slightingly"; lin slightness_N = mkN "slightness" ; lin sligo_PN = mkPN "Sligo"; -lin slim_A = mkA "slim" "slimmer*"; +lin slim_A = mkA "slim" "slimmer"; lin slim_V = mkV "slim" "slims" "slimmed" "slimmed" "slimming"; lin slim_V2 = mkV2 (mkV "slim" "slims" "slimmed" "slimmed" "slimming"); lin slime_N = mkN "slime" ; @@ -50452,7 +50452,7 @@ lin smudge_N = mkN "smudge" "smudges"; lin smudge_V = mkV "smudge" "smudges" "smudged" "smudged" "smudging"; lin smudge_V2 = mkV2 (mkV "smudge" "smudges" "smudged" "smudged" "smudging"); lin smudgy_A = compoundA (mkA "smudgy"); -lin smug_A = mkA "smug" "smugger*"; +lin smug_A = mkA "smug" "smugger"; lin smuggle_V2 = mkV2 (mkV "smuggle" "smuggles" "smuggled" "smuggled" "smuggling"); lin smuggler_N = mkN "smuggler" "smugglers"; lin smuggling_N = mkN "smuggling" ; @@ -50640,7 +50640,7 @@ lin snuffers_N = mkN "snuffers" ; lin snuffle_N = mkN "snuffle" "snuffles"; lin snuffle_V = mkV "snuffle" "snuffles" "snuffled" "snuffled" "snuffling"; lin snuffler_N = mkN "snuffler" ; -lin snug_A = mkA "snug" "snugger*"; +lin snug_A = mkA "snug" "snugger"; lin snug_N = mkN "snug" "snugs"; lin snuggery_N = mkN "snuggery" "snuggeries"; lin snuggle_V = mkV "snuggle" "snuggles" "snuggled" "snuggled" "snuggling"; @@ -51438,7 +51438,7 @@ lin spin_V = IrregEng.spin_V; lin spin_V2 = mkV2 (IrregEng.spin_V); lin spin_drier_N = mkN "spin - drier" "spin - driers"; lin spin_dry_V2 = mkV2 (mkV "spin - dry" "spin - dries" "spin - dried" "spin - dried" "spin - drying"); -lin spin_off_N = mkN "spin - off" "spin - offs"; +lin spin_off_N = mkN (variants {"spin - off"; "spinoff"}); lin spinach_N = mkN "spinach" ; lin spinal_A = compoundA (mkA "spinal"); lin spindle_N = mkN "spindle" "spindles"; @@ -56740,7 +56740,7 @@ lin trillium_N = mkN "trillium" ; lin trilobate_A = mkA "trilobate" ; lin trilobite_N = mkN "trilobite" ; lin trilogy_N = mkN "trilogy" "trilogies"; -lin trim_A = mkA "trim" "trimmer*"; +lin trim_A = mkA "trim" "trimmer"; lin trim_N = mkN "trim" ; lin trim_V = mkV "trim" "trims" "trimmed" "trimmed" "trimming"; lin trim_V2 = mkV2 (mkV "trim" "trims" "trimmed" "trimmed" "trimming"); @@ -60323,7 +60323,7 @@ lin waltz_V = mkV "waltz" "waltzes" "waltzed" "waltzed" "waltzing"; lin waltz_V2 = mkV2 (mkV "waltz" "waltzes" "waltzed" "waltzed" "waltzing"); lin waltzer_N = mkN "waltzer" ; lin wampum_N = mkN "wampum" ; -lin wan_A = mkA "wan" "wanner*"; +lin wan_A = mkA "wan" "wanner"; lin wand_N = mkN "wand" "wands"; lin wander_V = mkV "wander" "wanders" "wandered" "wandered" "wandering"; lin wander_V2 = mkV2 (mkV "wander" "wanders" "wandered" "wandered" "wandering"); @@ -60884,7 +60884,7 @@ lin westside_A = mkA "westside" ; lin westward_A = compoundA (mkA "westward"); lin westward_Adv = mkAdv "westward"; lin westwards_Adv = mkAdv "westwards"; -lin wet_A = mkA "wet" "wetter*"; +lin wet_A = mkA "wet" "wetter"; lin wet_N = mkN "wet" ; lin wet_V2 = mkV2 (mkV "wet" "wets" "wetted" "wetted" "wetting"); lin wet_nurse_N = mkN "wet - nurse" "wet - nurses";