diff --git a/lib/src/translator/todo/TopDictionaryFin.gf b/lib/src/translator/todo/TopDictionaryFin.gf index a540f8a01..935ae2e10 100644 --- a/lib/src/translator/todo/TopDictionaryFin.gf +++ b/lib/src/translator/todo/TopDictionaryFin.gf @@ -1,5 +1,5 @@ --# -path=.:src/finnish/stemmed:src/finnish:src/abstract:src/common:src/finnish/kotus:src/api ----- checked by IL till look_V in the BNC order +---- checked by IL till face_N in the BNC order concrete TopDictionaryFin of TopDictionary = CatFin ** open ParadigmsFin, (S = StructuralFin), (L = LexiconFin), @@ -15,8 +15,8 @@ lin of_Prep = casePrep genitive ; --- lin and_Conj = S.and_Conj ; lin in_Prep = S.in_Prep ; lin have_VV = S.must_VV ; -lin have_VS = mkVS "uskoa" ; -- Is this like "I have it that "? in that case uskoa or ymmärtää are OKish -lin have_V2V = mkV2V (mkV "saada") accusative ; --WV2V (k63 "saada") "lapsi" ; +lin have_VS = mkVS "uskoa" ; +lin have_V2V = mkV2V (mkV "saada") accusative ; lin have_V2 = S.have_V2 ; lin have_V = lin V S.have_V2 ; lin it_Pron = S.it_Pron ; @@ -44,10 +44,10 @@ lin say_VA = mkVA (mkV "sanoa") (mkPrep translative) ; lin say_V2 = mkV2 "sanoa" ; lin say_V = mkV "sanoa" ; lin if_Subj = S.if_Subj ; -lin go_VV = mkVV (mkV "aikoa") ; --? +lin go_VV = mkVV (mkV "aikoa") ; ---- subcat lin go_VS = mkVS "sanoa" ; lin go_VA = mkVA (mkV "käydä") (casePrep translative) ; -lin go_V2 = mkV2 (mkV "tulla") (mkPrep translative) ; --? +lin go_V2 = mkV2 (mkV "tulla") (mkPrep translative) ; ---- subcat lin go_V = L.go_V ; lin get_VV = mkVV "päätyä" infIllat ; lin get_VS = mkVS (mkV "ymmärtää") ; @@ -82,7 +82,7 @@ lin time_2_N = mkN "kerta" ; lin time_1_N = mkN "aika" "ajan" "aikoja" ; lin take_VA = mkVA (mkV "ottaa") (mkPrep essive) ; lin take_V2V = mkV2V (mkV "viedä") accusative ; --vien hänet tanssimaan -lin take_V2A = mkV2A tehda_V accusative (mkPrep translative) ; --? +lin take_V2A = mkV2A tehda_V accusative (mkPrep translative) ; ---- subcat lin take_V2 = mkV2 "ottaa" ; lin take_V = mkV "ottaa" ; lin so_Adv = mkAdv "niin" ; @@ -121,22 +121,21 @@ lin way_2_N = mkN "tapa" ; lin way_1_N = mkN "tie" ; lin look_VV = mkVV (mkV "näyttää") infPresPart ; lin look_VA = mkVA (mkV "näyttää") (mkPrep ablative) ; -lin look_V2V = mkV2V (mkV "katsoa") genitive infPresPart ; --? +lin look_V2V = mkV2V (mkV "katsoa") genitive infPresPart ; lin look_V2 = mkV2 (mkV "näyttää") (mkPrep ablative) ; lin look_V = mkV "katsoa" ; ----- checked by IL till look_V in the BNC order -lin like_Prep = postPrep genitive "tavalla" ; --- +lin like_Prep = postPrep genitive "tavalla" | mkPrep nominative "kuin" ; lin use_VV = mkVV "tavata" ; -lin use_V2V = mkWV2V (mkV "käyttää") ; +lin use_V2V = mkV2V (mkV "käyttää") ; lin use_V2 = mkV2 "käyttää" partitive ; lin use_V = mkV "käyttää" ; lin because_Subj = S.because_Subj ; lin good_A = L.good_A ; -lin find_VS = mkVS (mkV "huomata") ; --- +lin find_VS = mkVS (mkV "huomata") ; --? lin find_V2V = mkV2V (mkV "huomata") (mkPrep genitive) infPresPart ; --mkWV2V (k54A "löytää") ; lin find_V2A = mkV2A (mkV "pitää") (mkPrep partitive) (mkPrep essive) ; --WV2A (k54A "löytää") ; lin find_V2 = L.find_V2 ; -lin find_V = mkWV (k54A "löytää") ; --f62 +lin find_V = mkV "löytää" "löysi" ; lin man_N = L.man_N ; lin want_VV = S.want_VV ; lin want_VS = mkWVS (k75 "haluta") ; @@ -145,12 +144,12 @@ lin want_V2 = mkWV2 (k75 "haluta") ; lin want_V = mkWV (k75 "haluta") ; lin day_N = L.day_N ; lin between_Prep = S.between_Prep ; -lin even_Adv = mkWAdv (k99 "jopa") ; +lin even_Adv = mkAdv "jopa" ; lin there_Adv = S.there_Adv ; lin many_Det = S.many_Det ; lin after_Prep = S.after_Prep ; -lin down_Adv = mkWAdv (k99 "alas") ; -lin yeah_Interj = mkInterj "yess" ; +lin down_Adv = mkAdv "alhaalla" | mkAdv "alas" ; +lin yeah_Interj = mkInterj "joo" ; --mkInterj "yess" ; lin so_Subj = mkSubj "niin että" ; lin thing_N = mkN "asia" ; lin tell_VV = mkVV (mkV "käskeä") infIllat ; @@ -169,62 +168,61 @@ lin still_Adv = mkAdv "yhä" ; lin child_N = L.child_N ; lin here_Adv = mkAdv "täällä" ; lin over_Prep = postPrep genitive "yli" ; -lin too_Adv = mkAdv "liikaa" ; +lin too_Adv = mkAdv "myös" ; --split sense: mkAdv "liikaa" ; lin put_VS = mkWVS (k53A "määrittää") ; lin put_V2V = mkV2V (mkV "panna") accusative infIllat ; lin put_V2 = L.put_V2 ; lin put_V = mkV "panna" ; -lin on_Adv = mkWAdv (compoundAdv "eteen" (k99 "päin")) ; +lin on_Adv = mkAdv "päällä" ; -- mkAdv "eteenpäin" ; lin no_Interj = mkInterj "ei" ; -lin work_VV = mkVV (mkV "toimia") ; +lin work_VV = mkVV (mkV "toimia") infIness ; --rather choose Inf3Adess, but it's not in ParadigmsFin lin work_V2 = mkV2 "työstää" ; lin work_V = mkV "toimia" ; lin work_2_V = mkV "toimia" ; lin work_1_V = mkV "työskennellä" ; -lin become_VS = mkWVS (k67 "tulla") "jksik" ; --UNCHK +lin become_VS = mkVS (mkV "tulla") ; lin become_VA = L.become_VA ; lin become_V2 = mkV2 "tulla" translative ; -lin become_V = mkWV (k67 "tulla") ; --f125 +lin become_V = caseV elative (mkV "tulla") ; --hänestä tuli lin old_A = L.old_A ; -lin government_N = mkN (lin NK {s = d39 "hallitus"}) ; -lin mean_VV = mkWVV (k67A "ajatella") ; --UNCHK +lin government_N = mkN "hallitus" ; +lin mean_VV = mkVV (mkV "ajatella") ; lin mean_VS = mkVS (mkV "tarkoittaa") ; -lin mean_VA = mkWVA (k67A "ajatella") ; --UNCHK +lin mean_VA = mkVA (mkV "tarkoittaa") (mkPrep partitive) ; ---- subcat lin mean_V2V = mkV2V (mkV "tarkoittaa") (mkPrep genitive) infPresPart ; lin mean_V2 = mkV2 "tarkoittaa" partitive ; -lin mean_V = mkWV (k67A "ajatella") ; --UNCHK -lin part_N = mkN (lin NK {s = d10 "osa"}) ; -lin leave_VV = mkWVV (k53A "jättää") "taakseen" ; --UNCHK -lin leave_VS = mkVS (mkV (mkV "jättää") "tehtäväksi") ; --mkWVS (k53A "jättää") "taakseen" ; --f71 -lin leave_V2V = mkWV2V (k53A "jättää") "taakseen" ; --UNCHK +lin mean_V = mkV "tarkoittaa" ; +lin part_N = mkN "osa" ; +lin leave_VV = mkVV (mkV "lähteä") ; ---- subcat +lin leave_VS = mkVS (mkV (mkV "jättää") "tehtäväksi") ; +lin leave_V2V = mkV2V (mkV "jättää") accusative ; lin leave_V2 = L.leave_V2 ; -lin leave_V = mkV "länteä" ; +lin leave_V = mkV "lähteä" ; lin life_N = mkN "elämä" ; -lin great_A = mkA "suurenmoinen" ; +lin great_A = mkA "hieno" | mkA "suurenmoinen" ; lin case_N = mkN "tapaus" ; lin woman_N = L.woman_N ; -lin over_Adv = mkAdv "ohi" ; -lin seem_VV = mkWVV (k53A "vaikuttaa") infPresPart ; -lin seem_VS = mkWVS (k53A "vaikuttaa") ; --UNCHK +lin over_Adv = mkAdv "ohi" ; --split sense: mkAdv "yli" over above +lin seem_VV = mkVV (mkV "vaikuttaa") infPresPart ; +lin seem_VS = mkVS (mkV "vaikuttaa") ; lin seem_VA = mkVA (mkV "näyttää") (casePrep ablative) ; -lin seem_V2 = mkWV2 (k53A "vaikuttaa") ; --UNCHK -lin seem_V = mkWV (k53A "vaikuttaa") ; --f69 -lin work_N = mkWN (k19 "työ") ; --f350 +lin seem_V2 = mkV2 (mkV "vaikuttaa") ablative ; +lin seem_V = mkV "vaikuttaa" ; +lin work_N = mkN "työ" ; lin need_VV = mkVV (caseV genitive (mkV "tarvita")) ; -lin need_VV = mkVV (caseV genitive (mkV "tarvita")) ; -lin need_VS = mkWVS (k61A "vaatia") ; --UNCHK -lin need_V2V = mkV2V (mkV "vaatia") (mkPrep partitive) ; -lin need_V2 = mkV2 (lin VK {s = c69 "tarvita"}) ; +lin need_VS = mkVS (mkV "vaatia") ; +lin need_V2V = mkV2V (mkV "vaatia") ; +lin need_V2 = mkV2 (mkV "tarvita") partitive ; lin need_V = mkV "tarvita" ; lin feel_VS = mkVS "tuntea" ; lin feel_VA = mkVA (caseV elative (mkV "tuntua")) (mkPrep ablative) ; -lin feel_V2 = mkV2 (lin VK {s = c59A "tuntea"}) ; +lin feel_V2 = mkV2 "tuntea" ; lin feel_V = mkV "tuntea" ; -lin system_N = mkWN (k6 "systeemi") ; +lin system_N = mkN "järjestelmä" | mkN "systeemi" ; lin each_Det = mkDet Sg (mkN "jokainen") ; lin may_2_VV = mkVV (mkV "saada") ; lin may_1_VV = mkVV (mkV "saattaa") ; -lin much_Adv = mkWAdv (k99 "pitkälti") ; --UNCHK +lin much_Adv = mkAdv "paljon" ; lin ask_VV = mkVV (mkV "pyytää" "pyysi") infIllat ; lin ask_VS = mkWVS (k54A "pyytää") ; lin ask_VQ = mkVQ (mkV "kysyä") ; @@ -237,104 +235,104 @@ lin number_3_N = mkN "luku" ; lin number_2_N = mkN "luku" (mkN "määrä") | mkN "määrä" ; lin number_1_N = mkN "luku" ; lin yes_Interj = mkInterj "kyllä" ; -lin however_Adv = mkAdv (lin AdvK {s = c99 "kuitenkin"}) ; +lin however_Adv = mkAdv "kuitenkin" ; lin another_Det = mkDet Sg (mkN "toinen") ; -lin again_Adv = mkAdv (lin AdvK {s = c99 "uudelleen"}) ; -lin world_N = mkWN (k13 "maailma") ; --f351 -lin area_N = mkWN (k48 "alue") ; --UNCHK -lin area_6_N = mkN "ala" ; -lin area_5_N = mkN "ala" ; +lin again_Adv = mkAdv "taas" | mkAdv "uudelleen" ; +lin world_N = mkWN (k13 "maailma") ; +lin area_N = mkWN (k48 "alue") ; +lin area_6_N = mkN "pinta-" (mkN "ala") ; +lin area_5_N = mkN "alue" ; lin area_4_N = mkN "ala" ; -lin area_3_N = mkN "ala" ; +lin area_3_N = mkN "alue" ; lin area_2_N = mkN "ala" ; lin area_1_N = mkN "alue" ; -lin show_VS = mkVS (mkV "näyttää") ; -lin show_VQ = mkWVQ (k53 "vahvistaa") ; --UNCHK -lin show_V2V = mkWV2V (k53 "vahvistaa") ; --UNCHK +lin show_VS = mkVS (mkV "osoittaa") ; +lin show_VQ = mkVQ (mkV "vahvistaa") ; ---- subcat +lin show_V2V = mkV2V (mkV "näyttää") genitive infPresPart ; lin show_V2 = mkV2 "näyttää" ; -lin show_V = mkV "osoittaa" ; --f92 -lin course_N = mkWN (k5 "kurssi") ; --f68 +lin show_V = mkV "näyttää" ; +lin course_N = mkN "kurssi" ; lin company_2_N = mkN "seura" ; lin company_1_N = mkN "yhtiö" ; lin under_Prep = S.under_Prep ; -lin problem_N = mkWN (k10 "ongelma") ; +lin problem_N = mkN "ongelma" ; lin against_Prep = postPrep partitive "vastaan" ; -lin never_Adv = mkWAdv (k99 "koskaan") ; --UNCHK -lin most_Adv = mkWAdv (k99 "liki") ; --UNCHK +lin never_Adv = mkAdv "koskaan" | mkAdv "ei koskaan" ; ---- will look weird in sentences +lin most_Adv = mkAdv "suurin osa" ; lin service_N = mkWN (k2 "palvelu") ; lin try_VV = mkVV (mkV "yrittää") ; -lin try_V2V = mkWV2V (k61 "tutkia") ; --UNCHK -lin try_V2 = mkWV2 (k61 "tutkia") ; --UNCHK -lin try_V = mkV "yrittää" ; -lin call_V3 = mkV3 (mkV "kutsua") accusative (mkPrep translative) ; -lin call_V2V = mkWV2V (k53A "herättää") ; --UNCHK -lin call_V2A = mkWV2A (k53A "herättää") ; --UNCHK +lin try_V2V = mkV2V (mkV "yrittää") ; ---- subcat +lin try_V2 = mkV2 (mkV "syyttää") ; +lin try_V = mkV "kokeilla" ; +lin call_V3 = mkV3 (mkV "kutsua") (mkPrep partitive) (mkPrep translative) ; +lin call_V2V = mkV2V (mkV "kutsua") accusative ; +lin call_V2A = mkV2A (mkV "kutsua") (mkPrep partitive) (mkPrep translative) ; lin call_V2 = mkV2 (mkV "soittaa") (casePrep allative) ; --f53 -lin call_V = mkV "kutsua" ; +lin call_V = mkV "soittaa" ; --mkV "kutsua" ; lin hand_N = L.hand_N ; lin party_N = mkN "puolue" ; lin party_2_N = mkN "puolue" ; lin party_1_N = mkN "juhla" ; -lin high_A = mkA (lin AK {s = d15 "korkea"}) ; +lin high_A = mkA "korkea" ; lin about_Adv = mkAdv "suunnilleen" ; lin something_NP = S.something_NP ; lin school_N = L.school_N ; -lin in_Adv = mkWAdv (k99 "sisään") ; --- already split +lin in_Adv = mkAdv "sisään" ; --- already split lin in_1_Adv = mkAdv "sisällä" ; lin in_2_Adv = mkAdv "sisään" ; lin small_A = L.small_A ; lin place_N = mkN "paikka" ; lin before_Prep = S.before_Prep ; -lin while_Subj = mkSubj "samaan aikaan kuin" ; -lin away_Adv = mkWAdv (k99 "pois") ; --f161 +lin while_Subj = mkSubj "samalla kun" ; +lin away_Adv = mkAdv "pois" ; lin away_2_Adv = mkAdv "pois" ; lin away_1_Adv = mkAdv "poissa" ; -lin keep_VV = mkVV "jatkaa" ; ---??? puhumista -lin keep_VS = mkVS "uskoa" ; ---??? -lin keep_VA = mkWVA (k52 "säilöä") ; --UNCHK -lin keep_V2A = mkWV2A (k52 "säilöä") ; --UNCHK +lin keep_VV = mkVV "jatkaa" ; ---- ??? puhumista ; add more Inf3s in ParadigmsFin +lin keep_VS = mkVS "uskoa" ; ---- subcat +lin keep_VA = mkVA (mkV "säilyä") (mkPrep essive) ; +lin keep_V2A = mkV2A (mkV "säilyttää") accusative (mkPrep essive) ; lin keep_V2 = mkV2 "pitää" ; -lin keep_V = mkWV (k52 "säilöä") ; --f92 +lin keep_V = mkV "pysyä" ; lin point_N = mkN "piste" ; lin point_2_N = mkN "pointti" ; lin point_1_N = mkN "piste" ; lin house_N = L.house_N ; -lin different_A = mkWA (k38 "erilainen") ; --f174 +lin different_A = mkA "erilainen" ; lin country_N = L.country_N ; lin really_Adv = mkAdv "todella" ; lin provide_VS = mkV "edellyttää" ; lin provide_V2 = mkV2 "tarjota" partitive ; lin provide_V = mkWV (k52A "varautua") ; --f82 -lin week_N = mkN (lin NK {s = d01A "viikko"}) ; -lin hold_VS = mkVS "väittää" ; -lin hold_V3 = mkWV3 (k67A "pidätellä") ; --UNCHK -lin hold_V2V = mkWV2V (k67A "pidätellä") ; --UNCHK +lin week_N = mkN "viikko" ; +lin hold_VS = mkVS "katsoa" ; --hän katsoo, että XYZ +lin hold_V3 = mkV3 (mkV "pitää") accusative (mkPrep inessive) ; --pitää hänet turvassa? +lin hold_V2V = mkV2V (mkV "pidätellä") partitive infElat ; lin hold_V2 = L.hold_V2 ; lin hold_V = mkV "pitää" ; -lin large_A = mkA "iso" ; +lin large_A = mkA "suuri" ; lin member_N = mkN "jäsen" ; -lin off_Adv = mkWAdv (k99 "pois") ; --f110 +lin off_Adv = mkAdv "pois" ; --f110 lin always_Adv = mkAdv "aina" ; -lin follow_VS = mkWVS (k73 "seurata") ; --UNCHK -lin follow_V2 = mkV2 (mkV (lin VK {s = c73 "seurata"})) partitive ; -lin follow_V = mkWV (k73 "seurata") ; --f225 +lin follow_VS = mkVS (caseV elative (mkV "seurata")) ; --siitä seuraa, että +lin follow_V2 = mkV2 (mkV "seurata") partitive ; +lin follow_V = mkV "seurata" ; --f225 lin without_Prep = S.without_Prep ; -lin turn_VA = mkWVA (k53A "niksauttaa") ; --UNCHK -lin turn_V2A = mkWV2A (k53A "niksauttaa") ; --UNCHK -lin turn_V2 = mkV2 "kääntää" partitive ; +lin turn_VA = mkVA (mkV "muuttua") (mkPrep translative) ; +lin turn_V2A = mkV2A (mkV "muuttaa") accusative (mkPrep translative) ; +lin turn_V2 = mkV2 "kääntää" partitive | mkV2 (mkV "kääntää") accusative ; lin turn_V = L.turn_V ; -lin end_N = mkN "loppu" ; ---CHANGED --(lin NK {s = d10 "osa"}) ; +lin end_N = mkN "loppu" ; lin end_2_N = mkN "pää" | mkN "perä" ; lin end_1_N = mkN "loppu" ; lin within_Prep = postPrep genitive "sisällä" ; -lin local_A = mkWA (k38 "paikallinen") ; --f227 +lin local_A = mkA "paikallinen" ; --f227 lin where_Subj = mkSubj "missä" ; lin during_Prep = S.during_Prep ; -lin bring_V3 = mkWV3 (k56A "saattaa") ; --UNCHK -lin bring_V2V = mkWV2V (k56A "saattaa") ; --UNCHK +lin bring_V3 = mkV3 (mkV "saattaa") accusative (mkPrep illative) ; --saattaa hänet vankilaan +lin bring_V2V = mkV2V (mkV "saada") accusative infIllat ; --saa hänet tekemään lin bring_V2 = mkV2 "tuoda" ; lin most_Det = mkDet Pl (mkN "usein" "useimman" "useimpia") ; -lin word_N = mkN (lin NK {s = d09 "sana"}) ; +lin word_N = mkN "sana" ; lin begin_V2 = mkV2 "aloittaa" ; lin begin_V = mkV "alkaa" "alkoi" ; lin although_Subj = S.although_Subj ; @@ -343,32 +341,32 @@ lin next_Adv = mkAdv "seuraavaksi" ; lin family_N = mkWN (k48 "perhe") ; --f247 lin rather_Adv = mkAdv "mieluummin" ; lin fact_N = mkN "tosiasia" ; -lin like_VV = mkVV "tykätä" ; ---??? -lin like_VS = mkWVS (k53A "pitää") ; --UNCHK -lin like_V2V = mkWV2V (k53A "pitää") ; --UNCHK +lin like_VV = mkVV "tykätä" ; ---- need more inf forms; "pidän kutomisesta" rather than "tykkään kutoa" +lin like_VS = mkVS (mkV (mkV "pitää") "siitä") ; -- pidän siitä, että XYZ +lin like_V2V = mkV2V (mkV "haluta") genitive infPresPart ; ---- subcat lin like_V2 = L.like_V2 ; lin social_A = mkWA (k38 "sosiaalinen") ; --f62 -lin write_VV = mkWVV (k53A "kirjoittaa") ; --UNCHK +lin write_VV = mkWVV (k53A "kirjoittaa") ; ---- subcat lin write_VS = mkWVS (k53A "kirjoittaa") ; lin write_V2 = L.write_V2 ; lin write_V = mkWV (k53A "kirjoittaa") ; --f95 lin state_N = mkN "valtio" ; lin state_2_N = mkN "tila" ; lin state_1_N = mkN "valtio" ; -lin percent_N = mkWN (k5A "prosentti") ; --UNCHK +lin percent_N = mkWN (k5A "prosentti") ; lin quite_Adv = S.quite_Adv ; lin both_Det = mkDet Pl (mkN "molempi" "molemman" "molempia") ; lin start_V2 = mkV2 "aloittaa" ; lin start_V = mkV "aloittaa" ; -lin run_VS = mkVS (mkV (mkV "mennä") "niin") ; ---ARB --mkWVS (k52 "pysyä") "järkähtämättömänä" ; -lin run_V2 = mkV2 "harjoittaa" partitive ; +lin run_VS = mkVS (mkV (mkV "mennä") "niin") ; ---ARB +lin run_V2 = mkV2 (mkV "suorittaa") accusative ; --- split lin run_V = L.run_V ; lin long_A = L.long_A ; -lin right_Adv = mkAdv "oikein" ; ---ARB mkN "oikealle" +lin right_Adv = mkAdv "oikein" ; lin right_2_Adv = mkAdv "oikealle" | mkAdv "oikealla" ; --- split lin right_1_Adv = mkAdv "oikeassa" ; -lin set_VV = mkWVV (k52A "asettua") ; --UNCHK -lin set_VS = mkWVS (k52A "asettua") ; --UNCHK +lin set_VV = mkVV (mkV "valmistautua") infIllat ; +lin set_VS = mkVS (mkV "asettaa") ; ---- subcat lin set_V2 = mkV2 "asettaa" ; lin set_V = mkWV (k52A "asettua") ; --f162 lin help_VV = mkVV (mkV "auttaa") infIllat ; @@ -387,7 +385,7 @@ lin head_N = L.head_N ; lin information_N = mkN "informaatio" ; lin question_N = L.question_N ; lin business_N = mkN "liikeasia" ; -lin play_VV = mkWVV (k61A "leikkiä") infIllat ; ---??? +lin play_VV = mkVV (mkV "leikkiä") infPresPartAgr ; ---- subcat lin play_V2 = L.play_V2 ; lin play_V = L.play_V ; lin play_3_V2 = mkV2 "soittaa" partitive ; @@ -398,7 +396,7 @@ lin play_1_V2 = mkV2 "pelata" partitive ; lin play_1_V = mkV "pelata" ; lin power_N = mkN "teho" ; lin money_N = mkN "raha" ; -lin change_N = mkN (lin NK {s = d39 "muutos"}) ; +lin change_N = mkN "muutos" ; lin move_VV = mkVV "siirtyä" infIllat ; lin move_V2V = mkV2V (mkV "siirtää") accusative infIllat ; lin move_V2A = mkV2A (mkV "muuttaa") accusative (mkPrep translative) ; @@ -408,7 +406,7 @@ lin move_2_V = mkV "muuttaa" ; lin move_1_V = mkV "liikkua" ; lin interest_N = mkN "korko" ; lin interest_4_N = mkN "kiinnostus" ; ---- sense -lin interest_2_N = mkN "korko" ; ---- sense +lin interest_2_N = mkN "korko" ; lin interest_1_N = mkN "kiinnostus" | mkN "mielenkiinto" ; lin order_N = mkN "järjestys" ; lin book_N = L.book_N ; @@ -416,12 +414,12 @@ lin often_Adv = mkAdv "usein" ; lin development_N = mkN "kehitys" ; lin young_A = L.young_A ; lin national_A = mkA "kansallinen" ; -lin pay_V3 = mkWV3 (k52A "omistautua") ; --UNCHK -lin pay_V2V = mkWV2V (k52A "omistautua") ; --UNCHK +lin pay_V3 = mkV3 (mkV "osoittaa") (mkPrep partitive) (mkPrep allative) ; --osoittaa huomiota hänelle +lin pay_V2V = mkV2V (mkV "maksaa") accusative infIllat ; ---- subcat ("maksan hänet laulamaan"? if you have better ideas go ahead and change!) lin pay_V2 = mkV2 "maksaa" ; lin pay_V = mkV "kannattaa" ; -lin hear_VS = mkWVS (k63 "saada") "tietää" ; --UNCHK -lin hear_V2V = mkWV2V (k63 "saada") "tietää" ; --UNCHK +lin hear_VS = mkVS (mkV "kuulla") | mkVS (mkV (mkV "saada") "tietää") ; +lin hear_V2V = mkV2V (mkV "kuulla") genitive infPresPart ; --kuulin hänen tehneen lin hear_V2 = L.hear_V2 ; lin hear_V = mkV "kuulla" ; lin room_N = mkWN (k48 "huone") ; @@ -431,25 +429,25 @@ lin whether_Subj = mkSubj "josko" ; lin water_N = L.water_N ; lin form_N = mkWN (k1A "muoto") ; --f132 lin car_N = L.car_N ; -lin other_N = mkN (lin NK {s = d38 "toinen"}) ; -lin yet_Adv = mkWAdv (k99 "vielä") ; --f176 +lin other_N = mkN "toinen" ; +lin yet_Adv = mkAdv "vielä" ; --f176 lin yet_2_Adv = mkAdv "kuitenkin" ; lin yet_1_Adv = mkAdv "vielä" ; lin perhaps_Adv = mkAdv "ehkä" ; -lin meet_V2V = mkWV2V (k52A "kokoontua") ; --UNCHK +lin meet_V2V = mkV2V (mkV "tavata") ; ---- subcat lin meet_V2 = mkV2 "tavata" ; -lin meet_V = mkWV (k52A "kokoontua") ; --f106 +lin meet_V = mkV "kokoontua" ; --f106 lin level_N = mkN "taso" ; lin level_2_N = mkN "taso" ; lin level_1_N = mkN "taso" ; lin until_Subj = lin Subj (ss "kunnes") ; lin though_Subj = mkSubj "vaikka" ; lin policy_N = mkN "politiikka" ; -lin include_VV = mkWVV (k53A "sisällyttää") ; ---??? -lin include_V2 = mkV2 "sisältää" ; -lin include_V = mkWV (k53A "sisällyttää") ; +lin include_VV = mkVV (mkV "sisältää") ; ---- subcat +lin include_V2 = mkV2 "sisältää" | mkV2 "sisällyttää" ; +lin include_V = mkV "sisältää" ; lin believe_VS = mkVS (mkV "uskoa") ; -lin believe_V2V = mkWV2V (k52 "uskoa") "jhk" ; --UNCHK +lin believe_V2V = mkV2V (mkV "uskoa") genitive infPresPart ; lin believe_V2 = mkV2 "uskoa" illative ; lin believe_V = mkV "uskoa" ; lin council_N = mkN "neuvosto" ; @@ -457,64 +455,65 @@ lin already_Adv = L.already_Adv ; lin possible_A = mkWA (k38 "mahdollinen") ; lin nothing_NP = S.nothing_NP ; lin line_N = mkN "linja" ; -lin allow_VS = mkWVS (k53A "ottaa") "lukuun" ; +lin allow_VS = mkVS (mkV (mkV "ottaa") "lukuun") ; lin allow_V2V = mkV2Vf (mkV "sallia") (mkPrep genitive) infFirst ; -lin allow_V2 = mkV2 "hyväksyä" ; --f54 +lin allow_V2 = mkV2 "hyväksyä" | mkV2 "sallia" ; --f54 lin allow_V = mkV "sallia" ; lin need_N = mkWN (k48A "tarve") ; --f103 lin effect_N = mkN "vaikutus" ; lin big_A = L.big_A ; lin use_N = mkN "käyttö" ; -lin lead_VS = mkWVS (k56 "ajaa") ; --UNCHK -lin lead_V2V = mkWV2V (k56 "ajaa") ; --UNCHK +lin lead_VS = mkVS (mkV (mkV "johtaa") "siihen") ; +lin lead_V2V = mkV2V (mkV "ajaa") accusative infIllat ; lin lead_V2 = mkV2 "johtaa" partitive ; -lin lead_V = mkV (lin VK {s = c53A "johtaa"}) ; -lin stand_VV = mkWVV (k69 "suvaita") ; -lin stand_VS = mkWVS (k69 "suvaita") ; --UNCHK -lin stand_V2 = mkWV2 (k69 "suvaita") ; --UNCHK +lin lead_V = mkV "johtaa" ; +lin stand_VV = mkVV (mkV "kestää") ; --en kestä tehdä ~ can't stand to do +lin stand_VS = mkVS (mkV "puolustaa") ; ---- subcat +lin stand_V2 = mkV2 (mkV "puolustaa") ; -- split mkV2 "pystyttää" | mkV2 (mkV (mkV "ottaa") "kantaa") lin stand_V = L.stand_V ; lin idea_N = mkN "idea" "ideoita" ; -lin study_N = mkN "opiskelu" ; ---ARB mkN "tutkimus" -lin lot_N = mkWN (k9A "arpa") ; --f247 ---ARB mkN "paljous" -lin live_VV = mkWVV (k53 "elää") ; ---??? +lin study_N = mkN "opiskelu" ; --- split mkN "tutkimus" +lin lot_N = mkWN (k9A "arpa") ; --- split mkN "paljous" +lin live_VV = mkWVV (k53 "elää") ; ---- subcat lin live_V2 = mkV2 "asuttaa" partitive ; --mkWV2 (k53 "elää") ; lin live_V = L.live_V ; -lin job_N = mkN "työpaikka" ; +lin job_N = mkN "työ" | mkN "työpaikka" ; lin since_Subj = mkSubj "siitä lähtien kun" ; lin name_N = L.name_N ; -lin result_N = mkN (lin NK {s = d39 "tulos"}) ; +lin result_N = mkN "tulos" ; lin body_N = mkN "ruumis" ; lin happen_VV = mkVV "sattua" infIllat ; -lin happen_V2 = mkWV2 (k65 "käydä") ; --UNCHK +lin happen_V2 = mkV2 "tapahtua" ; ---- subcat lin happen_V = mkV "tapahtua" ; lin friend_N = L.friend_N ; -lin right_N = mkN "oikeus" ; ---ARB mkN "oikea" -lin least_Adv = mkWAdv (k99 "vähiten") ; --UNCHK +lin right_N = mkN "oikeus" ; --- split mkN "oikea" +lin least_Adv = mkAdv "vähiten" ; lin right_A = mkWA (k15 "oikea") ; --f92 lin right_2_A = mkA "oikea" ; lin right_1_A = mkA "oikea" ; -lin almost_Adv = mkAdv "lähes" ; +lin almost_Adv = mkAdv "melkein" | mkAdv "lähes" ; lin much_Det = S.much_Det ; -lin carry_V2 = mkV2 "kantaa" ; +lin carry_V2 = mkV2 (mkV "kantaa") partitive ; lin carry_V = mkV "kantaa" ; lin authority_N = mkN "viranomainen" ; lin authority_2_N = mkN "viranomainen" ; lin authority_1_N = mkN "auktoriteetti" ; -lin long_Adv = mkWAdv (k99 "pitkään") ; --f79 +lin long_Adv = mkAdv "pitkään" ; --f79 lin early_A = mkA "aikainen" ; lin view_N = mkWN (k10 "näkymä") ; --f160 lin view_2_N = mkN "mielipide" ; lin view_1_N = mkN "näkymä" | mkN "näky" ; -lin public_A = mkA (lin AK {s = d38 "julkinen"}) ; -lin together_Adv = mkWAdv "yhtä" "aikaa" ; --f97 +lin public_A = mkA "julkinen" ; +lin together_Adv = mkAdv "yhtä aikaa" ; --f97 lin talk_V2 = mkV2 "puhua" partitive ; lin talk_V = mkV "puhua" ; lin report_N = mkN "raportti" ; lin after_Subj = lin Subj (ss "sen jälkeen kun") ; lin only_Predet = S.only_Predet ; lin before_Subj = lin Subj (ss "ennen kuin") ; -lin bit_N = mkN "palanen" ; --f60 ---ARB ; bitti +lin bit_N = mkN "palanen" ; --- split mkN "bitti" lin face_N = mkN "kasvo" ; +---- checked by IL till face_N in the BNC order lin sit_VA = mkWVA (k53A "pitää") "istuntoa" ; --UNCHK lin sit_V2 = mkWV2 (k53A "pitää") "istuntoa" ; --UNCHK lin sit_V = L.sit_V ; diff --git a/lib/src/translator/todo/TopDictionarySpa.gf b/lib/src/translator/todo/TopDictionarySpa.gf index c38db42c5..874fdcb2a 100644 --- a/lib/src/translator/todo/TopDictionarySpa.gf +++ b/lib/src/translator/todo/TopDictionarySpa.gf @@ -170,7 +170,7 @@ lin put_VS = mkVS (poner_V) | mkVS (mkV "colocar") | mkVS (mkV "situar") ; lin put_V2V = mkV2V (poner_V) | mkV2V (mkV "colocar") | mkV2V (mkV "situar") ; lin put_V2 = L.put_V2 ; lin put_V = poner_V | mkV "colocar" | mkV "situar" ; -lin on_Adv = mkAdv "a cuatro patas" ; +lin on_Adv = mkAdv "sobre" ; lin no_Interj = mkInterj "sin comentarios" ; lin work_VV = mkVV (mkV "fermentar") ; lin work_V2 = mkV2 (mkV "fermentar") ; @@ -262,16 +262,16 @@ lin try_VV = mkVV (probar_V) ; lin try_V2V = mkV2V (probar_V) ; lin try_V2 = mkV2 (probar_V) ; lin try_V = probar_V ; -lin call_V3 = mkV3 (mkV (mkV "llamar") "al pan") | mkV3 (mkV (mkV "pan") "y al vino") | mkV3 (mkV "vino") ; -lin call_V2V = mkV2V (mkV (mkV "llamar") "al pan") | mkV2V (mkV (mkV "pan") "y al vino") | mkV2V (mkV "vino") ; -lin call_V2A = mkV2A (mkV (mkV "llamar") "al pan") | mkV2A (mkV (mkV "pan") "y al vino") | mkV2A (mkV "vino") ; -lin call_V2 = mkV2 (mkV (mkV "llamar") "al pan") | mkV2 (mkV (mkV "pan") "y al vino") | mkV2 (mkV "vino") ; -lin call_V = mkV (mkV "llamar") "al pan" | mkV (mkV "pan") "y al vino" | mkV "vino" ; +lin call_V3 = mkV3 (mkV "llamar") ; +lin call_V2V = mkV2V (mkV "llamar") ; +lin call_V2A = mkV2A (mkV "llamar") ; +lin call_V2 = mkV2 (mkV "llamar") ; +lin call_V = mkV "llamar" ; lin hand_N = L.hand_N ; -lin party_N = mkN "fiestero" | mkN "fiestera" | mkN "marchoso" | mkN "marchosa" ; -lin party_2_N = variants{} ; -lin party_1_N = variants{} ; -lin high_A = mkA "de nivel alto" | mkA "lujoso" | mkA "exclusivo" ; +lin party_N = mkN "partido" ; --mkN "fiestero" | mkN "fiestera" | mkN "marchoso" | mkN "marchosa" ; +lin party_2_N = mkN "partido" ; +lin party_1_N = mkN "fiesta" ; +lin high_A = mkA "alto" | mkA "lujoso" | mkA "exclusivo" ; lin about_Adv = mkAdv "alrededor" ; lin something_NP = S.something_NP ; lin school_N = L.school_N ;