diff --git a/lib/src/hindustani/AdjectiveHindustani.gf b/lib/src/hindustani/AdjectiveHindustani.gf index 3140d15e9..0849de126 100644 --- a/lib/src/hindustani/AdjectiveHindustani.gf +++ b/lib/src/hindustani/AdjectiveHindustani.gf @@ -36,5 +36,9 @@ incomplete concrete AdjectiveHindustani of Adjective = CatHindustani ** open Com }; AdjOrd ord = { s = \\_,_,_,_ => ord.s ; }; + + AdvAP ap adv = { + s = \\n,g,c,d => adv.s ! g ++ ap.s ! n ! g ! c ! d ; + } ; } diff --git a/lib/src/hindustani/SymbolHindustani.gf b/lib/src/hindustani/SymbolHindustani.gf index 40be60557..7d953b388 100644 --- a/lib/src/hindustani/SymbolHindustani.gf +++ b/lib/src/hindustani/SymbolHindustani.gf @@ -1,4 +1,5 @@ ---# -path=.:../abstract:../common + + --concrete SymbolUrd of Symbol = CatUrd ** open Prelude, ResUrd, StringsHindustani in { incomplete concrete SymbolHindustani of Symbol = @@ -36,7 +37,7 @@ lin BaseSymb = infixSS awr ; ConsSymb = infixSS [] ; - + oper -- Note: this results in a space before 's, but there's -- not mauch we can do about that. @@ -44,4 +45,4 @@ oper -- table {_ => s ++ "ka" } ; table {_ => s } ; -- testing for webalt but i think should bring back to its origional form as 'ka' is needed for making genitive, in webalt it gives unnecessary 'ka' -} +} \ No newline at end of file diff --git a/lib/src/urdu/DictUrd.gf b/lib/src/urdu/DictUrd.gf index 2a7859345..4177a8a15 100644 --- a/lib/src/urdu/DictUrd.gf +++ b/lib/src/urdu/DictUrd.gf @@ -15193,4 +15193,58 @@ lin language_title_Utt = ss "اردو" ; +-- added during translator experiments +--lin officialMasc_N= mkN ""; +lin use_V= compoundV "استعمال" (mkV "کرنا") ; +lin bureaucrat_N= mkN "بیوروکریٹ"; +--lin operational_A= mkA ""; +lin over_Prep= mkPrep "اوپر" "اوپر"; +lin say_V= mkV "کہنا"; +lin leave_V= compoundV "چلے" (mkV "جانا") ; +--lin payable_A= mkA ""; +lin as_Prep= mkPrep "ایسا" "ایسا"; +lin capsule_N= mkN "کیپسول"; +--lin regard_V= mkV ""; +lin as_Subj= ss "ایسا"; +lin insist_V= compoundV "اصرار" (mkV "کرنا") ; +--lin say_V= mkV ""; +--lin representativeMasc_N= mkN ""; +lin refuse_V= compoundV "انکار" (mkV "کرنا") ; +lin temporary_A= mkA "عارظی"; +--lin prostate_N= mkN ""; +lin via_Prep= mkPrep "کے ذریعے" "کے ذریعے"; +lin only_Adv= mkAdv "صرف"; +--lin amount_V= mkV ""; +lin up_Prep= mkPrep "اوپر" "اوپر"; +--lin snuff_N= mkN ""; +lin fighter_N= mkN "لڑاکا"; +--lin so_Subj= ss ""; +lin reply_V= compoundV "جواب" (mkV "دینا") ; +lin god_N= mkN "خدا"; +lin have_V= mkV "رکھنا"; +lin but_Subj= ss "لیکن"; +lin move_V= compoundV "حرکت" (mkV "کرنا") ; +lin football_N= mkN "فٹبال"; +--lin leave_V= mkV ""; +lin annual_A= mkA "سالانہ"; +lin by_Prep= mkPrep "کے ذرییے" "کے ذرییے"; +lin go_V= mkV "جانا"; +lin about_Prep= mkPrep "کے متعلق" "کے متعلق"; +--lin unless_Subj= ss ""; +--lin reply_V= mkV ""; +lin long_N= mkN "لمبا"; +--lin go_V= mkV ""; +lin since_Prep= mkPrep "کیونکہ" "کیونکہ"; +lin serve_V= compoundV "خدمت" (mkV "کرنا") ; +lin other_N= mkN "دوسرا"; +--lin publish_V= mkV ""; +lin against_Prep= mkPrep "مخالف" "مخالف"; +lin sunday_N= mkN "اتوار"; +lin squad_N= mkN "دستہ"; +lin presidentMasc_N= mkN "صدر"; +lin more_Adv= mkAdv "ذیادہ"; +lin total_N= mkN "ٹوٹل"; +lin april_N= mkN "اپریل"; +lin understand_V2 = mkV2 (compoundV "سمجھ" (mkV "لینا")) ; + }; diff --git a/lib/src/urdu/ExtraUrd.gf b/lib/src/urdu/ExtraUrd.gf index fe946de6e..49e1067a2 100644 --- a/lib/src/urdu/ExtraUrd.gf +++ b/lib/src/urdu/ExtraUrd.gf @@ -23,6 +23,9 @@ flags coding = utf8 ; -- added for causitives make_CV = mkVerb "نoتہiنگ" ** {c2 = "" }; + PassVPSlash vps = vps ; + + UncNeg = {s = [] ; p = Neg} ; -- for VP conjunction } diff --git a/lib/src/urdu/ExtraUrdAbs.gf b/lib/src/urdu/ExtraUrdAbs.gf index 76bd73b5e..11e31fae4 100644 --- a/lib/src/urdu/ExtraUrdAbs.gf +++ b/lib/src/urdu/ExtraUrdAbs.gf @@ -6,4 +6,5 @@ abstract ExtraUrdAbs = Extra ** { each_Det : Det ; have_V : V; cost_V : V; + UncNeg : Pol ; } diff --git a/lib/src/urdu/ParseUrd.gf b/lib/src/urdu/ParseUrd.gf index 593500bfc..0a6a473e2 100644 --- a/lib/src/urdu/ParseUrd.gf +++ b/lib/src/urdu/ParseUrd.gf @@ -1,4 +1,4 @@ ---# -path=alltenses:../abstract:../english +--# -path=.:alltenses:../abstract:../english concrete ParseUrd of ParseEngAbs = TenseX - [AdN,Adv,SC], -- TextX - [AdN,Adv,SC], @@ -6,19 +6,19 @@ concrete ParseUrd of ParseEngAbs = NounUrd, AdjectiveUrd, NumeralUrd, - -- SymbolUrd, ConjunctionUrd, - VerbUrd - [PassV2], + VerbUrd - [PassV2,ComplVV], AdverbUrd, PhraseUrd, SentenceUrd, RelativeUrd, + SymbolUrd [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP], -- StructuralUrd, IdiomUrd [NP, VP, Tense, Cl, ProgrVP, ExistNP], ExtraUrd [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash], - DictUrd ** + DictUrd2 ** -- UNDictUrd ** -open MorphoUrd, ResUrd, ParadigmsUrd, ParamX, CommonHindustani, Prelude in { +open MorphoUrd, ResUrd, ParadigmsUrd,CommonX, CommonHindustani, Prelude in { flags literal=Symb ; @@ -34,7 +34,7 @@ lin themself_NP = regNP "themself" plural ; -} CompoundCN num noun cn = { - s = \\n,c => num.s ++ noun.s ! num.n ! Dir ++ cn.s ! n ! c ; + s = \\n,c => num.s ++ cn.s ! n ! c ++ noun.s ! num.n ! Dir; g = cn.g } ; @@ -61,10 +61,11 @@ lin PositAdVAdj a = {s = a.s ! Sg ! Masc ! Dir ! Posit} ; --------------- --SlashV2V v p vp = insertVV (infV2V v.isAux vp) (predV v) vp.embComp ** {c2 = {s = sE ; c = VTrans}}; -- changed from VTransPost +ComplVV v a p vp = insertTrans (insertVV (infVV v.isAux vp) (predV v) vp.embComp ) VTrans; -- changed from VTransPost --------------- --- UseQuantPN q pn = {s = \\c => q.s ! Sg ! Masc ! Dir ++ pn.s ! c ; a = agrP3 Sg pn.g} ; + UseQuantPN q pn = {s = \\c => q.s ! Sg ! pn.g ! Dir ++ pn.s ! Dir ; a = agrP3 pn.g Sg} ; {- SlashV2V v p vp = insertObjc (\\a => p.s ++ case p.p of {CPos => ""; _ => "not"} ++ v.c3 ++ @@ -87,10 +88,10 @@ lin s = \\_,_ => "kh" ; a = RNoAg } ; - no_RP = { - s = \\_,_ => "" ; - a = RNoAg - } ; + --no_RP = { + -- s = \\_,_ => "" ; + -- a = RNoAg + -- } ; CompS s = {s = \\_ => "kh" ++ s.s} ; -- CompVP vp = {s = \\a => infVP VVInf vp a} ; diff --git a/lib/src/urdu/SymbolUrd.gf b/lib/src/urdu/SymbolUrd.gf index a9fa1f3ea..a0452b9a8 100644 --- a/lib/src/urdu/SymbolUrd.gf +++ b/lib/src/urdu/SymbolUrd.gf @@ -1,4 +1,2 @@ ---# -path=.:../hindustani:../abstract:../common - concrete SymbolUrd of Symbol = CatUrd ** SymbolHindustani with (ResHindustani = ResUrd) ;