memoir (18feb11)

git-svn-id: svn://tug.org/texlive/trunk@21458 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 25 insertions, 8 deletions

diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index a3d9f3a9162..091c8f293ee 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -19,7 +19,7 @@
 % This work consists of the files listed in the README file.
 % 
 % \fi
-% \CheckSum{30114}
+% \CheckSum{30116}
 %
 % \changes{v0.1}{2001/05/20}{First public alpha release}
 % \changes{v0.2}{2001/06/03}{First beta release}
@@ -103,6 +103,8 @@
 % \changes{v3.6e}{2010/08/20}{Maintenance}
 % \changes{v3.6f}{2010/08/22}{Bad typo}
 % \changes{v3.6g}{2010/09/19}{Maintenance}
+% \changes{v3.6h}{2011/02/13}{Various things}
+% \changes{v3.6i}{2011/02/18}{Two bug fixes}
 %
 % \def\dtxfile{memoir.dtx}
 %
@@ -148,6 +150,7 @@
 % \def\fileversion{v3.6f}          \def\filedate{2010/08/22}
 % \def\fileversion{v3.6g}          \def\filedate{2010/09/19}
 % \def\fileversion{v3.6h}          \def\filedate{2011/02/13}
+% \def\fileversion{v3.6i}          \def\filedate{2011/02/18}
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Source code\thanks{This
 %        file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -377,7 +380,7 @@
 %    Announce the name, option files and version for LaTeX2e files:
 %    \begin{macrocode}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2011/02/13 v3.6h configurable book, report, article document class]
+%<class>  [2011/02/18 v3.6i configurable book, report, article document class]
 %<9pt>\ProvidesFile{mem9.clo}%
 %<9pt>             [2008/01/30 v0.4 memoir class 9pt size option]
 %<10pt>\ProvidesFile{mem10.clo}%
@@ -18245,12 +18248,13 @@
 % Finally define the new float environment, in both normal and starred
 % forms. We also al an internal macro that can be used to globally
 % adjust floats, e.g. making all tables in small size.
-% \changes{v3.6h}{2011/02/01}{Added the calling of the adjustment
-% macros, and changed the handling of optional arguments a little.}
+% We would like to be able to insert adjustments inside the
+% floats. But the manner in which \cs{@float} works makes it
+% impossible for us to simple insert this into the definitions of the
+% floats. 
 %    \begin{macrocode}
-  \newenvironment{#2}[1][\@nameuse{fps@#2}]{\@float{#2}[##1]\@nameuse{#2adjustment}}{\end@float}
-  \newenvironment{#2*}[1][\@nameuse{fps@#2}]{%
-     \@dblfloat{#2}[##1]\@nameuse{#2adjustment}\@nameuse{#2*adjustment}}{\end@dblfloat}
+  \newenvironment{#2}{\@float{#2}}{\end@float}
+  \newenvironment{#2*}{\@dblfloat{#2}}{\end@dblfloat}
 %    \end{macrocode}
 % \end{environment}
 % \end{environment}
@@ -18262,6 +18266,18 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v3.6i}{2011/02/18}{Added this instead of inserting the
+% adjustment code directly into the environment definitions}
+% \begin{macro}{\@xfloat}
+%   In order to inject adjustment code into the core of the floats we
+%   will need to patch the code float macros a little.
+%    \begin{macrocode}
+\let\mem@old@xfloat\@xfloat
+\def\@xfloat#1[#2]{\mem@old@xfloat{#1}[#2]\@nameuse{#1adjustment}}
+%    \end{macrocode}
+%   
+% \end{macro}
+%
 % \begin{macro}{\setfloatlocations}
 % \cs{setfloatlocations}\marg{float}\marg{locs} sets the defualt locations
 % for the \meta{float} class of floats (e.g., \texttt{figure}) to \meta{locs}
@@ -28261,9 +28277,10 @@
 %
 % \begin{macro}{\addtonotes}
 % \cs{addtonotes}\marg{text} puts \meta{text} into the notes file.
+% \changes{v3.6i}{2011/02/18}{\cs{addtonotes} need \cs{immediate@protected@write}}
 %    \begin{macrocode}
 \newcommand{\addtonotes}[1]{\ifmempagenotes
- \IfFileExists{\jobname.ent}{\m@m@pnwrite\@notefile{}{#1}}{\mempnofilewarn}%
+ \IfFileExists{\jobname.ent}{\immediate@protected@write\@notefile{}{#1}}{\mempnofilewarn}%
 \fi}
 
 %    \end{macrocode}