From 86812fee93709641c0f4ff8f8319aa8f1efd096c Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Mon, 9 Dec 2013 10:43:57 +0000
Subject: [PATCH] more variants in ParseChi: topicalized adverbs, V-not-V
 questions

---
 lib/src/chinese/ExtraChi.gf    |  2 +-
 lib/src/chinese/ExtraChiAbs.gf |  4 ++--
 lib/src/chinese/ParseChi.gf    | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/src/chinese/ExtraChi.gf b/lib/src/chinese/ExtraChi.gf
index 1c5ef24e0..042170f73 100644
--- a/lib/src/chinese/ExtraChi.gf
+++ b/lib/src/chinese/ExtraChi.gf
@@ -55,6 +55,6 @@ concrete ExtraChi of ExtraChiAbs = CatChi **
           cl.np ++ cl.vp.prePart ++ verb ++ cl.vp.compl
       } ;
 
-  TopicAdvCl adv cl = mkClause (adv.s ++ cl.np) cl.vp ;
+  TopicAdvVP vp adv = insertTopic adv vp ;
 
 } 
diff --git a/lib/src/chinese/ExtraChiAbs.gf b/lib/src/chinese/ExtraChiAbs.gf
index 35692c8c9..1467295f9 100644
--- a/lib/src/chinese/ExtraChiAbs.gf
+++ b/lib/src/chinese/ExtraChiAbs.gf
@@ -10,9 +10,9 @@ abstract ExtraChiAbs = Cat,
     Aspect ;
 
   fun
-    CompBareAP : AP -> Comp ;  -- adjectival predication without copula
+    CompBareAP : AP -> Comp ;      -- adjectival predication without copula
 
     QuestRepV : Cl -> QCl ;        -- V neg V question
 
-    TopicAdvCl : Adv -> Cl -> Cl ; -- topicalized adverb
+    TopicAdvVP : VP -> Adv -> VP ; -- topicalized adverb
   } ;
diff --git a/lib/src/chinese/ParseChi.gf b/lib/src/chinese/ParseChi.gf
index 1a5faec3b..e55c5876e 100644
--- a/lib/src/chinese/ParseChi.gf
+++ b/lib/src/chinese/ParseChi.gf
@@ -7,11 +7,11 @@ concrete ParseChi of ParseEngAbs =
   NumeralChi,
   SymbolChi [PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP],
   ConjunctionChi,
-  VerbChi - [SlashV2V, PassV2, UseCopula, ComplVV, CompAP],
+  VerbChi - [SlashV2V, PassV2, UseCopula, ComplVV,    CompAP, AdvVP],
   AdverbChi,
   PhraseChi,
   SentenceChi,
-  QuestionChi,
+  QuestionChi - [QuestCl],
   RelativeChi,
   IdiomChi [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
   ConstructionChi,
@@ -33,7 +33,11 @@ flags
 -- Chinese-specific overrides
 
 lin
-  CompAP = G.CompAP | E.CompBareAP ;
+  CompAP = G.CompAP | E.CompBareAP ;                     -- he is good | he good
+
+  AdvVP vp adv = G.AdvVP 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
 
 lin