From e01f5aab3966b5e7f43d49a81e5bff88a9e212f1 Mon Sep 17 00:00:00 2001 From: pgen Date: Wed, 6 May 2020 14:56:39 +0200 Subject: Harmonize scrolling symbols and default colors --- tests/attributes/t0005.good | 10 +++---- tests/direct_access/t0002.good | 60 +++++++++++++++++++++--------------------- tests/gutter/t0004.good | 4 +-- tests/gutter/t0005.good | 4 +-- tests/long_lines/t0001.good | 16 +++++------ tests/long_lines/t0002.good | 16 +++++------ tests/long_lines/t0004.good | 12 ++++----- tests/long_lines/t0005.good | 16 +++++------ tests/message/t0003.good | 4 +-- tests/scrolling/t0008.good | 10 +++---- tests/substitutions/t0012.good | 28 ++++++++++---------- tests/substitutions/t0013.good | 28 ++++++++++---------- tests/substitutions/t0014.good | 28 ++++++++++---------- tests/substitutions/t0015.good | 28 ++++++++++---------- tests/substitutions/t0016.good | 20 +++++++------- tests/substitutions/t0017.good | 20 +++++++------- tests/substitutions/t0018.good | 20 +++++++------- 17 files changed, 162 insertions(+), 162 deletions(-) (limited to 'tests') diff --git a/tests/attributes/t0005.good b/tests/attributes/t0005.good index 6a6e7ab..09d8079 100644 --- a/tests/attributes/t0005.good +++ b/tests/attributes/t0005.good @@ -1,14 +1,14 @@ $ OUT=$(smenu -P -N 0 -a i:6 da:1,b s:5,b -c -- t0005.in) - 1 2 3 4 5 6 7 → ┐ + 1 2 3 4 5 6 7 ▸ ┐ 0:0123 7:24 8:24 9:24 17:07 18:07 19:07 27:24 28:24 29:24 37:24 38:24 39:24 47:24 48:24 49:24 57:24 58:24 59:24 67:24 68:24 69:24 70:0123 79:20 - 32 33 34 35 36 37 38 → ║ + 32 33 34 35 36 37 38 ▸ ║ 0:0123 7:24 8:24 9:24 17:24 18:24 19:24 27:24 28:24 29:24 37:24 38:24 39:24 47:24 48:24 49:24 57:24 58:24 59:24 67:24 68:24 69:24 70:0123 79:20 - 61 62 63 64 65 66 67 → │ + 61 62 63 64 65 66 67 ▸ │ 0:0123 7:24 8:24 9:24 17:24 18:24 19:24 27:24 28:24 29:24 37:24 38:24 39:24 47:24 48:24 49:24 57:24 58:24 59:24 67:24 68:24 69:24 70:0123 79:20 - 11) 101 12) 102 13) 103 14) 104 15) 105 16) 106 17) 107→ │ + 11) 101 12) 102 13) 103 14) 104 15) 105 16) 106 17) 107▸ │ 0:0123 1:011f 2:011f 3:011f 4:011f 5:011f 7:24 8:24 9:24 11:011f 12:011f 13:011f 14:011f 15:011f 17:24 18:24 19:24 21:011f 22:011f 23:011f 24:011f 25:011f 27:24 28:24 29:24 31:011f 32:011f 33:011f 34:011f 35:011f 37:24 38:24 39:24 41:011f 42:011f 43:011f 44:011f 45:011f 47:24 48:24 49:24 51:011f 52:011f 53:011f 54:011f 55:011f 57:24 58:24 59:24 61:011f 62:011f 63:011f 64:011f 65:011f 67:24 68:24 69:24 70:0123 79:20 - 131 132 133 134 135 136 137→ ▼ + 131 132 133 134 135 136 137▸ ▼ 0:0123 7:24 8:24 9:24 17:24 18:24 19:24 27:24 28:24 29:24 37:24 38:24 39:24 47:24 48:24 49:24 57:24 58:24 59:24 67:24 68:24 69:24 70:0123 79:20 $ diff --git a/tests/direct_access/t0002.good b/tests/direct_access/t0002.good index 3031c97..e9a8cea 100644 --- a/tests/direct_access/t0002.good +++ b/tests/direct_access/t0002.good @@ -1,35 +1,35 @@ $ OUT=$(smenu -N. -n 15 -c -e 000 -- t0002.in) -← 955) 955 956) 956 957) 957 958) 958 959) 959 960) 960 ▲ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 965) 965 966) 966 967) 967 968) 968 969) 969 970) 970 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 975) 975 976) 976 977) 977 978) 978 979) 979 980) 980 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 985) 985 986) 986 987) 987 988) 988 989) 989 990) 990 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 995) 995 996) 996 997) 997 998) 998 999) 999 1000 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 68:24 69:24 70:24 71:24 79:20 -← 1004) 1005 1005) 1006 1006) 1007 1007) 1008 1008) 1009 1009) 1010 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 1014) 1015 1015) 1016 1016) 1017 1017) 1018 1018) 1019 1019) 1020 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 1024) 1025 1025) 1026 1026) 1027 1027) 1028 1028) 1029 1029) 1030 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 1034) 1035 1035) 1036 1036) 1037 1037) 1038 1038) 1039 1039) 1040 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 1044) 1045 1045) 1046 1046) 1047 1047) 1048 1048) 1049 1049) 1050 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 1054) 1055 1055) 1056 1056) 1057 1057) 1058 1058) 1059 1059) 1060 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 1064) 1065 1065) 1066 1066) 1067 1067) 1068 1068) 1069 1069) 1070 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 1074) 1075 1075) 1076 1076) 1077 1077) 1078 1078) 1079 1079) 1080 │ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 1084) 1085 1085) 1086 1086) 1087 1087) 1088 1088) 1089 1089) 1090 ║ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 -← 1094) 1095 1095) 1096 1096) 1097 1097) 1098 1098) 1099 1099) 1100 ┘ -0:01 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 56:07 57:07 58:07 59:07 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 955) 955 956) 956 957) 957 958) 958 959) 959 960) 960 ▲ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 965) 965 966) 966 967) 967 968) 968 969) 969 970) 970 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 975) 975 976) 976 977) 977 978) 978 979) 979 980) 980 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 985) 985 986) 986 987) 987 988) 988 989) 989 990) 990 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 995) 995 996) 996 997) 997 998) 998 999) 999 1000 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 68:24 69:24 70:24 71:24 79:20 +◂ 1004) 1005 1005) 1006 1006) 1007 1007) 1008 1008) 1009 1009) 1010 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 1014) 1015 1015) 1016 1016) 1017 1017) 1018 1018) 1019 1019) 1020 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 1024) 1025 1025) 1026 1026) 1027 1027) 1028 1028) 1029 1029) 1030 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 1034) 1035 1035) 1036 1036) 1037 1037) 1038 1038) 1039 1039) 1040 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 1044) 1045 1045) 1046 1046) 1047 1047) 1048 1048) 1049 1049) 1050 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 1054) 1055 1055) 1056 1056) 1057 1057) 1058 1058) 1059 1059) 1060 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 1064) 1065 1065) 1066 1066) 1067 1067) 1068 1068) 1069 1069) 1070 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 1074) 1075 1075) 1076 1076) 1077 1077) 1078 1078) 1079 1079) 1080 │ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 1084) 1085 1085) 1086 1086) 1087 1087) 1088 1088) 1089 1089) 1090 ║ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 61:01 62:01 63:01 64:01 65:01 66:01 79:20 +◂ 1094) 1095 1095) 1096 1096) 1097 1097) 1098 1098) 1099 1099) 1100 ┘ +0:20 1:01 2:01 3:01 4:01 5:01 6:01 13:01 14:01 15:01 16:01 17:01 18:01 25:01 26:01 27:01 28:01 29:01 30:01 37:01 38:01 39:01 40:01 41:01 42:01 49:01 50:01 51:01 52:01 53:01 54:01 56:07 57:07 58:07 59:07 61:01 62:01 63:01 64:01 65:01 66:01 79:20 $ $ echo ":$OUT:" diff --git a/tests/gutter/t0004.good b/tests/gutter/t0004.good index aa18182..15245df 100644 --- a/tests/gutter/t0004.good +++ b/tests/gutter/t0004.good @@ -1,7 +1,7 @@ $ OUT=$(smenu -c -g '|: ' t0004.in) -←efgh:ijkl mnop qrst vwxy zabc defg hijk lmno pqrs tuvw xyza bcde efgh jklm→ -0:01 1:07 2:07 3:07 4:07 75:01 +◂efgh:ijkl mnop qrst vwxy zabc defg hijk lmno pqrs tuvw xyza bcde efgh jklm▸ +0:20 1:07 2:07 3:07 4:07 75:20 $ $ echo ":$OUT:" diff --git a/tests/gutter/t0005.good b/tests/gutter/t0005.good index dccedc8..8bf1951 100644 --- a/tests/gutter/t0005.good +++ b/tests/gutter/t0005.good @@ -1,7 +1,7 @@ $ OUT=$(smenu -c -g '|: ' t0005.in) - abcd|efgh:ijkl mnop qrst vwxy zabc defg hijk lmno pqrs tuvw xyza bcde efgh→ -0:01 1:07 2:07 3:07 4:07 75:01 + abcd|efgh:ijkl mnop qrst vwxy zabc defg hijk lmno pqrs tuvw xyza bcde efgh▸ +0:20 1:07 2:07 3:07 4:07 75:20 $ $ echo ":$OUT:" diff --git a/tests/long_lines/t0001.good b/tests/long_lines/t0001.good index 090dd96..24a7ea0 100644 --- a/tests/long_lines/t0001.good +++ b/tests/long_lines/t0001.good @@ -1,13 +1,13 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -n 4 -l t0001.in) -←3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 ┐ -0:01 79:20 -←34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58→ │ -0:01 75:01 79:20 -←63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87→ ║ -0:01 75:01 79:20 -←102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120→ ▼ -0:01 41:07 42:07 43:07 76:01 79:20 +◂3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 ┐ +0:20 79:20 +◂34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58▸ │ +0:20 75:20 79:20 +◂63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87▸ ║ +0:20 75:20 79:20 +◂102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120▸ ▼ +0:20 41:07 42:07 43:07 76:20 79:20 $ $ echo ":$OUT:" diff --git a/tests/long_lines/t0002.good b/tests/long_lines/t0002.good index 92a7b3e..736bdbf 100644 --- a/tests/long_lines/t0002.good +++ b/tests/long_lines/t0002.good @@ -1,13 +1,13 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -n 4 -c t0002.in) -←12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 ┐ -0:01 79:20 -←43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 │ -0:01 79:20 -←72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 → ║ -0:01 76:01 79:20 -←112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 ▼ -0:01 37:07 38:07 39:07 79:20 +◂12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 ┐ +0:20 79:20 +◂43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 │ +0:20 79:20 +◂72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 ▸ ║ +0:20 76:20 79:20 +◂112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 ▼ +0:20 37:07 38:07 39:07 79:20 $ $ echo ":$OUT:" diff --git a/tests/long_lines/t0004.good b/tests/long_lines/t0004.good index 18c2bc5..6e355ba 100644 --- a/tests/long_lines/t0004.good +++ b/tests/long_lines/t0004.good @@ -1,13 +1,13 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -l -n 4 t0004.in) - 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77→ ▲ -0:01 51:01 54:20 - 101 102 103 104 105 106 107 108 109 110 111 112 113→ │ -0:01 45:07 46:07 47:07 52:01 54:20 + 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77▸ ▲ +0:20 51:20 54:20 + 101 102 103 104 105 106 107 108 109 110 111 112 113▸ │ +0:20 45:07 46:07 47:07 52:20 54:20 131 132 133 134 135 136 137 138 139 140 ║ -0:01 54:20 +0:20 54:20 141 142 143 144 145 146 147 148 149 150 ┘ -0:01 54:20 +0:20 54:20 $ $ echo ":$OUT:" diff --git a/tests/long_lines/t0005.good b/tests/long_lines/t0005.good index 94aa606..515c761 100644 --- a/tests/long_lines/t0005.good +++ b/tests/long_lines/t0005.good @@ -1,13 +1,13 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -c -n 4 t0005.in) -←69 70 71 72 73 74 75 76 77 78 79 80 81 → ▲ -0:01 52:01 54:20 -←109 110 111 112 113 114 115 116 117 118 119 120 121→ │ -0:01 49:07 50:07 51:07 52:01 54:20 -←139 140 ║ -0:01 54:20 -←149 150 ┘ -0:01 54:20 +◂69 70 71 72 73 74 75 76 77 78 79 80 81 ▸ ▲ +0:20 52:20 54:20 +◂109 110 111 112 113 114 115 116 117 118 119 120 121▸ │ +0:20 49:07 50:07 51:07 52:20 54:20 +◂139 140 ║ +0:20 54:20 +◂149 150 ┘ +0:20 54:20 $ $ echo ":$OUT:" diff --git a/tests/message/t0003.good b/tests/message/t0003.good index 4204441..48670a2 100644 --- a/tests/message/t0003.good +++ b/tests/message/t0003.good @@ -4,8 +4,8 @@ $ OUT=$(smenu -M -l -m test t0003.in) 36:01 37:01 38:01 39:01 - 123456789 123456789 123456789 123456789 123456789 123456789 123456789→ -0:01 1:07 2:07 3:07 4:07 5:07 6:07 7:07 8:07 9:07 70:01 + 123456789 123456789 123456789 123456789 123456789 123456789 123456789▸ +0:20 1:07 2:07 3:07 4:07 5:07 6:07 7:07 8:07 9:07 70:20 $ $ echo ":$OUT:" diff --git a/tests/scrolling/t0008.good b/tests/scrolling/t0008.good index 8a21cab..6cc1e29 100644 --- a/tests/scrolling/t0008.good +++ b/tests/scrolling/t0008.good @@ -1,15 +1,15 @@ $ OUT=$(LC_ALL=en_US smenu -c -e x -e '[0-9]' t0008.in) \ -0:01 1:07 2:07 3:07 4:07 5:07 6:07 7:07 8:07 9:07 11:24 12:24 13:24 14:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 46:24 47:24 48:24 49:24 51:24 52:24 53:24 54:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 66:24 67:24 68:24 69:24 70:01 79:20 +0:20 1:07 2:07 3:07 4:07 5:07 6:07 7:07 8:07 9:07 11:24 12:24 13:24 14:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 46:24 47:24 48:24 49:24 51:24 52:24 53:24 54:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 66:24 67:24 68:24 69:24 70:20 79:20 + -0:01 1:24 2:24 3:24 4:24 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 46:24 47:24 48:24 49:24 51:24 52:24 53:24 54:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 66:24 67:24 68:24 69:24 70:01 79:20 +0:20 1:24 2:24 3:24 4:24 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 46:24 47:24 48:24 49:24 51:24 52:24 53:24 54:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 66:24 67:24 68:24 69:24 70:20 79:20 | -0:01 70:01 79:20 +0:20 70:20 79:20 | -0:01 70:01 79:20 +0:20 70:20 79:20 v -0:01 70:01 79:20 +0:20 70:20 79:20 $ $ echo ":$OUT:" diff --git a/tests/substitutions/t0012.good b/tests/substitutions/t0012.good index c836cb1..3b36ddd 100644 --- a/tests/substitutions/t0012.good +++ b/tests/substitutions/t0012.good @@ -2,20 +2,20 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -c -e 2 -I'/(1+)/(\1)/g' -n 15 \ > t0012.in) - (1) 2 3 4 5 6 7 8 9 (1)0 (11) 12 → -0:01 1:07 2:07 3:07 4:07 5:07 6:07 7:07 9:24 10:24 11:24 12:24 13:24 71:24 72:24 73:24 74:24 75:24 76:01 - 28 29 30 32 33 34 35 36 37 38 39 40 → -0:01 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:24 10:24 11:24 12:24 13:24 21:24 22:24 23:24 24:24 25:24 76:01 - 53 54 55 56 57 58 59 60 6(1) 62 63 64 → -0:01 59:24 60:24 61:24 62:24 63:24 76:01 - 77 78 79 80 8(1) 82 83 84 85 86 87 88 → -0:01 35:24 36:24 37:24 38:24 39:24 76:01 - (1)0(1) 102 (1)03 (1)04 (1)05 (1)06 (1)07 (1)08 (1)09 (11)0 (111) 112 → -0:01 9:24 10:24 11:24 12:24 13:24 71:24 72:24 73:24 74:24 75:24 76:01 - (11)9 120 121 122 123 124 125 126 127 128 129 (1)30→ -0:01 9:24 10:24 11:24 12:24 13:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 76:01 - (1)37 (1)38 (1)39 (1)40 (1)4(1) 142 (1)43 (1)44 (1)45 (1)46 (1)47 (1)48→ -0:01 35:24 36:24 37:24 38:24 39:24 76:01 + (1) 2 3 4 5 6 7 8 9 (1)0 (11) 12 ▸ +0:20 1:07 2:07 3:07 4:07 5:07 6:07 7:07 9:24 10:24 11:24 12:24 13:24 71:24 72:24 73:24 74:24 75:24 76:20 + 28 29 30 32 33 34 35 36 37 38 39 40 ▸ +0:20 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:24 10:24 11:24 12:24 13:24 21:24 22:24 23:24 24:24 25:24 76:20 + 53 54 55 56 57 58 59 60 6(1) 62 63 64 ▸ +0:20 59:24 60:24 61:24 62:24 63:24 76:20 + 77 78 79 80 8(1) 82 83 84 85 86 87 88 ▸ +0:20 35:24 36:24 37:24 38:24 39:24 76:20 + (1)0(1) 102 (1)03 (1)04 (1)05 (1)06 (1)07 (1)08 (1)09 (11)0 (111) 112 ▸ +0:20 9:24 10:24 11:24 12:24 13:24 71:24 72:24 73:24 74:24 75:24 76:20 + (11)9 120 121 122 123 124 125 126 127 128 129 (1)30▸ +0:20 9:24 10:24 11:24 12:24 13:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 76:20 + (1)37 (1)38 (1)39 (1)40 (1)4(1) 142 (1)43 (1)44 (1)45 (1)46 (1)47 (1)48▸ +0:20 35:24 36:24 37:24 38:24 39:24 76:20 $ $ echo ":$OUT:" diff --git a/tests/substitutions/t0013.good b/tests/substitutions/t0013.good index 039449e..c25dc99 100644 --- a/tests/substitutions/t0013.good +++ b/tests/substitutions/t0013.good @@ -2,20 +2,20 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -c -i 2 -I'/(1+)/(\1)/g' -n 15 \ > t0013.in) - 1 2 3 4 5 6 7 8 9 10 11 (1)2 13 → -0:01 1:24 2:24 3:24 5:07 6:07 7:07 8:07 9:07 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 73:24 74:24 75:24 76:01 - 28 29 30 32 33 34 35 36 37 38 39 40 41 → -0:01 11:24 12:24 13:24 14:24 15:24 16:24 17:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:01 - 53 54 55 56 57 58 59 60 61 62 63 64 65 → -0:01 1:24 2:24 3:24 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 61:24 62:24 63:24 64:24 65:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:01 - 77 78 79 80 81 82 83 84 85 86 87 88 89 → -0:01 1:24 2:24 3:24 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:01 - 101 (1)02 103 104 105 106 107 108 109 110 111 (11)2 113→ -0:01 1:24 2:24 3:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 73:24 74:24 75:24 76:01 - 119 (1)20 (1)2(1) (1)22 (1)23 (1)24 (1)25 (1)26 (1)27 (1)28 (1)29 130 131→ -0:01 1:24 2:24 3:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:01 - 137 138 139 140 141 (1)42 143 144 145 146 147 148 149→ -0:01 1:24 2:24 3:24 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:01 + 1 2 3 4 5 6 7 8 9 10 11 (1)2 13 ▸ +0:20 1:24 2:24 3:24 5:07 6:07 7:07 8:07 9:07 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 73:24 74:24 75:24 76:20 + 28 29 30 32 33 34 35 36 37 38 39 40 41 ▸ +0:20 11:24 12:24 13:24 14:24 15:24 16:24 17:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:20 + 53 54 55 56 57 58 59 60 61 62 63 64 65 ▸ +0:20 1:24 2:24 3:24 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 61:24 62:24 63:24 64:24 65:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:20 + 77 78 79 80 81 82 83 84 85 86 87 88 89 ▸ +0:20 1:24 2:24 3:24 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:20 + 101 (1)02 103 104 105 106 107 108 109 110 111 (11)2 113▸ +0:20 1:24 2:24 3:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 73:24 74:24 75:24 76:20 + 119 (1)20 (1)2(1) (1)22 (1)23 (1)24 (1)25 (1)26 (1)27 (1)28 (1)29 130 131▸ +0:20 1:24 2:24 3:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:20 + 137 138 139 140 141 (1)42 143 144 145 146 147 148 149▸ +0:20 1:24 2:24 3:24 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 67:24 68:24 69:24 70:24 71:24 73:24 74:24 75:24 76:20 $ $ echo ":$OUT:" diff --git a/tests/substitutions/t0014.good b/tests/substitutions/t0014.good index 59cb79a..31765a2 100644 --- a/tests/substitutions/t0014.good +++ b/tests/substitutions/t0014.good @@ -2,20 +2,20 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -c -i 2 -E'/(1+)/(\1)/g' -n 15 \ > t0014.in) - (1) 2 3 4 5 6 7 8 9 (1)0 (11) 12 → -0:01 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:07 10:07 11:07 12:07 13:07 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 76:01 - 28 29 30 32 33 34 35 36 37 38 39 40 → -0:01 15:24 16:24 17:24 18:24 19:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 71:24 72:24 73:24 74:24 75:24 76:01 - 53 54 55 56 57 58 59 60 6(1) 62 63 64 → -0:01 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:24 10:24 11:24 12:24 13:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 65:24 66:24 67:24 68:24 69:24 71:24 72:24 73:24 74:24 75:24 76:01 - 77 78 79 80 8(1) 82 83 84 85 86 87 88 → -0:01 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:24 10:24 11:24 12:24 13:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 71:24 72:24 73:24 74:24 75:24 76:01 - (1)0(1) 102 (1)03 (1)04 (1)05 (1)06 (1)07 (1)08 (1)09 (11)0 (111) 112 → -0:01 1:24 2:24 3:24 4:24 5:24 6:24 7:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 76:01 - (11)9 120 121 122 123 124 125 126 127 128 129 (1)30→ -0:01 1:24 2:24 3:24 4:24 5:24 6:24 7:24 71:24 72:24 73:24 74:24 75:24 76:01 - (1)37 (1)38 (1)39 (1)40 (1)4(1) 142 (1)43 (1)44 (1)45 (1)46 (1)47 (1)48→ -0:01 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:24 10:24 11:24 12:24 13:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 71:24 72:24 73:24 74:24 75:24 76:01 + (1) 2 3 4 5 6 7 8 9 (1)0 (11) 12 ▸ +0:20 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:07 10:07 11:07 12:07 13:07 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 76:20 + 28 29 30 32 33 34 35 36 37 38 39 40 ▸ +0:20 15:24 16:24 17:24 18:24 19:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 71:24 72:24 73:24 74:24 75:24 76:20 + 53 54 55 56 57 58 59 60 6(1) 62 63 64 ▸ +0:20 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:24 10:24 11:24 12:24 13:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 65:24 66:24 67:24 68:24 69:24 71:24 72:24 73:24 74:24 75:24 76:20 + 77 78 79 80 8(1) 82 83 84 85 86 87 88 ▸ +0:20 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:24 10:24 11:24 12:24 13:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 71:24 72:24 73:24 74:24 75:24 76:20 + (1)0(1) 102 (1)03 (1)04 (1)05 (1)06 (1)07 (1)08 (1)09 (11)0 (111) 112 ▸ +0:20 1:24 2:24 3:24 4:24 5:24 6:24 7:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 35:24 36:24 37:24 38:24 39:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 76:20 + (11)9 120 121 122 123 124 125 126 127 128 129 (1)30▸ +0:20 1:24 2:24 3:24 4:24 5:24 6:24 7:24 71:24 72:24 73:24 74:24 75:24 76:20 + (1)37 (1)38 (1)39 (1)40 (1)4(1) 142 (1)43 (1)44 (1)45 (1)46 (1)47 (1)48▸ +0:20 1:24 2:24 3:24 4:24 5:24 6:24 7:24 9:24 10:24 11:24 12:24 13:24 15:24 16:24 17:24 18:24 19:24 21:24 22:24 23:24 24:24 25:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 41:24 42:24 43:24 44:24 45:24 47:24 48:24 49:24 50:24 51:24 53:24 54:24 55:24 56:24 57:24 59:24 60:24 61:24 62:24 63:24 65:24 66:24 67:24 68:24 69:24 71:24 72:24 73:24 74:24 75:24 76:20 $ $ echo ":$OUT:" diff --git a/tests/substitutions/t0015.good b/tests/substitutions/t0015.good index 2f6d393..3bc8e5a 100644 --- a/tests/substitutions/t0015.good +++ b/tests/substitutions/t0015.good @@ -2,20 +2,20 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -c -e 2 -E'/(1+)/(\1)/g' -n 15 \ > t0015.in) - 1 2 3 4 5 6 7 8 9 10 11 (1)2 13 → -0:01 1:07 2:07 3:07 5:24 6:24 7:24 8:24 9:24 67:24 68:24 69:24 70:24 71:24 76:01 - 28 29 30 32 33 34 35 36 37 38 39 40 41 → -0:01 1:24 2:24 3:24 5:24 6:24 7:24 8:24 9:24 19:24 20:24 21:24 22:24 23:24 76:01 - 53 54 55 56 57 58 59 60 61 62 63 64 65 → -0:01 55:24 56:24 57:24 58:24 59:24 76:01 - 77 78 79 80 81 82 83 84 85 86 87 88 89 → -0:01 31:24 32:24 33:24 34:24 35:24 76:01 - 101 (1)02 103 104 105 106 107 108 109 110 111 (11)2 113→ -0:01 5:24 6:24 7:24 8:24 9:24 67:24 68:24 69:24 70:24 71:24 76:01 - 119 (1)20 (1)2(1) (1)22 (1)23 (1)24 (1)25 (1)26 (1)27 (1)28 (1)29 130 131→ -0:01 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 76:01 - 137 138 139 140 141 (1)42 143 144 145 146 147 148 149→ -0:01 31:24 32:24 33:24 34:24 35:24 76:01 + 1 2 3 4 5 6 7 8 9 10 11 (1)2 13 ▸ +0:20 1:07 2:07 3:07 5:24 6:24 7:24 8:24 9:24 67:24 68:24 69:24 70:24 71:24 76:20 + 28 29 30 32 33 34 35 36 37 38 39 40 41 ▸ +0:20 1:24 2:24 3:24 5:24 6:24 7:24 8:24 9:24 19:24 20:24 21:24 22:24 23:24 76:20 + 53 54 55 56 57 58 59 60 61 62 63 64 65 ▸ +0:20 55:24 56:24 57:24 58:24 59:24 76:20 + 77 78 79 80 81 82 83 84 85 86 87 88 89 ▸ +0:20 31:24 32:24 33:24 34:24 35:24 76:20 + 101 (1)02 103 104 105 106 107 108 109 110 111 (11)2 113▸ +0:20 5:24 6:24 7:24 8:24 9:24 67:24 68:24 69:24 70:24 71:24 76:20 + 119 (1)20 (1)2(1) (1)22 (1)23 (1)24 (1)25 (1)26 (1)27 (1)28 (1)29 130 131▸ +0:20 5:24 6:24 7:24 8:24 9:24 11:24 12:24 13:24 14:24 15:24 16:24 17:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 31:24 32:24 33:24 34:24 35:24 37:24 38:24 39:24 40:24 41:24 43:24 44:24 45:24 46:24 47:24 49:24 50:24 51:24 52:24 53:24 55:24 56:24 57:24 58:24 59:24 61:24 62:24 63:24 64:24 65:24 76:20 + 137 138 139 140 141 (1)42 143 144 145 146 147 148 149▸ +0:20 31:24 32:24 33:24 34:24 35:24 76:20 $ $ echo ":$OUT:" diff --git a/tests/substitutions/t0016.good b/tests/substitutions/t0016.good index 22509be..0acc402 100644 --- a/tests/substitutions/t0016.good +++ b/tests/substitutions/t0016.good @@ -2,18 +2,18 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -c -e 2 -E/1/A/g -I/1/B/g -n 6 \ > t0016.in) - B 2 3 4 5 6 7 8 9 B0 BB A2 B3 B4 B5 B6 B7 B8 B9 20→┐ -0:01 1:07 2:07 3:07 5:24 6:24 7:24 45:24 46:24 47:24 76:24 77:24 78:01 79:20 - 28 29 30 32 33 34 35 36 37 38 39 40 4B 42 43 44 45 46 47 48→║ -0:01 1:24 2:24 3:24 5:24 6:24 7:24 13:24 14:24 15:24 53:24 54:24 55:24 78:01 79:20 - 53 54 55 56 57 58 59 60 6B 62 63 64 65 66 67 68 69 70 7B 72→│ -0:01 37:24 38:24 39:24 76:24 77:24 78:01 79:20 - 77 78 79 80 8B 82 83 84 85 86 87 88 89 90 9B 92 93 94 95 96→│ -0:01 21:24 22:24 23:24 61:24 62:24 63:24 78:01 79:20 + B 2 3 4 5 6 7 8 9 B0 BB A2 B3 B4 B5 B6 B7 B8 B9 20▸┐ +0:20 1:07 2:07 3:07 5:24 6:24 7:24 45:24 46:24 47:24 76:24 77:24 78:20 79:20 + 28 29 30 32 33 34 35 36 37 38 39 40 4B 42 43 44 45 46 47 48▸║ +0:20 1:24 2:24 3:24 5:24 6:24 7:24 13:24 14:24 15:24 53:24 54:24 55:24 78:20 79:20 + 53 54 55 56 57 58 59 60 6B 62 63 64 65 66 67 68 69 70 7B 72▸│ +0:20 37:24 38:24 39:24 76:24 77:24 78:20 79:20 + 77 78 79 80 8B 82 83 84 85 86 87 88 89 90 9B 92 93 94 95 96▸│ +0:20 21:24 22:24 23:24 61:24 62:24 63:24 78:20 79:20 B0B A02 B03 B04 B05 B06 B07 B08 B09 BB0 BBB AA2 BB3 BB4 BB5 BB6 BB7 BB8 │ -0:01 5:24 6:24 7:24 45:24 46:24 47:24 79:20 +0:20 5:24 6:24 7:24 45:24 46:24 47:24 79:20 BB9 A20 A2A A22 A23 A24 A25 A26 A27 A28 A29 B30 B3B A32 B33 B34 B35 B36 ▼ -0:01 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 53:24 54:24 55:24 79:20 +0:20 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 53:24 54:24 55:24 79:20 $ $ echo ":$OUT:" diff --git a/tests/substitutions/t0017.good b/tests/substitutions/t0017.good index 7cb042e..671a573 100644 --- a/tests/substitutions/t0017.good +++ b/tests/substitutions/t0017.good @@ -2,18 +2,18 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -c -i 2 -E/1/A/g -I/1/B/g -n 6 \ > t0017.in) - A 2 3 4 5 6 7 8 9 A0 AA B2 A3 A4 A5 A6 A7 A8 A9 20→┐ -0:01 1:24 2:24 3:24 5:07 6:07 7:07 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 78:01 79:20 - 28 29 30 32 33 34 35 36 37 38 39 40 4A 42 43 44 45 46 47 48→║ -0:01 9:24 10:24 11:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 76:24 77:24 78:01 79:20 - 53 54 55 56 57 58 59 60 6A 62 63 64 65 66 67 68 69 70 7A 72→│ -0:01 1:24 2:24 3:24 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 78:01 79:20 - 77 78 79 80 8A 82 83 84 85 86 87 88 89 90 9A 92 93 94 95 96→│ -0:01 1:24 2:24 3:24 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 76:24 77:24 78:01 79:20 + A 2 3 4 5 6 7 8 9 A0 AA B2 A3 A4 A5 A6 A7 A8 A9 20▸┐ +0:20 1:24 2:24 3:24 5:07 6:07 7:07 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 78:20 79:20 + 28 29 30 32 33 34 35 36 37 38 39 40 4A 42 43 44 45 46 47 48▸║ +0:20 9:24 10:24 11:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 76:24 77:24 78:20 79:20 + 53 54 55 56 57 58 59 60 6A 62 63 64 65 66 67 68 69 70 7A 72▸│ +0:20 1:24 2:24 3:24 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 78:20 79:20 + 77 78 79 80 8A 82 83 84 85 86 87 88 89 90 9A 92 93 94 95 96▸│ +0:20 1:24 2:24 3:24 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 76:24 77:24 78:20 79:20 A0A B02 A03 A04 A05 A06 A07 A08 A09 AA0 AAA BB2 AA3 AA4 AA5 AA6 AA7 AA8 │ -0:01 1:24 2:24 3:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 79:20 +0:20 1:24 2:24 3:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 79:20 AA9 B20 B2B B22 B23 B24 B25 B26 B27 B28 B29 A30 A3A B32 A33 A34 A35 A36 ▼ -0:01 1:24 2:24 3:24 45:24 46:24 47:24 49:24 50:24 51:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 79:20 +0:20 1:24 2:24 3:24 45:24 46:24 47:24 49:24 50:24 51:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 79:20 $ $ echo ":$OUT:" diff --git a/tests/substitutions/t0018.good b/tests/substitutions/t0018.good index cd0d1ce..58c99d3 100644 --- a/tests/substitutions/t0018.good +++ b/tests/substitutions/t0018.good @@ -2,18 +2,18 @@ $ OUT=$(LC_ALL=en_US.UTF-8 smenu -c -i 2 -E/1/A/g -I/1/B/g \ > -S/1/C/g -n 6 t0018.in) - C 2 3 4 5 6 7 8 9 C0 CC C2 C3 C4 C5 C6 C7 C8 C9 20→┐ -0:01 1:24 2:24 3:24 5:07 6:07 7:07 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 78:01 79:20 - 28 29 30 32 33 34 35 36 37 38 39 40 4C 42 43 44 45 46 47 48→║ -0:01 9:24 10:24 11:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 76:24 77:24 78:01 79:20 - 53 54 55 56 57 58 59 60 6C 62 63 64 65 66 67 68 69 70 7C 72→│ -0:01 1:24 2:24 3:24 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 78:01 79:20 - 77 78 79 80 8C 82 83 84 85 86 87 88 89 90 9C 92 93 94 95 96→│ -0:01 1:24 2:24 3:24 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 76:24 77:24 78:01 79:20 + C 2 3 4 5 6 7 8 9 C0 CC C2 C3 C4 C5 C6 C7 C8 C9 20▸┐ +0:20 1:24 2:24 3:24 5:07 6:07 7:07 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 78:20 79:20 + 28 29 30 32 33 34 35 36 37 38 39 40 4C 42 43 44 45 46 47 48▸║ +0:20 9:24 10:24 11:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 76:24 77:24 78:20 79:20 + 53 54 55 56 57 58 59 60 6C 62 63 64 65 66 67 68 69 70 7C 72▸│ +0:20 1:24 2:24 3:24 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 78:20 79:20 + 77 78 79 80 8C 82 83 84 85 86 87 88 89 90 9C 92 93 94 95 96▸│ +0:20 1:24 2:24 3:24 5:24 6:24 7:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 45:24 46:24 47:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 65:24 66:24 67:24 69:24 70:24 71:24 73:24 74:24 76:24 77:24 78:20 79:20 C0C C02 C03 C04 C05 C06 C07 C08 C09 CC0 CCC CC2 CC3 CC4 CC5 CC6 CC7 CC8 │ -0:01 1:24 2:24 3:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 79:20 +0:20 1:24 2:24 3:24 9:24 10:24 11:24 13:24 14:24 15:24 17:24 18:24 19:24 21:24 22:24 23:24 25:24 26:24 27:24 29:24 30:24 31:24 33:24 34:24 35:24 37:24 38:24 39:24 41:24 42:24 43:24 49:24 50:24 51:24 53:24 54:24 55:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 79:20 CC9 C20 C2C C22 C23 C24 C25 C26 C27 C28 C29 C30 C3C C32 C33 C34 C35 C36 ▼ -0:01 1:24 2:24 3:24 45:24 46:24 47:24 49:24 50:24 51:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 79:20 +0:20 1:24 2:24 3:24 45:24 46:24 47:24 49:24 50:24 51:24 57:24 58:24 59:24 61:24 62:24 63:24 65:24 66:24 67:24 69:24 70:24 71:24 79:20 $ $ echo ":$OUT:" -- cgit v1.2.3