memoir (6mar15)

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

24 files changed, 585 insertions, 314 deletions

diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index f78f10918b6..9373d859e8e 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -13,7 +13,7 @@ more popular packages.
     PLEASE DON'T WRITE PETER DIRECTLY AS HE IS AWAY MORE OFTEN THAN
     NOT.
 
-Lars Madsen <daleif@imf.au.dk> has taking over the support for memoir.
+Lars Madsen <daleif@math.au.dk> has taking over the support for memoir.
 
 
    NOTE: If you are using the hyperref package dated earlier than 2006/11/15, 
@@ -36,6 +36,33 @@ o Backmatter:
     Bibliography, indexes                               ~  50 pages
 
 
+Changed (2015/03/05)
+
+o memoir v3.7c
+
+-- by request from LTX3, the \textsubscript definitions now only takes
+   place if \textsubscript is not already defined
+-- fixed interaction between memoir and fixltx2e, we delay our
+   \baselinestretch adjustment, reported by Ulrike Fisher
+-- provided \@textsuperscript instead of \newcommand, then fixltx2e
+   can be loaded before \documentclass, reported by Ulrike Fischer
+-- fixed typo in pagestyle message, reported by Werner Grundlingh 
+-- fixed a few sporious	spaces
+-- made changes to the article option (reported by Victor Ivrii):
+   o it no longer sets \chaptername to be empty 
+     (no idea why it did in the first place, certainly not a good idea
+     when using babel)
+   o under the article option, the headings page style now correctly
+     removes the term 'Chapter'  
+-- added a caveat about \tightlists vs. \small/\footnotesize
+-- reimplemented the ell chapter style
+-- various typos
+
+Please note that there are still items on my TODO list that has not
+yet been addressed. They will when time permits.
+
+
+
 Changed (2013/05/30)
 
 o memoir v3.7b
@@ -236,7 +263,7 @@ Earlier changes are noted at the end.
 ------------------------------------------------------------------- 
   Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
   Copyright 2001--2010 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
@@ -300,24 +327,31 @@ trims-example.tex  Example file showcasing the four types of trimmarks
                    supported by memoir, a PDF version of this is needed 
                    to build the manual
 
-    To install the package:
+To  manually install the package:
 o run: latex memoir.ins (which will generate memoir.cls, 
                          a set of mem*.clo files,
                          and basic.gst for MakeIndex glossary files)
+  run: latex mempatch.ins (which will generate memhfixc.sty and mempatch.sty)			 
 o Move memoir.cls, the mem*.clo files and any mem*.sty file to locations 
   where LaTeX will find them (typically in a local texmf tree at 
   /tex/latex/memoir) and refresh the file database. 
   See the FAQ on CTAN at help/uk-tex-faq
   or http://www.tug.ac.uk/faq for more information on this.
 
-    To read the commented source code
+However, it is alway recommended that you update your LaTeX
+installation, instead of attempting to manually install a Package or
+Class. Nowadays both MikTeX and TeXLive based systems provide update
+facilities. (Though, note that LaTeX provided by a Linux distribution
+does not).
+
+To read the commented source code
 o run: (pdf)latex memoir.dtx
        For an index run: makeindex -s gind.ist memoir
 o run: (pdf)latex memoir.dtx
 o Print the result for a hardcopy of the documented code (which consists
   of nearly 500 pages)
 
-    To process memman.tex (if you really want to do this and not just use 
+To process memman.tex (if you really want to do this and not just use 
 memman.pdf as supplied)
 o Make sure you can use the memoir class and the alltt, fixltx2e,
   layouts, graphicx, comment, and url (and perhaps some more) packages.
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf
index f47c6536976..2eac2443afb 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.pdf
+++ b/Master/texmf-dist/doc/latex/memoir/memman.pdf
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.tex b/Master/texmf-dist/doc/latex/memoir/memman.tex
index bc3492acfa4..10944f6ac0d 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.tex
+++ b/Master/texmf-dist/doc/latex/memoir/memman.tex
@@ -5,7 +5,7 @@
 %             Copyright 2001, 2002, 2003, 2004, 2008, 2009 Peter R. wilson
 %
 %   This work has the LPPL maintenance status "maintained".
-%   Maintainer: Lars Madsen (daleif at imf dot au dot dk)
+%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %
 %\listfiles
 \documentclass[10pt,letterpaper,extrafontsizes]{memoir}
@@ -29,7 +29,7 @@
 \usepackage{dpfloat}     % floats on facing pages
 \usepackage{fonttable}[2009/04/01]   % font tables
 %%%%\usepackage{xr-hyper} \externaldocument{memdesign} Doesn't work, 
-%%%%                      Idea won't work in general for memman/memdesin
+%%%%                      Idea won't work in general for memman/memdesign
 %%%%                      as at display time, who knows where everything
 %%%%                      will be located on the individual's computer.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -83,8 +83,8 @@
 
 % \svnidlong
 % {}
-% {$LastChangedDate: 2013-04-26 18:44:39 +0200 (Fri, 26 Apr 2013) $}
-% {$LastChangedRevision: 447 $}
+% {$LastChangedDate: 2015-03-05 18:49:59 +0100 (Thu, 05 Mar 2015) $}
+% {$LastChangedRevision: 516 $}
 % {$LastChangedBy: daleif $}
 
 
@@ -211,7 +211,7 @@
 \setlength{\parskip}{\baselineskip}
 %%\ttfamily
 \textcopyright{} 2001 --- 2010 Peter R. Wilson \\
-\textcopyright{} 2011 --- 2013 Lars Madsen \\
+\textcopyright{} 2011 --- 2014 Lars Madsen \\
 All rights reserved
 
 The Herries Press, Normandy Park, WA.
@@ -324,15 +324,15 @@ Manual last changed \svnyear/\svnmonth/\svnday
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
+{$LastChangedDate: 2014-11-05 16:28:11 +0100 (Wed, 05 Nov 2014) $}
+{$LastChangedRevision: 501 $}
 {$LastChangedBy: daleif $}
 
 \chapter{Preface}
 
     From personal experience and also from lurking on the \url{comp.text.tex}
-newsgroup the major problems with using LaTeX are related to document
-design. Some years ago most questions on \texttt{ctt} were answered by
+newsgroup the major problems with using \ltx\ are related to document
+design. Some years ago most questions on \ctt\ were answered by
 someone providing a piece of code that solved a particular problem, and
 again and again. More recently these questions are answered along the
 lines of `Use the ---------{} package', and again and again.
@@ -354,14 +354,14 @@ are usually accessed by using external packages. In most cases the class
 code is new code reimplementing package functionalities. The exceptions
 tend to be where I have cut and pasted code from some of my packages.
 I could not have written the \Pclass{memoir} class without the excellent 
-work presented by the implementors of LaTeX and its many packages.
+work presented by the implementors of \ltx\ and its many packages.
 
     Apart from packages that I happen to have written I have gained many
 ideas from the other packages listed in the \bibname. One way or another
 their authors have all contributed, albeit unknowingly. 
 The participants in the
 \url{comp.text.tex} newsgroup have also provided valuable input, partly
-by questioning how to do something in LaTeX, and partly by providing
+by questioning how to do something in \ltx, and partly by providing
 answers. It is a friendly and educational forum.
 
 {\raggedleft{\scshape Peter Wilson} \\ Seattle, WA \\ June 2001\par}
@@ -517,7 +517,7 @@ their nature, are not upward compatible.
       if the \Lpack{subfigure} package is used with the class.
 
 \item An \Lopt{article} option so that \Lclass{article} class typesetting
-      may be simulated.
+      may be \emph{simulated}.
 
 \item Incorporation of the essential code from the \Lpack{titling}
       package~\cite{TITLING} (to support the \Lopt{article} option).
@@ -778,17 +778,17 @@ them, were listed in the various
 introductions to the previous editions of this manual and it would now be 
 tedious to read them.
 
-    The \Mname\ class was first released in 2001 and since then
-has proven to be reasonably popular. The class can be used as a replacement
-for the \Lclass{book} and \Lclass{report} classes, by default generating
-documents virtually indistinguisable from ones produced by those classes.
-The class includes some options to produce documents with other appearances;
-for example an \Lclass{article} class look or one that looks as though 
-the document was
-produced on a typewriter with a single font, double spacing, no hyphenation, 
-and so on. In the following I use the term `standard class'\index{standard class} to denote
-the \Lclass{book} and \Lclass{report} classes and, when appropriate, the
-\Lclass{article} class as well.
+The \Mname\ class was first released in 2001 and since then has proven
+to be reasonably popular. The class can be used as a replacement for
+the \Lclass{book} and \Lclass{report} classes, by default generating
+documents virtually indistinguisable from ones produced by those
+classes.  The class includes some options to produce documents with
+other appearances; for example an \Lclass{article} class look or one
+that looks as though the document was produced on a typewriter with a
+single font, double spacing, no hyphenation, and so on. In the
+following I use the term `standard class'\index{standard class} to
+denote the \Lclass{book} and \Lclass{report} classes and, when
+appropriate, the \Lclass{article} class as well.
 
     The \Mname\ class includes the functionality of many packages, for
 instance the \Lpack{tocloft} package for controlling the table of contents or
@@ -1248,29 +1248,28 @@ been answered.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-21 16:33:04 +0200 (Tue, 21 May 2013) $}
-{$LastChangedRevision: 469 $}
+{$LastChangedDate: 2015-03-05 18:49:59 +0100 (Thu, 05 Mar 2015) $}
+{$LastChangedRevision: 516 $}
 {$LastChangedBy: daleif $}
 
 \chapter{Introduction to the eighth edition}
 
-    The \Lclass{memoir} class and this manual have seen many changes since
-they first saw the light of day. The major functions, and extensions to
-them, were listed in the various
-introductions to the previous editions of this manual and it would now be 
-tedious to read them.
-
-    The \Mname\ class was first released in 2001 and since then
-has proven to be reasonably popular. The class can be used as a replacement
-for the \Lclass{book} and \Lclass{report} classes, by default generating
-documents virtually indistinguisable from ones produced by those classes.
-The class includes some options to produce documents with other appearances;
-for example an \Lclass{article} class look or one that looks as though 
-the document was
-produced on a typewriter with a single font, double spacing, no hyphenation, 
-and so on. In the following I use the term `standard class'\index{standard class} to denote
-the \Lclass{book} and \Lclass{report} classes and, when appropriate, the
-\Lclass{article} class as well.
+The \Mname\ class and this manual have seen many changes since they
+first saw the light of day. The major functions, and extensions to
+them, were listed in the various introductions to the previous
+editions of this manual and it would now be tedious to read them.
+
+The \Mname\ class was first released in 2001 and since then has proven
+to be reasonably popular. The class can be used as a replacement for
+the \Lclass{book} and \Lclass{report} classes, by default generating
+documents virtually indistinguisable from ones produced by those
+classes.  The class includes some options to produce documents with
+other appearances; for example an \Lclass{article} class look or one
+that looks as though the document was produced on a typewriter with a
+single font, double spacing, no hyphenation, and so on. In the
+following I use the term `standard class'\index{standard class} to
+denote the \Lclass{book} and \Lclass{report} classes and, when
+appropriate, the \Lclass{article} class as well.
 
     The \Mname\ class includes the functionality of many packages, for
 instance the \Lpack{tocloft} package for controlling the table of contents or
@@ -1884,10 +1883,10 @@ If I have inadvertently left anyone off the list I apologise,
 and please let me know so that I can correct the 
 omisssion.% \footnote{Peter is currently occasionably reachable via email
 % at \texttt{herries dot press (at) earthlink dot net}, otherwise write
-% the maintainer at \texttt{daleif at imf dot au dot dk}}
-\footnote{Please write the maintainer at \texttt{daleif at imf dot au
+% the maintainer at \texttt{daleif at math dot au dot dk}}
+\footnote{Please write the maintainer at \texttt{daleif at math dot au
     dot dk}} Along those lines, if you have any questions you may
-direct them to the \url{comp.text.tex} newsgroup or post them om
+direct them to the \url{comp.text.tex} newsgroup or post them on
 \url{http://tex.stackexchange.com} as you are likely to get a
 satisfactory and timely response.
 
@@ -1932,7 +1931,7 @@ As the years go by support for \Lclass{memoir} will devolve from one
 person to another.\footnote{This is currently (July 2009) happening as
   Lars Madsen is taking over from Peter Wilson.}  Therefore it is
 probably safer to ask questions, complain, make suggestions, etc., on
-a Q\&A site like \url{http:://tex.stackexchange.com} or on the the
+a Q\&A site like \url{http://tex.stackexchange.com} or on the the
 newsgroup \url{comp.text.tex}, which is archived and read by many,
 than correspond directly with the maintainer, who might well be away
 for some considerable time and perhaps not notice your email after
@@ -1947,10 +1946,10 @@ track of memoir related matters.
 
 \textit{From the maintainer:} It seems that traffic on
 \url{comp.text.tex} is less frequent. So most \theclass\ related
-questions should go to \url{http:://tex.stackexchange.com}, please
+questions should go to \url{http://tex.stackexchange.com}, please
 remember to tag them properly, that really helps locating the
 \theclass\ related questions. If no-one comes up with an answer, you
-can also write me directly via \texttt{daleif (at) imf dot au dot dk}.
+can also write me directly via \texttt{daleif (at) math dot au dot dk}.
 
 
 
@@ -2165,8 +2164,8 @@ an em, often a quad is 1em.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
+{$LastChangedDate: 2014-11-05 16:28:11 +0100 (Wed, 05 Nov 2014) $}
+{$LastChangedRevision: 501 $}
 {$LastChangedBy: daleif $}
 
 \chapter{Starting off} \label{chap:starting}
@@ -2682,9 +2681,10 @@ are \Lopt{twoside}, \Lopt{onecolumn}, \Lopt{openright}, and \Lopt{final}.
   {Class option for indenting continuation lines in a bibliography.}
 
 \item[\Lopt{article}]\index{class options!article} 
-  typesetting simulates the \Lclass{article} class,
+  typesetting \emph{simulates} the \Lclass{article} class,
   but the \cmd{\chapter} command is not disabled.
-  Chapters\index{chapter} do not start a new page and chapter headings\index{heading!chapter} are typeset
+  Chapters\index{chapter} do not start a new page and chapter
+  headings\index{heading!chapter} are typeset 
   like a section heading\index{heading!sections}. The numbering of 
   figures\index{figure}, etc., is continuous
   and not per chapter. However, a \cmd{\part} command still puts
@@ -2772,8 +2772,8 @@ want to put \cmd{\raggedbottom} in the preamble\index{preamble}.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-16 17:28:08 +0200 (Thu, 16 May 2013) $}
-{$LastChangedRevision: 464 $}
+{$LastChangedDate: 2015-02-24 12:51:39 +0100 (Tue, 24 Feb 2015) $}
+{$LastChangedRevision: 508 $}
 {$LastChangedBy: daleif $}
 
 \chapter{Laying out the page} \label{chap:layingpage}
@@ -2796,6 +2796,8 @@ produce your own page layout if the default is inappropriate.
     If you are happy with the default layout you may skip the rest of this
 chapter.
 
+\fancybreak{}
+
     The pages of a book carry the text which is intended to educate, entertain
 and/or amuse the reader. The page must be designed to serve the purposes of
 the author and to ease the reader's task in assimilating the author's ideas.
@@ -2817,16 +2819,31 @@ all these.
 are similar to those provided by the \Lpack{geometry} 
 package~\cite{GEOMETRY}.
 
+\fancybreak{}
+
+\begin{adjustwidth}{3em}{3em}
+  \itshape
+  Note, if your paper choice matches one of the class paper options,
+  then you can skip forward to section~\ref{sec:typeblock2} --
+  \emph{\titleref{sec:typeblock2}}, as you have already chosen your
+  stock size and does not need trimming.
+\end{adjustwidth}
+
+On the other hand, if, say, you are designing a document, that is to
+be printed on one type of paper (the stock), and then trimmed to
+another, please read on.
+
+
 \section{Stock material}
 
-   Printing is the act of laying symbols onto a piece of stock\index{stock} 
-material.
-Some print on T shirts by a process called silk screening, where the shapes of
-the symbols are made in a screen and then fluid is squeezed through the screen
-onto the stock material --- in this case the fabric of the T shirt. Whether or
-not this is of general interest it is not the sort of printing or stock
-material that is normally used in book production. Books, except for the very
-particular, are printed on paper\index{paper}. 
+Printing is the act of laying symbols onto a piece of
+stock\index{stock} material.  Some print on T-shirts by a process
+called silk screening, where the shapes of the symbols are made in a
+screen and then fluid is squeezed through the screen onto the stock
+material --- in this case the fabric of the T shirt. Whether or not
+this is of general interest it is not the sort of printing or stock
+material that is normally used in book production. Books, except for
+the very particular, are printed on paper\index{paper}.
 
     In the desktop publishing world the stock\indextwo{stock}{paper}
 paper\indextwo{stock}{size} is usually one from a range of standard sizes. 
@@ -2899,6 +2916,8 @@ same parameters on a verso page.
 \end{figure}
 
 
+\fancybreak{}
+
 
     The first step in designing the page layout\index{page layout!design} 
 is to decide on the page size\indextwo{page}{size} and then pick an 
@@ -2920,6 +2939,13 @@ be cheaper than having to order specially sized stock\index{stock} material.
   {Width of the stock paper.}
     The class options\index{stock paper size option} 
 provide for some common stock\indextwo{stock}{size} sizes. 
+So if you have specified the class option \texttt{a4paper} and intend
+to print on A4, then you have no need for \cmd{\setstocksize}, proceed
+directly to section~\ref{sec:typeblock2}. Alternatively, the class
+provide settings for many other standard stock sizes, see
+\tref{tab:sizeoptsmetric} through \tref{tab:sizeoptsbrit}. 
+
+
 If you have some other size that you want to use, the 
 command \cmd{\setstocksize} can be used to
 specify that the stock\index{stock!specifying size} size is 
@@ -3063,6 +3089,16 @@ on and specify
 \settrims{0.5\trimtop}{\trimedge}
 \end{lcode}
 
+\fancybreak{}
+
+See also section~\ref{sec:predefined-layouts} --
+\emph{\titleref{sec:predefined-layouts}}, where we present some extra
+commands. For example \cmd{\setpagecc} for placing a trimmed page
+centered on the stock.
+
+After trimming the various methods to specify the typeblock, now
+refers to the \emph{trimmed} page, not the stock material.
+
 
 \section{The typeblock} \label{sec:typeblock2}
 
@@ -3077,6 +3113,9 @@ upper limit to the width of the typeblock. From a practical viewpoint,
 a line should not be too short because then there is difficulty in justifying
 the text.
 
+\subsection{A note on the width of the typeblock}
+
+
     Experiments have shown that the number of characters in a line of
 single column\index{column} text on a page should be
 in the range 60 to 70 for ease of reading. The range may be as much
@@ -3322,8 +3361,22 @@ commands\index{packages before class} before
 \end{tabular}
 \end{table}
 
+
+
+\subsection{Specifying the typeblock size}
+\label{sec:spec-typebl-size}
+
+
+
+
     The height of the typeblock\index{typeblock!height} should be 
-equivalent to an integral number of lines.
+equivalent to an integral number of lines. The class provides two
+different methods to specify the typeblock. \cmd{\settypeblocksize}
+(below) will set the size of the typoblock, other commands will then
+be used to place it on the paper. Alternatively the typeblock size can
+be determined by setting the margins around it. We present this later
+on in this section (see \cmd{\setlrmarginsandblock} and
+\cmd{\setulmarginsandblock}). 
 
 \begin{syntax}
 \cmd{\settypeblocksize}\marg{height}\marg{width}\marg{ratio} \\
@@ -3380,7 +3433,7 @@ so that the white space is equally distributed around the sides of the text.
   result in errors as the relationships mentioned above are not met
   (the \lnc{\textwidth} has changed, but not the margins).
 
-  We may add auto adjustments to a later version of \theclass.
+  We may add auto adjustments to a future version of \theclass.
 \end{note}
 
 
@@ -3839,7 +3892,7 @@ is along these lines:
   \lnc{\paperheight} and \lnc{\paperwidth}.
   
   If you use and print on, say, A4, the \texttt{a4paper} class option
-  is enough, not \cmd{\setstocksize} needed.
+  is enough, no \cmd{\setstocksize} needed.
 \item Decide on the location of the page\index{page!location} with
   respect to the stock\index{stock}. If the page and
   stock\index{stock} sizes are the same, then call
@@ -4021,7 +4074,7 @@ up being slightly larger than $H$.
 \caption{Results from sample \cs{textheight} adjustments} \label{tab:textht}
 \begin{tabular}{ccccc} \toprule
   & \multicolumn{4}{c}{Algorithm} \\ \cmidrule{2-5}
-  &  fixed & classic & lines & nearest \\ 
+  &  fixed & classic & lines & nearest \\ \cmidrule{2-5}
 Requested height & \multicolumn{4}{c}{adjusted height in pts, (lines) } \\ 
 \midrule
 10.0\cs{baselineskip} & 120.0pt, (10) & 130pt, (11) & 118pt, (10) & 118pt, (10) \\ 
@@ -4139,12 +4192,13 @@ document some special setup must be done.
 The macro \cmd{\fixpdflayout}\index{page layout!PDF} is automatically called after the preamble when
 \pdfltx{} is used to generate \pixpdf. The default definition is effectively:
 \begin{lcode}
-\newcommand*{\fixpdflayout}{\ifpdf\ifnum\pdfoutput>0\relax
+\newcommand*{\fixpdflayout}{
   \pdfpageheight=\the\stockheight
   \pdfpagewidth=\the\stockwidth
+  \ifxetex\else
   \ifdim\pdforigin=0pt\pdforigin=1in\fi
   \ifdim\pdfhorigin=0pt\pdfhorigin=1in\fi
-  \fi\fi}
+  \fi}
 \end{lcode}
 The first settings (\verb?\pdfpage...?) ensure that \pdfltx{} knows
 the size of the physical sheet\indextwo{stock}{size} for printing. 
@@ -4170,25 +4224,34 @@ processor
 with information about the stock\indextwo{stock}{size} size, 
 which a viewer or printer may use.
 
-    With a \Lopt{landscape} document and using the processing route
-\verb?latex -> dvips? the resulting \file{ps} \pscript{} file may appear 
-upside-down when viewed with, say, \Lprog{ghostview} 
-(also known as \Lprog{gsview32}). If this happens
-try putting the following in your preamble:
-\begin{lcode}
-\addtodef{\fixdvipslayout}{}{%
-  \special{!TeXDict begin /landplus90{true}store end }}
-\end{lcode}
-If required, additional code can be added to \cmd{\fixdvipslayout} by repeated
-applications of \cmd{\addtodef}. Some other potential specials for \pscript{}
-printing may be\footnote{At least for an HP 5SiMx LaserJet duplex printer.}
-\begin{lcode}
-% specify duplex printing 
-\special{!TeXDict begin <</Duplex true>> setpagedevice end} 
-% specify short side binding
-\special{!TeXDict begin <</Tumble true>> setpagedevice end} 
-\end{lcode}
-%<< because of emacs ...
+The macros \cmd{\fixpdflayout} and \cmd{\fixdvipslayout} are
+automatically executed at the start of the document, in combinations
+that make the most sense (i.e., \cmd{\fixpdflayout} when using XeLaTeX
+or \pdfltx{} and \cmd{fixdvipslayout} for the rest.
+
+
+\LMnote{2015/02/23}{Next lines outcommented as I do not feel that this
+  kind of examples below in a manual like this}
+
+%     With a \Lopt{landscape} document and using the processing route
+% \verb?latex -> dvips? the resulting \file{ps} \pscript{} file may appear 
+% upside-down when viewed with, say, \Lprog{ghostview} 
+% (also known as \Lprog{gsview32}). If this happens
+% try putting the following in your preamble:
+% \begin{lcode}
+% \addtodef{\fixdvipslayout}{}{%
+%   \special{!TeXDict begin /landplus90{true}store end }}
+% \end{lcode}
+% If required, additional code can be added to \cmd{\fixdvipslayout} by repeated
+% applications of \cmd{\addtodef}. Some other potential specials for \pscript{}
+% printing may be\footnote{At least for an HP 5SiMx LaserJet duplex printer.}
+% \begin{lcode}
+% % specify duplex printing 
+% \special{!TeXDict begin <</Duplex true>> setpagedevice end} 
+% % specify short side binding
+% \special{!TeXDict begin <</Tumble true>> setpagedevice end} 
+% \end{lcode}
+% %<< because of emacs ...
 
 \section{Example} \label{sec:pexamp}
 
@@ -4196,21 +4259,21 @@ printing may be\footnote{At least for an HP 5SiMx LaserJet duplex printer.}
 and US letterpaper\index{paper!size!letterpaper} stock\index{stock},
 wanting to do the least amount of trimming. The layout requirements
 are as follows.
-
-    The width of the 
-typeblock\index{typeblock} should
-be such that there are the optimum number of characters per line, and the 
-ratio of the height to the width of the typeblock\index{typeblock} should 
-equal the golden
-section. The text has to start 50pt below the top of the page.
-We will use the default \lnc{\headheight} and \lnc{\footskip}.
-The ratio of the outer margin\index{margin!outer} to the inner
-margin\index{margin!inner} should equal the
-golden section\index{golden section}, 
-as should the space above and below the header\index{header}. There is
-no interest at all in marginal\index{marginalia} notes, so we can 
-ignore any settings for these.
-
+\begin{itemize}\tightlist
+\item The width of the typeblock\index{typeblock} should be such that
+  there are the optimum number of characters per line.
+\item The ratio of the height to the width of the
+  typeblock\index{typeblock} should equal the golden section.
+\item The text has to start 50pt below the top of the page.  We will
+  use the default \lnc{\headheight} and \lnc{\footskip}.
+\item The ratio of the outer margin\index{margin!outer} to the inner
+  margin\index{margin!inner} should equal the golden
+  section\index{golden section}, as should the space above and below
+  the header\index{header}.
+\item There is no interest at all in
+  marginal\index{marginalia} notes, so we can ignore any settings for
+  these.
+\end{itemize}
     We can either do the maths ourselves or get \ltx\ to do it for us. Let's
 use \ltx. First we will work out the size of the largest sheet that can be
 cut from A4\index{paper!size!A4} and 
@@ -4326,6 +4389,8 @@ and A4 sized stock even if it might look better if it was designed for always
 being printed on one or the other.
 
 \section{Predefined layouts}
+\label{sec:predefined-layouts}
+
 
     The class, like the standard classes, will automatically produce 
 working layouts for \Lopt{letterpaper}
@@ -4474,6 +4539,8 @@ of \cmd{\isopage}.
 through \ref{fig:pagelastlay}. These were produced with the aid of the
 \Lpack{layouts} package.
 
+\fancybreak{}
+
 \begin{syntax}
 \cmd{\setpagebl}\marg{height}\marg{width}\marg{ratio} \\
 \cmd{\setpageml}\marg{height}\marg{width}\marg{ratio} \\
@@ -4568,8 +4635,8 @@ effect.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
+{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
+{$LastChangedRevision: 480 $}
 {$LastChangedBy: daleif $}
 
 
@@ -4906,7 +4973,7 @@ The fontfamily name is \pfontfam{pzd}.
     In \ltx\ there are three characteristics that apply to a font. These are:
 (a)~the shape\index{font characteristic!shape}, 
 (b)~the series\index{font characteristic!series} 
-(or weight),%\index{font characteristic!weight|see{series}}, 
+(or weight), %\index{font characteristic!weight|see{series}}, 
 and (c)~the family\index{font characteristic!family}. 
 Table \ref{tab:fontcat} illustrates these and lists the relevant 
 commands\index{font commands} to access the different font categories.
@@ -5024,7 +5091,7 @@ in a different font.
   {Declaration for using a Typewriter (monospaced) font.}
 \end{table}
 
-    Do not go wild seeing how many different kinds of font you can cram into
+    Do not go wild seeing how many different kinds of fonts you can cram into
 your work as in example~\ref{egbadmf}.
 
 \begin{egsource}{egbadmf}
@@ -5631,7 +5698,7 @@ single lines that begin on the following page) are resolved not by pushing
 one extra line from the same paragraph also onto the next page, but by
 stretching the textheight to allow this one extra at the bottom of the
 same page. \\
-\hfill /iaw (from CTT, \textit{widow handling?}, May 2006)
+\hfill /iaw (from \ctt, \textit{widow handling?}, May 2006)
 \end{quote}
 
 As so often happens, Donald Arseneau\index{Arseneau, Donald} 
@@ -5659,7 +5726,7 @@ may reduce the number of lines per page). For example, in the preamble:
 
 \indextwo{widow}{line}\indextwo{orphan}{line}
     The late Michael Downes\index{Downes, Michael} provided the following 
-(from CTT \textit{widow/orphan control package (for 2e)?}, 1998/08/31):
+(from \ctt\ \textit{widow/orphan control package (for 2e)?}, 1998/08/31):
 \begin{quote}
     For what it's worth here are the penalty values that I use when I don't
 [want] to \emph{absolutely} prohibit widow/orphan break, but come
@@ -6735,8 +6802,8 @@ and thanks notes are meant to be different.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
+{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
+{$LastChangedRevision: 480 $}
 {$LastChangedBy: daleif $}
 
 \chapter{Abstracts}
@@ -6758,7 +6825,7 @@ one-column\index{column!single} abstract\index{abstract} in a
 two-column\index{column!double} paper
 seem to pop up fairly regularly on the
 \texttt{comp.text.tex} newsgroup. While an answer based on responses
-on \texttt{ctt} is provided in the FAQ,
+on \ctt\ is provided in the FAQ,
 the class provides a more author-friendly means
 of accomplishing this. 
 
@@ -7006,8 +7073,8 @@ optional argument of the \cmd{\twocolumn} command. In fact,
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-13 16:55:11 +0200 (Mon, 13 May 2013) $}
-{$LastChangedRevision: 459 $}
+{$LastChangedDate: 2015-02-23 14:55:22 +0100 (Mon, 23 Feb 2015) $}
+{$LastChangedRevision: 506 $}
 {$LastChangedBy: daleif $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -7874,7 +7941,7 @@ wish to capture the \meta{title} to use in running headers.
 
 \section{Chapter headings}
 \label{sec:chapter-headings}
-\index{heading!chapter|(}
+\index{heading!chapter|(} %| emacs
 
     The chapter headings are configurable in much the same way as book or part 
 headings, but in addition there are some built in chapter styles that you may
@@ -8262,7 +8329,7 @@ plough through the rest of this section, except to look at the illustrations
 of the remaining predefined chapterstyles shown a little later.
 
 The various macros shown in the \cs{chapterhead} code above are initially 
-set up as:
+set up as (the code is known as the \cstyle{default} style): 
 \begin{lcode}
 \newcommand{\chapterheadstart}{\vspace*{\beforechapskip}}
 \newcommand{\printchaptername}{\chapnamefont \@chapapp}
@@ -8272,7 +8339,24 @@ set up as:
 \newcommand{\printchapternonum}{}
 \newcommand{\printchaptertitle}[1]{\chaptitlefont #1}
 \newcommand{\afterchaptertitle}{\par\nobreak\vskip \afterchapskip}
+\newcommand{\chapnamefont}{\normalfont\huge\bfseries}
+\newcommand{\chapnumfont}{\normalfont\huge\bfseries}
+\newcommand{\chaptitlefont}{\normalfont\Huge\bfseries}
+\setlength{\beforechapskip}{50pt}
+\setlength{\midchapskip}{20pt}
+\setlength{\afterchapskip}{40pt}
 \end{lcode}
+(The mysterious \cmd{\@chapapp} is the internal macro that \ltx\ uses
+to store normally the chapter name.\footnote{Remember, if you use
+a macro that has an \texttt{@} in its name it must be in a place
+where \texttt{@} is treated as a letter.} It will normally have 
+different values,
+set automatically, when typesetting a chapter in the main body 
+(e.g., \texttt{Chapter}) or in the appendices\index{appendix} where
+it would usually be set to \texttt{Appendix}, but you can specify
+these names yourself.)
+
+
 
     A new style is specified by changing the definitions of this last set of 
 macros and/or the various font and skip specifications.
@@ -8282,39 +8366,29 @@ macros and/or the various font and skip specifications.
 \end{syntax}
 Chapter styles are defined via the \cmd{\makechapterstyle} command, where
 \meta{style} is the style being defined and \meta{text} is the LaTeX code 
-defining the style.
+defining the style. Please note that the \meta{text} \emph{always}
+start by resetting macros and lengths to the values shown above. That
+is what you actually get is is the same as
+\begin{syntax}
+\cmd{\makechapterstyle}\marg{style}\{\\
+  \cmd{\chapterstyle}\{default\}\\
+  \meta{text}\\
+\} 
+\end{syntax}
+
 
-    To start things off, here is the code for the \cstyle{default} chapter
+
+    To start things off,  the \cstyle{default} chapter
 style, which mimics the chapter heads in the standard \Lclass{book} and 
-\Lclass{report} classes, as it appears in \file{memoir.cls}.
-\begin{lcode}
-\makechapterstyle{default}{%
-  \def\chapterheadstart{\vspace*{\beforechapskip}
-  \def\printchaptername{\chapnamefont \@chapapp}
-  \def\chapternamenum{\space}
-  \def\printchapternum{\chapnumfont \thechapter}
-  \def\afterchapternum{\par\nobreak\vskip \midchapskip}
-  \def\printchapternonum{}
-  \def\printchaptertitle##1{\chaptitlefont ##1}
-  \de\afterchaptertitle{\par\nobreak\vskip \afterchapskip}
-}
-\newcommand{\chapnamefont}{\normalfont\huge\bfseries}
-\newcommand{\chapnumfont}{\normalfont\huge\bfseries}
-\newcommand{\chaptitlefont}{\normalfont\Huge\bfseries}
-\newlength{\beforechapskip}\setlength{\beforechapskip}{50pt}
-\newlength{\midchapskip}\setlength{\midchapskip}{20pt}
-\newlength{\afterchapskip}\setlength{\afterchapskip}{40pt}
+\Lclass{report} classes, as it appears in \file{memoir.cls}:
+\begin{lcode}
+\makechapterstyle{default}{}
 \chapterstyle{default}
 \end{lcode}
-(The mysterious \cmd{\@chapapp} is the internal macro that \ltx\ uses
-to store normally the chapter name.\footnote{Remember, if you use
-a macro that has an \texttt{@} in its name it must be in a place
-where \texttt{@} is treated as a letter.} It will normally have 
-different values,
-set automatically, when typesetting a chapter in the main body 
-(e.g., \texttt{Chapter}) or in the appendices\index{appendix} where
-it would usually be set to \texttt{Appendix}, but you can specify
-these names yourself.)
+-- since the \cstyle{default} style \emph{is} the initial value of
+\cmd{\makechapterstyle}. The actual code is seen above. 
+
+
 
     As an example of setting up a simple chapterstyle, here is the code for 
 defining the \cstyle{section} chapterstyle. In this case it is principally
@@ -8413,6 +8487,16 @@ style's changes are not passed on to a following one.
 
 \LMnote{2011/05/25}{I've moved the chapter style images to the
   showcase appendix to save some space in the main part of the manual}
+
+
+\newcommand\PScaveat[1]{
+  \smallskip\noindent
+  \textbf{Caveat:} The \Pcstyle{#1} style requires the
+\Lpack{graphicx} package.
+\smallskip
+}
+
+
 \begin{itemize}
 
 \item[\cstyle{bianchi}] 
@@ -8624,8 +8708,9 @@ It is illustrated in
   Lyhne\footnote{\ctt, \textit{Glossary}, 2006/02/09} and shown in \fref{dclyhne}
   where the raggedleft
   sanserif title is between two rules, with the name and number above.
-  I modified the original to cater for unnumbered chapters. It requires
-  the \Lpack{graphicx} package.
+  I modified the original to cater for unnumbered chapters. 
+
+  \PScaveat{lyhne}
 
 %\begin{demochap}[-\onelineskip]{lyhne}\end{demochap}
 %\begin{demochap}[-2\onelineskip]{lyhne}\end{demochap}
@@ -8641,8 +8726,9 @@ It is illustrated in
   \textit{New chapter style: chapter vs chapter*}, 2003/12/09}
   and is shown in \fref{dcmadsen}.
   It is a large sanserif raggedleft style with the number in the margin
-  and a rule between the number and title lines. It requires the
-  \Lpack{graphicx} package.
+  and a rule between the number and title lines. 
+
+  \PScaveat{madsen}
 
 %\begin{demochap}[2\onelineskip]{madsen}\end{demochap}
 %\begin{demochap}[-2\onelineskip]{madsen}\end{demochap}
@@ -8676,6 +8762,8 @@ It is illustrated in
   number). The head of this chapter is set with the \cstyle{pedersen} style,
   because it cannot be adequately demonstrated in an illustration.
 
+  \PScaveat{pedersen}
+
 %%%%\begin{demochap}{pedersen}\end{demochap}
 
 \item[\cstyle{southall}] 
@@ -8727,8 +8815,9 @@ A style created by
    in the margin by the number line. It requires the \Ppack{graphicx} package.}
    This style created by Bastiaan\index{Veelo, Bastiaan} Veelo 
   is shown in \fref{dcveelo} and is raggedleft, large, bold and with a
-  black square in the margin by the number line. It requires the 
-  \Lpack{graphicx} package.
+  black square in the margin by the number line. 
+
+  \PScaveat{veelo}
 
 %\cleardoublepage
 
@@ -8886,7 +8975,7 @@ the ToC.
 The \cmd{\chapterprecistoc} macro puts \cmd{\precistoctext}\marg{text} into 
 the \pixfile{toc} file. The default definition similar to (but not
 exactly\footnote{Internally we use a different name for \cs{leftskip}
-  and \cs{rightskip} to make it easier to do right to left document
+  and \cs{rightskip} to make it easier to do right to left documents
 with the class and the \texttt{bidi} package.})
 \begin{lcode}
 \DeclareRobustCommand{\precistoctext}[1]{%
@@ -9347,8 +9436,11 @@ Here are some example lower level heads and the code used to produce them.
 
 
 
+\LMnote{2015/02/23}{Replaced \cs{mbox} with \cs{leavevmode} in def of
+\cs{marginbox}, suggested in \url{http://tex.stackexchange.com/a/222178/3929} }
+
 \newcommand{\marginbox}[1]{%
-  \parbox[t][0pt]{6em}{\itshape\raggedleft\mbox{} #1}}
+  \parbox[t][0pt]{6em}{\itshape\raggedleft\leavevmode #1}}
 \newcommand{\marginhead}[1]{%
   {\llap{\marginbox{#1}\kern0.5em}}}
 \setparaindent{0em}
@@ -9362,7 +9454,7 @@ I have done this here for a \cmd{\paragraph} heading (which is not otherwise
 used in this manual). The code is:
 \begin{lcode}
 \newcommand{\marginbox}[1]{%
-  \parbox[t][0pt]{6em}{\itshape\raggedleft\mbox{} #1}}
+  \parbox[t][0pt]{6em}{\itshape\raggedleft\leavevmode #1}}
 \newcommand{\marginhead}[1]{%
   {\llap{\marginbox{#1}\kern0.5em}}}
 \setparaindent{0em}
@@ -9672,7 +9764,7 @@ this:
 \chapter[Title]{Title\footnote{Do you really have to do this?}}
 \end{lcode}
 
-\index{footnote!in heading|)}
+\index{footnote!in heading|)} %| emacs
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -9780,7 +9872,7 @@ is defined as:
   \setsubparaheadstyle{\normalfont\normalsize\itshape\addperiod}}
 \end{lcode}
     You can see the effect throughout this document. This chapter is
-slightly different in that I have used the \cstyle{pederson} chapterstyle
+slightly different in that I have used the \cstyle{pedersen} chapterstyle
 instead of the \cstyle{demo3} chapterstyle that I have normally used.
     
 \begin{table}
@@ -9842,8 +9934,8 @@ normal size by the time subsubsection heads are reached, or before.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-21 16:33:04 +0200 (Tue, 21 May 2013) $}
-{$LastChangedRevision: 469 $}
+{$LastChangedDate: 2014-08-22 09:08:19 +0200 (Fri, 22 Aug 2014) $}
+{$LastChangedRevision: 498 $}
 {$LastChangedBy: daleif $}
 
 \chapterstyle{demo3}
@@ -10288,7 +10380,7 @@ footers\index{footer}, or any other purpose.
 \begin{syntax}
 \cmd{\makeheadrule}\marg{style}\marg{width}\marg{thickness} \\
 \cmd{\makefootrule}\marg{style}\marg{width}\marg{thickness}\marg{skip} \\
-\cmd{\makeheadfootprefix}\marg{style}\marg{for headrule}\marg{for footrule}\\
+\cmd{\makeheadfootruleprefix}\marg{style}\marg{for headrule}\marg{for footrule}\\
 \end{syntax}
 \glossary(makeheadrule)%
   {\cs{makeheadrule}\marg{style}\marg{width}\marg{thickness}}%
@@ -11104,8 +11196,8 @@ like:
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-22 16:29:23 +0200 (Wed, 22 May 2013) $}
-{$LastChangedRevision: 470 $}
+{$LastChangedDate: 2014-11-05 16:28:11 +0100 (Wed, 05 Nov 2014) $}
+{$LastChangedRevision: 501 $}
 {$LastChangedBy: daleif $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -11616,7 +11708,7 @@ and regular paragraphing.
 
 \subsection{Some ragged paragraphs}
 
-   A few paragraph shapes with unusual ragged lines are avaiable.
+   A few paragraph shapes with unusual ragged lines are available.
 
 \begin{egresult}[Ragged paragraphs]{eg:raggeds}
 \justlastraggedleft
@@ -11772,12 +11864,13 @@ by \meta{left} and \meta{right} respectively; if the page number is even
 margins\index{margin} by \meta{right} and \meta{left} respectively.
 
 \begin{syntax}
-\cmd{\strictpagecheck} \cmd{\lazypagecheck} \\
+\cmd{\strictpagecheck} \cmd{\easypagecheck} \\
 \end{syntax}
 
 Odd/even page checking may be either strict (\cmd{\strictpagecheck})
-or lazy (\cmd{\lazypagecheck}). Lazy checking works most of the time
-but if it fails at any point then the strict checking should be used.
+or easy (or one might call it lazy) (\cmd{\easypagecheck}). Easy
+checking works most of the time but if it fails at any point then the
+strict checking should be used.
 
     As an example, if a figure\index{figure} is wider than the textwidth 
 it will stick out into the righthand margin\index{margin!right}. It may be 
@@ -12061,7 +12154,7 @@ counter typeset as a lowercase Roman numeral followed by a single parenthesis
   appearance. We provide some simple tools to adjust vertical spacing,
   see below.
 
-  Users seeking more control can have a look at the \Lpack{enumitem}
+  Users seeking more control can have a look at the excellent \Lpack{enumitem}
   package by Javier Bezos. If loaded as
   \begin{lcode}
     \usepackage[shortlabels]{enumitem}
@@ -12123,6 +12216,23 @@ declaration is intermediate between \cmd{\defaultlists} and \cmd{\tightlists}.
 The starred version, \cmd{\firmlists*}, allows sligthly less space around 
 the lists when they are preceded by a blank line than does the 
 unstarred \cmd{\firmlists}.
+\begin{caveat}
+  Due to the manner i which \cmd{\small} and \cmd{\footnotesize} are
+  implemented, \cmd{\tightlists} and \cmd{\firmlists} will have \emph{no
+    effect} on lists typeset under \cmd{\small} or
+  \cmd{\footnotesize}.
+
+  A comprehensible solution can be done via the \Lpack{enumitem}
+  package via
+\begin{verbatim}
+% \tightlists equivalent
+\usepackage[shortlabels]{enumitem}
+\setlist{ noitemsep }
+\end{verbatim}
+\end{caveat}
+
+
+
 
 \begin{syntax}
 \cmd{\firmlist} \cmd{\tightlist} \\
@@ -12326,8 +12436,8 @@ other environments.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-08 17:14:46 +0200 (Wed, 08 May 2013) $}
-{$LastChangedRevision: 457 $}
+{$LastChangedDate: 2015-01-05 12:35:51 +0100 (Mon, 05 Jan 2015) $}
+{$LastChangedRevision: 502 $}
 {$LastChangedBy: daleif $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13244,8 +13354,8 @@ title is presented to it as an argument. Thus one may end
 
 \begin{caveat}
   Please read the section entitled
-  \emph{\titleref{sec:about-upper-og}} on
-  page~\pageref{sec:about-upper-og} if you consider using upper/lower
+  \emph{\titleref{sec:about-upper-or}} on
+  page~\pageref{sec:about-upper-or} if you consider using upper/lower
   cased TOC entries and especially if you are also using the
   \Lpack{hyperref} package.
 \end{caveat}
@@ -13386,7 +13496,7 @@ value of the \cmd{\cftwhatismyname} macro will locally reflect the
 current type. 
 
 As mentioned earlier, the \cmd{\book}, \cmd{\part} and \cmd{\chapter}
-numbers are typeset inside a box of certain fixed withs. Sometimes it
+numbers are typeset inside a box of certain fixed widths. Sometimes it
 can be handy \emph{not} having this box around. For this you can
 redefine one of the four \cs{...numberlinebox} macros listed
 above. For example via
@@ -13861,8 +13971,8 @@ this macro can be found in section~\ref{sec:chapter-precis}.
 
 
 \LMnote{2012/09/21}{added}
-\subsubsection{About upper og lower casing TOC entries}
-\label{sec:about-upper-og}
+\subsubsection{About upper or lower casing TOC entries}
+\label{sec:about-upper-or}
 
 Some designs call for upper (or lower casing) TOC entries. This
 \emph{is} possible but the solution depends on whether the
@@ -14614,8 +14724,8 @@ before the stuff you want to have moved out of, say, a part.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-10 17:06:52 +0200 (Fri, 10 May 2013) $}
-{$LastChangedRevision: 458 $}
+{$LastChangedDate: 2015-02-23 16:56:35 +0100 (Mon, 23 Feb 2015) $}
+{$LastChangedRevision: 507 $}
 {$LastChangedBy: daleif $}
 
 
@@ -15366,7 +15476,7 @@ situation like this
   some float here
 \end{lcode}
 \cmd{\FloatBlockAllowAbove} will allow the float to be placed at the
-top of the same page as \cmd{\FloatBlock}. \cmd{\FloatBlockAllowAbove}
+top of the same page as \cmd{\FloatBlock}. \cmd{\FloatBlockAllowBelow}
 is the reverse situation.
 
 It may be beneficial to be able to add \cmd{\FloatBlock} to sectional
@@ -16954,7 +17064,13 @@ Named legends may be set at the side with the \Ie{sidenamedlegend} environment.
   {Environment for setting a legend kind of sidecaption.}%
 Legends may be set at the side with the \Ie{sidelegend} environment.
 
+\fancybreak{}
 
+\textbf{Caveat}: Note that the \texttt{side...} envs expect the body
+of the float to be \emph{taller} than the typeset caption/legend. In
+case you write a long caption/legend for a short float, you may want
+to visit this answer:
+\url{http://tex.stackexchange.com/a/228412/3929}.
 
 
 \subsection{Tweaks}
@@ -17038,7 +17154,7 @@ so it must be altered by using a \cmd{\renewcommand*},
 \emph{not} by \cmd{\setlength}.
 
     If you do reduce the \cmd{\sidecapfloatwidth} you may notice that the
-sidecaption is actualy placed a distance \lnc{\sidecapsep} with respect
+sidecaption is actually placed a distance \lnc{\sidecapsep} with respect
 to the float's \Ie{minipage}, not with respect to the text block.
 
 \newlength{\mylength}
@@ -19434,8 +19550,8 @@ illustrate these points.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-02 16:10:51 +0200 (Thu, 02 May 2013) $}
-{$LastChangedRevision: 454 $}
+{$LastChangedDate: 2014-05-07 13:21:44 +0200 (Wed, 07 May 2014) $}
+{$LastChangedRevision: 481 $}
 {$LastChangedBy: daleif $}
 
 \chapter{Page notes} \label{chap:mnotes}
@@ -19832,17 +19948,20 @@ typeset the footnote marker at the point where \cmd{\footnote} is called
 which is defined by the \cmd{\footnote} or \cmd{\footnotemark} macros). 
 The default definition typesets the mark\index{footnote!marker!styling} 
 as a superscript and is effectively
+\LMnote{2014/05/07}{\cs{@makefnmark} does not take arguments}
 \begin{lcode}
-\newcommand*{\@makefnmark}[1]{\hbox{\textsuperscript{#1}}}
+\newcommand*{\@makefnmark}{\hbox{\textsuperscript{\@thefnmark}}}
 \end{lcode}
 You can change this if, for example,
  you wanted the marks to be in parentheses at the baseline.
+\LMnote{2014/05/07}{\cs{@makefnmark} does not take arguments}
  \begin{lcode}
- \renewcommand*{\@makefnmark}[1]{{\footnotesize (#1)}}
+ \renewcommand*{\@makefnmark}{{\footnotesize (\@thefnmark)}}
  \end{lcode}
  or, somewhat better to take account of the size of the surrounding text
+\LMnote{2014/05/07}{\cs{@makefnmark} does not take arguments}
  \begin{lcode}
- \renewcommand*{\@makefnmark}[1]{\slashfracstyle{(#1)}}
+ \renewcommand*{\@makefnmark}{\slashfracstyle{(\@thefnmark)}}
  \end{lcode}
 
 
@@ -25322,8 +25441,8 @@ will require the use of \cmd{\titleref} and so the declaration
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-02 16:10:51 +0200 (Thu, 02 May 2013) $}
-{$LastChangedRevision: 454 $}
+{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
+{$LastChangedRevision: 480 $}
 {$LastChangedBy: daleif $}
 
 
@@ -25955,7 +26074,7 @@ but could be redefined like, say,
 Following the declaration \cmd{\ignorenoidxfile}, which is the default,
 LaTeX will silently pass over attempts to use an \pixfile{idx} file which has
 not been declared via \cmd{\makeindex}. After the declaration
-\cmd{\reportnoidxfile} LaTeX will whinge about any attempts to 
+\cmd{\reportnoidxfile} LaTeX will whine about any attempts to 
 write to an unopened file.
 
 \index{index!printing|)}
@@ -27165,8 +27284,8 @@ pdflatex memman
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-17 16:33:35 +0200 (Fri, 17 May 2013) $}
-{$LastChangedRevision: 466 $}
+{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
+{$LastChangedRevision: 480 $}
 {$LastChangedBy: daleif $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -27287,7 +27406,7 @@ nothing if the \Lopt{showtrims} option has not been used.
 \begin{caveat}
   Most modern \LaTeX\ editors make use of the \emph{synctex} features
   in, say, pdf\LaTeX\ to enable \emph{reverse search} from the PDF
-  previewer back tot he source code in the editor. That is, click in a
+  previewer back to the source code in the editor. That is, click in a
   certain manner in the PDF previewer and you will be taken to the
   corresponding (or there about) line in the source code.
 
@@ -27973,7 +28092,7 @@ identical to the class.)
 \begin{syntax}
 \cmd{\checkoddpage} \\
 \piif{ifoddpage} \\
-\cmd{\strictpagecheck} \cmd{\lazypagecheck} \\
+\cmd{\strictpagecheck} \cmd{\easypagecheck} \\
 \end{syntax}
 \glossary(checkoddpage)%
   {\cs{checkoddpage}}%
@@ -27986,8 +28105,8 @@ identical to the class.)
   {\cs{strictpagecheck}}%
   {\cs{checkoddpage} will use an accurate but time and space consuming method
    for checking for an  odd page number.}
-\glossary(lazypagecheck)%
-  {\cs{lazypagecheck}}%
+\glossary(easypagecheck)%
+  {\cs{easypagecheck}}%
   {\cs{checkoddpage} will use a possibly inaccurate but fast method
    for checking for an  odd page number.}
 The macro \cmd{\checkoddpage} sets \piif{ifoddpage} to \ptrue\ if the current
@@ -28000,7 +28119,7 @@ is just
 to check the current page number which, because of TeX's asynchronous page
 breaking algorithm, may not correspond to the actual page number where the
 \cmd{\checkoddpage} command was issued. The simple, but faster, page checking
-method is used after the \cmd{\lazypagecheck} command is issued.
+method is used after the \cmd{\easypagecheck} command is issued.
 
 \begin{syntax}
 \cmd{\cplabel} \\
@@ -30305,8 +30424,8 @@ in your document's preamble\index{preamble}.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
+{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
+{$LastChangedRevision: 480 $}
 {$LastChangedBy: daleif $}
 
 \PWnote{2009/07/05}{Added thesis design chapter}
@@ -30332,7 +30451,7 @@ followed the rules laid down therein.
     Universities outside the US tend to be more relaxed with the result
 that theses from these establishments are very often more attractive (certainly
 less bulky) and more readable. The ASU requirements lead to an exceptionally
-dull and unatractive appearance.
+dull and unattractive appearance.
 
 \section{Example US thesis typographic requirements}
 
@@ -30604,13 +30723,12 @@ in the usual position. The text shall not exceed the one page.
 
 \section{Code}
 
-    Given the above set of requirements we can produce code that, hopefully,
-will generate documents that will not fall foul of the inspectorate. 
-For simplicity I'll do the code in the form of a package 
-called \verb?pwasu.sty?. 
-I will be using some \ltx\ kernel commands that you won't normally come. Some
-of the macros include \idxatincode\texttt{@} as part of their name but 
-this is safe
+Given the above set of requirements we can produce code that,
+hopefully, will generate documents that will not fall foul of the
+inspectorate.  For simplicity I'll do the code in the form of a
+package called \verb?pwasu.sty?.  I will be using some \ltx\ kernel
+commands that you won't normally come across. Some of the macros
+include \idxatincode\texttt{@} as part of their name but this is safe
 as they are in a package, otherwise they would have to be within a
 \cmd{\makeatletter} \ldots \cmd{\makeatother} grouping (\seeatincode).
 
@@ -31621,11 +31739,11 @@ section~\ref{sec:chapter-headings}, page~\pageref{sec:chapter-headings}.
 
 \begin{demochap}[-2\onelineskip]{komalike}\end{demochap}
 
-\begin{demochap}[-2\onelineskip]{lyhne}\end{demochap}
+\begin{demochap*}[-2\onelineskip]{lyhne}\end{demochap*}
 
 \clearpage
 
-\begin{demochap}[-2\onelineskip]{madsen}\end{demochap}
+\begin{demochap*}[-2\onelineskip]{madsen}\end{demochap*}
 
 \begin{demochap}[-3\onelineskip]{ntglike}\end{demochap}
 
@@ -31635,7 +31753,7 @@ section~\ref{sec:chapter-headings}, page~\pageref{sec:chapter-headings}.
 
 \begin{demochap}{thatcher}\end{demochap}
 
-\begin{demochap}[-2\onelineskip]{veelo}\end{demochap}
+\begin{demochap*}[-2\onelineskip]{veelo}\end{demochap*}
 
 \begin{demochap}{verville}\end{demochap}
 
@@ -31894,8 +32012,8 @@ on recto pages.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-16 17:28:08 +0200 (Thu, 16 May 2013) $}
-{$LastChangedRevision: 464 $}
+{$LastChangedDate: 2015-03-05 18:49:59 +0100 (Thu, 05 Mar 2015) $}
+{$LastChangedRevision: 516 $}
 {$LastChangedBy: daleif $}
 
 
@@ -31917,7 +32035,7 @@ to make the manual less cluttered.
 
 
 If you have some \theclass\ related code you would like to share, feel
-free to send it to \verb?daleif@imf.au.dk?.
+free to send it to \verb?daleif@math.au.dk?.
 
 
 
@@ -32345,8 +32463,8 @@ Then the definition of the actual appendix \toc{}:
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
+{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
+{$LastChangedRevision: 480 $}
 {$LastChangedBy: daleif $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -32360,7 +32478,7 @@ Then the definition of the actual appendix \toc{}:
 \LMnote{2010/02/08}{Added this intro to show the motivation for adding
 this}
 \LMnote{2010/02/17}{fixed typo from Adriano Pascoletti}
-There are many freely available \LaTeX\ introductions on CTAN and
+There are many freely available \ltx\ introductions on \ctan\ and
 other places. One thing that these apparently are not covering is the
 traditional picture environment. It can be very handy in many
 applications, though for more complex drawings the reader might be
@@ -32372,13 +32490,13 @@ much, the most important thing about this note is the mentioning of
 the picture package by Heiko, which enables us to use something like
 \cs{put}(5mm, 5cm)}
 \emph{Writers comment:} There are many extensions to the stock picture
-environment provided by the \LaTeX\ kernel. We have chosen not to deal
+environment provided by the \ltx\ kernel. We have chosen not to deal
 with them in this chapter but instead concentrate on what you get as
 is from the kernel. But there are a few handy packages that the reader
 might want to explore: picture (by Heiko Oberdiek) which extends the
 \cs{put} syntax to include arbitrary lengths, like 50mm; pict2e which
 is mentioned in \cite{GCOMPANION} but just recently was released;
-eepic. All packages are available from CTAN.
+eepic. All packages are available from \ctan.
 
 
 
@@ -33717,8 +33835,8 @@ exactly how many blobs to use for the curve.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
+{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
+{$LastChangedRevision: 480 $}
 {$LastChangedBy: daleif $}
 
 
@@ -33803,7 +33921,7 @@ have an idea of how \tx\ processes a source file to produce a
 Knuth~\cite{TEXBOOK} and also perhaps more accessibly by 
 Eijkhout~\cite{TEXBYTOPIC}; 
 the following is a simplified description.
-Basically there are four processes invloved and the output from one 
+Basically there are four processes involved and the output from one 
 process is the input to the following one.
 
 \begin{description}
@@ -35087,8 +35205,8 @@ but in this case the best place to look for further information is in the
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
+{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
+{$LastChangedRevision: 480 $}
 {$LastChangedBy: daleif $}
 
 
@@ -35101,7 +35219,7 @@ but in this case the best place to look for further information is in the
 
 \chapter{The terrors of errors} \label{chap:errors}
 
-    No matter how conscientious you are a mistake or two will occasionaly
+    No matter how conscientious you are a mistake or two will occasionally
 creep into your document source. The good news is that whatever happens
 \tx\ will not destroy your files --- it may produce some odd looking output,
 or even no output at all, but your work is safe. The bad news is that you
@@ -35755,7 +35873,7 @@ mode on the assumption that that was what you had forgotten to do.
 %1215 
 \item[\textmess{!}]\index{Missing control sequence inserted} 
    \textmess{Missing control sequence inserted.} \\
-     \texthelp{Please dont say} \verb?`\def cs{...}',? \texthelp{say}
+     \texthelp{Please don't say} \verb?`\def cs{...}',? \texthelp{say}
        \verb?`\def\cs{...}'.?
        \texthelp{I've inserted an inaccessible control sequence so that your
        definition will be completed without mixing me up too badly.
@@ -36036,7 +36154,7 @@ pagebreak, so it produced a page with too much whitespace on it.
      \verb?`\def\a1{...}',?
      \texthelp{then you must always put `1' after `\cs{a}', since the control
        sequence names are made up of letters only. 
-       The macro here has not been followed by the requied stuff,
+       The macro here has not been followed by the required stuff,
        so I'm ignoring it.}
 
 
@@ -36152,7 +36270,7 @@ Here is how much of TeX's memory you used:
             15000i,4000n,6000p,200000b,40000s
 \end{lcode}
 
-    The eror message says what kind of space it exhausted (input stack size
+    The error message says what kind of space it exhausted (input stack size
 in the example above). The most common are:
 \begin{plainlist}
 
@@ -37635,7 +37753,7 @@ end if
 \printglossary
 
 \renewcommand{\prebibhook}{%
-CTAN is the Comprehensive TeX Archive Network. Information on how to
+\ctan\ is the \cTeXan. Information on how to
 access CTAN is available at \url{http://www.tug.org}.
 \par\vspace{\onelineskip}}
 
@@ -39000,8 +39118,8 @@ the indexed topic.\vskip\onelineskip}
 {\Large\textsf{Colophon}}
 \end{center}
 \begin{center}
-This manual was typeset using the LaTeX typesetting system
-created by Leslie Lamport and the memoir class. 
+This manual was typeset using the \ltx\ typesetting system
+created by Leslie Lamport and the \Mname\ class. 
 The body text is set 10/12pt on a
 33pc measure with Palatino designed by Hermann Zapf, which includes 
 italics and small caps. Other fonts include
diff --git a/Master/texmf-dist/doc/latex/memoir/memsty.sty b/Master/texmf-dist/doc/latex/memoir/memsty.sty
index c5a23dc52c8..5abe01f7c3d 100644
--- a/Master/texmf-dist/doc/latex/memoir/memsty.sty
+++ b/Master/texmf-dist/doc/latex/memoir/memsty.sty
@@ -574,6 +574,13 @@ chapterstyle. It is one of several styles that come as part of the
   \global\c@subsection=\savesubseccnt
   \global\c@footnote=\saveftncnt}
 
+\newenvironment{demochap*}[2][\onelineskip]{
+  \let\DCcaption\caption
+  \renewcommand\caption[1]{\DCcaption{##1. This style requires the
+      \Lpack{graphicx} package}}
+  \begin{demochap}[#1]{#2}}{\end{demochap}}
+  
+
 %%% comma separated in-line items 
 \let\litemize\itemize \let\endlitemize\enditemize
 \renewenvironment{litemize}{\renewcommand{\item}{\unskip, }}{}
diff --git a/Master/texmf-dist/makeindex/memoir/basic.gst b/Master/texmf-dist/makeindex/memoir/basic.gst
index f73c9c9fc2e..323c518939f 100644
--- a/Master/texmf-dist/makeindex/memoir/basic.gst
+++ b/Master/texmf-dist/makeindex/memoir/basic.gst
@@ -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/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
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