colorize: accept wildcards in styles

Allow using * and ? to match multiple style objects for colorize, as
stated in the man page and consistent with aerc's main styles.

Fixes: a5c4f5d (colorize: handle spaces in styleset)
Signed-off-by: Jason Cox <me@jasoncarloscox.com>
Acked-by: Robin Jarry <robin@jarry.cc>

3 files changed, 40 insertions, 36 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc615f35..0f97738c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased](https://git.sr.ht/~rjarry/aerc/log/master)
 
+### Fixed
+
+- `colorize` styles can include wildcards `?` and `*`
+
 ## [0.16.0](https://git.sr.ht/~rjarry/aerc/refs/0.16.0) - 2023-09-27
 
 ### Added
diff --git a/filters/colorize.c b/filters/colorize.c
index 03f0fc75..d447dcb1 100644
--- a/filters/colorize.c
+++ b/filters/colorize.c
@@ -337,7 +337,7 @@ static struct {const char *n; struct style *s;} ini_objects[] = {
 };
 
 /*                         object            attribute           value */
-#define STYLE_LINE_FORMAT "%127[0-9A-Za-z_-].%127[0-9a-zA-Z_-] = %127[#a-zA-Z0-9]s"
+#define STYLE_LINE_FORMAT "%127[0-9A-Za-z_-*?].%127[0-9a-zA-Z_-] = %127[#a-zA-Z0-9]s"
 
 static int parse_styleset(void)
 {
diff --git a/filters/vectors/colorize-quotes.expected b/filters/vectors/colorize-quotes.expected
index a5d13e00..16a29c2c 100644
--- a/filters/vectors/colorize-quotes.expected
+++ b/filters/vectors/colorize-quotes.expected
@@ -1,26 +1,26 @@
 Foo Bar, xxxxx:
-> Lorem ipsum dolor sit amet, insolens adolescens ne usu? In pri denique
-> argumentum, te autem decore convenire mea! Duo nisl esse an, aliquid
-> conceptam sea cu. Ignota copiosae gubergren ad est, ut illum doming vocibus
-> sed. Et vis nulla expetendis mediocritatem, errem option gloriatur at nam?
-> Brute vidisse corpora ut his, sonet omnesque adipiscing ea quo, cum ea errem
-> aliquip reformidans?
+> Lorem ipsum dolor sit amet, insolens adolescens ne usu? In pri denique
+> argumentum, te autem decore convenire mea! Duo nisl esse an, aliquid
+> conceptam sea cu. Ignota copiosae gubergren ad est, ut illum doming vocibus
+> sed. Et vis nulla expetendis mediocritatem, errem option gloriatur at nam?
+> Brute vidisse corpora ut his, sonet omnesque adipiscing ea quo, cum ea errem
+> aliquip reformidans?
 
 Magna delicatissimi ei vel? Quem petentium scribentur eum ne? Et inani debet
 cetero mea, sint conceptam efficiendi mel te. Qui ut senserit interesset, per
 nibh petentium at! Sit docendi laboramus ei, animal insolens ad mea.
 
->> Nostrud alienum nec in, illum errem audiam no per! Saepe alterum vis ea! Ei
->> quis minim ius, ut eos mandamus salutandi. Lorem facilisis in nam, ridens
->> principes sadipscing et eum, pri graecis singulis ut. Mea dolor primis
->> impetus in, his epicurei tacimates id, vis labitur suscipit ad.
-> Erat alienum interpretaris has et, te vim aliquam molestie. Nam vivendum
-> facilisis qualisque at, ex his mucius qualisque! Fabulas lucilius adversarium
-> eu his. Cu soluta inermis accusata usu, his nulla dolore ne, vis id semper
-> detracto sententia <]8;id=colorize-0;https://foobar.com\https://foobar.com]8;;\> && "]8;id=colorize-1;https://foobaz.org/\https://foobaz.org/]8;;\".
->
-> Error libris deleniti ea mei, vis at elit probo munere, his sint unum
-> albucius ex. []8;id=colorize-2;https://pouet.com/oksuper\https://pouet.com/oksuper]8;;\](]8;id=colorize-3;https://pouet.com/oksuper\https://pouet.com/oksuper]8;;\).
+>> Nostrud alienum nec in, illum errem audiam no per! Saepe alterum vis ea! Ei
+>> quis minim ius, ut eos mandamus salutandi. Lorem facilisis in nam, ridens
+>> principes sadipscing et eum, pri graecis singulis ut. Mea dolor primis
+>> impetus in, his epicurei tacimates id, vis labitur suscipit ad.
+> Erat alienum interpretaris has et, te vim aliquam molestie. Nam vivendum
+> facilisis qualisque at, ex his mucius qualisque! Fabulas lucilius adversarium
+> eu his. Cu soluta inermis accusata usu, his nulla dolore ne, vis id semper
+> detracto sententia <]8;id=colorize-0;https://foobar.com\https://foobar.com]8;;\> && "]8;id=colorize-1;https://foobaz.org/\https://foobaz.org/]8;;\".
+>
+> Error libris deleniti ea mei, vis at elit probo munere, his sint unum
+> albucius ex. []8;id=colorize-2;https://pouet.com/oksuper\https://pouet.com/oksuper]8;;\](]8;id=colorize-3;https://pouet.com/oksuper\https://pouet.com/oksuper]8;;\).
 
 Graece definiebas scripserit ne est? Nec nonumes explicari contentiones ne,
 vocent iuvaret placerat no vix. Nec et partem salutandi deseruisse, his no
@@ -28,23 +28,23 @@ possim malorum pericula. Te quando reprehendunt nam, at consul sadipscing vel?
 Velit possim aliquando ei per, ne simul quodsi antiopam sea, ullum choro
 facilisi et pri http:// or https://!
 
-> Dico soleat partem ea pro, ad vix impetus splendide. Primis melius principes
-> pri ad, tacimates pertinacia ei pro? Appareat atomorum oportere at nam, eu
-> per quod minim reprimique, ornatus graecis ad vel. Malis vulputate ea qui,
-> eum tacimates recteque et, usu ea dolore vidisse. Brute mediocrem molestiae
-> sed te. No stet prompta pri, rebum populo nominati eos te.
->
-> diff --git a/foo b/foo
-> index 4b0fe8dded3a..518b67134639 100644
-> --- a/foo
-> +++ b/foo
-> @@ -131,6 +131,83 @@ func pouet() int {
->          err := doThis()
->  
-> -        err2 := doThat()
-> +        err2 := notDoThat()
->  
->          if err != nil || err2 != nil {
+> Dico soleat partem ea pro, ad vix impetus splendide. Primis melius principes
+> pri ad, tacimates pertinacia ei pro? Appareat atomorum oportere at nam, eu
+> per quod minim reprimique, ornatus graecis ad vel. Malis vulputate ea qui,
+> eum tacimates recteque et, usu ea dolore vidisse. Brute mediocrem molestiae
+> sed te. No stet prompta pri, rebum populo nominati eos te.
+>
+> diff --git a/foo b/foo
+> index 4b0fe8dded3a..518b67134639 100644
+> --- a/foo
+> +++ b/foo
+> @@ -131,6 +131,83 @@ func pouet() int {
+>          err := doThis()
+>  
+> -        err2 := doThat()
+> +        err2 := notDoThat()
+>  
+>          if err != nil || err2 != nil {
 
 Id vix referrentur philosophia, veri labores an nec. Noster denique no duo, sit
 ei diam inermis vocibus! Mutat principes ex pro, at ]8;id=colorize-4;mailto://~rjarry/aerc-devel@lists.sr.ht\~rjarry/aerc-devel@lists.sr.ht]8;;\.
@@ -59,7 +59,7 @@ oporteat assueverit disputationi nam ne, nonumes iracundia mea ad! Duo libris
 recusabo id, ceteros salutatus inciderint vim ea. Et graeco reformidans vel? Ei
 has labore quidam ]8;id=colorize-8;https://foobaz.com/ooo<uuuu>okf\https://foobaz.com/ooo<uuuu>okf]8;;\?
 
->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> sympa, non?
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> sympa, non?
 
 -- 
 Batman