summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/memoir/README26
-rw-r--r--Master/texmf-dist/doc/latex/memoir/memman.pdfbin4496525 -> 2668165 bytes
-rw-r--r--Master/texmf-dist/doc/latex/memoir/memman.tex231
-rw-r--r--Master/texmf-dist/source/latex/memoir/memoir.dtx356
-rw-r--r--Master/texmf-dist/source/latex/memoir/mempatch.dtx5
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls268
6 files changed, 643 insertions, 243 deletions
diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index c111e8c5469..eac6297d87f 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -7,11 +7,10 @@ you create your particular design. The class incorporates over 30 of the
more popular packages.
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.
+YOU ARE LIKELY TO GET FASTER AND BETTER ANSWERS THAN IF YOU EMAIL (PETER)
+DIRECTLY AS (PETER) IS AWAY MORE OFTEN THAN NOT.
- (Lars Madsen <daleif+memoir@imf.au.dk> is gradually taking over
- the support for memoir.)
+Lars Madsen <daleif+memoir@imf.au.dk> has taking over the support for memoir.
NOTE: In order to provide fixes for any problems that may arise
between major releases, you may find a file called mempatch.sty
@@ -42,6 +41,21 @@ o Backmatter:
Command glossary ~ 40 pages
Bibliography, indexes ~ 50 pages
+Changes (2010/09/19)
+
+o memoir v3.6g
+
+-- fixed a typo in the vplaces env
+-- made \needspace work better with \section and friends
+-- added \settypeoutlayoutunit such that users can choose in which
+ unit the layout list should be written to the log file.
+-- removed the \footnoteA--C commands from the manual, they have
+ never existed
+-- Added \OnehalfSpacing* and \DoubleSpacing* which will additionally
+ also make floats and page notes have the same spacing. Macros to
+ explicitly set these values have also been added
+-- made it more clear who the maintainer is
+
Changes (2010/08/22)
@@ -104,6 +118,7 @@ Earlier changes are noted at the end.
-------------------------------------------------------------------
Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
Copyright 2001--2010 Peter R. Wilson
+ Maintainer: Lars Madsen daleif+memoir at imf dot au dot dk
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -114,8 +129,9 @@ Earlier changes are noted at the end.
and version 1.3 or later is part of all distributions of
LaTeX version 2003/06/01 or later.
- This work has the LPPL maintenance status "author-maintained".
+ This work has the LPPL maintenance status "maintained".
+
This work consists of the files:
README (this file)
memoir.dtx
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf
index 02a4734477d..63428bb411d 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.pdf
+++ b/Master/texmf-dist/doc/latex/memoir/memman.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.tex b/Master/texmf-dist/doc/latex/memoir/memman.tex
index fb677882a8b..626f6beb86d 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.tex
+++ b/Master/texmf-dist/doc/latex/memoir/memman.tex
@@ -157,6 +157,8 @@
\end{center}
\begin{center}
\LARGE\textsf{Peter Wilson}\par
+\medskip
+\normalsize\textsf{Maintained by Lars Madsen}\par
\end{center}
\vspace*{\fill}
\def\THP{T\kern-0.2em H\kern-0.4em P}% OK for CMR
@@ -1215,8 +1217,8 @@ been answered.
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-07-01 00:45:30 +0200 (Thu, 01 Jul 2010) $}
-{$LastChangedRevision: 246 $}
+{$LastChangedDate: 2010-09-19 13:11:31 +0200 (Sun, 19 Sep 2010) $}
+{$LastChangedRevision: 275 $}
{$LastChangedBy: daleif $}
\chapter{Introduction to the eighth edition}
@@ -1848,8 +1850,9 @@ David Wilson.
If I have inadvertently left anyone off the list I apologise,
and please let me know so that I can correct the
-omisssion.\footnote{I am currently occasionably reachable via email
-at \texttt{herries dot press (at) earthlink dot net}.}
+omisssion.\footnote{Peter is currently occasionably reachable via email
+at \texttt{herries dot press (at) earthlink dot net}, otherwise write
+the maintainer at \texttt{daleif+memoir at imf dot au dot dk}}
Along those lines, if you have any questions please direct them
to the \url{comp.text.tex} newsgroup instead of directly to me as
you are much more likely to get a satisfactory and timely response.
@@ -1889,22 +1892,35 @@ or a package of your own or a class of your own (with a different name)
and make the changes there. Do not expect any help if you change the
\Lclass{memoir} class code directly.
+\fancybreak{}
- As the years go by support for \Lclass{memoir} will devolve from one
+As the years go by support for \Lclass{memoir} will devolve from one
person to another.\footnote{This is currently (July 2009) happening as
-Lars Madsen is taking over from Peter Wilson.}
-Therefore it is probably
-safer to ask questions, complain, make suggestions, etc., on the
-\url{comp.text.tex} newsgroup, which is archived and read by many,
-than correspond
-directly with the supporter, who might well be away for some considerable
-time and perhaps not notice your email after having returned to base.
+ Lars Madsen is taking over from Peter Wilson.} Therefore it is
+probably safer to ask questions, complain, make suggestions, etc., on
+the newsgroup called \url{comp.text.tex}, which is archived and read
+by many, than correspond directly with the maintainer, who might well
+be away for some considerable time and perhaps not notice your email
+after having returned to base.
Then dealing with memoir issues on \url{comp.text.tex}, please include
the word \texttt{memoir} in the subject. That will help the memoir
maintainer keep track of memoir related matters.
+If you do not have access to \url{comp.text.tex} you may also email
+the current maintainer at \texttt{daleif+memoir at imf dot au dot dk}.
+
+\fancybreak{}
+
+\textit{From the maintainer:} As I do not regularly read \LaTeX\
+related forums (like \url{www.latex-community.org} or
+\url{tex.stackexchange.com}), it will be a good idea to either write
+me directly or re-post the question on \url{comp.text.tex} if noone
+comes up with a suitable answer for questions involving \Lclass{memoir}.
+
+
+
%#% extend
%#% extstart include terminology.tex
@@ -2723,8 +2739,8 @@ want to put \cmd{\raggedbottom} in the preamble\index{preamble}.
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-05-13 17:10:00 +0200 (Thu, 13 May 2010) $}
-{$LastChangedRevision: 210 $}
+{$LastChangedDate: 2010-09-17 00:43:51 +0200 (Fri, 17 Sep 2010) $}
+{$LastChangedRevision: 274 $}
{$LastChangedBy: daleif $}
\chapter{Laying out the page} \label{chap:layingpage}
@@ -3974,10 +3990,17 @@ the layout in any way, you must call \cmd{\checkandfixthelayout} after you have
made all the necessary changes. As an aid, the final layout parameter values
are displayed on the terminal and written out to the log file.
+\LMnote{2010/09/17}{added \cs{\settypeoutlayoutunit}}
\begin{syntax}
\cmd{\typeoutlayout} \\
\cmd{\typeoutstandardlayout} \\
+\cmd{\settypeoutlayoutunit}\marg{unit} \\
\end{syntax}
+\glossary(settypeoutlayoutunit)%
+ {\cs{settypeoutlayoutunit}}%
+ {Allows the user to set the unit in which to typeset the layout
+ listing. Supported units: \texttt{pt}, \texttt{mm}, \texttt{cm},
+ \texttt{in}, \texttt{bp}, \texttt{dd} and \texttt{cc}.}
\glossary(typeoutlayout)%
{\cs{typeoutlayout}}%
{Outputs the current values of the class layout parameters to the
@@ -3995,6 +4018,12 @@ standard layout parameter\index{page layout!LaTeX parameters?\ltx\ parameters}
values to the terminal and log file so that you can
compare the two sets of parameter values.
+By using the macro \cmd{\settypeoutlayoutunit}\meta{unit} the user can
+change the unit in which the layout list is shown. Very handy when
+designing in, say, centimeters. Supported units are \texttt{pt},
+\texttt{mm}, \texttt{cm}, \texttt{in}, \texttt{bp}, \texttt{dd} and
+\texttt{cc}, default being \texttt{pt}.
+
\section{Side margins}
In \Lopt{twoside} printing the spine margin is normally the same on
@@ -4462,8 +4491,8 @@ effect.
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-05-13 17:10:00 +0200 (Thu, 13 May 2010) $}
-{$LastChangedRevision: 210 $}
+{$LastChangedDate: 2010-09-19 13:11:31 +0200 (Sun, 19 Sep 2010) $}
+{$LastChangedRevision: 275 $}
{$LastChangedBy: daleif $}
@@ -5289,23 +5318,48 @@ it is hard for a package to get at the internals of the overlying class
and kernel code. This is not to say that all is well with trying to deal
with it at the class level.
+\LMnote{2010/09/19}{Added description about the starred macros}
\begin{syntax}
-\cmd{\OnehalfSpacing} \cmd{\DoubleSpacing} \\
+\cmd{\OnehalfSpacing} \cmd{\OnehalfSpacing*} \\
+\cmd{\DoubleSpacing} \cmd{\DoubleSpacing*}\\
\end{syntax}
\glossary(OnehalfSpacing)%
{\cs{OnehalfSpacing}}%
{Declaration increasing the baseline to create the illusion of double spacing.}
+\glossary(OnehalfSpacing*)%
+ {\cs{OnehalfSpacing*}}%
+ {Same as \cs{OnehalfSpacing} but also effects page note and floats.}
\glossary(DoubleSpacing)%
{\cs{DoubleSpacing}}%
{Declaration doubling the baselineskip.}
+\glossary(DoubleSpacing*)%
+ {\cs{DoubleSpacing*}}%
+ {Same as \cs{DoubleSpacing} but also effects page notes and floats.}
+
+ The declaration \cmd{\OnehalfSpacing} increases the spacing between
+ lines so that they appear to be double spaced (especially to the
+ thesis layout arbiters), while the declaration \cmd{\DoubleSpacing}
+ really doubles the spacing between lines which really looks bad; but
+ if you have to use it, it is there. The spacing in footnotes and
+ floats (e.g., captions) is unaltered, which is usually required once
+ the controllers see what a blanket double spacing brings. Sometimes
+ it is also required to make page notes and floats (including
+ captions) in `double' spacing. The starred version of the two macros
+ above takes care of this. Alternatively the spacing in page notes
+ (i.e. footnotes and friends) or floats an be set explicitly using
+\begin{syntax}
+ \cmd{\setPagenoteSpacing}\marg{factor}\\
+ \cmd{\setFloatSpacing}\marg{factor}
+\end{syntax}
+\glossary(setFloatSpacing)%
+ {\cs{setFloatSpacing}}%
+ {Explicitly set the spacing used inside floats.}
+\glossary(setPagenoteSpacing)%
+ {\cs{setPagenoteSpacing}}%
+ {Explicitly set the spacing used inside page notes such including footnotes.}
+\cs{setFloatSpacing} should go after say \cs{OnehalfSpacing*} if used.
+
-The declaration \cmd{\OnehalfSpacing} increases the spacing between lines
-so that they appear to be double spaced (especially to the thesis layout
-arbiters), while the declaration
-\cmd{\DoubleSpacing} really doubles the spacing between lines which really
-looks bad; but if you have to use it, it is there. The spacing in footnotes
-and floats (e.g., captions) is unaltered, which is usually required once
-the controllers see what a blanket double spacing brings.
\PWnote{2009/06/24}{Corrected \cs{SetSingleSpace} to \cs{setSingleSpace}}
\begin{syntax}
@@ -5321,15 +5375,20 @@ The \cmd{\setSingleSpace} command is meant to be used to
adjust \emph{slightly} the normal spacing betwen lines, perhaps because
the font being used looks too crampled or loose. The effect is that the
normal \lnc{\baselineskip} spacing will be multiplied by \meta{factor}, which
-should be close to 1.0.
+should be close to 1.0. Using \cmd{\setSingleSpace} will also reset
+the float and page note spacings.
+
The declaration \cmd{\SingleSpacing} returns everthing to normal, or at
-least the setting from \cmd{\setSingleSpace} if it has been used.
+least the setting from \cmd{\setSingleSpace} if it has been used. It
+will also reset float and page note spacings to the same value.
\begin{syntax}
\senv{SingleSpace} ...\eenv{SingleSpace} \\
\senv{Spacing}\marg{factor} ... \eenv{Spacing} \\
\senv{OnehalfSpace} ... \eenv{OnehalfSpace} \\
+\senv{OnehalfSpace*} ... \eenv{OnehalfSpace*} \\
\senv{DoubleSpace} ... \eenv{DoubleSpace} \\
+\senv{DoubleSpace*} ... \eenv{DoubleSpace*} \\
\end{syntax}
\glossary(SingleSpace)%
{\senv{SingleSpace}}%
@@ -5340,9 +5399,15 @@ least the setting from \cmd{\setSingleSpace} if it has been used.
\glossary(OnehalfSpace)%
{\senv{OnehalfSpace}}%
{Environment form of \cs{OnehalfSpacing}}
+\glossary(OnehalfSpace*)%
+ {\senv{OnehalfSpace*}}%
+ {Environment form of \cs{OnehalfSpacing*}}
\glossary(DoubleSpace)%
{\senv{DoubleSpace}}%
{Environment form of \cs{DoubleSpacing}}
+\glossary(DoubleSpace*)%
+ {\senv{DoubleSpace*}}%
+ {Environment form of \cs{DoubleSpacing*}}
These are the environments corresponding to the declarations presented
earlier, for when you want to change the spacing locally.
@@ -6662,8 +6727,8 @@ optional argument of the \cmd{\twocolumn} command. In fact,
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-08-20 20:04:46 +0200 (Fri, 20 Aug 2010) $}
-{$LastChangedRevision: 267 $}
+{$LastChangedDate: 2010-09-13 11:11:29 +0200 (Mon, 13 Sep 2010) $}
+{$LastChangedRevision: 273 $}
{$LastChangedBy: daleif $}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -9577,7 +9642,7 @@ normal size by the time subsubsection heads are reached, or before.
chapterstyle (\fref{dcbringhurst}).
\item[\hstyle{crosshead}] This set uses the \cstyle{crosshead} chapterstyle
and the lower level division titles are set as crossheads.
-\item[\hstyle{default}] The default set corresponding the the \ltx\
+\item[\hstyle{default}] The default set corresponding the \ltx\
\Lclass{book} class.
\item[\hstyle{dowding}] A set based on Dowding's
\btitle{Finer Points}~\cite{DOWDING96}. It uses the \cstyle{dowding}
@@ -9607,8 +9672,8 @@ normal size by the time subsubsection heads are reached, or before.
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-06-25 13:34:23 +0200 (Fri, 25 Jun 2010) $}
-{$LastChangedRevision: 236 $}
+{$LastChangedDate: 2010-09-13 11:11:29 +0200 (Mon, 13 Sep 2010) $}
+{$LastChangedRevision: 273 $}
{$LastChangedBy: daleif $}
\chapterstyle{demo3}
@@ -9761,7 +9826,7 @@ For reference, the full list is given in \tref{tab:callthispagestyle}.
\item[\pstyle{empty}] The headers\index{header} and footers\index{footer} are empty.
\item[\pstyle{plain}] The header\index{header} is empty and the folio\index{folio} (page number)
is centered at the bottom of the page.
-\item[\pstyle{headings}] The footer\index{footer} is empty. The header\index{header} contains the
+\item[\pstyle{headings}] The footer\index{footer} is empty. The header\index{header} contains
the folio\index{folio} at the outer side of the page; on verso
pages the chapter name, number and title, in slanted uppercase is
set at the spine margin and on recto pages the section number
@@ -10061,7 +10126,7 @@ A header\index{header} may have a rule drawn between it and the top of
the typeblock\index{typeblock}, and similarly a rule may be drawn
between the bottom of the typeblock\index{typeblock} and the
footer\index{footer}.
-The \cmd{\makeheadrule} macro specifies the the \meta{width}
+The \cmd{\makeheadrule} macro specifies the \meta{width}
and \meta{thickness} of the rule below the \meta{style} pagestyle
header\index{header}, and the \cmd{\makefootrule} does the same for
the rule above the footer\index{footer}; the
@@ -10195,7 +10260,7 @@ but note that \Mname\ does not use this.
You don't need to understand this but in outline the first three lines specify
the contents of the footers and headers, and the remainder of the code sets
the marks that will be used in the headers. The \cmd{\leftmark} is specified to be
-the the word `chapter',
+the word `chapter',
followed by the number if it is in the \cmd{\mainmatter} and the \texttt{secnumdepth}
is such that chapters are numbered, followed by the chapter's title; all this
is made to be in upper case (via the \cmd{\MakeUppercase} macro). Similarly
@@ -14078,8 +14143,8 @@ before the stuff you want to have moved out of, say, a part.
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-05-13 17:10:00 +0200 (Thu, 13 May 2010) $}
-{$LastChangedRevision: 210 $}
+{$LastChangedDate: 2010-09-13 11:11:29 +0200 (Mon, 13 Sep 2010) $}
+{$LastChangedRevision: 273 $}
{$LastChangedBy: daleif $}
@@ -14650,7 +14715,7 @@ A float is never put on an earlier page than its definition but may be
put on the same or later page of its definition. If a float cannot be
placed, all suceeding floats will be held up, and \ltx\ can store no
more than 16 held up floats. A float cannot be placed if it would cause
-an overfull page, or it otherwise cannot be fitted according the the
+an overfull page, or it otherwise cannot be fitted according the
float placement parameters.
A \cmd{\clearpage} or \cmd{\cleardoublepage} or \eenv{document}
flushes\index{float!flush}
@@ -16102,7 +16167,7 @@ centered.
\index{caption!side|(}
- Typically captions are put either above or below the the element they
+ Typically captions are put either above or below the element they
are describing. Sometimes it is desireable to put a caption at the
side of the element instead.
@@ -16159,7 +16224,7 @@ neither checks nor fixes the side caption parameters.
\end{syntax}
\glossary(sidecapmargin)%
{\cs{sidecapmargin}\marg{margin}}%
- {Sets the the margin for sidecaptions.}%
+ {Sets the margin for sidecaptions.}%
\glossary(ifsidecapleft)%
{\cs{ifsidecapleft}}%
{\ptrue\ if sidecaptions will be set in the left margin,
@@ -16725,8 +16790,8 @@ footnote\index{footnote!text} text.
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-05-13 17:10:00 +0200 (Thu, 13 May 2010) $}
-{$LastChangedRevision: 210 $}
+{$LastChangedDate: 2010-09-13 11:11:29 +0200 (Mon, 13 Sep 2010) $}
+{$LastChangedRevision: 273 $}
{$LastChangedBy: daleif $}
@@ -17401,7 +17466,7 @@ case \emph{decked heads} are used.
A decked head\index{table!column!decked head} consists of a
\emph{spanner head}\index{table!column!spanner head} and the two or
more column heads it applies to. A horizontal
-\emph{spanner rule}\index{table!column!spanner rule} is set between the the
+\emph{spanner rule}\index{table!column!spanner rule} is set between the
spanner and column heads to
show which columns belong to the spanner.
@@ -18696,8 +18761,8 @@ illustrate these points.
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-05-13 17:10:00 +0200 (Thu, 13 May 2010) $}
-{$LastChangedRevision: 210 $}
+{$LastChangedDate: 2010-09-17 00:43:51 +0200 (Fri, 17 Sep 2010) $}
+{$LastChangedRevision: 274 $}
{$LastChangedBy: daleif $}
\chapter{Page notes} \label{chap:mnotes}
@@ -18943,31 +19008,33 @@ fix most overruns.
You must use an integer in the redefinition as the command is going to be
used in a place where \tx\ expects an integer.
-\begin{syntax}
-\cmd{\footnoteA}\marg{text} \\
-\cmd{\footnoteB}\marg{text} \\
-\cmd{\footnoteC}\marg{text} \\
-\end{syntax}
-\glossary(footnoteA)%
- {\cs{footnoteA}\marg{text}}%
- {A series A footnote.}
-\glossary(footnoteB)%
- {\cs{footnoteB}\marg{text}}%
- {A series B footnote.}
-\glossary(footnotec)%
- {\cs{footnoteC}\marg{text}}%
- {A series C footnote.}
-
- In addition to the regular \cmd{\footnote} the class provides
-three further\index{footnote!series} series
-of footnotes, namely the `A', `B', and `C' series which are
-distinguished by appending the series' uppercase letter at the end of
-the command, like \cmd{\footnoteB} for the `B' series.
-Perhaps the normal footnotes are required,
-marked\index{footnote!marker} flagged with arabic numerals, and another
-kind of footnote flagged with roman numerals. Each series has its own
-\cmd{\footnotemarkB}, \cmd{\footnotetextB} and so on matching the regular
-commands.
+\LMnote{2010/09/17}{removed the text below, I see no reason for adding
+this to memoir, so it is now removed from the manual}
+% \begin{syntax}
+% \cmd{\footnoteA}\marg{text} \\
+% \cmd{\footnoteB}\marg{text} \\
+% \cmd{\footnoteC}\marg{text} \\
+% \end{syntax}
+% \glossary(footnoteA)%
+% {\cs{footnoteA}\marg{text}}%
+% {A series A footnote.}
+% \glossary(footnoteB)%
+% {\cs{footnoteB}\marg{text}}%
+% {A series B footnote.}
+% \glossary(footnotec)%
+% {\cs{footnoteC}\marg{text}}%
+% {A series C footnote.}
+%
+% In addition to the regular \cmd{\footnote} the class provides
+% three further\index{footnote!series} series
+% of footnotes, namely the `A', `B', and `C' series which are
+% distinguished by appending the series' uppercase letter at the end of
+% the command, like \cmd{\footnoteB} for the `B' series.
+% Perhaps the normal footnotes are required,
+% marked\index{footnote!marker} flagged with arabic numerals, and another
+% kind of footnote flagged with roman numerals. Each series has its own
+% \cmd{\footnotemarkB}, \cmd{\footnotetextB} and so on matching the regular
+% commands.
\begin{syntax}
@@ -21654,8 +21721,8 @@ and the result is shown on the next page.
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-05-13 17:10:00 +0200 (Thu, 13 May 2010) $}
-{$LastChangedRevision: 210 $}
+{$LastChangedDate: 2010-09-13 11:11:29 +0200 (Mon, 13 Sep 2010) $}
+{$LastChangedRevision: 273 $}
{$LastChangedBy: daleif $}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -22090,7 +22157,7 @@ from the \Lpack{framed} package.
and \Ie{shaded} environments do not closely box the indented text. The
\Ie{qframe} and \Ie{qshade} environments do provide close
boxing.\footnote{Donald Arseneau has said that he may put something similar
-in a later version the the \Ie{framed} package.}
+in a later version the \Ie{framed} package.}
The difference can be seen in the following \Ie{quotation}.
\begin{quotation}
@@ -22756,7 +22823,7 @@ Then, for each line it does the following:
as a single token called \cmd{\verbatim@line}.
\item If the characters are the string `\verb?\end{verbatim}?' it finishes
the verbatim environment.
-\item Otherwise it calls the the macro \cmd{\verbatim@processline} whose
+\item Otherwise it calls the macro \cmd{\verbatim@processline} whose
argument is the characters in the
line, treated as a paragraph. It then starts all over again with
the next line.
@@ -23367,7 +23434,7 @@ is called. This is defined in lines 16 and 17, and simply writes
out to the figure file. The \cmd{\endwriteverbatim}, and any other kind of
\cs{end...verbatim}, command is very sensitive to anything that follows it,
and in this case did not like to be immediately followed by an
-\verb?\addtostream{...}?, but did not mind it being wrapped up in the
+\verb?\addtostream{...}?, but did not mind it being wrapped up in
the \cmd{\finishwritefigure} macro.
The \cmd{\printfigures} macro defined in the last three lines of the code
@@ -23988,8 +24055,8 @@ will require the use of \cmd{\titleref} and so the declaration
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-06-09 14:23:37 +0200 (Wed, 09 Jun 2010) $}
-{$LastChangedRevision: 219 $}
+{$LastChangedDate: 2010-09-13 11:11:29 +0200 (Mon, 13 Sep 2010) $}
+{$LastChangedRevision: 273 $}
{$LastChangedBy: daleif $}
@@ -24530,7 +24597,7 @@ then the indexed items are read from the file called \file{file.ind}.
{Typeset index in two columns (the default).}
\glossary(indexname)%
{\cs{indexname}}%
- {Name used for the the index title.}
+ {Name used for the theindex title.}
The index entries are typeset within the \Ie{theindex}
environment. By default it is typeset with two
columns\indextwo{double column}{index}
@@ -24850,7 +24917,7 @@ and its operation can be controlled by a
(by default this is an \pixfile{ist} file). Such a file consists of two
parts. The first
part specifies \Pmakeindex\ commands that can be included in the
-\meta{stuff} argument to \cmd{\index}. The second part controls how the
+\meta{stuff} argument to \cmd{\index}. The second part controls how
the sorted index data is to be output.
I will only describe the most common elements of what you can put in
@@ -25005,7 +25072,7 @@ is defined, you would do
As a special case, if you want an index item to have a page range
put the two
-characters \verb?|(? at the end of the the argument on the first page, and
+characters \verb?|(? at the end of the argument on the first page, and
the character pair \verb?|)? at the end of the argument on the last page.
For example:
\begin{lcode}
@@ -30709,8 +30776,8 @@ trim marks Rolf Niepraschk suggested the following trick
\svnidlong
{$Ignore: $}
-{$LastChangedDate: 2010-05-13 17:10:00 +0200 (Thu, 13 May 2010) $}
-{$LastChangedRevision: 210 $}
+{$LastChangedDate: 2010-09-13 11:11:29 +0200 (Mon, 13 Sep 2010) $}
+{$LastChangedRevision: 273 $}
{$LastChangedBy: daleif $}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31447,7 +31514,7 @@ The shortest line that \ltx\ can draw is about ten points
(1/7 inch approximately) in overall length. You can, though, draw lines that
are too long to fit on the page.
- Figure~\ref{flpic:lslope} shows the the lines and arrows slanting
+ Figure~\ref{flpic:lslope} shows the lines and arrows slanting
upwards and to the right that can be drawn in \ltx. The slope $(i,j)$
pair are shown to the right of the first set of lines and arrows, together
with the $j/i$ ratio which gives the slope of the line as a decimal number.
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index 29e7208a5ed..7c73b4e7277 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -2,7 +2,8 @@
%
% memoir.dtx
% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-% Copyright 2001--2009 Peter R. Wilson
+% Maintainer: Lars Madsen (daleif+memoir at imf dot au dot dk)
+% Copyright 2001--2010 Peter R. Wilson
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -13,12 +14,12 @@
% and version 1.3 or later is part of all distributions of
% LaTeX version 2003/06/01 or later.
%
-% This work has the LPPL maintenance status "author-maintained".
+% This work has the LPPL maintenance status "maintained".
%
% This work consists of the files listed in the README file.
%
% \fi
-% \CheckSum{29496}
+% \CheckSum{29717}
%
% \changes{v0.1}{2001/05/20}{First public alpha release}
% \changes{v0.2}{2001/06/03}{First beta release}
@@ -101,6 +102,7 @@
% \changes{v3.6d}{2010/07/01}{Various bug fixes}
% \changes{v3.6e}{2010/08/20}{Maintenance}
% \changes{v3.6f}{2010/08/22}{Bad typo}
+% \changes{v3.6g}{2010/09/19}{Maintenance}
%
% \def\dtxfile{memoir.dtx}
%
@@ -144,6 +146,7 @@
% \def\fileversion{v3.6d} \def\filedate{2010/07/01}
% \def\fileversion{v3.6e} \def\filedate{2010/08/20}
% \def\fileversion{v3.6f} \def\filedate{2010/08/22}
+% \def\fileversion{v3.6g} \def\filedate{2010/09/19}
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Source code\thanks{This
% file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -371,7 +374,7 @@
% Announce the name, option files and version for LaTeX2e files:
% \begin{macrocode}
%<class>\ProvidesClass{memoir}%
-%<class> [2010/08/22 v3.6f configurable book, report, article document class]
+%<class> [2010/09/19 v3.6g 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}%
@@ -4807,53 +4810,162 @@
% \end{macro}
%
% \begin{macro}{\typeoutlayout}
+% \begin{macro}{\settypeoutlayoutunit}
+% \begin{macro}{\mem@typeouttwolengths}
+% \begin{macro}{\mem@typeoutonelength}
% Why not type out the calculated versions of the designed values?
% \changes{v1.0a}{2002/01/18}{Added \cs{typeoutlayout}}
% \changes{v1.0a}{2002/01/25}{Added column info to \cs{typeoutlayout}}
% \changes{v1.61803}{2008/01/30}{Added sidecap and sidebar data to \cs{typeoutlayout}
% (mempatch v4.6)}
% \changes{v1.61803398d}{2010/02/04}{Added information about side feet}
+% \changes{v3.6g}{2010/09/17}{Added feature such that user can change
+% the unit used by \cs{typeoutlayout}, requested by Rasmus Villemoes}
+% Using the macro \cs{settypeoutlayoutunit}\marg{unit} before
+% \cs{typeoutlayout} (or more often \cs{checkandfixthelayout}), the
+% user can choose the unit in which the list is typeset. The code is
+% inspired by the \texttt{printlen} package.
+% \begin{macrocode}
+\newcommand\settypeoutlayoutunit[1]{
+ \nametest{#1}{pt}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{1.0}
+ \else
+ \nametest{#1}{pc}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.083333}
+ \else
+ \nametest{#1}{in}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.013837}
+ \else
+ \nametest{#1}{mm}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.351459}
+ \else
+ \nametest{#1}{cm}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.0351459}
+ \else
+ \nametest{#1}{bp}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.996264}
+ \else
+ \nametest{#1}{dd}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.9345718}
+ \else
+ \nametest{#1}{cc}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.0778809}
+ \else
+ \@memerror{Unknown unit '#1' not suitable for layout listing}{}
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+}
+% \end{macrocode}
+% Default value is \texttt{pt}, other supported are \texttt{mm},
+% \texttt{cm}, \texttt{in}, \texttt{bp}, \texttt{dd} and \texttt{cc}.
+% \begin{macrocode}
+\settypeoutlayoutunit{pt}
+% \end{macrocode}
+% To help with the typesetting, we need to helper macros:
+% \begin{macrocode}
+\newcommand\mem@typeouttwolengths[4]{
+ % #1 = text before
+ % #2 = first length
+ % #3 = text between
+ % #4 = second length
+ \setlength\@tempdimc{\mem@tl@unitperpt #2}
+ \edef\l@first{\strip@pt\@tempdimc}%
+ \setlength\@tempdimc{\mem@tl@unitperpt #4}
+ \edef\l@second{\strip@pt\@tempdimc}%
+ \typeout{#1: \l@first\mem@tl@unit\space#3\space\l@second\mem@tl@unit}
+}
+\newcommand\mem@typeoutonelength[2]{
+ % #1 = text before
+ % #2 = first length
+ \setlength\@tempdimc{\mem@tl@unitperpt #2}
+ \edef\l@first{\strip@pt\@tempdimc}%
+ \typeout{#1: \l@first\mem@tl@unit}
+}
+% \end{macrocode}
+% Thirdly \cs{typeoutlayout} need to be rewritten to take care of the
+% extra convertions
% \begin{macrocode}
\newcommand*{\typeoutlayout}{%
\typeout{}
\typeout{******************************************************}
- \typeout{Stock height and width:
- \the\stockheight\space by \the\stockwidth}
- \typeout{Top and edge trims:
- \the\trimtop\space and \the\trimedge}
- \typeout{Page height and width:
- \the\paperheight\space by \the\paperwidth}
- \typeout{Text height and width:
- \the\textheight\space by \the\textwidth}
- \typeout{Spine and edge margins:
- \the\spinemargin\space and \the\foremargin}
- \typeout{Upper and lower margins:
- \the\uppermargin\space and \the\lowermargin}
- \typeout{Headheight and headsep:
- \the\headheight\space and \the\headsep}
- \typeout{Footskip:
- \the\footskip}
- \typeout{Columnsep and columnseprule:
- \the\columnsep\space and \the\columnseprule}
- \typeout{Marginparsep and marginparwidth:
- \the\marginparsep\space and \the\marginparwidth}
- \typeout{Sidecapsep and sidecapwidth:
- \the\sidecapsep\space and \the\sidecapwidth}
- \typeout{Sidebarhsep and sidebarwidth:
- \the\sidebarhsep\space and \the\sidebarwidth}
- \typeout{Sidebarvsep and sidebartopsep:
- \the\sidebarvsep\space and \the\sidebartopsep}
- \typeout{Sidebarheight:
- \the\dimen\sideins}
- \typeout{Sidefoothsep and sidefootwidth:
- \the\sidefoothsep\space and \the\sidefootwidth}
- \typeout{Sidefootvsep and sidefootheight:
- \the\sidefootvsep\space and \the\sidefootheight}
+ % \typeout{Stock height and width:
+ % \the\stockheight\space by \the\stockwidth}
+ % \typeout{Top and edge trims:
+ % \the\trimtop\space and \the\trimedge}
+ % \typeout{Page height and width:
+ % \the\paperheight\space by \the\paperwidth}
+ % \typeout{Text height and width:
+ % \the\textheight\space by \the\textwidth}
+ % \typeout{Spine and edge margins:
+ % \the\spinemargin\space and \the\foremargin}
+ % \typeout{Upper and lower margins:
+ % \the\uppermargin\space and \the\lowermargin}
+ % \typeout{Headheight and headsep:
+ % \the\headheight\space and \the\headsep}
+ % \typeout{Footskip:
+ % \the\footskip}
+ % \typeout{Columnsep and columnseprule:
+ % \the\columnsep\space and \the\columnseprule}
+ % \typeout{Marginparsep and marginparwidth:
+ % \the\marginparsep\space and \the\marginparwidth}
+ % \typeout{Sidecapsep and sidecapwidth:
+ % \the\sidecapsep\space and \the\sidecapwidth}
+ % \typeout{Sidebarhsep and sidebarwidth:
+ % \the\sidebarhsep\space and \the\sidebarwidth}
+ % \typeout{Sidebarvsep and sidebartopsep:
+ % \the\sidebarvsep\space and \the\sidebartopsep}
+ % \typeout{Sidebarheight:
+ % \the\dimen\sideins}
+ % \typeout{Sidefoothsep and sidefootwidth:
+ % \the\sidefoothsep\space and \the\sidefootwidth}
+ % \typeout{Sidefootvsep and sidefootheight:
+ % \the\sidefootvsep\space and \the\sidefootheight}
+ \mem@typeouttwolengths{Stock height and width}{\stockheight}{by}{\stockwidth}
+ \mem@typeouttwolengths{Top and edge trims}{\trimtop}{and}{\trimedge}
+ \mem@typeouttwolengths{Page height and width}{\paperheight}{by}{\paperwidth}
+ \mem@typeouttwolengths{Text height and width}{\textheight}{by}{\textwidth}
+ \mem@typeouttwolengths{Spine and edge margins}{\spinemargin}{and}{\foremargin}
+ \mem@typeouttwolengths{Upper and lower margins}{\uppermargin}{and}{\lowermargin}
+ \mem@typeouttwolengths{Headheight and headsep}{\headheight}{and}{\headsep}
+ \mem@typeoutonelength{Footskip}{\footskip}
+ \mem@typeouttwolengths{Columnsep and columnseprule}{\columnsep}{and}{\columnseprule}
+ \mem@typeouttwolengths{Marginparsep and marginparwidth}{\marginparsep}{and}{\marginparwidth}
+ \mem@typeouttwolengths{Sidecapsep and sidecapwidth}{\sidecapsep}{and}{\sidecapwidth}
+ \mem@typeouttwolengths{Sidebarhsep and sidebarwidth}{\sidebarhsep}{and}{\sidebarwidth}
+ \mem@typeouttwolengths{Sidebarvsep and sidebartopsep}{\sidebarvsep}{and}{\sidebartopsep}
+ \mem@typeoutonelength{Sidebarheight}{\dimen\sideins}
+ \mem@typeouttwolengths{Sidefoothsep and sidefootwidth}{\sidefoothsep}{and}{\sidefootwidth}
+ \mem@typeouttwolengths{Sidefootvsep and sidefootheight}{\sidefootvsep}{and}{\sidefootheight}
\typeout{******************************************************}
\typeout{}}
% \end{macrocode}
% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macro}{\checkandfixthelayout}
% This macro checks and fixes the layout, and reports the result. It takes the
@@ -4939,24 +5051,33 @@
% \begin{macro}{\typeoutstandardlayout}
% Types out the current values of the standard page layout parameters.
% \changes{v1.0a}{2002/01/25}{Added \cs{typeoutstandardlayout}}
+% \changes{v3.6g}{2010/09/17}{changed such that the user can change
+% the unit being used}
% \begin{macrocode}
\newcommand{\typeoutstandardlayout}{%
\typeout{}
\typeout{******************************************************}
- \typeout{Page height and width:
- \the\paperheight\space by \the\paperwidth}
- \typeout{Text height and width:
- \the\textheight\space by \the\textwidth}
- \typeout{Oddside and evenside margins:
- \the\oddsidemargin\space and \the\evensidemargin}
- \typeout{Topmargin and footskip:
- \the\topmargin\space and \the\footskip}
- \typeout{Headheight and headsep:
- \the\headheight\space and \the\headsep}
- \typeout{Columnsep and columnseprule:
- \the\columnsep\space and \the\columnseprule}
- \typeout{Marginparsep and marginparwidth:
- \the\marginparsep\space and \the\marginparwidth}
+ % \typeout{Page height and width:
+ % \the\paperheight\space by \the\paperwidth}
+ \mem@typeouttwolengths{Page height and width}{\paperheight}{by}{\paperwidth}
+ % \typeout{Text height and width:
+ % \the\textheight\space by \the\textwidth}
+ \mem@typeouttwolengths{Text height and width}{\textheight}{by}{\textwidth}
+ % \typeout{Oddside and evenside margins:
+ % \the\oddsidemargin\space and \the\evensidemargin}
+ \mem@typeouttwolengths{Oddside and evenside margins}{\oddsidemargin}{and}{\evensidemargin}
+ % \typeout{Topmargin and footskip:
+ % \the\topmargin\space and \the\footskip}
+ \mem@typeouttwolengths{Topmargin and footskip}{\topmargin}{and}{\footskip}
+ % \typeout{Headheight and headsep:
+ % \the\headheight\space and \the\headsep}
+ \mem@typeouttwolengths{Headheight and headsep}{\headheight}{and}{\headsep}
+ % \typeout{Columnsep and columnseprule:
+ % \the\columnsep\space and \the\columnseprule}
+ \mem@typeouttwolengths{Columnsep and columnseprule}{\columnsep}{and}{\columnseprule}
+ % \typeout{Marginparsep and marginparwidth:
+ % \the\marginparsep\space and \the\marginparwidth}
+ \mem@typeouttwolengths{Marginparsep and marginparwidth}{\marginparsep}{and}{\marginparwidth}
\typeout{******************************************************}
\typeout{}
}
@@ -6686,22 +6807,40 @@
% \end{macro}
%
% \begin{macro}{\setSingleSpace}
+% \begin{macro}{\setFootnoteSpacing}
+% \begin{macro}{\setFloatSpacing}
% \cs{setSingleSpace}\marg{num} effectively increases the \cs{baselineskip} for
% single spacing to \meta{num}*\cs{baselineskip} (\meta{num} should be
-% close to 1.0). (In package was \cs{SetSinglespace}).
+% close to 1.0). (In package was \cs{SetSinglespace}). We extend with
+% two extra macros \cs{setFootnoteSpacing} and \cs{setFloatSpacing}
+% which can be used to explicitly set the spacing inside page notes
+% (fotnotes and friends) and inside floats. Changing
+% \cs{setSingleSpace} will also set page note and float spacings to
+% the same value.
+% \changes{v3.6g}{2010/09/19}{Added two extra 'single' spacing macros}
% \begin{macrocode}
\newcommand*{\setSingleSpace}[1]{%
- \def\m@m@singlespace{#1}}
+ \def\m@m@singlespace{#1}%
+ \def\m@m@footnote@spacing{#1}%
+ \def\m@m@float@spacing{#1} %
+}
\setSingleSpace{1}
+\newcommand*\setPagenoteSpacing[1]{\def\m@m@footnote@spacing{#1}}
+\newcommand*\setFloatSpacing[1] {\def\m@m@float@spacing{#1}}
% \end{macrocode}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macro}{\SingleSpacing}
% \cs{SingleSpacing} starts single spacing. (In package was \cs{singlespacing}).
+% \changes{v3.6g}{2010/09/19}{Added reset of the float and page note spacings}
% \begin{macrocode}
\newcommand*{\SingleSpacing}{%
\setSpacing{\m@m@singlespace}%
+ \edef\m@m@footnote@spacing{\baselinestretch}%
+ \edef\m@m@float@spacing{\baselinestretch}%
\vskip\baselineskip% correction for coming into single spacing
}
\SingleSpacing
@@ -6710,12 +6849,17 @@
% \end{macro}
%
%
+% \begin{macro}{\@OnehalfSpacing}
% \begin{macro}{\OnehalfSpacing}
% \cs{OnehalfSpacing} starts `one and a half' spacing, which to most
% thesis nitpickers will look like double spacing.
-% (In package was \cs{onehalfspacing}).
+% (In package was \cs{onehalfspacing}). The starred version
+% \cs{OnehalfSpacing*} will also give page notes and floats the same spacing
+% \changes{v3.6g}{2010/09/19}{Made \cs{OnehalfSpacing} into a starred
+% version such that the starred version makes everything one half
+% spaced including page notes and floats}
% \begin{macrocode}
-\newcommand*{\OnehalfSpacing}{
+\newcommand*{\@OnehalfSpacing}{
\setSpacing{1.25}% default (10pt)
\ifcase \@ptsize \relax % 10pt
\setSpacing{1.25}%
@@ -6732,15 +6876,27 @@
\else% the extended sizes
\setSpacing{1.16}%
\fi}
+\newcommand*\OnehalfSpacing{%
+ \@ifstar{%
+ \@OnehalfSpacing%
+ \edef\m@m@footnote@spacing{\baselinestretch}%
+ \edef\m@m@float@spacing{\baselinestretch}%
+ }{\@OnehalfSpacing}%
+}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\DoubleSpacing}
+% \begin{macro}{\@DoubleSpacing}
% \cs{DoubleSpacing} starts double spacing, which to most thesis nitpickers
-% will look far too spaced out. (In package was \cs{doublespacing}).
+% will look far too spaced out. (In package was
+% \cs{doublespacing}). The starred version will also set the page note
+% and float spacing to the same value.
+% \changes{v3.6g}{2010/09/19}{Extended with a starred version.}
% \begin{macrocode}
-\newcommand*{\DoubleSpacing}{
+\newcommand*{\@DoubleSpacing}{
\setSpacing{1.667}% default (10pt)
\ifcase \@ptsize \relax % 10pt
\setSpacing{1.667}%
@@ -6757,9 +6913,17 @@
\else% larger sizes
\setSpacing{1.5}%
\fi}
+\newcommand*\DoubleSpacing{%
+ \@ifstar{%
+ \@DoubleSpacing%
+ \edef\m@m@footnote@spacing{\baselinestretch}%
+ \edef\m@m@float@spacing{\baselinestretch}%
+ }{\@DoubleSpacing}%
+}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
%
% \begin{macro}{\@setsize}
@@ -6835,20 +6999,30 @@
%
% \begin{environment}{OnehalfSpace}
% Environment form of \cs{OnehalfSpacing}. (In package was \texttt{onehalfspace}).
+% \changes{v3.6g}{2010/09/19}{Added starred version of environment to
+% complement the starred macro version}
% \begin{macrocode}
\newenvironment{OnehalfSpace}{%
\begingroup
\OnehalfSpacing}{\m@mrestore@spacing}
+\newenvironment{OnehalfSpace*}{%
+ \begingroup
+ \OnehalfSpacing*}{\m@mrestore@spacing}
% \end{macrocode}
% \end{environment}
%
% \begin{environment}{DoubleSpace}
% Environment form of \cs{DoubleSpacing}. (In package was \texttt{doublespace}).
+% \changes{v3.6g}{2010/09/19}{Added starred version of environment to
+% complement the starred macro version}
% \begin{macrocode}
\newenvironment{DoubleSpace}{%
\begingroup
\DoubleSpacing}{\m@mrestore@spacing}
+\newenvironment{DoubleSpace*}{%
+ \begingroup
+ \DoubleSpacing}{\m@mrestore@spacing}
% \end{macrocode}
% \end{environment}
@@ -6901,7 +7075,7 @@
\let\m@m@xfloat\@xfloat
\def\@xfloat #1[#2]{%
\m@m@xfloat #1[#2]%
- \def\baselinestretch{\m@m@singlespace}%
+ \def\baselinestretch{\m@m@float@spacing}%
\normalsize}
% \end{macrocode}
@@ -24912,10 +25086,11 @@
% to implement the separator.
% \changes{v1.618}{2005/09/03}{Stop body font changes leaking into footnotes (mempatch v3.7)}
% \changes{v1.61803}{2008/01/30}{Keep single spacing in footnotes (mempatch v4.6)}
+% \changes{v3.6g}{2010/09/19}{Made the 'single spacing' configurable.}
% \begin{macrocode}
\renewcommand{\@footnotetext}[1]{\insert\footins{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
- \reset@font% <- v1.6180 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
+ \reset@font%
\foottextfont
\@preamfntext
\hsize\columnwidth
@@ -25270,16 +25445,17 @@
% \begin{macro}{\m@mold@mpfootnotetext}
% \changes{v1.6180}{2006/06/12}{Stop font changes leaking into footnotes.
% The v1.618 change was too early}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable'}
% \begin{macrocode}
\renewcommand{\@mpfootnotetext}[1]{%
\global\setbox\@mpfootins\vbox{%
\unvbox\@mpfootins
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\foottextfont \hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
\csname p@mpfootnote\endcsname\@thefnmark}%
\color@begingroup
- \reset@font% <- v1.6180 addition
+ \reset@font%
\@makefntext{%
\rule\z@\footnotesep\ignorespaces{\foottextfont #1}%
\@finalstrut\strutbox}%
@@ -25480,11 +25656,12 @@
% \changes{v1.6180339a}{2008/08/07}{Removed a space from
% \cs{m@make@footnotetext} and \cs{m@make@mpfootnotetext}
% (courtesy David Wilson)}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\m@make@footnotetext}[1]{%
\@namelongdef{@footnotetext#1}##1{%
\insert\@nameuse{footins#1}{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\@preamfntext
\hsize\columnwidth
@@ -25502,12 +25679,13 @@
%
% \begin{macro}{\m@make@mpfootnotetext}
% \cs{m@make@mpfootnotetext}\marg{series} creates \cs{@mpfootnotetext<series>}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\m@make@mpfootnotetext}[1]{%
\@namelongdef{@mpfootnotetext#1}##1{%
\global\setbox\@nameuse{@mpfootins#1}\vbox{%
\unvbox\@nameuse{@mpfootins#1}%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -25836,9 +26014,10 @@
% \cs{@twocolfootnotetext}\marg{text} is the two column version of
% \cs{@footnotetext} for the \verb?v@r? series.
% \changes{v1.618}{2005/09/03}{Added missing percent to \cs{@twocolfootnotetext} (mempatch v3.1)}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\@preamfntext
\protected@edef\@currentlabel{%
@@ -25877,11 +26056,12 @@
% \begin{macro}{\@mptwocolfootnotetext}
% \cs{@mptwocolfootnotetext}\marg{text} is the two column version
% of \cs{@mpfootnotetext} for the \verb?v@r? series for minipages.
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\@mptwocolfootnotetext}[1]{%
\global\setbox\@mpfootinsv@r\vbox{%
\unvbox\@mpfootinsv@r
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -25920,11 +26100,12 @@
% \begin{macro}{\m@make@twocolfootnotetext}
% \cs{m@make@twocolfootnotetext}\marg{series} creates
% \cs{@twocolfootnotetext}\meta{series}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\m@make@twocolfootnotetext}[1]{%
\@namelongdef{@twocolfootnotetext#1}##1{%
\insert\@nameuse{footins#1}{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\@preamfntext
\protected@edef\@currentlabel{%
@@ -25940,12 +26121,13 @@
% \begin{macro}{\m@make@mptwocolfootnotetext}
% \cs{m@make@mptwocolfootnotetext}\marg{series} creates
% \cs{@mptwocolfootnotetext}\meta{series}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\m@make@mptwocolfootnotetext}[1]{%
\@namelongdef{@mptwocolfootnotetext#1}##1{%
\global\setbox\@nameuse{@mpfootins#1}\vbox{%
\unvbox\@nameuse{@mpfootins#1}
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -26019,9 +26201,10 @@
% \begin{macro}{\@threecolfootnotetext}
% \cs{@threecolfootnotetext}\marg{text} is the three column version of
% \cs{@footnotetext}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\@preamfntext
\protected@edef\@currentlabel{%
@@ -26059,11 +26242,12 @@
% \begin{macro}{\@mpthreecolfootnotetext}
% \cs{@mpthreecolfootnotetext}\marg{text} is the three column version of
% \cs{@mpfootnotetext}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\@mpthreecolfootnotetext}[1]{%
\global\setbox\@mpfootinsv@r\vbox{%
\unvbox\@mpfootinsv@r
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -26103,11 +26287,12 @@
% \begin{macro}{\m@make@threecolfootnotetext}
% \cs{m@make@threecolfootnotetext}\marg{series} creates
% \cs{@threecolfootnotetext}\meta{series}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\m@make@threecolfootnotetext}[1]{%
\@namelongdef{@threecolfootnotetext#1}##1{%
\insert\@nameuse{footins#1}{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\@preamfntext
\protected@edef\@currentlabel{%
@@ -26122,12 +26307,13 @@
% \begin{macro}{\m@make@mpthreecolfootnotetext}
% \cs{m@make@mpthreecolfootnotetext}\marg{series} creates
% \cs{@mpthreecolfootnotetext}\meta{series}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\m@make@mpthreecolfootnotetext}[1]{%
\@namelongdef{@mpthreecolfootnotetext#1}##1{%
\global\setbox\@nameuse{@mpfootins#1}\vbox{%
\unvbox\@nameuse{@mpfootins#1}
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -26284,9 +26470,10 @@
% \begin{macro}{\@parafootnotetext}
% \cs{@parafootnotetext}\marg{text} is a paragraph version of
% \cs{@footnotetext}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\@preamfntext
\protected@edef\@currentlabel{%
@@ -26315,11 +26502,12 @@
% \begin{macro}{\@mpparafootnotetext}
% \cs{@mpparafootnotetext}\marg{text} is a paragraph version of
% \cs{@mpfootnotetext}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\@mpparafootnotetext}[1]{%
\global\setbox\@mpfootinsv@r\vbox{%
\unvbox\@mpfootinsv@r
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -26365,11 +26553,12 @@
% \begin{macro}{\m@make@parafootnotetext}
% \cs{m@make@parafootnotetext}\marg{series} creates
% \cs{@parafootnotetext}\meta{series}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\m@make@parafootnotetext}[1]{%
\@namelongdef{@parafootnotetext#1}##1{%
\insert\@nameuse{footins#1}{
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\@preamfntext
\protected@edef\@currentlabel{%
@@ -26386,12 +26575,13 @@
% \begin{macro}{\m@make@mpparafootnotetext}
% \cs{m@make@mpparafootnotetext}\marg{series} creates
% \cs{@mpparafootnotetext}\meta{series}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\m@make@mpparafootnotetext}[1]{%
\@namelongdef{@mpparafootnotetext#1}##1{%
\global\setbox\@nameuse{@mpfootins#1}\vbox{%
\unvbox\@nameuse{@mpfootins#1}
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -26771,9 +26961,10 @@
\ifm@mfnmargin% use marginpar
% \end{macrocode}
% Use \cs{marginpar} for placing the footnote.
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\marginpar{%
- \def\baselinestretch{\m@m@singlespace}%
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font
\foottextfont
\protected@edef\@currentlabel{%
@@ -26786,9 +26977,10 @@
% This is the original code for \cs{@footnotetext}.
% \changes{v1.618033988c}{2010/02/20}{sporadic spaces removed, error
% reported on texlive mailinglist}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\insert\footins{%
- \def\baselinestretch{\m@m@singlespace}%
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font
\foottextfont
\@preamfntext
@@ -27169,11 +27361,12 @@
% \begin{macro}{\@sidefootnotetext}
% \changes{v1.61803398d}{2010/02/05}{changed \cs{sidefootfont}
% to \cs{sidefoottextfont}}
+% \changes{v3.6g}{2010/09/19}{made 'single spacing' configurable}
% \begin{macrocode}
\newcommand{\@sidefootnotetext}[1]{\insert\sidefootins{%
\hsize\sidefootwidth
\@parboxrestore
- \def\baselinestretch{\m@m@singlespace}%
+ \def\baselinestretch{\m@m@footnote@spacing}%
\sidefootform \normalsize\normalfont\sidefoottextfont
\splittopskip=\ht\strutbox
\splitmaxdepth=\dp\strutbox
@@ -31789,9 +31982,10 @@
% ($<1.0$) the space above the body with respect to the space below.
% This is more robust than the method proposed in the manual.
% \changes{v1.61803}{2008/01/30}{Added vplace environment (mempatch v4.4)}
+% \changes{v3.6g}{2010/08/27}{Both should be \cs{vspace*}}
% \begin{macrocode}
\newenvironment{vplace}[1][1]{%
- \par\vspace{\stretch{#1}}%
+ \par\vspace*{\stretch{#1}}%
}{%
\vspace*{\stretch{1}}%
\par}
@@ -31877,10 +32071,12 @@
% a new page. The code is a variant of code thought of for the
% \Lpack{needspace} package~\cite{NEEDSPACE}.
% \changes{v1.4}{2003/11/16}{Added patch v1.4 versions of needspace macros}
+% \changes{v3.6g}{2010/09/09}{Added a \cs{vskip0pt} at the end to make
+% it work better with \cs{section} and friends}
% \begin{macrocode}
\newcommand{\needspace}[1]{\begingroup\setlength{\dimen@}{#1}%
\vskip\z@\@plus\dimen@\penalty -100\vskip\z@\@plus-\dimen@
- \vskip\dimen@\penalty 9999\vskip-\dimen@\endgroup}
+ \vskip\dimen@\penalty 9999\vskip-\dimen@\vskip\z@skip\endgroup}
% \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 b1e27f3a56e..c600a86386c 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -2,7 +2,8 @@
%
% mempatch.dtx
% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-% Copyright 2001 --- 2008 Peter R. Wilson
+% Maintainer: Lars Madsen (daleif+memoir at imf dot au dot dk)
+% Copyright 2001 --- 2010 Peter R. Wilson
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -13,7 +14,7 @@
% and version 1.3 or later is part of all distributions of
% LaTeX version 2003/06/01 or later.
%
-% This work has the LPPL maintenance status "author-maintained".
+% This work has the LPPL maintenance status "maintained".
%
% This work consists of the files listed in the README file.
%
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index 1177fad37cd..e1b29b992e0 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}%
- [2010/08/22 v3.6f configurable book, report, article document class]
+ [2010/09/19 v3.6g configurable book, report, article document class]
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -1230,41 +1230,127 @@
\@settopoint\evensidemargin
\fixheaderwidths}
+\newcommand\settypeoutlayoutunit[1]{
+ \nametest{#1}{pt}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{1.0}
+ \else
+ \nametest{#1}{pc}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.083333}
+ \else
+ \nametest{#1}{in}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.013837}
+ \else
+ \nametest{#1}{mm}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.351459}
+ \else
+ \nametest{#1}{cm}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.0351459}
+ \else
+ \nametest{#1}{bp}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.996264}
+ \else
+ \nametest{#1}{dd}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.9345718}
+ \else
+ \nametest{#1}{cc}
+ \ifsamename
+ \def\mem@tl@unit{#1}
+ \def\mem@tl@unitperpt{0.0778809}
+ \else
+ \@memerror{Unknown unit '#1' not suitable for layout listing}{}
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+}
+\settypeoutlayoutunit{pt}
+\newcommand\mem@typeouttwolengths[4]{
+ % #1 = text before
+ % #2 = first length
+ % #3 = text between
+ % #4 = second length
+ \setlength\@tempdimc{\mem@tl@unitperpt #2}
+ \edef\l@first{\strip@pt\@tempdimc}%
+ \setlength\@tempdimc{\mem@tl@unitperpt #4}
+ \edef\l@second{\strip@pt\@tempdimc}%
+ \typeout{#1: \l@first\mem@tl@unit\space#3\space\l@second\mem@tl@unit}
+}
+\newcommand\mem@typeoutonelength[2]{
+ % #1 = text before
+ % #2 = first length
+ \setlength\@tempdimc{\mem@tl@unitperpt #2}
+ \edef\l@first{\strip@pt\@tempdimc}%
+ \typeout{#1: \l@first\mem@tl@unit}
+}
\newcommand*{\typeoutlayout}{%
\typeout{}
\typeout{******************************************************}
- \typeout{Stock height and width:
- \the\stockheight\space by \the\stockwidth}
- \typeout{Top and edge trims:
- \the\trimtop\space and \the\trimedge}
- \typeout{Page height and width:
- \the\paperheight\space by \the\paperwidth}
- \typeout{Text height and width:
- \the\textheight\space by \the\textwidth}
- \typeout{Spine and edge margins:
- \the\spinemargin\space and \the\foremargin}
- \typeout{Upper and lower margins:
- \the\uppermargin\space and \the\lowermargin}
- \typeout{Headheight and headsep:
- \the\headheight\space and \the\headsep}
- \typeout{Footskip:
- \the\footskip}
- \typeout{Columnsep and columnseprule:
- \the\columnsep\space and \the\columnseprule}
- \typeout{Marginparsep and marginparwidth:
- \the\marginparsep\space and \the\marginparwidth}
- \typeout{Sidecapsep and sidecapwidth:
- \the\sidecapsep\space and \the\sidecapwidth}
- \typeout{Sidebarhsep and sidebarwidth:
- \the\sidebarhsep\space and \the\sidebarwidth}
- \typeout{Sidebarvsep and sidebartopsep:
- \the\sidebarvsep\space and \the\sidebartopsep}
- \typeout{Sidebarheight:
- \the\dimen\sideins}
- \typeout{Sidefoothsep and sidefootwidth:
- \the\sidefoothsep\space and \the\sidefootwidth}
- \typeout{Sidefootvsep and sidefootheight:
- \the\sidefootvsep\space and \the\sidefootheight}
+ % \typeout{Stock height and width:
+ % \the\stockheight\space by \the\stockwidth}
+ % \typeout{Top and edge trims:
+ % \the\trimtop\space and \the\trimedge}
+ % \typeout{Page height and width:
+ % \the\paperheight\space by \the\paperwidth}
+ % \typeout{Text height and width:
+ % \the\textheight\space by \the\textwidth}
+ % \typeout{Spine and edge margins:
+ % \the\spinemargin\space and \the\foremargin}
+ % \typeout{Upper and lower margins:
+ % \the\uppermargin\space and \the\lowermargin}
+ % \typeout{Headheight and headsep:
+ % \the\headheight\space and \the\headsep}
+ % \typeout{Footskip:
+ % \the\footskip}
+ % \typeout{Columnsep and columnseprule:
+ % \the\columnsep\space and \the\columnseprule}
+ % \typeout{Marginparsep and marginparwidth:
+ % \the\marginparsep\space and \the\marginparwidth}
+ % \typeout{Sidecapsep and sidecapwidth:
+ % \the\sidecapsep\space and \the\sidecapwidth}
+ % \typeout{Sidebarhsep and sidebarwidth:
+ % \the\sidebarhsep\space and \the\sidebarwidth}
+ % \typeout{Sidebarvsep and sidebartopsep:
+ % \the\sidebarvsep\space and \the\sidebartopsep}
+ % \typeout{Sidebarheight:
+ % \the\dimen\sideins}
+ % \typeout{Sidefoothsep and sidefootwidth:
+ % \the\sidefoothsep\space and \the\sidefootwidth}
+ % \typeout{Sidefootvsep and sidefootheight:
+ % \the\sidefootvsep\space and \the\sidefootheight}
+ \mem@typeouttwolengths{Stock height and width}{\stockheight}{by}{\stockwidth}
+ \mem@typeouttwolengths{Top and edge trims}{\trimtop}{and}{\trimedge}
+ \mem@typeouttwolengths{Page height and width}{\paperheight}{by}{\paperwidth}
+ \mem@typeouttwolengths{Text height and width}{\textheight}{by}{\textwidth}
+ \mem@typeouttwolengths{Spine and edge margins}{\spinemargin}{and}{\foremargin}
+ \mem@typeouttwolengths{Upper and lower margins}{\uppermargin}{and}{\lowermargin}
+ \mem@typeouttwolengths{Headheight and headsep}{\headheight}{and}{\headsep}
+ \mem@typeoutonelength{Footskip}{\footskip}
+ \mem@typeouttwolengths{Columnsep and columnseprule}{\columnsep}{and}{\columnseprule}
+ \mem@typeouttwolengths{Marginparsep and marginparwidth}{\marginparsep}{and}{\marginparwidth}
+ \mem@typeouttwolengths{Sidecapsep and sidecapwidth}{\sidecapsep}{and}{\sidecapwidth}
+ \mem@typeouttwolengths{Sidebarhsep and sidebarwidth}{\sidebarhsep}{and}{\sidebarwidth}
+ \mem@typeouttwolengths{Sidebarvsep and sidebartopsep}{\sidebarvsep}{and}{\sidebartopsep}
+ \mem@typeoutonelength{Sidebarheight}{\dimen\sideins}
+ \mem@typeouttwolengths{Sidefoothsep and sidefootwidth}{\sidefoothsep}{and}{\sidefootwidth}
+ \mem@typeouttwolengths{Sidefootvsep and sidefootheight}{\sidefootvsep}{and}{\sidefootheight}
\typeout{******************************************************}
\typeout{}}
@@ -1301,20 +1387,27 @@
\newcommand{\typeoutstandardlayout}{%
\typeout{}
\typeout{******************************************************}
- \typeout{Page height and width:
- \the\paperheight\space by \the\paperwidth}
- \typeout{Text height and width:
- \the\textheight\space by \the\textwidth}
- \typeout{Oddside and evenside margins:
- \the\oddsidemargin\space and \the\evensidemargin}
- \typeout{Topmargin and footskip:
- \the\topmargin\space and \the\footskip}
- \typeout{Headheight and headsep:
- \the\headheight\space and \the\headsep}
- \typeout{Columnsep and columnseprule:
- \the\columnsep\space and \the\columnseprule}
- \typeout{Marginparsep and marginparwidth:
- \the\marginparsep\space and \the\marginparwidth}
+ % \typeout{Page height and width:
+ % \the\paperheight\space by \the\paperwidth}
+ \mem@typeouttwolengths{Page height and width}{\paperheight}{by}{\paperwidth}
+ % \typeout{Text height and width:
+ % \the\textheight\space by \the\textwidth}
+ \mem@typeouttwolengths{Text height and width}{\textheight}{by}{\textwidth}
+ % \typeout{Oddside and evenside margins:
+ % \the\oddsidemargin\space and \the\evensidemargin}
+ \mem@typeouttwolengths{Oddside and evenside margins}{\oddsidemargin}{and}{\evensidemargin}
+ % \typeout{Topmargin and footskip:
+ % \the\topmargin\space and \the\footskip}
+ \mem@typeouttwolengths{Topmargin and footskip}{\topmargin}{and}{\footskip}
+ % \typeout{Headheight and headsep:
+ % \the\headheight\space and \the\headsep}
+ \mem@typeouttwolengths{Headheight and headsep}{\headheight}{and}{\headsep}
+ % \typeout{Columnsep and columnseprule:
+ % \the\columnsep\space and \the\columnseprule}
+ \mem@typeouttwolengths{Columnsep and columnseprule}{\columnsep}{and}{\columnseprule}
+ % \typeout{Marginparsep and marginparwidth:
+ % \the\marginparsep\space and \the\marginparwidth}
+ \mem@typeouttwolengths{Marginparsep and marginparwidth}{\marginparsep}{and}{\marginparwidth}
\typeout{******************************************************}
\typeout{}
}
@@ -2017,16 +2110,23 @@
\@currsize}
\newcommand*{\setSingleSpace}[1]{%
- \def\m@m@singlespace{#1}}
+ \def\m@m@singlespace{#1}%
+ \def\m@m@footnote@spacing{#1}%
+ \def\m@m@float@spacing{#1} %
+}
\setSingleSpace{1}
+\newcommand*\setPagenoteSpacing[1]{\def\m@m@footnote@spacing{#1}}
+\newcommand*\setFloatSpacing[1] {\def\m@m@float@spacing{#1}}
\newcommand*{\SingleSpacing}{%
\setSpacing{\m@m@singlespace}%
+ \edef\m@m@footnote@spacing{\baselinestretch}%
+ \edef\m@m@float@spacing{\baselinestretch}%
\vskip\baselineskip% correction for coming into single spacing
}
\SingleSpacing
-\newcommand*{\OnehalfSpacing}{
+\newcommand*{\@OnehalfSpacing}{
\setSpacing{1.25}% default (10pt)
\ifcase \@ptsize \relax % 10pt
\setSpacing{1.25}%
@@ -2043,8 +2143,15 @@
\else% the extended sizes
\setSpacing{1.16}%
\fi}
+\newcommand*\OnehalfSpacing{%
+ \@ifstar{%
+ \@OnehalfSpacing%
+ \edef\m@m@footnote@spacing{\baselinestretch}%
+ \edef\m@m@float@spacing{\baselinestretch}%
+ }{\@OnehalfSpacing}%
+}
-\newcommand*{\DoubleSpacing}{
+\newcommand*{\@DoubleSpacing}{
\setSpacing{1.667}% default (10pt)
\ifcase \@ptsize \relax % 10pt
\setSpacing{1.667}%
@@ -2061,6 +2168,13 @@
\else% larger sizes
\setSpacing{1.5}%
\fi}
+\newcommand*\DoubleSpacing{%
+ \@ifstar{%
+ \@DoubleSpacing%
+ \edef\m@m@footnote@spacing{\baselinestretch}%
+ \edef\m@m@float@spacing{\baselinestretch}%
+ }{\@DoubleSpacing}%
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% check what this does!!!!!!!!
\renewcommand*{\@setsize}[4]{%
@@ -2104,10 +2218,16 @@
\newenvironment{OnehalfSpace}{%
\begingroup
\OnehalfSpacing}{\m@mrestore@spacing}
+\newenvironment{OnehalfSpace*}{%
+ \begingroup
+ \OnehalfSpacing*}{\m@mrestore@spacing}
\newenvironment{DoubleSpace}{%
\begingroup
\DoubleSpacing}{\m@mrestore@spacing}
+\newenvironment{DoubleSpace*}{%
+ \begingroup
+ \DoubleSpacing}{\m@mrestore@spacing}
\newcommand*{\memdskipstretch}{0.0}
\newcommand*{\setDisplayskipStretch}[1]{%
@@ -2126,7 +2246,7 @@
\let\m@m@xfloat\@xfloat
\def\@xfloat #1[#2]{%
\m@m@xfloat #1[#2]%
- \def\baselinestretch{\m@m@singlespace}%
+ \def\baselinestretch{\m@m@float@spacing}%
\normalsize}
\newdimen\memPD
@@ -8611,8 +8731,8 @@
\fi}
\renewcommand{\@footnotetext}[1]{\insert\footins{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
- \reset@font% <- v1.6180 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
+ \reset@font%
\foottextfont
\@preamfntext
\hsize\columnwidth
@@ -8759,12 +8879,12 @@
\renewcommand{\@mpfootnotetext}[1]{%
\global\setbox\@mpfootins\vbox{%
\unvbox\@mpfootins
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\foottextfont \hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
\csname p@mpfootnote\endcsname\@thefnmark}%
\color@begingroup
- \reset@font% <- v1.6180 addition
+ \reset@font%
\@makefntext{%
\rule\z@\footnotesep\ignorespaces{\foottextfont #1}%
\@finalstrut\strutbox}%
@@ -8879,7 +8999,7 @@
\newcommand{\m@make@footnotetext}[1]{%
\@namelongdef{@footnotetext#1}##1{%
\insert\@nameuse{footins#1}{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\@preamfntext
\hsize\columnwidth
@@ -8896,7 +9016,7 @@
\@namelongdef{@mpfootnotetext#1}##1{%
\global\setbox\@nameuse{@mpfootins#1}\vbox{%
\unvbox\@nameuse{@mpfootins#1}%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -9055,7 +9175,7 @@
\let\mp@footgroupv@r\@mptwocol@footgroupv@r}
\newcommand{\@twocolfootnotetext}[1]{\insert\footinsv@r{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\@preamfntext
\protected@edef\@currentlabel{%
@@ -9079,7 +9199,7 @@
\newcommand{\@mptwocolfootnotetext}[1]{%
\global\setbox\@mpfootinsv@r\vbox{%
\unvbox\@mpfootinsv@r
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -9108,7 +9228,7 @@
\newcommand{\m@make@twocolfootnotetext}[1]{%
\@namelongdef{@twocolfootnotetext#1}##1{%
\insert\@nameuse{footins#1}{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\@preamfntext
\protected@edef\@currentlabel{%
@@ -9122,7 +9242,7 @@
\@namelongdef{@mptwocolfootnotetext#1}##1{%
\global\setbox\@nameuse{@mpfootins#1}\vbox{%
\unvbox\@nameuse{@mpfootins#1}
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -9159,7 +9279,7 @@
\let\mp@footgroupv@r\@mpthreecol@footgroupv@r}
\newcommand{\@threecolfootnotetext}[1]{\insert\footinsv@r{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\@preamfntext
\protected@edef\@currentlabel{%
@@ -9182,7 +9302,7 @@
\newcommand{\@mpthreecolfootnotetext}[1]{%
\global\setbox\@mpfootinsv@r\vbox{%
\unvbox\@mpfootinsv@r
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -9210,7 +9330,7 @@
\newcommand{\m@make@threecolfootnotetext}[1]{%
\@namelongdef{@threecolfootnotetext#1}##1{%
\insert\@nameuse{footins#1}{%
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\@preamfntext
\protected@edef\@currentlabel{%
@@ -9223,7 +9343,7 @@
\@namelongdef{@mpthreecolfootnotetext#1}##1{%
\global\setbox\@nameuse{@mpfootins#1}\vbox{%
\unvbox\@nameuse{@mpfootins#1}
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -9299,7 +9419,7 @@
\xdef\footfudgefactor{\expandafter\strip@pt\dimen0 }}}
\newcommand{\@parafootnotetext}[1]{\insert\footinsv@r{
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\@preamfntext
\protected@edef\@currentlabel{%
@@ -9318,7 +9438,7 @@
\newcommand{\@mpparafootnotetext}[1]{%
\global\setbox\@mpfootinsv@r\vbox{%
\unvbox\@mpfootinsv@r
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\foottextfont
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -9354,7 +9474,7 @@
\newcommand{\m@make@parafootnotetext}[1]{%
\@namelongdef{@parafootnotetext#1}##1{%
\insert\@nameuse{footins#1}{
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\@preamfntext
\protected@edef\@currentlabel{%
@@ -9369,7 +9489,7 @@
\@namelongdef{@mpparafootnotetext#1}##1{%
\global\setbox\@nameuse{@mpfootins#1}\vbox{%
\unvbox\@nameuse{@mpfootins#1}
- \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font\@nameuse{foottextfont#1}%
\hsize\columnwidth \@parboxrestore
\protected@edef\@currentlabel{%
@@ -9564,7 +9684,7 @@
\renewcommand{\@footnotetext}[1]{%
\ifm@mfnmargin% use marginpar
\marginpar{%
- \def\baselinestretch{\m@m@singlespace}%
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font
\foottextfont
\protected@edef\@currentlabel{%
@@ -9574,7 +9694,7 @@
\color@endgroup}%
\else% regular feet
\insert\footins{%
- \def\baselinestretch{\m@m@singlespace}%
+ \def\baselinestretch{\m@m@footnote@spacing}%
\reset@font
\foottextfont
\@preamfntext
@@ -9751,7 +9871,7 @@
\newcommand{\@sidefootnotetext}[1]{\insert\sidefootins{%
\hsize\sidefootwidth
\@parboxrestore
- \def\baselinestretch{\m@m@singlespace}%
+ \def\baselinestretch{\m@m@footnote@spacing}%
\sidefootform \normalsize\normalfont\sidefoottextfont
\splittopskip=\ht\strutbox
\splitmaxdepth=\dp\strutbox
@@ -11386,7 +11506,7 @@
\advance #1 by -\spinemargin}
\newenvironment{vplace}[1][1]{%
- \par\vspace{\stretch{#1}}%
+ \par\vspace*{\stretch{#1}}%
}{%
\vspace*{\stretch{1}}%
\par}
@@ -11409,7 +11529,7 @@
\newcommand{\needspace}[1]{\begingroup\setlength{\dimen@}{#1}%
\vskip\z@\@plus\dimen@\penalty -100\vskip\z@\@plus-\dimen@
- \vskip\dimen@\penalty 9999\vskip-\dimen@\endgroup}
+ \vskip\dimen@\penalty 9999\vskip-\dimen@\vskip\z@skip\endgroup}
\newcommand{\Needspace}{\@ifstar{\M@sneedsp@}{\M@needsp@}}
\newcommand{\M@sneedsp@}[1]{\par \penalty-100\begingroup
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:44:12 +0000