diff --git a/lib/src/hebrew/LexiconHeb.gf b/lib/src/hebrew/LexiconHeb.gf index 586f9e3a4..c5f4ca734 100644 --- a/lib/src/hebrew/LexiconHeb.gf +++ b/lib/src/hebrew/LexiconHeb.gf @@ -10,59 +10,60 @@ flags lin --add_V3 =""; -airplane_N = mkN "" "" Masc; +--airplane_N = mkN "" "" Masc; --alas_Interj =""; --already_Adv = "" ; -animal_N = mkN "" "" Masc; +animal_N = mkN "Hyh" "" Fem; --answer_V2S = dirV2 (mkVPaal "") ; -apartment_N = mkN "" "" Masc; -apple_N = mkN "" "" Masc; -art_N = mkN "" "" Masc; +apartment_N = mkN "dyrh" "" Fem; +apple_N = mkN "tpwH" "" Masc; +art_N = mkN "yZyrh" "" Fem; ashes_N = mkN "" "" Masc; --ask_V2Q = "" ; -baby_N = mkN "" "" Masc; -back_N = mkN "" "" Masc; +baby_N = mkN "tynwq" "" Masc; +--back_N = mkN "" "" Masc; bad_A = regA "rO" ; bank_N = mkN "" "" Masc; -bark_N = mkN "" "" Masc; +bark_N = mkN "bnq" "" Masc; beautiful_A = regA "yph" ; --become_VA =""; -beer_N = mkN "" "" Masc; +beer_N = mkN "byrh" "" Fem; --beg_V2V = dirV2 (mkVPaal "") ; -belly_N = mkN "" "" Masc; +--belly_N = mkN "bTN" "" Fem; big_A = regA "gdwl"; -bike_N = mkN "" "" Masc; -bird_N = mkN "" "" Masc; +--bike_N = mkN "" "" Masc; +bird_N = mkN "Zypwr" "" Fem; --bite_V2 = dirV2 (mkVPaal "") ; black_A = regA "sHwr" ; -blood_N = mkN "" "" Masc; +--blood_N = mkN "" "" Masc; --blow_V = mkVPaal "" ; blue_A = regA "Hkwl" ; -boat_N = mkN "" "" Masc; -bone_N = mkN "" "" Masc; -book_N = mkN "" "" Masc; -boot_N = mkN "" "" Masc; -boss_N = mkN "" "" Masc; -boy_N = mkN "" "" Masc; -bread_N = mkN "" "" Masc; +boat_N = mkN "Syrh" "" Fem; +bone_N = mkN "OZm" "" Masc; +book_N = mkN "Spr" "" Masc; +--boot_N = mkN "" "" Masc; +--boss_N = mkN "" "" Masc; --both fem and masc +boy_N = mkN "yld" "" Masc; +bread_N = mkN "lHm" "" Masc; --break_V2 = dirV2 (mkVPaal "") ; -breast_N = mkN "" "" Masc; +breast_N = mkN "HZh" "" Masc; --breathe_V = mkVPaal "" ; --broad_A = "" ; brown_A = regA "Hwm" ; --burn_V = mkVPaal "" ; -butter_N = mkN "" "" Masc; +--butter_N = mkN "" "" Masc; --buy_V2 = dirV2 (mkVPaal "qnh") ; -camera_N = mkN "" "" Masc; +{-camera_N = mkN "" "" Masc; cap_N = mkN "" "" Masc; car_N = mkN "" "" Masc; carpet_N = mkN "" "" Masc; -cat_N = mkN "" "" Masc; +cat_N = mkN "Htwl" "" Masc; ceiling_N = mkN "" "" Masc; cheese_N = mkN "" "" Masc; child_N = mkN "" "" Masc; church_N = mkN "" "" Masc; city_N = mkN "" "" Masc; +-} clean_A = regA "nqy" ; clever_A = regA "Hkm" ; close_V2 = dirV2 (mkVPaal "Sgr") ; diff --git a/lib/src/hebrew/ParadigmsHeb.gf b/lib/src/hebrew/ParadigmsHeb.gf index abdc53ff3..98d57b2dc 100644 --- a/lib/src/hebrew/ParadigmsHeb.gf +++ b/lib/src/hebrew/ParadigmsHeb.gf @@ -14,9 +14,9 @@ mkNoun : (bait,batim,batimD : Str) -> Gender -> Noun = \bait,batim,batimD,g -> { s = table { - Sg => table{Indef => bait ; Def => defH bait}; - Pl => table{Indef => batim ; Def => defH batim} ; - Dl => table{Indef => batimD ; Def => defH batimD} + Sg => table{Indef => bait ; Def => ("h" +bait)}; + Pl => table{Indef => batim ; Def => ("h" + batim)} ; + Dl => table{Indef => batimD ; Def => ("h" +batimD)} } ; g=g ; }; @@ -97,11 +97,12 @@ s = table { Sg => table { Indef => table { Masc => tov ; Fem => tova } ; - Def => table { Masc => defH tov ; Fem => defH tova } + Def => table { Masc => ("h" + tov) ; Fem => ("h" + + tova) } } ; _ => table { Indef => table {Masc => tovim ; Fem => tovot } ; - Def => table { Masc => defH tovim ; Fem => defH tovot } + Def => table { Masc => ("h" + tovim) ; Fem => ("h" + tovot) } } } }; diff --git a/lib/src/hebrew/PatternsHeb.gf b/lib/src/hebrew/PatternsHeb.gf index a975b5b49..a1deccd4a 100644 --- a/lib/src/hebrew/PatternsHeb.gf +++ b/lib/src/hebrew/PatternsHeb.gf @@ -8,8 +8,8 @@ C1aC2aC3ti = {C1 ="" ; C1C2=""; C2C3 =""; C3="ty"}; C1aC2aC3nu = { C1 = "" ; C1C2=""; C2C3 =""; C3="nw"}; C1aC2aC3ta = { C1 = "" ; C1C2=""; C2C3 =""; C3="ta"}; C1aC2aC3t = { C1 = "" ; C1C2=""; C2C3 =""; C3="t"}; -C1aC2aC3tem = { C1 = "" ; C1C2=""; C2C3 =""; C3="teM"}; -C1aC2aC3ten = { C1 = "" ; C1C2=""; C2C3 =""; C3="teN"}; +C1aC2aC3tem = { C1 = "" ; C1C2=""; C2C3 =""; C3="tM"}; +C1aC2aC3ten = { C1 = "" ; C1C2=""; C2C3 =""; C3="tN"}; C1aC2aC3 = { C1 = "" ; C1C2=""; C2C3 =""; C3=""}; C1aC2aC3a = { C1 = "" ; C1C2=""; C2C3 =""; C3="h"}; C1aC2aC3u = { C1 = "" ; C1C2=""; C2C3 =""; C3="w"}; @@ -32,8 +32,8 @@ hiC1C2aC3ti = {C1 ="h" ; C1C2=""; C2C3 =""; C3="ty"}; hiC1C2aC3nu = { C1 = "h" ; C1C2=""; C2C3 =""; C3="nw"}; hiC1C2aC3ta = { C1 = "h" ; C1C2=""; C2C3 =""; C3="ta"}; hiC1C2aC3t = { C1 = "h" ; C1C2=""; C2C3 =""; C3="t"}; -hiC1C2aC3tem= { C1 = "h" ; C1C2=""; C2C3 =""; C3="teM"}; -hiC1C2aC3ten = { C1 = "h" ; C1C2=""; C2C3 =""; C3="teN"}; +hiC1C2aC3tem= { C1 = "h" ; C1C2=""; C2C3 =""; C3="tM"}; +hiC1C2aC3ten = { C1 = "h" ; C1C2=""; C2C3 =""; C3="tN"}; hiC1C2iC3= { C1 = "h" ; C1C2=""; C2C3 ="y"; C3=""}; hiC1C2iC3a= { C1 = "h" ; C1C2=""; C2C3 ="y"; C3="h"}; hiC1C2iC3u = { C1 = "h" ; C1C2=""; C2C3 ="y"; C3="w"}; @@ -42,8 +42,8 @@ hitC1C2aC3ti = {C1 ="ht" ; C1C2=""; C2C3 =""; C3="ty"}; hitC1C2aC3nu = { C1 = "ht" ; C1C2=""; C2C3 =""; C3="nw"}; hitC1C2aC3ta = { C1 = "ht" ; C1C2=""; C2C3 =""; C3="ta"}; hitC1C2aC3t = { C1 = "ht" ; C1C2=""; C2C3 =""; C3="t"}; -hitC1C2aC3tem= { C1 = "ht" ; C1C2=""; C2C3 =""; C3="teM"}; -hitC1C2aC3ten = { C1 = "ht" ; C1C2=""; C2C3 =""; C3="teN"}; +hitC1C2aC3tem= { C1 = "ht" ; C1C2=""; C2C3 =""; C3="tM"}; +hitC1C2aC3ten = { C1 = "ht" ; C1C2=""; C2C3 =""; C3="tN"}; hitC1C2iC3= { C1 = "ht" ; C1C2=""; C2C3 ="y"; C3=""}; hitC1C2iC3a= { C1 = "ht" ; C1C2=""; C2C3 ="y"; C3="h"}; hitC1C2iC3u = { C1 = "ht" ; C1C2=""; C2C3 ="y"; C3="w"}; @@ -82,7 +82,7 @@ C1uC2aC3nu = { C1 = "" ; C1C2="w"; C2C3 =""; C3=""}; C1uC2aC3ti = { C1 = "ht" ; C1C2="w"; C2C3 =""; C3="ti"}; C1uC2aC3t = { C1 = "ht" ; C1C2="w"; C2C3 =""; C3="t"}; -C1uC2aC3tem= { C1 = "ht" ; C1C2="w"; C2C3 =""; C3="teM"}; -C1uC2aC3ten = { C1 = "ht" ; C1C2="w"; C2C3 =""; C3="teN"}; +C1uC2aC3tem= { C1 = "ht" ; C1C2="w"; C2C3 =""; C3="tM"}; +C1uC2aC3ten = { C1 = "ht" ; C1C2="w"; C2C3 =""; C3="tN"}; } diff --git a/lib/src/hebrew/ResHeb.gf b/lib/src/hebrew/ResHeb.gf index 8b6d32479..85e8eb0c4 100644 --- a/lib/src/hebrew/ResHeb.gf +++ b/lib/src/hebrew/ResHeb.gf @@ -125,8 +125,8 @@ oper Num, Ord : Type = {s : Case => Str; n : Number} ; Det : Type = {s : Gender => Str ; n : Number ; sp : Species; isDef : Bool} ; - defH : Str -> Str = \cn -> - case cn of {_ => "h" + cn} ; +-- defH : Str -> Str = \cn -> +-- case cn of {_ => "h" + cn} ; insertObj : NP -> VP -> VP = \np,vp -> let diff --git a/lib/src/hebrew/StructuralHeb.gf b/lib/src/hebrew/StructuralHeb.gf index 62b4b5a0d..d9de83d36 100644 --- a/lib/src/hebrew/StructuralHeb.gf +++ b/lib/src/hebrew/StructuralHeb.gf @@ -29,15 +29,15 @@ concrete StructuralHeb of Structural = CatHeb ** }; - he_Pron = mkPron "hwA" "Awtw" "bw" Masc Sg Per3 ; - i_Pron = mkPron "Any" "Awty" "ly" Masc Sg Per1 ; --both fem and masc nom, acc, gen - it_Pron = mkPron "zh" "" "" Masc Sg Per1 ; - she_Pron = mkPron "hyA" "Awth" "lh" Fem Sg Per3 ; - they_Pron = mkPron "hM" "hncnw" "lhM" Masc Pl Per1 ; + he_Pron = mkPron "hwA" "Awtw" "slw" Masc Sg Per3 ; + i_Pron = mkPron "Any" "Awty" "sly" Masc Sg Per1 ; --both fem and masc nom, acc, gen + it_Pron = mkPron "zh" "" "" Masc Sg Per3 ; + 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 "At" "" "" Fem Sg Per2 ; -- add Masc in extra - youPl_Pron = mkPron "AtN" "" "" Fem Sg Per2 ; - youPol_Pron = mkPron "AtN" "" "" Fem Sg Per2 ; + youSg_Pron = mkPron "Ath" "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 ; above_Prep = mkPrep "mOl" False; after_Prep = mkPrep "AHry" False;