From 09eb455bf0a899e9231b600e1326d5e0e4a67aca Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 Feb 2011 00:36:44 +0000 Subject: memoir (18feb11) git-svn-id: svn://tug.org/texlive/trunk@21458 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/memoir/memoir.cls | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex/memoir') diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls index 153b22ced90..520ab099ce8 100644 --- a/Master/texmf-dist/tex/latex/memoir/memoir.cls +++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{memoir}% - [2011/02/13 v3.6h configurable book, report, article document class] + [2011/02/18 v3.6i configurable book, report, article document class] \newcommand*{\@ptsize}{} \newcommand*{\@memptsize}{} \newlength{\onelineskip} @@ -6185,11 +6185,12 @@ \@namedef{fleg#2}{#4} % legend naming \@namedef{flegtoc#2}##1{} % legend name in ToC - \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 \newfloat +\let\mem@old@xfloat\@xfloat +\def\@xfloat#1[#2]{\mem@old@xfloat{#1}[#2]\@nameuse{#1adjustment}} \newcommand*{\setfloatlocations}[2]{\@namedef{fps@#1}{#2}} \newcommand*\setfloatadjustment[2]{\@namedef{#1adjustment}{#2}} @@ -10222,7 +10223,7 @@ } \newcommand{\addtonotes}[1]{\ifmempagenotes - \IfFileExists{\jobname.ent}{\m@m@pnwrite\@notefile{}{#1}}{\mempnofilewarn}% + \IfFileExists{\jobname.ent}{\immediate@protected@write\@notefile{}{#1}}{\mempnofilewarn}% \fi} \newcommand{\notenumintext}[1]{% -- cgit v1.2.3