From be8efac78d067c138ad8dda03df4336e73f94887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Jan 2022 11:51:07 +0100 Subject: New upstream version 1.0 --- tests/uniwidth/test-u16-strwidth.c | 2 +- tests/uniwidth/test-u16-width.c | 2 +- tests/uniwidth/test-u32-strwidth.c | 2 +- tests/uniwidth/test-u32-width.c | 2 +- tests/uniwidth/test-u8-strwidth.c | 2 +- tests/uniwidth/test-u8-width.c | 2 +- tests/uniwidth/test-uc_width.c | 2 +- tests/uniwidth/test-uc_width2.c | 2 +- tests/uniwidth/test-uc_width2.sh | 392 ++++++++++++++++++++++++++++++++----- 9 files changed, 349 insertions(+), 59 deletions(-) (limited to 'tests/uniwidth') diff --git a/tests/uniwidth/test-u16-strwidth.c b/tests/uniwidth/test-u16-strwidth.c index 1980fc30..8fcb1327 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-2018 Free Software Foundation, Inc. + Copyright (C) 2007-2022 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 diff --git a/tests/uniwidth/test-u16-width.c b/tests/uniwidth/test-u16-width.c index 63d83177..1ab82ca3 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-2018 Free Software Foundation, Inc. + Copyright (C) 2007-2022 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 diff --git a/tests/uniwidth/test-u32-strwidth.c b/tests/uniwidth/test-u32-strwidth.c index bf94d913..7bbf9f2c 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-2018 Free Software Foundation, Inc. + Copyright (C) 2007-2022 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 diff --git a/tests/uniwidth/test-u32-width.c b/tests/uniwidth/test-u32-width.c index 3693f6d4..b823829e 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-2018 Free Software Foundation, Inc. + Copyright (C) 2007-2022 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 diff --git a/tests/uniwidth/test-u8-strwidth.c b/tests/uniwidth/test-u8-strwidth.c index b9aacdec..cc3e7ea3 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-2018 Free Software Foundation, Inc. + Copyright (C) 2007-2022 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 diff --git a/tests/uniwidth/test-u8-width.c b/tests/uniwidth/test-u8-width.c index 424e576a..0570b995 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-2018 Free Software Foundation, Inc. + Copyright (C) 2007-2022 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 diff --git a/tests/uniwidth/test-uc_width.c b/tests/uniwidth/test-uc_width.c index bd3a32e5..4983ada2 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-2018 Free Software Foundation, Inc. + Copyright (C) 2007-2022 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 diff --git a/tests/uniwidth/test-uc_width2.c b/tests/uniwidth/test-uc_width2.c index 5ba7caa3..af744b1c 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-2018 Free Software Foundation, Inc. + Copyright (C) 2007-2022 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 diff --git a/tests/uniwidth/test-uc_width2.sh b/tests/uniwidth/test-uc_width2.sh index 2ade5850..c4263447 100755 --- a/tests/uniwidth/test-uc_width2.sh +++ b/tests/uniwidth/test-uc_width2.sh @@ -4,7 +4,7 @@ tmpfiles="" trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles uc_width.out" -./test-uc_width2${EXEEXT} | LC_ALL=C tr -d '\r' > uc_width.out +${CHECKER} ./test-uc_width2${EXEEXT} | LC_ALL=C tr -d '\r' > uc_width.out tmpfiles="$tmpfiles uc_width.ok" cat > uc_width.ok <<\EOF @@ -55,7 +55,9 @@ cat > uc_width.ok <<\EOF 07A6..07B0 0 07B1..07EA A 07EB..07F3 0 -07F4..0815 A +07F4..07FC A +07FD 0 +07FE..0815 A 0816..0819 0 081A A 081B..0823 0 @@ -65,8 +67,12 @@ cat > uc_width.ok <<\EOF 0829..082D 0 082E..0858 A 0859..085B 0 -085C..08D3 A -08D4..0902 0 +085C..088F A +0890..0891 0 +0892..0897 A +0898..089F 0 +08A0..08C9 A +08CA..0902 0 0903..0939 A 093A 0 093B A @@ -89,7 +95,9 @@ cat > uc_width.ok <<\EOF 09CD 0 09CE..09E1 A 09E2..09E3 0 -09E4..0A00 A +09E4..09FD A +09FE 0 +09FF..0A00 A 0A01..0A02 0 0A03..0A3B A 0A3C 0 @@ -117,7 +125,9 @@ cat > uc_width.ok <<\EOF 0ACD 0 0ACE..0AE1 A 0AE2..0AE3 0 -0AE4..0B00 A +0AE4..0AF9 A +0AFA..0AFF 0 +0B00 A 0B01 0 0B02..0B3B A 0B3C 0 @@ -127,8 +137,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 @@ -139,7 +149,11 @@ cat > uc_width.ok <<\EOF 0BCD 0 0BCE..0BFF A 0C00 0 -0C01..0C3D A +0C01..0C03 A +0C04 0 +0C05..0C3B A +0C3C 0 +0C3D A 0C3E..0C40 0 0C41..0C45 A 0C46..0C48 0 @@ -157,15 +171,19 @@ cat > uc_width.ok <<\EOF 0CCC..0CCD 0 0CCE..0CE1 A 0CE2..0CE3 0 -0CE4..0D00 A -0D01 0 -0D02..0D40 A +0CE4..0CFF A +0D00..0D01 0 +0D02..0D3A A +0D3B..0D3C 0 +0D3D..0D40 A 0D41..0D44 0 0D45..0D4C A 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 @@ -180,9 +198,7 @@ cat > uc_width.ok <<\EOF 0E4F..0EB0 A 0EB1 0 0EB2..0EB3 A -0EB4..0EB9 0 -0EBA A -0EBB..0EBC 0 +0EB4..0EBC 0 0EBD..0EC7 A 0EC8..0ECD 0 0ECE..0F17 A @@ -229,13 +245,14 @@ cat > uc_width.ok <<\EOF 109D 0 109E..10FF A 1100..115F 2 -1160..135C A +1160..11FF 0 +1200..135C A 135D..135F 0 1360..1711 A 1712..1714 0 1715..1731 A -1732..1734 0 -1735..1751 A +1732..1733 0 +1734..1751 A 1752..1753 0 1754..1771 A 1772..1773 0 @@ -250,8 +267,8 @@ cat > uc_width.ok <<\EOF 17D4..17DC A 17DD 0 17DE..180A A -180B..180E 0 -180F..1884 A +180B..180F 0 +1810..1884 A 1885..1886 0 1887..18A8 A 18A9 0 @@ -282,8 +299,8 @@ cat > uc_width.ok <<\EOF 1A7D..1A7E A 1A7F 0 1A80..1AAF A -1AB0..1ABE 0 -1ABF..1AFF A +1AB0..1ACE 0 +1ACF..1AFF A 1B00..1B03 0 1B04..1B33 A 1B34 0 @@ -328,9 +345,7 @@ cat > uc_width.ok <<\EOF 1CF5..1CF7 A 1CF8..1CF9 0 1CFA..1DBF A -1DC0..1DF5 0 -1DF6..1DFA A -1DFB..1DFF 0 +1DC0..1DFF 0 1E00..200A A 200B..200F 0 2010..2029 A @@ -343,9 +358,75 @@ cat > uc_width.ok <<\EOF 20A9 1 20AA..20CF A 20D0..20F0 0 -20F1..2328 A +20F1..2319 A +231A..231B 2 +231C..2328 A 2329..232A 2 -232B..2CEE A +232B..23E8 A +23E9..23EC 2 +23ED..23EF A +23F0 2 +23F1..23F2 A +23F3 2 +23F4..25FC A +25FD..25FE 2 +25FF..2613 A +2614..2615 2 +2616..2647 A +2648..2653 2 +2654..267E A +267F 2 +2680..2692 A +2693 2 +2694..26A0 A +26A1 2 +26A2..26A9 A +26AA..26AB 2 +26AC..26BC A +26BD..26BE 2 +26BF..26C3 A +26C4..26C5 2 +26C6..26CD A +26CE 2 +26CF..26D3 A +26D4 2 +26D5..26E9 A +26EA 2 +26EB..26F1 A +26F2..26F3 2 +26F4 A +26F5 2 +26F6..26F9 A +26FA 2 +26FB..26FC A +26FD 2 +26FE..2704 A +2705 2 +2706..2709 A +270A..270B 2 +270C..2727 A +2728 2 +2729..274B A +274C 2 +274D A +274E 2 +274F..2752 A +2753..2755 2 +2756 A +2757 2 +2758..2794 A +2795..2797 2 +2798..27AF A +27B0 2 +27B1..27BE A +27BF 2 +27C0..2B1A A +2B1B..2B1C 2 +2B1D..2B4F A +2B50 2 +2B51..2B54 A +2B55 2 +2B56..2CEE A 2CEF..2CF1 0 2CF2..2D7E A 2D7F 0 @@ -358,7 +439,9 @@ cat > uc_width.ok <<\EOF 303F A 3040..3098 2 3099..309A 0 -309B..4DBF 2 +309B..3247 2 +3248..324F A +3250..4DBF 2 4DC0..4DFF A 4E00..A4CF 2 A4D0..A66E A @@ -377,23 +460,29 @@ 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 -A8F2..A925 A +A8F2..A8FE A +A8FF 0 +A900..A925 A A926..A92D 0 A92E..A946 A A947..A951 0 -A952..A97F A +A952..A95F A +A960..A97C 2 +A97D..A97F A A980..A982 0 A983..A9B2 A A9B3 0 A9B4..A9B5 A A9B6..A9B9 0 A9BA..A9BB A -A9BC 0 -A9BD..A9E4 A +A9BC..A9BD 0 +A9BE..A9E4 A A9E5 0 A9E6..AA28 A AA29..AA2E 0 @@ -429,7 +518,11 @@ ABE9..ABEC A ABED 0 ABEE..ABFF A AC00..D7A3 2 -D7A4..F8FF A +D7A4..D7AF A +D7B0..D7C6 0 +D7C7..D7CA A +D7CB..D7FB 0 +D7FC..F8FF A F900..FAFF 2 FB00..FB1D A FB1E 0 @@ -463,11 +556,23 @@ FFFC..101FC 1 10A3F 0 10A40..10AE4 1 10AE5..10AE6 0 -10AE7..11000 1 +10AE7..10D23 1 +10D24..10D27 0 +10D28..10EAA 1 +10EAB..10EAC 0 +10EAD..10F45 1 +10F46..10F50 0 +10F51..10F81 1 +10F82..10F85 0 +10F86..11000 1 11001 0 11002..11037 1 11038..11046 0 -11047..1107E 1 +11047..1106F 1 +11070 0 +11071..11072 1 +11073..11074 0 +11075..1107E 1 1107F..11081 0 11082..110B2 1 110B3..110B6 0 @@ -475,7 +580,11 @@ FFFC..101FC 1 110B9..110BA 0 110BB..110BC 1 110BD 0 -110BE..110FF 1 +110BE..110C1 1 +110C2 0 +110C3..110CC 1 +110CD 0 +110CE..110FF 1 11100..11102 0 11103..11126 1 11127..1112B 0 @@ -487,9 +596,11 @@ FFFC..101FC 1 11180..11181 0 11182..111B5 1 111B6..111BE 0 -111BF..111C9 1 -111CA..111CC 0 -111CD..1122E 1 +111BF..111C8 1 +111C9..111CC 0 +111CD..111CE 1 +111CF 0 +111D0..1122E 1 1122F..11231 0 11232..11233 1 11234 0 @@ -503,8 +614,8 @@ FFFC..101FC 1 112E3..112EA 0 112EB..112FF 1 11300..11301 0 -11302..1133B 1 -1133C 0 +11302..1133A 1 +1133B..1133C 0 1133D..1133F 1 11340 0 11341..11365 1 @@ -517,7 +628,9 @@ FFFC..101FC 1 11442..11444 0 11445 1 11446 0 -11447..114B2 1 +11447..1145D 1 +1145E 0 +1145F..114B2 1 114B3..114B8 0 114B9 1 114BA 0 @@ -553,7 +666,41 @@ FFFC..101FC 1 11722..11725 0 11726 1 11727..1172B 0 -1172C..11C2F 1 +1172C..1182E 1 +1182F..11837 0 +11838 1 +11839..1183A 0 +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 +119DC..119DF 1 +119E0 0 +119E1..11A00 1 +11A01..11A06 0 +11A07..11A08 1 +11A09..11A0A 0 +11A0B..11A32 1 +11A33..11A38 0 +11A39..11A3A 1 +11A3B..11A3E 0 +11A3F..11A46 1 +11A47 0 +11A48..11A50 1 +11A51..11A56 0 +11A57..11A58 1 +11A59..11A5B 0 +11A5C..11A89 1 +11A8A..11A96 0 +11A97 1 +11A98..11A99 0 +11A9A..11C2F 1 11C30..11C36 0 11C37 1 11C38..11C3D 0 @@ -565,17 +712,68 @@ FFFC..101FC 1 11CB2..11CB3 0 11CB4 1 11CB5..11CB6 0 -11CB7..16AEF 1 +11CB7..11D30 1 +11D31..11D36 0 +11D37..11D39 1 +11D3A 0 +11D3B 1 +11D3C..11D3D 0 +11D3E 1 +11D3F..11D45 0 +11D46 1 +11D47 0 +11D48..11D8F 1 +11D90..11D91 0 +11D92..11D94 1 +11D95 0 +11D96 1 +11D97 0 +11D98..11EF2 1 +11EF3..11EF4 0 +11EF5..1342F 1 +13430..13438 0 +13439..16AEF 1 16AF0..16AF4 0 16AF5..16B2F 1 16B30..16B36 0 -16B37..16F8E 1 +16B37..16F4E 1 +16F4F 0 +16F50..16F8E 1 16F8F..16F92 0 -16F93..1BC9C 1 +16F93..16FDF 1 +16FE0..16FE3 2 +16FE4 0 +16FE5..16FEF 1 +16FF0..16FF1 2 +16FF2..16FFF 1 +17000..187F7 2 +187F8..187FF 1 +18800..18CD5 2 +18CD6..18CFF 1 +18D00..18D08 2 +18D09..1AFEF 1 +1AFF0..1AFF3 2 +1AFF4 1 +1AFF5..1AFFB 2 +1AFFC 1 +1AFFD..1AFFE 2 +1AFFF 1 +1B000..1B122 2 +1B123..1B14F 1 +1B150..1B152 2 +1B153..1B163 1 +1B164..1B167 2 +1B168..1B16F 1 +1B170..1B2FB 2 +1B2FC..1BC9C 1 1BC9D..1BC9E 0 1BC9F 1 1BCA0..1BCA3 0 -1BCA4..1D166 1 +1BCA4..1CEFF 1 +1CF00..1CF2D 0 +1CF2E..1CF2F 1 +1CF30..1CF46 0 +1CF47..1D166 1 1D167..1D169 0 1D16A..1D172 1 1D173..1D182 0 @@ -607,11 +805,103 @@ FFFC..101FC 1 1E023..1E024 0 1E025 1 1E026..1E02A 0 -1E02B..1E8CF 1 +1E02B..1E12F 1 +1E130..1E136 0 +1E137..1E2AD 1 +1E2AE 0 +1E2AF..1E2EB 1 +1E2EC..1E2EF 0 +1E2F0..1E8CF 1 1E8D0..1E8D6 0 1E8D7..1E943 1 1E944..1E94A 0 -1E94B..1FFFF 1 +1E94B..1F003 1 +1F004 2 +1F005..1F0CE 1 +1F0CF 2 +1F0D0..1F18D 1 +1F18E 2 +1F18F..1F190 1 +1F191..1F19A 2 +1F19B..1F1FF 1 +1F200..1F320 2 +1F321..1F32C 1 +1F32D..1F335 2 +1F336 1 +1F337..1F37C 2 +1F37D 1 +1F37E..1F393 2 +1F394..1F39F 1 +1F3A0..1F3CA 2 +1F3CB..1F3CE 1 +1F3CF..1F3D3 2 +1F3D4..1F3DF 1 +1F3E0..1F3F0 2 +1F3F1..1F3F3 1 +1F3F4 2 +1F3F5..1F3F7 1 +1F3F8..1F43E 2 +1F43F 1 +1F440 2 +1F441 1 +1F442..1F4FC 2 +1F4FD..1F4FE 1 +1F4FF..1F53D 2 +1F53E..1F54A 1 +1F54B..1F54E 2 +1F54F 1 +1F550..1F567 2 +1F568..1F579 1 +1F57A 2 +1F57B..1F594 1 +1F595..1F596 2 +1F597..1F5A3 1 +1F5A4 2 +1F5A5..1F5FA 1 +1F5FB..1F64F 2 +1F650..1F67F 1 +1F680..1F6C5 2 +1F6C6..1F6CB 1 +1F6CC 2 +1F6CD..1F6CF 1 +1F6D0..1F6D2 2 +1F6D3..1F6D4 1 +1F6D5..1F6D7 2 +1F6D8..1F6DC 1 +1F6DD..1F6DF 2 +1F6E0..1F6EA 1 +1F6EB..1F6EC 2 +1F6ED..1F6F3 1 +1F6F4..1F6FC 2 +1F6FD..1F7DF 1 +1F7E0..1F7EB 2 +1F7EC..1F7EF 1 +1F7F0 2 +1F7F1..1F90B 1 +1F90C..1F93A 2 +1F93B 1 +1F93C..1F945 2 +1F946 1 +1F947..1F9FF 2 +1FA00..1FA6F 1 +1FA70..1FA74 2 +1FA75..1FA77 1 +1FA78..1FA7C 2 +1FA7D..1FA7F 1 +1FA80..1FA86 2 +1FA87..1FA8F 1 +1FA90..1FAAC 2 +1FAAD..1FAAF 1 +1FAB0..1FABA 2 +1FABB..1FABF 1 +1FAC0..1FAC5 2 +1FAC6..1FACF 1 +1FAD0..1FAD9 2 +1FADA..1FADF 1 +1FAE0..1FAE7 2 +1FAE8..1FAEF 1 +1FAF0..1FAF6 2 +1FAF7..1FFFF 1 20000..3FFFF 2 40000..E0000 1 E0001 0 -- cgit v1.2.3