From 324eb400b5d210d76478a8a305cf0161e369142d Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Fri, 6 Dec 2013 09:16:50 +0000
Subject: [PATCH] added passives and self's to Chi

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

diff --git a/lib/src/chinese/ExtraChi.gf b/lib/src/chinese/ExtraChi.gf
index c954a4fa8..69ff495b8 100644
--- a/lib/src/chinese/ExtraChi.gf
+++ b/lib/src/chinese/ExtraChi.gf
@@ -1,5 +1,5 @@
 concrete ExtraChi of ExtraChiAbs = CatChi ** 
-  open ResChi, Coordination, Prelude in {
+  open ResChi, Coordination, (S = StructuralChi), Prelude in {
 
   flags coding = utf8 ;
 
@@ -11,6 +11,7 @@ concrete ExtraChi of ExtraChiAbs = CatChi **
 
   lin
     PassVPSlash vps = insertAdv (mkNP passive_s) vps ;
+    PassAgentVPSlash vps np = insertAdv (ss (appPrep S.by8agent_Prep np.s)) (insertAdv (mkNP passive_s) vps) ;
 
     MkVPS t p vp = {s = t.s ++ p.s ++ (mkClause [] vp).s ! p.p ! t.t} ;
     ConjVPS c = conjunctDistrSS (c.s ! CSent) ;
diff --git a/lib/src/chinese/ExtraChiAbs.gf b/lib/src/chinese/ExtraChiAbs.gf
index 50414c819..4b5c75537 100644
--- a/lib/src/chinese/ExtraChiAbs.gf
+++ b/lib/src/chinese/ExtraChiAbs.gf
@@ -1,6 +1,6 @@
 abstract ExtraChiAbs = Cat, 
 
-  Extra [NP, Quant, VPSlash, VP, Tense, Aspect, GenNP, PassVPSlash,
+  Extra [NP, Quant, VPSlash, VP, Tense, Aspect, GenNP, PassVPSlash, PassAgentVPSlash,
             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]
diff --git a/lib/src/chinese/IdiomChi.gf b/lib/src/chinese/IdiomChi.gf
index 2fd5ccb5e..586a44d87 100644
--- a/lib/src/chinese/IdiomChi.gf
+++ b/lib/src/chinese/IdiomChi.gf
@@ -27,6 +27,10 @@ concrete IdiomChi of Idiom = CatChi ** open Prelude, ResChi in {
 
     ImpPl1 vp = ss (zan_s ++ men_s ++ infVP vp ++ ba0_s) ;
 
+    SelfAdvVP vp = insertAdv (ss reflPron) vp ;
+    SelfAdVVP vp = insertAdv (ss reflPron) vp ;
+    SelfNP np = {s = np.s ++ reflPron} ;
+
 }
 
 
diff --git a/lib/src/chinese/ParseChi.gf b/lib/src/chinese/ParseChi.gf
index f686e1614..734d6d8ef 100644
--- a/lib/src/chinese/ParseChi.gf
+++ b/lib/src/chinese/ParseChi.gf
@@ -13,8 +13,8 @@ concrete ParseChi of ParseEngAbs =
   SentenceChi,
   QuestionChi,
   RelativeChi,
-  IdiomChi [NP, VP, Tense, Cl, ProgrVP, ExistNP],
-  ExtraChi [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash,
+  IdiomChi [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
+  ExtraChi [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash, PassAgentVPSlash,
             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],
@@ -35,8 +35,6 @@ lin
 
   that_RP = which_RP ;
 
-  UncNeg = negativePol ;
-
 -- lexical entries
 
 --  another_Quant = mkQuantifier "otro" "otra" "otros" "otras" ;