the Masc suffixes put in place in Dictionary where needed

lib/src/translator/todo/TopDictionaryEng.gf

@@ -654,7 +654,7 @@ lin staff_1_N = mkN "staff" ;
 lin certain_A = compoundA (mkA "certain");
 lin certain_2_A = mkA "certain" ;
 lin certain_1_A = mkA "certain" ;
-lin student_N = mkN "student" ;
+lin studentMasc_N = mkN masculine (mkN "student" "students");
 lin half_Predet = {s = "half" | "half of"} ;
 lin half_Predet = {s = "half" | "half of"} ;
 lin around_Prep = mkPrep "around";
@@ -669,7 +669,7 @@ lin particularly_Adv = mkAdv "particularly" ;
 lin department_N = mkN "department" "departments";
 lin management_N = mkN "management" "managements";
 lin morning_N = mkN "morning" "mornings";
-lin draw_V2 = variants{}; -- mkV2V (IrregEng.draw_V) noPrep to_Prep ;
+lin draw_V2 = variants{}; -- IrregEng.draw_V;
 lin draw_1_V2 = mkV2 (IrregEng.draw_V);
 lin draw_2_V2 = mkV2 (IrregEng.draw_V);
 lin draw_V = IrregEng.draw_V;
@@ -752,7 +752,7 @@ lin watch_V = mkV "watch" "watches" "watched" "watched" "watching";
 lin white_A = mkA "white" "whiter";
 lin situation_N = mkN "situation" "situations";
 lin ago_Adv = mkAdv "ago";
-lin teacher_N = mkN "teacher" ;
+lin teacherMasc_N = mkN masculine (mkN "teacher" "teachers");
 lin record_N = mkN "record" "records";
 lin record_3_N = mkN "record" ;
 lin record_2_N = mkN "record" ;
@@ -1164,7 +1164,7 @@ lin individual_A = compoundA (mkA "individual");
 lin forward_Adv = mkAdv "forward";
 lin announce_VS = mkVS (mkV "announce" "announces" "announced" "announced" "announcing");
 lin announce_V2 = mkV2 (mkV "announce" "announces" "announced" "announced" "announcing");
-lin user_N = mkN "user" ;
+lin userMasc_N = mkN masculine (mkN "user" "users");
 lin fund_N = mkN "fund" "funds";
 lin character_2_N = mkN "character" "characters";
 lin character_1_N = mkN "character" "characters";
@@ -1278,7 +1278,7 @@ lin left_A = irregAdv (mkA "left") "left";
 lin dead_A = compoundA (mkA "dead");
 lin discussion_N = mkN "discussion" "discussions";
 lin specific_A = irregAdv (compoundA (mkA "specific")) "specifically";
-lin customer_N = mkN "customer" ;
+lin customerMasc_N = mkN masculine (mkN "customer" "customers");
 lin box_N = mkN "box" "boxes";
 lin outside_Prep = mkPrep "outside";
 lin state_VS = mkVS (mkV "state");
@@ -1337,7 +1337,7 @@ lin commission_N = mkN "commission" "commissions";
 lin intend_VV = mkVV (mkV "intend");
 lin beyond_Prep = mkPrep "beyond";
 lin seat_N = mkN "seat" "seats";
-lin president_N = mkN "president" ;
+lin presidentMasc_N = mkN masculine (mkN "president" "presidents");
 lin encourage_V2V = mkV2V (mkV "encourage") noPrep to_Prep ;
 lin encourage_V2 = mkV2 (mkV "encourage" "encourages" "encouraged" "encouraged" "encouraging");
 lin addition_N = mkN "addition" "additions";
@@ -1478,7 +1478,7 @@ lin check_V = mkV "check" "checks" "checked" "checked" "checking";
 lin sun_N = mkN "sun" "suns";
 lin species_N = mkN "species" "species";
 lin possibility_N = mkN "possibility" "possibilities";
-lin official_N = mkN "official" ;
+lin officialMasc_N = mkN masculine (mkN "official" "officials");
 lin chairman_N = mkN masculine (mkN "chairman" "chairmen");
 lin speaker_N = mkN "speaker" "speakers";
 lin second_N = mkN "second" "seconds";
@@ -1691,7 +1691,7 @@ lin supply_V2 = mkV2 (mkV "supply" "supplies" "supplied" "supplied" "supplying")
 lin beat_V2 = mkV2 (IrregEng.beat_V);
 lin beat_V = IrregEng.beat_V;
 lin artist_N = mkN "artist" "artists";
-lin agent_N = mkN "agent" ;
+lin agentMasc_N = mkN masculine (mkN "agent" "agents");
 lin presence_N = mkN "presence" ;
 lin along_Adv = mkAdv "along";
 lin environmental_A = compoundA (mkA "environmental");
@@ -1728,7 +1728,7 @@ lin proportion_N = mkN "proportion" "proportions";
 lin primary_A = compoundA (mkA "primary");
 lin consideration_N = mkN "consideration" "considerations";
 lin reform_N = mkN "reform" "reforms";
-lin driver_N = mkN "driver" "drivers";
+lin driverMasc_N = mkN masculine (mkN "driver" "drivers");
 lin annual_A = compoundA (mkA "annual");
 lin nuclear_A = compoundA (mkA "nuclear");
 lin latter_A = compoundA (mkA "latter");
@@ -1755,7 +1755,7 @@ lin credit_N = mkN "credit" "credits";
 lin usual_A = compoundA (mkA "usual");
 lin link_V2 = mkV2 (mkV "link" "links" "linked" "linked" "linking");
 lin link_V = mkV "link" "links" "linked" "linked" "linking";
-lin candidate_N = mkN "candidate" ;
+lin candidateMasc_N = mkN masculine (mkN "candidate" "candidates");
 lin track_N = mkN "track" "tracks";
 lin safe_A = mkA "safe" "safer";
 lin interested_A = mkA "interested";
@@ -2149,7 +2149,7 @@ lin hide_V = IrregEng.hide_V;
 lin offence_N = mkN "offence" "offences";
 lin absence_N = mkN "absence" "absences";
 lin error_N = mkN "error" "errors";
-lin representative_N = mkN "representative" ;
+lin representativeMasc_N = mkN masculine (mkN "representative" "representatives");
 lin enterprise_N = mkN "enterprise" "enterprises";
 lin criticism_N = mkN "criticism" "criticisms";
 lin average_A = compoundA (mkA "average");
@@ -2272,7 +2272,7 @@ lin fast_Adv = mkAdv "fast";
 lin fast_A = mkA "fast" "faster";
 lin closely_Adv = mkAdv "closely" ;
 lin thin_A = mkA "thin" "thinner";
-lin solicitor_N = mkN "solicitor" ;
+lin solicitorMasc_N = mkN masculine (mkN "solicitor" "solicitors");
 lin secure_V2 = mkV2 (mkV "secure" "secures" "secured" "secured" "securing");
 lin plate_N = mkN "plate" "plates";
 lin pool_N = mkN "pool" "pools";
@@ -2547,7 +2547,7 @@ lin fuel_N = mkN "fuel" "fuels";
 lin mine_N = mkN "mine" "mines";
 lin appeal_V2 = mkV2 (mkV "appeal");
 lin appeal_V = mkV "appeal";
-lin servant_N = mkN "servant" ;
+lin servantMasc_N = mkN masculine (mkN "servant" "servants");
 lin liability_N = mkN "liability" "liabilities";
 lin constant_A = compoundA (mkA "constant");
 lin hate_VV = mkVV (mkV "hate");
@@ -2619,7 +2619,7 @@ lin paint_V = mkV "paint" "paints" "painted" "painted" "painting";
 lin judge_VS = mkVS (mkV "judge" "judges" "judged" "judged" "judging");
 lin judge_V2 = mkV2 (mkV "judge" "judges" "judged" "judged" "judging");
 lin judge_V = mkV "judge" "judges" "judged" "judged" "judging";
-lin citizen_N = mkN "citizen" ;
+lin citizenMasc_N = mkN masculine (mkN "citizen" "citizens");
 lin permanent_A = compoundA (mkA "permanent");
 lin weak_A = mkA "weak" "weaker";
 lin separate_V2 = mkV2 (mkV "separate" "separates" "separated" "separated" "separating");
@@ -2740,7 +2740,7 @@ lin crown_N = mkN "crown" "crowns";
 lin permit_V2V = mkV2V (mkV "permit" "permits" "permitted" "permitted" "permitting") noPrep to_Prep ;
 lin permit_V2 = mkV2 (mkV "permit" "permits" "permitted" "permitted" "permitting");
 lin permit_V = mkV "permit" "permits" "permitted" "permitted" "permitting";
-lin buyer_N = mkN "buyer" ;
+lin buyerMasc_N = mkN masculine (mkN "buyer" "buyers");
 lin gift_N = mkN "gift" "gifts";
 lin resolution_N = mkN "resolution" "resolutions";
 lin angry_A = mkA "angry" "angrier";
@@ -3209,7 +3209,7 @@ lin qualify_V = mkV "qualify" "qualifies" "qualified" "qualified" "qualifying";
 lin paragraph_N = mkN "paragraph" "paragraphs";
 lin sick_A = compoundA (mkA "sick");
 lin near_A = mkA "near" "nearer";
-lin researcher_N = mkN "researcher" ;
+lin researcherMasc_N = mkN masculine (mkN "researcher" "researchers");
 lin consent_N = mkN "consent" ;
 lin written_A = mkA "written" ;
 lin literary_A = compoundA (mkA "literary");
@@ -3234,7 +3234,7 @@ lin birthday_N = mkN "birthday" "birthdays";
 lin knife_N = mkN "knife" "knives";
 lin extreme_A = compoundA (mkA "extreme");
 lin core_N = mkN "core" "cores";
-lin peasant_N = mkN "peasant" ;
+lin peasantMasc_N = mkN masculine (mkN "peasant" "peasants");
 lin armed_A = mkA "armed" ;
 lin permission_N = mkN "permission" ;
 lin supreme_A = compoundA (mkA "supreme");
@@ -3325,7 +3325,7 @@ lin tower_N = mkN "tower" "towers";
 lin deposit_N = mkN "deposit" "deposits";
 lin pace_N = mkN "pace" "paces";
 lin compensation_N = mkN "compensation" "compensations";
-lin adviser_N = mkN "adviser" ;
+lin adviserMasc_N = mkN masculine (mkN "adviser" "advisers");
 lin consultant_N = mkN "consultant" "consultants";
 lin drag_V2 = mkV2 (mkV "drag" "drags" "dragged" "dragged" "dragging");
 lin drag_V = mkV "drag" "drags" "dragged" "dragged" "dragging";
@@ -3475,7 +3475,7 @@ lin apple_N = mkN "apple" "apples";
 lin catalogue_N = mkN "catalogue" "catalogues";
 lin tip_N = mkN "tip" "tips";
 lin publisher_N = mkN "publisher" "publishers";
-lin opponent_N = mkN "opponent" ;
+lin opponentMasc_N = mkN masculine (mkN "opponent" "opponents");
 lin live_A = compoundA (mkA "live");
 lin burden_N = mkN "burden" "burdens";
 lin tackle_V2 = mkV2 (mkV "tackle" "tackles" "tackled" "tackled" "tackling");
@@ -3530,7 +3530,7 @@ lin considerably_Adv = mkAdv "considerably" ;
 lin distant_A = compoundA (mkA "distant");
 lin lower_V2 = mkV2 (mkV "lower" "lowers" "lowered" "lowered" "lowering");
 lin lower_V = mkV "lower" "lowers" "lowered" "lowered" "lowering";
-lin favourite_N = mkN "favourite" ;
+lin favouriteMasc_N = mkN masculine (mkN (variants {"favourite"; "favorite"}));
 lin tear_V2 = mkV2 (IrregEng.tear_V);
 lin tear_V = IrregEng.tear_V;
 lin fixed_A = mkA "fixed" ;
@@ -3767,7 +3767,7 @@ lin album_N = mkN "album" "albums";
 lin guideline_N = mkN "guideline" "guidelines";
 lin disturb_V2 = mkV2 (mkV "disturb" "disturbs" "disturbed" "disturbed" "disturbing");
 lin amendment_N = mkN "amendment" "amendments";
-lin architect_N = mkN "architect" ;
+lin architectMasc_N = mkN masculine (mkN "architect" "architects");
 lin objection_N = mkN "objection" "objections";
 lin chart_N = mkN "chart" "charts";
 lin cattle_N = mkN "cattle" ;
@@ -3847,7 +3847,7 @@ lin gaze_V = mkV "gaze" "gazes" "gazed" "gazed" "gazing";
 lin burst_V2 = mkV2 (IrregEng.burst_V);
 lin burst_V = IrregEng.burst_V;
 lin charter_N = mkN "charter" "charters";
-lin feminist_N = mkN "feminist" ;
+lin feministMasc_N = mkN masculine (mkN "feminist" "feminists");
 lin discourse_N = mkN "discourse" "discourses";
 lin reflection_N = mkN "reflection" "reflections";
 lin carbon_N = mkN "carbon" "carbons";
@@ -3923,7 +3923,7 @@ lin murder_V2 = mkV2 (mkV "murder" "murders" "murdered" "murdered" "murdering");
 lin sigh_VS = mkVS (mkV "sigh" "sighs" "sighed" "sighed" "sighing");
 lin sigh_V2 = mkV2 (mkV "sigh" "sighs" "sighed" "sighed" "sighing");
 lin sigh_V = mkV "sigh" "sighs" "sighed" "sighed" "sighing";
-lin seller_N = mkN "seller" ;
+lin sellerMasc_N = mkN masculine (mkN "seller" "sellers");
 lin lease_N = mkN "lease" "leases";
 lin bitter_A = compoundA (mkA "bitter");
 lin double_V2 = mkV2 (mkV "double" "doubles" "doubled" "doubled" "doubling");
@@ -4143,7 +4143,7 @@ lin oblige_V2 = mkV2 (mkV "oblige" "obliges" "obliged" "obliged" "obliging");
 lin accountant_N = mkN "accountant" "accountants";
 lin mutual_A = compoundA (mkA "mutual");
 lin fat_N = mkN "fat" "fats";
-lin volunteer_N = mkN "volunteer" ;
+lin volunteerMasc_N = mkN masculine (mkN "volunteer" "volunteers");
 lin laughter_N = mkN "laughter" ;
 lin trick_N = mkN "trick" "tricks";
 lin load_V2 = mkV2 (mkV "load" "loads" "loaded" "loaded" "loading");
@@ -4492,7 +4492,7 @@ lin productivity_N = mkN "productivity" ;
 lin initiate_V2 = mkV2 (mkV "initiate" "initiates" "initiated" "initiated" "initiating");
 lin probability_N = mkN "probability" "probabilities";
 lin virus_N = mkN "virus" "viruses";
-lin reporter_N = mkN "reporter" ;
+lin reporterMasc_N = mkN masculine (mkN "reporter" "reporters");
 lin fool_N = mkN "fool" "fools";
 lin pop_V2 = mkV2 (mkV "pop" "pops" "popped" "popped" "popping");
 lin capitalism_N = mkN "capitalism" ;
@@ -4596,7 +4596,7 @@ lin fade_V = mkV "fade" "fades" "faded" "faded" "fading";
 lin chemistry_N = mkN "chemistry" ;
 lin unnecessary_A = compoundA (mkA "unnecessary");
 lin hit_N = mkN "hit" "hits";
-lin defender_N = mkN "defender" ;
+lin defenderMasc_N = mkN masculine (mkN "defender" "defenders");
 lin stance_N = mkN "stance" "stances";
 lin sin_N = mkN "sin" "sins";
 lin realistic_A = compoundA (mkA "realistic");
@@ -4699,7 +4699,7 @@ lin extract_V2 = mkV2 (mkV "extract" "extracts" "extracted" "extracted" "extract
 lin concession_N = mkN "concession" "concessions";
 lin autonomy_N = mkN "autonomy" "autonomies";
 lin norm_N = mkN "norm" "norms";
-lin musician_N = mkN "musician" ;
+lin musicianMasc_N = mkN masculine (mkN "musician" "musicians");
 lin graduate_N = mkN "graduate" "graduates";
 lin glory_N = mkN "glory" "glories";
 lin bear_N = mkN "bear" "bears";
@@ -4865,7 +4865,7 @@ lin mild_A = mkA "mild" "milder";
 lin chronic_A = compoundA (mkA "chronic");
 lin splendid_A = compoundA (mkA "splendid");
 lin function_V = mkV "function" "functions" "functioned" "functioned" "functioning";
-lin rider_N = mkN "rider" ;
+lin riderMasc_N = mkN masculine (mkN "rider" "riders");
 lin clay_N = mkN "clay" ;
 lin firstly_Adv = mkAdv "firstly" ;
 lin conceive_V2 = mkV2 (mkV "conceive" "conceives" "conceived" "conceived" "conceiving");
@@ -4876,7 +4876,7 @@ lin accuracy_N = mkN "accuracy" "accuracies";
 lin coup_N = mkN "coup" "coups";
 lin ambulance_N = mkN "ambulance" "ambulances";
 lin living_N = mkN "living" "livings";
-lin offender_N = mkN "offender" ;
+lin offenderMasc_N = mkN masculine (mkN "offender" "offenders");
 lin similarity_N = mkN "similarity" "similarities";
 lin orchestra_N = mkN "orchestra" "orchestras";
 lin brush_N = mkN "brush" "brushes";
@@ -5297,7 +5297,7 @@ lin discipline_V2 = mkV2 (mkV "discipline" "disciplines" "disciplined" "discipli
 lin halt_V2 = mkV2 (mkV "halt" "halts" "halted" "halted" "halting");
 lin halt_V = mkV "halt" "halts" "halted" "halted" "halting";
 lin electronics_N = mkN "electronics" "electronics";
-lin administrator_N = mkN "administrator" ;
+lin administratorMasc_N = mkN masculine (mkN "administrator" "administrators");
 lin sentence_V2 = mkV2 (mkV "sentence" "sentences" "sentenced" "sentenced" "sentencing");
 lin sentence_V = mkV "sentence";
 lin ill_Adv = mkAdv "ill";
@@ -5650,7 +5650,7 @@ lin managerial_A = compoundA (mkA "managerial");
 lin elaborate_A = compoundA (mkA "elaborate");
 lin restraint_N = mkN "restraint" "restraints";
 lin renew_V2 = mkV2 (mkV "renew" "renews" "renewed" "renewed" "renewing");
-lin gardener_N = mkN "gardener" ;
+lin gardenerMasc_N = mkN masculine (mkN "gardener" "gardeners");
 lin dilemma_N = mkN "dilemma" "dilemmas";
 lin configuration_N = mkN "configuration" "configurations";
 lin rear_A = mkA "rear" ;
@@ -5770,7 +5770,7 @@ lin disagree_VS = mkVS (mkV "disagree");
 lin disagree_V2 = mkV2 (mkV "disagree" "disagrees" "disagreed" "disagreed" "disagreeing");
 lin disagree_V = mkV "disagree";
 lin boyfriend_N = mkN masculine (mkN "boyfriend" "boyfriends");
-lin activist_N = mkN "activist" ;
+lin activistMasc_N = mkN masculine (mkN "activist" "activists");
 lin viewer_N = mkN "viewer" "viewers";
 lin slim_A = mkA "slim" "slimmer";
 lin textile_N = mkN "textile" "textiles";
@@ -5974,7 +5974,7 @@ lin prescribe_V = mkV "prescribe" "prescribes" "prescribed" "prescribed" "prescr
 lin calcium_N = mkN "calcium" ;
 lin redundant_A = compoundA (mkA "redundant");
 lin marker_N = mkN "marker" "markers";
-lin chemist_N = mkN "chemist" ;
+lin chemistMasc_N = mkN masculine (mkN "chemist" "chemists");
 lin mammal_N = mkN "mammal" "mammals";
 lin legacy_N = mkN "legacy" "legacies";
 lin debtor_N = mkN "debtor" "debtors";
@@ -6202,7 +6202,7 @@ lin patience_N = mkN "patience" ;
 lin legally_Adv = mkAdv "legally" ;
 lin habitat_N = mkN "habitat" "habitats";
 lin queue_N = mkN "queue" "queues";
-lin spectator_N = mkN "spectator" ;
+lin spectatorMasc_N = mkN masculine (mkN "spectator" "spectators");
 lin given_A = mkA "given" ;
 lin purple_A = compoundA (mkA "purple");
 lin outlook_N = mkN "outlook" "outlooks";
@@ -6371,7 +6371,7 @@ lin disclosure_N = mkN "disclosure" "disclosures";
 lin lace_N = mkN "lace" "laces";
 lin inability_N = mkN "inability" ;
 lin motif_N = mkN "motif" "motifs";
-lin listener_N = mkN "listener" ;
+lin listenerMasc_N = mkN masculine (mkN "listener" "listeners");
 lin hunt_N = mkN "hunt" "hunts";
 lin delicious_A = compoundA (mkA "delicious");
 lin term_VS = mkVS (mkV "term");
@@ -7014,7 +7014,7 @@ lin witch_N = mkN "witch" "witches";
 lin renewed_A = mkA "renewed" ;
 lin jar_N = mkN "jar" "jars";
 lin approved_A = mkA "approved" ;
-lin advocate_N = mkN "advocate" ;
+lin advocateMasc_N = mkN masculine (mkN "advocate" "advocates");
 lin worrying_A = mkA "worrying" ;
 lin minimize_V2 = mkV2 (mkV "minimize" "minimizes" "minimized" "minimized" "minimizing");
 lin footstep_N = mkN "footstep" "footsteps";
@@ -7049,7 +7049,7 @@ lin clerical_A = compoundA (mkA "clerical");
 lin hire_N = mkN "hire" ;
 lin contend_VS = mkVS (mkV "contend" "contends" "contended" "contended" "contending");
 lin contend_V = mkV "contend" "contends" "contended" "contended" "contending";
-lin amateur_N = mkN "amateur" ;
+lin amateurMasc_N = mkN masculine (mkN "amateur" "amateurs");
 lin instrumental_A = compoundA (mkA "instrumental");
 lin terminal_A = compoundA (mkA "terminal");
 lin electorate_N = mkN "electorate" "electorates";
@@ -7509,7 +7509,7 @@ lin latin_A = compoundA (mkA "latin");
 lin hover_V = mkV "hover" "hovers" "hovered" "hovered" "hovering";
 lin greeting_N = mkN "greeting" "greetings";
 lin chase_N = mkN "chase" "chases";
-lin spouse_N = mkN "spouse" ;
+lin spouseMasc_N = mkN masculine (mkN "spouse" "spouses");
 lin produce_N = mkN "produce" ;
 lin forge_V2 = mkV2 (mkV "forge" "forges" "forged" "forged" "forging");
 lin forge_V = mkV "forge" "forges" "forged" "forged" "forging";