new extra Chi constructions for HSK

lib/src/chinese/ExtraChi.gf

@@ -52,4 +52,7 @@ concrete ExtraChi of ExtraChiAbs = CatChi **
           in
           cl.np ++ cl.vp.prePart ++ verb ++ cl.vp.compl
       } ;
+
+  TopicAdvCl adv cl = mkClause (adv.s ++ cl.np) cl.vp ;
+
 } 

lib/src/chinese/ExtraChiAbs.gf

@@ -14,4 +14,5 @@ abstract ExtraChiAbs = Cat,
 
     QuestRepV : Cl -> QCl ;        -- V neg V question
 
+    TopicAdvCl : Adv -> Cl -> Cl ; -- topicalized adverb
   } ;

lib/src/chinese/PhraseChi.gf

@@ -1,7 +1,7 @@
 concrete PhraseChi of Phrase = CatChi ** open Prelude, ResChi in {
 
   lin
-    PhrUtt pconj utt voc = {s = pconj.s ++ voc.s ++ utt.s} ;
+    PhrUtt pconj utt voc = {s = pconj.s ++ voc.s ++ chcomma ++ utt.s} ;
 
     UttS s = s ;
     UttQS qs = qs ;

lib/src/chinese/ResChi.gf

@@ -208,7 +208,7 @@ oper
    mkClauseCompl : Str -> VP -> Str -> Clause = \np,vp,compl -> {
      s = \\p,a => np ++ vp.prePart ++ useVerb vp.verb ! p ! a ++ vp.compl ++ compl ;
      np = np ;
-     vp = vp ;
+     vp = insertObj (ss compl) vp ;
      } ;
    
 

lib/src/english/ParadigmsEng.gf

@@ -329,6 +329,8 @@ oper
 --2 Other categories
 
 mkSubj : Str -> Subj = \s -> lin Subj {s = s} ; --%
+mkInterj : Str -> Interj
+  = \s -> lin Interj (ss s) ;
 
 --.
 --2 Definitions of paradigms