From 6067bc4932e94336d0a2190e49e9d1d7e25c0a29 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Mon, 8 Dec 2014 13:14:47 +0000
Subject: [PATCH] some missing Chi functions

---
 lib/src/chinese/VerbChi.gf          |  8 +++++++-
 lib/src/translator/ExtensionsChi.gf |  6 ------
 lib/src/translator/TranslateChi.gf  | 12 +++++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/src/chinese/VerbChi.gf b/lib/src/chinese/VerbChi.gf
index 8d3f3af58..2cefa3038 100644
--- a/lib/src/chinese/VerbChi.gf
+++ b/lib/src/chinese/VerbChi.gf
@@ -42,7 +42,13 @@ concrete VerbChi of Verb = CatChi ** open ResChi, Prelude in {
       insertObj np
         (insertObj (mkNP (infVP vp)) (predV v v.part)) ** {c2 = vp.c2 ; isPre = vp.isPre} ;
 
-    ExtAdvVP, AdvVP = \vp,adv -> case adv.advType of {  ---- ExtAdvVP also ?
+    AdvVP vp adv = case adv.advType of {
+      ATManner => insertObj (ss (deVAdv_s ++ adv.s)) vp ;           -- he sleeps *well*
+      ATPlace True => insertAdvPost adv vp ;                        -- he today *in the house* sleeps
+      ATPlace False => insertAdvPost (ss (zai_V.s ++ adv.s)) vp ;   -- he today *here* sleeps
+      ATTime | ATPoss => insertTopic adv vp                                  -- *today* he here sleeps
+      } ;
+    ExtAdvVP vp adv = case adv.advType of {  ---- ExtAdvVP also ?
       ATManner => insertObj (ss (deVAdv_s ++ adv.s)) vp ;           -- he sleeps *well*
       ATPlace True => insertAdvPost adv vp ;                        -- he today *in the house* sleeps
       ATPlace False => insertAdvPost (ss (zai_V.s ++ adv.s)) vp ;   -- he today *here* sleeps
diff --git a/lib/src/translator/ExtensionsChi.gf b/lib/src/translator/ExtensionsChi.gf
index 0e823ee0e..a3ec682ee 100644
--- a/lib/src/translator/ExtensionsChi.gf
+++ b/lib/src/translator/ExtensionsChi.gf
@@ -61,12 +61,6 @@ lin
     advType = ATManner ;
   } ;
   
-  GerundAP v = {
-    s = v.s ++ de_s ; ----
-    monoSyl = False ;
-    hasAdA = True ; --- 
-  } ;
-
   PastPartAP v = {
     s = v.verb.s ++ de_s ; ----
     monoSyl = False ;
diff --git a/lib/src/translator/TranslateChi.gf b/lib/src/translator/TranslateChi.gf
index 7c10f498c..99bb1e10a 100644
--- a/lib/src/translator/TranslateChi.gf
+++ b/lib/src/translator/TranslateChi.gf
@@ -13,7 +13,7 @@ concrete TranslateChi of Translate =
   VerbChi - [
     UseCopula,  -- just removed
     PassV2, -- generalized
-    CompAP, AdvVP  -- Chi exceptions
+    CompAP, ExtAdvVP  -- Chi exceptions
     ],
   AdverbChi,
   PhraseChi,
@@ -27,7 +27,12 @@ concrete TranslateChi of Translate =
   DocumentationChi,
 
   ChunkChi,
-  ExtensionsChi [CompoundN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash, CompoundAP],
+  ExtensionsChi [
+    CompoundN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash, CompoundAP
+    , DirectComplVS, DirectComplVQ, FocusObjS
+    , PastPartAP, PastPartAgentAP, PresPartAP, GerundNP, GerundAdv
+    , WithoutVP, InOrderToVP, ByVP
+    ],
 
   DictionaryChi ** 
  
@@ -43,7 +48,8 @@ flags
 lin
   CompAP = E.CompBareAP | G.CompAP ;                      -- he good | he is good
 
-  AdvVP vp adv = G.AdvVP vp adv | E.TopicAdvVP vp adv  ;  -- he *today* here sleeps | *today* he here sleeps
+  ExtAdvVP vp adv = G.ExtAdvVP vp adv ;
+         ---- | E.TopicAdvVP vp adv  ;  -- he *today* here sleeps | *today* he here sleeps
 
   QuestCl cl = G.QuestCl cl | E.QuestRepV cl ;            -- he comes 'ma' | he come not come