French close to complete; reported on regexp bindings

lib/resource-1.0/romance/RelativeRomance.gf

@@ -1,44 +1,42 @@
 incomplete concrete RelativeRomance of Relative = 
-  CatRomance ** open DiffRomance, ResRomance in {
+  CatRomance ** open Prelude, CommonRomance, ResRomance in {
 
   flags optimize=all_subs ;
 
   lin
 
     RelCl cl = {
-      s = \\t,a,p,ag => pronSuch ! ag.gn ++ conjThat ++ cl.s ! t ! a ! p ! Sub
+      s = \\t,a,p,m,ag => pronSuch ! ag ++ conjThat ++ cl.s ! t ! a ! p ! m
       } ;
 
     RelVP rp vp = {
-      s = \\t,ant,b,ag => 
+      s = \\t,ant,b,m,ag => 
         let 
           agr = case rp.a of {
             RNoAg => ag ;
-            RAg a => a
+            RAg a => a ** {p = P3}
             } ;
-          cl = mkClause (rp.s ! ag.gn ! RNom) agr vp
+          cl = mkClause (rp.s ! False ! ag ! Nom) agr vp
         in
-        cl.s ! t ! ant ! b ! Sub
+        cl.s ! t ! ant ! b ! m
       } ;
-
---- We make this easy by using "som" and preposition stranding. It would be
---- a proble to determine whether $slash$ takes a direct object, since
---- $slash.c2$ is defined to be just a string. 
---
--- The empty relative is left to $ExtRomance$.
-
+{-
     RelSlash rp slash = {
       s = \\t,a,p,ag => 
           rp.s ! ag.gn ! RNom ++ slash.s ! t ! a ! p ! Sub ++ slash.c2
       } ;
-
---- The case here could be genitive.
+-}
 
     FunRP p np rp = {
-      s = \\gn,c => np.s ! nominative ++ p.s ++ rp.s ! gn ! RPrep ;
+      s = \\_,a,c => np.s ! Ton Nom ++ p.s ++ rp.s ! True ! a ! p.c ;
       a = RAg np.a
       } ;
+    IdRP = {
+      s = relPron ; 
+      a = RNoAg
+      } ;
 
-    IdRP = {s = relPron ; a = RNoAg} ;
+--    RCl  = {s : Tense => Anteriority => Polarity => Mood => Agr => Str} ;
+--    RP   = {s : AAgr  => RelForm => Str ; a : RAgr} ;
 
 }