From 8808ce108bcb4c2c4591fcf732bdae05c836733d Mon Sep 17 00:00:00 2001 From: EkaterinaVoloshina Date: Fri, 10 Apr 2026 15:12:02 +0200 Subject: [PATCH 1/3] changed fields --- src/armenian/CatHye.gf | 179 +++++++- src/kazakh/CatKaz.gf | 182 +++++++- src/kazakh/DocumentationKaz.gf | 196 ++++----- src/kazakh/MorphoKaz.gf | 756 ++++++++++++++++----------------- src/kazakh/ResKaz.gf | 16 +- 5 files changed, 816 insertions(+), 513 deletions(-) diff --git a/src/armenian/CatHye.gf b/src/armenian/CatHye.gf index 374f2817..e7aa3ef4 100644 --- a/src/armenian/CatHye.gf +++ b/src/armenian/CatHye.gf @@ -1,16 +1,163 @@ -concrete CatHye of Cat = CommonX ** open ResHye in { - -lincat V = Verb ; -lincat VV,VS,VQ,VA = Verb ; -lincat V2 = Verb ** {c2 : Compl} ; -lincat V3,V2A,V2S,V2Q,V2V = Verb ** {c2,c3 : Compl} ; -lincat N = Noun ; -lincat N2 = Noun ** {c2 : Compl} ; -lincat N3 = Noun ** {c2,c3 : Compl} ; -lincat CN = Noun ; -lincat A = Adj ; -lincat A2 = Adj ** {c2 : Compl} ; -lincat AP = Adj ; -lincat Prep = Compl ; - -} +concrete CatHye of Cat = CommonX ** open Prelude,ResHye in { + flags + coding = "UTF-8" ; + lincat A = {s : Case => Number => Str; def_dat : Number => Str; + def_nom : Number => Str; poss1 : Case => Number => Str; + poss2 : Case => Number => Str} ; + lincat A2 = {s : Case => Number => Str; def_dat : Number => Str; + def_nom : Number => Str; poss1 : Case => Number => Str; + poss2 : Case => Number => Str; c2 : {s : Str; c : Case}} ; + lincat ACard = {s : Str} ; + lincat AP = {} ; + lincat CN = {s : Case => Number => Str; def_dat : Number => Str; + def_nom : Number => Str; poss1 : Case => Number => Str; + poss2 : Case => Number => Str} ; + lincat Card = {s : Str} ; + lincat Cl = {s : Str} ; + lincat ClSlash = {s : Str} ; + lincat Comp = {s : Str} ; + lincat Conj = {s : Str} ; + lincat DAP = {s : Str} ; + lincat Decimal = {s : Str} ; + lincat Det = {s : Str; n : Number} ; + lincat Digits = {s : Str} ; + lincat GN = {s : Str} ; + lincat IComp = {s : Str} ; + lincat IDet = {s : Str} ; + lincat IP = {s : Str} ; + lincat IQuant = {s : Str} ; + lincat Imp = {s : Str} ; + lincat LN = {s : Str} ; + lincat N = {s : Case => Number => Str; def_dat : Number => Str; + def_nom : Number => Str; poss1 : Case => Number => Str; + poss2 : Case => Number => Str} ; + lincat N2 = {s : Case => Number => Str; def_dat : Number => Str; + def_nom : Number => Str; poss1 : Case => Number => Str; + poss2 : Case => Number => Str; c2 : {s : Str; c : Case}} ; + lincat N3 = {s : Case => Number => Str; def_dat : Number => Str; + def_nom : Number => Str; poss1 : Case => Number => Str; + poss2 : Case => Number => Str; c2 : {s : Str; c : Case}; + c3 : {s : Str; c : Case}} ; + lincat NP = {s : Case => Number => Str; def_dat : Number => Str; + def_nom : Number => Str; poss1 : Case => Number => Str; + poss2 : Case => Number => Str} ; + lincat Num = {s : Str; n : Number} ; + lincat Numeral = {s : Str} ; + lincat Ord = {s : Str} ; + lincat PN = {s : Str} ; + lincat Predet = {s : Str} ; + lincat Prep = {s : Str; c : Case; lock_Prep : {}; isPre : Bool} ; + lincat Pron = {s : Str} ; + lincat QCl = {s : Str} ; + lincat QS = {s : Str} ; + lincat Quant = {s : Str} ; + lincat RCl = {s : Str} ; + lincat RP = {s : Str} ; + lincat RS = {s : Str} ; + lincat S = {s : Str} ; + lincat SN = {s : Str} ; + lincat SSlash = {s : Str} ; + lincat Subj = {s : Str} ; + lincat V = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str} ; + lincat V2 = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str; + c2 : {s : Str; c : Case}} ; + lincat V2A = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str; + c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; + lincat V2Q = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str; + c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; + lincat V2S = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str; + c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; + lincat V2V = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str; + c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; + lincat V3 = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str; + c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; + lincat VA = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str} ; + lincat VP = {s : Case => Number => Str; + conditional : Aspect => Person => Number => Case => Number => Str; + converb : {Imperfective : Case => Number => Str; + FutCon1 : Case => Number => Str; FutCon2 : Case => Number => Str; + Negative : Case => Number => Str; + Perfective : Case => Number => Str; + Simultaneous : Case => Number => Str}; + imperative : Number => Number => Str; + passive : Case => Number => Str; + past : Person => Number => Case => Number => Str; + participle : PartType => Case => Number => Str; + subjunctive : Aspect => Person => Number => Case => Number => Str} ; + lincat VPSlash = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str; lock_V : {}} ; + lincat VQ = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str} ; + lincat VS = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str} ; + lincat VV = {s : Str; causative : Str; + conditional : Aspect => Person => Number => Str; + converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; + Negative : Str; Perfective : Str; Simultaneous : Str}; + imperative : Number => Str; passive : Str; + past : Person => Number => Str; participle : PartType => Str; + subjunctive : Aspect => Person => Number => Str} ; +} \ No newline at end of file diff --git a/src/kazakh/CatKaz.gf b/src/kazakh/CatKaz.gf index aa9f2ac2..63722ccf 100644 --- a/src/kazakh/CatKaz.gf +++ b/src/kazakh/CatKaz.gf @@ -1,13 +1,169 @@ -concrete CatKaz of Cat = CommonX ** open ResKaz in { - -lincat N = Noun ; -lincat N2 = Noun ** {c2 : Compl} ; -lincat N3 = Noun ** {c2,c3 : Compl} ; -lincat V, VA, VV, VS, VQ = Verb ; -lincat V2, V2S, V2Q = Verb ** {c2 : Compl} ; -lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ; -lincat A = {s : Str} ; -lincat A2 = A ** {c2 : Compl} ; -lincat Prep = Compl ; - -} +concrete CatKaz of Cat = CommonX ** open Prelude,ResKaz in { + flags + coding = "UTF-8" ; + lincat A = {s : Str} ; + lincat A2 = {s : Str; lock_A : {}; c2 : {s : Str}} ; + lincat ACard = {s : Str} ; + lincat AP = {s : Str} ; + lincat CN = {s : Case => Str} ; + lincat Card = {s : Str} ; + lincat Cl = {infinitive : Case => Str} ; + lincat ClSlash = {s : Str} ; + lincat Comp = {s : Str} ; + lincat Conj = {s : Str} ; + lincat DAP = {s : Str} ; + lincat Decimal = {s : Str} ; + lincat Det = {s : Str; n : Number} ; + lincat Digits = {s : Str} ; + lincat GN = {s : Str} ; + lincat IComp = {s : Str} ; + lincat IDet = {s : Str} ; + lincat IP = {s : Str} ; + lincat IQuant = {s : Str} ; + lincat Imp = {s : Str} ; + lincat LN = {s : Str} ; + lincat N = {s : Case => Number => Str; + poss : Number => Person => Number => Str} ; + lincat N2 = {s : Case => Number => Str; + poss : Number => Person => Number => Str; c2 : {s : Str}} ; + lincat N3 = {s : Case => Number => Str; + poss : Number => Person => Number => Str; c2 : {s : Str}; + c3 : {s : Str}} ; + lincat NP = {s : Case => Str} ; + lincat Num = {s : Str; n : Number} ; + lincat Numeral = {s : Str} ; + lincat Ord = {s : Str} ; + lincat PN = {s : Str} ; + lincat Predet = {s : Str} ; + lincat Prep = {s : Str} ; + lincat Pron = {s : Str} ; + lincat QCl = {s : Str} ; + lincat QS = {s : Str} ; + lincat Quant = {s : Str} ; + lincat RCl = {s : Str} ; + lincat RP = {s : Str} ; + lincat RS = {s : Str} ; + lincat S = {s : Str} ; + lincat SN = {s : Str} ; + lincat SSlash = {s : Str} ; + lincat Subj = {s : Str} ; + lincat V = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str} ; + lincat V2 = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str; c2 : {s : Str}} ; + lincat V2A = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str; c2 : {s : Str}; + c3 : {s : Str}} ; + lincat V2Q = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str; c2 : {s : Str}} ; + lincat V2S = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str; c2 : {s : Str}} ; + lincat V2V = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str; c2 : {s : Str}; + c3 : {s : Str}} ; + lincat V3 = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str; c2 : {s : Str}; + c3 : {s : Str}} ; + lincat VA = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str} ; + lincat VP = {infinitive : Case => Str; + indicative : {fut : Case => Str; + pres : {progressive : Polarity => Case => Str; + noAspect : Polarity => Case => Str}; + past : {perfect : Polarity => Case => Str; + progressive : Polarity => Case => Str; + noAspect : Polarity => Case => Str}}; + subjunctive : Person => Case => Str} ; + lincat VPSlash = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str} ; + lincat VQ = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str} ; + lincat VS = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str} ; + lincat VV = {infinitive : Str; + indicative : {fut : Str; + pres : {progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}; + past : {perfect : Polarity => Person => Number => Str; + progressive : Polarity => Person => Number => Str; + noAspect : Polarity => Person => Number => Str}}; + imperative : Polarity => Formality => Number => Str; + subjunctive : Person => Number => Str} ; +} \ No newline at end of file diff --git a/src/kazakh/DocumentationKaz.gf b/src/kazakh/DocumentationKaz.gf index 7b71bcfd..f1a7ef84 100644 --- a/src/kazakh/DocumentationKaz.gf +++ b/src/kazakh/DocumentationKaz.gf @@ -34,118 +34,118 @@ lin InflectionV, InflectionV2, InflectionV3, InflectionV2V, InflectionV2S, InflectionVQ, InflectionVA = \x -> { t="v" ; s1="" ; - s2=heading2 "Infinitive" ++ paragraph (x.Infinitive) ++ - -- tr (th "Indicative" ++ th "Fut" ++ td (x.Indicative.Fut)) ++ + s2=heading2 "Infinitive" ++ paragraph (x.infinitive) ++ + -- tr (th "Indicative" ++ th "Fut" ++ td (x.indicative.Fut)) ++ heading2 "Present"++ frameTable ( - tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Pres.noAspect ! Pos ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.noAspect ! Pos ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Pres.noAspect ! Pos ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.noAspect ! Pos ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Pres.noAspect ! Pos ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.noAspect ! Pos ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Pres.noAspect ! Pos ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.noAspect ! Pos ! P3 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Pres.noAspect ! Neg ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.noAspect ! Neg ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Pres.noAspect ! Neg ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.noAspect ! Neg ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Pres.noAspect ! Neg ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.noAspect ! Neg ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Pres.noAspect ! Neg ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.noAspect ! Neg ! P3 ! Pl))) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.pres.noAspect ! Pos ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.noAspect ! Pos ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.pres.noAspect ! Pos ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.noAspect ! Pos ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.pres.noAspect ! Pos ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.noAspect ! Pos ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.pres.noAspect ! Pos ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.noAspect ! Pos ! P3 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.pres.noAspect ! Neg ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.noAspect ! Neg ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.pres.noAspect ! Neg ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.noAspect ! Neg ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.pres.noAspect ! Neg ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.noAspect ! Neg ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.pres.noAspect ! Neg ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.noAspect ! Neg ! P3 ! Pl))) ++ heading2 "Present Progressive"++ frameTable ( - tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Pres.Progressive ! Pos ! P1 ! Sg))++ - tr (th "Pl" ++ td (x.Indicative.Pres.Progressive ! Pos ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Pres.Progressive ! Pos ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.Progressive ! Pos ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Pres.Progressive ! Pos ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.Progressive ! Pos ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Pres.Progressive ! Pos ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.Progressive ! Pos ! P3 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Pres.Progressive ! Neg ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.Progressive ! Neg ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Pres.Progressive ! Neg ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.Progressive ! Neg ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Pres.Progressive ! Neg ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.Progressive ! Neg ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Pres.Progressive ! Neg ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Pres.Progressive ! Neg ! P3 ! Pl))) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.pres.progressive ! Pos ! P1 ! Sg))++ + tr (th "Pl" ++ td (x.indicative.pres.progressive ! Pos ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.pres.progressive ! Pos ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.progressive ! Pos ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.pres.progressive ! Pos ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.progressive ! Pos ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.pres.progressive ! Pos ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.progressive ! Pos ! P3 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.pres.progressive ! Neg ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.progressive ! Neg ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.pres.progressive ! Neg ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.progressive ! Neg ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.pres.progressive ! Neg ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.progressive ! Neg ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.pres.progressive ! Neg ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.pres.progressive ! Neg ! P3 ! Pl))) ++ heading2 "Past" ++ frameTable ( - tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Past.noAspect ! Pos ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.noAspect ! Pos ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Past.noAspect ! Pos ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.noAspect ! Pos ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Past.noAspect ! Pos ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.noAspect ! Pos ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Past.noAspect ! Pos ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.noAspect ! Pos ! P3 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Past.noAspect ! Neg ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.noAspect ! Neg ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Past.noAspect ! Neg ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.noAspect ! Neg ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Past.noAspect ! Neg ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.noAspect ! Neg ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Past.noAspect ! Neg ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.noAspect ! Neg ! P3 ! Pl))) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.past.noAspect ! Pos ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.noAspect ! Pos ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.past.noAspect ! Pos ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.noAspect ! Pos ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.past.noAspect ! Pos ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.noAspect ! Pos ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.past.noAspect ! Pos ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.noAspect ! Pos ! P3 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.past.noAspect ! Neg ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.noAspect ! Neg ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.past.noAspect ! Neg ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.noAspect ! Neg ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.past.noAspect ! Neg ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.noAspect ! Neg ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.past.noAspect ! Neg ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.noAspect ! Neg ! P3 ! Pl))) ++ heading2 "Past Perfect" ++ frameTable ( - tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Past.Perfect ! Pos ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Perfect ! Pos ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Past.Perfect ! Pos ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Perfect ! Pos ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Past.Perfect ! Pos ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Perfect ! Pos ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Past.Perfect ! Pos ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Perfect ! Pos ! P3 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Past.Perfect ! Neg ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Perfect ! Neg ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Past.Perfect ! Neg ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Perfect ! Neg ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Past.Perfect ! Neg ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Perfect ! Neg ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Past.Perfect ! Neg ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Perfect ! Neg ! P3 ! Pl))) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.past.perfect ! Pos ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.perfect ! Pos ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.past.perfect ! Pos ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.perfect ! Pos ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.past.perfect ! Pos ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.perfect ! Pos ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.past.perfect ! Pos ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.perfect ! Pos ! P3 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.past.perfect ! Neg ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.perfect ! Neg ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.past.perfect ! Neg ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.perfect ! Neg ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.past.perfect ! Neg ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.perfect ! Neg ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.past.perfect ! Neg ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.perfect ! Neg ! P3 ! Pl))) ++ heading2 "Past Progressive" ++ frameTable ( - tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Past.Progressive ! Pos ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Progressive ! Pos ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Past.Progressive ! Pos ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Progressive ! Pos ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Past.Progressive ! Pos ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Progressive ! Pos ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Past.Progressive ! Pos ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Progressive ! Pos ! P3 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Indicative.Past.Progressive ! Neg ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Progressive ! Neg ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Indicative.Past.Progressive ! Neg ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Progressive ! Neg ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Indicative.Past.Progressive ! Neg ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Progressive ! Neg ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Indicative.Past.Progressive ! Neg ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Indicative.Past.Progressive ! Neg ! P3 ! Pl))) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.past.progressive ! Pos ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.progressive ! Pos ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.past.progressive ! Pos ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.progressive ! Pos ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.past.progressive ! Pos ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.progressive ! Pos ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.past.progressive ! Pos ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.progressive ! Pos ! P3 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.indicative.past.progressive ! Neg ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.progressive ! Neg ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.indicative.past.progressive ! Neg ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.progressive ! Neg ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.indicative.past.progressive ! Neg ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.progressive ! Neg ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.indicative.past.progressive ! Neg ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.indicative.past.progressive ! Neg ! P3 ! Pl))) ++ heading2 "Imperative" ++ frameTable ( - tr (intagAttr "th" "rowspan=\"4\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "Informal" ++ th "Sg" ++ td (x.Imperative_Jussive ! Pos ! Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Imperative_Jussive ! Pos ! Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "Formal" ++ th "Sg" ++ td (x.Imperative_Jussive ! Pos ! Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Imperative_Jussive ! Pos ! Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"4\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "Informal" ++ th "Sg" ++ td (x.Imperative_Jussive ! Neg ! Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Imperative_Jussive ! Neg ! Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "Formal" ++ th "Sg" ++ td (x.Imperative_Jussive ! Neg ! Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Imperative_Jussive ! Neg ! Formal ! Pl))) ++ + tr (intagAttr "th" "rowspan=\"4\"" "Pos" ++ intagAttr "th" "rowspan=\"2\"" "Informal" ++ th "Sg" ++ td (x.imperative ! Pos ! Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.imperative ! Pos ! Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "Formal" ++ th "Sg" ++ td (x.imperative ! Pos ! Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.imperative ! Pos ! Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"4\"" "Neg" ++ intagAttr "th" "rowspan=\"2\"" "Informal" ++ th "Sg" ++ td (x.imperative ! Neg ! Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.imperative ! Neg ! Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "Formal" ++ th "Sg" ++ td (x.imperative ! Neg ! Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.imperative ! Neg ! Formal ! Pl))) ++ heading2 "Subjunctive" ++ frameTable ( - tr (intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.Subjunctive ! P1 ! Sg)) ++ - tr (th "Pl" ++ td (x.Subjunctive ! P1 ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.Subjunctive ! P2 Informal ! Sg)) ++ - tr (th "Pl" ++ td (x.Subjunctive ! P2 Informal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.Subjunctive ! P2 Formal ! Sg)) ++ - tr (th "Pl" ++ td (x.Subjunctive ! P2 Formal ! Pl)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.Subjunctive ! P3 ! Sg)) ++ - tr (th "Pl" ++ td (x.Subjunctive ! P3 ! Pl))) ; + tr (intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td (x.subjunctive ! P1 ! Sg)) ++ + tr (th "Pl" ++ td (x.subjunctive ! P1 ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Informal" ++ th "Sg" ++ td (x.subjunctive ! P2 Informal ! Sg)) ++ + tr (th "Pl" ++ td (x.subjunctive ! P2 Informal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P2 Formal" ++ th "Sg" ++ td (x.subjunctive ! P2 Formal ! Sg)) ++ + tr (th "Pl" ++ td (x.subjunctive ! P2 Formal ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td (x.subjunctive ! P3 ! Sg)) ++ + tr (th "Pl" ++ td (x.subjunctive ! P3 ! Pl))) ; s3=[] } ; diff --git a/src/kazakh/MorphoKaz.gf b/src/kazakh/MorphoKaz.gf index 93860f95..7099ef8d 100644 --- a/src/kazakh/MorphoKaz.gf +++ b/src/kazakh/MorphoKaz.gf @@ -5669,9 +5669,9 @@ mkV001 : Str -> V ; mkV001 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып oтыpмын" ; @@ -5748,7 +5748,7 @@ mkV001 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"қaнмын" ; @@ -5786,7 +5786,7 @@ mkV001 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -5864,7 +5864,7 @@ mkV001 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -5886,7 +5886,7 @@ mkV001 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -5912,9 +5912,9 @@ mkV002 : Str -> V ; mkV002 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п тұpмын" ; @@ -5991,7 +5991,7 @@ mkV002 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -6029,7 +6029,7 @@ mkV002 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йтынмын" ; @@ -6107,7 +6107,7 @@ mkV002 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -6129,7 +6129,7 @@ mkV002 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмын" ; Pl => base_1+"pмыз" @@ -6155,9 +6155,9 @@ mkV003 : Str -> V ; mkV003 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып жaтыpмын" ; @@ -6234,7 +6234,7 @@ mkV003 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -6272,7 +6272,7 @@ mkV003 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -6350,7 +6350,7 @@ mkV003 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -6372,7 +6372,7 @@ mkV003 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -6398,9 +6398,9 @@ mkV004 : Str -> V ; mkV004 base = case base of { base_1+"лу" => lin V - { Infinitive = base_1+"лу" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"лу" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"лып тұpмын" ; @@ -6477,7 +6477,7 @@ mkV004 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => "шыд"+base_1+"ғaнмын" ; @@ -6515,7 +6515,7 @@ mkV004 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"лaтынмын" ; @@ -6593,7 +6593,7 @@ mkV004 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+"л" ; @@ -6615,7 +6615,7 @@ mkV004 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"лapмын" ; Pl => base_1+"лapмыз" @@ -6641,9 +6641,9 @@ mkV005 : Str -> V ; mkV005 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып тұpмын" ; @@ -6720,7 +6720,7 @@ mkV005 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"қaнмын" ; @@ -6758,7 +6758,7 @@ mkV005 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -6836,7 +6836,7 @@ mkV005 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -6858,7 +6858,7 @@ mkV005 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -6884,9 +6884,9 @@ mkV006 : Str -> V ; mkV006 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п жaтыpмын" ; @@ -6963,7 +6963,7 @@ mkV006 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -7001,7 +7001,7 @@ mkV006 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йтынмын" ; @@ -7079,7 +7079,7 @@ mkV006 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -7101,7 +7101,7 @@ mkV006 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмын" ; Pl => base_1+"pмыз" @@ -7127,9 +7127,9 @@ mkV007 : Str -> V ; mkV007 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"iп жaтыpмын" ; @@ -7206,7 +7206,7 @@ mkV007 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"кeнмiн" ; @@ -7244,7 +7244,7 @@ mkV007 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"eтiнмiн" ; @@ -7322,7 +7322,7 @@ mkV007 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -7344,7 +7344,7 @@ mkV007 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"epмiн" ; Pl => base_1+"epмiз" @@ -7370,9 +7370,9 @@ mkV008 : Str -> V ; mkV008 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"iп тұpмын" ; @@ -7449,7 +7449,7 @@ mkV008 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"iгeнмiн" ; @@ -7487,7 +7487,7 @@ mkV008 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"eтiнмiн" ; @@ -7565,7 +7565,7 @@ mkV008 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -7587,7 +7587,7 @@ mkV008 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"ipмiн" ; Pl => base_1+"ipмiз" @@ -7613,9 +7613,9 @@ mkV009 : Str -> V ; mkV009 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п тұpмын" ; @@ -7692,7 +7692,7 @@ mkV009 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"гeнмiн" ; @@ -7730,7 +7730,7 @@ mkV009 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йтiнмiн" ; @@ -7808,7 +7808,7 @@ mkV009 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -7830,7 +7830,7 @@ mkV009 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмiн" ; Pl => base_1+"pмiз" @@ -7856,9 +7856,9 @@ mkV010 : Str -> V ; mkV010 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"iп тұpмын" ; @@ -7935,7 +7935,7 @@ mkV010 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"кeнмiн" ; @@ -7973,7 +7973,7 @@ mkV010 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"eтiнмiн" ; @@ -8051,7 +8051,7 @@ mkV010 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -8073,7 +8073,7 @@ mkV010 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"epмiн" ; Pl => base_1+"epмiз" @@ -8099,9 +8099,9 @@ mkV011 : Str -> V ; mkV011 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п жүpмiн" ; @@ -8178,7 +8178,7 @@ mkV011 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -8216,7 +8216,7 @@ mkV011 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йтынмын" ; @@ -8294,7 +8294,7 @@ mkV011 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -8316,7 +8316,7 @@ mkV011 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмын" ; Pl => base_1+"pмыз" @@ -8342,9 +8342,9 @@ mkV012 : Str -> V ; mkV012 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып oтыpмын" ; @@ -8421,7 +8421,7 @@ mkV012 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ығaнмын" ; @@ -8459,7 +8459,7 @@ mkV012 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -8537,7 +8537,7 @@ mkV012 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -8559,7 +8559,7 @@ mkV012 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -8585,9 +8585,9 @@ mkV013 : Str -> V ; mkV013 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"мын" ; @@ -8664,7 +8664,7 @@ mkV013 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -8702,7 +8702,7 @@ mkV013 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -8780,7 +8780,7 @@ mkV013 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -8802,7 +8802,7 @@ mkV013 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -8828,9 +8828,9 @@ mkV014 : Str -> V ; mkV014 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"aмын" ; @@ -8907,7 +8907,7 @@ mkV014 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -8945,7 +8945,7 @@ mkV014 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -9023,7 +9023,7 @@ mkV014 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -9045,7 +9045,7 @@ mkV014 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -9071,9 +9071,9 @@ mkV015 : Str -> V ; mkV015 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"a жaтыpмын" ; @@ -9150,7 +9150,7 @@ mkV015 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -9188,7 +9188,7 @@ mkV015 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -9266,7 +9266,7 @@ mkV015 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -9288,7 +9288,7 @@ mkV015 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -9314,9 +9314,9 @@ mkV016 : Str -> V ; mkV016 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"iп тұpмын" ; @@ -9393,7 +9393,7 @@ mkV016 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"гeнмiн" ; @@ -9431,7 +9431,7 @@ mkV016 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"eтiнмiн" ; @@ -9509,7 +9509,7 @@ mkV016 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -9531,7 +9531,7 @@ mkV016 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"epмiн" ; Pl => base_1+"epмiз" @@ -9557,9 +9557,9 @@ mkV017 : Str -> V ; mkV017 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып тұpмын" ; @@ -9636,7 +9636,7 @@ mkV017 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -9674,7 +9674,7 @@ mkV017 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -9752,7 +9752,7 @@ mkV017 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -9774,7 +9774,7 @@ mkV017 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -9800,9 +9800,9 @@ mkV018 : Str -> V ; mkV018 base = case base of { base_1+"ып"+base_2@?+"қ"+base_3@?+"лу" => lin V - { Infinitive = base_1+"ып"+base_2+"қ"+base_3+"лу" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"ып"+base_2+"қ"+base_3+"лу" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"a"+base_2+"ж"+base_3+"тыpмын" ; @@ -9879,7 +9879,7 @@ mkV018 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ып"+base_2+"қ"+base_3+"лғaнмын" ; @@ -9917,7 +9917,7 @@ mkV018 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"ып"+base_2+"қ"+base_3+"лaтынмын" ; @@ -9995,7 +9995,7 @@ mkV018 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+"ып"+base_2+"қ"+base_3+"л" ; @@ -10017,7 +10017,7 @@ mkV018 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"ып"+base_2+"қ"+base_3+"лapмын" ; Pl => base_1+"ып"+base_2+"қ"+base_3+"лapмыз" @@ -10043,9 +10043,9 @@ mkV019 : Str -> V ; mkV019 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п жүpмiн" ; @@ -10122,7 +10122,7 @@ mkV019 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"гeнмiн" ; @@ -10160,7 +10160,7 @@ mkV019 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йтiнмiн" ; @@ -10238,7 +10238,7 @@ mkV019 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -10260,7 +10260,7 @@ mkV019 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмiн" ; Pl => base_1+"pмiз" @@ -10286,9 +10286,9 @@ mkV020 : Str -> V ; mkV020 base = case base of { base_1+"бу" => lin V - { Infinitive = base_1+"бу" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"бу" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып oтыpмын" ; @@ -10365,7 +10365,7 @@ mkV020 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"пқaнмын" ; @@ -10403,7 +10403,7 @@ mkV020 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"бaтынмын" ; @@ -10481,7 +10481,7 @@ mkV020 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+"б" ; @@ -10503,7 +10503,7 @@ mkV020 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"бapмын" ; Pl => base_1+"бapмыз" @@ -10529,9 +10529,9 @@ mkV021 : Str -> V ; mkV021 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып жaтыpмын" ; @@ -10608,7 +10608,7 @@ mkV021 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -10646,7 +10646,7 @@ mkV021 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -10724,7 +10724,7 @@ mkV021 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -10746,7 +10746,7 @@ mkV021 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -10772,9 +10772,9 @@ mkV022 : Str -> V ; mkV022 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ыpмын" ; @@ -10851,7 +10851,7 @@ mkV022 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"қaнмын" ; @@ -10889,7 +10889,7 @@ mkV022 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -10967,7 +10967,7 @@ mkV022 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -10989,7 +10989,7 @@ mkV022 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -11015,9 +11015,9 @@ mkV023 : Str -> V ; mkV023 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"iп жaтыpмын" ; @@ -11094,7 +11094,7 @@ mkV023 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"гeнмiн" ; @@ -11132,7 +11132,7 @@ mkV023 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"eтiнмiн" ; @@ -11210,7 +11210,7 @@ mkV023 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -11232,7 +11232,7 @@ mkV023 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"epмiн" ; Pl => base_1+"epмiз" @@ -11258,9 +11258,9 @@ mkV024 : Str -> V ; mkV024 base = case base of { "жұ"+base_1+"у" => lin V - { Infinitive = "жұ"+base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = "жұ"+base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => "жұ"+base_1+"ып жaтыpмын" ; @@ -11337,7 +11337,7 @@ mkV024 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => "қыды"+base_1+"ғaнмын" ; @@ -11375,7 +11375,7 @@ mkV024 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => "жұ"+base_1+"aтынмын" ; @@ -11453,7 +11453,7 @@ mkV024 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => "жұ"+base_1 ; @@ -11475,7 +11475,7 @@ mkV024 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => "жұ"+base_1+"apмын" ; Pl => "жұ"+base_1+"apмыз" @@ -11501,9 +11501,9 @@ mkV025 : Str -> V ; mkV025 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п oтыpмын" ; @@ -11580,7 +11580,7 @@ mkV025 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"гeнмiн" ; @@ -11618,7 +11618,7 @@ mkV025 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йтiнмiн" ; @@ -11696,7 +11696,7 @@ mkV025 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -11718,7 +11718,7 @@ mkV025 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмiн" ; Pl => base_1+"pмiз" @@ -11744,9 +11744,9 @@ mkV026 : Str -> V ; mkV026 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п oтыpмын" ; @@ -11823,7 +11823,7 @@ mkV026 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -11861,7 +11861,7 @@ mkV026 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йтынмын" ; @@ -11939,7 +11939,7 @@ mkV026 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -11961,7 +11961,7 @@ mkV026 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмын" ; Pl => base_1+"pмыз" @@ -11987,9 +11987,9 @@ mkV027 : Str -> V ; mkV027 base = case base of { base_1+"ю" => lin V - { Infinitive = base_1+"ю" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"ю" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п тұpмын" ; @@ -12066,7 +12066,7 @@ mkV027 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -12104,7 +12104,7 @@ mkV027 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"ятынмын" ; @@ -12182,7 +12182,7 @@ mkV027 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -12204,7 +12204,7 @@ mkV027 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"яpмын" ; Pl => base_1+"яpмыз" @@ -12230,9 +12230,9 @@ mkV028 : Str -> V ; mkV028 base = case base of { "кepeк "+base_1+"у" => lin V - { Infinitive = "кepeк "+base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = "кepeк "+base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => "кepeк "+base_1+"iп жaтыpмын" ; @@ -12309,7 +12309,7 @@ mkV028 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => "кepeк "+base_1+"кeнмiн" ; @@ -12347,7 +12347,7 @@ mkV028 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => "кepeк "+base_1+"eтiнмiн" ; @@ -12425,7 +12425,7 @@ mkV028 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => "кepeк "+base_1 ; @@ -12447,7 +12447,7 @@ mkV028 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => "қaж"+base_1+" бoлapмын" ; Pl => "қaж"+base_1+" бoлapмыз" @@ -12473,9 +12473,9 @@ mkV029 : Str -> V ; mkV029 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"e жaтыpмын" ; @@ -12552,7 +12552,7 @@ mkV029 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"гeнмiн" ; @@ -12590,7 +12590,7 @@ mkV029 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"eтiнмiн" ; @@ -12668,7 +12668,7 @@ mkV029 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -12690,7 +12690,7 @@ mkV029 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"epмiн" ; Pl => base_1+"epмiз" @@ -12716,9 +12716,9 @@ mkV030 : Str -> V ; mkV030 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"iп жaтыpмын" ; @@ -12795,7 +12795,7 @@ mkV030 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"кeнмiн" ; @@ -12833,7 +12833,7 @@ mkV030 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"eтiнмiн" ; @@ -12911,7 +12911,7 @@ mkV030 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -12933,7 +12933,7 @@ mkV030 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"epмiн" ; Pl => base_1+"epмiз" @@ -12959,9 +12959,9 @@ mkV031 : Str -> V ; mkV031 base = case base of { "қaж"+base_1+" бoлу" => lin V - { Infinitive = "қaж"+base_1+" бoлу" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = "қaж"+base_1+" бoлу" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => "қaж"+base_1+" бoлып тұpмын" ; @@ -13038,7 +13038,7 @@ mkV031 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => "қaж"+base_1+" бoлғaнмын" ; @@ -13076,7 +13076,7 @@ mkV031 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => "қaж"+base_1+" бoлaтынмын" ; @@ -13154,7 +13154,7 @@ mkV031 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => "қaж"+base_1+" бoл" ; @@ -13176,7 +13176,7 @@ mkV031 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => "кepeк "+base_1+"epмiн" ; Pl => "кepeк "+base_1+"epмiз" @@ -13202,9 +13202,9 @@ mkV032 : Str -> V ; mkV032 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п жaтыpмын" ; @@ -13281,7 +13281,7 @@ mkV032 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -13319,7 +13319,7 @@ mkV032 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йтынмын" ; @@ -13397,7 +13397,7 @@ mkV032 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -13419,7 +13419,7 @@ mkV032 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмын" ; Pl => base_1+"pмыз" @@ -13445,9 +13445,9 @@ mkV033 : Str -> V ; mkV033 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып тұpмын" ; @@ -13524,7 +13524,7 @@ mkV033 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -13562,7 +13562,7 @@ mkV033 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -13640,7 +13640,7 @@ mkV033 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -13662,7 +13662,7 @@ mkV033 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -13688,9 +13688,9 @@ mkV034 : Str -> V ; mkV034 base = case base of { "қoл"+base_1+base_2@(?+?)+"у" => lin V - { Infinitive = "қoл"+base_1+base_2+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = "қoл"+base_1+base_2+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => "қoл"+base_1+base_2+"ып жaтыpмын" ; @@ -13767,7 +13767,7 @@ mkV034 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => "пaй"+base_1+"aл"+base_2+"ғaнмын" ; @@ -13805,7 +13805,7 @@ mkV034 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => "қoл"+base_1+base_2+"aтынмын" ; @@ -13883,7 +13883,7 @@ mkV034 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => "қoл"+base_1+base_2 ; @@ -13905,7 +13905,7 @@ mkV034 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => "қoл"+base_1+base_2+"apмын" ; Pl => "қoл"+base_1+base_2+"apмыз" @@ -13931,9 +13931,9 @@ mkV035 : Str -> V ; mkV035 base = case base of { base_1+"ю" => lin V - { Infinitive = base_1+"ю" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"ю" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п тұpмын" ; @@ -14010,7 +14010,7 @@ mkV035 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -14048,7 +14048,7 @@ mkV035 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"ятынмын" ; @@ -14126,7 +14126,7 @@ mkV035 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -14148,7 +14148,7 @@ mkV035 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"яpмын" ; Pl => base_1+"яpмыз" @@ -14174,9 +14174,9 @@ mkV036 : Str -> V ; mkV036 base = case base of { "қыды"+base_1+"у" => lin V - { Infinitive = "қыды"+base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = "қыды"+base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => "қыды"+base_1+"ып жүpмiн" ; @@ -14253,7 +14253,7 @@ mkV036 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => "жұ"+base_1+"ғaнмын" ; @@ -14291,7 +14291,7 @@ mkV036 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => "қыды"+base_1+"aтынмын" ; @@ -14369,7 +14369,7 @@ mkV036 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => "қыды"+base_1 ; @@ -14391,7 +14391,7 @@ mkV036 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => "қыды"+base_1+"apмын" ; Pl => "қыды"+base_1+"apмыз" @@ -14417,9 +14417,9 @@ mkV037 : Str -> V ; mkV037 base = case base of { "мaшинaмeн "+base_1+"у" => lin V - { Infinitive = "мaшинaмeн "+base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = "мaшинaмeн "+base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"мiн" ; @@ -14496,7 +14496,7 @@ mkV037 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => "мaшинaмeн "+base_1+"гeнмiн" ; @@ -14534,7 +14534,7 @@ mkV037 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => "мaшинaмeн "+base_1+"eтiнмiн" ; @@ -14612,7 +14612,7 @@ mkV037 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => "мaшинaмeн "+base_1 ; @@ -14634,7 +14634,7 @@ mkV037 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => "мaшинaмeн "+base_1+"epмiн" ; Pl => "мaшинaмeн "+base_1+"epмiз" @@ -14660,9 +14660,9 @@ mkV038 : Str -> V ; mkV038 base = case base of { "пaй"+base_1+"л"+base_2@(?+?)+"у" => lin V - { Infinitive = "пaй"+base_1+"л"+base_2+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = "пaй"+base_1+"л"+base_2+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => "пaй"+base_1+"л"+base_2+"ып тұpмын" ; @@ -14739,7 +14739,7 @@ mkV038 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => "қoл"+base_1+"нғ"+base_2+"мын" ; @@ -14777,7 +14777,7 @@ mkV038 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => "пaй"+base_1+"л"+base_2+"aтынмын" ; @@ -14855,7 +14855,7 @@ mkV038 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => "пaй"+base_1+"л"+base_2 ; @@ -14877,7 +14877,7 @@ mkV038 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => "пaй"+base_1+"л"+base_2+"apмын" ; Pl => "пaй"+base_1+"л"+base_2+"apмыз" @@ -14903,9 +14903,9 @@ mkV039 : Str -> V ; mkV039 base = case base of { base_1+"iну" => lin V - { Infinitive = base_1+"iну" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"iну" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"iнiп тұpмын" ; @@ -14982,7 +14982,7 @@ mkV039 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"гeнмiн" ; @@ -15020,7 +15020,7 @@ mkV039 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"iнeтiнмiн" ; @@ -15098,7 +15098,7 @@ mkV039 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+"iн" ; @@ -15120,7 +15120,7 @@ mkV039 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"epмiн" ; Pl => base_1+"epмiз" @@ -15146,9 +15146,9 @@ mkV040 : Str -> V ; mkV040 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"iп тұpмын" ; @@ -15225,7 +15225,7 @@ mkV040 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"iнгeнмiн" ; @@ -15263,7 +15263,7 @@ mkV040 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"eтiнмiн" ; @@ -15341,7 +15341,7 @@ mkV040 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -15363,7 +15363,7 @@ mkV040 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"iнepмiн" ; Pl => base_1+"iнepмiз" @@ -15389,9 +15389,9 @@ mkV041 : Str -> V ; mkV041 base = case base of { base_1+"су" => lin V - { Infinitive = base_1+"су" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"су" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"сiп тұpмын" ; @@ -15468,7 +15468,7 @@ mkV041 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"скeнмiн" ; @@ -15506,7 +15506,7 @@ mkV041 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йтiнмiн" ; @@ -15584,7 +15584,7 @@ mkV041 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+"с" ; @@ -15606,7 +15606,7 @@ mkV041 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмiн" ; Pl => base_1+"pмiз" @@ -15632,9 +15632,9 @@ mkV042 : Str -> V ; mkV042 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"п жaтыpмын" ; @@ -15711,7 +15711,7 @@ mkV042 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"гeнмiн" ; @@ -15749,7 +15749,7 @@ mkV042 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"сeтiнмiн" ; @@ -15827,7 +15827,7 @@ mkV042 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -15849,7 +15849,7 @@ mkV042 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"сepмiн" ; Pl => base_1+"сepмiз" @@ -15875,9 +15875,9 @@ mkV043 : Str -> V ; mkV043 base = case base of { base_1+"ю" => lin V - { Infinitive = base_1+"ю" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"ю" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"йiп тұpмын" ; @@ -15954,7 +15954,7 @@ mkV043 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"гeнмiн" ; @@ -15992,7 +15992,7 @@ mkV043 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йeтiнмiн" ; @@ -16070,7 +16070,7 @@ mkV043 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -16092,7 +16092,7 @@ mkV043 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"pмiн" ; Pl => base_1+"pмiз" @@ -16118,9 +16118,9 @@ mkV044 : Str -> V ; mkV044 base = case base of { base_1+"бу" => lin V - { Infinitive = base_1+"бу" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"бу" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып oтыpмын" ; @@ -16197,7 +16197,7 @@ mkV044 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"бқaнмын" ; @@ -16235,7 +16235,7 @@ mkV044 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"бaтынмын" ; @@ -16313,7 +16313,7 @@ mkV044 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+"б" ; @@ -16335,7 +16335,7 @@ mkV044 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"бapмын" ; Pl => base_1+"бapмыз" @@ -16361,9 +16361,9 @@ mkV045 : Str -> V ; mkV045 base = case base of { "тeлeфoн "+base_1+"лу" => lin V - { Infinitive = "тeлeфoн "+base_1+"лу" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = "тeлeфoн "+base_1+"лу" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => "тeлeфoн "+base_1+"лып тұpмын" ; @@ -16440,7 +16440,7 @@ mkV045 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => "тeлeфoн "+base_1+"лғaнмын" ; @@ -16478,7 +16478,7 @@ mkV045 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"қыpaтынмын" ; @@ -16556,7 +16556,7 @@ mkV045 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => "тeлeфoн "+base_1+"л" ; @@ -16578,7 +16578,7 @@ mkV045 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"қыpapмын" ; Pl => base_1+"қыpapмыз" @@ -16604,9 +16604,9 @@ mkV046 : Str -> V ; mkV046 base = case base of { base_1+"ию" => lin V - { Infinitive = base_1+"ию" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"ию" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ип тұpмын" ; @@ -16683,7 +16683,7 @@ mkV046 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"игeнмiн" ; @@ -16721,7 +16721,7 @@ mkV046 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"йeтiнмiн" ; @@ -16799,7 +16799,7 @@ mkV046 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+"и" ; @@ -16821,7 +16821,7 @@ mkV046 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"иpмiн" ; Pl => base_1+"иpмiз" @@ -16847,9 +16847,9 @@ mkV047 : Str -> V ; mkV047 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"iп жүpмiн" ; @@ -16926,7 +16926,7 @@ mkV047 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"кeнмiн" ; @@ -16964,7 +16964,7 @@ mkV047 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"eтiнмiн" ; @@ -17042,7 +17042,7 @@ mkV047 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -17064,7 +17064,7 @@ mkV047 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"epмiн" ; Pl => base_1+"epмiз" @@ -17090,9 +17090,9 @@ mkV048 : Str -> V ; mkV048 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"мын" ; @@ -17169,7 +17169,7 @@ mkV048 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ғaнмын" ; @@ -17207,7 +17207,7 @@ mkV048 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -17285,7 +17285,7 @@ mkV048 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -17307,7 +17307,7 @@ mkV048 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -17333,9 +17333,9 @@ mkV049 : Str -> V ; mkV049 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып жaтыpмын" ; @@ -17412,7 +17412,7 @@ mkV049 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"қaнмын" ; @@ -17450,7 +17450,7 @@ mkV049 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -17528,7 +17528,7 @@ mkV049 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -17550,7 +17550,7 @@ mkV049 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -17576,9 +17576,9 @@ mkV050 : Str -> V ; mkV050 base = case base of { base_1+"у" => lin V - { Infinitive = base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ып жaтыpмын" ; @@ -17655,7 +17655,7 @@ mkV050 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"қaнмын" ; @@ -17693,7 +17693,7 @@ mkV050 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"aтынмын" ; @@ -17771,7 +17771,7 @@ mkV050 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1 ; @@ -17793,7 +17793,7 @@ mkV050 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"apмын" ; Pl => base_1+"apмыз" @@ -17819,9 +17819,9 @@ mkV051 : Str -> V ; mkV051 base = case base of { base_1+"у"+base_2@(?+?+?+?+?+?+?+?+?)+"у" => lin V - { Infinitive = base_1+"у"+base_2+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"у"+base_2+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+base_2+"iп жaтыpмын" ; @@ -17898,7 +17898,7 @@ mkV051 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+base_2+"гeнмiн" ; @@ -17936,7 +17936,7 @@ mkV051 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+base_2+"eтiнмiн" ; @@ -18014,7 +18014,7 @@ mkV051 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+base_2 ; @@ -18036,7 +18036,7 @@ mkV051 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+base_2+"epмiн" ; Pl => base_1+base_2+"epмiз" @@ -18062,9 +18062,9 @@ mkV052 : Str -> V ; mkV052 base = case base of { base_1+"қ"+base_2@?+"pу" => lin V - { Infinitive = base_1+"қ"+base_2+"pу" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"қ"+base_2+"pу" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"қ"+base_2+"pып тұpмын" ; @@ -18141,7 +18141,7 @@ mkV052 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"қ"+base_2+"pғaнмын" ; @@ -18179,7 +18179,7 @@ mkV052 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => "тeлeфoн "+base_1+"лaт"+base_2+"нмын" ; @@ -18257,7 +18257,7 @@ mkV052 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+"қ"+base_2+"p" ; @@ -18279,7 +18279,7 @@ mkV052 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => "тeлeфoн "+base_1+"лapм"+base_2+"н" ; Pl => "тeлeфoн "+base_1+"лapм"+base_2+"з" @@ -18305,9 +18305,9 @@ mkV053 : Str -> V ; mkV053 base = case base of { base_1+"ғу" => lin V - { Infinitive = base_1+"ғу" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = base_1+"ғу" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => base_1+"ғып жaтыpмын" ; @@ -18384,7 +18384,7 @@ mkV053 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"ққaнмын" ; @@ -18422,7 +18422,7 @@ mkV053 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => base_1+"ғaтынмын" ; @@ -18500,7 +18500,7 @@ mkV053 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => base_1+"ғ" ; @@ -18522,7 +18522,7 @@ mkV053 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => base_1+"ғapмын" ; Pl => base_1+"ғapмыз" @@ -18548,9 +18548,9 @@ mkV054 : Str -> V ; mkV054 base = case base of { "шыд"+base_1+"у" => lin V - { Infinitive = "шыд"+base_1+"у" ; - Indicative = { Fut = nonExist ; - Pres = { Progressive = table { + { infinitive = "шыд"+base_1+"у" ; + indicative = { fut = nonExist ; + pres = { progressive = table { Pos => table { P1 => table { Sg => "шыд"+base_1+"п жaтыpмын" ; @@ -18627,7 +18627,7 @@ mkV054 base = } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => base_1+"лғaнмын" ; @@ -18665,7 +18665,7 @@ mkV054 base = } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => "шыд"+base_1+"йтынмын" ; @@ -18743,7 +18743,7 @@ mkV054 base = } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => "шыд"+base_1 ; @@ -18765,7 +18765,7 @@ mkV054 base = } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => "шыд"+base_1+"pмын" ; Pl => "шыд"+base_1+"pмыз" diff --git a/src/kazakh/ResKaz.gf b/src/kazakh/ResKaz.gf index 1f5a0912..1bef15bd 100644 --- a/src/kazakh/ResKaz.gf +++ b/src/kazakh/ResKaz.gf @@ -81,12 +81,12 @@ oper mkNoun : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str param Polarity = Pos | Neg ; -oper Verb = {Infinitive: Str; Indicative: {Fut: Str; Pres: {Progressive: Polarity => Person => Number => Str; noAspect: Polarity => Person => Number => Str}; Past: {Perfect: Polarity => Person => Number => Str; Progressive: Polarity => Person => Number => Str; noAspect: Polarity => Person => Number => Str}}; Imperative_Jussive: Polarity => Formality => Number => Str; Subjunctive: Person => Number => Str} ; -- 113 +oper Verb = {infinitive: Str; indicative: {fut: Str; pres: {progressive: Polarity => Person => Number => Str; noAspect: Polarity => Person => Number => Str}; past: {perfect: Polarity => Person => Number => Str; progressive: Polarity => Person => Number => Str; noAspect: Polarity => Person => Number => Str}}; imperative: Polarity => Formality => Number => Str; subjunctive: Person => Number => Str} ; -- 113 oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Verb = \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34,f35,f36,f37,f38,f39,f40,f41,f42,f43,f44,f45,f46,f47,f48,f49,f50,f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61,f62,f63,f64,f65,f66,f67,f68,f69,f70,f71,f72,f73,f74,f75,f76,f77,f78,f79,f80,f81,f82,f83,f84,f85,f86,f87,f88,f89,f90,f91,f92,f93,f94,f95,f96,f97,f98 -> - { Infinitive = f1 ; - Indicative = { Fut = f2 ; - Pres = { Progressive = table { + { infinitive = f1 ; + indicative = { fut = f2 ; + pres = { progressive = table { Pos => table { P1 => table { Sg => f3 ; @@ -163,7 +163,7 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ } } } ; - Past = { Perfect = table { + past = { perfect = table { Pos => table { P1 => table { Sg => f35 ; @@ -201,7 +201,7 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ } } } ; - Progressive = table { + progressive = table { Pos => table { P1 => table { Sg => f51 ; @@ -279,7 +279,7 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ } } } ; - Imperative_Jussive = table { + imperative = table { Pos => table { Informal => table { Sg => f83 ; @@ -301,7 +301,7 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ } } } ; - Subjunctive = table { + subjunctive = table { P1 => table { Sg => f91 ; Pl => f92 From 44acdbd350ee2d36ef91305059bf8c68411ff0a9 Mon Sep 17 00:00:00 2001 From: EkaterinaVoloshina Date: Fri, 10 Apr 2026 15:49:30 +0200 Subject: [PATCH 2/3] fixed fields in armenian --- src/armenian/CatHye.gf | 60 +-- src/armenian/DocumentationHye.gf | 50 +-- src/armenian/MorphoHye.gf | 750 +++++++++++++++---------------- src/armenian/ParadigmsHye.gf | 1 - src/armenian/ResHye.gf | 28 +- 5 files changed, 444 insertions(+), 445 deletions(-) diff --git a/src/armenian/CatHye.gf b/src/armenian/CatHye.gf index e7aa3ef4..2da59320 100644 --- a/src/armenian/CatHye.gf +++ b/src/armenian/CatHye.gf @@ -46,7 +46,7 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in { lincat Ord = {s : Str} ; lincat PN = {s : Str} ; lincat Predet = {s : Str} ; - lincat Prep = {s : Str; c : Case; lock_Prep : {}; isPre : Bool} ; + lincat Prep = {s : Str; c : Case; lock_Prep : {}} ; lincat Pron = {s : Str} ; lincat QCl = {s : Str} ; lincat QS = {s : Str} ; @@ -60,73 +60,73 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in { lincat Subj = {s : Str} ; lincat V = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str} ; lincat V2 = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str; c2 : {s : Str; c : Case}} ; lincat V2A = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str; c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; lincat V2Q = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str; c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; lincat V2S = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str; c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; lincat V2V = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str; c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; lincat V3 = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str; c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ; lincat VA = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str} ; lincat VP = {s : Case => Number => Str; conditional : Aspect => Person => Number => Case => Number => Str; - converb : {Imperfective : Case => Number => Str; - FutCon1 : Case => Number => Str; FutCon2 : Case => Number => Str; - Negative : Case => Number => Str; - Perfective : Case => Number => Str; - Simultaneous : Case => Number => Str}; + converb : {imperfective : Case => Number => Str; + futCon1 : Case => Number => Str; FutCon2 : Case => Number => Str; + negative : Case => Number => Str; + perfective : Case => Number => Str; + simultaneous : Case => Number => Str}; imperative : Number => Number => Str; passive : Case => Number => Str; past : Person => Number => Case => Number => Str; @@ -134,29 +134,29 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in { subjunctive : Aspect => Person => Number => Case => Number => Str} ; lincat VPSlash = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str; lock_V : {}} ; lincat VQ = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str} ; lincat VS = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str} ; lincat VV = {s : Str; causative : Str; conditional : Aspect => Person => Number => Str; - converb : {Imperfective : Str; FutCon1 : Str; FutCon2 : Str; - Negative : Str; Perfective : Str; Simultaneous : Str}; + converb : {imperfective : Str; futCon1 : Str; futCon2 : Str; + negative : Str; perfective : Str; simultaneous : Str}; imperative : Number => Str; passive : Str; past : Person => Number => Str; participle : PartType => Str; subjunctive : Aspect => Person => Number => Str} ; diff --git a/src/armenian/DocumentationHye.gf b/src/armenian/DocumentationHye.gf index 855aeda7..7fb787cd 100644 --- a/src/armenian/DocumentationHye.gf +++ b/src/armenian/DocumentationHye.gf @@ -15,50 +15,50 @@ lin paragraph (x.s) ++ heading1 "Converb" ++ frameTable ( - tr (th "Imperfective" ++ td (x.Converb.Imperfective)) ++ - tr (th "Simultaneous" ++ td (x.Converb.Simultaneous)) ++ - tr (th "Perfective" ++ td (x.Converb.Perfective)) ++ - tr (th "Futute I" ++ td (x.Converb.FutCon1)) ++ - tr (th "Futute II" ++ td (x.Converb.FutCon2)) ++ - tr (th "Connegative" ++ td (x.Converb.Negative))) ++ + tr (th "Imperfective" ++ td (x.converb.imperfective)) ++ + tr (th "Simultaneous" ++ td (x.converb.simultaneous)) ++ + tr (th "Perfective" ++ td (x.converb.perfective)) ++ + tr (th "Futute I" ++ td (x.converb.futCon1)) ++ + tr (th "Futute II" ++ td (x.converb.futCon2)) ++ + tr (th "Connegative" ++ td (x.converb.negative))) ++ heading1 "Passive" ++ - paragraph x.Passive ++ + paragraph x.passive ++ heading1 "Participle" ++ frameTable ( - tr (th "Resultative" ++ td (x.Participle ! Resultative)) ++ - tr (th "Subject" ++ td (x.Participle ! Subject))) ++ + tr (th "Resultative" ++ td (x.participle ! Resultative)) ++ + tr (th "Subject" ++ td (x.participle ! Subject))) ++ heading1 "Past" ++ frameTable ( tr (th "" ++ th "Sg" ++ th "Pl") ++ - tr (th "P1" ++ td (x.Past ! P1 ! Sg) ++ td (x.Past ! P1 ! Pl)) ++ - tr (th "P2" ++ td (x.Past ! P2 ! Sg) ++ td (x.Past ! P2 ! Pl)) ++ - tr (th "P3" ++ td (x.Past ! P3 ! Sg) ++ td (x.Past ! P3 ! Pl))) ++ + tr (th "P1" ++ td (x.past ! P1 ! Sg) ++ td (x.past ! P1 ! Pl)) ++ + tr (th "P2" ++ td (x.past ! P2 ! Sg) ++ td (x.past ! P2 ! Pl)) ++ + tr (th "P3" ++ td (x.past ! P3 ! Sg) ++ td (x.past ! P3 ! Pl))) ++ heading1 "Subjunctive" ++ frameTable ( tr (intagAttr "th" "colspan=\"2\"" "" ++ th "Sg" ++ th "Pl") ++ tr (intagAttr "th" "rowspan=\"3\"" "Perfect" ++ - th "P1" ++ td (x.Subjunctive ! Perfect ! P1 ! Sg) ++ td (x.Subjunctive ! Perfect ! P1 ! Pl)) ++ - tr (th "P2" ++ td (x.Subjunctive ! Perfect ! P2 ! Sg) ++ td (x.Subjunctive ! Perfect ! P2 ! Pl)) ++ - tr (th "P3" ++ td (x.Subjunctive ! Perfect ! P3 ! Sg) ++ td (x.Subjunctive ! Perfect ! P3 ! Pl)) ++ + th "P1" ++ td (x.subjunctive ! Perfect ! P1 ! Sg) ++ td (x.subjunctive ! Perfect ! P1 ! Pl)) ++ + tr (th "P2" ++ td (x.subjunctive ! Perfect ! P2 ! Sg) ++ td (x.subjunctive ! Perfect ! P2 ! Pl)) ++ + tr (th "P3" ++ td (x.subjunctive ! Perfect ! P3 ! Sg) ++ td (x.subjunctive ! Perfect ! P3 ! Pl)) ++ tr (intagAttr "th" "rowspan=\"3\"" "Non_Past" ++ - th "P1" ++ td (x.Subjunctive ! Non_Past ! P1 ! Sg) ++ td (x.Subjunctive ! Non_Past ! P1 ! Pl)) ++ - tr (th "P2" ++ td (x.Subjunctive ! Non_Past ! P2 ! Sg) ++ td (x.Subjunctive ! Non_Past ! P2 ! Pl)) ++ - tr (th "P3" ++ td (x.Subjunctive ! Non_Past ! P3 ! Sg) ++ td (x.Subjunctive ! Non_Past ! P3 ! Pl))) ++ + th "P1" ++ td (x.subjunctive ! Non_Past ! P1 ! Sg) ++ td (x.subjunctive ! Non_Past ! P1 ! Pl)) ++ + tr (th "P2" ++ td (x.subjunctive ! Non_Past ! P2 ! Sg) ++ td (x.subjunctive ! Non_Past ! P2 ! Pl)) ++ + tr (th "P3" ++ td (x.subjunctive ! Non_Past ! P3 ! Sg) ++ td (x.subjunctive ! Non_Past ! P3 ! Pl))) ++ heading1 "Conditional" ++ frameTable ( tr (intagAttr "th" "colspan=\"2\"" "" ++ th "Sg" ++ th "Pl") ++ tr (intagAttr "th" "rowspan=\"3\"" "Perfect" ++ - th "P1" ++ td (x.Conditional ! Perfect ! P1 ! Sg) ++ td (x.Conditional ! Perfect ! P1 ! Pl)) ++ - tr (th "P2" ++ td (x.Conditional ! Perfect ! P2 ! Sg) ++ td (x.Conditional ! Perfect ! P2 ! Pl)) ++ - tr (th "P3" ++ td (x.Conditional ! Perfect ! P3 ! Sg) ++ td (x.Conditional ! Perfect ! P3 ! Pl)) ++ + th "P1" ++ td (x.conditional ! Perfect ! P1 ! Sg) ++ td (x.conditional ! Perfect ! P1 ! Pl)) ++ + tr (th "P2" ++ td (x.conditional ! Perfect ! P2 ! Sg) ++ td (x.conditional ! Perfect ! P2 ! Pl)) ++ + tr (th "P3" ++ td (x.conditional ! Perfect ! P3 ! Sg) ++ td (x.conditional ! Perfect ! P3 ! Pl)) ++ tr (intagAttr "th" "rowspan=\"4\"" "Non_Past" ++ - th "P1" ++ td (x.Conditional ! Non_Past ! P1 ! Sg) ++ td (x.Conditional ! Non_Past ! P1 ! Pl)) ++ - tr (th "P2" ++ td (x.Conditional ! Non_Past ! P2 ! Sg) ++ td (x.Conditional ! Non_Past ! P2 ! Pl)) ++ - tr (th "P3" ++ td (x.Conditional ! Non_Past ! P3 ! Sg) ++ td (x.Conditional ! Non_Past ! P3 ! Pl))) ++ + th "P1" ++ td (x.conditional ! Non_Past ! P1 ! Sg) ++ td (x.conditional ! Non_Past ! P1 ! Pl)) ++ + tr (th "P2" ++ td (x.conditional ! Non_Past ! P2 ! Sg) ++ td (x.conditional ! Non_Past ! P2 ! Pl)) ++ + tr (th "P3" ++ td (x.conditional ! Non_Past ! P3 ! Sg) ++ td (x.conditional ! Non_Past ! P3 ! Pl))) ++ heading1 "Imperative" ++ frameTable ( tr (th "Sg" ++ th "Pl") ++ - tr (td (x.Imperative_Jussive ! Sg) ++ td (x.Imperative_Jussive ! Pl))) ; + tr (td (x.imperative ! Sg) ++ td (x.imperative ! Pl))) ; s3=[] } ; lin diff --git a/src/armenian/MorphoHye.gf b/src/armenian/MorphoHye.gf index 747de9dc..c5679a23 100644 --- a/src/armenian/MorphoHye.gf +++ b/src/armenian/MorphoHye.gf @@ -7,8 +7,8 @@ mkV001 base = case base of { base_1+"ել" => lin V { s = base_1+"ել" ; - Causative = base_1+"եցնել" ; - Conditional = table { + causative = base_1+"եցնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"եի" ; @@ -23,7 +23,7 @@ mkV001 base = Pl => "կ"+base_1+"եին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"եմ" ; Pl => "կ"+base_1+"ենք" @@ -38,19 +38,19 @@ mkV001 base = } } } ; - Converb = { Imperfective = base_1+"ում" ; - FutCon1 = base_1+"ելու" ; - FutCon2 = base_1+"ելիք" ; - Negative = base_1+"ի" ; - Perfective = base_1+"ել" ; - Simultaneous = base_1+"ելիս" + converb = { imperfective = base_1+"ում" ; + futCon1 =base_1+"ելու" ; + futCon2 = base_1+"ելիք" ; + negative = base_1+"ի" ; + perfective = base_1+"ել" ; + simultaneous = base_1+"ելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"ի՛ր" ; Pl => base_1+"ե՛ք" } ; - Passive = base_1+"վել" ; - Past = table { + passive = base_1+"վել" ; + past = table { P1 => table { Sg => base_1+"եցի" ; Pl => base_1+"եցինք" @@ -64,11 +64,11 @@ mkV001 base = Pl => base_1+"եցին" } } ; - Participle = table { + participle = table { Resultative => base_1+"ած" ; Subject => base_1+"ող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"եի" ; @@ -83,7 +83,7 @@ mkV001 base = Pl => base_1+"եին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"եմ" ; Pl => base_1+"ենք" @@ -107,8 +107,8 @@ mkV002 base = case base of { base_1+"ալ" => lin V { s = base_1+"ալ" ; - Causative = base_1+"ացնել" ; - Conditional = table { + causative = base_1+"ացնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"այի" ; @@ -123,7 +123,7 @@ mkV002 base = Pl => "կ"+base_1+"ային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"ամ" ; Pl => "կ"+base_1+"անք" @@ -138,19 +138,19 @@ mkV002 base = } } } ; - Converb = { Imperfective = base_1+"ում" ; - FutCon1 = base_1+"ալու" ; - FutCon2 = base_1+"ալիք" ; - Negative = base_1+"ա" ; - Perfective = base_1+"ացել" ; - Simultaneous = base_1+"ալիս" + converb = { imperfective = base_1+"ում" ; + futCon1 =base_1+"ալու" ; + futCon2 = base_1+"ալիք" ; + negative = base_1+"ա" ; + perfective = base_1+"ացել" ; + simultaneous = base_1+"ալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"ա՛" ; Pl => base_1+"ացե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+"ացի" ; Pl => base_1+"ացինք" @@ -164,11 +164,11 @@ mkV002 base = Pl => base_1+"ացին" } } ; - Participle = table { + participle = table { Resultative => base_1+"ացած" ; Subject => base_1+"ացող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"այի" ; @@ -183,7 +183,7 @@ mkV002 base = Pl => base_1+"ային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"ամ" ; Pl => base_1+"անք" @@ -207,8 +207,8 @@ mkV003 base = case base of { base_1+"նել" => lin V { s = base_1+"նել" ; - Causative = nonExist ; - Conditional = table { + causative = nonExist ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"նեի" ; @@ -223,7 +223,7 @@ mkV003 base = Pl => "կ"+base_1+"նեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"նեմ" ; Pl => "կ"+base_1+"նենք" @@ -238,19 +238,19 @@ mkV003 base = } } } ; - Converb = { Imperfective = base_1+"նում" ; - FutCon1 = base_1+"նելու" ; - FutCon2 = base_1+"նելիք" ; - Negative = base_1+"նի" ; - Perfective = base_1+"րել" ; - Simultaneous = base_1+"նելիս" + converb = { imperfective = base_1+"նում" ; + futCon1 =base_1+"նելու" ; + futCon2 = base_1+"նելիք" ; + negative = base_1+"նի" ; + perfective = base_1+"րել" ; + simultaneous = base_1+"նելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"րո՛ւ" ; Pl => base_1+"րե՛ք" } ; - Passive = base_1+"վել" ; - Past = table { + passive = base_1+"վել" ; + past = table { P1 => table { Sg => base_1+"րի" ; Pl => base_1+"րինք" @@ -264,11 +264,11 @@ mkV003 base = Pl => base_1+"րին" } } ; - Participle = table { + participle = table { Resultative => base_1+"րած" ; Subject => base_1+"նող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"նեի" ; @@ -283,7 +283,7 @@ mkV003 base = Pl => base_1+"նեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"նեմ" ; Pl => base_1+"նենք" @@ -307,8 +307,8 @@ mkV004 base = case base of { base_1+"նալ" => lin V { s = base_1+"նալ" ; - Causative = base_1+"ցնել" ; - Conditional = table { + causative = base_1+"ցնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"նայի" ; @@ -323,7 +323,7 @@ mkV004 base = Pl => "կ"+base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"նամ" ; Pl => "կ"+base_1+"նանք" @@ -338,19 +338,19 @@ mkV004 base = } } } ; - Converb = { Imperfective = base_1+"նում" ; - FutCon1 = base_1+"նալու" ; - FutCon2 = base_1+"նալիք" ; - Negative = base_1+"նա" ; - Perfective = base_1+"ցել" ; - Simultaneous = base_1+"նալիս" + converb = { imperfective = base_1+"նում" ; + futCon1 =base_1+"նալու" ; + futCon2 = base_1+"նալիք" ; + negative = base_1+"նա" ; + perfective = base_1+"ցել" ; + simultaneous = base_1+"նալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"ցի՛ր" ; Pl => base_1+"ցե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+"ցա" ; Pl => base_1+"ցանք" @@ -364,11 +364,11 @@ mkV004 base = Pl => base_1+"ցան" } } ; - Participle = table { + participle = table { Resultative => base_1+"ցած" ; Subject => base_1+"ցող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"նայի" ; @@ -383,7 +383,7 @@ mkV004 base = Pl => base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"նամ" ; Pl => base_1+"նանք" @@ -407,8 +407,8 @@ mkV005 base = case base of { base_1+"ռնալ" => lin V { s = base_1+"ռնալ" ; - Causative = base_1+"րձնել" ; - Conditional = table { + causative = base_1+"րձնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"ռնայի" ; @@ -423,7 +423,7 @@ mkV005 base = Pl => "կ"+base_1+"ռնային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"ռնամ" ; Pl => "կ"+base_1+"ռնանք" @@ -438,19 +438,19 @@ mkV005 base = } } } ; - Converb = { Imperfective = base_1+"ռնում" ; - FutCon1 = base_1+"ռնալու" ; - FutCon2 = base_1+"ռնալիք" ; - Negative = base_1+"ռնա" ; - Perfective = base_1+"րձել" ; - Simultaneous = base_1+"ռնալիս" + converb = { imperfective = base_1+"ռնում" ; + futCon1 =base_1+"ռնալու" ; + futCon2 = base_1+"ռնալիք" ; + negative = base_1+"ռնա" ; + perfective = base_1+"րձել" ; + simultaneous = base_1+"ռնալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"րձի՛ր" ; Pl => base_1+"րձե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+"րձեցի" ; Pl => base_1+"րձեցինք" @@ -464,11 +464,11 @@ mkV005 base = Pl => base_1+"րձեցին" } } ; - Participle = table { + participle = table { Resultative => base_1+"րձած" ; Subject => base_1+"րձող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"ռնայի" ; @@ -483,7 +483,7 @@ mkV005 base = Pl => base_1+"ռնային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"ռնամ" ; Pl => base_1+"ռնանք" @@ -507,8 +507,8 @@ mkV006 base = case base of { "երթալ" => lin V { s = "երթալ" ; - Causative = "գնացնել" ; - Conditional = table { + causative = "գնացնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կերթայի" ; @@ -523,7 +523,7 @@ mkV006 base = Pl => "կերթային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կերթամ" ; Pl => "կերթանք" @@ -538,19 +538,19 @@ mkV006 base = } } } ; - Converb = { Imperfective = "երթում" ; - FutCon1 = "երթալու" ; - FutCon2 = "երթալիք" ; - Negative = "երթա" ; - Perfective = "գնացել" ; - Simultaneous = "երթալիս" + converb = { imperfective = "երթում" ; + futCon1 ="երթալու" ; + futCon2 = "երթալիք" ; + negative = "երթա" ; + perfective = "գնացել" ; + simultaneous = "երթալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => "երթա՛" ; Pl => "գնացե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => "գնացի" ; Pl => "գնացինք" @@ -564,11 +564,11 @@ mkV006 base = Pl => "գնացին" } } ; - Participle = table { + participle = table { Resultative => "գնացած" ; Subject => "գնացող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => "երթայի" ; @@ -583,7 +583,7 @@ mkV006 base = Pl => "երթային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "երթամ" ; Pl => "երթանք" @@ -607,8 +607,8 @@ mkV007 base = case base of { "էթալ" => lin V { s = "էթալ" ; - Causative = "գնացնել" ; - Conditional = table { + causative = "գնացնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կէթայի" ; @@ -623,7 +623,7 @@ mkV007 base = Pl => "կէթային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կէթամ" ; Pl => "կէթանք" @@ -638,19 +638,19 @@ mkV007 base = } } } ; - Converb = { Imperfective = "էթում" ; - FutCon1 = "էթալու" ; - FutCon2 = "էթալիք" ; - Negative = "էթա" ; - Perfective = "գնացել" ; - Simultaneous = "էթալիս" + converb = { imperfective = "էթում" ; + futCon1 ="էթալու" ; + futCon2 = "էթալիք" ; + negative = "էթա" ; + perfective = "գնացել" ; + simultaneous = "էթալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => "էթա՛" ; Pl => "գնացե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => "գնացի" ; Pl => "գնացինք" @@ -664,11 +664,11 @@ mkV007 base = Pl => "գնացին" } } ; - Participle = table { + participle = table { Resultative => "գնացած" ; Subject => "գնացող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => "էթայի" ; @@ -683,7 +683,7 @@ mkV007 base = Pl => "էթային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "էթամ" ; Pl => "էթանք" @@ -707,8 +707,8 @@ mkV008 base = case base of { base_1+"նել" => lin V { s = base_1+"նել" ; - Causative = base_1+"ցնել" ; - Conditional = table { + causative = base_1+"ցնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"նեի" ; @@ -723,7 +723,7 @@ mkV008 base = Pl => "կ"+base_1+"նեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"նեմ" ; Pl => "կ"+base_1+"նենք" @@ -738,19 +738,19 @@ mkV008 base = } } } ; - Converb = { Imperfective = base_1+"նում" ; - FutCon1 = base_1+"նելու" ; - FutCon2 = base_1+"նելիք" ; - Negative = base_1+"նի" ; - Perfective = base_1+"ել" ; - Simultaneous = base_1+"նելիս" + converb = { imperfective = base_1+"նում" ; + futCon1 =base_1+"նելու" ; + futCon2 = base_1+"նելիք" ; + negative = base_1+"նի" ; + perfective = base_1+"ել" ; + simultaneous = base_1+"նելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"ի՛ր" ; Pl => base_1+"ե՛ք" } ; - Passive = base_1+"նվել" ; - Past = table { + passive = base_1+"նվել" ; + past = table { P1 => table { Sg => base_1+"ա" ; Pl => base_1+"անք" @@ -764,11 +764,11 @@ mkV008 base = Pl => base_1+"ան" } } ; - Participle = table { + participle = table { Resultative => base_1+"ած" ; Subject => base_1+"նող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"նեի" ; @@ -783,7 +783,7 @@ mkV008 base = Pl => base_1+"նեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"նեմ" ; Pl => base_1+"նենք" @@ -807,8 +807,8 @@ mkV009 base = case base of { "ըլնել" => lin V { s = "ըլնել" ; - Causative = nonExist ; - Conditional = table { + causative = nonExist ; + conditional = table { Perfect => table { P1 => table { Sg => "կըլնեի" ; @@ -823,7 +823,7 @@ mkV009 base = Pl => "կըլնեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կըլնեմ" ; Pl => "կըլնենք" @@ -838,19 +838,19 @@ mkV009 base = } } } ; - Converb = { Imperfective = "ըլնում" ; - FutCon1 = "ըլնելու" ; - FutCon2 = "ըլնելիք" ; - Negative = "ըլնի" ; - Perfective = "էղել" ; - Simultaneous = "ըլնելիս" + converb = { imperfective = "ըլնում" ; + futCon1 ="ըլնելու" ; + futCon2 = "ըլնելիք" ; + negative = "ըլնի" ; + perfective = "էղել" ; + simultaneous = "ըլնելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => "էղի՛ր" ; Pl => "էղե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => "էղա" ; Pl => "էղանք" @@ -864,11 +864,11 @@ mkV009 base = Pl => "էղան" } } ; - Participle = table { + participle = table { Resultative => "էղած" ; Subject => "ըլնող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => "ըլնեի" ; @@ -883,7 +883,7 @@ mkV009 base = Pl => "ըլնեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "ըլնեմ" ; Pl => "ըլնենք" @@ -907,8 +907,8 @@ mkV010 base = case base of { base_1+"նալ" => lin V { s = base_1+"նալ" ; - Causative = base_1+"ցնել" ; - Conditional = table { + causative = base_1+"ցնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"նայի" ; @@ -923,7 +923,7 @@ mkV010 base = Pl => "կ"+base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"նամ" ; Pl => "կ"+base_1+"նանք" @@ -938,19 +938,19 @@ mkV010 base = } } } ; - Converb = { Imperfective = base_1+"նում" ; - FutCon1 = base_1+"նալու" ; - FutCon2 = base_1+"նալիք" ; - Negative = base_1+"նա" ; - Perfective = base_1+"ցել" ; - Simultaneous = base_1+"նալիս" + converb = { imperfective = base_1+"նում" ; + futCon1 =base_1+"նալու" ; + futCon2 = base_1+"նալիք" ; + negative = base_1+"նա" ; + perfective = base_1+"ցել" ; + simultaneous = base_1+"նալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"՛" ; Pl => base_1+"ցե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+"ցի" ; Pl => base_1+"ցինք" @@ -964,11 +964,11 @@ mkV010 base = Pl => base_1+"ցին" } } ; - Participle = table { + participle = table { Resultative => base_1+"ցած" ; Subject => base_1+"ցող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"նայի" ; @@ -983,7 +983,7 @@ mkV010 base = Pl => base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"նամ" ; Pl => base_1+"նանք" @@ -1007,8 +1007,8 @@ mkV011 base = case base of { base_1+"ալ" => lin V { s = base_1+"ալ" ; - Causative = base_1+"ացնել" ; - Conditional = table { + causative = base_1+"ացնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"այի" ; @@ -1023,7 +1023,7 @@ mkV011 base = Pl => "կ"+base_1+"ային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"ամ" ; Pl => "կ"+base_1+"անք" @@ -1038,19 +1038,19 @@ mkV011 base = } } } ; - Converb = { Imperfective = base_1+"ում" ; - FutCon1 = base_1+"ալու" ; - FutCon2 = base_1+"ալիք" ; - Negative = base_1+"այ" ; - Perfective = base_1+"ացել" ; - Simultaneous = base_1+"ալիս" + converb = { imperfective = base_1+"ում" ; + futCon1 =base_1+"ալու" ; + futCon2 = base_1+"ալիք" ; + negative = base_1+"այ" ; + perfective = base_1+"ացել" ; + simultaneous = base_1+"ալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"ա՛" ; Pl => base_1+"ացէ՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+"ացի" ; Pl => base_1+"ացինք" @@ -1064,11 +1064,11 @@ mkV011 base = Pl => base_1+"ացին" } } ; - Participle = table { + participle = table { Resultative => base_1+"ացած" ; Subject => base_1+"ացող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"այի" ; @@ -1083,7 +1083,7 @@ mkV011 base = Pl => base_1+"ային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"ամ" ; Pl => base_1+"անք" @@ -1107,8 +1107,8 @@ mkV012 base = case base of { base_1+"ել" => lin V { s = base_1+"ել" ; - Causative = base_1+"եցնել" ; - Conditional = table { + causative = base_1+"եցնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"էի" ; @@ -1123,7 +1123,7 @@ mkV012 base = Pl => "կ"+base_1+"էին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"եմ" ; Pl => "կ"+base_1+"ենք" @@ -1138,19 +1138,19 @@ mkV012 base = } } } ; - Converb = { Imperfective = base_1+"ում" ; - FutCon1 = base_1+"ելու" ; - FutCon2 = base_1+"ելիք" ; - Negative = base_1+"ի" ; - Perfective = base_1+"ել" ; - Simultaneous = base_1+"ելիս" + converb = { imperfective = base_1+"ում" ; + futCon1 =base_1+"ելու" ; + futCon2 = base_1+"ելիք" ; + negative = base_1+"ի" ; + perfective = base_1+"ել" ; + simultaneous = base_1+"ելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"ի՛ր" ; Pl => base_1+"է՛ք" } ; - Passive = base_1+"ուել" ; - Past = table { + passive = base_1+"ուել" ; + past = table { P1 => table { Sg => base_1+"եցի" ; Pl => base_1+"եցինք" @@ -1164,11 +1164,11 @@ mkV012 base = Pl => base_1+"եցին" } } ; - Participle = table { + participle = table { Resultative => base_1+"ած" ; Subject => base_1+"ող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"էի" ; @@ -1183,7 +1183,7 @@ mkV012 base = Pl => base_1+"էին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"եմ" ; Pl => base_1+"ենք" @@ -1207,8 +1207,8 @@ mkV013 base = case base of { base_1@?+base_2+"ել" => lin V { s = base_1+base_2+"ել" ; - Causative = base_1+base_2+"եցնել" ; - Conditional = table { + causative = base_1+base_2+"եցնել" ; + conditional = table { Perfect => table { P1 => table { Sg => base_1+"կ"+base_2+"եի" ; @@ -1223,7 +1223,7 @@ mkV013 base = Pl => base_1+"կ"+base_2+"եին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"կ"+base_2+"եմ" ; Pl => base_1+"կ"+base_2+"ենք" @@ -1238,19 +1238,19 @@ mkV013 base = } } } ; - Converb = { Imperfective = base_1+base_2+"ում" ; - FutCon1 = base_1+base_2+"ելու" ; - FutCon2 = base_1+base_2+"ելիք" ; - Negative = base_1+base_2+"ի" ; - Perfective = base_1+base_2+"ել" ; - Simultaneous = base_1+base_2+"ելիս" + converb = { imperfective = base_1+base_2+"ում" ; + futCon1 =base_1+base_2+"ելու" ; + futCon2 = base_1+base_2+"ելիք" ; + negative = base_1+base_2+"ի" ; + perfective = base_1+base_2+"ել" ; + simultaneous = base_1+base_2+"ելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+base_2+"ի՛ր" ; Pl => base_1+base_2+"ե՛ք" } ; - Passive = base_1+base_2+"վել" ; - Past = table { + passive = base_1+base_2+"վել" ; + past = table { P1 => table { Sg => base_1+base_2+"եցի" ; Pl => base_1+base_2+"եցինք" @@ -1264,11 +1264,11 @@ mkV013 base = Pl => base_1+base_2+"եցին" } } ; - Participle = table { + participle = table { Resultative => base_1+base_2+"ած" ; Subject => base_1+base_2+"ող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+base_2+"եի" ; @@ -1283,7 +1283,7 @@ mkV013 base = Pl => base_1+base_2+"եին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+base_2+"եմ" ; Pl => base_1+base_2+"ենք" @@ -1307,8 +1307,8 @@ mkV014 base = case base of { base_1+base_2@(?+?)+"նել" => lin V { s = base_1+base_2+"նել" ; - Causative = nonExist ; - Conditional = table { + causative = nonExist ; + conditional = table { Perfect => table { P1 => table { Sg => base_1+"կ"+base_2+"նեի" ; @@ -1323,7 +1323,7 @@ mkV014 base = Pl => base_1+"կ"+base_2+"նեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"կ"+base_2+"նեմ" ; Pl => base_1+"կ"+base_2+"նենք" @@ -1338,19 +1338,19 @@ mkV014 base = } } } ; - Converb = { Imperfective = base_1+base_2+"նում" ; - FutCon1 = base_1+base_2+"նելու" ; - FutCon2 = base_1+base_2+"նելիք" ; - Negative = base_1+base_2+"նի" ; - Perfective = base_1+base_2+"ել" ; - Simultaneous = base_1+base_2+"նելիս" + converb = { imperfective = base_1+base_2+"նում" ; + futCon1 =base_1+base_2+"նելու" ; + futCon2 = base_1+base_2+"նելիք" ; + negative = base_1+base_2+"նի" ; + perfective = base_1+base_2+"ել" ; + simultaneous = base_1+base_2+"նելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+base_2+"ի՛ր" ; Pl => base_1+base_2+"ե՛ք" } ; - Passive = base_1+base_2+"նվել" ; - Past = table { + passive = base_1+base_2+"նվել" ; + past = table { P1 => table { Sg => base_1+base_2+"ա" ; Pl => base_1+base_2+"անք" @@ -1364,11 +1364,11 @@ mkV014 base = Pl => base_1+base_2+"ան" } } ; - Participle = table { + participle = table { Resultative => base_1+base_2+"ած" ; Subject => base_1+base_2+"նող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+base_2+"նեի" ; @@ -1383,7 +1383,7 @@ mkV014 base = Pl => base_1+base_2+"նեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+base_2+"նեմ" ; Pl => base_1+base_2+"նենք" @@ -1407,8 +1407,8 @@ mkV015 base = case base of { base_1@?+base_2+"նալ" => lin V { s = base_1+base_2+"նալ" ; - Causative = base_1+base_2+"ցնել" ; - Conditional = table { + causative = base_1+base_2+"ցնել" ; + conditional = table { Perfect => table { P1 => table { Sg => base_1+"կ"+base_2+"նայի" ; @@ -1423,7 +1423,7 @@ mkV015 base = Pl => base_1+"կ"+base_2+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"կ"+base_2+"նամ" ; Pl => base_1+"կ"+base_2+"նանք" @@ -1438,19 +1438,19 @@ mkV015 base = } } } ; - Converb = { Imperfective = base_1+base_2+"նում" ; - FutCon1 = base_1+base_2+"նալու" ; - FutCon2 = base_1+base_2+"նալիք" ; - Negative = base_1+base_2+"նա" ; - Perfective = base_1+base_2+"ցել" ; - Simultaneous = base_1+base_2+"նալիս" + converb = { imperfective = base_1+base_2+"նում" ; + futCon1 =base_1+base_2+"նալու" ; + futCon2 = base_1+base_2+"նալիք" ; + negative = base_1+base_2+"նա" ; + perfective = base_1+base_2+"ցել" ; + simultaneous = base_1+base_2+"նալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+base_2+"ցի՛ր" ; Pl => base_1+base_2+"ցե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+base_2+"ցա" ; Pl => base_1+base_2+"ցանք" @@ -1464,11 +1464,11 @@ mkV015 base = Pl => base_1+base_2+"ցան" } } ; - Participle = table { + participle = table { Resultative => base_1+base_2+"ցած" ; Subject => base_1+base_2+"ցող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+base_2+"նայի" ; @@ -1483,7 +1483,7 @@ mkV015 base = Pl => base_1+base_2+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+base_2+"նամ" ; Pl => base_1+base_2+"նանք" @@ -1507,8 +1507,8 @@ mkV016 base = case base of { base_1+base_2@(?+?+?+?)+"ել" => lin V { s = base_1+base_2+"ել" ; - Causative = nonExist ; - Conditional = table { + causative = nonExist ; + conditional = table { Perfect => table { P1 => table { Sg => base_1+"կ"+base_2+"էի" ; @@ -1523,7 +1523,7 @@ mkV016 base = Pl => base_1+"կ"+base_2+"էին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"կ"+base_2+"եմ" ; Pl => base_1+"կ"+base_2+"ենք" @@ -1538,19 +1538,19 @@ mkV016 base = } } } ; - Converb = { Imperfective = base_1+base_2+"ում" ; - FutCon1 = base_1+base_2+"ելու" ; - FutCon2 = base_1+base_2+"ելիք" ; - Negative = base_1+base_2+"ի" ; - Perfective = base_1+base_2+"ել" ; - Simultaneous = base_1+base_2+"ելիս" + converb = { imperfective = base_1+base_2+"ում" ; + futCon1 =base_1+base_2+"ելու" ; + futCon2 = base_1+base_2+"ելիք" ; + negative = base_1+base_2+"ի" ; + perfective = base_1+base_2+"ել" ; + simultaneous = base_1+base_2+"ելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+base_2+"ի՛ր" ; Pl => base_1+base_2+"է՛ք" } ; - Passive = base_1+base_2+"ուել" ; - Past = table { + passive = base_1+base_2+"ուել" ; + past = table { P1 => table { Sg => base_1+base_2+"եցի" ; Pl => base_1+base_2+"եցինք" @@ -1564,11 +1564,11 @@ mkV016 base = Pl => base_1+base_2+"եցին" } } ; - Participle = table { + participle = table { Resultative => base_1+base_2+"ած" ; Subject => base_1+base_2+"ող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+base_2+"էի" ; @@ -1583,7 +1583,7 @@ mkV016 base = Pl => base_1+base_2+"էին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+base_2+"եմ" ; Pl => base_1+base_2+"ենք" @@ -1607,8 +1607,8 @@ mkV017 base = case base of { base_1+base_2@(?+?+?)+"նել" => lin V { s = base_1+base_2+"նել" ; - Causative = nonExist ; - Conditional = table { + causative = nonExist ; + conditional = table { Perfect => table { P1 => table { Sg => base_1+"կ"+base_2+"նեի" ; @@ -1623,7 +1623,7 @@ mkV017 base = Pl => base_1+"կ"+base_2+"նեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"կ"+base_2+"նեմ" ; Pl => base_1+"կ"+base_2+"նենք" @@ -1638,19 +1638,19 @@ mkV017 base = } } } ; - Converb = { Imperfective = base_1+base_2+"նում" ; - FutCon1 = base_1+base_2+"նելու" ; - FutCon2 = base_1+base_2+"նելիք" ; - Negative = base_1+base_2+"նի" ; - Perfective = base_1+base_2+"րել" ; - Simultaneous = base_1+base_2+"նելիս" + converb = { imperfective = base_1+base_2+"նում" ; + futCon1 =base_1+base_2+"նելու" ; + futCon2 = base_1+base_2+"նելիք" ; + negative = base_1+base_2+"նի" ; + perfective = base_1+base_2+"րել" ; + simultaneous = base_1+base_2+"նելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+base_2+"րո՛ւ" ; Pl => base_1+base_2+"րե՛ք" } ; - Passive = base_1+base_2+"վել" ; - Past = table { + passive = base_1+base_2+"վել" ; + past = table { P1 => table { Sg => base_1+base_2+"րի" ; Pl => base_1+base_2+"րինք" @@ -1664,11 +1664,11 @@ mkV017 base = Pl => base_1+base_2+"րին" } } ; - Participle = table { + participle = table { Resultative => base_1+base_2+"րած" ; Subject => base_1+base_2+"նող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+base_2+"նեի" ; @@ -1683,7 +1683,7 @@ mkV017 base = Pl => base_1+base_2+"նեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+base_2+"նեմ" ; Pl => base_1+base_2+"նենք" @@ -1707,8 +1707,8 @@ mkV018 base = case base of { base_1+"ել" => lin V { s = base_1+"ել" ; - Causative = nonExist ; - Conditional = table { + causative = nonExist ; + conditional = table { Perfect => table { P1 => table { Sg => base_1+"կեի" ; @@ -1723,7 +1723,7 @@ mkV018 base = Pl => base_1+"կեին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"կեմ" ; Pl => base_1+"կենք" @@ -1738,19 +1738,19 @@ mkV018 base = } } } ; - Converb = { Imperfective = base_1+"ում" ; - FutCon1 = base_1+"ելու" ; - FutCon2 = base_1+"ելիք" ; - Negative = base_1+"ի" ; - Perfective = base_1+"ել" ; - Simultaneous = base_1+"ելիս" + converb = { imperfective = base_1+"ում" ; + futCon1 =base_1+"ելու" ; + futCon2 = base_1+"ելիք" ; + negative = base_1+"ի" ; + perfective = base_1+"ել" ; + simultaneous = base_1+"ելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"ի՛ր" ; Pl => base_1+"ե՛ք" } ; - Passive = base_1+"վել" ; - Past = table { + passive = base_1+"վել" ; + past = table { P1 => table { Sg => base_1+"եցի" ; Pl => base_1+"եցինք" @@ -1764,11 +1764,11 @@ mkV018 base = Pl => base_1+"եցին" } } ; - Participle = table { + participle = table { Resultative => base_1+"ած" ; Subject => base_1+"ող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"եի" ; @@ -1783,7 +1783,7 @@ mkV018 base = Pl => base_1+"եին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"եմ" ; Pl => base_1+"ենք" @@ -1807,8 +1807,8 @@ mkV019 base = case base of { base_1+base_2@(?+?+?)+"ալ" => lin V { s = base_1+base_2+"ալ" ; - Causative = base_1+base_2+"ացնել" ; - Conditional = table { + causative = base_1+base_2+"ացնել" ; + conditional = table { Perfect => table { P1 => table { Sg => base_1+"կ"+base_2+"այի" ; @@ -1823,7 +1823,7 @@ mkV019 base = Pl => base_1+"կ"+base_2+"ային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"կ"+base_2+"ամ" ; Pl => base_1+"կ"+base_2+"անք" @@ -1838,19 +1838,19 @@ mkV019 base = } } } ; - Converb = { Imperfective = base_1+base_2+"ում" ; - FutCon1 = base_1+base_2+"ալու" ; - FutCon2 = base_1+base_2+"ալիք" ; - Negative = base_1+base_2+"ա" ; - Perfective = base_1+base_2+"ացել" ; - Simultaneous = base_1+base_2+"ալիս" + converb = { imperfective = base_1+base_2+"ում" ; + futCon1 =base_1+base_2+"ալու" ; + futCon2 = base_1+base_2+"ալիք" ; + negative = base_1+base_2+"ա" ; + perfective = base_1+base_2+"ացել" ; + simultaneous = base_1+base_2+"ալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+base_2+"ա՛" ; Pl => base_1+base_2+"ացե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+base_2+"ացի" ; Pl => base_1+base_2+"ացինք" @@ -1864,11 +1864,11 @@ mkV019 base = Pl => base_1+base_2+"ացին" } } ; - Participle = table { + participle = table { Resultative => base_1+base_2+"ացած" ; Subject => base_1+base_2+"ացող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+base_2+"այի" ; @@ -1883,7 +1883,7 @@ mkV019 base = Pl => base_1+base_2+"ային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+base_2+"ամ" ; Pl => base_1+base_2+"անք" @@ -1907,8 +1907,8 @@ mkV020 base = case base of { base_1+"նալ" => lin V { s = base_1+"նալ" ; - Causative = base_1+"ցնել" ; - Conditional = table { + causative = base_1+"ցնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"նայի" ; @@ -1923,7 +1923,7 @@ mkV020 base = Pl => "կ"+base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"նամ" ; Pl => "կ"+base_1+"նանք" @@ -1938,19 +1938,19 @@ mkV020 base = } } } ; - Converb = { Imperfective = base_1+"նում" ; - FutCon1 = base_1+"նալու" ; - FutCon2 = base_1+"նալիք" ; - Negative = base_1+"նայ" ; - Perfective = base_1+"ցել" ; - Simultaneous = base_1+"նալիս" + converb = { imperfective = base_1+"նում" ; + futCon1 =base_1+"նալու" ; + futCon2 = base_1+"նալիք" ; + negative = base_1+"նայ" ; + perfective = base_1+"ցել" ; + simultaneous = base_1+"նալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"ցի՛ր" ; Pl => base_1+"ցէ՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+"ցայ" ; Pl => base_1+"ցանք" @@ -1964,11 +1964,11 @@ mkV020 base = Pl => base_1+"ցան" } } ; - Participle = table { + participle = table { Resultative => base_1+"ցած" ; Subject => base_1+"ցող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"նայի" ; @@ -1983,7 +1983,7 @@ mkV020 base = Pl => base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"նամ" ; Pl => base_1+"նանք" @@ -2007,8 +2007,8 @@ mkV021 base = case base of { base_1+base_2@(?+?)+"ել" => lin V { s = base_1+base_2+"ել" ; - Causative = nonExist ; - Conditional = table { + causative = nonExist ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+base_2+"էի" ; @@ -2023,7 +2023,7 @@ mkV021 base = Pl => "կ"+base_1+base_2+"էին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+base_2+"եմ" ; Pl => "կ"+base_1+base_2+"ենք" @@ -2038,19 +2038,19 @@ mkV021 base = } } } ; - Converb = { Imperfective = base_1+"ւ"+base_2+"մ" ; - FutCon1 = base_1+base_2+"ելու" ; - FutCon2 = base_1+base_2+"ելիք" ; - Negative = base_1+base_2+"ի" ; - Perfective = base_1+base_2+"ել" ; - Simultaneous = base_1+base_2+"ելիս" + converb = { imperfective = base_1+"ւ"+base_2+"մ" ; + futCon1 =base_1+base_2+"ելու" ; + futCon2 = base_1+base_2+"ելիք" ; + negative = base_1+base_2+"ի" ; + perfective = base_1+base_2+"ել" ; + simultaneous = base_1+base_2+"ելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+base_2+"ի՛ր" ; Pl => base_1+base_2+"է՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+base_2+"եցի" ; Pl => base_1+base_2+"եցինք" @@ -2064,11 +2064,11 @@ mkV021 base = Pl => base_1+base_2+"եցին" } } ; - Participle = table { + participle = table { Resultative => base_1+base_2+"ած" ; Subject => base_1+base_2+"ող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+base_2+"էի" ; @@ -2083,7 +2083,7 @@ mkV021 base = Pl => base_1+base_2+"էին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+base_2+"եմ" ; Pl => base_1+base_2+"ենք" @@ -2107,8 +2107,8 @@ mkV022 base = case base of { base_1+"ռնալ" => lin V { s = base_1+"ռնալ" ; - Causative = base_1+"րձնել" ; - Conditional = table { + causative = base_1+"րձնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"ռնայի" ; @@ -2123,7 +2123,7 @@ mkV022 base = Pl => "կ"+base_1+"ռնային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"ռնամ" ; Pl => "կ"+base_1+"ռնանք" @@ -2138,19 +2138,19 @@ mkV022 base = } } } ; - Converb = { Imperfective = base_1+"ռնում" ; - FutCon1 = base_1+"ռնալու" ; - FutCon2 = base_1+"ռնալիք" ; - Negative = base_1+"ռնա" ; - Perfective = base_1+"րձել" ; - Simultaneous = base_1+"ռնալիս" + converb = { imperfective = base_1+"ռնում" ; + futCon1 =base_1+"ռնալու" ; + futCon2 = base_1+"ռնալիք" ; + negative = base_1+"ռնա" ; + perfective = base_1+"րձել" ; + simultaneous = base_1+"ռնալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"րձի՛ր" ; Pl => base_1+"րձե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+"րձա" ; Pl => base_1+"րձանք" @@ -2164,11 +2164,11 @@ mkV022 base = Pl => base_1+"րձան" } } ; - Participle = table { + participle = table { Resultative => base_1+"րձած" ; Subject => base_1+"րձող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"ռնայի" ; @@ -2183,7 +2183,7 @@ mkV022 base = Pl => base_1+"ռնային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"ռնամ" ; Pl => base_1+"ռնանք" @@ -2207,8 +2207,8 @@ mkV023 base = case base of { base_1+"նալ" => lin V { s = base_1+"նալ" ; - Causative = base_1+"սնել" ; - Conditional = table { + causative = base_1+"սնել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"նայի" ; @@ -2223,7 +2223,7 @@ mkV023 base = Pl => "կ"+base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"նամ" ; Pl => "կ"+base_1+"նանք" @@ -2238,19 +2238,19 @@ mkV023 base = } } } ; - Converb = { Imperfective = base_1+"նում" ; - FutCon1 = base_1+"նալու" ; - FutCon2 = base_1+"նալիք" ; - Negative = base_1+"նա" ; - Perfective = base_1+"սել" ; - Simultaneous = base_1+"նալիս" + converb = { imperfective = base_1+"նում" ; + futCon1 =base_1+"նալու" ; + futCon2 = base_1+"նալիք" ; + negative = base_1+"նա" ; + perfective = base_1+"սել" ; + simultaneous = base_1+"նալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => nonExist ; Pl => base_1+"սե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+"սա" ; Pl => base_1+"սանք" @@ -2264,11 +2264,11 @@ mkV023 base = Pl => base_1+"սան" } } ; - Participle = table { + participle = table { Resultative => base_1+"սած" ; Subject => base_1+"սող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"նայի" ; @@ -2283,7 +2283,7 @@ mkV023 base = Pl => base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"նամ" ; Pl => base_1+"նանք" @@ -2307,8 +2307,8 @@ mkV024 base = case base of { base_1+"նալ" => lin V { s = base_1+"նալ" ; - Causative = base_1+"նել" ; - Conditional = table { + causative = base_1+"նել" ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+"նայի" ; @@ -2323,7 +2323,7 @@ mkV024 base = Pl => "կ"+base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+"նամ" ; Pl => "կ"+base_1+"նանք" @@ -2338,19 +2338,19 @@ mkV024 base = } } } ; - Converb = { Imperfective = base_1+"նում" ; - FutCon1 = base_1+"նալու" ; - FutCon2 = base_1+"նալիք" ; - Negative = base_1+"նա" ; - Perfective = base_1+"ել" ; - Simultaneous = base_1+"նալիս" + converb = { imperfective = base_1+"նում" ; + futCon1 =base_1+"նալու" ; + futCon2 = base_1+"նալիք" ; + negative = base_1+"նա" ; + perfective = base_1+"ել" ; + simultaneous = base_1+"նալիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => nonExist ; Pl => base_1+"ե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+"ա" ; Pl => base_1+"անք" @@ -2364,11 +2364,11 @@ mkV024 base = Pl => base_1+"ան" } } ; - Participle = table { + participle = table { Resultative => base_1+"ած" ; Subject => base_1+"ող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+"նայի" ; @@ -2383,7 +2383,7 @@ mkV024 base = Pl => base_1+"նային" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+"նամ" ; Pl => base_1+"նանք" @@ -2407,8 +2407,8 @@ mkV025 base = case base of { base_1+base_2@?+"ել" => lin V { s = base_1+base_2+"ել" ; - Causative = nonExist ; - Conditional = table { + causative = nonExist ; + conditional = table { Perfect => table { P1 => table { Sg => "կ"+base_1+base_2+"եի" ; @@ -2423,7 +2423,7 @@ mkV025 base = Pl => "կ"+base_1+base_2+"եին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => "կ"+base_1+base_2+"եմ" ; Pl => "կ"+base_1+base_2+"ենք" @@ -2438,19 +2438,19 @@ mkV025 base = } } } ; - Converb = { Imperfective = base_1+base_2+"ում" ; - FutCon1 = base_1+base_2+"ելու" ; - FutCon2 = base_1+base_2+"ելիք" ; - Negative = base_1+base_2+"ի" ; - Perfective = base_1+base_2+"ել" ; - Simultaneous = base_1+base_2+"ելիս" + converb = { imperfective = base_1+base_2+"ում" ; + futCon1 =base_1+base_2+"ելու" ; + futCon2 = base_1+base_2+"ելիք" ; + negative = base_1+base_2+"ի" ; + perfective = base_1+base_2+"ել" ; + simultaneous = base_1+base_2+"ելիս" } ; - Imperative_Jussive = table { + imperative = table { Sg => base_1+"՛"+base_2 ; Pl => base_1+base_2+"ե՛ք" } ; - Passive = nonExist ; - Past = table { + passive = nonExist ; + past = table { P1 => table { Sg => base_1+base_2+"եցի" ; Pl => base_1+base_2+"եցինք" @@ -2464,11 +2464,11 @@ mkV025 base = Pl => base_1+base_2+"եցին" } } ; - Participle = table { + participle = table { Resultative => base_1+base_2+"ած" ; Subject => base_1+base_2+"ող" } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => base_1+base_2+"եի" ; @@ -2483,7 +2483,7 @@ mkV025 base = Pl => base_1+base_2+"եին" } } ; - Non_Past => table { + Non_past => table { P1 => table { Sg => base_1+base_2+"եմ" ; Pl => base_1+base_2+"ենք" diff --git a/src/armenian/ParadigmsHye.gf b/src/armenian/ParadigmsHye.gf index 4687407e..46e4693b 100644 --- a/src/armenian/ParadigmsHye.gf +++ b/src/armenian/ParadigmsHye.gf @@ -477,7 +477,6 @@ oper mkSubj : Str -> Subj = \s -> lin Subj {s=s} ; mkQuant : Str -> Quant = \s -> lin Quant {s=s} ; mkPredet : Str -> Predet = \s -> lin Predet {s=s} ; - mkDet : Str -> Det = \s -> lin Det {s=s} ; mkCard : Str -> Card = \s -> lin Card {s=s} ; mkConj : Str -> Conj = \s -> lin Conj {s=s} ; mkPConj : Str -> PConj = \s -> lin PConj {s=s} ; diff --git a/src/armenian/ResHye.gf b/src/armenian/ResHye.gf index aad80cec..08a7d030 100644 --- a/src/armenian/ResHye.gf +++ b/src/armenian/ResHye.gf @@ -5,12 +5,12 @@ param Person = P1 | P3 | P2 ; param Number = Sg | Pl ; param Case = Nom | Dat | Ablat | Instr | Loc ; param PartType = Resultative | Subject ; -oper Verb = {s: Str; Causative: Str; Conditional: Aspect => Person => Number => Str; Converb: {Imperfective: Str; FutCon1: Str; FutCon2: Str; Negative: Str; Perfective: Str; Simultaneous: Str}; Imperative_Jussive: Number => Str; Passive: Str; Past: Person => Number => Str; Participle: PartType => Str; Subjunctive: Aspect => Person => Number => Str} ; -- 898 +oper Verb = {s: Str; causative: Str; conditional: Aspect => Person => Number => Str; converb: {imperfective: Str; futCon1: Str; futCon2: Str; negative: Str; perfective: Str; simultaneous: Str}; imperative: Number => Str; passive: Str; past: Person => Number => Str; participle: PartType => Str; subjunctive: Aspect => Person => Number => Str} ; -- 898 oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Verb = \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34,f35,f36,f37,f38,f39,f40,f41,f42,f43 -> { s = f1 ; - Causative = f2 ; - Conditional = table { + causative = f2 ; + conditional = table { Perfect => table { P1 => table { Sg => f3 ; @@ -40,19 +40,19 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ } } } ; - Converb = { Imperfective = f15 ; - FutCon1 = f16 ; - FutCon2 = f17 ; - Negative = f18 ; - Perfective = f19 ; - Simultaneous = f20 + converb = { imperfective = f15 ; + futCon1 = f16 ; + futCon2 = f17 ; + negative = f18 ; + perfective = f19 ; + simultaneous = f20 } ; - Imperative_Jussive = table { + imperative = table { Sg => f21 ; Pl => f22 } ; - Passive = f23 ; - Past = table { + passive = f23 ; + past = table { P1 => table { Sg => f24 ; Pl => f25 @@ -66,11 +66,11 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ Pl => f29 } } ; - Participle = table { + participle = table { Resultative => f30 ; Subject => f31 } ; - Subjunctive = table { + subjunctive = table { Perfect => table { P1 => table { Sg => f32 ; From d6f3cae141c04cdd1f0af3dde18049b3f44aa472 Mon Sep 17 00:00:00 2001 From: EkaterinaVoloshina Date: Fri, 10 Apr 2026 15:57:46 +0200 Subject: [PATCH 3/3] fixed names of fields --- src/albanian/CatSqi.gf | 157 ++++++++++++++++++++++++++----- src/albanian/DocumentationSqi.gf | 52 +++++----- src/albanian/ResSqi.gf | 6 +- 3 files changed, 161 insertions(+), 54 deletions(-) diff --git a/src/albanian/CatSqi.gf b/src/albanian/CatSqi.gf index b029edc3..b5143981 100644 --- a/src/albanian/CatSqi.gf +++ b/src/albanian/CatSqi.gf @@ -1,25 +1,132 @@ -concrete CatSqi of Cat = CommonX ** open ParamX, Prelude, ResSqi in { - -lincat N = Noun ; -lincat N2 = Noun ** {c2 : Compl} ; -lincat N3 = Noun ** {c2,c3 : Compl} ; -lincat A = Adj ; -lincat A2 = Adj ** {c2 : Compl} ; -lincat V, VA, VV, VS, VQ = Verb ; -lincat V2, V2S, V2Q = Verb ** {c2 : Compl} ; -lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ; -lincat Prep = Compl ; - -lincat Numeral = {s : Str} ; -lincat Digits = {s : Str; n : Number; tail : DTail} ; -lincat Decimal = {s : Str; n : Number; hasDot : Bool} ; - -lincat AP = {s: Species => Case => Gender => Number => Str} ; -lincat CN = Noun ; -lincat Num = {s : Str; n : Number} ; -lincat Quant = {s : Case => Gender => Number => Str; spec : Species} ; -lincat Det = {s : Case => Gender => Str; spec : Species; n : Number} ; -lincat NP = {s: Case => Str; a : Agr} ; -lincat Pron = {s: Case => Str; acc_clit, dat_clit : Str; a : Agr} ; - -} +concrete CatSqi of Cat = CommonX ** open ParamX,Prelude,ResSqi in { + flags + coding = "UTF-8" ; + lincat A = {s : Case => Gender => Number => Str; clit : Bool} ; + lincat A2 = {s : Case => Gender => Number => Str; clit : Bool; + c2 : {s : Str}} ; + lincat ACard = {s : Str} ; + lincat AP = {s : Case => Gender => Number => Str; isPre : Bool} ; + lincat CN = {s : Species => Case => Number => Case => Str; + g : Gender} ; + lincat Card = {s : Str} ; + lincat Cl = {s : Str} ; + lincat ClSlash = {s : Str} ; + lincat Comp = {s : Str} ; + lincat Conj = {s : Str} ; + lincat DAP = {s : Str} ; + lincat Decimal = {s : Str; n : Number; hasDot : Bool} ; + lincat Det = {s : Str; n : Number; sp : Species} ; + lincat Digits = {s : Str; n : Number; tail : DTail} ; + lincat GN = {s : Str} ; + lincat IComp = {s : Str} ; + lincat IDet = {s : Str} ; + lincat IP = {s : Str} ; + lincat IQuant = {s : Str} ; + lincat Imp = {s : Str} ; + lincat LN = {s : Str} ; + lincat N = {s : Species => Case => Number => Str; g : Gender} ; + lincat N2 = {s : Species => Case => Number => Str; g : Gender; + c2 : {s : Str}} ; + lincat N3 = {s : Species => Case => Number => Str; g : Gender; + c2 : {s : Str}; c3 : {s : Str}} ; + lincat NP = {s : Case => Str; g : Gender} ; + lincat Num = {s : Str; n : Number} ; + lincat Numeral = {s : Str} ; + lincat Ord = {s : Str} ; + lincat PN = {s : Str} ; + lincat Predet = {s : Str} ; + lincat Prep = {s : Str} ; + lincat Pron = {s : Case => Str; acc_clit : Str; dat_clit : Str; + a : {gn : GenNum; p : Person}} ; + lincat QCl = {s : Str} ; + lincat QS = {s : Str} ; + lincat Quant = {s : Str; sp : Species} ; + lincat RCl = {s : Str} ; + lincat RP = {s : Str} ; + lincat RS = {s : Str} ; + lincat S = {s : Str} ; + lincat SN = {s : Str} ; + lincat SSlash = {s : Str} ; + lincat Subj = {s : Str} ; + lincat V = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str} ; + lincat V2 = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str; c2 : {s : Str}} ; + lincat V2A = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str; c2 : {s : Str}; + c3 : {s : Str}} ; + lincat V2Q = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str; c2 : {s : Str}} ; + lincat V2S = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str; c2 : {s : Str}} ; + lincat V2V = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str; c2 : {s : Str}; + c3 : {s : Str}} ; + lincat V3 = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str; c2 : {s : Str}; + c3 : {s : Str}} ; + lincat VA = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str} ; + lincat VP = {indicative : Tense => Number => Person => Case => Str; + participle : Case => Str; + pres_optative : Number => Person => Case => Str; + perf_optative : Number => Person => Case => Str; + pres_admirative : Number => Person => Case => Str; + imperf_admirative : Number => Person => Case => Str} ; + lincat VPSlash = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str} ; + lincat VQ = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str} ; + lincat VS = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str} ; + lincat VV = {indicative : Tense => Number => Person => Str; + imperative : Number => Str; participle : Str; + pres_optative : Number => Person => Str; + perf_optative : Number => Person => Str; + pres_admirative : Number => Person => Str; + imperf_admirative : Number => Person => Str} ; +} \ No newline at end of file diff --git a/src/albanian/DocumentationSqi.gf b/src/albanian/DocumentationSqi.gf index ba5c8d78..a6af5f39 100644 --- a/src/albanian/DocumentationSqi.gf +++ b/src/albanian/DocumentationSqi.gf @@ -51,32 +51,32 @@ lin InflectionV = \x -> { t="fl" ; s1=heading1 "Folje" ; s2=frameTable ( - tr (intagAttr "th" "rowspan=\"24\"" "Indicative" ++ intagAttr "th" "rowspan=\"6\"" "Pres" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Pres ! Sg ! P1)) ++ - tr (th "P2" ++ td (x.Indicative ! Pres ! Sg ! P2)) ++ - tr (th "P3" ++ td (x.Indicative ! Pres ! Sg ! P3)) ++ - tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Pres ! Pl ! P1)) ++ - tr (th "P2" ++ td (x.Indicative ! Pres ! Pl ! P2)) ++ - tr (th "P3" ++ td (x.Indicative ! Pres ! Pl ! P3)) ++ - tr (intagAttr "th" "rowspan=\"6\"" "Past" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Past ! Sg ! P1)) ++ - tr (th "P2" ++ td (x.Indicative ! Past ! Sg ! P2)) ++ - tr (th "P3" ++ td (x.Indicative ! Past ! Sg ! P3)) ++ - tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Past ! Pl ! P1)) ++ - tr (th "P2" ++ td (x.Indicative ! Past ! Pl ! P2)) ++ - tr (th "P3" ++ td (x.Indicative ! Past ! Pl ! P3)) ++ - tr (intagAttr "th" "rowspan=\"6\"" "Aorist" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Aorist ! Sg ! P1)) ++ - tr (th "P2" ++ td (x.Indicative ! Aorist ! Sg ! P2)) ++ - tr (th "P3" ++ td (x.Indicative ! Aorist ! Sg ! P3)) ++ - tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Aorist ! Pl ! P1)) ++ - tr (th "P2" ++ td (x.Indicative ! Aorist ! Pl ! P2)) ++ - tr (th "P3" ++ td (x.Indicative ! Aorist ! Pl ! P3)) ++ - tr (intagAttr "th" "rowspan=\"6\"" "Imperfect" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Imperfect ! Sg ! P1)) ++ - tr (th "P2" ++ td (x.Indicative ! Imperfect ! Sg ! P2)) ++ - tr (th "P3" ++ td (x.Indicative ! Imperfect ! Sg ! P3)) ++ - tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Imperfect ! Pl ! P1)) ++ - tr (th "P2" ++ td (x.Indicative ! Imperfect ! Pl ! P2)) ++ - tr (th "P3" ++ td (x.Indicative ! Imperfect ! Pl ! P3)) ++ - tr (intagAttr "th" "rowspan=\"2\"" "Imperative" ++ th "Sg" ++ td (x.Imperative ! Sg)) ++ - tr (th "Pl" ++ td (x.Imperative ! Pl)) ++ + tr (intagAttr "th" "rowspan=\"24\"" "Indicative" ++ intagAttr "th" "rowspan=\"6\"" "Pres" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.indicative ! Pres ! Sg ! P1)) ++ + tr (th "P2" ++ td (x.indicative ! Pres ! Sg ! P2)) ++ + tr (th "P3" ++ td (x.indicative ! Pres ! Sg ! P3)) ++ + tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.indicative ! Pres ! Pl ! P1)) ++ + tr (th "P2" ++ td (x.indicative ! Pres ! Pl ! P2)) ++ + tr (th "P3" ++ td (x.indicative ! Pres ! Pl ! P3)) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Past" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.indicative ! Past ! Sg ! P1)) ++ + tr (th "P2" ++ td (x.indicative ! Past ! Sg ! P2)) ++ + tr (th "P3" ++ td (x.indicative ! Past ! Sg ! P3)) ++ + tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.indicative ! Past ! Pl ! P1)) ++ + tr (th "P2" ++ td (x.indicative ! Past ! Pl ! P2)) ++ + tr (th "P3" ++ td (x.indicative ! Past ! Pl ! P3)) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Aorist" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.indicative ! Aorist ! Sg ! P1)) ++ + tr (th "P2" ++ td (x.indicative ! Aorist ! Sg ! P2)) ++ + tr (th "P3" ++ td (x.indicative ! Aorist ! Sg ! P3)) ++ + tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.indicative ! Aorist ! Pl ! P1)) ++ + tr (th "P2" ++ td (x.indicative ! Aorist ! Pl ! P2)) ++ + tr (th "P3" ++ td (x.indicative ! Aorist ! Pl ! P3)) ++ + tr (intagAttr "th" "rowspan=\"6\"" "Imperfect" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.indicative ! Imperfect ! Sg ! P1)) ++ + tr (th "P2" ++ td (x.indicative ! Imperfect ! Sg ! P2)) ++ + tr (th "P3" ++ td (x.indicative ! Imperfect ! Sg ! P3)) ++ + tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.indicative ! Imperfect ! Pl ! P1)) ++ + tr (th "P2" ++ td (x.indicative ! Imperfect ! Pl ! P2)) ++ + tr (th "P3" ++ td (x.indicative ! Imperfect ! Pl ! P3)) ++ + tr (intagAttr "th" "rowspan=\"2\"" "Imperative" ++ th "Sg" ++ td (x.imperative ! Sg)) ++ + tr (th "Pl" ++ td (x.imperative ! Pl)) ++ tr (th "participle" ++ td (x.participle)) ++ tr (intagAttr "th" "rowspan=\"6\"" "pres_optative" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.pres_optative ! Sg ! P1)) ++ tr (th "P2" ++ td (x.pres_optative ! Sg ! P2)) ++ diff --git a/src/albanian/ResSqi.gf b/src/albanian/ResSqi.gf index 1dcebbae..bd4a0f38 100644 --- a/src/albanian/ResSqi.gf +++ b/src/albanian/ResSqi.gf @@ -104,10 +104,10 @@ oper mkAdj : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Bool -> Adj = param Tense = Pres | Past | Imperfect | Aorist ; -oper Verb = {Indicative: Tense => Number => Person => Str; Imperative: Number => Str; participle: Str; pres_optative: Number => Person => Str; perf_optative: Number => Person => Str; pres_admirative: Number => Person => Str; imperf_admirative: Number => Person => Str} ; -- 758 +oper Verb = {indicative: Tense => Number => Person => Str; imperative: Number => Str; participle: Str; pres_optative: Number => Person => Str; perf_optative: Number => Person => Str; pres_admirative: Number => Person => Str; imperf_admirative: Number => Person => Str} ; -- 758 oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Verb = \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34,f35,f36,f37,f38,f39,f40,f41,f42,f43,f44,f45,f46,f47,f48,f49,f50,f51 -> - { Indicative = table { + { indicative = table { Pres => table { Sg => table { P1 => f1 ; @@ -157,7 +157,7 @@ oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ } } } ; - Imperative = table { + imperative = table { Sg => f25 ; Pl => f26 } ;