From 59791193fe9827730150df0600e00156c8a66711 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 22 Jul 2009 22:49:17 +0000
Subject: memoir 1.6180339g (22jul09)

git-svn-id: svn://tug.org/texlive/trunk@14374 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/memoir/memoir.dtx   | 19 +++++++++++++++----
 Master/texmf-dist/source/latex/memoir/mempatch.dtx |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'Master/texmf-dist/source/latex')

diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index 5a05f2e6a4f..6a502b302f9 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -78,6 +78,9 @@
 %                                   and added 2 col Toc}
 % \changes{v1.6180339f}{2009/04/25}{Extended description lists}
 % \changes{v1.6180339f}{2009/07/12}{Added three \cs{memlet...} macros}
+% \changes{v1.6180339g}{2009/07/13}{Fixed a bug regading extra enties
+% in the page note list}
+% \changes{v1.6180339g}{2009/07/21}{fixed mempatch typos}
 %
 % \def\dtxfile{memoir.dtx}
 %
@@ -109,6 +112,7 @@
 % \def\fileversion{v1.6180339d}  \def\filedate{2009/02/04}
 % \def\fileversion{v1.6180339e}  \def\filedate{2009/02/06}
 % \def\fileversion{v1.6180339f}  \def\filedate{2009/07/12}
+% \def\fileversion{v1.6180339g}  \def\filedate{2009/07/21}
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Source code\thanks{This
 %        file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -330,7 +334,7 @@
 %    Announce the name, option files and version for LaTeX2e files:
 %    \begin{macrocode}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2009/07/12 v1.6180339f configurable book, report, article document class]
+%<class>  [2009/07/21 v1.6180339g 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}%
@@ -8182,9 +8186,12 @@
 %                            in \cs{@chapter}}
 % \changes{v1.61803}{2008/01/30}{Added \cs{f@rbody} to \cs{@chapter},
 %      plus newchapter flag (mempatch v4.5)}
+% \changes{v1.6180339g}{2009/07/13}{added \cs{m@mpn@new@schapfalse}
+% otherwise both might end up true at the same time}
 %    \begin{macrocode}
 \def\@chapter[#1]#2{%
-  \m@mpn@new@chaptrue
+  \m@mpn@new@chaptrue%
+  \m@mpn@new@schapfalse%
   \def\f@rbdy{#2}%
   \ifx\ch@pt@c\@empty % no optional args
     \def\f@rtoc{#2}%
@@ -8409,9 +8416,12 @@
 % \changes{v1.4}{2003/11/16}{Added \cs{M@gettitle} to \cs{@schapter}}
 % \changes{v1.61803}{2008/01/30}{Changed \cs{@schapter} like 
 %          \cs{@chapter} (mempatch v4.5)}
+% \changes{v1.6180339g}{2009/07/13}{added \cs{m@mpn@new@chapfalse}
+% otherwise both might end up true at the same time}
 %    \begin{macrocode}
 \newcommand{\@schapter}[1]{%
-  \m@mpn@new@schaptrue
+  \m@mpn@new@schaptrue%
+  \m@mpn@new@chapfalse%
   \def\f@rbdy{#1}%
   \ifartopt
     \@makeschapterhead{#1}%
@@ -32197,7 +32207,8 @@
 % \changes{v1.6180339c}{2008/12/26}{Added the two missing arguments when inputting
 %  mempatch.sty (courtesy of Wilhelm Muller)}
 %    \begin{macrocode}
-\InputIfFileExists{mempatch.sty}{}{} % should be this
+\IfFileExists{mempatch.sty}{%
+  \RequirePackage{mempatch}}{}
 
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
index d69258be69f..3d6389b7167 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -832,7 +832,7 @@
 % ^^A \ProvidesFile{mempatch.sty}[2008/05/26 v5.0 Patches for memoir class v1.61803]
 % ^^A \ProvidesFile{mempatch.sty}[2008/07/11 v5.1 Patches for memoir class v1.618033]
 %    \begin{macrocode}
-\ProvidesPackage{mempatch.sty}[2009/07/12 v6.0d Patches for memoir class v1.6180339]
+\ProvidesPackage{mempatch}[2009/07/21 v6.0e Patches for memoir class v1.6180339]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%   Version 6.0 was released simultaneously with version 1.6180339 
-- 
cgit v1.2.3