summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/eplain
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-15 22:07:24 +0000
committerKarl Berry <karl@freefriends.org>2016-05-15 22:07:24 +0000
commit508373bc061209ca4f72fe1b73296cf5efb7ae7d (patch)
tree8bb8c9f6352aaed24299cf4b3af223d37fefa9b1 /Master/texmf-dist/tex/eplain
parentf64b201d1382d2009bef44578f44271d3a9aa3e0 (diff)
eplain (15may16)
git-svn-id: svn://tug.org/texlive/trunk@41154 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/eplain')
-rw-r--r--Master/texmf-dist/tex/eplain/btxmac.tex82
-rw-r--r--Master/texmf-dist/tex/eplain/eplain.aux4
-rw-r--r--Master/texmf-dist/tex/eplain/eplain.tex328
3 files changed, 105 insertions, 309 deletions
diff --git a/Master/texmf-dist/tex/eplain/btxmac.tex b/Master/texmf-dist/tex/eplain/btxmac.tex
index 2507dae85f3..2799da70fce 100644
--- a/Master/texmf-dist/tex/eplain/btxmac.tex
+++ b/Master/texmf-dist/tex/eplain/btxmac.tex
@@ -1,14 +1,14 @@
%% @texfile{
%% author = "Karl Berry and Oren Patashnik",
-%% version = "0.99n",
-%% date = "30 September 2013",
+%% version = "0.99o",
+%% date = "12 May 2016",
%% filename = "btxmac.tex",
%% address = "tex-eplain@tug.org",
%% supported = "yes",
%% docstring = "Defines macros that make BibTeX work with plain TeX",
%% }
-% BibTeX-for-TeX macros, version 0.99k, for BibTeX 0.99c, TeX 3.0 or later.
-% Copyright 1990, 1991, 1992, 1995, 2004, 2007, 2013 Karl Berry &
+% BibTeX-for-TeX macros for BibTeX 0.99c, TeX 3.0 or later.
+% Copyright 1990, 1991, 1992, 1995, 2005, 2007, 2013, 2016 Karl Berry &
% Oren Patashnik.
%
% Unlimited copying and redistribution of this file are permitted as
@@ -139,14 +139,24 @@
% 14-Mar-92 0.99j, made 0.99i's use of `\\' local to btxmac.tex.
% 13-Nov-95 0.99k, defined \begin and \end (while reading bbl file) only if
% it wasn't already defined.
-% 04-Aug-04 0.99l, defined \renewcommand and \providecommand, since
-% some AMS style files use them. Also defined
-% \emph, \textbf, and \mbox, since many .bib files
-% use them. And made these definitions (and others)
-% only effective if not already defined.
-% 07-Feb-13 0.99m, \newcommand and \providecommand should be \long,
-% and not use \edef. Define \bbltextbf.
-%
+% 11-Aug-03 0.99l, defined \renewcommand and \providecommand, since some AMS
+% style files use them. Also defined \emph, \textbf, and
+% \mbox, since many .bib files use them. This version was
+% never actually released, but these changes appear
+% starting with 0.99k-18aug05.
+% 18-Aug-05 0.99k-18aug05, made the \emph, etc., definitions effective only
+% if not already defined. Provided
+% \printcite{pre,post}item, \bblitemhook.
+% 09-Sep-07 0.99k-09sep07, executed \@citedef in a group to avoid potential
+% save-stack overflow.
+% 07-Feb-13 0.99m, made \newcommand and \providecommand be \long, and not
+% use \edef. Defined \bbltextbf.
+% 30-Sep-13 0.99n, made \@futurenonspacelet be \long,
+% renamed \@optionaltemp to \@optionalusercs,
+% ignored spaces after the optional argument.
+% 12-May-16 0.99o, renamed \@newcommand and others to \@btx..., to avoid
+% conflict with Babel's file plain.def.
+%
% The LaTeX-related commands defined in this file include
% (a) the four commands that a user types (\bibliography,
% \bibliographystyle, \cite, and \nocite);
@@ -156,7 +166,7 @@
% facility, so these macros ignore that command); and
% (c) the LaTeX commands (\newcommand, \renewcommand, \providecommand)
% that are written by a standard (alpha) or AMS bibliography style.
-% (d) a few more LaTeX commands (\emph, \textbf, \mbox) which many .bib
+% (d) a few more LaTeX commands (\emph, \mbox, \textbf) which many .bib
% files use.
%
% The definitions here are not the same as the corresponding LaTeX
@@ -520,7 +530,7 @@
% commands, \csname...\endcsname makes them equivalent to \relax
% locally in that group; when we globally redefine them, TeX enters
% the definitions on the save stack, once for each label. When done
-% in the topmost group, this can overflow stack of any size, given
+% in the topmost group, this can overflow a stack of any size, given
% sufficient number of label definitions. So, we put these
% \csname...\endcsname's inside another group, to pop the stack for
% every label.
@@ -752,7 +762,7 @@
% mentioned earlier, this \newcommand will redefine a preexisting
% command; that's different from how LaTeX's \newcommand behaves.
%
-\@innernewcount\@numparams
+\@innernewcount\@btxnumparams
%
% \newcommand{\foo}[n]{text} defines the control sequence \foo to have n
% parameters, and replacement text `text'. In LaTeX, this command gives
@@ -762,8 +772,8 @@
%
\ifx\newcommand\undefined
\long\def\newcommand#1{%
- \def\@commandname{#1}%
- \@getoptionalarg\@continuenewcommand
+ \def\@btxcommandname{#1}%
+ \@getoptionalarg\@btxcontinuenewcommand
}%
\fi
%
@@ -781,9 +791,9 @@
%
\ifx\providecommand\undefined
\long\def\providecommand#1{%
- \def\@commandname{#1}%
+ \def\@btxcommandname{#1}%
%
- \expandafter\ifx\@commandname \@undefined
+ \expandafter\ifx\@btxcommandname \@undefined
\let\cs=\@continuenewcommand % undefined, so we'll define it
\else
\let\cs=\@gobble % already defined, so ignore it
@@ -795,31 +805,31 @@
%
% Figure out if this definition has parameters.
%
-\def\@continuenewcommand{%
+\def\@btxcontinuenewcommand{%
% If no optional argument, we have zero parameters. Otherwise, we
% have that many.
- \@numparams = \ifx\@optionalarg\empty 0\else\@optionalarg \fi \relax
- \@newcommand
+ \@btxnumparams = \ifx\@optionalarg\empty 0\else\@optionalarg \fi \relax
+ \@btxnewcommand
}%
%
-% \@numparams is how many arguments this command has. The name of the
-% command is \@commandname. The replacement text for the new macro is #1.
+% \@btxnumparams is how many arguments this command has. The name of the
+% command is \@btxcommandname. The replacement text for the new macro is #1.
%
-\def\@newcommand#1{%
- \def\@startdef{\expandafter\def\@commandname}%
- \ifnum\@numparams=0
- \let\@paramdef = \empty
+\def\@btxnewcommand#1{%
+ \def\@btxstartdef{\expandafter\def\@btxcommandname}%
+ \ifnum\@btxnumparams=0
+ \let\@btxparamdef = \empty
\else
- \ifnum\@numparams>9
- \errmessage{\the\@numparams\space is too many parameters}%
+ \ifnum\@btxnumparams>9
+ \errmessage{\the\@btxnumparams\space is too many parameters}%
\else
- \ifnum\@numparams<0
- \errmessage{\the\@numparams\space is too few parameters}%
+ \ifnum\@btxnumparams<0
+ \errmessage{\the\@btxnumparams\space is too few parameters}%
\else
- \edef\@paramdef{%
- % This is disgusting, but \loop doesn't work inside \edef,
+ \edef\@btxparamdef{%
+ % This is sad, but \loop doesn't work inside \edef,
% because \body isn't defined.
- \ifcase\@numparams
+ \ifcase\@btxnumparams
\empty No arguments.
\or ####1%
\or ####1####2%
@@ -835,7 +845,7 @@
\fi
\fi
\fi
- \expandafter\@startdef\@paramdef{#1}%
+ \expandafter\@btxstartdef\@btxparamdef{#1}%
}%
%
%% [[[end of BibTeX-specific stuff]]]
diff --git a/Master/texmf-dist/tex/eplain/eplain.aux b/Master/texmf-dist/tex/eplain/eplain.aux
index 62854df2bc3..0efcf286dce 100644
--- a/Master/texmf-dist/tex/eplain/eplain.aux
+++ b/Master/texmf-dist/tex/eplain/eplain.aux
@@ -1 +1,3 @@
-% 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
+% This eplain.aux file is installed for the sake of initex. Running
+% initex without this file would produce an eplain.fmt which never
+% issues warning messages about undefined labels.
diff --git a/Master/texmf-dist/tex/eplain/eplain.tex b/Master/texmf-dist/tex/eplain/eplain.tex
index 4c49a2fb2c7..049fe9d447a 100644
--- a/Master/texmf-dist/tex/eplain/eplain.tex
+++ b/Master/texmf-dist/tex/eplain/eplain.tex
@@ -1,19 +1,19 @@
%% @texfile{
%% author = "Karl Berry, Steven Smith, Oleg Katsitadze, and others",
-%% version = "3.7",
-%% date = "Wed Feb 4 08:18:02 PST 2015",
+%% version = "3.8",
+%% date = "Thu May 12 09:13:53 PDT 2016",
%% filename = "eplain.tex",
%% email = "bug-eplain@tug.org",
-%% checksum = "4351 9769 139934",
+%% checksum = "4135 9294 134238",
%% codetable = "ASCII",
%% supported = "yes",
%% docstring = "This file defines macros that extend and expand on
%% plain TeX. eplain.tex is xeplain.tex and the other
%% source files with comments stripped; see the original
%% files for author credits, etc. The original sources
-%% can be found in Eplain source zip archive in your TeX
+%% can be found in Eplain sources in your TeX
%% distribution, on CTAN or on Eplain's home page at
-%% http://tug.org/eplain. And please base diffs or
+%% http://tug.org/eplain. Please base diffs or
%% other contributions on xeplain.tex, not the
%% stripped-down eplain.tex.",
%% }
@@ -31,259 +31,43 @@
%%
%% ifpdf.dtx (with options: `package')
%%
-%% This is a generated file.
-%%
-%% Project: ifpdf
-%% Version: 2011/01/30 v2.3
-%%
-%% Copyright (C) 2001, 2005-2011 by
-%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%% http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status "maintained".
-%%
-%% This Current Maintainer of this work is Heiko Oberdiek.
-%%
-%% The Base Interpreter refers to any `TeX-Format',
-%% because some files are installed in TDS:tex/generic//.
-%%
-%% This work consists of the main source file ifpdf.dtx
-%% and the derived files
-%% ifpdf.sty, ifpdf.pdf, ifpdf.ins, ifpdf.drv, ifpdf-test1.tex.
-%%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
- \catcode13=5 % ^^M
- \endlinechar=13 %
- \catcode35=6 % #
- \catcode39=12 % '
- \catcode44=12 % ,
- \catcode45=12 % -
- \catcode46=12 % .
- \catcode58=12 % :
- \catcode64=11 % @
- \catcode123=1 % {
- \catcode125=2 % }
- \expandafter\let\expandafter\x\csname ver@ifpdf.sty\endcsname
- \ifx\x\relax % plain-TeX, first loading
- \else
- \def\empty{}%
- \ifx\x\empty % LaTeX, first loading,
- \else
- \expandafter\ifx\csname PackageInfo\endcsname\relax
- \def\x#1#2{%
- \immediate\write-1{Package #1 Info: #2.}%
- }%
- \else
- \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
- \fi
- \x{ifpdf}{The package is already loaded}%
- \fi
- \fi
-\endgroup%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
- \catcode13=5 % ^^M
- \endlinechar=13 %
- \catcode35=6 % #
- \catcode39=12 % '
- \catcode40=12 % (
- \catcode41=12 % )
- \catcode44=12 % ,
- \catcode45=12 % -
- \catcode46=12 % .
- \catcode47=12 % /
- \catcode58=12 % :
- \catcode64=11 % @
- \catcode91=12 % [
- \catcode93=12 % ]
- \catcode123=1 % {
- \catcode125=2 % }
- \expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \def\x#1#2#3[#4]{\endgroup
- \xdef#1{#4}%
- }%
- \else
- \def\x#1#2[#3]{\endgroup
- #2[{#3}]%
- \ifx#1\@undefined
- \xdef#1{#3}%
- \fi
- \ifx#1\relax
- \xdef#1{#3}%
- \fi
- }%
- \fi
-\expandafter\x\csname ver@ifpdf.sty\endcsname
-\ProvidesPackage{ifpdf}%
- [2011/01/30 v2.3 Provides the ifpdf switch (HO)]%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
- \catcode13=5 % ^^M
- \endlinechar=13 %
- \catcode123=1 % {
- \catcode125=2 % }
- \catcode64=11 % @
- \def\x{\endgroup
- \expandafter\edef\csname ifpdf@AtEnd\endcsname{%
- \endlinechar=\the\endlinechar\relax
- \catcode13=\the\catcode13\relax
- \catcode32=\the\catcode32\relax
- \catcode35=\the\catcode35\relax
- \catcode61=\the\catcode61\relax
- \catcode64=\the\catcode64\relax
- \catcode123=\the\catcode123\relax
- \catcode125=\the\catcode125\relax
- }%
- }%
-\x\catcode61\catcode48\catcode32=10\relax%
-\catcode13=5 % ^^M
-\endlinechar=13 %
-\catcode35=6 % #
-\catcode64=11 % @
-\catcode123=1 % {
-\catcode125=2 % }
-\def\TMP@EnsureCode#1#2{%
- \edef\ifpdf@AtEnd{%
- \ifpdf@AtEnd
- \catcode#1=\the\catcode#1\relax
- }%
- \catcode#1=#2\relax
-}
-\TMP@EnsureCode{10}{12}% ^^J
-\TMP@EnsureCode{39}{12}% '
-\TMP@EnsureCode{40}{12}% (
-\TMP@EnsureCode{41}{12}% )
-\TMP@EnsureCode{44}{12}% ,
-\TMP@EnsureCode{45}{12}% -
-\TMP@EnsureCode{46}{12}% .
-\TMP@EnsureCode{47}{12}% /
-\TMP@EnsureCode{58}{12}% :
-\TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{91}{12}% [
-\TMP@EnsureCode{93}{12}% ]
-\TMP@EnsureCode{94}{7}% ^
-\TMP@EnsureCode{96}{12}% `
-\begingroup
- \expandafter\ifx\csname ifpdf\endcsname\relax
- \else
- \edef\i/{\expandafter\string\csname ifpdf\endcsname}%
- \expandafter\ifx\csname PackageError\endcsname\relax
- \def\x#1#2{%
- \edef\z{#2}%
- \expandafter\errhelp\expandafter{\z}%
- \errmessage{Package ifpdf Error: #1}%
- }%
- \def\y{^^J}%
- \newlinechar=10 %
- \else
- \def\x#1#2{%
- \PackageError{ifpdf}{#1}{#2}%
- }%
- \def\y{\MessageBreak}%
- \fi
- \x{Name clash, \i/ is already defined}{%
- Incompatible versions of \i/ can cause problems,\y
- therefore package loading is aborted.%
- }%
- \endgroup
- \expandafter\ifpdf@AtEnd
- \fi%
-\endgroup
-\begingroup
- \def\skip#1\relax\begingroup{}%
- \expandafter\ifx\csname pdfoutput\endcsname\relax
- \else
- \expandafter\skip
- \fi
- \expandafter\ifx\csname directlua\endcsname\relax
- \expandafter\skip
- \fi
-\endgroup
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
- \def\TMP@RequirePackage#1[#2]{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname ver@#1.sty\endcsname\relax
- \input #1.sty\relax
- \fi
- }%
- \TMP@RequirePackage{ifluatex}[2009/04/10]%
+%% Source File: ifpdf.dtx
+%% Copyright 2016 Heiko Oberdiek and LaTeX3 project
+%%
+%% This file may be distributed under the terms of the LPPL.
+%% See README for details.
+\ifx\ProvidesPackage\undefined
+\def\next#1#2[#3]{\wlog{#2 #3}}
+\expandafter\next\fi
+\ProvidesPackage{ifpdf}
+[2016/04/04 v3.0 Provides the ifpdf switch]
+\expandafter\ifx\csname ifpdf\endcsname\relax
+ \csname newif\expandafter\endcsname\csname ifpdf\endcsname
\else
- \RequirePackage{ifluatex}[2009/04/10]%
-\fi
-\ifluatex
- \ifnum\luatexversion<36 %
- \else
- \begingroup
- \directlua{tex.enableprimitives('ifpdf', {'pdfoutput'})}%
- \global\let\pdfoutput\ifpdfpdfoutput
- \endgroup
+ \ifx\pdftrue\undefined
+ \ifx\PackageError\undefined
+ \begingroup\def\PackageError#1#2#3{\endgroup\errmessage{#2}}
\fi
+ \PackageError{ifpdf}{incompatible ifpdf definition}{}
+ \expandafter\expandafter\expandafter
+ \fi
\fi
-\relax\begingroup\endgroup
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname newif\endcsname\relax
- \edef\pdffalse{%
- \let
- \expandafter\noexpand\csname ifpdf\endcsname
- \expandafter\noexpand\csname iffalse\endcsname
- }%
- \edef\pdftrue{%
- \let
- \expandafter\noexpand\csname ifpdf\endcsname
- \expandafter\noexpand\csname iftrue\endcsname
- }%
- \pdffalse
-\else
- \csname newif\expandafter\endcsname\csname ifpdf\endcsname
-\fi
+\let\ifpdf\iffalse
+\ifx\directlua\undefined
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdfoutput\endcsname\relax
\else
- \ifnum\pdfoutput<1 %
- \else
+ \ifnum\pdfoutput>0 %
\pdftrue
\fi
\fi
-\begingroup
- \expandafter\ifx\csname pdfoutput\endcsname\relax
- \else
- \escapechar=92 %
- \edef\m{\meaning\pdfoutput}%
- \edef\p{\string\pdfoutput}%
- \ifx\m\p
- \else
- \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
- \def\PackageWarningNoLine#1#2{%
- \immediate\write16{%
- Package `#1' Warning: #2.%
- }%
- }%
- \fi
- \PackageWarningNoLine{ifpdf}{%
- Someone has redefined \string\pdfoutput%
- }%
- \fi
- \fi
-\endgroup
-\begingroup
- \expandafter\ifx\csname PackageInfo\endcsname\relax
- \def\x#1#2{%
- }%
- \else
- \let\x\PackageInfo
- \expandafter\let\csname on@line\endcsname\empty
- \fi
- \x{ifpdf}{pdfTeX in PDF mode is \ifpdf\else not \fi detected}%
-\endgroup
-\ifpdf@AtEnd%
+\else
+\directlua{%
+if (tex.outputmode or tex.pdfoutput or 0) > 0 then
+ tex.print('\string\\pdftrue')
+end
+}
+\fi
%%
%% End of file `ifpdf.sty'.
\def\makeactive#1{\catcode`#1 = \active \ignorespaces}%
@@ -400,8 +184,8 @@
\fi
%% @texfile{
%% author = "Karl Berry and Oren Patashnik",
-%% version = "0.99n",
-%% date = "30 September 2013",
+%% version = "0.99o",
+%% date = "10 May 2016",
%% filename = "btxmac.tex",
%% address = "tex-eplain@tug.org",
%% supported = "yes",
@@ -643,11 +427,11 @@
\let\printcitepostitem\empty
\def\printcitenote#1{, #1}% comma, space, note (if it exists)
\let\citation = \@gobble
-\@innernewcount\@numparams
+\@innernewcount\@btxnumparams
\ifx\newcommand\undefined
\long\def\newcommand#1{%
- \def\@commandname{#1}%
- \@getoptionalarg\@continuenewcommand
+ \def\@btxcommandname{#1}%
+ \@getoptionalarg\@btxcontinuenewcommand
}%
\fi
\ifx\renewcommand\undefined
@@ -655,8 +439,8 @@
\fi
\ifx\providecommand\undefined
\long\def\providecommand#1{%
- \def\@commandname{#1}%
- \expandafter\ifx\@commandname \@undefined
+ \def\@btxcommandname{#1}%
+ \expandafter\ifx\@btxcommandname \@undefined
\let\cs=\@continuenewcommand % undefined, so we'll define it
\else
\let\cs=\@gobble % already defined, so ignore it
@@ -664,23 +448,23 @@
\@getoptionalarg\cs
}%
\fi
-\def\@continuenewcommand{%
- \@numparams = \ifx\@optionalarg\empty 0\else\@optionalarg \fi \relax
- \@newcommand
-}%
-\def\@newcommand#1{%
- \def\@startdef{\expandafter\def\@commandname}%
- \ifnum\@numparams=0
- \let\@paramdef = \empty
+\def\@btxcontinuenewcommand{%
+ \@btxnumparams = \ifx\@optionalarg\empty 0\else\@optionalarg \fi \relax
+ \@btxnewcommand
+}%
+\def\@btxnewcommand#1{%
+ \def\@btxstartdef{\expandafter\def\@btxcommandname}%
+ \ifnum\@btxnumparams=0
+ \let\@btxparamdef = \empty
\else
- \ifnum\@numparams>9
- \errmessage{\the\@numparams\space is too many parameters}%
+ \ifnum\@btxnumparams>9
+ \errmessage{\the\@btxnumparams\space is too many parameters}%
\else
- \ifnum\@numparams<0
- \errmessage{\the\@numparams\space is too few parameters}%
+ \ifnum\@btxnumparams<0
+ \errmessage{\the\@btxnumparams\space is too few parameters}%
\else
- \edef\@paramdef{%
- \ifcase\@numparams
+ \edef\@btxparamdef{%
+ \ifcase\@btxnumparams
\empty No arguments.
\or ####1%
\or ####1####2%
@@ -696,7 +480,7 @@
\fi
\fi
\fi
- \expandafter\@startdef\@paramdef{#1}%
+ \expandafter\@btxstartdef\@btxparamdef{#1}%
}%
}%
\ifx\nobibtex\@undefined \the\toks0 \fi
@@ -4347,5 +4131,5 @@
\def\fmtname{eplain}%
\def\eplain{t}%
{\edef\plainversion{\fmtversion}%
- \xdef\fmtversion{3.7: 4 February 2015 (and plain \plainversion)}%
+ \xdef\fmtversion{3.8: 12 May 2016 (and plain \plainversion)}%
}%