memoir (7mar11)

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

1 files changed, 38 insertions, 4 deletions

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{%