finished french vp (but buggy)

lib/resource/french/ParadigmsFre.gf

@@ -315,19 +315,19 @@ oper
 
   mkV0  v = v ** {lock_V0 = <>} ;
   mkVS  v = v ** {mn,mp = Ind ; lock_VS = <>} ;  ---- more moods
-  mkV2S v p = mkV2 v p ** {lock_V2S = <>} ;
+  mkV2S v p = mkV2 v p ** {mn,mp = Ind ; lock_V2S = <>} ;
   mkVV  v = v ** {c = accusative ; lock_VV = <>} ;
   deVV  v = v ** {c = genitive.p1 ; lock_VV = <>} ;
   aVV  v = v ** {c = dative.p1 ; lock_VV = <>} ;
-  mkV2V v p t = mkV2 v p ** {c3 = t.p1  ; lock_V2V = <>} ;
+  mkV2V v p t = mkV2 v p ** {c3 = t.p1  ; s3 = p.p2 ; lock_V2V = <>} ;
   mkVA  v = v ** {lock_VA = <>} ;
   mkV2A v p = mkV2 v p ** {lock_V2A = <>} ;
   mkVQ  v = v ** {lock_VQ = <>} ;
   mkV2Q v p = mkV2 v p ** {lock_V2Q = <>} ;
 
   mkAS  v = v ** {mn,mp = Ind ; lock_AS = <>} ; ---- more moods
-  mkA2S v p = mkA2 v p ** {lock_A2S = <>} ;
-  mkAV  v p = v ** {c = p.p1 ; lock_AV = <>} ;
+  mkA2S v p = mkA2 v p ** {mn,mp = Ind ; lock_A2S = <>} ;
+  mkAV  v p = v ** {c = p.p1 ; s2 = p.p2 ; lock_AV = <>} ;
   mkA2V v p q = mkA2 v p ** {s3 = q.p2 ; c3 = q.p1 ; lock_A2V = <>} ;
 
 } ;

lib/resource/french/SyntaxFre.gf

@@ -119,6 +119,11 @@ oper
     AEsse   => verbEtre
     } ;
 
+  progressiveVerbPhrase : VerbPhrase -> VerbGroup = \vp ->
+   predClauseBeGroup
+     (complCopula (\\g,n,p => 
+       "en" ++ "train" ++ elisDe ++ vp.s !  VIInfinit ! g ! n ! p)) ;
+
 -- The "ne - pas" negation.
 
   posNeg = \b,v,c -> 
@@ -179,13 +184,6 @@ oper
 
 -- Questions
 {- ----
-  questVerbPhrase = \jean,dort ->
-    {s = table {
-      DirQ   => optStr (estCeQue Acc) ++ (predVerbPhrase jean dort).s ! Ind ;
-      IndirQ => elisSi ++ (predVerbPhrase jean dort).s ! Ind
-      }
-    } ;
-
   existNounPhraseQuest = \duvin -> {
     s = \\m => 
         case m of {
@@ -194,22 +192,17 @@ oper
           } 
         ++ duvin.s ! stressed accusative  --- il y en a ; have to define "y"
     } ;
-
-  intVerbPhrase = \qui, dormir ->
-    let dort = dormir.s ! qui.g ! VPF Simul (VFin presInd qui.n P3)
-    in
-    {s = table {
-      DirQ => qui.s ! Nom ++ optStr (estCeQue Nom) ++ dort ;
-      IndirQ => "ce" ++ qui.s ! Nom ++ dort
-      }
-    } ;
-
+-}
   intSlash = \Qui, Tuvois ->
-    let {qui = Tuvois.s2 ++ Qui.s ! Tuvois.c ; tuvois = Tuvois.s ! Ind} in
-    {s = table {
-      DirQ   => qui ++ optStr (estCeQue Acc) ++ tuvois ; 
-      IndirQ => ifCe Tuvois.c ++ qui ++ tuvois
-      }
+    {s = \\b,cl =>
+      let 
+        qui = Tuvois.s2 ++ Qui.s ! Tuvois.c ; 
+        tuvois = Tuvois.s ! b ! cl
+      in
+      table {
+        DirQ   => qui ++ optStr (estCeQue Acc) ++ tuvois ; 
+        IndirQ => ifCe Tuvois.c ++ qui ++ tuvois
+        }
     } ;
 
 -- An auxiliary to distinguish between
@@ -221,14 +214,6 @@ oper
     _   => []
     } ;
 
-  questAdverbial = \quand, jean, dort ->
-    let {jeandort = (predVerbPhrase jean dort).s ! Ind} in
-    {s = table {
-      DirQ   => quand.s ++ optStr (estCeQue Acc) ++ jeandort ; 
-      IndirQ => quand.s                          ++ jeandort
-      }
-    } ;
--}
 ----- moved from Morpho
 
 --2 Articles