colorize: restore previous default theme

Restore the default theme from the previous colorize awk script. It is
more colorful and may be more appealing to new users out of the box.
Since colorize is now configurable via stylesets, power users can do
whatever they like.

Requested-by: Andrea Pappacoda <andrea@pappacoda.it>
Signed-off-by: Robin Jarry <robin@jarry.cc>
Agreed-by: Bence Ferdinandy <bence@ferdinandy.com>

6 files changed, 122 insertions, 122 deletions

diff --git a/filters/colorize.c b/filters/colorize.c
index dcc486b6..307fe190 100644
--- a/filters/colorize.c
+++ b/filters/colorize.c
@@ -154,18 +154,18 @@ struct styles {
 static FILE *in_file;
 static const char *styleset;
 static struct styles styles = {
-	.url = { .underline = 1 },
-	.header = { .bold = 1 },
-	.signature = { .dim = 1 },
-	.diff_meta = { .bold = 1 },
-	.diff_chunk = { .dim = 1 },
-	.diff_add = { .fg = { .type = PALETTE, .index = 2 } },
-	.diff_del = { .fg = { .type = PALETTE, .index = 1 } },
-	.quote_1 = { .fg = { .type = PALETTE, .index = 6 } },
-	.quote_2 = { .fg = { .type = PALETTE, .index = 6 }, .dim = 1 },
-	.quote_3 = { .fg = { .type = PALETTE, .index = 6 }, .dim = 1 },
-	.quote_4 = { .fg = { .type = PALETTE, .index = 6 }, .dim = 1 },
-	.quote_x = { .fg = { .type = PALETTE, .index = 6 }, .dim = 1 },
+	.url = { .underline = 1, .fg = { .type = RGB, .rgb = 0xffffaf } },
+	.header = { .bold = 1, .fg = { .type = RGB, .rgb = 0xaf87ff } },
+	.signature = { .dim = 1, .fg = { .type = RGB, .rgb = 0xaf87ff } },
+	.diff_meta = { .bold = 1, .fg = { .type = RGB, .rgb = 0xffffff } },
+	.diff_chunk = { .fg = { .type = RGB, .rgb = 0x00cdcd } },
+	.diff_add = { .fg = { .type = RGB, .rgb = 0x00cd00 } },
+	.diff_del = { .fg = { .type = RGB, .rgb = 0xcd0000 } },
+	.quote_1 = { .fg = { .type = RGB, .rgb = 0x5fafff } },
+	.quote_2 = { .fg = { .type = RGB, .rgb = 0xff8700 } },
+	.quote_3 = { .fg = { .type = RGB, .rgb = 0xaf87ff } },
+	.quote_4 = { .fg = { .type = RGB, .rgb = 0xff5fd7 } },
+	.quote_x = { .fg = { .type = RGB, .rgb = 0x808080 } },
 };
 
 static inline int startswith(const char *s, const char *prefix)
diff --git a/filters/vectors/colorize-patch.expected b/filters/vectors/colorize-patch.expected
index 1a2144a0..de3f2399 100644
--- a/filters/vectors/colorize-patch.expected
+++ b/filters/vectors/colorize-patch.expected
@@ -1,49 +1,49 @@
-From: Robin Jarry <robin@jarry.cc>
-Date: Mon, 26 Dec 2022 17:02:14 +0100
-Subject: [PATCH aerc] doc: fix numbered lists
+From: Robin Jarry <robin@jarry.cc>
+Date: Mon, 26 Dec 2022 17:02:14 +0100
+Subject: [PATCH aerc] doc: fix numbered lists
 
 According to scdoc(5), numbered lists start with a period.
 
-Fixes: af63bd0188d1 ("doc: homogenize scdoc markup")
-Signed-off-by: Robin Jarry <robin@jarry.cc>
+Fixes: af63bd0188d1 ("doc: homogenize scdoc markup")
+Signed-off-by: Robin Jarry <robin@jarry.cc>
 ---
  doc/aerc-stylesets.7.scd | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
-diff --git a/doc/aerc-stylesets.7.scd b/doc/aerc-stylesets.7.scd
-index d82ba7cf8163..34bbf4af0fc5 100644
---- a/doc/aerc-stylesets.7.scd
-+++ b/doc/aerc-stylesets.7.scd
-@@ -180,20 +180,20 @@ that style applies, unless overridden by a higher layer.
+diff --git a/doc/aerc-stylesets.7.scd b/doc/aerc-stylesets.7.scd
+index d82ba7cf8163..34bbf4af0fc5 100644
+--- a/doc/aerc-stylesets.7.scd
++++ b/doc/aerc-stylesets.7.scd
+@@ -180,20 +180,20 @@ that style applies, unless overridden by a higher layer.
  
  The order that *msglist_\** styles are applied in is, from first to last:
  
--1. *msglist_default*
--2. *msglist_unread*
--3. *msglist_read*
--4. *msglist_flagged*
--5. *msglist_deleted*
--6. *msglist_marked*
-+. *msglist_default*
-+. *msglist_unread*
-+. *msglist_read*
-+. *msglist_flagged*
-+. *msglist_deleted*
-+. *msglist_marked*
+-1. *msglist_default*
+-2. *msglist_unread*
+-3. *msglist_read*
+-4. *msglist_flagged*
+-5. *msglist_deleted*
+-6. *msglist_marked*
++. *msglist_default*
++. *msglist_unread*
++. *msglist_read*
++. *msglist_flagged*
++. *msglist_deleted*
++. *msglist_marked*
  
  So, the marked style will override all other msglist styles.
  
  The order for *dirlist_\** styles is:
  
--1. *dirlist_default*
--2. *dirlist_unread*
--3. *dirlist_recent*
-+. *dirlist_default*
-+. *dirlist_unread*
-+. *dirlist_recent*
+-1. *dirlist_default*
+-2. *dirlist_unread*
+-3. *dirlist_recent*
++. *dirlist_default*
++. *dirlist_unread*
++. *dirlist_recent*
  
  ## COLORS
  
--- 
-2.39.0
-
+-- 
+2.39.0
+
diff --git a/filters/vectors/colorize-quotes.expected b/filters/vectors/colorize-quotes.expected
index d350e4f1..6e71d60a 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 <https://foobar.com> && "https://foobaz.org/".
->
-> Error libris deleniti ea mei, vis at elit probo munere, his sint unum
-> albucius ex.
+>> 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 <https://foobar.com> && "https://foobaz.org/".
+>
+> Error libris deleniti ea mei, vis at elit probo munere, his sint unum
+> albucius ex.
 
 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!
 
-> 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 pericula assueverit vel.
@@ -52,14 +52,14 @@ Has putent verterem constituto ex, tale electram duo at! Ei nulla lucilius
 intellegat nam, pro quod epicuri dissentiet ut, omnis voluptatibus definitiones
 vim at.
 
-https://git-man-page-generator.lokaltog.net/#Y2xhcCQkY29tbWFuZA==
+https://git-man-page-generator.lokaltog.net/#Y2xhcCQkY29tbWFuZA==
 
 Eam mundi libris debitis ad, eam regione numquam at. Eum omnes bonorum eu,
 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?
 
->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> sympa, non?
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> sympa, non?
 
--- 
-Batman
+-- 
+Batman
diff --git a/stylesets/blue b/stylesets/blue
index 7ae019d2..c3e8c47e 100644
--- a/stylesets/blue
+++ b/stylesets/blue
@@ -46,18 +46,18 @@ default.selected.bg=#005f87
 
 completion_default.selected.bg=#005f87
 
-[viewer]
-url.fg=#ffffaf
-url.underline=true
-header.fg=#af87ff
-signature.fg=#af87ff
-diff_meta.fg=#ffffff
-diff_meta.bold=true
-diff_chunk.fg=#00cdcd
-diff_add.fg=#00cd00
-diff_del.fg=#cd0000
-quote_1.fg=#5fafff
-quote_2.fg=#ff8700
-quote_3.fg=#af87ff
-quote_4.fg=#ff5fd7
-quote_x.fg=#808080
+#[viewer]
+#url.fg=#ffffaf
+#url.underline=true
+#header.fg=#af87ff
+#signature.fg=#af87ff
+#diff_meta.fg=#ffffff
+#diff_meta.bold=true
+#diff_chunk.fg=#00cdcd
+#diff_add.fg=#00cd00
+#diff_del.fg=#cd0000
+#quote_1.fg=#5fafff
+#quote_2.fg=#ff8700
+#quote_3.fg=#af87ff
+#quote_4.fg=#ff5fd7
+#quote_x.fg=#808080
diff --git a/stylesets/default b/stylesets/default
index 5ee1c4e0..19eeb03d 100644
--- a/stylesets/default
+++ b/stylesets/default
@@ -36,14 +36,14 @@ border.reverse = true
 selector_focused.reverse=true
 selector_chooser.bold=true
 
-[viewer]
-url.underline=true
-header.bold=true
-signature.dim=true
-diff_meta.bold=true
-diff_chunk.dim=true
-diff_add.fg=2
-diff_del.fg=1
-quote_*.fg=6
-quote_*.dim=true
-quote_1.dim=false
+#[viewer]
+#url.underline=true
+#header.bold=true
+#signature.dim=true
+#diff_meta.bold=true
+#diff_chunk.dim=true
+#diff_add.fg=2
+#diff_del.fg=1
+#quote_*.fg=6
+#quote_*.dim=true
+#quote_1.dim=false
diff --git a/stylesets/pink b/stylesets/pink
index 792771a2..eb76a3f6 100644
--- a/stylesets/pink
+++ b/stylesets/pink
@@ -48,18 +48,18 @@ default.selected.bg=#de4e85
 
 completion_default.selected.bg=#de4e85
 
-[viewer]
-url.fg=#ffffaf
-url.underline=true
-header.fg=#af87ff
-signature.fg=#af87ff
-diff_meta.fg=#ffffff
-diff_meta.bold=true
-diff_chunk.fg=#00cdcd
-diff_add.fg=#00cd00
-diff_del.fg=#cd0000
-quote_1.fg=#5fafff
-quote_2.fg=#ff8700
-quote_3.fg=#af87ff
-quote_4.fg=#ff5fd7
-quote_x.fg=#808080
+#[viewer]
+#url.fg=#ffffaf
+#url.underline=true
+#header.fg=#af87ff
+#signature.fg=#af87ff
+#diff_meta.fg=#ffffff
+#diff_meta.bold=true
+#diff_chunk.fg=#00cdcd
+#diff_add.fg=#00cd00
+#diff_del.fg=#cd0000
+#quote_1.fg=#5fafff
+#quote_2.fg=#ff8700
+#quote_3.fg=#af87ff
+#quote_4.fg=#ff5fd7
+#quote_x.fg=#808080