diff --git a/src/korean/LexiconKor.gf b/src/korean/LexiconKor.gf index 5a06dbf29..977f3ce25 100644 --- a/src/korean/LexiconKor.gf +++ b/src/korean/LexiconKor.gf @@ -36,7 +36,7 @@ lin big_A = mkA "크다" ; lin black_A = mkA "검다" ; -- lin blood_N = mkN "" ; -- lin blow_V = mkV "" ; -lin blue_A = mkA "파랗다" "파래요" "파랗습니다" "파랗지" "파란" ; +lin blue_A = mkA "파랗다" "파래요" "파랗습니다" "파란" ; -- lin boat_N = mkN "" ; -- lin bone_N = mkN "" ; -- lin boot_N = mkN "" ; diff --git a/src/korean/ParadigmsKor.gf b/src/korean/ParadigmsKor.gf index 1e14bd9c7..31c7524a5 100644 --- a/src/korean/ParadigmsKor.gf +++ b/src/korean/ParadigmsKor.gf @@ -27,7 +27,7 @@ oper mkA : overload { mkA : (adj : Str) -> A ; -- Regular adjective, given in -다 form mkA : (kiga : Str) -> (jakda : A) -> A ; -- Compound adjective, e.g. 키가 작다 'short', literally 'height (is) small'. 키가 'height' given as string, 작다 'small' given as preconstructed A. - mkA : (plain,polite,formal,neg,attr : Str) -> A ; -- Worst case constructor: e.g. mkA "파랗다" "파래요" "파랗습니다" "파랗지" "파란" + mkA : (plain,polite,formal,attr : Str) -> A ; -- Worst case constructor: e.g. mkA "파랗다" "파래요" "파랗습니다" "파란" } ; mkA2 : overload { @@ -44,7 +44,7 @@ oper mkV : overload { mkV : (plain : Str) -> V ; -- Predictable verb. Takes plain, uninflected -다 form, e.g. 가다 mkV : (nore : Str) -> (hada : V) -> V ; -- Add a prefix to an existing verb, e.g. 노래+하다 - mkV : (plain,polite,formal,neg,attr : Str) -> V ; -- Worst case constructor: e.g. mkV "다르다" "달라요" "다릅니다" "다르지" "다른" + mkV : (plain,polite,formal,attr : Str) -> V ; -- Worst case constructor: e.g. mkV "다르다" "달라요" "다릅니다" "다른" } ; copula : V ; -- The copula verb '' @@ -135,8 +135,8 @@ oper mkA : (adj : Str) -> A = \s -> lin A (mkAdj s) ; mkA : (kiga : Str) -> (jakda : A) -> A = \kiga,jakda -> jakda ** {s = \\af => kiga ++ jakda.s ! af} ; - mkA : (x1,_,_,_,x5 : Str) -> A - = \x1,x2,x3,x4,x5 -> lin A (mkAdjReg x1 x2 x3 x4 x5) ; + mkA : (plain,polite,formal,attr : Str) -> A + = \x1,x2,x3,x4 -> lin A (mkAdjReg x1 x2 x3 x4) ; } ; mkA2 = overload { @@ -152,8 +152,8 @@ oper mkV : (plain : Str) -> V = \v -> lin V (mkVerb v) ; mkV : (nore : Str) -> (hada : V) -> V = \nore,hada -> hada ** { s = \\vf => nore + hada.s ! vf} ; - mkV : (plain,polite,formal,neg,attr : Str) -> V - = \x1,x2,x3,x4,x5 -> lin V (mkVerbReg x1 x2 x3 x4 x5) ; + mkV : (plain,polite,formal,attr : Str) -> V + = \x1,x2,x3,x4 -> lin V (mkVerbReg x1 x2 x3 x4) ; } ; copula = ResKor.copula ; diff --git a/src/korean/ResKor.gf b/src/korean/ResKor.gf index 8a0e94ace..fc2d4aee4 100644 --- a/src/korean/ResKor.gf +++ b/src/korean/ResKor.gf @@ -144,8 +144,6 @@ oper Adjective : Type = {s : VForm => Str} ; -- Adjectives are verbs Adjective2 : Type = Adjective ** {p2 : Postposition} ; - - v2a : (attrpos : Str) -> Verb -> Adjective = \attrpos,v -> { s = table { VAttr Pos => attrpos ; -- Positive Attr is different in @@ -158,8 +156,8 @@ oper attrpos : Str = add_N stem ; in v2a attrpos v ; - mkAdjReg : (x1,_,_,_,x5 : Str) -> Adjective = \plain,polite,formal,neg,attr -> - v2a attr (mkVerbReg plain polite formal neg attr) ; + mkAdjReg : (x1,_,_,x4 : Str) -> Adjective = \plain,polite,formal,attr -> + v2a attr (mkVerbReg plain polite formal attr) ; atoa2 : Adjective -> Adjective2 = \a -> a ** {c2=Bare ; p2=emptyPP} ; @@ -185,9 +183,8 @@ oper formal = case vowFinal stem of { True => add_B stem + "니다" ; False => stem + "습니다" } ; - neg = stem + "지" ; attrpos = stem + "는" ; - in mkVerbReg plain polite formal neg attrpos ; + in mkVerbReg plain polite formal attrpos ; mkVerb2 : (plain : Str) -> Verb2 = \plain -> vtov2 (mkVerb plain) ; mkVerb3 : (plain : Str) -> Verb3 = \plain -> v2tov3 (mkVerb2 plain) ; @@ -196,9 +193,10 @@ oper v2tov3 : Verb2 -> Verb3 = \v -> v ** {c3 = Bare ; p3 = datPP} ; -- ㄹ-irregulars, ㅎ-irregular - mkVerbReg : (x1,_,_,_,x5 : Str) -> Verb = - \plain,polite,formal,neg,attrpos -> + mkVerbReg : (x1,_,_,x4 : Str) -> Verb = + \plain,polite,formal,attrpos -> let stem = init plain ; + neg = stem + "지" ; attrneg = neg ++ "않는" ; planeg = neg ++ negForms ! Plain ; polneg = neg ++ negForms ! Polite ; @@ -255,7 +253,6 @@ oper "하다" "해요" "합니다" - "하지" "한" ; negForms : Style => Str =