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

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