changed type of ComplV3

lib/resource/romance/RulesRomance.gf

@@ -52,8 +52,6 @@ lin
 
   UseV2 = transAsVerb ;
 
-----  ComplV3 = complDitransVerb ;
-
   ComplA2S = predAdjSent2 ; ---- clitics get lost
 
   AdjPart = adjPastPart ;
@@ -99,9 +97,9 @@ lin
 --3 Sentences and relative clauses
 --
 
-  SlashV2 = slashTransVerb ;
-----  SlashVV2 = slashVerbVerb ;
-----  SlashAdv cl p = slashAdverb cl p.s ;
+  SlashV2  = slashTransVerb ;
+  SlashVV2 = slashVerbVerb ;
+  SlashAdv = slashAdverb ;
 
   IdRP = identRelPron ;
   FunRP = funRelPron ;

lib/resource/romance/SyntaxRomance.gf

@@ -635,10 +635,15 @@ oper
     v ** {s2 = p1 ; c = c1 ; s3 = p2 ; c3 = c2} ;
 
 --- This must be completed to account for the order of the clitics.
+--- In the rule below, the last argument cannot get cliticized.
 
-{- ----
   complDitransVerb : 
-    DitransVerb -> NounPhrase -> NounPhrase -> VerbGroup = \donner,jean,vin ->
+    DitransVerb -> NounPhrase -> NounPhrase -> Complemnt = \donner,jean,vin ->
+      complTransVerbGen 
+        donner jean 
+        (\\_,_,_ => donner.s3 ++ vin.s ! case2pform donner.c3) ;
+
+{-
     {s = \\b,g,w =>
        let 
          adonne = formVerb2 donner g w ;
@@ -927,6 +932,17 @@ oper
     predVerbGroupClause jean (predClauseGroup aimer (complVerb aimer)) **
     complementOfTransVerb aimer ;
 
+  slashVerbVerb : NounPhrase -> VerbVerb -> TransVerb -> ClauseSlashNounPhrase = 
+    \jean,vouloir,aimer ->
+    predVerbGroupClause jean 
+      (predClauseGroup aimer (complVerbVerb vouloir 
+         (predVerbGroup True {s = [] ; a = Simul} (predClauseGroup aimer (complVerb aimer))))) **
+    complementOfTransVerb aimer ;
+
+  slashAdverb : Clause -> {s : Str ; c : CaseA} -> ClauseSlashNounPhrase = 
+    \ilhabite,dans -> ilhabite ** {s2 = dans.s ; c = dans.c} ;
+
+
 --2 Relative pronouns and relative clauses
 --
 -- Relative pronouns are inflected in

lib/resource/romance/VerbphraseRomance.gf

@@ -28,6 +28,7 @@ incomplete concrete VerbphraseRomance of Verbphrase = CategoriesRomance **
   UseV v = predClauseGroup v (complVerb v) ;
   UsePassV v = predClauseBeGroup (passVerb v) ;
   ComplV2 v x = predClauseGroup v (complTransVerb v x) ;
+  ComplV3 v x y = predClauseGroup v (complDitransVerb v x y) ;
   ComplReflV2 v = predClauseGroup v (reflTransVerb v) ;
   ComplVS v x = predClauseGroup v (complSentVerb v x) ;
   ComplVV v x = predClauseGroup v (complVerbVerb v x) ;