diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 2b3325062..ad2c7578c 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -28274,6 +28274,7 @@ fun hysteroscopy_N : N ; fun hysterotomy_N : N ; fun hythe_PN : PN ; fun i_Pron : Pron ; +fun iFem_Pron : Pron ; fun i_e__Adv : Adv ; fun iamb_N : N ; fun iambic_A : A ; @@ -58864,6 +58865,7 @@ fun theta_N : N ; fun thetford_PN : PN ; fun theurgy_N : N ; fun they_Pron : Pron ; +fun theyFem_Pron : Pron ; fun thiabendazole_N : N ; fun thiazide_N : N ; fun thiazine_N : N ; @@ -64531,6 +64533,7 @@ fun wayside_N : N ; fun wayward_A : A ; fun wc_N : N ; fun we_Pron : Pron ; +fun weFem_Pron : Pron ; fun weak_A : A ; fun weak_kneed_A : A ; fun weaken_V : V ; @@ -65968,7 +65971,11 @@ fun yorkshire_PN : PN ; fun yottabit_N : N ; fun yottabyte_N : N ; fun youPl_Pron : Pron ; +fun youPlFem_Pron : Pron ; +fun youPol_Pron : Pron ; +fun youPolFem_Pron : Pron ; fun youSg_Pron : Pron ; +fun youSgFem_Pron : Pron ; fun young_A : A ; fun young_N : N ; fun younger_A : A ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 2edaf9e78..7ddc4d769 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -26592,6 +26592,7 @@ lin hysteroscopy_N = variants {}; lin hysterotomy_N = variants {}; lin hythe_PN = variants {}; lin i_Pron = mkPron "аз" "мен" "ми" "мой" "моя" "моят" "моя" "моята" "мое" "моето" "мои" "моите" (GSg Masc) P1; +lin iFem_Pron = mkPron "аз" "мен" "ми" "мой" "моя" "моят" "моя" "моята" "мое" "моето" "мои" "моите" (GSg Fem) P1; lin i_e__Adv = variants {}; lin iamb_N = variants {}; lin iambic_A = variants {}; @@ -55393,6 +55394,7 @@ lin theta_N = variants {}; lin thetford_PN = variants {}; lin theurgy_N = mkN047 "магия"; ---- lin they_Pron = mkPron "те" "тях" "им" "техен" "техния" "техният" "тяхна" "тяхната" "тяхно" "тяхното" "техни" "техните" GPl P3; +lin theyFem_Pron = mkPron "те" "тях" "им" "техен" "техния" "техният" "тяхна" "тяхната" "тяхно" "тяхното" "техни" "техните" GPl P3; lin thiabendazole_N = variants {}; lin thiazide_N = variants {}; lin thiazine_N = variants {}; @@ -60786,6 +60788,7 @@ lin wayside_N = variants {}; lin wayward_A = variants {mkA076 "дръпнат"; mkA079 "капризен"; mkA079 "своенравен"}; ---- lin wc_N = mkN041 "тоалетна"; lin we_Pron = mkPron "ние" "нас" "ни" "наш" "нашия" "нашият" "наша" "нашата" "наше" "нашето" "наши" "нашите" GPl P1; +lin weFem_Pron = mkPron "ние" "нас" "ни" "наш" "нашия" "нашият" "наша" "нашата" "наше" "нашето" "наши" "нашите" GPl P1; lin weak_A = mkA076 "слаб" ; lin weak_kneed_A = variants {}; lin weaken_V = dualV (mkV186 "отслабвам") (mkV173 "отслабя"); @@ -62116,7 +62119,11 @@ lin yorkshire_PN = mkPN "Йоркшир" Masc; lin yottabit_N = variants {}; lin yottabyte_N = variants {}; lin youPl_Pron = mkPron "вие" "вас" "ви" "ваш" "вашия" "вашият" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" GPl P2; +lin youPlFem_Pron = mkPron "вие" "вас" "ви" "ваш" "вашия" "вашият" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" GPl P2; +lin youPol_Pron = mkPron "вие" "вас" "ви" "ваш" "вашия" "вашият" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" GPl P2; +lin youPolFem_Pron = mkPron "вие" "вас" "ви" "ваш" "вашия" "вашият" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" GPl P2; lin youSg_Pron = mkPron "ти" "теб" "ти" "твой" "твоя" "твоят" "твоя" "твоята" "твое" "твоето" "твои" "твоите" (GSg Masc) P2; +lin youSgFem_Pron = mkPron "ти" "теб" "ти" "твой" "твоя" "твоят" "твоя" "твоята" "твое" "твоето" "твои" "твоите" (GSg Masc) P2; lin young_A = mkA076 "млад" ; lin young_N = dualN (mkN042 "младеж") (mkA078 "младежки"); lin younger_A = mkA078 "младши"; ---- diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 8e092291a..b688bdf9d 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -7183,6 +7183,7 @@ lin hypothetical_A = mkA "假想" ; lin hysteria_N = mkN "歇斯底里" ; lin hysterical_A = mkA "歇斯底里" ; lin i_Pron = S.i_Pron ; +lin iFem_Pron = S.i_Pron ; lin iambic_A = mkA "抑扬格" ; lin ice_N = L.ice_N ; lin ice_V2 = mkV2 "冰镇" ; @@ -15230,6 +15231,7 @@ lin thesaurus_N = mkN "宝库" ; lin thesis_N = mkN "论文" ; lin thespian_A = mkA "悲剧" ; lin they_Pron = S.they_Pron ; +lin theyFem_Pron = R.pronNP "她们" ; lin thick_A = L.thick_A ; lin thicket_N = mkN "灌木丛" "个" ; lin thickness_N = mkN "厚度" [] ; @@ -16597,6 +16599,7 @@ lin way_N = mkN "方法" ; lin wayside_N = mkN "路旁" ; lin wayward_A = mkA "任性" ; lin we_Pron = S.we_Pron ; +lin weFem_Pron = S.we_Pron ; lin weak_A = mkA "软弱" ; lin weak_kneed_A = mkA "软弱" ; lin weaken_V = mkV "削弱" ; @@ -16961,8 +16964,11 @@ lin yoga_N = mkN "瑜珈" ; lin yokohama_PN = mkPN "横滨" ; lin yon_Adv = mkAdv "在那边" ; lin youPl_Pron = S.youPl_Pron ; +lin youPlFem_Pron = S.youPl_Pron ; lin youPol_Pron = S.youPol_Pron ; +lin youPolFem_Pron = S.youPol_Pron ; lin youSg_Pron = S.youSg_Pron ; +lin youSgFem_Pron = S.youSg_Pron ; lin young_A = L.young_A ; lin young_N = mkN "年轻人" "个" ; lin youngish_A = mkA "颇年轻" ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index 937d053c3..311a67ed1 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -7517,7 +7517,8 @@ lin hypotenuse_N = mkN "hypotenusa" masculine feminine | mkN "schuine zijde" mas lin hypothesis_N = mkN "hypothese" ; -- status=guess lin hypoxia_N = mkN "hypoxie" feminine ; -- status=guess lin hysterectomy_N = mkN "hysterectomie" ; -- status=guess -lin i_Pron = S.i_Pron ; -- +lin i_Pron = S.i_Pron ; +lin iFem_Pron = S.i_Pron ; lin iambic_A = mkA "jambisch" ; -- status=guess lin iatrogenic_A = mkA "iatrogeen" ; -- status=guess lin ibex_N = mkN "steenbok" masculine | mkN "ibex" masculine ; -- status=guess status=guess @@ -15347,7 +15348,8 @@ lin thermosphere_N = mkN "thermosfeer" ; -- status=guess lin thesaurus_N = mkN "thesaurus" masculine | mkN "synoniemenboek" neuter ; -- status=guess status=guess lin thesis_N = mkN "these" ; -- status=guess lin theta_N = mkN "thèta" masculine feminine ; -- status=guess -lin they_Pron = S.they_Pron ; -- +lin they_Pron = S.they_Pron ; +lin theyFem_Pron = S.they_Pron ; lin thick_A = L.thick_A ; -- lin thick_Adv = mkAdv "dik" ; -- status=guess lin thick_N = mkN "het vuur van de strijd" ; -- status=guess @@ -16583,7 +16585,8 @@ lin way_N = mkN "manier" ; -- status=guess lin wayfarer_N = mkN "trekker" masculine ; -- status=guess lin waylay_V2 = mkV2 (mkV "onderscheppen") ; -- status=guess, src=wikt lin wayward_A = mkA "eigenzinnig" ; -- status=guess -lin we_Pron = S.we_Pron ; -- +lin we_Pron = S.we_Pron ; +lin weFem_Pron = S.we_Pron ; lin weak_A = mkA "flauw" ; -- status=guess lin weaken_V = mkV "verzwakken" ; -- status=guess, src=wikt lin weaken_V2 = mkV2 (mkV "verzwakken") ; -- status=guess, src=wikt @@ -16999,8 +17002,11 @@ lin yolk_N = mkN "dooier" masculine | mkN "eidooier" masculine | mkN "eigeel" ne lin yonder_Adv = mkAdv "ginder" ; -- status=guess lin yore_N = mkN "ver verleden" | mkN "weleer" | mkN "eertijds" ; -- status=guess status=guess status=guess lin youPl_Pron = S.youPl_Pron ; -- +lin youPlFem_Pron = S.youPl_Pron ; -- lin youPol_Pron = S.youPol_Pron ; -- +lin youPolFem_Pron = S.youPol_Pron ; -- lin youSg_Pron = S.youSg_Pron ; -- +lin youSgFem_Pron = S.youSg_Pron ; -- lin young_A = L.young_A ; -- lin young_N = mkN "jongeman" masculine ; -- status=guess lin youngster_N = mkN "jongere" masculine feminine ; -- status=guess diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index a98b0a68f..f674e76c8 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -28275,6 +28275,7 @@ lin hysteroscopy_N = mkN "hysteroscopy" ; lin hysterotomy_N = mkN "hysterotomy" ; lin hythe_PN = mkPN "Hythe"; lin i_Pron = mkPron "I" "me" "my" "mine" singular P1 human; +lin iFem_Pron = mkPron "I" "me" "my" "mine" singular P1 human; lin i_e__Adv = mkAdv "i.e." ; lin iamb_N = mkN "iamb" "iambs"; lin iambic_A = compoundA (mkA "iambic"); @@ -58868,6 +58869,7 @@ lin theta_N = mkN "theta" ; lin thetford_PN = mkPN "Thetford"; lin theurgy_N = mkN "theurgy" ; lin they_Pron = mkPron "they" "them" "their" "theirs" plural P3 human ; +lin theyFem_Pron = mkPron "they" "them" "their" "theirs" plural P3 human ; lin thiabendazole_N = mkN "thiabendazole" ; lin thiazide_N = mkN "thiazide" ; lin thiazine_N = mkN "thiazine" ; @@ -64535,6 +64537,7 @@ lin wayside_N = mkN "wayside" "waysides"; lin wayward_A = compoundA (mkA "wayward"); lin wc_N = mkN "WC" "WCs" ; lin we_Pron = mkPron "we" "us" "our" "ours" plural P1 human ; +lin weFem_Pron = mkPron "we" "us" "our" "ours" plural P1 human ; lin weak_A = mkA "weak" "weaker"; lin weak_kneed_A = compoundA (mkA "weak-kneed"); lin weaken_V = mkV "weaken" "weakens" "weakened" "weakened" "weakening"; @@ -65972,7 +65975,11 @@ lin yorkshire_PN = mkPN "Yorkshire"; lin yottabit_N = mkN "yottabit" ; lin yottabyte_N = mkN "yottabyte" ; lin youPl_Pron = mkPron "you" "you" "your" "yours" plural P2 human ; +lin youPlFem_Pron = mkPron "you" "you" "your" "yours" plural P2 human ; +lin youPol_Pron = mkPron "you" "you" "your" "yours" singular P2 human ; +lin youPolFem_Pron = mkPron "you" "you" "your" "yours" singular P2 human ; lin youSg_Pron = mkPron "you" "you" "your" "yours" singular P2 human ; +lin youSgFem_Pron = mkPron "you" "you" "your" "yours" singular P2 human ; lin young_A = mkA "young" "younger"; lin young_N = mkN "young" ; lin younger_A = mkA "younger" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 21d7f2c81..2c2a6b3ee 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -3,13 +3,13 @@ concrete DictionaryFin of Dictionary = CatFin ** open ParadigmsFin, (S = StructuralFin), (L = LexiconFin), - MorphoFin, ParadigmsFin, Kotus, WNKotus, StemFin, Prelude in { + MorphoFin, ParadigmsFin, Kotus, WNKotus, StemFin, (E=ExtraFin), Prelude in { flags coding=utf8 ; -oper - tehda_V = mkV (lin VK {s = c71 "tehdä"}) ; - nahda_V = mkV (lin VK {s = c71 "nähdä"}) ; +oper tehda_V = mkV (lin VK {s = c71 "tehdä"}) ; +oper nahda_V = mkV (lin VK {s = c71 "nähdä"}) ; +oper optProDrop : Pron -> Pron = \p -> p | E.ProDrop p ; lin a_fortiori_Adv = mkWAdv "suuremmalla" "syyllä" ; --UNCHK lin a_la_carte_Adv = mkWAdv "a" "la" "carte" ; --UNCHK @@ -24675,7 +24675,8 @@ lin hysterics_N = mkWN (k39 "kohtaus") "hysteerinen" ; --UNCHK lin hysterocatalepsy_N = mkWN (k12 "hysteria") "kataleptinen" ; --UNCHK lin hysterosalpingogram_N = mkWN "hysterosalpingografia" ; --UNCHK lin hysteroscopy_N = mkWN (compoundN "hysterosko" (k5A "oppi")) ; --UNCHK -lin i_Pron = S.i_Pron ; +lin i_Pron = optProDrop S.i_Pron ; +lin iFem_Pron = optProDrop S.i_Pron ; lin iamb_N = mkWN (k5 "jambi") ; --UNCHK lin iambic_A = mkWA (compoundA "jambi" (k38 "nen")) ; --UNCHK lin iambic_N = mkWN (k48A "säe") "jambinen" ; --UNCHK @@ -51411,7 +51412,8 @@ lin thespian_A = mkWA (k38 "traaginen") ; --UNCHK lin thespian_N = mkWN (k12 "näyttelijä") ; --UNCHK lin theta_N = mkWN (k9 "theeta") ; --UNCHK lin theurgy_N = mkWN "teurgia" ; --UNCHK -lin they_Pron = S.they_Pron ; +lin they_Pron = S.they_Pron | mkPronoun "ne" "niiden" "niitä" "niinä" "niihin" Pl P3 ; ---- split +lin theyFem_Pron = S.they_Pron ; lin thiabendazole_N = mkWN "tiabendatsoli" ; --UNCHK lin thiazide_N = mkWN (k5A "diureetti") ; --UNCHK lin thiazine_N = mkWN (k5A "diureetti") ; --UNCHK @@ -56446,7 +56448,8 @@ lin waylay_V2 = mkWV2 (k53A "odottaa") "makuulla" ; --UNCHK lin ways_N = mkWN (compoundN "vesillelasku" (k5A "ramppi")) ; --UNCHK lin wayside_N = mkWN (compoundN "tien" (k9A "laita")) ; --UNCHK lin wayward_A = mkWA (k34A "kuriton") ; --UNCHK -lin we_Pron = S.we_Pron ; +lin we_Pron = optProDrop S.we_Pron ; +lin weFem_Pron = optProDrop S.we_Pron ; lin weak_A = mkWA (k1A "heikko") ; --f133 lin weak_kneed_A = mkA "pelokas" ; lin weaken_V = mkWV (k72A "heiketä") ; @@ -57598,9 +57601,12 @@ lin yonder_A = mkWA (k101 "tuo") ; --UNCHK lin yore_N = mkWN "ennen" "vanhaan" ; --UNCHK lin yottabit_N = mkWN (compoundN "jotta" (k5A "bitti")) ; --UNCHK lin yottabyte_N = mkWN (compoundN "jotta" (k1 "tavu")) ; --UNCHK -lin youPl_Pron = S.youPl_Pron ; -lin youPol_Pron = S.youPol_Pron ; -lin youSg_Pron = S.youSg_Pron ; +lin youPl_Pron = optProDrop S.youPl_Pron ; +lin youPlFem_Pron = optProDrop S.youPl_Pron ; +lin youPol_Pron = optProDrop S.youPol_Pron ; +lin youPolFem_Pron = optProDrop S.youPol_Pron ; +lin youSg_Pron = optProDrop S.youSg_Pron ; +lin youSgFem_Pron = optProDrop S.youSg_Pron ; lin young_A = L.young_A ; lin young_N = mkWN (k38 "jälkeläinen") ; --UNCHK lin younger_A = mkWA "nuorempi" ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index d06a805ca..462290a74 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -10001,7 +10001,8 @@ lin hysterectomy_N = mkN "hystérectomie" feminine ; -- tocheck lin hysteresis_N = mkN "hystérèse" feminine ; -- tocheck lin hysteria_N = mkN "hystérie" feminine ; -- tocheck lin hysteric_N = mkN "hystérique" ; -- tocheck -lin i_Pron = S.i_Pron | E.i8fem_Pron; +lin i_Pron = S.i_Pron ; +lin iFem_Pron = E.i8fem_Pron ; lin iamb_N = mkN "ïambe" masculine ; -- tocheck lin iambic_A = mkA "iambique" ; -- tocheck lin iatrogenic_A = mkA "iatrogène" ; -- tocheck @@ -10891,7 +10892,7 @@ lin issue_N = mkN "problème" masculine | mkN "controverse" ; lin issue_V = variants{} ; -- lin issue_V2 = variants{} ; -- lin isthmus_N = mkN "isthme" ; -- tocheck -lin it_Pron = S.it_Pron | S.she_Pron; +lin it_Pron = S.it_Pron | S.she_Pron | E.ce_Pron ; lin italic_A = mkA "italique" ; -- tocheck lin itch_N = mkN "démangeaison" ; -- tocheck lin itch_V = mkV (mkV "démanger") ; -- tocheck @@ -20328,7 +20329,8 @@ lin thermostat_N = mkN "thermostat" ; -- tocheck lin thermotropism_N = mkN "thermotropisme" ; -- tocheck lin thesis_N = mkN "thèse" feminine ; -- tocheck lin theta_N = mkN "thêta" masculine ; -- tocheck -lin they_Pron = S.they_Pron | E.they8fem_Pron; +lin they_Pron = S.they_Pron ; +lin theyFem_Pron = E.they8fem_Pron ; lin thick_A = L.thick_A ; lin thick_Adv = mkAdv "épais" ; -- tocheck lin thicken_V2 = mkV2 (reflV (mkV "épaissir")) | mkV2 (mkV "épaissir") ; -- tocheck @@ -21969,7 +21971,8 @@ lin way_Adv = mkAdv "très" ; -- tocheck lin way_N = mkN "manière" feminine | mkN "façon" feminine ; lin wayfarer_N = mkN "voyageur" masculine ; -- tocheck lin waylay_V2 = mkV2 (mkV "comploter") ; -- tocheck -lin we_Pron = S.we_Pron | E.we8fem_Pron; +lin we_Pron = S.we_Pron ; +lin weFem_Pron = E.we8fem_Pron ; lin weak_A = mkA "faible" ; -- tocheck lin weaken_V = variants{}; -- mkV2 (reflV (mkV "affaiblir")) | mkV2 (mkV "affaiblir") ; -- tocheck lin weaken_V2 = mkV2 (reflV (mkV "affaiblir")) | mkV2 (mkV "affaiblir") ; -- tocheck @@ -22413,9 +22416,12 @@ lin yogi_N = mkN "yogi" masculine ; -- tocheck lin yoke_N = mkN "joug" masculine ; -- tocheck lin yonder_Adv = mkAdv "là-bas" ; -- tocheck lin yore_N = mkN "jadis" ; -- tocheck -lin youPl_Pron = S.youPl_Pron | E.youPl8fem_Pron; -lin youPol_Pron = S.youPol_Pron | E.youPol8fem_Pron; -lin youSg_Pron = S.youSg_Pron| E.youSg8fem_Pron; +lin youPl_Pron = S.youPl_Pron ; +lin youPlFem_Pron = E.youPl8fem_Pron ; +lin youPol_Pron = S.youPol_Pron ; +lin youPolFem_Pron = E.youPol8fem_Pron ; +lin youSg_Pron = S.youSg_Pron ; +lin youSgFem_Pron = E.youSg8fem_Pron ; lin young_A = L.young_A ; lin young_N = mkN "petit" masculine | mkN "jeune" masculine ; -- tocheck lin youngster_N = variants{} ; -- diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 297641b5b..de2372daf 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -18150,7 +18150,8 @@ lin hysteria_N = reg2N "Hysterie" "Hysterien" feminine; lin hysterical_A = mk3A "hysterisch" "hysterischer" "hysterischsten e"; lin hysterics_N = variants {}; lin hythe_PN = variants {}; -lin i_Pron = M.mkPronPers "ich" "mich" "mir" "meiner" "mein" R.Masc R.Sg R.P1; +lin i_Pron = S.i_Pron ; +lin iFem_Pron = S.i_Pron ; lin iamb_N = reg2N "Jambus" "Jamben" masculine; lin iambic_A = regA "jambisch"; lin iambics_N = variants {}; @@ -39143,7 +39144,8 @@ lin thespian_A = variants {}; lin thespian_N = variants {}; lin thessaloniki_PN = variants {}; lin thetford_PN = variants {}; -lin they_Pron = M.mkPronPers "sie" "sie" "ihnen" "ihrer" "ihr" R.Fem R.Pl R.P3; +lin they_Pron = S.they_Pron ; +lin theyFem_Pron = S.they_Pron ; lin thick_A = regA "dick"; lin thick_Adv = variants{} ; -- lin thick_N = variants {}; @@ -42938,7 +42940,8 @@ lin wayne_PN = variants {}; lin wayside_N = variants {}; lin wayward_A = mk3A "eigenwillig" "eigenwilliger" "eigenwilligste"; lin wc_N = variants {}; -lin we_Pron = M.mkPronPers "wir" "uns" "uns" "unser" "unser" R.Fem R.Pl R.P1; +lin we_Pron = S.we_Pron ; +lin weFem_Pron = S.we_Pron ; lin weak_A = mk3A "schwach" "schwächer" "schwächste"; lin weak_kneed_A = variants {}; lin weaken_V = variants{} ; -- @@ -44020,8 +44023,12 @@ lin yore_N = variants {}; lin york_PN = variants {}; lin yorkley_PN = variants {}; lin yorkshire_PN = variants {}; -lin youPl_Pron = M.mkPronPers "ihr" "euch" "euch" "eurer" "euer" R.Fem R.Pl R.P2; -lin youSg_Pron = M.mkPronPers "du" "dich" "dir" "deiner" "dein" R.Fem R.Sg R.P2; +lin youPl_Pron = S.youPl_Pron ; +lin youPlFem_Pron = S.youPl_Pron ; +lin youPol_Pron = S.youPol_Pron ; +lin youPolFem_Pron = S.youPol_Pron ; +lin youSg_Pron = S.youSg_Pron ; +lin youSgFem_Pron = S.youSg_Pron ; lin young_A = mk3A "jung" "jünger" "jüngste"; lin young_N = variants {}; lin youngish_A = variants {}; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 814adfe4e..26faabfc1 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -13079,6 +13079,7 @@ lin hysteria_N = mkN "उन्माद" ; -- tocheck lin hysterical_A = mkA "उन्मत्त" ; -- tocheck lin hysterics_N = mkN "हिस्टीरिया का दौरा" ; -- tocheck lin i_Pron = personalPN "मैं" "मुझ" "" "मेरा" "मेरी" "मेरे" "मेरी" Sg Masc Pers1; +lin iFem_Pron = personalPN "मैं" "मुझ" "" "मेरा" "मेरी" "मेरे" "मेरी" Sg Masc Pers1; ---- lin iambic_A = mkA "लघु-गुरु चरणयुक्त" ; -- tocheck lin ibex_N = mkN "साकिन" ; -- tocheck lin ice_N = mkN "जमी हुई मिठाई" ; -- tocheck @@ -28586,6 +28587,7 @@ lin thesis_N = mkN "अभिधारणा" ; -- tocheck lin thespian_A = mkA "नाट्य संबंधी" ; -- tocheck lin thespian_N = mkN "अभिनेता" ; -- tocheck lin they_Pron = personalPN "वे" "वे" "वे" "उन का" "उन की" "उन के" "उन की" Pl Masc Pers3_Distant ; ---- +lin theyFem_Pron = personalPN "वे" "वे" "वे" "उन का" "उन की" "उन के" "उन की" Pl Fem Pers3_Distant ; ---- lin thick_A = mkA "गाढा" ; -- tocheck lin thick_Adv = mkAdv "घनेपन से" ; -- tocheck lin thick_N = mkN "स्थूलता" ; -- tocheck @@ -32626,6 +32628,7 @@ lin wayside_N = mkN "रास्ते का किनारा" ; -- tocheck lin wayward_A = mkA "ज़िद्दी" ; -- tocheck lin wc_N = mkN "शौचघर" ; -- tocheck lin we_Pron = personalPN "हम" "हम" "हम" "हमारा" "हमारी" "हमारे" "हमारी" Pl Masc Pers1 ; +lin weFem_Pron = personalPN "हम" "हम" "हम" "हमारा" "हमारी" "हमारे" "हमारी" Pl Fem Pers1 ; ---- lin weak_A = mkA "स्वराघात-हीन" ; -- tocheck lin weaken_V = compoundV "शिथिल" (mkV "होना") ; -- tocheck lin weaken_V2 = mkV2 (compoundV "शिथिल" (mkV "होना")) ; -- tocheck @@ -33672,8 +33675,11 @@ lin yore_N = mkN "प्राचीन समय" ; -- tocheck lin york_PN = mkPN "यौर्क" ; -- tocheck lin yorkshire_PN = mkPN "यौर्कशर" ; -- tocheck lin youPl_Pron = personalPN "तुम" "तुम" "तुम" "तुम्हारा" "तुम्हारी" "तुम्हारे" "तुम्हारी" Pl Masc Pers2_Casual ; +lin youPlFem_Pron = personalPN "तुम" "तुम" "तुम" "तुम्हारा" "तुम्हारी" "तुम्हारे" "तुम्हारी" Pl Fem Pers2_Casual ; lin youPol_Pron = personalPN "आप" "आप" "आप" "आप का" "आप की" "आप के" "आप की" Sg Masc Pers2_Respect ; +lin youPolFem_Pron = personalPN "आप" "आप" "आप" "आप का" "आप की" "आप के" "आप की" Sg Fem Pers2_Respect ; lin youSg_Pron = personalPN "तू" "तुम" "तुम" "तुम्हारा" "तुम्हारी" "तुम्हारे" "तुम्हारी" Sg Masc Pers2_Casual ; +lin youSgFem_Pron = personalPN "तू" "तुम" "तुम" "तुम्हारा" "तुम्हारी" "तुम्हारे" "तुम्हारी" Sg Fem Pers2_Casual ; lin young_A = mkA "नयी" ; -- tocheck lin young_N = mkN "शावक" ; -- tocheck lin younger_A = mkA "कनिष्ठ" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 2650f2c52..5aac74fe5 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -1,6 +1,6 @@ concrete DictionaryIta of Dictionary = CatIta ** open ParadigmsIta, (P = ParadigmsIta), - IrregIta, (I=IrregIta), MorphoIta, (L=LexiconIta), (S=StructuralIta), Prelude in { + IrregIta, (I=IrregIta), MorphoIta, (L=LexiconIta), (S=StructuralIta), (E=ExtraIta),Prelude in { oper mkInterj : Str -> Interj = \s -> lin Interj (ss s) ; @@ -15,6 +15,7 @@ oper mkSubj : Str -> Subj = \s -> lin Subj {s = [] ; m = Indic} ; ---- oper subSubj : Str -> Subj = \s -> lin Subj {s = [] ; m = Conjunct} ; ---- +oper optProDrop : Pron -> Pron = \p -> p | E.ProDrop p ; lin aardvark_N = mkN "oritteropo" ; -- status=guess lin aardwolf_N = mkN "protele" ; -- status=guess @@ -8008,7 +8009,7 @@ lin haze_N = mkN "smog" | mkN "nebbia" ; -- status=guess status=guess lin hazel_A = mkA "nocciola" ; -- status=guess lin hazel_N = mkN "nocciola" ; -- status=guess lin hazelnut_N = mkN "nocciola" ; -- status=guess -lin he_Pron = S.he_Pron ; +lin he_Pron = optProDrop S.he_Pron ; lin head_A = variants{} ; -- lin head_N = L.head_N ; lin head_V = variants{} ; -- @@ -8550,7 +8551,8 @@ lin hysterectomy_N = mkN "isterectomia" ; -- status=guess lin hysteresis_N = mkN "isterisi" feminine ; -- status=guess lin hysteria_N = mkN "isteria" ; -- status=guess lin hysterical_A = mkA "isterico" ; -- status=guess -lin i_Pron = S.i_Pron ; +lin i_Pron = optProDrop S.i_Pron ; +lin iFem_Pron = optProDrop E.i8fem_Pron ; lin iamb_N = mkN "giambo" ; -- status=guess lin iambic_A = mkA "giambico" ; -- status=guess lin ibex_N = mkN "stambecco" ; -- status=guess @@ -9865,14 +9867,14 @@ lin lichen_N = mkN "lichene" masculine ; -- status=guess lin lick_V = mkV "leccare" ; -- status=guess, src=wikt lin lick_V2 = mkV2 (mkV "leccare") ; -- status=guess, src=wikt lin lid_N = mkN "coperchio" ; -- status=guess -lin lie_1_V = variants{} ; -- -lin lie_2_V = variants{} ; -- +lin lie_1_V = L.lie_V ; +lin lie_2_V = mkV "mentire" ; lin lie_N = mkN "bugia" | mkN "menzogna" | mkN "frottola" | mkN "baggianata" | mkN "fola" | mkN "balla" | mkN "fandonia" ; -- status=guess status=guess status=guess status=guess status=guess status=guess status=guess -lin lie_V = L.lie_V ; -- comment=CHECKED +lin lie_V = L.lie_V ; lin lie_VS = mkVS (mkV (essere_V) "sdraiato") | mkVS (mkV (essere_V) "disteso") | mkVS (mkV "giacere") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt lin lieutenancy_N = mkN "luogotenenza" ; -- status=guess lin lieutenant_N = mkN "tenente" | mkN "luogotenente" ; -- status=guess status=guess -lin life_N = mkN "vita" masculine ; -- status=guess +lin life_N = mkN "vita" feminine ; lin lifeboat_N = mkN "scialuppa di salvataggio" ; -- status=guess lin lifespan_N = variants{} ; -- lin lifestyle_N = variants{} ; -- @@ -15229,7 +15231,7 @@ lin shave_V = radere_V ; -- status=guess, src=wikt lin shave_V2 = mkV2 (radere_V) ; -- status=guess, src=wikt lin shawl_N = mkN "scialle" masculine ; -- status=guess lin shawm_N = mkN "zufolo" | mkN "cennamella" ; -- status=guess status=guess -lin she_Pron = S.she_Pron ; +lin she_Pron = optProDrop S.she_Pron ; lin sheaf_N = mkN "fascio" ; -- status=guess lin shear_V2 = mkV2 (mkV "tagliare") ; -- status=guess, src=wikt lin shears_N = mkN "cesoie" feminine ; -- status=guess @@ -17134,9 +17136,10 @@ lin thermonuclear_A = mkA "termonucleare" ; -- status=guess lin thermos_N = mkN "termos" masculine ; -- status=guess lin thermosphere_N = mkN "termosfera" ; -- status=guess lin thermotropism_N = mkN "termotropismo" ; -- status=guess -lin thesaurus_N = mkN "dizionario dei sinonimi" | mkN "tesoro" ; -- status=guess status=guess -lin thesis_N = mkN "tesi" feminine | mkN "tema" masculine ; -- status=guess status=guess -lin they_Pron = S.they_Pron ; +lin thesaurus_N = mkN "tesoro" ; +lin thesis_N = mkN "tesi" feminine ; +lin they_Pron = optProDrop S.they_Pron ; +lin theyFem_Pron = optProDrop E.they8fem_Pron ; lin thick_A = L.thick_A ; lin thick_Adv = variants{} ; -- lin thick_N = mkN "folto" ; -- status=guess @@ -18493,7 +18496,8 @@ lin way_1_N = mkN "strada" | mkN "via" ; lin way_2_N = mkN "maniera" ; lin way_N = mkN "maniera" ; lin wayfarer_N = mkN "viaggiatore" | mkN "viandante" masculine ; -- status=guess status=guess -lin we_Pron = S.we_Pron ; +lin we_Pron = optProDrop S.we_Pron ; +lin weFem_Pron = optProDrop E.we8fem_Pron ; lin weak_A = mkA "debole" ; -- status=guess lin weaken_V = variants{} ; -- lin weaken_V2 = variants{} ; -- @@ -18919,9 +18923,11 @@ lin yoke_V = mkV "aggiogare" ; -- status=guess, src=wikt lin yoke_V2 = mkV2 (mkV "aggiogare") ; -- status=guess, src=wikt lin yolk_N = mkN "tuorlo" ; -- status=guess lin yonder_Adv = mkAdv "laggiù" ; -- status=guess -lin youPl_Pron = S.youPl_Pron ; -- comment=CHECKED -lin youPol_Pron = S.youPol_Pron ; -- comment=CHECKED -lin youSg_Pron = S.youSg_Pron ; -- comment=CHECKED +lin youPl_Pron = optProDrop S.youPl_Pron | optProDrop E.youPolPl_Pron ; ---- split +lin youPlFem_Pron = optProDrop E.youPl8fem_Pron | optProDrop E.youPolPl8fem_Pron ; ---- split +lin youPolFem_Pron = optProDrop E.youPol8fem_Pron ; +lin youSg_Pron = optProDrop S.youSg_Pron ; +lin youSgFem_Pron = optProDrop E.youSg8fem_Pron ; lin young_A = L.young_A ; lin younger_A = mkA "minore" ; -- status=guess lin youngster_N = variants{} ; -- diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 67a9d6ed4..2d6ab1ceb 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -1,5 +1,5 @@ concrete DictionarySpa of Dictionary = CatSpa -** open ParadigmsSpa, MorphoSpa, IrregSpa, (L=LexiconSpa), (S=StructuralSpa), Prelude in { +** open ParadigmsSpa, MorphoSpa, IrregSpa, (L=LexiconSpa), (S=StructuralSpa), (E=ExtraSpa), Prelude in { oper mkInterj : Str -> Interj = \s -> lin Interj (ss s) ; @@ -7,6 +7,7 @@ oper mkDet : Str -> Det = \s -> lin Det {s,sp = \\_,c => prepCase c ++ s ; n = Sg ; s2 = [] ; isNeg = False} ; oper mkConj : Str -> Conj = \s -> lin Conj {s1 = [] ; s2 = s ; n = Pl} ; +oper optProDrop : Pron -> Pron = \p -> p | E.ProDrop p ; lin aalii_N = mkN "chirca" ; -- status=guess lin aardvark_N = mkN "cerdo hormiguero" ; -- status=guess @@ -9680,7 +9681,7 @@ lin hazardous_A = mkA "aventurado" ; -- status=guess lin haze_N = mkN "bruma" ; -- status=guess lin hazel_N = mkN "avellana" ; -- status=guess lin hazelnut_N = mkN "avellana" ; -- status=guess -lin he_Pron = S.he_Pron ; +lin he_Pron = optProDrop S.he_Pron ; lin head_A = variants{} ; lin head_N = L.head_N ; lin head_V = mkV (mkV "echarse") "a andar" ; @@ -10291,7 +10292,8 @@ lin hyrax_N = mkN "damán" masculine ; -- status=guess lin hysterectomy_N = mkN "histerectomía" ; -- status=guess lin hysteresis_N = mkN "histéresis" feminine ; -- status=guess lin hysteria_N = mkN "histérico" ; -- status=guess -lin i_Pron = S.i_Pron ; +lin i_Pron = optProDrop S.i_Pron ; +lin iFem_Pron = optProDrop E.i8fem_Pron ; lin iamb_N = mkN "yambo" ; -- status=guess lin iambic_A = mkA "yámbico" ; -- status=guess lin ibex_N = mkN "íbice" | mkN "ibex" masculine ; -- status=guess status=guess @@ -18327,7 +18329,7 @@ lin shave_V2 = mkV2 (mkV "afeitar") | mkV2 (mkV "rapar") | mkV2 (mkV "rasurar") lin shaver_N = mkN "maquinilla de afeitar" | mkN "máquina de afeitar" | mkN "afeitadora" ; -- status=guess status=guess status=guess lin shawl_N = mkN "chal" masculine ; -- status=guess lin shawm_N = mkN "caramillo" ; -- status=guess -lin she_Pron = S.she_Pron ; +lin she_Pron = optProDrop S.she_Pron ; lin sheaf_N = mkN "atado" | mkN "atada" ; -- status=guess status=guess lin shear_N = mkN "cizalla" ; -- status=guess lin shear_V2 = mkV2 (mkV "cizallar") ; -- status=guess, src=wikt @@ -20691,7 +20693,8 @@ lin thermotherapy_N = mkN "termoterapia" ; -- status=guess lin thesaurus_N = mkN "tesauro" ; -- status=guess lin thesis_N = mkN "tesis" feminine ; lin theta_N = mkN "onda theta" ; -- status=guess -lin they_Pron = S.they_Pron ; +lin they_Pron = optProDrop S.they_Pron ; +lin theyFem_Pron = optProDrop E.they8fem_Pron ; lin thick_A = L.thick_A ; lin thick_Adv = variants{} ; lin thick_N = mkN "espeso" ; -- status=guess @@ -22326,7 +22329,8 @@ lin way_2_N = variants{} ; lin way_Adv = mkAdv "muy" ; -- status=guess lin way_N = mkN "medios" masculine ; lin wayfarer_N = mkN "caminante" masculine ; -- status=guess -lin we_Pron = S.we_Pron ; +lin we_Pron = optProDrop S.we_Pron ; +lin weFem_Pron = optProDrop E.we8fem_Pron ; lin weak_A = mkA "débil" | mkA "feble" | mkA "flaco" | mkA "flojo" ; lin weaken_V = mkV "debilitarse" ; lin weaken_V2 = mkV2 (mkV "debilitarse") ; @@ -22823,9 +22827,11 @@ lin yokel_N = mkN "paleto" | mkN "palurdo" ; -- status=guess status=guess lin yolk_N = mkN "yema" ; -- status=guess lin yonder_Adv = mkAdv "de allá" ; -- status=guess lin yore_N = mkN "antaño" ; -- status=guess -lin youPl_Pron = S.youPl_Pron ; -- comment=CHECKED -lin youPol_Pron = S.youPol_Pron ; -- comment=CHECKED -lin youSg_Pron = S.youSg_Pron ; -- comment=CHECKED +lin youPl_Pron = optProDrop S.youPl_Pron | optProDrop E.youPolPl_Pron ; ---- split +lin youPlFem_Pron = optProDrop E.youPl8fem_Pron | optProDrop E.youPolPl8fem_Pron ; ---- split +lin youPolFem_Pron = optProDrop E.youPol8fem_Pron ; +lin youSg_Pron = optProDrop S.youSg_Pron ; +lin youSgFem_Pron = optProDrop E.youSg8fem_Pron ; lin young_A = L.young_A ; lin young_N = mkN "jóvenes" ; -- status=guess lin youngster_N = mkN "jovenzuelo" ; diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 7861fa35a..ac9726fa8 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -28044,6 +28044,7 @@ lin hysteroscopy_N = variants {} ; lin hysterotomy_N = variants {} ; lin hythe_PN = variants {} ; lin i_Pron = S.i_Pron; +lin iFem_Pron = S.i_Pron; lin i_e__Adv = variants {} ; lin iamb_N = variants {} ; lin iambic_A = mkA "jambisk" ; -- status=guess @@ -58401,6 +58402,7 @@ lin theta_N = variants {} ; lin thetford_PN = variants {} ; lin theurgy_N = variants {} ; lin they_Pron = S.they_Pron; +lin theyFem_Pron = S.they_Pron; lin thiabendazole_N = variants {} ; lin thiazide_N = variants {} ; lin thiazine_N = variants {} ; @@ -64030,6 +64032,7 @@ lin wayside_N = variants {} ; lin wayward_A = mkA "nyckfull" ; -- comment=5 lin wc_N = mkN "toalett" "toaletter" ; -- comment=2 lin we_Pron = S.we_Pron; +lin weFem_Pron = S.we_Pron; lin weak_A = mkA "svag" | mkA "klen" ; -- SaldoWN -- comment=15 lin weak_kneed_A = variants {} ; lin weaken_V = mkV "försvagar" ; -- comment=2 @@ -65457,7 +65460,11 @@ lin yorkshire_PN = variants {} ; lin yottabit_N = variants {} ; lin yottabyte_N = variants {} ; lin youPl_Pron = S.youPl_Pron; +lin youPlFem_Pron = S.youPol_Pron; +lin youPol_Pron = S.youPol_Pron; +lin youPolFem_Pron = S.youPl_Pron; lin youSg_Pron = S.youSg_Pron; +lin youSgFem_Pron = S.youSg_Pron; lin young_A = L.young_A ; lin young_N = mkN "unge" utrum; lin younger_A = mkA "ung" "yngre" "yngst" ; diff --git a/lib/src/translator/TranslateFin.gf b/lib/src/translator/TranslateFin.gf index 72ce9a97a..1c7ff0b4f 100644 --- a/lib/src/translator/TranslateFin.gf +++ b/lib/src/translator/TranslateFin.gf @@ -5,7 +5,7 @@ concrete TranslateFin of Translate = CatFin, NounFin - [ PPartNP - ,UsePron, PossPron -- Fin specific: replaced by variants with prodrop + ,PossPron -- Fin specific: replaced by variants with prodrop ], AdjectiveFin, NumeralFin, @@ -38,7 +38,6 @@ flags literal=Symb ; coding = utf8 ; -- the overrides ----- lin - UsePron p = G.UsePron p | G.UsePron (E.ProDrop p) ; PossPron p = G.PossPron p | E.ProDropPoss p ; } diff --git a/lib/src/translator/TranslateIta.gf b/lib/src/translator/TranslateIta.gf index 854bb6f5a..96a1ce724 100644 --- a/lib/src/translator/TranslateIta.gf +++ b/lib/src/translator/TranslateIta.gf @@ -4,7 +4,6 @@ concrete TranslateIta of Translate = TenseIta, NounIta - [ PPartNP - ,UsePron -- override with a prodrop variant ], AdjectiveIta, NumeralIta, @@ -34,10 +33,5 @@ open MorphoIta, ResIta, ParadigmsIta, SyntaxIta, (E = ExtraIta), (G = GrammarIta flags literal=Symb ; --- the overrides ----- -lin - - UsePron p = G.UsePron p | G.UsePron (E.ProDrop p) ; - } diff --git a/lib/src/translator/TranslateSpa.gf b/lib/src/translator/TranslateSpa.gf index dc516e2bd..a84e6befb 100644 --- a/lib/src/translator/TranslateSpa.gf +++ b/lib/src/translator/TranslateSpa.gf @@ -4,7 +4,6 @@ concrete TranslateSpa of Translate = TenseSpa, NounSpa - [ PPartNP - ,UsePron -- override with a prodrop variant ], AdjectiveSpa, NumeralSpa, @@ -34,10 +33,5 @@ open MorphoSpa, ResSpa, ParadigmsSpa, SyntaxSpa, (E = ExtraSpa), (G = GrammarSpa flags literal=Symb ; --- the overrides ----- -lin - - UsePron p = G.UsePron p | G.UsePron (E.ProDrop p) ; - } diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index 625f9db9a..729426b2c 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -27908,7 +27908,8 @@ hysterosalpingogram_N 3.729715012475897e-6 hysteroscopy_N 3.729715012475897e-6 hysterotomy_N 3.729715012475897e-6 hythe_PN 1.865462821325971e-5 -i_Pron 6.125875932444215e-2 +i_Pron 3.125875932444215e-2 +iFem_Pron 2.125875932444215e-2 i_e__Adv 8.668966832532898e-6 iamb_N 3.729715012475897e-6 iambic_A 2.1546383978108874e-5 @@ -57882,7 +57883,8 @@ thessaloniki_PN 1.865462821325971e-5 theta_N 3.729715012475897e-6 thetford_PN 1.865462821325971e-5 theurgy_N 3.729715012475897e-6 -they_Pron 0.19058998288500661 +they_Pron 0.10058998288500661 +theyFem_Pron 0.09058998288500661 thiabendazole_N 3.729715012475897e-6 thiazide_N 3.729715012475897e-6 thiazine_N 3.729715012475897e-6 @@ -63457,7 +63459,8 @@ ways_N 3.729715012475897e-6 wayside_N 7.459430024951794e-6 wayward_A 3.231957596716331e-5 wc_N 3.729715012475897e-6 -we_Pron 7.640391384376917e-2 +we_Pron 3.640391384376917e-2 +weFem_Pron 2.640391384376917e-2 weak_A 1.454380918522349e-3 weak_kneed_A 2.1546383978108874e-5 weaken_V 1.0659046582301448e-3 @@ -64859,8 +64862,12 @@ yorkley_PN 1.865462821325971e-5 yorkshire_PN 1.865462821325971e-5 yottabit_N 3.729715012475897e-6 yottabyte_N 3.729715012475897e-6 -youPl_Pron 3.8234249362224304e-2 -youSg_Pron 6.458488067943295e-5 +youPl_Pron 3.8234249362224304e-5 +youPlFem_Pron 3.8234249362224304e-5 +youPol_Pron 3.8234249362224304e-5 +youPolFem_Pron 3.8234249362224304e-5 +youSg_Pron 6.458488067943295e-3 +youSgFem_Pron 6.458488067943295e-3 young_A 1.5190200704566757e-3 young_N 7.459430024951794e-6 younger_A 1.0773191989054437e-5