From 9b785463f0405adbb6dfbd324ebf0166e4356941 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 15 Jun 2014 14:04:48 +0000 Subject: [PATCH] changes updated in TopDictionaryFin --- lib/src/translator/DictionarySwe.gf | 4 +- lib/src/translator/todo/TopDictionaryFin.gf | 66 ++++++++++----------- lib/src/translator/todo/TopDictionarySwe.gf | 2 +- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 23aa1e7d4..c4d35841d 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -54786,8 +54786,8 @@ lin steady_V2 = variants {} ; -- status=guess lin steak_N = mkN "stek" | mkN "biff" ; -- SaldoWN = mkN "stek" neutrum ; -- comment=5 lin steakhouse_N = mkN "stekhus" neutrum; -- comment=2 lin steal_N = mkN "slinka" ; -- comment=2 -lin steal_V = mkV "stjäla" "stjäl" "stjäl" "stal" "stulit" "stulen" ; -- comment=6 -lin steal_V2 = mkV2 (mkV "stjäla"); -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt +lin steal_V = mkV "stjäla" "stjäl" "stjäl" "stal" "stulit" "stulen" ; +lin steal_V2 = mkV2 (mkV "stjäla" "stjäl" "stjäl" "stal" "stulit" "stulen") ; lin steal_away_V = mkV "stjäla" "stjäl" "stjäl" "stal" "stulit" "stulen" ; -- comment=6 lin steal_out_V = mkV "stjäla" "stjäl" "stjäl" "stal" "stulit" "stulen" ; -- comment=6 lin steal_over_V2 = variants {} ; -- status=guess diff --git a/lib/src/translator/todo/TopDictionaryFin.gf b/lib/src/translator/todo/TopDictionaryFin.gf index ca79977a2..dd07d994d 100644 --- a/lib/src/translator/todo/TopDictionaryFin.gf +++ b/lib/src/translator/todo/TopDictionaryFin.gf @@ -156,7 +156,7 @@ lin over_Prep = postPrep genitive "yli" ; lin too_Adv = mkAdv "myös" ; lin put_V2 = L.put_V2 ; lin on_Adv = mkAdv "päällä" ; -- mkAdv "eteenpäin" ; -lin no_Interj = mkInterj "ei" ; +lin no_Interj = mkInterj "ei" | mkInterj "en" ; lin work_V2 = mkV2 "työstää" ; lin work_V = mkV "toimia" ; lin work_2_V = mkV "toimia" ; @@ -397,7 +397,7 @@ lin believe_V = mkV "uskoa" ; lin council_N = mkN "neuvosto" ; lin already_Adv = L.already_Adv ; lin possible_A = mkWA (k38 "mahdollinen") ; -lin nothing_NP = S.nothing_NP ; +lin nothing_NP = S.nothing_NP ** {s = \\c => "ei" ++ S.nothing_NP.s ! c} ; lin line_N = mkN "linja" ; lin allow_V2V = mkV2Vf (mkV "sallia") (mkPrep genitive) infFirst ; lin allow_V2 = mkV2 "hyväksyä" | mkV2 "sallia" ; @@ -1572,7 +1572,7 @@ lin examine_V2 = mkV2 (lin VK {s = c61 "tutkia"}) ; lin bird_N = L.bird_N ; lin green_A = L.green_A ; lin band_N = mkWN (k9A "panta") ; -lin sex_N = mkN "seksi" | mkN "sukupuoli" ; ---- split +lin sex_N = mkN "seksi" | mkN "sukupuoli" "sukupuolia" ; ---- split lin finger_N = mkWN (k7 "sormi") ; lin past_N = mkN "menneisyys" ; lin independent_A = mkWA (k38 "itsenäinen") ; @@ -1617,17 +1617,17 @@ lin otherwise_Adv = mkWAdv (k99 "muuten") ; lin railway_N = mkN "rautatie" | mkWN (k9A "rata") ; lin directly_Adv = mkAdv "suoraan" ; lin supply_N = mkN "tarjonta" ; -lin expression_N = mkN "ilmaisu" | mkN "ilmaus" ; +lin expression_N = mkN "ilmaisu" | mkN "ilmaus" ; lin owner_N = mkN (lin NK {s = d10 "omistaja"}) ; lin associate_V2 = mkWV2 (k62 "assosioida") ; -lin associate_V = mkV "assosioitua" ; -lin corner_N = mkWN (k10 "kulma") ; +lin associate_V = mkV "assosioitua" ; +lin corner_N = mkWN (k10 "kulma") ; lin past_A = mkA "entinen" ; -lin match_N = mkN "vastine" ; -lin match_3_N = mkN "yhteensopivuus" | mkN "vastine" ; +lin match_N = mkN "vastine" ; +lin match_3_N = mkN "yhteensopivuus" | mkN "vastine" ; lin match_2_N = mkN "tuli" (mkN "tikku") ; lin match_1_N = mkN "ottelu" | mkN "matsi" ; -lin sport_N = mkN "urheilu" ; +lin sport_N = mkN "urheilu" ; lin status_N = mkN "asema" ; lin beautiful_A = L.beautiful_A ; lin offer_N = mkN "tarjous" ; @@ -1638,14 +1638,14 @@ lin civil_A = mkA "siviili" ; --- lin perform_V2 = mkV2 "suorittaa" ; lin perform_V = mkV "esittää" ; lin sentence_N = mkN "lause" | mkWN (k3 "tuomio") ; --- split -lin crime_N = mkWN (k39 "rikos") ; +lin crime_N = mkWN (k39 "rikos") ; lin ball_N = mkN "pallo" ; lin marry_V2 = mkV2 "naida" ; lin marry_V = mkV L.go_V "naimisiin" | mkV "avioitua" ; lin wind_N = L.wind_N ; -lin truth_N = mkWN (k40 "totuus") ; +lin truth_N = mkWN (k40 "totuus") ; lin protect_V2 = mkV2 "suojella" partitive ; -lin protect_V = mkWV (k67 "suojella") ; +lin protect_V = mkWV (k67 "suojella") ; lin safety_N = mkN "turvallisuus" ; lin partner_N = mkWN (k6 "partneri") | mkN "kumppani" ; lin completely_Adv = mkAdv "täysin" ; @@ -1653,11 +1653,11 @@ lin copy_N = mkN "kopio" | mkN "jäljennös" ; lin balance_N = mkN "tasapaino" | mkN "balanssi" ; lin sister_N = L.sister_N ; lin reader_N = mkN "lukija" | mkN "lukemisto" ; ---- split -lin below_Adv = mkAdv "alapuolella" ; -lin trial_N = mkWN (k5 "testi") ; +lin below_Adv = mkAdv "alapuolella" ; +lin trial_N = mkWN (k5 "testi") ; lin rock_N = L.rock_N ; lin damage_N = mkN "vahinko" ; -lin adopt_V2 = mkV2 "omaksua" ; +lin adopt_V2 = mkV2 "omaksua" ; lin newspaper_N = L.newspaper_N ; lin meaning_N = mkN "merkitys" ; lin light_A = mkA "kevyt" | mkWA (k10 "valoisa") ; ---- split @@ -1665,27 +1665,27 @@ lin essential_A = mkA "olennainen" ; lin obvious_A = mkWA (kH1 "ilmeinen") ; lin nation_N = mkN "kansa" (mkN "kunta") ; lin confirm_VS = mkVS (mkV "vahvistaa") ; -lin confirm_V2 = mkV2 "vahvistaa" | mkV2 "varmistaa" ; -lin south_N = mkWN (k10 "etelä") ; -lin length_N = mkWN (k40 "pituus") ; +lin confirm_V2 = mkV2 "vahvistaa" | mkV2 "varmistaa" ; +lin south_N = mkWN (k10 "etelä") ; +lin length_N = mkWN (k40 "pituus") ; lin branch_N = mkWN (k9 "haara") | mkN "oksa" ; ---- split -lin deep_A = mkWA (k10 "syvä") | mkA "syvällinen" ; ---- split ? -lin none_NP = S.nothing_NP ; -lin planning_N = mkWN (k2 "suunnittelu") ; +lin deep_A = mkWA (k10 "syvä") | mkA "syvällinen" ; ---- split ? +lin none_NP = S.nothing_NP ** {s = \\c => "ei" ++ S.nothing_NP.s ! c} ; +lin planning_N = mkWN (k2 "suunnittelu") ; lin trust_N = mkN (lin NK {s = d39 "luottamus"}) ; lin working_A = mkA "toimiva" | mkA "työtätekevä" ; ---- split -lin pain_N = mkWN (k1A "särky") | mkN "kipu" ; -lin studio_N = mkWN (k3 "studio") ; +lin pain_N = mkWN (k1A "särky") | mkN "kipu" ; +lin studio_N = mkWN (k3 "studio") ; lin positive_A = mkA "positiivinen" | mkA "myönteinen" ; ---- split lin spirit_N = mkN "henki" ; lin college_N = mkWN (k8 "college") ; ---- yliopisto lin accident_N = mkN "onnettomuus" | mkN "sattuma" ; ---- split lin star_V2 = mkV2 "esiintyä" inessive ; ---- sense -lin hope_N = mkWN (k1 "toivo") ; -lin mark_V3 = mkV2 "merkitä" accusative allative ; ---- sense -lin mark_V2 = mkWV2 (k53A "merkitä") ; +lin hope_N = mkWN (k1 "toivo") ; +lin mark_V3 = mkV3 (mkV "merkitä") accusative (mkPrep allative) ; ---- sense +lin mark_V2 = mkWV2 (k53A "merkitä") ; lin works_N = mkN "laitos" | mkWN (compoundN "suur" (k19 "työ")) ; ---- split: water works ; collected words -lin league_N = mkWN (k1A "liitto") ; +lin league_N = mkWN (k1A "liitto") ; lin league_2_N = mkN "liiga" ; lin league_1_N = mkN "liiga" ; lin clear_V2 = mkWV2 (k53 "puhdistaa") ; @@ -1693,13 +1693,13 @@ lin clear_V = mkV "selkeytyä" ; lin imagine_VS = mkVS (mkV "kuvitella") ; lin imagine_V2 = mkV2 "kuvitella" ; lin imagine_V = mkV "kuvitella" ; -lin through_Adv = mkV "läpi" ; +lin through_Adv = mkAdv "läpi" ; lin cash_N = mkN "käteinen" ; lin normally_Adv = mkAdv "normaalisti" ; -lin play_N = mkN "näytelmä" ; +lin play_N = mkN "näytelmä" ; lin strength_N = mkN "vahvuus" ; lin train_N = L.train_N ; -lin travel_V2 = mkV2 "matkustaa" illative ; +lin travel_V2 = mkV2 "matkustaa" illative ; lin travel_V = L.travel_V ; lin target_N = mkN "maalitaulu" | mkN "kohde" ; ---- split concrete vs. abstract lin very_A = mkA "nimenomainen" ; @@ -1708,11 +1708,11 @@ lin male_A = mkA "miespuolinen" | mkA "urospuolinen" ; lin gas_N = mkWN (k1 "kaasu") | mkN "bensiini" | mkN "bensa" ; ---- split liquid or gas ; gasoline lin issue_V2 = mkV2 "julkaista" ; lin issue_V = mkWV (k67 "tulla") "esiin" ; ---- sense -lin contribution_N = mkWN (k40 "panos") ; +lin contribution_N = mkWN (k40 "panos") ; lin complex_A = mkA "monimutkainen" ; lin supply_V2 = mkV2 "tarjota" partitive ; lin beat_V2 = mkV2 "hakata" partitive | mkV2 "lyödä" partitive ; -lin beat_V = mkWV (k52A "takoa") ; +lin beat_V = mkWV (k52A "takoa") ; lin artist_N = mkN "taiteilija" | mkWN (k5 "artisti") ; lin agentMasc_N = mkN "agentti" | mkN "edustaja" ; lin presence_N = mkN "läsnäolo" ; @@ -2096,7 +2096,7 @@ lin head_V = mkV "johtaa" ; --f60 lin examination_N = mkWN (k2 "tarkastelu") ; --UNCHK lin deliver_V2 = mkV2 "toimittaa" ; --f64 lin deliver_V = mkV (mkV "tuottaa") "tulosta" ; ---ARB mkWV (k63 "saada") "lapsi" ; -lin nobody_NP = S.nobody_NP ; +lin nobody_NP = S.nobody_NP ** {s = \\c => "ei" ++ S.nobody_NP.s ! c} ; lin substantial_A = mkA "merkittävä" ; lin invite_V2V = mkWV2V (k54A "pyytää") ; --UNCHK lin invite_V2 = mkV2 "kutsua" ; diff --git a/lib/src/translator/todo/TopDictionarySwe.gf b/lib/src/translator/todo/TopDictionarySwe.gf index 87cdc79c9..4892f64eb 100644 --- a/lib/src/translator/todo/TopDictionarySwe.gf +++ b/lib/src/translator/todo/TopDictionarySwe.gf @@ -2590,7 +2590,7 @@ lin terrible_A = mkA "hemsk" ; -- comment=9 lin knee_N = L.knee_N ; lin dress_N = mkN "krydda" ; -- comment=9 lin unfortunately_Adv = mkAdv "tyvärr" | mkAdv "olyckligtvis" ; -lin steal_V2 = mkV2 (mkV "stjäla"); -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt +lin steal_V2 = mkV2 (mkV "stjäla" "stjäl" "stjäl" "stal" "stulit" "stulen") ; lin steal_V = mkV "stjäla" "stjäl" "stjäl" "stal" "stulit" "stulen" ; -- comment=6 lin criminal_A = mkA "brottslig" | mkA "kriminell" ; lin signal_N = mkN "signal" "signaler" ; -- comment=2