From 96d8cc4c04f5221b0e63b3cd2e70c6bb92e4f3b2 Mon Sep 17 00:00:00 2001
From: "virk.shafqat" <virk.shafqat@gmail.com>
Date: Fri, 13 May 2011 21:51:16 +0000
Subject: [PATCH] refinementsUrdPhrasebook-2011-05-13

---
 examples/phrasebook/SentencesUrd.gf |  4 +---
 examples/phrasebook/WordsUrd.gf     | 15 +++++++++------
 lib/src/hindustani/ResHindustani.gf |  2 +-
 lib/src/urdu/ResHindustani.gf       |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/examples/phrasebook/SentencesUrd.gf b/examples/phrasebook/SentencesUrd.gf
index 894df4089..9ab6013bb 100644
--- a/examples/phrasebook/SentencesUrd.gf
+++ b/examples/phrasebook/SentencesUrd.gf
@@ -1,11 +1,10 @@
-concrete SentencesUrd of Sentences =  NumeralUrd ** SentencesI - [sing,IFemale,YouFamFemale,YouPolFemale] with 
+concrete SentencesUrd of Sentences =  NumeralUrd **  SentencesI - [sing,IFemale,YouFamFemale,YouPolFemale] with 
   (Syntax = SyntaxUrd),
   (Symbolic = SymbolicUrd),
   (Lexicon = LexiconUrd) **
   open 
   (P=ParadigmsUrd),
   ParamX,
-  StringsUrdu,
   CommonHindustani in {
   lin IFemale = mkPerson (P.personalPN myN mjh "" myra myry myrE myry Sg Fem Pers1) ;
       YouFamFemale = mkPerson (P.personalPN tw tw tw tyra tyry tyrE tyry Sg Fem Pers2_Casual) ;
@@ -28,5 +27,4 @@ oper
   apka = ["آپ كا"] ;
   apky = ["آپ كی"] ;
   apkE = ["آپ كے"] ;
-
   } ;
diff --git a/examples/phrasebook/WordsUrd.gf b/examples/phrasebook/WordsUrd.gf
index 790b6b24b..c4f4ddfd4 100644
--- a/examples/phrasebook/WordsUrd.gf
+++ b/examples/phrasebook/WordsUrd.gf
@@ -155,9 +155,9 @@ flags coding = utf8 ;
 -- miscellaneous
 
     QWhatName p = mkQS (mkQCl whatSg_IP (mkVP (nameOf p))) ;
---    QWhatAge p = mkQS (mkQCl (ICompAP (mkAP L.old_A)) p.name) ;
---    HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item IrregUrd.cost_V)) ; 
---    ItCost item price = mkCl item (mkV2 IrregUrd.cost_V) price ;
+    QWhatAge p = mkQS (mkQCl (mkCl (mkNP (modQuant p.poss)) (mkAdv "عمر"))) ;
+    HowMuchCost item = mkQS (mkQCl (mkCl (modNP item) (mkAdv ["كی قیمت"]))) ; 
+    ItCost item price = mkCl item (mkV2 (mkV "قیمت")) price ;
 
     PropOpen p = mkCl p.name open_Adv ;
     PropClosed p = mkCl p.name closed_Adv ;
@@ -218,8 +218,8 @@ flags coding = utf8 ;
       mkQS (mkQCl far_IAdv (mkNP (mkNP y.name (SyntaxUrd.mkAdv from_Prep x.name)) t)) ;
     HowFarBy y t = mkQS (mkQCl far_IAdv (mkNP y.name t)) ;
  
---    WhichTranspPlace trans place = 
---      mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ;
+    WhichTranspPlace trans place = 
+      mkQS (mkQCl (SyntaxUrd.mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ;
 
     IsTranspPlace trans place =
       mkQS (mkQCl (mkCl (mkCN trans.name place.to))) ;
@@ -261,10 +261,13 @@ flags coding = utf8 ;
       by = SyntaxUrd.mkAdv by8means_Prep (mkNP n)
       } ;
 
-    mkSuperl : A -> Det = \a -> SyntaxUrd.mkDet the_Art (SyntaxUrd.mkOrd a) ;
+--    mkSuperl : A -> Det = \a -> SyntaxUrd.mkDet the_Art (SyntaxUrd.mkOrd a) ;
+      mkSuperl : A -> Det = \a -> lin Det { s = \\n,g,c => a.s ! n ! g ! c ! Posit ; n = Sg } ;
     
    far_IAdv = ExtraUrd.IAdvAdv (P.mkAdv "دور") ;
 -------------------
 modN : N -> N = \noun -> lin N {s = \\n,c =>noun.s!n!c++"كا" ; g =noun.g} ;
+modQuant : Quant -> Quant = \q -> lin Quant {s = \\n,g,c => q.s ! n ! Fem ! c ; a = q.a};
+modNP : NP -> NP = \np -> lin NP {s = \\_ => np.s ! NPC Obl  ; a = np.a};
 
 }
diff --git a/lib/src/hindustani/ResHindustani.gf b/lib/src/hindustani/ResHindustani.gf
index 3fad732af..3af299d5e 100644
--- a/lib/src/hindustani/ResHindustani.gf
+++ b/lib/src/hindustani/ResHindustani.gf
@@ -65,7 +65,7 @@ param
   detcn2NP : (Determiner) -> Noun -> NPCase -> Number -> Str = \dt,cn,npc,nn -> case npc of {
 --       NPC c => dt.s ! Sg ! Masc ++ cn.s ! nn ! c ; --changed while phrasebook e.g tyry beti where gender of determiner 'tyry' should be dependent on gender of common noum e.g 'beti' 
        NPC c => dt.s ! nn ! cn.g ! c ++ cn.s ! nn ! c ;
-       NPObj => dt.s ! nn ! cn.g ! Dir ++ cn.s ! nn ! Dir ;
+       NPObj => dt.s ! nn ! cn.g ! Obl ++ cn.s ! nn ! Dir ; 
        NPErg => dt.s ! nn ! cn.g ! Obl ++ cn.s ! nn ! Obl ++ "nE"
       } ;  
   det2NP : (Determiner) -> NPCase -> Str = \dt,npc -> case npc of {
diff --git a/lib/src/urdu/ResHindustani.gf b/lib/src/urdu/ResHindustani.gf
index 06388d71d..37d20880f 100644
--- a/lib/src/urdu/ResHindustani.gf
+++ b/lib/src/urdu/ResHindustani.gf
@@ -65,7 +65,7 @@ param
   detcn2NP : (Determiner) -> Noun -> NPCase -> Number -> Str = \dt,cn,npc,nn -> case npc of {
 --       NPC c => dt.s ! Sg ! Masc ++ cn.s ! nn ! c ; --changed while phrasebook e.g tyry beti where gender of determiner 'tyry' should be dependent on gender of common noum e.g 'beti' 
        NPC c => dt.s ! nn ! cn.g ! c ++ cn.s ! nn ! c ;
-       NPObj => dt.s ! nn ! cn.g ! Dir ++ cn.s ! nn ! Dir ;
+       NPObj => dt.s ! nn ! cn.g ! Obl ++ cn.s ! nn ! Dir ; 
        NPErg => dt.s ! nn ! cn.g ! Obl ++ cn.s ! nn ! Obl ++ "نے"
       } ;  
   det2NP : (Determiner) -> NPCase -> Str = \dt,npc -> case npc of {