eplain[54] trunk: btxmac.tex: do not use unprefixed csname \cs,

[commits+karl at tug.org]

Revision: 54
          http://tug.org/svn/eplain?view=revision&revision=54
Author:   karl
Date:     2022-10-02 19:52:12 +0200 (Sun, 02 Oct 2022)
Log Message:
-----------
btxmac.tex: do not use unprefixed csname \cs, conflicts with plain tugboat[.sty] et al.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/btxmac.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2021-04-22 16:41:33 UTC (rev 53)
+++ trunk/ChangeLog	2022-10-02 17:52:12 UTC (rev 54)
@@ -1,3 +1,9 @@
+2022-10-02  Karl Berry  <karl at freefriends.org>
+
+	* btxmac.tex (\futurenonspacelet, \@step..., \providecommand):
+	use \@btxcs instead of \cs, which may be otherwise defined,
+	e.g., by plain tugboat.sty. Version 0.99q.
+
 2020-09-19  Karl Berry  <karl at freefriends.org>
 
 	* demo/Makefile (ctan_lion_350x350.png): update ctan_lion url.

Modified: trunk/btxmac.tex
===================================================================
--- trunk/btxmac.tex	2021-04-22 16:41:33 UTC (rev 53)
+++ trunk/btxmac.tex	2022-10-02 17:52:12 UTC (rev 54)
@@ -1,7 +1,7 @@
 %% @texfile{
 %%   author = "Karl Berry and Oren Patashnik",
-%%   version = "0.99p",
-%%   date = "30 May 2019",
+%%   version = "0.99q",
+%%   date = "2 October 2022",
 %%   filename = "btxmac.tex",
 %%   address = "tex-eplain at tug.org",
 %%   supported = "yes",
@@ -8,8 +8,8 @@
 %%   docstring = "Defines macros that make BibTeX work with plain TeX",
 %% }
 % BibTeX-for-TeX macros for BibTeX 0.99c, TeX 3.0 or later.
-% Copyright 1990, 1991, 1992, 1995, 2005, 2007, 2013, 2016, 2019 Karl Berry &
-% Oren Patashnik.
+% Copyright 1990, 1991, 1992, 1995, 2005, 2007, 2013, 2016, 2019, 2022
+% Karl Berry & Oren Patashnik.
 % 
 % Unlimited copying and redistribution of this file are permitted as
 % long as this file is not modified. Modifications (and redistribution
@@ -158,7 +158,9 @@
 %                     conflict with Babel's file plain.def.
 %   30-May-19  0.99p, one missed rename of \@continuenewcommand to \@btx...,
 %                     that made \providecommand fail.
-%                     
+%   02-Oct-22  0.99q, avoid using unprefixed control sequence \cs,
+%                     which conflicts with TUGboat's \cs. Doc updates.
+%
 % The LaTeX-related commands defined in this file include
 % (a) the four commands that a user types (\bibliography,
 %     \bibliographystyle, \cite, and \nocite); 
@@ -211,10 +213,10 @@
 %
 % \biblabelwidth
 %
-% There are fifteen other control sequences (explained later in more detail)
+% There are sixteen other control sequences (explained later in more detail)
 % that the macros of this file will use if you define them---you should
 % define them after the \input btxmac command but before the \bibliography
-% command.  The first six begin with `\bbl' and affect fonts, spacing,
+% command.  The first seven begin with `\bbl' and affect fonts, spacing,
 % perhaps other characteristics of the bibliography, and which .bbl files
 % get read; the next five begin with `\biblabel' and determine how labels
 % are formatted in the bibliography; and the last four begin with `\print'
@@ -223,6 +225,7 @@
 % \bblem
 % \bblfilebasename
 % \bblhook
+% \bblitemhook
 % \bblnewblock
 % \bblrm
 % \bblsc
@@ -275,10 +278,10 @@
 %
 % Make an outer definition into an inner one (due to Chris Thompson).
 % The arguments should be the control sequence to be defined, and the
-% new of the \outer control sequence, as characters; the control
+% name of the \outer control sequence, as characters; the control
 % sequence #1 is defined to be just the same as \csname#2\endcsname, but
-% not \outer.  For example, \@innerdef\innernewcount{newcount} would
-% define \innernewcount to be a non-outer version of \newcount.
+% not \outer.  For example, \@innerdef\innernewcount{newcount}
+% defines \innernewcount to be a non-outer version of \newcountb.
 %
 \def\@innerdef#1#2{\edef#1{\expandafter\noexpand\csname #2\endcsname}}%
 %
@@ -307,11 +310,11 @@
 \fi
 %
 %
-% The following macro \@futurenonspacelet (from the TeXbook) behaves
+% The following macro \@futurenonspacelet (from The TeXbook) behaves
 % essentially like \futurelet except that it discards any implicit or
 % explicit space tokens that intervene before a nonspace is scanned:
 %
-\long\def\@futurenonspacelet#1{\def\cs{#1}%
+\long\def\@futurenonspacelet#1{\def\@btxcs{#1}%
    \afterassignment\@stepone\let\@nexttoken=
 }%
 \begingroup % The grouping here avoids stepping on an outside use of `\\'.
@@ -319,8 +322,8 @@
 \\ % now \@stoken is a space token (\\ is a control symbol, so that
    % space after it is seen).
 \endgroup
-\def\@stepone{\expandafter\futurelet\cs\@steptwo}%
-\def\@steptwo{\expandafter\ifx\cs\@stoken\let\@@next=\@stepthree
+\def\@stepone{\expandafter\futurelet\@btxcs\@steptwo}%
+\def\@steptwo{\expandafter\ifx\@btxcs\@stoken\let\@@next=\@stepthree
    \else\let\@@next=\@nexttoken\fi \@@next}%
 \def\@stepthree{\afterassignment\@stepone\let\@@next= }%
 %
@@ -796,11 +799,11 @@
    \def\@btxcommandname{#1}%
    %
    \expandafter\ifx\@btxcommandname \@undefined
-     \let\cs=\@btxcontinuenewcommand  % undefined, so we'll define it
+     \let\@btxcs=\@btxcontinuenewcommand  % undefined, so we'll define it
    \else
-     \let\cs=\@gobble                 % already defined, so ignore it
+     \let\@btxcs=\@gobble                 % already defined, so ignore it
    \fi
-   \@getoptionalarg\cs
+   \@getoptionalarg\@btxcs
 }%
 \fi
 %