diff --git a/lib/src/slovenian/CatSlv.gf b/lib/src/slovenian/CatSlv.gf index 043d31388..ee653883b 100644 --- a/lib/src/slovenian/CatSlv.gf +++ b/lib/src/slovenian/CatSlv.gf @@ -8,6 +8,8 @@ lincat CN = {s : Species => Case => Number => Str; g : Gender} ; NP = {s : Case => Str ; a : Agr} ; + Pron = {s : Case => Str ; a : Agr} ; + Det = {s : Case => Str; spec : Species; n : Number} ; Num = {s : Case => Str ; n : Number} ; Quant = {s : Str; spec : Species} ; diff --git a/lib/src/slovenian/GrammarSlv.gf b/lib/src/slovenian/GrammarSlv.gf index 627193678..168af4f51 100644 --- a/lib/src/slovenian/GrammarSlv.gf +++ b/lib/src/slovenian/GrammarSlv.gf @@ -3,7 +3,7 @@ concrete GrammarSlv of Grammar = NounSlv, -- VerbEng, - AdjectiveSlv + AdjectiveSlv, {- AdverbEng, NumeralEng, SentenceEng, @@ -12,8 +12,9 @@ concrete GrammarSlv of Grammar = ConjunctionEng, PhraseEng, TextX - [Pol,PPos,PNeg], - StructuralEng, - IdiomEng, +-} + StructuralSlv +{- IdiomEng, TenseX -} ** { diff --git a/lib/src/slovenian/NounSlv.gf b/lib/src/slovenian/NounSlv.gf index 509b1340c..c0126bcc2 100644 --- a/lib/src/slovenian/NounSlv.gf +++ b/lib/src/slovenian/NounSlv.gf @@ -3,7 +3,7 @@ concrete NounSlv of Noun = CatSlv ** open ResSlv in { lin DetCN det cn = { s = \\c => det.s ! c ++ cn.s ! det.spec ! c ! det.n ; - a = {g=cn.g; n=det.n} + a = {g=cn.g; n=det.n; p=P3} } ; DetQuant quant num = { diff --git a/lib/src/slovenian/ParadigmsSlv.gf b/lib/src/slovenian/ParadigmsSlv.gf index add86e549..e81530280 100644 --- a/lib/src/slovenian/ParadigmsSlv.gf +++ b/lib/src/slovenian/ParadigmsSlv.gf @@ -274,4 +274,16 @@ oper mkAdv : Str -> Adv = \s -> lin Adv {s=s} ; + mkPron : (_,_,_,_,_,_ : Str) -> Gender -> Number -> Person -> Pron = + \nom,acc,gen,dat,loc,instr,g,n,p -> + lin Pron {s = table { + Nom => nom; + Acc => acc; + Gen => gen; + Dat => dat; + Loc => loc; + Instr=>instr + } ; + a = {g=g; n=n; p=p} + } ; } diff --git a/lib/src/slovenian/ResSlv.gf b/lib/src/slovenian/ResSlv.gf index 7e887c719..b6d5c59df 100644 --- a/lib/src/slovenian/ResSlv.gf +++ b/lib/src/slovenian/ResSlv.gf @@ -25,6 +25,6 @@ param | ASuperlDefAcc ; oper - Agr = {g : Gender; n : Number} ; + Agr = {g : Gender; n : Number; p : Person} ; }