From 82e26f27acac86b76d864486d11071bf51cd1e1a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Apr 2015 21:16:25 +0000 Subject: memoir (23apr15) git-svn-id: svn://tug.org/texlive/trunk@37021 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/memoir/README | 25 ++++ Master/texmf-dist/doc/latex/memoir/memman.pdf | Bin 2732722 -> 2732108 bytes Master/texmf-dist/doc/latex/memoir/memman.tex | 177 +++++++++++++++++++------- Master/texmf-dist/doc/latex/memoir/memsty.sty | 6 +- 4 files changed, 162 insertions(+), 46 deletions(-) (limited to 'Master/texmf-dist/doc/latex/memoir') diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README index 9373d859e8e..c056617a96a 100644 --- a/Master/texmf-dist/doc/latex/memoir/README +++ b/Master/texmf-dist/doc/latex/memoir/README @@ -36,6 +36,31 @@ o Backmatter: Bibliography, indexes ~ 50 pages + +Changed (2015/04/23) + +o memoir v3.7d + +-- \end@dblfloat code reversion now only happens if fixltx2e has a + release date older than 2014/01/01. Newer versions of fixltx2e has + no problems with memoir +-- added \feetatbottom. Use it to force footnotes to be added + from the bottom up when in a \raggedbottom context. Has no effect + under \flushbottom +-- \twocolumnfootnotes, \threecolumnfootnotes, \paragraphfootnotes now + use \skip\footins +-- added \setfootins, it will set \skip\footins and its minipage + counterpart, plus the \...v@r versions used by e.g., + \twocolumnfootnotes +-- fixed a bug in page styles whereby one could not apply rule + prefixes to a copied style. +-- Fixed typo in manual about \newleadpage, + reported by Werner Grundlingh +-- updated our version of \@doclearpage to match fixltx2e v1.1s (which + will also be in the next ltx kernel). This will change float + placement in a twocolumn doc (for the better) + + Changed (2015/03/05) o memoir v3.7c diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf index 2eac2443afb..0758ee99f16 100644 Binary files a/Master/texmf-dist/doc/latex/memoir/memman.pdf and b/Master/texmf-dist/doc/latex/memoir/memman.pdf differ diff --git a/Master/texmf-dist/doc/latex/memoir/memman.tex b/Master/texmf-dist/doc/latex/memoir/memman.tex index 10944f6ac0d..45cb6ded596 100644 --- a/Master/texmf-dist/doc/latex/memoir/memman.tex +++ b/Master/texmf-dist/doc/latex/memoir/memman.tex @@ -125,18 +125,20 @@ layout=marginnote } + \begin{document} + %#% extstart input intro.tex -\tightlists -%\firmlists +%\tightlists +\firmlists \midsloppy \raggedbottom \chapterstyle{demo3} @@ -1248,8 +1250,8 @@ been answered. \svnidlong {$Ignore: $} -{$LastChangedDate: 2015-03-05 18:49:59 +0100 (Thu, 05 Mar 2015) $} -{$LastChangedRevision: 516 $} +{$LastChangedDate: 2015-04-22 17:17:51 +0200 (Wed, 22 Apr 2015) $} +{$LastChangedRevision: 527 $} {$LastChangedBy: daleif $} \chapter{Introduction to the eighth edition} @@ -1753,8 +1755,6 @@ For referential purposes, arguments are denoted by \meta{arg} \\ \end{syntax} - - \section{Acknowledgements} Many people have contributed to the \Lclass{memoir} class and this manual @@ -1954,6 +1954,8 @@ can also write me directly via \texttt{daleif (at) math dot au dot dk}. %#% extend + + %#% extstart include terminology.tex \svnidlong @@ -2164,8 +2166,8 @@ an em, often a quad is 1em. \svnidlong {$Ignore: $} -{$LastChangedDate: 2014-11-05 16:28:11 +0100 (Wed, 05 Nov 2014) $} -{$LastChangedRevision: 501 $} +{$LastChangedDate: 2015-04-23 14:33:14 +0200 (Thu, 23 Apr 2015) $} +{$LastChangedRevision: 528 $} {$LastChangedBy: daleif $} \chapter{Starting off} \label{chap:starting} @@ -2537,9 +2539,11 @@ definitions within the class code). file containing all the size and space specifications for your chosen font size, and also tell \Mname\ the name of the file. \emph{Before} the \cmd{\documentclass} command define two macros, \cmd{\anyptfilebase} and -\cmd{\anyptsize} like: \\ -\verb?\newcommand*{\anyptfilebase}?\marg{chars} -\verb?\newcommand*{\anyptsize}?\marg{num} \\ +\cmd{\anyptsize} like: +\begin{lcode} + \newcommand*{\anyptfilebase}\marg{chars} + \newcommand*{\anyptsize}\marg{num} +\end{lcode} \glossary(anyptsize)% {\cs{anyptsize}}% {Second part (the pointsize) of the name the \texttt{clo} file for the @@ -2772,8 +2776,8 @@ want to put \cmd{\raggedbottom} in the preamble\index{preamble}. \svnidlong {$Ignore: $} -{$LastChangedDate: 2015-02-24 12:51:39 +0100 (Tue, 24 Feb 2015) $} -{$LastChangedRevision: 508 $} +{$LastChangedDate: 2015-04-22 13:01:10 +0200 (Wed, 22 Apr 2015) $} +{$LastChangedRevision: 524 $} {$LastChangedBy: daleif $} \chapter{Laying out the page} \label{chap:layingpage} @@ -2833,8 +2837,36 @@ On the other hand, if, say, you are designing a document, that is to be printed on one type of paper (the stock), and then trimmed to another, please read on. +% Before we start let use summarize what laying out the page +% involves\fxnote{where did the spacings around enumerate go? Had to add +% a blank line} + +% \begin{enumerate}[(a)] +% \item Figure out the stock size of your document and whether or not +% you need to trim the stock to get the desired paper size. + +% Most people just specify the stick and paper size via a class option +% like \Lopt{a4paper}. Thus you can proceed to +% section~\ref{sec:typeblock2}. +% \item Specify the text block, basically the margins. + +% The class provide two interfaces for this: (1) Set the margins +% around the text block, thereby defining the text block, and (2), +% specify the size of the text block directly and then place it on the +% page. +% \item Specify auxiliary layout, like placement of headers, footers and +% margin notes. +% \item At the end (\emph{very important}) we ask the class to put +% everything together and check that they make sense. +% \end{enumerate} + + + + + \section{Stock material} +\label{sec:stock-material} Printing is the act of laying symbols onto a piece of stock\index{stock} material. Some print on T-shirts by a process @@ -2861,6 +2893,7 @@ the norm. \section{The page} +\label{sec:page} The class assumes that there will be only a single page on a side of each piece of stock\index{stock}; two sides means that there can be two @@ -3864,9 +3897,31 @@ is set to \meta{push}. We may add other auto adjusting features to future \theclass\ releases. \end{note} - \index{marginalia|)} %| + +\section{Other} +\label{sec:other} + + +\begin{syntax} +\cmd{\setfootins}\marg{length for normal}\marg{length for minipage} \\ +\end{syntax} +% \glossary(setfootins)% +% {\cs{setfootins}\marg{length for normal}\marg{length for minipage}}% +% {Sets \cs{skip}\cs{footins} and its minipage counterpart.} + +\noindent +When footnotes are added to the text block they are added +\cs{skip}\cs{footins} below the text. Since this is a skip it usually +needs special syntax to change it. Instead we have provided an +interface to set it.\footnote{This interface also sets the equivalent + lengths used when \cs{twocolumnfootnotes} and friends are being + used.} The default sizes are \cs{bigskipamount}. + + + + \section{Putting it together} The page layout parameters\index{page layout!class parameters} @@ -4630,7 +4685,6 @@ effect. %#% extend - %#% extstart include text-and-fonts.tex \svnidlong @@ -6797,7 +6851,6 @@ and thanks notes are meant to be different. \index{thanks!styling|)} %#% extend - %#% extstart include abstracts.tex \svnidlong @@ -7073,8 +7126,8 @@ optional argument of the \cmd{\twocolumn} command. In fact, \svnidlong {$Ignore: $} -{$LastChangedDate: 2015-02-23 14:55:22 +0100 (Mon, 23 Feb 2015) $} -{$LastChangedRevision: 506 $} +{$LastChangedDate: 2015-04-22 15:51:45 +0200 (Wed, 22 Apr 2015) $} +{$LastChangedRevision: 526 $} {$LastChangedBy: daleif $} %%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -7897,19 +7950,29 @@ titling. Something like this may do the trick \begin{syntax} \cmd{\newleadpage}\oarg{page-style}\marg{cmdname}\marg{title} \\ -\cmd{\newleadpage*}\oarg{page-style}\marg{cmdname}\marg{title} \\ +%\cmd{\newleadpage*}\oarg{page-style}\marg{cmdname}\marg{title} \\ \cmd{\renewleadpage}\oarg{page-style}\marg{cmdname}\marg{title} \\ -\cmd{\renewleadpage*}\oarg{page-style}\marg{cmdname}\marg{title} \\ -\end{syntax} -\cmd{\newleadpage} and associates are variants of the \cmd{\newcommand} -and companions.\footnote{The suggestions for these came from +%\cmd{\renewleadpage*}\oarg{page-style}\marg{cmdname}\marg{title} \\ +\end{syntax} +\glossary(newleadpage)% +{\cs{newleadpage}\oarg{page-style}\marg{cmdname}\marg{title}}% +{Creates a macro to that when used will generate a sort of title +page. Very similar to \cs{appendixpage}.} +\glossary(renewleadpage)% +{\cs{renewleadpage}\oarg{page-style}\marg{cmdname}\marg{title}}% +{Redefines an existing new lead page macro.} +The \cmd{\newleadpage}\footnote{The suggestions for this came from Danie Els\index{Els, Danie} and Lars Madsen\index{Madsen, Lars}.} -The \cmd{\newleadpage} command defines a macro \verb?\cmdname? that when called +command defines a macro \verb?\cmdname? that when called will typeset an Appendixpage-like page (see \Sref{sec:appendices}) with a -title \meta{title} -using the \meta{page-style} as the pagestyle for the page. The default -is the \pstyle{empty} pagestyle. The macro \cmd{\renewleadpage} redefines -an existing leadpage command. As an example: +title \meta{title} using the \meta{page-style} as the pagestyle for +the page. The default is the \pstyle{empty} pagestyle. The macro +\cmd{\renewleadpage} redefines an existing leadpage command. +\cmd{\cmdname} will add an entry to the TOC, the similarly defined +\cmd{\cmdname*} will not. + + +As an example: \begin{lcode} \newleadpage{plates}{Picture Gallery} \end{lcode} @@ -7919,6 +7982,10 @@ part-like page with the title \textbf{Picture Gallery}. \begin{syntax} \cmd{\leadpagetoclevel} \\ \end{syntax} +\glossary(leadpagetoclevel)% +{\cs{leadpagetoclevel}}% +{Holds the default toc level for \cs{newleadpage} generated macros, +default is \texttt{chapter}.} When \cs{(re)newleadpage} is used the resulting command adds \meta{title} to the \toc\ as though it was an unnumbered \cmd{\leadpagetoclevel} entry, whose definition is @@ -7930,8 +7997,6 @@ If you wished them to be entered like a \cmd{\part} header then simply: \renewcommand*{\leadpagetoclevel}{part} \end{lcode} - When the starred versions \cs{(re)newleadpage*} are used the resulting -command will not add \meta{title} to the \toc. The layout of the page matches that for unnumbered \cmd{\part} pages, and internally the resulting commands use \cmd{\partmark} in case you @@ -12431,7 +12496,6 @@ other environments. \index{list|)} %| %#% extend - %#% extstart include content-lists.tex \svnidlong @@ -17573,8 +17637,6 @@ package can be used with the class, but there are a few caveats: %#% extend - - %#% extstart include rows-and-columns.tex \svnidlong @@ -19550,8 +19612,8 @@ illustrate these points. \svnidlong {$Ignore: $} -{$LastChangedDate: 2014-05-07 13:21:44 +0200 (Wed, 07 May 2014) $} -{$LastChangedRevision: 481 $} +{$LastChangedDate: 2015-04-22 17:17:51 +0200 (Wed, 22 Apr 2015) $} +{$LastChangedRevision: 527 $} {$LastChangedBy: daleif $} \chapter{Page notes} \label{chap:mnotes} @@ -19674,7 +19736,7 @@ the separator. Its default definition is: \glossary(feetbelowfloat)% {\cs{feetbelowfloat}}% {Typeset footnotes below bottom floats.} -In\fxnote{this needs checking} the standard classes, footnotes on a page that has a float at the +In the standard classes, footnotes on a page that has a float at the bottom are typeset before the float. I think that this looks peculiar. Following the \cmd{\feetbelowfloat} declaration footnotes will be typeset at the bottom of the page below any bottom @@ -19684,6 +19746,22 @@ as opposed to being put just after the bottom line of text. The standard positioning is used following the \cmd{\feetabovefloat} declaration, which is the default. +\begin{syntax} +\cmd{\feetatbottom} \\ +\end{syntax} +\glossary(feetatbottom)% + {\cs{feetatbottom}}% + {Place footnotes at the very bottom of the text block whenever we + are in a non \cs{flushbottom} context.} +Then\Added{2015/04/22} we use \cs{raggedbottom} or similar, \LaTeX{} +will by default attach the footnotes just below the text. In many +cases it may look better if the footnotes are being build from the +bottom of the texst block up. Issuing \cs{feetatbottom} does +this. Please note that \cs{feetatbottom} has no effect whenever +\cs{flushbottom} is active. + + + \subsection{A variety of footnotes} \begin{syntax} @@ -20235,6 +20313,26 @@ and if you later want rules you can write: \end{lcode} +\fancybreak{} + + +In \fref{fig:fn} we see that the footnotes are separated from the text +by \cs{skip}\cs{footins}. We provide a special interface to set this skip:\Added{2015/04/22} +\begin{syntax} +\cmd{\setfootins}\marg{length for normal}\marg{length for minipage} \\ +\end{syntax} +\glossary(setfootins)% +{\cs{setfootins}\marg{length for normal}\marg{length for minipage}}% +{Sets \cs{skip}\cs{footins} and its minipage counterpart.} +The default is similar to +\begin{lcode} + \setfootins{\bigskipamount}{\bigskipamount} +\end{lcode} +Internally \cmd{\setfootins} also sets the skips being used by +\cmd{\twocolumnfootnotes} and friends. + + + \index{footnote!styling|)} \index{footnote|)} @@ -21465,13 +21563,6 @@ ignored as for \cmd{\pagenote} it can be arbitrary text whereas for %#% extend - - - - - - - %#% extstart include decorative-text.tex \svnidlong diff --git a/Master/texmf-dist/doc/latex/memoir/memsty.sty b/Master/texmf-dist/doc/latex/memoir/memsty.sty index 5abe01f7c3d..d0b3b10cdf1 100644 --- a/Master/texmf-dist/doc/latex/memoir/memsty.sty +++ b/Master/texmf-dist/doc/latex/memoir/memsty.sty @@ -22,7 +22,7 @@ \providecommand{\LMnote}[2]{} \providecommand{\PWnote}[2]{} - +\newcommand\Added[1]{\sidepar{\tiny Added #1}} %%%%%%%%%%%%%%%%%%% kill scale change warning in layouts \renewcommand*{\setlayoutscale}[1]{\setlength{\l@youtunitlength}{1pt} @@ -482,12 +482,12 @@ official r\^ole in fluffy souffl\'es?' } % after, looks a bit better} \newenvironment{lcode}{\@zeroseps \nopagebreak - \vskip0.2em plus 0.1em minus 0.2em + \vskip0.4em plus 0.1em minus 0.2em \renewcommand{\verbatim@startline}{\verbatim@line{\hskip\gparindent}} \small\setlength{\baselineskip}{\onelineskip}\verbatim}% {\endverbatim \vspace{-\baselineskip} - \vskip0.3em plus 0.1em minus 0.2em + \vskip0.6em plus 0.1em minus 0.2em \noindent} %%%%% LaTeX syntax -- cgit v1.2.3