diff --git a/lib/src/chinese/NounChi.gf b/lib/src/chinese/NounChi.gf index 0da33db6a..91825d7ea 100644 --- a/lib/src/chinese/NounChi.gf +++ b/lib/src/chinese/NounChi.gf @@ -84,4 +84,6 @@ concrete NounChi of Noun = CatChi ** open ResChi, Prelude in { RelNP np rs = mkNP (rs.s ++ np.s) ; + PossNP cn np = {s = np.s ++ possessive_s ++ cn.s ; c = cn.c} ; + } diff --git a/lib/src/chinese/ParseChi.gf b/lib/src/chinese/ParseChi.gf index c0acce6c8..15b387426 100644 --- a/lib/src/chinese/ParseChi.gf +++ b/lib/src/chinese/ParseChi.gf @@ -61,7 +61,8 @@ lin themselves_NP = regNP "themselves" plural ; -} ----- CompoundCN num noun cn = mkCN (ParadigmsChi.mkN (num.s ++ (noun.s ++ cn.s)) cn.c) ; ---- +CompoundCN num noun cn = {s = num.s ++ noun.s ++ cn.s ; c = cn.c} ; ---- +DashCN noun cn = {s = noun.s ++ cn.s ; c = cn.c} ; ---- {- DashCN noun1 noun2 = { @@ -129,16 +130,14 @@ lin s = \\agr => vp.ad ++ vp.prp ++ vp.s2 ! agr ; c = npNom } ; +-} ApposNP np1 np2 = { - s = \\c => np1.s ! c ++ "," ++ np2.s ! npNom ; - a = np1.a + s = np1.s ++ chcomma ++ np2.s } ; AdAdV = cc2 ; UttAdV adv = adv; --} - }