diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/memoir/README | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/memoir/memman.pdf | bin | 2732108 -> 2732193 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/memoir/memman.tex | 24 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/memoir/memsty.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/memoir/memoir.dtx | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/memoir/memoir.cls | 8 |
6 files changed, 54 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README index c056617a96a..a69d578404f 100644 --- a/Master/texmf-dist/doc/latex/memoir/README +++ b/Master/texmf-dist/doc/latex/memoir/README @@ -37,6 +37,14 @@ o Backmatter: +Changed (2015/07/08) + +o memoir v3.7e + +-- per request, memoir no longer auto load the etex package on newer + kernels (as the 2015+ kernels auto allocate the extra registers) + + Changed (2015/04/23) o memoir v3.7d diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf Binary files differindex 0758ee99f16..5484b6b959b 100644 --- a/Master/texmf-dist/doc/latex/memoir/memman.pdf +++ b/Master/texmf-dist/doc/latex/memoir/memman.pdf diff --git a/Master/texmf-dist/doc/latex/memoir/memman.tex b/Master/texmf-dist/doc/latex/memoir/memman.tex index 45cb6ded596..09fa2546a00 100644 --- a/Master/texmf-dist/doc/latex/memoir/memman.tex +++ b/Master/texmf-dist/doc/latex/memoir/memman.tex @@ -12500,8 +12500,8 @@ other environments. \svnidlong {$Ignore: $} -{$LastChangedDate: 2015-01-05 12:35:51 +0100 (Mon, 05 Jan 2015) $} -{$LastChangedRevision: 502 $} +{$LastChangedDate: 2015-05-11 13:47:08 +0200 (Mon, 11 May 2015) $} +{$LastChangedRevision: 531 $} {$LastChangedBy: daleif $} %%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14537,7 +14537,7 @@ following will set up for sub-answers. \newcommand{\subanswer}[1]{ \refstepcounter{subanswer} \par\textbf{\thesubanswer) #1} - \addcontentsline{ans}{subanswer{\protect\numberline{\thesubanswer}#1}} + \addcontentsline{ans}{subanswer}{\protect\numberline{\thesubanswer}#1} \setcounter{ansdepth}{2} \end{lcode} And then: @@ -19612,8 +19612,8 @@ illustrate these points. \svnidlong {$Ignore: $} -{$LastChangedDate: 2015-04-22 17:17:51 +0200 (Wed, 22 Apr 2015) $} -{$LastChangedRevision: 527 $} +{$LastChangedDate: 2015-05-11 16:20:03 +0200 (Mon, 11 May 2015) $} +{$LastChangedRevision: 532 $} {$LastChangedBy: daleif $} \chapter{Page notes} \label{chap:mnotes} @@ -21505,7 +21505,7 @@ By default this means that the header for starred chapters will be something like >>Chapter Title<<, which may look odd. In that case redefine \cmd{\pagenotesubheadstarred} to something similar to \begin{lcode} -\renewcommand\pagenotesubheadstarred{\section*{#3}} +\renewcommand\pagenotesubheadstarred[3]{\section*{#3}} \end{lcode} Just remember that unless you have specified \cmd{\continuousnotenums} in the preamble the note counter (\Icn{pagenote}) will only be reset @@ -31542,8 +31542,8 @@ than Archibald Smythe University will permit. \svnidlong {$Ignore: $} -{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $} -{$LastChangedRevision: 442 $} +{$LastChangedDate: 2015-07-08 09:49:37 +0200 (Wed, 08 Jul 2015) $} +{$LastChangedRevision: 536 $} {$LastChangedBy: daleif $} \chapter{Packages and macros} @@ -31560,6 +31560,14 @@ you do not have them please consider getting them, are: \begin{itemize} \item \Lpack{etex} lets you take advantage of e\tx's extended support for counters and such. + + Note that from 2015 and onwards, the allocation of extra + registers have now been build into the LaTeX kernel. Thus in + most cases the \Lpack{etex} package is no longer + necessary. There are how ever extra very special features left + in \Lpack{etex} that \emph{some} users may need. In that case + please remember to load \Lpack{etex} by placing + \verb|\RequirePackage{etex}| \emph{before} \cs{documentclass}! \item \Lpack{url}~\cite{URL} is for typesetting URL's without worrying about special characters or line breaking. \item \Lpack{fixltx2e}~\cite{FIXLTX2E} eliminates some infelicities diff --git a/Master/texmf-dist/doc/latex/memoir/memsty.sty b/Master/texmf-dist/doc/latex/memoir/memsty.sty index d0b3b10cdf1..d0b64f00809 100644 --- a/Master/texmf-dist/doc/latex/memoir/memsty.sty +++ b/Master/texmf-dist/doc/latex/memoir/memsty.sty @@ -6,7 +6,7 @@ %%\usepackage{layouts}[2001/04/29] %%\usepackage{verbatim} %%\usepackage{glossit} -\usepackage{etex} +%\usepackage{etex} \usepackage{layouts}[2001/04/29] \usepackage{url} \usepackage{fixltx2e} 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} diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls index 4e2948001e5..9ce322f4ef1 100644 --- a/Master/texmf-dist/tex/latex/memoir/memoir.cls +++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls @@ -28,8 +28,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{memoir}% - [2015/04/23 v3.7d configurable book, report, article document class] -\newcommand\memversion{v3.7d, 2015/04/23} + [2015/07/08 v3.7e configurable book, report, article document class] +\newcommand\memversion{v3.7e, 2015/07/08} \newcommand*{\@ptsize}{} \newcommand*{\@memptsize}{} \newlength{\onelineskip} @@ -682,7 +682,9 @@ \fi \ifmem@noetex\relax\else - \IfFileExists{etex.sty}{\RequirePackage{etex}}{} + \ifx\e@alloc\@undefined + \IfFileExists{etex.sty}{\RequirePackage{etex}}{} + \fi \fi \providecommand*{\memoirpostopthook}{} \memoirpostopthook |