diff --git a/lib/src/hindi/MorphoHin.gf b/lib/src/hindi/MorphoHin.gf index 40937c843..6bb9eaf31 100644 --- a/lib/src/hindi/MorphoHin.gf +++ b/lib/src/hindi/MorphoHin.gf @@ -252,8 +252,8 @@ oper } } }; - makeDemonPronForm : Str -> Str -> Str -> DemPronForm ; - makeDemonPronForm yeh is inn = mkDemonPronForm yeh is "" yeh is "" yeh inn "" yeh inn ""; + makeDemonPronForm : Str -> Str -> Str -> Str -> DemPronForm ; + makeDemonPronForm yeh ye is inn = mkDemonPronForm yeh is "" yeh is "" ye inn "" ye inn ""; -- makePossPronForm myra myry hmara hmary = mkDemonPronForm myra myra myra myry myry myry hmara hmara hmara hmary hmary hmary; PersPron = {s: PersPronForm => Str}; diff --git a/lib/src/hindi/ParadigmsHin.gf b/lib/src/hindi/ParadigmsHin.gf index 747e68557..e82078de5 100644 --- a/lib/src/hindi/ParadigmsHin.gf +++ b/lib/src/hindi/ParadigmsHin.gf @@ -57,7 +57,7 @@ oper => 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 = <>}; + demoPN : Str -> Str -> Str -> Str -> Quant = \s1,s2,s3,s4 -> let n = makeDemonPronForm s1 s2 s3 s4 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/hindi/StructuralHin.gf b/lib/src/hindi/StructuralHin.gf index 43aeb4557..2c54fe8b8 100644 --- a/lib/src/hindi/StructuralHin.gf +++ b/lib/src/hindi/StructuralHin.gf @@ -77,14 +77,14 @@ concrete StructuralHin of Structural = CatHin ** somePl_Det = mkDet "कुछ" "कुछ" "कुछ" "कुछ" Pl ; something_NP = MassNP (UseN (ParadigmsHin.mkN ["कोई चीज़"] ["कोई चीज़"] ["कोई चीज़"] ["कोई चीज़"] ["कोई चीज़"] ["कोई चीज़"] Masc )); somewhere_Adv = mkAdv ["कहीं"] ; - that_Quant = demoPN "वह" "उस" "उन" ; + that_Quant = demoPN "वह" "वे" "उस" "उन" ; that_Subj = ss "कि"; there_Adv = mkAdv "वहाँ" ; there7to_Adv = mkAdv ["वहाँ पर"] ; there7from_Adv = mkAdv ["वहाँ से"] ; therefore_PConj = ss "इस लिये" ; they_Pron = personalPN "वे" "वे" "वे" "उन का" "उन की" "उन के" "उन की" Pl Masc Pers3_Distant ; ---- - this_Quant = demoPN "ये" "इस" "इन"; + this_Quant = demoPN "यह" "ये" "इस" "इन"; through_Prep = mkPrep ["में से"] ["में से"] ; too_AdA = ss "बहुत" ; to_Prep = mkPrep "को" "को" ; -- ** {lock_Prep = <>}; diff --git a/lib/src/hindi/src/MorphoHin.gf b/lib/src/hindi/src/MorphoHin.gf index 22e3cdea9..6f5c9c7eb 100644 --- a/lib/src/hindi/src/MorphoHin.gf +++ b/lib/src/hindi/src/MorphoHin.gf @@ -252,8 +252,8 @@ oper } } }; - makeDemonPronForm : Str -> Str -> Str -> DemPronForm ; - makeDemonPronForm yeh is inn = mkDemonPronForm yeh is "" yeh is "" yeh inn "" yeh inn ""; + makeDemonPronForm : Str -> Str -> Str -> Str -> DemPronForm ; + makeDemonPronForm yeh ye is inn = mkDemonPronForm yeh is "" yeh is "" ye inn "" ye inn ""; -- makePossPronForm myra myry hmara hmary = mkDemonPronForm myra myra myra myry myry myry hmara hmara hmara hmary hmary hmary; PersPron = {s: PersPronForm => Str}; diff --git a/lib/src/hindi/src/StructuralHin.gf b/lib/src/hindi/src/StructuralHin.gf index ea8588ad1..920b15853 100644 --- a/lib/src/hindi/src/StructuralHin.gf +++ b/lib/src/hindi/src/StructuralHin.gf @@ -77,14 +77,14 @@ concrete StructuralHin of Structural = CatHin ** somePl_Det = mkDet "kuc'" "kuc'" "kuc'" "kuc'" Pl ; something_NP = MassNP (UseN (ParadigmsHin.mkN ["ko:I: ci:z"] ["ko:I: ci:z"] ["ko:I: ci:z"] ["ko:I: ci:z"] ["ko:I: ci:z"] ["ko:I: ci:z"] Masc )); somewhere_Adv = mkAdv ["kahi:m."] ; - that_Quant = demoPN "vah" "Us" "Un" ; + that_Quant = demoPN "vah" "ve:" "Us" "Un" ; that_Subj = ss "ki"; there_Adv = mkAdv "vaha:n~" ; there7to_Adv = mkAdv ["vaha:n~ par"] ; there7from_Adv = mkAdv ["vaha:n~ se:"] ; therefore_PConj = ss "Is liye:" ; they_Pron = personalPN "ve:" "ve:" "ve:" "Un ka:" "Un ki:" "Un ke:" "Un ki:" Pl Masc Pers3_Distant ; ---- - this_Quant = demoPN "ye:" "Is" "In"; + this_Quant = demoPN "yah" "ye:" "Is" "In"; through_Prep = mkPrep ["me:m. se:"] ["me:m. se:"] ; too_AdA = ss "bahut" ; to_Prep = mkPrep "ko:" "ko:" ; -- ** {lock_Prep = <>};