summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx36
1 files changed, 20 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
index e5e003f45c7..b5fc71e1438 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
@@ -145,7 +145,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
-\GetIdInfo$Id: l3bootstrap.dtx 5500 2015-01-27 14:37:04Z joseph $
+\GetIdInfo$Id: l3bootstrap.dtx 5542 2015-02-28 22:47:53Z joseph $
{L3 Bootstrap code}
%</driver|package>
%<*driver>
@@ -444,27 +444,31 @@
% there is no danger of an \enquote{uncontrolled} error if the engine
% requirements are not met.
%
-% For \LaTeX{} only, load \pkg{etex} as otherwise we are likely to get into
-% trouble with registers. Some inserts are reserved also as these have to
-% be from the standard pool. Note that \tn{reserveinserts} is \tn{outer}
-% and so is accessed here by csname. In earlier versions, loading \pkg{etex}
-% was done directly and so \tn{reserveinserts} appeared in the code: this
-% then required a \tn{relax} after \tn{RequirePackage} to prevent an error
-% with \enquote{unsafe} definitions as seen for example with \pkg{capoptions}.
-% The optional loading here is done using a group and \tn{ifx} test as we
-% are not quite in the position to have a single name for \tn{pdfstrcmp} just
-% yet.
+% For \LaTeXe{} we need to make sure that the extended pool is being used:
+% \pkg{expl3} uses a lot of registers. For formats from 2015 onward there is
+% nothing to do as this is automatic. For older formats, the \pkg{etex}
+% package needs to be loaded to do the job. In that case, some inserts are
+% reserved also as these have to be from the standard pool. Note that
+% \tn{reserveinserts} is \tn{outer} and so is accessed here by csname. In
+% earlier versions, loading \pkg{etex} was done directly and so
+% \tn{reserveinserts} appeared in the code: this then required a \tn{relax}
+% after \tn{RequirePackage} to prevent an error with \enquote{unsafe}
+% definitions as seen for example with \pkg{capoptions}. The optional loading
+% here is done using a group and \tn{ifx} test as we are not quite in the
+% position to have a single name for \tn{pdfstrcmp} just yet.
% \begin{macrocode}
%<*package>
\begingroup
\def\@tempa{LaTeX2e}
\def\next{}
\ifx\fmtname\@tempa
- \def\next
- {%
- \RequirePackage{etex}%
- \csname reserveinserts\endcsname{32}%
- }
+ \unless\ifdefined\extrafloats
+ \def\next
+ {%
+ \RequirePackage{etex}%
+ \csname reserveinserts\endcsname{32}%
+ }
+ \fi
\fi
\expandafter\endgroup
\next