Merge branch 'feature/upstream' into develop

9 files changed, 62 insertions, 28 deletions

diff --git a/tests/uniwidth/test-u16-strwidth.c b/tests/uniwidth/test-u16-strwidth.c
index ba7f0474..dfc1d79f 100644
--- a/tests/uniwidth/test-u16-strwidth.c
+++ b/tests/uniwidth/test-u16-strwidth.c
@@ -1,5 +1,5 @@
 /* Test of u16_strwidth() function.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    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
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU 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/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
diff --git a/tests/uniwidth/test-u16-width.c b/tests/uniwidth/test-u16-width.c
index dc8162af..be121f8e 100644
--- a/tests/uniwidth/test-u16-width.c
+++ b/tests/uniwidth/test-u16-width.c
@@ -1,5 +1,5 @@
 /* Test of u16_width() function.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    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
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU 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/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
diff --git a/tests/uniwidth/test-u32-strwidth.c b/tests/uniwidth/test-u32-strwidth.c
index 83e13340..54a7e299 100644
--- a/tests/uniwidth/test-u32-strwidth.c
+++ b/tests/uniwidth/test-u32-strwidth.c
@@ -1,5 +1,5 @@
 /* Test of u32_strwidth() function.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    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
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU 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/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
diff --git a/tests/uniwidth/test-u32-width.c b/tests/uniwidth/test-u32-width.c
index 0095b6d3..d8b5409f 100644
--- a/tests/uniwidth/test-u32-width.c
+++ b/tests/uniwidth/test-u32-width.c
@@ -1,5 +1,5 @@
 /* Test of u32_width() function.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    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
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU 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/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
diff --git a/tests/uniwidth/test-u8-strwidth.c b/tests/uniwidth/test-u8-strwidth.c
index 9b184d67..e2cb23dc 100644
--- a/tests/uniwidth/test-u8-strwidth.c
+++ b/tests/uniwidth/test-u8-strwidth.c
@@ -1,5 +1,5 @@
 /* Test of u8_strwidth() function.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    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
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU 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/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
diff --git a/tests/uniwidth/test-u8-width.c b/tests/uniwidth/test-u8-width.c
index e0e37f53..cfa04791 100644
--- a/tests/uniwidth/test-u8-width.c
+++ b/tests/uniwidth/test-u8-width.c
@@ -1,5 +1,5 @@
 /* Test of u8_width() function.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    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
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU 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/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
diff --git a/tests/uniwidth/test-uc_width.c b/tests/uniwidth/test-uc_width.c
index 8c248fa2..488a0803 100644
--- a/tests/uniwidth/test-uc_width.c
+++ b/tests/uniwidth/test-uc_width.c
@@ -1,5 +1,5 @@
 /* Test of uc_width() function.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    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
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU 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/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
diff --git a/tests/uniwidth/test-uc_width2.c b/tests/uniwidth/test-uc_width2.c
index 60ef7556..67754697 100644
--- a/tests/uniwidth/test-uc_width2.c
+++ b/tests/uniwidth/test-uc_width2.c
@@ -1,5 +1,5 @@
 /* Test of uc_width() function.
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
    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
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU 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/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2008.  */
 
diff --git a/tests/uniwidth/test-uc_width2.sh b/tests/uniwidth/test-uc_width2.sh
index 1463d345..2ade5850 100755
--- a/tests/uniwidth/test-uc_width2.sh
+++ b/tests/uniwidth/test-uc_width2.sh
@@ -65,8 +65,8 @@ cat > uc_width.ok <<\EOF
 0829..082D	0
 082E..0858	A
 0859..085B	0
-085C..08E2	A
-08E3..0902	0
+085C..08D3	A
+08D4..0902	0
 0903..0939	A
 093A		0
 093B		A
@@ -251,7 +251,9 @@ cat > uc_width.ok <<\EOF
 17DD		0
 17DE..180A	A
 180B..180E	0
-180F..18A8	A
+180F..1884	A
+1885..1886	0
+1887..18A8	A
 18A9		0
 18AA..191F	A
 1920..1922	0
@@ -327,8 +329,8 @@ cat > uc_width.ok <<\EOF
 1CF8..1CF9	0
 1CFA..1DBF	A
 1DC0..1DF5	0
-1DF6..1DFB	A
-1DFC..1DFF	0
+1DF6..1DFA	A
+1DFB..1DFF	0
 1E00..200A	A
 200B..200F	0
 2010..2029	A
@@ -376,8 +378,8 @@ A80B		0
 A80C..A824	A
 A825..A826	0
 A827..A8C3	A
-A8C4		0
-A8C5..A8DF	A
+A8C4..A8C5	0
+A8C6..A8DF	A
 A8E0..A8F1	0
 A8F2..A925	A
 A926..A92D	0
@@ -493,7 +495,9 @@ FFFC..101FC	1
 11234		0
 11235		1
 11236..11237	0
-11238..112DE	1
+11238..1123D	1
+1123E		0
+1123F..112DE	1
 112DF		0
 112E0..112E2	1
 112E3..112EA	0
@@ -507,7 +511,13 @@ FFFC..101FC	1
 11366..1136C	0
 1136D..1136F	1
 11370..11374	0
-11375..114B2	1
+11375..11437	1
+11438..1143F	0
+11440..11441	1
+11442..11444	0
+11445		1
+11446		0
+11447..114B2	1
 114B3..114B8	0
 114B9		1
 114BA		0
@@ -543,7 +553,19 @@ FFFC..101FC	1
 11722..11725	0
 11726		1
 11727..1172B	0
-1172C..16AEF	1
+1172C..11C2F	1
+11C30..11C36	0
+11C37		1
+11C38..11C3D	0
+11C3E..11C91	1
+11C92..11CA7	0
+11CA8..11CA9	1
+11CAA..11CB0	0
+11CB1		1
+11CB2..11CB3	0
+11CB4		1
+11CB5..11CB6	0
+11CB7..16AEF	1
 16AF0..16AF4	0
 16AF5..16B2F	1
 16B30..16B36	0
@@ -575,9 +597,21 @@ FFFC..101FC	1
 1DA9B..1DA9F	0
 1DAA0		1
 1DAA1..1DAAF	0
-1DAB0..1E8CF	1
+1DAB0..1DFFF	1
+1E000..1E006	0
+1E007		1
+1E008..1E018	0
+1E019..1E01A	1
+1E01B..1E021	0
+1E022		1
+1E023..1E024	0
+1E025		1
+1E026..1E02A	0
+1E02B..1E8CF	1
 1E8D0..1E8D6	0
-1E8D7..1FFFF	1
+1E8D7..1E943	1
+1E944..1E94A	0
+1E94B..1FFFF	1
 20000..3FFFF	2
 40000..E0000	1
 E0001		0