updating VP versions

lib/resource/english/ClauseEng.gf

@@ -1,8 +1,6 @@
 --# -path=.:../abstract:../../prelude
---# -opt
 
 concrete ClauseEng of Clause = CategoriesEng ** 
-----  ClausePredI with (Predic = PredicEng) ; {-
 
   open Prelude, SyntaxEng in {
 

lib/resource/english/ClauseEngVP.gf

@@ -0,0 +1,5 @@
+--# -path=.:../abstract:../../prelude
+--# -opt
+
+concrete ClauseEngVP of Clause = CategoriesEng **
+  ClauseI with (Rules=RulesEng), (Verbphrase=VerbphraseEng) ;

lib/resource/english/SyntaxEng.gf

@@ -448,9 +448,8 @@ oper
     } ;
 
 -- To form an infinitival group
-
-{- ---- obsolete
-  predVerbGroup : Bool -> {s : Str ; a : Anteriority} -> VerbGroup -> VerbPhrase =
+{-
+  predVerbGroupOld : Bool -> {s : Str ; a : Anteriority} -> VerbGroup -> VerbPhrase =
     \b,ant,vg -> {
     s  = table {
            VIInfinit  => \\a => ant.s ++ vg.s2 ! b ! VInfinit ant.a ! a ;
@@ -459,6 +458,16 @@ oper
     s1 = if_then_Str b [] "not"
     } ;
 -}
+  predVerbGroup : VerbGroup -> VerbClause = \vg ->
+    {s = \\p,a =>
+           table {
+             VIInfinit  => \\ag => 
+               vg.s ! p ! VInfinit a ! ag ++ vg.s2 ! p ! VInfinit a ! ag ;
+             VIPresPart => \\ag => 
+               vg.s ! p ! VPresPart ! ag  ++ vg.s2 ! p ! VPresPart ! ag
+           } ;
+       s1 = \\b => if_then_Str b [] "not"
+      } ;
 
   predVerbI : Verb -> Complement -> VerbClause = 
     \verb,comp -> 

lib/resource/english/VerbphraseEng.gf

@@ -22,6 +22,8 @@
 concrete VerbphraseEng of Verbphrase = CategoriesEng ** 
   open Prelude, SyntaxEng in {
 
+  flags optimize=all_subs ;
+
   lin
   UseV v = predClauseGroup v (complVerb v) ;
   UsePassV v = predClauseBeGroup (passVerb v) ;
@@ -45,8 +47,6 @@ concrete VerbphraseEng of Verbphrase = CategoriesEng **
 
   PredProgVP = progressiveVerbPhrase ;
 
-----  SPredProgVP = progressiveClause ;
-
 -- Use VPs
 
   PredVP = predVerbGroupClause ;
@@ -54,9 +54,10 @@ concrete VerbphraseEng of Verbphrase = CategoriesEng **
   RelVP = relVerbPhrase ;
   IntVP = intVerbPhrase ;
 
-  PosVP = predVerbGroup True ;
-  NegVP = predVerbGroup False ;
+--  PosVP = predVerbGroup True ;
+--  NegVP = predVerbGroup False ;
+  UseVP = predVerbGroup ;
 
   AdvVP = adVerbPhrase ;
   SubjVP = subjunctVerbPhrase ;
-}
+}

lib/resource/romance/VerbphraseRomance.gf

@@ -51,11 +51,13 @@ incomplete concrete VerbphraseRomance of Verbphrase = CategoriesRomance **
 
   PredVP = predVerbGroupClause ;
 
-  RelVP = relVerbPhrase ;
+  RelVP = variants {} ; ----- relVerbPhrase ;
   IntVP = intVerbPhrase ;
 
 --  PosVP tp = predVerbGroup True tp ;
 --  NegVP tp = predVerbGroup False tp ;
+  UseVP = variants {} ;
+
 
   AdvVP = adVerbPhrase ;
   SubjVP = subjunctVerbPhrase ;