ParseFin ProDrop variants ; ParseFre question word order and pronoun gender variants

lib/src/french/DictEngFre.gf

@@ -5,6 +5,7 @@ concrete DictEngFre of DictEngAbs = CatFre ** open ParadigmsFre,
   (S = StructuralFre),
   (L = LexiconFre),
   (I = IrregFre),
+  (E = ExtraFre),
   MorphoFre, ParadigmsFre, Prelude in {
 
 ---flags coding=utf8 ; --- because of IrregFre
@@ -49,11 +50,11 @@ lin
   how_IAdv = S.how_IAdv; --CHECKED
   how8many_IDet = S.how8many_IDet; --CHECKED
   how8much_IAdv = S.how8much_IAdv; --CHECKED
-  i_Pron = S.i_Pron; --CHECKED
+  i_Pron = S.i_Pron | E.i8fem_Pron ; --CHECKED
   if_Subj = S.if_Subj; --CHECKED
   in8front_Prep = S.in8front_Prep; --CHECKED
   in_Prep = S.in_Prep; --CHECKED
-  it_Pron = S.it_Pron; --CHECKED
+  it_Pron = S.it_Pron | S.she_Pron ; --CHECKED
   less_CAdv = S.less_CAdv; --CHECKED
   many_Det = S.many_Det; --CHECKED
   more_CAdv = S.more_CAdv; --CHECKED
@@ -82,7 +83,7 @@ lin
   there7to_Adv = S.there7to_Adv; --CHECKED
   there7from_Adv = S.there7from_Adv; --CHECKED
   therefore_PConj = S.therefore_PConj; --CHECKED
-  they_Pron = S.they_Pron; --CHECKED
+  they_Pron = S.they_Pron | E.they8fem_Pron ; --CHECKED
   this_Quant = S.this_Quant; --CHECKED
   through_Prep = S.through_Prep; --CHECKED
   to_Prep = S.to_Prep; --CHECKED
@@ -90,22 +91,22 @@ lin
   under_Prep = S.under_Prep; --CHECKED
   very_AdA = S.very_AdA; --CHECKED
   want_VV = S.want_VV; --CHECKED
-  we_Pron = S.we_Pron; --CHECKED
+  we_Pron = S.we_Pron | E.we8fem_Pron ; --CHECKED
   whatPl_IP = S.whatPl_IP; --CHECKED
-  whatSg_IP = S.whatSg_IP; --CHECKED
+  whatSg_IP = S.whatSg_IP | E.QueestcequeIP ; --CHECKED
   when_IAdv = S.when_IAdv; --CHECKED
   when_Subj = S.when_Subj; --CHECKED
   where_IAdv = S.where_IAdv; --CHECKED
   which_IQuant = S.which_IQuant; --CHECKED
   whoPl_IP = S.whoPl_IP; --CHECKED
-  whoSg_IP = S.whoSg_IP; --CHECKED
+  whoSg_IP = S.whoSg_IP | E.QuiestcequeIP ; --CHECKED
   why_IAdv = S.why_IAdv; --CHECKED
   with_Prep = S.with_Prep; --CHECKED
   without_Prep = S.without_Prep; --CHECKED
   yes_Utt = S.yes_Utt; --CHECKED
-  youSg_Pron = S.youSg_Pron; --CHECKED
-  youPl_Pron = S.youPl_Pron; --CHECKED
-  youPol_Pron = S.youPol_Pron; --CHECKED
+  youSg_Pron = S.youSg_Pron  | E.youSg8fem_Pron ; --CHECKED
+  youPl_Pron = S.youPl_Pron | E.youPl8fem_Pron ; --CHECKED
+  youPol_Pron = S.youPol_Pron | E.youPol8fem_Pron ; --CHECKED
   no_Quant = S.no_Quant; --CHECKED
   not_Predet = S.not_Predet; --CHECKED
   if_then_Conj = S.if_then_Conj; --CHECKED

lib/src/french/ParseFre.gf

@@ -10,8 +10,8 @@ concrete ParseFre of ParseEngAbs =
   VerbFre - [SlashV2V, PassV2, UseCopula, ComplVV],
   AdverbFre,
   PhraseFre,
-  SentenceFre - [  SlashVP, SlashVS],
-  QuestionFre,
+  SentenceFre,
+  QuestionFre - [QuestCl, QuestIAdv], -- more variants here
   RelativeFre,
   IdiomFre [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
   ConstructionFre,
@@ -22,12 +22,43 @@ concrete ParseFre of ParseEngAbs =
             ClSlash, RCl, EmptyRelSlash],
 
   DictEngFre ** 
-open PhonoFre, MorphoFre, ResFre, ParadigmsFre, SyntaxFre, Prelude in {
+open PhonoFre, MorphoFre, ResFre, CommonRomance, ParadigmsFre, SyntaxFre, Prelude, (G = GrammarFre) in {
 
 flags
   literal=Symb ;
   coding = utf8 ;
 
+-- overrides from Lang
+
+lin
+  QuestCl cl = 
+    {s = \\t,a,p =>                             -- est-ce qu'il dort ?
+            let cls = cl.s ! DDir ! t ! a ! p 
+            in table {
+              QDir   => "est-ce" ++ elisQue ++ cls ! Indic ;
+              QIndir => subjIf ++ cls ! Indic
+              }
+      }
+  | {s = \\t,a,p =>                             -- dort-il ?
+            let cls = cl.s ! DInv ! t ! a ! p 
+            in table {
+              QDir   => cls ! Indic ;
+              QIndir => subjIf ++ cls ! Indic
+              }
+      }
+  | G.QuestCl cl                                -- il dort ?
+  ;
+
+
+  QuestIAdv iadv cl = 
+     G.QuestIAdv iadv cl                       -- où dort-il
+   | {s = \\t,a,p,q =>                         -- où est-ce qu'il dort        
+            let 
+              ord = DDir ;
+              cls = cl.s ! ord ! t ! a ! p ! Indic ;
+              why = iadv.s
+            in why ++ "est-ce" ++ elisQue ++ cls
+      } ;
 
 lin
 -- missing from ExtraFre; should not really be there either