diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/memoir/memoir.dtx')
| -rw-r--r-- | Master/texmf-dist/source/latex/memoir/memoir.dtx | 79 |
1 files changed, 56 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx index 6e17791119f..0be3c499d98 100644 --- a/Master/texmf-dist/source/latex/memoir/memoir.dtx +++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx @@ -18,7 +18,7 @@ % This work consists of the files listed in the README file. % % \fi -% \CheckSum{28432} +% \CheckSum{28463} % % \changes{v0.1}{2001/05/20}{First public alpha release} % \changes{v0.2}{2001/06/03}{First beta release} @@ -86,6 +86,7 @@ % main function out of \cs{newlistof}} % \changes{v1.61803398}{2009/09/10}{fixed bug with upquote} % \changes{v1.61803398b}{2009/09/21}{fixed typo} +% \changes{v1.61803398c}{2009/11/13}{fixed typo} % % \def\dtxfile{memoir.dtx} % @@ -120,6 +121,7 @@ % \def\fileversion{v1.6180339g} \def\filedate{2009/07/13} % \def\fileversion{v1.61803398} \def\filedate{2009/09/10} % \def\fileversion{v1.61803398b} \def\filedate{2009/09/21} +% \def\fileversion{v1.61803398c} \def\filedate{2009/11/17} % \title{The LaTeX \Lpack{memoir} class for configurable book % typesetting: Source code\thanks{This % file (\texttt{\dtxfile}) has version number \fileversion, last revised @@ -343,7 +345,7 @@ % Announce the name, option files and version for LaTeX2e files: % \begin{macrocode} %<class>\ProvidesClass{memoir}% -%<class> [2009/09/21 v1.61803398b configurable book, report, article document class] +%<class> [2009/11/17 v1.61803398c 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}% @@ -6738,9 +6740,11 @@ % \cs{abnormalparskip}\marg{length} sets \cs{parskip} to \meta{length}. % \cs{nonzeroparskip} sets \cs{parskip} to a non-zero value that might be % not too bad (any non-zero \cs{parskip} is not good). +% \changes{v1.61803398c}{2009/11/13}{\cs{parskip} was set to \cs{z@}, +% thus the stretch was missing, this broke \cs{flushbottom}} % \begin{macrocode} \newcommand*{\traditionalparskip}{% - \parskip \z@ + \setlength\parskip{0\p@ \@plus \p@} \m@mnzpskipfalse} \newskip\m@mabparskip \newcommand*{\abnormalparskip}[1]{% @@ -8972,6 +8976,8 @@ % Posted to CTT on 2003/12/09, \textit{New chapter style: chapter vs chapter*} % by Lars Madsen. % This requires the \Lpack{graphicx} package, +% \changes{v1.61803398c}{2009/11/15}{Updated to provide a better +% unnumbered look} % \begin{macrocode} \makechapterstyle{madsen}{% requires graphicx package \chapterstyle{default} @@ -8986,6 +8992,10 @@ \chapnamefont\bfseries\sffamily\thechapter} }% }% + \renewcommand*{\printchapternonum}{% + \chapnamefont \phantom{\printchaptername \chapternamenum \printchapternum} + \afterchapternum % + }% \renewcommand*{\afterchapternum}{% \par\hspace{1.5cm}\hrule\vskip\midchapskip}} @@ -26729,11 +26739,33 @@ % The trimming marks used for mid-side display. % \changes{v1.3}{2002/10/10}{Added \cs{tmarktm}, \cs{tmarkml}, \cs{tmarkmr} % and \cs{tmarkbm}} +% \changes{v1.6180339c}{2009/11/13}{Fill in these four macros. Easier +% for users to define them to do nothing, than coming up with the code} % \begin{macrocode} -\newcommand*{\tmarktm}{} -\newcommand*{\tmarkml}{} -\newcommand*{\tmarkmr}{} -\newcommand*{\tmarkbm}{} +\newcommand*{\tmarktm}{% + \begin{picture}(0,0)% + \unitlength 1mm + \thinlines + \put(0,2){\line(0,1){10}} + \end{picture}} +\newcommand*{\tmarkml}{% + \begin{picture}(0,0)% + \unitlength 1mm + \thinlines + \put(-2,0){\line(-1,0){10}} + \end{picture}} +\newcommand*{\tmarkmr}{% + \begin{picture}(0,0)% + \unitlength 1mm + \thinlines + \put(2,0){\line(1,0){10}} + \end{picture}} +\newcommand*{\tmarkbm}{% + \begin{picture}(0,0)% + \unitlength 1mm + \thinlines + \put(0,-12){\line(0,1){10}} + \end{picture}} % \end{macrocode} % \end{macro} @@ -26936,6 +26968,8 @@ % (mempatch v4.5)} % \changes{v1.6180339f}{2009/06/24}{Added Dan Luecking's fix to % \cs{mem@shippii} to cater for another merry hyperref change!} +% \changes{v1.6180339c}{2009/11/13}{Replaced Dans fix with a fix from +% Heiko Oberdiek} % \begin{macrocode} \newcommand*{\mem@shipi}{% \ifvoid\@cclv\expandafter\aftergroup\fi\mem@shipii} @@ -26945,25 +26979,24 @@ \else \ifshowtrims % \end{macrocode} -% On 2009/05/02 Dan Luecking (ctt \emph{Re: recent hyperref error (e.g. -% v6.78q not v6.78f) with memoir[showtrims]}) found that \texttt{hpdftex.def} -% included the code: +% Heiko Oberdiek responded to a problem reported by Rolf +% Niepraschk. The earlier implementation might cause the output box to +% be shifted. Heikos explanation (in response to the line +% \verb?\mem@oldshipout\vbox{\trimmarks\ifvbox\@cclv\unvbox\else\box\fi\@cclv}?) : % \begin{verbatim} -% \def\Hy@FixNotFirstPage{% -% \gdef\Hy@FixNotFirstPage{% -% \setbox\AtbeginShipoutBox=\hbox{% -% \copy\AtBeginShipoutBox -% }% -% }% -% } -% \AtBeginShipout{\Hy@FixNotFirstPage} +% In vertical mode (\mem@oldshipout\vbox{...}) TeX puts +% interline skip between two boxes (\trimmarks and \@cclv), +% here \linekskip (1pt) is put inbetween causing the +% shift downwards. % \end{verbatim} -% which turns box 255 (\cs{@cclv}) into an hbox whereas memoir expected a vbox -% (which has worked happily for many years). -% Dan suggested replacing my original \\ -% \verb?\mem@oldshipout\vbox{\trimmarks\unvbox\@cclv}? as below: +% Heiko also provided the fix used below. Actually Heikos fix also +% fixes a problem that might cause glue settings to disappear. % \begin{macrocode} - \mem@oldshipout\vbox{\trimmarks \ifvbox \@cclv \unvbox \else \box \fi \@cclv}% + \mem@oldshipout\vbox{% + \trimmarks + \nointerlineskip + \box\@cclv + }% \else \mem@oldshipout\box\@cclv \fi |