Merge pull request #47 from inariksit/arabic

(Ara) Add linref for CN + choose bare form for UttCN, no case

src/arabic/CatAra.gf

@@ -47,7 +47,7 @@ concrete CatAra of Cat = CommonX - [Utt]  ** open ResAra, Prelude, ParamX in {
 
 -- Noun
 
-    CN = ResAra.Noun ** {adj : NTable ; np : Case => Str};
+    CN = ResAra.CN;
     NP, Pron = ResAra.NP; --{s : Case => Str ; a : Agr } ;
     Num,
     Ord,
@@ -90,4 +90,8 @@ concrete CatAra of Cat = CommonX - [Utt]  ** open ResAra, Prelude, ParamX in {
     N3 = ResAra.Noun ** {c2, c3 : Str} ;
     PN = {s : Case => Str; g : Gender; h : Species} ;
 
+linref
+
+  CN = \cn -> uttCN cn ! Masc ;
+
 }

src/arabic/PhraseAra.gf

@@ -15,7 +15,7 @@ concrete PhraseAra of Phrase = CatAra ** open
     UttAP ap = {s = ResAra.uttAP ap} ; --IL
     UttCard c = {s = ResAra.uttNum c} ; --IL
 
-    UttCN cn = {s = \\_ => cn.s ! Sg ! Def ! Nom} ; --IL
+    UttCN cn = {s = ResAra.uttCN cn } ; --IL
     UttNP np = {s = \\_ => np.s ! Nom} ;
     UttVP vp = {s = \\g => (compVP vp).s ! {g=g ; n=Sg} ! Nom} ; --IL
     UttS,

src/arabic/ResAra.gf

@@ -119,6 +119,10 @@ resource ResAra = PatternsAra ** open  Prelude, Predef, OrthoAra, ParamX  in {
     uttAP : AP -> (Gender => Str) ;
     uttAP ap = \\g => ap.s ! NoHum ! g ! Sg ! Def ! Nom ; ----IL
 
+    CN : Type = Noun ** {adj : NTable ; np : Case => Str};
+    uttCN : CN -> (Gender => Str) ;
+    uttCN cn = \\_ => cn.s ! Sg ! Indef ! Bare ;
+
     NumOrdCard : Type = {
       s : Gender => State => Case => Str ;
       n : Size ;