From 8ebc58dba0381898ce61235b298edc2b31fbbc28 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Dec 2007 01:10:45 +0000 Subject: memoir 4.9a (27dec07) git-svn-id: svn://tug.org/texlive/trunk@5959 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/memoir/README | 6 +- Master/texmf-dist/source/latex/memoir/mempatch.dtx | 84 ++++++++++++++++++---- Master/texmf-dist/tex/latex/memoir/mempatch.sty | 56 ++++++++++++--- Master/tlpkg/bin/ctan2tds | 2 +- 4 files changed, 124 insertions(+), 24 deletions(-) diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README index 246fb006030..9a9b549d14a 100644 --- a/Master/texmf-dist/doc/latex/memoir/README +++ b/Master/texmf-dist/doc/latex/memoir/README @@ -29,6 +29,10 @@ use the memhfixc package after the hyperref package, e.g., ... Later versions of the hyperref package automatically load the memhfixc package. +Changes (2007/12/24) +o New version (4.9a) of mempatch.sty, fixing bugs introduced in v4.9 +o NO CHANGES TO THE USER MANUAL OR ADDENDUM + Changes (2007/12/14) o New version (4.9) of mempatch.sty, fixing all known bugs and adding minor enhancements @@ -316,6 +320,6 @@ o Run (pdf)latex twice more on memman.tex o Print the manual -2007/12/14 +2007/12/24 Peter Wilson herries dot press at earthlink dot net diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx index 731c5294124..9dd60a743ca 100755 --- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx +++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx @@ -19,7 +19,7 @@ % % % \fi -% \CheckSum{7275} +% \CheckSum{7349} % % \def\dtxfile{\texttt{mempatch.dtx}} % \def\fileversion{v1.0} \def\filedate{2003/10/04} @@ -57,6 +57,7 @@ % \def\fileversion{v4.7} \def\filedate{2006/12/23} % \def\fileversion{v4.8} \def\filedate{2007/01/22} % \def\fileversion{v4.9} \def\filedate{2007/12/14} +% \def\fileversion{v4.9a} \def\filedate{2007/12/24} % % \title{The LaTeX \Lpack{memoir} class for configurable book % typesetting: Code patches\thanks{This @@ -786,9 +787,10 @@ % ^^A \ProvidesFile{mempatch.sty}[2006/12/11 v4.6 Patches for memoir class v1.618] % ^^A \ProvidesFile{mempatch.sty}[2006/12/23 v4.7 Patches for memoir class v1.618] % ^^A \ProvidesFile{mempatch.sty}[2007/01/22 v4.8 Patches for memoir class v1.618] +% ^^A \ProvidesFile{mempatch.sty}[2007/12/14 v4.9 Patches for memoir class v1.618] +% % \begin{macrocode} -\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. @@ -820,6 +822,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. +%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \end{macrocode} @@ -2122,15 +2126,20 @@ % \end{macro} % % \begin{macro}{\cftbookname} +% \begin{macro}{\cftbookbreak} % \begin{macro}{\l@book} % \begin{macro}{\booknumberline} % Now for the ToC entry. +% \changes{v4.9a}{2007/12/24}{Added \cs{cftbookbreak}} % \begin{macrocode} \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 @@ -2159,6 +2168,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\cftbeforebookskip} % \begin{macro}{\cftbookindent} @@ -3253,6 +3263,42 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\cftpartbreak} +% \begin{macro}{\l@part} +% \changes{v4.9a}{2007/12/24}{Added \cs{cftpartbreak}} +% \begin{macrocode} +\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} + +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \subsection{Page layout} % % Morten H{\o}gholm suggested (2006/07/26) that instead of using TeX syntax I should use @@ -7176,6 +7222,8 @@ % \begin{macro}{\caption} % \begin{macro}{\@caption} % \changes{v4.9}{2007/11/14}{Revert caption macros for the caption package} +% \changes{v4.9a}{2007/12/18}{Added missing comment mark at end of \cs{caption} +% for caption package checking} % \begin{macrocode} %%% revert changes to captioning macros if the caption package is used. \AtBeginPackage{caption}{ @@ -7203,7 +7251,7 @@ \refstepcounter\@captype \expandafter\@firstofone \fi - {\@dblarg{\@caption\@captype}} + {\@dblarg{\@caption\@captype}}% } \long\def\@caption##1[##2]##3{% @@ -7233,14 +7281,25 @@ % \begin{macro}{\ifxetex} % Checks if XeTeX is being used. % \changes{v4.9}{2007/11/14}{Added \cs{ifxetex}} +% \changes{v4.9a}{2007/12/23}{Added more to \cs{ifxetex}} % \begin{macrocode} %%% 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} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\RequireXeTeX} +% Check for XeTeX from the \Lpack{ifxetex} package. +% \changes{v4.9a}{2007/12/23}{Added \cs{RequireXeTeX}} +% \begin{macrocode} +\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} % \end{macrocode} % \end{macro} @@ -7481,6 +7540,7 @@ % \begin{macro}{\cftinsertcode} % \begin{macro}{\cftinserthook} % \changes{v4.9}{2007/12/14}{Added \cs{cftinsert} and friends} +% \changes{v4.9a}{2007/12/18}{Fixed argument bug in \cs{cftinserthook}} % \begin{macrocode} %%% %%% Following code suggested by Lars Madsen @@ -7491,7 +7551,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}{% 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}{% diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds index 129bb1b0560..3bda805457a 100755 --- a/Master/tlpkg/bin/ctan2tds +++ b/Master/tlpkg/bin/ctan2tds @@ -132,7 +132,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw 'edmac', "die 'skipping, needs work (unzip xx)'", 'ednotes', "&MAKEnosymlinks", 'elhyphen', "&MAKEelhyphen", - 'epic', "die 'skipping, license unknown and replaced by eepic'," + 'epic', "die 'skipping, license unknown and replaced by eepic'", 'epigrafica', "&MAKEflatten", 'epiolmec', "&MAKEflatten", 'epix', "die 'skipping, needs C++'", -- cgit v1.2.3