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] 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 b87c55b2..bac8693d 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 {