diff --git a/src/english/IrregEng.gf b/src/english/IrregEng.gf index 2f08c1558..7b9c48ddf 100644 --- a/src/english/IrregEng.gf +++ b/src/english/IrregEng.gf @@ -13,7 +13,8 @@ flags optimize=values ; bend_V = irregV "bend" "bent" "bent" ; beset_V = irregV "beset" "beset" "beset" ; bet_V = irregDuplV "bet" "bet" "bet" ; - bid_V = irregDuplV "bid" (variants {"bid" ; "bade"}) (variants {"bid" ; "bidden"}) ; + bid_V = irregDuplV "bid" "bid" "bid" ; + bid_bade_V = irregDuplV "bid" "bade" "bidden" ; bind_V = irregV "bind" "bound" "bound" ; bite_V = irregV "bite" "bit" "bitten" ; bleed_V = irregV "bleed" "bled" "bled" ; @@ -23,7 +24,7 @@ flags optimize=values ; bring_V = irregV "bring" "brought" "brought" ; broadcast_V = irregV "broadcast" "broadcast" "broadcast" ; build_V = irregV "build" "built" "built" ; - burn_V = irregV "burn" (variants {"burned" ; "burnt"}) (variants {"burned" ; "burnt"}) ; + burn_V = irregV "burn" "burnt" "burnt" ; burst_V = irregV "burst" "burst" "burst" ; buy_V = irregV "buy" "bought" "bought" ; cast_V = irregV "cast" "cast" "cast" ; @@ -36,10 +37,10 @@ flags optimize=values ; cut_V = irregDuplV "cut" "cut" "cut" ; deal_V = irregV "deal" "dealt" "dealt" ; dig_V = irregDuplV "dig" "dug" "dug" ; - dive_V = irregV "dive" (variants {"dived" ; "dove"}) "dived" ; + dive_V = irregV "dive" "dove" "dived" ; do_V = mk5V "do" "does" "did" "done" "doing" ; draw_V = irregV "draw" "drew" "drawn" ; - dream_V = irregV "dream" (variants {"dreamed" ; "dreamt"}) (variants {"dreamed" ; "dreamt"}) ; + dream_V = irregV "dream" "dreamt" "dreamt" ; drive_V = irregV "drive" "drove" "driven" ; drink_V = irregV "drink" "drank" "drunk" ; eat_V = irregV "eat" "ate" "eaten" ; @@ -75,27 +76,27 @@ flags optimize=values ; know_V = irregV "know" "knew" "known" ; lay_V = irregV "lay" "laid" "laid" ; lead_V = irregV "lead" "led" "led" ; - leap_V = irregV "leap" (variants {"leaped" ; "lept"}) (variants {"leaped" ; "lept"}) ; - learn_V = irregV "learn" (variants {"learned" ; "learnt"}) (variants {"learned" ; "learnt"}) ; + leap_V = irregV "leap" "lept" "lept" ; + learn_V = irregV "learn" "learnt" "learnt" ; leave_V = irregV "leave" "left" "left" ; lend_V = irregV "lend" "lent" "lent" ; let_V = irregDuplV "let" "let" "let" ; lie_V = irregV "lie" "lay" "lain" ; - light_V = irregV "light" (variants {"lighted" ; "lit"}) "lighted" ; + light_V = irregV "light" "lit" "lit" ; lose_V = irregV "lose" "lost" "lost" ; make_V = irregV "make" "made" "made" ; mean_V = irregV "mean" "meant" "meant" ; meet_V = irregV "meet" "met" "met" ; - misspell_V = irregV "misspell" (variants {"misspelled" ; "misspelt"}) (variants {"misspelled" ; "misspelt"}) ; + misspell_V = irregV "misspell" "misspelt" "misspelt" ; mistake_V = irregV "mistake" "mistook" "mistaken" ; - mow_V = irregV "mow" "mowed" (variants {"mowed" ; "mown"}) ; + mow_V = irregV "mow" "mowed" "mown" ; overcome_V = irregV "overcome" "overcame" "overcome" ; overdo_V = mk5V "overdo" "overdoes" "overdid" "overdone" "overdoing" ; overtake_V = irregV "overtake" "overtook" "overtaken" ; overthrow_V = irregV "overthrow" "overthrew" "overthrown" ; pay_V = irregV "pay" "paid" "paid" ; plead_V = irregV "plead" "pled" "pled" ; - prove_V = irregV "prove" "proved" (variants {"proved" ; "proven"}) ; + prove_V = irregV "prove" "proved" "proven" ; put_V = irregDuplV "put" "put" "put" ; quit_V = irregDuplV "quit" "quit" "quit" ; read_V = irregV "read" "read" "read" ; @@ -104,22 +105,22 @@ flags optimize=values ; ring_V = irregV "ring" "rang" "rung" ; rise_V = irregV "rise" "rose" "risen" ; run_V = irregDuplV "run" "ran" "run" ; - saw_V = irregV "saw" "sawed" (variants {"sawed" ; "sawn"}) ; + saw_V = irregV "saw" "sawed" "sawn" ; say_V = irregV "say" "said" "said" ; see_V = irregV "see" "saw" "seen" ; seek_V = irregV "seek" "sought" "sought" ; sell_V = irregV "sell" "sold" "sold" ; send_V = irregV "send" "sent" "sent" ; set_V = irregDuplV "set" "set" "set" ; - sew_V = irregV "sew" "sewed" (variants {"sewed" ; "sewn"}) ; + sew_V = irregV "sew" "sewed" "sewn" ; shake_V = irregV "shake" "shook" "shaken" ; - shave_V = irregV "shave" "shaved" (variants {"shaved" ; "shaven"}) ; + shave_V = irregV "shave" "shaved" "shaven" ; shear_V = irregV "shear" "shore" "shorn" ; shed_V = irregDuplV "shed" "shed" "shed" ; shine_V = irregV "shine" "shone" "shone" ; - shoe_V = irregV "shoe" "shoed" (variants {"shoed" ; "shod"}) ; + shoe_V = irregV "shoe" "shoed" "shod" ; shoot_V = irregV "shoot" "shot" "shot" ; - show_V = irregV "show" "showed" (variants {"showed" ; "shown"}) ; + show_V = irregV "show" "showed" "shown" ; shrink_V = irregV "shrink" "shrank" "shrunk" ; shut_V = irregDuplV "shut" "shut" "shut" ; sing_V = irregV "sing" "sang" "sung" ; @@ -131,16 +132,18 @@ flags optimize=values ; sling_V = irregV "sling" "slung" "slung" ; slit_V = irregDuplV "slit" "slit" "slit" ; smite_V = irregV "smite" "smote" "smitten" ; - sow_V = irregV "sow" "sowed" (variants {"sowed" ; "sown"}) ; + sow_V = irregV "sow" "sowed" "sown" ; speak_V = irregV "speak" "spoke" "spoken" ; speed_V = irregV "speed" "sped" "sped" ; spend_V = irregV "spend" "spent" "spent" ; - spill_V = irregV "spill" (variants {"spilled" ; "spilt"}) (variants {"spilled" ; "spilt"}) ; + spill_V = irregV "spill" "spilt" "spilt" ; spin_V = irregDuplV "spin" "spun" "spun" ; - spit_V = irregDuplV "spit" (variants {"spit" ; "spat"}) "spit" ; + spit_V = irregDuplV "spit" "spit" "spit" ; + spit_spat_V = irregDuplV "spit" "spat" "spit" ; split_V = irregDuplV "split" "split" "split" ; spread_V = irregV "spread" "spread" "spread" ; - spring_V = irregV "spring" (variants {"sprang" ; "sprung"}) "sprung" ; + spring_V = irregV "spring" "sprang" "sprung" ; + spring_sprung_V = irregV "spring" "sprung" "sprung" ; stand_V = irregV "stand" "stood" "stood" ; steal_V = irregV "steal" "stole" "stolen" ; stick_V = irregV "stick" "stuck" "stuck" ; @@ -152,7 +155,7 @@ flags optimize=values ; strive_V = irregV "strive" "strove" "striven" ; swear_V = irregV "swear" "swore" "sworn" ; sweep_V = irregV "sweep" "swept" "swept" ; - swell_V = irregV "swell" "swelled" (variants {"swelled" ; "swollen"}) ; + swell_V = irregV "swell" "swelled" "swollen" ; swim_V = irregDuplV "swim" "swam" "swum" ; swing_V = irregV "swing" "swung" "swung" ; take_V = irregV "take" "took" "taken" ; @@ -160,7 +163,7 @@ flags optimize=values ; tear_V = irregV "tear" "tore" "torn" ; tell_V = irregV "tell" "told" "told" ; think_V = irregV "think" "thought" "thought" ; - thrive_V = irregV "thrive" (variants {"thrived" ; "throve"}) "thrived" ; + thrive_V = irregV "thrive" "throve" "thrived" ; throw_V = irregV "throw" "threw" "thrown" ; thrust_V = irregV "thrust" "thrust" "thrust" ; tread_V = irregV "tread" "trod" "trodden" ; @@ -169,7 +172,7 @@ flags optimize=values ; upset_V = irregDuplV "upset" "upset" "upset" ; wake_V = irregV "wake" "woke" "woken" ; wear_V = irregV "wear" "wore" "worn" ; - weave_V = irregV "weave" (variants {"weaved" ; "wove"}) (variants {"weaved" ; "woven"}) ; + weave_V = irregV "weave" "wove" "woven" ; wed_V = irregDuplV "wed" "wed" "wed" ; weep_V = irregV "weep" "wept" "wept" ; wind_V = irregV "wind" "wound" "wound" ; diff --git a/src/english/IrregEngAbs.gf b/src/english/IrregEngAbs.gf index 103fe3278..32dbcb421 100644 --- a/src/english/IrregEngAbs.gf +++ b/src/english/IrregEngAbs.gf @@ -9,6 +9,7 @@ fun beset_V : V ; bet_V : V ; bid_V : V ; + bid_bade_V : V ; bind_V : V ; bite_V : V ; bleed_V : V ; @@ -133,9 +134,11 @@ fun spill_V : V ; spin_V : V ; spit_V : V ; + spit_spat_V : V ; split_V : V ; spread_V : V ; spring_V : V ; + spring_sprung_V : V ; stand_V : V ; steal_V : V ; stick_V : V ;