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
index 87c7bcd2c029b0f2ceab8b6137674251d25bc5df..1ba03669bb26cf2223770d104e3a61a662c82806 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-01  Ben Pfaff  <blp@cs.stanford.edu>
+
+       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  <blp@cs.stanford.edu>
 
        Remove module 'u8-grapheme-len' as too redundant with

diff --git a/lib/unigbrk.in.h b/lib/unigbrk.in.h
index c95b75be051c98f74f21b3fb9bcca012cf1e90cb..6dda1ea115566e7fc93f5ef69dbaf80972a4fbb0 100644 (file)
--- a/lib/unigbrk.in.h
+++ b/lib/unigbrk.in.h
@@ -76,7 +76,7 @@ extern int
    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
index 36e559fb7ae8c2b5ce7f7d28838e5cc7f13c15e0..b79a8a8b5541ad4048edade0f9833a3fe58ca254 100644 (file)
--- a/lib/unigbrk/u16-grapheme-breaks.c
+++ b/lib/unigbrk/u16-grapheme-breaks.c
@@ -36,7 +36,7 @@ u16_grapheme_breaks (const uint16_t *s, size_t n, char *p)
 
       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
index 8ca3a939fdb9736d4ba4f66f342b83ae41b5ee38..c4bed19bbab23b77484ac6d533e97a100fe7113b 100644 (file)
--- a/lib/unigbrk/u16-grapheme-next.c
+++ b/lib/unigbrk/u16-grapheme-next.c
@@ -36,7 +36,7 @@ u16_grapheme_next (const uint16_t *s, const uint16_t *end)
       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
index 353a63a0b010d05f9f649c3448ce0a38689056f8..437f3db2f87fcc6dd6b4cfd5f4a2a29b9ba91b14 100644 (file)
--- a/lib/unigbrk/u16-grapheme-prev.c
+++ b/lib/unigbrk/u16-grapheme-prev.c
@@ -44,7 +44,7 @@ u16_grapheme_prev (const uint16_t *s, const uint16_t *start)
           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
index 2b5c12c5adb5d6eb55ce20258e6c08cd1c73dff9..09dc238c8bfa5e48e23ebd65da18148bdb372f2d 100644 (file)
--- a/lib/unigbrk/u32-grapheme-breaks.c
+++ b/lib/unigbrk/u32-grapheme-breaks.c
@@ -35,7 +35,7 @@ u32_grapheme_breaks (const uint32_t *s, size_t n, char *p)
 
       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
index 08fa7dd10f3c8d945a1e5f57d5a0ee9926481db7..52dc514d13b4abdbf82114d38088a79df3211802 100644 (file)
--- a/lib/unigbrk/u32-grapheme-next.c
+++ b/lib/unigbrk/u32-grapheme-next.c
@@ -36,7 +36,7 @@ u32_grapheme_next (const uint32_t *s, const uint32_t *end)
       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
index 7fc90e3b0eb8b3876a028185f27af1802826ac52..fb0ea1348c2e735bfdce2d2fe4cb9e2345530df2 100644 (file)
--- a/lib/unigbrk/u32-grapheme-prev.c
+++ b/lib/unigbrk/u32-grapheme-prev.c
@@ -41,7 +41,7 @@ u32_grapheme_prev (const uint32_t *s, const uint32_t *start)
           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
index 3fb552255f8f6732aefce5e0553bcdc1cf4691cc..f145bdc0b0e35e766f2f37a9b88cfd61072c81c0 100644 (file)
--- a/lib/unigbrk/u8-grapheme-breaks.c
+++ b/lib/unigbrk/u8-grapheme-breaks.c
@@ -37,7 +37,7 @@ u8_grapheme_breaks (const uint8_t *s, size_t n, char *p)
 
       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
index 123af518cd4816ee789d7df6377ea03a282bfad7..068f174b1097f31cd988812f1f40630673004bba 100644 (file)
--- a/lib/unigbrk/u8-grapheme-next.c
+++ b/lib/unigbrk/u8-grapheme-next.c
@@ -36,7 +36,7 @@ u8_grapheme_next (const uint8_t *s, const uint8_t *end)
       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
index ebbdce4337775bec6a87a8571d27853f137f1fad..ac866b0e4d81ede408c5ede983fd02b4ee8aeacc 100644 (file)
--- a/lib/unigbrk/u8-grapheme-prev.c
+++ b/lib/unigbrk/u8-grapheme-prev.c
@@ -44,7 +44,7 @@ u8_grapheme_prev (const uint8_t *s, const uint8_t *start)
           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
index 3e1b6ebb98b4a80597ff99e3867773122be1be57..c67a5da1eb29364d6d637aa8c5f79b329fa67f3c 100644 (file)
--- a/lib/unigbrk/uc-is-grapheme-break.c
+++ b/lib/unigbrk/uc-is-grapheme-break.c
@@ -90,7 +90,7 @@ static const unsigned short int gb_table[12] =
   };
 
 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
index 859db49289cfcdd030a599da400e97dc044e0640..47304f0374cf47000fc9bcbeb9d1ab71b706f999 100644 (file)
--- a/tests/unigbrk/test-uc-is-grapheme-break.c
+++ b/tests/unigbrk/test-uc-is-grapheme-break.c
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
               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);