Make g_unichar_combining_class() public. (#453998)

2007-07-19  Behdad Esfahbod  <behdad@gnome.org>

        * glib/glib.symbols:
        * glib/gunicode.h:
        * glib/gunicodeprivate.h:
        * glib/gunidecomp.c (g_unichar_combining_class):
        * glib/guniprop.c (has_more_above):
        Make g_unichar_combining_class() public. (#453998)


svn path=/trunk/; revision=5644
This commit is contained in:
Behdad Esfahbod 2007-07-19 13:46:05 +00:00 committed by Behdad Esfahbod
parent 5fd575191e
commit 613b489b6b
8 changed files with 30 additions and 3 deletions

View File

@ -1,3 +1,12 @@
2007-07-19 Behdad Esfahbod <behdad@gnome.org>
* glib/glib.symbols:
* glib/gunicode.h:
* glib/gunicodeprivate.h:
* glib/gunidecomp.c (g_unichar_combining_class):
* glib/guniprop.c (has_more_above):
Make g_unichar_combining_class() public. (#453998)
Fri Jul 13 01:01:46 2007 Tim Janik <timj@imendio.com> Fri Jul 13 01:01:46 2007 Tim Janik <timj@imendio.com>
* glib/gthread.[hc]: more atomic ops pointer cast fixes. this time it'll * glib/gthread.[hc]: more atomic ops pointer cast fixes. this time it'll

View File

@ -1,3 +1,7 @@
2007-07-19 Behdad Esfahbod <behdad@gnome.org>
* glib/glib-sections.txt:
2007-07-12 Matthias Clasen <mclasen@redhat.com> 2007-07-12 Matthias Clasen <mclasen@redhat.com>
* === Released 2.13.7 === * === Released 2.13.7 ===

View File

@ -2420,6 +2420,7 @@ GUnicodeType
g_unichar_type g_unichar_type
GUnicodeBreakType GUnicodeBreakType
g_unichar_break_type g_unichar_break_type
g_unichar_combining_class
g_unicode_canonical_ordering g_unicode_canonical_ordering
g_unicode_canonical_decomposition g_unicode_canonical_decomposition
g_unichar_get_mirror_char g_unichar_get_mirror_char

View File

@ -1291,6 +1291,7 @@ g_utf8_collate_key_for_filename G_GNUC_MALLOC
#if IN_FILE(__G_UNIDECOMP_C__) #if IN_FILE(__G_UNIDECOMP_C__)
g_unicode_canonical_decomposition G_GNUC_MALLOC g_unicode_canonical_decomposition G_GNUC_MALLOC
g_unicode_canonical_ordering g_unicode_canonical_ordering
g_unicode_combining_class
g_utf8_normalize g_utf8_normalize
#endif #endif
#endif #endif

View File

@ -236,6 +236,9 @@ GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;
/* Return the line break property for a given character */ /* Return the line break property for a given character */
GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST; GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST;
/* Returns the combining class for a given character */
gint g_unichar_combining_class (gunichar uc); G_GNUC_CONST;
/* Compute canonical ordering of a string in-place. This rearranges /* Compute canonical ordering of a string in-place. This rearranges
decomposed characters in the string according to their combining decomposed characters in the string according to their combining

View File

@ -29,7 +29,6 @@ G_GNUC_INTERNAL gunichar *_g_utf8_normalize_wc
(const gchar *str, (const gchar *str,
gssize max_len, gssize max_len,
GNormalizeMode mode); GNormalizeMode mode);
G_GNUC_INTERNAL gint _g_unichar_combining_class (gunichar uc);
G_END_DECLS G_END_DECLS

View File

@ -47,8 +47,18 @@
? CC_PART2 (((Char) - 0xe0000) >> 8, (Char) & 0xff) \ ? CC_PART2 (((Char) - 0xe0000) >> 8, (Char) & 0xff) \
: 0)) : 0))
/**
* g_unichar_combining_class:
* @c: a Unicode character
*
* Determines the canonical combining class of a Unicode character.
*
* Return value: the combining class of the character.
*
* Since: 2.14
**/
gint gint
_g_unichar_combining_class (gunichar uc) g_unichar_combining_class (gunichar uc)
{ {
return COMBINING_CLASS (uc); return COMBINING_CLASS (uc);
} }

View File

@ -970,7 +970,7 @@ has_more_above (const gchar *str)
while (*p) while (*p)
{ {
combining_class = _g_unichar_combining_class (g_utf8_get_char (p)); combining_class = g_unichar_combining_class (g_utf8_get_char (p));
if (combining_class == 230) if (combining_class == 230)
return TRUE; return TRUE;
else if (combining_class == 0) else if (combining_class == 0)