diff --git a/lib/resource/abstract/SwadeshLex.gf b/lib/resource/abstract/SwadeshLex.gf index b895d23a3..c2d825b78 100644 --- a/lib/resource/abstract/SwadeshLex.gf +++ b/lib/resource/abstract/SwadeshLex.gf @@ -33,8 +33,6 @@ abstract SwadeshLex = Categories ** { when_IAdv : IAdv ; how_IAdv : IAdv ; - -- not : Adv ; -- ? - -- Conjunctions and_Conj : Conj ; @@ -45,6 +43,10 @@ abstract SwadeshLex = Categories ** { in_Prep : Prep ; with_Prep : Prep ; + -- not -- ? + -- if -- ? + -- because -- ? + -- Numerals one_Num : Num ; diff --git a/lib/resource/english/SwadeshLexEng.gf b/lib/resource/english/SwadeshLexEng.gf index 48b7522fa..efd71b840 100644 --- a/lib/resource/english/SwadeshLexEng.gf +++ b/lib/resource/english/SwadeshLexEng.gf @@ -2,7 +2,7 @@ concrete SwadeshLexEng of SwadeshLex = CategoriesEng ** open ResourceEng, SyntaxEng, ParadigmsEng, VerbsEng, - BasicEng in { + BasicEng, Prelude in { lin @@ -44,6 +44,12 @@ concrete SwadeshLexEng of SwadeshLex = CategoriesEng and_Conj = and_Conj ; + -- Prepositions + + at_Prep = ss "at" ; + in_Prep = ss "in" ; + with_Prep = ss "with" ; + -- Numerals one_Num = UseNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; diff --git a/lib/resource/swedish/SwadeshLexSwe.gf b/lib/resource/swedish/SwadeshLexSwe.gf index 3c42228f1..88985ceb5 100644 --- a/lib/resource/swedish/SwadeshLexSwe.gf +++ b/lib/resource/swedish/SwadeshLexSwe.gf @@ -2,7 +2,7 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe ** open ResourceSwe, SyntaxSwe, ParadigmsSwe, VerbsSwe, - BasicSwe in { + BasicSwe, Prelude in { lin @@ -44,6 +44,12 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe and_Conj = and_Conj ; + -- Prepositions + + at_Prep = ss "vid" ; + in_Prep = ss "i" ; + with_Prep = ss "med" ; + -- Numerals one_Num = UseNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ; @@ -67,6 +73,7 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe good_ADeg = good_ADeg ; green_ADeg = green_ADeg ; heavy_ADeg = irregADeg "tung" "tyngre" "tyngst" ; + left_A = mkA "vänstra" "vänstra" "vänstra" ; long_ADeg = long_ADeg ; narrow_ADeg = narrow_ADeg ; near_ADeg = mkADeg "nära" "nära" "nära" "nära" @@ -74,8 +81,8 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe new_ADeg = new_ADeg ; old_ADeg = old_ADeg ; red_ADeg = red_ADeg ; + right_A = mkA "högra" "högra" "högra" ; rotten_ADeg = mk3ADeg "rutten" "ruttet" "ruttna" ; - round_ADeg = regADeg "rund" ; sharp_ADeg = regADeg "vass" ; short_ADeg = short_ADeg ; @@ -90,8 +97,6 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe wide_ADeg = mk2ADeg "bred" "brett" ; yellow_ADeg = yellow_ADeg ; - left_A = mkA "vänstra" "vänstra" "vänstra" ; - right_A = mkA "högra" "högra" "högra" ; -- Nouns @@ -209,14 +214,14 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe hold_V = hålla_V ; hunt_V = regV "jaga" ; kill_V = regV "döda" ; - know_V = kunna_V ; -- FIXME: känna? veta? + know_V = veta_V ; laugh_V = regV "skratta" ; - lie_V = ljuga_V ; + lie_V = ligga_V ; live_V = leva_V ; play_V = mk2V "leka" "leker" ; pull_V = draga_V ; push_V = mk2V "trycka" "trycker" ; - rub_V = smörja_V ; + rub_V = gnida_V ; say_V = säga_V ; scratch_V = regV "klia" ; see_V = se_V ; @@ -227,8 +232,8 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe smell_V = regV "lukta" ; spit_V = regV "spotta" ; split_V = klyva_V ; - squeeze_V = regV "krama" ; - stab_V = hugga_V ; + squeeze_V = klämma_V ; + stab_V = sticka_V ; stand_V = stå_V ; suck_V = suga_V ; swell_V = svälla_V ; diff --git a/lib/resource/swedish/VerbsSwe.gf b/lib/resource/swedish/VerbsSwe.gf index b8eddcbe9..5c0d6a222 100644 --- a/lib/resource/swedish/VerbsSwe.gf +++ b/lib/resource/swedish/VerbsSwe.gf @@ -45,7 +45,8 @@ 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 (variants { "draga"; "dra"}) "drog" "dragit" ; + draga_V = mkV (variants { "dra"; "draga"}) (variants { "drar" ; + "drager"}) (variants { "dra" ; "drag" }) "drog" "dragit" "dragen" ; dricka_V = irregV "dricka" "drack" "druckit" ; driva_V = irregV "driva" "drev" "drivit" ; drypa_V = irregV "drypa" "dröp" "drupit" ; @@ -93,6 +94,7 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { inskriva_V = irregV "inskriva" "inskrev" "inskrivit" ; intaga_V = irregV "intaga" "intog" "intagit" ; känna_V = irregV "känna" "kände" "känt" ; + klämma_V = irregV "klämma" "klämde" "klämt" ; kliva_V = irregV "kliva" "klev" "klivit" ; klyva_V = irregV "klyva" "klöv" "kluvit" ; knipa_V = irregV "knipa" "knep" "knipit" ; @@ -103,6 +105,7 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { kvida_V = irregV "kvida" "kved" "kvidit" ; låta_V = irregV "låta" "lät" "låtit" ; leva_V = irregV "leva" "levde" "levt" ; + ligga_V = irregV "ligga" "låg" "legat" ; ljuda_V = irregV "ljuda" "ljöd" "ljudit" ; ljuga_V = irregV "ljuga" "ljög" "ljugit" ; ljuta_V = irregV "ljuta" "ljöt" "ljutit" ; @@ -173,6 +176,7 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { utbrista_V = irregV "utbrista" "utbrast" "utbrustit" ; utesluta_V = irregV "utesluta" "uteslöt" "uteslutit" ; utskriva_V = irregV "utskriva" "utskrev" "utskrivit" ; + veta_V = mkV "veta" "vet" "vet" "visste" "vetat" (variants {}) ; vända_V = irregV "vända" "vände" "vänt" ; vina_V = irregV "vina" "ven" "vinit" ; vinna_V = irregV "vinna" "vann" "vunnit" ; diff --git a/lib/resource/swedish/VerbsSweAbs.gf b/lib/resource/swedish/VerbsSweAbs.gf index 59f6269b2..0ceb1438b 100644 --- a/lib/resource/swedish/VerbsSweAbs.gf +++ b/lib/resource/swedish/VerbsSweAbs.gf @@ -88,6 +88,7 @@ abstract VerbsSweAbs = Categories ** { inskriva_V : V ; intaga_V : V ; känna_V : V ; + klämma_V : V ; kliva_V : V ; klyva_V : V ; knipa_V : V ; @@ -98,6 +99,7 @@ abstract VerbsSweAbs = Categories ** { kvida_V : V ; låta_V : V ; leva_V : V ; + ligga_V : V ; ljuda_V : V ; ljuga_V : V ; ljuta_V : V ; @@ -169,6 +171,7 @@ abstract VerbsSweAbs = Categories ** { utesluta_V : V ; utskriva_V : V ; vända_V : V ; + veta_V : V ; vina_V : V ; vinna_V : V ; vrida_V : V ;