From 06d3bdc834e075662be4cc4dcb139040ec95b1e3 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Wed, 15 May 2019 15:24:49 +0200
Subject: [PATCH 1/2] (Pes) add new invarA + remove an ill-advised heuristic
 from mkA

---
 src/persian/ParadigmsPes.gf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/persian/ParadigmsPes.gf b/src/persian/ParadigmsPes.gf
index d93937fd..ae381f65 100644
--- a/src/persian/ParadigmsPes.gf
+++ b/src/persian/ParadigmsPes.gf
@@ -323,9 +323,7 @@ oper
 
   mkA = overload {
     mkA : Str -> A -- Regular adjective, same adj and adv forms.
-       = \str -> lin A (case str of {
-          _ + " " + _ => mkAdj str str str ;
-          _           => mkAdj str str }) ;
+       = \str -> lin A (mkAdj str str) ;
     mkA : Str-> Str -> A -- Takes adj and adv forms
        = \str,adv -> lin A (mkAdj str adv);
     mkA : (pos,compar,adv : Str) -> A -- positive, comparative and adverb
@@ -334,6 +332,10 @@ oper
       = \a,c -> lin A2 (mkAdj a a ** {c2 = c})
    } ;
 
+  -- Mostly for things that are not really adjectives, like adverbials /IL
+  invarA : Str -> A = \str ->
+    lin A (<mkAdj str str : Adjective> ** {s = \\_,_ => str}) ;
+
    prefixA a = a ** {isPre=True};
 
    preA : (adj,adv : Str) -> A = \adj,adv ->

From 9c2e4a2943c2f8bc6ebf871c4b9d637fd81a27e1 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Wed, 15 May 2019 16:48:09 +0200
Subject: [PATCH 2/2] (Pes) Minor lexical fixes

---
 src/persian/LexiconPes.gf    | 2 +-
 src/persian/StructuralPes.gf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/persian/LexiconPes.gf b/src/persian/LexiconPes.gf
index 9f84da83..18a7f76d 100644
--- a/src/persian/LexiconPes.gf
+++ b/src/persian/LexiconPes.gf
@@ -89,7 +89,7 @@ concrete LexiconPes of Lexicon = CatPes **
   girl_N = mkN02 "دختر" animate;
   glove_N = mkN01 "دستکش" inanimate;
   gold_N = mkN01 "طلا" inanimate;
-  good_A = mkA "خوب" ;
+  good_A = mkA "خوب" "بهتر" "خوب" ;
   go_V = mkV "رفتن" "رو";
   green_A = mkA "سبز" ;
   harbour_N = mkN "بندر" "بنادر" inanimate;
diff --git a/src/persian/StructuralPes.gf b/src/persian/StructuralPes.gf
index 922015a2..03312228 100644
--- a/src/persian/StructuralPes.gf
+++ b/src/persian/StructuralPes.gf
@@ -21,7 +21,7 @@ concrete StructuralPes of Structural = CatPes **
   by8agent_Prep = mkPrep "توسط" ;
   by8means_Prep = mkPrep "با" ;
 --  can8know_VV,can_VV = mkVV (mkV "سکن") ;
-  can_VV = mkVV (mkV_1 "توانستن") ; ---- AR
+  can_VV = let isAux = False in mkVV isAux subjunctive (mkV_1 "توانستن") ; ---- AR
   during_Prep = mkPrep ["در طول"] ;
   either7or_DConj = sd2 "یا" "یا" ** {n = Sg} ;
 --  everybody_NP =  R.indeclNP "هر کwی";