From 08ff8ee3e5bec0cf79aa3ae647fa347d0ecf5065 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Thu, 18 Oct 2018 14:45:50 +0200
Subject: [PATCH] (Ara) Small orthography fixes

---
 src/arabic/OrthoAra.gf     | 5 ++++-
 src/arabic/ParadigmsAra.gf | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/arabic/OrthoAra.gf b/src/arabic/OrthoAra.gf
index 8e861e0cd..a7dc5d664 100644
--- a/src/arabic/OrthoAra.gf
+++ b/src/arabic/OrthoAra.gf
@@ -21,8 +21,11 @@ flags coding=utf8 ;
 
     rectifyHmz: Str -> Str = \word ->
       case word of {
+        l@(""|"ال") + ("أ"|"أَ") + #hamza + "ْ" + tail => l + "آ" + tail;
+        l@(""|"ال") + ("أ"|"أَ") + #hamza  + tail => l + "آ" + tail;
         l@(""|"ال") + #hamza + v@("َ"|"ُ") + tail => l + "أ" + v + tail;
-        l@(""|"ال") + #hamza + v@("ِ") + tail => l + "إ" + v + tail;
+        l@(""|"ال") + #hamza + v@("ِ")     + tail => l + "إ" + v + tail;
+
         head + v1@("ِ"|"ُ"|"َ"|"ْ"|"ا"|"ي"|"و") + #hamza + v2@(""|"ُ"|"َ"|"ْ"|"ِ") => head + v1 + (tHmz v1) + v2;
         head + #hamza + tail => head + (bHmz (dp 2 head) (take 2 tail)) + tail; --last head , take 1 tail
         _           => word
diff --git a/src/arabic/ParadigmsAra.gf b/src/arabic/ParadigmsAra.gf
index 68db5d3da..f84fc7add 100644
--- a/src/arabic/ParadigmsAra.gf
+++ b/src/arabic/ParadigmsAra.gf
@@ -286,10 +286,9 @@ resource ParadigmsAra = open
 
   v1' : Str ->  Vowel -> Vowel -> Verb =
     \rootStr,vPerf,vImpf ->
-    let { root = mkRoot3 rootStr ;
-          l = dp 2 rootStr } in --last rootStr
-    case <l, root.c> of {
-      <"ّ",_>      => v1geminate rootStr vPerf vImpf ;
+    let { root = mkRoot3 rootStr } in 
+    case <root.l, root.c> of {
+      <"ّ",    _> => v1geminate rootStr vPerf vImpf ;
       <"و"|"ي",_> => case vPerf of {
                        i => v1defective_i root vImpf ;
                        _ => v1defective_a root vImpf } ;