From 6a6062039e8c44f6177dd4122552c230fcbca84c Mon Sep 17 00:00:00 2001
From: Aarne Ranta <aarne@Aarnes-MacBook-Pro.local>
Date: Wed, 6 Nov 2019 17:05:04 +0100
Subject: [PATCH 1/2] some more concrete configs in LangEng

---
 src/english/LangEng.labels | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/english/LangEng.labels b/src/english/LangEng.labels
index 482344348..e011bab47 100644
--- a/src/english/LangEng.labels
+++ b/src/english/LangEng.labels
@@ -1,7 +1,7 @@
-UseV,ComplVV,ComplVS,ComplVQ,ComplVA,SlashV2a,SlashV2V,SlashV2A,SlashV2S,Slash2V3,Slash3V3,UseComp,ProgrVP,PassV2 {"not","don't","doesn't","didn't","haven't","hasn't","hadn't","wouldn't","won't","isn't","aren't","wasn't","weren't"} PART neg head 
-UseV,ComplVV,ComplVS,ComplVQ,ComplVA,SlashV2a,SlashV2V,SlashV2A,SlashV2S,Slash2V3,Slash3V3,UseComp,ProgrVP,PassV2 {"has","had","have","will","would","do","does","did"} AUX aux head
+UseV,ComplVV,ComplVS,ComplVQ,ComplVA,SlashV2a,SlashV2V,SlashV2A,SlashV2S,Slash2V3,Slash3V3,UseComp,CompAdv,CompNP,CompAP,CompCN,ProgrVP,PassV2 {"not","don't","doesn't","didn't","haven't","hasn't","hadn't","wouldn't","won't","isn't","aren't","wasn't","weren't"} PART neg head 
+UseV,ComplVV,ComplVS,ComplVQ,ComplVA,SlashV2a,SlashV2V,SlashV2A,SlashV2S,Slash2V3,Slash3V3,UseComp,CompAdv,CompNP,CompAP,CompCN,ProgrVP,PassV2 {"has","had","have","will","would","do","does","did"} AUX aux head
 UseV,UseComp {"to"} PART mark head
-UseComp,ProgrVP,QuestIComp {"is","are","am","was","were","been","be"} VERB cop head
+UseComp,CompAdv,CompAP,CompNP,CompCN,ProgrVP,QuestIComp {"is","are","am","was","were","been","be"} VERB cop head
 CompCN {"a","an"} DET det head
 PassV2 {"is","are","am","was","were""been","be"} VERB auxpass head
 ComplVV {"to"} PART mark xcomp

From 6a245549289c6abec1e407eac0295ccba9977c83 Mon Sep 17 00:00:00 2001
From: aarneranta <aarne@chalmers.se>
Date: Wed, 6 Nov 2019 17:08:47 +0100
Subject: [PATCH 2/2] fixed (hopefully) the rest confusions in French mkA
 argument order

---
 src/french/MorphoFre.gf | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/french/MorphoFre.gf b/src/french/MorphoFre.gf
index b87c55b24..bac8693da 100644
--- a/src/french/MorphoFre.gf
+++ b/src/french/MorphoFre.gf
@@ -106,44 +106,44 @@ oper
       _ => grand + "e"
       }
     in
-    mkAdj grand (grand + "s") grande (grande + "ment") ;
+    mkAdj grand grande (grand + "s") (grande + "ment") ;
 
 -- Masculine form used for adverbial; also covers "carré".
 
   adjJoli : Str -> Adj = \joli ->
-    mkAdj joli (joli + "s") (joli + "e") (joli + "ment") ;
+    mkAdj joli (joli + "e") (joli + "s") (joli + "ment") ;
 
   adjHeureux : Str -> Adj = \heureux ->
     let {heureu = Predef.tk 1 heureux} in
-    mkAdj heureux heureux (heureu+"se") (heureu+"sement") ;
+    mkAdj heureux (heureu+"se") heureux (heureu+"sement") ;
 
   adjBanal : Str -> Adj = \banal ->
     let {bana = Predef.tk 1 banal} in
-    mkAdj banal (bana + "ux") (banal+"e") (banal+"ement") ;
+    mkAdj banal (banal + "e") (bana+"ux") (banal+"ement") ;
 
   adjJeune : Str -> Adj = \jeune ->
-    mkAdj jeune (jeune+"s") jeune (jeune+"ment") ;
+    mkAdj jeune jeune (jeune+"s") (jeune+"ment") ;
 
   adjIndien : Str -> Adj = \indien ->
-    mkAdj indien (indien+"s") (indien+"ne") (indien+"nement") ;
+    mkAdj indien (indien+"ne") (indien+"s") (indien+"nement") ;
 
   adjTel : Str -> Adj = \tel ->
-    mkAdj tel (tel+"s") (tel+"le") (tel+"lement") ;
+    mkAdj tel (tel+"le") (tel+"s") (tel+"lement") ;
 
   adjFrancais : Str -> Adj = \francais ->
-    mkAdj francais francais (francais+"e") (francais+"ement") ;
+    mkAdj francais (francais+"e") francais (francais+"ement") ;
 
   adjCher : Str -> Adj = \cher ->
     let {ch = Predef.tk 2 cher} in
-    mkAdj cher (cher + "s") (ch + "ère") (ch + "èrement") ;
+    mkAdj cher (ch + "ère") (cher + "s") (ch + "èrement") ;
 
   adjPublic : Str -> Adj = \public ->
     let publique = init public + "que" in
-    mkAdj public (public+"s") (publique) (publique+"ment") ;
+    mkAdj public publique (public+"s") (publique+"ment") ;
 
   adjVif : Str -> Adj = \vif ->
     let vive = init vif + "ve" in
-    mkAdj vif (vif+"s") (vive) (vive+"ment") ;
+    mkAdj vif vive (vif+"s") (vive+"ment") ;
 
   mkAdjReg : Str -> Adj = \creux ->
     case Predef.dp 3 creux of {