diff --git a/lib/src/slovenian/CatSlv.gf b/lib/src/slovenian/CatSlv.gf index 141c9c563..557872128 100644 --- a/lib/src/slovenian/CatSlv.gf +++ b/lib/src/slovenian/CatSlv.gf @@ -47,6 +47,6 @@ lincat A = {s : AForm => Str}; N = {s : Case => Number => Str; g : AGender}; - PN = {s : Case => Str; g : AGender}; + PN = {s : Case => Str; g : AGender; n : Number}; } diff --git a/lib/src/slovenian/NounSlv.gf b/lib/src/slovenian/NounSlv.gf index b0d71814d..879cdf7ab 100644 --- a/lib/src/slovenian/NounSlv.gf +++ b/lib/src/slovenian/NounSlv.gf @@ -19,7 +19,7 @@ concrete NounSlv of Noun = CatSlv ** open ResSlv,Prelude in { UsePN pn = { s = pn.s; - a = {g=agender2gender pn.g; n=Sg; p=P3}; + a = {g=agender2gender pn.g; n=pn.n; p=P3}; isPron = False } ; diff --git a/lib/src/slovenian/ParadigmsSlv.gf b/lib/src/slovenian/ParadigmsSlv.gf index b8817a786..6fee34a7e 100644 --- a/lib/src/slovenian/ParadigmsSlv.gf +++ b/lib/src/slovenian/ParadigmsSlv.gf @@ -129,14 +129,16 @@ oper mkPN = overload { mkPN : N -> PN = \noun -> lin PN { s = \\c => noun.s ! c ! Sg ; - g = noun.g + g = noun.g ; + n = Sg }; mkPN : N -> Number -> PN = \noun,nr -> lin PN { s = \\c => noun.s ! c ! nr ; - g = noun.g + g = noun.g ; + n = nr }; - mkPN : (_,_,_,_,_,_ : Str) -> AGender -> PN = - \nom,gen,dat,acc,loc,instr,g -> lin PN { + mkPN : (_,_,_,_,_,_ : Str) -> AGender -> Number -> PN = + \nom,gen,dat,acc,loc,instr,g,n -> lin PN { s = table { Nom => nom; Gen => gen; @@ -145,7 +147,8 @@ oper Loc => loc; Instr => instr }; - g = g + g = g ; + n = n }; } ;