1 files changed, 53 insertions, 24 deletions
diff --git a/tests/uniwidth/test-uc_width2.sh b/tests/uniwidth/test-uc_width2.sh
index b6d05f14f3..585291b210 100755
--- a/tests/uniwidth/test-uc_width2.sh
+++ b/tests/uniwidth/test-uc_width2.sh
@@ -133,8 +133,8 @@ cat > uc_width.ok <<\EOF
 0B41..0B44	0
 0B45..0B4C	A
 0B4D		0
-0B4E..0B55	A
-0B56		0
+0B4E..0B54	A
+0B55..0B56	0
 0B57..0B61	A
 0B62..0B63	0
 0B64..0B81	A
@@ -175,7 +175,9 @@ cat > uc_width.ok <<\EOF
 0D4D		0
 0D4E..0D61	A
 0D62..0D63	0
-0D64..0DC9	A
+0D64..0D80	A
+0D81		0
+0D82..0DC9	A
 0DCA		0
 0DCB..0DD1	A
 0DD2..0DD4	0
@@ -291,8 +293,8 @@ cat > uc_width.ok <<\EOF
 1A7D..1A7E	A
 1A7F		0
 1A80..1AAF	A
-1AB0..1ABE	0
-1ABF..1AFF	A
+1AB0..1AC0	0
+1AC1..1AFF	A
 1B00..1B03	0
 1B04..1B33	A
 1B34		0
@@ -454,7 +456,9 @@ A807..A80A	A
 A80B		0
 A80C..A824	A
 A825..A826	0
-A827..A8C3	A
+A827..A82B	A
+A82C		0
+A82D..A8C3	A
 A8C4..A8C5	0
 A8C6..A8DF	A
 A8E0..A8F1	0
@@ -550,7 +554,9 @@ FFFC..101FC	1
 10AE5..10AE6	0
 10AE7..10D23	1
 10D24..10D27	0
-10D28..10F45	1
+10D28..10EAA	1
+10EAB..10EAC	0
+10EAD..10F45	1
 10F46..10F50	0
 10F51..11000	1
 11001		0
@@ -580,7 +586,9 @@ FFFC..101FC	1
 111B6..111BE	0
 111BF..111C8	1
 111C9..111CC	0
-111CD..1122E	1
+111CD..111CE	1
+111CF		0
+111D0..1122E	1
 1122F..11231	0
 11232..11233	1
 11234		0
@@ -650,7 +658,13 @@ FFFC..101FC	1
 1182F..11837	0
 11838		1
 11839..1183A	0
-1183B..119D3	1
+1183B..1193A	1
+1193B..1193C	0
+1193D		1
+1193E		0
+1193F..11942	1
+11943		0
+11944..119D3	1
 119D4..119D7	0
 119D8..119D9	1
 119DA..119DB	0
@@ -716,11 +730,16 @@ FFFC..101FC	1
 16F8F..16F92	0
 16F93..16FDF	1
 16FE0..16FE3	2
-16FE4..16FFF	1
+16FE4		0
+16FE5..16FEF	1
+16FF0..16FF1	2
+16FF2..16FFF	1
 17000..187F7	2
 187F8..187FF	1
-18800..18AF2	2
-18AF3..1AFFF	1
+18800..18CD5	2
+18CD6..18CFF	1
+18D00..18D08	2
+18D09..1AFFF	1
 1B000..1B11F	2
 1B120..1B14F	1
 1B150..1B152	2
@@ -823,24 +842,34 @@ FFFC..101FC	1
 1F6CD..1F6CF	1
 1F6D0..1F6D2	2
 1F6D3..1F6D4	1
-1F6D5		2
-1F6D6..1F6EA	1
+1F6D5..1F6D7	2
+1F6D8..1F6EA	1
 1F6EB..1F6EC	2
 1F6ED..1F6F3	1
-1F6F4..1F6FA	2
-1F6FB..1F7DF	1
+1F6F4..1F6FC	2
+1F6FD..1F7DF	1
 1F7E0..1F7EB	2
-1F7EC..1F90C	1
-1F90D..1F9FF	2
+1F7EC..1F90B	1
+1F90C..1F93A	2
+1F93B		1
+1F93C..1F945	2
+1F946		1
+1F947..1F9FF	2
 1FA00..1FA6F	1
-1FA70..1FA73	2
-1FA74..1FA77	1
+1FA70..1FA74	2
+1FA75..1FA77	1
 1FA78..1FA7A	2
 1FA7B..1FA7F	1
-1FA80..1FA82	2
-1FA83..1FA8F	1
-1FA90..1FA95	2
-1FA96..1FFFF	1
+1FA80..1FA86	2
+1FA87..1FA8F	1
+1FA90..1FAA8	2
+1FAA9..1FAAF	1
+1FAB0..1FAB6	2
+1FAB7..1FABF	1
+1FAC0..1FAC2	2
+1FAC3..1FACF	1
+1FAD0..1FAD6	2
+1FAD7..1FFFF	1
 20000..3FFFF	2
 40000..E0000	1
 E0001		0