diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/memoir/README | 26 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/memoir/memoir.dtx | 151 | ||||
| -rwxr-xr-x | Master/texmf-dist/source/latex/memoir/mempatch.dtx | 53 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/memoir/memoir.cls | 106 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/memoir/mempatch.sty | 31 |
5 files changed, 199 insertions, 168 deletions
diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README index 2e919893251..91933976bcb 100644 --- a/Master/texmf-dist/doc/latex/memoir/README +++ b/Master/texmf-dist/doc/latex/memoir/README @@ -6,9 +6,9 @@ normal fontsize and, if you have scalable fonts, 20pt, 25pt, 30pt, 36pt, you create your particular design. The class incorporates over 30 of the 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. + IF YOU HAVE ANY QUESTIONS PLEASE ASK THEM ON THE COMP.TEXT.TEX NEWSGROUP; +YOU ARE LIKELY TO GET FASER AND BETTER ANSWERS THAN IF YOU EMAIL ME DIRECTLY +AS I AM AWAY MORE OFTEN THAN NOT. 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 a file called memmanadd.* which provides -amendments to the current version of the User Manual. + NOTE: Similarly, there may be file(s) called memmanadd.(tex|pdf) 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,11 +38,13 @@ o Mainmatter: o Appendices: (La)Tex programming, Errors and warnings ~ 40 pages o Backmatter: Command glossary ~ 40 pages - Bibliography, index ~ 50 pages + Bibliography, indexes ~ 50 pages -Changes (2008/06/29) -o Mempatch v5.1 released to fix \feetbelowfloats bug. +Changes (2008/06/02) +o Memoir class v1.618033 released with bug fixes for \feetbelowfloats + and sidebar layout for the larger font sizes. +o NO CHANGES TO THE USER MANUAL Changes (2008/05/27) o Memoir class v1.61803 released incorporating all patches and comments about @@ -315,10 +317,11 @@ 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 @@ -338,7 +341,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 about 400 pages) + of nearly 500 pages) To process memman.tex (if you really want to do this and not just use memman.pdf as supplied) @@ -346,12 +349,13 @@ 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 -2008/05/27 +2008/06/02 Peter Wilson herries dot press at earthlink dot net diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx index 42c0f13726a..cba17ce08e3 100644 --- a/Master/texmf-dist/source/latex/memoir/memoir.dtx +++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx @@ -18,7 +18,7 @@ % This work consists of the files listed in the README file. % % \fi -% \CheckSum{27322} +% \CheckSum{27414} % % \changes{v0.1}{2001/05/20}{First public alpha release} % \changes{v0.2}{2001/06/03}{First beta release} @@ -65,6 +65,7 @@ % \changes{v1.618}{2005/09/25}{Support for glossaries} % \changes{v1.6180}{2006/06/12}{Footnote font fix} % \changes{v1.61803}{2008/05/26}{Folded in all mempatch v4.9a patches} +% \changes{v1.618033}{2008/06/02}{Fixed(?) page layout algorithms} % % \def\dtxfile{memoir.dtx} % @@ -88,6 +89,7 @@ % \def\fileversion{v1.618} \def\filedate{2005/09/27} % \def\fileversion{v1.6180} \def\filedate{2006/06/12} % \def\fileversion{v1.61803} \def\filedate{2008/05/26} +% \def\fileversion{v1.618033} \def\filedate{2008/06/02} % \title{The LaTeX \Lpack{memoir} class for configurable book % typesetting: Source code\thanks{This % file (\texttt{\dtxfile}) has version number \fileversion, last revised @@ -304,10 +306,11 @@ %<class>\NeedsTeXFormat{LaTeX2e} % \end{macrocode} % +% ^^A Use the Golden Section as the version number (1.6180339887 4989484820 4586834365) % Announce the name, option files and version for LaTeX2e files: % \begin{macrocode} %<class>\ProvidesClass{memoir}% -%<class> [2008/05/26 v1.61803 configurable book, report, article document class] +%<class> [2008/06/02 v1.618033 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}% @@ -965,27 +968,33 @@ % \subsection{Checking the processor} % % \begin{macro}{\ifpdf} +% \begin{macro}{\pdftrue} +% \begin{macro}{\pdffalse} % This can be used to check whether or not a document is being processed % by \LaTeX{} or pdf\LaTeX. % \changes{v1.0}{2001/09/21}{Made checking of \cs{pdfouput} more robust} % \changes{v1.618}{2005/09/03}{Prohibit loading the ifpdf package (mempatch v3.9)} +% \changes{v1.618033}{2008/06/02}{Further improved pdf checking} % \begin{macrocode} \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 % \end{macrocode} % \end{macro} -% -% +% \end{macro} +% \end{macro} % % \begin{macro}{\ifetex} % \begin{macro}{\etextrue} @@ -993,13 +1002,19 @@ % Check if \texttt{etex} is being used. This is based on the check for % \texttt{pdf(latex)}. % \changes{v1.61803}{2008/01/30}{Added check for etex (mempatch v4.9)} +% \changes{v1.618033}{2008/06/02}{Improved check for etex} % \begin{macrocode} \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 @@ -1046,9 +1061,14 @@ % \begin{macrocode} \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 @@ -2036,6 +2056,18 @@ % \end{macrocode} % +% \begin{macro}{\memoirpostopthook} +% A user could define this \emph{before} the \cs{documentclass} command +% to do something at this point. For example, to set up a new stock size: \\ +% \verb?\def\memoirpostopthook{\stockheight=44in \stockwidth=34in}? +% \changes{v1.618033}{2008/06/02}{Added \cs{memoirpostopthook}} +% \begin{macrocode} +\providecommand*{\memoirpostopthook}{} + \memoirpostopthook + +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\cleartorecto} % A repeat of \cs{cleardoublepage}; clears to a recto (odd-numbered) page. % \begin{macrocode} @@ -4096,14 +4128,20 @@ \addtolength\marginparwidth{-0.8in} % don't know why this isn't .4 \fi \ifdim\marginparwidth>2in - \setlength\marginparwidth{2in} + \setlength\marginparwidth{2in}% \fi % \end{macrocode} -% Set these values to integer numbers of points, and calculate the +% Set these values to integer numbers of points, and afterwards calculate the % \cs{evensidemargin}. +% Jonathon Stickel (\url{jjstickel@vcn.com}) on 2008/05/30 noted that +% \cs{marginparwidth} had to be positive for the initial setting of the sidebar +% geometry through \cs{setsidebars}. +% \changes{v1.618033}{2008/06/02}{Ensured initial value of \cs{marginparwidth} +% was positive} % \begin{macrocode} \@settopoint\oddsidemargin \@settopoint\marginparwidth +\ifdim\marginparwidth<1pt \setlength\marginparwidth{1pt}\fi \setlength\evensidemargin {\paperwidth} \addtolength\evensidemargin{-2in} @@ -4169,10 +4207,14 @@ % If its length variable argument is zero or less it reports an error. % % \changes{v1.4}{2003/02/27}{Added \cs{@memznegtest}} +% \changes{v1.618033}{2008/06/02}{Changed \cs{@memznegtest} and +% \cs{@memnegtest} to issue warnings instead of errors} +% % \begin{macrocode} \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} % \end{macrocode} % \end{macro} @@ -4183,7 +4225,8 @@ % \begin{macrocode} \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} % \end{macrocode} @@ -4310,6 +4353,8 @@ % % Check that all the sums add up correctly, or % at least to within a small (\cs{@tempdimb}) error. +% \changes{v1.618033}{2008/06/02}{Added more information about problematic +% layout values} % \begin{macrocode} \@tempdimb = -1pt \@tempdima=\stockwidth @@ -4317,9 +4362,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 @@ -4329,10 +4374,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 @@ -4341,9 +4386,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 @@ -4353,10 +4398,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 @@ -4365,9 +4410,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 @@ -4375,8 +4420,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} @@ -22583,7 +22628,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 @@ -24814,6 +24860,26 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\m@mopfootnotebf} +% (footnote) code in support of footnotes below floats. +% Problem with original code noted by J{\o}rgen Larsen (\url{jl@ruc.dk}) +% on 2008/05/24. +% \changes{v1.618033}{2008/06/02}{Added \cs{m@mopfootnotebf}} +% \begin{macrocode} +\newcommand*{\m@mopfootnotebf}{% + \setbox\@outputbox \vbox{% + \boxmaxdepth\@maxdepth + \unvbox\@outputbox + \vskip\skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup}} + +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\m@mopsidebar} % (sidebar) code for possible use in \cs{@makecol}. % From DA's latest sidebar fixes. @@ -24852,19 +24918,20 @@ % \begin{macro}{\mem@makecolbf} % A version of \cs{@makecol} which puts footnotes at the bottom of the page % (after any bottom floats). +% \changes{v1.618033}{2008/06/02}{Used \cs{m@mopfootnotebf} instead of +% \cs{m@mopfootnote} in \cs{mem@makecolbf}} % \begin{macrocode} \gdef\mem@makecolbf{% \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} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx index 221bb28d5ad..793d0e0599c 100755 --- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx +++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx @@ -60,7 +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} +% \def\fileversion{v5.0} \def\filedate{2008/06/02} % % \title{The LaTeX \Lpack{memoir} class for configurable book % typesetting: Code patches\thanks{This @@ -794,62 +794,17 @@ % ^^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/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. %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \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/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'. |