summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/memoir
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/tex/latex/memoir
parent6112f0a2130c0874c8926a94609f23f3d3d7636f (diff)
memoir (6mar15)
git-svn-id: svn://tug.org/texlive/trunk@36449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem10.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem11.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem12.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem14.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem17.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem20.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem25.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem30.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem36.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem48.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem60.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem9.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memhfixc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls91
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mempatch.sty2
15 files changed, 76 insertions, 43 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/mem10.clo b/Master/texmf-dist/tex/latex/memoir/mem10.clo
index fc4bf8f3e5e..55e452a8458 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem10.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem10.clo
@@ -10,7 +10,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/tex/latex/memoir/mem11.clo b/Master/texmf-dist/tex/latex/memoir/mem11.clo
index a0be89a940e..51fd28a90c0 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem11.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem11.clo
@@ -10,7 +10,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/tex/latex/memoir/mem12.clo b/Master/texmf-dist/tex/latex/memoir/mem12.clo
index 6f4f3414c80..6edfd5d205a 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem12.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem12.clo
@@ -10,7 +10,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/tex/latex/memoir/mem14.clo b/Master/texmf-dist/tex/latex/memoir/mem14.clo
index d2a9f597ac0..98e9764f82f 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem14.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem14.clo
@@ -10,7 +10,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/tex/latex/memoir/mem17.clo b/Master/texmf-dist/tex/latex/memoir/mem17.clo
index fc7c0542f62..4ca9c556013 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem17.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem17.clo
@@ -10,7 +10,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/tex/latex/memoir/mem20.clo b/Master/texmf-dist/tex/latex/memoir/mem20.clo
index a7d777d1053..84cd9555f87 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem20.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem20.clo
@@ -10,7 +10,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/tex/latex/memoir/mem25.clo b/Master/texmf-dist/tex/latex/memoir/mem25.clo
index 538ff3a331d..44a297a31d1 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem25.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem25.clo
@@ -10,7 +10,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/tex/latex/memoir/mem30.clo b/Master/texmf-dist/tex/latex/memoir/mem30.clo
index 7d42b4f9bdf..572a9c61456 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem30.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem30.clo
@@ -10,7 +10,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/tex/latex/memoir/mem36.clo b/Master/texmf-dist/tex/latex/memoir/mem36.clo
index c6a08eb1114..f49d3864f20 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem36.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem36.clo
@@ -10,7 +10,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/tex/latex/memoir/mem48.clo b/Master/texmf-dist/tex/latex/memoir/mem48.clo
index 48a5624fc1f..921b87f3b35 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem48.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem48.clo
@@ -10,7 +10,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/tex/latex/memoir/mem60.clo b/Master/texmf-dist/tex/latex/memoir/mem60.clo
index e67d9d77d8a..bbf0baa4046 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem60.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem60.clo
@@ -10,7 +10,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/tex/latex/memoir/mem9.clo b/Master/texmf-dist/tex/latex/memoir/mem9.clo
index 6506b5f1b6e..dda06b05faf 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem9.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem9.clo
@@ -10,7 +10,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/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
index 9d4e090f079..4de14936d4d 100644
--- a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
+++ b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
@@ -9,7 +9,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
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index a0be2433cbc..0fb671d7dc5 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -10,7 +10,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
@@ -28,8 +28,8 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2013/05/30 v3.7b configurable book, report, article document class]
-\newcommand\memversion{v3.7b, 2013/05/30}
+ [2015/03/05 v3.7c configurable book, report, article document class]
+\newcommand\memversion{v3.7c, 2015/03/05}
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -1562,8 +1562,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 }
\newcommand{\makeevenhead}[4]{%
\mem@ps@safe@change{#1}
@@ -2355,11 +2355,13 @@
\the\everydisplay
\memdskips}
-\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}
+}
\newdimen\memPD
\newenvironment{vminipage}{%
@@ -3280,27 +3282,45 @@
\afterchapternum%
\vskip\topskip}}
+\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%
+ }%
+
\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}}
+ % \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}}
\makechapterstyle{ger}{%
@@ -6347,6 +6367,7 @@
\def\end@dblfloat{%
\@memlistsubcaptions{\@captype}\@memoldedblfloat}
+\@ifundefined{MEMOIROVERRIDE}{
\AtBeginDocument{\@ifpackageloaded{fixltx2e}{%
\def\end@dblfloat{%
\if@twocolumn
@@ -6360,6 +6381,7 @@
\else
\end@float
\fi}}{}}
+}{\typeout{MEMOIROVERRIDE initiated, ignoring internal fixltx2e 'patch'}}
\def\mem@fb@botlist{\@botlist}
\def\mem@fb@topblock{\suppressfloats[t]}
@@ -10112,7 +10134,7 @@
\unvbox\@outputbox}
\fi}
-\gdef\mem@makecol{
+\gdef\mem@makecol{%
\m@m@makecolintro
\ifvoid\footins
\setbox\@outputbox \box\@cclv
@@ -10126,7 +10148,7 @@
\m@m@makecoltext
\global \maxdepth \@maxdepth}
-\gdef\mem@makecolbf{
+\gdef\mem@makecolbf{%
\m@m@makecolintro
\setbox\@outputbox \box\@cclv
\m@m@makecolfloats
@@ -11966,10 +11988,12 @@
\raise.5ex\hbox{\slashfracstyle{#1}}\kern-.13em/%
\kern-.15em\lower.25ex\hbox{\slashfracstyle{#2}}}
-\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}}}}}
+}{}
%%%%%%%%%%%%%%%%%%%% number formatting
@@ -12815,7 +12839,16 @@
\counterwithout{table}{chapter}
\counterwithout{footnote}{chapter}
\counterwithout{equation}{chapter}
- \renewcommand{\chaptername}{}
+ %\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/tex/latex/memoir/mempatch.sty b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
index 7158af2d513..d5c55e97b85 100644
--- a/Master/texmf-dist/tex/latex/memoir/mempatch.sty
+++ b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
@@ -9,7 +9,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