From a7732f24755f6219f1f0b14f4d3fe014dcd7922f Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Fri, 2 Sep 2005 13:49:02 +0000
Subject: [PATCH] Predic works

---
 lib/resource/abstract/Predic.gf   | 12 ++++++------
 lib/resource/english/ClauseEng.gf | 18 +-----------------
 lib/resource/english/PredicEng.gf |  4 ++--
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/lib/resource/abstract/Predic.gf b/lib/resource/abstract/Predic.gf
index eca746fc0..7ec09b743 100644
--- a/lib/resource/abstract/Predic.gf
+++ b/lib/resource/abstract/Predic.gf
@@ -39,11 +39,11 @@ abstract Predic = Categories ** {
 -}
 
 
-    UseV1  : V   -> Verb Vt_ ;
-    UseV2  : V2  -> Verb (Vt CtN) ;
-    UseVS  : VS  -> Verb (Vt CtS) ;
-    UseV3  : V3  -> Verb (VtN CtN) ;
-    UseV2S : V2S -> Verb (VtN CtS) ;
-    UseV2Q : V2Q -> Verb (VtN CtQ) ;
+    VeV1  : V   -> Verb Vt_ ;
+    VeV2  : V2  -> Verb (Vt CtN) ;
+    VeVS  : VS  -> Verb (Vt CtS) ;
+    VeV3  : V3  -> Verb (VtN CtN) ;
+    VeV2S : V2S -> Verb (VtN CtS) ;
+    VeV2Q : V2Q -> Verb (VtN CtQ) ;
     ---- etc
 }
diff --git a/lib/resource/english/ClauseEng.gf b/lib/resource/english/ClauseEng.gf
index 862d5b6fa..9694b2d23 100644
--- a/lib/resource/english/ClauseEng.gf
+++ b/lib/resource/english/ClauseEng.gf
@@ -2,7 +2,7 @@
 --# -opt
 
 concrete ClauseEng of Clause = CategoriesEng ** 
-----  ClausePredI with (Predic = PredicEng) ;
+----  ClausePredI with (Predic = PredicEng) ; {-
 
   open Prelude, SyntaxEng in {
 
@@ -98,19 +98,3 @@ concrete ClauseEng of Clause = CategoriesEng **
 
   IPredProgVP vp = predBeGroupI (vp.s ! VIPresPart) ;
 }
-
-
-{-
--- Use VPs
-
-  PredVP = predVerbGroupClause ;
-  IntVP = intVerbPhrase ;
-  RelVP = relVerbPhrase ;
-
-
-  PosVP tp = predVerbGroup True tp.a ;
-  NegVP tp = predVerbGroup False tp.a ;
-
-  AdvVP = adVerbPhrase ;
-  SubjVP = subjunctVerbPhrase ;
--}
diff --git a/lib/resource/english/PredicEng.gf b/lib/resource/english/PredicEng.gf
index 2e35e8078..510176c3c 100644
--- a/lib/resource/english/PredicEng.gf
+++ b/lib/resource/english/PredicEng.gf
@@ -53,8 +53,8 @@ concrete PredicEng of Predic = CategoriesEng **
                 cprep2 verb.c (compl.s2 ! a)
         ) ; 
 
-    UseV1 v = v ** {isAux = False ; c = CVt_} ;
-    UseV2 v = v ** {isAux = False ; c = CVt (CCtN CP_)} ; ---- other preps
+    VeV1 v = v ** {isAux = False ; c = CVt_} ;
+    VeV2 v = v ** {isAux = False ; c = CVt (CCtN CP_)} ; ---- other preps
 
 {-
     Walk = {s = "walks" ; c = VC_} ;