swedish complete

lib/resource-1.0/scandinavian/DiffScand.gf

@@ -28,6 +28,8 @@ interface DiffScand = open ResScand, Prelude in {
     verbHave : {s : VForm => Str ; vtype : VType} ;
     verbBe   : {s : VForm => Str ; vtype : VType} ;
 
+    verbBecome : {s : VForm => Str ; vtype : VType} ;
+
     auxFut : Str ;
     auxCond : Str ;
 

lib/resource-1.0/scandinavian/PhraseScand.gf

@@ -12,7 +12,7 @@ incomplete concrete PhraseScand of Phrase =
     UttIP ip = {s = ip.s ! nominative} ; --- Acc also
     UttIAdv iadv = iadv ;
     UttNP np = {s = np.s ! accusative} ;
-----    UttVP vp = {s = infMark ++ infVP vp (agrP3 Sg)} ;
+    UttVP vp = {s = infMark ++ infVP vp (agrP3 Utr Sg)} ;
     UttAdv adv = adv ;
 
     NoPConj = {s = []} ;

lib/resource-1.0/scandinavian/ResScand.gf

@@ -190,30 +190,4 @@ resource ResScand = ParamScand ** open Prelude in {
           }
     } ;
 
----- For $Numeral$.
---
---  mkNum : Str -> Str -> Str -> Str -> {s : DForm => CardOrd => Str} = 
---    \two, twelve, twenty, second ->
---    {s = table {
---       unit => table {NCard => two ; NOrd => second} ; 
---       teen => \\c => mkCard c twelve ; 
---       ten  => \\c => mkCard c twenty
---       }
---    } ;
---
---  regNum : Str -> {s : DForm => CardOrd => Str} = 
---    \six -> mkNum six (six + "teen") (six + "ty") (regOrd six) ;
---
---  regCardOrd : Str -> {s : CardOrd => Str} = \ten ->
---    {s = table {NCard => ten ; NOrd => regOrd ten}} ;
---
---  mkCard : CardOrd -> Str -> Str = \c,ten -> 
---    (regCardOrd ten).s ! c ; 
---
---  regOrd : Str -> Str = \ten -> 
---    case last ten of {
---      "y" => init ten + "ieth" ;
---      _   => ten + "th"
---      } ;
---
 }

lib/resource-1.0/scandinavian/VerbScand.gf

@@ -33,9 +33,10 @@ incomplete concrete VerbScand of Verb = CatScand ** open DiffScand, ResScand in
 
     ReflV2 v = insertObj (\\a => v.c2 ++ reflPron a) (predV v) ;
 
---  PassV2 v = {s = \\_ => v.s ! VPPart} ;
--- UseComp comp = insertObj (\\a => comp.s ! agrAdj a.gn DIndef) (predV verbBe) ;
-
+    PassV2 v = 
+      insertObj 
+        (\\a => v.s ! VI (VPtPret (agrAdj a.gn DIndef) Nom)) 
+        (predV verbBecome) ;
 
     UseVS, UseVQ = \vv -> {s = vv.s ; c2 = [] ; vtype = vv.vtype} ;