diff options
| -rwxr-xr-x | abas2html | 2 | ||||
| -rw-r--r-- | abas2html.1 | 4 | ||||
| -rw-r--r-- | atascii.c | 10 | ||||
| -rw-r--r-- | atascii.h | 2 | ||||
| -rw-r--r-- | listamsb.1 | 9 | ||||
| -rw-r--r-- | listamsb.c | 10 | ||||
| -rw-r--r-- | listamsb.rst | 6 |
7 files changed, 34 insertions, 9 deletions
@@ -98,7 +98,7 @@ if [ "$LISTER" = "listamsb" ]; then if [ "$MONO" = "1" ]; then MONO_OPT="-M" else - checkbin colorize-amsb + checkbin "${COLORIZE_AMSB:-colorize-amsb}" fi else if [ "$MONO" = "1" ]; then diff --git a/abas2html.1 b/abas2html.1 index 004bdf7..03d48c5 100644 --- a/abas2html.1 +++ b/abas2html.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 "ABAS2HTML" 1 "2025-03-26" "0.2.2" "Urchlay's Atari 8-bit Tools" +.TH "ABAS2HTML" 1 "2025-04-01" "0.2.2" "Urchlay's Atari 8-bit Tools" .SH NAME abas2html \- Create HTML from tokenized Atari BASIC .SH SYNOPSIS @@ -116,7 +116,7 @@ See \fBlistbas\fP(1) for usage. Note that Atari Microsoft BASIC programs are listed with \fBlistamsb\fP, which is not affected by this environment variable. .TP -.B \fBA8CAT\fP, \fBCOLORIZE_AMSB\fP +.B \fBCOLORIZE_AMSB\fP Used by \fBlistamsb\fP(1) when listing Atari Microsoft BASIC programs. .UNINDENT .SH EXIT STATUS @@ -32,7 +32,6 @@ static int affects_inv(int c) { } } - int atascii_context_init(atascii_ctx *ctx, int mode, int flags) { memset(ctx, 0, sizeof(atascii_ctx)); @@ -62,7 +61,7 @@ char *atascii_a2utf(atascii_ctx *ctx, int src, char *dest) { if(src == ATA_CHR_FINISH) { if(ctx->inv) - strcpy(dest, atascii_inverse_off); + strcpy(dest, ctx->mode == ATA_MODE_MAGAZINE ? "{norm}": atascii_inverse_off); return dest; } @@ -149,3 +148,10 @@ char *atascii_a2utf(atascii_ctx *ctx, int src, char *dest) { return dest; } + +const char *atascii_finish(atascii_ctx *ctx) { + if(ctx->inv) + return ATA_MODE_MAGAZINE ? "{norm}": atascii_inverse_off; + else + return ""; +}; @@ -39,4 +39,6 @@ extern int atascii_context_init(atascii_ctx *ctx, int mode, int flags); */ extern char *atascii_a2utf(atascii_ctx *ctx, int src, char *dest); +extern const char *atascii_finish(atascii_ctx *ctx); + #endif @@ -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 "LISTAMSB" 1 "2025-04-01" "0.2.2" "Urchlay's Atari 8-bit Tools" +.TH "LISTAMSB" 1 "2025-04-02" "0.2.2" "Urchlay's Atari 8-bit Tools" .SH NAME listamsb \- List the source of a tokenized Atari Microsoft BASIC program .SH SYNOPSIS @@ -295,6 +295,13 @@ you see this warning, you\(aqll also see \fIN\fP <unknown token \fIXX\fP> messages in the actual listing. .UNINDENT .SH ENVIRONMENT +.INDENT 0.0 +.TP +.B \fBCOLORIZE_AMSB\fP +Path to the \fBcolorize\-amsb\fP executable. Can be the absolute path +or just the executable (searched for in \fBPATH\fP). If not set, +defaults to \fIcolorize\-amsb\fP\&. +.UNINDENT .SH LIMITATIONS .sp \fBlistamsb\fP may behave strangely when fed something other than a @@ -79,6 +79,8 @@ from this (except the 3-byte header) */ #define UNLOCK_KEY 0x54 +#define ENV_VAR "COLORIZE_AMSB" + const char *self; atascii_ctx actx; @@ -965,13 +967,15 @@ void open_output() { verbose(1, "using stdout for output"); } else { if(color) { - verbose(1, "using pipe for output: %s", "colorize-amsb"); - outfile = popen("colorize-amsb", "w"); /* "wb" not allowed! */ + char *exe = getenv(ENV_VAR); + if(!exe) exe = "colorize-amsb"; + verbose(1, "using pipe for output: %s", exe); + outfile = popen(exe, "w"); /* "wb" not allowed! */ /* we probably never see this error. popen() fails only if we feed it an invalid mode, or if fork() or pipe() fails, or I suppose if some idjit has done a "rm -f /bin/sh"... all other errors are caught at pclose(). */ - if(!outfile) os_err("|%s: %s", "colorize-amsb", strerror(errno)); + if(!outfile) os_err("|%s: %s", exe, strerror(errno)); need_pclose = 1; } else { outfile = stdout; diff --git a/listamsb.rst b/listamsb.rst index 2a86a23..5bb5640 100644 --- a/listamsb.rst +++ b/listamsb.rst @@ -283,6 +283,12 @@ continues processing. ENVIRONMENT =========== +**COLORIZE_AMSB** + Path to the **colorize-amsb** executable. Can be the absolute path + or just the executable (searched for in **PATH**). If not set, + defaults to *colorize-amsb*. + + LIMITATIONS =========== |