progress with scandinavian

lib/resource-1.0/swedish/DiffSwe.gf

@@ -1,4 +1,4 @@
-instance DiffSwe of DiffScand = {
+instance DiffSwe of DiffScand = open ResScand, Prelude in {
 
 -- Parameters.
 
@@ -6,7 +6,17 @@ instance DiffSwe of DiffScand = {
     Gender = Utr | Neutr ;
 
   oper
-    utrum = Utr ; neutrum = Neutr ;
+    utrum = Utr ; 
+    neutrum = Neutr ;
+
+    gennum : Gender -> Number -> GenNum = \g,n ->
+      case <g,n> of {
+        <Utr,Sg> => SgUtr ;
+        <Neutr,Sg> => SgNeutr ;
+        _  => Plg
+        } ;
+
+    detDef : Species = Def ;
 
 -- Strings.
 
@@ -14,4 +24,19 @@ instance DiffSwe of DiffScand = {
     conjThan = "än" ;
     infMark  = "att" ;
 
+    artIndef : Gender => Str = table {
+      Utr => "en" ;
+      Neutr => "ett"
+      } ;
+
+    verbHave = 
+      mkVerb "ha" "har" "ha" "hade" "haft" "havd" "havt" "havda" ;
+
+    auxFut = "ska" ;      -- "skall" in ExtSwe
+    auxCond = "skulle" ;
+
+    negation : Polarity => Str = table {
+      Pos => [] ;
+      Neg => "inte"
+      } ;
 }

lib/resource-1.0/swedish/LexSwe.gf

@@ -30,15 +30,15 @@ concrete LexSwe of Lex = CatSwe ** open ResSwe, Prelude in {
     here_Adv = {s = "här"} ;
     very_AdA = {s = "mycket"} ;
     always_AdV = {s = "alltid"} ;
---
---    only_Predet = {s = "bara"} ;
---    all_Predet = {s = "alla"} ;
+
+    only_Predet = {s = \\_ => "bara"} ;
+    all_Predet = {s = gennumForms "all" "allt" "alla"} ;
 --    this_Quant = {s = "this" ; n = Sg} ;
 --    these_Quant = {s = "these" ; n = Pl} ;
 --    
---    i_Pron  = mkNP "I"  "me"  "my"  Sg P1 ;
---    he_Pron = mkNP "he" "him" "his" Sg P3 ;
---    we_Pron = mkNP "we" "us"  "our" Pl P1 ;
+    i_Pron  = mkNP "jag"  "mig"  "min" "mitt" "mina"  SgUtr P1 ;
+    he_Pron = mkNP "han"  "honom"  "hans" "hans" "hans"  SgUtr P3 ;
+    we_Pron = mkNP "vi"  "oss"  "vår" "vårt" "våra"  SgUtr P1 ;
 --
 --    whoSg_IP = mkIP "who" "whom" "whose" Sg ;
 --    whoPl_IP = mkIP "who" "whom" "whose" Pl ;

lib/resource-1.0/swedish/NounSwe.gf

@@ -0,0 +1,2 @@
+concrete NounSwe of Noun = CatSwe ** NounScand with
+  (DiffScand = DiffSwe) ;

lib/resource-1.0/swedish/SentenceSwe.gf

@@ -0,0 +1,2 @@
+concrete SentenceSwe of Sentence = CatSwe ** SentenceScand with
+  (DiffScand = DiffSwe) ;

lib/resource-1.0/swedish/TestSwe.gf

@@ -1,17 +1,17 @@
 --# -path=.:../scandinavian:../abstract:../common:prelude
 
 concrete TestSwe of Test = 
---  NounSwe, 
---  VerbSwe, 
+  NounSwe, 
+  VerbSwe, 
   AdjectiveSwe,
   AdverbSwe,
 --  -- NumeralSwe,
---  SentenceSwe,
+  SentenceSwe,
 --  QuestionSwe,
 --  RelativeSwe,
 --  ConjunctionSwe,
   PhraseSwe,
---  UntensedSwe,
+  UntensedSwe,
 --  -- TensedSwe,
   LexSwe 
   ** {

lib/resource-1.0/swedish/UntensedSwe.gf

@@ -0,0 +1,2 @@
+concrete UntensedSwe of Untensed = CatSwe ** UntensedScand with
+  (DiffScand = DiffSwe) ;

lib/resource-1.0/swedish/VerbSwe.gf

@@ -0,0 +1,2 @@
+concrete VerbSwe of Verb = CatSwe ** VerbScand with
+  (DiffScand = DiffSwe) ;