summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/tools/tpm-ctan-check3
-rw-r--r--Master/texmf-dist/doc/latex/memoir/README19
-rwxr-xr-xMaster/texmf-dist/source/latex/memoir/mempatch.dtx71
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mempatch.sty27
-rw-r--r--Master/texmf-dist/tpm/memoir.tpm8
5 files changed, 112 insertions, 16 deletions
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index 4f92f5f082d..b4dcc82b597 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -46,7 +46,8 @@ my @WorkingTPM = qw(
graphicx-psmin greenpoint
grnumalt GuIT
HA-prosper hands hepthesis hhtensor histogr hitec hrlatex hvfloat
- hyperref hyperxmp hyphen-base hyphen-basque hyphen-german
+ hyperref hyperxmp hyphen-base hyphen-basque
+ hyphen-french hyphen-german
hyphen-greek hyphen-norwegian hyphen-ukenglish
hyphen-usorbian hyplain
ibygrk icsv IEEEconf IEEEtran ifxetex ijqc inlinebib invoice
diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index 557d07b96b7..406ea3c0534 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -15,12 +15,25 @@ the patch or addendum files.
NOTE: Similarly, there may be a file called memmanadd.* which provides
amendments to the current version of the User Manual.
- NOTE: If you are using the hyperref package, use the memhfixc package
-after the hyperref package, e.g.,
+ NOTE: If you are using the hyperref package dated earlier than 2006/11/15,
+use the memhfixc package after the hyperref package, e.g.,
...
\usepackage[...]{hyperref}
\usepackage{memhfixc}
...
+Later versions of the hyperref package automatically load the memhfixc package.
+
+Changes (2006/12/23)
+o New version (4.7) of mempatch.sty, fixing minor infelicities with v4.6
+o NO CHANGES TO THE USER MANUAL OR ADDENDUM
+
+Changes (2006/12/11)
+o New version (1.9) of memhfixc.sty
+o New version (4.6) of mempatch.sty, adding spacing commands,
+ about a dozen new built-in chapterstyles, new trimmarks,
+ some minor new commands, and bug fixes.
+o New version of memmanadd.pdf
+o NO CHANGES TO THE USER MANUAL
Changes (2006/08/09)
o New version 4.5 of mempatch.sty
@@ -280,6 +293,6 @@ o Run (pdf)latex twice more on memman.tex
o Print the manual
-2006/08/09
+2006/12/23
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 6f2eeb6f762..6301f8f8495 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{6168}
+% \CheckSum{6212}
%
% \def\dtxfile{\texttt{mempatch.dtx}}
% \def\fileversion{v1.0} \def\filedate{2003/10/04}
@@ -54,6 +54,7 @@
% \def\fileversion{v4.4a} \def\filedate{2006/01/23}
% \def\fileversion{v4.5} \def\filedate{2006/08/08}
% \def\fileversion{v4.6} \def\filedate{2006/12/11}
+% \def\fileversion{v4.7} \def\filedate{2006/12/23}
%
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Code patches\thanks{This
@@ -774,8 +775,9 @@
% ^^A \ProvidesFile{mempatch.sty}[2006/01/23 v4.4a Patches for memoir class v1.618]
% ^^A \ProvidesFile{mempatch.sty}[2006/07/10 v4.5 Patches for memoir class v1.618]
% ^^A \ProvidesFile{mempatch.sty}[2006/08/08 v4.5 Patches for memoir class v1.618]
+% ^^A \ProvidesFile{mempatch.sty}[2006/12/11 v4.6 Patches for memoir class v1.618]
% \begin{macrocode}
-\ProvidesFile{mempatch.sty}[2006/12/11 v4.6 Patches for memoir class v1.618]
+\ProvidesFile{mempatch.sty}[2006/12/23 v4.7 Patches for memoir class v1.618]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -799,6 +801,8 @@
%%% the interlinear and interparagraph spacing, adds some minor new commands,
%%% and provides about a dozen more built-in chapterstyles.
%%% See the code (near the end) for details.
+%%%
+%%% Version 4.7 fixes tiny bugs introduced in version 4.6
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \end{macrocode}
@@ -5965,11 +5969,12 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\chs@Ger}
+% \begin{macro}{\chs@ger}
% Posted to CTT on 2002/04/12 \textit{Fancy Headings, Chapter Headings} by Gerardo Garcia.
+% \changes{v4.7}{2006/12/23}{Renamed the `Ger' chapterstyle to `ger'}
% \begin{macrocode}
%% Gerardo Garcia, ctt 2002/04/12, `Fancy Headings, Chapter Headings
-\makechapterstyle{Ger}{%
+\makechapterstyle{ger}{%
\renewcommand*{\chapterheadstart}{\vspace*{\beforechapskip}
\mbox{}\\\mbox{}\rule[0pt]{\textwidth}{0.4pt}\par}
\setlength{\midchapskip}{20pt}
@@ -6006,6 +6011,7 @@
% Posted to CTT on 2003/12/09, \textit{New chapter style: chapter vs chapter*}
% by Lars Madsen.
% This requires the \Lpack{graphicx} package,
+% \changes{v4.7}{2006/12/23}{Added \cs{raggedleft} to \cs{chaptitlefont} in the madsen chapterstyle}
% \begin{macrocode}
%% posted to ctt, December 2003
%%%% \usepackage{graphicx}
@@ -6013,7 +6019,7 @@
\renewcommand*{\chapnamefont}{%
\normalfont\Large\scshape\raggedleft}
\renewcommand*{\chaptitlefont}{%
- \normalfont\Huge\bfseries\sffamily}
+ \normalfont\Huge\bfseries\sffamily\raggedleft}
\renewcommand*{\chapternamenum}{}
\renewcommand*{\printchapternum}{%
\makebox[0pt][l]{\hspace{0.4em}
@@ -6180,6 +6186,61 @@
% \end{macro}
%
%
+% \section{Mempatch version 4.7}
+%
+% \begin{macrocode}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Version 4.7 (2006/12/23 and later)
+
+% \end{macrocode}
+%
+% \subsection{Epigraphs}
+%
+% Erik Quaeghebeur (CTT, 2006/12/21, \textit{[memoir:epigraph] dissapearing initial L/l
+% (minimal example)}) discovered that an initial `l' was deleted when
+% \texttt{flushleftright} was used for \cs{epigraphtextposition}. This was caused
+% by `fil' being the last token in the definition.
+%
+% \begin{macro}{flushleftright}
+% \changes{v4.7}{2006/12/23}{Changed \cs{flushleftright} and \cs{centerlastline}
+% so that `fil' was not the last token}
+% \begin{macrocode}
+\renewcommand*{\flushleftright}{%
+ \leftskip\z@ \rightskip\z@
+ \parfillskip\@flushglue}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{centerlastline}
+% \begin{macrocode}
+\renewcommand*{\centerlastline}{%
+ \parfillskip=\z@ plus 2fil
+ \rightskip=\z@ plus -1fil
+ \leftskip\@flushglue}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{@epitext}
+% \changes{v4.7}{2006/12/23}{Added \cs{par} to \cs{@epitext} and \cs{@episource}}
+% \begin{macrocode}
+\renewcommand{\@epitext}[1]{%
+ \begin{minipage}{\epigraphwidth}\begin{\textflush} #1\par
+ \ifdim\epigraphrule>\z@ \@epirule \else \vspace*{1ex}\fi
+ \end{\textflush}\end{minipage}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{@episource}
+% \begin{macrocode}
+\renewcommand{\@episource}[1]{%
+ \begin{minipage}{\epigraphwidth}\begin{\sourceflush} #1\par
+ \end{\sourceflush}\end{minipage}}
+
+% \end{macrocode}
+% \end{macro}
+%
+%
% The end of the patch file
%
% \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/memoir/mempatch.sty b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
index 0f8ff85a628..c00b0517f24 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}[2006/12/11 v4.6 Patches for memoir class v1.618]
+\ProvidesFile{mempatch.sty}[2006/12/23 v4.7 Patches for memoir class v1.618]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Version 4.0 was released simultaneously with version 1.618 of memoir.
@@ -45,6 +45,8 @@
%%% the interlinear and interparagraph spacing, adds some minor new commands,
%%% and provides about a dozen more built-in chapterstyles.
%%% See the code (near the end) for details.
+%%%
+%%% Version 4.7 fixes tiny bugs introduced in version 4.6
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2880,7 +2882,7 @@
\raggedleft {\chaptitlefont ##1}\par\nobreak}}
%% Gerardo Garcia, ctt 2002/04/12, `Fancy Headings, Chapter Headings
-\makechapterstyle{Ger}{%
+\makechapterstyle{ger}{%
\renewcommand*{\chapterheadstart}{\vspace*{\beforechapskip}
\mbox{}\\\mbox{}\rule[0pt]{\textwidth}{0.4pt}\par}
\setlength{\midchapskip}{20pt}
@@ -2907,7 +2909,7 @@
\renewcommand*{\chapnamefont}{%
\normalfont\Large\scshape\raggedleft}
\renewcommand*{\chaptitlefont}{%
- \normalfont\Huge\bfseries\sffamily}
+ \normalfont\Huge\bfseries\sffamily\raggedleft}
\renewcommand*{\chapternamenum}{}
\renewcommand*{\printchapternum}{%
\makebox[0pt][l]{\hspace{0.4em}
@@ -3020,6 +3022,25 @@
\vskip 0.5\onelineskip
\hrule}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Version 4.7 (2006/12/23 and later)
+
+\renewcommand*{\flushleftright}{%
+ \leftskip\z@ \rightskip\z@
+ \parfillskip\@flushglue}
+\renewcommand*{\centerlastline}{%
+ \parfillskip=\z@ plus 2fil
+ \rightskip=\z@ plus -1fil
+ \leftskip\@flushglue}
+
+\renewcommand{\@epitext}[1]{%
+ \begin{minipage}{\epigraphwidth}\begin{\textflush} #1\par
+ \ifdim\epigraphrule>\z@ \@epirule \else \vspace*{1ex}\fi
+ \end{\textflush}\end{minipage}}
+\renewcommand{\@episource}[1]{%
+ \begin{minipage}{\epigraphwidth}\begin{\sourceflush} #1\par
+ \end{\sourceflush}\end{minipage}}
+
\endinput
%%
%% End of file `mempatch.sty'.
diff --git a/Master/texmf-dist/tpm/memoir.tpm b/Master/texmf-dist/tpm/memoir.tpm
index ee67093c6a5..3ed710fb511 100644
--- a/Master/texmf-dist/tpm/memoir.tpm
+++ b/Master/texmf-dist/tpm/memoir.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/memoir.zip">
<TPM:Name>memoir</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/12/18 01:41:52</TPM:Date>
+ <TPM:Date>2006/12/29 01:01:17</TPM:Date>
<TPM:Version>3.11</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -23,7 +23,7 @@ hyphenation, typewriter font). Documents can use 9pt, 10pt,
<TPM:Size>4606974</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="395140">
+ <TPM:RunFiles size="395849">
texmf-dist/makeindex/memoir/memman.ist
texmf-dist/tex/latex/memoir/mem10.clo
texmf-dist/tex/latex/memoir/mem11.clo
@@ -36,14 +36,14 @@ texmf-dist/tex/latex/memoir/memoir.cls
texmf-dist/tex/latex/memoir/mempatch.sty
texmf-dist/tpm/memoir.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="3186497">
+ <TPM:DocFiles size="3187031">
texmf-dist/doc/latex/memoir/README
texmf-dist/doc/latex/memoir/basic.gst
texmf-dist/doc/latex/memoir/memman.pdf
texmf-dist/doc/latex/memoir/memman.tex
texmf-dist/doc/latex/memoir/memmanadd.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="1025337">
+ <TPM:SourceFiles size="1027316">
texmf-dist/source/latex/memoir/memoir.dtx
texmf-dist/source/latex/memoir/memoir.ins
texmf-dist/source/latex/memoir/mempatch.dtx