Merge branch 'feature/upstream' into develop

16 files changed, 47 insertions, 23 deletions

diff --git a/tests/unigbrk/GraphemeBreakTest.txt b/tests/unigbrk/GraphemeBreakTest.txt
index eff2fd3..3c73f97 100644
--- a/tests/unigbrk/GraphemeBreakTest.txt
+++ b/tests/unigbrk/GraphemeBreakTest.txt
@@ -1,11 +1,11 @@
-# GraphemeBreakTest-14.0.0.txt
-# Date: 2021-03-08, 06:22:32 GMT
-# © 2021 Unicode®, Inc.
+# GraphemeBreakTest-15.0.0.txt
+# Date: 2022-02-26, 00:38:37 GMT
+# © 2022 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
+# For terms of use, see https://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
-#   For documentation, see http://www.unicode.org/reports/tr44/
+#   For documentation, see https://www.unicode.org/reports/tr44/
 #
 # Default Grapheme_Cluster_Break Test
 #
diff --git a/tests/unigbrk/test-u16-grapheme-breaks.c b/tests/unigbrk/test-u16-grapheme-breaks.c
index f315054..a1cb80d 100644
--- a/tests/unigbrk/test-u16-grapheme-breaks.c
+++ b/tests/unigbrk/test-u16-grapheme-breaks.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-u16-grapheme-next.c b/tests/unigbrk/test-u16-grapheme-next.c
index e30597f..bb7aba6 100644
--- a/tests/unigbrk/test-u16-grapheme-next.c
+++ b/tests/unigbrk/test-u16-grapheme-next.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-u16-grapheme-prev.c b/tests/unigbrk/test-u16-grapheme-prev.c
index c475dee..986b5dd 100644
--- a/tests/unigbrk/test-u16-grapheme-prev.c
+++ b/tests/unigbrk/test-u16-grapheme-prev.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-u32-grapheme-breaks.c b/tests/unigbrk/test-u32-grapheme-breaks.c
index 252df62..7af266e 100644
--- a/tests/unigbrk/test-u32-grapheme-breaks.c
+++ b/tests/unigbrk/test-u32-grapheme-breaks.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-u32-grapheme-next.c b/tests/unigbrk/test-u32-grapheme-next.c
index 85a17df..1762378 100644
--- a/tests/unigbrk/test-u32-grapheme-next.c
+++ b/tests/unigbrk/test-u32-grapheme-next.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-u32-grapheme-prev.c b/tests/unigbrk/test-u32-grapheme-prev.c
index beeeef7..d3838f5 100644
--- a/tests/unigbrk/test-u32-grapheme-prev.c
+++ b/tests/unigbrk/test-u32-grapheme-prev.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-u8-grapheme-breaks.c b/tests/unigbrk/test-u8-grapheme-breaks.c
index d6f3d55..fdc0d50 100644
--- a/tests/unigbrk/test-u8-grapheme-breaks.c
+++ b/tests/unigbrk/test-u8-grapheme-breaks.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-u8-grapheme-next.c b/tests/unigbrk/test-u8-grapheme-next.c
index a58ecf0..5c61d84 100644
--- a/tests/unigbrk/test-u8-grapheme-next.c
+++ b/tests/unigbrk/test-u8-grapheme-next.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-u8-grapheme-prev.c b/tests/unigbrk/test-u8-grapheme-prev.c
index 668e04b..a59e264 100644
--- a/tests/unigbrk/test-u8-grapheme-prev.c
+++ b/tests/unigbrk/test-u8-grapheme-prev.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-uc-gbrk-prop.c b/tests/unigbrk/test-uc-gbrk-prop.c
index 1e7d2df..605d83d 100644
--- a/tests/unigbrk/test-uc-gbrk-prop.c
+++ b/tests/unigbrk/test-uc-gbrk-prop.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-uc-gbrk-prop.h b/tests/unigbrk/test-uc-gbrk-prop.h
index 752db2f..d975a1e 100644
--- a/tests/unigbrk/test-uc-gbrk-prop.h
+++ b/tests/unigbrk/test-uc-gbrk-prop.h
@@ -4,7 +4,7 @@
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 3 of the License,
+   by the Free Software Foundation, either version 3 of the License,
    or (at your option) any later version.
 
    This file is distributed in the hope that it will be useful,
@@ -228,6 +228,8 @@
 { 0x0CD7, GBP_EXTEND },
 { 0x0CE2, GBP_OTHER },
 { 0x0CE4, GBP_EXTEND },
+{ 0x0CF3, GBP_OTHER },
+{ 0x0CF4, GBP_SPACINGMARK },
 { 0x0D00, GBP_OTHER },
 { 0x0D02, GBP_EXTEND },
 { 0x0D04, GBP_SPACINGMARK },
@@ -276,7 +278,7 @@
 { 0x0EB4, GBP_SPACINGMARK },
 { 0x0EBD, GBP_EXTEND },
 { 0x0EC8, GBP_OTHER },
-{ 0x0ECE, GBP_EXTEND },
+{ 0x0ECF, GBP_EXTEND },
 { 0x0F18, GBP_OTHER },
 { 0x0F1A, GBP_EXTEND },
 { 0x0F35, GBP_OTHER },
@@ -1384,6 +1386,8 @@
 { 0x10D28, GBP_EXTEND },
 { 0x10EAB, GBP_OTHER },
 { 0x10EAD, GBP_EXTEND },
+{ 0x10EFD, GBP_OTHER },
+{ 0x10F00, GBP_EXTEND },
 { 0x10F46, GBP_OTHER },
 { 0x10F51, GBP_EXTEND },
 { 0x10F82, GBP_OTHER },
@@ -1445,6 +1449,8 @@
 { 0x11238, GBP_EXTEND },
 { 0x1123E, GBP_OTHER },
 { 0x1123F, GBP_EXTEND },
+{ 0x11241, GBP_OTHER },
+{ 0x11242, GBP_EXTEND },
 { 0x112DF, GBP_OTHER },
 { 0x112E0, GBP_EXTEND },
 { 0x112E3, GBP_SPACINGMARK },
@@ -1608,8 +1614,23 @@
 { 0x11EF3, GBP_OTHER },
 { 0x11EF5, GBP_EXTEND },
 { 0x11EF7, GBP_SPACINGMARK },
+{ 0x11F00, GBP_OTHER },
+{ 0x11F02, GBP_EXTEND },
+{ 0x11F03, GBP_PREPEND },
+{ 0x11F04, GBP_SPACINGMARK },
+{ 0x11F34, GBP_OTHER },
+{ 0x11F36, GBP_SPACINGMARK },
+{ 0x11F3B, GBP_EXTEND },
+{ 0x11F3E, GBP_OTHER },
+{ 0x11F40, GBP_SPACINGMARK },
+{ 0x11F41, GBP_EXTEND },
+{ 0x11F42, GBP_SPACINGMARK },
+{ 0x11F43, GBP_EXTEND },
 { 0x13430, GBP_OTHER },
-{ 0x13439, GBP_CONTROL },
+{ 0x13440, GBP_CONTROL },
+{ 0x13441, GBP_EXTEND },
+{ 0x13447, GBP_OTHER },
+{ 0x13456, GBP_EXTEND },
 { 0x16AF0, GBP_OTHER },
 { 0x16AF5, GBP_EXTEND },
 { 0x16B30, GBP_OTHER },
@@ -1669,12 +1690,16 @@
 { 0x1E025, GBP_EXTEND },
 { 0x1E026, GBP_OTHER },
 { 0x1E02B, GBP_EXTEND },
+{ 0x1E08F, GBP_OTHER },
+{ 0x1E090, GBP_EXTEND },
 { 0x1E130, GBP_OTHER },
 { 0x1E137, GBP_EXTEND },
 { 0x1E2AE, GBP_OTHER },
 { 0x1E2AF, GBP_EXTEND },
 { 0x1E2EC, GBP_OTHER },
 { 0x1E2F0, GBP_EXTEND },
+{ 0x1E4EC, GBP_OTHER },
+{ 0x1E4F0, GBP_EXTEND },
 { 0x1E8D0, GBP_OTHER },
 { 0x1E8D7, GBP_EXTEND },
 { 0x1E944, GBP_OTHER },
diff --git a/tests/unigbrk/test-uc-grapheme-breaks.c b/tests/unigbrk/test-uc-grapheme-breaks.c
index dad6bf3..1e3b1ee 100644
--- a/tests/unigbrk/test-uc-grapheme-breaks.c
+++ b/tests/unigbrk/test-uc-grapheme-breaks.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-uc-is-grapheme-break.c b/tests/unigbrk/test-uc-is-grapheme-break.c
index 70bd519..433ba68 100644
--- a/tests/unigbrk/test-uc-is-grapheme-break.c
+++ b/tests/unigbrk/test-uc-is-grapheme-break.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
+   by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -21,7 +21,6 @@
 /* Specification. */
 #include <unigbrk.h>
 
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/unigbrk/test-ulc-grapheme-breaks.c b/tests/unigbrk/test-ulc-grapheme-breaks.c
index dae6875..8ef608f 100644
--- a/tests/unigbrk/test-ulc-grapheme-breaks.c
+++ b/tests/unigbrk/test-ulc-grapheme-breaks.c
@@ -3,7 +3,7 @@
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/tests/unigbrk/test-ulc-grapheme-breaks.sh b/tests/unigbrk/test-ulc-grapheme-breaks.sh
index 0cad760..119228e 100755
--- a/tests/unigbrk/test-ulc-grapheme-breaks.sh
+++ b/tests/unigbrk/test-ulc-grapheme-breaks.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Test in an ISO-8895-6 locale.
-: ${LOCALE_AR=ar_SA}
+: "${LOCALE_AR=ar_SA}"
 if test $LOCALE_AR = none; then
   if test -f /usr/bin/localedef; then
     echo "Skipping test: no traditional Arabic locale is installed"