thai questions and negations

lib/resource-1.0/thai/CatTha.gf

@@ -4,24 +4,24 @@ concrete CatTha of Cat = CommonX ** open ResTha, Prelude in {
 
   lincat
 
----- Tensed/Untensed
---
---    S  = {s : Str} ;
---    QS = {s : QForm => Str} ;
+-- Tensed/Untensed
+
+    S  = {s : Str} ;
+    QS = {s : QForm => Str} ;
 --    RS = {s : Agr => Str ; c : Case} ; -- c for it clefts
 --
 ---- Sentence
 --
---    Cl = {s : Tense => Anteriority => CPolarity => Order => Str} ;
+    Cl = {s : Polarity => Str} ;
 --    Slash = {
 --      s : Tense => Anteriority => CPolarity => Order => Str ;
 --      c2 : Str
 --      } ;
---    Imp = {s : CPolarity => ImpForm => Str} ;
+    Imp = {s : Polarity => Str} ;
 --
 ---- Question
 --
---    QCl = {s : Tense => Anteriority => CPolarity => QForm => Str} ;
+    QCl = {s : Polarity => Str} ;
 --    IP = {s : Case => Str ; n : Number} ;
 --    IComp = {s : Str} ;    
 --    IDet = {s : Str ; n : Number} ;
@@ -33,15 +33,8 @@ concrete CatTha of Cat = CommonX ** open ResTha, Prelude in {
 --
 ---- Verb
 --
---    VP = {
---      s : Tense => Anteriority => CPolarity => Order => Agr => {fin, inf : Str} ;
---      prp : Str ; -- present participle 
---      inf : Str ; -- infinitive
---      ad  : Str ;
---      s2  : Agr => Str
---      } ;
---
---    Comp = {s : Agr => Str} ; 
+    VP = ResTha.VP ; 
+    Comp = ResTha.VP ; 
 --
 ---- Adjective
 --
@@ -66,12 +59,12 @@ concrete CatTha of Cat = CommonX ** open ResTha, Prelude in {
 --    Subj = {s : Str} ;
 --    Prep = {s : Str} ;
 --
----- Open lexical classes, e.g. Lexicon
---
---    V, VS, VQ, VA = Verb ; -- = {s : VForm => Str} ;
---    V2, V2A = Verb ** {c2 : Str} ;
---    V3 = Verb ** {c2, c3 : Str} ;
---    VV = {s : VVForm => Str ; isAux : Bool} ;
+-- Open lexical classes, e.g. Lexicon
+
+    V, VS, VQ, VA = Verb ; 
+    V2, V2A = Verb ** {c2 : Str} ;
+    V3 = Verb ** {c2, c3 : Str} ;
+    VV = VVerb ;
 --
 --    A = {s : AForm => Str} ;
 --    A2 = {s : AForm => Str ; c2 : Str} ;