memoir patches update 4.8 (23jan07)

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

4 files changed, 119 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index 406ea3c0534..55a9e3ffb30 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -23,6 +23,11 @@ use the memhfixc package after the hyperref package, e.g.,
 ...
 Later versions of the hyperref package automatically load the memhfixc package.
 
+Changes (2007/01/22)
+o New version (4.8) of mempatch.sty, fixing the abstract environment and
+  other minor infelicities.
+o NO CHANGES TO THE USER MANUAL OR ADDENDUM
+
 Changes (2006/12/23)
 o New version (4.7) of mempatch.sty, fixing minor infelicities with v4.6
 o NO CHANGES TO THE USER MANUAL OR ADDENDUM
@@ -222,7 +227,7 @@ o First public experimental alpha release
 
 ------------------------------------------------------------------- 
   Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-  Copyright 2001--2005 Peter R. Wilson
+  Copyright 2001--2007 Peter R. Wilson
  
   This work may be distributed and/or modified under the
   conditions of the LaTeX Project Public License, either
@@ -293,6 +298,6 @@ o Run (pdf)latex twice more on memman.tex
 o Print the manual
 
 
-2006/12/23
+2007/01/22
 Peter Wilson
 herries dot press at earthlink dot net
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
index 6301f8f8495..687682ca40f 100755
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -2,7 +2,7 @@
 %
 % mempatch.dtx
 % Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-% Copyright 2001 --- 2006 Peter R. Wilson
+% Copyright 2001 --- 2007 Peter R. Wilson
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -19,7 +19,7 @@
 %
 % 
 % \fi
-% \CheckSum{6212}
+% \CheckSum{6253}
 %
 % \def\dtxfile{\texttt{mempatch.dtx}}
 % \def\fileversion{v1.0} \def\filedate{2003/10/04}
@@ -55,6 +55,7 @@
 % \def\fileversion{v4.5} \def\filedate{2006/08/08}
 % \def\fileversion{v4.6} \def\filedate{2006/12/11}
 % \def\fileversion{v4.7} \def\filedate{2006/12/23}
+% \def\fileversion{v4.8} \def\filedate{2007/01/22}
 %
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Code patches\thanks{This
@@ -776,8 +777,9 @@
 % ^^A \ProvidesFile{mempatch.sty}[2006/07/10 v4.5 Patches for memoir class v1.618]
 % ^^A \ProvidesFile{mempatch.sty}[2006/08/08 v4.5 Patches for memoir class v1.618]
 % ^^A \ProvidesFile{mempatch.sty}[2006/12/11 v4.6 Patches for memoir class v1.618]
+% ^^A \ProvidesFile{mempatch.sty}[2006/12/23 v4.7 Patches for memoir class v1.618]
 %    \begin{macrocode}
-\ProvidesFile{mempatch.sty}[2006/12/23 v4.7 Patches for memoir class v1.618]
+\ProvidesFile{mempatch.sty}[2007/01/22 v4.8 Patches for memoir class v1.618]
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -803,6 +805,8 @@
 %%% See the code (near the end) for details.
 %%%
 %%%   Version 4.7 fixes tiny bugs introduced in version 4.6
+%%%
+%%%   Version 4.8 fixes some more little bugs.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %    \end{macrocode}
@@ -3049,11 +3053,12 @@
 %
 % \begin{macro}{\newlistentry}
 % Extend \cs{newlistentry} to add \cs{cftXname}.
+% \changes{v4.8}{2007/01/22}{Added missing backslash in \cs{newlistentry}}
 %    \begin{macrocode}
 \renewcommand*{\newlistentry}[4][\@empty]{%
   \@ifundefined{c@#2}{%  check & set the counter
     \ifx \@empty#1\relax
-      newcounter{#2}%
+      \newcounter{#2}%  % added the backslash 2007/01/22 per J{\o}rgen Larsen
     \else
       \newcounter{#2}[#1]%
       \expandafter\edef\csname the#2\endcsname{%
@@ -6240,6 +6245,74 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \section{Mempatch version 4.8}
+%
+%    \begin{macrocode}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Version 4.8 (2007/01/22 and later)
+
+%    \end{macrocode}
+%
+% \subsection{Abstracts}
+%
+%    There are various problems with the code for abstracts, partly because
+% it was too early in the class file (it should have come \emph{after}
+% the code for lists).
+% \changes{v4.8}{2007/01/22}{Several changes to the code for abstracts}
+%
+% \begin{macro}{\abscolnamefont}
+% \begin{macro}{\abscoltextfont}
+% Fonts for an abstract in a two column document where the abstract 
+% is part of a column. Also the default \cs{absrightmargin}.
+% \changes{v4.8}{2007/01/22}{Added \cs{abscolnamefont} and \cs{abscoltextfont}}
+%    \begin{macrocode}
+%%%% \abscolnamefont and \abscoltextfont are the fonts when an abstract
+%%%% is like a section in a two column document.
+\newcommand*{\abscolnamefont}{\normalfont\Large\bfseries}
+\newcommand*{\abscoltextfont}{\normalfont}
+
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\absleftindent}
+% \begin{macro}{\abs@leftindent}
+% \begin{macro}{\absrightindent}
+% Set these lengths \emph{after} \cs{leftmargin} and \cs{rightmargin} have 
+% been set.
+%    \begin{macrocode}
+\absleftindent=\leftmargin
+\abs@leftindent=\leftmargin
+\absrightindent=\leftmargin
+
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+%
+% \begin{macro}{\setup@bstract}
+% The \cs{setup@bstract} macro set \cs{absrightindent} and it shouldn't
+% have done.
+% \changes{v4.8}{2007/01/22}{Deleted always setting \cs{absrightindent} in \cs{setup@bstract}}
+%    \begin{macrocode}
+\renewcommand*{\setup@bstract}{%
+  \abs@leftindent=\absleftindent
+  \if@twocolumn
+    \if@bsonecol
+    \else
+      \abs@leftindent=\z@
+      \absrightindent=\z@
+      \renewcommand*{\abstractnamefont}{\abscolnamefont}
+      \renewcommand*{\abstracttextfont}{\abscoltextfont}
+      \renewcommand*{\absnamepos}{flushleft}
+      \setlength{\abstitleskip}{-2ex}
+    \fi
+  \fi}
+
+%    \end{macrocode}
+% \end{macro}
+%
 %
 % The end of the patch file
 %
diff --git a/Master/texmf-dist/tex/latex/memoir/mempatch.sty b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
index c00b0517f24..c4b1916fd05 100644
--- a/Master/texmf-dist/tex/latex/memoir/mempatch.sty
+++ b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
@@ -7,7 +7,7 @@
 %% mempatch.dtx  (with options: `patch')
 %% 
 %%   Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%%   Copyright 2001 --- 2006 Peter R. Wilson
+%%   Copyright 2001 --- 2007 Peter R. Wilson
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
@@ -22,7 +22,7 @@
 %% 
 %%   This work consists of the files listed in the README file.
 %% 
-\ProvidesFile{mempatch.sty}[2006/12/23 v4.7 Patches for memoir class v1.618]
+\ProvidesFile{mempatch.sty}[2007/01/22 v4.8 Patches for memoir class v1.618]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%   Version 4.0 was released simultaneously with version 1.618 of memoir.
@@ -47,6 +47,8 @@
 %%% See the code (near the end) for details.
 %%%
 %%%   Version 4.7 fixes tiny bugs introduced in version 4.6
+%%%
+%%%   Version 4.8 fixes some more little bugs.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1199,7 +1201,7 @@
 \renewcommand*{\newlistentry}[4][\@empty]{%
   \@ifundefined{c@#2}{%  check & set the counter
     \ifx \@empty#1\relax
-      newcounter{#2}%
+      \newcounter{#2}%  % added the backslash 2007/01/22 per J{\o}rgen Larsen
     \else
       \newcounter{#2}[#1]%
       \expandafter\edef\csname the#2\endcsname{%
@@ -3041,6 +3043,32 @@
   \begin{minipage}{\epigraphwidth}\begin{\sourceflush} #1\par
   \end{\sourceflush}\end{minipage}}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Version 4.8 (2007/01/22 and later)
+
+%%%% \abscolnamefont and \abscoltextfont are the fonts when an abstract
+%%%% is like a section in a two column document.
+\newcommand*{\abscolnamefont}{\normalfont\Large\bfseries}
+\newcommand*{\abscoltextfont}{\normalfont}
+
+\absleftindent=\leftmargin
+\abs@leftindent=\leftmargin
+\absrightindent=\leftmargin
+
+\renewcommand*{\setup@bstract}{%
+  \abs@leftindent=\absleftindent
+  \if@twocolumn
+    \if@bsonecol
+    \else
+      \abs@leftindent=\z@
+      \absrightindent=\z@
+      \renewcommand*{\abstractnamefont}{\abscolnamefont}
+      \renewcommand*{\abstracttextfont}{\abscoltextfont}
+      \renewcommand*{\absnamepos}{flushleft}
+      \setlength{\abstitleskip}{-2ex}
+    \fi
+  \fi}
+
 \endinput
 %%
 %% End of file `mempatch.sty'.
diff --git a/Master/texmf-dist/tpm/memoir.tpm b/Master/texmf-dist/tpm/memoir.tpm
index 07c89337e21..924505031b9 100644
--- a/Master/texmf-dist/tpm/memoir.tpm
+++ b/Master/texmf-dist/tpm/memoir.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/memoir.zip">
     <TPM:Name>memoir</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/12/29 01:01:17</TPM:Date>
+    <TPM:Date>2007/01/23 00:15:24</TPM:Date>
     <TPM:Version>3.11</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>
@@ -23,7 +23,7 @@ hyphenation, typewriter font). Documents can use 9pt, 10pt,
     <TPM:Size>4610196</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="395849">
+    <TPM:RunFiles size="396751">
 texmf-dist/makeindex/memoir/memman.ist
 texmf-dist/tex/latex/memoir/mem10.clo
 texmf-dist/tex/latex/memoir/mem11.clo
@@ -36,14 +36,14 @@ texmf-dist/tex/latex/memoir/memoir.cls
 texmf-dist/tex/latex/memoir/mempatch.sty
 texmf-dist/tpm/memoir.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="3187031">
+    <TPM:DocFiles size="3187198">
 texmf-dist/doc/latex/memoir/README
 texmf-dist/doc/latex/memoir/basic.gst
 texmf-dist/doc/latex/memoir/memman.pdf
 texmf-dist/doc/latex/memoir/memman.tex
 texmf-dist/doc/latex/memoir/memmanadd.pdf
     </TPM:DocFiles>
-    <TPM:SourceFiles size="1027316">
+    <TPM:SourceFiles size="1029677">
 texmf-dist/source/latex/memoir/memoir.dtx
 texmf-dist/source/latex/memoir/memoir.ins
 texmf-dist/source/latex/memoir/mempatch.dtx