diff --git a/src/korean/CatKor.gf b/src/korean/CatKor.gf index 17a66ac21..9f615449d 100644 --- a/src/korean/CatKor.gf +++ b/src/korean/CatKor.gf @@ -8,7 +8,7 @@ concrete CatKor of Cat = CommonX ** open ResKor, Prelude in { -- Constructed in SentenceKor, and also in IdiomKor S = ResKor.Sentence ; - QS = SS ; -- Questions not implemented yet + QS = {s : Style => Str}; -- Questions not implemented yet RS = ResKor.Sentence ; -- relative sentence. Tense and polarity fixed, -- but agreement may depend on the CN/NP it modifies. diff --git a/src/korean/ParamKor.gf b/src/korean/ParamKor.gf index 575db8b5c..bd852d353 100644 Binary files a/src/korean/ParamKor.gf and b/src/korean/ParamKor.gf differ diff --git a/src/korean/PhraseKor.gf b/src/korean/PhraseKor.gf index aaa6a434a..74c7ff15a 100644 --- a/src/korean/PhraseKor.gf +++ b/src/korean/PhraseKor.gf @@ -3,8 +3,8 @@ concrete PhraseKor of Phrase = CatKor ** open Prelude, ResKor in { lin PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ; - UttS s = {s = s.s ! Statement} ; - UttQS qs = qs ; + UttS s = {s = s.s ! Statement linStyle} ; + UttQS qs = {s = qs.s ! linStyle} ; UttIAdv iadv = iadv ; UttAdv adv = adv ; UttInterj i = i ; @@ -19,7 +19,7 @@ concrete PhraseKor of Phrase = CatKor ** open Prelude, ResKor in { UttVP vp = {s = linVP linVF vp} ; UttCN cn = {s = cn.rs ++ cn.s ! Bare} ; UttCard n = {s = n.s ! NK ! Indep} ; - UttAP ap = { s = ap.compar ++ ap.s ! VF Plain Pos} ; + UttAP ap = {s = ap.compar ++ ap.s ! VF Plain Pos} ; NoPConj = {s = []} ; -- PConjConj conj = {s = conj.s1 ++ conj.s2 ! …} ; diff --git a/src/korean/ResKor.gf b/src/korean/ResKor.gf index d47257803..588a21262 100644 --- a/src/korean/ResKor.gf +++ b/src/korean/ResKor.gf @@ -361,7 +361,7 @@ oper let vf = case cltyp of { Subord => VAttr p ; WithConj => VStem p ; - _ => VF Polite p } -- TODO: more tenses, politeness + Statement st => VF st p } -- TODO: more tenses in np ++ vp.nObj -- an object, not copula complement ++ vp.adv diff --git a/src/korean/SentenceKor.gf b/src/korean/SentenceKor.gf index 59574a9f9..9553d6f7f 100644 --- a/src/korean/SentenceKor.gf +++ b/src/korean/SentenceKor.gf @@ -53,10 +53,13 @@ lin } ; -- : Temp -> Pol -> QCl -> QS ; - UseQCl t p cl = {s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! Statement} ; + UseQCl t p cl = { + s = \\st => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! Statement st} ; -- : Temp -> Pol -> RCl -> RS ; - UseRCl t p rcl = {s = \\c => t.s ++ p.s ++ rcl.s ! t.t ! t.a ! p.p ! c} ; + UseRCl t p rcl = { + s = \\c => t.s ++ p.s ++ rcl.s ! t.t ! t.a ! p.p ! c + } ; -- AdvS : Adv -> S -> S ; -- then I will go home AdvS = advS "" ;