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

diff --git a/ChangeLog b/ChangeLog
index 837d14d..dadc463 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * glib/gthread.[hc]: more atomic ops pointer cast fixes. this time it'll

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 1dc958a..0ece3eb 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-19  Behdad Esfahbod  <behdad@gnome.org>
+
+       * glib/glib-sections.txt:
+
 2007-07-12  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.13.7 ===

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 9b611f5..7f75ad6 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -2420,6 +2420,7 @@ GUnicodeType
 g_unichar_type
 GUnicodeBreakType
 g_unichar_break_type
+g_unichar_combining_class
 g_unicode_canonical_ordering
 g_unicode_canonical_decomposition
 g_unichar_get_mirror_char

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 5ab5853..f54b992 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1291,6 +1291,7 @@ g_utf8_collate_key_for_filename G_GNUC_MALLOC
 #if IN_FILE(__G_UNIDECOMP_C__)
 g_unicode_canonical_decomposition G_GNUC_MALLOC
 g_unicode_canonical_ordering
+g_unicode_combining_class
 g_utf8_normalize
 #endif
 #endif

diff --git a/glib/gunicode.h b/glib/gunicode.h
index 47478d0..41157bd 100644 (file)
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -236,6 +236,9 @@ GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;
 /* Return the line break property for a given character */
 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
    decomposed characters in the string according to their combining

diff --git a/glib/gunicodeprivate.h b/glib/gunicodeprivate.h
index 01aa5cb..70539d4 100644 (file)
--- a/glib/gunicodeprivate.h
+++ b/glib/gunicodeprivate.h
@@ -29,7 +29,6 @@ G_GNUC_INTERNAL gunichar *_g_utf8_normalize_wc
                                (const gchar    *str,
                                gssize          max_len,
                                GNormalizeMode  mode);
-G_GNUC_INTERNAL gint      _g_unichar_combining_class (gunichar uc);
 
 G_END_DECLS
 

diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index 21fd7c6..713742b 100644 (file)
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -47,8 +47,18 @@
       ? CC_PART2 (((Char) - 0xe0000) >> 8, (Char) & 0xff) \
       : 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
-_g_unichar_combining_class (gunichar uc)
+g_unichar_combining_class (gunichar uc)
 {
   return COMBINING_CLASS (uc);
 }

diff --git a/glib/guniprop.c b/glib/guniprop.c
index c66a02c..5eb0f13 100644 (file)
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -970,7 +970,7 @@ has_more_above (const gchar *str)
 
   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)
         return TRUE;
       else if (combining_class == 0)