trap 'rm -fr $tmpfiles' 1 2 3 15
tmpfiles="$tmpfiles uc_width.out"
-./test-uc_width2${EXEEXT} > uc_width.out
+./test-uc_width2${EXEEXT} | LC_ALL=C tr -d '\r' > uc_width.out
tmpfiles="$tmpfiles uc_width.ok"
cat > uc_width.ok <<\EOF
00AE..02FF A
0300..036F 0
0370..0482 A
-0483..0486 0
-0487 A
-0488..0489 0
+0483..0489 0
048A..0590 A
0591..05BD 0
05BE A
05C8..05FF A
0600..0603 0
0604..060F A
-0610..0615 0
-0616..064A A
+0610..061A 0
+061B..064A A
064B..065E 0
065F..066F A
0670 0
07A6..07B0 0
07B1..07EA A
07EB..07F3 0
-07F4..0900 A
-0901..0902 0
+07F4..0815 A
+0816..0819 0
+081A A
+081B..0823 0
+0824 A
+0825..0827 0
+0828 A
+0829..082D 0
+082E..08FF A
+0900..0902 0
0903..093B A
093C 0
093D..0940 A
0949..094C A
094D 0
094E..0950 A
-0951..0954 0
-0955..0961 A
+0951..0955 0
+0956..0961 A
0962..0963 0
0964..0980 A
0981 0
0A47..0A48 0
0A49..0A4A A
0A4B..0A4D 0
-0A4E..0A6F A
+0A4E..0A50 A
+0A51 0
+0A52..0A6F A
0A70..0A71 0
-0A72..0A80 A
+0A72..0A74 A
+0A75 0
+0A76..0A80 A
0A81..0A82 0
0A83..0ABB A
0ABC 0
0B3D..0B3E A
0B3F 0
0B40 A
-0B41..0B43 0
-0B44..0B4C A
+0B41..0B44 0
+0B45..0B4C A
0B4D 0
0B4E..0B55 A
0B56 0
-0B57..0B81 A
+0B57..0B61 A
+0B62..0B63 0
+0B64..0B81 A
0B82 0
0B83..0BBF A
0BC0 0
0C4A..0C4D 0
0C4E..0C54 A
0C55..0C56 0
-0C57..0CBB A
+0C57..0C61 A
+0C62..0C63 0
+0C64..0CBB A
0CBC 0
0CBD..0CCB A
0CCC..0CCD 0
0CCE..0CE1 A
0CE2..0CE3 0
0CE4..0D40 A
-0D41..0D43 0
-0D44..0D4C A
+0D41..0D44 0
+0D45..0D4C A
0D4D 0
-0D4E..0DC9 A
+0D4E..0D61 A
+0D62..0D63 0
+0D64..0DC9 A
0DCA 0
0DCB..0DD1 A
0DD2..0DD4 0
0FC7..102C A
102D..1030 0
1031 A
-1032 0
-1033..1035 A
-1036..1037 0
+1032..1037 0
1038 A
-1039 0
-103A..1057 A
+1039..103A 0
+103B..103C A
+103D..103E 0
+103F..1057 A
1058..1059 0
-105A..10FF A
+105A..105D A
+105E..1060 0
+1061..1070 A
+1071..1074 0
+1075..1081 A
+1082 0
+1083..1084 A
+1085..1086 0
+1087..108C A
+108D 0
+108E..109C A
+109D 0
+109E..10FF A
1100..115F 2
1160..135E A
135F 0
18AA..191F A
1920..1922 0
1923..1926 A
-1927..192B 0
-192C..1931 A
+1927..1928 0
+1929..1931 A
1932 0
1933..1938 A
1939..193B 0
193C..1A16 A
1A17..1A18 0
-1A19..1AFF A
+1A19..1A55 A
+1A56 0
+1A57 A
+1A58..1A5E 0
+1A5F A
+1A60 0
+1A61 A
+1A62 0
+1A63..1A64 A
+1A65..1A6C 0
+1A6D..1A72 A
+1A73..1A7C 0
+1A7D..1A7E A
+1A7F 0
+1A80..1AFF A
1B00..1B03 0
1B04..1B33 A
1B34 0
1B42 0
1B43..1B6A A
1B6B..1B73 0
-1B74..1DBF A
-1DC0..1DCA 0
-1DCB..1DFD A
-1DFE..1DFF 0
+1B74..1B7F A
+1B80..1B81 0
+1B82..1BA1 A
+1BA2..1BA5 0
+1BA6..1BA7 A
+1BA8..1BA9 0
+1BAA..1C2B A
+1C2C..1C33 0
+1C34..1C35 A
+1C36..1C37 0
+1C38..1CCF A
+1CD0..1CD2 0
+1CD3 A
+1CD4..1CE0 0
+1CE1 A
+1CE2..1CE8 0
+1CE9..1CEC A
+1CED 0
+1CEE..1DBF A
+1DC0..1DE6 0
+1DE7..1DFC A
+1DFD..1DFF 0
1E00..200A A
200B..200F 0
2010..2029 A
202A..202E 0
202F..205F A
-2060..2063 0
-2064..2069 A
+2060..2064 0
+2065..2069 A
206A..206F 0
2070..20A8 A
20A9 1
20AA..20CF A
-20D0..20EF 0
-20F0..2328 A
+20D0..20F0 0
+20F1..2328 A
2329..232A 2
-232B..2E7F A
+232B..2CEE A
+2CEF..2CF1 0
+2CF2..2DDF A
+2DE0..2DFF 0
+2E00..2E7F A
2E80..3029 2
302A..302F 0
3030..303E 2
309B..4DBF 2
4DC0..4DFF A
4E00..A4CF 2
-A4D0..A801 A
+A4D0..A66E A
+A66F..A672 0
+A673..A67B A
+A67C..A67D 0
+A67E..A6EF A
+A6F0..A6F1 0
+A6F2..A801 A
A802 0
A803..A805 A
A806 0
A80B 0
A80C..A824 A
A825..A826 0
-A827..ABFF A
+A827..A8C3 A
+A8C4 0
+A8C5..A8DF A
+A8E0..A8F1 0
+A8F2..A925 A
+A926..A92D 0
+A92E..A946 A
+A947..A951 0
+A952..A97F A
+A980..A982 0
+A983..A9B2 A
+A9B3 0
+A9B4..A9B5 A
+A9B6..A9B9 0
+A9BA..A9BB A
+A9BC 0
+A9BD..AA28 A
+AA29..AA2E 0
+AA2F..AA30 A
+AA31..AA32 0
+AA33..AA34 A
+AA35..AA36 0
+AA37..AA42 A
+AA43 0
+AA44..AA4B A
+AA4C 0
+AA4D..AAAF A
+AAB0 0
+AAB1 A
+AAB2..AAB4 0
+AAB5..AAB6 A
+AAB7..AAB8 0
+AAB9..AABD A
+AABE..AABF 0
+AAC0 A
+AAC1 0
+AAC2..ABE4 A
+ABE5 0
+ABE6..ABE7 A
+ABE8 0
+ABE9..ABEC A
+ABED 0
+ABEE..ABFF A
AC00..D7A3 2
D7A4..F8FF A
F900..FAFF 2
FB1F..FDFF A
FE00..FE0F 0
FE10..FE1F 2
-FE20..FE23 0
-FE24..FE2F A
+FE20..FE26 0
+FE27..FE2F A
FE30..FE6F 2
FE70..FEFE A
FEFF 0
FFE0..FFE6 2
FFE7..FFF8 1
FFF9..FFFB 0
-FFFC..10A00 1
+FFFC..101FC 1
+101FD 0
+101FE..10A00 1
10A01..10A03 0
10A04 1
10A05..10A06 0
10A38..10A3A 0
10A3B..10A3E 1
10A3F 0
-10A40..1D166 1
+10A40..1107F 1
+11080..11081 0
+11082..110B2 1
+110B3..110B6 0
+110B7..110B8 1
+110B9..110BA 0
+110BB..110BC 1
+110BD 0
+110BE..1D166 1
1D167..1D169 0
-1D16A..1D17A 1
-1D17B..1D182 0
+1D16A..1D172 1
+1D173..1D182 0
1D183..1D184 1
1D185..1D18B 0
1D18C..1D1A9 1
1D1AE..1D241 1
1D242..1D244 0
1D245..1FFFF 1
-20000..2A6D6 2
-2A6D7..2F7FF 1
-2F800..2FA1D 2
-2FA1E..E0000 1
+20000..2FFFD 2
+2FFFE..2FFFF 1
+30000..3FFFD 2
+3FFFE..E0000 1
E0001 0
E0002..E001F 1
E0020..E007F 0