Merge branch 'release/debian/1.1-1_experimental1'debian/1.1-1_experimental1

15 files changed, 136 insertions, 44 deletions

diff --git a/lib/unigbrk/gbrkprop.h b/lib/unigbrk/gbrkprop.h
index 4b1f8424..b91ce07a 100644
--- a/lib/unigbrk/gbrkprop.h
+++ b/lib/unigbrk/gbrkprop.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Grapheme break property of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 14.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 15.0.0.  */
 
 /* Copyright (C) 2000-2022 Free Software Foundation, Inc.
 
@@ -8,7 +8,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
@@ -35,7 +35,7 @@ struct
   {
     int level1[15];
     short level2[3 << 9];
-    unsigned char level3[124 << 7];
+    unsigned char level3[127 << 7];
   }
 unigbrkprop =
 {
@@ -115,13 +115,13 @@ unigbrkprop =
     10112, 10240, 10368, 10496, 10624, 10752, 10880,    -1,
     11008, 11136,    -1, 11264, 11392, 11520, 11648,    -1,
     11776,    -1, 11904, 12032, 12160, 12288,    -1,    -1,
-    12416, 12544, 12672, 12800,    -1, 12928,    -1,    -1,
+    12416, 12544, 12672, 12800,    -1, 12928, 13056,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    13056,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    13184,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -134,8 +134,8 @@ unigbrkprop =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1, 13184, 13312,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1, 13440, 13568,
+       -1,    -1,    -1,    -1,    -1, 13312, 13440,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1, 13568, 13696,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -155,27 +155,27 @@ unigbrkprop =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 13696,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1, 13824,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1, 13824,    -1,
-       -1,    -1, 13952, 14080, 14208,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1, 13952,    -1,
+       -1,    -1, 14080, 14208, 14336,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1, 14336, 14464,    -1,    -1,
+       -1,    -1,    -1,    -1, 14464, 14592,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    14592,    -1, 13312,    -1,    -1, 14720,    -1,    -1,
+    14720, 14848, 13440,    -1,    -1, 14976,    -1,    -1,
+       -1, 15104,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1, 15232, 15360,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 14848, 14976,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1, 15488,    -1,    -1,    -1, 15616,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1, 15104,    -1,    -1,    -1, 15232,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    15360, 15488, 15616, 15744, 15488, 15488, 15488, 15488,
-    15488, 15488, 15488, 15488, 15488, 15488, 15488, 15488,
-    15488, 15488, 15488, 15488, 15488, 15488, 15488, 15488,
-    15488, 15488, 15488, 15488, 15488, 15488, 15488, 15488,
+    15744, 15872, 16000, 16128, 15872, 15872, 15872, 15872,
+    15872, 15872, 15872, 15872, 15872, 15872, 15872, 15872,
+    15872, 15872, 15872, 15872, 15872, 15872, 15872, 15872,
+    15872, 15872, 15872, 15872, 15872, 15872, 15872, 15872,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -842,7 +842,7 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_SPACINGMARK,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -961,7 +961,7 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
-    GBP_EXTEND, GBP_EXTEND, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -2701,7 +2701,7 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -2910,7 +2910,7 @@ unigbrkprop =
     GBP_EXTEND, GBP_SPACINGMARK, GBP_EXTEND, GBP_EXTEND,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_EXTEND, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3502,6 +3502,7 @@ unigbrkprop =
     GBP_EXTEND, GBP_SPACINGMARK, GBP_SPACINGMARK, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_PREPEND, GBP_SPACINGMARK,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3514,9 +3515,12 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_CONTROL, GBP_CONTROL, GBP_CONTROL, GBP_CONTROL,
-    GBP_CONTROL, GBP_CONTROL, GBP_CONTROL, GBP_CONTROL,
-    GBP_CONTROL, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_SPACINGMARK, GBP_SPACINGMARK, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_SPACINGMARK, GBP_SPACINGMARK,
+    GBP_EXTEND, GBP_SPACINGMARK, GBP_EXTEND, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3542,6 +3546,34 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_CONTROL, GBP_CONTROL, GBP_CONTROL, GBP_CONTROL,
+    GBP_CONTROL, GBP_CONTROL, GBP_CONTROL, GBP_CONTROL,
+    GBP_CONTROL, GBP_CONTROL, GBP_CONTROL, GBP_CONTROL,
+    GBP_CONTROL, GBP_CONTROL, GBP_CONTROL, GBP_CONTROL,
+    GBP_EXTEND, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3921,6 +3953,38 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_EXTEND,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3970,6 +4034,38 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
diff --git a/lib/unigbrk/u-grapheme-breaks.h b/lib/unigbrk/u-grapheme-breaks.h
index e1b600f7..9adce155 100644
--- a/lib/unigbrk/u-grapheme-breaks.h
+++ b/lib/unigbrk/u-grapheme-breaks.h
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
diff --git a/lib/unigbrk/u16-grapheme-breaks.c b/lib/unigbrk/u16-grapheme-breaks.c
index dc33c8c4..43939747 100644
--- a/lib/unigbrk/u16-grapheme-breaks.c
+++ b/lib/unigbrk/u16-grapheme-breaks.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
@@ -28,7 +28,6 @@
 /* Specification.  */
 #include "unigbrk.h"
 
-#include <stdbool.h>
 #include <string.h>
 
 #include "unictype.h"
diff --git a/lib/unigbrk/u16-grapheme-next.c b/lib/unigbrk/u16-grapheme-next.c
index 96bd6888..79ba2ee1 100644
--- a/lib/unigbrk/u16-grapheme-next.c
+++ b/lib/unigbrk/u16-grapheme-next.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
diff --git a/lib/unigbrk/u16-grapheme-prev.c b/lib/unigbrk/u16-grapheme-prev.c
index 9cd2a52a..6bff9566 100644
--- a/lib/unigbrk/u16-grapheme-prev.c
+++ b/lib/unigbrk/u16-grapheme-prev.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
diff --git a/lib/unigbrk/u32-grapheme-breaks.c b/lib/unigbrk/u32-grapheme-breaks.c
index 448810a0..92795584 100644
--- a/lib/unigbrk/u32-grapheme-breaks.c
+++ b/lib/unigbrk/u32-grapheme-breaks.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
@@ -28,7 +28,6 @@
 /* Specification.  */
 #include "unigbrk.h"
 
-#include <stdbool.h>
 #include <string.h>
 
 #include "unictype.h"
diff --git a/lib/unigbrk/u32-grapheme-next.c b/lib/unigbrk/u32-grapheme-next.c
index f770f27c..419e3d5b 100644
--- a/lib/unigbrk/u32-grapheme-next.c
+++ b/lib/unigbrk/u32-grapheme-next.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
diff --git a/lib/unigbrk/u32-grapheme-prev.c b/lib/unigbrk/u32-grapheme-prev.c
index 27ee860a..f01c6c11 100644
--- a/lib/unigbrk/u32-grapheme-prev.c
+++ b/lib/unigbrk/u32-grapheme-prev.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
diff --git a/lib/unigbrk/u8-grapheme-breaks.c b/lib/unigbrk/u8-grapheme-breaks.c
index 68d8a609..b21ba262 100644
--- a/lib/unigbrk/u8-grapheme-breaks.c
+++ b/lib/unigbrk/u8-grapheme-breaks.c
@@ -7,7 +7,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
@@ -29,7 +29,6 @@
 /* Specification.  */
 #include "unigbrk.h"
 
-#include <stdbool.h>
 #include <string.h>
 
 #include "unictype.h"
diff --git a/lib/unigbrk/u8-grapheme-next.c b/lib/unigbrk/u8-grapheme-next.c
index 3bb5824b..44df62ee 100644
--- a/lib/unigbrk/u8-grapheme-next.c
+++ b/lib/unigbrk/u8-grapheme-next.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
diff --git a/lib/unigbrk/u8-grapheme-prev.c b/lib/unigbrk/u8-grapheme-prev.c
index e9238d4f..f61d01f9 100644
--- a/lib/unigbrk/u8-grapheme-prev.c
+++ b/lib/unigbrk/u8-grapheme-prev.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
diff --git a/lib/unigbrk/uc-gbrk-prop.c b/lib/unigbrk/uc-gbrk-prop.c
index f29d47f0..fb618fa1 100644
--- a/lib/unigbrk/uc-gbrk-prop.c
+++ b/lib/unigbrk/uc-gbrk-prop.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
diff --git a/lib/unigbrk/uc-grapheme-breaks.c b/lib/unigbrk/uc-grapheme-breaks.c
index 5f6583e2..73130a59 100644
--- a/lib/unigbrk/uc-grapheme-breaks.c
+++ b/lib/unigbrk/uc-grapheme-breaks.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
@@ -28,7 +28,6 @@
 /* Specification.  */
 #include "unigbrk.h"
 
-#include <stdbool.h>
 #include <string.h>
 
 #include "unictype.h"
diff --git a/lib/unigbrk/uc-is-grapheme-break.c b/lib/unigbrk/uc-is-grapheme-break.c
index 1367300c..2cf82f16 100644
--- a/lib/unigbrk/uc-is-grapheme-break.c
+++ b/lib/unigbrk/uc-is-grapheme-break.c
@@ -6,7 +6,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)
diff --git a/lib/unigbrk/ulc-grapheme-breaks.c b/lib/unigbrk/ulc-grapheme-breaks.c
index d063bb4a..97e4c9e8 100644
--- a/lib/unigbrk/ulc-grapheme-breaks.c
+++ b/lib/unigbrk/ulc-grapheme-breaks.c
@@ -7,7 +7,7 @@
    It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
    You can redistribute it and/or modify it under either
      - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation; either version 3, or (at your
+       by the Free Software Foundation, either version 3, or (at your
        option) any later version, or
      - the terms of the GNU General Public License as published by the
        Free Software Foundation; either version 2, or (at your option)