diff --git a/src/persian/ExtendPes.gf b/src/persian/ExtendPes.gf index 2b02ee196..797a67aed 100644 --- a/src/persian/ExtendPes.gf +++ b/src/persian/ExtendPes.gf @@ -34,7 +34,10 @@ lin EmbedPresPart vp = lin SC {s = showVPH Inf defaultAgr vp} ; -- : SSlash -> SC - EmbedSSlash ss = {s = conjThat ++ ss.s ! Indic ++ ss.c2.s} ; + -- Not optimal: complement with آن should go after subject, but SSlash is already fixed. + -- You can get the more idiomatic word order by using other RGL functions, so it's + -- less critical to tweak this function and SSlash (pretty marginal category). /IL + EmbedSSlash ss = {s = "آنچه" ++ appComp ss.c2 (\\_ => "آن") ++ ss.s ! Indic} ; -- : Adv -> NP -> Cl -- here is the car / here are the cars AdvIsNP adv np = mkClause (indeclNP adv.s ** {a = np.a}) (UseComp (CompNP np)) ; diff --git a/src/persian/SentencePes.gf b/src/persian/SentencePes.gf index 91765aeea..ca73f6397 100644 --- a/src/persian/SentencePes.gf +++ b/src/persian/SentencePes.gf @@ -7,7 +7,7 @@ concrete SentencePes of Sentence = CatPes ** open Prelude, ResPes,Predef in { PredVP np vp = mkClause np vp ; - PredSCVP sc vp = mkSClause ("این" ++ sc.s) defaultAgr vp ; + PredSCVP sc vp = mkSClause sc.s defaultAgr vp ; ImpVP vp = { s = \\pol,n => diff --git a/src/persian/VerbPes.gf b/src/persian/VerbPes.gf index 12217937b..4c62a6c71 100644 --- a/src/persian/VerbPes.gf +++ b/src/persian/VerbPes.gf @@ -22,9 +22,9 @@ concrete VerbPes of Verb = CatPes ** open ResPes,Prelude in { } ; SlashVV vv vps = vps ** ComplVV vv vps ; - SlashV2S v s = predVc v ** embComp (conjThat ++ s.s ! Indic) (predV v) ; - SlashV2Q v q = predVc v ** embComp q.s (predV v) ; - SlashV2A v ap = predVc v ** insertObj (appComp v.c2 ap.s) (predV v) ; ---- paint it red , check form of adjective + SlashV2S v s = predVc v ** ComplVS v s ; + SlashV2Q v q = predVc v ** ComplVQ v q ; + SlashV2A v ap = predVc v ** insertObj (appComp v.c2 ap.s) (predV v) ; ---- paint it red , check form of adjective -- : V2V -> VP -> VPSlash ; -- beg (her) to go SlashV2V v2v vp = predVc v2v ** {