Merge branch 'feature/upstream' into develop

9 files changed, 40 insertions, 18 deletions

diff --git a/tests/uniwidth/test-u16-strwidth.c b/tests/uniwidth/test-u16-strwidth.c
index ecf7f178..a3c55f3b 100644
--- a/tests/uniwidth/test-u16-strwidth.c
+++ b/tests/uniwidth/test-u16-strwidth.c
@@ -54,5 +54,5 @@ main ()
     ASSERT (u16_strwidth (input, "GB2312") == 6);
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/uniwidth/test-u16-width.c b/tests/uniwidth/test-u16-width.c
index 8b25ccf8..609aa9a6 100644
--- a/tests/uniwidth/test-u16-width.c
+++ b/tests/uniwidth/test-u16-width.c
@@ -60,5 +60,5 @@ main ()
     ASSERT (u16_width (input + INPUT4_OFFSET, INPUT4_LENGTH, "GB2312") == 6);
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/uniwidth/test-u32-strwidth.c b/tests/uniwidth/test-u32-strwidth.c
index e3f2d027..8101b026 100644
--- a/tests/uniwidth/test-u32-strwidth.c
+++ b/tests/uniwidth/test-u32-strwidth.c
@@ -54,5 +54,5 @@ main ()
     ASSERT (u32_strwidth (input, "GB2312") == 6);
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/uniwidth/test-u32-width.c b/tests/uniwidth/test-u32-width.c
index caa35ca9..a09d0873 100644
--- a/tests/uniwidth/test-u32-width.c
+++ b/tests/uniwidth/test-u32-width.c
@@ -60,5 +60,5 @@ main ()
     ASSERT (u32_width (input + INPUT4_OFFSET, INPUT4_LENGTH, "GB2312") == 6);
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/uniwidth/test-u8-strwidth.c b/tests/uniwidth/test-u8-strwidth.c
index 8f54953f..1652516f 100644
--- a/tests/uniwidth/test-u8-strwidth.c
+++ b/tests/uniwidth/test-u8-strwidth.c
@@ -49,5 +49,5 @@ main ()
     ASSERT (u8_strwidth (input, "GB2312") == 6);
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/uniwidth/test-u8-width.c b/tests/uniwidth/test-u8-width.c
index 75ce8e82..cb783b79 100644
--- a/tests/uniwidth/test-u8-width.c
+++ b/tests/uniwidth/test-u8-width.c
@@ -58,5 +58,5 @@ main ()
     ASSERT (u8_width (input + INPUT4_OFFSET, INPUT4_LENGTH, "GB2312") == 6);
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/uniwidth/test-uc_width.c b/tests/uniwidth/test-uc_width.c
index 5f0e793f..23269d3e 100644
--- a/tests/uniwidth/test-uc_width.c
+++ b/tests/uniwidth/test-uc_width.c
@@ -52,5 +52,5 @@ main ()
   ASSERT (uc_width (0x20369, "UTF-8") == 2);
   ASSERT (uc_width (0x2F876, "UTF-8") == 2);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/uniwidth/test-uc_width2.c b/tests/uniwidth/test-uc_width2.c
index a07a11f8..26b1809a 100644
--- a/tests/uniwidth/test-uc_width2.c
+++ b/tests/uniwidth/test-uc_width2.c
@@ -82,5 +82,5 @@ main ()
     }
   finish_interval ();
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/uniwidth/test-uc_width2.sh b/tests/uniwidth/test-uc_width2.sh
index c46b3d07..3fa45d39 100755
--- a/tests/uniwidth/test-uc_width2.sh
+++ b/tests/uniwidth/test-uc_width2.sh
@@ -63,8 +63,8 @@ cat > uc_width.ok <<\EOF
 0829..082D	0
 082E..0858	A
 0859..085B	0
-085C..0897	A
-0898..089F	0
+085C..0896	A
+0897..089F	0
 08A0..08C9	A
 08CA..08E1	0
 08E2		A
@@ -554,10 +554,12 @@ FFFC..101FC	1
 10AE5..10AE6	0
 10AE7..10D23	1
 10D24..10D27	0
-10D28..10EAA	1
+10D28..10D68	1
+10D69..10D6D	0
+10D6E..10EAA	1
 10EAB..10EAC	0
-10EAD..10EFC	1
-10EFD..10EFF	0
+10EAD..10EFB	1
+10EFC..10EFF	0
 10F00..10F45	1
 10F46..10F50	0
 10F51..10F81	1
@@ -618,7 +620,17 @@ FFFC..101FC	1
 11366..1136C	0
 1136D..1136F	1
 11370..11374	0
-11375..11437	1
+11375..113BA	1
+113BB..113C0	0
+113C1..113CD	1
+113CE		0
+113CF		1
+113D0		0
+113D1		1
+113D2		0
+113D3..113E0	1
+113E1..113E2	0
+113E3..11437	1
 11438..1143F	0
 11440..11441	1
 11442..11444	0
@@ -657,7 +669,9 @@ FFFC..101FC	1
 116B6		1
 116B7		0
 116B8..1171C	1
-1171D..1171F	0
+1171D		0
+1171E		1
+1171F		0
 11720..11721	1
 11722..11725	0
 11726		1
@@ -734,11 +748,17 @@ FFFC..101FC	1
 11F40		0
 11F41		1
 11F42		0
-11F43..1342F	1
+11F43..11F59	1
+11F5A		0
+11F5B..1342F	1
 13430..13440	0
 13441..13446	1
 13447..13455	0
-13456..16AEF	1
+13456..1611D	1
+1611E..16129	0
+1612A..1612C	1
+1612D..1612F	0
+16130..16AEF	1
 16AF0..16AF4	0
 16AF5..16B2F	1
 16B30..16B36	0
@@ -821,7 +841,9 @@ FFFC..101FC	1
 1E2EC..1E2EF	0
 1E2F0..1E4EB	1
 1E4EC..1E4EF	0
-1E4F0..1E8CF	1
+1E4F0..1E5ED	1
+1E5EE..1E5EF	0
+1E5F0..1E8CF	1
 1E8D0..1E8D6	0
 1E8D7..1E943	1
 1E944..1E94A	0