Finnish complete

lib/resource-1.0/finnish/QuestionFin.gf

@@ -14,18 +14,16 @@ concrete QuestionFin of Question = CatFin ** open ResFin, Prelude in {
       in {
         s = \\t,a,p => cl.s ! t ! a ! p ! SDecl
         } ;
-{-
+
     QuestSlash ip slash = {
       s = \\t,a,p => 
             let 
               cls = slash.s ! t ! a ! p ;
-              who = slash.c2 ++ ip.s ! Acc --- stranding in ExtFin 
-            in table {
-              QDir   => who ++ cls ! OQuest ;
-              QIndir => who ++ cls ! ODir
-              }
+              who = appCompl True p slash.c2 (ip ** {a = agrP3 ip.n ; isPron = False})
+            in
+            who ++ cls
       } ;
--}
+
     QuestIAdv iadv cl = {
       s = \\t,a,p => iadv.s ++ cl.s ! t ! a ! p ! SDecl
       } ;
@@ -37,11 +35,23 @@ concrete QuestionFin of Question = CatFin ** open ResFin, Prelude in {
       s = \\c => ip.s ! c ++ adv.s ;
       n = ip.n
       } ;
-{- 
-    IDetCN idet num ord cn = {
-      s = \\c => idet.s ++ num.s ++ ord.s ++ cn.s ! idet.n ! c ; 
-      n = idet.n
+
+-- The computation of $ncase$ is a special case of that in $NounFin.DetCN$,
+-- since we don't have possessive suffixes or definiteness. 
+--- It could still be nice to have a common oper...
+
+    IDetCN idet num ord cn = let n = idet.n in {
+      s = \\c => 
+        let 
+          k = npform2case c ;
+          ncase = case <k,num.isNum> of {
+            <Nom,  True> => NCase Sg Part ; -- mitkä kolme kytkintä
+            <_,    True> => NCase Sg k ;    -- miksi kolmeksi kytkimeksi
+            _            => NCase n  k      -- mitkä kytkimet
+            }
+        in
+        idet.s ! k ++ num.s ! Sg ! k ++ ord.s ! n ! k ++ cn.s ! ncase ; 
+      n = n
       } ;
--}
 
 }