number agreement in Romance predeterminers

lib/src/romance/CatRomance.gf

@@ -67,7 +67,11 @@ incomplete concrete CatRomance of Cat = CommonX
       s2 : Str ; 
       sp : Number => Gender => Case => Str 
       } ;
-    Predet  = {s : AAgr   => Case => Str ; c : Case} ; -- c : la plupart de
+    Predet  = {
+      s : AAgr   => Case => Str ; 
+      c : Case ; -- c : la plupart de
+      a : PAgr   -- if an agr is forced, e.g. chacun de nous
+      } ;
     Num     = {s : Gender => Str ; isNum : Bool ; n : Number} ;
     Card    = {s : Gender => Str ; n : Number} ;
     Ord     = {s : AAgr   => Str} ;

lib/src/romance/CommonRomance.gf

@@ -118,7 +118,7 @@ param
    | RCond   --# notpresent
    ;
 
--- Agreement of adjectives, verb phrases, and relative pronouns.
+-- Agreement of adjectives, verb phrases, relative pronouns, and predeterminers.
 
 oper
   AAgr : Type = {g : Gender ; n : Number} ;
@@ -126,6 +126,7 @@ oper
 
 param
   RAgr = RAg {g : Gender ; n : Number} | RNoAg ; --- AAgr
+  PAgr = PAg Number | PNoAg ;
 
 -- Clitic slots.
 

lib/src/romance/NounRomance.gf

@@ -20,7 +20,7 @@ incomplete concrete NounRomance of Noun =
 
     PredetNP pred np = heavyNP {
       s = \\c => pred.s ! aagr (np.a.g) (np.a.n) ! c ++ (np.s ! pred.c).ton ;
-      a = np.a ;
+      a = case pred.a of {PAg n => agrP3 np.a.g n ; _ => np.a} ;
       hasClit = False
       } ;