a bunch of additions in the parsing grammars and dictionaries plus an updated statistical model

lib/src/english/DictEng.gf

@@ -985,6 +985,7 @@ lin almighty_N = mkN "almighty";
 lin almond_N = mkN "almond" "almonds";
 lin almond_eyed_A = compoundA (mkA "almond - eyed");
 lin almoner_N = mkN "almoner" "almoners";
+lin almost_AdA = mkAdA "almost" ;
 lin almost_AdN = mkAdN "almost" ;
 lin almost_Adv = mkAdv "almost";
 lin almost_Predet = {s="almost"} ;
@@ -19886,6 +19887,7 @@ lin keep_V2 = mkV2 (IrregEng.keep_V);
 lin keep_to_V2V = mkV2V (IrregEng.keep_V) noPrep to_Prep;
 lin keep_ing_V2V = ingV2V (IrregEng.keep_V) noPrep noPrep;
 lin keep_VA = mkVA (IrregEng.keep_V);
+lin keep_V2A = mkV2A (IrregEng.keep_V) noPrep;
 lin keep_VS = mkVS (IrregEng.keep_V);
 lin keep_VV = ingVV (IrregEng.keep_V);
 lin keeper_N = mkN "keeper" "keepers";
@@ -22476,6 +22478,7 @@ lin mean_A = mkA "mean" "meaner";
 lin mean_N = mkN "mean" "means";
 lin mean_V = IrregEng.mean_V;
 lin mean_V2 = mkV2 (IrregEng.mean_V);
+lin mean_V2V = mkV2V (IrregEng.mean_V) noPrep to_Prep;
 lin mean_VA = mkVA (IrregEng.mean_V);
 lin mean_VV = mkVV (IrregEng.mean_V);
 lin mean_VS = mkVS (IrregEng.mean_V);
@@ -32009,11 +32012,9 @@ lin rummage_V = mkV "rummage" "rummages" "rummaged" "rummaged" "rummaging";
 lin rummage_V2 = mkV2 (mkV "rummage" "rummages" "rummaged" "rummaged" "rummaging");
 lin rummy_A = mkA "rummy" "rummyyer*";
 lin rummy_N = mkN "rummy" ;
-lin rumor_V2 = mkV2 (mkV "rumor" "rumors" "rumored" "rumored" "rumoring");
-lin rumor_V2V = mkV2V (mkV "rumor" "rumors" "rumored" "rumored" "rumoring") noPrep to_Prep ;
-lin rumor_VS = mkVS (mkV "rumor" "rumors" "rumored" "rumored" "rumoring");
 lin rumour_N = variants {mkN "rumour" "rumours"; mkN "rumor" "rumors"};
-lin rumour_V2 = mkV2 (mkV "rumour" "rumours" "rumoured" "rumoured" "rumouring");
+lin rumour_V2 = mkV2 (mkV (variants {"rumour"; "rumor"}));
+lin rumour_V3 = mkV3 (mkV (variants {"rumour"; "rumor"})) noPrep noPrep;
 lin rumour_monger_N = mkN "rumour - monger" "rumour - mongers";
 lin rump_N = mkN "rump" "rumps";
 lin rump_steak_N = mkN "rump - steak" "rump - steaks";
@@ -38327,7 +38328,7 @@ lin thingummy_N = mkN "thingummy" "thingummies";
 lin think_N = mkN "think" "thinks";
 lin think_V = IrregEng.think_V;
 lin think_V2 = mkV2 (IrregEng.think_V);
-lin think_VA = mkVA (IrregEng.think_V);
+lin think_V2A = mkV2A (IrregEng.think_V) noPrep;
 lin think_VS = mkVS (IrregEng.think_V);
 lin think_tank_N = mkN "think - tank" "think - tanks";
 lin thinkable_A = compoundA (mkA "thinkable");

lib/src/english/DictEngAbs.gf

@@ -980,6 +980,7 @@ fun almighty_N : N;
 fun almond_N : N;
 fun almond_eyed_A : A;
 fun almoner_N : N;
+fun almost_AdA : AdA;
 fun almost_AdN : AdN;
 fun almost_Adv : Adv;
 fun almost_Predet : Predet;
@@ -19862,6 +19863,7 @@ fun keep_V2 : V2;
 fun keep_to_V2V : V2V;
 fun keep_ing_V2V : V2V;
 fun keep_VA : VA;
+fun keep_V2A : V2A;
 fun keep_VS : VS;
 fun keep_VV : VV;
 fun keeper_N : N;
@@ -22439,6 +22441,7 @@ fun mean_A : A;
 fun mean_N : N;
 fun mean_V : V;
 fun mean_V2 : V2;
+fun mean_V2V : V2V;
 fun mean_VA : VA;
 fun mean_VV : VV;
 fun mean_VS : VS;
@@ -31955,11 +31958,9 @@ fun rummage_V : V;
 fun rummage_V2 : V2;
 fun rummy_A : A;
 fun rummy_N : N;
-fun rumor_V2 : V2;
-fun rumor_V2V : V2V;
-fun rumor_VS : VS;
 fun rumour_N : N;
 fun rumour_V2 : V2;
+fun rumour_V3 : V3;
 fun rumour_monger_N : N;
 fun rump_N : N;
 fun rump_steak_N : N;
@@ -38261,7 +38262,7 @@ fun thingummy_N : N;
 fun think_N : N;
 fun think_V : V;
 fun think_V2 : V2;
-fun think_VA : VA;
+fun think_V2A : V2A;
 fun think_VS : VS;
 fun think_tank_N : N;
 fun thinkable_A : A;

lib/src/english/ParseEng.gf

@@ -109,53 +109,23 @@ lin
     } ;
 
   CompS s = {s = \\_ => "that" ++ s.s} ;
+  CompQS qs = {s = \\_ => qs.s ! QIndir} ;
   CompVP ant p vp = {s = \\a => ant.s ++ p.s ++ 
                                 infVP VVInf vp ant.a p.p a} ;
 
-  PassVS vs vp = 
-    let
-      vps = insertObj (\\a => infVP VVInf vp Simul CPos a) (predV vs) ;
-      be  = predAux auxBe ;
-      ppt = vps.ptp
-    in {
-    s = be.s ;
-    prp = be.prp ;
-    ptp = be.ptp ;
-    inf = be.inf ;
-    ad = vps.ad ;
-    s2 = \\a => ppt ++ vps.s2 ! a
+  VPSlashVS vs vp = 
+    insertObj (\\a => infVP VVInf vp Simul CPos a) (predV vs) **
+    {c2 = ""; gapInMiddle = False} ;
+
+  PastPartRS ant pol vps = {
+    s = \\agr => vps.ad ++ vps.ptp ++ vps.s2 ! agr ;
+    c = npNom
     } ;
 
-  PPartNP np vps = {
-    s = let
-          be = predAux auxBe ;
-          ppt = vps.ptp
-        in \\c => np.s ! c ++ vps.ad ++ vps.ptp ++ vps.s2 ! np.a ;
-    a = np.a
-  } ;
-
-{-  
-  PastPartRS ant pol vp = {
-    s = let
-          be = predAux auxBe ;
-          ppt = vps.ptp
-        in \\c => np.s ! c ++ vps.ad ++ vps.ptp ++ vps.s2 ! np.a ;
-    a = np.a
-    } ;
-  
-  PresPartRS rp vp = {
-    s = \\t,ant,b,ag => 
-        let 
-          agr = case rp.a of {
-            RNoAg => ag ;
-            RAg a => a
-            } ;
-          cl = mkClause (rp.s ! RC (fromAgr agr).g npNom) agr vp
-        in
-        cl.s ! t ! ant ! b ! ODir ;
+  PresPartRS ant pol vp = {
+    s = \\agr => vp.ad ++ vp.prp ++ vp.s2 ! agr ;
     c = npNom
   } ;
--}
 
   ApposNP np1 np2 = {
     s = \\c => np1.s ! c ++ "," ++ np2.s ! npNom ;

lib/src/english/ParseEngAbs.gf

@@ -54,15 +54,15 @@ fun CompoundCN : Num -> N -> CN -> CN ;
     that_RP : RP ;
 
     CompS : S -> Comp ;
+    CompQS : QS -> Comp ;
     CompVP : Ant -> Pol -> VP -> Comp ;
 
-	PassVS : VS -> VP -> VP ;
-	PPartNP : NP -> VPSlash -> NP ;
-	
+	VPSlashVS : VS -> VP -> VPSlash ;
+
 	UncNeg : Pol ;
 
---	PastPartRS : Anter -> Pol -> VP -> RS ;
---  PresPartRS : Anter -> Pol -> VP -> RS ;
+	PastPartRS : Ant -> Pol -> VPSlash -> RS ;
+    PresPartRS : Ant -> Pol -> VP -> RS ;
 
 	ApposNP : NP -> NP -> NP ;