memoir 4.9a (27dec07)

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

1 files changed, 46 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/memoir/mempatch.sty b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
index a3e4594b2d3..0dbc42da7d7 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.
 %% 
-\ProvidesFile{mempatch.sty}[2007/12/14 v4.9 Patches for memoir class v1.618]
+\ProvidesFile{mempatch.sty}[2007/12/24 v4.9a Patches for memoir class v1.618]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%   Version 4.0 was released simultaneously with version 1.618 of memoir.
@@ -54,6 +54,8 @@
 %%% page numbers in the ToC, etc., and improved control over line numbering
 %%% for verses and boxed verbatims.
 %%%
+%%%   Version 4.9a fixes the (few) bugs in version 4.9.
+%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -687,10 +689,13 @@
   \fi}
 
 \newcommand*{\cftbookname}{}
+\newcommand*{\cftbookbreak}{\addpenalty{-\@highpenalty}%
+  \addvspace{\cftbeforebookskip}}
 \newcommand*{\l@book}[2]{%
   \ifnum\c@tocdepth >-3\relax
-    \addpenalty{-\@highpenalty}%
-    \addvspace{\cftbeforebookskip}%
+%%    \addpenalty{-\@highpenalty}%
+    \cftbookbreak
+%%    \addvspace{\cftbeforebookskip}%
     \begingroup
       {\leftskip \cftbookindent\relax
        \rightskip \@tocrmarg
@@ -1331,6 +1336,34 @@
     \@nameuse{cft#1formatpnum}{##1}%
     \@nameuse{cft#1afterpnum}\par}}
 
+\newcommand*{\cftpartbreak}{\addpenalty{-\@highpenalty}%
+  \addvspace{\cftbeforepartskip}}
+\renewcommand*{\l@part}[2]{%
+  \ifnum\c@tocdepth >-2\relax
+%%    \addpenalty{-\@highpenalty}%
+    \cftpartbreak
+%%    \addvspace{\cftbeforepartskip}%
+    \begingroup
+      {\leftskip \cftpartindent\relax
+       \rightskip \@tocrmarg
+       \parfillskip -\rightskip
+       \parindent \cftpartindent\relax\@afterindenttrue
+       \interlinepenalty\@M
+       \leavevmode
+       \settowidth{\@tempdima}{\cftpartfont\cftpartname}%
+       \addtolength{\@tempdima}{\cftpartnumwidth}%
+       \let\@cftbsnum \cftpartpresnum
+       \let\@cftasnum \cftpartaftersnum
+       \let\@cftasnumb \cftpartaftersnumb
+       \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+       {\cftpartfont #1}%
+       \cftpartfillnum{#2}}
+      \nobreak
+      \global\@nobreaktrue
+      \everypar{\global\@nobreakfalse\everypar{}}%
+    \endgroup
+  \fi}
+
 \renewcommand*{\setrectanglesize}[3]{%
   \nametest{#1}{*}%
   \ifsamename                           % H = *
@@ -3442,7 +3475,7 @@
      \refstepcounter\@captype
      \expandafter\@firstofone
    \fi
-   {\@dblarg{\@caption\@captype}}
+   {\@dblarg{\@caption\@captype}}%
 }
 
 \long\def\@caption##1[##2]##3{%
@@ -3461,11 +3494,14 @@
 
 %%% Use this to check if XeTeX is being used.
 \newif\ifxetex
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
-  \xetexfalse
-\else
-  \xetextrue
-\fi
+\@ifundefined{XeTeXrevision}{\xetexfalse}{\xetextrue}
+\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}
+\EmulatedPackage{ifxetex}
 
 \def\bs{\texttt{\char`\\}}
 \ifx\l@nohyphenation\undefined
@@ -3576,7 +3612,7 @@
 \newcommand{\cftinsertcode}[2]{\@namedef{cftinsert#1}{#2}}
 %%% Insert a hook into the `List of' file
 \newcommand*{\cftinserthook}[2]{%
-  \addtocontents{#1}{\protect\cftinsert\protect{#1\protect}}}
+  \addtocontents{#1}{\protect\cftinsert\protect{#2\protect}}}
 %%%
 %%% Use like this:
 %%% \cftinsertcode{A}{%