cxrefbas: computed warning now says ON/GOTO or ON/GOSUB, not just ON.

28 files changed, 71 insertions, 33 deletions

diff --git a/a8eol.1 b/a8eol.1
index a68ed2b..9fada03 100644
--- a/a8eol.1
+++ b/a8eol.1
@@ -27,7 +27,7 @@ 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 "A8EOL" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "A8EOL" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 a8eol \- convert Atari 8-bit text files to/from UNIX/Windows/Mac
 .\" RST source for a8eol(1) man page. Convert with:
@@ -469,6 +469,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/a8utf8.1 b/a8utf8.1
index ada18ea..8648ebc 100644
--- a/a8utf8.1
+++ b/a8utf8.1
@@ -27,7 +27,7 @@ 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 "A8UTF8" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "A8UTF8" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 a8utf8 \- Convert Atari 8-bit text to UTF-8 encoded Unicode.
 .\" RST source for a8utf8(1) man page. Convert with:
@@ -100,6 +100,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/atascii.7 b/atascii.7
index 7032d78..f71fd94 100644
--- a/atascii.7
+++ b/atascii.7
@@ -27,7 +27,7 @@ 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 "ATASCII" 7 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "ATASCII" 7 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 atascii \- Atari 8-bit character set
 .\" RST source for atascii(7) man page. Convert with:
@@ -2158,6 +2158,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/atr2xfd.1 b/atr2xfd.1
index e4a91e9..8700a5e 100644
--- a/atr2xfd.1
+++ b/atr2xfd.1
@@ -27,7 +27,7 @@ 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 "ATR2XFD" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "ATR2XFD" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 atr2xfd \- Convert an Atari 8-bit ATR disk image to a raw (XFD) image
 .\" RST source for atr2xfd(1) man page. Convert with:
@@ -189,6 +189,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/atrsize.1 b/atrsize.1
index f87edce..dd24af8 100644
--- a/atrsize.1
+++ b/atrsize.1
@@ -27,7 +27,7 @@ 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 "ATRSIZE" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "ATRSIZE" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 atrsize \- Change the size of an Atari 8-bit ATR disk image, or create a blank ATR image
 .\" RST source for atrsize(1) man page. Convert with:
@@ -203,6 +203,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/axe.1 b/axe.1
index c0b658d..6241004 100644
--- a/axe.1
+++ b/axe.1
@@ -27,7 +27,7 @@ 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 "AXE" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "AXE" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 axe \- ATR/XFD Editor
 .\" RST source for axe(1) man page. Convert with:
@@ -144,6 +144,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/blob2c.1 b/blob2c.1
index fefda0e..b292a36 100644
--- a/blob2c.1
+++ b/blob2c.1
@@ -27,7 +27,7 @@ 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 "BLOB2C" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "BLOB2C" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 blob2c \- Create C source and header files from a binary file
 .\" RST source for blob2c(1) man page. Convert with:
@@ -124,6 +124,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/blob2xex.1 b/blob2xex.1
index 4a37c3b..1fb19a4 100644
--- a/blob2xex.1
+++ b/blob2xex.1
@@ -27,7 +27,7 @@ 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 "BLOB2XEX" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "BLOB2XEX" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 blob2xex \- Create Atari 8-bit executables from arbitrary data
 .\" RST source for blob2xex(1) man page. Convert with:
@@ -215,6 +215,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/cart2xex.1 b/cart2xex.1
index c20e98f..a1be462 100644
--- a/cart2xex.1
+++ b/cart2xex.1
@@ -27,7 +27,7 @@ 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 "CART2XEX" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "CART2XEX" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 cart2xex \- Convert an Atari 8-bit ROM cartridge image to a binary load file
 .\" RST source for cart2xex(1) man page. Convert with:
@@ -234,6 +234,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/cxrefbas.1 b/cxrefbas.1
index 47909bd..8cfb9ac 100644
--- a/cxrefbas.1
+++ b/cxrefbas.1
@@ -37,7 +37,8 @@ cxrefbas \fBinput\-file\fP
 .sp
 \fBcxrefbas\fP reads an Atari 8\-bit BASIC tokenized program. For each
 line number in the program, it prints a list of lines that reference
-it, via \fIGOTO\fP, \fIGOSUB\fP, \fIRESTORE\fP, \fITRAP\fP, \fION/GOTO\fP, or \fION/GOSUB\fP\&.
+it, via \fIGOTO\fP, \fIGOSUB\fP, \fIRESTORE\fP, \fITRAP\fP, \fION/GOTO\fP, \fION/GOTO\fP,
+or \fION/GOSUB\fP\&.
 .sp
 If a line doesn\(aqt exist, but is referenced (e.g. \fIGOTO 100\fP, but there
 is no line 100), it\(aqs printed in the table, prefixed with \fI!\fP\&.
@@ -80,6 +81,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/cxrefbas.c b/cxrefbas.c
index 45369d4..7cc3114 100644
--- a/cxrefbas.c
+++ b/cxrefbas.c
@@ -11,7 +11,7 @@
 unsigned short *linerefs[32769];
 int refcounts[32769];
 int lines_exist[32769];
-int last_cmd;
+unsigned char last_cmd, on_op;
 int last_cmd_pos;
 
 void add_lineref(unsigned short from, unsigned short to) {
@@ -57,9 +57,10 @@ CALLBACK(start_stmt) {
 CALLBACK(got_cmd) {
 	last_cmd = tok;
 	last_cmd_pos = pos;
+	on_op = 0;
 }
 
-void computed_msg(unsigned char tok, unsigned short lineno) {
+void computed_msg(unsigned short lineno) {
 	static int last_lineno = -1;
 	char *cmd;
 
@@ -67,7 +68,7 @@ void computed_msg(unsigned char tok, unsigned short lineno) {
 	if(lineno == last_lineno) return;
 	last_lineno = lineno;
 
-	switch(tok) {
+	switch(last_cmd) {
 		case CMD_GOTO:
 			cmd = "GOTO"; break;
 		case CMD_GO_TO:
@@ -79,7 +80,11 @@ void computed_msg(unsigned char tok, unsigned short lineno) {
 		case CMD_TRAP:
 			cmd = "TRAP"; break;
 		case CMD_ON:
-			cmd = "ON"; break;
+			if(on_op == OP_GOSUB)
+				cmd = "ON/GOSUB";
+			else
+				cmd = "ON/GOTO";
+			break;
 		default: /* should never happen! */
 			cmd = "???"; break;
 	}
@@ -94,7 +99,7 @@ CALLBACK(got_var) {
 		case CMD_GOSUB:
 		case CMD_RESTORE:
 		case CMD_TRAP:
-			computed_msg(last_cmd, lineno);
+			computed_msg(lineno);
 			break;
 		default:
 			break;
@@ -104,6 +109,11 @@ CALLBACK(got_var) {
 CALLBACK(got_exp) {
 	int standalone;
 
+	if(last_cmd == CMD_ON) {
+		if(tok == OP_GOTO || tok == OP_GOSUB)
+			on_op = tok;
+	}
+
 	if(tok != OP_NUMCONST) return;
 	standalone = is_standalone_num(pos);
 
@@ -116,7 +126,7 @@ CALLBACK(got_exp) {
 			if((pos == last_cmd_pos + 1) && standalone) {
 				add_lineref(lineno, fp2int(program + pos + 1));
 			} else {
-				computed_msg(last_cmd, lineno);
+				computed_msg(lineno);
 			}
 			break;
 		case CMD_ON: {
@@ -128,7 +138,7 @@ CALLBACK(got_exp) {
 						if(standalone)
 							add_lineref(lineno, fp2int(program + pos + 1));
 						else
-							computed_msg(last_cmd, lineno);
+							computed_msg(lineno);
 						break;
 					default:
 						break;
diff --git a/cxrefbas.rst b/cxrefbas.rst
index fbfc74a..b32cdb0 100644
--- a/cxrefbas.rst
+++ b/cxrefbas.rst
@@ -18,7 +18,8 @@ DESCRIPTION
 
 **cxrefbas** reads an Atari 8-bit BASIC tokenized program. For each
 line number in the program, it prints a list of lines that reference
-it, via *GOTO*, *GOSUB*, *RESTORE*, *TRAP*, *ON/GOTO*, or *ON/GOSUB*.
+it, via *GOTO*, *GOSUB*, *RESTORE*, *TRAP*, *ON/GOTO*, *ON/GOTO*,
+or *ON/GOSUB*.
 
 If a line doesn't exist, but is referenced (e.g. *GOTO 100*, but there
 is no line 100), it's printed in the table, prefixed with *!*.
diff --git a/dasm2atasm.1 b/dasm2atasm.1
index f37187a..2c7fd04 100644
--- a/dasm2atasm.1
+++ b/dasm2atasm.1
@@ -27,7 +27,7 @@ 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 "DASM2ATASM" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "DASM2ATASM" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 dasm2atasm \- Convert 6502 assembly source from dasm syntax to atasm or ca65 syntax.
 .\" RST source for dasm2atasm(1) man page. Convert with:
@@ -231,6 +231,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/dumpbas.1 b/dumpbas.1
index f2fa471..1471885 100644
--- a/dumpbas.1
+++ b/dumpbas.1
@@ -27,7 +27,7 @@ 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 "DUMPBAS" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "DUMPBAS" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 dumpbas \- Formatted hexdump for tokenized Atari 8-bit BASIC files
 .SH SYNOPSIS
@@ -212,6 +212,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/fenders.1 b/fenders.1
index 44998ff..7adf27f 100644
--- a/fenders.1
+++ b/fenders.1
@@ -27,7 +27,7 @@ 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 "FENDERS" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "FENDERS" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 fenders \- Install Fenders 3-sector loader in boot sectors of an ATR image
 .\" RST source for fenders(1) man page. Convert with:
@@ -278,6 +278,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/manftr.rst b/manftr.rst
index ac50295..0bcbeb4 100644
--- a/manftr.rst
+++ b/manftr.rst
@@ -19,6 +19,7 @@ SEE ALSO
 **blob2c**\(1), 
 **blob2xex**\(1), 
 **cart2xex**\(1), 
+**cxrefbas**\(1), 
 **dasm2atasm**\(1), 
 **dumpbas**\(1), 
 **f2toxex**\(1), 
diff --git a/protbas.1 b/protbas.1
index 33946b7..0b716c6 100644
--- a/protbas.1
+++ b/protbas.1
@@ -27,7 +27,7 @@ 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 "PROTBAS" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "PROTBAS" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 protbas \- LIST-protect Atari 8-bit BASIC programs
 .SH SYNOPSIS
@@ -119,6 +119,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/renumbas.1 b/renumbas.1
index 3cd0e65..33d54db 100644
--- a/renumbas.1
+++ b/renumbas.1
@@ -27,7 +27,7 @@ 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 "RENUMBAS" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "RENUMBAS" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 renumbas \- Renumber Atari 8-bit BASIC programs
 .SH SYNOPSIS
@@ -161,6 +161,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/rom2cart.1 b/rom2cart.1
index 83a3654..28ac181 100644
--- a/rom2cart.1
+++ b/rom2cart.1
@@ -27,7 +27,7 @@ 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 "ROM2CART" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "ROM2CART" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 rom2cart \- Convert a raw ROM image to an Atari800 CART image, or vice versa
 .\" RST source for rom2cart(1) man page. Convert with:
@@ -247,6 +247,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/unmac65.1 b/unmac65.1
index 6694892..fcc5469 100644
--- a/unmac65.1
+++ b/unmac65.1
@@ -27,7 +27,7 @@ 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 "UNMAC65" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "UNMAC65" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 unmac65 \- Detokenize Atari 8-bit Mac/65 SAVEd files.
 .\" RST source for unmac65(1) man page. Convert with:
@@ -379,6 +379,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/unprotbas.1 b/unprotbas.1
index 9f4c8c5..1cbbd98 100644
--- a/unprotbas.1
+++ b/unprotbas.1
@@ -27,7 +27,7 @@ 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 "UNPROTBAS" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "UNPROTBAS" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 unprotbas \- Unprotect LIST-protected Atari 8-bit BASIC programs
 .SH SYNOPSIS
@@ -346,6 +346,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/vxrefbas.1 b/vxrefbas.1
index fcee203..6ea268f 100644
--- a/vxrefbas.1
+++ b/vxrefbas.1
@@ -27,7 +27,7 @@ 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 "VXREFBAS" 1 "2024-06-15" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "VXREFBAS" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 vxrefbas \- Variable cross-reference for tokenized Atari 8-bit BASIC files
 .SH SYNOPSIS
@@ -120,6 +120,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/xex.5 b/xex.5
index b67c6b4..eee39dd 100644
--- a/xex.5
+++ b/xex.5
@@ -27,7 +27,7 @@ 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 "XEX" 5 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "XEX" 5 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 xex \- Atari 8-bit executable file format.
 .\" RST source for xex(5) man page. Convert with:
@@ -306,6 +306,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/xex1to2.1 b/xex1to2.1
index 3d66d3d..eadf8f2 100644
--- a/xex1to2.1
+++ b/xex1to2.1
@@ -27,7 +27,7 @@ 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 "XEX1TO2" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "XEX1TO2" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 xex1to2 \- Convert an Atari DOS 1.0 executable to a standard Atari executable
 .\" RST source for xex1to2(1) man page. Convert with:
@@ -80,6 +80,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/xexamine.1 b/xexamine.1
index 73031a8..8311ea8 100644
--- a/xexamine.1
+++ b/xexamine.1
@@ -27,7 +27,7 @@ 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 "XEXAMINE" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "XEXAMINE" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 xexamine \- Show information on Atari 8-bit executables (XEX)
 .\" RST source for xexamine(1) man page. Convert with:
@@ -138,6 +138,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/xexcat.1 b/xexcat.1
index 57069fb..a7b571d 100644
--- a/xexcat.1
+++ b/xexcat.1
@@ -27,7 +27,7 @@ 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 "XEXCAT" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "XEXCAT" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 xexcat \- Concatenate Atari 8-bit executables (XEX) into a single XEX file.
 .\" RST source for xexcat(1) man page. Convert with:
@@ -198,6 +198,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/xexsplit.1 b/xexsplit.1
index 674dd22..ba7b2ac 100644
--- a/xexsplit.1
+++ b/xexsplit.1
@@ -27,7 +27,7 @@ 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 "XEXSPLIT" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "XEXSPLIT" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 xexsplit \- Split a multi-segment Atari 8-bit executable (XEX) into multiple single-segment files.
 .\" RST source for xexsplit(1) man page. Convert with:
@@ -191,6 +191,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),
diff --git a/xfd2atr.1 b/xfd2atr.1
index 14e06ef..a4511f5 100644
--- a/xfd2atr.1
+++ b/xfd2atr.1
@@ -27,7 +27,7 @@ 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 "XFD2ATR" 1 "2024-06-13" "0.2.1" "Urchlay's Atari 8-bit Tools"
+.TH "XFD2ATR" 1 "2024-06-16" "0.2.1" "Urchlay's Atari 8-bit Tools"
 .SH NAME
 xfd2atr \- Convert an Atari 8-bit XFD (raw) disk image to an ATR image.
 .\" RST source for xfd2atr(1) man page. Convert with:
@@ -119,6 +119,7 @@ Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\
 \fBblob2c\fP(1),
 \fBblob2xex\fP(1),
 \fBcart2xex\fP(1),
+\fBcxrefbas\fP(1),
 \fBdasm2atasm\fP(1),
 \fBdumpbas\fP(1),
 \fBf2toxex\fP(1),