Add g_unichar_iszerowidth(). (#347645)

2007-01-03  Behdad Esfahbod  <behdad@gnome.org>

        * glib/glib.symbols:
        * glib/gunicode.h:
        * glib/guniprop.c: Add g_unichar_iszerowidth(). (#347645)

svn path=/trunk/; revision=5202

diff --git a/ChangeLog b/ChangeLog
index e93a45190032c82bd03460681595ceacb0044e46..24e9384d746cbc4474b3d790fe91f5f2cd2a8e87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-03  Behdad Esfahbod  <behdad@gnome.org>
+
+       * glib/glib.symbols:
+       * glib/gunicode.h:
+       * glib/guniprop.c: Add g_unichar_iszerowidth(). (#347645)
+
 2007-01-03  Behdad Esfahbod  <behdad@gnome.org>
 
        * glib/gutils.h: Fix bug in g_bit_nth_lsf (#371631) and use

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 58b52541e8e21d38d8e7d6cee25c2a5c8b50de79..baeeeea8e82a78ba66cb146cab2c8c2e1e487bfb 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,14 @@
+2007-01-03  Behdad Esfahbod  <behdad@gnome.org>
+
+       * glib/glib-sections.txt: Add g_unichar_iszerowidth.
+
+       * glib/tmpl/glib-unused.sgml:
+       * glib/tmpl/keyfile.sgml:
+       * glib/tmpl/macros_misc.sgml:
+       * glib/tmpl/messages.sgml:
+       * glib/tmpl/unicode.sgml:
+       Template changes.
+
 2007-01-02  Matthias Clasen  <mclasen@redhat.com>
        
        * glib/running.sgml: Remove C99ism from example.

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 92d85c7d1662b56c00bf858d1a5db3388de29eb4..739507af5afe504cbc21d587b34dc0197335e2d0 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -2264,6 +2264,7 @@ g_unichar_istitle
 g_unichar_isdefined
 g_unichar_iswide
 g_unichar_iswide_cjk
+g_unichar_iszerowidth
 g_unichar_toupper
 g_unichar_tolower
 g_unichar_totitle

diff --git a/docs/reference/glib/tmpl/glib-unused.sgml b/docs/reference/glib/tmpl/glib-unused.sgml
index b089e668638f564fd2cbb3d7b9f56b7dd2c86cb3..de6993de5fe0b1ec0fb7b47e4a03b3b61d1ceb1f 100644 (file)
--- a/docs/reference/glib/tmpl/glib-unused.sgml
+++ b/docs/reference/glib/tmpl/glib-unused.sgml
@@ -203,6 +203,15 @@ error domains.
 </para>
 
 
+<!-- ##### MACRO G_HAVE_GNUC_VISIBILITY ##### -->
+<para>
+This macro is defined as 1 if the the compiler supports ELF visibility 
+attributes (currently only <command>gcc</command>).
+</para>
+
+Since: 2.6
+
+
 <!-- ##### MACRO G_HOOK_DEFERRED_DESTROY ##### -->
 <para>
 

diff --git a/docs/reference/glib/tmpl/keyfile.sgml b/docs/reference/glib/tmpl/keyfile.sgml
index efd16969074b9c1ce5fba52f3be7f9a96eb90700..7045dcdc31dc65ca1b4de405410f2bf8548da2f6 100644 (file)
--- a/docs/reference/glib/tmpl/keyfile.sgml
+++ b/docs/reference/glib/tmpl/keyfile.sgml
@@ -504,6 +504,8 @@ Flags which influence the parsing.
 @key_file: 
 @group_name: 
 @key: 
+@list: 
+@length: 
 
 
 <!-- ##### FUNCTION g_key_file_set_locale_string_list ##### -->
@@ -515,6 +517,8 @@ Flags which influence the parsing.
 @group_name: 
 @key: 
 @locale: 
+@list: 
+@length: 
 
 
 <!-- ##### FUNCTION g_key_file_set_boolean_list ##### -->

diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml
index 580aebc503e4ff6598bb8f23d5da1bc694a7a6e5..c8cd2930a1c6749485ded1025489e35289555c78 100644 (file)
--- a/docs/reference/glib/tmpl/macros_misc.sgml
+++ b/docs/reference/glib/tmpl/macros_misc.sgml
@@ -297,16 +297,6 @@ See the GNU C documentation for details.
 
 
 
-<!-- ##### MACRO G_HAVE_GNUC_VISIBILITY ##### -->
-<para>
-This macro is defined as 1 if the the compiler supports ELF visibility 
-attributes (currently only <command>gcc</command>).
-</para>
-
-Since: 2.6
-
-
-
 <!-- ##### MACRO G_GNUC_INTERNAL ##### -->
 <para>
 Expands to the GNU C <literal>visibility(hidden)</literal> attribute if the 

diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml
index 35c85da7dde0c38ed7e276876f6eb18cdc93ac76..1beec0038841de0a9925d980e04cb4beb9e02cca 100644 (file)
--- a/docs/reference/glib/tmpl/messages.sgml
+++ b/docs/reference/glib/tmpl/messages.sgml
@@ -144,6 +144,8 @@ A convenience function/macro to log a normal message.
 
 @...:
 
+@...:
+
 @...: 
 
 
@@ -187,6 +189,8 @@ variable (see <ulink url="glib-running.html">Running GLib Applications</ulink>).
 
 @...:
 
+@...:
+
 @...: 
 
 
@@ -235,6 +239,8 @@ the %G_DEBUG environment variable (see
 
 @...:
 
+@...:
+
 @...: 
 
 
@@ -278,6 +284,8 @@ assertion failure.
 
 @...:
 
+@...:
+
 @...: 
 
 
@@ -316,6 +324,8 @@ A convenience function/macro to log a debug message.
 
 @...:
 
+@...:
+
 @...: 
 @Since: 2.6
 

diff --git a/docs/reference/glib/tmpl/unicode.sgml b/docs/reference/glib/tmpl/unicode.sgml
index ccae9129adcbc1235d402b0f777abada7e8788a4..dde994382572c7a9b2e120821ba339590e711777 100644 (file)
--- a/docs/reference/glib/tmpl/unicode.sgml
+++ b/docs/reference/glib/tmpl/unicode.sgml
@@ -201,6 +201,15 @@ will correctly interpret surrogate pairs.</footnote>.
 @Returns: 
 
 
+<!-- ##### FUNCTION g_unichar_iszerowidth ##### -->
+<para>
+
+</para>
+
+@c: 
+@Returns: 
+
+
 <!-- ##### FUNCTION g_unichar_toupper ##### -->
 <para>
 

diff --git a/docs/reference/gobject/tmpl/enumerations_flags.sgml b/docs/reference/gobject/tmpl/enumerations_flags.sgml
index 1293d2fd81090bcd271d5a6e324f74854c07de17..2b72931f272dcc620b7e02724c671a0bb0713797 100644 (file)
--- a/docs/reference/gobject/tmpl/enumerations_flags.sgml
+++ b/docs/reference/gobject/tmpl/enumerations_flags.sgml
@@ -232,13 +232,11 @@ than to write one yourself using g_enum_register_static().
 </para>
 
 @name: A nul-terminated string used as the name of the new type.
-@_static_values: 
-@Returns: The new type identifier.
-<!-- # Unused Parameters # -->
 @const_static_values: An array of #GEnumValue structs for the possible
   enumeration values. The array is terminated by a struct with all 
   members being 0. GObject keeps a reference to the data, so it cannot
   be stack-allocated.
+@Returns: The new type identifier.
 
 
 <!-- ##### FUNCTION g_flags_register_static ##### -->
@@ -252,12 +250,10 @@ than to write one yourself using g_flags_register_static().
 </para>
 
 @name: A nul-terminated string used as the name of the new type.
-@_static_values: 
-@Returns: The new type identifier.
-<!-- # Unused Parameters # -->
 @const_static_values: An array of #GFlagsValue structs for the possible
   flags values. The array is terminated by a struct with all members being 0.
   GObject keeps a reference to the data, so it cannot be stack-allocated.
+@Returns: The new type identifier.
 
 
 <!-- ##### FUNCTION g_enum_complete_type_info ##### -->
@@ -286,8 +282,6 @@ my_enum_complete_type_info (GTypePlugin     *plugin,
 
 @g_enum_type: the type identifier of the type being completed
 @info: the #GTypeInfo struct to be filled in
-@_values: 
-<!-- # Unused Parameters # -->
 @const_values: An array of #GEnumValue structs for the possible
   enumeration values. The array is terminated by a struct with all 
   members being 0.
@@ -302,8 +296,6 @@ g_enumeration_complete_type_info() above.
 
 @g_flags_type: the type identifier of the type being completed
 @info: the #GTypeInfo struct to be filled in
-@_values: 
-<!-- # Unused Parameters # -->
 @const_values: An array of #GFlagsValue structs for the possible
   enumeration values. The array is terminated by a struct with all 
   members being 0.

diff --git a/docs/reference/gobject/tmpl/gtypemodule.sgml b/docs/reference/gobject/tmpl/gtypemodule.sgml
index 550d2dde62e7ff2dafc16d5164cb2d7250eac6dc..71ce8f1a06eda7c181d48d1232143b52902983cf 100644 (file)
--- a/docs/reference/gobject/tmpl/gtypemodule.sgml
+++ b/docs/reference/gobject/tmpl/gtypemodule.sgml
@@ -164,13 +164,11 @@ not be unloaded.
 
 @module:              a #GTypeModule
 @name:                name for the type
-@_static_values: 
-@Returns: the new or existing type ID
-@Since: 2.6
-<!-- # Unused Parameters # -->
 @const_static_values: an array of #GEnumValue structs for the possible
   enumeration values. The array is terminated by a struct with all 
   members being 0.
+@Returns: the new or existing type ID
+@Since: 2.6
 
 
 <!-- ##### FUNCTION g_type_module_register_flags ##### -->
@@ -187,13 +185,11 @@ not be unloaded.
 
 @module:              a #GTypeModule
 @name:                name for the type
-@_static_values: 
-@Returns: the new or existing type ID
-@Since: 2.6
-<!-- # Unused Parameters # -->
 @const_static_values: an array of #GFlagsValue structs for the possible
   flags values. The array is terminated by a struct with all 
   members being 0.
+@Returns: the new or existing type ID
+@Since: 2.6
 
 
 <!-- ##### MACRO G_DEFINE_DYNAMIC_TYPE ##### -->
@@ -212,7 +208,6 @@ See G_DEFINE_DYNAMIC_TYPE_EXTENDED() for an example.
 @t_n: The name of the new type, in lowercase, with words
   separated by '_'.
 @T_P: The #GType of the parent type.
-
 @Since: 2.14
 
 
@@ -286,6 +281,6 @@ gtk_gadget_register_type (GTypeModule *type_module)
 @TYPE_PARENT: The #GType of the parent type.
 @flags: #GTypeFlags to pass to g_type_register_static()
 @CODE: Custom code that gets inserted in the *_get_type() function.
-
 @Since: 2.14
 
+

diff --git a/glib/glib.symbols b/glib/glib.symbols
index bfad3e2240837cea51687426c61a61fd9a6f677d..2649bd40909ee8765a6e8a7e17c13ce327d836be 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1256,6 +1256,7 @@ g_unichar_isupper G_GNUC_CONST
 g_unichar_iswide G_GNUC_CONST
 g_unichar_iswide_cjk G_GNUC_CONST
 g_unichar_isxdigit G_GNUC_CONST
+g_unichar_iszerowidth G_GNUC_CONST
 g_unichar_tolower G_GNUC_CONST
 g_unichar_totitle G_GNUC_CONST
 g_unichar_toupper G_GNUC_CONST

diff --git a/glib/gunicode.h b/glib/gunicode.h
index b024a6a730774c709ab1504617f7e102c23d9799..050045fb65dbd1501e2ab0882e6c0c82710fd56d 100644 (file)
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -215,6 +215,7 @@ gboolean g_unichar_istitle   (gunichar c) G_GNUC_CONST;
 gboolean g_unichar_isdefined (gunichar c) G_GNUC_CONST;
 gboolean g_unichar_iswide    (gunichar c) G_GNUC_CONST;
 gboolean g_unichar_iswide_cjk(gunichar c) G_GNUC_CONST;
+gboolean g_unichar_iszerowidth(gunichar c) G_GNUC_CONST;
 
 /* More <ctype.h> functions.  These convert between the three cases.
  * See the Unicode book to understand title case.  */

diff --git a/glib/guniprop.c b/glib/guniprop.c
index f2f64172a64ca5f45c280bbedfec9394211d611a..2292e76045572318587dce6f2aa9a856d26b4fd4 100644 (file)
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -85,6 +85,11 @@
                            OR (G_UNICODE_COMBINING_MARK,       \
                            OR (G_UNICODE_ENCLOSING_MARK,       0))))
 
+#define ISZEROWIDTHTYPE(Type)  IS ((Type),                     \
+                           OR (G_UNICODE_NON_SPACING_MARK,     \
+                           OR (G_UNICODE_ENCLOSING_MARK,       \
+                           OR (G_UNICODE_FORMAT,               0))))
+
 /**
  * g_unichar_isalnum:
  * @c: a Unicode character
@@ -351,6 +356,40 @@ g_unichar_isdefined (gunichar c)
   return TYPE (c) != G_UNICODE_UNASSIGNED;
 }
 
+/**
+ * g_unichar_iszerowidth:
+ * @c: a Unicode character
+ * 
+ * Determines if a given character typically takes zero width when rendered.
+ * The return value is %TRUE for all non-spacing and enclosing marks
+ * (e.g., combining accents), format characters, zero-width
+ * space, but not U+00AD SOFT HYPHEN.
+ *
+ * A typical use of this function is with one of g_unichar_iswide() or
+ * g_unichar_iswide_cjk() to determine the number of cells a string occupies
+ * when displayed on a grid display (terminals).  However, note that not all
+ * terminals support zero-width rendering of zero-width marks.
+ *
+ * Return value: %TRUE if the character has zero width
+ *
+ * Since: 2.14
+ **/
+gboolean
+g_unichar_iszerowidth (gunichar c)
+{
+  if (G_UNLIKELY (c == 0x00AD))
+    return FALSE;
+
+  if (G_UNLIKELY (ISZEROWIDTHTYPE (c)))
+    return TRUE;
+
+  if (G_UNLIKELY ((c >= 0x1160 && c < 0x1200) ||
+                 c == 0x200B))
+    return TRUE;
+
+  return FALSE;
+}
+
 /**
  * g_unichar_iswide:
  * @c: a Unicode character