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/doc/latex/memoir/README | 74 +++++++++++++---------- Master/texmf-dist/doc/latex/memoir/memman.pdf | Bin 2673365 -> 2676991 bytes Master/texmf-dist/doc/latex/memoir/memman.tex | 14 ++--- Master/texmf-dist/source/latex/memoir/memoir.dtx | 33 +++++++--- Master/texmf-dist/tex/latex/memoir/memoir.cls | 11 ++-- 5 files changed, 78 insertions(+), 54 deletions(-) diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README index 8737fa71f1e..e8d9451476f 100644 --- a/Master/texmf-dist/doc/latex/memoir/README +++ b/Master/texmf-dist/doc/latex/memoir/README @@ -42,6 +42,15 @@ o Backmatter: Bibliography, indexes ~ 50 pages +Changed (2011/02/18) + +o memoir v3.6i + +-- fixes two problems, one in \addtonotes and implemented the float + inner adjustment in a different manner such that \setfloatlocation + works again + + Changes (2011/02/13) o memoir v3.6h @@ -123,40 +132,7 @@ o Memhfixc v1.15 (special thanks to Ian D. Leroux and meho_r on ctt for reporting this) -Changes (2010/07/01) -o Memoir v3.6d - --- added \precistocformat, default \noindent, thus the toc precis text - is no longer indented by default. --- Fixed some typos in the manual and in the class --- reorganized the manner by which we handle the memoir user - manual. This enables us to add reversion numbers and dates to the - start of each chapter of the manual. Please note that these - revision numbers do not appear if one attempts to compile - memman.tex as it relies on a modified (and thus private) version of - svn-multi and also relies on splitting memman.tex into separate - files. --- If the 'article' class option is in effect we now use the plain - page style by default instead of headings. - -o Memhfixc v1.14 - --- Brought memoir sections back in line with hyperref. Now a hyperlink - to a section should end up above the section tilte, instead of below. - - -Changes (2010/04/19) - -o Memoir v3.6 - --- reversioned memoir to version 3.6. The version number was tending - towards the golden ration, but apparently this numeric value is - not widely known. --- fixed \marginparmargin{left} in twoside mode --- fixed a race condition in memhfixc - - Earlier changes are noted at the end. @@ -266,6 +242,38 @@ trims-example.tex will otherwise be ignored) ------------------------------------------------------------------- +Changes (2010/07/01) + +o Memoir v3.6d + +-- added \precistocformat, default \noindent, thus the toc precis text + is no longer indented by default. +-- Fixed some typos in the manual and in the class +-- reorganized the manner by which we handle the memoir user + manual. This enables us to add reversion numbers and dates to the + start of each chapter of the manual. Please note that these + revision numbers do not appear if one attempts to compile + memman.tex as it relies on a modified (and thus private) version of + svn-multi and also relies on splitting memman.tex into separate + files. +-- If the 'article' class option is in effect we now use the plain + page style by default instead of headings. + +o Memhfixc v1.14 + +-- Brought memoir sections back in line with hyperref. Now a hyperlink + to a section should end up above the section tilte, instead of below. + + +Changes (2010/04/19) + +o Memoir v3.6 + +-- reversioned memoir to version 3.6. The version number was tending + towards the golden ration, but apparently this numeric value is + not widely known. +-- fixed \marginparmargin{left} in twoside mode +-- fixed a race condition in memhfixc Changes (2010/02/20) diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf index 93e812f87c7..863e1fce9fc 100644 Binary files a/Master/texmf-dist/doc/latex/memoir/memman.pdf and b/Master/texmf-dist/doc/latex/memoir/memman.pdf differ diff --git a/Master/texmf-dist/doc/latex/memoir/memman.tex b/Master/texmf-dist/doc/latex/memoir/memman.tex index 0dc77d5f764..a1fe4b01ce2 100644 --- a/Master/texmf-dist/doc/latex/memoir/memman.tex +++ b/Master/texmf-dist/doc/latex/memoir/memman.tex @@ -14219,8 +14219,8 @@ before the stuff you want to have moved out of, say, a part. \svnidlong {$Ignore: $} -{$LastChangedDate: 2011-02-07 00:55:43 +0100 (Mon, 07 Feb 2011) $} -{$LastChangedRevision: 343 $} +{$LastChangedDate: 2011-02-18 14:23:02 +0100 (Fri, 18 Feb 2011) $} +{$LastChangedRevision: 352 $} {$LastChangedBy: daleif $} @@ -14371,12 +14371,10 @@ centered plus have all (floating) tables typeset in \cmd{\small} use \setfloatadjustment{figure}{\centering} \setfloatadjustment{table}{\small\centering} \end{lcode} -The starred floats will call the un-starred adjustment followed by a -starred adjustment (if any is defined), i.e. to center only -\Ie{figure*} use -\begin{lcode} - \setfloatadjustment{figure*}{\centering} -\end{lcode} +\LMnote{2011/02/18}{I've removed the figure*adjustment feature, so + there is no differenting between starred and non starred floats when +it comes to inner adjustment} + \subsection{Margin floats} \label{sec:margin-floats} 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} %\ProvidesClass{memoir}% -% [2011/02/13 v3.6h configurable book, report, article document 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} 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