diff --git a/lib/src/slovenian/CatSlv.gf b/lib/src/slovenian/CatSlv.gf index 8912107aa..1c367fe0c 100644 --- a/lib/src/slovenian/CatSlv.gf +++ b/lib/src/slovenian/CatSlv.gf @@ -31,6 +31,7 @@ lincat Numeral = {s : Gender => Case => Str ; n : NumAgr} ; -- Structural + Conj = {s : Str} ; Prep = {s : Str; c : Case} ; -- Open lexical classes, e.g. Lexicon diff --git a/lib/src/slovenian/ConjunctionSlv.gf b/lib/src/slovenian/ConjunctionSlv.gf new file mode 100644 index 000000000..802ed6623 --- /dev/null +++ b/lib/src/slovenian/ConjunctionSlv.gf @@ -0,0 +1,20 @@ +concrete ConjunctionSlv of Conjunction = + CatSlv ** open ResSlv in { + + lin + ConjAP conj xs = { + s = \\sp,g,c,n => xs.s1 ! sp ! g ! c ! n ++ conj.s ++ xs.s2 ! sp ! g ! c ! n + } ; + +-- These fun's are generated from the list cat's. + + BaseAP x y = { s1 = x.s; s2=y.s } ; + ConsAP x xs = { + s1 = \\sp,g,c,n => x.s ! sp ! g ! c ! n ++ xs.s1 ! sp ! g ! c ! n ; + s2 = xs.s2 + } ; + + lincat + [AP] = {s1,s2 : Species => Gender => Case => Number => Str} ; + +} diff --git a/lib/src/slovenian/GrammarSlv.gf b/lib/src/slovenian/GrammarSlv.gf index 398d77250..2ab83e31b 100644 --- a/lib/src/slovenian/GrammarSlv.gf +++ b/lib/src/slovenian/GrammarSlv.gf @@ -8,8 +8,8 @@ concrete GrammarSlv of Grammar = NumeralSlv, SentenceSlv, QuestionSlv, -{- RelativeSlv, - ConjunctionSlv,-} +{- RelativeSlv,-} + ConjunctionSlv, PhraseSlv, TextX - [Pol,PPos,PNeg], StructuralSlv,