diff --git a/src/macedonian/IdiomMkd.gf b/src/macedonian/IdiomMkd.gf new file mode 100644 index 00000000..b54b46ab --- /dev/null +++ b/src/macedonian/IdiomMkd.gf @@ -0,0 +1,13 @@ +concrete IdiomMkd of Idiom = CatMkd ** open Prelude,ResMkd in { + +lin ProgrVP vp = { + present = \\a,n,p => vp.present ! Imperfective ! n ! p ; + aorist = vp.aorist ; + imperfect = \\a,n,p => vp.imperfect ! Imperfective ! n ! p ; + imperative = \\a,n => vp.imperative ! Imperfective ! n ; + participle = {aorist = \\a,gn => vp.participle.aorist ! Imperfective ! gn ; + perfect = \\a => vp.participle.perfect ! Imperfective ; + imperfect = \\a => vp.participle.imperfect ! Imperfective} + } ; + +} diff --git a/src/macedonian/MorphoMkd.gf b/src/macedonian/MorphoMkd.gf index 3ba71124..605b7497 100644 --- a/src/macedonian/MorphoMkd.gf +++ b/src/macedonian/MorphoMkd.gf @@ -15469,10 +15469,7 @@ mkA050 base = } ; mkAdv : Str -> Adv ; -mkAdv base_1 = - lin Adv - { s = base_1 - } ; +mkAdv s = {s=s} ; mkPron : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> GenNum -> Person -> Pronoun = \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,g,p -> diff --git a/src/macedonian/ResMkd.gf b/src/macedonian/ResMkd.gf index 34927986..460f688f 100644 --- a/src/macedonian/ResMkd.gf +++ b/src/macedonian/ResMkd.gf @@ -162,7 +162,14 @@ oper mkAdv : Str -> Adv = param Case = Acc | Dat ; param Role = RSubj | RObj Case | RPrep ; -oper Pronoun = {s : Role => Str; clitic : Case => Str; g : GenNum; p : Person} ; +oper Pronoun = { + s : Role => Str; + clitic : Case => Str; + poss : Species => GenNum => Str ; + poss_clitic : Str ; + g : GenNum; + p : Person + } ; genNum : Gender -> Number -> GenNum = \g,n -> case n of { diff --git a/src/macedonian/TenseMkd.gf b/src/macedonian/TenseMkd.gf new file mode 100644 index 00000000..437e6d67 --- /dev/null +++ b/src/macedonian/TenseMkd.gf @@ -0,0 +1,10 @@ +concrete TenseMkd of Tense = CatMkd[Tense,Temp], TenseX - [Tense,Temp,TTAnt,TPres,TPast,TFut,TCond] ** open ResMkd in { + +lin + TTAnt t a = {s = a.s ++ t.s ; a = a.a ; t = t.t} ; + TPres = {s = []} ** {t = VPresent} ; + TPast = {s = []} ** {t = VPastImperfect} ; --# notpresent + TFut = {s = []} ** {t = VFut} ; --# notpresent + TCond = {s = []} ** {t = VCond} ; --# notpresent + +} diff --git a/src/macedonian/TextMkd.gf b/src/macedonian/TextMkd.gf new file mode 100644 index 00000000..01c7fca3 --- /dev/null +++ b/src/macedonian/TextMkd.gf @@ -0,0 +1,7 @@ +concrete TextMkd of Text = open Prelude in { + lin + TEmpty = {s = []} ; + TFullStop x xs = {s = x.s ++ SOFT_BIND ++ "." ++ xs.s} ; + TQuestMark x xs = {s = x.s ++ SOFT_BIND ++ "?" ++ xs.s} ; + TExclMark x xs = {s = x.s ++ SOFT_BIND ++ "!" ++ xs.s} ; +}