Improves fuzzy and substring search

Leading and trailing blanks are now ignored.

6 files changed, 17 insertions, 17 deletions

diff --git a/tests/search/t0021.good b/tests/search/t0021.good
index 5ac53da..9616170 100644
--- a/tests/search/t0021.good
+++ b/tests/search/t0021.good
@@ -1,11 +1,11 @@
 $ OUT=$(smenu -n 18 t0021.in)
 
 c b  bcac cabab  baac c aaa ab  a ab    bcaa   a  bb b b ba  c aa   cb 
-24:07 25:07 26:07 27:07 28:0723 29:0723 47:23 51:23 64:23 69:23 
+10:07 11:07 12:07 13:0723 14:0723 15:07 28:23 29:23 34:23 35:23 47:23 51:23 64:23 69:23 
  aaaab aa ba b ab     aaab cbbcaca babb cabbcaaca b cba   babbbbbc aababc b a 
-24:23 25:23 36:23 38:23 
+15:23 16:23 24:23 25:23 36:23 38:23 
 bcabcccc ca  ba aca a  a ab    b aac bb c  c a a b  a a ba  acb cabaabcca  b 
-34:23 38:23 
+25:23 26:23 34:23 38:23 
 ca a b aa cbccca a a  cb a bb bbbac bbc c  cc c   bacb bcacabaa ac 
 19:23 23:23 
 b babaa  a  a  cbacac a   a  aac  c  a aaaca bb a caa cba  b   b  abcbb  c 
@@ -17,13 +17,13 @@ ca        c  aaa c  cca  a bb   b ac  c  b c ca b  babbc   cc a cbab
 baaa cc a baabbcac a b bbc  bc bcbcac bba bc   b  a b    cbb  cbbc b acba  a 
 50:23 52:23 
 a a  caabbbbb c ba bcb   ca cbccac  abb aba  cc bbb ba cbc cab b cbaab  
-7:23 12:23 36:23 38:23 42:23 50:23 60:23 63:23 
+7:23 12:23 36:23 38:23 42:23 50:23 60:23 63:23 68:23 69:23 
 c b cbb 
 
 $ 
 
 $ echo ":$OUT:"
 
-:aaa ab:
+:cabab:
 
 $ exit 0
diff --git a/tests/search/t0022.good b/tests/search/t0022.good
index 10705e9..3b88aeb 100644
--- a/tests/search/t0022.good
+++ b/tests/search/t0022.good
@@ -1,23 +1,23 @@
 $ OUT=$(smenu -n 18 t0022.in)
 
 c b  bcac cabab  baac c aaa ab  a ab    bcaa   a  bb b b ba  c aa   cb 
-24:0723 25:07 26:07 27:07 28:07 29:0723 63:23 69:23 
+24:0723 25:07 26:07 27:07 28:07 29:0723 32:23 35:23 63:23 69:23 
  aaaab aa ba b ab     aaab cbbcaca babb cabbcaaca b cba   babbbbbc aababc b a 
-15:23 16:23 67:23 69:23 
+1:23 5:23 15:23 16:23 22:23 25:23 67:23 69:23 
 bcabcccc ca  ba aca a  a ab    b aac bb c  c a a b  a a ba  acb cabaabcca  b 
 23:23 26:23 33:23 37:23 54:23 56:23 60:23 62:23 
 ca a b aa cbccca a a  cb a bb bbbac bbc c  cc c   bacb bcacabaa ac 
 19:23 23:23 
 b babaa  a  a  cbacac a   a  aac  c  a aaaca bb a caa cba  b   b  abcbb  c 
-66:23 67:23 
+37:23 45:23 66:23 67:23 
 babc c a c   b b  b ccca b ab ab ba cacc ba bcc cacbb  cbba ca 
 27:23 28:23 30:23 31:23 
 ca        c  aaa c  cca  a bb   b ac  c  b c ca b  babbc   cc a cbab 
 
 baaa cc a baabbcac a b bbc  bc bcbcac bba bc   b  a b    cbb  cbbc b acba  a 
-69:23 71:23 
+50:23 52:23 69:23 71:23 
 a a  caabbbbb c ba bcb   ca cbccac  abb aba  cc bbb ba cbc cab b cbaab  
-40:23 41:23 
+36:23 37:23 40:23 41:23 
 c b cbb 
 
 $ 
diff --git a/tests/search/t0023.good b/tests/search/t0023.good
index 3e3174f..ac03c4a 100644
--- a/tests/search/t0023.good
+++ b/tests/search/t0023.good
@@ -11,11 +11,11 @@ $ OUT=$(smenu -k -n 18 -T \| t0023.in)
 àùù€ç €€çç€    é  éù退 €ùé   çéé€ù é à€à  ùù é àé€ç€ ààçà  éàçùç ç€ùç€  € àé 
 18:04 19:04 20:0423 21:04 22:0423 48:04 49:0423 50:04 51:04 52:0423 
 éàà   €çéé€ ù€€ùà ç €ù€  éç€  
-6:04 7:04 8:04 9:0423 10:0423 
+6:04 7:04 8:04 9:0423 10:0423 24:04 25:0423 26:04 27:0423 28:04 
 $ 
 
 $ echo ":$OUT:"
 
-:éç退|ùé à€|€é à€|ùù退|€ éù€|éù退|àé€ç€|€çéé€:
+:éç退|ùé à€|€é à€|ùù退|€ éù€|éù退|àé€ç€|€çéé€| éç€ :
 
 $ exit 0
diff --git a/tests/search/t0024.good b/tests/search/t0024.good
index 59c509d..6aea485 100644
--- a/tests/search/t0024.good
+++ b/tests/search/t0024.good
@@ -11,11 +11,11 @@ $ OUT=$(smenu -k -n 18 -T \| t0024.in)
 àùù€ç €€çç€    é  éù退 €ùé   çéé€ù é à€à  ùù é àé€ç€ ààçà  éàçùç ç€ùç€  € àé 
 18:0423 19:04 20:04 21:0423 22:04 36:0423 37:04 38:04 39:0423 40:04 
 éàà   €çéé€ ù€€ùà ç €ù€  éç€  
-
+24:04 25:0423 26:04 27:0423 28:04 
 $ 
 
 $ echo ":$OUT:"
 
-:éùé€ù|éç退|é€ùàà|éà€ùé|éù退|é à€à:
+:éùé€ù|éç退|é€ùàà|éà€ùé|éù退|é à€à| éç€ :
 
 $ exit 0
diff --git a/tests/search/t0026.good b/tests/search/t0026.good
index 5c1751a..3013b5e 100644
--- a/tests/search/t0026.good
+++ b/tests/search/t0026.good
@@ -1,7 +1,7 @@
 $ OUT=$(smenu -n 0 -N -- t0026.in)
 
  1) ab  2) ababab  3) abxab  4)  abab  5) abab   6)  abab  
-0:01 1:01 2:01 4:0723 5:0723 7:01 8:01 9:01 15:23 16:23 18:01 19:01 20:01 25:23 26:23 28:01 29:01 30:01 35:23 36:23 38:01 39:01 40:01 48:01 49:01 50:01 
+0:01 1:01 2:01 4:0723 5:0723 7:01 8:01 9:01 15:23 16:23 18:01 19:01 20:01 25:23 26:23 28:01 29:01 30:01 35:23 36:23 38:01 39:01 40:01 44:23 45:23 48:01 49:01 50:01 55:23 56:23 
 $ 
 
 $ echo ":$OUT:"
diff --git a/tests/search/t0027.good b/tests/search/t0027.good
index 5b0621f..6ee632e 100644
--- a/tests/search/t0027.good
+++ b/tests/search/t0027.good
@@ -9,9 +9,9 @@ $ OUT=$(smenu -n 0 -N -c t0027.in)
  4)  abab  
 0:01 1:01 2:01 7:23 8:23 
  5) abab   
-0:01 1:01 2:01 
+0:01 1:01 2:01 6:23 7:23 
  6)  abab  
-0:01 1:01 2:01 
+0:01 1:01 2:01 7:23 8:23 
 $ 
 
 $ echo ":$OUT:"