From: Choe Hwanjin Date: Sat, 17 Oct 2009 12:35:26 +0000 (+0900) Subject: jaso 대신 jamo를 사용한다. X-Git-Tag: libhangul-0.0.10~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb36c6692a974004d911325b8d744465caee6974;p=platform%2Fcore%2Fuifw%2Flibhangul.git jaso 대신 jamo를 사용한다. 따라서 jaso를 사용한 함수는 앞으로 지원하지 않는다. git-svn-id: http://kldp.net/svn/hangul/libhangul/trunk@200 8f00fcd2-89fc-0310-932e-b01be5b65e01 --- diff --git a/hangul/hangul.h b/hangul/hangul.h index b1ba34a..250620c 100644 --- a/hangul/hangul.h +++ b/hangul/hangul.h @@ -41,10 +41,10 @@ bool hangul_is_choseong_conjoinable(ucschar c); bool hangul_is_jungseong_conjoinable(ucschar c); bool hangul_is_jongseong_conjoinable(ucschar c); bool hangul_is_syllable(ucschar c); -bool hangul_is_jaso(ucschar c); bool hangul_is_jamo(ucschar c); +bool hangul_is_cjamo(ucschar c); -ucschar hangul_jaso_to_jamo(ucschar ch); +ucschar hangul_jamo_to_cjamo(ucschar ch); ucschar hangul_choseong_to_jongseong(ucschar ch); ucschar hangul_jongseong_to_choseong(ucschar ch); @@ -57,10 +57,10 @@ const ucschar* hangul_syllable_iterator_next(const ucschar* str, int hangul_syllable_len(const ucschar* str, int max_len); -ucschar hangul_jaso_to_syllable(ucschar choseong, +ucschar hangul_jamo_to_syllable(ucschar choseong, ucschar jungseong, ucschar jongseong); -void hangul_syllable_to_jaso(ucschar syllable, +void hangul_syllable_to_jamo(ucschar syllable, ucschar* choseong, ucschar* jungseong, ucschar* jongseong); @@ -150,6 +150,15 @@ const char* hanja_get_comment(const Hanja* hanja); /* deprecated */ +bool hangul_is_jaso(ucschar c); +ucschar hangul_jaso_to_jamo(ucschar ch); +ucschar hangul_jaso_to_syllable(ucschar choseong, + ucschar jungseong, + ucschar jongseong); +void hangul_syllable_to_jaso(ucschar syllable, + ucschar* choseong, + ucschar* jungseong, + ucschar* jongseong); typedef bool (*HangulICFilter) (ucschar*, ucschar, ucschar, ucschar, void*); void hangul_ic_set_filter(HangulInputContext *hic, HangulICFilter func, void *user_data); diff --git a/hangul/hangulctype.c b/hangul/hangulctype.c index 9bcc819..f9b0e80 100644 --- a/hangul/hangulctype.c +++ b/hangul/hangulctype.c @@ -120,21 +120,28 @@ hangul_is_syllable(ucschar c) } /** - * @brief check for a jaso + * @brief check for a jamo * @param c ucs4 code value - * @return true if the character c falls into jaso class + * @return true if the character c falls into jamo class * * This function check whether c, which must have ucs4 value, falls into - * jaso class; that is choseong, jungseong or jongseong. + * jamo class; that is choseong, jungseong or jongseong. */ bool -hangul_is_jaso(ucschar c) +hangul_is_jamo(ucschar c) { return hangul_is_choseong(c) || hangul_is_jungseong(c) || hangul_is_jongseong(c); } +/* deprecated */ +bool +hangul_is_jaso(ucschar c) +{ + return hangul_is_jamo(c); +} + /** * @brief check for a compatibility jamo * @param c ucs4 code value @@ -144,21 +151,21 @@ hangul_is_jaso(ucschar c) * compatibility jamo class. */ bool -hangul_is_jamo(ucschar c) +hangul_is_cjamo(ucschar c) { return c >= 0x3131 && c <= 0x318e; } /** - * @brief convert a jaso to the compatibility jamo + * @brief convert a jamo to the compatibility jamo * @param c ucs4 code value * @return converted value, or c * - * This function converts the jaso c, which must have ucs4 value, to + * This function converts the jamo c, which must have ucs4 value, to * comaptibility jamo or c if the conversion is failed */ ucschar -hangul_jaso_to_jamo(ucschar c) +hangul_jamo_to_cjamo(ucschar c) { static ucschar choseong[] = { 0x3131, /* 0x1100 */ @@ -247,6 +254,13 @@ hangul_jaso_to_jamo(ucschar c) return c; } +/* deprecated */ +ucschar +hangul_jaso_to_jamo(ucschar c) +{ + return hangul_jamo_to_cjamo(c); +} + ucschar hangul_choseong_to_jongseong(ucschar c) { @@ -357,11 +371,11 @@ hangul_jongseong_dicompose(ucschar c, ucschar* jong, ucschar* cho) * @param jongseong UCS4 code value * @return syllable code compose from choseong, jungseong and jongseong * - * This function compose hangul jaso choseong, jungseong and jongseong and + * This function compose hangul jamo choseong, jungseong and jongseong and * return the syllable code. */ ucschar -hangul_jaso_to_syllable(ucschar choseong, ucschar jungseong, ucschar jongseong) +hangul_jamo_to_syllable(ucschar choseong, ucschar jungseong, ucschar jongseong) { ucschar c; @@ -385,8 +399,15 @@ hangul_jaso_to_syllable(ucschar choseong, ucschar jungseong, ucschar jongseong) return c; } +/* deprecated */ +ucschar +hangul_jaso_to_syllable(ucschar choseong, ucschar jungseong, ucschar jongseong) +{ + return hangul_jamo_to_syllable(choseong, jungseong, jongseong); +} + void -hangul_syllable_to_jaso(ucschar syllable, +hangul_syllable_to_jamo(ucschar syllable, ucschar* choseong, ucschar* jungseong, ucschar* jongseong) @@ -418,6 +439,16 @@ hangul_syllable_to_jaso(ucschar syllable, } } +/* deprecated */ +void +hangul_syllable_to_jaso(ucschar syllable, + ucschar* choseong, + ucschar* jungseong, + ucschar* jongseong) +{ + return hangul_syllable_to_jamo(syllable, choseong, jungseong, jongseong); +} + static inline bool is_syllable_boundary(ucschar prev, ucschar next) { @@ -601,7 +632,7 @@ build_syllable(const ucschar* str, size_t len) if (i < len) return 0; - return hangul_jaso_to_syllable(cho, jung, jong); + return hangul_jamo_to_syllable(cho, jung, jong); } /**