From 6a5979a68949d864433f4249c8fa9b27dcfcf7d8 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Sun, 6 Oct 2013 21:13:31 +0000
Subject: [PATCH] using le for AAnter in Chi; adjustments of CompAP rules in
 Chi

---
 lib/src/chinese/CatChi.gf   | 4 ++--
 lib/src/chinese/ParseChi.gf | 2 +-
 lib/src/chinese/ResChi.gf   | 5 ++++-
 lib/src/chinese/TenseChi.gf | 7 +++++--
 lib/src/chinese/TextChi.gf  | 2 +-
 lib/src/chinese/VerbChi.gf  | 9 ++++-----
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/src/chinese/CatChi.gf b/lib/src/chinese/CatChi.gf
index 8c485d866..7209c1136 100644
--- a/lib/src/chinese/CatChi.gf
+++ b/lib/src/chinese/CatChi.gf
@@ -1,4 +1,4 @@
-concrete CatChi of Cat = CommonX - [Tense, Temp, Adv] ** open ResChi, Prelude in {
+concrete CatChi of Cat = CommonX - [Tense, Temp, Ant, Adv] ** open ResChi, Prelude in {
 
   lincat
 
@@ -81,6 +81,6 @@ concrete CatChi of Cat = CommonX - [Tense, Temp, Adv] ** open ResChi, Prelude in
 
     Temp  = {s : Str ; t : Aspect} ;
     Tense = {s : Str ; t : Aspect} ;
-
+    Ant   = {s : Str ; t : Aspect} ;
 
 }
diff --git a/lib/src/chinese/ParseChi.gf b/lib/src/chinese/ParseChi.gf
index 2917bc65e..7d9618c0f 100644
--- a/lib/src/chinese/ParseChi.gf
+++ b/lib/src/chinese/ParseChi.gf
@@ -14,7 +14,7 @@ concrete ParseChi of ParseEngAbs =
   QuestionChi,
   RelativeChi,
   IdiomChi [NP, VP, Tense, Cl, ProgrVP, ExistNP],
-  ExtraChi [NP, Quant, VPSlash, VP, Tense, Aspect, GenNP, PassVPSlash,
+  ExtraChi [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash,
             Temp, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP,
             VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV,
             ClSlash, RCl, EmptyRelSlash, ListCN, ConjCN, BaseCN, ConsCN],
diff --git a/lib/src/chinese/ResChi.gf b/lib/src/chinese/ResChi.gf
index c01b1cc91..a415e71c7 100644
--- a/lib/src/chinese/ResChi.gf
+++ b/lib/src/chinese/ResChi.gf
@@ -118,7 +118,10 @@ oper
   copula : Verb = mkVerb "是" [] [] [] [] "不" ;
   hen_copula : Verb = 
     {s = hen_s ; sn = [] ; pp = [] ; ds = [] ; dp = [] ; ep = [] ; neg = "不"} ; --- 
-  nocopula : Verb = mkVerb [] [] [] [] [] "不" ;
+  nocopula : Verb = 
+    {s = [] ; sn = "是" ; pp = [] ; ds = [] ; dp = [] ; ep = [] ; neg = "不"} ; --- 
+  adjcopula : Verb = 
+    {s = "是" ; sn = [] ; pp = [] ; ds = [] ; dp = [] ; ep = [] ; neg = "不"} ; --- 
 
   regVerb : (walk : Str) -> Verb = \v -> 
     mkVerb v "了" "着" "在" "过" "没" ;
diff --git a/lib/src/chinese/TenseChi.gf b/lib/src/chinese/TenseChi.gf
index 060c9fe3e..f2c196c05 100644
--- a/lib/src/chinese/TenseChi.gf
+++ b/lib/src/chinese/TenseChi.gf
@@ -1,8 +1,8 @@
 concrete TenseChi of Tense = 
-  CatChi [Tense,Temp], TenseX [Ant,Pol,AAnter,ASimul,PNeg,PPos] ** open ResChi in {
+  CatChi [Tense,Temp,Ant], TenseX [Pol,PNeg,PPos] ** open ResChi in {
 
   lin
-    TTAnt t a = {s = t.s ++ a.s ; t = t.t} ;
+    TTAnt t a = {s = t.s ++ a.s ; t = case a.t of {APerf => APerf ; _ => t.t}} ;
 
     ---- ??
     TPres = {s = [] ; t = APlain} ;
@@ -10,4 +10,7 @@ concrete TenseChi of Tense =
     TFut  = {s = [] ; t = ADurProg} ;   
     TCond = {s = [] ; t = ADurStat} ;
 
+    ASimul = {s = [] ; t = APlain} ;
+    AAnter = {s = [] ; t = APerf} ;   
+
 }
diff --git a/lib/src/chinese/TextChi.gf b/lib/src/chinese/TextChi.gf
index acb204ff3..b7a4e48c6 100644
--- a/lib/src/chinese/TextChi.gf
+++ b/lib/src/chinese/TextChi.gf
@@ -1,4 +1,4 @@
-concrete TextChi of Text = CommonX - [Temp,Tense,Adv] ** open ResChi in {
+concrete TextChi of Text = CommonX - [Temp,Tense,Ant,Adv] ** open ResChi in {
 
 -- No punctuation - but make sure to leave spaces between sentences!
 
diff --git a/lib/src/chinese/VerbChi.gf b/lib/src/chinese/VerbChi.gf
index d01f31d8d..8eb961c56 100644
--- a/lib/src/chinese/VerbChi.gf
+++ b/lib/src/chinese/VerbChi.gf
@@ -54,11 +54,10 @@ concrete VerbChi of Verb = CatChi ** open ResChi, Prelude in {
 
     PassV2 v = insertAdv (mkNP passive_s) (predV v v.part) ; ----
 
-    CompAP ap = insertObj (mkNP ap.s) (
-      case ap.hasAdA of {
-         True => predV nocopula [] ; 
-         False => predV hen_copula []}
-         ) ; 
+    CompAP ap = case ap.hasAdA of {
+      True  => insertObj (mkNP ap.s) (predV nocopula []) ; 
+      False => insertObj (mkNP (ap.s ++ de_s)) (predV copula [])
+      } ; 
 
     CompNP np = insertObj np (predV copula []) ; ----