memoir 3.6f (23aug10)

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

2 files changed, 10 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
index 58ebaf0827e..c305304cfbe 100644
--- a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
+++ b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
@@ -38,6 +38,7 @@
 %% With thanks to Heiko Oberdiek, if you use hyperref dated 2006/11/15
 %% or later, memhfixc will be automatically loaded after hyperref.
 %%
+%% Version 1.15  2010/08/17
 %% Version 1.14  2010/06/10
 %% Version 1.13  2010/04/19
 %% Version 1.12  2009/02/06
@@ -54,7 +55,7 @@
 %% Version 1.1  2003/01/22
 %% Version 1.0  2002/10/22
 %%
-\ProvidesPackage{memhfixc}[2010/06/10 v1.14 nameref/hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2010/08/17 v1.15 nameref/hyperref package fixes for memoir class]
 \let\M@hfixcfinish\relax
 \@ifclassloaded{memoir}{}%
                        {\let\M@hfixcfinish\endinput
@@ -202,7 +203,7 @@
       \Hy@MakeCurrentHrefAuto{section*}%
       \setlength{\Hy@SectionHShift}{#3}%
       \begingroup
-      \toks@{\H@old@sectm@m{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{8}]}%
+      \toks@{\H@old@sectm@m{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]}%
       \toks\tw@\expandafter{%
         \expandafter\Hy@SectionAnchorHref\expandafter{\@currentHref}%
         #9%
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index ff916f2dbdb..d971fd708da 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}%
-  [2010/07/01 v3.6d configurable book, report, article document class]
+  [2010/08/20 v3.6e configurable book, report, article document class]
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
 \newlength{\onelineskip}
@@ -2646,9 +2646,13 @@
     \thispagestyle{chapter}
     \global\@topnum\z@
   \fi
-  \@afterindentfalse
+  \m@mindentafterchapter
   \@ifstar{\@m@mschapter}{\@m@mchapter}}
 
+\newcommand*\indentafterchapter{\def\m@mindentafterchapter{\@afterindenttrue}}
+\newcommand*\noindentafterchapter{\def\m@mindentafterchapter{\@afterindentfalse}}
+\noindentafterchapter
+
 \newcommand{\@m@mchapter}[1][]{%
   \def\ch@pt@c{#1}% capture first optional arg
   \@ifnextchar[{\@chapter}{\@chapter[]}%
@@ -8384,8 +8388,7 @@
     \fi
   \fi}
 
-\newcommand{\parnopar}{\parfillskip=0pt\par\parskip=0pt\noindent
-                       \parfillskip\@flushglue}
+\newcommand*{\parnopar}{{\parfillskip=0pt\par\parskip=0pt\noindent}}
 
 \newif\ifreversesidepar
   \reversesidepartrue