Merge remote-tracking branch 'upstream/master' into por

src/english/AdjectiveEng.gf

@@ -36,7 +36,7 @@ concrete AdjectiveEng of Adjective = CatEng ** open ResEng, Prelude in {
       } ;
 
     SentAP ap sc = {
-      s = \\a => ap.s ! a ++ sc.s ; 
+      s = \\a => ap.s ! a ++ sc.s ! a ; 
       isPre = False
       } ;
 

src/english/CatEng.gf

@@ -1,4 +1,4 @@
-concrete CatEng of Cat = CommonX - [Pol] ** open ResEng, Prelude in {
+concrete CatEng of Cat = CommonX - [Pol,SC] ** open ResEng, Prelude in {
 
   flags optimize=all_subs ;
 
@@ -49,6 +49,7 @@ concrete CatEng of Cat = CommonX - [Pol] ** open ResEng, Prelude in {
 -- Adjective
 
     AP = {s : Agr => Str ; isPre : Bool} ; 
+    SC = {s : Agr => Str} ;
 
 -- Noun
 

src/english/ExtendEng.gf

@@ -141,7 +141,7 @@ concrete ExtendEng of Extend =
       isPre = vp.isSimple                 -- depends on whether there are complements
       } ;
 
-    EmbedPresPart vp = {s = infVP VVPresPart vp Simul CPos (agrP3 Sg)} ; --- agr
+    EmbedPresPart vp = {s = \\a => infVP VVPresPart vp Simul CPos a} ;
 
    PastPartAP vp = { 
       s = \\a => vp.ad ! a ++ vp.ptp ++ vp.p ++ vp.c2 ++ vp.s2 ! a ++ vp.ext ;
@@ -282,6 +282,8 @@ concrete ExtendEng of Extend =
 
 
   lin
+    AdAdV = cc2 ;
+
     AdjAsCN ap = let cn = mkNoun "one" "one's" "ones" "ones'" ** {g = Neutr}
       in {
         s = \\n,c => preOrPost ap.isPre (ap.s ! agrgP3 n cn.g) (cn.s ! n ! c) ;
@@ -292,6 +294,8 @@ concrete ExtendEng of Extend =
       a = agrgP3 Sg nonhuman
       } ;
 
+    PositAdVAdj a = {s = a.s ! AAdv} ;
+
   lincat
     RNP     = {s : Agr => Str} ;
     RNPList = {s1,s2 : Agr => Str} ;
@@ -330,4 +334,4 @@ concrete ExtendEng of Extend =
 
 
 
-}
+}

src/english/ExtraEng.gf

@@ -91,7 +91,7 @@ concrete ExtraEng of ExtraEngAbs = CatEng **
       isPre = vp.isSimple                 -- depends on whether there are complements
       } ;
 
-    EmbedPresPart vp = {s = infVP VVPresPart vp Simul CPos (agrP3 Sg)} ; --- agr
+    EmbedPresPart vp = {s = \\a => infVP VVPresPart vp Simul CPos a} ; --- agr
 
     UttVPShort vp = {s = infVP VVAux vp Simul CPos (agrP3 Sg)} ;
 
@@ -357,4 +357,4 @@ lin
       } ;
 
 
-}
+}

src/english/GrammarEng.gf

@@ -11,10 +11,10 @@ concrete GrammarEng of Grammar =
   RelativeEng,
   ConjunctionEng,
   PhraseEng,
-  TextX - [Pol,PPos,PNeg],
+  TextX - [Pol,PPos,PNeg,SC],
   StructuralEng,
   IdiomEng,
-  TenseX - [Pol,PPos,PNeg]
+  TenseX - [Pol,PPos,PNeg,SC]
   ** open ResEng, Prelude in {
 
 flags startcat = Phr ; unlexer = text ; lexer = text ;

src/english/NounEng.gf

@@ -141,7 +141,7 @@ concrete NounEng of Noun = CatEng ** open MorphoEng, ResEng, Prelude in {
       } ;
     AdvCN cn ad = {s = \\n,c => cn.s ! n ! c ++ ad.s ; g = cn.g} ;
 
-    SentCN cn sc = {s = \\n,c => cn.s ! n ! c ++ sc.s ; g = cn.g} ;
+    SentCN cn sc = {s = \\n,c => cn.s ! n ! c ++ sc.s ! agrgP3 n cn.g ; g = cn.g} ;
 
     ApposCN cn np = {s = \\n,c => cn.s ! n ! Nom ++ np.s ! NCase c ; g = cn.g} ;
 

src/english/ParseEng.gf

@@ -1,7 +1,7 @@
 --# -path=.:../abstract:../translator
 
 concrete ParseEng of ParseEngAbs = 
-  TenseX - [Pol, PNeg, PPos],
+  TenseX - [Pol, PNeg, PPos, SC],
   CatEng,
   NounEng - [PPartNP],
   AdjectiveEng,
@@ -142,7 +142,7 @@ lin
 
   VPSlashVS vs vp = 
     insertObj (\\a => infVP VVInf vp Simul CPos a) (predV vs) **
-    {c2 = ""; gapInMiddle = False} ;
+    {c2 = ""; missingAdv = False; gapInMiddle = False} ;
 
   PastPartRS ant pol vps = {
     s = \\agr => vps.ad ! agr ++ vps.ptp ++ vps.s2 ! agr ;

src/english/SentenceEng.gf

@@ -6,7 +6,7 @@ concrete SentenceEng of Sentence = CatEng ** open Prelude, ResEng in {
 
     PredVP np vp = mkClause (np.s ! npNom) np.a vp ;
 
-    PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp ;
+    PredSCVP sc vp = let a = agrP3 Sg in mkClause (sc.s ! a) a vp ;
 
     ImpVP vp = {
       s = \\pol,n => 
@@ -37,9 +37,9 @@ concrete SentenceEng of Sentence = CatEng ** open Prelude, ResEng in {
         (insertObj (\\_ => conjThat ++ slash.s) (predV vs))  **
         {c2 = slash.c2} ;
 
-    EmbedS  s  = {s = conjThat ++ s.s} ;
-    EmbedQS qs = {s = qs.s ! QIndir} ;
-    EmbedVP vp = {s = infVP VVInf vp Simul CPos (agrP3 Sg)} ; --- agr
+    EmbedS  s  = {s = \\_ => conjThat ++ s.s} ;
+    EmbedQS qs = {s = \\_ => qs.s ! QIndir} ;
+    EmbedVP vp = {s = \\a => infVP VVInf vp Simul CPos a} ;
 
     UseCl  t p cl = {
       s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! ctr p.p ! oDir