Scandinavian conjunction

2005-12-07 22:22:29 +00:00
parent 5a9db982dc
commit 59d1b1271b
7 changed files with 77 additions and 51 deletions
--- a/lib/resource-1.0/scandinavian/ParamScand.gf
+++ b/lib/resource-1.0/scandinavian/ParamScand.gf
@@ -80,6 +80,20 @@ oper
    Pres => VF (VPres v) ;
    Past => VF (VPret v) ;
    _ => VI (VInfin v) --- not to be used?
-    } ;    
+    } ;
+    
+-- Used in $ConjunctionScand$.
+
+  conjGenNum : (_,_ : GenNum) -> GenNum = \g,h -> case <g,h> of {
+    <SgUtr,SgUtr> => SgUtr ;
+    <Plg,  _>     => Plg ;
+    <_,  Plg>     => Plg ;
+    _             => SgNeutr 
+    } ;
+
+  conjAgr : (_,_ : Agr) -> Agr = \a,b -> {
+    gn = conjGenNum a.gn b.gn ;
+    p  = conjPerson a.p  b.p
+    } ;

 }