diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-19 22:54:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-19 22:54:48 +0000 |
commit | 63653db196b6e47d4fc631c9e850c2b31478fe6f (patch) | |
tree | e4b5f86537eb826d53e1feb9c07fe84454511316 /Master/texmf-dist/source/latex/memoir | |
parent | 3127e51522e361c647124aed8a4883caff20a9ed (diff) |
memoir 3.6g (20sep10)
git-svn-id: svn://tug.org/texlive/trunk@19810 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/memoir')
-rw-r--r-- | Master/texmf-dist/source/latex/memoir/memoir.dtx | 356 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/memoir/mempatch.dtx | 5 |
2 files changed, 279 insertions, 82 deletions
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. % |