memoir (6mar15)

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

1 files changed, 62 insertions, 29 deletions

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}{%