From f7568f51427be44b4a9fd340d61ca20b645e58b2 Mon Sep 17 00:00:00 2001 From: bringert Date: Wed, 2 Mar 2005 13:45:52 +0000 Subject: [PATCH] More swadesh swedish fixes + related irregular verbs. --- lib/resource/swedish/MorphoSwe.gf | 1 + lib/resource/swedish/SwadeshLexSwe.gf | 6 +++--- lib/resource/swedish/VerbsSwe.gf | 9 ++++++++- lib/resource/swedish/VerbsSweAbs.gf | 7 +++++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lib/resource/swedish/MorphoSwe.gf b/lib/resource/swedish/MorphoSwe.gf index 4f2bea577..61e35dcc6 100644 --- a/lib/resource/swedish/MorphoSwe.gf +++ b/lib/resource/swedish/MorphoSwe.gf @@ -187,6 +187,7 @@ adj2Reg : Str -> Str -> Adj = \vid,vitt -> adjAlmostReg vid vitt (vid + "a") ; } ; såld = case Predef.dp 2 sålt of { "it" => Predef.tk 2 sålt + "en" ; + "tt" => Predef.tk 2 sålt + "dd" ; _ => init sålt + "d" } in diff --git a/lib/resource/swedish/SwadeshLexSwe.gf b/lib/resource/swedish/SwadeshLexSwe.gf index a90196394..4feae90d9 100644 --- a/lib/resource/swedish/SwadeshLexSwe.gf +++ b/lib/resource/swedish/SwadeshLexSwe.gf @@ -157,7 +157,7 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe sea_N = sea_N ; seed_N = regN "frö" neutrum ; skin_N = regN "skinn" neutrum ; - sky_N = regN "himmel" "himlar" ; + sky_N = mk2N "himmel" "himlar" ; smoke_N = regN "rök" utrum ; snake_N = snake_N ; snow_N = regN "snö" utrum ; @@ -177,7 +177,7 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe worm_N = regN "mask" utrum ; year_N = regN "år" neutrum ; - name_N2 = mkN2 (regN "namn") "på" ; +-- name_N2 = mkN2 (regN "namn") "på" ; mother_N2 = mother_N2 ; father_N2 = father_N2 ; @@ -212,7 +212,7 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe lie_V = ljuga_V ; live_V = mk2V "leva" "levde" ; play_V = mk2V "leka" "lekte" ; - pull_V = dra_V ; + pull_V = draga_V ; push_V = mk2V "trycka" "tryckte" ; rub_V = smörja_V ; say_V = säga_V ; diff --git a/lib/resource/swedish/VerbsSwe.gf b/lib/resource/swedish/VerbsSwe.gf index 53a37ebb8..0a7de33ae 100644 --- a/lib/resource/swedish/VerbsSwe.gf +++ b/lib/resource/swedish/VerbsSwe.gf @@ -45,7 +45,7 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { brista_V = irregV "brista" "brast" "brustit" ; bryta_V = irregV "bryta" "bröt" "brutit" ; dö_V = irregV "dö" "dog" "dött" ; - draga_V = irregV "draga" "drog" "dragit" ; + draga_V = irregV (variants { "draga"; "dra"}) "drog" "dragit" ; dricka_V = irregV "dricka" "drack" "druckit" ; driva_V = irregV "driva" "drev" "drivit" ; drypa_V = irregV "drypa" "dröp" "drupit" ; @@ -73,6 +73,7 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { försvinna_V = irregV "försvinna" "försvann" "försvunnit" ; förtiga_V = irregV "förtiga" "förteg" "förtigit" ; frysa_V = irregV "frysa" "frös" "frusit" ; + gå_V = irregV "gå" "gick" "gått" ; genomdriva_V = irregV "genomdriva" "genomdrev" "genomdrivit" ; gilla_V = irregV "gilla" "gall" "gillit" ; giva_V = irregV "ge" "gav" "givit" ; @@ -92,6 +93,7 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { inskriva_V = irregV "inskriva" "inskrev" "inskrivit" ; intaga_V = irregV "intaga" "intog" "intagit" ; kliva_V = irregV "kliva" "klev" "klivit" ; + klyva_V = irregV "klyva" "klöv" "kluvit" ; knipa_V = irregV "knipa" "knep" "knipit" ; knyta_V = irregV "knyta" "knöt" "knutit" ; komma_V = irregV "komma" "kom" "kommit" ; @@ -114,6 +116,8 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { rinna_V = irregV "rinna" "rann" "runnit" ; riva_V = irregV "riva" "rev" "rivit" ; ryta_V = irregV "ryta" "röt" "rutit" ; + säga_V = irregV "säga" "sade" "sagt" ; + se_V = irregV "se" "såg" "sett" ; sitta_V = irregV "sitta" "satt" "suttit" ; sjuda_V = irregV "sjuda" "sjöd" "sjudit" ; sjunga_V = irregV "sjunga" "sjöng" "sjungit" ; @@ -131,8 +135,10 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { slippa_V = irregV "slippa" "slapp" "sluppit" ; slita_V = irregV "slita" "slet" "slitit" ; sluta_V = irregV "sluta" "slöt" "slutit" ; + smörja_V = irregV "smörja" "smorjde" "smort" ; smita_V = irregV "smita" "smet" "smitit" ; snyta_V = irregV "snyta" "snöt" "snutit" ; + sova_V = irregV "sova" "sov" "sovit" ; spinna_V = irregV "spinna" "spann" "spunnit" ; spricka_V = irregV "spricka" "sprack" "spruckit" ; sprida_V = irregV "sprida" "spred" "spridit" ; @@ -147,6 +153,7 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { supa_V = irregV "supa" "söp" "supit" ; svida_V = irregV "svida" "sved" "svidit" ; svika_V = irregV "svika" "svek" "svikit" ; + sy_V = irregV "sy" "sydde" "sytt" ; taga_V = irregV "taga" "tog" "tagit" ; tiga_V = irregV "tiga" "teg" "tigit" ; tillåta_V = irregV "tillåta" "tillät" "tillåtit" ; diff --git a/lib/resource/swedish/VerbsSweAbs.gf b/lib/resource/swedish/VerbsSweAbs.gf index f7e94429f..0884627c2 100644 --- a/lib/resource/swedish/VerbsSweAbs.gf +++ b/lib/resource/swedish/VerbsSweAbs.gf @@ -68,6 +68,7 @@ abstract VerbsSweAbs = Categories ** { försvinna_V : V ; förtiga_V : V ; frysa_V : V ; + gå_V : V ; genomdriva_V : V ; gilla_V : V ; giva_V : V ; @@ -87,6 +88,7 @@ abstract VerbsSweAbs = Categories ** { inskriva_V : V ; intaga_V : V ; kliva_V : V ; + klyva_V : V ; knipa_V : V ; knyta_V : V ; komma_V : V ; @@ -109,6 +111,8 @@ abstract VerbsSweAbs = Categories ** { rinna_V : V ; riva_V : V ; ryta_V : V ; + säga_V : V ; + se_V : V ; sitta_V : V ; sjuda_V : V ; sjunga_V : V ; @@ -126,8 +130,10 @@ abstract VerbsSweAbs = Categories ** { slippa_V : V ; slita_V : V ; sluta_V : V ; + smörja_V : V ; smita_V : V ; snyta_V : V ; + sova_V : V ; spinna_V : V ; spricka_V : V ; sprida_V : V ; @@ -142,6 +148,7 @@ abstract VerbsSweAbs = Categories ** { supa_V : V ; svida_V : V ; svika_V : V ; + sy_V : V ; taga_V : V ; tiga_V : V ; tillåta_V : V ;