memoir (7mar11)

git-svn-id: svn://tug.org/texlive/trunk@21638 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 131 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index e8d9451476f..f289e82b564 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -42,6 +42,19 @@ o Backmatter:
     Bibliography, indexes                               ~  50 pages
 
 
+Changed (2011/03/06)
+
+o memoir v3.6j
+
+-- fixed typo in trimmarks
+-- changed \chapter (and chapter like titles), \section's, \part 
+   and \book such that a non-zero \parskip no longer interfer
+   with the title layout.
+-- yet another fix for the reimplemented page notes. Now 'x    x' 
+   only result in one line break not several.
+
+
+
 Changed (2011/02/18)
 
 o memoir v3.6i
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf
index 863e1fce9fc..0d0142bbc72 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 a1fe4b01ce2..8b912a8607f 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.tex
+++ b/Master/texmf-dist/doc/latex/memoir/memman.tex
@@ -4513,8 +4513,8 @@ effect.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2010-09-19 13:11:31 +0200 (Sun, 19 Sep 2010) $}
-{$LastChangedRevision: 275 $}
+{$LastChangedDate: 2011-03-06 19:39:20 +0100 (Sun, 06 Mar 2011) $}
+{$LastChangedRevision: 360 $}
 {$LastChangedBy: daleif $}
 
 
@@ -5326,7 +5326,10 @@ throughout a paragraph. The value  may change
 depending on the size of the current font. More precisely, the 
 \cmd{\baselineskip} depends on the font being used at the \emph{end} of 
 the paragraph. The class also provides the length \lnc{\onelineskip}
-which is the default leading for the normal body font. As far as the class
+which is the default leading for the normal body font.\footnote{That
+  is \cmd{\onelineskip} is set in the \text{memX.clo} file
+  corresponding to the font size class option. For \texttt{10pt}, the
+  size is set via \texttt{mem10.clo}.} As far as the class
 is concerned this is a constant value; that is, unlike \lnc{\baselineskip},
 it never alters \lnc{\onelineskip}. You can use (fractions) of 
 \lnc{\onelineskip} to specify vertical spaces in terms of normal text 
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index 091c8f293ee..1eee2800c4e 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -19,7 +19,7 @@
 % This work consists of the files listed in the README file.
 % 
 % \fi
-% \CheckSum{30116}
+% \CheckSum{30174}
 %
 % \changes{v0.1}{2001/05/20}{First public alpha release}
 % \changes{v0.2}{2001/06/03}{First beta release}
@@ -105,6 +105,7 @@
 % \changes{v3.6g}{2010/09/19}{Maintenance}
 % \changes{v3.6h}{2011/02/13}{Various things}
 % \changes{v3.6i}{2011/02/18}{Two bug fixes}
+% \changes{v3.6j}{2011/03/06}{Bug fixes}
 %
 % \def\dtxfile{memoir.dtx}
 %
@@ -151,6 +152,7 @@
 % \def\fileversion{v3.6g}          \def\filedate{2010/09/19}
 % \def\fileversion{v3.6h}          \def\filedate{2011/02/13}
 % \def\fileversion{v3.6i}          \def\filedate{2011/02/18}
+% \def\fileversion{v3.6j}          \def\filedate{2011/03/06}
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Source code\thanks{This
 %        file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -380,7 +382,7 @@
 %    Announce the name, option files and version for LaTeX2e files:
 %    \begin{macrocode}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2011/02/18 v3.6i configurable book, report, article document class]
+%<class>  [2011/03/06 v3.6j 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}%
@@ -8412,10 +8414,13 @@
   \fi
 %    \end{macrocode}
 % Empty the marks, center the title on the page, and set the normal font.
+% \changes{v3.6j}{2011/03/03}{Set \cs{parskip} to zero, such that a
+% non-zero \cs{parskip} does not interfer with the title layout}
 %    \begin{macrocode}
   \bookpagemark{#1}%
   {\centering
    \interlinepenalty \@M
+   \parskip\z@
    \normalfont
 %    \end{macrocode}
 % Print the number, if there is one, then the title below. Macro \cs{@endbook}
@@ -8435,6 +8440,7 @@
 % \cs{@sbook}\marg{long} formats the title of a \cs{book*} book. It is 
 % simpler than \cs{@book} because there is no  number to print.
 % \changes{v1.4}{2003/11/16}{Added \cs{M@gettitle} to \cs{@sbook}}
+% \changes{v3.6j}{2011/03/03}{Set \cs{parskip} to zero here as well}
 %    \begin{macrocode}
 \long\def\@sbook#1{%
   \M@gettitle{#1}%
@@ -8442,6 +8448,7 @@
   \membookstarinfo{#1}%
   {\centering
    \interlinepenalty \@M
+   \parskip\z@
    \normalfont
    \printbooktitle{#1}\par}%
   \@endbook}
@@ -8630,10 +8637,14 @@
   \fi
 %    \end{macrocode}
 % Empty the marks, center the title on the page, and set the normal font.
+% \changes{v3.6j}{2011/03/03}{Set \cs{parskip} to zero inside the
+% group, such that a non-zero \cs{parskip} does not interfer with the
+% title layout}
 %    \begin{macrocode}
   \partmark{#1}%
   {\centering
    \interlinepenalty \@M
+   \parskip\z@
    \normalfont
 %    \end{macrocode}
 % Print the number, if there is one, then the title below. Macro \cs{@endpart}
@@ -8653,6 +8664,7 @@
 % \cs{@spart}\marg{long} formats the title of a \cs{part*} part. It is 
 % simpler than \cs{@part} because there is no  number to print.
 % \changes{v1.4}{2003/11/16}{Added \cs{M@gettitle} to \cs{@spart}}
+% \changes{v3.6j}{2011/03/03}{Set \cs{parskip} to zero here as well}
 %    \begin{macrocode}
 \long\def\@spart#1{%
   \M@gettitle{#1}%
@@ -8660,6 +8672,7 @@
   \mempartstarinfo{#1}%
   {\centering
    \interlinepenalty \@M
+   \parskip\z@
    \normalfont
    \printparttitle{#1}\par}%
   \@endpart}
@@ -8960,10 +8973,13 @@
 % \changes{v1.3}{2002/10/10}{Added \cs{printchapternonum} to 
 %                            \cs{@makechapterhead}}
 % \changes{v1.61803398}{2009/07/17}{Added bidi support to \cs{@makechapterhead}}
+% \changes{v3.6j}{2011/03/01}{Set \cs{parskip} to zero such that a
+% non-zero \cs{parskip} to not interfer with the placement of the title}
 %    \begin{macrocode}
 \def\@makechapterhead#1{%
   \chapterheadstart%  \vspace*{50\p@}%
   {%\parindent \z@ \raggedright \normalfont
+   \parskip \z@
    \parindent \z@ \memRTLraggedright \normalfont
 %    \end{macrocode}
 % If there is a number, typeset it, otherwise call \cs{printchapternonum}.
@@ -9126,10 +9142,13 @@
 % \changes{v1.3}{2002/10/10}{Added \cs{printchapternonum} to 
 %                            \cs{@makeschapterhead}}
 % \changes{v1.61803398}{2009/07/17}{Added bidi support to \cs{@makeschapterhead}}
+% \changes{v3.6j}{2011/0301}{Made sure the \cs{parskip} is zero inside
+% the title area, otherwise placement might come out wrong}
 %    \begin{macrocode}
 \def\@makeschapterhead#1{%
   \chapterheadstart
   {%\parindent \z@ \raggedright \normalfont
+   \parskip \z@% 
    \parindent \z@ \memRTLraggedright \normalfont
    \printchapternonum
    \interlinepenalty\@M
@@ -9970,6 +9989,8 @@
 % \item add an extra optional argument.
 % \changes{v1.4}{2003/11/22}{Added extra optional arg to \cs{@startsection}
 %                            (from patch v1.4)}
+% \item make sure it is not effected by a non-zero \cs{parskip}
+% \changes{v3.6j}{2011/03/02}{added the above feature}
 % \end{itemize}
 % The original is in \file{ltsect.dtx}. \\
 % \cs{@startsection}\marg{name}\marg{level}\marg{indent} \\
@@ -10005,7 +10026,13 @@
   \if@nobreak
     \everypar{}%
   \else
+%    \end{macrocode}
+% Slight change such that the effect of \cs{parskip} is cancelled
+% \changes{v3.6j}{2011/03/02}{Adding a negative \cs{parskip} seem to
+% be able to remove the effect of a non-zero \cs{parskip}}
+%    \begin{macrocode}
     \addpenalty\@secpenalty\addvspace\@tempskipa
+    \addvspace{-\parskip}% <--- added 2011/03/02
   \fi
 %    \end{macrocode}
 % For the extra optional argument, change the original \verb?\@dblarg{\@sect{...?
@@ -10019,7 +10046,41 @@
 % \end{macro}
 % \end{macro}
 %
-%
+% \changes{v3.6j}{2011/03/02}{Added the change of the kernel \cs{@xsect}}
+% \begin{macro}{\@xsect}
+%   In order to fulfill removing the effect that a non-zero
+%   \cs{parskip} has on the sectional spacing, we also have to patch
+%   the kernel \cs{@xsect}. (The original is found in latex.ltx) 
+%    \begin{macrocode}
+\def\@xsect#1{%
+  \@tempskipa #1\relax
+  \ifdim \@tempskipa>\z@
+    \par \nobreak
+    \vskip \@tempskipa
+    \vskip-\parskip%<--- added 2011/03/02
+    \@afterheading
+  \else
+    \@nobreakfalse
+    \global\@noskipsectrue
+    \everypar{%
+      \if@noskipsec
+        \global\@noskipsecfalse
+       {\setbox\z@\lastbox}%
+        \clubpenalty\@M
+        \begingroup \@svsechd \endgroup
+        \unskip
+        \@tempskipa #1\relax
+        \hskip -\@tempskipa
+      \else
+        \clubpenalty \@clubpenalty
+        \everypar{}%
+      \fi}%
+  \fi
+  \ignorespaces}
+
+%    \end{macrocode}
+% \end{macro}
+% %
 % \begin{macro}{\M@sect}
 % At least the \Lpack{hyperref} and \Lpack{nameref} packages, and
 % possibly other packages,  modify the kernel \cs{@sect} assuming 8 args.
@@ -21464,10 +21525,14 @@
 % \changes{v1.3}{2002/10/10}{Added \cs{printZnonum} to \cs{@Zmaketitle}}
 % \changes{v1.61803}{2008/01/30}{Slight changes to \cs{@Zmaketitle}
 %         (mempatch v4.6)}
+% \changes{v3.6j}{2011/03/01}{Made sure \cs{parskip} is zero in the
+% title, otherwise a non-zero \cs{parskip} might cause it to be placed
+% incorrectly}
 %    \begin{macrocode}
   \@namedef{@#2maketitle}{%
     \@nameuse{#2headstart}
    {\parindent\z@ 
+    \parskip\z@
 %%%%  \parskip\cftparskip
     \interlinepenalty\@M
 %    \end{macrocode}
@@ -28022,9 +28087,10 @@
 % \begin{macro}{\pagenote}
 % Make sure that this has a useful definition. 
 % \changes{v3.6h}{2011/01/19}{Made \cs{pagenote} robust}
+% \changes{v3.6j}{2011/03/01}{Removed \cs{@sanitize}}
 %    \begin{macrocode}
   \DeclareRobustCommand\pagenote{\@bsphack\begingroup
-    \@sanitize
+  %  \@sanitize
     \m@m@wrpnote}%
 %    \end{macrocode}
 % \end{macro}
@@ -28034,9 +28100,10 @@
 % the writing macro that will ignore the optional argument. This will
 % internally be used when the user ask for foot notes to be turned
 % into page notes.
+% \changes{v3.6j}{2011/03/01}{Removed \cs{@sanitize}}
 %    \begin{macrocode}
   \DeclareRobustCommand\mem@footto@pagenote{\@bsphack\begingroup
-    \@sanitize
+  %  \@sanitize
     \def\mem@pn@step{01}%
     \m@m@wrpnote}%
 %    \end{macrocode}
@@ -28966,6 +29033,7 @@
 % \changes{v3.6h}{2010/12/05}{Added \cs{normalfont} such that font
 % changes going over a page break does not effect the quarks
 % text. Reported by Rasmus Villemoes.}
+% \changes{v3.6j}{2011/02/28}{Typo hsip -> hskip, reported by Alex Ball}
 %    \begin{macrocode}
 \newcommand*{\registrationColour}[1]{#1}
 \newcommand*{\quarkmarks}{%
@@ -29034,7 +29102,7 @@
         \if@twoside
           \hskip\trimedge % left of logical page
         \else
-          \hskip\stockwidth \hsip-\trimedge \hskip-\paperwidth
+          \hskip\stockwidth \hskip-\trimedge \hskip-\paperwidth
         \fi
       \fi
       \vbox to \paperheight{%
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index 520ab099ce8..bcd804795b5 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -26,7 +26,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{memoir}%
-  [2011/02/18 v3.6i configurable book, report, article document class]
+  [2011/03/06 v3.6j configurable book, report, article document class]
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
 \newlength{\onelineskip}
@@ -2683,6 +2683,7 @@
   \bookpagemark{#1}%
   {\centering
    \interlinepenalty \@M
+   \parskip\z@
    \normalfont
    \ifnum \c@secnumdepth >-3\relax
      \printbookname \booknamenum \printbooknum
@@ -2697,6 +2698,7 @@
   \membookstarinfo{#1}%
   {\centering
    \interlinepenalty \@M
+   \parskip\z@
    \normalfont
    \printbooktitle{#1}\par}%
   \@endbook}
@@ -2774,6 +2776,7 @@
   \partmark{#1}%
   {\centering
    \interlinepenalty \@M
+   \parskip\z@
    \normalfont
    \ifnum \c@secnumdepth >-2\relax
      \printpartname \partnamenum \printpartnum
@@ -2788,6 +2791,7 @@
   \mempartstarinfo{#1}%
   {\centering
    \interlinepenalty \@M
+   \parskip\z@
    \normalfont
    \printparttitle{#1}\par}%
   \@endpart}
@@ -2905,6 +2909,7 @@
 \def\@makechapterhead#1{%
   \chapterheadstart%  \vspace*{50\p@}%
   {%\parindent \z@ \raggedright \normalfont
+   \parskip \z@
    \parindent \z@ \memRTLraggedright \normalfont
    \ifm@m@And
      \printchaptername \chapternamenum \printchapternum
@@ -2976,6 +2981,7 @@
 \def\@makeschapterhead#1{%
   \chapterheadstart
   {%\parindent \z@ \raggedright \normalfont
+   \parskip \z@%
    \parindent \z@ \memRTLraggedright \normalfont
    \printchapternonum
    \interlinepenalty\@M
@@ -3468,11 +3474,38 @@
     \everypar{}%
   \else
     \addpenalty\@secpenalty\addvspace\@tempskipa
+    \addvspace{-\parskip}% <--- added 2011/03/02
   \fi
   \@ifstar
     {\@ssect{#3}{#4}{#5}{#6}}%
     {\@trplargoom{\M@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
 
+\def\@xsect#1{%
+  \@tempskipa #1\relax
+  \ifdim \@tempskipa>\z@
+    \par \nobreak
+    \vskip \@tempskipa
+    \vskip-\parskip%<--- added 2011/03/02
+    \@afterheading
+  \else
+    \@nobreakfalse
+    \global\@noskipsectrue
+    \everypar{%
+      \if@noskipsec
+        \global\@noskipsecfalse
+       {\setbox\z@\lastbox}%
+        \clubpenalty\@M
+        \begingroup \@svsechd \endgroup
+        \unskip
+        \@tempskipa #1\relax
+        \hskip -\@tempskipa
+      \else
+        \clubpenalty \@clubpenalty
+        \everypar{}%
+      \fi}%
+  \fi
+  \ignorespaces}
+
 \def\M@sect#1#2#3#4#5#6[#7][#8]#9{%
   \ifheadnameref\M@gettitle{#8}\else\M@gettitle{#7}\fi
   \ifnum #2>\c@secnumdepth
@@ -7462,6 +7495,7 @@
   \@namedef{@#2maketitle}{%
     \@nameuse{#2headstart}
    {\parindent\z@
+    \parskip\z@
 %%%%  \parskip\cftparskip
     \interlinepenalty\@M
     \@nameuse{print#2nonum}%
@@ -10129,10 +10163,10 @@
   \immediate\openout\@notefile=\jobname.ent
   \mempagenotestrue
   \DeclareRobustCommand\pagenote{\@bsphack\begingroup
-    \@sanitize
+  %  \@sanitize
     \m@m@wrpnote}%
   \DeclareRobustCommand\mem@footto@pagenote{\@bsphack\begingroup
-    \@sanitize
+  %  \@sanitize
     \def\mem@pn@step{01}%
     \m@m@wrpnote}%
   \typeout{Writing note file \jobname.ent}%
@@ -10545,7 +10579,7 @@
         \if@twoside
           \hskip\trimedge % left of logical page
         \else
-          \hskip\stockwidth \hsip-\trimedge \hskip-\paperwidth
+          \hskip\stockwidth \hskip-\trimedge \hskip-\paperwidth
         \fi
       \fi
       \vbox to \paperheight{%