memoir v1.6180339 (25jul08)

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

2 files changed, 86 insertions, 60 deletions

diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index 32061c82c62..8663162dbea 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -25,7 +25,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{memoir}%
-  [2008/06/02 v1.618033 configurable book, report, article document class]
+  [2008/07/23 v1.6180339 configurable book, report, article document class]
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
 \newlength{\onelineskip}
@@ -93,7 +93,7 @@
 \providecommand*{\EmulatedPackage}{}
 \renewcommand*{\EmulatedPackage}[1]{%
   \@ifnextchar[{\@emulated@package{#1}}%
-               {\@emulated@package{#1}[]}%]
+               {\@emulated@package{#1}[\@empty]}%]
 }
 \providecommand*{\EmulatedPackageWithOptions}{}
 \renewcommand*{\EmulatedPackageWithOptions}[2]{%
@@ -104,8 +104,9 @@
   \expandafter\xdef\csname ver@#1.\@pkgextension\endcsname{#2}%
   \@ifundefined{opt@#1.\@pkgextension}%
     {\@namedef{opt@#1.\@pkgextension}{}}{}%
-  \wlog{Package #1 \if,\csname opt@#1.\@pkgextension\endcsname,\else
-        (with options \csname opt@#1.\@pkgextension\endcsname)\fi
+  \wlog{Package #1 \ifx\@empty#2\else[#2] \fi
+        \if,\csname opt@#1.\@pkgextension\endcsname,\else
+        (with options \csname opt@#1.\@pkgextension\endcsname) \fi
         emulated by \@currname.}%
 }
 \@onlypreamble\EmulatedPackage
@@ -113,7 +114,7 @@
 \@onlypreamble\@emulated@package
 
 \newcommand*{\DisemulatePackage}[1]{%
-  \@namelet{ver@#1.\pkgextension}\relax}
+  \@namelet{ver@#1.\@pkgextension}\relax}
 \@onlypreamble\DisemulatePackage
 
 \renewcommand{\InputIfFileExists}[2]{%
@@ -198,6 +199,13 @@
 \newcommand{\cmd}[1]{\cmdprint{#1}%
   \index{\expandafter\@gobble\string#1?\string\cmdprint{\string#1}}}
 
+\newif\ifm@mifpdf
+  \m@mifpdffalse
+\IfFileExists{ifpdf.sty}{\RequirePackage{ifpdf}\relax}{%
+  \ClassWarningNoLine{memoir}{%
+    Package `ifpdf' is not installed.\MessageBreak
+    The package is being emulated}%
+\m@mifpdftrue
 \newif\ifpdf
   \pdffalse
 \ifx\pdfoutput\undefined
@@ -212,7 +220,16 @@
     \fi
   \fi
 \fi
+%%\EmulatedPackage{ifpdf}[2008/07/23]
+}
 
+\newif\ifm@mifetex
+  \m@mifetexfalse
+\IfFileExists{ifetex.sty}{\RequirePackage{ifetex}\relax}{%
+  \ClassWarningNoLine{memoir}{%
+    If there is an `ifetex' package then it is not installed.\MessageBreak
+    The package is being emulated}%
+\m@mifetextrue
 \newif\ifetex
   \etexfalse
 \ifx\eTeXversion\undefined
@@ -227,16 +244,35 @@
     \fi
   \fi
 \fi
+%%\EmulatedPackage{ifetex}[2008/07/23]
+}
 
+\newif\ifm@mifxetex
+  \m@mifxetexfalse
+\IfFileExists{ifxetex.sty}{\RequirePackage{ifxetex}\relax}{%
+  \ClassWarningNoLine{memoir}{%
+    The `ifxetex' package is not installed.\MessageBreak
+    The package is being emulated}%
 \newif\ifxetex
 \@ifundefined{XeTeXrevision}{\xetexfalse}{\xetextrue}
+%%\EmulatedPackage{ifxetex}[2008/07/23]
+}
+\ifm@mifxetex
 \def\RequireXeTeX{%
   \ifxetex\else
   \@memerror{XeTeX is required to process this document}%
             {Try again with xelatex, not (pdf)latex.\MessageBreak
              Or try removing any XeTeX package(s).}
   \fi}
+\fi
 
+\newif\ifm@mifluatex
+  \m@mifluatexfalse
+\IfFileExists{ifluatex.sty}{\RequirePackage{ifluatex}\relax}{%
+  \ClassWarningNoLine{memoir}{%
+    If there is an `ifluatex' package then it is not installed.\MessageBreak
+    The package is being emulated}%
+\m@mifluatextrue
 \newif\ifluatex
   \luatexfalse
 \ifx\luatexversion\@undefined
@@ -249,6 +285,8 @@
     \fi
   \fi
 \fi
+%%\EmulatedPackage{ifluatex}[2008/07/23]
+}
 
 \edef\wo@dmacro{%
   \string m\string a\string c\string r\string o\string :%
@@ -6891,7 +6929,7 @@
   \fi}
 \newcommand{\booknumberline}[1]{%
   \hb@xt@\@tempdima{%
-    \cftbookname\@cftbsnum #1\@cftasnum\hfil}\@cftasnumb\space}
+    \cftbookname\@cftbsnum #1\@cftasnum\hfil}\@cftasnumb}%%\space}
 
 \newlength{\cftbeforebookskip}
   \setlength{\cftbeforebookskip}{2.25em \@plus\p@}
@@ -6950,7 +6988,7 @@
 
 \newcommand{\partnumberline}[1]{%
   \hb@xt@\@tempdima{%
-    \cftpartname\@cftbsnum #1\@cftasnum\hfil}\@cftasnumb\space}
+    \cftpartname\@cftbsnum #1\@cftasnum\hfil}\@cftasnumb}%%\space}
 
   \newlength{\cftbeforepartskip}
     \setlength{\cftbeforepartskip}{2.25em \@plus\p@}
@@ -11315,43 +11353,45 @@
   \pagestyle{plain}
 \fi
 
-\EmulatedPackage{abstract}
-\EmulatedPackage{appendix}
-\EmulatedPackage{array}
-\EmulatedPackage{booktabs}
-\EmulatedPackage{ccaption}
-\EmulatedPackage{changepage}
-\EmulatedPackage{chngcntr}
-\EmulatedPackage{chngpage}
+\EmulatedPackage{abstract}[2008/07/23]
+\EmulatedPackage{appendix}[2008/07/23]
+\EmulatedPackage{array}[2008/07/23]
+\EmulatedPackage{booktabs}[2008/07/23]
+\EmulatedPackage{ccaption}[2008/07/23]
+\EmulatedPackage{changepage}[2008/07/23]
+\EmulatedPackage{chngcntr}[2008/07/23]
+\EmulatedPackage{chngpage}[2008/07/23]
 \EmulatedPackage{crop}
-\EmulatedPackage{dcolumn}
-\EmulatedPackage{delarray}
-\EmulatedPackage{enumerate}
-\EmulatedPackage{epigraph}
-%%%%%\EmulatedPackage{framed}
-\EmulatedPackage{ifmtarg}
-\EmulatedPackage{ifpdf}
-\EmulatedPackage{ifxetex}
-\EmulatedPackage{index}
-\EmulatedPackage{makeidx}
-\EmulatedPackage{moreverb}
-\EmulatedPackage{mparhack}
-\EmulatedPackage{needspace}
-\EmulatedPackage{newfile}
-\EmulatedPackage{nextpage}
-\EmulatedPackage{pagenote}
-\EmulatedPackage{parskip}
-\EmulatedPackage{patchcmd}
-\EmulatedPackage{setspace}
-\EmulatedPackage{shortvrb}
-\EmulatedPackage{showidx}
-\EmulatedPackage{tabularx}
-\EmulatedPackage{titleref}
-\EmulatedPackage{titling}
-\EmulatedPackage{tocbibind}
-\EmulatedPackage{tocloft}
-\EmulatedPackage{verbatim}
-\EmulatedPackage{verse}
+\EmulatedPackage{dcolumn}[2008/07/23]
+\EmulatedPackage{delarray}[2008/07/23]
+\EmulatedPackage{enumerate}[2008/07/23]
+\EmulatedPackage{epigraph}[2008/07/23]
+%%%%%\EmulatedPackage{framed}[2008/07/23]
+\EmulatedPackage{ifmtarg}[2008/07/23]
+\ifm@mifetex\EmulatedPackage{ifetex}[2008/07/23]\fi
+\ifm@mifluatex\EmulatedPackage{ifluatex}[2008/07/23]\fi
+\ifm@mifpdf\EmulatedPackage{ifpdf}[2008/07/23]\fi
+\ifm@mifxetex\EmulatedPackage{ifxetex}[2008/07/23]\fi
+\EmulatedPackage{index}[2008/07/23]
+\EmulatedPackage{makeidx}[2008/07/23]
+\EmulatedPackage{moreverb}[2008/07/23]
+\EmulatedPackage{mparhack}[2008/07/23]
+\EmulatedPackage{needspace}[2008/07/23]
+\EmulatedPackage{newfile}[2008/07/23]
+\EmulatedPackage{nextpage}[2008/07/23]
+\EmulatedPackage{pagenote}[2008/07/23]
+\EmulatedPackage{parskip}[2008/07/23]
+\EmulatedPackage{patchcmd}[2008/07/23]
+\EmulatedPackage{setspace}[2008/07/23]
+\EmulatedPackage{shortvrb}[2008/07/23]
+\EmulatedPackage{showidx}[2008/07/23]
+\EmulatedPackage{tabularx}[2008/07/23]
+\EmulatedPackage{titleref}[2008/07/23]
+\EmulatedPackage{titling}[2008/07/23]
+\EmulatedPackage{tocbibind}[2008/07/23]
+\EmulatedPackage{tocloft}[2008/07/23]
+\EmulatedPackage{verbatim}[2008/07/23]
+\EmulatedPackage{verse}[2008/07/23]
 
 %%% revert changes to captioning macros if the caption package is used.
 \AtBeginPackage{caption}{
diff --git a/Master/texmf-dist/tex/latex/memoir/mempatch.sty b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
index 421416ec8f4..12f8fec9199 100644
--- a/Master/texmf-dist/tex/latex/memoir/mempatch.sty
+++ b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
@@ -22,29 +22,15 @@
 %% 
 %%   This work consists of the files listed in the README file.
 %% 
-\ProvidesFile{mempatch.sty}[2008/07/11 v5.1 Patches for memoir class v1.618033]
+\ProvidesFile{mempatch.sty}[2008/07/23 v6.0 Patches for memoir class v1.6180339]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%   Version 5.0 was released simultaneously with versions 1.61803
-%%% and then with 1.618033 of memoir.
+%%%   Version 6.0 was released simultaneously with version 1.6180339
+%%% of memoir.
 %%% By definition there were no patches.
 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Version 5.1
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\renewcommand*{\DisemulatePackage}[1]{%
-  \@namelet{ver@#1.\@pkgextension}\relax}
-
-\renewcommand{\booknumberline}[1]{%
-  \hb@xt@\@tempdima{%
-    \cftbookname\@cftbsnum #1\@cftasnum\hfil}\@cftasnumb}
-\renewcommand{\partnumberline}[1]{%
-  \hb@xt@\@tempdima{%
-    \cftpartname\@cftbsnum #1\@cftasnum\hfil}\@cftasnumb}
-
 \endinput
 %%
 %% End of file `mempatch.sty'.