From fc8987e557bbe7ce3a8cbf644b9a106750b03094 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Tue, 7 Apr 2020 21:30:43 +0200 Subject: [PATCH] (Kor) Small cleanup + new words --- src/korean/Hangul.gf | 1 + src/korean/LexiconKor.gf | 6 +++--- src/korean/ResKor.gf | 2 -- src/korean/StructuralKor.gf | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/korean/Hangul.gf b/src/korean/Hangul.gf index 11264927..42793d56 100644 --- a/src/korean/Hangul.gf +++ b/src/korean/Hangul.gf @@ -183,6 +183,7 @@ oper "기" | "끼" | "니" | "디" | "띠" | "리" | "미" | "비" | "삐" | "시" | "씨" | "이" | "지" | "찌" | "치" | "키" | "티" | "피" | "히" ) ; a : pattern Str = #("가" | "까" | "나" | "다" | "따" | "라" | "마" | "바" | "빠" | "사" | "싸" | "아" | "자" | "짜" | "차" | "카" | "타" | "파" | "하") ; + e : pattern Str = #("게" | "께" | "네" | "데" | "떼" | "레" | "메" | "베" | "뻬" | "세" | "쎄" | "에" | "제" | "쩨" | "체" | "케" | "테" | "페" | "헤") ; eo : pattern Str = #("거" | "꺼" | "너" | "더" | "떠" | "러" | "머" | "버" | "뻐" | "서" | "써" | "어" | "저" | "쩌" | "처" | "커" | "터" | "퍼" | "허") ; eu : pattern Str = #("그" | "끄" | "느" | "드" | "뜨" | "르" | "므" | "브" | "쁘" | "스" | "쓰" | "으" | "즈" | "쯔" | "츠" | "크" | "트" | "프" | "흐") ; i : pattern Str = #("기" | "끼" | "니" | "디" | "띠" | "리" | "미" | "비" | "삐" | "시" | "씨" | "이" | "지" | "찌" | "치" | "키" | "티" | "피" | "히") ; diff --git a/src/korean/LexiconKor.gf b/src/korean/LexiconKor.gf index 977f3ce2..11e46d85 100644 --- a/src/korean/LexiconKor.gf +++ b/src/korean/LexiconKor.gf @@ -1,5 +1,5 @@ concrete LexiconKor of Lexicon = CatKor ** - open ParadigmsKor, ResKor in { + open ParadigmsKor, ResKor, StructuralKor in { ---- -- A @@ -223,7 +223,7 @@ lin like_V2 = mkV2 (mkV "좋아" do_V) topic object ; -- M lin man_N = mkN "남자" ; --- lin married_A2 = mkA "" ; +lin married_A2 = mkA2 (mkA "결혼했다" "결혼했어요" "결혼했습니다" "결혼한") with_Prep ; -- TODO check: forced past tense -- lin meat_N = mkN "" ; lin milk_N = mkN "우유" ; -- lin moon_N = mkN "" ; @@ -279,7 +279,7 @@ lin person_N = mkN "사람" ; -- lin read_V2 = mkV2 "" ; -- lin ready_A = mkA "" ; -- lin reason_N = mkN "" ; -lin red_A = mkA "빨갛다" ; +lin red_A = mkA "빨갛다" "빨개요" "빨갛습니다" "빨간" ; -- lin religion_N = mkN "" ; -- lin restaurant_N = mkN "" ; -- lin river_N = mkN "" ; diff --git a/src/korean/ResKor.gf b/src/korean/ResKor.gf index a6b4b725..e8907c24 100644 --- a/src/korean/ResKor.gf +++ b/src/korean/ResKor.gf @@ -300,12 +300,10 @@ oper Complement : Type = { s : VForm => Str ; - -- compar : Str ; -- comparative is discontinuous } ; emptyComp : Complement = { s = \\_ => [] ; - -- compar : Str ; } ; BaseVP : Type = { diff --git a/src/korean/StructuralKor.gf b/src/korean/StructuralKor.gf index 60b3f719..fe62f835 100644 --- a/src/korean/StructuralKor.gf +++ b/src/korean/StructuralKor.gf @@ -69,7 +69,7 @@ lin only_Predet = {s = \\_ => "만" ; p = Consonant} ; --lin every_Det = ; -lin few_Det = mkDet "조금" Pl ; +lin few_Det = mkDet "조금의" Pl ; lin many_Det = mkDet "많은" Pl ; -- lin much_Det = ; @@ -115,7 +115,7 @@ lin possess_Prep = mkPrep "의" ; -- lin through_Prep = mkPrep ; lin to_Prep = mkPrep "에"; -- lin under_Prep = mkPrep "" ; --- lin with_Prep = mkPrep "" ; +lin with_Prep = mkPrep "와" "과" ; -- lin without_Prep = mkPrep "" ;