From 5cbdc1382844dc4266e577dc92d35f9dc8e4678b Mon Sep 17 00:00:00 2001
From: ftyers <ftyers@72bbbca6-d526-0410-a7d9-f06f51895060>
Date: Mon, 31 Dec 2007 14:52:42 +0000
Subject: [PATCH] Another go

git-svn-id: https://apertium.svn.sourceforge.net/svnroot/apertium@3213 72bbbca6-d526-0410-a7d9-f06f51895060
---
 apertium-tg-fa/apertium-tg-fa.fa.dix.xml    | 59 ++++++++++++++++++++++++++++-
 apertium-tg-fa/apertium-tg-fa.tg-fa.dix.xml | 36 +++++++++++-------
 apertium-tg-fa/apertium-tg-fa.tg.dix.xml    |  3 +-
 3 files changed, 81 insertions(+), 17 deletions(-)

diff --git a/apertium-tg-fa/apertium-tg-fa.fa.dix.xml b/apertium-tg-fa/apertium-tg-fa.fa.dix.xml
index 657ddca8..5c936673 100644
--- a/apertium-tg-fa/apertium-tg-fa.fa.dix.xml
+++ b/apertium-tg-fa/apertium-tg-fa.fa.dix.xml
@@ -61,8 +61,6 @@
       </e>
     </pardef>
 
-
-
     <pardef n="P__ه">
       <e>
         <p>
@@ -119,6 +117,60 @@
       </e>
     </pardef>
 
+    <pardef n="prsubj__prn">
+      <e>
+        <p>
+          <l>من</l>
+          <r>prpers<s n="prn"/><s n="subj"/><s n="p1"/><s n="mf"/><s n="sg"/></r>
+        </p>
+      </e>
+      <e>
+        <p>
+          <l>تو</l>
+          <r>prpers<s n="prn"/><s n="subj"/><s n="p2"/><s n="mf"/><s n="sg"/></r>
+        </p>
+      </e>
+      <e>
+        <p>
+          <l>او</l>
+          <r>prpers<s n="prn"/><s n="subj"/><s n="p3"/><s n="mf"/><s n="sg"/></r>
+        </p>
+      </e>
+      <!-- him or her -->
+      <e>
+        <p>
+          <l>وى</l>
+          <r>prpers<s n="prn"/><s n="subj"/><s n="p3"/><s n="mf"/><s n="sg"/></r>
+        </p>
+      </e>
+      <e>
+        <p>
+          <l>ما</l>
+          <r>prpers<s n="prn"/><s n="subj"/><s n="p1"/><s n="mf"/><s n="pl"/></r>
+        </p>
+      </e>
+      <e>
+        <p>
+          <l>شما</l>
+          <r>prpers<s n="prn"/><s n="subj"/><s n="p2"/><s n="mf"/><s n="pl"/></r>
+        </p>
+      </e>
+      <e>
+        <p>
+          <l>آنها</l>
+          <r>prpers<s n="prn"/><s n="subj"/><s n="p3"/><s n="mf"/><s n="pl"/></r>
+        </p>
+      </e>
+      <!-- human only -->
+      <e>
+        <p>
+          <l>ایشان</l>
+          <r>prpers<s n="prn"/><s n="subj"/><s n="p3"/><s n="mf"/><s n="pl"/></r>
+        </p>
+      </e>
+    </pardef>
+
+
     <pardef n="ﺩﺭ__pr">
       <e>
         <p>
@@ -200,6 +252,7 @@
       </e>
     </pardef>
 
+
     <pardef n="تاجیکستان__np">
       <e>
         <p>
@@ -608,6 +661,8 @@
   </pardefs>
 
   <section id="main" type="standard">
+    <e lm="personal subject pronouns"><i/><par n="prsubj__prn"/></e>
+
     <e lm="و"><i>و</i><par n="و__cnjcoo"/></e>
 
     <e lm="که"><i>که</i><par n="که__rel"/></e>
diff --git a/apertium-tg-fa/apertium-tg-fa.tg-fa.dix.xml b/apertium-tg-fa/apertium-tg-fa.tg-fa.dix.xml
index e182f5f1..fc061131 100644
--- a/apertium-tg-fa/apertium-tg-fa.tg-fa.dix.xml
+++ b/apertium-tg-fa/apertium-tg-fa.tg-fa.dix.xml
@@ -42,21 +42,24 @@
     <e><p><l>навад<s n="num"/></l><r>نود<s n="num"/></r></p></e>
     <e><p><l>сад<s n="num"/></l><r>صد<s n="num"/></r></p></e>
 
+
     <e r="RL"><p><l>дусад<s n="num"/></l><r>دوصد<s n="num"/></r></p></e>
     <e><p><l>дусад<s n="num"/></l><r>دویست<s n="num"/></r></p></e>
-	<e r="RL"><p><l>сесад<s n="num"/></l><r>سه‌صد<s n="num"/></r></p></e>
-	<e><p><l>сесад<s n="num"/></l><r>سیصد<s n="num"/></r></p></e>
-	<e><p><l>чаҳорсад<s n="num"/></l><r>چهارصد<s n="num"/></r></p></e>
-	<e r="RL"><p><l>панҷсад<s n="num"/></l><r>پنجصد<s n="num"/></r></p></e>
-	<e r="RL"><p><l>панҷсад<s n="num"/></l><r>پنج‌صد<s n="num"/></r></p></e>
-	<e><p><l>панҷсад<s n="num"/></l><r>پانصد<s n="num"/></r></p></e>
-	<e><p><l>шашсад<s n="num"/></l><r>ششصد<s n="num"/></r></p></e>
-	<e><p><l>ҳафтсад<s n="num"/></l><r>هفتصد<s n="num"/></r></p></e>
-	<e><p><l>ҳаштсад<s n="num"/></l><r>هشتصد<s n="num"/></r></p></e>
-	<e><p><l>ноҳсад<s n="num"/></l><r>نهصد<s n="num"/></r></p></e>
-	<e><p><l>ҳазор<s n="num"/></l><r>هزار<s n="num"/></r></p></e>
-	<e><p><l>милюн<s n="num"/></l><r>میلیون<s n="num"/></r></p></e>
-	<e><p><l>милёрд<s n="num"/></l><r>میلیارد<s n="num"/></r></p></e>    
+
+    <e r="RL"><p><l>сесад<s n="num"/></l><r>سه‌صد<s n="num"/></r></p></e>
+    <e><p><l>сесад<s n="num"/></l><r>سیصد<s n="num"/></r></p></e>
+    <e><p><l>чаҳорсад<s n="num"/></l><r>چهارصد<s n="num"/></r></p></e>
+    <e r="RL"><p><l>панҷсад<s n="num"/></l><r>پنجصد<s n="num"/></r></p></e>
+    <e r="RL"><p><l>панҷсад<s n="num"/></l><r>پنج‌صد<s n="num"/></r></p></e>
+    <e><p><l>панҷсад<s n="num"/></l><r>پانصد<s n="num"/></r></p></e>
+    <e><p><l>шашсад<s n="num"/></l><r>ششصد<s n="num"/></r></p></e>
+    <e><p><l>ҳафтсад<s n="num"/></l><r>هفتصد<s n="num"/></r></p></e>
+    <e><p><l>ҳаштсад<s n="num"/></l><r>هشتصد<s n="num"/></r></p></e>
+    <e><p><l>ноҳсад<s n="num"/></l><r>نهصد<s n="num"/></r></p></e>
+    <e><p><l>ҳазор<s n="num"/></l><r>هزار<s n="num"/></r></p></e>
+    <e><p><l>миллион<s n="num"/></l><r>میلیون<s n="num"/></r></p></e>
+    <e><p><l>миллиард<s n="num"/></l><r>میلیارد<s n="num"/></r></p></e>    
+    
 
     <e><p><l>дар<s n="pr"/></l><r>در<s n="pr"/></r></p></e>
     <e><p><l>аз<s n="pr"/></l><r>از<s n="pr"/></r></p></e>
@@ -82,6 +85,10 @@
     <e><p><l>муттаҳид<s n="adj"/></l><r>متحد<s n="adj"/></r></p></e>
     <e><p><l>дода<s n="adj"/></l><r>داده<s n="adj"/></r></p></e>
     <e><p><l>комил<s n="adj"/></l><r>کامل<s n="adj"/></r></p></e>
+    <e><p><l>баланд<s n="adj"/></l><r>بلند<s n="adj"/></r></p></e>
+    <e><p><l>солиёна<s n="adj"/></l><r>سالیانه<s n="adj"/></r></p></e>
+    <e><p><l>шахс<s n="adj"/></l><r>شخص<s n="adj"/></r></p></e>
+    <e><p><l>маърӯф<s n="adj"/></l><r>معروف<s n="adj"/></r></p></e>
 
     <e><p><l>қадимӣ<s n="adj"/></l><r>قدیمی<s n="adj"/></r></p></e>
     <e><p><l>аслӣ<s n="adj"/></l><r>اصلی<s n="adj"/></r></p></e>
@@ -140,6 +147,7 @@
     <e><p><l>ҳавонавард<s n="n"/></l><r>هوانورد<s n="n"/></r></p></e>
     <e><p><l>ҳизб<s n="n"/></l><r>حزب<s n="n"/></r></p></e>
     <e><p><l>хабар<s n="n"/></l><r>خبر<s n="n"/></r></p></e>
+    <e><p><l>рада<s n="n"/></l><r>رده<s n="n"/></r></p></e>
 
     <e><p><l>баҳр<s n="n"/></l><r>دریا<s n="n"/></r></p></e>
     <e><p><l>варзиш<s n="n"/></l><r>ورزش<s n="n"/></r></p></e>
@@ -347,7 +355,7 @@
    
 
 
-
+    <e><p><l>prpers<s n="prn"/></l><r>prpers<s n="prn"/></r></p></e>
 
     <!-- punctuation etc. -->
      <e>
diff --git a/apertium-tg-fa/apertium-tg-fa.tg.dix.xml b/apertium-tg-fa/apertium-tg-fa.tg.dix.xml
index ded584fa..df45979e 100644
--- a/apertium-tg-fa/apertium-tg-fa.tg.dix.xml
+++ b/apertium-tg-fa/apertium-tg-fa.tg.dix.xml
@@ -195,9 +195,10 @@
           <r>prpers<s n="prn"/><s n="subj"/><s n="p3"/><s n="mf"/><s n="sg"/></r>
 	</p>
       </e>
+      <!-- him or her -->
       <e>
 	<p>
-          <l>вай</l> <!-- him or her -->
+          <l>вай</l>
           <r>prpers<s n="prn"/><s n="subj"/><s n="p3"/><s n="mf"/><s n="sg"/></r>
 	</p>
       </e>
-- 
2.11.4.GIT