cf for restricted import; new API funs

resource/abstract/Clause.gf

@@ -33,11 +33,10 @@ fun
 
   SPredProgVP  : NP -> VPI -> Cl ;                -- "he is eating"
 
-
   QPredV       : IP -> V  -> QCl ;                -- "who walks"
   QPredPassV   : IP -> V  -> QCl ;                -- "who is seen"
   QPredV2      : IP -> V2 -> NP -> QCl ;          -- "who sees Mary"
-----  QPredV3      : IP -> V3 -> NP -> NP -> QCl ;       -- "who gives Mary food"
+  QPredV3      : IP -> V3 -> NP -> NP -> QCl ;    -- "who gives Mary food"
   QPredReflV2  : IP -> V2 -> QCl ;                -- "who loves himself"
   QPredVS      : IP -> VS -> S  -> QCl ;          -- "who says that Mary runs"
   QPredVV      : IP -> VV -> VPI -> QCl ;         -- "who must walk"
@@ -54,9 +53,29 @@ fun
   QPredNP      : IP -> NP -> QCl ;                -- "who is Bill"
   QPredAdv     : IP -> Adv -> QCl ;               -- "who is in France"
 
+  QPredProgVP  : IP -> VPI -> QCl ;               -- "who is eating"
+
   IPredV       : Ant -> V  -> VPI ;               -- "walk"
+  IPredPassV   : Ant -> V  -> VPI ;               -- "be seen"
   IPredV2      : Ant -> V2 -> NP -> VPI ;         -- "see Mary"
+  IPredV3      : Ant -> V3 -> NP -> NP -> VPI ;   -- "give Mary food"
+  IPredReflV2  : Ant -> V2 -> VPI ;               -- "love himself"
+  IPredVS      : Ant -> VS -> S  -> VPI ;         -- "say that Mary runs"
+  IPredVV      : Ant -> VV -> VPI -> VPI ;        -- "want to walk"
+  IPredVQ      : Ant -> VQ -> QS -> VPI ;         -- "ask who will come"
+  IPredVA      : Ant -> VA -> AP -> VPI ;         -- "look ill"
+  IPredV2A     : Ant -> V2A -> NP ->AP ->VPI ;    -- "paint the house red"
+  IPredSubjV2V : Ant -> V2V -> NP ->VPI ->VPI ;   -- "promise Mary to leave"
+  IPredObjV2V  : Ant -> V2V  -> NP -> VPI ->VPI ; -- "ask me to come"
+  IPredV2S     : Ant -> V2S  -> NP -> S  -> VPI ; -- "tell me that it is good"
+  IPredV2Q     : Ant -> V2Q  -> NP -> QS -> VPI ; -- "ask me if it is good"
+
   IPredAP      : Ant -> AP -> VPI ;               -- "be old"
+  IPredCN      : Ant -> CN -> VPI ;               -- "be a man"
+  IPredNP      : Ant -> NP -> VPI ;               -- "be Bill"
+  IPredAdv     : Ant -> Adv -> VPI ;              -- "be in France"
+
+  IPredProgVP  : Ant -> VPI -> VPI ;              -- "be eating"
 
 
 {-

resource/abstract/Rules.gf

@@ -111,9 +111,11 @@ fun
   PrepNP : Prep -> NP -> PP ;          -- "in London", "after the war"
 
   AdvCN  : CN -> PP -> CN ;            -- "house in London"
+  AdvPN  : PN -> PP -> NP ;            -- "x to the power of k"
   AdvAP  : AdA -> AP -> AP ;           -- "very good"
   AdvAdv : AdA -> Adv -> Adv ;         -- "very well"
 
+
 --!
 --3 Sentences and relative clauses
 --
@@ -195,6 +197,12 @@ fun
   SubjImper : Subj -> S -> Imp -> Imp ;    -- "if it is hot, use a glove!"
   SubjQS    : Subj -> S -> QS -> QS ;      -- "if you are new, who are you?"
 
+-- This rule makes a subordinate clause into a sentence adverb, which
+-- can be attached to e.g. noun phrases. It might even replace the
+-- previous subjunction rules.
+
+  AdvSubj   : Subj -> S -> Adv ;           -- "when he arrives"
+
 --!
 --2 One-word utterances
 --

resource/english/ClauseEng.gf

@@ -33,15 +33,14 @@ concrete ClauseEng of Clause = CategoriesEng **
   QPredPassV np v = predBeGroupQ np (passVerb v) ;
   QPredV2 np v x = intVerbClause np v (complTransVerb v x) ;
   QPredReflV2 np v = intVerbClause np v (reflTransVerb v) ;
+  QPredV3 np v x y = intVerbClause np v (complDitransVerb v x y) ;
   QPredVS np v x = intVerbClause np v (complSentVerb v x) ;
   QPredVV np v x = intVerbClause np (aux2verb v) (complVerbVerb v x) ;
   QPredVQ np v x = intVerbClause np v (complQuestVerb v x) ;
   QPredVA np v x = intVerbClause np v (complAdjVerb v x) ;
   QPredV2A np v x y = intVerbClause np v (complDitransAdjVerb v x y) ;
-  QPredSubjV2V np v x y = intVerbClause np v (complDitransVerbVerb
+  QPredSubjV2V np v x y = intVerbClause np v (complDitransVerbVerb False v x y) ;
-  False v x y) ;
+  QPredObjV2V np v x y = intVerbClause np v (complDitransVerbVerb True v x y) ;
-  QPredObjV2V np v x y = intVerbClause np v (complDitransVerbVerb
-  True v x y) ;
   QPredV2S np v x y = intVerbClause np v (complDitransSentVerb v x y) ;
   QPredV2Q np v x y = intVerbClause np v (complDitransQuestVerb v x y) ;
 
@@ -50,10 +49,29 @@ concrete ClauseEng of Clause = CategoriesEng **
   QPredNP np v = predBeGroupQ np (complNounPhrase v) ;
   QPredAdv np v = predBeGroupQ np (complAdverb v) ;
 
+  QPredProgVP np vp = predBeGroupQ np (vp.s ! VIPresPart) ;
+
   IPredV a v = predVerbI True a v (complVerb v) ;
+  IPredPassV a v = predVerbI True a v (passVerb v) ;
   IPredV2 a v x = predVerbI True a v (complTransVerb v x) ;
+  IPredReflV2 a v = predVerbI True a v (reflTransVerb v) ;
+  IPredV3 a v x y = predVerbI True a v (complDitransVerb v x y) ;
+  IPredVS a v x = predVerbI True a v (complSentVerb v x) ;
+  IPredVV a v x = predVerbI True a (aux2verb v) (complVerbVerb v x) ;
+  IPredVQ a v x = predVerbI True a v (complQuestVerb v x) ;
+  IPredVA a v x = predVerbI True a v (complAdjVerb v x) ;
+  IPredV2A a v x y = predVerbI True a v (complDitransAdjVerb v x y) ;
+  IPredSubjV2V a v x y = predVerbI True a v (complDitransVerbVerb False v x y) ;
+  IPredObjV2V a v x y = predVerbI True a v (complDitransVerbVerb True v x y) ;
+  IPredV2S a v x y = predVerbI True a v (complDitransSentVerb v x y) ;
+  IPredV2Q a v x y = predVerbI True a v (complDitransQuestVerb v x y) ;
 
   IPredAP a v = predBeGroupI True a v.s ;
+  IPredCN a v = predBeGroupI True a (complCommNoun v) ;
+  IPredNP a v = predBeGroupI True a (complNounPhrase v) ;
+  IPredAdv a v = predBeGroupI True a (complAdverb v) ;
+
+  IPredProgVP a vp = predBeGroupI True a (vp.s ! VIPresPart) ;
 
 {-
 -- Use VPs

resource/english/LangEng.gf

@@ -19,4 +19,5 @@ lin
   PNCountry x = x ;
   ANationality x = x ;
   NLanguage x = x ;
+
 }

resource/english/RulesEng.gf

@@ -111,7 +111,7 @@ lin
   AdvCN = advCommNounPhrase ;
   AdvAP = advAdjPhrase ;
   AdvAdv = cc2 ;
-
+  AdvPN pn pp = nameNounPhrase {s = \\c => pn.s ! c ++ pp.s ; g = pn.g} ;
 
 --3 Sentences and relative clauses
 --
@@ -180,6 +180,7 @@ lin
   SubjS = subjunctSentence ;
   SubjImper = subjunctImperative ;
   SubjQS = subjunctQuestion ;
+  AdvSubj if A = ss (if.s ++ A.s) ;
 
   PhrNP = useNounPhrase ;
   PhrOneCN = useCommonNounPhrase singular ;