diff --git a/src/hungarian/NounMorphoHun.gf b/src/hungarian/NounMorphoHun.gf index b5056d651..d06dcc6ea 100644 --- a/src/hungarian/NounMorphoHun.gf +++ b/src/hungarian/NounMorphoHun.gf @@ -37,7 +37,7 @@ oper s = \\nc => case nc of { -- All plural forms and Sg Acc use the "lova" stem - PlStem | SgAccStem + PlStem | SgAccStem | PossdSg_PossrSg1P2 => nLova.s ! nc ; SgSup | -- Sg Sup has vowel o/ö, not a/e @@ -96,7 +96,7 @@ oper s = \\nc => case nc of { -- All plural forms and Sg Acc use the "majmo" stem - PlStem | SgAccStem => nMajmo.s ! nc ; + PlStem | SgAccStem | PossdSg_PossrSg1P2 => nMajmo.s ! nc ; -- Sg Sup uses the same majm* stem, but vowel can be different: -- sátor, sátrat -> sátron, not *sátran @@ -169,6 +169,11 @@ oper let tolla = init tollat ; nTolla = mkNoun tolla ; nToll = mkNoun toll ; + sörö = case vowFinal tolla of { + True => tolla ; + False => tolla -- város+o+m, sör+ö+m, vér+e+m + + harm3 "o" "e" "ö" ! getHarm tolla + } ; napj = case andB (ifTok Bool toll tolla True False) (notB (vowFinal tolla)) of { True => toll ; -- sör, sör|t -> sör|e @@ -206,6 +211,7 @@ oper PossdSg_PossrPl1 => napj + harm "u" "ü" ! nToll.h ; PossdSg_PossrP3 => napj ; + PossdSg_PossrSg1P2 => sörö ; -- The plural morpheme before possessive suffixes: madarai PossdPl => napj + harm "a" "e" ! nToll.h + "i" ; @@ -225,7 +231,7 @@ oper in nMadara ** { s = \\nc => case nc of { -- All plural forms and Sg Acc use the "tolla" stem - PlStem | SgAccStem => nMadara.s ! nc ; + PlStem | SgAccStem | PossdSg_PossrSg1P2 => nMadara.s ! nc ; PossdSg_PossrPl1 => madar + harm "u" "ü" ! nMadara.h ; diff --git a/src/hungarian/ParamHun.gf b/src/hungarian/ParamHun.gf index 911bac0a7..27a4a12dd 100644 --- a/src/hungarian/ParamHun.gf +++ b/src/hungarian/ParamHun.gf @@ -76,8 +76,9 @@ param | SgInsStem -- Instrumental and translative: -v after vowels | SgStem -- Rest of the cases in Sg | PlStem -- Rest of the cases in Pl - | PossdSg_PossrP3 -- Possessed item is Sg, possessor is Sg or Pl P3 + | PossdSg_PossrP3 -- Possessed item is Sg, possessor is {Sg,Pl} P3 | PossdSg_PossrPl1 -- Possessed item is Sg, possessor is Pl P1 + | PossdSg_PossrSg1P2 -- Possessed item is Sg, possessor is Sg P1 or {Sg,Pl} P2 | PossdPl -- Possessed item in plural, any possessor. ; -- Rest of poss forms use SgAccStem @@ -157,6 +158,7 @@ oper PlStem => "PlStem" ; PossdSg_PossrP3 => "PossdSg_PossrP3" ; PossdSg_PossrPl1 => "PossdSg_PossrPl1" ; + PossdSg_PossrSg1P2 => "PossdSg_PossrSg1P2" ; PossdPl => "PossdPl" } ; diff --git a/src/hungarian/ResHun.gf b/src/hungarian/ResHun.gf index dcc6139f0..f6256624a 100644 --- a/src/hungarian/ResHun.gf +++ b/src/hungarian/ResHun.gf @@ -49,7 +49,7 @@ oper Sg => case st of { dSg_rP3 _ => PossdSg_PossrP3 ; dSg_rPl1 => PossdSg_PossrPl1 ; - dSg_rSg1P2 => SgAccStem } + dSg_rSg1P2 => PossdSg_PossrSg1P2 } } ; -- possessive suffix e.g. "their cats-3pl" is just k. not uk/ük