diff --git a/lib/src/hebrew/PatternsHeb.gf b/lib/src/hebrew/PatternsHeb.gf index a1deccd4a..abbeb76d2 100644 --- a/lib/src/hebrew/PatternsHeb.gf +++ b/lib/src/hebrew/PatternsHeb.gf @@ -22,8 +22,8 @@ C1oC2C3ot = { C1 = "" ; C1C2="w"; C2C3 =""; C3="wt"}; eC1C2oC3 = { C1 = "y" ; C1C2=""; C2C3 =""; C3=""}; niC1C2oC3 = { C1 = "n" ; C1C2=""; C2C3 =""; C3=""}; tiC1C2oC3 = { C1 = "t" ; C1C2=""; C2C3 =""; C3=""}; -tiC1C2eC3i = { C1 = "t" ; C1C2=""; C2C3 ="e"; C3="y"}; -tiC1C2eC3o = { C1 = "t" ; C1C2=""; C2C3 ="e"; C3="w"}; +tiC1C2eC3i = { C1 = "t" ; C1C2=""; C2C3 =""; C3="y"}; +tiC1C2eC3o = { C1 = "t" ; C1C2=""; C2C3 =""; C3="w"}; yiC1C2oC3 = { C1 = "y" ; C1C2=""; C2C3 =""; C3=""}; yiC1C2eC3u = { C1 = "y" ; C1C2=""; C2C3 =""; C3="w"}; diff --git a/lib/src/hebrew/ResHeb.gf b/lib/src/hebrew/ResHeb.gf index 85e8eb0c4..a207a0d9e 100644 --- a/lib/src/hebrew/ResHeb.gf +++ b/lib/src/hebrew/ResHeb.gf @@ -132,8 +132,10 @@ oper let nps = np.s ! Acc in - { s = vp.s; - obj = nps.obj; + { s = vp.s; + obj = case of + { => "At" ++ nps.obj; + _ => nps.obj } ; s2 = vp.s2; pred = vp.pred; isPred = vp.isPred @@ -156,6 +158,9 @@ oper isPred = False } ; + predVc : Verb2 -> VPSlash = \verb2 -> + predV verb2 ** {c2 = verb2.c} ; + appPattern : Root -> Pattern -> Str = \r,p -> p.C1 + r.C1 + p.C1C2 + r.C2 + p.C2C3 + r.C3 + p.C3 ; diff --git a/lib/src/hebrew/StructuralHeb.gf b/lib/src/hebrew/StructuralHeb.gf index d9de83d36..53a05e2c6 100644 --- a/lib/src/hebrew/StructuralHeb.gf +++ b/lib/src/hebrew/StructuralHeb.gf @@ -35,7 +35,7 @@ concrete StructuralHeb of Structural = CatHeb ** she_Pron = mkPron "hyA" "slh" "slh" Fem Sg Per3 ; they_Pron = mkPron "hM" "slhM" "slhM" Masc Pl Per3 ; -- add Fem in extra we_Pron = mkPron "AnHnw" "Awtnw" "lnw" Masc Pl Per1; --both fem and masc - youSg_Pron = mkPron "Ath" "slK" "slK" Fem Sg Per2 ; -- add Masc in extra + youSg_Pron = mkPron "At" "slK" "slK" Fem Sg Per2 ; -- add Masc in extra youPl_Pron = mkPron "AtN" "slkN" "slkN" Fem Pl Per2 ; -- youPol_Pron = mkPron "AtN" "" "" Fem Sg Per2 ; diff --git a/lib/src/hebrew/VerbHeb.gf b/lib/src/hebrew/VerbHeb.gf index 0f1fb5b77..c489ba45d 100644 --- a/lib/src/hebrew/VerbHeb.gf +++ b/lib/src/hebrew/VerbHeb.gf @@ -6,8 +6,8 @@ concrete VerbHeb of Verb = CatHeb ** open Prelude, ResHeb in { UseV = predV ; - ComplSlash vp np = insertObj np vp ; + ComplSlash vp np = insertObj vp np; - SlashV2a v = predV v ** {c2 = v.c2} ; + SlashV2a v = predVc v ; --predV v ** {c2 = v.c2} ; }