diff --git a/examples/phrasebook/SentencesUrd.gf b/examples/phrasebook/SentencesUrd.gf index be3538ba3..154ca1d7d 100644 --- a/examples/phrasebook/SentencesUrd.gf +++ b/examples/phrasebook/SentencesUrd.gf @@ -1,13 +1,4 @@ -concrete SentencesUrd of Sentences = NumeralUrd ** SentencesI - [sing,YouFamFemale] with +concrete SentencesUrd of Sentences = NumeralUrd ** SentencesI - [sing] with (Syntax = SyntaxUrd), (Symbolic = SymbolicUrd), - (Lexicon = LexiconUrd) ** - open - (S=SyntaxUrd), - (P=ParadigmsUrd) in { -lin YouFamFemale = mkPersonUrd youSg_Pron "تیری" ; - -oper - mkPersonUrd : Pron -> Str -> {name : NP ; isPron : Bool ; poss : Quant} = \p,s -> - {name = mkNP (P.mkN s) ; isPron = True ; poss = mkQuant p} ; - } ; + (Lexicon = LexiconUrd) diff --git a/examples/phrasebook/WordsUrd.gf b/examples/phrasebook/WordsUrd.gf index 73e023726..8160f818d 100644 --- a/examples/phrasebook/WordsUrd.gf +++ b/examples/phrasebook/WordsUrd.gf @@ -130,7 +130,7 @@ flags coding = utf8 ; AHasAge p num = mkCl p.name (mkNP num (mkCN (modN L.year_N))); AHasChildren p num = mkCl p.name have_V2 (mkNP num L.child_N) ; AHasRoom 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)))) ; AHasTable p num = mkCl p.name have_V2 (mkNP (mkNP a_Det (mkN "میز")) (SyntaxUrd.mkAdv for_Prep (mkNP num (mkN "شخص")))) ; AHasName p name = mkCl (nameOf p) name ; @@ -160,10 +160,10 @@ flags coding = utf8 ; PropOpen p = mkCl p.name open_Adv ; PropClosed p = mkCl p.name closed_Adv ; - PropOpenDate p d = mkCl p.name (mkVP (mkVP open_Adv) d) ; - PropClosedDate p d = mkCl p.name (mkVP (mkVP closed_Adv) d) ; - PropOpenDay p d = mkCl p.name (mkVP (mkVP open_Adv) d.habitual) ; - PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_Adv) d.habitual) ; + PropOpenDate p d = mkCl p.name (mkVP (mkVP d) open_Adv) ; + PropClosedDate p d = mkCl p.name (mkVP (mkVP d) closed_Adv) ; + PropOpenDay p d = mkCl p.name (mkVP (mkVP d.habitual) open_Adv); + PropClosedDay p d = mkCl p.name (mkVP (mkVP d.habitual) closed_Adv) ; -- Building phrases from strings is complicated: the solution is to use -- mkText : Text -> Text -> Text ; diff --git a/lib/src/hindustani/CatHindustani.gf b/lib/src/hindustani/CatHindustani.gf index d6eb8e52c..3f023c3e7 100644 --- a/lib/src/hindustani/CatHindustani.gf +++ b/lib/src/hindustani/CatHindustani.gf @@ -55,7 +55,8 @@ incomplete concrete CatHindustani of Cat = CN = ResHindustani.Noun ; NP = CommonHindustani.NP ; - Pron = {s : Case => Str ; ps : Str ; a : Agr}; + -- Pron = {s : Case => Str ; ps : Str ; gs : Str ; a : Agr}; + Pron = {s : Case => Str ; ps : Number => Gender => Str ; a : Agr}; Det = ResHindustani.Determiner ; Predet = {s : Str} ; Num = {s : Str ; n : Number} ; diff --git a/lib/src/hindustani/CommonHindustani.gf b/lib/src/hindustani/CommonHindustani.gf index 3bd656138..892426e6f 100644 --- a/lib/src/hindustani/CommonHindustani.gf +++ b/lib/src/hindustani/CommonHindustani.gf @@ -87,30 +87,30 @@ resource CommonHindustani = ParamX ** open Prelude,Predef in { => "hyN" ; => "hyN" ; => "hyN" ; - => "th-a" ; - => "th-y" ; - => "th-a" ; - => "th-y" ; + => "th'a" ; + => "th'y" ; + => "th'a" ; + => "th'y" ; => "th-a" ; - => "th-y" ; - => "th-E" ; - => "th-yN" ; + => "th'y" ; + => "th'E" ; + => "th'yN" ; => "th-a" ; - => "th-y" ; + => "th'y" ; => "th-a" ; - => "th-y" ; - => "th-E" ; - => "th-yN" ; - => "th-E" ; - => "th-yN" ; - => "th-E" ; - => "th-yN" ; - => "th-E" ; - => "th-yN" ; - => "th-E" ; - => "th-yN" ; - => "th-E" ; - => "th-yN" ; + => "th'y" ; + => "th'E" ; + => "th'yN" ; + => "th'E" ; + => "th'yN" ; + => "th'E" ; + => "th'yN" ; + => "th'E" ; + => "th'yN" ; + => "th'E" ; + => "th'yN" ; + => "th'E" ; + => "th'yN" ; => "ga" ; => "gy" ; => "ga" ; diff --git a/lib/src/hindustani/ExtraHindustani.gf b/lib/src/hindustani/ExtraHindustani.gf index 03549c693..e5ade8a96 100644 --- a/lib/src/hindustani/ExtraHindustani.gf +++ b/lib/src/hindustani/ExtraHindustani.gf @@ -3,10 +3,17 @@ incomplete concrete ExtraHindustani of ExtraHindustaniAbs = CatHindustani ** open CommonHindustani,Coordination,ResHindustani, ParamX in { lin - GenNP np = {s = \\_,_,_ => np.s ! NPC Obl ++ "ka" ; a = np.a} ; +-- GenNP np = {s = \\_,_,_ => np.s ! NPC Obl ++ "ka" ; a = np.a} ; + GenNP np = {s = \\n,g,c => + case of { + <_,Masc,_> => np.s ! NPC Obl ++ "ka" ; + <_,Fem,_> => np.s ! NPC Obl ++ "ky" + }; + + a = np.a} ; each_Det = mkDet "hr kwy" "hr kwy" "hr kwy" "hr kwy" Sg ; - have_V = mkV "rakh-na"; + have_V = mkV "rakh'na"; IAdvAdv adv = {s = "ktny" ++ adv.s} ; ICompAP ap = {s = "ktnE" ++ ap.s ! Sg ! Masc ! Dir ! Posit} ; cost_V = mkV "qymt" ; diff --git a/lib/src/hindustani/NounHindustani.gf b/lib/src/hindustani/NounHindustani.gf index 1ee42fb9e..53a949d39 100644 --- a/lib/src/hindustani/NounHindustani.gf +++ b/lib/src/hindustani/NounHindustani.gf @@ -51,7 +51,7 @@ incomplete concrete NounHindustani of Noun = a = agrP3 Masc Sg } ; - PossPron p = {s = \\_,_,_ => p.ps ; a = p.a} ; + PossPron p = {s = \\n,g,_ => p.ps ! n ! g ; a = p.a} ; NumSg = {s = []; n = Sg} ; NumPl = {s = []; n = Pl} ; diff --git a/lib/src/hindustani/ResHindustani.gf b/lib/src/hindustani/ResHindustani.gf index 6dd7e4063..869dfeccc 100644 --- a/lib/src/hindustani/ResHindustani.gf +++ b/lib/src/hindustani/ResHindustani.gf @@ -63,9 +63,10 @@ param NPErg => pn ! Obl ++ "nE" } ; detcn2NP : (Determiner) -> Noun -> NPCase -> Number -> Str = \dt,cn,npc,nn -> case npc of { - NPC c => dt.s ! Sg ! Masc ++ cn.s ! nn ! c ; - NPObj => dt.s ! Sg ! Masc ++ cn.s ! nn ! Dir ; - NPErg => dt.s ! Sg ! Masc ++ cn.s ! nn ! Obl ++ "nE" +-- 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 ++ cn.s ! nn ! c ; + NPObj => dt.s ! nn ! cn.g ++ cn.s ! nn ! Dir ; + NPErg => dt.s ! nn ! cn.g ++ cn.s ! nn ! Obl ++ "nE" } ; det2NP : (Determiner) -> NPCase -> Str = \dt,npc -> case npc of { NPC c => dt.s ! Sg ! Masc ; diff --git a/lib/src/urdu/CommonHindustani.gf b/lib/src/urdu/CommonHindustani.gf index 41e2b9c64..5fc647183 100644 --- a/lib/src/urdu/CommonHindustani.gf +++ b/lib/src/urdu/CommonHindustani.gf @@ -87,30 +87,30 @@ resource CommonHindustani = ParamX ** open Prelude,Predef in { => "ہیں" ; => "ہیں" ; => "ہیں" ; - => "تh-ا" ; - => "تh-ی" ; - => "تh-ا" ; - => "تh-ی" ; + => "تھا" ; + => "تھی" ; + => "تھا" ; + => "تھی" ; => "تh-ا" ; - => "تh-ی" ; - => "تh-ے" ; - => "تh-یں" ; + => "تھی" ; + => "تھے" ; + => "تھیں" ; => "تh-ا" ; - => "تh-ی" ; + => "تھی" ; => "تh-ا" ; - => "تh-ی" ; - => "تh-ے" ; - => "تh-یں" ; - => "تh-ے" ; - => "تh-یں" ; - => "تh-ے" ; - => "تh-یں" ; - => "تh-ے" ; - => "تh-یں" ; - => "تh-ے" ; - => "تh-یں" ; - => "تh-ے" ; - => "تh-یں" ; + => "تھی" ; + => "تھے" ; + => "تھیں" ; + => "تھے" ; + => "تھیں" ; + => "تھے" ; + => "تھیں" ; + => "تھے" ; + => "تھیں" ; + => "تھے" ; + => "تھیں" ; + => "تھے" ; + => "تھیں" ; => "گا" ; => "گی" ; => "گا" ; diff --git a/lib/src/urdu/ParadigmsUrd.gf b/lib/src/urdu/ParadigmsUrd.gf index 904bbd9c0..d5cba3a15 100644 --- a/lib/src/urdu/ParadigmsUrd.gf +++ b/lib/src/urdu/ParadigmsUrd.gf @@ -50,7 +50,15 @@ oper -- Proper names mkPN : Str -> PN = \s -> let n = regNoun s in {s = n.s ! Sg ; g = n.g ; lock_PN = <>} ; - personalPN : Str -> Str -> Str -> Str -> Number -> Gender -> UPerson -> Pron = \s1,s2,s3,sp,nn,g,p -> let n = mkPron s1 s2 s3 in {s = n.s ; a = toAgr nn p g ; ps = sp ; lock_Pron = <>}; + personalPN : Str -> Str -> Str -> Str -> Str -> Str -> Str -> Number -> Gender -> UPerson -> Pron = + \s1,s2,s3,smp,sfp,pmp,pfp,nn,g,p -> let n = mkPron s1 s2 s3 in + {s = n.s ; + a = toAgr nn p g ; + ps = \\n,g => case of { + =>smp ; + => sfp ; + => pmp ; + => pfp } ; lock_Pron = <>}; demoPN : Str -> Str -> Str -> Quant = \s1,s2,s3 -> let n = makeDemonPronForm s1 s2 s3 in {s = n.s ; a = defaultAgr ; lock_Quant = <>}; mkDet : Str -> Str -> Str -> Str -> Number -> Det = \s1,s2,s3,s4,nb -> let dt = makeDet s1 s2 s3 s4 nb in {s = dt.s ; n = nb ; lock_Det = <>}; mkIP : (x1,x2,x3:Str) -> Number -> Gender -> IP = \s1,s2,s3,n,g -> let p = mkIntPronForm s1 s2 s3 in { s = p.s ; n = n ; g = g ; lock_IP = <>}; diff --git a/lib/src/urdu/ResHindustani.gf b/lib/src/urdu/ResHindustani.gf index 9b8d9d0d0..e69d5e9dc 100644 --- a/lib/src/urdu/ResHindustani.gf +++ b/lib/src/urdu/ResHindustani.gf @@ -63,9 +63,10 @@ param NPErg => pn ! Obl ++ "نے" } ; detcn2NP : (Determiner) -> Noun -> NPCase -> Number -> Str = \dt,cn,npc,nn -> case npc of { - NPC c => dt.s ! Sg ! Masc ++ cn.s ! nn ! c ; - NPObj => dt.s ! Sg ! Masc ++ cn.s ! nn ! Dir ; - NPErg => dt.s ! Sg ! Masc ++ cn.s ! nn ! Obl ++ "نے" +-- 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 ++ cn.s ! nn ! c ; + NPObj => dt.s ! nn ! cn.g ++ cn.s ! nn ! Dir ; + NPErg => dt.s ! nn ! cn.g ++ cn.s ! nn ! Obl ++ "نے" } ; det2NP : (Determiner) -> NPCase -> Str = \dt,npc -> case npc of { NPC c => dt.s ! Sg ! Masc ; diff --git a/lib/src/urdu/StructuralUrd.gf b/lib/src/urdu/StructuralUrd.gf index 32088c093..8c253e8f4 100644 --- a/lib/src/urdu/StructuralUrd.gf +++ b/lib/src/urdu/StructuralUrd.gf @@ -18,8 +18,8 @@ concrete StructuralUrd of Structural = CatUrd ** between_Prep = mkPrep "درمیاں" "درمیاں" ; both7and_DConj = sd2 "دونوں" "اور" ** {n = Pl} ; but_PConj = ss "لیكن" ; - by8agent_Prep = mkPrep "" "" ; - by8means_Prep = mkPrep "" "" ; + by8agent_Prep = mkPrep "سے" "" ; + by8means_Prep = mkPrep "پر" "" ; can8know_VV,can_VV = mkV "سكنا" ** { isAux = True} ; during_Prep = mkPrep ["كے درمیاں"] ["كے درمیاں"] ; either7or_DConj = sd2 "كوی ایك" "یا" ** {n = Sg} ; @@ -31,7 +31,7 @@ concrete StructuralUrd of Structural = CatUrd ** first_Ord = {s = "پعہلا" ; n = Sg} ; --DEPRECATED for_Prep = mkPrep "كیلیے" "كیلیے" ; from_Prep = mkPrep "سے" "سے" ; - he_Pron = personalPN "وہ" "اس" "" "اس كا" Sg Masc Pers3_Distant ; + he_Pron = personalPN "وہ" "اس" "" ["اس كا"] ["اس كی"] ["اس كے"] ["اس كی"] Sg Masc Pers3_Distant ; here_Adv = mkAdv "یہاں" ; here7to_Adv = mkAdv ["یہاں پر"] ; here7from_Adv = mkAdv ["یہاں سے"] ; @@ -40,9 +40,9 @@ concrete StructuralUrd of Structural = CatUrd ** how8much_IAdv = ss "كتنا" ; if_Subj = ss "اگر" ; in8front_Prep = mkPrep ["كے سامنے"] ["كے سامنے"] ; - i_Pron = personalPN "میں" "مجھ" "" "میرا" Sg Masc Pers1; + i_Pron = personalPN "میں" "مجھ" "" "میرا" "میری" "میرے" "میری" Sg Masc Pers1; in_Prep = mkPrep "میں" "میں" ; - it_Pron = personalPN "یہ" "اس" "اس" "اس كا" Sg Masc Pers3_Near; + it_Pron = personalPN "یہ" "اس" "اس" ["اس كا"] ["اس كی"] ["اس كے"] ["اس كی"] Sg Masc Pers3_Near; less_CAdv = {s = "كم" ; p = ""} ; many_Det = mkDet "بہت زیادہ" "بہت زیادہ" "بہت زیادہ" "بہت زیادہ" Pl ; more_CAdv = {s = "زیادہ" ; p = "سے" } ; @@ -71,7 +71,7 @@ concrete StructuralUrd of Structural = CatUrd ** please_Voc = ss "مہربانی" ; possess_Prep = mkPrep "كا" "كی" ; quite_Adv = ss "خاموش" ; - she_Pron = personalPN "وہ" "اس" "وہ" "اس كی" Sg Fem Pers3_Distant ; + she_Pron = personalPN "وہ" "اس" "وہ" ["اس كی"] ["اس كی"] ["اس كے"] ["اس كی"] Sg Fem Pers3_Distant ; so_AdA = ss "[اس لیE]" ; somebody_NP = MassNP (UseN (ParadigmsUrd.mkN "كوی" "كوی" "كوی" "كوی" "كوی" "كوی" Masc )); someSg_Det = mkDet "كچھ" "كچھ" "كچھ" "كچھ" Sg ; @@ -84,7 +84,7 @@ concrete StructuralUrd of Structural = CatUrd ** there7to_Adv = mkAdv ["وہاں پر"] ; there7from_Adv = mkAdv ["وہاں سے"] ; therefore_PConj = ss "اس لیے" ; - they_Pron = personalPN "وہ" "وہ" "وہ" "ان كا" Pl Masc Pers3_Distant ; ---- + they_Pron = personalPN "وہ" "وہ" "وہ" ["ان كا"] ["ان كی"] ["ان كے"] ["ان كی"] Pl Masc Pers3_Distant ; ---- this_Quant = demoPN "یہ" "اس" "ان"; through_Prep = mkPrep ["میں سے"] ["میں سے"] ; too_AdA = ss "بہت" ; @@ -92,7 +92,7 @@ concrete StructuralUrd of Structural = CatUrd ** under_Prep = mkPrep "نیچے" "نیچے" ; -- ** {lock_Prep = <>}; very_AdA = ss "بہت" ; want_VV = mkV "چاہنا" ** { isAux = False} ; - we_Pron = personalPN "ہم" "ہم" "ہم" "ہمارا" Pl Masc Pers1 ; + we_Pron = personalPN "ہم" "ہم" "ہم" "ہمارا" "ہماری" "ہمارے" "ہماری" Pl Masc Pers1 ; whatSg_IP = mkIP "كیا" "كس" "كس" Sg Masc ; whatPl_IP = mkIP "كیا" "كن" "كن" Pl Masc ; when_IAdv = ss "كب" ; @@ -109,9 +109,9 @@ concrete StructuralUrd of Structural = CatUrd ** with_Prep = mkPrep ["كے ساتھ"] ["كے ساتھ"] ; -- yes_Phr = ss "ہاں" ; yes_Utt = ss "ہاں" ; - youSg_Pron = personalPN "تو" "تو" "تو" "تیرا" Sg Masc Pers2_Casual ; - youPl_Pron = personalPN "تم" "تم" "تم" "تمھارا" Pl Masc Pers2_Casual ; - youPol_Pron = personalPN "آپ" "آپ" "آپ" "آپ كا" Sg Masc Pers2_Respect ; + youSg_Pron = personalPN "تو" "تو" "تو" "تیرا" "تیری" "تیرے" "تیری" Sg Masc Pers2_Casual ; + youPl_Pron = personalPN "تم" "تم" "تم" "تمھارا" "تمھاری" "تمھارے" "تمھاری" Pl Masc Pers2_Casual ; + youPol_Pron = personalPN "آپ" "آپ" "آپ" ["آپ كا"] ["آپ كی"] ["آپ كے"] ["آپ كی"] Sg Masc Pers2_Respect ; no_Quant = demoPN " كوی نہیں" "كوی نہیں" "كوی نہیں" ; not_Predet = {s="نہیں"} ; if_then_Conj = sd2 "اگر" "تو" ** {n = Sg} ; diff --git a/lib/src/urdu/src/StructuralUrd.gf b/lib/src/urdu/src/StructuralUrd.gf index cc2cb5738..91b3aac37 100644 --- a/lib/src/urdu/src/StructuralUrd.gf +++ b/lib/src/urdu/src/StructuralUrd.gf @@ -18,8 +18,8 @@ concrete StructuralUrd of Structural = CatUrd ** between_Prep = mkPrep "drmyaN" "drmyaN" ; both7and_DConj = sd2 "dwnwN" "awr" ** {n = Pl} ; but_PConj = ss "lykn" ; - by8agent_Prep = mkPrep "" "" ; - by8means_Prep = mkPrep "" "" ; + by8agent_Prep = mkPrep "sE" "" ; + by8means_Prep = mkPrep "pr" "" ; can8know_VV,can_VV = mkV "skna" ** { isAux = True} ; during_Prep = mkPrep ["kE drmyaN"] ["kE drmyaN"] ; either7or_DConj = sd2 "kwy ayk" "ya" ** {n = Sg} ; @@ -31,7 +31,7 @@ concrete StructuralUrd of Structural = CatUrd ** first_Ord = {s = "pehla" ; n = Sg} ; --DEPRECATED for_Prep = mkPrep "kylyE" "kylyE" ; from_Prep = mkPrep "sE" "sE" ; - he_Pron = personalPN "wh" "as" "" "as ka" Sg Masc Pers3_Distant ; + he_Pron = personalPN "wh" "as" "" ["as ka"] ["as ky"] ["as kE"] ["as ky"] Sg Masc Pers3_Distant ; here_Adv = mkAdv "yhaN" ; here7to_Adv = mkAdv ["yhaN pr"] ; here7from_Adv = mkAdv ["yhaN sE"] ; @@ -40,9 +40,9 @@ concrete StructuralUrd of Structural = CatUrd ** how8much_IAdv = ss "ktna" ; if_Subj = ss "agr" ; in8front_Prep = mkPrep ["kE samnE"] ["kE samnE"] ; - i_Pron = personalPN "myN" "mjh'" "" "myra" Sg Masc Pers1; + i_Pron = personalPN "myN" "mjh'" "" "myra" "myry" "myrE" "myry" Sg Masc Pers1; in_Prep = mkPrep "myN" "myN" ; - it_Pron = personalPN "yh" "as" "as" "as ka" Sg Masc Pers3_Near; + it_Pron = personalPN "yh" "as" "as" ["as ka"] ["as ky"] ["as kE"] ["as ky"] Sg Masc Pers3_Near; less_CAdv = {s = "km" ; p = ""} ; many_Det = mkDet "bht zyadh" "bht zyadh" "bht zyadh" "bht zyadh" Pl ; more_CAdv = {s = "zyadh" ; p = "sE" } ; @@ -71,7 +71,7 @@ concrete StructuralUrd of Structural = CatUrd ** please_Voc = ss "mhrbany" ; possess_Prep = mkPrep "ka" "ky" ; quite_Adv = ss "KamwX" ; - she_Pron = personalPN "wh" "as" "wh" "as ky" Sg Fem Pers3_Distant ; + she_Pron = personalPN "wh" "as" "wh" ["as ky"] ["as ky"] ["as kE"] ["as ky"] Sg Fem Pers3_Distant ; so_AdA = ss "[as lyE]" ; somebody_NP = MassNP (UseN (ParadigmsUrd.mkN "kwy" "kwy" "kwy" "kwy" "kwy" "kwy" Masc )); someSg_Det = mkDet "kch'" "kch'" "kch'" "kch'" Sg ; @@ -84,7 +84,7 @@ concrete StructuralUrd of Structural = CatUrd ** there7to_Adv = mkAdv ["whaN pr"] ; there7from_Adv = mkAdv ["whaN sE"] ; therefore_PConj = ss "as lyE" ; - they_Pron = personalPN "wh" "wh" "wh" "an ka" Pl Masc Pers3_Distant ; ---- + they_Pron = personalPN "wh" "wh" "wh" ["an ka"] ["an ky"] ["an kE"] ["an ky"] Pl Masc Pers3_Distant ; ---- this_Quant = demoPN "yh" "as" "an"; through_Prep = mkPrep ["myN sE"] ["myN sE"] ; too_AdA = ss "bht" ; @@ -92,7 +92,7 @@ concrete StructuralUrd of Structural = CatUrd ** under_Prep = mkPrep "nycE" "nycE" ; -- ** {lock_Prep = <>}; very_AdA = ss "bht" ; want_VV = mkV "cahna" ** { isAux = False} ; - we_Pron = personalPN "hm" "hm" "hm" "hmara" Pl Masc Pers1 ; + we_Pron = personalPN "hm" "hm" "hm" "hmara" "hmary" "hmarE" "hmary" Pl Masc Pers1 ; whatSg_IP = mkIP "kya" "ks" "ks" Sg Masc ; whatPl_IP = mkIP "kya" "kn" "kn" Pl Masc ; when_IAdv = ss "kb" ; @@ -109,9 +109,9 @@ concrete StructuralUrd of Structural = CatUrd ** with_Prep = mkPrep ["kE sath'"] ["kE sath'"] ; -- yes_Phr = ss "haN" ; yes_Utt = ss "haN" ; - youSg_Pron = personalPN "tw" "tw" "tw" "tyra" Sg Masc Pers2_Casual ; - youPl_Pron = personalPN "tm" "tm" "tm" "tmh'ara" Pl Masc Pers2_Casual ; - youPol_Pron = personalPN "Ap" "Ap" "Ap" "Ap ka" Sg Masc Pers2_Respect ; + youSg_Pron = personalPN "tw" "tw" "tw" "tyra" "tyry" "tyrE" "tyry" Sg Masc Pers2_Casual ; + youPl_Pron = personalPN "tm" "tm" "tm" "tmh'ara" "tmh'ary" "tmh'arE" "tmh'ary" Pl Masc Pers2_Casual ; + youPol_Pron = personalPN "Ap" "Ap" "Ap" ["Ap ka"] ["Ap ky"] ["Ap kE"] ["Ap ky"] Sg Masc Pers2_Respect ; no_Quant = demoPN " kwy nhyN" "kwy nhyN" "kwy nhyN" ; not_Predet = {s="nhyN"} ; if_then_Conj = sd2 "agr" "tw" ** {n = Sg} ;