documenting Numeral; completing Swedish

lib/resource-1.0/scandinavian/AdjectiveScand.gf

@@ -12,18 +12,19 @@ incomplete concrete AdjectiveScand of Adjective =
       isPre = False
       } ;
 
----- $SuperlA$ belongs to determiner syntax in $Noun$.
---
---    ComplA2 a np = {
---      s = \\_ => a.s ! AAdj Posit ++ a.c2 ++ np.s ! Acc ; 
---      isPre = False
---      } ;
---
---    ReflA2 a = {
---      s = \\ag => a.s ! AAdj Posit ++ a.c2 ++ reflPron ! ag ; 
---      isPre = False
---      } ;
---
+-- $SuperlA$ belongs to determiner syntax in $Noun$.
+
+    ComplA2 a np = {
+      s = \\ap => a.s ! AF (APosit ap) Nom ++ a.c2 ++ np.s ! accusative ; 
+      isPre = False
+      } ;
+
+    ReflA2 a = {
+      s = \\ap => a.s ! AF (APosit ap) Nom ++ a.c2 ++ 
+                  reflPron (agrP3 Utr Sg) ; ---- 
+      isPre = False
+      } ;
+
     SentAP ap sc = {
       s = \\a => ap.s ! a ++ sc.s ; 
       isPre = False

lib/resource-1.0/scandinavian/VerbScand.gf

@@ -6,7 +6,9 @@ incomplete concrete VerbScand of Verb = CatScand ** open DiffScand, ResScand in
     UseV = predV ;
     ComplV2 v np = insertObj (\\_ => v.c2 ++ np.s ! accusative) (predV v) ;
     ComplV3 v np np2 = 
-      insertObj (\\_ => v.c2 ++ np.s ! accusative ++ v.c3 ++ np2.s ! accusative) (predV v) ;
+      insertObj 
+        (\\_ => v.c2 ++ np.s ! accusative ++ v.c3 ++ np2.s ! accusative) 
+        (predV v) ;
 
     ComplVV v vp = insertObj (\\a => v.c2 ++ infVP vp a) (predV v) ;
     ComplVS v s  = insertObj (\\_ => conjThat ++ s.s ! Sub) (predV v) ;
@@ -25,15 +27,15 @@ incomplete concrete VerbScand of Verb = CatScand ** open DiffScand, ResScand in
     CompNP np = {s = \\_ => np.s ! accusative} ;
     CompAdv a = {s = \\_ => a.s} ;
 
---- these give parser overflow
     AdvVP vp adv = insertAdv adv.s vp ;
----    AdVVP adv vp = insertAdV adv.s vp ;
+    AdVVP adv vp = insertAdV adv.s vp ;
 
-{-
-    ReflV2 v = insertObj (\\a => v.c2 ++ reflPron ! a) (predV v) ;
 
-    PassV2 v = {s = \\_ => v.s ! VPPart} ;
--}
+    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) ;
+
 
     UseVS, UseVQ = \vv -> {s = vv.s ; c2 = [] ; vtype = vv.vtype} ;