Merge pull request #113 from inariksit/arabic

Arabic

src/arabic/LexiconAra.gf

@@ -132,7 +132,7 @@ flags
   meat_N       = brkN "لحم" "فَعلة" "فُعُول" Masc NoHum ;
   milk_N       = brkN "حلب" "فَعِيل" "فَعِيل" Masc NoHum ; --no plur
   moon_N       = brkN "قمر" "فَعَل" "أَفعَال" Masc NoHum ;
-  mother_N2    = mkN2 (sdfN "ءم" "فُعَّ" Fem Hum) ;
+  mother_N2    = mkN2 (mkN "أُمّ" "أُمَّات" Fem Hum) ;
   mountain_N   = brkN "جبل" "فَعَل" "فِعَال" Masc NoHum ;
   music_N      = mkN (reg "مُوسِيقَى" "مُوسِيقَى") Fem NoHum ; --no plur
   narrow_A     = sndA "ضيق" "فَعِّل" ;

src/arabic/NounAra.gf

@@ -30,7 +30,7 @@ lin
                 ++ noun c'          
                 ++ adj c'
                 ++ cn.np ! c' ;
-          True => noun (cas c) -- deal with possessive suffix
+          True => noun (cas c) -- deal with possessive suffix + dative hack
                ++ determiner c'
                ++ adj c'
                ++ cn.np ! c'
@@ -106,7 +106,7 @@ lin
   PossPron p = baseQuant ** {
     s = \\_,_,_,_ => BIND ++ p.s ! Gen;
     d = Poss;
-    is1sg = case p.a.pgn of { Per1 Sing => True ; _ => False } ;
+    is1sg = is1sg p.a ;
     isPron = True} ;
 
   NumSg = {
@@ -179,7 +179,9 @@ lin
   Use2N3 n3 = n3 ;
   Use3N3 n3 = n3 ** {c2 = n3.c3} ;
 
-  ComplN2 n2 np = UseN n2 ** {np = \\c => n2.c2.s ++ bindIf n2.c2.binds ++ np.s ! n2.c2.c} ;
+  ComplN2 n2 np = UseN n2 ** {
+    np = \\c => n2.c2.s ++ bindIf n2.c2.binds ++ np.s ! n2.c2.c
+    } ;
 
   ComplN3 n3 np = ComplN2 n3 np ** {c2 = n3.c3} ;
 
@@ -195,13 +197,22 @@ lin
   AdvCN,
   SentCN = \cn,ss -> cn ** {s2 = \\n,d,c => cn.s2 ! n ! d ! c ++ ss.s} ;
 
-  ApposCN cn np = cn ** { np = \\c => cn.np ! c ++ np.s ! c } ;
+  ApposCN cn np = cn ** {
+    np = \\c => cn.np ! c ++ np.s ! c
+    } ;
 
   -- : CN -> NP -> CN ;     -- house of Paris, house of mine
   PossNP cn np = cn ** {
-    s  = \\n,_d,c => cn.s  ! n ! Const ! c ;
-    s2 = \\n,_d,c => cn.s2 ! n ! Const ! Gen ;
-    np = \\c => cn.np ! c ++ np.s ! Gen
+    s  = \\n,d,c => cn.s  ! n ! case d of {Poss=>d ; _=>Const} ! c ;
+    s2 = \\n,d,c => cn.s2 ! n ! case d of {Poss=>d ; _=>Const} ! Gen ;
+    np = \\c => cn.np ! c 
+          ++ case is1sg np.a of {
+                True => "لَدَي" ++ np.empty ;
+                False => 
+                  case np.a.isPron of {
+                    True => "لَدَي" ++ BIND ++ np.s ! Gen ;
+                    False =>  np.s ! Gen }
+             }
     };
 
   -- : CN -> NP -> CN ;     -- glass of wine

src/arabic/ResAra.gf

@@ -177,8 +177,8 @@ resource ResAra = PatternsAra ** open  Prelude, Predef, OrthoAra, ParamX  in {
 
     -- All fields of NP
     cn2str : CN -> Number -> State -> Case -> Str = \cn,n,s,c ->
-      cn.s   ! n ! s ! c ++
-      cn.s2  ! n ! s ! c ++
+      cn.s  ! n ! s ! c ++
+      cn.s2 ! n ! s ! c ++
       cn.np ! c ;
 
     useN : Noun -> CN = \n -> n ** {np = \\_ => []} ;
@@ -1181,11 +1181,17 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf ->
     --dual suffixes
     dl : State => Case => Str =
       table {
-        (Const|Poss) =>
+        Const =>
           table {
             Nom => "َا";
             _   => "َيْ"
           };
+        Poss =>
+          table {
+            Nom => "َا" ; -- wrong for 1st person poss. suff
+            Bare => "َيَّ" ; -- this covers 1st person for genitive and accusative
+            _   => "َيْ"
+          };
         _ =>
           table {
             Nom  => "َانِ";
@@ -1395,6 +1401,8 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf ->
     AAgr = {g : Gender ; n : Number} ;
 
     agrLite : Agr -> AgrLite = \a -> a ** {gn = pgn2gn a.pgn} ;
+    is1sg : Agr -> Bool = \a ->
+      case a.pgn of {Per1 Sing => True; _ => False} ;
 
 -----------------------------------------------------------------------------
 -- NP, Pron