# HG changeset patch # User Ben Pfaff # Date 1293923740 28800 # Node ID 42f8fcc42425872b646ace82b3d7b58a518625ce # Parent 2e7260ffde00400f9577e44f1f7c19cefce7c546 Rename uc_is_grapheme_cluster_break() to uc_is_grapheme_break(). This aids consistency, since the "cluster" term is not used elsewhere. * lib/unigbrk.in.h: Update name. * lib/unigbrk/u16-grapheme-breaks.c: Update name. * lib/unigbrk/u16-grapheme-next.c: Update name. * lib/unigbrk/u16-grapheme-prev.c: Update name. * lib/unigbrk/u32-grapheme-breaks.c: Update name. * lib/unigbrk/u32-grapheme-next.c: Update name. * lib/unigbrk/u32-grapheme-prev.c: Update name. * lib/unigbrk/u8-grapheme-breaks.c: Update name. * lib/unigbrk/u8-grapheme-next.c: Update name. * lib/unigbrk/u8-grapheme-prev.c: Update name. * lib/unigbrk/uc-is-grapheme-break.c: Update name. * tests/unigbrk/test-uc-is-grapheme-break.c: Update name. Suggested by Bruno Haible. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2011-01-01 Ben Pfaff + + Rename uc_is_grapheme_cluster_break() to uc_is_grapheme_break() + for consistency, since the "cluster" term is not used elsewhere. + * lib/unigbrk.in.h: Update name. + * lib/unigbrk/u16-grapheme-breaks.c: Update name. + * lib/unigbrk/u16-grapheme-next.c: Update name. + * lib/unigbrk/u16-grapheme-prev.c: Update name. + * lib/unigbrk/u32-grapheme-breaks.c: Update name. + * lib/unigbrk/u32-grapheme-next.c: Update name. + * lib/unigbrk/u32-grapheme-prev.c: Update name. + * lib/unigbrk/u8-grapheme-breaks.c: Update name. + * lib/unigbrk/u8-grapheme-next.c: Update name. + * lib/unigbrk/u8-grapheme-prev.c: Update name. + * lib/unigbrk/uc-is-grapheme-break.c: Update name. + * tests/unigbrk/test-uc-is-grapheme-break.c: Update name. + Suggested by Bruno Haible. + 2011-01-01 Ben Pfaff Remove module 'u8-grapheme-len' as too redundant with diff --git a/lib/unigbrk.in.h b/lib/unigbrk.in.h --- a/lib/unigbrk.in.h +++ b/lib/unigbrk.in.h @@ -76,7 +76,7 @@ Use A == 0 or B == 0 to indicate start of text or end of text, respectively. */ extern bool - uc_is_grapheme_cluster_break (ucs4_t a, ucs4_t b); + uc_is_grapheme_break (ucs4_t a, ucs4_t b); /* Returns the start of the next grapheme cluster following S, or NULL if the end of the string has been reached. */ diff --git a/lib/unigbrk/u16-grapheme-breaks.c b/lib/unigbrk/u16-grapheme-breaks.c --- a/lib/unigbrk/u16-grapheme-breaks.c +++ b/lib/unigbrk/u16-grapheme-breaks.c @@ -36,7 +36,7 @@ mblen = u16_mbtouc (&next, s, n); - p[0] = uc_is_grapheme_cluster_break (prev, next); + p[0] = uc_is_grapheme_break (prev, next); if (mblen > 1) p[1] = 0; diff --git a/lib/unigbrk/u16-grapheme-next.c b/lib/unigbrk/u16-grapheme-next.c --- a/lib/unigbrk/u16-grapheme-next.c +++ b/lib/unigbrk/u16-grapheme-next.c @@ -36,7 +36,7 @@ ucs4_t next; mblen = u16_mbtouc (&next, s, end - s); - if (uc_is_grapheme_cluster_break (prev, next)) + if (uc_is_grapheme_break (prev, next)) break; prev = next; diff --git a/lib/unigbrk/u16-grapheme-prev.c b/lib/unigbrk/u16-grapheme-prev.c --- a/lib/unigbrk/u16-grapheme-prev.c +++ b/lib/unigbrk/u16-grapheme-prev.c @@ -44,7 +44,7 @@ return start; } - if (uc_is_grapheme_cluster_break (prev, next)) + if (uc_is_grapheme_break (prev, next)) break; s = prev_s; diff --git a/lib/unigbrk/u32-grapheme-breaks.c b/lib/unigbrk/u32-grapheme-breaks.c --- a/lib/unigbrk/u32-grapheme-breaks.c +++ b/lib/unigbrk/u32-grapheme-breaks.c @@ -35,7 +35,7 @@ u32_mbtouc (&next, &s[i], 1); - p[i] = uc_is_grapheme_cluster_break (prev, next); + p[i] = uc_is_grapheme_break (prev, next); prev = next; } diff --git a/lib/unigbrk/u32-grapheme-next.c b/lib/unigbrk/u32-grapheme-next.c --- a/lib/unigbrk/u32-grapheme-next.c +++ b/lib/unigbrk/u32-grapheme-next.c @@ -36,7 +36,7 @@ ucs4_t next; u32_mbtouc (&next, s, end - s); - if (uc_is_grapheme_cluster_break (prev, next)) + if (uc_is_grapheme_break (prev, next)) break; prev = next; diff --git a/lib/unigbrk/u32-grapheme-prev.c b/lib/unigbrk/u32-grapheme-prev.c --- a/lib/unigbrk/u32-grapheme-prev.c +++ b/lib/unigbrk/u32-grapheme-prev.c @@ -41,7 +41,7 @@ return start; } - if (uc_is_grapheme_cluster_break (prev, next)) + if (uc_is_grapheme_break (prev, next)) break; next = prev; diff --git a/lib/unigbrk/u8-grapheme-breaks.c b/lib/unigbrk/u8-grapheme-breaks.c --- a/lib/unigbrk/u8-grapheme-breaks.c +++ b/lib/unigbrk/u8-grapheme-breaks.c @@ -37,7 +37,7 @@ mblen = u8_mbtouc (&next, s, n); - p[0] = uc_is_grapheme_cluster_break (prev, next); + p[0] = uc_is_grapheme_break (prev, next); for (i = 1; i < mblen; i++) p[i] = 0; diff --git a/lib/unigbrk/u8-grapheme-next.c b/lib/unigbrk/u8-grapheme-next.c --- a/lib/unigbrk/u8-grapheme-next.c +++ b/lib/unigbrk/u8-grapheme-next.c @@ -36,7 +36,7 @@ ucs4_t next; mblen = u8_mbtouc (&next, s, end - s); - if (uc_is_grapheme_cluster_break (prev, next)) + if (uc_is_grapheme_break (prev, next)) break; prev = next; diff --git a/lib/unigbrk/u8-grapheme-prev.c b/lib/unigbrk/u8-grapheme-prev.c --- a/lib/unigbrk/u8-grapheme-prev.c +++ b/lib/unigbrk/u8-grapheme-prev.c @@ -44,7 +44,7 @@ return start; } - if (uc_is_grapheme_cluster_break (prev, next)) + if (uc_is_grapheme_break (prev, next)) break; s = prev_s; diff --git a/lib/unigbrk/uc-is-grapheme-break.c b/lib/unigbrk/uc-is-grapheme-break.c --- a/lib/unigbrk/uc-is-grapheme-break.c +++ b/lib/unigbrk/uc-is-grapheme-break.c @@ -90,7 +90,7 @@ }; bool -uc_is_grapheme_cluster_break (ucs4_t a, ucs4_t b) +uc_is_grapheme_break (ucs4_t a, ucs4_t b) { int a_gcp, b_gcp; diff --git a/tests/unigbrk/test-uc-is-grapheme-break.c b/tests/unigbrk/test-uc-is-grapheme-break.c --- a/tests/unigbrk/test-uc-is-grapheme-break.c +++ b/tests/unigbrk/test-uc-is-grapheme-break.c @@ -134,7 +134,7 @@ next = next_int; } - if (uc_is_grapheme_cluster_break (prev, next) != should_break) + if (uc_is_grapheme_break (prev, next) != should_break) { int prev_gbp = uc_graphemeclusterbreak_property (prev); int next_gbp = uc_graphemeclusterbreak_property (next);