more Chinese fixes by Chen Peng

This commit is contained in:
aarne
2012-11-19 09:55:05 +00:00
parent b5df913041
commit c85e85e36e
2 changed files with 77 additions and 71 deletions

View File

@@ -81,7 +81,7 @@ lin pot0as1 n =
wan0 => n.s ++ mkD "千" "仟"}
} ;
lin pot1 d =
{inh = zero ;
{inh = nozero ; -- inh = zero
s,p = table {
shi => d.s ++ mkD "十" "拾" ;
shi0 => d.s ++ mkD "十" "拾" ;

View File

@@ -28,7 +28,7 @@ and_Conj = {s = table {
CPhr CNPhrase => mkConjForm "和" ;
CPhr CAPhrase => mkConjForm "而" ;
CPhr CVPhrase => mkConjForm "又" ;
CSent => mkConjForm []
CSent => mkConjForm "并且" --modified by chenpneg 11.19
}
} ;
or_Conj = {s = table {
@@ -99,8 +99,7 @@ no_Utt = ss neg_s ;
oper
mkConjForm : Str -> {s1,s2 : Str} = \s -> {s1 = [] ; s2 = word s} ;
mkConjForm2 : Str -> Str -> {s1,s2 : Str} = \s1,s2 -> {s1 = word s1 ; s2 = word s1} ;
mkConjForm2 : Str -> Str -> {s1,s2 : Str} = \s1,s2 -> {s1 = word s1 ; s2 = word s2} ; --obvious slip of a pen chenpeng 11.19
-- manually by AR, Jolene
lin
@@ -120,11 +119,11 @@ at_least_AdN = ssword "最少" ; -- at least five
at_most_AdN = ssword "最多" ;
behind_Prep = mkPrep "后面" "在";
both7and_DConj = {s = table { -- modified by chenpeng 11.17
CPhr CNPhrase => mkConjForm2 "" "" ;
both7and_DConj = {s = table { -- modified by chenpeng 11.19
CPhr CNPhrase => mkConjForm2 "包括" "" ;
CPhr CAPhrase => mkConjForm2 "即" "又" ;
CPhr CVPhrase => mkConjForm2 "不" "而且" ;
CSent => mkConjForm2 "不" "而且"
CPhr CVPhrase => mkConjForm2 "不" "而且" ;
CSent => mkConjForm2 "不" "而且"
}
} ;
@@ -133,8 +132,8 @@ by8agent_Prep = mkPrep "被" ; -- by for agent in passive
during_Prep = mkPrep "期间" "在" ; -- [mark] often equivalent to nothing
-- translation for "he swam during this summer. " and "he swam this summer." are often the same
either7or_DConj = {s = table { -- modified by chenpeng 11.17
CPhr CNPhrase => mkConjForm2 "或" "或" ;
either7or_DConj = {s = table { -- modified by chenpeng 11.19
CPhr CNPhrase => mkConjForm2 "或" "或" ;
CPhr CAPhrase => mkConjForm2 "要么" "要么" ;
CPhr CVPhrase => mkConjForm2 "要么" "要么" ;
CSent => mkConjForm2 "要么" "要么"
@@ -154,6 +153,13 @@ if_Subj = mkSubj "如果" [] ; --"就" ; -- [mark] "就" often comes between NP
less_CAdv = {s = word "少于" ; p = than_s} ; -- modified by chenpeng 11.17
more_CAdv = {s = "更加" ; p = than_s} ; -- modified by chenpeng 11.17
most_Predet = ssword "大多数" ;
if_then_Conj = {s = table { -- added by chenpeng 11.19
CPhr CNPhrase => mkConjForm [] ;
CPhr CAPhrase => mkConjForm [] ;
CPhr CVPhrase => mkConjForm [] ;
CSent => mkConjForm2 "如果" "那么"
}
} ;
nobody_NP = ssword "没人" ;
nothing_NP = ssword "没有什么" ;
on_Prep = mkPrep "上" "在" ;