summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-08 22:33:01 +0000
committerKarl Berry <karl@freefriends.org>2015-07-08 22:33:01 +0000
commitcf50135f238594f9bbff9bb76412001f6a171c85 (patch)
treed9042b6e62e3e7193880e98c79b80fd83b3475e6 /Master/texmf-dist/source
parente1218e4d5ddcb68ac921c718bbe7a537af862583 (diff)
memoir (8jul15)
git-svn-id: svn://tug.org/texlive/trunk@37809 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/memoir/memoir.dtx28
1 files changed, 24 insertions, 4 deletions
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index f7d554e4978..ea366334874 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -20,7 +20,7 @@
% This work consists of the files listed in the README file.
%
% \fi
-% \CheckSum{30748}
+% \CheckSum{30752}
%
% \changes{v0.1}{2001/05/20}{First public alpha release}
% \changes{v0.2}{2001/06/03}{First beta release}
@@ -112,6 +112,9 @@
% \changes{v3.7b}{2013/05/30}{Bugfix, sidecaption}
% \changes{v3.7c}{2015/03/05}{Bugfix}
% \changes{v3.7d}{2015/04/23}{Misc. bugfixes}
+% \changes{v3.7e}{2015/07/08}{Per request from LaTeX Team, etex is not
+% autoloaded on newer kernels}
+%
%
% \def\dtxfile{memoir.dtx}
%
@@ -164,6 +167,7 @@
% \def\fileversion{v3.7b} \def\filedate{2013/05/30}
% \def\fileversion{v3.7c} \def\filedate{2015/03/05}
% \def\fileversion{v3.7d} \def\filedate{2015/04/23}
+% \def\fileversion{v3.7e} \def\filedate{2015/07/08}
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Source code\thanks{This
% file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -393,11 +397,11 @@
% Announce the name, option files and version for LaTeX2e files:
% \begin{macrocode}
%<class>\ProvidesClass{memoir}%
-%<class> [2015/04/23 v3.7d configurable book, report, article document class]
+%<class> [2015/07/08 v3.7e configurable book, report, article document class]
% \end{macrocode}
% In the manual it is useful to know the current version.
% \begin{macrocode}
-%<class>\newcommand\memversion{v3.7d, 2015/04/23}
+%<class>\newcommand\memversion{v3.7e, 2015/07/08}
%<9pt>\ProvidesFile{mem9.clo}%
%<9pt> [2008/01/30 v0.4 memoir class 9pt size option]
%<10pt>\ProvidesFile{mem10.clo}%
@@ -2394,6 +2398,12 @@
% may have the eTeX pacakge, but is not based on eTeX (eventhough that
% is what the LaTeX-project have recommended for several years now),
% so we add a dead mans switch to disable the loading.
+%
+% \medskip\noindent
+% Update 2015: Since the 2015 LaTeX kernel automatically takes care of
+% allocating extra registers, the \Lpack{etex} package is no longer
+% needed with newer kernels. Therefore automatic loading \Lpack{etex}
+% now only happen if the kernel is pre 2015.
% \begin{macro}{\ifmem@noetex}
% \begin{macro}{\mem@noetextrue}
% \begin{macro}{\mem@noetexfalse}
@@ -2442,9 +2452,19 @@
% \end{macrocode}
% Load the eTeX package if found, and if the user has not explicitly
% asked us not to.
+%
+% \medskip\noindent
+% Update 2015: Since 2015 the LaTeX kernel automatically
+% allocate extra registers, thus that part of the \Lpack{etex}
+% package is no longer needed for newer \LaTeX\ kernels. At the
+% request of the LaTeX Team, we now only load \Lpack{etex} on older
+% kernels.
+% \changes{v3.7e}{2015/07/08}{Only load \Lpack{etex} on older kernels}
% \begin{macrocode}
\ifmem@noetex\relax\else
- \IfFileExists{etex.sty}{\RequirePackage{etex}}{}
+ \ifx\e@alloc\@undefined
+ \IfFileExists{etex.sty}{\RequirePackage{etex}}{}
+ \fi
\fi
% \end{macrocode}
% \begin{macro}{\memoirpostopthook}