From 812b22f7c33fcb9664a3ef3b2dfe35bb79e2708d Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Thu, 10 Oct 2013 17:56:05 +0000
Subject: [PATCH] fixed progressives and vocative commas in Chi

---
 lib/src/chinese/IdiomChi.gf  | 7 ++++++-
 lib/src/chinese/PhraseChi.gf | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/src/chinese/IdiomChi.gf b/lib/src/chinese/IdiomChi.gf
index ff37cbe15..b1591af6f 100644
--- a/lib/src/chinese/IdiomChi.gf
+++ b/lib/src/chinese/IdiomChi.gf
@@ -18,7 +18,12 @@ concrete IdiomChi of Idiom = CatChi ** open Prelude, ResChi in {
 
     ExistIP ip = {s = (mkClause [] (regVerb you_s) ip.s).s} ; ---- infl of you
 
-    ProgrVP vp = vp ; ----
+    ProgrVP vp = {
+      verb = regVerb zai_s ;
+      compl = vp.prePart ++ vp.verb.s ++ vp.compl ;
+      prePart = []
+      } ;
+
 
     ImpPl1 vp = ss (zan_s ++ men_s ++ infVP vp ++ ba0_s) ;
 
diff --git a/lib/src/chinese/PhraseChi.gf b/lib/src/chinese/PhraseChi.gf
index 8eb39bfdb..1ebde7980 100644
--- a/lib/src/chinese/PhraseChi.gf
+++ b/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 ++ chcomma ++ utt.s} ;
+    PhrUtt pconj utt voc = {s = pconj.s ++ voc.s ++ utt.s} ;
 
     UttS s = s ;
     UttQS qs = qs ;
@@ -23,6 +23,6 @@ concrete PhraseChi of Phrase = CatChi ** open Prelude, ResChi in {
     PConjConj conj = ss (conj.s ! CSent).s2 ;
 
     NoVoc = {s = []} ;
-    VocNP np = {s = np.s} ; ---- ??
+    VocNP np = {s = np.s ++ chcomma} ; ---- ??
 
 }