From b0a27fa1b235b8769c32d6a4af90697503bc5f7f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 1 Oct 2015 22:00:12 +0000 Subject: latex 2015/10/01 git-svn-id: svn://tug.org/texlive/trunk@38512 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/base/ltoutput.dtx | 79 +++++++++++++++--------- 1 file changed, 49 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/source/latex/base/ltoutput.dtx') diff --git a/Master/texmf-dist/source/latex/base/ltoutput.dtx b/Master/texmf-dist/source/latex/base/ltoutput.dtx index 4e04c4b064c..1cb7ec5dec1 100644 --- a/Master/texmf-dist/source/latex/base/ltoutput.dtx +++ b/Master/texmf-dist/source/latex/base/ltoutput.dtx @@ -30,14 +30,14 @@ %%% From File: ltoutput.dtx %\ProvidesPackage{flafter} %\ProvidesPackage{fltrace} -% [2015/07/12 v1.2n +% [2015/09/05 v1.3a % Standard LaTeX floats after reference (FMi)] % Tracing LaTeX floats algorithm (FMi)] % %<*driver> % \fi \ProvidesFile{ltoutput.dtx} - [2015/07/06 v1.2n LaTeX Kernel (Output Routine)] + [2015/09/05 v1.3a LaTeX Kernel (Output Routine)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltoutput.dtx} @@ -52,7 +52,7 @@ % % \fi % -% \CheckSum{3696} +% \CheckSum{3800} % % % \iffalse @@ -691,32 +691,50 @@ % \end{macrocode} % % DEFINITION OF FLOAT BOXES: +% \changes{v1.3a}{2015/09/205} +% {extended \cs{@freelist}} % \begin{macrocode} -\newinsert\bx@A -\newinsert\bx@B -\newinsert\bx@C -\newinsert\bx@D -\newinsert\bx@E -\newinsert\bx@F -\newinsert\bx@G -\newinsert\bx@H -\newinsert\bx@I -\newinsert\bx@J -\newinsert\bx@K -\newinsert\bx@L -\newinsert\bx@M -\newinsert\bx@N -\newinsert\bx@O -\newinsert\bx@P -\newinsert\bx@Q -\newinsert\bx@R -% \end{macrocode} -% -% \begin{macrocode} -\gdef\@freelist{\@elt\bx@A\@elt\bx@B\@elt\bx@C\@elt\bx@D\@elt\bx@E - \@elt\bx@F\@elt\bx@G\@elt\bx@H\@elt\bx@I\@elt\bx@J - \@elt\bx@K\@elt\bx@L\@elt\bx@M\@elt\bx@N - \@elt\bx@O\@elt\bx@P\@elt\bx@Q\@elt\bx@R} +% +%\IncludeInRelease{2015/10/01}% +% {\bx@ZZ}{Extended float list}% +%<*2ekernel|latexrelease> +\let\@elt\newinsert +%<*2ekernel> +\def\@freelist{% + \@elt\bx@A\@elt\bx@B\@elt\bx@C\@elt\bx@D\@elt\bx@E + \@elt\bx@F\@elt\bx@G\@elt\bx@H\@elt\bx@I\@elt\bx@J + \@elt\bx@K\@elt\bx@L\@elt\bx@M\@elt\bx@N + \@elt\bx@O\@elt\bx@P\@elt\bx@Q\@elt\bx@R} +\@freelist +% +\ifx\numexpr\@undefined\else +\def\reserved@a{% + \@elt\bx@S\@elt\bx@T\@elt\bx@U\@elt\bx@V + \@elt\bx@W\@elt\bx@X\@elt\bx@Y\@elt\bx@Z + \@elt\bx@AA\@elt\bx@BB\@elt\bx@CC\@elt\bx@DD\@elt\bx@EE + \@elt\bx@FF\@elt\bx@GG\@elt\bx@HH\@elt\bx@II\@elt\bx@JJ + \@elt\bx@KK\@elt\bx@LL\@elt\bx@MM\@elt\bx@NN + \@elt\bx@OO\@elt\bx@PP\@elt\bx@QQ\@elt\bx@RR + \@elt\bx@SS\@elt\bx@TT\@elt\bx@UU\@elt\bx@VV + \@elt\bx@WW\@elt\bx@XX\@elt\bx@YY\@elt\bx@ZZ} +\reserved@a +\def\@elt{\noexpand\@elt\noexpand} +\edef\@freelist{\@freelist\reserved@a} +\fi +\let\reserved@a\relax +\let\@elt\relax +% +%\EndIncludeInRelease +%\IncludeInRelease{0000/00/00}% +% {\bx@ZZ}{Extended float list}% +%\def\@freelist{% +% \@elt\bx@A\@elt\bx@B\@elt\bx@C\@elt\bx@D\@elt\bx@E +% \@elt\bx@F\@elt\bx@G\@elt\bx@H\@elt\bx@I\@elt\bx@J +% \@elt\bx@K\@elt\bx@L\@elt\bx@M\@elt\bx@N +% \@elt\bx@O\@elt\bx@P\@elt\bx@Q\@elt\bx@R} +% \insc@unt=234 +%\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % % \begin{macrocode} @@ -3920,8 +3938,9 @@ % \texttt{flafter} to make the tracing work. % \begin{macrocode} \@ifpackageloaded{flafter} - {\PackageWarningNoLine{fltrace}{Load 'fltrace' before 'flafter'\MessageBreak - Attempting to recover by reloading 'flafter'}% + {\PackageWarningNoLine + {fltrace}{Load 'fltrace' before 'flafter'\MessageBreak + Attempting to recover by reloading 'flafter'}% % \end{macrocode} % Hide the fact that \texttt{flafter} was already loaded and then % request it anew. -- cgit v1.2.3