updated DictEngSwe with Folkets lexikon and with 120 most common missing Penn treebank words, the latter manually. Folkets lexicon needs some manual revision (which is the reason not just to link to the automatically generated version).

lib/src/swedish/MakeStructuralSwe.gf

@@ -13,6 +13,14 @@ oper
            [table (P.Gender) [vilken;vilket] ; table (P.Gender) [vilka;vilka]] ; 
      det = d ; lock_IQuant = <>} ;
 
+  mkQuant : Str -> Str -> Str -> Quant = \naagon,naagot,naagra ->
+    lin Quant {s,sp = table {
+       Sg => \\_,_ => table {Utr => naagon ; Neutr => naagot} ; 
+       Pl => \\_,_,_ => naagra
+       } ;
+     det = DIndef
+    } ; 
+
   mkDet : Str -> P.Number -> Det = \s,n ->
     lin Det {s,sp = \\_,_ => s ; n = n ; det = DDef Indef} ;
 
@@ -33,4 +41,7 @@ oper
         a = PAg n ;
         }      
       } ;
+
+    mkNum : Str -> Num = \s -> lin Num {s = table {_ => s} ; isDet = True ; n = Pl} ;
+
 }

lib/src/swedish/ParadigmsSwe.gf

@@ -280,7 +280,11 @@ oper
   mkVS  : V -> VS ; 
   mkV2S : V -> Prep -> V2S ;
   mkVV  : V -> VV ;
-  mkV2V : V -> Prep -> Prep -> V2V ;
+  auxVV : V -> VV ;
+  mkV2V : overload {
+    mkV2V : V -> V2V ;
+    mkV2V : V -> Prep -> Prep -> V2V ;
+    } ;
   mkVA  : V -> VA ;
   mkV2A : V -> Prep -> V2A ;
   mkVQ  : V -> VQ ;
@@ -634,6 +638,7 @@ oper
   mkV0  v = v ** {lock_V0 = <>} ;
   mkVS  v = v ** {lock_VS = <>} ;
   mkVV  v = v ** {c2 = mkComplement "att" ; lock_VV = <>} ;
+  auxVV v = v ** {c2 = mkComplement [] ; lock_VV = <>} ;
   mkVQ  v = v ** {lock_VQ = <>} ;
 
   mkVA  v = v ** {lock_VA = <>} ;
@@ -645,7 +650,15 @@ oper
   A2V : Type = A2 ;
 
   mkV2S v p = mmkV2 v p ** {lock_V2S = <>} ;
-  mkV2V v p t = mmkV2 v p ** {c3 = mkComplement "att" ; lock_V2V = <>} ;
+
+
+  mkV2V = overload {
+    mkV2V : V -> V2V =
+     \v -> mmkV2 v (mkPrep []) ** {c3 = mkComplement "att" ; lock_V2V = <>} ;
+    mkV2V : V -> Prep -> Prep -> V2V =
+     \v, p, t -> mmkV2 v p ** {c3 = mkComplement p.s ; lock_V2V = <>} ;
+    } ;
+
   mkV2Q v p = mmkV2 v p ** {lock_V2Q = <>} ;
 
   mkAS  v = v ** {lock_A = <>} ;

lib/src/swedish/ParseSwe.gf

@@ -19,7 +19,7 @@ concrete ParseSwe of ParseEngAbs =
             ClSlash, RCl, EmptyRelSlash],
 
   DictEngSwe ** 
-open MorphoSwe, ResSwe, ParadigmsSwe, Prelude in {
+open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, Prelude in {
 
 flags
   literal=Symb ;
@@ -80,10 +80,12 @@ lin
                                            v.c3 ++ 
                                            vpi.s ! VVAux ! a)
                                    (predVc v) ;
-  ComplVV v a p vp = insertObj (\\agr => a.s ++ p.s ++ 
+-}
-                                         infVP v.typ vp a.a p.p agr)
-                               (predVV v) ;
 
+  ComplVV v a p vp = mkVP v vp ; ----
+
+
+{-
   PredVPosv np vp = {
       s = \\t,a,b,o => 
         let 
@@ -107,12 +109,11 @@ lin
           OQuest => verb.aux ++ compl ++ verb.adv ++ vp.ad ++ verb.fin ++ verb.inf ++ np.s ! npNom
           }
     } ;
+-}
 
-  that_RP = {
+  that_RP = which_RP ; -- som
-    s = \\_ => "that" ;
-    a = RNoAg
-    } ;
 
+{-
   CompS s = {s = \\_ => "that" ++ s.s} ;
   CompQS qs = {s = \\_ => qs.s ! QIndir} ;
   CompVP ant p vp = {s = \\a => ant.s ++ p.s ++ 
@@ -132,6 +133,7 @@ lin
     c = npNom
   } ;
 -}
+
   ApposNP np1 np2 = {
     s = \\c => np1.s ! c ++ "," ++ np2.s ! NPNom ;
     a = np1.a