diff --git a/lib/src/hindustani/ResHindustani.gf b/lib/src/hindustani/ResHindustani.gf index 53c93da41..9aed2ac1c 100644 --- a/lib/src/hindustani/ResHindustani.gf +++ b/lib/src/hindustani/ResHindustani.gf @@ -228,12 +228,12 @@ param insertObj2 obj vp ** {c2 = vp.c2} ; infVP : Bool -> VPH -> Agr -> Str = \isAux,vp,a -> - vp.obj.s ++ vp.comp ! a ++ vp.inf ; + vp.obj.s ++ vp.ad ++ vp.comp ! a ++ vp.cvp ++ vp.inf ; infVV : Bool -> VPH -> Str = \isAux,vp -> - case isAux of {False => vp.obj.s ++ (vp.comp ! (toAgr Sg Pers1 Masc)) ++ vp.cvp ++ vp.inf ; True => vp.cvp ++ (vp.s ! VPImp).inf ++ vp.obj.s ++ (vp.comp ! (toAgr Sg Pers1 Masc)) } ; + case isAux of {False => vp.obj.s ++ vp.ad ++ (vp.comp ! (toAgr Sg Pers1 Masc)) ++ vp.cvp ++ vp.inf ; True => vp.cvp ++ (vp.s ! VPImp).inf ++ vp.obj.s ++ vp.ad ++ (vp.comp ! (toAgr Sg Pers1 Masc)) } ; infV2V : Bool -> VPH -> Str = \isAux,vp -> - case isAux of {False => vp.obj.s ++ (vp.comp ! (toAgr Sg Pers1 Masc)) ++ (vp.s ! VPInf).fin ++ ky ; True => vp.obj.s ++ (vp.comp ! (toAgr Sg Pers1 Masc)) ++ (vp.s ! VPImp).fin ++ ky}; + case isAux of {False => vp.obj.s ++ vp.ad ++ (vp.comp ! (toAgr Sg Pers1 Masc)) ++ (vp.s ! VPInf).fin ++ ky ; True => vp.obj.s ++ vp.ad ++ (vp.comp ! (toAgr Sg Pers1 Masc)) ++ (vp.s ! VPImp).fin ++ ky}; insertObject : NP -> VPHSlash -> VPH = \np,vps -> { diff --git a/lib/src/urdu/DictUrd2.gf b/lib/src/urdu/DictUrd2.gf index 428a52e4d..27ca61fc5 100644 --- a/lib/src/urdu/DictUrd2.gf +++ b/lib/src/urdu/DictUrd2.gf @@ -287,7 +287,7 @@ lin acropolis_N = mkN "قدیم یونانی بالاحصار" ; lin across_Adv = mkAdv "پار" ; lin acrostic_N = mkN "توشیخ بازی" ; lin acrylic_N = mkN "ايکرولين" ; -lin act_N = mkN "عمل" ; -- from DictUrd +lin act_N = mkN "عمل" "عمل" "عمل" "اعمال" "اعمال" "عملو" Masc; -- from DictUrd lin act_V = compoundV "اداکاری" (mkV "کرنا") ; -- from DictUrd lin act_V2 = mkV2 (compoundV "عمل" (mkV "کرنا")) ; -- lin act_V2V = mkV2 (compoundV "عمل" (mkV "کرنا")) ; @@ -576,7 +576,7 @@ lin after_Adv = mkAdv "بعد از وقت" ; -- from DictUrd lin aftercare_N = mkN "پس از صحت یابی احتیاط" ; lin aftereffect_N = mkN "اثر مابعد" ; lin aftermath_N = mkN "ما حاصل" ; -- from DictUrd -lin afternoon_N = mkN "دو پہر" ; -- from DictUrd +lin afternoon_N = mkN "بعد دوپہر" ; -- from DictUrd lin afterwards_Adv = mkAdv "آیندہ" ; -- from DictUrd lin again_Adv = mkAdv "آیندہ" ; -- from DictUrd lin agape_A = mkA "ہکا بکا" ; @@ -1337,8 +1337,8 @@ lin approximation_N = mkN "قربت" ; lin appurtenance_N = mkN "لواحقین" ; -- from DictUrd lin apr_PN = mkPN "خوبانی" ; lin apricot_N = mkN "خوبانی" ; -- from DictUrd -lin april_N = mkN "سن عیسوی کا چوتھا مہینہ" ; -lin april_PN = mkPN "سن عیسوی کا چوتھا مہینہ" ; +lin april_N = mkN "اپریل" ; --changed +lin april_PN = mkPN "اپریل" ; --changed lin apron_N = mkN "پیش بند" ; lin apropos_A = mkA "مناسب" ; lin apropos_Adv = mkAdv "مناسب" ; @@ -1456,7 +1456,7 @@ lin armorial_A = mkA "نقاہتی" ; lin armour_N = mkN "بکتر" ; -- from DictUrd lin armoured_A = mkA "زرہ بکتر" ; lin armpit_N = mkN "بغل" ; -- from DictUrd -lin army_N = mkN "عسکر" ; -- from DictUrd +lin army_N = mkN "فوج" "فوج" "فوج" "افواج" "افواج" "فوجو" Masc ; -- from DictUrd lin arnica_N = mkN "گاو چشم" ; lin aroma_N = mkN "بو باس" ; -- from DictUrd lin aromatic_A = mkA "مہکتا ہوا" ; -- from DictUrd @@ -3915,7 +3915,7 @@ lin capsicum_N = mkN "شملہ مرچ" ; lin capsize_V = compoundV "الٹ" (mkV "جانا") ; lin capsize_V2 = mkV2 (compoundV "الٹ" (mkV "جانا")) ; lin capstan_N = mkN "لنگر چرخ" ; -lin capsule_N = mkN "گولیاں" ; +lin capsule_N = mkN "گولی" ; lin capt_PN = mkPN "سربراہ" ; lin captain_N = mkN "سربراہ" ; lin captain_V2 = mkV2 (mkV "سربراہ") ; @@ -7254,7 +7254,7 @@ lin decimalize_V2 = mkV2 (compoundV "تحویل اعشاریہ" (mkV "کرنا") lin decimate_V2 = mkV2 (compoundV "تباہ و برباد کر" (mkV "دینا")) ; -- from DictUrd lin decipher_V2 = mkV2 (compoundV "حل" (mkV "کرنا")) ; lin decipherable_A = mkA "حل کے قابل" ; -lin decision_N = mkN "عزم" ; -- from DictUrd +lin decision_N = mkN "فیصلہ" ; -- from DictUrd -- corrected lin decisive_A = mkA "دو ٹوک" ; -- from DictUrd lin deck_N = mkN "عرشہ" ; -- from DictUrd lin deck_V2 = mkV2 (mkV "ڈھکنا") ; -- from DictUrd @@ -8554,7 +8554,7 @@ lin divisible_A = mkA "قابل تقسیم" ; lin division_N = mkN "باب" ; -- from DictUrd lin divisional_A = mkA "تقسیمی" ; lin divisor_N = mkN "مقسوم علیہ" ; -lin divorce_N = mkN "چھوٹ" ; -- from DictUrd +lin divorce_N = mkN "طلاق" ; -- from DictUrd --changed lin divorce_V2 = mkV2 (compoundV "الگ" (mkV "کرنا")) ; -- from DictUrd lin divorcee_N = mkN "طلاق یافتہ عورت" ; lin divot_N = mkN "فن تعمیر" ; @@ -9793,7 +9793,7 @@ lin epitomize_V2 = mkV2 (compoundV "خلاصہ" (mkV "کرنا")) ; lin epoch_N = mkN "عصر" ; -- from DictUrd lin epsom_PN = mkPN "اپسم نمک" ; lin equable_A = mkA "برابر" ; -lin equal_A = mkA "عدیل" ; -- from DictUrd +lin equal_A = mkA "برابر" ; -- from DictUrd -- changed lin equal_N = mkN "جوڑی" ; -- from DictUrd lin equal_V2 = mkV2 (compoundV "برابر" (mkV "کرنا")) ; lin equalitarian_N = mkN "مساوات پسند" ; @@ -10041,8 +10041,8 @@ lin exacting_A = mkA "مشقت طلب" ; lin exaction_N = mkN "استحصال" ; lin exactitude_N = mkN "درستی" ; -- from DictUrd lin exactness_N = mkN "قطعیت" ; -lin exaggerate_V = compoundV "بڑھا چڑھا" (mkV "کر") ; -lin exaggerate_V2 = mkV2 (compoundV "حاشیہ" (mkV "چڑھانا")) ; -- from DictUrd +lin exaggerate_V = compoundV "بڑھا چڑھا کر پیش" (mkV "کرنا") ; +lin exaggerate_V2 = mkV2 (compoundV "بڑھا چڑھا کر پیش" (mkV "کرنا")) ; -- from DictUrd lin exaggeration_N = mkN "بناوٹ" ; -- from DictUrd lin exalt_V2 = mkV2 (mkV "چڑھانا") ; -- from DictUrd lin exaltation_N = mkN "عروج" ; -- from DictUrd @@ -10379,7 +10379,7 @@ lin fabricate_V2 = mkV2 (mkV "بنانا") ; -- from DictUrd lin fabrication_N = mkN "جعل سازی" ; -- from DictUrd lin fabulous_A = mkA "بناوٹی" ; -- from DictUrd lin facade_N = mkN "آگا" ; -- from DictUrd -lin face_N = mkN "آگا" ; -- from DictUrd +lin face_N = mkN "چہرہ" ; -- from DictUrd --changed lin face_V = mkV "رخ" ; lin face_V2 = mkV2 (compoundV "جا" (mkV "بھڑنا")) ; -- from DictUrd lin face_card_N = mkN "تصويری پتہ" ; @@ -10399,7 +10399,7 @@ lin fact_N = mkN "امر" ; -- from DictUrd lin faction_N = mkN "دھڑا" ; -- from DictUrd lin factious_A = mkA "فتنہ انگیز" ; lin factitious_A = mkA "بناوٹی" ; -- from DictUrd -lin factor_N = mkN "عامل" ; -- from DictUrd +lin factor_N = mkN "عمل" "عمل" "عمل" "عوامل" "عوامل" "عواملو" Masc; -- from DictUrd -- manually corrected lin factory_N = mkN "کار خانہ" ; -- from DictUrd lin factotum_N = mkN "خدمت گار" ; -- from DictUrd lin factual_A = mkA "واقعہ کے متعلق" ; @@ -12115,7 +12115,7 @@ lin girth_N = mkN "پیٹی" ; lin gist_N = mkN "خلاصہ" ; -- from DictUrd lin give_N = mkN "دینا" ; lin give_V = mkV "دینا" ; -lin give_V2 = mkV2 (compoundV "عطا" (mkV "کرنا")) ; -- from DictUrd +lin give_V2 = mkV2 (mkV "دینا") ; -- from DictUrd --changed lin giveaway_N = mkN "دغا بازی" ; lin giver_N = mkN "عطا کرنے والا" ; -- from DictUrd lin gizzard_N = mkN "سنگ دانہ" ; @@ -12679,7 +12679,7 @@ lin guard_V = mkV "دربان" ; lin guard_V2 = mkV2 (compoundV "حفاظت" (mkV "کرنا")) ; -- from DictUrd lin guarded_A = mkA "چوکننا" ; -- from DictUrd lin guardhouse_N = mkN "گارڈ ہاوٴس" ; -lin guardian_N = mkN "حافظ" ; -- from DictUrd +lin guardian_N = mkN "محافظ" ; -- from DictUrd lin guardianship_N = mkN "امانت" ; -- from DictUrd lin guardsman_N = mkN "پہرہ دار" ; lin guatemala_PN = mkPN "گوئٹے مالائی" ; @@ -13183,7 +13183,7 @@ lin heap_N = mkN "انبار" ; -- from DictUrd lin heap_V2 = mkV2 (compoundV "ڈھیر" (mkV "لگانا")) ; -- from DictUrd lin heaps_Adv = mkAdv "ڈھیر" ; lin hear_V = mkV "سننا" ; -lin hear_V2 = mkV2 (compoundV "کان" (mkV "دھرنا")) ; -- from DictUrd +lin hear_V2 = mkV2 (mkV "سننا" ) ; -- from DictUrd --lin hear_V2V = mkV2 (mkV "سننا") ; lin hear_VS = mkVS (mkV "سننا") ; lin hearer_N = mkN "سامع" ; -- from DictUrd @@ -13732,7 +13732,7 @@ lin horridness_N = mkN "وحشت انگیزی" ; lin horrific_A = mkA "ڈراؤنا" ; -- from DictUrd lin horrify_V2 = mkV2 (mkV "ڈرانا") ; -- from DictUrd lin horror_N = mkN "فساد" ; -- from DictUrd -lin horse_N = mkN "اسپ" ; -- from DictUrd +lin horse_N = mkN "گوڑا" ; -- from DictUrd --changed lin horse_chestnut_N = mkN "شاہ بلوط بندی" ; lin horse_laugh_N = mkN "بدتمیزی کی ہنسی" ; lin horse_sense_N = mkN "عملی سمجھ بوجھ" ; @@ -14327,7 +14327,7 @@ lin impose_V2 = mkV2 (compoundV "عائد" (mkV "کرنا")) ; -- from Dic lin imposing_A = mkA "عظی?" ; -- from DictUrd lin imposition_N = mkN "بار" ; -- from DictUrd lin impossibility_N = mkN "ناممکنیت" ; -- from DictUrd -lin impossible_A = mkA "انہونی" ; -- from DictUrd +lin impossible_A = mkA "ناممکن" ; -- from DictUrd lin impostor_N = mkN "دغا باز" ; lin imposture_N = mkN "عیاری" ; -- from DictUrd lin impotence_N = mkN "نامردگی" ; -- from DictUrd @@ -14979,7 +14979,7 @@ lin insinuatingly_Adv = mkAdv "اشارہ کرتے ہوۓ" ; lin insinuation_N = mkN "چاپلوسی" ; -- from DictUrd lin insipid_A = mkA "بے لذت" ; -- from DictUrd lin insipidity_N = mkN "بے مزگی" ; -- from DictUrd -lin insist_V = mkV "اصرار" ; +lin insist_V = compoundV "اصرار" (mkV "کرنا") ; lin insist_V2 = mkV2 (compoundV "اصرار" (mkV "کرنا")) ; -- from DictUrd lin insist_VS = mkVS (mkV "اصرار") ; lin insistence_N = mkN "اصرار" ; -- from DictUrd @@ -15518,7 +15518,7 @@ lin jag_V2 = mkV2 (compoundV "دندانے" (mkV "ڈالنا")) ; -- from lin jagged_A = mkA "کٹا پھٹا" ; -- from DictUrd lin jaggy_A = mkA "آڑی ترچھی نوک دار" ; -- from DictUrd lin jaguar_N = mkN "ایک طرح کا تیندوا" ; -- from DictUrd -lin jail_N = mkN "محبس" ; -- from DictUrd +lin jail_N = mkN "جیل" ; -- from DictUrd lin jail_V2 = mkV2 (compoundV "اندر" (mkV "کرنا")) ; -- from DictUrd lin jailer_N = mkN "داروغئ قید خانہ" ; -- from DictUrd lin jalopy_N = mkN "پھٹیچر گاڑی" ; -- from DictUrd @@ -16425,10 +16425,10 @@ lin leatherette_N = mkN "مصنوعی چمڑا" ; lin leatherneck_N = mkN "عوامی" ; lin leathery_A = mkA "سخت" ; lin leave_N = mkN "چھٹی" ; -- from DictUrd -lin leave_V = mkV "رخصت" ; -lin leave_V2 = mkV2 (compoundV "الگ" (mkV "ہونا")) ; -- from DictUrd +lin leave_V = compoundV "چلے" (mkV "جانا") ; +lin leave_V2 = mkV2 (compoundV "چلے" (mkV "جانا")) ; -- from DictUrd --lin leave_V2V = mkV2 (mkV "رخصت") ; -lin leave_VS = mkVS (mkV "رخصت") ; +lin leave_VS = mkVS (compoundV "چلے" (mkV "جانا")) ; lin leave_taking_N = mkN "خدا حافظ کہنا" ; lin leaven_N = mkN "خمیرہ" ; -- from DictUrd lin leaven_V2 = mkV2 (mkV "خمیر") ; @@ -17349,7 +17349,7 @@ lin majestic_A = mkA "عالیشان" ; -- from DictUrd lin majestically_Adv = mkAdv "رعب داب سے" ; -- from DictUrd lin majesty_N = mkN "عظمت" ; -- from DictUrd lin majolica_N = mkN "میجولیکا" ; -lin major_A = mkA "اکبر" ; -- from DictUrd +lin major_A = mkA "بڑا" ; -- from DictUrd -- corrected lin major_N = mkN "اہم" ; lin major_V = mkV "اہم" ; lin major_domo_N = mkN "شاہی محل کا میر سامان" ; @@ -17616,14 +17616,14 @@ lin marque_N = mkN "خر گاہ" ; lin marquee_N = mkN "خیمہ" ; -- from DictUrd lin marquetry_N = mkN "مینا کاری" ; -- from DictUrd lin marquis_N = mkN "نواب" ; -lin marriage_N = mkN "عقد" ; -- from DictUrd +lin marriage_N = mkN "شادی" ; -- from DictUrd --changed lin marriageability_N = mkN "شادی کی صلاحیت" ; lin marriageable_A = mkA "قابل ازدواجیت" ; -- from DictUrd lin married_A = mkA "بیاہتا" ; -- from DictUrd lin marrow_N = mkN "گودا" ; -- from DictUrd lin marrowbone_N = mkN "مغزی ہڈی" ; -lin marry_V = compoundV "بیاہ" (mkV "کرنا") ; -- from DictUrd -lin marry_V2 = mkV2 (compoundV "عقد" (mkV "کرنا")) ; -- from DictUrd +lin marry_V = compoundV "شادی" (mkV "کرنا") ; -- from DictUrd --changed +lin marry_V2 = mkV2 (compoundV "شادی" (mkV "کرنا")) ; -- from DictUrd --changed lin mars_PN = mkPN "مریغ" ; lin marsh_N = mkN "دلدل" ; -- from DictUrd lin marshal_N = mkN "سپہ سالار" ; @@ -17709,7 +17709,7 @@ lin mat_N = mkN "بوریا" ; -- from DictUrd lin mat_V = mkV "چٹائی" ; lin mat_V2 = mkV2 (mkV "چٹائی") ; lin matador_N = mkN "ثور افگن" ; -lin match_N = mkN "جواب" ; -- from DictUrd +lin match_N = mkN "میچ" ; -- from DictUrd lin match_V = mkV "مقابلہ" ; lin match_V2 = mkV2 (compoundV "مناسب" (mkV "ہونا")) ; -- from DictUrd lin match_point_N = mkN "میچ پوائنٹ" ; @@ -18581,7 +18581,7 @@ lin monday_N = mkN "پیر" ; lin monday_PN = mkPN "پیر" ; lin monetary_A = mkA "مالیاتی" ; -- from DictUrd lin monetize_V2 = mkV2 (compoundV "سکہ" (mkV "بنانا")) ; -lin money_N = mkN "دام" ; -- from DictUrd +lin money_N = mkN "پیسے" ; -- from DictUrd --changed lin money_order_N = mkN "منی آرڈر" ; lin moneychanger_N = mkN "خردیا" ; -- from DictUrd lin moneyed_A = mkA "امیر" ; -- from DictUrd @@ -18655,7 +18655,7 @@ lin mood_N = mkN "حال" ; -- from DictUrd lin moodily_Adv = mkAdv "بے زاری سے" ; -- from DictUrd lin moodiness_N = mkN "بے زاری" ; -- from DictUrd lin moody_A = mkA "آزردہ" ; -- from DictUrd -lin moon_N = mkN "بدر" ; -- from DictUrd +lin moon_N = mkN "چاند" ; -- from DictUrd --changed lin moon_V = mkV "چاند" ; lin moon_V2 = mkV2 (mkV "چاند") ; lin moonbeam_N = mkN "چاندنی" ; -- from DictUrd @@ -19242,7 +19242,7 @@ lin neutrality_N = mkN "غیر جانب داری" ; -- from DictUrd lin neutralize_V2 = mkV2 (compoundV "بے تاثیر" (mkV "کرنا")) ; lin neutron_N = mkN "غیر چارج شدہ ذرہ" ; lin nevertheless_Adv = mkAdv "اما" ; -- from DictUrd -lin new_A = mkA "حادس" ; -- from DictUrd +lin new_A = mkA "نیا" ; -- from DictUrd --changed lin new_Adv = mkAdv "نیا" ; lin newcomer_N = mkN "نو وارد" ; -- from DictUrd lin newfangled_A = mkA "اچھوتی اور نئی بات کا مشتاق" ; -- from DictUrd @@ -20995,7 +20995,7 @@ lin permeate_V = compoundV "سرایت" (mkV "کرنا") ; lin permeate_V2 = mkV2 (compoundV "سرائیت" (mkV "کرنا")) ; -- from DictUrd lin permeation_N = mkN "سرائیت" ; -- from DictUrd lin permissible_A = mkA "درست" ; -- from DictUrd -lin permission_N = mkN "بار" ; -- from DictUrd +lin permission_N = mkN "اجازت" ; -- from DictUrd lin permissive_A = mkA "اجازت دینے والا" ; lin permissiveness_N = mkN "جواز" ; lin permit_N = mkN "اجازت دینا" ; @@ -21567,9 +21567,9 @@ lin platypus_N = mkN "بط منقار" ; lin plaudit_N = mkN "تالیاں" ; -- from DictUrd lin plausibility_N = mkN "معقولیت" ; -- from DictUrd lin plausible_A = mkA "چرب زبان" ; -- from DictUrd -lin play_N = mkN "بازیچہ" ; -- from DictUrd +lin play_N = mkN "کھیل" ; -- from DictUrd lin play_V = mkV "کھیلنا" ; -lin play_V2 = mkV2 (mkV "بجانا") ; -- from DictUrd +lin play_V2 = mkV2 (mkV "کھیلنا") ; -- from DictUrd lin play_off_N = mkN "نمائش کرنا" ; lin playbill_N = mkN "ناٹک اشتہار" ; lin playboy_N = mkN "تماشبین" ; @@ -22489,7 +22489,7 @@ lin priory_N = mkN "پرائری" ; lin prise_V2 = mkV2 (compoundV "زور سے" (mkV "کھولنا")) ; lin prism_N = mkN "مخروط مستوی" ; lin prismatic_A = mkA "منشور نما" ; -lin prison_N = mkN "حبس" ; -- from DictUrd +lin prison_N = mkN "جیل" ; -- from DictUrd --changed lin prisoner_N = mkN "اسیر" ; -- from DictUrd lin pristine_A = mkA "سابق" ; -- from DictUrd lin privacy_N = mkN "گوشہ" ; -- from DictUrd @@ -22798,7 +22798,7 @@ lin prosper_V = mkV "بڑھنا" ; -- from DictUrd lin prosper_V2 = mkV2 (compoundV "فروغ" (mkV "پانا")) ; lin prosperity_N = mkN "بخت" ; -- from DictUrd lin prosperous_A = mkA "آباد" ; -- from DictUrd -lin prostate_N = mkN "بڑا غدود" ; +lin prostate_N = mkN "بڑی غدود" ; lin prostitute_N = mkN "عصمت فروش" ; -- from DictUrd lin prostitute_V2 = mkV2 (compoundV "عصمت" (mkV "فروشی")) ; lin prostitution_N = mkN "فاحشگی" ; -- from DictUrd @@ -24097,7 +24097,7 @@ lin request_N = mkN "عرض" ; -- from DictUrd lin request_V2 = mkV2 (compoundV "عرض" (mkV "کرنا")) ; -- from DictUrd lin request_VS = mkVS (compoundV "درخواست" (mkV "کرنا")) ; lin require_V = compoundV "طلب" (mkV "کرنا") ; -lin require_V2 = mkV2 (compoundV "در خواست" (mkV "کرنا")) ; -- from DictUrd +lin require_V2 = mkV2 (compoundV "ضروری" (mkV "ہونا")) ; -- from DictUrd -- lin require_V2V = mkV2 (compoundV "طلب" (mkV "کرنا")) ; lin require_VS = mkVS (compoundV "طلب" (mkV "کرنا")) ; lin requirement_N = mkN "حاجت" ; -- from DictUrd @@ -25478,8 +25478,8 @@ lin sigh_N = mkN "آہ" ; -- from DictUrd lin sigh_V = compoundV "آہ" (mkV "بھرنا") ; lin sigh_V2 = mkV2 (compoundV "آہیں" (mkV "نکلنا")) ; -- from DictUrd lin sigh_VS = mkVS (compoundV "آہ" (mkV "بھرنا")) ; -lin sight_N = mkN "بصر" ; -- from DictUrd -lin sight_V2 = mkV2 (mkV "نظارہ") ; +lin sight_N = mkN "نظارہ" ; -- from DictUrd -- changed +lin sight_V2 = mkV2 (mkV "دیکھنا") ; -- changed lin sighted_A = mkA "نظارہ" ; lin sighting_N = mkN "نظارہ" ; lin sightseeing_N = mkN "تاریخی مقامات پر جانا" ; @@ -25664,7 +25664,7 @@ lin slaughter_N = mkN "ہلاکت" ; -- from DictUrd lin slaughter_V2 = mkV2 (mkV "گھمسان") ; -- from DictUrd lin slav_A = mkA "غلام" ; lin slav_N = mkN "غلام" ; -lin slave_N = mkN "عبد" ; -- from DictUrd +lin slave_N = mkN "غلام" ; -- from DictUrd --changed lin slave_V = mkV "غلام" ; lin slaver_N = mkN "منہ سے بہتی رال" ; -- from DictUrd lin slaver_V = compoundV "جوتی" (mkV "چکنا") ; -- from DictUrd @@ -26018,7 +26018,7 @@ lin sow_V = mkV "بونا" ; lin sow_V2 = mkV2 (mkV "بونا") ; -- from DictUrd lin soy_N = mkN "سویا بین" ; lin spa_N = mkN "خلا" ; -lin space_N = mkN "عرصہ" ; -- from DictUrd +lin space_N = mkN "خلا" ; -- from DictUrd lin space_V2 = mkV2 (mkV "خلا") ; lin spacecraft_N = mkN "خلائی جہاز" ; lin spaceship_N = mkN "خلائی جہاز" ; @@ -26234,7 +26234,7 @@ lin sprig_N = mkN "زندہ دلی" ; lin spring_N = mkN "عین" ; -- from DictUrd lin spring_V = mkV "لچکنا" ; -- from DictUrd lin spring_V2 = mkV2 (mkV "بہار") ; -lin sprinkle_V2 = mkV2 (mkV "برکنا") ; -- from DictUrd +lin sprinkle_V2 = mkV2 (mkV "چھڑکنا") ; -- from DictUrd --changed lin sprinkling_N = mkN "قطروں کا چھڑکاؤ" ; -- from DictUrd lin sprint_N = mkN "چھوٹی سی دوڑ" ; -- from DictUrd lin sprint_V = mkV "دوڑنا" ; @@ -26408,7 +26408,7 @@ lin stationery_N = mkN "سامان تحریر" ; lin statistic_N = mkN "اعداد و شمار" ; lin statistics_N = mkN "شماریات" ; -- from DictUrd lin stature_N = mkN "اندام" ; -- from DictUrd -lin status_N = mkN "آبرو" ; -- from DictUrd +lin status_N = mkN "مقام" ; -- from DictUrd -- changed lin statutory_A = mkA "قانونی" ; lin staunch_A = mkA "کٹر" ; -- from DictUrd lin staunch_V2 = mkV2 (compoundV "خون کا بہاؤ بند" (mkV "کرنا")) ; @@ -26555,7 +26555,7 @@ lin stork_N = mkN "بگلا" ; lin storm_N = mkN "تلاطم" ; -- from DictUrd lin storm_V = mkV "طوفان" ; lin storm_V2 = mkV2 (compoundV "حملہ" (mkV "کرنا")) ; -- from DictUrd -lin stormy_A = mkA "شور انگیز" ; -- from DictUrd +lin stormy_A = mkA "طوفانی" ; -- from DictUrd lin story_N = mkN "افسانہ" ; -- from DictUrd lin stout_A = mkA "دھینگا" ; -- from DictUrd lin stout_N = mkN "موٹا تازہ" ; @@ -26659,7 +26659,7 @@ lin stubborn_A = mkA "ضدی" ; lin stuck_V2 = mkV2 (compoundV "پھنسا" (mkV "ہوا")) ; lin stud_N = mkN "نسل کش گھوڑا" ; -- from DictUrd lin stud_V2 = mkV2 (mkV "جڑانا") ; -- from DictUrd -lin student_N = mkN "مرید" ; -- from DictUrd +lin student_N = mkN "طالبعلم" ; -- from DictUrd lin studio_N = mkN "مصور کا کمرہ" ; lin study_N = mkN "مطالعہ" ; -- from DictUrd lin study_V = compoundV "مطالعہ" (mkV "کرنا") ; @@ -26806,7 +26806,7 @@ lin sugar_V2 = mkV2 (mkV "شکر") ; lin suggest_V = compoundV "تجویز" (mkV "کرنا") ; lin suggest_V2 = mkV2 (compoundV "عرض" (mkV "کرنا")) ; -- from DictUrd lin suggest_VS = mkVS (compoundV "تجویز" (mkV "کرنا")) ; -lin suggestion_N = mkN "ایما" ; -- from DictUrd +lin suggestion_N = mkN "رائے" ; -- from DictUrd -- changed lin suicidal_A = mkA "خودکشی کے مترادف" ; lin suicide_N = mkN "خود کشی" ; -- from DictUrd lin suit_N = mkN "در خواست" ; -- from DictUrd @@ -27406,7 +27406,7 @@ lin tempo_N = mkN "لے" ; -- from DictUrd lin temporal_A = mkA "دنیاوی" ; -- from DictUrd lin temporality_N = mkN "عارضی ہونا" ; lin temporariness_N = mkN "عارضیت" ; -- from DictUrd -lin temporary_A = mkA "چند روزہ" ; +lin temporary_A = mkA "عارضی" ; lin temporize_V = compoundV "زمانہ کا ساتھ" (mkV "دینا") ; lin tempt_V2 = mkV2 (mkV "آزمانا") ; -- from DictUrd --lin tempt_V2V = mkV2 (mkV "اکسانا") ; @@ -27542,7 +27542,7 @@ lin theism_N = mkN "خدا پر یقین" ; -- from DictUrd lin theist_N = mkN "توحید پرست" ; lin thematic_A = mkA "اصلی مادے کا" ; lin theme_N = mkN "موضوع" ; -- from DictUrd -lin then_Adv = mkAdv "پس" ; -- from DictUrd +lin then_Adv = mkAdv "تب" ; -- from DictUrd lin thence_Adv = mkAdv "اس وجہ سے" ; -- from DictUrd lin thenceforth_Adv = mkAdv "اس مقام سے" ; lin thenceforward_Adv = mkAdv "اس کے بعد سے" ; @@ -27632,7 +27632,7 @@ lin thrash_V2 = mkV2 (mkV "کوٹنا") ; -- from DictUrd lin thrashing_N = mkN "زد و کوب" ; -- from DictUrd lin thread_N = mkN "دھاگا" ; -- from DictUrd lin thread_V2 = mkV2 (mkV "دھاگہ") ; -lin threat_N = mkN "ڈانٹ" ; -- from DictUrd +lin threat_N = mkN "خطرہ" ; -- from DictUrd lin threaten_V = mkV "دھمکانا" ; lin threaten_V2 = mkV2 (mkV "ڈرانا") ; -- from DictUrd lin threaten_VS = mkVS (mkV "دھمکانا") ; @@ -27669,7 +27669,7 @@ lin through_Adv = mkAdv "بدولت" ; lin throughout_Adv = mkAdv "بھر" ; -- from DictUrd lin throw_N = mkN "پھینکنا" ; lin throw_V = mkV "پھینکنا" ; -lin throw_V2 = mkV2 (mkV "ڈالنا") ; -- from DictUrd +lin throw_V2 = mkV2 (mkV "پھینکنا") ; -- from DictUrd lin throw_VS = mkVS (mkV "پھینکنا") ; lin thrum_V = mkV "جھالر" ; lin thrum_V2 = mkV2 (mkV "جھالر") ; @@ -27966,7 +27966,7 @@ lin touring_A = mkA "دورہ" ; lin touring_N = mkN "دورہ" ; lin tourism_N = mkN "سفر" ; -- from DictUrd lin tourist_N = mkN "جہانگرد" ; -- from DictUrd -lin tournament_N = mkN "دنگل" ; -- from DictUrd +lin tournament_N = mkN "ٹورنامنٹ" ; -- from DictUrd lin tourney_N = mkN "فن سپہ گری کی نمائش" ; lin tourniquet_N = mkN "لہو روک" ; lin tours_PN = mkPN "دورہ" ; @@ -29514,7 +29514,7 @@ lin watch_V2 = mkV2 (mkV "دیکھنا") ; --lin watch_V2V = mkV2 (mkV "دیکھنا") ; lin watch_VS = mkVS (mkV "دیکھنا") ; lin watchful_A = mkA "بے دار" ; -- from DictUrd -lin water_N = mkN "آب" ; -- from DictUrd +lin water_N = mkN "پانی" ; -- from DictUrd --changed lin water_V = mkV "پانی" ; lin water_V2 = mkV2 (compoundV "آب پاشی" (mkV "کرنا")) ; -- from DictUrd lin waterfall_N = mkN "آبشار" ; -- from DictUrd @@ -29551,7 +29551,7 @@ lin wear_PN = mkPN "پہننا" ; lin wear_V = mkV "پہننا" ; lin wear_V2 = mkV2 (mkV "اوڑھنا") ; -- from DictUrd lin wearing_A = mkA "گراں" ; -- from DictUrd -lin weather_N = mkN "آب و ہوا" ; -- from DictUrd +lin weather_N = mkN "موسم" ; -- from DictUrd lin weather_V = mkV "موسم" ; lin weather_V2 = mkV2 (compoundV "برداشت" (mkV "کرنا")) ; -- from DictUrd lin weave_N = mkN "بننا" ; @@ -29686,7 +29686,7 @@ lin whistle_N = mkN "سیٹی" ; -- from DictUrd lin whistle_V = mkV "سیٹی" ; lin whistle_V2 = mkV2 (compoundV "سیٹی" (mkV "بجانا")) ; -- from DictUrd lin whit_N = mkN "چھوٹا ترین ٹکڑا" ; -- from DictUrd -lin white_A = mkA "ابیض" ; -- from DictUrd +lin white_A = mkA "سفید" ; -- from DictUrd --changed lin white_N = mkN "سفید" ; lin whiting_N = mkN "سفید" ; lin whiz_N = mkN "سن سے نکل جانا" ; @@ -30214,4 +30214,6 @@ lin so_Subj= ss "اس لئے"; lin several_Num = {s = "کئی" ; n = Pl} ; lin few_Num = {s = "چند" ; n = Pl} ; lin even_AdV = ss "حتی کہ"; +lin should_VV = mkV "چاہنا" ** { isAux = True} ; --this need to be fixed +lin must_VV = (mkV "ضرور چاہنا") ** { isAux = True} ; -- this need to be fixed } diff --git a/lib/src/urdu/ParseUrd.gf b/lib/src/urdu/ParseUrd.gf index 74b2b8609..dc8fe745a 100644 --- a/lib/src/urdu/ParseUrd.gf +++ b/lib/src/urdu/ParseUrd.gf @@ -85,7 +85,7 @@ ComplVV v a p vp = insertTrans (insertVV (infVV v.isAux vp) (predV v) vp.embComp } ; -} CompVP ant p vp = {s = \\a => ant.s ++ p.s ++ - infVP False vp a} ; + infVP False vp a} ; -- check for vp.isAux that_RP = { s = \\_,_ => "kh" ;