scandinavian topological sentence model

lib/resource/swedish/BasicSwe.gf

@@ -25,7 +25,7 @@ lin
   black_ADeg = mk2ADeg "svart" "svart" ;
   blue_ADeg = mk2ADeg "blå" "blått";
   boat_N = regN "båt" utrum ;
-  book_N = mk2N "bok" "böcker" ;
+  book_N = mkN "bok" "boken" "böcker" "böckerna" ;
   boot_N = mk2N "stövel" "stövlar" ;
   boss_N = mk2N "chef" "chefer" ;
   boy_N = regN "pojke" utrum ;
@@ -49,7 +49,7 @@ lin
   city_N = mk2N "stad" "städer" ;
   clean_ADeg = regADeg "ren" ;
   clever_ADeg = regADeg "klok" ;
-  close_V2 = dirV2 (regV "stänga") ;
+  close_V2 = dirV2 (mk2V "stänga" "stänger") ;
   coat_N = regN "rock" utrum ;
   cold_ADeg = regADeg "kall" ;
   come_V = (mkV "komma" "kommer" "kom" "kom" "kommit" "kommen") ;
@@ -105,7 +105,7 @@ lin
   leather_N = mkN "läder" "lädret" "läder" "lädren" ;
   leave_V2 = dirV2 (regV "lämna") ;
   like_V2 = mkV2 (mk2V "tycka" "tycker") "om" ;
-  listen_V2 = dirV2 (regV "lyssna") ;
+  listen_V2 = mkV2 (regV "lyssna") "på" ;
   live_V = (irregV "leva" "levde" "levt") ; ---- ?
   long_ADeg = irregADeg "lång" "längre" "längst" ;
   lose_V2 = dirV2 (regV "förlora") ;

lib/resource/swedish/CountrySwe.gf

@@ -1,4 +1,4 @@
-concrete CountrySwe of Country = open ResourceSwe, ParadigmsSwe in {
+concrete CountrySwe of Country = open CategoriesSwe, ParadigmsSwe in {
 
   lincat
     Country = PN ;

lib/resource/swedish/LangSatsSwe.gf

@@ -0,0 +1,22 @@
+--# -path=.:../scandinavian:../abstract:../../prelude
+
+concrete LangSatsSwe of LangSats = 
+  RulesSwe, 
+  SatsSwe, 
+  StructuralSwe,  
+  BasicSwe,
+  TimeSwe,
+  CountrySwe
+
+   ** open Prelude, ParadigmsSwe in {
+
+lin
+  AdvDate d = prefixSS "på" d ;
+  AdvTime t = prefixSS "klockan" t ;
+  NWeekday w = w ;
+  PNWeekday w = nounPN w ;
+
+  PNCountry x = x ;
+  ANationality x = x ;
+  NLanguage x = x ;
+}

lib/resource/swedish/SatsSwe.gf

@@ -0,0 +1,4 @@
+--# -path=.:../scandinavian:../abstract:../../prelude
+
+concrete SatsSwe of Sats = CategoriesSwe **
+  SatsScand with (SyntaxScand=SyntaxSwe) ;

lib/resource/swedish/SimpleLangSwe.gf

@@ -0,0 +1,21 @@
+--# -path=.:../scandinavian:../abstract:../../prelude
+
+concrete SimpleLangSwe of SimpleLang = 
+  SimpleSwe, 
+  StructuralSwe,
+  BasicSwe,
+  TimeSwe,
+  CountrySwe
+
+   ** open Prelude, ParadigmsSwe in {
+
+lin
+  AdvDate d = prefixSS "på" d ;
+  AdvTime t = prefixSS "klockan" t ;
+  NWeekday w = w ;
+  PNWeekday w = nounPN w ;
+
+  PNCountry x = x ;
+  ANationality x = x ;
+  NLanguage x = x ;
+}

lib/resource/swedish/SimpleSwe.gf

@@ -0,0 +1,8 @@
+--# -path=.:../scandinavian:../abstract:../../prelude
+
+concrete SimpleSwe of Simple = CategoriesSwe ** SimpleI with
+  (Categories = CategoriesSwe),
+  (Rules = RulesSwe),
+  (Structural = StructuralSwe),
+  (Verbphrase = VerbphraseSwe)
+  ;

lib/resource/swedish/TimeSwe.gf

@@ -1,5 +1,5 @@
 concrete TimeSwe of Time = NumeralsSwe ** 
-  open Prelude, MorphoSwe, ResourceSwe, ParadigmsSwe in {
+  open Prelude, MorphoSwe, CategoriesSwe, ParadigmsSwe in {
 
 lincat
 Date = SS ;