Merge branch 'master' of www.grammaticalframework.org:/usr/local/www/GF

src/api/libraryBrowser/LibraryBrowser.gf

@@ -1,10 +1,12 @@
 abstract LibraryBrowser = 
   Grammar - [
-    n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,
+--    n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,
-    UseCopula,
+    UseCopula
-    UsePron, IndefArt, DefArt, Use2N3, Use3N3
+--    ,UsePron, IndefArt, DefArt, Use2N3, Use3N3
     ], 
-  Lexicon [
+  Lexicon
+{- AR 21/8/2017 removing almost all the restrictions
+  [
     N,   man_N, woman_N, house_N,
     N2,  brother_N2,
     N3,  distance_N3,
@@ -22,6 +24,7 @@ abstract LibraryBrowser =
     V2S, answer_V2S,
     V2Q, ask_V2Q
     ]
+-}
   ** {
   flags startcat = Utt ;
 

src/api/libraryBrowser/LibraryBrowserAPI.gf

@@ -121,7 +121,7 @@ lin D_6 = mkTerm "n6_Dig" ;
 lin D_7 = mkTerm "n7_Dig" ;
 lin D_8 = mkTerm "n8_Dig" ;
 lin D_9 = mkTerm "n9_Dig" ;
---lin DefArt = mkTerm "the_Quant" ;
+lin DefArt = mkTerm "the_Quant" ;
 lin DetCN det_1 cn_2 = mkTerm "mkNP" (flatIfTerm det_1) (flatIfTerm cn_2) ;
 lin DetNP det_1 = mkTerm "mkNP" det_1 ;
 lin DetQuant quant_1 num_2 = mkFlat (mkTerm "mkDet" quant_1 num_2) ;
@@ -144,7 +144,7 @@ lin IdetQuant iquant_1 num_2 = mkTerm "mkIDet" iquant_1 num_2 ;
 lin ImpPl1 vp_1 = mkTerm "lets_Utt" vp_1 ;
 lin ImpVP vp_1 = mkTerm "mkImp" vp_1 ;
 lin ImpersCl vp_1 = mkTerm "mkCl" vp_1 ;
---lin IndefArt = mkTerm "a_Quant" ;
+lin IndefArt = mkTerm "a_Quant" ;
 lin MassNP cn_1 = mkTerm "mkNP" cn_1 ;
 lin NoPConj = mkTerm (hide "NoPConj") ;
 lin NoVoc = mkTerm (hide "NoVoc") ;
@@ -222,7 +222,7 @@ lin UseComparA a_1 = mkTerm "mkAP" a_1 ;
 lin UseN n_1 = mkFlat (mkTerm "mkCN" n_1) ;
 lin UseN2 n2_1 = mkTerm "mkCN" n2_1 ;
 lin UsePN pn_1 = mkTerm "mkNP" pn_1 ;
---lin UsePron pron_1 = mkTerm "mkNP" pron_1 ;
+lin UsePron pron_1 = mkTerm "mkNP" pron_1 ;
 lin UseQCl temp_1 pol_2 qcl_3 = mkTerm "mkQS" (flatTerm temp_1) pol_2 qcl_3 ;
 lin UseRCl temp_1 pol_2 rcl_3 = mkTerm "mkRS" (flatTerm temp_1) pol_2 rcl_3 ;
 lin UseSlash temp_1 pol_2 clslash_3 = mkTerm "mkSSlash" temp_1 pol_2 clslash_3 ;

src/api/libraryBrowser/LibraryBrowserBul.gf

@@ -0,0 +1,25 @@
+--# -path=.:alltenses
+
+concrete LibraryBrowserBul of LibraryBrowser = 
+  GrammarBul - [
+    UseCopula
+    ], 
+  LexiconBul
+    ** open (S = SyntaxBul) in {
+
+  lin
+    i_NP = S.i_NP ;
+    you_NP = S.you_NP ;
+    he_NP = S.he_NP ;
+    she_NP = S.she_NP ;
+    we_NP = S.we_NP ;
+    youPl_NP = S.youPl_NP ;
+    youPol_NP = S.youPol_NP ;
+    they_NP = S.they_NP ;
+
+    a_Det = S.mkDet S.a_Quant ;
+    the_Det = S.mkDet S.the_Quant ;
+    aPl_Det = S.mkDet S.a_Quant S.plNum ;
+    thePl_Det = S.mkDet S.the_Quant S.plNum ;
+}
+

src/api/libraryBrowser/LibraryBrowserChi.gf

@@ -0,0 +1,25 @@
+--# -path=.:alltenses
+
+concrete LibraryBrowserChi of LibraryBrowser = 
+  GrammarChi - [
+    UseCopula
+    ], 
+  LexiconChi
+    ** open (S = SyntaxChi) in {
+
+  lin
+    i_NP = S.i_NP ;
+    you_NP = S.you_NP ;
+    he_NP = S.he_NP ;
+    she_NP = S.she_NP ;
+    we_NP = S.we_NP ;
+    youPl_NP = S.youPl_NP ;
+    youPol_NP = S.youPol_NP ;
+    they_NP = S.they_NP ;
+
+    a_Det = S.mkDet S.a_Quant ;
+    the_Det = S.mkDet S.the_Quant ;
+    aPl_Det = S.mkDet S.a_Quant S.plNum ;
+    thePl_Det = S.mkDet S.the_Quant S.plNum ;
+}
+

src/api/libraryBrowser/LibraryBrowserDut.gf

@@ -2,30 +2,10 @@
 
 concrete LibraryBrowserDut of LibraryBrowser = 
   GrammarDut - [
-    n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,
+    UseCopula
-    UseCopula,
-    UsePron, IndefArt, DefArt, Use2N3, Use3N3
     ], 
-  LexiconDut [
+  LexiconDut
-    N,   man_N, woman_N, house_N,
-    N2,  brother_N2,
-    N3,  distance_N3,
-    PN,  john_PN, paris_PN,
-    A,   old_A, young_A, red_A,
-    A2,  married_A2,
-    V,   sleep_V, walk_V,
-    V2,  love_V2,
-    V3,  give_V3,
-    VA,  become_VA, 
-    VS,  know_VS,
-    VQ,  wonder_VQ,
-    V2V, beg_V2V,
-    V2A, paint_V2A,
-    V2S, answer_V2S,
-    V2Q, ask_V2Q
-    ] 
     ** open (S = SyntaxDut) in {
-  flags startcat = Utt ;
 
   lin
     i_NP = S.i_NP ;

src/api/libraryBrowser/LibraryBrowserEng.gf

@@ -2,11 +2,13 @@
 
 concrete LibraryBrowserEng of LibraryBrowser = 
   GrammarEng - [
-    n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,
+---    n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8,
-    UseCopula,
+    UseCopula
-    UsePron, IndefArt, DefArt, Use2N3, Use3N3
+---    ,UsePron, IndefArt, DefArt, Use2N3, Use3N3
     ], 
-  LexiconEng [
+  LexiconEng
+{-
+  [
     N,   man_N, woman_N, house_N,
     N2,  brother_N2,
     N3,  distance_N3,
@@ -24,8 +26,8 @@ concrete LibraryBrowserEng of LibraryBrowser =
     V2S, answer_V2S,
     V2Q, ask_V2Q
     ]
+-}
   ** open (S = SyntaxEng) in {
-  flags startcat = Utt ;
   
   lin
     i_NP = S.i_NP ;

src/api/libraryBrowser/LibraryBrowserSpa.gf

@@ -0,0 +1,25 @@
+--# -path=.:alltenses
+
+concrete LibraryBrowserSpa of LibraryBrowser = 
+  GrammarSpa - [
+    UseCopula
+    ], 
+  LexiconSpa
+    ** open (S = SyntaxSpa) in {
+
+  lin
+    i_NP = S.i_NP ;
+    you_NP = S.you_NP ;
+    he_NP = S.he_NP ;
+    she_NP = S.she_NP ;
+    we_NP = S.we_NP ;
+    youPl_NP = S.youPl_NP ;
+    youPol_NP = S.youPol_NP ;
+    they_NP = S.they_NP ;
+
+    a_Det = S.mkDet S.a_Quant ;
+    the_Det = S.mkDet S.the_Quant ;
+    aPl_Det = S.mkDet S.a_Quant S.plNum ;
+    thePl_Det = S.mkDet S.the_Quant S.plNum ;
+}
+

src/api/libraryBrowser/LibraryBrowserSwe.gf

@@ -0,0 +1,25 @@
+--# -path=.:alltenses
+
+concrete LibraryBrowserSwe of LibraryBrowser = 
+  GrammarSwe - [
+    UseCopula
+    ], 
+  LexiconSwe
+    ** open (S = SyntaxSwe) in {
+
+  lin
+    i_NP = S.i_NP ;
+    you_NP = S.you_NP ;
+    he_NP = S.he_NP ;
+    she_NP = S.she_NP ;
+    we_NP = S.we_NP ;
+    youPl_NP = S.youPl_NP ;
+    youPol_NP = S.youPol_NP ;
+    they_NP = S.they_NP ;
+
+    a_Det = S.mkDet S.a_Quant ;
+    the_Det = S.mkDet S.the_Quant ;
+    aPl_Det = S.mkDet S.a_Quant S.plNum ;
+    thePl_Det = S.mkDet S.the_Quant S.plNum ;
+}
+

src/chunk/ChunkJpn.gf

@@ -3,7 +3,7 @@ concrete ChunkJpn of Chunk = CatJpn, ExtensionsJpn [VPS,VPI] **
                AdA_Chunk, AdV_Chunk, AdN_Chunk, PConj_Chunk, Symb_Chunk,
                fullstop_Chunk, exclmark_Chunk, questmark_Chunk, comma_Chunk,
                colon_Chunk, semicolon_Chunk, quote_Chunk, lpar_Chunk,
-               rpar_Chunk, dash_Chunk]
+               rpar_Chunk, dash_Chunk, sbSS]
      with (Syntax = SyntaxJpn), (Extensions = ExtensionsJpn) **
   open 
     SyntaxJpn, (E = ExtensionsJpn), Prelude, 

src/translator/DictionaryUrd.gf

@@ -11,476 +11,474 @@ coding=utf8 ;
 -- concrete StructuralUrd of Structural = CatUrd ** 
 --  open MorphoUrd, ParadigmsUrd, Prelude, NounUrd,ParamX,CommonHindustani in {
 
-lin
+lin above_Prep = mkPrep ["کے اوپر"] ["کے اوپر"] ;
-  above_Prep = mkPrep ["کے اوپر"] ["کے اوپر"] ;
+lin after_Prep = mkPrep ["کے بعد"] ["کے بعد"] ;
-  after_Prep = mkPrep ["کے بعد"] ["کے بعد"] ;
+lin all_Predet = ss "تمام" ;
-  all_Predet = ss "تمام" ;
+lin almost_AdA, almost_AdN = mkAdN "تقریبا" ;
-  almost_AdA, almost_AdN = mkAdN "تقریبا" ;
+lin although_Subj = ss "اگرچہ" ;
-  although_Subj = ss "اگرچہ" ;
+lin always_AdV = ss "ہمیشہ" ;
-  always_AdV = ss "ہمیشہ" ;
+lin and_Conj = sd2 [] "اور" ** {n = Pl} ;
-  and_Conj = sd2 [] "اور" ** {n = Pl} ;
+lin because_Subj = ss "کیونکہ" ;
-  because_Subj = ss "کیونکہ" ;
+lin before_Prep = mkPrep ["سے پہلے"] ["سے پہلے"] ;
-  before_Prep = mkPrep ["سے پہلے"] ["سے پہلے"] ;
+lin behind_Prep = mkPrep ["کے پیچھے"] ["کے پیچھے"] ;
-  behind_Prep = mkPrep ["کے پیچھے"] ["کے پیچھے"] ;
+lin between_Prep = mkPrep "درمیاں" "درمیاں" ;
-  between_Prep = mkPrep "درمیاں" "درمیاں" ;
+lin both7and_DConj = sd2 "دونوں" "اور" ** {n = Pl} ;
-  both7and_DConj = sd2 "دونوں" "اور" ** {n = Pl} ;
+lin but_PConj = ss "لیکن" ;
-  but_PConj = ss "لیکن" ;
+lin by8agent_Prep = mkPrep "سے" "" ;
-  by8agent_Prep = mkPrep "سے" "" ;
+lin by8means_Prep = mkPrep "پر" "" ;
-  by8means_Prep = mkPrep "پر" "" ;
+lin can8know_VV,can_VV = mkV "سکنا" ** { isAux = True} ;
-  can8know_VV,can_VV = mkV "سکنا" ** { isAux = True} ;
+lin during_Prep = mkPrep ["کے درمیاں"] ["کے درمیاں"] ;
-  during_Prep = mkPrep ["کے درمیاں"] ["کے درمیاں"] ;
+lin either7or_DConj = sd2 "کوی ایک" "یا" ** {n = Sg} ;
-  either7or_DConj = sd2 "کوی ایک" "یا" ** {n = Sg} ;
+lin everybody_NP = MassNP (UseN (P.mkN "ہر کوی" "ہر کوی" "ہر کوی" "ہر کوی" "ہر کوی" "ہر کوی" Masc )); -- not a good way coz need to include NounUrd
-  everybody_NP =  MassNP (UseN (P.mkN "ہر کوی" "ہر کوی" "ہر کوی" "ہر کوی" "ہر کوی" "ہر کوی" Masc )); -- not a good way coz need to include NounUrd
+lin every_Det = mkDet "ہر" "ہر" "ہر" "ہر" Sg;
-  every_Det = mkDet "ہر" "ہر" "ہر" "ہر" Sg;
+lin everything_NP = MassNP (UseN (P.mkN "ہر چیز" "ہر چیز" "ہر چیزو" "سب چیزیں" "سب چیزوں" "سب چیزو" Masc ));
-  everything_NP = MassNP (UseN (P.mkN "ہر چیز" "ہر چیز" "ہر چیزو" "سب چیزیں" "سب چیزوں" "سب چیزو" Masc ));
+lin everywhere_Adv = mkAdv "ہر جگہ" ;
-  everywhere_Adv = mkAdv "ہر جگہ" ;
+lin few_Det = mkDet "چند" "چند" "چند" "چند" Pl ;
-  few_Det = mkDet "چند" "چند" "چند" "چند" Pl ;
+lin first_Ord = {s = "پعہلا" ; n = Sg} ; --DEPRECATED
-  first_Ord = {s = "پعہلا" ; n = Sg} ; --DEPRECATED
+lin for_Prep = mkPrep "کیلیے" "کیلیے" ;
-  for_Prep = mkPrep "کیلیے" "کیلیے" ;
+lin from_Prep = mkPrep "سے" "سے" ;
-  from_Prep = mkPrep "سے" "سے" ;
+lin he_Pron = personalPN "وہ" "اس" "" ["اس کا"] ["اس کی"] ["اس کے"] ["اس کی"] Sg Masc Pers3_Distant ;
-  he_Pron = personalPN "وہ" "اس" "" ["اس کا"] ["اس کی"] ["اس کے"] ["اس کی"] Sg Masc Pers3_Distant ;
+lin here_Adv = mkAdv "یہاں" ;
-  here_Adv = mkAdv "یہاں" ;
+lin here7to_Adv = mkAdv ["یہاں پر"] ;
-  here7to_Adv = mkAdv ["یہاں پر"] ;
+lin here7from_Adv = mkAdv ["یہاں سے"] ;
-  here7from_Adv = mkAdv ["یہاں سے"] ;
+lin how_IAdv = ss "کیسے" ;
-  how_IAdv = ss "کیسے" ;
+lin how8many_IDet = makeIDet "کتنے" "کتنی" Pl ;
-  how8many_IDet = makeIDet "کتنے" "کتنی" Pl ;
+lin how8much_IAdv = ss "کتنا" ;
-  how8much_IAdv  = ss "کتنا" ;
+lin if_Subj = ss "اگر" ;
-  if_Subj = ss "اگر" ;
+lin in8front_Prep = mkPrep ["کے سامنے"] ["کے سامنے"] ;
-  in8front_Prep = mkPrep ["کے سامنے"] ["کے سامنے"] ;
+lin i_Pron = personalPN "میں" "مجھ" "" "میرا" "میری" "میرے" "میری" Sg Masc Pers1;
-  i_Pron = personalPN "میں" "مجھ" "" "میرا" "میری" "میرے" "میری" Sg Masc Pers1;
+lin in_Prep = mkPrep "میں" "میں" ;
-  in_Prep = mkPrep "میں" "میں" ;
+lin it_Pron  = personalPN "یہ" "اس" "اس" ["اس کا"] ["اس کی"] ["اس کے"] ["اس کی"] Sg Masc Pers3_Near;
-  it_Pron  = personalPN "یہ" "اس" "اس" ["اس کا"] ["اس کی"] ["اس کے"] ["اس کی"] Sg Masc Pers3_Near;
+lin less_CAdv = {s = "کم" ; p = ""} ;
-  less_CAdv = {s = "کم" ; p = ""} ;
+lin many_Det = mkDet "بہت زیادہ" "بہت زیادہ" "بہت زیادہ" "بہت زیادہ" Pl ;
-  many_Det = mkDet "بہت زیادہ" "بہت زیادہ" "بہت زیادہ" "بہت زیادہ" Pl ;
+lin more_CAdv = {s = "زیادہ" ; p = "سے" } ;
-  more_CAdv = {s = "زیادہ" ; p = "سے" } ;
+lin most_Predet = ss "زیادہ تر" ;
-  most_Predet = ss "زیادہ تر" ;
+lin much_Det = mkDet "بہت" "بہت" "بہت" "بہت" Sg  ;
-  much_Det = mkDet "بہت" "بہت" "بہت" "بہت" Sg  ;
 -----b  no_Phr = ss "نo" ;
-  no_Utt = ss "نہیں" ;
+lin no_Utt = ss "نہیں" ;
-  on_Prep = mkPrep "پر" "پر" ;
+lin on_Prep = mkPrep "پر" "پر" ;
 --  one_Quant = demoPN "ایک" "ایک" "ایک" ; -- DEPRECATED
-  only_Predet = ss "صرف" ;
+lin only_Predet = ss "صرف" ;
-  or_Conj = sd2 [] "یا" ** {n = Sg} ;
+lin or_Conj = sd2 [] "یا" ** {n = Sg} ;
-  otherwise_PConj = ss "یا پھر" ;
+lin otherwise_PConj = ss "یا پھر" ;
-  part_Prep = mkPrep "" "" ;
+lin part_Prep = mkPrep "" "" ;
-  please_Voc = ss "مہربانی" ;
+lin please_Voc = ss "مہربانی" ;
-  possess_Prep = mkPrep "کا" "کی" ;
+lin possess_Prep = mkPrep "کا" "کی" ;
  -- quite_Adv = ss "خاموش" ;
-  she_Pron = personalPN "وہ" "اس" "وہ" ["اس کی"] ["اس کی"] ["اس کے"] ["اس کی"] Sg Fem Pers3_Distant ;
+lin she_Pron = personalPN "وہ" "اس" "وہ" ["اس کی"] ["اس کی"] ["اس کے"] ["اس کی"] Sg Fem Pers3_Distant ;
-  so_AdA = ss "اس لیے" ;
+lin so_AdA = ss "اس لیے" ;
-  somebody_NP = MassNP (UseN (P.mkN "کوی" "کوی" "کوی" "کوی" "کوی" "کوی" Masc ));
+lin somebody_NP = MassNP (UseN (P.mkN "کوی" "کوی" "کوی" "کوی" "کوی" "کوی" Masc ));
-  someSg_Det = mkDet "کچھ" "کچھ" "کچھ" "کچھ" Sg ;
+lin someSg_Det = mkDet "کچھ" "کچھ" "کچھ" "کچھ" Sg ;
-  somePl_Det = mkDet "کچھ" "کچھ" "کچھ" "کچھ" Pl ;
+lin somePl_Det = mkDet "کچھ" "کچھ" "کچھ" "کچھ" Pl ;
-  something_NP = MassNP (UseN (P.mkN "کوی چیز" "کوی چیز" "کوی چیز" "کھ چیزیں" "کھ چیزوں" "کھ چیزو" Masc ));
+lin something_NP = MassNP (UseN (P.mkN "کوی چیز" "کوی چیز" "کوی چیز" "کھ چیزیں" "کھ چیزوں" "کھ چیزو" Masc ));
-  somewhere_Adv = mkAdv ["کہیں پر"] ;
+lin somewhere_Adv = mkAdv ["کہیں پر"] ;
-  that_Quant = demoPN "وہ" "اس" "ان" ;
+lin that_Quant = demoPN "وہ" "اس" "ان" ;
-  that_Subj = ss "کہ";
+lin that_Subj = ss "کہ";
-  there_Adv = mkAdv "وہاں" ;
+lin there_Adv = mkAdv "وہاں" ;
-  there7to_Adv = mkAdv ["وہاں پر"] ;
+lin there7to_Adv = mkAdv ["وہاں پر"] ;
-  there7from_Adv = mkAdv ["وہاں سے"] ;
+lin there7from_Adv = mkAdv ["وہاں سے"] ;
-  therefore_PConj = ss "اس لیے" ;
+lin therefore_PConj = ss "اس لیے" ;
-  they_Pron = personalPN "وہ" "وہ" "وہ" ["ان کا"] ["ان کی"] ["ان کے"] ["ان کی"] Pl Masc Pers3_Distant ; ---- 
+lin they_Pron = personalPN "وہ" "وہ" "وہ" ["ان کا"] ["ان کی"] ["ان کے"] ["ان کی"] Pl Masc Pers3_Distant ; ---- 
-  this_Quant = demoPN "یہ" "اس" "ان";      
+lin this_Quant = demoPN "یہ" "اس" "ان";      
-  through_Prep = mkPrep ["میں سے"] ["میں سے"] ;
+lin through_Prep = mkPrep ["میں سے"] ["میں سے"] ;
-  too_AdA = ss "بہت" ;
+lin too_AdA = ss "بہت" ;
-  to_Prep = mkPrep "کو" "کو" ; -- ** {lock_Prep = <>};
+lin to_Prep = mkPrep "کو" "کو" ; -- ** {lock_Prep = <>};
-  under_Prep = mkPrep "کے نیچے" "کے نیچے" ; -- ** {lock_Prep = <>};
+lin under_Prep = mkPrep "کے نیچے" "کے نیچے" ; -- ** {lock_Prep = <>};
-  very_AdA = ss "بہت" ;
+lin very_AdA = ss "بہت" ;
-  want_VV = mkV "چاہنا" ** { isAux = False} ;
+lin want_VV = mkV "چاہنا" ** { isAux = False} ;
-  we_Pron = personalPN "ہم" "ہم" "ہم" "ہمارا" "ہماری" "ہمارے" "ہماری" Pl Masc Pers1 ;
+lin we_Pron = personalPN "ہم" "ہم" "ہم" "ہمارا" "ہماری" "ہمارے" "ہماری" Pl Masc Pers1 ;
-  whatSg_IP = mkIP "کیا" "کس" "کس" Sg Masc ;
+lin whatSg_IP = mkIP "کیا" "کس" "کس" Sg Masc ;
-  whatPl_IP = mkIP "کیا" "کن" "کن" Pl Masc ;
+lin whatPl_IP = mkIP "کیا" "کن" "کن" Pl Masc ;
-  when_IAdv = ss "کب" ;
+lin when_IAdv = ss "کب" ;
-  when_Subj = ss "جب" ;
+lin when_Subj = ss "جب" ;
-  where_IAdv = ss "کہاں" ;
+lin where_IAdv = ss "کہاں" ;
 --  which_IQuant = {s = \\_ => "کون سی"} ;
-  which_IQuant = mkIQuant "کون" ;
+lin which_IQuant = mkIQuant "کون" ;
 --  whichPl_IDet = makeDet "کون سا" "کون سی" "کون سے" "کون سی" ;
 --  whichSg_IDet = makeDet "کون سا" "کون سی" "کون سے" "کون سی" ;
-  whoSg_IP = mkIP "کون" "کس" "کس" Sg Masc  ;
+lin whoSg_IP = mkIP "کون" "کس" "کس" Sg Masc  ;
-  whoPl_IP = mkIP "کون" "کن" "کنہوں" Pl Masc ;
+lin whoPl_IP = mkIP "کون" "کن" "کنہوں" Pl Masc ;
-  why_IAdv = ss "کیوں" ;
+lin why_IAdv = ss "کیوں" ;
-  without_Prep = mkPrep ["کے بغیر"] ["کے بغیر"] ;
+lin without_Prep = mkPrep ["کے بغیر"] ["کے بغیر"] ;
-  with_Prep = mkPrep ["کے ساتھ"] ["کے ساتھ"] ;
+lin with_Prep = mkPrep ["کے ساتھ"] ["کے ساتھ"] ;
 --  yes_Phr = ss "ہاں" ;
-  yes_Utt = ss "ہاں" ;
+lin yes_Utt = ss "ہاں" ;
-  youSg_Pron = personalPN "تو" "تو" "تو" "تیرا" "تیری" "تیرے" "تیری" Sg Masc Pers2_Casual ;
+lin youSg_Pron = personalPN "تو" "تو" "تو" "تیرا" "تیری" "تیرے" "تیری" Sg Masc Pers2_Casual ;
-  youPl_Pron = personalPN "تم" "تم" "تم" "تمھارا" "تمھاری" "تمھارے" "تمھاری" Pl Masc Pers2_Casual ;
+lin youPl_Pron = personalPN "تم" "تم" "تم" "تمھارا" "تمھاری" "تمھارے" "تمھاری" Pl Masc Pers2_Casual ;
-  youPol_Pron = personalPN "آپ" "آپ" "آپ" ["آپ کا"] ["آپ کی"] ["آپ کے"] ["آپ کی"] Pl Masc Pers2_Respect  ;
+lin youPol_Pron = personalPN "آپ" "آپ" "آپ" ["آپ کا"] ["آپ کی"] ["آپ کے"] ["آپ کی"] Pl Masc Pers2_Respect  ;
-  no_Quant =  demoPN " کوی نہیں" "کوی نہیں" "کوی نہیں" ; 
+lin no_Quant =  demoPN " کوی نہیں" "کوی نہیں" "کوی نہیں" ; 
-  not_Predet = {s="نہیں"} ;
+lin not_Predet = {s="نہیں"} ;
-  if_then_Conj = sd2 "اگر" "تو" ** {n = Sg} ; 
+lin if_then_Conj = sd2 "اگر" "تو" ** {n = Sg} ; 
-  at_least_AdN = mkAdN ["کم از کم"] ;
+lin at_least_AdN = mkAdN ["کم از کم"] ;
-  at_most_AdN = mkAdN ["زیادہ سے زیادہ"];
+lin at_most_AdN = mkAdN ["زیادہ سے زیادہ"];
-  nothing_NP = MassNP (UseN (P.mkN "کوی چیز نہیں" "کوی چیز نہیں" "کوی چیز نہیں" "کوی چیز نہیں" "کوی چیز نہیں" "کوی چیز نہیں" Masc )); 
+lin nothing_NP = MassNP (UseN (P.mkN "کوی چیز نہیں" "کوی چیز نہیں" "کوی چیز نہیں" "کوی چیز نہیں" "کوی چیز نہیں" "کوی چیز نہیں" Masc )); 
-  except_Prep = mkPrep "کے سواے" "کے سواے" ;
+lin except_Prep = mkPrep "کے سواے" "کے سواے" ;
-  nobody_NP = MassNP (UseN (P.mkN "کوی نہیں" "کوی نہیں" "کوی نہیں" "کوی نہیں" "کوی نہیں" "کوی نہیں" Masc ));  
+lin nobody_NP = MassNP (UseN (P.mkN "کوی نہیں" "کوی نہیں" "کوی نہیں" "کوی نہیں" "کوی نہیں" "کوی نہیں" Masc ));  
 
-  as_CAdv = {s = "اتنا" ; p = "جتنا"} ;
+lin as_CAdv = {s = "اتنا" ; p = "جتنا"} ;
 
-  have_V2 = mkV2 (mkV "رکھنا") "" ;
+lin have_V2 = mkV2 (mkV "رکھنا") "" ;
 
-  language_title_Utt = ss "اردو" ;
+lin language_title_Utt = ss "اردو" ;
 
 --concrete LexiconUrd of Lexicon = CatUrd ** 
 --open ResUrd, ParadigmsUrd, Prelude in {
 
-lin
+lin airplane_N = P.mkN "جہاز" ;
-  airplane_N = P.mkN "جہاز" ;
+lin answer_V2S = mkV2  (compoundV "جواب" (mkV "دینا")) ;
-  answer_V2S = mkV2  (compoundV "جواب" (mkV "دینا")) ;
+lin apartment_N = P.mkN "کمرہ" ;
-  apartment_N = P.mkN "کمرہ" ;
+lin apple_N = P.mkN "سیب" ;
-  apple_N = P.mkN "سیب" ;
+lin art_N = P.mkN "فن" ;
-  art_N = P.mkN "فن" ;
+lin ask_V2Q = mkV2 (mkV "پوچھنا") ;
-  ask_V2Q = mkV2 (mkV "پوچھنا") ;
+lin baby_N = P.mkN "بچہ" ;
-  baby_N = P.mkN "بچہ" ;
+lin bad_A = mkA "برا" ;
-  bad_A = mkA "برا" ;
+lin bank_N = P.mkN "بینک" ;
-  bank_N = P.mkN "بینک" ;
+lin beautiful_A = mkA "خوبصورت" ;
-  beautiful_A = mkA "خوبصورت" ;
+lin become_VA = mkV "بننا";
-  become_VA = mkV "بننا";
+lin beer_N = P.mkN "بییر" ;
-  beer_N = P.mkN "بییر" ;
+lin beg_V2V =  mkV2V (compoundV "التجا" (mkV "کرنا")) "سے" "کہ" False;
-  beg_V2V =  mkV2V (compoundV "التجا" (mkV "کرنا")) "سے" "کہ" False;
+lin big_A = mkA "بڑا" ;
-  big_A = mkA "بڑا" ;
+lin bike_N = P.mkN "سایکل" feminine ;
-  bike_N = P.mkN "سایکل" feminine ;
+lin bird_N = P.mkN "پرندہ" ;
-  bird_N = P.mkN "پرندہ" ;
+lin black_A =  mkA "کالا" ;
-  black_A =  mkA "کالا" ;
+lin blue_A = mkA "نیلا" ;
-  blue_A = mkA "نیلا" ;
+lin boat_N = P.mkN "کشتی" ;
-  boat_N = P.mkN "کشتی" ;
+lin book_N = P.mkN "کتاب" feminine ;
-  book_N = P.mkN "کتاب" feminine ;
+lin boot_N = P.mkN "جوتا" ;
-  boot_N = P.mkN "جوتا" ;
+lin boss_N = P.mkN "صاحب" ;
-  boss_N = P.mkN "صاحب" ;
+lin boy_N = P.mkN "لڑکا" ;
-  boy_N = P.mkN "لڑکا" ;
+lin bread_N = P.mkN "روٹی" ;
-  bread_N = P.mkN "روٹی" ;
+lin break_V2 = mkV2 (mkV "توڑنا") ;
-  break_V2 = mkV2 (mkV "توڑنا") ;
+lin broad_A = mkA "کھلا" ;
-  broad_A = mkA "کھلا" ;
+lin brother_N2 = mkN2 (P.mkN "بھای") (mkPrep "کا" "کا") "کے" ; --not correct
-  brother_N2 = mkN2 (P.mkN "بھای") (mkPrep "کا" "کا") "کے" ; --not correct
+lin brown_A = mkA "نسواری" ;
-  brown_A = mkA "نسواری" ;
+lin butter_N = P.mkN "مکھن" ;
-  butter_N = P.mkN "مکھن" ;
+lin buy_V2 = mkV2 (mkV "خریدنا") "کو";
-  buy_V2 = mkV2 (mkV "خریدنا") "کو";
+lin camera_N = P.mkN "کیمرہ" ;
-  camera_N = P.mkN "کیمرہ" ;
+lin cap_N = P.mkN "ٹوپی" ;
-  cap_N = P.mkN "ٹوپی" ;
+lin car_N = P.mkN "گاڑی" ;
-  car_N = P.mkN "گاڑی" ;
+lin carpet_N = P.mkN "تپائی" ;
-  carpet_N = P.mkN "تپائی" ;
+lin cat_N = P.mkN "بلی" ;
-  cat_N = P.mkN "بلی" ;
+lin ceiling_N = P.mkN "چھت" feminine ;
-  ceiling_N = P.mkN "چھت" feminine ;
+lin chair_N = P.mkN "کرسی" ;
-  chair_N = P.mkN "کرسی" ;
+lin cheese_N = P.mkN "پنیر" feminine ;
-  cheese_N = P.mkN "پنیر" feminine ;
+lin child_N = P.mkN "بچہ" ;
-  child_N = P.mkN "بچہ"  ;
+lin church_N = mkCmpdNoun "گرجا" (P.mkN "گھر") ;
-  church_N = mkCmpdNoun "گرجا" (P.mkN "گھر") ;
+lin city_N = P.mkN "شہر"  ;
-  city_N = P.mkN "شہر"  ;
+lin clean_A = mkA "صاف" ;
-  clean_A = mkA "صاف" ;
+lin clever_A = mkA "ہوشیار" ;  
-  clever_A = mkA "ہوشیار" ;  
+lin close_V2 =  mkV2 (compoundV "بند" do_V2); 
-  close_V2 =  mkV2 (compoundV "بند" do_V2); 
+lin coat_N = P.mkN "کوٹ" ;
-  coat_N = P.mkN "کوٹ" ;
+lin cold_A = mkA "ٹھنڈا" ;
-  cold_A = mkA "ٹھنڈا" ;
+lin come_V = mkV "آنا" ;
-  come_V = mkV "آنا" ;
+lin computer_N = P.mkN "کمپیوٹر" ;
-  computer_N = P.mkN "کمپیوٹر" ;
+lin country_N = P.mkN "ملک" ;
-  country_N = P.mkN "ملک" ;
+lin cousin_N = mkCmpdNoun "چچا" (P.mkN "زاد") ; -- a compund noun made of two nouns
-  cousin_N = mkCmpdNoun "چچا" (P.mkN "زاد") ; -- a compund noun made of two nouns
+lin cow_N = P.mkN "گاے" feminine ;
-  cow_N = P.mkN "گاے" feminine ;
+lin die_V = mkV "مرنا" ;
-  die_V = mkV "مرنا" ;
+lin dirty_A = mkA "گندا" ;
-  dirty_A = mkA "گندا" ;
+lin distance_N3 = mkN3 (P.mkN "فاصلہ") (mkPrep "کا" "کا") "کے" "سے"  ;
-  distance_N3 = mkN3 (P.mkN "فاصلہ") (mkPrep "کا" "کا") "کے" "سے"  ;
+lin doctor_N = P.mkN "معالج" ;
-  doctor_N = P.mkN "معالج" ;
+lin dog_N = P.mkN "کتا" ;
-  dog_N = P.mkN "کتا" ;
+lin door_N = P.mkN "دروازہ" ;
-  door_N = P.mkN "دروازہ" ;
+lin drink_V2 = mkV2 (mkV "پینا");
-  drink_V2 = mkV2 (mkV "پینا");
+lin easy_A2V = mkA "آسان" "" ;
-  easy_A2V = mkA "آسان" "" ;
+lin eat_V2 = mkV2 (mkV "کھانا") "" ;
-  eat_V2 = mkV2 (mkV "کھانا") "" ;
+lin empty_A = mkA "خالی" ;
-  empty_A = mkA "خالی" ;
+lin enemy_N = P.mkN "دشمن" ;
-  enemy_N = P.mkN "دشمن" ;
+lin factory_N = P.mkN "کارخانہ" ;
-  factory_N = P.mkN "کارخانہ" ;
+lin father_N2 = mkN2 (P.mkN "ابا") (mkPrep "کا" "کا") "کے"  ;
-  father_N2 = mkN2 (P.mkN "ابا") (mkPrep "کا" "کا") "کے"  ;
+lin fear_VS = mkV "ڈرنا";
-  fear_VS = mkV "ڈرنا";
+lin find_V2 = mkV2 (mkV "پانا") ;
-  find_V2 = mkV2 (mkV "پانا") ;
+lin fish_N = P.mkN "مچھلی" ;
-  fish_N = P.mkN "مچھلی" ;
+lin floor_N = P.mkN "فرش" ;
-  floor_N = P.mkN "فرش" ;
+lin forget_V2 = mkV2 (mkV "بھولنا")  ;
-  forget_V2 = mkV2 (mkV "بھولنا")  ;
+lin fridge_N = P.mkN "فریج" ;
-  fridge_N = P.mkN "فریج" ;
+lin friend_N = P.mkN "دوست" masculine ;
-  friend_N = P.mkN "دوست" masculine ;
+lin fruit_N = P.mkN "پھل" ;
-  fruit_N = P.mkN "پھل" ;
 --  fun_AV = mkAV (regA "f?ن") ;
-  garden_N = P.mkN "باغ" ;
+lin garden_N = P.mkN "باغ" ;
-  girl_N = P.mkN "لڑکی" ;
+lin girl_N = P.mkN "لڑکی" ;
-  glove_N = P.mkN "دستانہ" ;
+lin glove_N = P.mkN "دستانہ" ;
-  gold_N = P.mkN "سونا" ;
+lin gold_N = P.mkN "سونا" ;
-  good_A = mkA "اچھا" ;
+lin good_A = mkA "اچھا" ;
-  go_V = mkV "جانا" ;
+lin go_V = mkV "جانا" ;
-  green_A = mkA "سبز" ;
+lin green_A = mkA "سبز" ;
-  harbour_N = mkCmpdNoun "بندر" (P.mkN "گاہ") ;
+lin harbour_N = mkCmpdNoun "بندر" (P.mkN "گاہ") ;
-  hate_V2 = mkV2 (compoundV "نفرت" do_V2) ;
+lin hate_V2 = mkV2 (compoundV "نفرت" do_V2) ;
-  hat_N = P.mkN "ٹوپی" ;
+lin hat_N = P.mkN "ٹوپی" ;
 --  have_V2 = dirV2 (mk5V "ہa?ع" "ہاس" "ہاد" "ہاد" "ہa??نگ") ;
-  hear_V2 = mkV2 (mkV "سننا") ;
+lin hear_V2 = mkV2 (mkV "سننا") ;
-  hill_N = P.mkN "پہاڑی" ;
+lin hill_N = P.mkN "پہاڑی" ;
-  hope_VS = (compoundV "امید" do_V2);
+lin hope_VS = (compoundV "امید" do_V2);
-  horse_N = P.mkN "گھوڑا" ;
+lin horse_N = P.mkN "گھوڑا" ;
-  hot_A = mkA "گرم" ;
+lin hot_A = mkA "گرم" ;
-  house_N = P.mkN "گھر" ;
+lin house_N = P.mkN "گھر" ;
-  important_A = mkA "اہم" ;
+lin important_A = mkA "اہم" ;
-  industry_N = P.mkN "صنعت" feminine ;
+lin industry_N = P.mkN "صنعت" feminine ;
-  iron_N = P.mkN "لوہا" ;
+lin iron_N = P.mkN "لوہا" ;
-  king_N = P.mkN "بادشاہ" ;
+lin king_N = P.mkN "بادشاہ" ;
-  know_V2 = mkV2 (mkV "جاننا") ;
+lin know_V2 = mkV2 (mkV "جاننا") ;
-  know_VS = (mkV "جاننا") ;
+lin know_VS = (mkV "جاننا") ;
-  know_VQ = (mkV "جاننا") ;
+lin know_VQ = (mkV "جاننا") ;
-  lake_N = P.mkN "جھیل" feminine ;
+lin lake_N = P.mkN "جھیل" feminine ;
-  lamp_N = P.mkN "لیمپ" ;
+lin lamp_N = P.mkN "لیمپ" ;
-  learn_V2 = mkV2 (mkV "سیکھنا") ;
+lin learn_V2 = mkV2 (mkV "سیکھنا") ;
-  leather_N = P.mkN "چمڑا" ;
+lin leather_N = P.mkN "چمڑا" ;
-  leave_V2 = mkV2 (mkV "جانا") ;
+lin leave_V2 = mkV2 (mkV "جانا") ;
-  like_V2 = mkV2 (compoundV "پسند" do_V2) "کو";
+lin like_V2 = mkV2 (compoundV "پسند" do_V2) "کو";
-  listen_V2 = mkV2 (mkV "سننا") ;
+lin listen_V2 = mkV2 (mkV "سننا") ;
-  live_V = mkV "رہنا" ; ---- touch
+lin live_V = mkV "رہنا" ; ---- touch
-  long_A = mkA "لمبا" ;
+lin long_A = mkA "لمبا" ;
-  lose_V2 = mkV2 (compoundV "کھو" do_V2) ;
+lin lose_V2 = mkV2 (compoundV "کھو" do_V2) ;
-  love_N = P.mkN "محبت" ;
+lin love_N = P.mkN "محبت" ;
-  love_V2 = mkV2 (compoundV "پیار" do_V2) "کو";
+lin love_V2 = mkV2 (compoundV "پیار" do_V2) "کو";
-  man_N = P.mkN "آدمی" "آدمی" "آدمی" "آدمی" "آدمیوں" "آدمیو" masculine ; 
+lin man_N = P.mkN "آدمی" "آدمی" "آدمی" "آدمی" "آدمیوں" "آدمیو" masculine ; 
-  married_A2 = mkA "شادی شدہ" "سے" ;
+lin married_A2 = mkA "شادی شدہ" "سے" ;
-  meat_N = P.mkN "گوشت" ;
+lin meat_N = P.mkN "گوشت" ;
-  milk_N = P.mkN "دودھ" ;
+lin milk_N = P.mkN "دودھ" ;
-  moon_N = P.mkN "چاند" ;
+lin moon_N = P.mkN "چاند" ;
   mother_N2 = mkN2 (P.mkN "ماں") (mkPrep "کی" "کی") "کے";   -- not covered need to be discussed
-  mountain_N = P.mkN "پہاڑی" ;
+lin mountain_N = P.mkN "پہاڑی" ;
-  music_N = P.mkN "موسیقی" ;
+lin music_N = P.mkN "موسیقی" ;
-  narrow_A = mkA "باریک" ;
+lin narrow_A = mkA "باریک" ;
-  new_A = mkA "نیا" ;
+lin new_A = mkA "نیا" ;
-  newspaper_N = P.mkN "اخبار" ;
+lin newspaper_N = P.mkN "اخبار" ;
-  oil_N = P.mkN "تیل" ;
+lin oil_N = P.mkN "تیل" ;
-  old_A = mkA "بوڑھا" ;
+lin old_A = mkA "بوڑھا" ;
-  open_V2 = mkV2 (mkV "کھولنا") ;
+lin open_V2 = mkV2 (mkV "کھولنا") ;
-  paint_V2A = mkV2 (compoundV "رنگ" do_V2) ;
+lin paint_V2A = mkV2 (compoundV "رنگ" do_V2) ;
-  paper_N = P.mkN "کاغز" ;
+lin paper_N = P.mkN "کاغز" ;
-  paris_PN = mkPN "پیرس" ;
+lin paris_PN = mkPN "پیرس" ;
-  peace_N = P.mkN "امن" ;
+lin peace_N = P.mkN "امن" ;
-  pen_N = P.mkN "پنسل" ;
+lin pen_N = P.mkN "پنسل" ;
-  planet_N = P.mkN "سیارہ" ;
+lin planet_N = P.mkN "سیارہ" ;
-  plastic_N = P.mkN "پلاسٹک" ;
+lin plastic_N = P.mkN "پلاسٹک" ;
-  play_V2 = mkV2 (mkV "کھیلنا") ;
+lin play_V2 = mkV2 (mkV "کھیلنا") ;
-  policeman_N = mkCmpdNoun "پولیس" (P.mkN "والا") ; 
+lin policeman_N = mkCmpdNoun "پولیس" (P.mkN "والا") ; 
-  priest_N = (P.mkN "پیغمبر") ;
+lin priest_N = (P.mkN "پیغمبر") ;
 --  probable_AS = mkAS (regA "پr?بابلع") ;
-  queen_N = P.mkN "شہزادی" ;
+lin queen_N = P.mkN "شہزادی" ;
-  radio_N = P.mkN "ریڈیو" ;
+lin radio_N = P.mkN "ریڈیو" ;
-  rain_V0 = compoundV "بارش" (mkV "ہونا" ) ;
+lin rain_V0 = compoundV "بارش" (mkV "ہونا" ) ;
-  read_V2 = mkV2 (mkV "پڑھنا");
+lin read_V2 = mkV2 (mkV "پڑھنا");
-  red_A = mkA "لال" ;
+lin red_A = mkA "لال" ;
-  religion_N = P.mkN "مزہب" ;
+lin religion_N = P.mkN "مزہب" ;
-  restaurant_N = P.mkN "ہوٹل" ;
+lin restaurant_N = P.mkN "ہوٹل" ;
 --  river_N = P.mkN "دریا" masculine ;
-  rock_N = P.mkN "چٹان" ;
+lin rock_N = P.mkN "چٹان" ;
 --  roof_N = P.mkN "چھت"   masculine ;
-  rubber_N = P.mkN "ربڑ" ;
+lin rubber_N = P.mkN "ربڑ" ;
-  run_V = mkV "دوڑنا" ;
+lin run_V = mkV "دوڑنا" ;
-  say_VS = mkV "کہنا" ;
+lin say_VS = mkV "کہنا" ;
-  school_N = P.mkN "سکول" ;
+lin school_N = P.mkN "سکول" ;
-  science_N = P.mkN "سانس" ;
+lin science_N = P.mkN "سانس" ;
-  sea_N = P.mkN "سمندر" ;
+lin sea_N = P.mkN "سمندر" ;
-  seek_V2 = mkV2 (compoundV "تلاش" do_V2) ;
+lin seek_V2 = mkV2 (compoundV "تلاش" do_V2) ;
-  see_V2 = mkV2 (mkV "دیکھنا") ;
+lin see_V2 = mkV2 (mkV "دیکھنا") ;
-  sell_V3 = mkV3 (mkV "بیچنا") "کو" "";
+lin sell_V3 = mkV3 (mkV "بیچنا") "کو" "";
-  send_V3 = mkV3 (mkV "بھیجنا") "کو" "";
+lin send_V3 = mkV3 (mkV "بھیجنا") "کو" "";
-  sheep_N = P.mkN "بھیڑ" feminine ;
+lin sheep_N = P.mkN "بھیڑ" feminine ;
-  ship_N = P.mkN "جہاز" ;
+lin ship_N = P.mkN "جہاز" ;
-  shirt_N = P.mkN "قمیص" feminine;
+lin shirt_N = P.mkN "قمیص" feminine;
-  shoe_N = P.mkN "جوتا" ;
+lin shoe_N = P.mkN "جوتا" ;
-  shop_N = P.mkN "دوکان" feminine ;
+lin shop_N = P.mkN "دوکان" feminine ;
-  short_A = mkA "چھوٹا" ;
+lin short_A = mkA "چھوٹا" ;
-  silver_N = P.mkN "چاندی" ;
+lin silver_N = P.mkN "چاندی" ;
-  sister_N = P.mkN "بہن" feminine ;
+lin sister_N = P.mkN "بہن" feminine ;
-  sleep_V = mkV "سونا" ;
+lin sleep_V = mkV "سونا" ;
-  small_A = mkA "چھوٹا" ;
+lin small_A = mkA "چھوٹا" ;
-  snake_N = P.mkN "سانپ" ;
+lin snake_N = P.mkN "سانپ" ;
-  sock_N = P.mkN "جراب" feminine ;
+lin sock_N = P.mkN "جراب" feminine ;
-  speak_V2 = mkV2 (mkV "بولنا") ;
+lin speak_V2 = mkV2 (mkV "بولنا") ;
-  star_N = P.mkN "ستارا" ;
+lin star_N = P.mkN "ستارا" ;
-  steel_N = P.mkN "سٹیل" ;
+lin steel_N = P.mkN "سٹیل" ;
-  stone_N = P.mkN "پتھر" ;
+lin stone_N = P.mkN "پتھر" ;
-  stove_N = P.mkN "چولہا" ;
+lin stove_N = P.mkN "چولہا" ;
-  student_N = mkCmpdNoun "طالب" (P.mkN "علم") ;
+lin student_N = mkCmpdNoun "طالب" (P.mkN "علم") ;
-  stupid_A = mkA "احمق" ;
+lin stupid_A = mkA "احمق" ;
-  sun_N = P.mkN "سورج" ;
+lin sun_N = P.mkN "سورج" ;
-  switch8off_V2 = mkV2 (mkV "چلانا") ;
+lin switch8off_V2 = mkV2 (mkV "چلانا") ;
-  switch8on_V2 = mkV2 (compoundV "بند" do_V2) ;
+lin switch8on_V2 = mkV2 (compoundV "بند" do_V2) ;
-  table_N = P.mkN "میز" feminine ;
+lin table_N = P.mkN "میز" feminine ;
-  talk_V3 = mkV3 (mkV "بولنا") "سے" "[کے بارے میN]";
+lin talk_V3 = mkV3 (mkV "بولنا") "سے" "[کے بارے میN]";
-  teacher_N = P.mkN "استاد" ;
+lin teacher_N = P.mkN "استاد" ;
-  teach_V2 = mkV2 (mkV "پڑھنا") ;
+lin teach_V2 = mkV2 (mkV "پڑھنا") ;
-  television_N = P.mkN "تیلیویژن" ;
+lin television_N = P.mkN "تیلیویژن" ;
-  thick_A = mkA "موٹا" ;
+lin thick_A = mkA "موٹا" ;
-  thin_A = mkA "پتلا" ;
+lin thin_A = mkA "پتلا" ;
-  train_N = P.mkN "گاڑی" ;
+lin train_N = P.mkN "گاڑی" ;
-  travel_V = (compoundV "سفر" do_V2) ;
+lin travel_V = (compoundV "سفر" do_V2) ;
 --  tree_N = P.mkN "درخت" masculine ;
 -- ---- trousers_N = P.mkN "تr??سعرس" ;
-  ugly_A = mkA "بدصورت" ;
+lin ugly_A = mkA "بدصورت" ;
-  understand_V2 = mkV2 (mkV "سمجھنا") ;
+lin understand_V2 = mkV2 (mkV "سمجھنا") ;
-  university_N = P.mkN "یونیورسٹی" ;
+lin university_N = P.mkN "یونیورسٹی" ;
-  village_N = P.mkN "گاوں" ;
+lin village_N = P.mkN "گاوں" ;
-  wait_V2 = mkV2 (compoundV "انتظار" do_V2) ;
+lin wait_V2 = mkV2 (compoundV "انتظار" do_V2) ;
-  walk_V = mkV "چلنا" ;
+lin walk_V = mkV "چلنا" ;
-  warm_A = mkA "گرم" ;
+lin warm_A = mkA "گرم" ;
-  war_N = P.mkN "جنگ" ;
+lin war_N = P.mkN "جنگ" ;
-  watch_V2 = mkV2 (mkV "دیکھنا") ;
+lin watch_V2 = mkV2 (mkV "دیکھنا") ;
-  water_N = P.mkN "پانی" ; -- not covered masculine ending with y
+lin water_N = P.mkN "پانی" ; -- not covered masculine ending with y
-  white_A = mkA "سفید" ;
+lin white_A = mkA "سفید" ;
-  window_N = P.mkN "کھڑکی" ;
+lin window_N = P.mkN "کھڑکی" ;
-  wine_N = P.mkN "شراب" feminine ;
+lin wine_N = P.mkN "شراب" feminine ;
-  win_V2 = mkV2 (mkV "جیتنا") ;
+lin win_V2 = mkV2 (mkV "جیتنا") ;
-  woman_N = P.mkN "عورت" feminine ;
+lin woman_N = P.mkN "عورت" feminine ;
-  wonder_VQ = compoundV "حیران" (mkV "ہونا") ;
+lin wonder_VQ = compoundV "حیران" (mkV "ہونا") ;
-  wood_N = P.mkN "لکڑی" ;
+lin wood_N = P.mkN "لکڑی" ;
-  write_V2 = mkV2 (mkV "لکھنا") ;
+lin write_V2 = mkV2 (mkV "لکھنا") ;
-  yellow_A = mkA "پیلا" ;
+lin yellow_A = mkA "پیلا" ;
-  young_A = mkA "جوان" ;
+lin young_A = mkA "جوان" ;
-  do_V2 = mkV2 (mkV "کرنا")  ;
+lin do_V2 = mkV2 (mkV "کرنا")  ;
-  now_Adv = mkAdv "اب" ;
+lin now_Adv = mkAdv "اب" ;
-  already_Adv = mkAdv "[پہلے ہy]" ;
+lin already_Adv = mkAdv "[پہلے ہy]" ;
-  song_N = P.mkN "گانا" ;
+lin song_N = P.mkN "گانا" ;
-  add_V3 = mkV3 (compoundV "اضافہ" do_V2) "" "" ;
+lin add_V3 = mkV3 (compoundV "اضافہ" do_V2) "" "" ;
-  number_N = P.mkN "ہندسہ" ;
+lin number_N = P.mkN "ہندسہ" ;
-  put_V2 = mkV2 (mkV "ڈالنا") ;
+lin put_V2 = mkV2 (mkV "ڈالنا") ;
-  stop_V = mkV "رکنا"  ;
+lin stop_V = mkV "رکنا"  ;
-  jump_V = mkV "چھلانگنا" ;
+lin jump_V = mkV "چھلانگنا" ;
 
-  left_Ord = {s = "بایاں" ; n = singular};
+lin left_Ord = {s = "بایاں" ; n = singular};
-  right_Ord = {s= "دایاں" ; n = singular};
+lin right_Ord = {s= "دایاں" ; n = singular};
-  far_Adv = mkAdv "دور" ;
+lin far_Adv = mkAdv "دور" ;
-  correct_A = mkA "صیح" ;
+lin correct_A = mkA "صیح" ;
-  dry_A = mkA "خشک" ;
+lin dry_A = mkA "خشک" ;
-  dull_A = mkA "نالایق" ;
+lin dull_A = mkA "نالایق" ;
-  full_A = mkA "مکمل" ;
+lin full_A = mkA "مکمل" ;
-  heavy_A = mkA "بھاری" ;
+lin heavy_A = mkA "بھاری" ;
-  near_A = mkA "قریبی" ;
+lin near_A = mkA "قریبی" ;
-  rotten_A = mkA "خراب" ;
+lin rotten_A = mkA "خراب" ;
-  round_A = mkA "گول" ;
+lin round_A = mkA "گول" ;
-  sharp_A = mkA "تیز" ;
+lin sharp_A = mkA "تیز" ;
-  smooth_A = mkA "ہموار" ;
+lin smooth_A = mkA "ہموار" ;
-  straight_A = mkA "سیدھا" ;
+lin straight_A = mkA "سیدھا" ;
-  wet_A = mkA "گیلا" ; ----
+lin wet_A = mkA "گیلا" ; ----
-  wide_A = mkA "کھلا" ;
+lin wide_A = mkA "کھلا" ;
-  animal_N = P.mkN "جانور" ;
+lin animal_N = P.mkN "جانور" ;
-  ashes_N = P.mkN "راکھ" feminine; -- FIXME: plural only?
+lin ashes_N = P.mkN "راکھ" feminine; -- FIXME: plural only?
-  back_N = P.mkN "قمر" feminine ;
+lin back_N = P.mkN "قمر" feminine ;
-  bark_N = P.mkN "بارک" ;
+lin bark_N = P.mkN "بارک" ;
-  belly_N = P.mkN "دھنی" ;
+lin belly_N = P.mkN "دھنی" ;
-  blood_N = P.mkN "خون" ;
+lin blood_N = P.mkN "خون" ;
-  bone_N = P.mkN "ہڈی" ;
+lin bone_N = P.mkN "ہڈی" ;
-  breast_N = P.mkN "چھاتی" ;
+lin breast_N = P.mkN "چھاتی" ;
-  cloud_N = P.mkN "بادل" ;
+lin cloud_N = P.mkN "بادل" ;
-  day_N = P.mkN "دن" ;
+lin day_N = P.mkN "دن" ;
-  dust_N = P.mkN "دھول" ;
+lin dust_N = P.mkN "دھول" ;
-  ear_N = P.mkN "کان" ;
+lin ear_N = P.mkN "کان" ;
-  earth_N = P.mkN "زمین" feminine ;
+lin earth_N = P.mkN "زمین" feminine ;
-  egg_N = P.mkN "انڈہ" ;
+lin egg_N = P.mkN "انڈہ" ;
-  eye_N = P.mkN "آنکھ" feminine ;
+lin eye_N = P.mkN "آنکھ" feminine ;
-  fat_N = P.mkN "موٹا" ;
+lin fat_N = P.mkN "موٹا" ;
-  feather_N = P.mkN "پر" ;
+lin feather_N = P.mkN "پر" ;
-  fingernail_N = P.mkN "ناخن" ;
+lin fingernail_N = P.mkN "ناخن" ;
-  fire_N = P.mkN "آگ" feminine ;
+lin fire_N = P.mkN "آگ" feminine ;
-  flower_N = P.mkN "پھول" ;
+lin flower_N = P.mkN "پھول" ;
-  fog_N = P.mkN "دھند" feminine ;
+lin fog_N = P.mkN "دھند" feminine ;
-  foot_N = P.mkN "پاوں" ; -- not properly covered need to be discussed
+lin foot_N = P.mkN "پاوں" ; -- not properly covered need to be discussed
-  forest_N = P.mkN "جنگل" ;
+lin forest_N = P.mkN "جنگل" ;
-  grass_N = P.mkN "گھاس" feminine ;
+lin grass_N = P.mkN "گھاس" feminine ;
-  guts_N = P.mkN "گٹ" ; -- FIXME: no singular
+lin guts_N = P.mkN "گٹ" ; -- FIXME: no singular
-  hair_N = P.mkN "بال" ;
+lin hair_N = P.mkN "بال" ;
-  hand_N = P.mkN "ہاتھ" ;
+lin hand_N = P.mkN "ہاتھ" ;
-  head_N = P.mkN "سر" ;
+lin head_N = P.mkN "سر" ;
-  heart_N = P.mkN "دل" ;
+lin heart_N = P.mkN "دل" ;
-  horn_N = P.mkN "گھنٹی" ;
+lin horn_N = P.mkN "گھنٹی" ;
-  husband_N = P.mkN "شوہر" ;
+lin husband_N = P.mkN "شوہر" ;
-  ice_N = P.mkN "برف" feminine ;
+lin ice_N = P.mkN "برف" feminine ;
-  knee_N = P.mkN "کہنی" ;
+lin knee_N = P.mkN "کہنی" ;
-  leaf_N = P.mkN "پتہ" ;
+lin leaf_N = P.mkN "پتہ" ;
-  leg_N = P.mkN "ٹانگ" feminine ;
+lin leg_N = P.mkN "ٹانگ" feminine ;
-  liver_N = P.mkN "جگر" ;
+lin liver_N = P.mkN "جگر" ;
-  louse_N = P.mkN "گھر" ;
+lin louse_N = P.mkN "گھر" ;
-  mouth_N = P.mkN "منہ" ;
+lin mouth_N = P.mkN "منہ" ;
-  name_N = P.mkN "نام" ;
+lin name_N = P.mkN "نام" ;
-  neck_N = P.mkN "گردن" feminine ;
+lin neck_N = P.mkN "گردن" feminine ;
-  night_N = P.mkN "رات" feminine ;
+lin night_N = P.mkN "رات" feminine ;
-  nose_N = P.mkN "ناک" ;
+lin nose_N = P.mkN "ناک" ;
-  person_N = P.mkN "شخص" ;
+lin person_N = P.mkN "شخص" ;
-  rain_N = P.mkN "بارش" feminine ;
+lin rain_N = P.mkN "بارش" feminine ;
-  road_N = P.mkN "سڑک" ;
+lin road_N = P.mkN "سڑک" ;
-  root_N = P.mkN "جڑ" feminine ;
+lin root_N = P.mkN "جڑ" feminine ;
-  rope_N = P.mkN "رسی" ;
+lin rope_N = P.mkN "رسی" ;
-  salt_N = P.mkN "نمک" feminine ;
+lin salt_N = P.mkN "نمک" feminine ;
-  sand_N = P.mkN "ریت" feminine ;
+lin sand_N = P.mkN "ریت" feminine ;
-  seed_N = P.mkN "بیج"  ;
+lin seed_N = P.mkN "بیج"  ;
-  skin_N = P.mkN "جلد" feminine ;
+lin skin_N = P.mkN "جلد" feminine ;
-  sky_N = P.mkN "آسمان" ;
+lin sky_N = P.mkN "آسمان" ;
-  smoke_N = P.mkN "دھواں"; -- singular masc nouns ending with aN,wN yet to be implemented
+lin smoke_N = P.mkN "دھواں"; -- singular masc nouns ending with aN,wN yet to be implemented
-  snow_N = P.mkN "برف" feminine ;
+lin snow_N = P.mkN "برف" feminine ;
-  stick_N = P.mkN "چھڑی" ;
+lin stick_N = P.mkN "چھڑی" ;
-  tail_N = P.mkN "دم" ;
+lin tail_N = P.mkN "دم" ;
-  tongue_N = P.mkN "زبان" feminine ;
+lin tongue_N = P.mkN "زبان" feminine ;
 --  tooth_N = P.mkN "دانت" masculine;
-  wife_N = P.mkN "بیوی" ;
+lin wife_N = P.mkN "بیوی" ;
-  wind_N = P.mkN "آندھی" ;
+lin wind_N = P.mkN "آندھی" ;
-  wing_N = P.mkN "پر" ;
+lin wing_N = P.mkN "پر" ;
-  worm_N = P.mkN "گرم" ;
+lin worm_N = P.mkN "گرم" ;
-  year_N = P.mkN "سال" ;
+lin year_N = P.mkN "سال" ;
-  blow_V = mkV "چلنا" ;
+lin blow_V = mkV "چلنا" ;
-  breathe_V = compoundV "سانس" (mkV "لینا" ) ;
+lin breathe_V = compoundV "سانس" (mkV "لینا" ) ;
-  burn_V = mkV "جلنا" ;
+lin burn_V = mkV "جلنا" ;
-  dig_V = mkV "کھودنا" ;
+lin dig_V = mkV "کھودنا" ;
-  fall_V = mkV "گرنا" ;
+lin fall_V = mkV "گرنا" ;
-  float_V = mkV "تیرنا" ;
+lin float_V = mkV "تیرنا" ;
-  flow_V = mkV  "بہنا" ;
+lin flow_V = mkV  "بہنا" ;
-  fly_V = mkV "اڑنا" ;
+lin fly_V = mkV "اڑنا" ;
-  freeze_V = mkV "جمنا";
+lin freeze_V = mkV "جمنا";
-  give_V3 = mkV3 (mkV "دینا") "کو" "";
+lin give_V3 = mkV3 (mkV "دینا") "کو" "";
-  laugh_V = mkV "ہنسنا" ;
+lin laugh_V = mkV "ہنسنا" ;
 --  lie_N = P.mkN "جھوت" masculine ;
-  lie_V = compoundV "جھوٹ" (mkV "بولنا" );
+lin lie_V = compoundV "جھوٹ" (mkV "بولنا" );
-  play_V = mkV "کھیلنا" ;
+lin play_V = mkV "کھیلنا" ;
-  sew_V = mkV "سینا" ;
+lin sew_V = mkV "سینا" ;
-  sing_V = mkV "گانا" ;
+lin sing_V = mkV "گانا" ;
-  sit_V = mkV "بیٹھنا" ;
+lin sit_V = mkV "بیٹھنا" ;
-  smell_V = mkV "سونگنا" ;
+lin smell_V = mkV "سونگنا" ;
-  spit_V = mkV "تھوکنا" ;
+lin spit_V = mkV "تھوکنا" ;
-  stand_V = compoundV "کھڑے" (mkV "ہونا" );
+lin stand_V = compoundV "کھڑے" (mkV "ہونا" );
-  swell_V = mkV "سوجھنا" ;
+lin swell_V = mkV "سوجھنا" ;
-  swim_V = mkV "تیرنا" ;
+lin swim_V = mkV "تیرنا" ;
-  think_V = mkV "سوچنا" ;
+lin think_V = mkV "سوچنا" ;
-  turn_V = mkV "مڑنا";
+lin turn_V = mkV "مڑنا";
-  vomit_V = compoundV "التی" (mkV "کرنا") ;
+lin vomit_V = compoundV "التی" (mkV "کرنا") ;
-  bite_V2 = mkV2 (mkV "کاٹنا") ;
+lin bite_V2 = mkV2 (mkV "کاٹنا") ;
-  count_V2 = mkV2 (mkV "گننا") ;
+lin count_V2 = mkV2 (mkV "گننا") ;
-  cut_V2 = mkV2 (mkV "کاتنا") ;
+lin cut_V2 = mkV2 (mkV "کاتنا") ;
-  fear_V2 = mkV2 (mkV "ڈرنا") ;
+lin fear_V2 = mkV2 (mkV "ڈرنا") ;
-  fight_V2 = mkV2 (mkV "لڑنا") ;
+lin fight_V2 = mkV2 (mkV "لڑنا") ;
-  hit_V2 = mkV2 (compoundV "ٹھوکر" (mkV "مارنا" ));
+lin hit_V2 = mkV2 (compoundV "ٹھوکر" (mkV "مارنا" ));
-  hold_V2 = mkV2 (mkV "پکڑنا") ;
+lin hold_V2 = mkV2 (mkV "پکڑنا") ;
-  hunt_V2 = mkV2 (compoundV "شکار" do_V2);
+lin hunt_V2 = mkV2 (compoundV "شکار" do_V2);
-  kill_V2 =  mkV2 (compoundV "مار" (mkV "ڈالنا" )) ;
+lin kill_V2 = mkV2 (compoundV "مار" (mkV "ڈالنا" )) ;
-  pull_V2 = mkV2 (mkV "کھنچنا");
+lin pull_V2 = mkV2 (mkV "کھنچنا");
-  push_V2 = mkV2 (mkV "دھکیلنا") "کو" ;
+lin push_V2 = mkV2 (mkV "دھکیلنا") "کو" ;
-  rub_V2 = mkV2 (mkV "رگڑنا") ;
+lin rub_V2 = mkV2 (mkV "رگڑنا") ;
-  scratch_V2 = mkV2 (mkV "کھرچنا") "کو" ;
+lin scratch_V2 = mkV2 (mkV "کھرچنا") "کو" ;
-  split_V2 = mkV2 (mkV "بانٹنا") "کو" ;
+lin split_V2 = mkV2 (mkV "بانٹنا") "کو" ;
 --  squeeze_V2 = dirV2 (regV "سq?ععزع") ;
 --  stab_V2 = dirV2 (regDuplV "ستاب") ;
-  suck_V2 = mkV2 (mkV "چوسنا") ;
+lin suck_V2 = mkV2 (mkV "چوسنا") ;
-  throw_V2 = mkV2 (mkV "پھینکنا") ;
+lin throw_V2 = mkV2 (mkV "پھینکنا") ;
-  tie_V2 = mkV2 (mkV "باندھنا") ;
+lin tie_V2 = mkV2 (mkV "باندھنا") ;
-  wash_V2 = mkV2 (mkV "دھونا") ;
+lin wash_V2 = mkV2 (mkV "دھونا") ;
-  wipe_V2 = mkV2 (compoundV "صاف" (mkV "کرنا" ));
+lin wipe_V2 = mkV2 (compoundV "صاف" (mkV "کرنا" ));
 
 ----  other_A = regA "؟تہعر" ;
 
-  grammar_N = P.mkN "گردان" ;
+lin grammar_N = P.mkN "گردان" ;
-  language_N = P.mkN "زبان" feminine ;
+lin language_N = P.mkN "زبان" feminine ;
-  rule_N = P.mkN "اصول" ;
+lin rule_N = P.mkN "اصول" ;
 
-    john_PN = mkPN "جان" ;
+lin   john_PN = mkPN "جان" ;
-    question_N = P.mkN "سوال" ;
+lin   question_N = P.mkN "سوال" ;
-    ready_A = mkA "تیار" ;
+lin   ready_A = mkA "تیار" ;
-    reason_N = P.mkN "وجہ" feminine ;
+lin   reason_N = P.mkN "وجہ" feminine ;
-    today_Adv = mkAdv "آج" ;
+lin   today_Adv = mkAdv "آج" ;
-    uncertain_A = mkA ["غیریقینی"] ;
+lin   uncertain_A = mkA ["غیریقینی"] ;
 
 -- from urdu/DictUrd.gf