diff --git a/examples/stoneage/StoneageEng.gf b/examples/stoneage/StoneageEng.gf index ed5c1c3c0..2db6ac8c2 100644 --- a/examples/stoneage/StoneageEng.gf +++ b/examples/stoneage/StoneageEng.gf @@ -3,6 +3,9 @@ concrete StoneageEng of Stoneage = open SyntaxEng, ResourceEng, ParadigmsEng, SwadeshLexEng, StoneageResEng in { +flags + startcat=S; + lincat S = Phr ; NP = NP ; diff --git a/examples/stoneage/StoneageSwe.gf b/examples/stoneage/StoneageSwe.gf index d18027a87..4e90376bb 100644 --- a/examples/stoneage/StoneageSwe.gf +++ b/examples/stoneage/StoneageSwe.gf @@ -1,6 +1,9 @@ --# -path=.:../../lib/resource/abstract:../../lib/prelude:../../lib/resource/swedish:../../lib/resource/scandinavian concrete StoneageSwe of Stoneage - = open SyntaxSwe, ResourceSwe, ParadigmsSwe, SwadeshLexSwe, StoneageResSwe in { + = open SyntaxSwe, ResourceSwe, ParadigmsSwe, VerbsSwe, SwadeshLexSwe, StoneageResSwe in { + +flags + startcat=S; lincat S = Phr ; @@ -17,10 +20,12 @@ lin Hear = PresVasV2 hear_V ; Know = PresVasV2 know_V ; Think = PresVasV2 think_V ; - Smell = PresVasV2 smell_V ; + Smell s o = PresCl (SPredV2 s (dirV2 känna_V) (DefOneNP + (AdvCN (UseN (mk2N "lukt" "lukter")) + (PrepNP possess_Prep o)))) ; Fear = PresVasV2 fear_V ; Kill = PresVasV2 kill_V ; - Fight = PresVasV2 fight_V ; + Fight s o = PresCl (AdvCl (SPredV s fight_V) (AdvPP (PrepNP with_Prep o))) ; Hunt = PresVasV2 hunt_V ; Hit = PresVasV2 hit_V ; Cut = PresVasV2 cut_V ; diff --git a/lib/resource/english/SwadeshLexEng.gf b/lib/resource/english/SwadeshLexEng.gf index 6e5069f11..474a97ad0 100644 --- a/lib/resource/english/SwadeshLexEng.gf +++ b/lib/resource/english/SwadeshLexEng.gf @@ -121,7 +121,7 @@ concrete SwadeshLexEng of SwadeshLex = CategoriesEng forest_N = regN "forest" ; fruit_N = fruit_N ; grass_N = regN "grass" ; - guts_N = regN "guts" ; -- FIXME: plural only? + guts_N = regN "gut" ; -- FIXME: no singular hair_N = regN "hair" ; hand_N = regN "hand" ; head_N = regN "head" ; diff --git a/lib/resource/swedish/SwadeshLexSwe.gf b/lib/resource/swedish/SwadeshLexSwe.gf index 00629b60e..92f5a1abf 100644 --- a/lib/resource/swedish/SwadeshLexSwe.gf +++ b/lib/resource/swedish/SwadeshLexSwe.gf @@ -110,7 +110,7 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe earth_N = mk2N "jord" "jordar" ; egg_N = mk2N "ägg" "ägg" ; eye_N = mkN "öga" "ögat" "ögon" "ögonen" ; - fat_N = mk2N "fett" "fetter" ; + fat_N = mk2N "fett" "fett" ; father_N = mascN (mkN "far" "fadern" "fäder" "fäderna") ; -- father_N = UseN2 father_N2 ; feather_N = mk2N "fjäder" "fjädrar" ; @@ -127,7 +127,7 @@ concrete SwadeshLexSwe of SwadeshLex = CategoriesSwe hair_N = mk2N "hår" "hår" ; hand_N = mk2N "hand" "händer" ; head_N = mkN "huvud" "huvudet" "huvuden" "huvudena" ; - heart_N = mk2N "hjärta" "hjärtan" ; + heart_N = mkN "hjärta" "hjärtat" "hjärtan" "hjärtana" ; horn_N = mk2N "horn" "horn" ; husband_N = mascN (mk2N "make" "makar") ; ice_N = mk2N "is" "isar" ; diff --git a/lib/resource/swedish/VerbsSwe.gf b/lib/resource/swedish/VerbsSwe.gf index 71fc2bc7f..b8eddcbe9 100644 --- a/lib/resource/swedish/VerbsSwe.gf +++ b/lib/resource/swedish/VerbsSwe.gf @@ -92,13 +92,14 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { innesluta_V = irregV "innesluta" "inneslöt" "inneslutit" ; inskriva_V = irregV "inskriva" "inskrev" "inskrivit" ; intaga_V = irregV "intaga" "intog" "intagit" ; + känna_V = irregV "känna" "kände" "känt" ; 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" ; krypa_V = irregV "krypa" "kröp" "krupit" ; - kunna_V = irregV "kunna" "kunde" "kunnat" ; + kunna_V = mkV "kunna" "kan" "kan" "kunde" "kunnat" "känd" ; kvida_V = irregV "kvida" "kved" "kvidit" ; låta_V = irregV "låta" "lät" "låtit" ; leva_V = irregV "leva" "levde" "levt" ; @@ -123,7 +124,7 @@ concrete VerbsSwe of VerbsSweAbs = CategoriesSwe ** open ParadigmsSwe in { sjuda_V = irregV "sjuda" "sjöd" "sjudit" ; sjunga_V = irregV "sjunga" "sjöng" "sjungit" ; sjunka_V = irregV "sjunka" "sjönk" "sjunkit" ; - skära_V = irregV "skära" "skar" "skurit" ; + skära_V = mkV "skära" "skär" "skär" "skar" "skurit" "skuren" ; skina_V = irregV "skina" "sken" "skinit" ; skita_V = irregV "skita" "sket" "skitit" ; skjuta_V = irregV "skjuta" "skjöt" "skjutit" ; diff --git a/lib/resource/swedish/VerbsSweAbs.gf b/lib/resource/swedish/VerbsSweAbs.gf index ab54ce8c1..59f6269b2 100644 --- a/lib/resource/swedish/VerbsSweAbs.gf +++ b/lib/resource/swedish/VerbsSweAbs.gf @@ -87,6 +87,7 @@ abstract VerbsSweAbs = Categories ** { innesluta_V : V ; inskriva_V : V ; intaga_V : V ; + känna_V : V ; kliva_V : V ; klyva_V : V ; knipa_V : V ;