diff options
Diffstat (limited to 'Master/texmf-dist/doc/latex/memoir')
| -rw-r--r-- | Master/texmf-dist/doc/latex/memoir/README | 44 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/memoir/memman.pdf | bin | 2780528 -> 2788654 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/memoir/memman.tex | 396 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/memoir/memsty.sty | 36 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/memoir/setpage-example.pdf | bin | 0 -> 203838 bytes |
5 files changed, 356 insertions, 120 deletions
diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README index b94bb579f52..45c21dd7049 100644 --- a/Master/texmf-dist/doc/latex/memoir/README +++ b/Master/texmf-dist/doc/latex/memoir/README @@ -13,7 +13,7 @@ more popular packages. PLEASE DON'T WRITE PETER DIRECTLY AS HE IS AWAY MORE OFTEN THAN NOT. -Lars Madsen <daleif@math.au.dk> has taking over the support for memoir. +Lars Madsen <daleif@math.au.dk> is maintaining memoir. NOTE: If you are using the hyperref package dated earlier than 2006/11/15, @@ -36,6 +36,48 @@ o Backmatter: Bibliography, indexes ~ 50 pages +Changed (2018/12/12) + +o memoir v3.7h + +-- The following packages are no longer embedded into the class + sources: array, delarray, dcolumn and tabularx. + + These are all part of the _tools_ section of every LaTeX + installation, thus there is no reason to embed it anymore (let + alone keep track of when they are updated). Instead we require them + from the LaTeX installation. + + Note that the class still makes its own defaults for some of the + default settings for these packages. + + Historical note: When the class was first created updating LaTeX + was not an easy task, often done by hand. Also there was no manual + requirements, or if there were a manual it might not be easy to + find. So it made sense to have it all in one place and their + manuals added to the class manual. This usage information in the + manual will stay, but might no longer be 100% up to date, so users + are always referred to the package manuals. + + We may remove more embedded packages in the future and replace them + with just require the distribution provided ones. + +-- remembered to note \pagerefname when dealing with page notes. + +-- fixed bug in inline toc entries in the manual when there are subitem + that are not typeset and hyperref is in use (\endlinechar=-1 around + the toc), also noted in the manual that this problem may occur and + how to deal with it. + + One might argue that \endlinechar=-1 should be the default thenever + the ToC are being typeset. + +-- Added \SingleSpacing* which does *not* add a \vskip at the + end. Also adjusted \SingleSpacing such that it does not emit a + \vskip when used in the preamble. This fixes + <https://tex.stackexchange.com/q/298904/3929> + + Changed (2018/04/04) o memoir v3.7g diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf Binary files differindex 2528978dcff..38847b78a7b 100644 --- a/Master/texmf-dist/doc/latex/memoir/memman.pdf +++ b/Master/texmf-dist/doc/latex/memoir/memman.pdf diff --git a/Master/texmf-dist/doc/latex/memoir/memman.tex b/Master/texmf-dist/doc/latex/memoir/memman.tex index a86e15feaf9..63d653c5a96 100644 --- a/Master/texmf-dist/doc/latex/memoir/memman.tex +++ b/Master/texmf-dist/doc/latex/memoir/memman.tex @@ -7,9 +7,8 @@ % This work has the LPPL maintenance status "maintained". % Maintainer: Lars Madsen (daleif at math dot au dot dk) % -%\listfiles -\documentclass[10pt,letterpaper,extrafontsizes]{memoir} \listfiles +\documentclass[10pt,letterpaper,extrafontsizes]{memoir} \usepackage{comment} @@ -83,9 +82,9 @@ % \svnidlong % {} -% {$LastChangedDate: 2015-03-05 18:49:59 +0100 (Thu, 05 Mar 2015) $} -% {$LastChangedRevision: 516 $} -% {$LastChangedBy: daleif $} +% {$LastChangedDate: 2018-12-12 12:53:37 +0100 (Wed, 12 Dec 2018) $} +% {$LastChangedRevision: 622 $} +% {$LastChangedBy: daleif@math.au.dk $} @@ -122,13 +121,39 @@ \usepackage[draft]{fixme} \fxsetup{ - layout=marginnote + multiuser, + marginface=\normalfont\tiny, + innerlayout=noinline, + layout=marginnote, } - +\usepackage{tikz,ragged2e} +\makeatletter +% extra feature, vadj=length kan flytte på fxnotes hvis de overlapper +\@fxdefinekey{layout}{vadj}{\def\marginnotevadjust{#1}} + +% endnu mere ekstra feature, kræver tikz og calc tikz lib + +\renewcommand*\FXLayoutMarginNote[3]{% + \tikz[overlay,remember picture]\coordinate (A) at (0,0);% + \marginnote[% + \RaggedLeft% + \rlap{\tikz[overlay,remember picture]\coordinate(C) at (0,0);}% + \@fxuseface{margin}% + \@fxtextstd{#1}{#2}{#3}% + {\tikz[overlay,remember picture,ultra thin,cyan]\draw(A) -| ++(0,-2pt) -|(C);}% + ]{% + \RaggedRight% + \tikz[overlay,remember picture]\coordinate(B) at (0,0);% + \@fxuseface{margin}% + \@fxtextstd{#1}{#2}{#3}% + \tikz[overlay,remember picture,ultra thin,cyan]\draw(A) -| ++(0,-2pt) -|(B);% + }% +} +\makeatother -\begin{document} +\begin{document} %#% extstart input intro.tex @@ -212,8 +237,15 @@ \setlength{\parindent}{0pt} \setlength{\parskip}{\baselineskip} %%\ttfamily -\textcopyright{} 2001 --- 2010 Peter R. Wilson \\ -\textcopyright{} 2011 --- \phantom{2014} Lars Madsen \\ +%\textcopyright{} 2001 --- 2010 Peter R. Wilson \\ +%\textcopyright{} 2011 --- \phantom{2099} Lars Madsen \\ + +\begin{tabular}{@{} l l} + \textcopyright{} 2001\:---\:2010 &Peter R. Wilson \\ + \textcopyright{} 2011\:---\:& Lars Madsen +\end{tabular} + + All rights reserved The Herries Press, Normandy Park, WA. @@ -310,7 +342,29 @@ Manual last changed \svnyear/\svnmonth/\svnday \clearpage \setupparasubsecs \setupmaintoc + +\begingroup + +% important point here: We need \endlineshar=-1 here for the inline +% list of subsections. Why? Beacause we have subsection subsubsection +% subsection, and under hyperref running the l@subsubsection for +% subsubsection, which typesets nothing, ruins our \ignorespaces in +% our redefinition of \l@subsection (it cannot see and ignore the space after the +% \contentsline line for subsubsection). Easiest solution: use +% change \endlinechar +% +% Special thanks to David Carlisle in the tex.stackexchange.com chat +% for suggesting it + + +\endlinechar=-1 + + \tableofcontents + +\endgroup + + \setlength{\unitlength}{1pt} \clearpage \listoffigures @@ -4785,9 +4839,9 @@ code below, and then the result is scaled down. \svnidlong {$Ignore: $} -{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $} -{$LastChangedRevision: 480 $} -{$LastChangedBy: daleif $} +{$LastChangedDate: 2018-09-19 15:47:14 +0200 (Wed, 19 Sep 2018) $} +{$LastChangedRevision: 621 $} +{$LastChangedBy: daleif@math.au.dk $} \chapter{Text and fonts} @@ -5260,7 +5314,7 @@ is usually \emph{highly inadvisable!} for a reasonable effect, as in example~\ref{eg16}. \begin{egsource}{eg16} \begin{center} -\textsc{Des Dames du Temps Jardis} +\textsc{Des Dames du Temps Jadis} \end{center}% \settowidth{\versewidth}{Or yet in a year where they are} \begin{verse}[\versewidth] \begin{itshape} @@ -5282,7 +5336,7 @@ But where are the snows of yesteryear? \begin{egresult}[Sometimes mixed fonts work]{eg16} \begin{center} -\textsc{Des Dames du Temps Jardis} +\textsc{Des Dames du Temps Jadis} \end{center}% \settowidth{\versewidth}{Or yet in a year where they are} \begin{verse}[\versewidth] \begin{itshape} @@ -5660,11 +5714,17 @@ with it at the class level. \PWnote{2009/06/24}{Corrected \cs{SetSingleSpace} to \cs{setSingleSpace}} \begin{syntax} -\cmd{\SingleSpacing} \cmd{\setSingleSpace}\marg{factor} \\ + \cmd{\SingleSpacing}\\ + \cmd{\SingleSpacing*}\\ + \cmd{\setSingleSpace}\marg{factor} \\ \end{syntax} \glossary(SingleSpacing)% {\cs{SingleSpacing}}% - {Declaration restoring normal single spacing (or that set by \cs{setSingleSpace}).} + {Declaration restoring normal single spacing (or that set by + \cs{setSingleSpace}). Note, this added a skip at the end.} +\glossary(SingleSpacing*)% + {\cs{SingleSpacing*}}% + {Same as \cs{SingleSpacing}, but does not add a skip at the end.} \glossary(setSingleSpace)% {\cs{setSingleSpace}\marg{factor}}% {Change the baselineskip by \meta{factor}.} @@ -5679,6 +5739,20 @@ The declaration \cmd{\SingleSpacing} returns everthing to normal, or at 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{note} + \sloppy + \cmd{\SingleSpacing} will also issue a + \cmd{\vskip}\cmd{\baselineskip} at the end (which is ignored if + \cmd{\SingleSpacing} is used in the preamble). This skip makes sure + that comming from \cmd{\DoubleSpacing} to \cmd{\SingleSpacing} still + looks ok. + + But in certain cases, this skip is unwanted. Therefore as of 2018 we + added a \cmd{\SingleSpacing*} that is equal to \cmd{\SingleSpacing} + but \emph{does not} add this skip. +\end{note} + + \begin{syntax} \senv{SingleSpace} ...\eenv{SingleSpace} \\ \senv{Spacing}\marg{factor} ... \eenv{Spacing} \\ @@ -10114,9 +10188,9 @@ normal size by the time subsubsection heads are reached, or before. \svnidlong {$Ignore: $} -{$LastChangedDate: 2014-08-22 09:08:19 +0200 (Fri, 22 Aug 2014) $} -{$LastChangedRevision: 498 $} -{$LastChangedBy: daleif $} +{$LastChangedDate: 2018-09-06 15:05:23 +0200 (Thu, 06 Sep 2018) $} +{$LastChangedRevision: 612 $} +{$LastChangedBy: daleif@math.au.dk $} \chapterstyle{demo3} @@ -11073,8 +11147,9 @@ is in \cmd{\leftmark}. As index\index{index} entries are usually very short, the Index\index{index} is set in two columns\index{column!double}. Unfortunately \ltx's marking mechanism can be very -fragile on twocolumn\index{column!double} pages, but the standard -\Lpack{fixltx2e} package corrects this. +fragile on twocolumn\index{column!double} pages.\footnote{This was + fixed in the \LaTeX{} kernel, but including the functionality from + the \Lpack{fixltx2e} package.} The index\index{index} itself is called by\index{indexing} \begin{lcode} @@ -12629,9 +12704,9 @@ other environments. \svnidlong {$Ignore: $} -{$LastChangedDate: 2015-07-20 13:55:32 +0200 (Mon, 20 Jul 2015) $} -{$LastChangedRevision: 542 $} -{$LastChangedBy: daleif $} +{$LastChangedDate: 2018-09-14 11:13:10 +0200 (Fri, 14 Sep 2018) $} +{$LastChangedRevision: 620 $} +{$LastChangedBy: daleif@math.au.dk $} %%%%%%%%%%%%%%%%%%%%%%%%%% %%\chapterstyle{section} @@ -13526,7 +13601,7 @@ margin\index{margin!left} (\textit{indent} in \fref{fig:ltoc}). It and \texttt{PAGE} is the page number. In the numbered entry the pseudo-code \begin{lcode} -{\cftKpresnum SNUM\cftaftersnum\hfil} +{\cftKpresnum SNUM\cftKaftersnum\hfil} \end{lcode} is typeset within a box of width \lnc{\cftKnumwidth}, see the \cs{...numberlinebox} macros later on. @@ -14405,6 +14480,31 @@ setting each group as a single paragraph (each is normally set with a paragraph to itself). By uncommenting or commenting the noted lines in the code you can change the layout a little. + +\begin{caveat} + We have an interesting caveat regarding \cmd{\setupparasubsecs} if + you are using \Lpack{hyperref} \emph{and} you have subsubsections, + that are not shown in the ToC. You may see some inline subsection + entries showing up as `\dots\ text~15 ,\dots', that is a strange + space appears before the comma. + + This is an artifact due to the way \Lpack{hyperref} wraps itself + around the ToC entries, even the ones that are not typeset, and thus + an end of line space survives. We fix it using \cmd{\endlinechar}: + \begin{lcode} + \begingroup + \endlinechar=-1 + \tableofcontents + \endgroup + \end{lcode} + Note again that it only happen if you have subsubsections with an + inline subsection entry list, \emph{and} you are using + \Lpack{hyperref}. +\end{caveat} + + + + Normally, section titles (and below) are set as individual paragraphs. Effectively the first thing that is done is to end any previous paragraph, and also the last thing is to end the current @@ -14917,9 +15017,9 @@ before the stuff you want to have moved out of, say, a part. \svnidlong {$Ignore: $} -{$LastChangedDate: 2015-02-23 16:56:35 +0100 (Mon, 23 Feb 2015) $} -{$LastChangedRevision: 507 $} -{$LastChangedBy: daleif $} +{$LastChangedDate: 2018-09-06 15:05:23 +0200 (Thu, 06 Sep 2018) $} +{$LastChangedRevision: 612 $} +{$LastChangedBy: daleif@math.au.dk $} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -15590,9 +15690,8 @@ Floats of the same kind are output in definition order, except that a double column\index{float!double column} float may be output before a later single column\index{float!single column} float of the same kind, or -\textit{vice-versa}\footnote{This little quirk -is fixed by the \Lpack{fixltx2e} package, at least for tables and figures. -The package is part of a normal \ltx\ distribution.}. +\textit{vice-versa}\footnote{As of 2015 this has been fixed in the + \LaTeX{} kernel.}. 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 @@ -17770,9 +17869,9 @@ package can be used with the class, but there are a few caveats: \svnidlong {$Ignore: $} -{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $} -{$LastChangedRevision: 442 $} -{$LastChangedBy: daleif $} +{$LastChangedDate: 2018-09-06 15:05:23 +0200 (Thu, 06 Sep 2018) $} +{$LastChangedRevision: 612 $} +{$LastChangedBy: daleif@math.au.dk $} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -17800,6 +17899,27 @@ environments. These are based partly on a merging of the Much of the material in this chapter strongly reflects the documentation of these packages. +\begin{note} + As of September 2018: The \Lpack{array}, \Lpack{delarray}, + \Lpack{tabularx} and \Lpack{dcolumn} packages are no longer embedded + into the class, but rather being autoloaded from the \LaTeX\ + installation.\footnote{As the embedded versions were more or less + carbon copies, it makes much more sense to let the \LaTeX-team + maintain them, than us having to replace the embedded copy each + time they are updated or bug fixed.} As the embededed versions + were just carbon copies,\footnote{With edited error messages.} we + get the same result but just loading the packages, with less + maintenance. Plus these packages are part of the \LaTeX{} core + packages and thus is available in all \LaTeX{} installations. + + We have kept the documentation we had written for the manual (and + updated it slightly), but refer to \cite{ARRAY}, \cite{DELARRAY}, \cite{TABULARX} and + \cite{DCOLUMN} for the 100\% up to date documentation. +\end{note} + +\fancybreak{} + + Additionally, new kinds of tabular environments are also provided. @@ -17855,42 +17975,64 @@ are listed in \tref{tab:tabpream}. \centering \caption{The array and tabular preamble options.} \label{tab:tabpream} \setlength{\extrarowheight}{1pt} - \begin{tabular}{cp{9cm}} \toprule - \texttt{l} & Left adjusted column. \\ - \texttt{c} & Centered adjusted column. \\ - \texttt{r} & Right adjusted column. \\ - \texttt{p}\marg{width} & Equivalent to \verb?\parbox[t]?\marg{width}. \\ - \texttt{m}\marg{width} & Defines a column of width \meta{width}. - Every entry will be centered in proportion to - the rest of the line. It is somewhat like - \cmd{\parbox}\marg{width}. \\ - \texttt{b}\marg{width} & Coincides with \verb?\parbox[b]?\marg{width}. \\ - \texttt{>}\marg{decl} & Can be used before an \texttt{l}, \texttt{r}, - \texttt{c}, \texttt{p}, \texttt{m} or a - \texttt{b} option. It inserts \meta{decl} - directly in front of the entry of the column. - \\ - \texttt{<}\marg{decl} & Can be used after an \texttt{l}, \texttt{r}, - \texttt{c}, \verb?p{..}?, \verb?m{..}? or a - \verb?b{..}? - option. It inserts \meta{decl} right - after the entry of the column. \\ - \texttt{|} & Inserts a vertical line. The distance between - two columns will be enlarged by the width of - the line. \\ - \texttt{@}\marg{decl} & Suppresses inter-column space and inserts - \meta{decl} instead. \\ - \texttt{!}\marg{decl} & Can be used anywhere and corresponds with the - \texttt{|} option. The difference is that - \meta{decl} is inserted instead of a - vertical line, so this option doesn't - suppress the normally inserted space between - columns in contrast to \verb?@{...}?.\\ - \texttt{*}\marg{num}\marg{opts} & Equivalent to \meta{num} copies of - \meta{opts} \\ - \texttt{D}\marg{ssep}\marg{osep}\marg{places} & Column entries aligned - on a `decimal point' \\ - \bottomrule + \begin{tabular}{cp{9cm}} \toprule \texttt{l} & Left adjusted + column. + \\ + \texttt{c} & Centered adjusted column. + \\ + \texttt{r} & Right adjusted column. + \\ + \texttt{p}\marg{width} & Equivalent to + \verb?\parbox[t]?\marg{width}. + \\ + \texttt{m}\marg{width} & Defines a column of width \meta{width}. + Every entry will be centered in proportion to the rest of the + line. It is somewhat like \cmd{\parbox}\marg{width}. + \\ + \texttt{b}\marg{width} & Coincides with + \verb?\parbox[b]?\marg{width}. + \\ + \texttt{>}\marg{decl} & Can be used before an \texttt{l}, + \texttt{r}, \texttt{c}, \texttt{p}, \texttt{m} or a \texttt{b} + option. It inserts \meta{decl} directly in front of the entry of + the column. + \\ + \texttt{<}\marg{decl} & Can be used after an \texttt{l}, + \texttt{r}, \texttt{c}, \verb?p{..}?, \verb?m{..}? or a + \verb?b{..}? option. It inserts \meta{decl} right after the + entry of the column. + \\ + \texttt{|} & Inserts a vertical line. The distance between two + columns will be enlarged by the width of the line. + \\ + \texttt{@}\marg{decl} & Suppresses inter-column space and + inserts \meta{decl} instead. + \\ + \texttt{!}\marg{decl} & Can be used anywhere and corresponds + with the \texttt{|} option. The difference is that \meta{decl} + is inserted instead of a vertical line, so this option doesn't + suppress the normally inserted space between columns in contrast + to \verb?@{...}?. + \\ + \texttt{*}\marg{num}\marg{opts} & Equivalent to \meta{num} + copies of \meta{opts} + \\ + \texttt{w}\marg{align}\marg{width} & \raggedright\arraybackslash + \emph{New in \Lpack{array} v2.4h, 2018.} Here \meta{align} is + one of \texttt{l}, \texttt{c} or \texttt{r}. The construction + corresponds to every cell in the column being formated as + \verb|\makebox|\oarg{width}\oarg{align}\marg{cell}. It will + silently overprint if the contents are wider than \meta{width}. + \\ + + \texttt{W}\marg{align}\marg{width} & \emph{New in in \Lpack{array} + v2.4h, 2018.} Similar to \texttt{w}, but issues an overfull warning if + the contents is too wide. + \\ + \texttt{D}\marg{ssep}\marg{osep}\marg{places} & Column entries aligned + on a `decimal point' + \\ + \bottomrule \end{tabular} % \end{center} \end{adjustwidth} @@ -17989,8 +18131,19 @@ for example to show different spacing effects. \end{itemize} +\goodbreak + \subsection{D column specifiers} \label{sec:dcolumns} + \begin{recommended} + As an alternative to the \texttt{D} column (through using the + \Lpack{dcolumn} package), you can use the \Lpack{siunitx} package + which have the added bonus of many more configuration and + formatting features. See \cite{SIUNITX} for details. + \end{recommended} + + + In financial tables dealing with pounds and pence or dollars and cents, column entries should be aligned on the separator between the numbers. The \texttt{D} @@ -19741,9 +19894,9 @@ illustrate these points. \svnidlong {$Ignore: $} -{$LastChangedDate: 2015-05-11 16:20:03 +0200 (Mon, 11 May 2015) $} -{$LastChangedRevision: 532 $} -{$LastChangedBy: daleif $} +{$LastChangedDate: 2018-09-19 15:47:14 +0200 (Wed, 19 Sep 2018) $} +{$LastChangedRevision: 621 $} +{$LastChangedBy: daleif@math.au.dk $} \chapter{Page notes} \label{chap:mnotes} @@ -19875,19 +20028,23 @@ 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. + + +\LMnote{2018/09/19}{Removed \cs{feetatbottom} from the manual. It does not + actually do anything. The footnotes are always at the bottom} +% \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. @@ -21406,7 +21563,8 @@ that we can refer back to its page, and (2) \cmd{\pageinnotes} calls \begin{syntax} \cmd{\pageinnotes}\marg{auto generated note label key}\\ \cmd{\printpageinnotes}\marg{auto generated note label key}\\ -\cmd{\printpageinnoteshyperref}\marg{auto generated note label key} +\cmd{\printpageinnoteshyperref}\marg{auto generated note label key}\\ +\cmd{\pagerefname} \end{syntax} \glossary(pageinnotes)% {\cs{pageinnotes}\marg{pagenum}}% @@ -21419,6 +21577,9 @@ that we can refer back to its page, and (2) \cmd{\pageinnotes} calls {Prints an endnote's page reference number whenever the \protect\Lpack{hyperref} package is used, it will include a hyperlink back to the page in question.}% +\glossary(pagerefname)% +{\cs{pagerename}}% +{Holds the name prefix when referring to a page number, defaults to \texttt{page}.}% Default definitions \begin{lcode} \newcommand*{\printpageinnotes}[1]{% @@ -31717,9 +31878,9 @@ than Archibald Smythe University will permit. \svnidlong {$Ignore: $} -{$LastChangedDate: 2015-07-08 09:49:37 +0200 (Wed, 08 Jul 2015) $} -{$LastChangedRevision: 536 $} -{$LastChangedBy: daleif $} +{$LastChangedDate: 2018-09-06 15:05:23 +0200 (Thu, 06 Sep 2018) $} +{$LastChangedRevision: 612 $} +{$LastChangedBy: daleif@math.au.dk $} \chapter{Packages and macros} @@ -31750,6 +31911,11 @@ you do not have them please consider getting them, are: of floats\index{float} on a twocolumn\index{column!double} page and ensures the correct marking on a twocolumn\index{column!double} page. + + Note that as of 2015, the functionality of this package has been + merged into the \LaTeX{} kernel. Loading this package does nothing. + + \item \Lpack{alltt}~\cite{ALLTT} is a basic package which provides a verbatim-like environment but \verb?\?, \verb?{?, and \verb?}? have their usual meanings (i.e., \ltx\ commands are not disabled). @@ -31971,6 +32137,10 @@ The \theclass\ memoir class has several features that involve a \emph{style} and it provide several of these styles. This chapter is used to showcase these styles. +\begingroup +% because of hyperref warnings + + \section{Chapter styles} \label{sec:chapter-styles} @@ -32279,6 +32449,8 @@ on recto pages. \index{chapterstyle|)} +\endgroup + %#% extend %#% extstart include sniplets.tex @@ -38169,10 +38341,10 @@ access CTAN is available at \url{http://www.tug.org}. \end{comment} %%% keep -\bibitem[Car94]{DELARRAY} +\bibitem[Car14]{DELARRAY} David Carlisle. \newblock \emph{The delarray package}. - \newblock March, 1994. + \newblock October, 2014. \newblock (Available from CTAN via \CTANurl{/macros/latex/required/tools/}) @@ -38210,10 +38382,11 @@ access CTAN is available at \url{http://www.tug.org}. \end{comment} %%% keep -\bibitem[Car99]{TABULARX} +\LMnote{2018/09/06}{Updated year} +\bibitem[Car16]{TABULARX} David Carlisle. \newblock \emph{The tabularx package}. - \newblock January, 1999. + \newblock February, 2016. \newblock (Available from CTAN via \CTANurl{/macros/latex/required/tools/}) @@ -38226,7 +38399,8 @@ access CTAN is available at \url{http://www.tug.org}. \CTANurl{/macros/latex/required/graphics/}) %%% keep -\bibitem[Car01]{DCOLUMN} +\LMnote{2018/09/06}{updated year} +\bibitem[Car14]{DCOLUMN} David Carlisle. \newblock \emph{The dcolumn package}. \newblock May, 2001. @@ -38423,10 +38597,11 @@ I.~D. Faux and M.~J. Pratt. %%% keep -\bibitem[Fea03]{BOOKTABS} +\LMnote{2018/09/06}{Updated year} +\bibitem[Fea16]{BOOKTABS} Simon Fear. \newblock \emph{Publication quality tables in LaTeX}. - \newblock March, 2003. + \newblock April, 2016. \newblock (Available from CTAN via \CTANurl{/macros/latex/contrib/booktabs}) @@ -38720,17 +38895,18 @@ I.~D. Faux and M.~J. Pratt. \end{comment} %%% keep -\bibitem[Mit98]{MULTICOL} +\bibitem[Mit18]{MULTICOL} Frank Mittelbach. \newblock \emph{An environment for multicolumn output}. - \newblock January, 1998. + \newblock April, 2018. \newblock (Available from CTAN (the \texttt{multicol} package) via \CTANurl{/macros/latex/required/tools/}) -%%% keep -\bibitem[MC98]{ARRAY} +%%keep +\LMnote{2018/09/06}{Updated year} +\bibitem[MC18]{ARRAY} Frank Mittelbach and David Carlisle. - \newblock \emph{A new implementation of LaTeX's tabular and array environment}. \newblock May, 1998. + \newblock \emph{A new implementation of LaTeX's tabular and array environment}. \newblock May, 2018. \newblock (Available from CTAN (the \texttt{array} package) via \CTANurl{/macros/latex/required/tools/}) @@ -38738,7 +38914,9 @@ I.~D. Faux and M.~J. Pratt. \bibitem[MC00]{FIXLTX2E} Frank Mittelbach and David Carlisle. \newblock \emph{The fixltx2e package}. - \newblock September, 2000. + \newblock December, 2016. + \newblock As of 2015 the functionality of this package has been + merged with the \LaTeX{} kernel. \newblock (Available from CTAN via \CTANurl{/macros/latex/base/}) @@ -39325,6 +39503,16 @@ Peter Wilson. \newblock \emph{A Rumour of Humour: A scientist's commonplace book}. \newblock To be published. + +\bibitem[Wri18]{SIUNITX} + Joseph Wright. + \newblock \emph{Siunitx — A comprehensive (SI) units package} + \newblock May, 2018. + \newblock (Available from CTAN via \CTANurl{/macros/latex/contrib/siunitx}) + + + + \begin{comment} \bibitem[Wis03]{WISHART03} David Wishart. diff --git a/Master/texmf-dist/doc/latex/memoir/memsty.sty b/Master/texmf-dist/doc/latex/memoir/memsty.sty index bf2c27748cd..a59bd4d4556 100644 --- a/Master/texmf-dist/doc/latex/memoir/memsty.sty +++ b/Master/texmf-dist/doc/latex/memoir/memsty.sty @@ -113,26 +113,29 @@ \renewcommand*{\cftbookformatpnum}[1]{% \hbox to\unitlength{{\cftbookpagefont ##1}}}} + \newcommand*{\setupparasubsecs}{% - \let\oldnumberline\numberline - \renewcommand*{\cftsubsectionfont}{\itshape} - \renewcommand*{\cftsubsectionpagefont}{\itshape} - \renewcommand{\l@subsection}[2]{ - \ifnum\c@tocdepth > 1\relax + \let\oldnumberline\numberline% + \renewcommand*{\cftsubsectionfont}{\itshape}% + \renewcommand*{\cftsubsectionpagefont}{\itshape}% + \renewcommand{\l@subsection}[2]{% + \ifnum\c@tocdepth > 1\relax% \def\numberline####1{\textit{####1}~}% - \leftskip=\cftsubsectionindent - \rightskip=\@tocrmarg + \leftskip=\cftsubsectionindent% + \rightskip=\@tocrmarg% %% \advance\rightskip 0pt plus \hsize % uncomment this for raggedright %% \advance\rightskip 0pt plus 2em % uncomment this for semi-ragged - \parfillskip=\fill - \ifhmode ,\ \else\noindent\fi - \ignorespaces + \parfillskip=\fill% + \ifhmode ,\ \else\noindent\fi% + \ignorespaces% {\cftsubsectionfont ##1}~{\cftsubsectionpagefont##2}% - \let\numberline\oldnumberline\ignorespaces + \let\numberline\oldnumberline\ignorespaces% \fi}} + \AtEndDocument{\addtocontents{toc}{\par}}%%% OK + \newcommand*{\setupmaintoc}{% \renewcommand{\contentsname}{Contents} \let\changetocdepth\oldchangetocdepth @@ -524,6 +527,7 @@ chapterstyle. It is one of several styles that come as part of the \LMnote{2011/05/25}{I've moved the demochaps to an appendix, so \cs{@chapapp} need a little redoing} \newenvironment{demochap}[2][\onelineskip]{% +% \typeout{Chapter value going in: \thechapter} \savechapcnt=\c@chapter \saveseccnt=\c@section \savesubseccnt=\c@subsection @@ -539,7 +543,7 @@ chapterstyle. It is one of several styles that come as part of the \begingroup %% \hrule \let\@chapapp\chaptername% such that appendix does not disturb - \renewcommand{\theHchapter}{\thepage.\thechapter} +% \renewcommand{\theHchapter}{\thepage.\thechapter.showcase} \renewcommand\thechapter{\arabic{chapter}} \vspace*{#1} \chapterstyle{#2} @@ -548,6 +552,7 @@ chapterstyle. It is one of several styles that come as part of the \renewcommand*{\addcontentsline}[3]{} \renewcommand*{\thispagestyle}[1]{} \renewcommand*{\markboth}[2]{} + \let\refstepcounter\stepcounter \chapter{Demonstration of the #2 chapter style} \chaptext{#2} \vspace{\onelineskip} @@ -559,9 +564,9 @@ chapterstyle. It is one of several styles that come as part of the \global\demochapcnt=0\relax \fi \c@chapter=\savechapcnt - \advance\c@chapter\m@ne - \renewcommand{\theHchapter}{\thepage.\thechapter-\the\demochapcnt.\thesheetsequence} - \refstepcounter{chapter}% +% \advance\c@chapter\m@ne +% \renewcommand{\theHchapter}{\thepage.\thechapter-\the\demochapcnt.\thesheetsequence.showcase} +% \refstepcounter{chapter}% % \stepcounter{chapter} \begin{center} \caption{The #2 chapterstyle}\label{dc#2} @@ -572,6 +577,7 @@ chapterstyle. It is one of several styles that come as part of the }{%\gdef\theHchapter{\thechapter} \end{figure} \counterwithin{figure}{chapter} + \global\c@chapter=\savechapcnt \global\c@section=\saveseccnt \global\c@subsection=\savesubseccnt \global\c@footnote=\saveftncnt} diff --git a/Master/texmf-dist/doc/latex/memoir/setpage-example.pdf b/Master/texmf-dist/doc/latex/memoir/setpage-example.pdf Binary files differnew file mode 100644 index 00000000000..52845755698 --- /dev/null +++ b/Master/texmf-dist/doc/latex/memoir/setpage-example.pdf |