diff --git a/lib/src/chinese/ExtraChi.gf b/lib/src/chinese/ExtraChi.gf index 7fc22872d..69d76e46f 100644 --- a/lib/src/chinese/ExtraChi.gf +++ b/lib/src/chinese/ExtraChi.gf @@ -52,4 +52,7 @@ concrete ExtraChi of ExtraChiAbs = CatChi ** in cl.np ++ cl.vp.prePart ++ verb ++ cl.vp.compl } ; + + TopicAdvCl adv cl = mkClause (adv.s ++ cl.np) cl.vp ; + } diff --git a/lib/src/chinese/ExtraChiAbs.gf b/lib/src/chinese/ExtraChiAbs.gf index c50c87e3a..50414c819 100644 --- a/lib/src/chinese/ExtraChiAbs.gf +++ b/lib/src/chinese/ExtraChiAbs.gf @@ -14,4 +14,5 @@ abstract ExtraChiAbs = Cat, QuestRepV : Cl -> QCl ; -- V neg V question + TopicAdvCl : Adv -> Cl -> Cl ; -- topicalized adverb } ; diff --git a/lib/src/chinese/PhraseChi.gf b/lib/src/chinese/PhraseChi.gf index 629e2090a..8eb39bfdb 100644 --- a/lib/src/chinese/PhraseChi.gf +++ b/lib/src/chinese/PhraseChi.gf @@ -1,7 +1,7 @@ concrete PhraseChi of Phrase = CatChi ** open Prelude, ResChi in { lin - PhrUtt pconj utt voc = {s = pconj.s ++ voc.s ++ utt.s} ; + PhrUtt pconj utt voc = {s = pconj.s ++ voc.s ++ chcomma ++ utt.s} ; UttS s = s ; UttQS qs = qs ; diff --git a/lib/src/chinese/ResChi.gf b/lib/src/chinese/ResChi.gf index e78e2d836..4c5a4b977 100644 --- a/lib/src/chinese/ResChi.gf +++ b/lib/src/chinese/ResChi.gf @@ -208,7 +208,7 @@ oper mkClauseCompl : Str -> VP -> Str -> Clause = \np,vp,compl -> { s = \\p,a => np ++ vp.prePart ++ useVerb vp.verb ! p ! a ++ vp.compl ++ compl ; np = np ; - vp = vp ; + vp = insertObj (ss compl) vp ; } ; diff --git a/lib/src/english/ParadigmsEng.gf b/lib/src/english/ParadigmsEng.gf index 982c458a3..1874fe4e4 100644 --- a/lib/src/english/ParadigmsEng.gf +++ b/lib/src/english/ParadigmsEng.gf @@ -329,6 +329,8 @@ oper --2 Other categories mkSubj : Str -> Subj = \s -> lin Subj {s = s} ; --% +mkInterj : Str -> Interj + = \s -> lin Interj (ss s) ; --. --2 Definitions of paradigms