luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unicode: add a g_utf8_substring convenience api

Browse Source 
This function is useful in the GTK+ accessibility implementations,
and seems like a nice thing to have around in general.
This commit is contained in:
Matthias Clasen 2011-06-23 21:31:40 -04:00
parent c2b112bc56
commit 9eb65dd3ed
5 changed files with 73 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/glib/glib-sections.txt
View File

@ -2726,6 +2726,7 @@ g_utf8_strncpy
g_utf8_strchr
g_utf8_strrchr
g_utf8_strreverse
g_utf8_substring
g_utf8_validate
<SUBSECTION>

25
glib/glib.symbols
View File

@ -1196,13 +1196,8 @@ g_tree_search
g_tree_steal
g_tree_traverse
g_unichar_break_type
g_utf8_collate
g_utf8_collate_key
g_utf8_collate_key_for_filename
g_unicode_canonical_decomposition
g_unicode_canonical_ordering
g_unichar_combining_class
g_utf8_normalize
g_unichar_isalnum
g_unichar_isalpha
g_unichar_iscntrl
@ -1228,30 +1223,36 @@ g_unichar_get_script
g_unichar_digit_value
g_unichar_xdigit_value
g_unichar_type
g_unicode_canonical_decomposition
g_utf8_casefold
g_utf8_strup
g_utf8_strdown
g_get_charset
g_ucs4_to_utf16
g_ucs4_to_utf8
g_utf16_to_ucs4
g_utf16_to_utf8
g_utf8_collate
g_utf8_collate_key
g_utf8_collate_key_for_filename
g_utf8_find_next_char
g_utf8_find_prev_char
g_utf8_get_char
g_utf8_get_char_validated
g_utf8_normalize
g_utf8_offset_to_pointer
g_utf8_pointer_to_offset
g_utf8_prev_char
g_utf8_strup
g_utf8_strdown
g_utf8_strchr
g_utf8_strlen
g_utf8_strncpy
g_utf8_strrchr
g_utf8_strreverse
g_utf8_substring
g_utf8_to_ucs4
g_utf8_to_ucs4_fast
g_utf8_to_utf16
g_utf8_validate
g_get_charset
g_ucs4_to_utf16
g_ucs4_to_utf8
g_utf16_to_ucs4
g_utf16_to_utf8
g_unichar_to_utf8
g_unichar_validate
glib_pgettext

8
glib/gunicode.h
View File

@ -312,8 +312,12 @@ gchar* g_utf8_find_next_char (const gchar *p,
gchar* g_utf8_find_prev_char (const gchar *str,
const gchar *p) G_GNUC_PURE;
glong g_utf8_strlen (const gchar *p,
gssize max) G_GNUC_PURE;
glong g_utf8_strlen (const gchar *p,
gssize max) G_GNUC_PURE;
gchar *g_utf8_substring (const gchar *p,
glong start_pos,
glong end_pos) G_GNUC_MALLOC;
/* Copies n characters from src to dest */
gchar* g_utf8_strncpy (gchar *dest,

32
glib/gutf8.c
View File

@ -268,6 +268,38 @@ g_utf8_strlen (const gchar *p,
return len;
}
/**
* g_utf8_substring:
* @str: a UTF-8 encoded string
* @start_pos: a character offset within @str
* @end_pos: another character offset within @str
*
* Copies a substring out of a UTF-8 encoded string.
* The substring will contain @end_pos - @start_pos
* characters.
*
* Returns: a newly allocated copy of the requested
* substring. Free with g_free() when no longer needed.
*
* Since: 2.30
*/
gchar *
g_utf8_substring (const gchar *str,
glong start_pos,
glong end_pos)
{
gchar *start, *end, *out;
start = g_utf8_offset_to_pointer (str, start_pos);
end = g_utf8_offset_to_pointer (start, end_pos - start_pos);
out = g_malloc (end - start + 1);
memcpy (out, start, end - start);
out[end - start] = 0;
return out;
}
/**
* g_utf8_get_char:
* @p: a pointer to Unicode character encoded as UTF-8

21
glib/tests/utf8-misc.c
View File

@ -106,8 +106,28 @@ test_utf8_reverse (void)
r = g_utf8_strreverse ("\340\254\213\360\220\244\200\101\341\272\266", -1);
g_assert_cmpstr (r, ==, "\341\272\266\101\360\220\244\200\340\254\213");
g_free (r);
}
static void
test_utf8_substring (void)
{
gchar *r;
r = g_utf8_substring ("abcd", 1, 3);
g_assert_cmpstr (r, ==, "bc");
g_free (r);
r = g_utf8_substring ("abcd", 0, 4);
g_assert_cmpstr (r, ==, "abcd");
g_free (r);
r = g_utf8_substring ("abcd", 2, 2);
g_assert_cmpstr (r, ==, "");
g_free (r);
r = g_utf8_substring ("abc\xe2\x82\xa0gh\xe2\x82\xa4", 2, 5);
g_assert_cmpstr (r, ==, "c\xe2\x82\xa0g");
g_free (r);
}
static void
@ -519,6 +539,7 @@ main (int argc,
g_test_add_func ("/utf8/strncpy", test_utf8_strncpy);
g_test_add_func ("/utf8/strrchr", test_utf8_strrchr);
g_test_add_func ("/utf8/reverse", test_utf8_reverse);
g_test_add_func ("/utf8/substring", test_utf8_substring);
g_test_add_func ("/unicode/validate", test_unichar_validate);
g_test_add_func ("/unicode/character-type", test_unichar_character_type);
g_test_add_func ("/unicode/break-type", test_unichar_break_type);