From ab120fc83f61f581fe9febcce2e611e20d593196 Mon Sep 17 00:00:00 2001
From: "virk.shafqat" <virk.shafqat@gmail.com>
Date: Thu, 19 May 2011 15:19:15 +0000
Subject: [PATCH] refinements-2011-05-19

---
 examples/phrasebook/WordsUrd.gf         | 14 +++++++-------
 lib/src/hindustani/NounHindustani.gf    |  2 +-
 lib/src/hindustani/StringsHindustani.gf |  1 +
 lib/src/urdu/GrammarUrd.gf              |  5 +++--
 lib/src/urdu/StringsHindustani.gf       |  1 +
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/examples/phrasebook/WordsUrd.gf b/examples/phrasebook/WordsUrd.gf
index c4f4ddfd4..fa5596d21 100644
--- a/examples/phrasebook/WordsUrd.gf
+++ b/examples/phrasebook/WordsUrd.gf
@@ -18,7 +18,7 @@ flags coding = utf8 ;
     Apple = mkCN L.apple_N ;
     Beer = mkCN L.beer_N ;
     Bread = mkCN L.bread_N ;
-    Cheese = mkCN (mkN "پنیر") ;
+    Cheese = mkCN (mkN "پنیر" Fem) ;
     Chicken = mkCN (mkN "مرغی") ;
     Coffee = mkCN (mkN "كافی") ;
     Fish = mkCN L.fish_N ;
@@ -26,8 +26,8 @@ flags coding = utf8 ;
     Milk = mkCN L.milk_N ;
     Pizza = mkCN (mkN "پیزہ") ;
     Salt = mkCN L.salt_N ;
-    Tea = mkCN (mkN "چاے") ;
-    Water = mkCN L.water_N ;
+    Tea = mkCN (mkN "چاے" Fem) ;
+    Water = mkCN L.water_N;
     Wine = mkCN L.wine_N ;
 
 -- Properties; many of them are in the resource lexicon, others can be built by $mkA$.
@@ -88,7 +88,7 @@ flags coding = utf8 ;
     Pound = mkCN (mkN "پاونڈ") ;
     Rouble = mkCN (mkN "روبل") ;
     SwedishCrown = mkCN (mkA "سویڈش") (mkN "كراون") | mkCN (mkN "كراون") ;
-    Zloty = mkCN (mkN "زلوٹی") ;
+    Zloty = mkCN (mkN "زلوٹی" Fem) ;
 
 -- Nationalities
 
@@ -114,14 +114,14 @@ flags coding = utf8 ;
 -- Means of transportation 
  
    Bike = mkTransport L.bike_N ;
-   Bus = mkTransport (mkN "بس") ;
+   Bus = mkTransport (mkN "بس" Fem) ;
    Car = mkTransport L.car_N ;
    Ferry = mkTransport (mkN "فیری") ;
    Plane = mkTransport L.airplane_N ;
    Subway = mkTransport (mkN "سب وے") ;
    Taxi = mkTransport (mkN "ٹیكسی") ;
    Train = mkTransport (mkN "ریل گاڑی") ;
-   Tram = mkTransport (mkN "ٹرام") ;
+   Tram = mkTransport (mkN "ٹرام" Fem) ;
 
    ByFoot = P.mkAdv "پیدل" ;
 
@@ -133,7 +133,7 @@ flags coding = utf8 ;
     AHasRoom p num = mkCl p.name have_V2 
       (mkNP (mkNP a_Det (mkN "كمرہ")) (SyntaxUrd.mkAdv for_Prep (mkNP num (P.mkN "شخص" "شخص" "شخص" "اشخاص" "اشخاص" "شخصو" masculine)))) ;
     AHasTable p num = mkCl p.name have_V2 
-      (mkNP (mkNP a_Det (mkN "میز")) (SyntaxUrd.mkAdv for_Prep (mkNP num (mkN "شخص")))) ;
+      (mkNP (mkNP a_Det (mkN "میز")) (SyntaxUrd.mkAdv for_Prep (mkNP num (P.mkN "شخص" "شخص" "شخص" "اشخاص" "اشخاص" "شخصو" masculine)))) ;
     AHasName p name = mkCl (nameOf p) name ;
     AHungry p = mkCl p.name (mkA "بھوكا") ;
     AIll p = mkCl p.name (mkA "بیمار") ;
diff --git a/lib/src/hindustani/NounHindustani.gf b/lib/src/hindustani/NounHindustani.gf
index e4e10943c..8ed168e1b 100644
--- a/lib/src/hindustani/NounHindustani.gf
+++ b/lib/src/hindustani/NounHindustani.gf
@@ -86,7 +86,7 @@ incomplete concrete NounHindustani of Noun =
       } ;
 
     DefArt = {s = \\_,_,_ => [] ; a = defaultAgr} ;
-    IndefArt = {s = \\_,_,_ => [] ; a =defaultAgr } ;
+    IndefArt = {s = \\n,_,_ => case n of {Sg => indfArt ; Pl => []} ; a =defaultAgr } ;
 
     MassNP cn = {s = \\c => toNP (cn.s ! Sg) c ; a = agrP3 cn.g Sg} ;
 
diff --git a/lib/src/hindustani/StringsHindustani.gf b/lib/src/hindustani/StringsHindustani.gf
index 485d122d2..315909bc3 100644
--- a/lib/src/hindustani/StringsHindustani.gf
+++ b/lib/src/hindustani/StringsHindustani.gf
@@ -16,5 +16,6 @@ oper
   waN = "waN" ;
 
   comma = "," ;
+  indfArt = "ayk" ;
 
 }
diff --git a/lib/src/urdu/GrammarUrd.gf b/lib/src/urdu/GrammarUrd.gf
index efafb5d37..2db7219cc 100644
--- a/lib/src/urdu/GrammarUrd.gf
+++ b/lib/src/urdu/GrammarUrd.gf
@@ -1,4 +1,4 @@
---# -path=.:../abstract:../common:../prelude:c:/gf_unicoded/hindustani
+--# -path=.:../abstract:../common:../prelude
 
  concrete GrammarUrd of Grammar = 
   NounUrd, 
@@ -11,7 +11,8 @@
   RelativeUrd,
   ConjunctionUrd,
   PhraseUrd,
-  TextX - [Adv,AdN],
+  TextUrd - [Adv,AdN],
+--  TextX - [Adv,AdN],
   StructuralUrd,
   TenseX - [Adv,AdN],
   IdiomUrd
diff --git a/lib/src/urdu/StringsHindustani.gf b/lib/src/urdu/StringsHindustani.gf
index a0ef21737..71f506ea2 100644
--- a/lib/src/urdu/StringsHindustani.gf
+++ b/lib/src/urdu/StringsHindustani.gf
@@ -16,5 +16,6 @@ oper
   waN = "واں" ;
 
   comma = "," ;
+  indfArt = "ایك" ;
 
 }