diff --git a/ChangeLog b/ChangeLog index 5c8b6e603..476d9d6a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-05-22 Noah Levitt + + * glib/guniprop.c: Update g_unichar_iswide to Unicode 4.0 (#113404). + 2003-05-21 Noah Levitt * glib/guniprop.c: Fix obscure typo in case conversion routine diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5c8b6e603..476d9d6a7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2003-05-22 Noah Levitt + + * glib/guniprop.c: Update g_unichar_iswide to Unicode 4.0 (#113404). + 2003-05-21 Noah Levitt * glib/guniprop.c: Fix obscure typo in case conversion routine diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5c8b6e603..476d9d6a7 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2003-05-22 Noah Levitt + + * glib/guniprop.c: Update g_unichar_iswide to Unicode 4.0 (#113404). + 2003-05-21 Noah Levitt * glib/guniprop.c: Fix obscure typo in case conversion routine diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5c8b6e603..476d9d6a7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2003-05-22 Noah Levitt + + * glib/guniprop.c: Update g_unichar_iswide to Unicode 4.0 (#113404). + 2003-05-21 Noah Levitt * glib/guniprop.c: Fix obscure typo in case conversion routine diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5c8b6e603..476d9d6a7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2003-05-22 Noah Levitt + + * glib/guniprop.c: Update g_unichar_iswide to Unicode 4.0 (#113404). + 2003-05-21 Noah Levitt * glib/guniprop.c: Fix obscure typo in case conversion routine diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5c8b6e603..476d9d6a7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2003-05-22 Noah Levitt + + * glib/guniprop.c: Update g_unichar_iswide to Unicode 4.0 (#113404). + 2003-05-21 Noah Levitt * glib/guniprop.c: Fix obscure typo in case conversion routine diff --git a/glib/guniprop.c b/glib/guniprop.c index 04fb0a335..0740b3cc6 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -331,16 +331,19 @@ gboolean g_unichar_iswide (gunichar c) { if (c < 0x1100) - return 0; + return FALSE; - return ((c >= 0x1100 && c <= 0x115f) /* Hangul Jamo */ - || (c >= 0x2e80 && c <= 0xa4cf && (c & ~0x0011) != 0x300a && - c != 0x303f) /* CJK ... Yi */ - || (c >= 0xac00 && c <= 0xd7a3) /* Hangul Syllables */ - || (c >= 0xf900 && c <= 0xfaff) /* CJK Compatibility Ideographs */ - || (c >= 0xfe30 && c <= 0xfe6f) /* CJK Compatibility Forms */ - || (c >= 0xff00 && c <= 0xff5f) /* Fullwidth Forms */ - || (c >= 0xffe0 && c <= 0xffe6)); + return (c <= 0x115f /* Hangul Jamo init. consonants */ + || c == 0x2329 || c == 0x232a /* angle brackets */ + || (c >= 0x2e80 && c <= 0xa4cf && (c < 0x302a || c > 0x302f) + && c != 0x303f && c != 0x3099 && c!= 0x309a) /* CJK ... Yi */ + || (c >= 0xac00 && c <= 0xd7a3) /* Hangul Syllables */ + || (c >= 0xf900 && c <= 0xfaff) /* CJK Compatibility Ideographs */ + || (c >= 0xfe30 && c <= 0xfe6f) /* CJK Compatibility Forms */ + || (c >= 0xff00 && c <= 0xff60) /* Fullwidth Forms */ + || (c >= 0xffe0 && c <= 0xffe6) /* Fullwidth Forms */ + || (c >= 0x20000 && c <= 0x2fffd) /* CJK extra stuff */ + || (c >= 0x30000 && c <= 0x3fffd)); } /**