[latex3-commits] [latex2e-public] r1311 - re-instate old fixltx2e guarded by IncludeInRelease
noreply at latex-project.org
noreply at latex-project.org
Thu Dec 29 19:44:15 CET 2016
Author: carlisle
Date: 2016-12-29 19:44:14 +0100 (Thu, 29 Dec 2016)
New Revision: 1311
Added:
trunk/base/testfiles/tlb-fixltx2e-002.lvt
trunk/base/testfiles/tlb-fixltx2e-002.tlg
Modified:
trunk/base/latexrelease.dtx
trunk/base/ltboxes.dtx
trunk/base/ltmath.dtx
Log:
re-instate old fixltx2e guarded by IncludeInRelease
Modified: trunk/base/latexrelease.dtx
===================================================================
--- trunk/base/latexrelease.dtx 2016-12-23 22:03:31 UTC (rev 1310)
+++ trunk/base/latexrelease.dtx 2016-12-29 18:44:14 UTC (rev 1311)
@@ -34,12 +34,12 @@
%</dtx>
%<driver>\ProvidesFile{latexrelease.drv}
%<fixltx2e>\ProvidesPackage{fixltx2e}
-%<fixltx2e> [2015/06/22 v2.0b fixes to LaTeX (obsolete)]
+%<fixltx2e> [2016/12/29 v2.1a fixes to LaTeX (obsolete)]
%<latexrelease>\ProvidesPackage{latexrelease}
%<*!fixltx2e>
% \fi
% \ProvidesFile{latexrelease.dtx}
- [2016/07/04 v1.0g LaTeX release emulation and tests]
+ [2016/12/29 v1.0h LaTeX release emulation and tests]
% \iffalse
%</!fixltx2e>
%<*driver>
@@ -470,11 +470,512 @@
% Generate a stub \Lpack{fixltx2e} package:
% \begin{macrocode}
%<*fixltx2e>
+\IncludeInRelease{2015/01/01}{\fixltxe}{Old fixltx2e package}
\NeedsTeXFormat{LaTeX2e}
\PackageWarningNoLine{fixltx2e}{%
fixltx2e is not required with releases after 2015\MessageBreak
All fixes are now in the LaTeX kernel.\MessageBreak
See the latexrelease package for details}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}{\fixltxe}{Old fixltx2e package}
+\def\@outputdblcol{%
+ \if at firstcolumn
+ \global\@firstcolumnfalse
+ \global\setbox\@leftcolumn\copy\@outputbox
+ \splitmaxdepth\maxdimen
+ \vbadness\maxdimen
+ \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+ \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+ \toks@\expandafter{\topmark}%
+ \xdef\@firstcoltopmark{\the\toks@}%
+ \toks@\expandafter{\splitfirstmark}%
+ \xdef\@firstcolfirstmark{\the\toks@}%
+ \ifx\@firstcolfirstmark\@empty
+ \global\let\@setmarks\relax
+ \else
+ \gdef\@setmarks{%
+ \let\firstmark\@firstcolfirstmark
+ \let\topmark\@firstcoltopmark}%
+ \fi
+ \else
+ \global\@firstcolumntrue
+ \setbox\@outputbox\vbox{%
+ \hb at xt@\textwidth{%
+ \hb at xt@\columnwidth{\box\@leftcolumn \hss}%
+ \hfil
+ {\normalcolor\vrule \@width\columnseprule}%
+ \hfil
+ \hb at xt@\columnwidth{\box\@outputbox \hss}}}%
+ \@combinedblfloats
+ \@setmarks
+ \@outputpage
+ \begingroup
+ \@dblfloatplacement
+ \@startdblcolumn
+ \@whilesw\if at fcolmade \fi{\@outputpage\@startdblcolumn}%
+ \endgroup
+ \fi}
+\def\end at dblfloat{%
+ \if at twocolumn
+ \@endfloatbox
+ \ifnum\@floatpenalty <\z@
+ \@largefloatcheck
+ \global\dp\@currbox1sp %
+ \@cons\@currlist\@currbox
+ \ifnum\@floatpenalty <-\@Mii
+ \penalty -\@Miv
+ \@tempdima\prevdepth
+ \vbox{}%
+ \prevdepth\@tempdima
+ \penalty\@floatpenalty
+ \else
+ \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack
+ \fi
+ \fi
+ \else
+ \end at float
+ \fi
+}
+\def\@testwrongwidth #1{%
+ \ifdim\dp#1=\f at depth
+ \else
+ \global\@testtrue
+ \fi}
+\let\f at depth\z@
+\def\@dblfloatplacement{\global\@dbltopnum\c at dbltopnumber
+ \global\@dbltoproom \dbltopfraction\@colht
+ \@textmin \@colht
+ \advance \@textmin -\@dbltoproom
+ \@fpmin \dblfloatpagefraction\textheight
+ \@fptop \@dblfptop
+ \@fpsep \@dblfpsep
+ \@fpbot \@dblfpbot
+ \def\f at depth{1sp}}
+\def \@doclearpage {%
+ \ifvoid\footins
+ \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa
+ \setbox\@tempboxa\box\@cclv
+ \xdef\@deferlist{\@toplist\@botlist\@deferlist}%
+ \global \let \@toplist \@empty
+ \global \let \@botlist \@empty
+ \global \@colroom \@colht
+ \ifx \@currlist\@empty
+ \else
+ \@latexerr{Float(s) lost}\@ehb
+ \global \let \@currlist \@empty
+ \fi
+ \@makefcolumn\@deferlist
+ \@whilesw\if at fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
+ \if at twocolumn
+ \if at firstcolumn
+ \xdef\@deferlist{\@dbltoplist\@deferlist}%
+ \global \let \@dbltoplist \@empty
+ \global \@colht \textheight
+ \begingroup
+ \@dblfloatplacement
+ \@makefcolumn\@deferlist
+ \@whilesw\if at fcolmade \fi{\@outputpage
+ \@makefcolumn\@deferlist}%
+ \endgroup
+ \else
+ \vbox{}\clearpage
+ \fi
+ \fi
+ \ifx\@deferlist\@empty \else\clearpage \fi
+ \else
+ \setbox\@cclv\vbox{\box\@cclv\vfil}%
+ \@makecol\@opcol
+ \clearpage
+ \fi
+}
+\def \@startdblcolumn {%
+ \@tryfcolumn \@deferlist
+ \if at fcolmade
+ \else
+ \begingroup
+ \let \reserved at b \@deferlist
+ \global \let \@deferlist \@empty
+ \let \@elt \@sdblcolelt
+ \reserved at b
+ \endgroup
+ \fi
+}
+\def\@addtonextcol{%
+ \begingroup
+ \@insertfalse
+ \@setfloattypecounts
+ \ifnum \@fpstype=8
+ \else
+ \ifnum \@fpstype=24
+ \else
+ \@flsettextmin
+ \@reqcolroom \ht\@currbox
+ \advance \@reqcolroom \@textmin
+ \ifdim \@colroom>\@reqcolroom
+ \@flsetnum \@colnum
+ \ifnum\@colnum>\z@
+ \@bitor\@currtype\@deferlist
+ \@testwrongwidth\@currbox
+ \if at test
+ \else
+ \@addtotoporbot
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at insert
+ \else
+ \@cons\@deferlist\@currbox
+ \fi
+ \endgroup
+}
+\def\@addtodblcol{%
+ \begingroup
+ \@insertfalse
+ \@setfloattypecounts
+ \@getfpsbit \tw@
+ \ifodd\@tempcnta
+ \@flsetnum \@dbltopnum
+ \ifnum \@dbltopnum>\z@
+ \@tempswafalse
+ \ifdim \@dbltoproom>\ht\@currbox
+ \@tempswatrue
+ \else
+ \ifnum \@fpstype<\sixt@@n
+ \advance \@dbltoproom \@textmin
+ \ifdim \@dbltoproom>\ht\@currbox
+ \@tempswatrue
+ \fi
+ \advance \@dbltoproom -\@textmin
+ \fi
+ \fi
+ \if at tempswa
+ \@bitor \@currtype \@deferlist
+ \@testwrongwidth\@currbox
+ \if at test
+ \else
+ \@tempdima -\ht\@currbox
+ \advance\@tempdima
+ -\ifx \@dbltoplist\@empty \dbltextfloatsep \else
+ \dblfloatsep \fi
+ \global \advance \@dbltoproom \@tempdima
+ \global \advance \@colht \@tempdima
+ \global \advance \@dbltopnum \m at ne
+ \@cons \@dbltoplist \@currbox
+ \@inserttrue
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at insert
+ \else
+ \@cons\@deferlist\@currbox
+ \fi
+ \endgroup
+}
+\def \@addtocurcol {%
+ \@insertfalse
+ \@setfloattypecounts
+ \ifnum \@fpstype=8
+ \else
+ \ifnum \@fpstype=24
+ \else
+ \@flsettextmin
+ \advance \@textmin \@textfloatsheight
+ \@reqcolroom \@pageht
+ \ifdim \@textmin>\@reqcolroom
+ \@reqcolroom \@textmin
+ \fi
+ \advance \@reqcolroom \ht\@currbox
+ \ifdim \@colroom>\@reqcolroom
+ \@flsetnum \@colnum
+ \ifnum \@colnum>\z@
+ \@bitor\@currtype\@deferlist
+ \@testwrongwidth\@currbox
+ \if at test
+ \else
+ \@bitor\@currtype\@botlist
+ \if at test
+ \@addtobot
+ \else
+ \ifodd \count\@currbox
+ \advance \@reqcolroom \intextsep
+ \ifdim \@colroom>\@reqcolroom
+ \global \advance \@colnum \m at ne
+ \global \advance \@textfloatsheight \ht\@currbox
+ \global \advance \@textfloatsheight 2\intextsep
+ \@cons \@midlist \@currbox
+ \if at nobreak
+ \nobreak
+ \@nobreakfalse
+ \everypar{}%
+ \else
+ \addpenalty \interlinepenalty
+ \fi
+ \vskip \intextsep
+ \box\@currbox
+ \penalty\interlinepenalty
+ \vskip\intextsep
+ \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi
+ \outputpenalty \z@
+ \@inserttrue
+ \fi
+ \fi
+ \if at insert
+ \else
+ \@addtotoporbot
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \if at insert
+ \else
+ \@resethfps
+ \@cons\@deferlist\@currbox
+ \fi
+}
+\def\@xtryfc #1{%
+ \@next\reserved at a\@trylist{}{}%
+ \@currtype \count #1%
+ \divide\@currtype\@xxxii
+ \multiply\@currtype\@xxxii
+ \@bitor \@currtype \@failedlist
+ \@testfp #1%
+ \@testwrongwidth #1%
+ \ifdim \ht #1>\@colht
+ \@testtrue
+ \fi
+ \if at test
+ \@cons\@failedlist #1%
+ \else
+ \@ytryfc #1%
+ \fi}
+\def\@ztryfc #1{%
+ \@tempcnta\count #1%
+ \divide\@tempcnta\@xxxii
+ \multiply\@tempcnta\@xxxii
+ \@bitor \@tempcnta {\@failedlist \@flfail}%
+ \@testfp #1%
+ \@testwrongwidth #1%
+ \@tempdimb\@tempdima
+ \advance\@tempdimb\ht #1%
+ \advance\@tempdimb\@fpsep
+ \ifdim \@tempdimb >\@colht
+ \@testtrue
+ \fi
+ \if at test
+ \@cons\@flfail #1%
+ \else
+ \@cons\@flsucceed #1%
+ \@tempdima\@tempdimb
+ \fi}
+\def\@{\spacefactor\@m{}}
+\def\@tempa#1#2{#1#2\relax}
+\ifx\setlength\@tempa
+ \def\setlength#1#2{#1 #2\relax}
+\fi
+\def\addpenalty#1{%
+ \ifvmode
+ \if at minipage
+ \else
+ \if at nobreak
+ \else
+ \ifdim\lastskip=\z@
+ \penalty#1\relax
+ \else
+ \@tempskipb\lastskip
+ \begingroup
+ \advance \@tempskipb
+ \ifdim\prevdepth>\maxdepth\maxdepth\else
+ \ifdim \prevdepth = -\@m\p@ \z@ \else \prevdepth \fi
+ \fi
+ \vskip -\@tempskipb
+ \penalty#1%
+ \vskip\@tempskipb
+ \endgroup
+ \vskip -\@tempskipb
+ \vskip \@tempskipb
+ \fi
+ \fi
+ \fi
+ \else
+ \@noitemerr
+ \fi}
+\def\@fnsymbol#1{%
+ \ifcase#1\or \TextOrMath\textasteriskcentered *\or
+ \TextOrMath \textdagger \dagger\or
+ \TextOrMath \textdaggerdbl \ddagger \or
+ \TextOrMath \textsection \mathsection\or
+ \TextOrMath \textparagraph \mathparagraph\or
+ \TextOrMath \textbardbl \|\or
+ \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or
+ \TextOrMath {\textdagger\textdagger}{\dagger\dagger}\or
+ \TextOrMath {\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger}\else
+ \@ctrerr \fi
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname eTeXversion\endcsname\relax
+\DeclareRobustCommand\TextOrMath{%
+ \ifmmode \expandafter\@secondoftwo
+ \else \expandafter\@firstoftwo \fi}
+\protected at edef\TextOrMath#1#2{\TextOrMath{#1}{#2}}
+\else
+\protected\expandafter\def\csname TextOrMath\space\endcsname{%
+ \ifmmode \expandafter\@secondoftwo
+ \else \expandafter\@firstoftwo \fi}
+\edef\TextOrMath#1#2{%
+ \expandafter\noexpand\csname TextOrMath\space\endcsname
+ {#1}{#2}}
+\fi
+\def\@esphack{%
+ \relax
+ \ifhmode
+ \spacefactor\@savsf
+ \ifdim\@savsk>\z@
+ \nobreak \hskip\z at skip % <------
+ \ignorespaces
+ \fi
+ \fi}
+\def\@Esphack{%
+ \relax
+ \ifhmode
+ \spacefactor\@savsf
+ \ifdim\@savsk>\z@
+ \nobreak \hskip\z at skip % <------
+ \@ignoretrue
+ \ignorespaces
+ \fi
+ \fi}
+\DeclareRobustCommand\em
+ {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
+ \eminnershape \else \itshape \fi}
+\def\eminnershape{\upshape}
+\DeclareRobustCommand*\textsubscript[1]{%
+ \@textsubscript{\selectfont#1}}
+\def\@textsubscript#1{%
+ {\m at th\ensuremath{_{\mbox{\fontsize\sf at size\z@#1}}}}}
+\def\@DeclareMathSizes #1#2#3#4#5{%
+ \@defaultunits\dimen@ #2pt\relax\@nnil
+ \if $#3$%
+ \expandafter\let\csname S@\strip at pt\dimen@\endcsname\math at fontsfalse
+ \else
+ \@defaultunits\dimen at ii #3pt\relax\@nnil
+ \@defaultunits\@tempdima #4pt\relax\@nnil
+ \@defaultunits\@tempdimb #5pt\relax\@nnil
+ \toks@{#1}%
+ \expandafter\xdef\csname S@\strip at pt\dimen@\endcsname{%
+ \gdef\noexpand\tf at size{\strip at pt\dimen at ii}%
+ \gdef\noexpand\sf at size{\strip at pt\@tempdima}%
+ \gdef\noexpand\ssf at size{\strip at pt\@tempdimb}%
+ \the\toks@
+ }%
+ \fi
+}
+\providecommand*\MakeRobust[1]{%
+ \@ifundefined{\expandafter\@gobble\string#1}{%
+ \@latex at error{The control sequence `\string#1' is undefined!%
+ \MessageBreak There is nothing here to make robust}%
+ \@eha
+ }%
+ {%
+ \@ifundefined{\expandafter\@gobble\string#1\space}%
+ {%
+ \expandafter\let\csname
+ \expandafter\@gobble\string#1\space\endcsname=#1%
+ \edef\reserved at a{\string#1}%
+ \def\reserved at b{#1}%
+ \edef\reserved at b{\expandafter\strip at prefix\meaning\reserved at b}%
+ \edef#1{%
+ \ifx\reserved at a\reserved at b
+ \noexpand\x at protect\noexpand#1%
+ \fi
+ \noexpand\protect\expandafter\noexpand
+ \csname\expandafter\@gobble\string#1\space\endcsname}%
+ }%
+ {\@latex at info{The control sequence `\string#1' is already robust}}%
+ }%
+}
+\MakeRobust\(
+\MakeRobust\)
+\MakeRobust\[
+\MakeRobust\]
+\MakeRobust\makebox
+\MakeRobust\savebox
+\MakeRobust\framebox
+\MakeRobust\parbox
+\MakeRobust\rule
+\MakeRobust\raisebox
+\def\@xfloat #1[#2]{%
+ \@nodocument
+ \def \@captype {#1}%
+ \def \@fps {#2}%
+ \@onelevel at sanitize \@fps
+ \def \reserved at b {!}%
+ \ifx \reserved at b \@fps
+ \@fpsadddefault
+ \else
+ \ifx \@fps \@empty
+ \@fpsadddefault
+ \fi
+ \fi
+ \ifhmode
+ \@bsphack
+ \@floatpenalty -\@Mii
+ \else
+ \@floatpenalty-\@Miii
+ \fi
+ \ifinner
+ \@parmoderr\@floatpenalty\z@
+ \else
+ \@next\@currbox\@freelist
+ {%
+ \@tempcnta \sixt@@n
+ \expandafter \@tfor \expandafter \reserved at a
+ \expandafter :\expandafter =\@fps
+ \do
+ {%
+ \if \reserved at a h%
+ \ifodd \@tempcnta
+ \else
+ \advance \@tempcnta \@ne
+ \fi
+ \else\if \reserved at a t%
+ \@setfpsbit \tw@
+ \else\if \reserved at a b%
+ \@setfpsbit 4%
+ \else\if \reserved at a p%
+ \@setfpsbit 8%
+ \else\if \reserved at a !%
+ \ifnum \@tempcnta>15
+ \advance\@tempcnta -\sixt@@n\relax
+ \fi
+ \else
+ \@latex at error{Unknown float option `\reserved at a'}%
+ {Option `\reserved at a' ignored and `p' used.}%
+ \@setfpsbit 8%
+ \fi\fi\fi\fi\fi
+ }%
+ \@tempcntb \csname ftype@\@captype \endcsname
+ \multiply \@tempcntb \@xxxii
+ \advance \@tempcnta \@tempcntb
+ \global \count\@currbox \@tempcnta
+ }%
+ \@fltovf
+ \fi
+ \global \setbox\@currbox
+ \color at vbox
+ \normalcolor
+ \vbox \bgroup
+ \hsize\columnwidth
+ \@parboxrestore
+ \@floatboxreset
+}
+ \def\@stpelt#1{\global\csname c@#1\endcsname \m at ne\stepcounter{#1}}
+\EndIncludeInRelease
%</fixltx2e>
% \end{macrocode}
%
Modified: trunk/base/ltboxes.dtx
===================================================================
--- trunk/base/ltboxes.dtx 2016-12-23 22:03:31 UTC (rev 1310)
+++ trunk/base/ltboxes.dtx 2016-12-29 18:44:14 UTC (rev 1311)
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltboxes.dtx}
- [2015/01/08 v1.1h LaTeX Kernel (Box Commands)]
+ [2016/12/29 v1.2a LaTeX Kernel (Box Commands)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltboxes.dtx}
@@ -252,6 +252,7 @@
%<latexrelease> \@ifnextchar(%)
%<latexrelease> \@makepicbox
%<latexrelease> {\@ifnextchar[\@makebox\mbox}}%
+%<latexrelease>\expandafter\let\csname makebox \endcsname\@undefined
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
@@ -465,6 +466,7 @@
%<latexrelease>\def\savebox#1{%
%<latexrelease> \@ifnextchar(%)
%<latexrelease> {\@savepicbox#1}{\@ifnextchar[{\@savebox#1}{\sbox#1}}}%
+%<latexrelease>\expandafter\let\csname savebox \endcsname\@undefined
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
@@ -661,6 +663,7 @@
%<latexrelease>\def\framebox{%
%<latexrelease> \@ifnextchar(%)
%<latexrelease> \@framepicbox{\@ifnextchar[\@framebox\fbox}}%
+%<latexrelease>\expandafter\let\csname framebox \endcsname\@undefined
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
@@ -775,6 +778,7 @@
%<latexrelease> \@ifnextchar[%]
%<latexrelease> \@iparbox
%<latexrelease> {\@iiiparbox c\relax[s]}}%
+%<latexrelease>\expandafter\let\csname parbox \endcsname\@undefined
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
@@ -1066,6 +1070,7 @@
%<latexrelease>\IncludeInRelease{0000/00/00}%
%<latexrelease> {\rule}{Make \rule robust}%
%<latexrelease>\def\rule{\@ifnextchar[\@rule{\@rule[\z@]}}%
+%<latexrelease>\expandafter\let\csname rule \endcsname\@undefined
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
@@ -1126,6 +1131,7 @@
%<latexrelease>\def\raisebox#1{%
%<latexrelease> \leavevmode
%<latexrelease> \@ifnextchar[{\@rsbox{#1}}{\@irsbox{#1}[]}}
+%<latexrelease>\expandafter\let\csname raisebox \endcsname\@undefined
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
Modified: trunk/base/ltmath.dtx
===================================================================
--- trunk/base/ltmath.dtx 2016-12-23 22:03:31 UTC (rev 1310)
+++ trunk/base/ltmath.dtx 2016-12-29 18:44:14 UTC (rev 1311)
@@ -31,14 +31,14 @@
%
%<leqno>\ProvidesFile{leqno.clo}
%<fleqn>\ProvidesFile{fleqn.clo}
-%<leqno,fleqn> [2015/03/31 v1.1i Standard LaTeX option
+%<leqno,fleqn> [2016/12/29 v1.2a Standard LaTeX option
%<leqno> (left equation numbers)]
%<fleqn> (flush left equations)]
%
%<*driver>
% \fi
\ProvidesFile{ltmath.dtx}
- [2015/03/11 v1.1i LaTeX Kernel (Math Setup)]
+ [2016/12/29 v1.2a LaTeX Kernel (Math Setup)]
% \iffalse
%</driver>
%
@@ -537,8 +537,10 @@
%<latexrelease>\IncludeInRelease{0000/00/00}{\(}{Make \( robust}%
%<latexrelease>\def\({%
%<latexrelease> \relax\ifmmode\@badmath\else$\fi}%
+%<latexrelease>\expandafter\let\csname\string( \endcsname\@undefined
%<latexrelease>\def\){%
%<latexrelease> \relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}%
+%<latexrelease>\expandafter\let\csname\string) \endcsname\@undefined
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
@@ -600,6 +602,7 @@
%<latexrelease> $$%%$$ BRACE MATCH HACK
%<latexrelease> \fi
%<latexrelease>}%
+%<latexrelease>\expandafter\let\csname\string[ \endcsname\@undefined
% \end{macrocode}
%
% \begin{macrocode}
@@ -615,6 +618,7 @@
%<latexrelease> \fi
%<latexrelease> \ignorespaces
%<latexrelease>}%
+%<latexrelease>\expandafter\let\csname\string] \endcsname\@undefined
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
Added: trunk/base/testfiles/tlb-fixltx2e-002.lvt
===================================================================
--- trunk/base/testfiles/tlb-fixltx2e-002.lvt (rev 0)
+++ trunk/base/testfiles/tlb-fixltx2e-002.lvt 2016-12-29 18:44:14 UTC (rev 1311)
@@ -0,0 +1,28 @@
+% fixltx2e should update formats that have been re-set vial latexrelease
+
+\input{test2e}
+
+\START
+
+% robust
+\show\(
+\show\makebox
+
+\OMIT
+\RequirePackage[2014/01/01]{latexrelease}
+\TIMO
+
+% not robust
+\show\(
+\show\makebox
+
+\OMIT
+\documentclass{article}
+\usepackage{fixltx2e}
+\TIMO
+
+% robust again
+\show\(
+\show\makebox
+
+\END
\ No newline at end of file
Added: trunk/base/testfiles/tlb-fixltx2e-002.tlg
===================================================================
--- trunk/base/testfiles/tlb-fixltx2e-002.tlg (rev 0)
+++ trunk/base/testfiles/tlb-fixltx2e-002.tlg 2016-12-29 18:44:14 UTC (rev 1311)
@@ -0,0 +1,20 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+> \(=macro:
+->\x at protect \(\protect \( .
+l. ...\show\(
+> \makebox=macro:
+->\protect \makebox .
+l. ...\show\makebox
+> \(=macro:
+->\relax \ifmmode \@badmath \else $\fi .
+l. ...\show\(
+> \makebox=macro:
+->\leavevmode \@ifnextchar (\@makepicbox {\@ifnextchar [\@makebox \mbox }.
+l. ...\show\makebox
+> \(=macro:
+->\x at protect \(\protect \( .
+l. ...\show\(
+> \makebox=macro:
+->\protect \makebox .
+l. ...\show\makebox
More information about the latex3-commits
mailing list