summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/memoir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-22 22:49:17 +0000
committerKarl Berry <karl@freefriends.org>2009-07-22 22:49:17 +0000
commit59791193fe9827730150df0600e00156c8a66711 (patch)
tree2c53f755ccf3bae08152e27c16f3ccab7006f515 /Master/texmf-dist/tex/latex/memoir
parentc3e77d64d6cd4a78f811f055c8e66fad01d86afd (diff)
memoir 1.6180339g (22jul09)
git-svn-id: svn://tug.org/texlive/trunk@14374 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls11
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mempatch.sty2
2 files changed, 8 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index 2451f8919e0..833fe2b042e 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}%
- [2009/07/12 v1.6180339f configurable book, report, article document class]
+ [2009/07/21 v1.6180339g configurable book, report, article document class]
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -2558,7 +2558,8 @@
\m@mpn@new@schapfalse
\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}%
@@ -2670,7 +2671,8 @@
\ifheadnameref\M@gettitle{\f@rhdr}\else\M@gettitle{#2}\fi}
\newcommand{\@schapter}[1]{%
- \m@mpn@new@schaptrue
+ \m@mpn@new@schaptrue%
+ \m@mpn@new@chapfalse%
\def\f@rbdy{#1}%
\ifartopt
\@makeschapterhead{#1}%
@@ -11714,7 +11716,8 @@
\AtBeginPackage{float}{\let\newfloat\relax}
-\InputIfFileExists{mempatch.sty}{}{} % should be this
+\IfFileExists{mempatch.sty}{%
+ \RequirePackage{mempatch}}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/memoir/mempatch.sty b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
index caa876d9c03..bfd0ae2b3f7 100644
--- a/Master/texmf-dist/tex/latex/memoir/mempatch.sty
+++ b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
@@ -22,7 +22,7 @@
%%
%% This work consists of the files listed in the README file.
%%
-\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