memoir update (3jul08)

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

2 files changed, 71 insertions, 66 deletions

diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index f1c5e71d68a..32061c82c62 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -25,7 +25,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{memoir}%
-  [2008/05/26 v1.61803 configurable book, report, article document class]
+  [2008/06/02 v1.618033 configurable book, report, article document class]
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
 \newlength{\onelineskip}
@@ -199,23 +199,31 @@
   \index{\expandafter\@gobble\string#1?\string\cmdprint{\string#1}}}
 
 \newif\ifpdf
+  \pdffalse
 \ifx\pdfoutput\undefined
 \else
-  \ifx\pdfoutput\relax
+  \ifx\pdfoutput\@undefined
   \else
-    \ifcase\pdfoutput
+    \ifx\pdfoutput\relax
     \else
-      \pdftrue
+      \ifnum\pdfoutput>0\relax
+        \pdftrue
+      \fi
     \fi
   \fi
 \fi
 
 \newif\ifetex
   \etexfalse
-\ifx\eTeXversion\@undefined\else
-  \ifx\eTeXversion\relax\else
-    \ifnum\eTeXversion>0\relax
-      \etextrue
+\ifx\eTeXversion\undefined
+\else
+  \ifx\eTeXversion\@undefined
+  \else
+    \ifx\eTeXversion\relax
+    \else
+      \ifnum\eTeXversion>0\relax
+        \etextrue
+      \fi
     \fi
   \fi
 \fi
@@ -231,9 +239,14 @@
 
 \newif\ifluatex
   \luatexfalse
-\ifx\luatexversion\@undefined\else
-  \ifx\luatexversion\relax
-    \luatextrue
+\ifx\luatexversion\@undefined
+\else
+  \ifx\luatexversion\undefined
+  \else
+    \ifx\luatexversion\relax
+    \else
+      \luatextrue
+    \fi
   \fi
 \fi
 
@@ -575,6 +588,9 @@
 \ExecuteOptions{final,letterpaper,10pt,onecolumn,openright,twoside}
 \ProcessOptions
 
+\providecommand*{\memoirpostopthook}{}
+  \memoirpostopthook
+
 \def\cleartorecto{\clearpage\if@twoside \ifodd\c@page\else
   \hbox{}\thispagestyle{cleared}%
   \newpage\if@twocolumn\hbox{}\newpage\fi\fi\fi}
@@ -921,10 +937,11 @@
   \addtolength\marginparwidth{-0.8in} % don't know why this isn't .4
 \fi
 \ifdim\marginparwidth>2in
-  \setlength\marginparwidth{2in}
+  \setlength\marginparwidth{2in}%
 \fi
 \@settopoint\oddsidemargin
 \@settopoint\marginparwidth
+\ifdim\marginparwidth<1pt \setlength\marginparwidth{1pt}\fi
 
 \setlength\evensidemargin  {\paperwidth}
 \addtolength\evensidemargin{-2in}
@@ -952,11 +969,13 @@
 
 \newcommand*{\@memznegtest}[1]{%
   \ifdim#1>\z@\else
-    \@memerror{\protect#1\space is zero or negative}{\@ehd}%
+ %%%%   \@memerror{\protect#1\space is zero or negative}{\@ehd}%
+    \@memwarn{\protect#1\space is zero or negative}%
   \fi}
 \newcommand*{\@memnegtest}[1]{%
   \ifdim#1<\z@
-    \@memerror{\protect#1\space is negative}{\@ehd}%
+%%%%    \@memerror{\protect#1\space is negative}{\@ehd}%
+    \@memwarn{\protect#1\space is negative}%
   \fi}
 
 \newcommand*{\m@mclassicht}{%
@@ -1038,9 +1057,9 @@
   \advance\@tempdima -\paperwidth
   \ifdim\@tempdima<\@tempdimb
     \@tempdima = -\@tempdima
-    \@memerror{\protect\paperwidth\space and/or
-                        \protect\trimedge\space
-                        are too large for \protect\stockwidth\space
+    \@memerror{\protect\paperwidth\space (\the\paperwidth) and/or
+                        \protect\trimedge\space (\the\trimedge)
+                        are too large for \protect\stockwidth\space (\the\stockwidth)
                         by \the\@tempdima}%
                        {\@ehd}
   \fi
@@ -1050,10 +1069,10 @@
   \advance\@tempdima -\spinemargin
   \ifdim\@tempdima<\@tempdimb
     \@tempdima = -\@tempdima
-    \@memerror{\protect\spinemargin\space and/or
-                        \protect\textwidth\space and/or
-                        \protect\foremargin\space
-                        are too large for \protect\paperwidth\space
+    \@memerror{\protect\spinemargin\space (\the\spinemargin) and/or
+                        \protect\textwidth\space (\the\textwidth) and/or
+                        \protect\foremargin\space (\the\foremargin)
+                        are too large for \protect\paperwidth\space (\the\paperwidth)
                         by \the\@tempdima}%
                        {\@ehd}
   \fi
@@ -1062,9 +1081,9 @@
   \advance\@tempdima -\paperheight
   \ifdim\@tempdima<\@tempdimb
     \@tempdima = -\@tempdima
-    \@memerror{\protect\paperheight\space and/or
-                        \protect\trimtop\space
-                        are too large for \protect\stockheight\space
+    \@memerror{\protect\paperheight\space (\the\paperheight) and/or
+                        \protect\trimtop\space (\the\trimtop)
+                        are too large for \protect\stockheight\space (\the\stockheight)
                         by \the\@tempdima}%
                        {\@ehd}
   \fi
@@ -1074,10 +1093,10 @@
   \advance\@tempdima -\lowermargin
   \ifdim\@tempdima<\@tempdimb
     \@tempdima = -\@tempdima
-    \@memerror{\protect\uppermargin\space and/or
-                        \protect\textheight\space and/or
-                        \protect\lowermargin\space
-                        are too large for \protect\paperheight\space
+    \@memerror{\protect\uppermargin\space (\the\uppermargin) and/or
+                        \protect\textheight\space (\the\textheight) and/or
+                        \protect\lowermargin\space (\the\lowermargin)
+                        are too large for \protect\paperheight\space (\the\paperheight)
                         by \the\@tempdima}%
                        {\@ehd}
   \fi
@@ -1086,9 +1105,9 @@
   \advance\@tempdima -\headsep
   \ifdim\@tempdima<\@tempdimb
     \@tempdima = -\@tempdima
-    \@memerror{\protect\headheight\space and/or
-                        \protect\headsep\space
-                        are too large for \protect\uppermargin\space
+    \@memerror{\protect\headheight\space (\the\headheight) and/or
+                        \protect\headsep\space (\the\headsep)
+                        are too large for \protect\uppermargin\space (\the\uppermargin)
                         by \the\@tempdima}%
                        {\@ehd}
   \fi
@@ -1096,8 +1115,8 @@
   \advance\@tempdima -\footskip
   \ifdim\@tempdima<\z@
     \@tempdima = -\@tempdima
-    \@memerror{\protect\footskip
-                        is too large for \protect\lowermargin\space
+    \@memerror{\protect\footskip\space (\the\footskip)
+                        is too large for \protect\lowermargin\space (\the\lowermargin)
                         by \the\@tempdima}%
                        {\@ehd}
   \fi}
@@ -7829,7 +7848,8 @@
   \nametest{#6}{*}\ifsamename\else
     \setsidebarheight{#6}%
     \ifdim\dimen\sideins>\z@\else
-      \@memerror{\protect\sidebarheight\space is zero or negative}{\@ehd}%
+%%%%      \@memerror{\protect\sidebarheight\space is zero or negative}{\@ehd}%
+      \@memwarn{\protect\sidebarheight\space is zero or negative}%
     \fi
   \fi}
 \setsidebars{\marginparsep}%          sidebarhsep
@@ -8837,6 +8857,17 @@
     \unvbox \footins
   \color@endgroup}}
 
+\newcommand*{\m@mopfootnotebf}{%
+  \setbox\@outputbox \vbox{%
+  \boxmaxdepth\@maxdepth
+  \unvbox\@outputbox
+  \vskip\skip\footins
+  \color@begingroup
+    \normalcolor
+    \footnoterule
+    \unvbox \footins
+  \color@endgroup}}
+
 \newcommand*{\m@mopsidebar}{%
   \ifvoid\sideins\else
     \setbox\@outputbox \vbox{%
@@ -8861,14 +8892,13 @@
   \m@m@makecolintro
   \setbox\@outputbox \box\@cclv
   \m@m@makecolfloats
-  \ifvoid\footins
-  \else
-    \m@mopfootnote
+  \ifvoid\footins\else
+    \m@mopfootnotebf
   \fi
   \m@mdoextrafeet
   \m@mopsidebar
   \m@m@makecoltext
-  \global \maxdepth \@maxdepth}
+  \global\maxdepth \@maxdepth}
 
 \gdef\mem@makecoldblf{%
   \m@m@makecolintro
diff --git a/Master/texmf-dist/tex/latex/memoir/mempatch.sty b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
index 9df9b6069ea..6215b65c1f6 100644
--- a/Master/texmf-dist/tex/latex/memoir/mempatch.sty
+++ b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
@@ -22,40 +22,15 @@
 %% 
 %%   This work consists of the files listed in the README file.
 %% 
-\ProvidesFile{mempatch.sty}[2008/06/29 v5.1 Patches for memoir class v1.61803]
+\ProvidesFile{mempatch.sty}[2008/06/02 v5.0 Patches for memoir class v1.618033]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%   Version 5.0 was released simultaneously with version 1.61803 of memoir.
+%%%   Version 5.0 was released simultaneously with versions 1.61803
+%%% and then with 1.618033 of memoir.
 %%% By definition there were no patches.
 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%% 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'.