Merge branch 'release/0.9.8-1'0.9.8-1

1 files changed, 8 insertions, 22 deletions

diff --git a/lib/unigbrk/u16-grapheme-breaks.c b/lib/unigbrk/u16-grapheme-breaks.c
index d01e65cc..67ad3bb4 100644
--- a/lib/unigbrk/u16-grapheme-breaks.c
+++ b/lib/unigbrk/u16-grapheme-breaks.c
@@ -1,5 +1,5 @@
 /* Grapheme cluster breaks function.
-   Copyright (C) 2010-2016 Free Software Foundation, Inc.
+   Copyright (C) 2010-2017 Free Software Foundation, Inc.
    Written by Ben Pfaff <blp@cs.stanford.edu>, 2010.
 
    This program is free software: you can redistribute it and/or
@@ -22,32 +22,18 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 /* Specification.  */
 #include "unigbrk.h"
 
-#include "unistr.h"
-
-void
-u16_grapheme_breaks (const uint16_t *s, size_t n, char *p)
-{
-  ucs4_t prev;
-  int mblen;
-
-  prev = 0;
-  for (; n > 0; s += mblen, p += mblen, n -= mblen)
-    {
-      ucs4_t next;
+#include <string.h>
 
-      mblen = u16_mbtouc (&next, s, n);
-
-      p[0] = uc_is_grapheme_break (prev, next);
-      if (mblen > 1)
-        p[1] = 0;
+#include "unistr.h"
 
-      prev = next;
-    }
-}
+#define FUNC u16_grapheme_breaks
+#define UNIT uint16_t
+#define U_MBTOUC u16_mbtouc
+#include "u-grapheme-breaks.h"