Merge branch 'feature/upstream' into develop

9 files changed, 36 insertions, 18 deletions

diff --git a/tests/uniwidth/test-u16-strwidth.c b/tests/uniwidth/test-u16-strwidth.c
index 8fcb132..a41d47c 100644
--- a/tests/uniwidth/test-u16-strwidth.c
+++ b/tests/uniwidth/test-u16-strwidth.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/uniwidth/test-u16-width.c b/tests/uniwidth/test-u16-width.c
index 1ab82ca..c8dc1ad 100644
--- a/tests/uniwidth/test-u16-width.c
+++ b/tests/uniwidth/test-u16-width.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/uniwidth/test-u32-strwidth.c b/tests/uniwidth/test-u32-strwidth.c
index 7bbf9f2..6e627a4 100644
--- a/tests/uniwidth/test-u32-strwidth.c
+++ b/tests/uniwidth/test-u32-strwidth.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/uniwidth/test-u32-width.c b/tests/uniwidth/test-u32-width.c
index b823829..4c92c85 100644
--- a/tests/uniwidth/test-u32-width.c
+++ b/tests/uniwidth/test-u32-width.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/uniwidth/test-u8-strwidth.c b/tests/uniwidth/test-u8-strwidth.c
index cc3e7ea..90fa436 100644
--- a/tests/uniwidth/test-u8-strwidth.c
+++ b/tests/uniwidth/test-u8-strwidth.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/uniwidth/test-u8-width.c b/tests/uniwidth/test-u8-width.c
index 0570b99..eb56bc0 100644
--- a/tests/uniwidth/test-u8-width.c
+++ b/tests/uniwidth/test-u8-width.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/uniwidth/test-uc_width.c b/tests/uniwidth/test-uc_width.c
index 4983ada..86389b2 100644
--- a/tests/uniwidth/test-uc_width.c
+++ b/tests/uniwidth/test-uc_width.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/uniwidth/test-uc_width2.c b/tests/uniwidth/test-uc_width2.c
index af744b1..d088cf3 100644
--- a/tests/uniwidth/test-uc_width2.c
+++ b/tests/uniwidth/test-uc_width2.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/uniwidth/test-uc_width2.sh b/tests/uniwidth/test-uc_width2.sh
index c426344..2833aef 100755
--- a/tests/uniwidth/test-uc_width2.sh
+++ b/tests/uniwidth/test-uc_width2.sh
@@ -200,8 +200,8 @@ cat > uc_width.ok <<\EOF
 0EB2..0EB3	A
 0EB4..0EBC	0
 0EBD..0EC7	A
-0EC8..0ECD	0
-0ECE..0F17	A
+0EC8..0ECE	0
+0ECF..0F17	A
 0F18..0F19	0
 0F1A..0F34	A
 0F35		0
@@ -560,7 +560,9 @@ FFFC..101FC	1
 10D24..10D27	0
 10D28..10EAA	1
 10EAB..10EAC	0
-10EAD..10F45	1
+10EAD..10EFC	1
+10EFD..10EFF	0
+10F00..10F45	1
 10F46..10F50	0
 10F51..10F81	1
 10F82..10F85	0
@@ -608,7 +610,9 @@ FFFC..101FC	1
 11236..11237	0
 11238..1123D	1
 1123E		0
-1123F..112DE	1
+1123F..11240	1
+11241		0
+11242..112DE	1
 112DF		0
 112E0..112E2	1
 112E3..112EA	0
@@ -730,9 +734,19 @@ FFFC..101FC	1
 11D97		0
 11D98..11EF2	1
 11EF3..11EF4	0
-11EF5..1342F	1
-13430..13438	0
-13439..16AEF	1
+11EF5..11EFF	1
+11F00..11F01	0
+11F02..11F35	1
+11F36..11F3A	0
+11F3B..11F3F	1
+11F40		0
+11F41		1
+11F42		0
+11F43..1342F	1
+13430..13440	0
+13441..13446	1
+13447..13455	0
+13456..16AEF	1
 16AF0..16AF4	0
 16AF5..16B2F	1
 16B30..16B36	0
@@ -805,13 +819,17 @@ FFFC..101FC	1
 1E023..1E024	0
 1E025		1
 1E026..1E02A	0
-1E02B..1E12F	1
+1E02B..1E08E	1
+1E08F		0
+1E090..1E12F	1
 1E130..1E136	0
 1E137..1E2AD	1
 1E2AE		0
 1E2AF..1E2EB	1
 1E2EC..1E2EF	0
-1E2F0..1E8CF	1
+1E2F0..1E4EB	1
+1E4EC..1E4EF	0
+1E4F0..1E8CF	1
 1E8D0..1E8D6	0
 1E8D7..1E943	1
 1E944..1E94A	0
@@ -912,7 +930,7 @@ E0100..E01EF	0
 E01F0..10FFFF	1
 EOF
 
-: ${DIFF=diff}
+: "${DIFF=diff}"
 ${DIFF} uc_width.ok uc_width.out
 result=$?