diff --git a/lib/src/urdu/ExtraHindustani.gf b/lib/src/urdu/ExtraHindustani.gf index 2e60f74a3..f5cd2740f 100644 --- a/lib/src/urdu/ExtraHindustani.gf +++ b/lib/src/urdu/ExtraHindustani.gf @@ -6,7 +6,7 @@ incomplete concrete ExtraHindustani of ExtraHindustaniAbs = CatHindustani ** GenNP np = {s = \\_,_,_ => np.s ! NPC Obl ++ "كا" ; a = np.a} ; each_Det = mkDet "ہر كوی" "ہر كوی" "ہر كوی" "ہر كوی" Sg ; - have_V = mkV "راكh-نا"; + have_V = mkV "راكھنا"; IAdvAdv adv = {s = "كتنی" ++ adv.s} ; ICompAP ap = {s = "كتنے" ++ ap.s ! Sg ! Masc ! Dir ! Posit} ; cost_V = mkV "قیمت" ; diff --git a/lib/src/urdu/ExtraUrd.gf b/lib/src/urdu/ExtraUrd.gf index 8fa449524..c5d625bb1 100644 --- a/lib/src/urdu/ExtraUrd.gf +++ b/lib/src/urdu/ExtraUrd.gf @@ -4,7 +4,14 @@ concrete ExtraUrd of ExtraUrdAbs = CatUrd ** flags coding = utf8 ; lin - GenNP np = {s = \\_,_,_ => np.s ! NPC Obl ++ "كا" ; a = np.a} ; + -- GenNP np = {s = \\_,_,_ => np.s ! NPC Obl ++ "كا" ; a = np.a} ; + GenNP np = {s = \\n,g,c => + case of { + <_,Masc,_> => np.s ! NPC Obl ++ "كا" ; + <_,Fem,_> => np.s ! NPC Obl ++ "كی" + }; + + a = np.a} ; each_Det = mkDet "ہر كوی" "ہر كوی" "ہر كوی" "ہر كوی" Sg ; have_V = mkV "راكh-نا"; diff --git a/lib/src/urdu/NumeralUrd.gf b/lib/src/urdu/NumeralUrd.gf index b7f4ad3cb..6acc13307 100644 --- a/lib/src/urdu/NumeralUrd.gf +++ b/lib/src/urdu/NumeralUrd.gf @@ -1,118 +1,117 @@ -concrete NumeralUrd of Numeral = CatUrd ** open ResUrd,CommonHindustani,ParamX, Prelude in { --- By Harald Hammarström --- Modification for Urdu Shafqat Virk - --- still old Devanagari coding - -flags coding=utf8 ; - -param DForm = unit | ten ; -param DSize = sg | r2 | r3 | r4 | r5 | r6 | r7 | r8 | r9 ; -param Size = singl | less100 | more100 ; - -oper LinDigit = {s : DForm => Str ; size : DSize ; n : Number} ; - - -lincat Dig = { s:Str ; n : Number}; -lincat Digit = LinDigit ; -lincat Sub10 = {s : DForm => Str ; size : DSize ; n : Number} ; -lincat Sub100 = {s : Str ; size : Size ; n : Number} ; -lincat Sub1000 = {s : Str ; s2 : Str ; size : Size ; n : Number } ; -lincat Sub1000000 = { s : Str ; n : Number } ; - -lin num x0 = - {s = table { - NCard => x0.s ; - NOrd => x0.s ++ "واں" -- need to use mkOrd x0.s but it gives linking error - }; - n = x0.n - } ; - - -oper mkNum : Str -> Str -> DSize -> LinDigit = - \do -> \bis -> \sz -> - {s = table {unit => do ; ten => bis } ; - size = sz ; n = Pl} ; - -lin n2 = mkNum "دو" "بیس" r2 ; -lin n3 = mkNum "تین" "تیس" r3 ; -lin n4 = mkNum "چار" "چالیس" r4 ; -lin n5 = mkNum "پانچ" "پچاس" r5 ; -lin n6 = mkNum "چھ" "ساتھ" r6 ; -lin n7 = mkNum "سات" "ستر" r7; -lin n8 = mkNum "آتھ" "اسی" r8; -lin n9 = mkNum "نو" "نوے" r9 ; - -oper mkR : Str -> Str -> Str -> Str -> Str -> Str -> Str -> Str -> Str -> DSize => Str = \a1 -> \a2 -> \a3 -> \a4 -> \a5 -> \a6 -> \a7 -> \a8 -> \a9 -> table { - sg => a1 + "اہ" ; - r2 => a2 + "یس" ; - r3 => a3 + "تیس" ; - r4 => a4 + "الیس" ; - r5 => a5 + "ن" ; - r6 => a6 + "ساٹھ" ; - r7 => a7 + "ہتر" ; - r8 => a8 + "اسی" ; - r9 => a9 + "انوے" -} ; - -oper rows : DSize => DSize => Str = table { - sg => mkR "گیارہ" "اك" "اكت" "اكت" "اكیاو" "اك" "اك" "اكی" "اكی" ; - r2 => mkR "بارہ" "بای" "بات" "بای" "باو" "با" "با" "بای" "ب" ; - r3 => mkR "تیر" "تی" "تین" "تنت" "ترپ" "تری" "ت" "تر" "تر" ; - r4 => mkR "چود" "چوب" "چون" "چوا" "چوو" "چون" "چوہ" "چور" "چور" ; - r5 => mkR "پند" "پچی" "پین" "پنتا" "پچپ" "پین" "پہ" "پچ" "پچ" ; - r6 => mkR "سول" "چھب" "چھت" "چھی" "چھپ" "چھیا" "چھ" "چھی" "چھی" ; - r7 => mkR "ستر" "ستا" "سین" "سنت" "ستاو" "ستا" "سر" "ست" "ستا" ; - r8 => mkR "اتھار" "اتھای" "اڑ" "اڑت" "اتھاو" "اڑ" "اتھ" "اتھ" "اتھ" ; - r9 => table {sg => "انیس" ; r2 => "انتیس" ; r3 => "انتالیس" ; - r4 => "انچاس" ; r5 => "انستھ" ; r6 => "انہتر" ; - r7 => "اناسی" ; - r8 => "انانوے" ; r9 => "ننانوے" } -} ; - -oper ss : Str -> {s : Str} = \s -> {s = s} ; - -lin pot01 = {s = table {unit => "ایك" ; _ => "دمی" } ; size = sg ; n = Sg} ; -lin pot0 d = d ; -lin pot110 = {s = "داس" ; size = less100 ; n = Pl} ; -lin pot111 = {s = rows ! sg ! sg ; size = less100 ; n = Pl} ; -lin pot1to19 d = {s = rows ! d.size ! sg ; size = less100 ; n = d.n} ; -lin pot0as1 n = {s = n.s ! unit ; size = table {sg => singl ; _ => less100} ! n.size ; n = n.n } ; - -lin pot1 d = {s = d.s ! ten ; size = less100 ; n = d.n} ; -lin pot1plus d e = {s = rows ! e.size ! d.size ; size = less100 ; n = d.n} ; - -lin pot1as2 n = {s = n.s ; s2 = "دمی" ; size = n.size ; n = n.n} ; -lin pot2 d = {s = (mksau (d.s ! unit) d.size) ; - s2 = d.s ! unit ++ "لاكھ" ; size = more100 ; n = d.n} ; -lin pot2plus d e = - {s = (mksau (d.s ! unit) d.size) ++ e.s ; - s2 = (d.s ! unit) ++ "لاكھ" ++ (mkhazar e.s e.size) ; - size = more100 ; n = d.n} ; - -lin pot2as3 n = {s = n.s ; n = n.n} ; -lin pot3 n = {s = table { singl => ekhazar ; - less100 => n.s ++ "ہزار" ; - more100 => n.s2 } ! n.size ; n = n.n} ; -lin pot3plus n m = - {s = table {singl => ekhazar ; - less100 => n.s ++ "ہزار" ; - more100 => n.s2 } ! n.size ++ m.s ; n = n.n} ; - -lin D_0 = { s = "۰" ; n = Sg}; -lin D_1 = { s = "۱" ; n = Sg}; -lin D_2 = { s = "۲" ; n = Pl}; -lin D_3 = { s = "۳" ; n = Pl}; -lin D_4 = { s = "۴" ; n = Pl}; -lin D_5 = { s = "۵" ; n = Pl}; -lin D_6 = { s = "۶" ; n = Pl}; -lin D_7 = { s = "۷" ; n = Pl}; -lin D_8 = { s = "۸" ; n = Pl}; -lin D_9 = { s = "۹" ; n = Pl}; -lin IDig d = { s = \\_ => d.s ; n = d.n} ; -lin IIDig d dg = { s = \\df => Prelude.glue (dg.s ! df) d.s ; n = Pl }; - -oper ekhazar : Str = variants {"ہزار" ; "ایك" ++ "ہزار"} ; -oper mkhazar : Str -> Size -> Str = \s -> \sz -> table {singl => ekhazar ; _ => s ++ "ہزار"} ! sz ; -oper mksau : Str -> DSize -> Str = \s -> \sz -> table {sg => "سو" ; _ => s ++ "سو"} ! sz ; -} +-- By Harald Hammarstr +-- Modification for Urdu Shafqat Virk + + +concrete NumeralUrd of Numeral = CatUrd ** open ResUrd,CommonHindustani,ParamX, Prelude in { +flags coding=utf8 ; + +param DForm = unit | ten ; +param DSize = sg | r2 | r3 | r4 | r5 | r6 | r7 | r8 | r9 ; +param Size = singl | less100 | more100 ; + +oper LinDigit = {s : DForm => Str ; size : DSize ; n : Number} ; + + +lincat Dig = { s:Str ; n : Number}; +lincat Digit = LinDigit ; +lincat Sub10 = {s : DForm => Str ; size : DSize ; n : Number} ; +lincat Sub100 = {s : Str ; size : Size ; n : Number} ; +lincat Sub1000 = {s : Str ; s2 : Str ; size : Size ; n : Number } ; +lincat Sub1000000 = { s : Str ; n : Number } ; + +lin num x0 = + {s = table { + NCard => x0.s ; + NOrd => x0.s ++ "واں" -- need to use mkOrd x0.s but it gives linking error + }; + n = x0.n + } ; + + +oper mkNum : Str -> Str -> DSize -> LinDigit = + \do -> \bis -> \sz -> + {s = table {unit => do ; ten => bis } ; + size = sz ; n = Pl} ; + +lin n2 = mkNum "دو" "بیس" r2 ; +lin n3 = mkNum "تین" "تیس" r3 ; +lin n4 = mkNum "چار" "چالیس" r4 ; +lin n5 = mkNum "پانچ" "پچاس" r5 ; +lin n6 = mkNum "چھ" "ساٹھ" r6 ; +lin n7 = mkNum "سات" "ستر" r7; +lin n8 = mkNum "آٹھ" "اسی" r8; +lin n9 = mkNum "نو" "نوے" r9 ; + +oper mkR : Str -> Str -> Str -> Str -> Str -> Str -> Str -> Str -> Str -> DSize => Str = \a1 -> \a2 -> \a3 -> \a4 -> \a5 -> \a6 -> \a7 -> \a8 -> \a9 -> table { + sg => a1 + "ہ" ; + r2 => a2 + "یس" ; + r3 => a3 + "تیس" ; + r4 => a4 + "الیس" ; + r5 => a5 + "ن" ; + r6 => a6 + "ساٹھ" ; + r7 => a7 + "ہتر" ; + r8 => a8 + "اسی" ; + r9 => a9 + "انوے" +} ; + +oper rows : DSize => DSize => Str = table { + sg => mkR "گیار" "اك" "اكت" "اكت" "اكیاو" "اك" "اك" "اكی" "اكی" ; + r2 => mkR "بار" "بای" "بات" "بای" "باو" "با" "با" "بای" "ب" ; + r3 => mkR "تیر" "تی" "تین" "تنت" "ترپ" "تری" "ت" "تر" "تر" ; + r4 => mkR "چود" "چوب" "چون" "چوا" "چوو" "چون" "چوہ" "چور" "چور" ; + r5 => mkR "پندر" "پچی" "پین" "پنتا" "پچپ" "پین" "پہ" "پچ" "پچ" ; + r6 => mkR "سول" "چھب" "چھت" "چھی" "چھپ" "چھیا" "چھ" "چھی" "چھی" ; + r7 => mkR "ستر" "ستا" "سین" "سنت" "ستاو" "ستا" "سر" "ست" "ستا" ; + r8 => mkR "اٹھار" "اٹھای" "اڑ" "اڑت" "اٹھاو" "اڑ" "اٹھ" "اٹھ" "اٹھ" ; + r9 => table {sg => "انیس" ; r2 => "انتیس" ; r3 => "انتالیس" ; + r4 => "انچاس" ; r5 => "انستھ" ; r6 => "انہتر" ; + r7 => "اناسی" ; + r8 => "انانوے" ; r9 => "ننانوے" } +} ; + +oper ss : Str -> {s : Str} = \s -> {s = s} ; + +lin pot01 = {s = table {unit => "ایك" ; _ => "دمی" } ; size = sg ; n = Sg} ; +lin pot0 d = d ; +lin pot110 = {s = "دس" ; size = less100 ; n = Pl} ; +lin pot111 = {s = rows ! sg ! sg ; size = less100 ; n = Pl} ; +lin pot1to19 d = {s = rows ! d.size ! sg ; size = less100 ; n = d.n} ; +lin pot0as1 n = {s = n.s ! unit ; size = table {sg => singl ; _ => less100} ! n.size ; n = n.n } ; + +lin pot1 d = {s = d.s ! ten ; size = less100 ; n = d.n} ; +lin pot1plus d e = {s = rows ! e.size ! d.size ; size = less100 ; n = d.n} ; + +lin pot1as2 n = {s = n.s ; s2 = "دمی" ; size = n.size ; n = n.n} ; +lin pot2 d = {s = (mksau (d.s ! unit) d.size) ; + s2 = d.s ! unit ++ "لاكھ" ; size = more100 ; n = d.n} ; +lin pot2plus d e = + {s = (mksau (d.s ! unit) d.size) ++ e.s ; + s2 = (d.s ! unit) ++ "لاكھ" ++ (mkhazar e.s e.size) ; + size = more100 ; n = d.n} ; + +lin pot2as3 n = {s = n.s ; n = n.n} ; +lin pot3 n = {s = table { singl => ekhazar ; + less100 => n.s ++ "ہزار" ; + more100 => n.s2 } ! n.size ; n = n.n} ; +lin pot3plus n m = + {s = table {singl => ekhazar ; + less100 => n.s ++ "ہزار" ; + more100 => n.s2 } ! n.size ++ m.s ; n = n.n} ; + +lin D_0 = { s = "۰" ; n = Sg}; +lin D_1 = { s = "۱" ; n = Sg}; +lin D_2 = { s = "۲" ; n = Pl}; +lin D_3 = { s = "۳" ; n = Pl}; +lin D_4 = { s = "۴" ; n = Pl}; +lin D_5 = { s = "۵" ; n = Pl}; +lin D_6 = { s = "۶" ; n = Pl}; +lin D_7 = { s = "۷" ; n = Pl}; +lin D_8 = { s = "۸" ; n = Pl}; +lin D_9 = { s = "۹" ; n = Pl}; +lin IDig d = { s = \\_ => d.s ; n = d.n} ; +lin IIDig d dg = { s = \\df => Prelude.glue (dg.s ! df) d.s ; n = Pl }; + +oper ekhazar : Str = variants {"ہزار" ; "ایك" ++ "ہزار"} ; +oper mkhazar : Str -> Size -> Str = \s -> \sz -> table {singl => ekhazar ; _ => s ++ "ہزار"} ! sz ; +oper mksau : Str -> DSize -> Str = \s -> \sz -> table {sg => "ایك" ++ "سو" ; _ => s ++ "سو"} ! sz ; +} diff --git a/lib/src/urdu/ParadigmsUrd.gf b/lib/src/urdu/ParadigmsUrd.gf index 47a731a63..904bbd9c0 100644 --- a/lib/src/urdu/ParadigmsUrd.gf +++ b/lib/src/urdu/ParadigmsUrd.gf @@ -49,20 +49,14 @@ 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 = <>}; - 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 = <>}; + 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 = <>}; + 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 = <>}; -- AdN - mkAdN : Str -> AdN - = \s -> {s = s ; p = False ; lock_AdN = <>} ; + mkAdN : Str -> AdN = \s -> {s = s ; p = False ; lock_AdN = <>} ; --2 Adjectives mkA = overload { @@ -87,7 +81,7 @@ oper mkV2 : V -> Str -> V2 -- e.g bnd krna = \v,p -> v ** {c2 = {s = p ; c = VTrans} ; lock_V2 = <>} ; } ; - dirV2 : V -> V2 = \v -> v ** {c2 = {s = [] ; c = VTrans} ; lock_V2 = <>} ; --% + dirV2 : V -> V2 = \v -> v ** {c2 = {s = [] ; c = VTrans} ; lock_V2 = <>} ; mkV3 : V -> Str -> Str -> V3; -- e.g bycna mkV3 v p q = v ** { c2 = p ; c3 = q ; lock_V3 = <>} ; @@ -125,7 +119,7 @@ oper -- mkQuant : Pron -> Quant = \p -> {s = \\_,_,c => p.s!c ;a = p.a ; lock_Quant = <>}; -- mkQuant : (no_sg, no_pl, none_sg, non_pl : Str) -> Quant = mkQuantifier; -- } ; - mkIQuant : Str -> IQuant = \s -> makeIQuant s ; --% + mkIQuant : Str -> IQuant = \s -> makeIQuant s ; --2 Conjunctions @@ -136,21 +130,21 @@ oper mkConj : Str -> Str -> Number -> Conj ; -- either ... or (agrement number given as argument) } ; mkConj = overload { - mkConj : Str -> Conj = \y -> mk2Conj [] y plural ; --% - mkConj : Str -> Number -> Conj = \y,n -> mk2Conj [] y n ; --% - mkConj : Str -> Str -> Conj = \x,y -> mk2Conj x y plural ; --% - mkConj : Str -> Str -> Number -> Conj = mk2Conj ; --% + mkConj : Str -> Conj = \y -> mk2Conj [] y plural ; + mkConj : Str -> Number -> Conj = \y,n -> mk2Conj [] y n ; + mkConj : Str -> Str -> Conj = \x,y -> mk2Conj x y plural ; + mkConj : Str -> Str -> Number -> Conj = mk2Conj ; } ; - mk2Conj : Str -> Str -> Number -> Conj = \x,y,n -> --% + mk2Conj : Str -> Str -> Number -> Conj = \x,y,n -> lin Conj (sd2 x y ** {n = n}) ; -- mkV0 : V -> V0 ; mkVS : V -> VS; -- e.g drna mkVS v = v ; -- mkV2S : V -> Prep -> V2S ; - mkVV : V -> VV -- e.g cahna - = \v -> lin VV (v ** {isAux = False}); + mkVV : V -> VV = -- e.g cahna + \v -> lin VV (v ** {isAux = False}); mkAdA : Str -> AdA ; -- mkAdv x = lin Adv (ss x) ; diff --git a/lib/src/urdu/StructuralUrd.gf b/lib/src/urdu/StructuralUrd.gf index f0971bebb..32088c093 100644 --- a/lib/src/urdu/StructuralUrd.gf +++ b/lib/src/urdu/StructuralUrd.gf @@ -123,7 +123,7 @@ concrete StructuralUrd of Structural = CatUrd ** as_CAdv = {s = "اتنا" ; p = "جتنا"} ; - have_V2 = mkV2 (mkV "راكھنا") "" ; + have_V2 = mkV2 (mkV "ركھنا") "" ; language_title_Utt = ss "اردو" ; diff --git a/lib/src/urdu/src/ExtraUrd.gf b/lib/src/urdu/src/ExtraUrd.gf index b113a7c38..067262f16 100644 --- a/lib/src/urdu/src/ExtraUrd.gf +++ b/lib/src/urdu/src/ExtraUrd.gf @@ -4,7 +4,14 @@ concrete ExtraUrd of ExtraUrdAbs = CatUrd ** flags coding = utf8 ; 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"; diff --git a/lib/src/urdu/src/StructuralUrd.gf b/lib/src/urdu/src/StructuralUrd.gf index 8d18a5a71..cc2cb5738 100644 --- a/lib/src/urdu/src/StructuralUrd.gf +++ b/lib/src/urdu/src/StructuralUrd.gf @@ -123,7 +123,7 @@ concrete StructuralUrd of Structural = CatUrd ** as_CAdv = {s = "atna" ; p = "jtna"} ; - have_V2 = mkV2 (mkV "rakh'na") "" ; + have_V2 = mkV2 (mkV "rkh'na") "" ; language_title_Utt = ss "ardw" ; diff --git a/lib/src/urdu/translit.gfs b/lib/src/urdu/translit.gfs index dcd8b6a29..65b70e13f 100644 --- a/lib/src/urdu/translit.gfs +++ b/lib/src/urdu/translit.gfs @@ -8,5 +8,6 @@ rf -file=src/IdiomUrd.gf | ps -env=quotes -to_urdu | wf -file=IdiomUrd.gf rf -file=src/LexiconUrd.gf | ps -env=quotes -to_urdu | wf -file=LexiconUrd.gf rf -file=src/MorphoUrd.gf | ps -env=quotes -to_urdu | wf -file=MorphoUrd.gf rf -file=src/StructuralUrd.gf | ps -env=quotes -to_urdu | wf -file=StructuralUrd.gf +rf -file=src/NumeralUrd.gf | ps -env=quotes -to_urdu | wf -file=NumeralUrd.gf