summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-03-06 22:27:23 +0000
committerKarl Berry <karl@freefriends.org>2015-03-06 22:27:23 +0000
commit59459b17c1b5c64a74bb926836393d379e64493e (patch)
tree6acd41ce2dbf02014116cdbaa79153266ae115c4 /Master/texmf-dist/source
parent6112f0a2130c0874c8926a94609f23f3d3d7636f (diff)
memoir (6mar15)
git-svn-id: svn://tug.org/texlive/trunk@36449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/memoir/memoir.dtx153
-rw-r--r--Master/texmf-dist/source/latex/memoir/memoir.ins2
-rw-r--r--Master/texmf-dist/source/latex/memoir/mempatch.dtx2
-rw-r--r--Master/texmf-dist/source/latex/memoir/mempatch.ins4
4 files changed, 120 insertions, 41 deletions
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index 875187fdaf0..80ebb97512a 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -2,7 +2,7 @@
%
% memoir.dtx
% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-% Maintainer: Lars Madsen (daleif at imf dot au dot dk)
+% Maintainer: Lars Madsen (daleif at math dot au dot dk)
% Copyright 2001--2010 Peter R. Wilson
% Copyright 2011--2013 Lars Madsen
%
@@ -20,7 +20,7 @@
% This work consists of the files listed in the README file.
%
% \fi
-% \CheckSum{30567}
+% \CheckSum{30606}
%
% \changes{v0.1}{2001/05/20}{First public alpha release}
% \changes{v0.2}{2001/06/03}{First beta release}
@@ -110,6 +110,7 @@
% \changes{v3.6k}{2013/05/17}{Various fixes and long overdue maintenance}
% \changes{v3.7}{2013/05/22}{Bumped version}
% \changes{v3.7b}{2013/05/30}{Bugfix, sidecaption}
+% \changes{v3.7c}{2013/05/30}{Bugfix}
%
% \def\dtxfile{memoir.dtx}
%
@@ -160,6 +161,7 @@
% \def\fileversion{v3.6k} \def\filedate{2013/05/17}
% \def\fileversion{v3.7} \def\filedate{2013/05/22}
% \def\fileversion{v3.7b} \def\filedate{2013/05/30}
+% \def\fileversion{v3.7c} \def\filedate{2015/03/05}
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Source code\thanks{This
% file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -168,7 +170,7 @@
% \author{%
% Peter Wilson\\ ^^A\thanks{\texttt{herries dot press at earthlink dot net}}\\
% Herries Press \\
-% (maintained by Lars Madsen\thanks{\texttt{daleif at imf dot au dot dk}}\ )}
+% (maintained by Lars Madsen\thanks{\texttt{daleif at math dot au dot dk}}\ )}
% \date{\filedate}
% \maketitle
%
@@ -315,7 +317,7 @@
\begin{document}
\DeleteShortVerb{\|}
\raggedbottom
-\raggedright
+%\raggedright
\DocInput{\jobname.dtx}
\PrintIndex
%% \PrintChanges
@@ -389,11 +391,11 @@
% Announce the name, option files and version for LaTeX2e files:
% \begin{macrocode}
%<class>\ProvidesClass{memoir}%
-%<class> [2013/05/30 v3.7b configurable book, report, article document class]
+%<class> [2015/03/05 v3.7c configurable book, report, article document class]
% \end{macrocode}
% In the manual it is useful to know the current version.
% \begin{macrocode}
-%<class>\newcommand\memversion{v3.7b, 2013/05/30}
+%<class>\newcommand\memversion{v3.7c, 2015/03/05}
%<9pt>\ProvidesFile{mem9.clo}%
%<9pt> [2008/01/30 v0.4 memoir class 9pt size option]
%<10pt>\ProvidesFile{mem10.clo}%
@@ -5596,7 +5598,9 @@
% \end{macrocode}
% \verb?\mem@ps@safe@change? takes a page style name, checks to see if
-% it is defined, if it is, it checks to see if it is safe to change it.
+% it is defined, if it is, it checks to see if it is safe to change
+% it.
+% \changes{v3.7c}{2014/05/20}{Typo reported by Werner Grundlingh}
% \begin{macrocode}
\newcommand\mem@ps@safe@change[1]{%
\@ifundefined{ps@#1}{%
@@ -5605,8 +5609,8 @@
\@memerror{The pagestyle '#1' is marked as an alias page style.^^J
Modifying an alias page style may give unexpected results.^^J The
alias chain resolves to the real page style '\@tempa', so try
- issuing^^J \string\copypagestyle{#1}{\@tempa}^^J before before
- modifying '#1'}{} \fi }
+ issuing^^J \string\copypagestyle{#1}{\@tempa}^^J
+ before modifying '#1'}{} \fi }
% \end{macrocode}
%
@@ -7370,13 +7374,19 @@
% \end{macro}
%
% \begin{macro}{\@xfloat}
-% Reset \cs{baselinestretch} in floats.
+% Reset \cs{baselinestretch} in floats. Because of a package like
+% \Lpack{fixltx2e} (recommended package), we have to delay the
+% addition.
+% \changes{v3.7d}{2014/07/28}{Delayed addition to
+% \cs{@xfloat}. Reported by Ulrike Fischer}.
% \begin{macrocode}
-\let\m@m@xfloat\@xfloat
-\def\@xfloat #1[#2]{%
- \m@m@xfloat #1[#2]%
- \def\baselinestretch{\m@m@float@spacing}%
- \normalsize}
+\AtBeginDocument{
+ \let\m@m@xfloat\@xfloat
+ \def\@xfloat #1[#2]{%
+ \m@m@xfloat #1[#2]%
+ \def\baselinestretch{\m@m@float@spacing}%
+ \normalsize}
+}
% \end{macrocode}
% \end{macro}
@@ -9775,28 +9785,59 @@
%
% \begin{macro}{\chs@ell}
% Another of my styles which I'll probably use for my next book.
+%
+% James Dietrich\footnote{\texttt{jdietrch@fastmail.fm}} (2014/05/29)
+% reports that the line and number part of the \textsf{ell} chapter
+% style does not align correctly if the page is excessively
+% stretched. The style is reimplemented using \Lenv{tabularx} instead.
+% \changes{v3.7d}{2014/11/05}{Reimplemeted the ell chapter style}
+% \begin{macro}{\chs@ell@helper}
+% For code reuse (the slightly strange values come from trial and
+% error to match the original look):
+% \begin{macrocode}
+\newcommand\chs@ell@helper[1]{%
+ \par%
+ \begin{adjustwidth}{}{-\chapindent}
+ \begin{tabularx}{\linewidth}{>{\raggedleft\arraybackslash}X|}%|emacs
+ \leavevmode\chapnumfont #1\vphantom{1}%
+ \hspace*{3.6pt}%
+ \rule[-13.5pt]{0pt}{14.8mm}%
+ \\%
+ \hline%
+ \end{tabularx}%
+ \end{adjustwidth}%
+ \par%
+ }%
+
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
\makechapterstyle{ell}{%
\chapterstyle{default}
\renewcommand*{\chapnumfont}{\normalfont\HUGE\sffamily}
\renewcommand*{\chaptitlefont}{\normalfont\huge\sffamily}
\settowidth{\chapindent}{\chapnumfont 111}
- \renewcommand*{\chapterheadstart}{\begingroup
- \vspace*{\beforechapskip}%
- \begin{adjustwidth}{}{-\chapindent}%
- \hrulefill
- \smash{\rule{0.4pt}{15mm}}
- \end{adjustwidth}\endgroup}
+ % \renewcommand*{\chapterheadstart}{\begingroup
+ % \vspace*{\beforechapskip}%
+ % \begin{adjustwidth}{}{-\chapindent}%
+ % \hrulefill
+ % \smash{\rule{0.4pt}{15mm}}
+ % \end{adjustwidth}\endgroup}
\renewcommand*{\printchaptername}{}
\renewcommand*{\chapternamenum}{}
- \renewcommand*{\printchapternum}{%
- \begin{adjustwidth}{}{-\chapindent}
- \hfill
- \raisebox{10mm}[0pt][0pt]{\chapnumfont \thechapter}%
- \hspace*{1em}
- \end{adjustwidth}\vspace*{-3.0\onelineskip}}
+ \renewcommand*{\printchapternum}{%
+ % \begin{adjustwidth}{}{-\chapindent}
+ % \hfill
+ % \raisebox{10mm}[0pt][0pt]{\chapnumfont \thechapter}%
+ % \hspace*{1em}
+ % \end{adjustwidth}\vspace*{-3.0\onelineskip}
+ \chs@ell@helper{\thechapter}%
+ }
+ \renewcommand\printchapternonum{%
+ \chs@ell@helper{}\afterchapternum}
\renewcommand*{\printchaptertitle}[1]{%
- \vskip\onelineskip
+ %\vskip\onelineskip
\raggedleft {\chaptitlefont ##1}\par\nobreak}}
% \end{macrocode}
@@ -18779,7 +18820,11 @@
% Unfortunately the \Lpack{fixltx2e} package, version 1.1h (current as of 2005/09/03) makes assumptions
% about \cs{end@float} which do not hold for memoir. The code has to be reverted back to that in version 1.0b of \Lpack{fixltx2e}.
% \changes{v1.618}{2005/09/03}{Dealt with incompatibilities between fixltx2e and memoir's \cs{end@dblfloat} (mempatch v3.7)}
+% \changes{v3.7c}{2015/03/05}{Note quite sure why this fix is needed,
+% so we add a trick so that it can be deleted by defining a macro
+% before \cs{documentclass}, that makes it easier to test}
% \begin{macrocode}
+\@ifundefined{MEMOIROVERRIDE}{
\AtBeginDocument{\@ifpackageloaded{fixltx2e}{%
\def\end@dblfloat{%
\if@twocolumn
@@ -18793,6 +18838,7 @@
\else
\end@float
\fi}}{}}
+}{\typeout{MEMOIROVERRIDE initiated, ignoring internal fixltx2e 'patch'}}
% \end{macrocode}
% \end{macro}
@@ -28132,8 +28178,9 @@
% \begin{macro}{\@mem@extranofeet}
% \begin{macro}{@mem@testifnofoot}
% Revise these to cater for the new sidefoot insert.
+% \changes{v3.7c}{2013/11/28}{Spurious space}
% \begin{macrocode}
-\gdef\mem@makecol{
+\gdef\mem@makecol{%
\m@m@makecolintro
\ifvoid\footins
\setbox\@outputbox \box\@cclv
@@ -28150,8 +28197,9 @@
% \end{macrocode}
%
% \changes{v1.618033988b}{2010/02/17}{a bf was missing in \cs{m@mopfootnotebf}}
+% \changes{v3.7c}{2013/11/28}{Spurious space}
% \begin{macrocode}
-\gdef\mem@makecolbf{
+\gdef\mem@makecolbf{%
\m@m@makecolintro
\setbox\@outputbox \box\@cclv
\m@m@makecolfloats
@@ -31977,7 +32025,7 @@
\wd\tw@\wd\@tempboxa
% \end{macrocode}
% PW: the next line was: \\
-% \verb?\centerline{#2{\box\tw@}}% ??? \centerline bad idea? \\
+% \verb!\centerline{#2{\box\tw@}}% ??? \centerline bad idea?! \\
% but I have changed it as follows so that \cs{centerline} can be changed
% from elsewhere if useful.
% \begin{macrocode}
@@ -32254,7 +32302,7 @@
% \end{macrocode}
% \end{environment}
%
-% \begin{environment}
+% \begin{environment}{qshade}
% And here is my corresponding version for \Lenv{shaded}.
% \changes{v1.61803}{2008/01/30}{Added the qshade environment}
% \begin{macrocode}
@@ -33458,11 +33506,19 @@
% \cs{textsuperscript} macro.
% \changes{v1.4}{2003/11/16}{Added \cs{textsubscript} and supports
% (from patch v1.5)}
+% \changes{v3.7d}{2014/07/28}{\cs{@textsubscript} should be provided,
+% not newcommaded, otherwise one cannot load \Lpack{fixltx2e} before
+% \cs{documentclass}, reported by Ulrike Fischer}
+% \changes{v3.7d}{2015/03/05}{Requested by the LTX3 team as they are
+% updating the LaTeX kernel with the \Lpack{fixltx2e} fixes. Added
+% \cs{@ifundefined} wapper}
% \begin{macrocode}
-\DeclareRobustCommand*{\textsubscript}[1]{%
- \@textsubscript{\selectfont#1}}
-\newcommand*{\@textsubscript}[1]{%
- {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+\@ifundefined{textsubscript}{%
+ \DeclareRobustCommand*{\textsubscript}[1]{%
+ \@textsubscript{\selectfont#1}}
+ \providecommand*{\@textsubscript}[1]{%
+ {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+}{}
% \end{macrocode}
% \end{macro}
@@ -35199,6 +35255,10 @@
% \changes{v1.4}{2003/11/22}{Added some resets of maketitle macros to
% the article option (from patch v1.7)}
% \changes{v1.4}{2003/12/18}{Added equation counter to article resets}
+%
+% Victor Ivrii\footnote{\texttt{vivrii@gmail.com}} (October 2014)
+% noted that adding \pstyle{headings} and english \Lpack{babel}
+% produce unexpected headers containing the frase ``Chapter''.
% \begin{macrocode}
\ifartopt
\chapterstyle{article}
@@ -35206,7 +35266,26 @@
\counterwithout{table}{chapter}
\counterwithout{footnote}{chapter}
\counterwithout{equation}{chapter}
- \renewcommand{\chaptername}{}
+% \end{macrocode}
+% Setting \cs{chaptername} empty was added in v1.0a, with no
+% indication why. Because of \Lpack{babel} (and others) this is
+% clearly not a good idea. We will adjust \pstyle{headings} in a
+% different manner, but leave all the other page styles alone as using
+% the \Lopt{article} as the basis of design work might not be
+% recommended.
+% \changes{v3.7d}{2014/11/05}{Redone \cs{chaptername} adjustment plus
+% \pstyle{headings} under \Lopt{article} option}
+% \begin{macrocode}
+ %\renewcommand{\chaptername}{}
+ \if@twoside
+ \addtopsmarks{headings}{}{%
+ \createmark{chapter}{left}{shownumber}{}{. \ }
+ }
+ \else
+ \addtopsmarks{headings}{}{%
+ \createmark{chapter}{right}{shownumber}{}{. \ }
+ }
+ \fi
\renewcommand{\maketitlehookb}{%
\vskip -1.5\topsep\vskip -1.5\partopsep}
\renewcommand{\maketitlehookc}{%
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.ins b/Master/texmf-dist/source/latex/memoir/memoir.ins
index 9cc64652e55..971456fb09c 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.ins
+++ b/Master/texmf-dist/source/latex/memoir/memoir.ins
@@ -32,7 +32,7 @@
Herries Press
Copyright 2001--2011 Peter R. Wilson
Copyright 2011--2013 Lars Madsen
- Maintainer: Lars Madsen (daleif at imf dot au dot dk)
+ Maintainer: Lars Madsen (daleif at math dot au dot dk)
This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
index 62c730d0c29..54d27876709 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -2,7 +2,7 @@
%
% mempatch.dtx
% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-% Maintainer: Lars Madsen (daleif at imf dot au dot dk)
+% Maintainer: Lars Madsen (daleif at math dot au dot dk)
% Copyright 2001 --- 2010 Peter R. Wilson
%
% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.ins b/Master/texmf-dist/source/latex/memoir/mempatch.ins
index 36a3aed7d63..5dcbc23f3e0 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.ins
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.ins
@@ -2,7 +2,7 @@
%% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
%% Copyright 2001 --- 2010 Peter R. Wilson
%% Copyright 2011 --- 2013 Lars Madsen
-%% Maintainer: Lars Madsen (daleif at imf dot au dot dk)
+%% Maintainer: Lars Madsen (daleif at math dot au dot dk)
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -32,7 +32,7 @@
Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
Copyright 2001 --- 2010 Peter R. Wilson
Copyright 2011 --- 2013 Peter R. Wilson
- Maintainer: Lars Madsen (daleif at imf dot au dot dk)
+ Maintainer: Lars Madsen (daleif at math dot au dot dk)
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either