summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-07-02 13:37:12 +0000
committerKarl Berry <karl@freefriends.org>2008-07-02 13:37:12 +0000
commit44c08073080c733a50d3bf35ab5dddc6f1f4915c (patch)
tree246f931115d53d9444750ef0296a08464d520168 /Master
parent001ae50bb1458fee8e67cceb9b5e6ca0c7de001b (diff)
memoir update (30jun08)
git-svn-id: svn://tug.org/texlive/trunk@9157 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/memoir/README17
-rwxr-xr-xMaster/texmf-dist/source/latex/memoir/mempatch.dtx50
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mempatch.sty28
3 files changed, 85 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index 79055529523..2e919893251 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -8,7 +8,7 @@ more popular packages.
NOTE: If you have any questions please ask them on the comp.text.tex
newsgroup; you are likely to get faster and better answers than if you
-email me directly as I am away more often than not.
+email me directly.
NOTE: In order to provide fixes for any problems that may arise
between major releases, you may find a file called mempatch.sty
@@ -17,8 +17,8 @@ will automatically include this so DO NOT \usepackage{mempatch}.
The Change lists below do not neccessarily note each release of
the patch or addendum files.
- NOTE: Similarly, there may be file(s) called memmanadd.(tex|pdf) which
-provides amendments to the current version of the User Manual.
+ NOTE: Similarly, there may be a file called memmanadd.* which provides
+amendments to the current version of the User Manual.
NOTE: If you are using the hyperref package dated earlier than 2006/11/15,
use the memhfixc package after the hyperref package, e.g.,
@@ -38,7 +38,10 @@ o Mainmatter:
o Appendices: (La)Tex programming, Errors and warnings ~ 40 pages
o Backmatter:
Command glossary ~ 40 pages
- Bibliography, indexes ~ 50 pages
+ Bibliography, index ~ 50 pages
+
+Changes (2008/06/29)
+o Mempatch v5.1 released to fix \feetbelowfloats bug.
Changes (2008/05/27)
@@ -312,11 +315,10 @@ memman.tex LaTeX source for the user manual
memman.pdf User manual in PDF
memmanadd.pdf Addendum (in PDF) to the User Manual (if required)
memsty.sty Style file for (memman|memmanadd).tex
+memlays.sty Style file for extra layouts
memnoidxnum.tex Some default indexed elements for memman.tex
memfonts.sty Palatino/CMR(lmodern) font mix
-memlays.sty Additional diagrammatic layouts
titlepages.sty Assorted title page definitions
-anvil2.mps Herries Press logo
memman.ist MakeIndex style file for (memman|memmanadd).tex
memman.gst MakeIndex style file for (memman|memmanadd) glossary
@@ -336,7 +338,7 @@ o run: (pdf)latex memoir.dtx
For an index run: makeindex -s gind.ist memoir
o run: (pdf)latex memoir.dtx
o Print the result for a hardcopy of the documented code (which consists
- of nearly 500 pages)
+ of about 400 pages)
To process memman.tex (if you really want to do this and not just use
memman.pdf as supplied)
@@ -344,7 +346,6 @@ o Make sure you can use the memoir class and the alltt, fixltx2e,
layouts, graphicx, comment, and url (and perhaps some more) packages.
o Run (pdf)latex twice on memman.tex
o For an index run: makeindex -s memman.ist memman
-o For an index of first lines run: makeindex lines
o For a glossary run: makeindex -s memman.gst -o memman.gls memman.glo
o Run (pdf)latex twice more on memman.tex
o Print the manual
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
index 6808ffc1070..221bb28d5ad 100755
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -60,6 +60,7 @@
% \def\fileversion{v4.9a} \def\filedate{2007/12/24}
% \def\fileversion{v4.9a+} \def\filedate{2007/12/31}
% \def\fileversion{v5.0} \def\filedate{2008/05/26}
+% \def\fileversion{v5.1} \def\filedate{2008/06/29}
%
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Code patches\thanks{This
@@ -791,8 +792,9 @@
%
% ^^A \ProvidesFile{mempatch.sty}[2007/12/24 v4.9a Patches for memoir class v1.618]
% ^^A \ProvidesFile{mempatch.sty}[2007/12/31 v4.9a+ Patches for memoir class v1.618]
+% ^^A \ProvidesFile{mempatch.sty}[2008/05/26 v5.0 Patches for memoir class v1.61803]
% \begin{macrocode}
-\ProvidesFile{mempatch.sty}[2008/05/26 v5.0 Patches for memoir class v1.61803]
+\ProvidesFile{mempatch.sty}[2008/06/29 v5.1 Patches for memoir class v1.61803]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Version 5.0 was released simultaneously with version 1.61803 of memoir.
@@ -802,6 +804,52 @@
% \end{macrocode}
%
+% \subsection{Version 5.1}
+%
+% \begin{macrocode}
+%%%%%%%%%%%%%%%%%%%%%%%%%%% Version 5.1 (2008/06/29) %%%%%%%%%%%%%%%%%%%
+
+% \end{macrocode}
+%
+% J{\o}rgen Larsen\footnote{CTT, \textit{Memoir: \cs{feetbelow} eats the main
+% text}, 2008/06/23 (\url{jl@ruc.dk}).} discovered that using
+% \cs{feetbelowfloats} had the side effect of eliminating all but the
+% footnotes.
+% \begin{macro}{\m@mopfootnotebf}
+% \begin{macro}{\mem@makecolbf}
+% These two macros enable footnotes to be set below any bottom floats.
+% \changes{v5.1}{2008/06/29}{Added \cs{m@mopfootnotebf} and used it in
+% \cs{mem@makecolbf}}
+% \begin{macrocode}
+%%%% fix for \feetbelowfloats bug
+
+\newcommand*{\m@mopfootnotebf}{%
+ \setbox\@outputbox \vbox{%
+ \boxmaxdepth\@maxdepth
+ \unvbox\@outputbox
+ \vskip\skip\footins
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color@endgroup}}
+\gdef\mem@makecolbf{%
+ \m@m@makecolintro
+ \setbox\@outputbox \box\@cclv
+ \m@m@makecolfloats
+ \ifvoid\footins\else
+ \m@mopfootnotebf
+ \fi
+ \m@mdoextrafeet
+ \m@mopsidebar
+ \m@m@makecoltext
+ \global\maxdepth \@maxdepth}
+
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+%
% The end of the patch file.
%
% \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/memoir/mempatch.sty b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
index 3ea25995e8b..9df9b6069ea 100644
--- a/Master/texmf-dist/tex/latex/memoir/mempatch.sty
+++ b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
@@ -22,7 +22,7 @@
%%
%% This work consists of the files listed in the README file.
%%
-\ProvidesFile{mempatch.sty}[2008/05/26 v5.0 Patches for memoir class v1.61803]
+\ProvidesFile{mempatch.sty}[2008/06/29 v5.1 Patches for memoir class v1.61803]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Version 5.0 was released simultaneously with version 1.61803 of memoir.
@@ -30,6 +30,32 @@
%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%% Version 5.1 (2008/06/29) %%%%%%%%%%%%%%%%%%%
+
+%%%% fix for \feetbelowfloats bug
+
+\newcommand*{\m@mopfootnotebf}{%
+ \setbox\@outputbox \vbox{%
+ \boxmaxdepth\@maxdepth
+ \unvbox\@outputbox
+ \vskip\skip\footins
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color@endgroup}}
+\gdef\mem@makecolbf{%
+ \m@m@makecolintro
+ \setbox\@outputbox \box\@cclv
+ \m@m@makecolfloats
+ \ifvoid\footins\else
+ \m@mopfootnotebf
+ \fi
+ \m@mdoextrafeet
+ \m@mopsidebar
+ \m@m@makecoltext
+ \global\maxdepth \@maxdepth}
+
\endinput
%%
%% End of file `mempatch.sty'.