eplain (1oct13)

git-svn-id: svn://tug.org/texlive/trunk@31819 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 28 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/eplain/btxmac.tex b/Master/texmf-dist/tex/eplain/btxmac.tex
index 88338ab8b39..2507dae85f3 100644
--- a/Master/texmf-dist/tex/eplain/btxmac.tex
+++ b/Master/texmf-dist/tex/eplain/btxmac.tex
@@ -1,7 +1,7 @@
 %% @texfile{
 %%   author = "Karl Berry and Oren Patashnik",
-%%   version = "0.99m",
-%%   date = "7 February 2013",
+%%   version = "0.99n",
+%%   date = "30 September 2013",
 %%   filename = "btxmac.tex",
 %%   address = "tex-eplain@tug.org",
 %%   supported = "yes",
@@ -299,7 +299,7 @@
 % essentially like \futurelet except that it discards any implicit or
 % explicit space tokens that intervene before a nonspace is scanned:
 %
-\def\@futurenonspacelet#1{\def\cs{#1}%
+\long\def\@futurenonspacelet#1{\def\cs{#1}%
    \afterassignment\@stepone\let\@nexttoken=
 }%
 \begingroup % The grouping here avoids stepping on an outside use of `\\'.
@@ -319,7 +319,7 @@
 % the brackets don't have a funny category code.
 %
 \def\@getoptionalarg#1{%
-   \let\@optionaltemp = #1%
+   \let\@optionalusercs = #1%
    \let\@optionalnext = \relax
    \@futurenonspacelet\@optionalnext\@bracketcheck
 }%
@@ -329,19 +329,21 @@
 %
 \def\@bracketcheck{%
    \ifx [\@optionalnext
-      \expandafter\@@getoptionalarg
+      \expandafter\@@getoptionalarg % we have an optional arg
    \else
-      \let\@optionalarg = \empty
-      % We can't do the \temp after the \fi, because then the \temp gets
-      % in the way of reading the optional argument from the input, if
-      % we do have one.
-      \expandafter\@optionaltemp
+      \let\@optionalarg = \empty    % no optional arg
+      \expandafter\@optionalusercs
    \fi
 }%
 %
+% Get the next bracketed text.
 \def\@@getoptionalarg[#1]{%
    \def\@optionalarg{#1}%
-   \@optionaltemp
+   % Ignore spaces after the optional arg, too.
+   % (We don't actually need to peek ahead, but this is the easiest way
+   % to ignore the spaces.)
+   \let\@optdummy=\relax % just in case it has become \outer somehow
+   \@futurenonspacelet\@optdummy\@optionalusercs
 }%
 %
 %
diff --git a/Master/texmf-dist/tex/eplain/eplain.aux b/Master/texmf-dist/tex/eplain/eplain.aux
index 421a9706688..62854df2bc3 100644
--- a/Master/texmf-dist/tex/eplain/eplain.aux
+++ b/Master/texmf-dist/tex/eplain/eplain.aux
@@ -1,4 +1 @@
-% This eplain.aux file is installed for the sake of initex.  Running
-% initex without this file will produce eplain.fmt which will never
-% issue warning messages about undefined labels.
-
+% This eplain.aux file is installed for the sake of initex.  Running\n% initex without this file would produce an eplain.fmt which never\n% issues warning messages about undefined labels.\n
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/eplain/eplain.tex b/Master/texmf-dist/tex/eplain/eplain.tex
index d4caba1059b..aa446aec776 100644
--- a/Master/texmf-dist/tex/eplain/eplain.tex
+++ b/Master/texmf-dist/tex/eplain/eplain.tex
@@ -1,10 +1,10 @@
 %% @texfile{
 %%   author = "Karl Berry, Steven Smith, Oleg Katsitadze, and others",
-%%   version = "3.5",
-%%   date = "Fri Feb  8 09:51:56 PST 2013",
+%%   version = "3.6",
+%%   date = "Mon Sep 30 11:39:28 PDT 2013",
 %%   filename = "eplain.tex",
 %%   email = "bug-eplain@tug.org",
-%%   checksum = "4345   9735 139553",
+%%   checksum = "4346   9755 139706",
 %%   codetable = "ASCII",
 %%   supported = "yes",
 %%   docstring = "This file defines macros that extend and expand on
@@ -400,8 +400,8 @@
 \fi
 %% @texfile{
 %%   author = "Karl Berry and Oren Patashnik",
-%%   version = "0.99m",
-%%   date = "7 February 2013",
+%%   version = "0.99n",
+%%   date = "30 September 2013",
 %%   filename = "btxmac.tex",
 %%   address = "tex-eplain@tug.org",
 %%   supported = "yes",
@@ -423,7 +423,7 @@
 \else
    \def\@linenumber{\the\inputlineno:\space}%
 \fi
-\def\@futurenonspacelet#1{\def\cs{#1}%
+\long\def\@futurenonspacelet#1{\def\cs{#1}%
    \afterassignment\@stepone\let\@nexttoken=
 }%
 \begingroup % The grouping here avoids stepping on an outside use of `\\'.
@@ -435,21 +435,22 @@
    \else\let\@@next=\@nexttoken\fi \@@next}%
 \def\@stepthree{\afterassignment\@stepone\let\@@next= }%
 \def\@getoptionalarg#1{%
-   \let\@optionaltemp = #1%
+   \let\@optionalusercs = #1%
    \let\@optionalnext = \relax
    \@futurenonspacelet\@optionalnext\@bracketcheck
 }%
 \def\@bracketcheck{%
    \ifx [\@optionalnext
-      \expandafter\@@getoptionalarg
+      \expandafter\@@getoptionalarg % we have an optional arg
    \else
-      \let\@optionalarg = \empty
-      \expandafter\@optionaltemp
+      \let\@optionalarg = \empty    % no optional arg
+      \expandafter\@optionalusercs
    \fi
 }%
 \def\@@getoptionalarg[#1]{%
    \def\@optionalarg{#1}%
-   \@optionaltemp
+   \let\@optdummy=\relax % just in case it has become \outer somehow
+   \@futurenonspacelet\@optdummy\@optionalusercs
 }%
 \def\@nnil{\@nil}%
 \def\@fornoop#1\@@#2#3{}%
@@ -2350,7 +2351,7 @@
 \def\eqprint#1{(#1)}%
 \def\eqsubreftext#1#2{#1.#2}%
 \let\extraidxcmdsuffixes = \empty
-\outer\def\defineindex#1{%
+\def\defineindex#1{%
   \def\@idxprefix{#1}%
   \expandafter\innernewif\csname if\@idxprefix dx\endcsname
   \csname \@idxprefix dxtrue\endcsname
@@ -4341,5 +4342,5 @@
 \def\fmtname{eplain}%
 \def\eplain{t}%
 {\edef\plainversion{\fmtversion}%
- \xdef\fmtversion{3.5:  8 February 2013 (and plain \plainversion)}%
+ \xdef\fmtversion{3.6: 30 September 2013 (and plain \plainversion)}%
 }%