summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/memoir/memoir.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/memoir/memoir.dtx')
-rw-r--r--Master/texmf-dist/source/latex/memoir/memoir.dtx50
1 files changed, 42 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index 57615dbf4c8..48b374d2f88 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{29391}
+% \CheckSum{29407}
%
% \changes{v0.1}{2001/05/20}{First public alpha release}
% \changes{v0.2}{2001/06/03}{First beta release}
@@ -94,6 +94,10 @@
% \changes{v1.618033988}{2010/02/16}{bumped version to v1.618033988}
% \changes{v1.618033988b}{2010/02/17}{fixed typo that broke \cs{feetbelowfloat}}
% \changes{v1.618033988c}{2010/02/20}{fixed sporadic space in \cs{@footnotetext}}
+% \changes{v1.618033988d}{2010/02/26}{fixed bug in
+% \cs{marginparmargin}\{left\} in twoside mode}
+%
+% \changes{v3.6}{2010/04/19}{Reversioned memoir to a more suitable scheme}
%
% \def\dtxfile{memoir.dtx}
%
@@ -133,6 +137,7 @@
% \def\fileversion{v1.618033988} \def\filedate{2010/02/16}
% \def\fileversion{v1.618033988b} \def\filedate{2010/02/17}
% \def\fileversion{v1.618033988c} \def\filedate{2010/02/20}
+% \def\fileversion{v3.6} \def\filedate{2010/04/19}
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Source code\thanks{This
% file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -353,10 +358,14 @@
% \end{macrocode}
%
% ^^A Use the Golden Section as the version number (1.6180339887 4989484820 4586834365)
+% \changes{v3.6}{2010/04/19}{Not any more, apparently people does not
+% know the numeric value of the golden ration very well}
+%
+%
% Announce the name, option files and version for LaTeX2e files:
% \begin{macrocode}
%<class>\ProvidesClass{memoir}%
-%<class> [2010/02/20 v1.618033988c configurable book, report, article document class]
+%<class> [2010/04/19 v3.6 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}%
@@ -23707,28 +23716,53 @@
% away in the kernel's \texttt{output} routine. A couple of minor changes are made
% to the kernel code. The first is at the beginning where I have added
% the \cs{checkoddpage} page checking code.
+% \changes{v1.618033988d}{2010/02/26}{fixed twoside -> left marrgin
+% bug, reported by Frank Wikstr\"om, on private email}
+% In the new margin placement syntax, there is a new syntax: always
+% left, in twoside mode. This cannot be implemented using the normal
+% marginpar placement controls, so we have to add our own.
% \begin{macrocode}
\def\@addmarginpar{%
\checkoddpage
% \end{macrocode}
-% Continue with the kernel code.
+% Continue with the kernel code. The twocolumn stuff in the new syntax
+% scheme is the same as in the kernel.
% \begin{macrocode}
\@next\@marbox\@currlist{\@cons\@freelist\@marbox
\@cons\@freelist\@currbox}\@latexbug\@tempcnta\@ne
\if@twocolumn
\if@firstcolumn \@tempcnta\m@ne \fi
\else
- \if@mparswitch
+% \end{macrocode}
+% \changes{v1.618033988d}{2010/02/26}{added as a part of the above
+% mentioned fix}
+% Here we add the new stuff. We make use of the fact that we have
+% hidden all the page checking in \verb?\m@mwhich@margin?, and we only
+% fire it of if we know \verb?\marginparmargin? have been used (via
+% \verb?\ifm@msetmp?).
+% \begin{macrocode}
+ \ifm@msetmp%
+ % \@tempcnta > 0 => right side of page
+ % \@tempcnta < 0 => left side of page
+ \m@mwhich@margin{\m@mmpar@margin}% set left or right margin
+ \ifmemtortm%
+ \@tempcnta\@ne\relax%
+ \else%
+ \@tempcnta\m@ne\relax%
+ \fi%
+ \else%
+ \if@mparswitch
% \end{macrocode}
% The next line, reading \\
% \verb?\ifodd\c@page \else\@tempcnta\m@ne \fi? \\
% is where the odd/even page checking is done in the kernel code. I
% replace it with my code, and then continue with the kernel.
% \begin{macrocode}
- \ifoddpage \else \@tempcnta\m@ne \fi
- \fi
- \if@reversemargin \@tempcnta -\@tempcnta \fi
- \fi
+ \ifoddpage \else \@tempcnta\m@ne \fi%
+ \fi%
+ \if@reversemargin \@tempcnta -\@tempcnta \fi%
+ \fi%
+ \fi%
\ifnum\@tempcnta <\z@ \global\setbox\@marbox\box\@currbox \fi
\@tempdima\@mparbottom
\advance\@tempdima -\@pageht