listamsb: add colorization.

4 files changed, 56 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 6403549..ed99125 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,8 @@ CFLAGS=-Wall $(COPT) -ansi -D_GNU_SOURCE -DVERSION=\"$(VERSION)\"
 
 # BINS and SCRIPTS go in $BINDIR, DOCS go in $DOCDIR
 BINS=a8eol atr2xfd atrsize axe blob2c blob2xex cart2xex cxrefbas dumpbas fenders protbas renumbas rom2cart unmac65 unprotbas vxrefbas xex1to2 xexamine xexcat xexsplit xfd2atr listbas a8cat a8xd whichbas bas2aplus listamsb
-SCRIPTS=dasm2atasm diffbas a8diff
-MANS=a8eol.1 xfd2atr.1 atr2xfd.1 blob2c.1 cart2xex.1 fenders.1 xexsplit.1 xexcat.1 atrsize.1 rom2cart.1 unmac65.1 axe.1 dasm2atasm.1 blob2xex.1 xexamine.1 xex1to2.1 unprotbas.1 protbas.1 renumbas.1 dumpbas.1 vxrefbas.1 cxrefbas.1 listbas.1 a8cat.1 a8xd.1 whichbas.1 diffbas.1 a8diff.1 bas2aplus.1 listamsb.1
+SCRIPTS=dasm2atasm diffbas a8diff colorize-amsb
+MANS=a8eol.1 xfd2atr.1 atr2xfd.1 blob2c.1 cart2xex.1 fenders.1 xexsplit.1 xexcat.1 atrsize.1 rom2cart.1 unmac65.1 axe.1 dasm2atasm.1 blob2xex.1 xexamine.1 xex1to2.1 unprotbas.1 protbas.1 renumbas.1 dumpbas.1 vxrefbas.1 cxrefbas.1 listbas.1 a8cat.1 a8xd.1 whichbas.1 diffbas.1 a8diff.1 bas2aplus.1 listamsb.1 colorize-amsb.1
 MAN5S=xex.5
 MAN7S=atascii.7 fauxtari.7 amsb.7
 DOCS=README.txt CHANGES.txt equates.inc *.dasm LICENSE ksiders/atr.txt
diff --git a/listamsb.1 b/listamsb.1
index 63e29af..009b5a8 100644
--- a/listamsb.1
+++ b/listamsb.1
@@ -27,12 +27,12 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "LISTAMSB" 1 "2025-03-12" "0.2.2" "Urchlay's Atari 8-bit Tools"
+.TH "LISTAMSB" 1 "2025-03-17" "0.2.2" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 listamsb \- List the source of a tokenized Atari Microsoft BASIC program
 .SH SYNOPSIS
 .sp
-listamsb [\fB\-U\fP] | [\fB\-C\fP [\fB\-k\fP]] | [\fB\-D\fP] | [[\fB\-L\fP] [\fB\-a\fP] [\fB\-c\fP] [\fB\-v\fP] [\fB\-h\fP] [\fB\-i\fP] [\fB\-u\fP] [\fB\-t\fP] [\fB\-m\fP] [\fB\-n\fP] [\fB\-s\fP] [\fB\-r\fP \fIline\-range\fP] ...] [\fBinput\-file\fP] [\fBoutput\-file\fP]
+listamsb [\fB\-U\fP] | [\fB\-C\fP [\fB\-k\fP]] | [\fB\-D\fP] | [[\fB\-L\fP] [\fB\-a\fP] [\fB\-c\fP] [\fB\-v\fP] [\fB\-h\fP] [\fB\-i\fP] [\fB\-u\fP] [\fB\-t\fP] [\fB\-m\fP] [\fB\-M\fP] [\fB\-n\fP] [\fB\-s\fP] [\fB\-r\fP \fIline\-range\fP] ...] [\fBinput\-file\fP] [\fBoutput\-file\fP]
 .SH DESCRIPTION
 .sp
 \fBlistamsb\fP acts like the \fILIST\fP command in Atari Microsoft BASIC. It reads a
@@ -62,6 +62,9 @@ When listing a program to \fBstdout\fP, output is piped through
 human\-readable on modern terminals. This means \fBa8cat\fP must be
 available in your \fBPATH\fP\&. If this is not convenient, you can set
 the location of \fBa8cat\fP via the \fBA8CAT\fP environment variable.
+When listing in color (when the \fB\-M\fP option is not used), \fBa8cat\fP\(aqs
+output is piped through \fBcolorize\-amsb\fP, which also must be available
+in your \fBPATH\fP\&.
 .sp
 \fBlistamsb\fP will not write binary data (ATASCII or tokenized BASIC)
 directly to a terminal, under any circumstances.
@@ -118,7 +121,7 @@ or \fB\-U\fP\&.
 .B \fB\-a\fP
 Output raw ATASCII. This option must be used with an
 \fBoutput\-file\fP, a pipe, or redirection: \fBlistamsb\fP will not write
-ATASCII to a terminal. \fBa8cat\fP is not used, with this option.
+ATASCII to a terminal. \fBa8cat\fP and \fBcolorize\-amsb\fP are not used, with this option.
 .TP
 .B \fB\-c\fP
 Check only. No output on \fBstdout\fP\&. Diagnostics are still printed on stderr,
@@ -128,6 +131,10 @@ this option.
 .B \fB\-i\fP, \fB\-u\fP, \fB\-t\fP, \fB\-m\fP, \fB\-s\fP
 These options are passed to \fBa8cat\fP\&. See its man page for details.
 .TP
+.B \fB\-M\fP
+Monochrome listing: disable color syntax highlighting, meaning \fBcolorize\-amsb\fP
+is not used.
+.TP
 .B \fB\-r\fP \fIline\-range\fP
 Show only part of the listing. \fIline\-range\fP can be a single line, or
 a comma\- or hyphen\-separated pair of starting and ending line numbers (e.g. \fB100,200\fP, or
@@ -287,11 +294,24 @@ spaces or other metacharacters, they must be escaped.
 .UNINDENT
 .SH LIMITATIONS
 .sp
-Unlike \fBlistbas\fP, there\(aqs no color syntax highlighting. Probably there
-never will be.
+\fBlistamsb\fP may behave strangely when fed something other than a
+tokenized AMSB program, at least if the first byte in the file
+is \fB$00\fP or \fB$01\fP\&. Unfortunately, tokenized Atari BASIC (and
+variants like Turbo and BASIC XL) begin with \fB$00\fP\&. Usually
+you\(aqll get this error:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+not an AMSB file: program size too small (0). Atari BASIC file?
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
 .sp
-It\(aqs hard to reliably detect AMSB files. Most of the time, it can at least
-detect Atari BASIC files, but occasionally you\(aqll get gibberish output instead.
+\&...but occasionally you may get a bunch of warnings and gibberish
+output instead.
 .SH EXIT STATUS
 .sp
 0 for success, 1 if there was an error reading the input (e.g. file
diff --git a/listamsb.c b/listamsb.c
index 397e1fd..b7aad8a 100644
--- a/listamsb.c
+++ b/listamsb.c
@@ -92,6 +92,7 @@ int initial_eol = 1;           /* -n */
 int crunch      = 0;           /* -C, -D */
 int decrunch    = 0;           /* -D */
 int keep_rems   = 0;           /* -k */
+int color       = 1;           /* -m */
 
 int locked =      0;
 int need_pclose = 0;
@@ -795,12 +796,13 @@ void crunch_program(void) {
 void print_help(void) {
 	printf("%s v" VERSION " - detokenize Atari Microsoft BASIC files\n", self);
 	puts("By B. Watson <urchlay@slackware.uk>, released under the WTFPL");
-	printf("Usage: %s [[-[acCDUnviutms] ...] [-r *start,end*]] <file> <outfile>\n", self);
+	printf("Usage: %s [[-[acCDUMnviutms] ...] [-r *start,end*]] <file> <outfile>\n", self);
 	puts("  -a: raw ATASCII output");
 	puts("  -c: check only (no listing)");
 	puts("  -C: crunch program");
 	puts("  -D: decrunch program");
 	puts("  -U: lock or unlock program");
+	puts("  -M: monochrome listing (no colorization)");
 	puts("  -n: no blank line at start of listing");
 	puts("  -v: verbosity");
 	puts("  -r: only list lines numbered from *start* to *end*");
@@ -866,7 +868,7 @@ void parse_args(int argc, char **argv) {
 		}
 	}
 
-	while( (opt = getopt(argc, argv, "DCnLUlr:cvaiutmshk")) != -1) {
+	while( (opt = getopt(argc, argv, "MDCnLUlr:cvaiutmshk")) != -1) {
 		switch(opt) {
 			case 'L': crunch = decrunch = unlock_mode = 0; break;
 			case 'D': decrunch =    1; break;
@@ -878,6 +880,7 @@ void parse_args(int argc, char **argv) {
 			case 'a': raw_output  = 1; break;
 			case 'v': verbosity++    ; break;
 			case 'n': initial_eol = 0; break;
+			case 'M': color =       0; break;
 			case 'h': print_help(); exit(0);
 			case 'r': get_line_range(optarg); ropt++; break;
 			case 'i':
@@ -904,8 +907,8 @@ void parse_args(int argc, char **argv) {
 	}
 
 	if(unlock_mode || crunch || decrunch) {
-		if(!initial_eol || check_only || raw_output || ropt || a8catopt) {
-			warn("-[acimnrstu] options ignored with -U, -C, or -D");
+		if(!initial_eol || check_only || raw_output || ropt || a8catopt || !color) {
+			warn("-[acimMnrstu] options ignored with -U, -C, or -D");
 		}
 	}
 
@@ -959,6 +962,8 @@ void open_output() {
 		} else {
 			verbose(1, "A8CAT not set in environment, using 'a8cat'");
 		}
+		if(color)
+			strcat(pipe_command, " | colorize-amsb");
 		verbose(1, "using pipe for output: %s", pipe_command);
 		outfile = popen(pipe_command, "w"); /* "wb" not allowed! */
 		/* we probably never see this error. popen() fails only if
diff --git a/listamsb.rst b/listamsb.rst
index 92ab15f..3753bdf 100644
--- a/listamsb.rst
+++ b/listamsb.rst
@@ -11,7 +11,7 @@ List the source of a tokenized Atari Microsoft BASIC program
 SYNOPSIS
 ========
 
-listamsb [**-U**] | [**-C** [**-k**]] | [**-D**] | [[**-L**] [**-a**] [**-c**] [**-v**] [**-h**] [**-i**] [**-u**] [**-t**] [**-m**] [**-n**] [**-s**] [**-r** *line-range*] ...] [**input-file**] [**output-file**]
+listamsb [**-U**] | [**-C** [**-k**]] | [**-D**] | [[**-L**] [**-a**] [**-c**] [**-v**] [**-h**] [**-i**] [**-u**] [**-t**] [**-m**] [**-M**] [**-n**] [**-s**] [**-r** *line-range*] ...] [**input-file**] [**output-file**]
 
 DESCRIPTION
 ===========
@@ -43,6 +43,9 @@ When listing a program to **stdout**, output is piped through
 human-readable on modern terminals. This means **a8cat** must be
 available in your **PATH**\. If this is not convenient, you can set
 the location of **a8cat** via the **A8CAT** environment variable.
+When listing in color (when the **-M** option is not used), **a8cat**\'s
+output is piped through **colorize-amsb**, which also must be available
+in your **PATH**\.
 
 **listamsb** will not write binary data (ATASCII or tokenized BASIC)
 directly to a terminal, under any circumstances.
@@ -102,7 +105,7 @@ or **-U**.
 **-a**
   Output raw ATASCII. This option must be used with an
   **output-file**, a pipe, or redirection: **listamsb** will not write
-  ATASCII to a terminal. **a8cat** is not used, with this option.
+  ATASCII to a terminal. **a8cat** and **colorize-amsb** are not used, with this option.
 
 **-c**
   Check only. No output on **stdout**. Diagnostics are still printed on stderr,
@@ -112,6 +115,10 @@ or **-U**.
 **-i**\, **-u**\, **-t**\, **-m**\, **-s**
   These options are passed to **a8cat**. See its man page for details.
 
+**-M**
+  Monochrome listing: disable color syntax highlighting, meaning **colorize-amsb**
+  is not used.
+
 **-r** *line-range*
   Show only part of the listing. *line-range* can be a single line, or
   a comma- or hyphen-separated pair of starting and ending line numbers (e.g. **100,200**, or
@@ -273,11 +280,16 @@ ENVIRONMENT
 LIMITATIONS
 ===========
 
-Unlike **listbas**, there's no color syntax highlighting. Probably there
-never will be.
+**listamsb** may behave strangely when fed something other than a
+tokenized AMSB program, at least if the first byte in the file
+is **$00** or **$01**. Unfortunately, tokenized Atari BASIC (and
+variants like Turbo and BASIC XL) begin with **$00**. Usually
+you'll get this error::
+
+  not an AMSB file: program size too small (0). Atari BASIC file?
 
-It's hard to reliably detect AMSB files. Most of the time, it can at least
-detect Atari BASIC files, but occasionally you'll get gibberish output instead.
+\.\.\.but occasionally you may get a bunch of warnings and gibberish
+output instead.
 
 EXIT STATUS
 ===========