added questions and relative clauses

src/macedonian/CatMkd.gf

@@ -29,27 +29,18 @@ linref V, VA, VV, VS, VQ, V2, V2S, V2Q, V3, V2A, V2V =
 linref A, A2 = \a -> a.s ! Indef ! GSg Masc ;
 
 lincat AP = {s : Species => GenNum => Str; isPre : Bool} ;
-lincat NP = {s : Role => Str; vocative: Str; g : GenNum; p : Person} ;
+lincat NP = {s : Role => Str; vocative: Str; a : Agr} ;
 lincat Num = {s : Str; n : NNumber} ;
 lincat Quant = {s : Str; sp : Species} ;
 lincat Det = {s : Str; n : NNumber; sp : Species} ;
 
-lincat VP = {present : Aspect => Number => Person => Str;
-             aorist : Number => Person => Str;
-             imperfect : Aspect => Number => Person => Str;
-             imperative : Aspect => Number => Str;
-             participle : {aorist : Aspect => GenNum => Str;
-                           imperfect : Aspect => GenNum => Str;
-                           perfect : Aspect => Str}} ;
-lincat VPSlash = {present : Aspect => Number => Person => Str;
-                  aorist : Number => Person => Str;
-                  imperfect : Aspect => Number => Person => Str;
-                  imperative : Aspect => Number => Str;
-                  participle : {aorist : Aspect => GenNum => Str;
-                                imperfect : Aspect => GenNum => Str;
-                                perfect : Aspect => Str};
-                  noun_from_verb : Str; vtype : VType; c2 : Compl} ;
+lincat VP = Verb ** {compl : Agr => Str} ;
+lincat VPSlash = Verb ** {compl : Agr => Str; c2 : Compl} ;
+lincat S,QS = {s : Str} ;
+lincat RS = {s : GenNum => Str} ;
 lincat Cl = {s : ResMkd.Tense => Anteriority => Polarity => Order => Str} ;
+lincat QCl = {s : ResMkd.Tense => Anteriority => Polarity => Str} ;
+lincat RCl = {s : GenNum => ResMkd.Tense => Anteriority => Polarity => Str} ;
 lincat RP = {s : GenNum => Str} ;
 lincat IP = {s : Str} ;
 lincat Subj = {s : Str} ;