corrections in DictEngChi

lib/src/chinese/ParadigmsChi.gf

@@ -40,6 +40,8 @@ oper
           v + "+" + p => lin V (regVerb (v + p)) ;
           _ => lin V (regVerb walk)
           } ;
+    mkV : (walk,out : Str) -> V 
+      = \v,p -> lin V (regVerb (v + p)) ; ----
     mkV : (arrive : Str) -> Str -> Str -> Str -> Str -> V
       = \arrive,pp,ds,dp,ep -> lin V (mkVerb arrive pp ds dp ep neg_s) ;
     mkV : (arrive : Str) -> Str -> Str -> Str -> Str -> Str -> V
@@ -80,10 +82,13 @@ oper
     } ;
 
   mkVS = overload {
-  mkVS : V -> VS =
-    \v -> lin VS v ;
   mkVS : Str -> VS =
     \v -> lin VS (regVerb v) ;
+  mkVS : Str -> Str -> VS =
+    \s,t -> lin VS (regVerb (s + t)) ; ----
+
+  mkVS : V -> VS =
+    \v -> lin VS v ;
   } ;
 
   mkVA = overload {
@@ -131,6 +136,8 @@ oper
   mkAdv = overload {
     mkAdv : Str -> Adv 
       = \s -> lin Adv {s = word s ; advType = getAdvType s} ;
+    mkAdv : Str -> Str -> Adv 
+      = \s,t -> lin Adv {s = word (s + t) ; advType = getAdvType s} ; ----
     mkAdv : Str -> AdvType -> Adv 
       = \s,at -> lin Adv {s = word s ; advType = at} ;
     } ;
@@ -168,8 +175,12 @@ oper
     = \s -> lin AdN {s = word s} ;
   mkSubj : Str -> Subj 
     = \s -> lin Subj (ResChi.mkSubj s []) ;
-  mkConj : Str -> Conj 
+  mkConj = overload {
-    = \s -> lin Conj {s = \\_ => mkConjForm s} ;
+    mkConj : Str -> Conj 
+      = \s -> lin Conj {s = \\_ => mkConjForm s} ;
+    mkConj : (both,and : Str) -> Conj 
+      = \s,t -> lin Conj {s = \\_ => mkConjForm2 s t} ;
+   } ;
   mkpDet : Str -> Det 
     = \s -> lin Det {s = word s ; detType = DTFull Sg} ;
   mkQuant : Str -> Quant 

lib/src/chinese/ParseChi.gf

@@ -21,7 +21,7 @@ concrete ParseChi of ParseEngAbs =
 
   DictEngChi,
 Assign_1,
-Assign_10,
+Assign_10 - [weep_V],
 Assign_11,
 Assign_12,
 Assign_13,