From 5f4f1b30a3efb229412cc0c50d95cecdce43a682 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 26 Sep 2014 14:48:28 +0000 Subject: [PATCH] Dictionary fixes for Swe nd Fin --- lib/src/dutch/PhraseDut.gf | 3 +++ lib/src/translator/DictionaryFin.gf | 6 +++--- lib/src/translator/ExtensionsSwe.gf | 2 +- lib/src/translator/TranslateEng.gf | 1 - 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/src/dutch/PhraseDut.gf b/lib/src/dutch/PhraseDut.gf index 0aeddfdfe..ff442c7e4 100644 --- a/lib/src/dutch/PhraseDut.gf +++ b/lib/src/dutch/PhraseDut.gf @@ -22,6 +22,9 @@ concrete PhraseDut of Phrase = CatDut ** open Prelude, ResDut in UttCard n = {s = n.s ! Utr ! Nom} ; UttAP ap = {s = ap.s ! APred} ; + UttInterj i = i ; + UttAdV a = a ; + NoPConj = {s = []} ; PConjConj conj = ss (conj.s2) ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index bab01a93e..cc176745a 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -32330,7 +32330,7 @@ lin multiversity_N = mkWN (compoundN "yli" (k2 "opisto")) "laaja" ; --UNCHK lin multivitamin_N = mkWN "monivitamiinipilleri" ; --UNCHK lin multum_in_parvo_N = mkN "tiivistelmä" ; ---ARB separateN "multum in" (mkN "parvo") ; ----sanaliitto ; meaning: much in little; summary lin mum_A = mkWA (k38 "hiljainen") ; --UNCHK -lin mum_N = mkWN (k99 "vaiti") ; --UNCHK +lin mum_N = mkN "äiti" ; lin mumble_N = mkWN (k12 "mumina") ; --UNCHK lin mumble_V = mkWV (k54A "mongertaa") ; --UNCHK lin mumble_V2 = mkWV2 (k54A "mongertaa") ; --UNCHK @@ -49949,7 +49949,7 @@ lin synthesizer_N = mkWN (k6 "syntetisaattori") ; --UNCHK lin synthetic_A = mkWA (k38 "synteettinen") ; lin synthetic_N = mkWN (k48 "yhdiste") "synteettinen" ; --UNCHK lin synthetically_Adv = mkWAdv (k99 "synteettisesti") ; --UNCHK -lin syphilis_N = mkWN (k39 "lues") ; --UNCHK +lin syphilis_N = mkN "kuppa" | mkN "syfilis" ; lin syphilitic_A = mkWA (k38 "kuppainen") ; --UNCHK lin syphilitic_N = mkWN (compoundN "kuppatauti" (k41 "potilas")) ; --UNCHK lin syphon_N = mkWN (compoundN "ilma" (k7 "putki")) ; --UNCHK @@ -51573,7 +51573,7 @@ lin tiyin_N = mkWN "tenge" ; --UNCHK lin tizzy_N = mkWN (k39 "kiihtymys") ; --UNCHK lin tnt_N = mkWN (k6 "trotyyli") ; --UNCHK lin to_Adv = mkAdv "luo" ; ---- what is this? -lin to_Prep = mkPrep illative | mkPrep allative ; ---- | luokse_Prep | luokse_Prep ** {s = luokse_Prep.s ** {p2 = "luo"}} | mkPrep "tykö" ; +lin to_Prep = mkPrep illative | luokse_Prep | luokse_Prep ** {s = luokse_Prep.s ** {p2 = "luo"}} | mkPrep "tykö" | mkPrep translative | mkPrep allative ; lin toad_N = mkWN (k10 "konna") ; --UNCHK lin toadfish_N = mkWN (k18 "tau") "Opsanus" ; --UNCHK lin toadflax_N = mkWN (compoundN "kannus" (k1 "ruoho")) ; --UNCHK diff --git a/lib/src/translator/ExtensionsSwe.gf b/lib/src/translator/ExtensionsSwe.gf index fcaf1f724..f29b4c486 100644 --- a/lib/src/translator/ExtensionsSwe.gf +++ b/lib/src/translator/ExtensionsSwe.gf @@ -65,7 +65,7 @@ lin } ; ByVP vp = { -- genom att dricka öl, genom att vara glad - s = "för att" ++ infVP vp {g = Utr ; n = Sg ; p = P3} + s = "genom att" ++ infVP vp {g = Utr ; n = Sg ; p = P3} } ; PresPartAP vp = { diff --git a/lib/src/translator/TranslateEng.gf b/lib/src/translator/TranslateEng.gf index 164bc94b5..0122ff126 100644 --- a/lib/src/translator/TranslateEng.gf +++ b/lib/src/translator/TranslateEng.gf @@ -81,5 +81,4 @@ lin OrdNumeralSuperl n a = G.OrdNumeralSuperl n a | {s = \\c => n.s ! NOrd ! Nom ++ Predef.BIND ++ "-" ++ Predef.BIND ++ a.s ! AAdj Superl c} ; - }