refinements

lib/src/persian/SymbolPes.gf

@@ -3,29 +3,32 @@
 concrete SymbolPes of Symbol = CatPes ** open Prelude, ResPes in {
 
   flags coding = utf8;
-{-
+
  lin
 -- SymbPN i = {s = \\_ => i.s ; g = Masc} ;
-  SymbPN i = {s = addGenitiveS i.s ; g = Masc} ;
-  IntPN i  = {s = addGenitiveS i.s ; g = Masc} ;
-  FloatPN i = {s = addGenitiveS i.s ; g = Masc} ;
-  NumPN i = {s = \\_ =>i.s ; g = Masc} ;
+  SymbPN i = {s = i.s ; animacy = Inanimate} ; -- "از" is removed for Phrasebook
+  IntPN i  = {s = i.s ++ "از" ; animacy = Inanimate} ;
+  FloatPN i = {s = i.s ++ "از" ; animacy = Inanimate} ;
+  NumPN i = {s = i.s ; animacy = Inanimate} ;
   CNIntNP cn i = {
-    s = \\c => cn.s ! Sg ! Dir ++ i.s ;
-    a = agrP3 cn.g Sg
+    s = \\ez => cn.s ! aEzafa ! Sg  ++ i.s ;
+    a = agrPesP3 Sg ;
+    animacy = cn.animacy
     } ;
   CNSymbNP det cn xs = {
-    s = \\c => det.s!Sg!Masc ++ cn.s ! det.n ! Dir ++  xs.s ; 
-    a = agrP3 cn.g det.n
+    s = \\ez => det.s ++ cn.s ! aEzafa ! det.n   ++  xs.s ; 
+    a = agrPesP3 det.n ;
+    animacy = cn.animacy
     } ;
   CNNumNP cn i = {
-    s = \\c => cn.s ! Sg ! Dir ++ i.s ;
-    a = agrP3 cn.g Sg
+    s = \\ez => cn.s ! aEzafa ! Sg   ++ i.s ;
+    a = agrPesP3 Sg ;
+    animacy = cn.animacy
     } ;
 
   SymbS sy = sy ; 
   SymbNum sy = { s = sy.s ; n = Pl } ;
-  SymbOrd sy = { s = sy.s ++ "waN" ; n = Pl} ;
+  SymbOrd sy = { s = sy.s ++ "wN" ; n = Pl} ;
 
 lincat 
 
@@ -34,14 +37,15 @@ lincat
 lin
   MkSymb s = s ;
 
-  BaseSymb = infixSS "tE" ;
+  BaseSymb = infixSS "تE" ;
   ConsSymb = infixSS "" ;
 
-oper
+--oper
     -- Note: this results in a space before 's, but there's
     -- not mauch we can do about that.
-    addGenitiveS : Str -> Case => Str = \s -> 
-     table {_ => s ++ "da" } ;
--}
+--    addGenitiveS : Str ;
+--    addGenitiveS s =
+--     s ++ "از" ;
+
 
 }