colorize: don't print an id in osc8 terminator

Printing an ID in the OSC8 terminator can cause issues in some pagers
and/or terminals. The "spec" doesn't allow for an ID in the terminator,
but most applications and terminals will ignore it if it's there.
Prevent printing it in the first place for better compatibility.

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Signed-off-by: Robin Jarry <robin@jarry.cc>
Acked-by: Robin Jarry <robin@jarry.cc>

3 files changed, 13 insertions, 9 deletions

diff --git a/filters/colorize.c b/filters/colorize.c
index 8e0cc3c7..51bcdbe9 100644
--- a/filters/colorize.c
+++ b/filters/colorize.c
@@ -415,12 +415,16 @@ static inline size_t print_notabs(const char *in, size_t max_len)
 }
 
 static void print_osc8(const char *url, size_t len, size_t id, bool email) {
-	printf("\x1b]8;id=colorize-%lu;", id);
+	print("\x1b]8;");
 	if (url != NULL) {
+		printf("id=colorize-%lu;", id);
 		if (email) {
 			print("mailto://");
 		}
 		print_notabs(url, len);
+	} else {
+		/* do not print and url id for the terminator */
+		print(";");
 	}
 	print("\x1b\\");
 }
diff --git a/filters/vectors/colorize-patch.expected b/filters/vectors/colorize-patch.expected
index 619e118f..e9124672 100644
--- a/filters/vectors/colorize-patch.expected
+++ b/filters/vectors/colorize-patch.expected
@@ -1,11 +1,11 @@
-From: Robin Jarry <]8;id=colorize-0;mailto://robin@jarry.cc\robin@jarry.cc]8;id=colorize-0;\>
+From: Robin Jarry <]8;id=colorize-0;mailto://robin@jarry.cc\robin@jarry.cc]8;;\>
 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 <]8;id=colorize-1;mailto://robin@jarry.cc\robin@jarry.cc]8;id=colorize-1;\>
+Signed-off-by: Robin Jarry <]8;id=colorize-1;mailto://robin@jarry.cc\robin@jarry.cc]8;;\>
 ---
  doc/aerc-stylesets.7.scd | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/filters/vectors/colorize-quotes.expected b/filters/vectors/colorize-quotes.expected
index c136fcb0..5cb4dacc 100644
--- a/filters/vectors/colorize-quotes.expected
+++ b/filters/vectors/colorize-quotes.expected
@@ -17,10 +17,10 @@ nibh petentium at! Sit docendi laboramus ei, animal insolens ad mea.
 > 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;id=colorize-0;\> && "]8;id=colorize-1;https://foobaz.org/\https://foobaz.org/]8;id=colorize-1;\".
+> 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;id=colorize-2;\](]8;id=colorize-3;https://pouet.com/oksuper\https://pouet.com/oksuper]8;id=colorize-3;\).
+> 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
@@ -47,17 +47,17 @@ facilisi et pri http:// or https://!
 >          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;id=colorize-4;\.
+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;;\.
 Has putent verterem constituto ex, tale electram duo at! Ei nulla lucilius
 intellegat nam, pro quod epicuri dissentiet ut, omnis voluptatibus definitiones
-vim at []8;id=colorize-5;irc://foo.bar\irc://foo.bar]8;id=colorize-5;\] <]8;id=colorize-6;mailto://jeanpierre@foobaz.org\jeanpierre@foobaz.org]8;id=colorize-6;\>.
+vim at []8;id=colorize-5;irc://foo.bar\irc://foo.bar]8;;\] <]8;id=colorize-6;mailto://jeanpierre@foobaz.org\jeanpierre@foobaz.org]8;;\>.
 
-]8;id=colorize-7;https://git-man-page-generator.lokaltog.net/#Y2xhcCQkY29tbWFuZA==\https://git-man-page-generator.lokaltog.net/#Y2xhcCQkY29tbWFuZA==]8;id=colorize-7;\
+]8;id=colorize-7;https://git-man-page-generator.lokaltog.net/#Y2xhcCQkY29tbWFuZA==\https://git-man-page-generator.lokaltog.net/#Y2xhcCQkY29tbWFuZA==]8;;\
 
 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 ]8;id=colorize-8;https://foobaz.com/ooo<uuuu>okf\https://foobaz.com/ooo<uuuu>okf]8;id=colorize-8;\?
+has labore quidam ]8;id=colorize-8;https://foobaz.com/ooo<uuuu>okf\https://foobaz.com/ooo<uuuu>okf]8;;\?
 
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> sympa, non?