diff options
| -rw-r--r-- | diffbas.1 | 113 | ||||
| -rw-r--r-- | diffbas.rst | 48 |
2 files changed, 161 insertions, 0 deletions
diff --git a/diffbas.1 b/diffbas.1 new file mode 100644 index 0000000..8460519 --- /dev/null +++ b/diffbas.1 @@ -0,0 +1,113 @@ +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.TH "DIFFBAS" 1 "2024-07-13" "0.2.1" "Urchlay's Atari 8-bit Tools" +.SH NAME +diffbas \- Show differences between two tokenized Atari 8-bit BASIC files +.SH SYNOPSIS +.sp +diffbas [\fIdiff\-options\fP] [\fB\-\-\fP \fIlistbas\-options\fP] \fIfile1\fP \fIfile2\fP +.SH DESCRIPTION +.sp +\fBdiffbas\fP shows the differences between two tokenized (SAVEd) +Atari BASIC programs, using \fBlistbas\fP(1) and \fBdiff\fP(1). +.SH OPTIONS +.sp +\fBdiffbas\fP takes no options of its own. It will pass options as\-is +to both \fBlistbas\fP and \fBdiff\fP\&. Use \fB\-\-\fP to separate them: everything +before \fB\-\-\fP is passed to \fBdiff\fP, and everything between \fB\-\-\fP and +the first filename is passed to \fBlistbas\fP\&. +.SH EXAMPLE +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +$ diffbas \-u A.BAS B.BAS + +\-\-\- A.BAS.lst 2024\-07\-12 23:56:46.937965855 \-0400 ++++ B.BAS.lst 2024\-07\-12 23:56:46.938965854 \-0400 +@@ \-1,3 +1,4 @@ + 10 ? "THIS LINE IS IN BOTH PROGRAMS." + 20 ? "THIS LINE IS ALSO IN BOTH." ++25 ? "THIS LINE ONLY IN B.BAS!" + 30 END +.ft P +.fi +.UNINDENT +.UNINDENT +.SH EXIT STATUS +.sp +0 for success. On failure, the exit status is that of whichever command +failed (\fBlistbas\fP or \fBdiff\fP). +.SH COPYRIGHT +.sp +WTFPL. See \fI\%http://www.wtfpl.net/txt/copying/\fP for details. +.SH AUTHOR +.INDENT 0.0 +.IP B. 3 +Watson <\fI\%urchlay@slackware.uk\fP>; Urchlay on irc.libera.chat \fI##atari\fP\&. +.UNINDENT +.SH SEE ALSO +.sp +\fBa8cat\fP(1), +\fBa8eol\fP(1), +\fBa8xd\fP(1), +\fBatr2xfd\fP(1), +\fBatrsize\fP(1), +\fBaxe\fP(1), +\fBblob2c\fP(1), +\fBblob2xex\fP(1), +\fBcart2xex\fP(1), +\fBcxrefbas\fP(1), +\fBdasm2atasm\fP(1), +\fBdiffbas\fP(1), +\fBdumpbas\fP(1), +\fBf2toxex\fP(1), +\fBfenders\fP(1), +\fBlistbas\fP(1), +\fBprotbas\fP(1), +\fBrenumbas\fP(1), +\fBrom2cart\fP(1), +\fBunmac65\fP(1), +\fBunprotbas\fP(1), +\fBvxrefbas\fP(1), +\fBwhichbas\fP(1), +\fBxex1to2\fP(1), +\fBxexamine\fP(1), +\fBxexcat\fP(1), +\fBxexsplit\fP(1), +\fBxfd2atr\fP(1), +\fBxex\fP(5), +\fBatascii\fP(7). +.sp +Any good Atari 8\-bit book: \fIDe Re Atari\fP, \fIThe Atari BASIC Reference +Manual\fP, the \fIOS Users\(aq Guide\fP, \fIMapping the Atari\fP, etc. +.\" Generated by docutils manpage writer. +. diff --git a/diffbas.rst b/diffbas.rst new file mode 100644 index 0000000..4bb2210 --- /dev/null +++ b/diffbas.rst @@ -0,0 +1,48 @@ +======= +diffbas +======= + +-------------------------------------------------------------- +Show differences between two tokenized Atari 8-bit BASIC files +-------------------------------------------------------------- + +.. include:: manhdr.rst + +SYNOPSIS +======== + +diffbas [*diff-options*] [**--** *listbas-options*] *file1* *file2* + +DESCRIPTION +=========== +**diffbas** shows the differences between two tokenized (SAVEd) +Atari BASIC programs, using **listbas**\(1) and **diff**\(1). + +OPTIONS +======= +**diffbas** takes no options of its own. It will pass options as-is +to both **listbas** and **diff**. Use **--** to separate them: everything +before **--** is passed to **diff**, and everything between **--** and +the first filename is passed to **listbas**. + +EXAMPLE +======= + +:: + + $ diffbas -u A.BAS B.BAS + + --- A.BAS.lst 2024-07-12 23:56:46.937965855 -0400 + +++ B.BAS.lst 2024-07-12 23:56:46.938965854 -0400 + @@ -1,3 +1,4 @@ + 10 ? "THIS LINE IS IN BOTH PROGRAMS." + 20 ? "THIS LINE IS ALSO IN BOTH." + +25 ? "THIS LINE ONLY IN B.BAS!" + 30 END + +EXIT STATUS +=========== +0 for success. On failure, the exit status is that of whichever command +failed (**listbas** or **diff**). + +.. include:: manftr.rst |