From 3ec6a3df9f6d8358f1c2b54427386abbadf4ac40 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 30 Aug 2015 20:50:10 +0000 Subject: bigfoot (30aug15) git-svn-id: svn://tug.org/texlive/trunk@38248 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bigfoot/bigfoot.pdf | Bin 405024 -> 405835 bytes Master/texmf-dist/doc/latex/bigfoot/perpage.pdf | Bin 203898 -> 203798 bytes Master/texmf-dist/doc/latex/bigfoot/suffix.pdf | Bin 183512 -> 183403 bytes Master/texmf-dist/source/latex/bigfoot/bigfoot.drv | 2 +- Master/texmf-dist/source/latex/bigfoot/bigfoot.dtx | 21 +++++++++++++-------- Master/texmf-dist/source/latex/bigfoot/bigfoot.ins | 2 +- Master/texmf-dist/tex/latex/bigfoot/bigfoot.sty | 14 ++++++++------ 7 files changed, 23 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/bigfoot/bigfoot.pdf b/Master/texmf-dist/doc/latex/bigfoot/bigfoot.pdf index 93a2ca3056c..3c5eac0f92f 100644 Binary files a/Master/texmf-dist/doc/latex/bigfoot/bigfoot.pdf and b/Master/texmf-dist/doc/latex/bigfoot/bigfoot.pdf differ diff --git a/Master/texmf-dist/doc/latex/bigfoot/perpage.pdf b/Master/texmf-dist/doc/latex/bigfoot/perpage.pdf index ebdbf7c5f72..b5d53e08043 100644 Binary files a/Master/texmf-dist/doc/latex/bigfoot/perpage.pdf and b/Master/texmf-dist/doc/latex/bigfoot/perpage.pdf differ diff --git a/Master/texmf-dist/doc/latex/bigfoot/suffix.pdf b/Master/texmf-dist/doc/latex/bigfoot/suffix.pdf index 7e0ac2fe2d3..faae714a5bc 100644 Binary files a/Master/texmf-dist/doc/latex/bigfoot/suffix.pdf and b/Master/texmf-dist/doc/latex/bigfoot/suffix.pdf differ diff --git a/Master/texmf-dist/source/latex/bigfoot/bigfoot.drv b/Master/texmf-dist/source/latex/bigfoot/bigfoot.drv index 84916b732f5..353dfb51d1c 100644 --- a/Master/texmf-dist/source/latex/bigfoot/bigfoot.drv +++ b/Master/texmf-dist/source/latex/bigfoot/bigfoot.drv @@ -22,7 +22,7 @@ %% in the same archive or directory.) %% %% bigfoot is part of the bigfoot bundle for critical typesetting -%% Copyright 2004--2014 David Kastrup +%% Copyright 2004--2015 David Kastrup %% %% The license notice and corresponding source code for this file are %% contained in bigfoot.dtx. diff --git a/Master/texmf-dist/source/latex/bigfoot/bigfoot.dtx b/Master/texmf-dist/source/latex/bigfoot/bigfoot.dtx index be78a65452c..769653fe784 100644 --- a/Master/texmf-dist/source/latex/bigfoot/bigfoot.dtx +++ b/Master/texmf-dist/source/latex/bigfoot/bigfoot.dtx @@ -1,7 +1,7 @@ % \iffalse %% %% bigfoot is part of the bigfoot bundle for critical typesetting -%% Copyright 2004--2014 David Kastrup +%% Copyright 2004--2015 David Kastrup %% %% The license notice and corresponding source code for this file are %% contained in bigfoot.dtx. @@ -20,7 +20,7 @@ % along with this program; if not, write to the Free Software % Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA % \fi -% \CheckSum{4576} +% \CheckSum{4580} % \GetFileInfo{bigfoot.sty} % \title{The \texttt{bigfoot} package\\version \fileversion} % \date{\filedate} @@ -151,7 +151,7 @@ % \begin{macrocode} %<*style> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bigfoot}[2014/10/23 2.0 makes footnotes work] +\ProvidesPackage{bigfoot}[2015/08/30 2.1 makes footnotes work] \DeclareOption{para}{\PackageInfo{bigfoot}{Compatibility option `para' has no effect:^^J% @@ -253,12 +253,17 @@ % sense than what would happen otherwise. % \item We allocate quite a few registers, and the danger of running % out of them is smaller when the extra registers of \eTeX\ are -% taken into account. +% taken into account. Now unfortunately the LaTeX team has decided +% in 2015 to do its own extended allocation scheme incompatible with +% the |etex| package, so we need to guard against this load in case +% the new LaTeX allocation scheme is detected. % \end{enumerate} % We need the |manyfoot| package to build on. The |suffix| and % |perpage| package are needed for some small stuff. % \begin{macrocode} +\ifx\e@alloc\@undefined \RequirePackage{etex} +\fi \RequirePackage{manyfoot} \RequirePackage{suffix} \RequirePackage{perpage} @@ -2155,7 +2160,7 @@ % \begin{macrocode} \unvbox\z@ \global\setbox\@cclv\vbox{\break\unvbox\@cclv}% - {\splittopskip-\maxdimen \setbox\z@\vsplit\@cclv to\z@} + {\splittopskip-\maxdimen \setbox\z@\vsplit\@cclv to\z@}% \ifnum\outputpenalty=\@M \setbox\z@\vbox{\pagediscards \FN@cleanpagepenalty}% @@ -3559,14 +3564,14 @@ \AtBeginDocument{\@ifundefined{footinsdefault}% {\newfootnote[plain]{default}% {\let\@elt\FN@maybestart - \MFL@list\relax} + \MFL@list\relax}% }{}% % \end{macrocode} % And since LaTeX's macros are inferior to our own (and would probably % not match too well), we reroot them to the default footnote style. % \begin{macrocode} - \def\@footnotetext{\Footnotetextdefault{}} - \def\p@footnotedefault{\p@footnote} + \def\@footnotetext{\Footnotetextdefault{}}% + \def\p@footnotedefault{\p@footnote}% } % % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/bigfoot/bigfoot.ins b/Master/texmf-dist/source/latex/bigfoot/bigfoot.ins index f445cedcd79..dceb20a0618 100644 --- a/Master/texmf-dist/source/latex/bigfoot/bigfoot.ins +++ b/Master/texmf-dist/source/latex/bigfoot/bigfoot.ins @@ -1,6 +1,6 @@ %% %% bigfoot is part of the bigfoot bundle for critical typesetting -%% Copyright 2004--2014 David Kastrup +%% Copyright 2004--2015 David Kastrup %% %% The license notice and corresponding source code for this file are %% contained in bigfoot.dtx. diff --git a/Master/texmf-dist/tex/latex/bigfoot/bigfoot.sty b/Master/texmf-dist/tex/latex/bigfoot/bigfoot.sty index ce4c14b6e6f..0e5b6e3486b 100644 --- a/Master/texmf-dist/tex/latex/bigfoot/bigfoot.sty +++ b/Master/texmf-dist/tex/latex/bigfoot/bigfoot.sty @@ -22,13 +22,13 @@ %% in the same archive or directory.) %% %% bigfoot is part of the bigfoot bundle for critical typesetting -%% Copyright 2004--2014 David Kastrup +%% Copyright 2004--2015 David Kastrup %% %% The license notice and corresponding source code for this file are %% contained in bigfoot.dtx. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bigfoot}[2014/10/23 2.0 makes footnotes work] +\ProvidesPackage{bigfoot}[2015/08/30 2.1 makes footnotes work] \DeclareOption{para}{\PackageInfo{bigfoot}{Compatibility option `para' has no effect:^^J% @@ -60,7 +60,9 @@ \else \hypersetup{hyperfootnotes=false} \fi +\ifx\e@alloc\@undefined \RequirePackage{etex} +\fi \RequirePackage{manyfoot} \RequirePackage{suffix} \RequirePackage{perpage} @@ -769,7 +771,7 @@ \global\setbox\@cclv\vbox{% \unvbox\z@ \global\setbox\@cclv\vbox{\break\unvbox\@cclv}% - {\splittopskip-\maxdimen \setbox\z@\vsplit\@cclv to\z@} + {\splittopskip-\maxdimen \setbox\z@\vsplit\@cclv to\z@}% \ifnum\outputpenalty=\@M \setbox\z@\vbox{\pagediscards \FN@cleanpagepenalty}% @@ -1423,10 +1425,10 @@ \AtBeginDocument{\@ifundefined{footinsdefault}% {\newfootnote[plain]{default}% {\let\@elt\FN@maybestart - \MFL@list\relax} + \MFL@list\relax}% }{}% - \def\@footnotetext{\Footnotetextdefault{}} - \def\p@footnotedefault{\p@footnote} + \def\@footnotetext{\Footnotetextdefault{}}% + \def\p@footnotedefault{\p@footnote}% } \endinput %% -- cgit v1.2.3