latex 2e release (7May)

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

123 files changed, 4721 insertions, 4216 deletions

diff --git a/Master/texmf-dist/source/latex/base/alltt.dtx b/Master/texmf-dist/source/latex/base/alltt.dtx
index 826e173d430..96f4710c91c 100644
--- a/Master/texmf-dist/source/latex/base/alltt.dtx
+++ b/Master/texmf-dist/source/latex/base/alltt.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \CheckSum{108}
 % \iffalse
@@ -68,7 +68,7 @@
 %    \begin{abstract}
 %    This package defines the \Lenv{alltt} environment, which is like
 %    the \Lenv{verbatim} environment except that |\|, |{|, and |}|
-%    have their usual meanings. 
+%    have their usual meanings.
 %
 %    Thus, other commands and environments can appear within an
 %    \Lenv{alltt} environment.
@@ -78,15 +78,15 @@
 %
 %  \DescribeEnv{alltt}
 %   Here are some things you may want to do in an \Lenv{alltt}
-%   environment: 
+%   environment:
 %   \begin{itemize}
 %   \item Change fonts--e.g., by typing |{\em emphasized text\/}|
-% 
+%
 %   \item Insert text from a file \file{foo.tex} by typing
 %    |\input{foo}|. Beware that each |<return>| starts a new line, so
 %    if \file{foo.tex} ends with a |<return>| you can wind up with an
-%    extra blank line if you're not careful. 
-% 
+%    extra blank line if you're not careful.
+%
 %   \item Insert a math formula.  Note that |$| just produces a dollar
 %   sign, so you'll have to type |\(...\)| or |\[...\]|.  Also, |^|
 %   and |_| just produce their characters; use |\sp| or |\sb| for
@@ -183,7 +183,7 @@
   \def\@new@specials{}
 %    \end{macrocode}
 %    The command |\@remove| compares its argument with the argument of\\
-%    |\g@remfrom@specials|. 
+%    |\g@remfrom@specials|.
 %    \begin{macrocode}
   \def\@remove##1{%
     \ifx##1#1\else
@@ -194,7 +194,7 @@
     \g@addto@macro\@new@specials{\do ##1}\fi}
 %    \end{macrocode}
 %    Now we |\let| |\do| be equal to |\@remove| and execute
-%    |\dospecials|. 
+%    |\dospecials|.
 %    \begin{macrocode}
   \let\do\@remove\dospecials
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/alltt.ins b/Master/texmf-dist/source/latex/base/alltt.ins
index aa9bca9b09b..5239993efa4 100644
--- a/Master/texmf-dist/source/latex/base/alltt.ins
+++ b/Master/texmf-dist/source/latex/base/alltt.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/autoload.ins b/Master/texmf-dist/source/latex/base/autoload.ins
index ade001548e6..782b3a0dd37 100644
--- a/Master/texmf-dist/source/latex/base/autoload.ins
+++ b/Master/texmf-dist/source/latex/base/autoload.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -41,9 +41,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -53,7 +53,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -66,8 +66,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 \usepreamble\mainpreamble
diff --git a/Master/texmf-dist/source/latex/base/cfgguide.tex b/Master/texmf-dist/source/latex/base/cfgguide.tex
index 7ac0208ba4c..e47659fde92 100644
--- a/Master/texmf-dist/source/latex/base/cfgguide.tex
+++ b/Master/texmf-dist/source/latex/base/cfgguide.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: cfgguide.tex
 
diff --git a/Master/texmf-dist/source/latex/base/classes.dtx b/Master/texmf-dist/source/latex/base/classes.dtx
index 0d5411aa9ba..e9a6ca5e37c 100644
--- a/Master/texmf-dist/source/latex/base/classes.dtx
+++ b/Master/texmf-dist/source/latex/base/classes.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \CheckSum{2976}
 %% \CharacterTable
@@ -78,7 +78,7 @@
 %
 % The next bit of code contains the documentation driver file for
 % \TeX{}, i.e., the file that will produce the documentation you are
-% currently reading. It will be extracted from this file by the 
+% currently reading. It will be extracted from this file by the
 % {\sc docstrip} program.
 %
 % \changes{1.0f}{1993/12/07}{Use class ltxdoc document class}
@@ -190,7 +190,7 @@
 % \changes{v1.0j}{1993/12/10}{Use \cs{cmd} in change entries}
 % \changes{v1.0k}{1994/01/09}{Removed some typos/bugs}
 % \changes{v1.0l}{1994/01/11}{add the extension to the names of the
-%     files} 
+%     files}
 % \changes{v1.0l}{1994/01/10}{Changed version numbering; moved leqno
 %    and fleqn options to an external file.}
 % \changes{v1.0n}{1994/01/19}{Removed code for makeidx option and made
@@ -242,7 +242,7 @@
 % \maketitle
 % \tableofcontents
 %
-% \StopEventually{}    ^^A 
+% \StopEventually{}    ^^A
 %
 % \section{The {\sc docstrip} modules}
 %
@@ -424,7 +424,7 @@
 %
 %  \subsection{openright option}
 %    This option determines whether or not a chapter must start on
-%    a right-hand page 
+%    a right-hand page
 %    request one.
 %    \begin{macrocode}
 %<!article>\if@compatibility
@@ -819,7 +819,7 @@
 %    of the size option we do not change them to stay compatible with
 %    both \LaTeX~2.09 and older releases of \LaTeXe.
 % \changes{v1.3n}{1995/10/29}{Added setting the values of
-%    \cs{...skipamount}} 
+%    \cs{...skipamount}}
 %    \begin{macrocode}
 %<*10pt|11pt|12pt>
 \setlength\smallskipamount{3\p@ \@plus 1\p@ \@minus 1\p@}
@@ -1200,7 +1200,7 @@
 %    width except for a `real margin' of white space of width 0.4in.
 %    A check should perhaps be built in to ensure that the (text)
 %    margin width does not get too small!
-%    
+%
 % \changes{v1.1a}{1994/03/12}{New algorithm for \cs{oddsidemargin}}
 % \changes{v1.1a}{1994/03/12}{New algorithm for \cs{marginparwidth}}
 % \changes{v1.2z}{1995/04/14}{Also take \cs{marginparsep} into account
@@ -1213,7 +1213,7 @@
 %    For one-sided printing we center the text on the page, by
 %    calculating the difference between |\textwidth| and
 %    |\paperwidth|. Half of that difference is than used for
-%    the margin (thus |\oddsidemargin| is |1in| less). 
+%    the margin (thus |\oddsidemargin| is |1in| less).
 %    \begin{macrocode}
   \else
     \setlength\@tempdima        {\paperwidth}
@@ -1813,7 +1813,7 @@
 %    \end{macrocode}
 %    We center the entire title vertically; the centering is set off a
 %    little by adding a |\vskip|. (In compatibility mode the pagenumber
-%    is set to 0 by the titlepage environment to keep the behaviour 
+%    is set to 0 by the titlepage environment to keep the behaviour
 %    of \LaTeX\ 2.09 style files.)
 % \changes{v1.0g}{1993/12/09}{Removed the setting of the page number,
 %    when not in compatibility mode}
@@ -2209,7 +2209,7 @@
 %  \end{macro}
 %
 %  \begin{macro}{\mainmatter}
-%    This command clears the page, starts arabic page numbering and 
+%    This command clears the page, starts arabic page numbering and
 %    turns on chapter numbering.  Since this restarts the page numbering
 %    from 1, it should also ensure that a recto page is used.
 % \changes{v1.3r}{1996/05/26}{Make this command react to the option
@@ -2230,7 +2230,7 @@
 %  \end{macro}
 %
 %  \begin{macro}{\backmatter}
-%    This clears the page, turns off chapter numbering and leaves page 
+%    This clears the page, turns off chapter numbering and leaves page
 %    numbering unchanged.
 %    \begin{macrocode}
 \newcommand\backmatter{%
@@ -2706,7 +2706,7 @@
 % \changes{v1.0m}{1994/01/12}{Use em instead of pt to remain
 %    compatible with old styles}
 % \changes{v1.3q}{1995/12/20}{Temporary(?) fix: revert to setting
-%    \cs{leftmargin} at outer level} 
+%    \cs{leftmargin} at outer level}
 %
 % When we are in two column mode some of the margins are set somewhat
 % smaller.
@@ -2796,7 +2796,7 @@
 % \begin{macro}{\@listI}
 % |\@listi| defines the values of
 % |\leftmargin|, |\parsep|, |\topsep|, |\itemsep|, etc.\ for the
-% lists that appear on top-level. Its definition is modified by the 
+% lists that appear on top-level. Its definition is modified by the
 % font-size commands (eg within |\small| the list parameters get
 % ``smaller'' values).
 %
@@ -2806,17 +2806,17 @@
 %    \begin{macrocode}
 %<*10pt|11pt|12pt>
 \def\@listi{\leftmargin\leftmargini
-%<*10pt>    
+%<*10pt>
             \parsep 4\p@ \@plus2\p@ \@minus\p@
             \topsep 8\p@ \@plus2\p@ \@minus4\p@
             \itemsep4\p@ \@plus2\p@ \@minus\p@}
-%</10pt>            
-%<*11pt>            
+%</10pt>
+%<*11pt>
             \parsep 4.5\p@ \@plus2\p@ \@minus\p@
             \topsep 9\p@   \@plus3\p@ \@minus5\p@
             \itemsep4.5\p@ \@plus2\p@ \@minus\p@}
-%</11pt>            
-%<*12pt>            
+%</11pt>
+%<*12pt>
             \parsep 5\p@  \@plus2.5\p@ \@minus\p@
             \topsep 10\p@ \@plus4\p@   \@minus6\p@
             \itemsep5\p@  \@plus2.5\p@ \@minus\p@}
@@ -2847,15 +2847,15 @@
 %<*10pt>
               \topsep    4\p@ \@plus2\p@ \@minus\p@
               \parsep    2\p@ \@plus\p@  \@minus\p@
-%</10pt>                 
-%<*11pt>                 
+%</10pt>
+%<*11pt>
               \topsep    4.5\p@ \@plus2\p@ \@minus\p@
               \parsep    2\p@   \@plus\p@  \@minus\p@
-%</11pt>                 
-%<*12pt>                 
+%</11pt>
+%<*12pt>
               \topsep    5\p@   \@plus2.5\p@ \@minus\p@
               \parsep    2.5\p@ \@plus\p@    \@minus\p@
-%</12pt>                 
+%</12pt>
               \itemsep   \parsep}
 \def\@listiii{\leftmargin\leftmarginiii
               \labelwidth\leftmarginiii
@@ -3115,7 +3115,7 @@
 %  back to one at the end.  In compatibility mode, it sets the
 %  page number to zero. This is incorrect since it results in using
 %  the page parameters for a right-hand page but it is the way it was.
-%  In two-column style, it still makes a 
+%  In two-column style, it still makes a
 %  one-column page.
 %
 % \changes{v1.0g}{1993/12/09}{Moved the setting of
@@ -3184,7 +3184,7 @@
 %    \begin{itemize}
 %    \item reset the section and subsection counters to zero,
 %    \item redefine |\thesection| to produce alphabetic appendix
-%        numbers. This redefinition is done globally to ensure that it 
+%        numbers. This redefinition is done globally to ensure that it
 %        survives even if |\appendix| is issued within an environment such
 %        as \texttt{multicols}.
 %    \end{itemize}
@@ -3207,7 +3207,7 @@
 %    \item redefine the chapter counter to produce appendix numbers,
 %    \item possibly redefine the |\chapter| command if appendix titles
 %        and headings are to look different from chapter titles and
-%        headings. This redefinition is done globally to ensure that it 
+%        headings. This redefinition is done globally to ensure that it
 %        survives even if |\appendix| is issued within an environment such
 %        as \texttt{multicols}.
 %    \end{itemize}
@@ -3453,7 +3453,7 @@
 %
 % \begin{macro}{\c@table}
 %    First we have to allocate a counter to number the tables.
-%    
+%
 %    In the report and book document classes tables within chapters are
 %    numbered per chapter.
 % \changes{v1.3u}{1996/10/31}{Added test for non-zero chapter number}
@@ -3732,7 +3732,7 @@
 %
 % \changes{v1.0g}{1993/12/09}{Moved the setting of
 %    \cs{@restonecolfalse}}
-% \changes{v1.4h}{2007/10/19}{Explain why \cs{@mkboth} is insde the heading 
+% \changes{v1.4h}{2007/10/19}{Explain why \cs{@mkboth} is insde the heading
 %                         arg for \cs{tableofcontents} (pr/3285 and pr/3984)}
 %    \begin{macrocode}
 \newcommand\tableofcontents{%
@@ -3800,7 +3800,7 @@
 %    holds the part number is stored in \LaTeX's scratch register
 %    |\@tempdima|. Therefore we initialize it there even though we do
 %    not use |\numberline| internally---the value used is quite large
-%    so that something like |\numberline{VIII}| would still work.    
+%    so that something like |\numberline{VIII}| would still work.
 % \changes{v1.4d}{2001/04/21}{Initialize \cs{@tempdima} to some
 %    sensible value (pr/3327)}
 %    \begin{macrocode}
@@ -3809,14 +3809,14 @@
 %    \end{macrocode}
 %    We set |\parindent| to 0pt and use |\rightskip| to leave
 %    enough room for the pagenumbers.\footnote{^^A
-%        We should really set \cs{rightskip} to \cs{@tocrmarg} instead 
-%        of \cs{@pnumwidth} (no version of {\LaTeX} ever did this), 
+%        We should really set \cs{rightskip} to \cs{@tocrmarg} instead
+%        of \cs{@pnumwidth} (no version of {\LaTeX} ever did this),
 %        otherwise the \cs{rightskip} is too small.
-%        Unfortunately this can't be changed in {\LaTeXe} as we don't 
-%        want to create different versions of {\LaTeXe} which produce 
+%        Unfortunately this can't be changed in {\LaTeXe} as we don't
+%        want to create different versions of {\LaTeXe} which produce
 %        different typset output unless this is absolutely necessary;
 %        instead we suspend it for \LaTeX3.}
-%    To prevent overfull box messages the |\parfillskip| is set to a 
+%    To prevent overfull box messages the |\parfillskip| is set to a
 %    negative value.
 %    \begin{macrocode}
       \parindent \z@ \rightskip \@pnumwidth
@@ -3985,7 +3985,7 @@
 %
 % \changes{v1.0g}{1993/12/09}{Moved the setting of
 %    \cs{@restonecolfalse}}
-% \changes{v1.4c}{2001/01/06}{Moved \cs{@mkboth} out of heading 
+% \changes{v1.4c}{2001/01/06}{Moved \cs{@mkboth} out of heading
 %                             arg (pr/3285)}
 %    \begin{macrocode}
 \newcommand\listoffigures{%
@@ -4021,7 +4021,7 @@
 %
 % \changes{v1.0g}{1993/12/09}{Moved the setting of
 %    \cs{@restonecolfalse}}
-% \changes{v1.4c}{2001/01/06}{Moved \cs{@mkboth} out of heading 
+% \changes{v1.4c}{2001/01/06}{Moved \cs{@mkboth} out of heading
 %                             arg (pr/3285)}
 %    \begin{macrocode}
 \newcommand\listoftables{%
@@ -4098,7 +4098,7 @@
 %    The |\@mkboth| was moved out of the heading argument since at
 %    least in report and book (twocolumn option) there are definitions
 %    for |\chapter| which would swallow it otherwise.
-% \changes{v1.4c}{2001/01/06}{Moved \cs{@mkboth} out of heading 
+% \changes{v1.4c}{2001/01/06}{Moved \cs{@mkboth} out of heading
 %                             arg (pr/3285)}
 %    \begin{macrocode}
       \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}%
diff --git a/Master/texmf-dist/source/latex/base/classes.ins b/Master/texmf-dist/source/latex/base/classes.ins
index 0464db681b2..85ab77e41a0 100644
--- a/Master/texmf-dist/source/latex/base/classes.ins
+++ b/Master/texmf-dist/source/latex/base/classes.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/clsguide.tex b/Master/texmf-dist/source/latex/base/clsguide.tex
index 91066dc6048..3a99d1a15fb 100644
--- a/Master/texmf-dist/source/latex/base/clsguide.tex
+++ b/Master/texmf-dist/source/latex/base/clsguide.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: clsguide.tex
 
@@ -37,46 +37,46 @@
 \author{Copyright \copyright~1995--2006 The \LaTeX3 Project\\
    All rights reserved}
 
-\date{15 February 2006} 
+\date{15 February 2006}
 
 \begin{document}
- 
+
 \maketitle
- 
+
 \tableofcontents
- 
+
 \section{Introduction}
 
 This document is an introduction to writing classes and packages for
 \LaTeX{}, with special attention given to upgrading existing
 \LaTeX~2.09 packages to \LaTeXe{}.  The latter subject is also
 covered in an article by Johannes Braams published in TUGboat~15.3.
- 
+
 \subsection{Writing classes and packages for \LaTeXe}
- 
+
 \LaTeX{} is a document preparation system that enables the document
 writer to concentrate on the contents of their text, without bothering
 too much about the formatting of it.  For example, chapters are
 indicated by |\chapter{<title>}| rather than by selecting 18pt bold.
- 
+
 The file that contains the information about how to turn logical
 structure (like `|\chapter|') into formatting (like `18pt bold ragged
 right') is a \emph{document class}.  In addition, some features (such
 as colour or included graphics) are independent of the document class
 and these are contained in \emph{packages}.
- 
+
 One of the largest differences between \LaTeX~2.09 and \LaTeXe{} is in
 the commands used to write packages and classes.  In \LaTeX~2.09,
 there was very little support for writing |.sty| files, and so writers
 had to resort to using low-level commands.
- 
+
 \LaTeXe{} provides high-level commands for structuring packages.
 It is also much easier to build classes and packages on top of each
 other, for example writing a local technical report class |cetechr|
 (for the Chemical Engineering department) based on |article|.
- 
+
 \subsection{Overview}
- 
+
 This document contains an overview of how to write classes and
 packages for \LaTeX{}.  It does \emph{not} introduce all of the
 commands necessary to write packages: these can be found in either
@@ -84,33 +84,33 @@ commands necessary to write packages: these can be found in either
 commands for structuring classes and packages.
 
 \begin{description}
- 
+
 \item[Section~\ref{Sec:general}] contains some general advice about
   writing classes and packages.  It describes the difference between
   classes and packages, the command naming conventions, the use of
   |doc| and |docstrip|, how \TeX's primitive file and box commands
   interact with \LaTeX{}. It also contains some hints about general
   \LaTeX{} style.
- 
+
 \item[Section~\ref{Sec:structure}] describes the structure of classes
   and packages.  This includes building classes and packages on top of
   other classes and packages, declaring options and declaring
   commands.  It also contains example classes.
- 
+
 \item[Section~\ref{Sec:commands}] lists the new class and package
    commands.
- 
+
  \item[Section~\ref{Sec:upgrade}] gives detailed advice on how to
    upgrade existing \LaTeX~2.09 classes and packages to \LaTeXe{}.
- 
+
 \end{description}
- 
+
 \subsection{Further information}
- 
+
 For a general introduction to \LaTeX{}, including the new features of
 \LaTeXe{}, you should read \emph{\LaTeXbook}
 by Leslie Lamport~\cite{A-W:LLa94}.
- 
+
 A more detailed description of the new features of \LaTeX, including an
 overview of more than 200 packages and nearly 1000 ready to run examples, is
 to be found in \emph{\LaTeXcomp second edition} by Frank Mittelbach and
@@ -118,7 +118,7 @@ Michel Goossens~\cite{A-W:MG2004}.
 
 The \LaTeX{} system is based on \TeX{}, which is
 described in \emph{The \TeX book} by Donald E.~Knuth~\cite{A-W:DEK91}.
- 
+
 There are a number of documentation files which accompany every copy
 of \LaTeX{}.  A copy of \emph{\LaTeX{} News} will come out with each
 six-monthly release of \LaTeX{}, and is found in the files
@@ -127,7 +127,7 @@ six-monthly release of \LaTeX{}, and is found in the files
 \emph{\fntguide} describes the \LaTeX{} font selection scheme for
 class- and package-writers; it is in |fntguide.tex|. Configuring
 \LaTeX{} is covered by the guide \emph{\cfgguide} in
-\texttt{cfgguide.tex} whilst the philosophy behind our policy on 
+\texttt{cfgguide.tex} whilst the philosophy behind our policy on
 modifying \LaTeX{} is described in \emph{\modguide} in
 \texttt{modguide.tex}.
 
@@ -175,7 +175,7 @@ cannot be changed.
 We would, of course, welcome the production of better classes, or of
 packages that can be used to enhance these classes.  So your first
 thought when you consider such a deficiency will, we hope, be ``what
-can I do to improve this?''  
+can I do to improve this?''
 
 Similar considerations apply to those parts of the kernel that are
 implementing design decisions, many of which should be left to the
@@ -187,7 +187,7 @@ enhancements will have to wait for \LaTeX3.
 
 \section{Writing classes and packages}
 \label{Sec:writing}
- 
+
 This section covers some general points concerned with writing
 \LaTeX{} classes and packages.
 
@@ -206,33 +206,33 @@ supported by individuals: they should support only the new standard
 
 
 \subsection{Using `docstrip' and `doc'}
- 
+
 If you are going to write a large class or package for \LaTeX{} then
 you should consider using the |doc| software which comes with
-\LaTeX{}. 
+\LaTeX{}.
 \LaTeX{} classes and packages written using this can be
 processed in two ways: they can be run through \LaTeX{}, to produce
 documentation; and they can be processed with |docstrip|, to produce
 the |.cls| or |.sty| file.
- 
+
 The |doc| software can automatically generate indexes of definitions,
 indexes of command use, and change-log lists.  It is very useful for
 maintaining and documenting large \TeX{} sources.
- 
+
 The documented sources of the \LaTeX{} kernel itself, and of the
 standard classes, etc, are |doc| documents; they are in the |.dtx|
 files in the distribution.  You can, in fact, typeset the source code
 of the kernel as one long document, complete with index, by running
 \LaTeX{} on |source2e.tex|.  Typesetting these documents uses the
 class file |ltxdoc.cls|.
- 
+
 For more information on |doc| and |docstrip|, consult the files
 |docstrip.dtx|, |doc.dtx|, and \emph{\LaTeXcomp}.  For examples of its
 use, look at the |.dtx| files.
 
 \subsection{Is it a class or a package?}
 \label{Sec:classorpkg}
- 
+
 The first thing to do when you want to put some new \LaTeX{} commands
 in a file is to decide whether it should be a \emph{document class} or a
 \emph{package}.  The rule of thumb is:
@@ -250,59 +250,59 @@ Thus, a company might have a local |ownlet| class for printing letters
 with their own headed note-paper.  Such a class would build on top of
 the existing |letter| class but it cannot be used with any other
 document class, so we have |ownlet.cls| rather than |ownlet.sty|.
- 
+
 The |graphics| package, in contrast, provides commands for including
 images into a \LaTeX{} document.  Since these commands can be used
 with any document class, we have |graphics.sty| rather than
 |graphics.cls|.
- 
+
 
 \subsection{Command names}
- 
+
 \LaTeX{} has three types of command.
- 
+
 There are the author commands, such as |\section|, |\emph| and
 |\times|:  most of these have short names, all in lower case.
- 
+
 There are also the class and package writer commands:
 most of these have long mixed-case names such as the following.
 \begin{verbatim}
    \InputIfFileExists  \RequirePackage  \PassOptionsToClass
 \end{verbatim}
- 
+
 Finally, there are the internal commands used in the \LaTeX{}
 implementation, such as |\@tempcnta|, |\@ifnextchar| and |\@eha|:
 most of these commands contain |@| in their name, which means they
 cannot be used in documents, only in class and package files.
- 
+
 Unfortunately, for historical reasons the distinction between these
 commands is often blurred.  For example, |\hbox| is an internal
 command which should only be used in the \LaTeX{} kernel, whereas
 |\m@ne| is the constant $-1$ and could have been |\MinusOne|.
- 
+
 However, this rule of thumb is still useful: if a command has |@| in
 its name then it is not part of the supported \LaTeX{} language---and
 its behaviour may change in future releases!  If a command is
 mixed-case, or is described in \emph{\LaTeXbook}, then you can rely on
 future releases of \LaTeXe{} supporting the command.
- 
+
 \subsection{Box commands and colour}
 \label{Sec:colour}
- 
+
 Even if you do not intend to use colour in your own documents, by
 taking note of the points in this section you can ensure that your
 class or package is compatible with the |color| package. This may
 benefit people using your class or package who have access to colour
 printers.
- 
+
 The simplest way to ensure `colour safety' is to always use \LaTeX{}
 box commands rather than \TeX{} primitives, that is use |\sbox| rather
 than |\setbox|, |\mbox| rather than |\hbox| and |\parbox| or
 the |minipage| environment rather than |\vbox|.
 The \LaTeX{} box commands have new options which mean that they are now
 as powerful as the \TeX{} primitives.
- 
-As an example of what can go wrong, consider that in 
+
+As an example of what can go wrong, consider that in
 |{\ttfamily <text>}|
 the font is restored just \emph{before} the |}|, whereas in the
 similar looking construction
@@ -318,11 +318,11 @@ stored in the box. Exactly what bad effects this can have depends on
 how colour is implemented: it can range from getting the wrong
 colours in the rest of the document, to causing errors in the
 dvi-driver used to print the document.
- 
-Also of interest is the command |\normalcolor|.   This is 
+
+Also of interest is the command |\normalcolor|.   This is
 normally just |\relax| (i.e., does nothing)
-but you can use it rather like |\normalfont| to 
-set regions of the page such as captions or section headings to the 
+but you can use it rather like |\normalfont| to
+set regions of the page such as captions or section headings to the
 `main document colour'.
 
 
@@ -349,13 +349,13 @@ outside math mode: for example, neither |\textfont 1| nor
 The new system provides many commands designed to help you produce
 well-structured class and package files that are both robust and
 portable.  This section outlines some ways to make intelligent use of
-these. 
+these.
 
 \subsubsection{Loading other files}
 \label{Sec:loading}
 
 \NEWdescription{1995/12/01}
-\LaTeX{} provides these commands: 
+\LaTeX{} provides these commands:
 \begin{verbatim}
    \LoadClass        \LoadClassWithOptions
    \RequirePackage   \RequirePackageWithOptions
@@ -363,20 +363,20 @@ these.
 for using classes or packages inside other classes or packages.  We
 recommend strongly that you use them, rather than the primitive
 |\input| command, for a number of reasons.
- 
+
 Files loaded with |\input <filename>| will not be listed in the
 |\listfiles| list.
- 
+
 If a package is always loaded with |\RequirePackage...| or |\usepackage|
 then, even if its loading is requested several times, it will be
 loaded only once.  By contrast, if it is loaded with |\input| then it
 can be loaded more than once; such an extra loading may waste time and
 memory and it may produce strange results.
- 
+
 If a package provides option-processing then, again, strange results
 are possible if the package is |\input| rather than loaded by means of
 |\usepackage| or |\RequirePackage...|.
- 
+
 If the package |foo.sty| loads the package |baz.sty| by use of
 |\input baz.sty| then the user will get a warning:
 \begin{verbatim}
@@ -385,7 +385,7 @@ If the package |foo.sty| loads the package |baz.sty| by use of
 \end{verbatim}
 Thus, for several reasons, using |\input| to load packages is not a
 good idea.
- 
+
 Unfortunately, if you are upgrading the file |myclass.sty| to a class
 file then you have to make sure that any old files which contain
 |\input myclass.sty| still work.
@@ -404,7 +404,7 @@ For example, |article.sty| contains just the following lines:
 \end{verbatim}
 You may wish to do the same or, if you think that it is safe to do so,
 you may decide to just remove |myclass.sty|.
- 
+
 \subsubsection{Make it robust}
 
 We consider it good practice, when writing packages and classes, to use
@@ -415,20 +415,20 @@ Thus, instead of using |\def...| we recommend using one of
 also useful. Doing this makes
 it less likely that you will inadvertently redefine a command, giving
 unexpected results.
- 
+
 When you define an environment, use |\newenvironment| or
 |\renewenvironment| instead |\def\foo{...}| and |\def\endfoo{...}|.
- 
+
 If you need to set or change the value of a \m{dimen} or \m{skip}
 register, use |\setlength|.
- 
+
 To manipulate boxes, use \LaTeX{} commands such as |\sbox|,
 |\mbox| and |\parbox| rather than |\setbox|, |\hbox| and |\vbox|.
- 
+
 Use |\PackageError|, |\PackageWarning| or |\PackageInfo| (or the
 equivalent class commands) rather than |\@latexerr|, |\@warning| or
 |\wlog|.
- 
+
 It is still possible to declare options by defining |\ds@<option>| and
 calling |\@options|; but we recommend the |\DeclareOption| and
 |\ProcessOptions| commands instead.  These are more powerful and use
@@ -460,7 +460,7 @@ It is also useful if local classes or packages have a common prefix,
 for example the University of Nowhere classes might begin with |unw|.
 This helps to avoid every University having its own thesis class, all
 called |thesis.cls|.
- 
+
 If you rely on some features of the \LaTeX{} kernel, or on a package,
 please specify the release-date you need.  For example, the package
 error commands were introduced in the June 1994 release so, if you use
@@ -486,7 +486,7 @@ particular, no typesetting can be done.
 
 \section{The structure of a class or package}
 \label{Sec:structure}
- 
+
 \LaTeXe{} classes and packages have more structure than \LaTeX~2.09
 style files did.  The outline of a class or package file is:
 \begin{description}
@@ -500,9 +500,9 @@ style files did.  The outline of a class or package file is:
 \item[More declarations] This is where the file does most of its work:
    declaring new variables, commands and fonts; and loading other files.
 \end{description}
- 
+
 \subsection{Identification}
- 
+
 The first thing a class or package file does is identify itself.
 Package files do this as follows:
 \begin{verbatim}
@@ -527,7 +527,7 @@ For example:
 \NEWdescription{1998/06/19}
 The \m{date} should be given in the form `\textsc{yyyy/mm/dd}' and
 must be present if the optional argument is used (this is also true
-for the |\NeedsTeXFormat| command). 
+for the |\NeedsTeXFormat| command).
 Any derivation from this syntax will result in low-level \TeX{}
 errors---the commands expect a valid syntax to speed up the daily
 usage of the package or class and make no provision for the case that
@@ -538,10 +538,10 @@ This date is checked whenever a user specifies a date in their
 \begin{verbatim}
    \documentclass{article}[1995/12/23]
 \end{verbatim}
-then users at a different location 
+then users at a different location
 would get a warning that their copy of |article| was out of
 date.
- 
+
 The description of a class is displayed when the class is used.  The
 description of a package is put into the log file.  These descriptions
 are also displayed by the |\listfiles| command.  The phrase
@@ -549,14 +549,14 @@ are also displayed by the |\listfiles| command.  The phrase
 banner of any file other than those in the standard \LaTeX{}
 distribution.
 
- 
+
 \subsection{Using classes and packages}
- 
+
 The first major difference between \LaTeX~2.09 style files and
 \LaTeXe{} packages and classes is that \LaTeXe{} supports
 \emph{modularity}, in the sense of building files from small
 building-blocks rather than using large single files.
- 
+
 A \LaTeX{} package or class can load a package as follows:
 \begin{verbatim}
    \RequirePackage[<options>]{<package>}[<date>]
@@ -570,7 +570,7 @@ It allows packages or classes to use features provided by other
 packages.  For example, by loading the |ifthen| package, a package
 writer can use the `if\dots then\dots else\dots' commands provided
 by that package.
- 
+
 A \LaTeX{} class can load one other class as follows:
 \begin{verbatim}
    \LoadClass[<options>]{<class-name>}[<date>]
@@ -600,7 +600,7 @@ For example:
 \end{verbatim}
 
 \subsection{Declaring options}
- 
+
 \NEWdescription{1998/12/01}
 The other major difference between \LaTeX~2.09 styles and \LaTeXe{}
 packages and classes is in option handling.  Packages and classes can
@@ -666,7 +666,7 @@ class, you can use:
 \end{verbatim}
 If you do this then you should make sure you load the class at some
 later point, otherwise the options will never be processed!
- 
+
 So far, we have explained only how to declare options, not how to
 execute them.  To process the options with which the file was called,
 you should use:
@@ -676,7 +676,7 @@ you should use:
 This executes the \m{code} for each option that was both specified and
 declared (see Section~\ref{Sec:commands.options} for details of how
 this is done).
- 
+
 For example, if the |jane| package file contains:
 \begin{verbatim}
    \DeclareOption{foo}{\typeout{Saw foo.}}
@@ -686,16 +686,16 @@ For example, if the |jane| package file contains:
 \end{verbatim}
 and an author writes |\usepackage[foo,bar]{jane}|, then they will see
 the messages \texttt{Saw foo.} and \texttt{What's bar?}
- 
+
 \subsection{A minimal class file}
- 
+
 Most of the work of a class or package is in defining new commands, or
 changing the appearance of documents.  This is done in the body of the
 package, using commands such as |\newcommand| or |\setlength|.
 
 \LaTeXe{} provides several new commands to help class and package
 writers; these are described in detail in Section~\ref{Sec:commands}.
- 
+
 There are four things that every class file \emph{must} contain: these
 are a definition of |\normalsize|, values for |\textwidth| and
 |\textheight| and a specification for page-numbering.  So a minimal
@@ -713,13 +713,13 @@ distribution, as \texttt{minimal.cls}.} looks like this:
 However, this class file will not support footnotes, marginals,
 floats, etc., nor will it provide any of the 2-letter font commands
 such as |\rm|; thus most classes will contain more than this minimum!
- 
+
 \subsection{Example: a local letter class}
- 
+
 A company may have its own letter class, for setting letters in the
 company style.  This section shows a simple implementation of such a
 class, although a real class would need more structure.
- 
+
 The class begins by announcing itself as |neplet.cls|.
 \begin{verbatim}
    \NeedsTeXFormat{LaTeX2e}
@@ -742,9 +742,9 @@ the first page of letters.
    }
 \end{verbatim}
 And that's it!
- 
+
 \subsection{Example: a newsletter class}
- 
+
 A simple newsletter can be typeset with \LaTeX{}, using a variant of the
 |article| class.
 The class begins by announcing itself as |smplnews.cls|.
@@ -793,7 +793,7 @@ It redefines |\section| and switches off section numbering.
          {section}{1}{0pt}{-1.5ex plus -1ex minus -.2ex}%
          {1ex plus .2ex}{\large\sffamily\slshape\headlinecolor}%
    }
- 
+
    \setcounter{secnumdepth}{0}
 \end{verbatim}
 It also sets the three essential things.
@@ -806,20 +806,20 @@ In practice, a class would need more than this: it would provide
 commands for issue numbers, authors of articles, page styles and so
 on; but this skeleton gives a start.  The |ltnews| class file is not
 much more complex than this one.
- 
+
 \section{Commands for class and package writers}
 \label{Sec:commands}
- 
+
 This section describes briefly each of the new commands for class and
 package writers.  To find out about other aspects of the new system,
 you should also read \emph{\LaTeXbook}, \emph{\LaTeXcomp} and
 \emph{\usrguide}.
- 
+
 \subsection{Identification}
- 
+
 The first group of commands discussed here are those used
 to identify your class or package file.
- 
+
 \begin{decl}
 |\NeedsTeXFormat| \arg{format-name} \oarg{release-date}
 \end{decl}
@@ -830,12 +830,12 @@ format that is needed.  When the release date of the format is older
 than the one specified a warning will be generated. The standard
 \m{format-name} is \texttt{LaTeX2e}.  The date, if present, must be in
 the form \textsc{yyyy/mm/dd}.
- 
+
 Example:
 \begin{verbatim}
    \NeedsTeXFormat{LaTeX2e}[1994/06/01]
 \end{verbatim}
- 
+
 \begin{decl}
 |\ProvidesClass| \arg{class-name} \oarg{release-info} \\
 |\ProvidesPackage| \arg{package-name} \oarg{release-info}
@@ -857,25 +857,25 @@ release is not too old.
 
 The whole of this \m{release-info} information is displayed by
 |\listfiles| and should therefore not be too long.
- 
+
 Example:
 \begin{verbatim}
    \ProvidesClass{article}[1994/06/01 v1.0 Standard LaTeX class]
    \ProvidesPackage{ifthen}[1994/06/01 v1.0 Standard LaTeX package]
 \end{verbatim}
- 
+
 \begin{decl}
   |\ProvidesFile| \arg{file-name} \oarg{release-info}
 \end{decl}
 This is similar to the two previous commands except that here the full
 filename, including the extension, must be given. It is used for
 declaring any files other than main class and package files.
- 
+
 Example:
 \begin{verbatim}
    \ProvidesFile{T1enc.def}[1994/06/01 v1.0 Standard LaTeX file]
 \end{verbatim}
- 
+
 Note that the phrase \texttt{Standard LaTeX} \textbf{must not} be used
 in the identification banner of any file other than those in the
 standard \LaTeX{} distribution.
@@ -896,13 +896,13 @@ Packages and classes should use these commands to load other packages.
 
 The use of |\RequirePackage| is the same as the author command
 |\usepackage|.
- 
+
 Examples:
 \begin{verbatim}
    \RequirePackage{ifthen}[1994/06/01]
    \RequirePackageWithOptions{graphics}[1995/12/01]
 \end{verbatim}
- 
+
 \begin{decl}
   |\LoadClass| \oarg{options-list} \arg{class-name}
      \oarg{release-info}\\
@@ -913,7 +913,7 @@ Examples:
 These commands are for use \emph{only} in class files, they cannot be
 used in packages files;
 they can be used at most once within a class file.
- 
+
 The use of|\LoadClass| is the same as
 the use of |\documentclass| to load a class file.
 
@@ -945,7 +945,7 @@ There are some commands designed especially for use within the
   |\DeclareOption| \arg{option-name} \arg{code}
 \end{decl}
 This makes \m{option-name} a `declared option' of the class or package
-in which it is put.  
+in which it is put.
 
 The \m{code} argument contains the code to be executed if that option
 is specified for the class or package; it can contain any valid
@@ -955,7 +955,7 @@ Example:
 \begin{verbatim}
    \DeclareOption{twoside}{\@twosidetrue}
 \end{verbatim}
- 
+
 \begin{decl}
   |\DeclareOption*| \arg{code}
 \end{decl}
@@ -984,7 +984,7 @@ used within these arguments can be found in the next few subsections.
   |\CurrentOption|
 \end{decl}
 This expands to the name of the current option.
- 
+
 \begin{decl}
   |\OptionNotUsed|
 \end{decl}
@@ -997,7 +997,7 @@ be added to the list of `unused options'.
   necessary to double them).
 
 \subsection{Moving options around}
-\label{Sec:opmove} 
+\label{Sec:opmove}
 
 These two commands are also very useful within the \m{code} argument
 of |\DeclareOption| or |\DeclareOption*|:
@@ -1010,7 +1010,7 @@ The command |\PassOptionsToPackage| passes the option names in
 This means that it adds the \m{option-list} to the
 list of options used by any future |\RequirePackage| or |\usepackage|
 command for package \m{package-name}.
- 
+
 Example:
 \begin{verbatim}
    \PassOptionsToPackage{foo,bar}{fred}
@@ -1023,7 +1023,7 @@ is the same as:
 
 Similarly, |\PassOptionsToClass| may be used in a class file to pass
 options to another class to be loaded with |\LoadClass|.
- 
+
 \NEWdescription{1995/12/01}
 The effects and use of these two commands should be contrasted with
 those of the following two (documented above, in \ref{Sec:loadf}):
@@ -1077,7 +1077,7 @@ declared.
 \subsection{Delaying code}
 \label{Sec:delays}
 
-These first two commands are also intended primarily for use within 
+These first two commands are also intended primarily for use within
 the \m{code} argument of |\DeclareOption| or |\DeclareOption*|.
 
 \begin{decl}
@@ -1087,18 +1087,18 @@ the \m{code} argument of |\DeclareOption| or |\DeclareOption*|.
 These commands declare \m{code} that is saved away internally and then
 executed after processing the whole of the current class or package
 file.
- 
+
 Repeated use of these commands is permitted: the code in the
 arguments is stored (and later executed) in the order of their
 declarations.
- 
+
 \begin{decl}
   |\AtBeginDocument| \arg{code}\\
   |\AtEndDocument| \arg{code}
 \end{decl}
 These commands declare \m{code} to be saved internally and executed
 while \LaTeX{} is executing |\begin{document}| or |\end{document}|.
- 
+
 The \m{code} specified in the argument to |\AtBeginDocument| is
 executed near the end of the |\begin{document}| code, \emph{after} the
 font selection tables have been set up.  It is therefore a useful
@@ -1116,11 +1116,11 @@ executed at the beginning of the |\end{document}| code,
 floating environments are processed. If some of the \m{code} is to be
 executed after these two processes, you should include a |\clearpage|
 at the appropriate point in \m{code}.
- 
+
 Repeated use of these commands is permitted: the code in the
 arguments is stored (and later executed) in the order of their
 declarations.
- 
+
 \begin{decl}[1994/12/01]
   |\AtBeginDvi| \arg{specials}
 \end{decl}
@@ -1130,21 +1130,21 @@ document.
 
 This should not be used for anything that will add any typeset
 material to the |.dvi| file.
- 
+
 Repeated use of this command is permitted.
- 
+
 
 \subsection{Option processing}
 \label{Sec:commands.options}
- 
+
 \begin{decl}
   |\ProcessOptions|
 \end{decl}
 This command executes the \m{code} for each selected option.
- 
+
 We shall first describe how |\ProcessOptions| works in a package file,
 and then how this differs in a class file.
- 
+
 To understand in detail what |\ProcessOptions| does in a package file,
 you have to know the difference between \emph{local} and \emph{global}
 options.
@@ -1226,7 +1226,7 @@ Note the following:
   were specified), whilst the |twocolumn| option does not: this is
   because |twocolumn| is a global option.
 \end{itemize}
- 
+
 In a class file, |\ProcessOptions| works in the same way, except
 that: \emph{all} options are local; and the default value for
 |\DeclareOption*| is |\OptionNotUsed| rather than an error.
@@ -1244,7 +1244,7 @@ error messages being issued.
 This is like |\ProcessOptions| but it executes the options in the
 order specified in the calling commands, rather than in the order of
 declaration in the class or package. For a package this means that the
-global options are processed first. 
+global options are processed first.
 
 The |\@options| command from \LaTeX~2.09 has been made equivalent to
 this in order to ease the task of updating old document styles to
@@ -1254,8 +1254,8 @@ this in order to ease the task of updating old document styles to
   |\ExecuteOptions| \arg{options-list}
 \end{decl}
 
-For each option in the \m{options-list}, in order, 
-this command simply executes the command 
+For each option in the \m{options-list}, in order,
+this command simply executes the command
 |\ds@<option>| (if this command is not defined, then that option is
 silently ignored).
 
@@ -1269,19 +1269,19 @@ in two columns. Then it could specify:
 
 
 \subsection{Safe file commands}
- 
+
 These commands deal with file input; they ensure that the non-existence
 of a requested file can be handled in a user-friendly way.
- 
+
 \begin{decl}
 |\IfFileExists| \arg{file-name} \arg{true} \arg{false}
 \end{decl}
 If the file exists then the code specified in \m{true} is
 executed.
- 
+
 If the file does not exist then the code specified in \m{false} is
 executed.
- 
+
 This command does \emph{not} input the file.
 
 \begin{decl}
@@ -1292,15 +1292,15 @@ before the input, the code specified in \m{true} is executed.
 
 If the file does not exist then the code specified in \m{false} is
 executed.
- 
+
 It is implemented using |\IfFileExists|.
 
 
 \subsection{Reporting errors, etc}
- 
+
 These commands should be used by third party classes and packages to
 report errors, or to provide information to authors.
- 
+
 \begin{decl}
   |\ClassError| \arg{class-name} \arg{error-text} \arg{help-text}\\
   |\PackageError| \arg{package-name} \arg{error-text} \arg{help-text}
@@ -1308,7 +1308,7 @@ report errors, or to provide information to authors.
 These produce an error message.  The \m{error-text} is displayed and the
 |?| error prompt is shown.  If the user types |h|, they will be shown
 the \m{help-text}.
- 
+
 Within the \m{error-text} and \m{help-text}: |\protect| can be used to
 stop a command from expanding; |\MessageBreak| causes a line-break;
 and |\space| prints a space.
@@ -1340,7 +1340,7 @@ If the user types |h|, this will be shown:
    Oh dear! Something's gone wrong.
      Try typing  <<return>>  to proceed, ignoring \foo.
 \end{verbatim}
- 
+
 \begin{decl}
   |\ClassWarning| \arg{class-name} \arg{warning-text}\\
   |\PackageWarning| \arg{package-name} \arg{warning-text}\\
@@ -1365,11 +1365,11 @@ stop a command from expanding; |\MessageBreak| causes a line-break;
 and |\space| prints a space.
 Also, these should not end with a full stop as one is
 automatically added.
- 
+
 
 \subsection{Defining commands}
 \label{Sec:commands.define}
- 
+
 \LaTeXe{} provides some extra methods of (re)defining commands that are
 intended for use in class and package files.
 
@@ -1390,7 +1390,7 @@ a robust command, even if some code within the\m{definition} is
 fragile.  You can use this command to define new robust commands, or
 to redefine existing commands and make them robust.  A log is put into
 the transcript file if a command is redefined.
- 
+
 For example, if |\seq| is defined as follows:
 \begin{verbatim}
    \DeclareRobustCommand{\seq}[2][n]{%
@@ -1422,7 +1422,7 @@ This takes the same arguments as |\newcommand| but, rather than define
 \m{cmd}, it just checks that the current definition of \m{cmd} is
 exactly as given by \m{definition}.  An error is raised if these
 definitions differ.
- 
+
 This command is useful for checking the state of the system before
 your package starts altering the definitions of commands.  It allows
 you to check, in particular, that no other package has redefined the
@@ -1442,7 +1442,7 @@ We hope that these changes will not affect many packages.
 \label{Sec:commands.misc}
 
 \subsection{Layout parameters}
- 
+
 \begin{decl}
 |\paperheight|\\
 |\paperwidth|
@@ -1477,7 +1477,7 @@ For example:
 \begin{tabular}{rl}
    |\uppercase{aBcD\ae\AA\ss\OE}| & \uppercase{aBcD\ae\AA\ss\OE}\\
    |\lowercase{aBcD\ae\AA\ss\OE}| & \lowercase{aBcD\ae\AA\ss\OE}\\
-   |\MakeUppercase{aBcD\ae\AA\ss\OE}| & 
+   |\MakeUppercase{aBcD\ae\AA\ss\OE}| &
                                       \MakeUppercase{aBcD\ae\AA\ss\OE}\\
    |\MakeLowercase{aBcD\ae\AA\ss\OE}| & \MakeLowercase{aBcD\ae\AA\ss\OE}
 \end{tabular}
@@ -1581,11 +1581,11 @@ default setting will be over-ridden.
 
 \section{Upgrading \LaTeX~2.09 classes and packages}
 \label{Sec:upgrade}
- 
+
 This section describes the changes you may need to make when you
 upgrade an existing \LaTeX{} style to a package or class but we shall
 start in optimistic mode.
- 
+
 Many existing style files will run with \LaTeXe{} without any
 modification to the file itself.  When everything is running OK,
 please put a note in the newly created package or class file to record
@@ -1617,7 +1617,7 @@ reasons.
 \begin{itemize}
 \item \LaTeX{} now has a robust, well-defined designer's interface for
   selecting fonts, which is very different from the \LaTeX~2.09
-  internals.  
+  internals.
 \item Your style file may have used some \LaTeX~2.09 internal commands
   which have changed, or which have been removed.
 \end{itemize}
@@ -1651,13 +1651,13 @@ condition, as follows:
 
 
 \subsection{Font commands}
- 
+
 Some font and size commands are now defined by the document class
 rather than by the \LaTeX{} kernel.  If you are upgrading a
 \LaTeX~2.09 document style to a class that does not load one of the
 standard classes, then you will probably need to add definitions for
 these commands.
- 
+
 \begin{decl}
    |\rm| |\sf| |\tt| |\bf| |\it| |\sl| |\sc|
 \end{decl}
@@ -1676,7 +1676,7 @@ One possible definition is:
 This would make the font commands orthogonal; for example
 |{\bf\it text}| would produce bold italic, thus: \textbf{\textit{text}}.
 It will also make them produce an error if used in math mode.
- 
+
 Another possible definition is:
 \begin{verbatim}
    \DeclareOldFontCommand{\rm}{\rmfamily}{\mathrm}
@@ -1696,7 +1696,7 @@ follow the standard classes and define:
    \DeclareOldFontCommand{\sc}{\normalfont\scshape}{\mathsc}
 \end{verbatim}
 This means, for example, that |{\bf\it text}| will produce medium
-weight (rather than bold) italic, thus: \textit{text}.  
+weight (rather than bold) italic, thus: \textit{text}.
 
 \begin{decl}
    |\normalsize| \\
@@ -1728,11 +1728,11 @@ This means you should use |\renewcommand| for |\normalsize| and
 
 
 \subsection{Obsolete commands}
- 
+
 Some packages will not work with \LaTeXe{}, normally because they relied
 on an internal \LaTeX{} command which was never supported and has now
 changed, or been removed.
- 
+
 In many cases there will now be a robust, high-level means of
 achieving what previously required low-level commands.  Please consult
 Section~\ref{Sec:commands} to see if you can now use the \LaTeXe{}
@@ -1750,7 +1750,7 @@ check any that you have used or changed.
 
 We shall, however, list some of the more important commands which are
 no longer supported.
- 
+
 \begin{decl}
    |\tenrm| |\elvrm| |\twlrm| \dots\\
    |\tenbf| |\elvbf| |\twlbf| \dots\\
@@ -1769,7 +1769,7 @@ For example, the command |\twlsf| should be replaced by:
 Another possibility is to use the |rawfonts| package, described in
 \emph{\usrguide}.
 
-Also, remember that many of the fonts preloaded by \LaTeX~2.09 
+Also, remember that many of the fonts preloaded by \LaTeX~2.09
 are no longer preloaded.
 
 \begin{decl}
@@ -1799,7 +1799,7 @@ These commands have now been reimplemented using
 If your package redefined one of the |\p|-commands then you must
 remove the redefinition and use |\DeclareRobustCommand| to redefine the
 non-|\p| command.
- 
+
 \begin{decl}
 |\footheight|\\
 |\@maxsep|\\
@@ -1808,20 +1808,20 @@ non-|\p| command.
 These parameters are not used by \LaTeXe{} so they have been removed,
 except in \LaTeX~2.09 compatibility mode.  Classes should no longer
 set them.
- 
+
 \begin{thebibliography}{1}
- 
+
 \bibitem{A-W:DEK91}
 Donald~E. Knuth.
 \newblock {\em The \TeX book}.
 \newblock Addison-Wesley, Reading, Massachusetts, 1986.
 \newblock Revised to cover \TeX3, 1991.
- 
+
 \bibitem{A-W:LLa94}
 Leslie Lamport.
 \newblock {\em {\LaTeX:} A Document Preparation System}.
 \newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994.
- 
+
 \bibitem{A-W:MG2004}
 Frank Mittelbach and Michel Goossens.
 \newblock {\em The {\LaTeX} Companion second edition}.
@@ -1856,7 +1856,7 @@ Section references below are to \emph{\clsguide}.
 
   If your file sets up new fonts, font-changing commands or symbols,
   you should also read \emph{\fntguide}.
-  
+
 \item It did not work?  There are three possibilities here:
   \begin{itemize}
   \item  error messages are produced whilst reading your file;
diff --git a/Master/texmf-dist/source/latex/base/cmextra.ins b/Master/texmf-dist/source/latex/base/cmextra.ins
index bc00b9594b9..d8714c26a3f 100644
--- a/Master/texmf-dist/source/latex/base/cmextra.ins
+++ b/Master/texmf-dist/source/latex/base/cmextra.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file may only be distributed together with a copy of the LaTeX
@@ -79,39 +79,39 @@ of this file under its original name.
 %
 % \Ask\answer{%
 %      **************************************************************
-%   ^^J* 
+%   ^^J*
 %   ^^J* Do you have the Concrete Roman fonts installed on your system,
 %   ^^J* or do you intend to install them?
-%   ^^J*  
+%   ^^J*
 %   ^^J* If so please answer with `y' otherwise with `n' below.
 %   ^^J*
-%   ^^J* You can easily redo this installation later in case you 
+%   ^^J* You can easily redo this installation later in case you
 %   ^^J* change your mind.
 %   ^^J**************************************************************}
-% 
+%
 % {\ifx\answer\y
-% 
+%
 % \Msg{*** Generating font defs for Cork encoded fonts ***}
 % \Msg{*** Generating font defs for old TeX Text encoding ***}
 % \Msg{*** Generating font defs for math italic encoding ***}
-% 
+%
 % \generate{%
 %   \file{t1ccr.fd}{\from{cmfonts.fdd}{fd,T1ccr}}
 %   \file{ot1ccr.fd}{\from{cmfonts.fdd}{fd,OT1ccr}}
 %   \file{omlccm.fd}{\from{cmfonts.fdd}{fd,OMLccm}}}
-% 
+%
 % \fi}
 
 \Ask\answer{%
      **************************************************************
-  ^^J* 
+  ^^J*
   ^^J* Do you have the cyrillic fonts from the University of
   ^^J* Washington installed on your system,
   ^^J* or do you intend to install them?
-  ^^J*  
+  ^^J*
   ^^J* If so please answer with `y' otherwise with `n' below.
   ^^J*
-  ^^J* You can easily redo this installation later in case you 
+  ^^J* You can easily redo this installation later in case you
   ^^J* change your mind.
   ^^J**************************************************************}
 
diff --git a/Master/texmf-dist/source/latex/base/cmfonts.fdd b/Master/texmf-dist/source/latex/base/cmfonts.fdd
index bc1c329a8ea..794fd3ef22c 100644
--- a/Master/texmf-dist/source/latex/base/cmfonts.fdd
+++ b/Master/texmf-dist/source/latex/base/cmfonts.fdd
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \CheckSum{295}
 %
@@ -87,7 +87,7 @@
 %\fi
 %
 %
-% 
+%
 % \changes{v2.5e}{1997/06/16}{Replaced reference to DC-fonts by ec
 %    fonts.}
 % \changes{v2.5c}{1997/05/26}{Removed spaces in and around arguments
@@ -106,11 +106,11 @@
 %      {Dont force T1 hyphenchar to 127. latex/1853}
 % \changes{v2.4c}{1995/11/07}{Use decimal rather than octal character
 % specification for \cs{hyphenchar} and \cs{skewchar} so that there is
-% no problem with an active quote character.} 
+% no problem with an active quote character.}
 % \changes{v2.4a}{1995/10/22}{Added support for new (v1.2) DC fonts
 %    and text companion fonts (TS1 encoding).}
 % \changes{v2.3d}{1994/11/02}{Added more font substitutions for
-%    \cs{pounds}.} 
+%    \cs{pounds}.}
 % \changes{v2.3d}{1994/10/30}{Added OMLcmr.fd and OMScmr.fd.}
 % \changes{v2.3b}{1994/05/12}{Added \cs{ProvidesFile} commands}
 % \changes{v2.3a}{1994/05/03}{Included definitions for
@@ -513,7 +513,7 @@
 %<ec>ecssdc10
        }{}
 %    \end{macrocode}
-% 
+%
 %    \begin{macrocode}
 %<*!new&!ec>
 %<+T1cmss>%%%%%%%% bold extended series
@@ -612,7 +612,7 @@
 %
 % \subsubsection{Computer Modern Variable Typewriter}
 %
-%    The Computer Modern Variable Typewriter family is the 
+%    The Computer Modern Variable Typewriter family is the
 %    proportional spaced version of the Computer Modern Typewriter
 %    family. It is implemented as a separate family to allow easy use
 %    in normal text, including changes of shape/series etc if available.
@@ -942,7 +942,7 @@
 %<-ori>      <5><6><7><8><9>cmssdc10%
        <10><10.95><12><14.4><17.28><20.74><24.88>cmssdc10%
        }{}
- 
+
 %<+OT1cmss,Ucmss>%%%%%%%%% bold extended series
 %<+OT1cmss>\DeclareFontShape{OT1}{cmss}{bx}{n}
 %<+Ucmss>\DeclareFontShape{U}{cmss}{bx}{n}%
@@ -1030,7 +1030,7 @@
 %
 % \subsubsection{Computer Modern Variable Typewriter (\texttt{OT1})}
 %
-%    The Computer Modern Variable Typewriter family is the 
+%    The Computer Modern Variable Typewriter family is the
 %    proportional spaced version of the Computer Modern Typewriter
 %    family. It is implemented as a separate family to allow easy use
 %    in normal text, including changes of shape/series etc if available.
@@ -1125,7 +1125,7 @@
 %
 %  \subsubsection{Computer Modern Roman Math italics}
 %
-%  \changes{v2.3d}{1994/10/30}{Added OMLcmr font substitutions pointing 
+%  \changes{v2.3d}{1994/10/30}{Added OMLcmr font substitutions pointing
 %     to OMLcmm. }
 %  \changes{v2.3f}{1995/04/22}{Corrected OMLcmr \cs{skewchar}}
 %
@@ -1152,7 +1152,7 @@
    {<->ssub*cmm/b/it}{}
 %</OMLcmr>
 %    \end{macrocode}
-% 
+%
 %  \subsubsection{Computer Modern Math symbols}
 %
 %  \changes{v2.3a}{1994/05/02}{Included font definitions for
@@ -1173,10 +1173,10 @@
 %
 %  \subsubsection{Computer Modern Roman Math symbols}
 %
-%  \changes{v2.3d}{1994/10/30}{Added OMScmr font substitutions pointing 
+%  \changes{v2.3d}{1994/10/30}{Added OMScmr font substitutions pointing
 %     to OMScmm. }
 %
-%  Some text symbols like `\P' and `\dag' are kept in the OMS encoding, 
+%  Some text symbols like `\P' and `\dag' are kept in the OMS encoding,
 %  so we need font substititutions from OMS/cmr to OMS/cmsy.
 %    \begin{macrocode}
 %<*OMScmr>
diff --git a/Master/texmf-dist/source/latex/base/cmfonts.ins b/Master/texmf-dist/source/latex/base/cmfonts.ins
index 775b74eaa55..5016ea751e2 100644
--- a/Master/texmf-dist/source/latex/base/cmfonts.ins
+++ b/Master/texmf-dist/source/latex/base/cmfonts.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file may only be distributed together with a copy of the LaTeX
@@ -93,7 +93,7 @@ of this file under its original name.
           \file{omscmr.fd}{\from{cmfonts.fdd}{OMScmr}}
           }
 
- 
+
 \ifToplevel{
 \Msg{***********************************************************}
 \Msg{*}
@@ -108,6 +108,6 @@ of this file under its original name.
 \Msg{* Happy TeXing}
 \Msg{***********************************************************}
 }
- 
+
 \endbatchfile
 
diff --git a/Master/texmf-dist/source/latex/base/cyrguide.tex b/Master/texmf-dist/source/latex/base/cyrguide.tex
index 4080fcb617d..e9a163aead6 100644
--- a/Master/texmf-dist/source/latex/base/cyrguide.tex
+++ b/Master/texmf-dist/source/latex/base/cyrguide.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 
@@ -97,7 +97,7 @@ were written by Werner Lemberg and Vladimir Volovich (except that the
 concrete hyphenation patterns which are part of \textsf{ruhyphen} came
 from individual authors).  The support for the Ukrainian language was
 prepared by Andrij Shvaika.
-  
+
 
 \section{Installation}
 
@@ -154,7 +154,7 @@ releases of \babel{}, will be withdrawn in the near future and replaced
 by the |OT2| encoding.
 
 \subsection{Getting pre-built packages}
- 
+
 Many of the major \TeX{} distributions, such as te\TeX{}, fp\TeX{} and
 \TeX{}live, contain (or soon will) everything that is needed,
 including the LH~fonts, \textsf{ruhyphen} and the latest version of
@@ -301,15 +301,15 @@ variants of each other).
 
 \item |cp855| --- the standard \mbox{MS-DOS} Cyrillic code-page.
 
-\item |cp866| --- the standard \mbox{MS-DOS} Russian code-page.  
+\item |cp866| --- the standard \mbox{MS-DOS} Russian code-page.
   Several code-pages very similar to this are also supported
   (the differences are all in the range 242--254).
   \begin{itemize}
   \item |cp866av| -- the `Cyrillic Alternative' code-page (an
     alternative variant of cp866);
-  \item |cp866mav| --  the `Modified Alternative Variant'; 
-  \item |cp866nav| --  the `New Alternative Variant'; 
-  \item |cp866tat| --  an experimental Tatarian code-page.    
+  \item |cp866mav| --  the `Modified Alternative Variant';
+  \item |cp866nav| --  the `New Alternative Variant';
+  \item |cp866tat| --  an experimental Tatarian code-page.
   \end{itemize}
 
 \item |cp1251| --- the standard MS Windows Cyrillic code-page.
@@ -321,7 +321,7 @@ variants of each other).
   code-pages which coincide for all Russian letters but add some other
   Cyrillic letters. The following are supported:
   \begin{itemize}
-  \item \mbox{\texttt{koi8-u}}  -- for Ukrainian; 
+  \item \mbox{\texttt{koi8-u}}  -- for Ukrainian;
   \item \mbox{\texttt{koi8-ru}} -- this is described in a draft RFC
     document specifying a widely used character set for mail and news
     exchange in the Ukrainian internet community, as well as for
@@ -331,7 +331,7 @@ variants of each other).
 
 \item |iso88595| --- the \mbox{ISO 8859-5} Cyrillic code-page (also called
   \mbox{ISO-IR-144}).
-  
+
 \item |maccyr| --- the Apple Macintosh Cyrillic code-page (also known
   as Microsoft cp10007) and |macukr|, the Apple Macintosh Ukrainian
   code-page, very similar to the Cyrillic code-page.
diff --git a/Master/texmf-dist/source/latex/base/doc.dtx b/Master/texmf-dist/source/latex/base/doc.dtx
index 15b6719427b..2b98a6b0e71 100644
--- a/Master/texmf-dist/source/latex/base/doc.dtx
+++ b/Master/texmf-dist/source/latex/base/doc.dtx
@@ -3,29 +3,29 @@
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
 %           2006 2007 2008 2009 2010
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % ^^A -*-LaTeX-*-
 %
@@ -61,7 +61,7 @@
 %           Everything up to the next `\ fi' (without a blank) will
 %           be ignored.  This is necessary because `%' may no longer
 %           be a comment mark when this file is read in.
-%           
+%
 %
 %% Package `doc' to use with LaTeX 2e
 %% Copyright (C) 1989-1999 Frank Mittelbach, all rights reserved.
@@ -92,7 +92,7 @@
 %
 %
 % \hyphenation{make-index}
-% 
+%
 % \DoNotIndex{\@,\@@par,\@beginparpenalty,\@empty}
 % \DoNotIndex{\@flushglue,\@gobble,\@input}
 % \DoNotIndex{\@makefnmark,\@makeother,\@maketitle}
@@ -201,24 +201,24 @@
 % since the last published version \cite{art:doc} but which have been
 % present in distributed versions of \texttt{doc.sty} for some time.  It
 % also integrates the (undocumented) features of the distributed
-% \texttt{newdoc.sty}. 
+% \texttt{newdoc.sty}.
 %
 % The following changes and additions have been made to the user
 % interface since the published version~\cite{art:doc}.  See
-% \S\ref{sec:interface} for more details. 
+% \S\ref{sec:interface} for more details.
 % \begin{description}
 % \item[Driver mechanism] "\DocInput" is now used in the driver file
 %    to input possibly multiple independent \DOC{} files and \DOC{} no
 %    longer has to be the last package.  "\IndexListing" is replaced
-%    by "\IndexInput"; 
+%    by "\IndexInput";
 % \item[Indexing] is controlled by "\PageIndex" and "\CodelineIndex",
 %    one of which must be specified to produce an index---there is no
-%    longer a "\makeindex" in the default "\DocstyleParms"; 
+%    longer a "\makeindex" in the default "\DocstyleParms";
 % \item[The \texttt{macro} environment] now takes as argument the
 %    macro name {\em with\/} the backslash;
 % \item[Verbatim text] Newlines are now forbidden inside "\verb" and
 %    commands "\MakeShortVerb" and "\DeleteShortVerb" are provided for
-%    verbatim shorthand; 
+%    verbatim shorthand;
 % \item[\texttt{\bslash par}] can now be used in "\DoNotIndex";
 % \item[Checksum/character table support] for ensuring the integrity
 %    of distributions is added;
@@ -277,7 +277,7 @@
 %
 % \ifmulticols
 % \end{multicols}
-% 
+%
 % \begin{multicols}{2}[\medskip \rule{\textwidth}{.3pt}
 %                      \section{Introduction}]
 % \else
@@ -357,7 +357,7 @@
 % package one has to prepare a special driver file which produces the
 % formatted document. This driver file has the following
 % characteristics:
-% 
+%
 % \noindent |\documentclass[|\meta{options}]^^A
 %           |{|\meta{document-class}|}|\\[1pt]
 % |\usepackage{doc}|\\[3pt]
@@ -368,7 +368,7 @@
 %
 % The \meta{document-class} might be any document class, I normally
 % use \texttt{article}.
-% 
+%
 % In the \meta{preamble} one should place declarations which
 % manipulate the behavior of the \DOC{} package like
 % |\DisableCrossrefs| or |\OnlyDescription|.
@@ -377,24 +377,24 @@
 % Finally the \meta{special input commands} part should contain one or
 % more |\DocInput|\meta{file name} and/or
 % |\IndexInput|\meta{file name} commands.  The
-% |\DocInput| command is used for files prepared for the 
+% |\DocInput| command is used for files prepared for the
 % \DOC{} package whereas |\IndexInput| can be used for all kinds of
 % macro files.  See page \pageref{..Input} for more details of
 % "\IndexInput".  Multiple "\DocInput"s can be used with a
 % number of included files which are each self-contained
 % self-documenting packages---for instance, each containing
-% "\maketitle". 
+% "\maketitle".
 %
 % As an example, the driver file for the \DOC{} package itself is
 % the following text surrounded by "%<*driver>" and "%</driver>".
 % To produce the documentation you can simply run the \texttt{.dtx}
 % file through \LaTeX{} in which case this code will be executed
 % (loading the document class \texttt{ltxdoc}, etc.) or you can
-% extract this into a separate file by using 
+% extract this into a separate file by using
 % the \texttt{docstrip} program.
 % The line numbers below are added by
-% \DOC{}'s formatting.  
-% Note that the class \textsf{ltxdoc} has the \DOC{} package 
+% \DOC{}'s formatting.
+% Note that the class \textsf{ltxdoc} has the \DOC{} package
 % preloaded.
 % \changes{v1.7a}{1992/03/06}{Added
 %                 docstrip-derivable driver file as example.}
@@ -402,7 +402,7 @@
 %    \begin{macrocode}
 %<*driver>
 \documentclass{ltxdoc}
-\EnableCrossrefs         
+\EnableCrossrefs
  %\DisableCrossrefs % Say \DisableCrossrefs if index is ready
 \CodelineIndex
 \RecordChanges                  % Gather update information
@@ -495,7 +495,7 @@
 % \changes{v1.7a}{1992/02/26}{Documented \cs{verb} change.}
 % \DescribeMacro\verb
 % The "\verb" command is re-implemented to give an error report if a
-% newline appears in its argument. 
+% newline appears in its argument.
 % The \textsf{verbatim} and \textsf{verbatim$*$} environments set text
 % in the style defined by "\MacroFont"~(\S\ref{sec:macrofont}).
 %
@@ -509,7 +509,7 @@
 % macro.\footnote{This is a change to the style design I described in
 %                ^^A \TUB ^^A removed in case ltugboat.sty not used
 %                \textsl{TUGboat\/}\ 10\#1 (Jan.~89). We finally decided
-%                that it would 
+%                that it would
 %                be better to use the macro name {\em with\/} the
 %                backslash as an argument.}
 % This argument is also used to print the name in the margin and to
@@ -521,7 +521,7 @@
 % \changes{v1.7a}{1992/02/26}{Note on need for some text in macro env.}
 % There should be some text---even  if it's just an empty
 % "\mbox{}"---in this environment before "\begin{macrocode}" or the
-% marginal label won't print in the right place. 
+% marginal label won't print in the right place.
 %
 % \DescribeMacro\MacrocodeTopsep
 % \DescribeMacro\MacroTopsep
@@ -535,7 +535,7 @@
 % |\MacroFont| holds the font and a possible size change command
 % for the code lines, the "verbatim"["*"] environment and the macro
 % names printed in the margin.  If you want
-% to change their default values in a 
+% to change their default values in a
 % class file (like \texttt{ltugboat.cls}) use the |\DocstyleParms|
 % command described below. Starting with release 2.0a it can now
 % be changed directly as long as the redefinition happens before
@@ -584,7 +584,7 @@
 % |\SpecialEscapechar| is a single-letter control sequence, that
 % is, one has to use "\|" for example to denote that `\verb+|+'
 % is used as an escape character. |\SpecialEscapechar| only
-% changes the behavior of the next \textsf{macrocode} or 
+% changes the behavior of the next \textsf{macrocode} or
 % \textsf{macrocode$*$} environment.
 %
 %  The actual index entries created will all be printed with |\|
@@ -636,11 +636,11 @@
 % "\theCodelineNo".  Its default definition is to use scriptsize
 % arabic numerals; a user-supplied definition won't be overwritten.
 %
-% \DescribeMacro\CodelineNumbered 
+% \DescribeMacro\CodelineNumbered
 % When you don't wish to get an index but want your code lines
 % numbered use "\CodelineNumbered" instead of "\CodelineIndex". This
 % prevents the generation of an unnecessary ".idx" file.
-% 
+%
 %
 % \subsection{Producing the actual index entries}
 %
@@ -651,7 +651,7 @@
 %
 % But this isn't built in: one has only to redefine some of the
 % following macros to be able to use any other index program.  All
-% macros which are installation 
+% macros which are installation
 % dependent are defined in such a way that they won't overwrite a
 % previous definition. Therefore it is safe to put the changed
 % versions in a package file which might be read in before the doc
@@ -692,7 +692,7 @@
 % \textsf{macro} environment.} may be used.  It is called `special'
 % because it has to print its argument verbatim.
 % A similar macro, called |\SpecialMainEnvIndex| is used for indexing
-% the main definition point of an 
+% the main definition point of an
 % environment.\footnote{This macro is called by the
 % \textsf{environment} environment.}
 % \DescribeMacro\SpecialIndex
@@ -738,7 +738,7 @@
 %
 % \DescribeMacro\OldMakeindex
 % Versions of \textsf{makeindex} prior to 2.9 had some bugs affecting
-% \DOC{}.  One of these, 
+% \DOC{}.  One of these,
 % pertaining to the "%" character doesn't have a work-around
 % appropriate for versions with and without the
 % bug.\label{makeindex:version}  If
@@ -808,11 +808,11 @@
 %  |\parindent|    & \IndexParms \the\parindent    &
 %  |\columnsep|    & \IndexParms \the\columnsep    \\
 %  |\parskip|      & \IndexParms \the\parskip           &
-%  |\rightskip|    & \IndexParms 
+%  |\rightskip|    & \IndexParms
 %                         \expandafter\dimenvalue\the\rightskip  \\
 %  |\mathsurround| & \IndexParms \the\mathsurround  &
-%  |\parfillskip|  & \IndexParms 
-%                         \expandafter\dimenvalue\the\parfillskip      
+%  |\parfillskip|  & \IndexParms
+%                         \expandafter\dimenvalue\the\parfillskip
 %  \end{tabular}
 % \end{center}
 % \DescribeMacro{\@idxitem}
@@ -855,7 +855,7 @@
 %  |\MacroIndent|   & \the\MacroIndent \\
 %  |\marginparpush| & \the\marginparpush    &
 %  |\MacrocodeTopsep|   & \the\MacrocodeTopsep \\
-%  |\tolerance|     & \the\tolerance  
+%  |\tolerance|     & \the\tolerance
 %  \end{tabular}
 % \end{center}
 %
@@ -864,7 +864,7 @@
 %
 % \DescribeMacro\MakeShortVerb
 % \DescribeMacro{\MakeShortVerb*} \DescribeMacro\DeleteShortVerb It is
-% awkward to have to type, say, "\verb|"\ldots"|" continually when 
+% awkward to have to type, say, "\verb|"\ldots"|" continually when
 % quoting
 % verbatim bits (like macro names) in the text, so an abbreviation
 % mechanism is provided.  Pick a character \meta{c}---one which
@@ -987,7 +987,7 @@
 % and using up valuable characters in the entry with old \textsf{makeindex}
 % versions.
 %
-% \changes{v1.7a}{1992/02/26}{Description of \cs{RecordChanges} etc. 
+% \changes{v1.7a}{1992/02/26}{Description of \cs{RecordChanges} etc.
 % added
 % to interface section.} \DescribeMacro\RecordChanges To cause the
 % change information to be written out, include "\RecordChanges" in
@@ -1010,7 +1010,7 @@
 %
 % \label{sec:checksum}
 % \DescribeMacro\CharacterTable
-% \DescribeMacro\CheckSum 
+% \DescribeMacro\CheckSum
 % To overcome some of the problems of sending files over the networks
 % we developed two macros which should detect corrupted files. If one
 % places the lines
@@ -1023,7 +1023,7 @@
 %"%%  Lower-case   "
 %"\a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z"\\
 %"%%  Digits        \0\1\2\3\4\5\6\7\8\9"\\
-%"%%  Exclamation   \!     Double quote  "\verb=\"= 
+%"%%  Exclamation   \!     Double quote  "\verb=\"=
 %"    Hash (number) \#"\\
 %"%%  Dollar        \$     Percent       \%     Ampersand     \&"\\
 %"%%  Acute accent  \'     Left paren    \(     Right paren   \)"\\
@@ -1127,7 +1127,7 @@
 %                             it out.}
 %
 % To sum up, the basic structure of a \texttt{.dtx} file without any
-% refinements is like this: 
+% refinements is like this:
 % \begin{verse}\small
 % "% "\meta{waffle}\ldots\\
 % \quad\ldots \\
@@ -1146,7 +1146,7 @@
 % "% \Finale \PrintIndex \PrintChanges"
 % \end{verse}
 % For examples of the use of most---if not all---of the features
-% described above consult the \texttt{doc.dtx} source itself. 
+% described above consult the \texttt{doc.dtx} source itself.
 %
 % \subsection{Acknowledgements}
 %
@@ -1172,7 +1172,7 @@
 %      \newblock London, 1786 \& 1788.
 %    \bibitem{art:Knuthliterat} \textsc{D. E. Knuth}.
 %      \newblock Literate Programming.
-%      \newblock Computer Journal, Vol.~27, \textit{pp}.~97--111, 
+%      \newblock Computer Journal, Vol.~27, \textit{pp}.~97--111,
 %               May 1984.
 %    \bibitem{book:KnuthA} \textsc{D. E. Knuth}.
 %      \newblock Computers \& Typesetting (The \TeX book).
@@ -1188,7 +1188,7 @@
 %      \newblock \textsl{TUGboat}, Vol.~10(2), \textit{pp}.~245--273,
 %        July 1989.
 %    \bibitem{art:docstrip} \textsc{Frank Mittelbach, Denys Duchier and
-%         Johannes Braams}. 
+%         Johannes Braams}.
 %      \newblock \texttt{docstrip.dtx} (to appear).
 %      \newblock The file is part of the DOC package.
 %    \bibitem{book:Raspe} \textsc{R. E. Raspe} (*1737, \dag 1797).
@@ -1206,7 +1206,7 @@
 %  \ifmulticols
 %  \addtocontents{toc}{\protect\end{multicols}}
 %  \fi
-% 
+%
 % } ^^A end \StopEventually
 %
 %
@@ -1247,7 +1247,7 @@
 % The first thing that we do next is to get ourselves a new comment
 % sign.  Because all sensible signs are already occupied, we will
 % choose one that can only be entered indirectly:
-% {\DoNotIndex{\^}^^A avoid misinterpretion !!!!! VERIFY  
+% {\DoNotIndex{\^}^^A avoid misinterpretion !!!!! VERIFY
 %    \begin{macrocode}
 \catcode`\^^A=14
 %    \end{macrocode}
@@ -1278,7 +1278,7 @@
 %    Parts of the macro definition will be surrounded by the
 %    environment \textsf{macrocode}.  Put more precisely, they will be
 %    enclosed by a macro whose argument (the text to be set
-%    `verbatim') is terminated by the string 
+%    `verbatim') is terminated by the string
 % \verb*+%    \end{macrocode}+.  Carefully note the number of spaces.
 %    |\macrocode| is defined completely analogously to
 %    |\verbatim|, but because a few small changes were carried
@@ -1353,7 +1353,7 @@
 % \changes{v1.5l}{1989/09/10}{Code line numbers supported.}
 % \changes{v1.5t}{1989/11/07}{Call \cs{leavevmode} to get \cs{everypar}
 %                           on blank lines.}
-% \changes{v1.7c}{1992/3/24}{Added \cs{interlinepenalty} to 
+% \changes{v1.7c}{1992/3/24}{Added \cs{interlinepenalty} to
 %                          \cs{par} from
 %                          verbatim.sty}
 %    \begin{macrocode}
@@ -1510,7 +1510,7 @@
 %    To allow changing the "\MacroFont" in the preamble we defer
 %    defining the internally used "\macro@font" until after the
 %    preamble.
-% \changes{v2.0a}{1998/05/16}{Support changing \cs{MacroFont} in 
+% \changes{v2.0a}{1998/05/16}{Support changing \cs{MacroFont} in
 %          preamble}
 %    \begin{macrocode}
 \AtBeginDocument{\let\macro@font\MacroFont}
@@ -1527,7 +1527,7 @@
 % start of the line and \meta{switch} comprises names with various
 % possible separators and a possible leading "+", "-", "*" or "/"
 % \cite{art:docstrip}.  All that concerns us here is what the first
-% character of \meta{switch} is.)  First it checks the "pm@module" 
+% character of \meta{switch} is.)  First it checks the "pm@module"
 % flag in case the previous line had a non-block module
 % directive i.e., not "%<*" or "%</"; if it did we need to close the
 % group it started and unset the flag.  "\check@module" looks ahead at
@@ -1583,7 +1583,7 @@
 % \end{macro}
 % \begin{macro}{\ch@angle}
 % \changes{v1.7a}{1992/03/12}{Added.}
-% \changes{v1.9k}{1994/02/22}{Have \texttt{<} active} 
+% \changes{v1.9k}{1994/02/22}{Have \texttt{<} active}
 %    If the current lookahead token is "<" we are defined to be
 %    processing a module directive can go on to look for "+" etc.;
 %    otherwise we must put back the gobbled "%". With \LaTeXe{}
@@ -1592,7 +1592,7 @@
 \begingroup
 \catcode`\<\active
 \gdef\ch@angle{\ifx<\next
-    \expandafter\ch@plus@etc 
+    \expandafter\ch@plus@etc
   \else \percentchar \fi}
 %    \end{macrocode}
 % \end{macro}
@@ -1653,7 +1653,7 @@
 \catcode`\~=\active
 \lccode`\~=`\>
 \lowercase{\gdef\pm@module#1~}{\pm@moduletrue
-   \Module{#1}\begingroup 
+   \Module{#1}\begingroup
 %    \end{macrocode}
 %    We switch to a special font as soon the nesting is higher than
 %    the current value of "\c@StandardModuleDepth". We do a local
@@ -1749,8 +1749,8 @@
 % \end{macro}
 %
 % \begin{macro}{\mod@math@codes}
-% \changes{v1.7c}{1992/03/26}{Added.} 
-% \changes{v2.1e}{2010/02/04}{Added mathcodes for +,-,:, and = (pr/4096)} 
+% \changes{v1.7c}{1992/03/26}{Added.}
+% \changes{v2.1e}{2010/02/04}{Added mathcodes for +,-,:, and = (pr/4096)}
 %    As well as `words', the module
 %    directive text might contain any of the characters "*/+-,&|!()"
 %    for the current version of \textsf{docstrip}.  We only need
@@ -1760,7 +1760,7 @@
 %    will not have a special catcode when it's encountered.
 %    \begin{macrocode}
 \def\mod@math@codes{\mathcode`\|="226A \mathcode`\&="2026
-                    \mathcode`\-="702D \mathcode`\+="702B 
+                    \mathcode`\-="702D \mathcode`\+="702B
                     \mathcode`\:="703A \mathcode`\=="703D }
 %    \end{macrocode}
 % \end{macro}
@@ -1772,7 +1772,7 @@
 % \changes{v1.8c}{1993/10/25}{NFSS standard}
 % If NFSS is in use we need a new math alphabet which uses a sans serif
 % font. To support both the release one and two of NFSS the alphabet
-% was renamed to "\mathsf" which is defined in NFSS2. 
+% was renamed to "\mathsf" which is defined in NFSS2.
 %    \begin{macrocode}
 %\ifx\selectfont\undefined
 %\else
@@ -1795,7 +1795,7 @@
 %                           avoid unnecessary fontwarning.}
 %    \begin{macrocode}
 \newskip\MacrocodeTopsep \MacrocodeTopsep = 3pt plus 1.2pt minus 1pt
-\newdimen\MacroIndent    
+\newdimen\MacroIndent
 \settowidth\MacroIndent{\rmfamily\scriptsize 00\ }
 %    \end{macrocode}
 % \end{macro}
@@ -1821,7 +1821,7 @@
 %    around the problem with an additional comment character.  But now
 %    back to |\macrocode*|. We start with the macro |\macro@code|
 %    which prepares everything and then call the macro |\sxmacro@code|
-%    whose argument is terminated by the string 
+%    whose argument is terminated by the string
 %\verb*+%    \end{macrocode*}+.
 %    \begin{macrocode}
 \@namedef{macrocode*}{\macro@code\sxmacro@code}
@@ -1962,7 +1962,7 @@
 %    \end{macrocode}
 %    To put the labels in the left margin we have to use the
 %    |\reversemarginpar| declaration. (This means that the
-%    \texttt{doc.sty} can't be used with all classes or packages.) 
+%    \texttt{doc.sty} can't be used with all classes or packages.)
 %    We also
 %    make the |\marginparpush| zero and |\marginparwidth| suitably
 %    wide.
@@ -2074,7 +2074,7 @@
 %    The omission of this token once caused a funny error.
 %  \changes{v1.5u}{1989/11/14}{equal sign added.}
 %    \begin{macrocode}
-{\catcode`\%=12 
+{\catcode`\%=12
  \long\gdef\check@percent#1{\ifx #1%\let\next\@empty \else
                                     \let\next=#1\fi \next}}
 %    \end{macrocode}
@@ -2168,17 +2168,17 @@
 %    depth, we use a counter. We also need a counter to count the
 %    number of nested \textsf{macro} environments.
 % \changes{v1.5k}{1989/08/17}{Fix for save stack problem.}
-% \changes{v1.9k}{1994/02/22}{Fix probably no longer necessary} 
+% \changes{v1.9k}{1994/02/22}{Fix probably no longer necessary}
 %    \begin{macrocode}
 \newcount\macro@cnt \macro@cnt=0
 %    \end{macrocode}
 %    The environment takes an argument---the macro name to be
 %    described.  Since this name may contain special `letters' we have
 %    to re-|\catcode| them before scanning the argument. This is done
-%    by the |\MakePrivateLetters| macro. 
+%    by the |\MakePrivateLetters| macro.
 % \changes{v1.5k}{1989/08/17}{Fix for save stack problem.}
 % \changes{v1.7a}{1992/02/26}{Catcode backslash to other (from newdoc).}
-% \changes{v1.9k}{1994/02/22}{Don't omit extra group} 
+% \changes{v1.9k}{1994/02/22}{Don't omit extra group}
 %    \begin{macrocode}
 \def\macro{\begingroup
    \catcode`\\12
@@ -2204,7 +2204,7 @@
 % \changes{v1.5f}{1989/5/07}{MacroTopsep parameter added.}
 % \changes{v1.5k}{1989/08/17}{Fix for save stack problem.}
 % \changes{v1.8c}{1993/10/25}{Support ``environment'' env}
-% \changes{v1.9k}{1994/02/22}{Remove \cs{macro@level}} 
+% \changes{v1.9k}{1994/02/22}{Remove \cs{macro@level}}
 %    \begin{macrocode}
 \long\def\m@cro@#1#2{\endgroup \topsep\MacroTopsep \trivlist
 %    \end{macrocode}
@@ -2315,7 +2315,7 @@
 %    index program in use (note the definition of
 %    |\SpecialMainIndex| for our installation).
 % \changes{v1.5s}{1989/11/05}{Support for code line no. (Undoc)}
-% \changes{v1.9u}{1995/08/06}{Removed brace group which 
+% \changes{v1.9u}{1995/08/06}{Removed brace group which
 %           killed \cs{DoNotIndex}}
 %    We advance the current codeline number and after producing an
 %    index entry revert to the original value
@@ -2362,7 +2362,7 @@
 %     \textsf{environment} environments are mixed, therefore we now
 %     use a simpler approach.
 % \changes{v1.5k}{1989/08/17}{Fix for save stack problem.}
-% \changes{v1.9k}{1994/02/22}{Don't checkfor nesting} 
+% \changes{v1.9k}{1994/02/22}{Don't checkfor nesting}
 %    \begin{macrocode}
 \let\endmacro \endtrivlist
 \let\endenvironment\endmacro
@@ -2741,8 +2741,8 @@
 %    mustn't be stored with a special category code or exclusion from
 %    the index won't work, so we employ the case-changing trick used
 %    elsewhere.  Since the argument might be an active character,
-%    |\string| is used to normalize it. 
-% \changes{v2.0e}{1998/12/28}{Correctly use the case-changing trick.} 
+%    |\string| is used to normalize it.
+% \changes{v2.0e}{1998/12/28}{Correctly use the case-changing trick.}
 %    \begin{macrocode}
 \begingroup
 \catcode`\&=12
@@ -2841,7 +2841,7 @@
 %    The next three branches are needed because of bugs in
 %    our \textsf{makeindex} program. You can't produce unbalanced index
 %    entries\footnote{This is possible for \TeX{} if you use
-%                     \texttt{\string{$_{12}$ \rmfamily or 
+%                     \texttt{\string{$_{12}$ \rmfamily or
 %                     \ttfamily\string}$_{12}$},
 %                     but \textsf{makeindex} will complain.}
 %    and you have to double a percent character. To get around these
@@ -2850,7 +2850,7 @@
 %                  all three
 %                  bugs. When they've found their way through all
 %                    installations,
-%                    the lines above will be removed. See 
+%                    the lines above will be removed. See
 %                    page~\pageref{bug:fixes} if you already have them.
 %                    (I'm not sure which versions incorporate these, but
 %                    2.11 is OK.  See also
@@ -2967,7 +2967,7 @@
 % where \meta{macro name} is a macro name like
 % $"\"_{12}"p"{_{11}}"@"_{11}$ or $"\"_{12}"$"_{11}$.  Note that the "\"
 % has category `other' and the other characters in the name are all
-% `letter', regardless of their normal category. 
+% `letter', regardless of their normal category.
 %
 % \begin{macro}{\DoNotIndex}
 %    This macro is used to suppress macro names in the index.  It
@@ -2989,7 +2989,7 @@
 %
 % \begin{macro}{\do@not@index}
 %    We make the |\do@not@index| macro |\long|
-%    since the user might want to exclude the |\par| 
+%    since the user might want to exclude the |\par|
 %    macro.
 %    \begin{macrocode}
 \long\def\do@not@index#1{%
@@ -2999,7 +2999,7 @@
 %    \changes{v1.7a}{1992/02/26}{Replaced with newdoc version.}
 %    \begin{macrocode}
     \endgroup
-    \addto@hook\index@excludelist{#1,}}    
+    \addto@hook\index@excludelist{#1,}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3143,7 +3143,7 @@
 %<+gind|gglo>%% doc.sty.  The commands for MAKEINDEX like `level'
 %<+gind|gglo>%% `item_x1' are described in `` Makeindex, A General
 %<+gind|gglo>%% Purpose, Formatter-Independent Index Processor'' by
-%<+gind|gglo>%% Pehong Chen. 
+%<+gind|gglo>%% Pehong Chen.
 %<+gind|gglo>
 %    \end{macrocode}
 %
@@ -3232,7 +3232,7 @@
 %
 % \begin{macro}{\SpecialIndex@}
 % \changes{v2.0c}{1998/08/22}{Macro added.}
-% \changes{v2.0f}{1999/02/27}{Temp fix to allow strange code in arg 1 
+% \changes{v2.0f}{1999/02/27}{Temp fix to allow strange code in arg 1
 %                             (PR 2968)}
 %    The macro |\SpecialIndex@| does the real work for |\SpecialMainIndex|
 %    and |\SpecialUsageIndex|. It takes two arguments: the macro to be
@@ -3241,19 +3241,19 @@
 % \changes{v2.0g}{1999/03/22}{Correct so-called temp fix. I'm not going to
 %                   explain this.}
 %    \begin{macrocode}
-\begingroup       
- \catcode`\|=0                                                         
- \catcode`\\=12                                                        
- |gdef|@SpecialIndexHelper@#1#2|@nil{% 
-   |if |noexpand#1\%                                           
-     |gdef|@gtempa{#2}%                                         
-   |else                                                       
-     |begingroup                                               
-       |escapechar|m@ne                                        
+\begingroup
+ \catcode`\|=0
+ \catcode`\\=12
+ |gdef|@SpecialIndexHelper@#1#2|@nil{%
+   |if |noexpand#1\%
+     |gdef|@gtempa{#2}%
+   |else
+     |begingroup
+       |escapechar|m@ne
        |expandafter|gdef|expandafter|@gtempa|expandafter{|string#1#2}%
-     |endgroup                                                 
-   |fi}                                                        
-|endgroup                                                      
+     |endgroup
+   |fi}
+|endgroup
 \def\SpecialIndex@#1#2{%
 %    \end{macrocode}
 %    The first thing it does is to convert the macro into a list of
@@ -3332,11 +3332,11 @@
 %    \begin{macrocode}
 \def\SpecialMainEnvIndex#1{\@bsphack\special@index{%
                                       #1\actualchar
-                                      {\string\ttfamily\space#1} 
+                                      {\string\ttfamily\space#1}
                                          (environment)%
                                       \encapchar main}%
     \special@index{environments:\levelchar#1\actualchar{%
-                   \string\ttfamily\space#1}\encapchar 
+                   \string\ttfamily\space#1}\encapchar
            main}\@esphack}
 %    \end{macrocode}
 %    The |\SpecialUsageIndex| is similar to |\SpecialMainIndex|, except
@@ -3366,15 +3366,15 @@
 %    First we sort the environment under its own name stating in the
 %    actual entry that this is an environment.
 %    \begin{macrocode}
-    \index{#1\actualchar{\protect\ttfamily#1} 
+    \index{#1\actualchar{\protect\ttfamily#1}
            (environment)\encapchar usage}%
 %    \end{macrocode}
 %    The second entry is sorted as a subitem under the key
-%    `environments:'. 
+%    `environments:'.
 % \changes{v2.1b}{2004/02/09}{environment names incorrectly sorted in
 %           index (pr/3615)}
 %    \begin{macrocode}
-    \index{environments:\levelchar#1\actualchar{\protect\ttfamily#1}\encapchar 
+    \index{environments:\levelchar#1\actualchar{\protect\ttfamily#1}\encapchar
            usage}\@esphack}
 %    \end{macrocode}
 %    Because both entries correspond to `descriptions' of the
@@ -3596,13 +3596,13 @@
 \@ifundefined{index@prologue}
      {\def\index@prologue{\section*{Index}%
                  \markboth{Index}{Index}%
-                 Numbers written in italic refer to the page 
+                 Numbers written in italic refer to the page
                  where the corresponding entry is described;
-                 numbers underlined refer to the 
+                 numbers underlined refer to the
                  \ifcodeline@index
                    code line of the
                  \fi
-                 definition; numbers in roman refer to the 
+                 definition; numbers in roman refer to the
                  \ifcodeline@index
                    code lines
                  \else
@@ -3763,7 +3763,7 @@
 %\def\printindex{\typeout{\string\printindex\space is obsolete!}%
 %                \typeout{Please use \string\PrintIndex\space
 %                         if you are a macro implementor^^J
-%                         or get a newer version of the documented 
+%                         or get a newer version of the documented
 %                         software if you are a user}%
 %                \PrintIndex}
 %    \end{macrocode}
@@ -3916,7 +3916,7 @@
 % \end{macro}
 % \end{macro}
 %
-% 
+%
 % \begin{macro}{\GlossaryMin}
 %    \changes{BHK}{1989/04/26}{Added to support
 %                            \texttt{\protect\bslash changes}.}
@@ -3979,7 +3979,7 @@
 %<+gglo>"\n\n \\end{theglossary}\n"
 %    \end{macrocode}
 % This difference from \texttt{gind.ist} is necessary if you have an
-% up-to-date \LaTeX. 
+% up-to-date \LaTeX.
 %    \begin{macrocode}
 %<+gglo>keyword "\\glossaryentry"
 %<*package>
@@ -4044,7 +4044,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-%    
+%
 %
 %
 %
@@ -4058,7 +4058,7 @@
 % \begin{macro}{\AlsoImplementation}
 % \changes{v1.9w}{1995/12/27}{Macro added}
 % \begin{macro}{\OnlyDescription}
-%    If |\AlsoImplementation| is in force the whole documentation 
+%    If |\AlsoImplementation| is in force the whole documentation
 %    including the code part will be typeset. This is the default.
 %    \begin{macrocode}
 \newcommand\AlsoImplementation{%
@@ -4073,14 +4073,14 @@
 %    But |\Finale| will be called at the very end of a file. This
 %    is exactly the point were we want to know if the file is
 %    uncorrupted. Therefore we also call |\check@checksum| at this
-%    point. 
+%    point.
 %    \begin{macrocode}
                   \check@checksum}%
 %    \end{macrocode}
 %    On the other hand: |\StopEventually| is more or less a
 %    dividing point between description and code. So we start to look
 %    for the check-sum of the documented file by calling
-%    |\init@checksum|. 
+%    |\init@checksum|.
 %    \begin{macrocode}
               \init@checksum
               \@esphack}%
@@ -4139,7 +4139,7 @@
   \newlanguage\l@nohyphenation
 \fi
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareRobustCommand\meta[1]{%
 %    \end{macrocode}
@@ -4205,7 +4205,7 @@
 %    \end{macrocode}
 %    Then it only remains to read in the specified file, and finish
 %    off the |\trivlist|.
-% \changes{v1.5t}{1989/11/07}{Call \cs{endmacrocode} instead 
+% \changes{v1.5t}{1989/11/07}{Call \cs{endmacrocode} instead
 %                             of \cs{endtrivlist}.}
 %    \begin{macrocode}
      \input{#1}\endmacrocode
@@ -4278,7 +4278,7 @@
 % \meta{c}\meta{text}\meta{c} is equivalent to
 % "\verb"\meta{c}\meta{text}\meta{c}.\footnote{Warning:
 % the commentary in the rest of this section was written by Dave
-% Love.}  In addition, the fact 
+% Love.}  In addition, the fact
 % that \meta{c} is made active is recorded for the benefit of the
 % \textsf{verbatim} and \textsf{macrocode} environments.
 % Note particularly that the definitions below are global.
@@ -4363,10 +4363,10 @@
 % region where you need to use the character outside a verbatim
 % environment.  It arranges for "\dospecials" and "\@sanitize" to be
 % altered appropriately, restores the saved catcode and, if necessary,
-% the character's meaning (as stored by 
+% the character's meaning (as stored by
 % "\MakeShortVerb").  If the catcode wasn't stored in
 % "\cc\"\meta{c} (by "\MakeShortVerb") the command is silently
-% ignored. 
+% ignored.
 % \changes{v1.7a}{1992/02/28}{Check for previous matched
 %                           \cs{MakeShortVerb}
 %                           to avoid error.}
@@ -4454,7 +4454,7 @@
   \xdef\dospecials{\dospecials}%
 %    \end{macrocode}
 % Fixing "\@sanitize" is the same except that we need to re-define
-% "\@makeother" which obviously needs to be done in a group. 
+% "\@makeother" which obviously needs to be done in a group.
 %    \begin{macrocode}
   \begingroup
     \def\@makeother##1{%
@@ -4485,11 +4485,11 @@
 %        \footnotetext{Warning: the commentary in this section was
 %                      written by Dave Love. }
 %
-% 
+%
 % \begin{macro}{\init@checksum}
 % The checksum mechanism works by counting backslashes in the
 % macrocode.  This initialises the count (when called from
-% "\StopEventually"). 
+% "\StopEventually").
 % \changes{v1.5k}{1989/09/04}{Macro added to support checksum.}
 %    \begin{macrocode}
 \def\init@checksum{\relax
@@ -4502,7 +4502,7 @@
 % \changes{v1.5k}{1989/09/04}{Macro added to support checksum.}
 % This reports the sum compared with the value ("\bslash@cnt") the
 % file advertises.  It's called from "\Finale" (if that hasn't been
-% re-defined). 
+% re-defined).
 %    \begin{macrocode}
 \def\check@checksum{\relax
      \ifnum\check@sum=\z@
@@ -4516,7 +4516,7 @@
          \typeout{* Checksum passed *}%
          \typeout{*******************}%
        \else
-         \PackageError{doc}{Checksum not passed 
+         \PackageError{doc}{Checksum not passed
                     (\the\check@sum<>\the\bslash@cnt)}%
           {The file currently documented seems to be wrong.^^J%
            Try to get a correct version.}%
@@ -4555,7 +4555,7 @@
 % \begin{macro}{\step@checksum}
 % \changes{v1.5k}{1989/09/04}{Macro added to support checksum.}
 % This advances the count when a backslash is encountered in the
-% macrocode. 
+% macrocode.
 %    \begin{macrocode}
 \def\step@checksum{\global\advance\bslash@cnt\@ne}
 %    \end{macrocode}
@@ -4643,7 +4643,7 @@
 %    \end{macrocode}
 % \end{macro}
 % \let\MakePrivateLetters=\makeatletter
-% 
+%
 % \begin{macro}{\wrong@table}
 % \changes{v1.7a}{1992/02/28}{Moved to where the catcodes are right
 %                           so it works.}
@@ -4664,8 +4664,8 @@
 % The code in this section allows index entries to refer to code line
 % numbers---the number of the first line of macrocode in the
 % \textsf{macro} environment.
-% 
-% 
+%
+%
 % \begin{macro}{\codeline@index}
 % Indexing by code line is controlled by the "codeline@index" switch.
 % \changes{v1.5s}{1989/11/05}{Support for code line no. (Undoc)}
@@ -4702,9 +4702,9 @@
 %                  \cs{CodelineIndex} (Undoc)}
 % This switches on use of the index file with "\makeindex", sets the
 % switch to indicate code line numbering and defines "\special@index"
-% appropriately. 
+% appropriately.
 %    \begin{macrocode}
-\def\CodelineIndex{\makeindex 
+\def\CodelineIndex{\makeindex
                    \codeline@indextrue
                    \let\special@index\codeline@wrindex}
 %    \end{macrocode}
@@ -4712,7 +4712,7 @@
 % \begin{macro}{\PageIndex}
 % "\PageIndex" is similar.
 %    \begin{macrocode}
-\def\PageIndex{\makeindex 
+\def\PageIndex{\makeindex
                \codeline@indexfalse
                \let\special@index\index}
 %    \end{macrocode}
@@ -4765,7 +4765,7 @@
 %
 % The following |\mathcode| definitions allow the characters
 % `|\|'
-% and `\texttt{@}' to appear in |\ttfamily| font when invoked in math 
+% and `\texttt{@}' to appear in |\ttfamily| font when invoked in math
 % mode;\footnote{You may wonder why the definitions state that both
 %                characters belong to the {\em variable family\/}
 %                (i.e.\ the number 7 in front). The reason is this:
@@ -4775,7 +4775,7 @@
 %                math family number 7 which is the typewriter family in
 %                standard \LaTeX.
 %                But this file should not depend on this specific
-%                setting, so I changed these 
+%                setting, so I changed these
 %                \texttt{\bslash mathcode}$\,$s
 %                to work with any family assignments. For an example
 %                see the article about the new font selection scheme.}
diff --git a/Master/texmf-dist/source/latex/base/docstrip.dtx b/Master/texmf-dist/source/latex/base/docstrip.dtx
index be2a4711e08..ab107aecf86 100644
--- a/Master/texmf-dist/source/latex/base/docstrip.dtx
+++ b/Master/texmf-dist/source/latex/base/docstrip.dtx
@@ -1,37 +1,37 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2014
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 \catcode`\{=1
 \catcode`\}=2
 \def\filename{docstrip.dtx}
 \def\fileversion{2.5d}
 \def\filedate{2005/07/29}
-\def\docdate {1999/03/31}
+\def\docdate {2014/04/19}
 % \CheckSum{2439}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -54,7 +54,7 @@
 %
 %% The docstrip program for use with TeX.
 %% Copyright (C) 1989-1991 Frank Mittelbach
-%% Copyright (C) 1992-1995 Johannes Braams, Denys Duchier, 
+%% Copyright (C) 1992-1995 Johannes Braams, Denys Duchier,
 %%                         Frank Mittelbach
 %% Copyright (C) 1995 Marcin Woli\'nski
 %% Copyright (C) 1996-1997 Mark Wooding, Marcin Woli\'nski
@@ -142,17 +142,17 @@
 %  \and
 %   Denys Duchier
 %  \and
-%   Johannes Braams 
+%   Johannes Braams
 %  \and
-%   Marcin Woli\'nski 
+%   Marcin Woli\'nski
 %  \and
-%   Mark Wooding 
+%   Mark Wooding
 % }
 %
 % \date{Printed \today}
 %
 % \maketitle
-% 
+%
 % \begin{abstract}
 %    This document describes the implementation of the \ds{} program.
 %    The original version of this program was developed by Frank
@@ -204,7 +204,7 @@
 %    \TeX\ programs has \TeX\@.  Therefore the \ds{} program is
 %    implemented entirely in \TeX.
 %
-% \subsection{Functions of the \ds{} program} 
+% \subsection{Functions of the \ds{} program}
 %
 %    Having created the \ds{} program to remove comment lines from
 %    \TeX\ programs\footnote{Note that only comment lines, that is
@@ -232,9 +232,9 @@
 %        to generate the executable versions of your files from the
 %        distribution sources.
 %        Most of the \LaTeX\  distribution is packaged this way.
-%        To produce such a batch file include a statement in your 
+%        To produce such a batch file include a statement in your
 %         `batch file' that
-%        instructs \TeX\ to read \texttt{docstrip.tex}. 
+%        instructs \TeX\ to read \texttt{docstrip.tex}.
 %        The beginning of such a file would look like:
 %\begin{verbatim}
 %    \input docstrip
@@ -286,7 +286,7 @@
 %    And standard packages use
 %\begin{verbatim}
 %    \usedir{tex/latex/tools}
-%    \usedir{tex/latex/babel} 
+%    \usedir{tex/latex/babel}
 %\end{verbatim}
 %    etc.
 %
@@ -312,12 +312,12 @@
 %\begin{verbatim}
 %    \BaseDirectory{/usr/local/lib/texmf}
 %\end{verbatim}
-%    and for standard em\TeX{} installation 
+%    and for standard em\TeX{} installation
 %\begin{verbatim}
 %    \BaseDirectory{c:/emtex}
 %\end{verbatim}
 %
-% \DescribeMacro{\DeclareDir} 
+% \DescribeMacro{\DeclareDir}
 %    Having specified the base directory you should tell \ds{} how to
 %    interpret labels used in |\usedir| commands. This is done with
 %    |\DeclareDir| with two arguments. The first is the label and the
@@ -383,13 +383,13 @@
 %   |\def\WriteToDir{./}| on MSDOS/Unix,
 %   |\def\WriteToDir{:}| on Macintosh,
 %   |\def\WriteToDir{[]}| on VMS.
-%  
+%
 %    If your system requires something
 %    completely different you can define in |docstrip.cfg| macros
 %    |\dirsep| and |\makepathname|. Check for their definition in the
 %    implementation part. If you want some substantially different
 %    scheme of translating |\usedir| labels into directory names try
-%    redefining macro |\usedir|. 
+%    redefining macro |\usedir|.
 %
 % \subsection{Setting maximum numbers of streams}
 %
@@ -449,7 +449,7 @@
 %    batch file for \TeX.
 %
 % \DescribeMacro{\input}
-% All \ds{} batch files should start with the line: |\input docstrip| 
+% All \ds{} batch files should start with the line: |\input docstrip|
 %
 % Do not use the  \LaTeX\ syntax |\input{docstrip}| as batch files may
 % be used with plain~\TeX\ or ini\TeX.
@@ -465,7 +465,7 @@
 % in the file are ignored. In old files that start
 % |\def\batchfile{|\ldots\ this command is optional, but is a good
 % idea anyway. If this command is omitted from a batchfile then
-% normally \TeX\ will go to its interactive |*| prompt, so you may 
+% normally \TeX\ will go to its interactive |*| prompt, so you may
 % stop \ds{} by typing |\endbatchfile| to this prompt.
 %
 % \DescribeMacro{\generate}
@@ -628,7 +628,7 @@
 %    you include a |^^J| character in one of these lines, everything
 %    that follows it on the same line is written to a new line in the
 %    output file.  This `feature' can be used to add a |\typeout| or
-%    |\message| to the the stripped file.
+%    |\message| to the stripped file.
 %
 % \DescribeMacro{\declarepreamble}
 % \DescribeMacro{\declarepostamble}
@@ -642,16 +642,16 @@
 %    such). In such a case one can say |\declarepreamble\somename|,
 %    then type in his/her preamble, end it with |\endpreamble|,
 %    and  later  on  |\usepreamble\somename|  to  switch   to   this
-%    preamble.  
+%    preamble.
 %    If no preamble  should be used you can deploy the |\nopreamble|
 %    command. This command is equivalent to saying  |\usepreamble\empty|.
 %    The  same  mechanism works for postambles, |\use...|
 %    declarations are local and can appear inside |\generate|.
 %
 %    Commands   |\preamble|   and   |\postamble| define and  activate
-%    pre(post)ambles named |\defaultpreamble| and |\defaultpostamble|. 
+%    pre(post)ambles named |\defaultpreamble| and |\defaultpostamble|.
 %
-% \DescribeMacro{\batchinput} 
+% \DescribeMacro{\batchinput}
 %    The batch file commands can be put into several batch files which
 %    are then executed from a master batch file. This is, for example,
 %    useful if a distribution consists of several distinct parts. You
@@ -659,11 +659,11 @@
 %    addition a master file that simply calls the batch files for the
 %    parts.  For this, call the individual batch files from the master
 %    file with the command |\batchinput{|\meta{file}|}|. Don't use
-%    |\input| for this purpose, this command 
+%    |\input| for this purpose, this command
 %    should be used only for calling the \ds{} program as explained
 %    above and is ignored when used for any other purpose.
 %
-% \DescribeMacro{\ifToplevel} 
+% \DescribeMacro{\ifToplevel}
 %    When batch files are nested you may want to suppress certain
 %    commands in the lower-level batch files such as terminal
 %    messages. For this purpose you can use the |\ifToplevel| command
@@ -686,7 +686,7 @@
 %        a \texttt{.}-character is written on the terminal.
 % \item[\texttt{/}] When a number of empty lines appear in a row in the
 %        input file, at most one of them is retained. The \ds{}
-%        program signals the removal of an empty line with the 
+%        program signals the removal of an empty line with the
 %        \texttt{/}-character.
 % \item[\texttt{<}] When a `guard line' is found in the input and it
 %        starts a block of optionally included code, this is signalled
@@ -763,12 +763,12 @@
 %\DeleteShortVerb\|
 %    \begin{tabular}{lcl}
 %    \meta{Expression} & $::=$ & \meta{Secondary}
-%                            [\{\texttt{|}, \texttt{,}\} 
+%                            [\{\texttt{|}, \texttt{,}\}
 %                            \meta{Secondary}]*\\
-%    \meta{Secondary}    & $::=$ & 
+%    \meta{Secondary}    & $::=$ &
 %                        \meta{Primary} [\texttt{\&}
 %                         \meta{Primary}]*\\
-%    \meta{Primary}  & $::=$ & 
+%    \meta{Primary}  & $::=$ &
 %                        \meta{Terminal} $|$ \texttt{!}\meta{Primary}
 %                        $|$ \texttt{(}\meta{Expression}\texttt{)}\\
 %    \end{tabular}
@@ -799,7 +799,7 @@
 %
 %    When a block of code is {\em not\/} included, any guards that occur
 %    within that block are {\em not\/} evaluated.
-% 
+%
 % \section{Those other languages}
 %    Since \TeX\ is an open system some of \TeX\ packages include
 %    non-\TeX\ files. Some authors use \ds\ to generate PostScript
@@ -826,7 +826,7 @@
 %    \declarepreamble\foo
 %    ____________________________
 %    Package FOO for use with TeX
-%    \endpreamble 
+%    \endpreamble
 %\end{verbatim}
 %    macro |\foo| is defined as
 %\begin{verbatim}
@@ -865,7 +865,7 @@
 %    source file use value current at time of |\generate|. Note that
 %    this means that you cannot produce concurrently two files using
 %    different |\MetaPrefix|es.
-%    
+%
 % \subsection{Verbatim mode}
 %    If your programming language uses some construct that can
 %    interferes badly with \ds\ (e.g., percent in column one) you may
@@ -874,7 +874,7 @@
 %
 %    A `Guard expression' of the form |%<<|\meta{END-TAG} marks
 %    the start of a section that will be copied verbatim upto a line
-%    containing only a percent in column 1 followed by \meta{END-TAG}. 
+%    containing only a percent in column 1 followed by \meta{END-TAG}.
 %    You can select any \meta{END-TAG} you want, but note that spaces
 %     count here. Example:
 %\begin{verbatim}
@@ -907,7 +907,7 @@
 % \section{Producing the documentation}
 %
 %    We provide a short driver file that can be extracted by the
-%    \ds{} program using the the conditional `\textsf{driver}'.  To
+%    \ds{} program using the conditional `\textsf{driver}'.  To
 %    allow the use of \texttt{docstrip.dtx} as a program at Ini\TeX{}
 %    time (e.g., to strip
 %    off its own comments) we need to add a bit of primitive code.
@@ -929,7 +929,7 @@
 %    We use some trickery to avoid issuing |\end{document}| when
 %    the |\ifx| construction is unfinished. If condition below is
 %    true a |\fi| is constructed on the fly, the |\ifx| is completed,
-%    and the real |\fi| will never be seen as it comes after 
+%    and the real |\fi| will never be seen as it comes after
 %    |\end{document}|. On the other hand if condition is false
 %    \TeX\ skips over |\csname fi\endcsname| having no idea that
 %    this could stand for |\fi|, driver is skipped and only then
@@ -948,11 +948,11 @@
 %    formatting the documentation.
 %    \begin{macrocode}
  \documentclass{ltxdoc}
-    \EnableCrossrefs 
- % \DisableCrossrefs 
- % use \DisableCrossrefs if the 
- % index is ready 
- \RecordChanges 
+    \EnableCrossrefs
+ % \DisableCrossrefs
+ % use \DisableCrossrefs if the
+ % index is ready
+ \RecordChanges
  % \OnlyDescription
  \typeout{Expect some Under- and overfull boxes}
  \begin{document}
@@ -977,7 +977,7 @@
 \ifnum13=\catcode`\~{\egroup\else
   \catcode`\Z=9
 Z
-Z  \catcode`\{=1  \catcode`\}=2 
+Z  \catcode`\{=1  \catcode`\}=2
 Z  \catcode`\#=6  \catcode`\^=7
 Z  \catcode`\@=11 \catcode`\^^L=13
 Z  \let\bgroup={  \let\egroup=}
@@ -1007,7 +1007,7 @@ Z \def\@if#1#2{%
 Z   \expandafter\def\csname\expandafter\@gobbletwo\string#1%
 Z                     \expandafter\@gobbletwo\string#2\endcsname
 Z                        {\let#1#2}}
-Z 
+Z
 Z  \def\@gobbletwo#1#2{}
 Z  \def\@gobblethree#1#2#3{}
 Z
@@ -1017,9 +1017,9 @@ Z  \let\repeat\fi
 Z
 Z  \def\empty{}
 Z
-Z  \def\tracingall{\tracingcommands2 \tracingstats2 
-Z    \tracingpages1 \tracingoutput1 \tracinglostchars1 
-Z    \tracingmacros2 \tracingparagraphs1 \tracingrestores1 
+Z  \def\tracingall{\tracingcommands2 \tracingstats2
+Z    \tracingpages1 \tracingoutput1 \tracinglostchars1
+Z    \tracingmacros2 \tracingparagraphs1 \tracingrestores1
 Z    \showboxbreadth 10000 \showboxdepth 10000 \errorstopmode
 Z    \errorcontextlines 10000 \tracingonline1 }
 Z
@@ -1078,7 +1078,7 @@ Z
 % \begin{macro}{\ifDefault}
 %    The switch |\ifDefault| is used to indicate whether the
 %    default batch file has to be used.
-% \changes{2.0f}{1991/06/04}{Macro added.} 
+% \changes{2.0f}{1991/06/04}{Macro added.}
 %    \begin{macrocode}
 \newif\ifDefault
 %    \end{macrocode}
@@ -1199,7 +1199,7 @@ Z
 % \end{macro}
 %
 % \begin{macro}{\inputcheck}
-%    This stream is only used for checking for existence of files. 
+%    This stream is only used for checking for existence of files.
 %    \begin{macrocode}
 \newread\inputcheck
 %    \end{macrocode}
@@ -1226,7 +1226,7 @@ Z
 %    an argument delimited by \verb*= = (i.e.\ a space) that just
 %    gobbles the argument.  Since the end-of-line character is
 %    converted by \TeX{} to a space.  This means that |\input| is not
-%    available as a command within batch files. 
+%    available as a command within batch files.
 %
 % \begin{macro}{\@@input}
 % \changes{2.1a}{1993/02/22}{Macro added}
@@ -1237,7 +1237,7 @@ Z
 \ifx\undefined\@@input \let\@@input\input\fi
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 %    To allow the nesting of batch files the |\batchinput| command is
 %    provided it takes one argument, the name of the batch file to
 %    switch to.
@@ -1274,7 +1274,7 @@ Z
 % \begin{macro}{\skip@input}
 % \changes{2.0j}{1992/03/03}{Added macro}
 % \changes{2.0n}{1992/04/26}{Argument delimited by space not \cs{relax}}
-% \changes{2.0n}{1992/04/26}{Macro renamed from \cs{skipinput}} 
+% \changes{2.0n}{1992/04/26}{Macro renamed from \cs{skipinput}}
 %    And here is the promised redefinition of |\input|:
 %    \begin{macrocode}
 \def\skip@input#1 {}
@@ -1491,7 +1491,7 @@ Z
 %    use of the \verb=\loop{=\meta{body}\verb=}\repeat= macro that
 %    is defined in plain \TeX\@. The syntax for this loop is:
 %    \begin{flushleft}
-%    |\for|\meta{control sequence} |:=| \meta{list} 
+%    |\for|\meta{control sequence} |:=| \meta{list}
 %    |\do|\\
 %    \meta{body}\\
 %    |\od|
@@ -1573,16 +1573,16 @@ Z
 % \end{macro}
 %
 % \changes{2.3a}{1995/08/18}{New mechanism: output streams allocation}
-% 
+%
 % \subsubsection{Output streams allocator}
-% 
+%
 % For each of sixteen output streams  available  we  have  a  macro
 % named |\s@0| through |\s@15| saying if the stream is assigned to a
 % file~(1) or not~(0). Initially all streams are not assigned.
 %
 % We also declare 16 counters which will be needed by the conditional
 % code inclusion algorithm.
-% 
+%
 %    \begin{macrocode}
 \ifx\@tempcnta\undefined \newcount\@tempcnta \fi
 \@tempcnta=0
@@ -1593,9 +1593,9 @@ Z
 \advance\@tempcnta1
 \ifnum\@tempcnta<16\repeat
 %    \end{macrocode}
-% 
+%
 % We will use \emph{The \TeX book} style list to search through streams.
-% 
+%
 %    \begin{macrocode}
 \let\s@do\relax
 \edef\@outputstreams{%
@@ -1619,18 +1619,18 @@ Z
 % called,  which  gobbles  rest of the list including the ending
 % |\@nostreamerror|. It also gobbles |\fi| ending the condition, so
 % the |\fi| is reinserted.
-% 
+%
 %    \begin{macrocode}
 \def\@nostreamerror{\errmessage{No more output streams!}}
 \def\@streamfound#1\@nostreamerror{\fi}
 %    \end{macrocode}
 % \end{macro}\end{macro}
-% 
+%
 % |\@stripstr| is auxiliary macro eating characters |\s@|
 % (backslash,s,@). It is defined in somewhat strange way since |\s@|
 % must have all category code  12  (other).  This  macro  is  used to
 % extract stream numbers from stream names.
-% 
+%
 %    \begin{macrocode}
 \bgroup\edef\x{\egroup
  \def\noexpand\@stripstr\string\s@{}}
@@ -1643,11 +1643,11 @@ Z
 % named the  same  as  the  external  file  being  opened. E.g., to
 % write to file |foo.tex|   use    |\StreamOpen\foo|,    then
 % |\StreamPut\foo|    and |\StreamClose\foo|.
-% 
+%
 %    \begin{macrocode}
 \chardef\stream@closed=16
 \def\StreamOpen#1{%
-  \chardef#1=\stream@closed 
+  \chardef#1=\stream@closed
   \def\s@do##1{\ifnum##1=0
     \chardef#1=\expandafter\@stripstr\string##1 %
     \global\chardef##1=1 %
@@ -1668,7 +1668,7 @@ Z
 \def\StreamPut{\immediate\write}
 %    \end{macrocode}
 % \end{macro}\end{macro}\end{macro}
-% 
+%
 % \subsubsection{Input and Output}
 %
 % \begin{macro}{\maybeMsg}
@@ -1677,7 +1677,7 @@ Z
 %    When this program is used it can optionally show its progress on
 %    the terminal. In that case it will write a special character to
 %    the terminal (and the transcript file) for each input line. This
-%    option is on by default when statistics are included in 
+%    option is on by default when statistics are included in
 %    \texttt{docstrip.tex}. It is off when statistics are excluded. The
 %    commands |\showprogress| and |\keepsilent| can be used
 %    to choose otherwise.
@@ -1806,12 +1806,12 @@ Z
   \edef#1{\the\@temptokena#2}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@ifpresent}
 %    This macro checks if its first argument  is  present  on  a
 %    list passed as the second argument. Depending on the result
 %    it executes either its third or fourth argument.
-% 
+%
 %    \begin{macrocode}
 \def\@ifpresent#1#2#3#4{%
   \def\tmp##1#1##2\qStop{\ifx!##2!}%
@@ -1876,7 +1876,7 @@ Z
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\kernel@ifnextchar}
-%   \changes{v2.5d}{2005/07/29}{Added macro} 
+%   \changes{v2.5d}{2005/07/29}{Added macro}
 %   The 2003/12/01 release of \LaTeX\ incorporated this macro to avoid
 %   problems with \texttt{amsmath} but this also means that we have to
 %   perform the same trick here when people use \LaTeX\ on a
@@ -1888,10 +1888,10 @@ Z
 %
 %
 % \subsection{The evaluation of boolean expressions}
-% 
+%
 %    For clarity we repeat here the syntax for the boolean expressions
 %    in a somewhat changed but equivalent way:
-% 
+%
 % \DeleteShortVerb\|
 %    \begin{tabular}{lcl}
 %    \meta{Expression} & $::=$ & \meta{Secondary} $|$
@@ -1900,19 +1900,19 @@ Z
 %    \meta{Secondary}    & $::=$ & \meta{Primary} $|$
 %                         \meta{Primary} \texttt{\&}
 %                              \meta{Secondary}\\
-%    \meta{Primary}  & $::=$ & 
+%    \meta{Primary}  & $::=$ &
 %                         \meta{Terminal} $|$ \texttt{!}\meta{Primary}
-%                                  $|$ 
+%                                  $|$
 %                         \texttt{(}\meta{Expression}\texttt{)}\\
 %    \end{tabular}
-% 
+%
 %    The \texttt{|} stands for disjunction, the \texttt{\&} stands for
 %    conjunction and the \texttt{!}\ stands for negation. The
 %    \meta{Terminal} is any sequence of letters and evaluates to
 %    \meta{true} iff it occurs in the list of options that have to be
 %    included.
 % \MakeShortVerb\|
-% 
+%
 %    Since we can generate multiple output files  from  one  input,
 %    same  guard  expressions  can  be  computed several times with
 %    different options. For that reason we  first  ``compile''  the
@@ -1921,10 +1921,10 @@ Z
 %    options  produces  1  or  0  as  a  result. The idea is to say
 %    |\if1\Expr{|\meta{current set  of  options}|}...\fi|  for  all
 %    output files.
-% 
+%
 %    Here is a table recursively defining  translations  for  right
 %    sides  of the grammar. $\tau(X)$ denotes translation of~$X$.
-%    
+%
 % \DeleteShortVerb\|
 % \MakeShortVerb\"
 %    \begingroup
@@ -1958,11 +1958,11 @@ Z
 %\end{verbatim}
 %    When  called  as  above  this  will  expand to |1| if |foo| is
 %    present on current list of options and to |0| otherwise.
-% 
+%
 %    Macros  below  work  in  ``almost  expand-only''   mode   i.e.
 %    expression is analyzed only by expansion but we have to define
 %    some macros on the way (e.g., |\Expr| and |\t@foo|).
-% 
+%
 %    The   first   parameter   of   each   of   these   macros   is
 %    ``continuation''   (in  the  sense  similar  to  the  language
 %    \textsc{Scheme}). Continuation is a function of at  least  one
@@ -1973,12 +1973,12 @@ Z
 %    argument)   passing   to  it  whole  constructed  translation.
 %    Continuation may expect more arguments if it wants to see what
 %    comes next on the input.
-% 
+%
 %    We  will perform recursive descent parse, but definitions will
 %    be presented in bottom-up order.
-% 
+%
 % \begin{macro}{\Terminal}
-% 
+%
 %    \meta{Terminal}s are  recognized  by  macro  |\Terminal|.  The
 %    proper   way   of   calling  it  is  |\Terminal{|\meta{current
 %    continuation}|}{}|.     Parameters     are:      continuation,
@@ -1987,7 +1987,7 @@ Z
 %    then  takes  appropriate  actions.  Since  there  are 7 ending
 %    chars  and probably one |\csname| costs  less  than  7  nested
 %    |\if|s we construct a name and check if it is defined.
-% 
+%
 %    We must expand |\ifx| completely before taking next actions so
 %    we use |\afterfi|.
 %    \begin{macrocode}
@@ -1996,21 +1996,21 @@ Z
 %    \end{macrocode}
 %    If condition is true |#3| belongs to  current  \meta{Terminal}
 %    so we append it to \meta{Terminal}-so-far and call |\Terminal|
-%    again. 
+%    again.
 %    \begin{macrocode}
     \afterfi{\Terminal{#1}{#2#3}}\else
 %    \end{macrocode}
 %    When condition is false it's time to end  the  \meta{Terminal}
 %    so we call macro |\TerminalX|. Next character is reinserted to
 %    the input.
-% 
+%
 %    In both cases continuation is passed unchanged.
 %    \begin{macrocode}
     \afterfi{\TerminalX{#1}{#2}#3}\fi
   }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\eT@}
 %    Here we define macros marking characters  that  cannot  appear
 %    inside  terminal.  The value is not important as long as it is
@@ -2022,11 +2022,11 @@ Z
 \Name\let{eT@(}=1 \Name\let{eT@)}=1
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\TerminalX}
 %    This macro should end scanning of \meta{Terminal}.  Parameters
 %    are continuation and gathered tokens of \meta{Terminal}.
-% 
+%
 %    Macro starts by issuing an error message if \meta{Terminal} is
 %    empty.
 %    \begin{macrocode}
@@ -2046,10 +2046,10 @@ Z
   }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\Primary}
 %    Parameters are continuation and next character from the input.
-%    
+%
 %    According to the syntax \meta{Primari}es can have three forms.
 %    This  makes us use even more dirty tricks than usual. Note the
 %    |\space| after a series of |\ifx|s. This  series  produces  an
@@ -2060,7 +2060,7 @@ Z
 %    |\if|s and so to use |\afterfi|.
 %    \begin{macrocode}
 \def\Primary#1#2{%
-  \ifcase \ifx!#20\else\ifx(#21\else2\fi\fi\space 
+  \ifcase \ifx!#20\else\ifx(#21\else2\fi\fi\space
 %    \end{macrocode}
 %    First case is for |!| i.e.  negated \meta{Primary}.   In  this
 %    case   we  call  |\Primary|  recursively  but  we  create  new
@@ -2084,11 +2084,11 @@ Z
   }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\NPrimary}
 %    Parameters    are   continuation   and   previously   computed
 %    \meta{Primary}.
-%    
+%
 %    This macro negates result of previous  computations  according
 %    to the rule
 %    $$\tau(!\meta{Primary})
@@ -2097,21 +2097,21 @@ Z
 \def\NPrimary#1#2{%
   #1{\noexpand\if1#20\noexpand\else1\noexpand\fi}%
   }
-%    \end{macrocode}   
+%    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\PExpression}
 %    Parameters: continuation,  \meta{Expression},  next  character
 %    from  input. We are checking if character is |)| and then pass
 %    unchanged result to our continuation.
 %    \begin{macrocode}
-\def\PExpression#1#2#3{% 
+\def\PExpression#1#2#3{%
   \ifx)#3\else
     \errmessage{Error in expression: expected right parenthesis}\fi
   #1{#2}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\Secondary}
 %    Each \meta{Secondary} expression starts  with  \meta{Primary}.
 %    Next checks will be performed by |\SecondaryX|.
@@ -2120,7 +2120,7 @@ Z
   \Primary{\SecondaryX{#1}}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\SecondaryX}
 %    Parameters:  continuation, translation of \meta{Primary}, next
 %    character. We start by checking if next character is |&|.
@@ -2143,9 +2143,9 @@ Z
   \afterfi{#1{#2}#3}\fi
   }
 \egroup
-%    \end{macrocode}   
+%    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\SecondaryXX}
 %    Parameters:   continuation,   translation  of  \meta{Primary},
 %    translation of \meta{Secondary}. We construct  translation  of
@@ -2159,16 +2159,16 @@ Z
   #1{\noexpand\if0#20\noexpand\else#3\noexpand\fi}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\Expression}
 %    Every   \meta{Expression}  starts  with  \meta{Secondary}.  We
 %    construct new continuation and pass it to |\Secondary|.
 %    \begin{macrocode}
 \def\Expression#1{%
   \Secondary{\ExpressionX{#1}}}
-%    \end{macrocode}   
+%    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\ExpressionX}
 %    Parameters:  continuation,  translation  of  \meta{Secondary},
 %    next   character.   We   perform   check   if   character   is
@@ -2189,11 +2189,11 @@ Z
   }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\ExpressionXX}
 %    Parameters:  continuation,  translation  of  \meta{Secondary},
 %    translation of \meta{Expression}.
-%    We finish up translating  of  \meta{Expression}  according  to   
+%    We finish up translating  of  \meta{Expression}  according  to
 %    the formula:
 %    $$\tau(\mbox{\meta{Secondary}\texttt{\char`\|}\meta{Expression}})
 %                         =|\if1|\,\tau(\meta{Secondary})\,|1\else|
@@ -2201,9 +2201,9 @@ Z
 %    \begin{macrocode}
 \def\ExpressionXX#1#2#3{%
   #1{\noexpand\if1#21\noexpand\else#3\noexpand\fi}}
-%    \end{macrocode}   
+%    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\StopParse}
 %    Here is initial continuation for whole parse process. It  will
 %    be  used  by  |\Evaluate|. Note that we assume that expression
@@ -2216,8 +2216,8 @@ Z
   \edef\Expr##1{#1}}
 %    \end{macrocode}
 % \end{macro}
-% 
-% \begin{macro}{\Evaluate}   
+%
+% \begin{macro}{\Evaluate}
 %    This macro is used to start  parsing.  We  call  |\Expression|
 %    with  continuation  defined  above.   On  end of expression we
 %    append a |>|.
@@ -2291,7 +2291,7 @@ Z
 %    The macro |\putMetaComment| has one argument, delimited with
 %    |\endLine|. It brings the source line with |%%| stripped. We
 %    prepend to it |\MetaPrefix| (which can be different from |%%|)
-%    and send the line to all active files. 
+%    and send the line to all active files.
 %    \begin{macrocode}
   \edef\inLine{\MetaPrefix#1}%
   \let\do\putline@do
@@ -2325,7 +2325,7 @@ Z
 %    a `\texttt{\%}' further processing has to be done by
 %    |\processLineX|; otherwise this is normal (not commented out)
 %    line.
-%    
+%
 %    In either case the character read is reinserted to the input
 %    as it may have to be written out.
 %
@@ -2361,7 +2361,7 @@ Z
 %
 % \begin{macro}{\processLineX}
 % \changes{2.3a}{1995/08/20}{Trying to avoid assignments}
-%    This macro is also defined within a group, 
+%    This macro is also defined within a group,
 %    because it also has to check if the next
 %    token in the input stream is a `\texttt{\%}' character.
 %
@@ -2408,9 +2408,9 @@ Z
 %    slash (\texttt{/}) a plus (\texttt{+}), a minus (\texttt{-}), a
 %    less-than sign (\texttt{<}) starting verbatim mode or
 %    any other character that can be found in an option name. This
-%    means that we have to peek at the next token and 
-%    decide what kind of guard we have. 
-%    
+%    means that we have to peek at the next token and
+%    decide what kind of guard we have.
+%
 %    We reinsert |#1| as it may be needed by |\doOption|.
 %    \begin{macrocode}
 \def\checkOption<#1{%
@@ -2431,7 +2431,7 @@ Z
 % \begin{macro}{\doOption}
 %    When no guard modifier is found by |\checkOptions|, the
 %    macro |\doOption| is called. It evaluates a boolean
-%    expression. The result of this evaluation is stored in 
+%    expression. The result of this evaluation is stored in
 %    |\Expr|. The guard only affects the current
 %    line,  so  |\do|  is  defined in such a way that depending on the
 %    result of the  test |\if1\Expr{|\meta{options}|}|,  the  current
@@ -2517,7 +2517,7 @@ Z
 %    \begin{macrocode}
   \def\blockHead{#1}%
 %    \end{macrocode}
-%    Now we evaluate guard expression for all output files 
+%    Now we evaluate guard expression for all output files
 %    updating off-counters. Then we create new list of active
 %    output files. Only files that were active in the outer block
 %    can remain active now.
@@ -2670,7 +2670,7 @@ Z
 % \changes{2.3e}{1996/10/02}{Added doc}
 %    \ds{} keeps information needed to control inclusion of sources in
 %    several list structures. Lists are macros expanding to a series
-%    of calls to macro |\do| with two or three parameters. 
+%    of calls to macro |\do| with two or three parameters.
 %    Subsequently |\do| is redefined in various ways and list
 %    macros sometimes are executed to perform some action on every
 %    element, and sometimes are used inside an |\edef| to make new
@@ -2689,7 +2689,7 @@ Z
 %    \end{itemize}
 %
 %    For every output file name \meta{outfile} \ds{} keeps following
-%    information: 
+%    information:
 %    \begin{itemize}
 %    \item[\cs{pth@}\meta{outfile}] full pathname (including file name),
 %    \item[\cs{ref@}\meta{outfile}] reference lines for the file,
@@ -2697,7 +2697,7 @@ Z
 %               with spaces (needed by \cs{InFileName}),
 %    \item[\cs{pre@}\meta{outfile}] preamble template (as defined with
 %               |\declarepreamble|),
-%    \item[\cs{post@}\meta{outfile}] postamble template. 
+%    \item[\cs{post@}\meta{outfile}] postamble template.
 %    \end{itemize}
 %
 % \begin{macro}{\generate}
@@ -2775,9 +2775,9 @@ Z
 %    \begin{macrocode}
     \immediate\openin\inFile\@pathname\relax
     \ifeof\inFile\else
-      \Ask\answer{File \@pathname\space already exists 
+      \Ask\answer{File \@pathname\space already exists
                   \ifx\empty\destdir somewhere \fi
-                  on the system.^^J% 
+                  on the system.^^J%
                   Overwrite it%
                   \ifx\empty\destdir\space if necessary\fi
                   ? [y/n]}%
@@ -2840,7 +2840,7 @@ Z
   #2%
   \let\from\err@from \let\needed\err@needed
 %    \end{macrocode}
-%    We check order of input files.  
+%    We check order of input files.
 %    \begin{macrocode}
   \checkorder
 %    \end{macrocode}
@@ -2874,7 +2874,7 @@ Z
 \def\checkorderX(#1)#2\qStop#3\qStop{%
   \def\tmp##1\readsource(#1)##2\qStop{%
     \ifx!##2! \order@error
-    \else\ifx!#2!\else 
+    \else\ifx!#2!\else
        \checkorderXX##2%
     \fi\fi}%
   \def\checkorderXX##1\readsource(#1)\fi\fi{\fi\fi
@@ -2892,7 +2892,7 @@ Z
 %  \end{macro}
 %
 % \begin{macro}{\needed}
-% \changes{2.3c}{1995/08/24}{Macro added}     
+% \changes{2.3c}{1995/08/24}{Macro added}
 % \changes{2.3e}{1996/09/12}{Forced expansion of argument to fix a bug
 %                with filenames containing macros}
 % \begin{macro}{\@needed}
@@ -2937,7 +2937,7 @@ Z
 % \end{macro}
 %
 % \begin{macro}{\from}
-% \changes{2.3c}{1995/08/24}{part of code moved to \cs{needed}}     
+% \changes{2.3c}{1995/08/24}{part of code moved to \cs{needed}}
 %    |\from| starts by adding a line to  preamble for output file.
 %    \begin{macrocode}
 \def\from#1#2{\errmessage{Command `\string\from' only allowed in
@@ -3000,7 +3000,7 @@ Z
 %                            off-counters' names}
 % \changes{2.3e}{1996/10/02}{Introduced ``open list''}
 %    When the input file was successfully opened, we try to open all
-%    needed output files by executing the ``open list''. 
+%    needed output files by executing the ``open list''.
 %    If any of files couldn't be opened because of number of streams
 %    limits, their names are put into |\refusedfiles| list. This list
 %    subsequently becomes the open list for the next pass.
@@ -3012,7 +3012,7 @@ Z
 %    Now all output files that could be opened are open. So we go
 %    through the ``output list'' and for every open file we display a
 %    message and zero the off-counter, while closed files are appended
-%    to |\refusedfiles|. 
+%    to |\refusedfiles|.
 %    \begin{macrocode}
     \Msg{} \def\@msg{Processing file \uptospace#1 \qStop}
     \def\change@msg{%
@@ -3143,14 +3143,14 @@ Z
 % \end{macro}
 %
 %  \begin{macro}{\showfiles@do}
-% \changes{2.4a}{1996/10/02}{Macro added (MW)} 
+% \changes{2.4a}{1996/10/02}{Macro added (MW)}
 %    A message is displayed on the terminal telling the user what we
 %    are about to do. For each open output file we display one line
 %    saying what options it is generated with and the off-counter
 %    associated with the file is zeroed. First line contains also name
 %    of input file.
 %    Names of output files that are closed are appended to
-%    |\refusedfiles|. 
+%    |\refusedfiles|.
 %    \begin{macrocode}
 \def\showfiles@do#1#2{%
   \ifnum#1=\stream@closed
@@ -3181,7 +3181,7 @@ Z
 %
 % \begin{macro}{\openoutput}
 % \changes{2.3e}{1996/10/02}{Change for ``open lists'' -- renamed from
-%                            \cs{ensureopen@do}} 
+%                            \cs{ensureopen@do}}
 % \changes{2.4a}{1996/06/06}{Check whether there are streams left (MDW)}
 %    This macro opens output streams if possible.
 %    \begin{macrocode}
@@ -3211,7 +3211,7 @@ Z
 %
 % \begin{macro}{\closeoutput}
 % \changes{2.4a}{1996/06/06}
-%      {Don't close the file if it's not open (MDW)} 
+%      {Don't close the file if it's not open (MDW)}
 %    This macro closes open output stream when it is no longer
 %    needed and increments maxfiles counters.
 %    \begin{macrocode}
@@ -3230,7 +3230,7 @@ Z
 %  \begin{macro}{\ds@heading}
 % \changes{2.3e}{1996/09/16}{Macro added.}
 %    This is a couple of lines, stating what file is being written and
-%    how it was created. 
+%    how it was created.
 %    \begin{macrocode}
 \def\ds@heading{%
   \MetaPrefix ^^J%
@@ -3261,7 +3261,7 @@ Z
 % \begin{macro}{\declarepreamble}
 % \changes{2.3a}{1995/08/18}{renamed from \cs{preamble};
 %                            interface changed}
-% \changes{2.0e}{1991/06/01}{Macro added.} 
+% \changes{2.0e}{1991/06/01}{Macro added.}
 % \changes{2.3e}{1995/09/25}
 %     {Change for batchfiles working by \cs{input}}
 % \changes{2.3e}{1996/09/16}{Change to allow customization.}
@@ -3366,7 +3366,7 @@ Z
   \declarepreamble\defaultpreamble}
 \def\postamble{\usepostamble\defaultpostamble
   \declarepostamble\defaultpostamble}
-%    \end{macrocode}   
+%    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \begin{macro}{\org@preamble}
@@ -3418,7 +3418,7 @@ in the same archive or directory.)
 %
 % \begin{macro}{\originaldefault}
 % \changes{2.5a}{1998/04/03}{Macro added}
-% \changes{2.5b}{1998/04/28}{Macro renamed from \cs{orginaldefault} 
+% \changes{2.5b}{1998/04/28}{Macro renamed from \cs{orginaldefault}
 %   to \cs{originaldefault}}
 % The default preamble header changed in v2.5 to allow distribution
 % of generated files as long as source also distributed. If you need
@@ -3491,7 +3491,7 @@ for copying and modification in the file \inFileName.
 % \end{macro}
 %
 % \subsection{Support for writing to specified directories}
-% 
+%
 %    As we've seen before every output file is written to  directory
 %    specifed  by  the  value of |\destdir| current at the moment of
 %    this file's  |\file|  declaration.
@@ -3511,11 +3511,11 @@ for copying and modification in the file \inFileName.
 \def\showdirectory#1{\WriteToDir}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\BaseDirectory}
 % \changes{2.3e}{1995/09/15}{Macro added}
 % \changes{2.4e}{1996/10/22}{\cs{@setwritetodir} added (DPC)}
-%    This is config file command for specifing root directory of the 
+%    This is config file command for specifing root directory of the
 %    \TeX{}  hierarchy.  It enables the whole directory
 %    selecting mechanism by redefining |\usedir|.
 %    First make sure that the directory syntax commands have been set
@@ -3529,7 +3529,7 @@ for copying and modification in the file \inFileName.
   \edef\basedir{#1\dirsep}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\convsep}
 % \changes{2.3e}{1995/09/15}{Macro added}
 %    This macro loops through slashes in its argument replacing them
@@ -3541,16 +3541,16 @@ for copying and modification in the file \inFileName.
 \def\pesvnoc#1\qStop{\fi}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\alt@usedir}
 % \changes{2.3e}{1995/09/15}{Macro added}
 %    Directory name construction macro enabling writing to various
-%    directories. 
+%    directories.
 %    \begin{macrocode}
 \def\alt@usedir#1{%
   \Name\ifx{dir@#1}\relax
     \undefined@directory{#1}%
-  \else 
+  \else
     \edef\destdir{\csname dir@#1\endcsname}%
   \fi}
 \def\showalt@directory#1{%
@@ -3559,7 +3559,7 @@ for copying and modification in the file \inFileName.
   \else\csname dir@#1\endcsname\fi}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 %  \begin{macro}{\undefined@directory}
 % \changes{2.4a}{1996/10/04}{Macro added (MW)}
 % \changes{2.4e}{1996/10/22}{Help text added (DPC)}
@@ -3627,7 +3627,7 @@ for copying and modification in the file \inFileName.
   \ifx t#2\askforoverwritetrue
   \else\askforoverwritefalse\fi
   \generate{\file{#1}{#3}}%
-  }}    
+  }}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3683,11 +3683,11 @@ for copying and modification in the file \inFileName.
 %    these commands, but issue a warning when they are used.
 %    \begin{macrocode}
 \def\processfile{\Msg{%
-    ^^Jplease use \string\processFile\space instead of 
+    ^^Jplease use \string\processFile\space instead of
        \string\processfile!^^J}%
     \processFile}
 \def\generatefile{\Msg{%
-    ^^Jplease use \string\generateFile\space instead of 
+    ^^Jplease use \string\generateFile\space instead of
       \string\generatefile!^^J}%
     \generateFile}
 %    \end{macrocode}
@@ -3715,7 +3715,7 @@ for copying and modification in the file \inFileName.
 % The configuration command |\maxfiles| is just slightly prettier than
 % an assignment, for \LaTeX\ people.  It also gives me an opportunity
 % to check that the limit is vaguely sensible.  I need at least 4
-% streams: 
+% streams:
 % \begin{enumerate}
 % \item A batch file.
 % \item A sub batch file, which \LaTeX's installation utility uses.
@@ -3737,7 +3737,7 @@ for copying and modification in the file \inFileName.
 %    \end{macrocode}
 %
 % \changes{2.4a}{1996/10/03}{No default limit since batchfiles are now
-%                            \cs{input} (MW)} 
+%                            \cs{input} (MW)}
 % Since batchfiles are now |\input|ed there should be no default limit
 % here. I'll just use some abstract large number.
 %    \begin{macrocode}
@@ -3820,7 +3820,7 @@ for copying and modification in the file \inFileName.
 % \changes{2.3e}{1995/09/25}{Batch file is \cs{input}ed not \cs{read}}
 %    When \ds{} is run it always tries to use a batch file.
 %
-%    For this purpose it calls the macro |\processbatchFile|. 
+%    For this purpose it calls the macro |\processbatchFile|.
 %
 % \changes{2.4a}{1996/06/06}
 %      {Added check for file limits (MDW)}
@@ -3989,10 +3989,10 @@ for copying and modification in the file \inFileName.
 % \changes{2.0p}{1992/06/26}{Changed question about overwriting.}
 %    \begin{macrocode}
           \Continuefalse
-          \Ask\answer{File \destdir\destFileName\space already 
-                      exists 
+          \Ask\answer{File \destdir\destFileName\space already
+                      exists
                       \ifx\empty\destdir somewhere \fi
-                      on the system.^^J% 
+                      on the system.^^J%
                       Overwrite it%
                       \ifx\empty\destdir\space if necessary\fi
                       ? [y/n]}%
@@ -4145,7 +4145,7 @@ for copying and modification in the file \inFileName.
 %    a file name.  Its default value defined here is suitable for
 %    \textsc{unix, ms-dos} and Macintosh, but for some systems it may
 %    be needed to redefine this in \texttt{docstrip.cfg} file.  We
-%    provide such redefinition for VMS here.  
+%    provide such redefinition for VMS here.
 %
 %    Macro |\dirsep| holds directory separator specific for a
 %    system. Default value suitable for UNIX and DOS is slash. It
@@ -4154,7 +4154,7 @@ for copying and modification in the file \inFileName.
 %    The definition of this macro is now delayed until |\@setwritedir|
 %    is called.
 % \end{macro}
-% 
+%
 % \begin{macro}{\@setwritedir}
 % \changes{2.4e}{1996/10/22}{macro added (DPC)}
 % The following tests try to automatically set |\WriteToDir|,
@@ -4228,7 +4228,7 @@ for copying and modification in the file \inFileName.
 %
 % If the user has a |docstrip.cfg| file, use it now.
 % \changes{2.4d}{1995/10/17}{Move config file test to outer level (DPC)}
-%    This macro tries to read \texttt{docstrip.cfg} file.  If this 
+%    This macro tries to read \texttt{docstrip.cfg} file.  If this
 %    succeeds executes its first argument, otherwise the second.
 %    \begin{macrocode}
 \immediate\openin\inputcheck=docstrip.cfg\relax
@@ -4261,7 +4261,7 @@ for copying and modification in the file \inFileName.
 % do not start with |\def\batchfile{|\ldots
 %    \begin{macrocode}
 \def\process@first@batchfile{%
-  \processbatchFile  
+  \processbatchFile
   \ifnum\NumberOfFiles=\z@
     \interactive
   \fi
@@ -4316,9 +4316,9 @@ for copying and modification in the file \inFileName.
 %
 %    First check whether the user has
 %    defined the control sequence |\batchfile|. If he did, it should
-%    contain the name of the file to process. 
+%    contain the name of the file to process.
 %    If he didn't, try the current file, unless that is |docstrip.tex|
-%    in which case a default name is tried. 
+%    in which case a default name is tried.
 %    Whether or not the default batch file is used is
 %    remembered by setting the switch |\ifDefault| to \meta{true} or
 %    \meta{false}.
diff --git a/Master/texmf-dist/source/latex/base/docstrip.ins b/Master/texmf-dist/source/latex/base/docstrip.ins
index 9e3f0c6ab14..a8da8dcd278 100644
--- a/Master/texmf-dist/source/latex/base/docstrip.ins
+++ b/Master/texmf-dist/source/latex/base/docstrip.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -44,9 +44,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -56,7 +56,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -69,8 +69,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/ec.ins b/Master/texmf-dist/source/latex/base/ec.ins
index db315210b2f..c397daa561f 100644
--- a/Master/texmf-dist/source/latex/base/ec.ins
+++ b/Master/texmf-dist/source/latex/base/ec.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file may only be distributed together with a copy of the LaTeX
@@ -76,7 +76,7 @@ of this file under its original name.
 
 \Msg{*** Generating font defs for Cork encoded
          and Text Companion fonts ***}
- 
+
 \generate{
   \file{t1cmfib.fd}{
      \from{cmfonts.fdd}{fd,T1cmfib,ec}}
@@ -126,5 +126,5 @@ of this file under its original name.
 \Msg{* Happy TeXing}
 \Msg{***********************************************************}
 }
- 
+
 \endbatchfile
diff --git a/Master/texmf-dist/source/latex/base/encguide.tex b/Master/texmf-dist/source/latex/base/encguide.tex
index d15bbdcdb22..a38ce10f789 100644
--- a/Master/texmf-dist/source/latex/base/encguide.tex
+++ b/Master/texmf-dist/source/latex/base/encguide.tex
@@ -1,39 +1,39 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2014
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % $Id: encguide.tex 5713 2006-01-18 23:29:23Z robin $
 %
 
- 
+
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
- 
+
 \documentclass{ltxguide}[1994/11/20]
- 
+
 \usepackage[T1]{fontenc}
 \IfFileExists{lmodern.sty}{\usepackage{lmodern}}{}
 \usepackage{textcomp}
@@ -175,7 +175,7 @@
      \else
        \count@="80
        \setbox0=\hbox{\X
-        \loop\char\count@\advance\count@ by1 \ifnum\count@<"100 
+        \loop\char\count@\advance\count@ by1 \ifnum\count@<"100
         \repeat}%
   \ifdim\wd0>0pt \let\top\tophalf\else\let\top\notophalf\fi
      \beginchart\X{\hfill\llap{\textbf{#1, \large#2}\label{fonttable:#1}}}\normalchart
@@ -187,18 +187,18 @@
 \setcounter{tocdepth}{3}
 
 \title{\LaTeX{} font encodings}
- 
+
 \author{Frank Mittelbach \and Robin
    Fairbairns \and Werner Lemberg \and \LaTeX3 Project Team.}
- 
-\date{\copyright~Copyright 1995--1997,  2005, 2006 \\[5pt] 6 January 2006}
- 
+
+\date{\copyright~Copyright 1995--2014 \\[5pt] 23 March 2014}
+
 \begin{document}
- 
+
 \maketitle
- 
+
 \tableofcontents
- 
+
 \section{Introduction}
 
 This document explains the ideas that underpin \LaTeX{} font
@@ -259,7 +259,7 @@ The Computer Modern text encoding raises problems in unmodified
 \verb"\accent" commands.  Even in those Western European languages for
 which the \Enc{OT1} encoding has symbols for the necessary
 \verb"\accent"-based diacritics, this shortcoming ruins typesetting of
-running text. 
+running text.
 
 With the advent of \TeX{}\,3, with its ability to switch between
 hyphenation pattern sets, it was clear that the situation could not
@@ -300,11 +300,11 @@ most likely be delayed still further.
 
 
 \subsection{Further information}
- 
+
 For a general introduction to \LaTeX, including the new features of
 \LaTeXe, you should read \emph{\LaTeXbook},
 Leslie Lamport, Addison Wesley, 2nd~ed, 1994.
- 
+
 A more detailed description of the new features of \LaTeX, including an
 overview of more than 200 packages and nearly 1000 ready to run examples, is
 to be found in \emph{\LaTeXcomp{} second edition} by Frank Mittelbach and
@@ -314,11 +314,11 @@ The \LaTeX{} project sponsored a report on Mathematical % spelt out in full
 font encodings, which
 is worth reading for its insight into the problems of defining the way
 in which math is used: see~\cite{ziegler,clasen,clasen-vieth}.
- 
+
 The \LaTeX{} font selection scheme is based on \TeX, which is described
 by its developer in \emph{The \TeX book}, Donald E.~Knuth, Addison
 Wesley, 1986, revised in 1991 to include the features of \TeX~3.
- 
+
 For more information about \TeX{} and \LaTeX, please contact your local
 \TeX{} Users Group, or the international \TeX{} Users Group
 (\url{http://www.tug.org}).
@@ -369,7 +369,7 @@ start with |E|, whilst |U| is for Unknown or Unclassified encodings.
   change from font to font, a number of problems arise, so it is best to
   develop encodings that can be used with a large number of fonts in parallel.
   This allows documents to be typeset using different fonts without problems.
-  
+
   The \Enc{TS1} encoding is a good example of a \emph{bad} encoding (even
   though it was developed with the best intentions) as a huge number of fonts
   can only implement parts of it. Similarly, the fact that the few sets of
@@ -378,7 +378,7 @@ start with |E|, whilst |U| is for Unknown or Unclassified encodings.
   problems. Don't add to this if possible!
 \end{quote}
 
- 
+
 \subsection{128$^+$ glyph encodings (text)}
 
 The `OT' series of font encodings start with Donald Knuth's original
@@ -408,7 +408,7 @@ signifying `original', or just `old'.
   \verb=\=, \verb={=, and \verb=}= are only available in the
   typewriter fonts and the \textdollar{} and \textsterling{} signs
   share the same position (in different font shapes).
-  
+
   This means that direct selection of these slots can produce
   unpredictable results, e.g., typing \texttt{\string<} or
   \verb=\symbol{'74}= in a document can yield `\textquestiondown'.
@@ -437,7 +437,7 @@ signifying `original', or just `old'.
   The \Enc{OT3} encoding was never really used with \LaTeXe{}
   following the introduction of the TIPA system which offers much
   better support for IPA. In particular, no \File{ot3enc.def}
-  file was ever produced. 
+  file was ever produced.
 \end{encodinginfo}
 
 
@@ -467,7 +467,7 @@ signifying `original', or just `old'.
 
 \end{encodinginfo}
 
-      
+
 
 \begin{encodinginfo}{OT6}
         {Armenian text encoding}
@@ -479,6 +479,13 @@ signifying `original', or just `old'.
 
   This encoding was allocated to permit use of Dachian's
   Armenian fonts in a standard \LaTeX{} environment.
+
+  Because of license issues the \texttt{artmr} fonts are not necessarily
+  included in distributed \TeX{} installations (and for this reason the
+  corresponding encoding table is not shown below). However, the fonts
+  and the support macros can be found on the CTAN archives (look for
+  \texttt{armtex}).
+
 \end{encodinginfo}
 
 
@@ -517,7 +524,7 @@ signifying `original', or just `old'.
   {--- (within each encoding)}
   {larm1000}
   {\cite{Berdnikov:eurotex-98}}
-  
+
   There are too many glyphs in the full Cyrillic complement of
   languages for all of them to be covered by a single
   \LaTeX{}-compliant encoding (the lower half of each
@@ -546,7 +553,7 @@ signifying `original', or just `old'.
     The \Enc{T3} encoding (and associated macros) provides the glyphs required
   in phonetic description according to current International Phonetic
   Association recommendations \cite{ipa}.
-  
+
   The \Enc{T3} encoding does \emph{not fulfil} the requirements for \Enc{T}
   encodings---the name is a historical accident. The correct name would be
   \Enc{X3}, but due to the fact that this font family has been used under its
@@ -563,15 +570,15 @@ signifying `original', or just `old'.
         {0x00--0xFF}              % range(s) of slots used for glyphs
         {0x24}         % range(s) of slots with variable glyphs if any
         {fcr10}              % name of an example font
-        {\cite{tub:JKn93}} 
+        {\cite{tub:JKn93}}
 
 The African Latin fonts contain in their lower half (0--127) the same
 characters as the European Latin (T1-encoded) Fonts, while in their
 upper half (128--255) they
 contain letters and symbols for African languages that use extended
-Latin alphabets. 
+Latin alphabets.
 Due to lack of space, J\"org had to play the unfortunate trick of
-assigning \verb=\textdollar= and \verb=\textsterling= 
+assigning \verb=\textdollar= and \verb=\textsterling=
 the same position; users should take these characters
 from the text companion font, if they are needed.  Instead of defining
 a lot of new control sequences for the single letters, there are three
@@ -579,9 +586,9 @@ accent-like control sequences with general purpose:
 \verb=\m= (Modified-1),
 \verb=\M= (Modified-2) and
 \verb=\B= (Barred).
-Most standard \LaTeX{} encoding-dependent commands 
+Most standard \LaTeX{} encoding-dependent commands
 work.  However, the Icelandic special letters are not available and `best
-replacements' for \verb=\Th=, \verb=\th=, and \verb=\dh= 
+replacements' for \verb=\Th=, \verb=\th=, and \verb=\dh=
 are used (barred T and d resp.).
 \end{encodinginfo}
 
@@ -667,8 +674,8 @@ itself hasn't been defined so far.
 \else
   \expandafter\ifx\csname r@fonttable:ptmr8c\endcsname\relax
   \else
-    \space (compare the two tables for \Enc{TS1} on 
-     pages~\pageref{fonttable:tcrm1000} 
+    \space (compare the two tables for \Enc{TS1} on
+     pages~\pageref{fonttable:tcrm1000}
      and~\pageref{fonttable:ptmr8c})%
   \fi
 \fi.
@@ -738,7 +745,7 @@ itself hasn't been defined so far.
         {---}
         {cmsy10}
         {\cite[p.431]{A-W:DKn86}}
-  
+
   The  \Enc{OMS} encoding contains basic mathematical symbols,
   together with an uppercase ``calligraphic'' Latin alphabet.
 \end{encodinginfo}
@@ -793,7 +800,7 @@ given in \cite{ziegler}.
   {all}
   {}
   {\cite[p.416]{A-W:MG2004}}
-  
+
   As the name indicates, encodings starting with the letter \Enc{E} are
   intended for experimental encodings, that are still likely to change.
 \end{encodinginfo}
@@ -805,14 +812,14 @@ given in \cite{ziegler}.
         {all}
         {}
         {\cite[p.416]{A-W:MG2004}}
-        
+
         `Local' encodings provide the means to develop representation
         techniques that are suited to a particular \TeX{} environment.  While
         the developer has freedom to specify their encoding as he or she
         pleases, there is a strong incentive to obey the \LaTeX{} rules for
         encodings, since it will otherwise be difficult to compose text using
         the encoding.
-  
+
         At least it was the intention that \Enc{L..} encodings are local and
         site dependent. However, a number of such encodings became generally
         used without ever getting a different name allocated.
@@ -828,7 +835,7 @@ given in \cite{ziegler}.
         {\emph{believed none}}
         {ptmr8y}
         {\cite[p.416]{A-W:MG2004}}
-        
+
         This is an alternative to the \Enc{T1} encoding developed by Y\&Y and
         used in their commerical \TeX{} implementation.
 
@@ -856,7 +863,7 @@ given in \cite{ziegler}.
         {\emph{believed none}}
         {grmn1000}
         {\cite[p.575]{A-W:MG2004}}
-        
+
         Currently the main encoding in use for the Greek language.
 
         This encoding doesn't conform to the restrictions for
@@ -875,7 +882,7 @@ given in \cite{ziegler}.
   {---}
   {}
   {\cite{Adobe:PDF-1.6}, \cite{hyperref}}
-  
+
   The \Enc{PD1} encoding is a virtual encoding with 256 glyphs needed to
   produce bookmarks and similar text in PDF document generated with pdf\LaTeX.
   The encoding is ``virtual'' because by design there are no \TeX{}
@@ -891,7 +898,7 @@ given in \cite{ziegler}.
   {---}
   {}
   {\cite{Adobe:PDF-1.6}, \cite{hyperref}}
-  
+
   Another virtual encoding (with more than 600 characters) for
   Unicode-encoded bookmarks in PDF documents.
 \end{encodinginfo}
@@ -912,7 +919,7 @@ given in \cite{ziegler}.
 
 
 
-\section{Restrictions} 
+\section{Restrictions}
 \label{sec:restrictions}
 
 
@@ -1165,14 +1172,14 @@ accented.  For example, |\v{c}| is the \textsc{licr} for `\v{c}'.
 \ttverb\textunderscore    \>OT1,T1\>   \textunderscore  \>  \\
 \ttverb\textvisiblespace  \>OT1,T1\>   \textvisiblespace\>  \\
 \ttverb\th                \>T1    \>   \th              \>
-\end{tabbing}                        
+\end{tabbing}
 
 
 
 
 \begin{thebibliography}{99}
 \addcontentsline{toc}{section}{\numberline{\relax}\refname}
- 
+
 
 \bibitem{Adobe:PDF-1.6} \emph{\textsc{PDF} reference}:
     Adobe portable document format version~1.6.  Adobe Systems
@@ -1238,9 +1245,9 @@ Michael~J. Ferguson.
 
 \bibitem{tub:JKn93}
 J\"org Knappen.
-\newblock Fonts for Africa: The fc Fonts. 
+\newblock Fonts for Africa: The fc Fonts.
 \newblock {\em {TUG}boat}, 14(2):104, 1993.
- 
+
 \bibitem{Knappen:TB17-2-96} J\"org Knappen:
   \emph{The \Pkg{dc} fonts~1.3: Move towards stability
       and completeness}.  In: TUGBoat 17\#2, 1996.
@@ -1249,7 +1256,7 @@ J\"org Knappen.
 \bibitem{A-W:DKn86}
 Donald~E. Knuth.
 \newblock {\em The {\TeX}book}.
-\newblock Volume~A of {\em Computers \& {T}ypesetting\/}, 
+\newblock Volume~A of {\em Computers \& {T}ypesetting\/},
   May 1989.
 \newblock Eight printing.
 
@@ -1278,7 +1285,7 @@ Frank Mittelbach and Michel Goossens.
   \url{http://unicode.org}.
 
 \bibitem{ziegler} Justin Ziegler, \emph{Technical
-    Report on Math Font Encodings}, June 1994, 
+    Report on Math Font Encodings}, June 1994,
   \url{http://www.tug.org/twg/mfg/papers/ltx3pub/l3d007.ps.gz}.
 
 \end{thebibliography}
@@ -1305,7 +1312,7 @@ for each font it fails to find.)
 
 \ftable{plr10}{OT4}
 
-\ftable{artmr10}{OT6}
+%\ftable{artmr10}{OT6}
 
 \ftable{ecrm1000}{T1}
 
diff --git a/Master/texmf-dist/source/latex/base/exscale.dtx b/Master/texmf-dist/source/latex/base/exscale.dtx
index 4621afeaa5f..70104afbe43 100644
--- a/Master/texmf-dist/source/latex/base/exscale.dtx
+++ b/Master/texmf-dist/source/latex/base/exscale.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% File: exscale.dtx
@@ -33,7 +33,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{exscale}
 %<fd,    >\ProvidesFile{OMXcmex.fd}
-%<package,fd>     [2007/10/29 v2.1h 
+%<package,fd>     [2007/10/29 v2.1h
 %<package>                         Standard LaTeX package exscale]
 %<fd,    >                         exscale package font definitions]
 %<*driver>
@@ -159,7 +159,7 @@
 %    \end{macrocode}
 % This dimen is set with every size change to $1.2$ times the height
 % of a left parenthesis.
-% \changes{v2.1e}{1994/11/06}{Renamed \cs{every@size} to 
+% \changes{v2.1e}{1994/11/06}{Renamed \cs{every@size} to
 %                             \cs{every@math@size}}
 % \changes{v2.1e}{1994/11/06}{Update \cs{big@size} globally}
 % \changes{v2.1h}{2001/10/29}{Use box 0 within group to avoid changing this
diff --git a/Master/texmf-dist/source/latex/base/exscale.ins b/Master/texmf-dist/source/latex/base/exscale.ins
index 179decb900a..8263ff4d523 100644
--- a/Master/texmf-dist/source/latex/base/exscale.ins
+++ b/Master/texmf-dist/source/latex/base/exscale.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/fixltx2e.dtx b/Master/texmf-dist/source/latex/base/fixltx2e.dtx
index d9d91e43636..c67813a566a 100644
--- a/Master/texmf-dist/source/latex/base/fixltx2e.dtx
+++ b/Master/texmf-dist/source/latex/base/fixltx2e.dtx
@@ -1,34 +1,34 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2014
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
-% 
+%
 %<*dtx>
           \ProvidesFile{fixltx2e.dtx}
 %</dtx>
@@ -38,7 +38,7 @@
 %<driver>\ProvidesFile{fixltx2e.drv}
 % \fi
 %         \ProvidesFile{fixltx2e.dtx}
-          [2006/09/13 v1.1m fixes to LaTeX]
+          [2014/04/27 v1.1p fixes to LaTeX]
 %
 % \iffalse
 %<*driver>
@@ -54,7 +54,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1078}
+% \CheckSum{1213}
 %
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -89,9 +89,9 @@
 %
 % \begin{abstract}
 %    These packages provides fixes to \LaTeXe{} which are desirable
-%    but cannot be integrated into the \LaTeXe{} kernel or the 
-%    font definition files directly as they would produce a version 
-%    incompatible to earlier releases (either in formatting or 
+%    but cannot be integrated into the \LaTeXe{} kernel or the
+%    font definition files directly as they would produce a version
+%    incompatible to earlier releases (either in formatting or
 %    functionality).
 %
 %    By providing these fixes in the form of packages, users can benefit
@@ -114,7 +114,7 @@
 %    classes are not concerned with bugs but are suggesting, more or
 %    less politely, that the design decisions embodied in them are
 %    `not optimal' and asking us to modify them.
-%    
+%
 %    There are several reasons why we have decided not to make such
 %    changes to these files.
 %    \begin{itemize}
@@ -123,7 +123,7 @@
 %    good practice to change such aspects of `standard classes'
 %    because many people will be relying on them.
 %    \end{itemize}
-%    
+%
 %    We have therefore decided not to even consider making such
 %    modifications, nor to spend time justifying that decision.  This
 %    does not mean that we do not agree that there are many
@@ -146,7 +146,7 @@
 %
 % In theory one could get around this by adding a line like
 % \begin{quote}
-% |\NeedsTeXFormat{latex2e}[|\meta{date}|]| 
+% |\NeedsTeXFormat{latex2e}[|\meta{date}|]|
 % \end{quote}
 % on top of the document. However, this fails for two reasons. Firstly,
 % most people will not be aware that they make use of a feature or fix
@@ -156,7 +156,7 @@
 % in time to process the document properly (the latter is a sad fact
 % of life).
 %
-% By providing the \Lpack{fixltx2e} and \Lpack{fix-cm} packages 
+% By providing the \Lpack{fixltx2e} and \Lpack{fix-cm} packages
 % we hope to help people in this respect since, when they
 % are used, a document will contain a clear
 % indication that special features/fixes are needed and if the
@@ -164,10 +164,10 @@
 % with the right version) it is far easier to download and install them
 % from some archive than to upgrade \LaTeX{} in a rush.
 %
-% The packages are independent from each other and deal with different 
+% The packages are independent from each other and deal with different
 % subjects:
 % \Lpack{fixltx2e} provides general changes to the \LaTeX{} kernel,
-% while \Lpack{fix-cm} improves the definitions of the Computer Modern 
+% while \Lpack{fix-cm} improves the definitions of the Computer Modern
 % font families.
 %
 % We will try to maintain the packages in such a way that they can be used
@@ -189,14 +189,14 @@
 %   |\usepackage{fixltx2e}[|\meta{date}|]|
 % \end{quote}
 % into the preamble of your document, where \meta{date} is the date of
-% the \Lpack{fixltx2e} package that you are using. 
+% the \Lpack{fixltx2e} package that you are using.
 % This way your document will produce a warning if processed at a site
 % that only has an older version of of this package.
 %
 % \subsection{Using \Lpack{fix-cm}}
 %
 % \begin{sloppypar}
-% To use the \Lpack{fix-cm} package, 
+% To use the \Lpack{fix-cm} package,
 % load \danger it \emph{before} \cmd{\documentclass},
 % and use the command \cmd{\RequirePackage} to do so, rather than the
 % normal \cmd{\usepackage}:
@@ -205,8 +205,8 @@
 %   |\RequirePackage{fix-cm}|\\
 %   |\documentclass| \dots
 % \end{verse}
-% \textbf{Do not to load any other package before the document class}, 
-% unless you have a thorough understanding of the \LaTeX{} internals 
+% \textbf{Do not to load any other package before the document class},
+% unless you have a thorough understanding of the \LaTeX{} internals
 % and know exactly what you are doing!
 %
 %
@@ -219,7 +219,7 @@
 %
 %
 %
-% \subsection{2-col: 1-col fig can come before earlier 2-col fig 
+% \subsection{2-col: 1-col fig can come before earlier 2-col fig
 %            (pr/2346)}
 %
 %\begin{verbatim}
@@ -235,7 +235,7 @@
 % table."  however, there is a footnote stating, "However,
 % in two-column page style, a single-column figure can come before
 % an earlier double-column figure, and vice versa."
-% 
+%
 % this twocolumn behavior is undesireable---at least by me and
 % most professional organizations i publish in.  ed snyzter developed
 % a hack fix for 2.09 several years ago which links the two
@@ -287,7 +287,7 @@
 % float is committed to a certain region, an additional check must be
 % made to check that the float is (or is not) double column. If it
 % spans the wrong number of columns it is deferred rather than being
-% added. 
+% added.
 %
 % Unfortunately the bit `16' is not available in \LaTeXe. It is used
 % to encode the extra float position possibility `|!|' that was added
@@ -406,7 +406,7 @@
 %
 % \section{Fixes added for 2003/06/01}
 %
-% \subsection{\texttt{\textbackslash fnsymbol} should use text symbols 
+% \subsection{\texttt{\textbackslash fnsymbol} should use text symbols
 %    if possible (pr/3400)}
 %
 %\begin{verbatim}
@@ -434,7 +434,7 @@
 % >Synopsis:       No hyphenation in first word after float environment
 % >Arrival-Date:   Thu Jan 30 13:21:00 CET 2003
 % >Originator:     h.harders@tu-bs.de (Harald Harders)
-% 
+%
 % If a float environment (figure, table) is written within a paragraph,
 % the first word after the environment is not hyphenated.
 %\end{verbatim}
@@ -462,7 +462,7 @@
 %\begin{verbatim}
 %\usepackage[T1]{fontenc}
 %\end{verbatim}
-% to a document that uses the Computer Modern typefaces, 
+% to a document that uses the Computer Modern typefaces,
 % then not only the T1 encoding is used but the fonts
 % used in the document look noticeably different. This is due to the fact
 % that the EC fonts have more font series designs, e.g.\ a 14.4\,pt bold
@@ -484,14 +484,14 @@
 %
 %
 %
-% \subsubsection{What \Lpack{fix-cm} does} 
+% \subsubsection{What \Lpack{fix-cm} does}
 %
 % ^^A Are you bothered by the T1 and TS1 encoded Computer Modern fonts,
 % ^^A which look partially worse than the traditional ones?  Would you
 % ^^A like to use the CM fonts with arbitrary sizes?  If so, the macro
 % ^^A package \Lpack{fix-cm} can help you.
 %
-% Loading the package \Lpack{fix-cm} changes the font definitions of the 
+% Loading the package \Lpack{fix-cm} changes the font definitions of the
 % Computer Modern fonts, in order to achieve the following effects:
 % \begin{itemize}
 %   \item
@@ -513,10 +513,10 @@
 % The package acts on the following font families:
 % \begin{itemize}
 %   \item
-%   The text font families \file{cmr}, \file{cmss}, \file{cmtt} and 
+%   The text font families \file{cmr}, \file{cmss}, \file{cmtt} and
 %   \file{cmvtt} with OT1, T1 and TS1 encoding.
-%   \item 
-%   The default math fonts used by \LaTeX, i.e., the font families 
+%   \item
+%   The default math fonts used by \LaTeX, i.e., the font families
 %   \file{cmm} with encoding OML and \file{cms} with encoding OMS.
 %   \item
 %   The symbols used by the package \Lpack{latexsym}, i.e., the font
@@ -551,7 +551,7 @@
 % The package should be loaded \danger \emph{before} \cmd{\documentclass},
 % using the command |\RequirePackage{fix-cm}|, rather than the
 % normal \cmd{\usepackage}.
-% Rationale:  
+% Rationale:
 % If the package is loaded in the preamble, a preceding package or
 % even the code of the document class may have used any of the CM
 % fonts already.  However, the definitions of those fonts, that are
@@ -572,18 +572,18 @@
 % lots of possibly huge \file{.pk} files.  Also, \MF{} chokes
 % sometimes on extremely small or large sizes, because of arithmetic
 % problems.
-%   
+%
 % \Lpack{fix-cm} supersedes the experimental packages \Lpack{cmsd} and
 % \Lpack{fix-ec}, which are no longer distributed.
 %
 % The packages \Lpack{type1cm} and \Lpack{type1ec} must not be loaded
-% additionally; they enable only continuous scaling.  
+% additionally; they enable only continuous scaling.
 %
 %
 %
 % \section{Fixes added for 2005/12/01}
 %
-% \subsection{\texttt{\textbackslash textsubscript} not defined in  
+% \subsection{\texttt{\textbackslash textsubscript} not defined in
 %    latex.ltx (pr/3492)}
 %
 %\begin{verbatim}
@@ -609,10 +609,10 @@
 % >Arrival-Date:   Fri Jun 11 16:21:00 CEST 2004
 % >Originator:     moho01ab@student.cbs.dk  (Morten Hoegholm)
 %
-% The last three arguments of \@DeclareMathSizes cannot take a dimension 
-% as argument, making it inconsistent with the rest of the font changing 
-% commands and itself, as the second argument can take a dimension 
-% specification. 
+% The last three arguments of \@DeclareMathSizes cannot take a dimension
+% as argument, making it inconsistent with the rest of the font changing
+% commands and itself, as the second argument can take a dimension
+% specification.
 %\end{verbatim}
 %
 % \subsection{\texttt{\textbackslash addpenalty} ruins flush-bottom (pr/3073)}
@@ -624,14 +624,14 @@
 % >Arrival-Date:   20 Oct 2005 14:46:35 -0700
 % >Originator:     asnd@triumf.ca (Donald Arseneau)
 % >Description:
-%  The (revised) definition of \addpenalty has been 
+%  The (revised) definition of \addpenalty has been
 %  incorporated into fixltx2e, but now Plamen Tanovski has found a
 %  problem:  since the \vskip is increased by the previous depth,
 %  consecutive \addpenalty and \addvspace commands keep enlarging
 %  the \vskip.
 %\end{verbatim}
 %
-% \subsection{\texttt{\textbackslash footnotemark[x]} crashes with fixltx2e.sty 
+% \subsection{\texttt{\textbackslash footnotemark[x]} crashes with fixltx2e.sty
 %    (pr/3752)}
 %
 %\begin{verbatim}
@@ -695,12 +695,12 @@
 %
 % Use of a \raisebox in \section{} produces the error message
 % mentioned in the subject.
-% 
+%
 % PR latex/1738 descriped a similar problem, which has been solved
 % 10 years ago. Protecting the \raisebox with \protect solved my
 % problem as well, but wouldn't it make sense to have a similar fix
 % as in the PR?
-% 
+%
 % It is particulary confusing, that an unprotected \raisebox in a
 % \section*-environment works fine, while in a \section-environment
 % produces error.
@@ -720,6 +720,31 @@
 % |\framebox|, |\parbox|, |\rule| and |\raisebox|.
 %
 %
+% \section{Fixes added for 2014/05/01}
+%
+% \subsection{Check the optional arguments of floats}
+%
+% By default LaTeX silently ignores unknown letters in the optional
+% arguments of floats. |\begin{figure}[tB]| the |B| is ignored so it
+% acts like |\begin{figure}[t]| However |\begin{figure}[B]| does
+% \emph{not} act like |\begin{figure}[]| as the check for an empty
+% argumant, or unsupplied argument, is earlier. |[]| causes the
+% default float placement to be used, but |[B]| means that \emph{no}
+% float area is allowed and so the float will not be placed until the
+% next |\clearpage| or end of document, no warning is given.
+%
+% This package adds a check on each letter, and if it not one of
+% |!tbhp| then an error is given and the code acts as if |p| had been
+% used, so that the float may be placed somewhere.
+%
+% \subsection{Infinite glue found (pr/4023 and pr/2346)}
+%
+% The fix for pr/2346 had an issue when used in conjunction with
+%  |\enlargethispage| as the latter introduced an infinite negative
+%  glue at the bottom of the page. That in turn make a |\vsplit|
+%  operation to get at the column marks invalid.
+%
+%
 % \StopEventually{}
 %
 % \section{Implementation}
@@ -733,7 +758,7 @@
 %
 %
 %
-% \subsection{2-col: 1-col fig can come before earlier 2-col fig 
+% \subsection{2-col: 1-col fig can come before earlier 2-col fig
 %              (pr/2346) \\
 %             Wrong headline for twocolumn (pr/2613)}
 %
@@ -760,10 +785,20 @@
 %    \begin{macrocode}
     \splitmaxdepth\maxdimen
     \vbadness\maxdimen
-    \setbox\@outputbox\vsplit\@outputbox to\maxdimen
+%    \end{macrocode}
+%  In case of |\enlargethispage| we will have infinite negative glue
+%  at the bottom of the page (coming from |\vss|) and that will earn
+%  us an error message if we |\vsplit| to get at the marks.  So we
+%  need to remove thek last glue (if any) at the end of |\@outputbox|
+%  as we are only interested in marks that change doesn't matter.
+% \changes{v1.1o}{2014/04/18}{Handle infinite glue from
+%  \cs{enlargethispage} (pr/4023)}
+%    \begin{macrocode}
+     \setbox\@outputbox\vbox{\unvbox\@outputbox\unskip}%
+     \setbox\@outputbox\vsplit\@outputbox to\maxdimen
 %    \end{macrocode}
 %
-% One minor difference from the current \package{fixmarks}, pass the 
+% One minor difference from the current \package{fixmarks}, pass the
 % marks through a token register to stop any |#| tokens causing an
 % error in a |\def|.
 %    \begin{macrocode}
@@ -828,32 +863,37 @@
 %
 %    \begin{macrocode}
 \def\end@dblfloat{%
-\if@twocolumn
-  \@endfloatbox
-  \ifnum\@floatpenalty <\z@
-    \@largefloatcheck
+  \if@twocolumn
+    \@endfloatbox
+    \ifnum\@floatpenalty <\z@
+      \@largefloatcheck
 %    \end{macrocode}
 %
 %  Force the depth of two column float boxes.
 %    \begin{macrocode}
-    \global\dp\@currbox1sp %
+      \global\dp\@currbox1sp %
 %    \end{macrocode}
-%
+%    What follows is essentially |\end@float| without a starting
+%    |\@endfloatbox|.
 % \changes{v1.1d}{2000/09/24}{FMi: use output routine to
 %    defer float}
-%    Next line assumes that first token of |\end@float| is
-%    |\@endfloatbox| so we gobble that.
-%    \begin{macrocode}
-%    \@cons\@deferlist\@currbox
-     \expandafter\@gobble\end@float
-%    \end{macrocode}
-%    |\@Esphack| is then added by |\@endfloat| above.
-%    \begin{macrocode}
+% \changes{v1.1p}{2014/04/27}{Inline the code to allow some
+%   coexistance with packages that hook into \cs{end@float} and do not
+%   know about the algorithm change}
+%    \begin{macrocode}
+      \@cons\@currlist\@currbox
+      \ifnum\@floatpenalty <-\@Mii
+        \penalty -\@Miv
+        \@tempdima\prevdepth
+        \vbox{}%
+        \prevdepth\@tempdima
+        \penalty\@floatpenalty
+      \else
+        \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack
+      \fi
+  \else
+    \end@float
   \fi
-%    \ifnum \@floatpenalty =-\@Mii \@Esphack\fi
-\else
-  \end@float
-\fi
 }
 %    \end{macrocode}
 %
@@ -862,7 +902,7 @@
 % width of the float).
 %    \begin{macrocode}
 \def\@testwrongwidth #1{%
-  \ifdim\dp#1=\f@depth 
+  \ifdim\dp#1=\f@depth
   \else
     \global\@testtrue
   \fi}
@@ -892,7 +932,7 @@
 %
 % All the remaining changes are replacing the double column defer list
 % or insering the extra test |\@testwrongwidth|\marg{box} at suitable
-% places. That is at plces where a box is taken off the deferlist.
+% places. That is at places where a box is taken off the deferlist.
 %    \begin{macrocode}
 \def \@doclearpage {%
      \ifvoid\footins
@@ -937,7 +977,7 @@
          \fi
        \fi
 %    \end{macrocode}
-%    the next line is needed to avoid loosing floats in certain 
+%    the next line is needed to avoid losing floats in certain
 %    circumstances a single call to the original |\doclearpage|
 %    will now no longer output all floats.
 % \changes{v1.1d}{2000/09/24}{FMi: ensure \cs{doclearpage}
@@ -1148,7 +1188,7 @@
   \ifdim \ht #1>\@colht
      \@testtrue
   \fi
-  \if@test 
+  \if@test
     \@cons\@failedlist #1%
   \else
     \@ytryfc #1%
@@ -1159,7 +1199,7 @@
 \def\@ztryfc #1{%
   \@tempcnta\count #1%
   \divide\@tempcnta\@xxxii
-  \multiply\@tempcnta\@xxxii 
+  \multiply\@tempcnta\@xxxii
   \@bitor \@tempcnta {\@failedlist \@flfail}%
   \@testfp #1%
 %    \end{macrocode}
@@ -1240,7 +1280,7 @@
         \else
           \@tempskipb\lastskip
 %    \end{macrocode}
-%    \changes{v1.1l}{2005/11/10}{Add the correct \cs{vskip}} 
+%    \changes{v1.1l}{2005/11/10}{Add the correct \cs{vskip}}
 %    We have to make sure the final \cs{vskip} seen by \TeX\ is the
 %    correct one, namely \cs{@tempskipb}. However we may have to
 %    adjust for \cs{prevdepth} when placing the penalty but that
@@ -1274,7 +1314,7 @@
 %
 %
 %
-% \subsection{\texttt{\textbackslash fnsymbol} should use text symbols 
+% \subsection{\texttt{\textbackslash fnsymbol} should use text symbols
 %    if possible (pr/3400)}
 %  \begin{macro}{\@fnsymbol}
 %
@@ -1322,12 +1362,12 @@
 %    beginning of an alignment cell. However, users of e\TeX\ will be
 %    pleasantly surprised to get the best of both worlds and no bad
 %    side effects.
-% 
+%
 %    First some code for checking if we are running e\TeX\ but making
 %    sure not to permanently turn |\eTeXversion| into |\relax|.
 %    \begin{macrocode}
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname eTeXversion\endcsname\relax 
+\expandafter\ifx\csname eTeXversion\endcsname\relax
 %    \end{macrocode}
 % In case of ordinary \TeX\ we define |\TextOrMath| as a robust
 % command but make sure it always grabs its arguments. If we didn't do
@@ -1400,7 +1440,7 @@
 %  \end{macro}
 %  \end{macro}
 %
-% \subsection{\texttt{\textbackslash textsubscript} not defined in  
+% \subsection{\texttt{\textbackslash textsubscript} not defined in
 %    latex.ltx (pr/3492)}
 %
 % \begin{macro}{\textsubscript}
@@ -1419,7 +1459,7 @@
 % \subsection{\texttt{\textbackslash DeclareMathSizes} only take pts.
 %     (pr/3693)}
 %
-% \begin{macro}{\@DeclareMathSizes} 
+% \begin{macro}{\@DeclareMathSizes}
 % \changes{v1.1k}{2005/09/29}{Fixed blank lines}
 % This fix given by Michael J. Downes on comp.text.tex on 2002/10/17
 %  allows the user to have settings such as
@@ -1447,8 +1487,8 @@
 %
 % \subsection{Fewer fragile macros}
 %
-% \begin{macro}{\MakeRobust} 
-% \changes{v1.1n}{2006/03/24}{Added macro} 
+% \begin{macro}{\MakeRobust}
+% \changes{v1.1n}{2006/03/24}{Added macro}
 %
 % The macro firstly checks if the controls sequence in question exists
 % at all.
@@ -1466,9 +1506,9 @@
 % \verb*=\foo = equal to \verb*=\foo= and redefine \verb*=\foo= so
 % that it acts like a macro defined with \verb=\DeclareRobustCommand=.
 %    \begin{macrocode}
-  {% 
+  {%
     \@ifundefined{\expandafter\@gobble\string#1\space}%
-    {% 
+    {%
       \expandafter\let\csname
       \expandafter\@gobble\string#1\space\endcsname=#1%
       \edef\reserved@a{\string#1}%
@@ -1489,13 +1529,13 @@
 % Here we make some kernel macros robust.
 %    \begin{macrocode}
 \MakeRobust\(
-\MakeRobust\) 
-\MakeRobust\[ 
+\MakeRobust\)
+\MakeRobust\[
 \MakeRobust\]
-\MakeRobust\makebox 
-\MakeRobust\savebox 
-\MakeRobust\framebox 
-\MakeRobust\parbox 
+\MakeRobust\makebox
+\MakeRobust\savebox
+\MakeRobust\framebox
+\MakeRobust\parbox
 \MakeRobust\rule
 \MakeRobust\raisebox
 %    \end{macrocode}
@@ -1507,7 +1547,7 @@
 % \subsection{Using EC fonts (T1 encoding) makes my documents look
 %             bl**dy horrible}
 %
-% \subsubsection{Preliminaries} 
+% \subsubsection{Preliminaries}
 % The \LaTeX{} kernel does not declare the font encoding TS1.
 % However, we are going to set up font definitions for this encoding,
 % so we have to declare it now.
@@ -1518,8 +1558,8 @@
 %
 % In case the package is loaded in the preamble, any of the CM fonts may
 % have been used already and cannot be redefined.  Yet we try to
-% intercept at least the problem that is most likely to occur, i.e., 
-% a hidden \cmd{\normalfont}.  Most of the standard definitions 
+% intercept at least the problem that is most likely to occur, i.e.,
+% a hidden \cmd{\normalfont}.  Most of the standard definitions
 % are ok, but those for T1 encoding and 10.95\,pt need to be removed:
 %    \begin{macrocode}
 \expandafter \let \csname T1/cmr/m/n/10.95\endcsname \relax
@@ -1528,11 +1568,11 @@
 \expandafter \let \csname T1/cmvtt/m/n/10.95\endcsname \relax
 %    \end{macrocode}
 %
-% \Lpack{fix-cm} may still fail, if the EC fonts are preloaded in the 
-% \LaTeX{} format file. This situation is, however, very unlikely and could occur 
+% \Lpack{fix-cm} may still fail, if the EC fonts are preloaded in the
+% \LaTeX{} format file. This situation is, however, very unlikely and could occur
 % only with a customized format.
 %
-% The remainder of the package is enclosed in a group, where the catcodes 
+% The remainder of the package is enclosed in a group, where the catcodes
 % are guaranteed to be appropriate for the processing of font definitions.
 %    \begin{macrocode}
 \begingroup
@@ -1672,8 +1712,8 @@
 \DeclareFontShape{T1}{cmss}{bx}{it}
        {<->ssub*cmss/bx/sl}{}
 %    \end{macrocode}
-% The following substitutions are not provided in the default 
-% \file{.fd} files.  I have included them, so that you can 
+% The following substitutions are not provided in the default
+% \file{.fd} files.  I have included them, so that you can
 % easily use the EC fonts with the default bold series being
 % \file{b} rather than \file{bx}.
 %    \begin{macrocode}
@@ -2093,17 +2133,17 @@
 % \subsubsection{\LaTeX{} symbols}
 %    \begin{macrocode}
 \DeclareFontFamily{U}{lasy}{}
-\DeclareFontShape{U}{lasy}{m}{n}{ 
-        <-6>    lasy5 
+\DeclareFontShape{U}{lasy}{m}{n}{
+        <-6>    lasy5
         <6-7>   lasy6
         <7-8>   lasy7
         <8-9>   lasy8
-        <9-10>  lasy9 
-        <10->   lasy10  
+        <9-10>  lasy9
+        <10->   lasy10
       }{}
 \DeclareFontShape{U}{lasy}{b}{n}{
         <-10>   ssub * lasy/m/n
-        <10->   lasyb10  
+        <10->   lasyb10
       }{}
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -2112,6 +2152,89 @@
 %    \end{macrocode}
 %
 %
+% \subsection{Check the optional argument to floats}
+%
+% The default definition of |\@xfloat| allows
+% |\begin{figure}[abt23WD]| silently ignoring all but |t|.  If you use
+% |\begin{figure}[T]| you get no warning but the float is not allowed
+% \emph{anywhere} so will go to the end of document (or
+% |\clearpage|). This change gives an error message for undefined
+% options.
+%
+% \changes{v1.1n}{2013/12/13}{Check float optional argument.}
+%    \begin{macrocode}
+\def\@xfloat #1[#2]{%
+  \@nodocument
+  \def \@captype {#1}%
+   \def \@fps {#2}%
+   \@onelevel@sanitize \@fps
+   \def \reserved@b {!}%
+   \ifx \reserved@b \@fps
+     \@fpsadddefault
+   \else
+     \ifx \@fps \@empty
+       \@fpsadddefault
+     \fi
+   \fi
+   \ifhmode
+     \@bsphack
+     \@floatpenalty -\@Mii
+   \else
+     \@floatpenalty-\@Miii
+   \fi
+  \ifinner
+     \@parmoderr\@floatpenalty\z@
+  \else
+    \@next\@currbox\@freelist
+      {%
+       \@tempcnta \sixt@@n
+       \expandafter \@tfor \expandafter \reserved@a
+         \expandafter :\expandafter =\@fps
+         \do
+%    \end{macrocode}
+% Start of changes, use a nested if structure, ending in an error.
+%    \begin{macrocode}
+          {%
+           \if \reserved@a h%
+             \ifodd \@tempcnta
+             \else
+               \advance \@tempcnta \@ne
+             \fi
+           \else\if \reserved@a t%
+             \@setfpsbit \tw@
+           \else\if \reserved@a b%
+             \@setfpsbit 4%
+           \else\if \reserved@a p%
+             \@setfpsbit 8%
+           \else\if \reserved@a !%
+             \ifnum \@tempcnta>15
+               \advance\@tempcnta -\sixt@@n\relax
+             \fi
+           \else
+             \@latex@error{Unknown float option `\reserved@a'}%
+             {Option `\reserved@a' ignored and `p' used.}%
+             \@setfpsbit 8%
+           \fi\fi\fi\fi\fi
+           }%
+%    \end{macrocode}
+% End of changes
+%    \begin{macrocode}
+       \@tempcntb \csname ftype@\@captype \endcsname
+       \multiply \@tempcntb \@xxxii
+       \advance \@tempcnta \@tempcntb
+       \global \count\@currbox \@tempcnta
+       }%
+    \@fltovf
+  \fi
+  \global \setbox\@currbox
+    \color@vbox
+      \normalcolor
+      \vbox \bgroup
+        \hsize\columnwidth
+        \@parboxrestore
+        \@floatboxreset
+}
+%    \end{macrocode}
 % \Finale
 %
 \endinput
diff --git a/Master/texmf-dist/source/latex/base/fixltx2e.ins b/Master/texmf-dist/source/latex/base/fixltx2e.ins
index c609ddd71e3..c54d1f6e235 100644
--- a/Master/texmf-dist/source/latex/base/fixltx2e.ins
+++ b/Master/texmf-dist/source/latex/base/fixltx2e.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/fntguide.tex b/Master/texmf-dist/source/latex/base/fntguide.tex
index 57ed8cf0f43..1959cf480a2 100644
--- a/Master/texmf-dist/source/latex/base/fntguide.tex
+++ b/Master/texmf-dist/source/latex/base/fntguide.tex
@@ -2,51 +2,51 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: fntguide.tex
- 
+
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
- 
+
 \documentclass{ltxguide}[1995/11/28]
- 
+
 \title{\LaTeXe{} font selection}
- 
+
 \author{\copyright~Copyright 1995--2005, \LaTeX3 Project Team.\\
    All rights reserved.}
- 
+
 \date{27 November 2005}
- 
+
 \begin{document}
- 
+
 \maketitle
- 
+
 \tableofcontents
- 
+
 \section{Introduction}
- 
+
 This document describes the new font selection features of the \LaTeX{}
 Document Preparation System.  It is intended for package writers who
 want to write font-loading packages similar to |times| or |latexsym|.
@@ -55,84 +55,84 @@ This document is only a brief introduction to the new facilities and
 is intended for package writers who are familiar with \TeX{} fonts and
 \LaTeX{} packages.  It is \emph{neither} a user-guide \emph{nor} a
 reference manual for fonts in \LaTeXe.
- 
+
 \subsection{\LaTeXe~fonts}
- 
+
 The most important difference between \LaTeX~2.09 and \LaTeXe{} is the
 way that fonts are selected.  In \LaTeX~2.09, the Computer Modern fonts
 were built into the \LaTeX~format, and so customizing \LaTeX{} to use
 other fonts was a major effort.
- 
+
 In \LaTeXe, very few fonts are built into the format, and there are
 commands to load new text and math fonts.  Packages such as |times| or
 |latexsym| allow authors to access these fonts.
 This document describes how to write similar font-loading packages.
- 
+
 The \LaTeXe{} font selection system was first released as the `New Font
 Selection Scheme' (NFSS) in 1989, and then in release~2 in 1993.
 \LaTeXe{} includes NFSS release~2 as standard.
- 
+
 \subsection{Overview}
- 
+
 This document contains an overview of the new font commands
 of \LaTeX.
- 
+
 \begin{description}
- 
+
 \item[Section~\ref{Sec:text}] describes the commands for selecting fonts
    in classes and packages.  It lists the five \LaTeX{} font
    attributes, and lists the commands for selecting fonts.  It also
    describes how to customize the author commands such as |\textrm| and
    |\textit| to suit your document design.
- 
+
 \item[Section~\ref{Sec:math}] explains the commands for controlling
    \LaTeX{} math fonts.  It describes how to specify new math fonts and
    new math symbols.
- 
+
 \item[Section~\ref{Sec:install}] explains how to install new fonts into
    \LaTeX.  It shows how \LaTeX{} font attributes are turned into \TeX{}
    font names, and how to specify your own fonts using font definition
    files.
- 
+
 \item[Section~\ref{Sec:encode}] discusses text font encodings.
    It describes how to declare a new encoding and how to define
    commands, such as |\AE| or |\"|, which have different definitions in
    different encodings, depending on whether ligatures, etc.\ are
    available in the encoding.
- 
+
 \item[Section~\ref{Sec:misc}] covers font miscellanea.  It describes how
    \LaTeX{} performs font substitution, how to customize fonts that are
    preloaded in the \LaTeX{} format, and the naming conventions used in
    \LaTeX{} font selection.
- 
+
 \end{description}
- 
+
 \subsection{Further information}
- 
+
 For a general introduction to \LaTeX, including the new features of
 \LaTeXe, you should read \emph{\LaTeXbook},
 Leslie Lamport, Addison Wesley, 2nd~ed, 1994.
- 
+
 A more detailed description of the \LaTeX{} font selection scheme is to
 be found in \emph{\LaTeXcomp}, 2nd~ed, by Mittelbach and Goossens, Addison
 Wesley, 2004.
- 
+
 The \LaTeX{} font selection scheme is based on \TeX, which is described
 by its developer in \emph{The \TeX book}, Donald E.~Knuth, Addison
 Wesley, 1986, revised in 1991 to include the features of \TeX~3.
- 
+
 Sebastian Rahtz's |psnfss| software contains the software for using a
 large number of Type~1 fonts (including the Adobe Laser Writer 35 and
 the Monotype CD-ROM fonts) in \LaTeX.  It should be available from the
 same source as your copy of \LaTeX.
- 
+
 The |psnfss| software uses fonts generated by Alan Jeffrey's
 |fontinst| software.  This can convert fonts from Adobe Font Metric
 format into a format readable by \LaTeX, including the generation of
 the font definition files described in Section~\ref{Sec:install}.  The
 |fontinst| software should be available from the same source as your
 copy of \LaTeX.
- 
+
 Whenever practical, \LaTeX{} uses the font naming scheme called
 `fontname'; this was described in \emph{Filenames for fonts},%
 \footnote{An up-to-date electronic version
@@ -144,10 +144,10 @@ The class-writer's guide \emph{\clsguide} describes
 the new \LaTeX{} features for writers of document classes and packages
 and is kept in |clsguide.tex|. Configuring
 \LaTeX{} is covered by the guide \emph{\cfgguide} in
-\texttt{cfgguide.tex} whilst the philosophy behind our policy on 
+\texttt{cfgguide.tex} whilst the philosophy behind our policy on
 modifying \LaTeX{} is described in \emph{\modguide} in
 \texttt{modguide.tex}.
- 
+
 The documented source code (from the files used to produce
 the kernel format via |latex.ltx|) is now available as
 \emph{The \LaTeXe\ Sources}.
@@ -165,35 +165,35 @@ Addresses and other details can be found at:
 
 \section{Text fonts}
 \label{Sec:text}
- 
+
 This section describes the commands available to class and package
 writers for specifying and selecting fonts.
- 
+
 \subsection{Text font attributes}
- 
+
 Every text font in \LaTeX{} has five \emph{attributes}:
 \begin{description}
- 
+
 \item[encoding] This specifies the order that characters appear in the
    font.  The two most common text encodings used in \LaTeX{} are
    Knuth's `\TeX{} text' encoding, and the `\TeX{} text extended'
    encoding developed by the \TeX{} Users Group members during a \TeX{}
    Conference at Cork in~1990 (hence its informal name `Cork encoding').
- 
+
 \item[family] The name for a collection of fonts, usually grouped under
    a common name by the font foundry.  For example, `Adobe Times', `ITC
    Garamond', and Knuth's `Computer Modern Roman' are all font families.
- 
+
 \item[series] How heavy or expanded a font is.  For example, `medium
    weight', `narrow' and `bold extended' are all series.
- 
+
 \item[shape] The form of the letters within a font family.  For
    example, `italic', `oblique' and `upright' (sometimes called
    `roman') are all font shapes.
- 
+
 \item[size] The design size of the font, for example `10pt'. If no
    dimension is specified, `pt' is assumed.
- 
+
 \end{description}
 The possible values for these attributes are given short acronyms by
 \LaTeX.  The most common values for the font encoding are:
@@ -213,7 +213,7 @@ The possible values for these attributes are given short acronyms by
 The `local' encodings are intended for font encodings which are only
 locally available, for example a font containing an organisation's
 logo in various sizes.
- 
+
 There are far too many font families to list them all, but some common
 ones are:
 \begin{center}
@@ -311,18 +311,18 @@ The author commands for fonts set the five attributes:
 \end{center}
 The values used by these commands are determined by the document class,
 using the parameters defined in Section~\ref{Sec:text.param}.
- 
+
 Note that there are no author commands for selecting new encodings.
 These should be provided by packages, such as the |fontenc| package.
- 
+
 This section does not explain how \LaTeX{} font specifications are
 turned into \TeX{} font names.  This is described in
 Section~\ref{Sec:install}.
- 
+
 \subsection{Selection commands}
- 
+
 The low-level commands used to select a text font are as follows.
- 
+
 \begin{decl}
 |\fontencoding| \arg{encoding} \\
 |\fontfamily|  \arg{family}\\
@@ -331,7 +331,7 @@ The low-level commands used to select a text font are as follows.
 |\fontsize| \arg{size} \arg{baselineskip}\\
 |\linespread| \arg{factor}
 \end{decl}
- 
+
 \NEWdescription{1998/12/01}
 Each of the commands starting with |\font...| sets one of the font
 attributes; |\fontsize| also sets |\baselineskip|. The |\linespread|
@@ -342,13 +342,13 @@ values greater one).
 The actual font in use is not altered by these commands, but the
 current attributes are used to determine which font and baseline skip
 to use after the next |\selectfont| command.
- 
+
 
 \begin{decl}
 |\selectfont|
 \end{decl}
 Selects a text font, based on the current values of the font attributes.
- 
+
 \emph{Warning}: There \emph{must} be a |\selectfont| command
 immediately after any settings of the font parameters by (some of)
 the six commands above, before any following text.
@@ -362,18 +362,18 @@ but it is \emph{not} legal to say:
 \end{verbatim}
 You may get unexpected results if you put text between a
 |\font<parameter>| command (or |\linespread|) and a |\selectfont|.
- 
+
 \begin{decl}
 |\usefont| \arg{encoding} \arg{family} \arg{series} \arg{shape}
 \end{decl}
 A short hand for the equivalent |\font...| commands followed by a
 call to |\selectfont|.
- 
- 
+
+
 \subsection{Internals}
- 
+
 The current values of the font attributes are held in internal macros.
- 
+
 \begin{decl}
       |\f@encoding| \\
       |\f@family|  \\
@@ -385,13 +385,13 @@ The current values of the font attributes are held in internal macros.
       |\sf@size|  \\
       |\ssf@size|
 \end{decl}
- 
+
 These hold the current values of the encoding, the family, the series,
 the shape, the size, the baseline skip, the main math size, the
 `script' math size and the `scriptscript' math size. The last three
 are accessible only within a formula; outside of math they may contain
 arbitrary values.
- 
+
 For example, to set the size to 12 without
 changing the baseline skip:
 \begin{verbatim}
@@ -401,10 +401,10 @@ However, you should \emph{never} alter the values of the internal
 commands directly; they must only be modified using the low-level
 commands like |\fontfamily|, |\fontseries|, etc. If you disobey this
 warning you might produce code that loops.
- 
+
 \subsection{Parameters for author commands}
 \label{Sec:text.param}
- 
+
 The parameter values set by author commands such as |\textrm| and
 |\rmfamily|, etc.\ are not hard-wired into \LaTeX; instead these
 commands use the values of a number of parameters set by the document
@@ -417,7 +417,7 @@ specifies:
    \renewcommand{\sfdefault}{phv}
    \renewcommand{\ttdefault}{pcr}
 \end{verbatim}
- 
+
 \begin{decl}
  |\encodingdefault| \\
  |\familydefault|   \\
@@ -428,7 +428,7 @@ The encoding, family, series and shape of the main body font.  By
 default these are |OT1|, |\rmdefault|, |m| and |n|.  Note that since
 the default family is |\rmdefault|, this means that changing
 |\rmdefault| will change the main body font of the document.
- 
+
 \begin{decl}
  |\rmdefault|  \\
  |\sfdefault| \\
@@ -437,7 +437,7 @@ the default family is |\rmdefault|, this means that changing
 The families selected by |\textrm|, |\rmfamily|, |\textsf|,
 |\sffamily|, |\texttt| and |\ttfamily|.  By default these are |cmr|,
 |cmss| and |cmtt|.
- 
+
 \begin{decl}
  |\bfdefault| \\
  |\mddefault|
@@ -452,8 +452,8 @@ extended' series.  An alternative (taken for the fonts provided by
 |psnfss|) is to define silent substitutions from |bx| series to |b|
 series with special |\DeclareFontShape| declarations and the |ssub|
 size function, see Section~\ref{sec:sizefunct}.
- 
- 
+
+
 \begin{decl}
  |\itdefault| \\
  |\sldefault| \\
@@ -463,7 +463,7 @@ size function, see Section~\ref{sec:sizefunct}.
 The shapes selected by |\textit|, |\itshape|, |\textsl|, |\slshape|,
 |\textsc|, |\scshape|, |\textup| and |\upshape|.  By default these are
 |it|, |sl|, |sc| and |n|.
- 
+
 Note that there are no parameters for the size commands.  These should
 be defined directly in class files, for example:
 \begin{verbatim}
@@ -472,59 +472,59 @@ be defined directly in class files, for example:
 More elaborate examples (setting additional parameters when the text
 size is changed) can be found in |classes.dtx| the source
 documentation for the classes |article|, |report|, and |book|.
- 
- 
+
+
 \subsection{Special font declaration commands}
- 
+
 \begin{decl}
 |\DeclareFixedFont| \arg{cmd} \arg{encoding} \arg{family} \arg{series}
                     \arg{shape} \arg{size}
 \end{decl}
- 
+
 Declares command \m{cmd} to be a font switch which selects the font
 that is specified by the attributes \m{encoding}, \m{family},
 \m{series}, \m{shape}, and \m{size}.
- 
+
 The font is selected without any adjustments to baselineskip and other
 surrounding conditions.
- 
+
 This example makes |{\picturechar .}| select a small dot very quickly:
 \begin{verbatim}
    \DeclareFixedFont{\picturechar}{OT1}{cmr}{m}{n}{5}
 \end{verbatim}
- 
- 
+
+
 \begin{decl}
 |\DeclareTextFontCommand| \arg{cmd} \arg{font-switches}
 \end{decl}
- 
+
 Declares command \m{cmd} to be a font command with one argument.
 The current font attributes are locally modified by \m{font-switches}
 and then the argument of \m{cmd} is typeset in the resulting new font.
- 
+
 Commands defined by |\DeclareTextFontCommand| automatically take care
 of any necessary italic correction (on either side).
- 
+
 The following example shows how |\textrm| is defined by the kernel.
 \begin{verbatim}
    \DeclareTextFontCommand{\textrm}{\rmfamily}
 \end{verbatim}
- 
+
 To define a command that always typeset its argument in the italic
 shape of the main document font you could declare:
 \begin{verbatim}
    \DeclareTextFontCommand{\normalit}{\normalfont\itshape}
 \end{verbatim}
- 
+
 This declaration can be used to change the meaning of a command; if
 \m{cmd} is already defined, a log that it has been redefined
 is put in the transcript file.
- 
+
 \begin{decl}
 |\DeclareOldFontCommand| \arg{cmd} \arg{text-switch}
                                    \arg{math-switch}
 \end{decl}
- 
+
 Declares command \m{cmd} to be a font switch (i.e.~used with the
 syntax |{<cmd>...}|) having the definition \m{text-switch}
 when used in text and the definition \m{math-switch} when used in a
@@ -533,11 +533,11 @@ Math alphabet commands, like |\mathit|, when used within \m{math-switch}
 should not have an argument.  Their use in this argument causes their
 semantics to change so that they here act as a font switch, as
 required by the usage of the \m{cmd}.
- 
+
 This declaration is useful for setting up commands like |\rm| to behave
 as they did in \LaTeX~2.09. We strongly urge you \emph{not} to misuse
 this declaration to invent new font commands.
- 
+
 The following example defines |\it| to produce the italic shape of the
 main document font if used in text and to switch to the font that would
 normally be produced by the math alphabet |\mathit| if used in a
@@ -545,23 +545,23 @@ formula.
 \begin{verbatim}
    \DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
 \end{verbatim}
- 
+
 This declaration can be used to change the meaning of a command; if
 \m{cmd} is already defined, a log that it has been redefined
 is put in the transcript file.
- 
- 
+
+
 \section{Math fonts}
 \label{Sec:math}
- 
+
 This section describes the commands available to class and package
 writers for specifying math fonts and math commands.
- 
+
 \subsection{Math font attributes}
- 
+
 The selection of fonts within math mode is quite different to that of
 text fonts.
- 
+
 Some math fonts are selected explicitly by one-argument commands such
 as |\mathsf{max}| or |\mathbf{vec}|; such fonts are called \emph{math
 alphabets}.  These math alphabet commands affect only the font used
@@ -597,7 +597,7 @@ are:
 Some math fonts are both \emph{math alphabets} and \emph{math symbol
 fonts}, for example |\mathrm| and |operators| are the same font, and
 |\mathnormal| and |letters| are the same font.
- 
+
 Math fonts in \LaTeX{} have the same five attributes as text fonts:
 encoding, family, series, shape and size.  However, there are no
 commands that allow the attributes to be individually changed.
@@ -622,9 +622,9 @@ version maps:
 \end{center}
 The |bold| math version is similar except that it contains bold fonts.
 The command |\boldmath| selects the |bold| math version.
- 
+
 Math versions can only be changed outside of math mode.
- 
+
 The two predefined math versions are:
 \begin{center}
    \begin{tabular}{rl}
@@ -635,13 +635,13 @@ The two predefined math versions are:
 Packages may define new math alphabets, math symbol fonts, and math
 versions.  This section describes the commands for writing such
 packages.
- 
+
 \subsection{Selection commands}
- 
+
 There are no commands for selecting symbol fonts.  Instead, these are
 selected indirectly through symbol commands like |\oplus|.
 Section~\ref{Sec:math.commands} explains how to define symbol commands.
- 
+
 \begin{decl}
       |\mathnormal{<math>}|\\
       |\mathcal{<math>}|\\
@@ -654,48 +654,48 @@ Section~\ref{Sec:math.commands} explains how to define symbol commands.
 Each math alphabet is a command which can only be used inside math
 mode.  For example, |$x + \mathsf{y} + \mathcal{Z}$| produces $x +
 \mathsf{y} + \mathcal{Z}$.
- 
+
 \begin{decl}
 |\mathversion{<version>}|
 \end{decl}
 This command selects a math version; it can only be used outside math
 mode.  For example, |\boldmath| is defined to be |\mathversion{bold}|.
- 
+
 \subsection{Declaring math versions}
- 
+
 \begin{decl}
 |\DeclareMathVersion| \arg{version}
 \end{decl}
- 
+
 Defines \m{version} to be a math version.
- 
+
 The newly declared version is initialised with the defaults for all
 symbol fonts and math alphabets declared so far (see the commands
 |\DeclareSymbolFont| and |\DeclareMathAlphabet|).
- 
+
 If used on an already existing version, an information message is
 written to the transcript file and all previous |\SetSymbolFont| or
 |\SetMathAlphabet| declarations for this version are overwritten by
 the math alphabet and symbol font defaults, i.e.~one ends up with a
 virgin math version.
- 
+
 Example:
 \begin{verbatim}
    \DeclareMathVersion{normal}
 \end{verbatim}
- 
- 
+
+
 \subsection{Declaring math alphabets}
 
 \begin{decl}
 |\DeclareMathAlphabet| \arg{math-alph} \arg{encoding} \arg{family}
                        \arg{series} \arg{shape}
 \end{decl}
- 
+
 \NEWdescription{1997/12/01}
 If this is the first declaration for \m{math-alph} then a new math
 alphabet with this as its command name is created.
- 
+
 The arguments \m{encoding} \m{family} \m{series} \m{shape} are used to
 set, or reset, the default values for this math alphabet in all math
 versions; if required, these must be further reset later for a
@@ -708,7 +708,7 @@ command for a particular math version.
 Checks that the command \m{math-alph} is either already a math
 alphabet command or is undefined; and that \m{encoding} is a known
 encoding scheme, i.e., has been previously declared.
- 
+
 
 In these examples, |\foo| is defined for all math versions but |\baz|,
 by default, is defined nowhere.
@@ -716,53 +716,53 @@ by default, is defined nowhere.
    \DeclareMathAlphabet{\foo}{OT1}{cmtt}{m}{n}
    \DeclareMathAlphabet{\baz}{OT1}{}{}{}
 \end{verbatim}
- 
- 
+
+
 \begin{decl}
 |\SetMathAlphabet| \arg{math-alph} \arg{version}\\
         \null\hfill\arg{encoding} \arg{family} \arg{series} \arg{shape}
 \end{decl}
- 
+
 Changes, or sets, the font for the math alphabet \m{math-alph} in math
 version \m{version} to \m{encoding}\m{family}\m{series}\m{shape}.
- 
-Checks that \m{math-alph} has been declared as a math alphabet, 
+
+Checks that \m{math-alph} has been declared as a math alphabet,
 \m{version} is a known math version and \m{encoding} is a known
 encoding scheme.
- 
+
 
 This example defines |\baz| for the `normal' math version only:
 \begin{verbatim}
    \SetMathAlphabet{\baz}{normal}{OT1}{cmss}{m}{n}
 \end{verbatim}
- 
+
 Note that this declaration is not used for all math alphabets:
 Section~\ref{sec:symalph} describes |\DeclareSymbolFontAlphabet|,
 which is used to set up math alphabets contained in fonts which have
 been declared as symbol fonts.
- 
- 
+
+
 \subsection{Declaring symbol fonts}
 \label{sec:symalph}
- 
+
 \begin{decl}
 |\DeclareSymbolFont| \arg{sym-font} \arg{encoding} \arg{family}
                      \arg{series} \arg{shape}
 \end{decl}
- 
+
 \NEWdescription{1997/12/01}
 If this is the first declaration for \m{sym-font} then a new
 symbol font with this name is created (i.e.~this identifier is assigned
 to a new \TeX{} math group).
- 
+
 The arguments \m{encoding} \m{family} \m{series} \m{shape} are used to
 set, or reset. the default values for this symbol font in \emph{all}
 math versions; if required, these must be further reset later for
 a particular math version by a |\SetSymbolFont| command.
- 
+
 Checks that \m{encoding} is a declared encoding scheme.
- 
- 
+
+
 For example, the following sets up the first four standard math symbol
 fonts:
 \begin{verbatim}
@@ -771,20 +771,20 @@ fonts:
    \DeclareSymbolFont{symbols}{OMS}{cmsy}{m}{n}
    \DeclareSymbolFont{largesymbols}{OMX}{cmex}{m}{n}
 \end{verbatim}
- 
- 
+
+
 \begin{decl}
 |\SetSymbolFont| \arg{sym-font} \arg{version}\\
      \null\hfill \arg{encoding} \arg{family} \arg{series} \arg{shape}
 \end{decl}
- 
+
 Changes the symbol font \m{sym-font} for math version \m{version}
 to \m{encoding} \m{family} \m{series} \m{shape}.
- 
-Checks that \m{sym-font} has been declared as a symbol font,  
+
+Checks that \m{sym-font} has been declared as a symbol font,
 \m{version} is a known math version and \m{encoding} is a
 declared encoding scheme.
- 
+
 
 For example, the following come from the set up of the `bold'
 math version:
@@ -792,31 +792,31 @@ math version:
    \SetSymbolFont{operators}{bold}{OT1}{cmr}{bx}{n}
    \SetSymbolFont{letters}{bold}{OML}{cmm}{b}{it}
 \end{verbatim}
- 
- 
+
+
 \begin{decl}
 |\DeclareSymbolFontAlphabet| \arg{math-alph} \arg{sym-font}
 \end{decl}
- 
+
 \NEWdescription{1997/12/01}
 Allows the previously declared symbol font \m{sym-font} to be the
 math alphabet with command \m{math-alph} in \emph{all} math versions.
- 
+
 Checks that the command \m{math-alph} is either already a math alphabet
 command or is undefined; and that \m{sym-font} is a symbol font.
- 
+
 
 Example:
 \begin{verbatim}
    \DeclareSymbolFontAlphabet{\mathrm}{operators}
    \DeclareSymbolFontAlphabet{\mathcal}{symbols}
 \end{verbatim}
- 
+
 This declaration should be used in preference to
 |\DeclareMathAlphabet| and |\SetMathAlphabet| when a math alphabet is
 the same as a symbol font; this is because it makes better use of the
 limited number (only 16) of \TeX's math groups.
- 
+
 \NEWdescription{1997/12/01}
 Note that, whereas a \TeX{} math group is allocated to each symbol font
 when it is first declared, a math alphabet uses a \TeX{} math group
@@ -825,15 +825,15 @@ only when its command is used within a math formula.
 
 \subsection{Declaring math symbols}
 \label{Sec:math.commands}
- 
+
 \begin{decl}
 |\DeclareMathSymbol| \arg{symbol} \arg{type} \arg{sym-font}
                      \arg{slot}
 \end{decl}
- 
+
 The \m{symbol} can be either a single character such as `|>>|', or a
 macro name, such as |\sum|.
- 
+
 Defines the \m{symbol} to be a math symbol of type
 \m{type} in slot \m{slot} of symbol font \m{sym-font}. The
 \m{type} can be given as a number or as a command:
@@ -855,18 +855,18 @@ commands: within the argument of a math alphabet command they will
 produce the character in slot \m{slot} of that math alphabet's font.
 Symbols of other types will always produce the same symbol
 (within one math version).
- 
+
 |\DeclareMathSymbol| allows a macro \m{symbol} to be redefined only if
 it was previously defined to be a math symbol.  It also checks that
 the \m{sym-font} is a declared symbol font.
- 
+
 Example:
 \begin{verbatim}
    \DeclareMathSymbol{\alpha}{0}{letters}{"0B}
    \DeclareMathSymbol{\lessdot}{\mathbin}{AMSb}{"0C}
    \DeclareMathSymbol{\alphld}{\mathalpha}{AMSb}{"0C}
 \end{verbatim}
- 
+
 \begin{decl}
  |\DeclareMathDelimiter| \arg{cmd}   \arg{type}
                \arg{sym-font-1} \arg{slot-1}\\
@@ -876,9 +876,9 @@ Defines \m{cmd} to be a math delimiter where the small variant is in
 slot \m{slot-1} of symbol font \m{sym-font-1} and the large
 variant is in slot \m{slot-2} of symbol font \m{sym-font-2}.
 Both symbol fonts must have been declared previously.
- 
+
 Checks that \m{sym-font-i} are both declared symbol fonts.
- 
+
 If \TeX{} is not looking for a delimiter, \m{cmd} is treated just as
 if it had been defined with |\DeclareMathSymbol| using
 \m{type}, \m{sym-font-1} and \m{slot-1}.  In other words, if a
@@ -889,7 +889,7 @@ as a math symbol.
 In case \m{cmd} is a single character such as `|[|', the same syntax is
 used.  Previously the \arg{type} argument was not present (and thus the
 corresponding math symbol declaration had to be provided seperately).
- 
+
 Example:
 \begin{verbatim}
    \DeclareMathDelimiter{\langle}{\mathopen}{symbols}{"68}
@@ -897,50 +897,50 @@ Example:
    \DeclareMathDelimiter{(}      {\mathopen}{operators}{"28}
                                             {largesymbols}{"00}
 \end{verbatim}
- 
- 
+
+
 \begin{decl}
 |\DeclareMathAccent| \arg{cmd} \arg{type} \arg{sym-font} \arg{slot}
 \end{decl}
- 
+
 Defines \m{cmd} to act as a math accent.
- 
+
 The accent character comes from slot \m{slot} in
 \m{sym-font}. The \m{type} can be either
 |\mathord| or |\mathalpha|; in the latter case the accent character
 changes font when used in a math alphabet.
- 
+
 Example:
 \begin{verbatim}
    \DeclareMathAccent{\acute}{\mathalpha}{operators}{"13}
    \DeclareMathAccent{\vec}{\mathord}{letters}{"7E}
 \end{verbatim}
- 
- 
+
+
 \begin{decl}
 |\DeclareMathRadical| \arg{cmd}
                     \arg{sym-font-1} \arg{slot-1}\\
        \null\hfill  \arg{sym-font-2} \arg{slot-2}
 \end{decl}
- 
+
 Defines \m{cmd} to be a radical where the small variant is in
 slot \m{slot-1} of symbol font \m{sym-font-1} and the
 large variant is in slot \m{slot-2} of symbol font
 \m{sym-font-2}.  Both symbol fonts must have been declared
 previously.
- 
+
 Example (probably the only use for it!):
 \begin{verbatim}
    \DeclareMathRadical{\sqrt}{symbols}{"70}{largesymbols}{"70}
 \end{verbatim}
- 
+
 \subsection{Declaring math sizes}
- 
+
 \begin{decl}
 |\DeclareMathSizes| \arg{t-size} \arg{mt-size} \arg{s-size}
                     \arg{ss-size}
 \end{decl}
- 
+
 Declares that \m{mt-size} is the (main) math text size, \m{s-size} is
 the `script' size and \m{ss-size} the `scriptscript' size to be used
 in math, when \m{t-size} is the current text size. For text sizes for
@@ -948,24 +948,24 @@ which no such declaration is given the `script' and `scriptscript'
 size will be calculated and then fonts are loaded for the calculated
 sizes or the best approximation (this may result in a warning
 message).
- 
+
 Normally, \m{t-size} and \m{mt-size} will be identical; however, if,
 for example, PostScript text fonts are mixed with bit-map math fonts
 then you may not have available a \m{mt-size} for every \m{t-size}.
- 
+
 Example:
 \begin{verbatim}
    \DeclareMathSizes{13.82}{14.4}{10}{7}
 \end{verbatim}
- 
+
 \section{Font installation}
 \label{Sec:install}
- 
+
 This section explains how \LaTeX's font attributes are turned into
 \TeX{} font specifications.
- 
+
 \subsection{Font definition files}
- 
+
 \NEWdescription{1997/12/01}
 The description of how \LaTeX{} font attributes are turned into \TeX{}
 fonts is usually kept in a \emph{font definition file} (|.fd|).  The
@@ -974,7 +974,7 @@ called |<enc><family>.fd|: for example, |ot1cmr.fd| for Computer
 Modern Roman with encoding |OT1| or |t1ptm.fd| for Adobe Times with
 encoding |T1|.  Note that encoding names are converted to lowercase
 when used as part of file names.
- 
+
 Whenever \LaTeX{} encounters an encoding/family combination that it
 does not know (e.g.~if the document designer says
 |\fontfamily{ptm}\selectfont|) then \LaTeX{} attempts to load the
@@ -982,20 +982,20 @@ appropriate |.fd| file.  ``Not known'' means: there was no
 |\DeclareFontFamily| declaration issued for this encoding/family
 combination.  If the |.fd| file could not be found, a warning is
 issued and font substitutions are made.
- 
+
 The declarations in the font definition file are responsible for
 telling \LaTeX{} how to load fonts for that encoding/family
-combination.  
- 
+combination.
+
 \subsection{Font definition file commands}
- 
+
 \emph{Note}: A font definition file should contain only commands
 from this subsection.
 
 Note that these commands can also be used outside a font definition
 file: they can be put in package or class files, or even in the
 preamble of a document.
- 
+
 \begin{decl}
    |\ProvidesFile{<file-name>}[<release-info>]|
 \end{decl}
@@ -1004,10 +1004,10 @@ as described in \emph{\clsguide}.  For example:
 \begin{verbatim}
    \ProvidesFile{t1ptm.fd}[1994/06/01 Adobe Times font definitions]
 \end{verbatim}
- 
+
 Spaces within the arguments specific to font definition files are
 ignored to avoid surplus spaces in the document. If a real space is
-necessary use |\space|.  
+necessary use |\space|.
 \NEWdescription{2004/02/10}However, note that this is only true if the
 declaration is made at top level! If used within the definition of
 another command, within |\AtBeginDocument|, option code or in similar
@@ -1017,43 +1017,43 @@ incorrect table entries.
 \begin{decl}
 |\DeclareFontFamily| \arg{encoding} \arg{family} \arg{loading-settings}
 \end{decl}
- 
+
 Declares a font family \m{family} to be available in encoding scheme
 \m{encoding}.
- 
+
 The \m{loading-settings} are executed immediately after loading any
 font with this encoding and family.
- 
+
 Checks that \m{encoding} was previously declared.
- 
+
 This example refers to the Computer Modern Typewriter font family in
 the Cork encoding:
 \begin{verbatim}
    \DeclareFontFamily{T1}{cmtt}{\hyphenchar\font=-1}
 \end{verbatim}
- 
+
 Each |.fd| file should contain exactly one |\DeclareFontFamily|
 command, and it should be for the appropriate encoding/family
 combination.
- 
+
 \begin{decl}
 |\DeclareFontShape| \arg{encoding} \arg{family} \arg{series}
                     \arg{shape}\\
         \null\hfill \arg{loading-info} \arg{loading-settings}
 \end{decl}
- 
+
 Declares a font shape combination; here \m{loading-info} contains the
 information that combines sizes with external fonts. The syntax is
 complex and is described in Section~\ref{sec:loadinfo} below.
- 
+
 The \m{loading-settings} are executed after loading any font with this
 font shape.  They are executed immediately after the
 `loading-settings' which were declared by |\DeclareFontFamily| and so
 they can be used to overwrite the settings made at the family level.
- 
+
 Checks that the combination \m{encoding}\m{family} was previously
 declared via |\DeclareFontFamily|.
- 
+
 Example:
 \begin{verbatim}
    \DeclareFontShape{OT1}{cmr}{m}{sl}{%
@@ -1066,7 +1066,7 @@ Example:
 \end{verbatim}
 The file can contain any number of |\DeclareFontShape| commands,
 which should be for the appropriate \m{encoding} and \m{family}.
- 
+
 \NEWfeature{1996/06/01}
 The font family declarations for the |OT1|-encoded fonts now all
 contain:
@@ -1078,12 +1078,12 @@ whilst maintaining the correct value for all fonts.
 
 \subsection{Font file loading information}
 \label{sec:loadinfo}
- 
+
 The information which tells \LaTeX{} exactly which font ({\tt .tfm})
 files to load is contained in the \m{loading-info} part of a
 |\DeclareFontShape| declaration. This part consists of one or more
 \m{fontshape-decl}s, each of which has the following form:
- 
+
 \begin{center}
 \begin{tabular}{r@{ $::=$ }l}
  \m{fontshape-decl} &  \m{size-infos} \m{font-info} \\
@@ -1096,12 +1096,12 @@ files to load is contained in the \m{loading-info} part of a
 \end{center}
 The \m{number-or-range} denotes the size or size-range
 for which this entry applies.
- 
+
 If it contains a hyphen it is a
 range: lower bound on the left (if missing, zero implied), upper bound
 on the right (if missing, $\infty$ implied). For ranges, the
 upper bound is \emph{not} included in the range and the lower bound is.
- 
+
 Examples:
 \begin{center}
 \begin{tabular}{lll}
@@ -1114,41 +1114,41 @@ Examples:
 \end{center}
 If more than one \m{size-info} entry follows without any
 intervening \m{font-info}, they all share the next \m{font-info}.
- 
+
 The \m{size-function}, if present, handles the use of \m{font-info}.
 If not present, the `empty' \m{size-function} is assumed.
- 
+
 All the \m{size-info}s are inspected in the order in which they appear
 in the font shape declaration. If a \m{size-info} matches the
 requested size, its \m{size-function} is executed. If |\external@font|
 is non-empty afterwards this process stops, otherwise the next
 \m{size-info} is inspected. (See also |\DeclareSizeFunction|.)
- 
+
 If this process does not lead to a non-empty |\external@font|,
 \LaTeX{} tries the nearest simple size. If the entry contains only
 ranges an error is returned.
- 
- 
+
+
 \subsection{Size functions}
 \label{sec:sizefunct}
- 
- 
+
+
 \LaTeX{} provides the following size functions, whose `inputs' are
 \m{fontarg} and \m{optarg} (when present).
- 
+
 \begin{description}
 \item[`' (empty)]
 Load the external font \m{fontarg} at the user-requested size. If
 \m{optarg} is present, it is used as the scale-factor.
- 
+
 \item[s]
 Like the empty function but without terminal warnings, only
 loggings.
- 
+
 \item[gen]
 Generates the external font from \m{fontarg} followed by
 the user-requested size, e.g.~|<<8>> <<9>> <<10>> gen * cmtt|
- 
+
 \item[sgen]
 Like the `gen' function but without terminal warnings, only loggings.
 
@@ -1157,74 +1157,74 @@ Like the `gen' function but without terminal warnings, only loggings.
 Generates the external font from \m{fontarg} followed by
 the user-requested size, using the conventions of the `ec' fonts.
 e.g.~|<<10.98>> genb * dctt| produces |dctt1098|.
- 
+
 \item[sgenb]
 \NEWfeature{1995/12/01}
 Like the `genb' function but without terminal warnings, only loggings.
- 
+
 \item[sub]
 Tries to load a font from a different font shape declaration given by
 \m{fontarg} in the form \m{family}|/|\m{series}|/|\m{shape}.
- 
+
 \item[ssub]
 Silent variant of `sub', only loggings.
- 
+
 \item[subf]
 Like the empty function but issues a warning that it has to substitute
 the external font \m{fontarg} because the desired font shape was not
 available in the requested size.
- 
+
 \item[ssubf]
 Silent variant of `subf', only loggings.
- 
+
 \item[fixed]
 Load font \m{fontarg} as is, disregarding the user-requested size.
 If present, \m{optarg} gives the ``at \ldots pt'' size to be used.
- 
+
 \item[sfixed]
 Silent variant of `fixed', only loggings.
- 
+
 \end{description}
- 
+
 Examples for the use of most of the above size functions can be found
 in the file |cmfonts.fdd|---the source for the standard |.fd| files
 describing the Computer Modern fonts by Donald Knuth.
- 
- 
+
+
 \begin{decl}
 |\DeclareSizeFunction| \arg{name} \arg{code}
 \end{decl}
- 
+
 Declares a size-function \m{name} for use in |\DeclareFontShape|
 commands.  The interface is still under development but there should be
 no real need to a define new size functions.
- 
+
 The \m{code} is executed when the size or size-range in
 |\DeclareFontShape| matches the user-requested size.
- 
+
 The arguments of the size-function are automatically parsed and placed
 into |\mandatory@arg| and |\optional@arg| for use in \m{code}. Also
 available, of course, is |\f@size|, which is the user-requested size.
- 
+
 To signal success \m{code} must define the command |\external@font|
 to contain the external name and any scaling options (if present) for
 the font to be loaded.
- 
+
 This example sets up the `empty' size function (simplified):
 \begin{verbatim}
    \DeclareSizeFunction{}
            {\edef\external@font{\mandatory@arg\space at\f@size}
 \end{verbatim}
- 
- 
+
+
 \section{Encodings}
 \label{Sec:encode}
- 
+
 This section explains how to declare and use new font encodings and
 how to declare commands for use with particular encodings.
- 
+
 \subsection{The \textsf{fontenc} package}
- 
+
 Users can select new font encodings using the |fontenc| package.  The
 |fontenc| package has options for encodings; the last option becomes
 the default encoding.  For example, to use the |OT2| (Washington
@@ -1233,13 +1233,13 @@ default, an author types:
 \begin{verbatim}
    \usepackage[OT2,T1]{fontenc}
 \end{verbatim}
- 
+
 \NEWdescription{1997/12/01}
 For each font encoding \m{ENC} given as an option, this package loads
 the \emph{encoding definition} (|<enc>enc.def|, with an all
 lower-case name) file; it also sets |\encodingdefault| to be the last
 encoding in the option list.
- 
+
 The declarations in the encoding definition file |<enc>enc.def| for
 encoding \m{ENC} are responsible for declaring this encoding and
 telling \LaTeX{} how to produce characters in this encoding; this file
@@ -1251,7 +1251,7 @@ sets up various defaults which require that |OT1|-encoded fonts are
 available.
 Other encoding set-ups might be added to the distribution at a
 later stage.
- 
+
 Thus the example above loads the files |ot2enc.def| and |t1enc.def|
 and sets |\encodingdefault| to |T1|.
 
@@ -1263,7 +1263,7 @@ the `cmr' family).
 
 \subsection{Encoding definition file commands}
 \label{Sec:encode.def}
- 
+
 \emph{Note}: An encoding definition file should contain only commands
 from this subsection.
 
@@ -1277,7 +1277,7 @@ are still under development.  Therefore, the current versions of the
 files |ot1enc.def| and |t1enc.def| are temporary versions and should
 not be used as models for producing further such files.  For further
 information you should read the documentation in |ltoutenc.dtx|.
- 
+
 \begin{decl}
    |\ProvidesFile{<file-name>}[<release-info>]|
 \end{decl}
@@ -1287,39 +1287,39 @@ command, described in \emph{\clsguide}.  For example:
    \ProvidesFile{ot2enc.def}
                 [1994/06/01 Washington University Cyrillic encoding]
 \end{verbatim}
- 
- 
+
+
 \begin{decl}
 |\DeclareFontEncoding| \arg{encoding} \arg{text-settings}
                        \arg{math-settings}
 \end{decl}
- 
+
 Declares a new encoding scheme \m{encoding}.
- 
+
 The \m{text-settings} are
 declarations which are executed every time |\selectfont| changes the
 encoding to be \m{encoding}.
- 
+
 The \m{math-settings} are similar but are for math alphabets. They
 are executed whenever a math alphabet with this encoding is
 called.
- 
+
 \NEWfeature{1998/12/01}
 It also saves the value of \m{encoding} in the macro
 |\LastDeclaredEncoding|.
- 
+
 Example:
 \begin{verbatim}
    \DeclareFontEncoding{OT1}{}{}
 \end{verbatim}
- 
+
 Some author commands need to change their definition depending on
 which encoding is currently in use.  For example, in the |OT1|
 encoding, the letter `\AE' is in slot |"1D|, whereas in the |T1|
 encoding it is in slot |"C6|.  So the definition of |\AE| has to
 change depending on whether the current encoding is |OT1| or |T1|.
 The following commands allow this to happen.
- 
+
 \begin{decl}
    |\DeclareTextCommand| \arg{cmd} \arg{encoding}
    \oarg{num} \oarg{default} \arg{definition}
@@ -1333,13 +1333,13 @@ definition of |\k| in the |T1| encoding is:
 \end{verbatim}
 |\DeclareTextCommand| takes the same optional arguments as
 |\newcommand|.
- 
+
 The resulting command is
 robust, even if the code in \m{definition} is fragile.
- 
+
 It does not produce an error if the command has already
 been defined but logs the redefinition in the transcript file.
- 
+
 \begin{decl}[1994/12/01]
    |\ProvideTextCommand| \arg{cmd} \arg{encoding}
    \oarg{num} \oarg{default} \arg{definition}
@@ -1347,7 +1347,7 @@ been defined but logs the redefinition in the transcript file.
 This command is the same as |\DeclareTextCommand|, except that
 if \m{cmd} is already defined in encoding \m{encoding}, then the
 definition is ignored.
- 
+
 \begin{decl}
    |\DeclareTextSymbol| \arg{cmd} \arg{encoding} \arg{slot}
 \end{decl}
@@ -1359,7 +1359,7 @@ is:
 \end{verbatim}
 It does not produce an error if the command has already
 been defined but logs the redefinition in the transcript file.
- 
+
 \begin{decl}
    |\DeclareTextAccent| \arg{cmd} \arg{encoding} \arg{slot}
 \end{decl}
@@ -1371,7 +1371,7 @@ the |OT1| encoding is:
 \end{verbatim}
 It does not produce an error if the command has already
 been defined but logs the redefinition in the transcript file.
- 
+
 \begin{decl}
    |\DeclareTextComposite| \arg{cmd} \arg{encoding} \arg{letter}
                            \arg{slot}
@@ -1380,18 +1380,18 @@ This command declares that the composite letter formed from applying
 \m{cmd} to \m{letter} is defined to be simply slot \m{slot} in the
 encoding.   The \m{letter} should be a single letter (such as |a|) or
 a single command (such as |\i|).
- 
- 
+
+
 For example, the definition of |\'{a}|
 in the |T1| encoding could be declared like this:
 \begin{verbatim}
    \DeclareTextComposite{\'}{T1}{a}{225}
 \end{verbatim}
- 
+
 The \m{cmd} will normally have been previously declared
 for this encoding, either by using
 |\DeclareTextAccent|, or as a one-argument |\DeclareTextCommand|.
- 
+
 \begin{decl}[1994/12/01]
    |\DeclareTextCompositeCommand| \arg{cmd} \arg{encoding} \arg{letter}
                            \arg{definition}
@@ -1420,11 +1420,11 @@ encoding, e.g.
   \DeclareTextAccent{\'}{\LastDeclaredEncoding}{1}
 \end{verbatim}
 This can be useful in cases where encoding files sharing common code
-are generated from one source.  
+are generated from one source.
 
 
 \subsection{Default definitions}
- 
+
 \NEWdescription{1997/12/01}
 The declarations used in encoding definition files define
 encoding-specific commands but they do not allow those commands to be
@@ -1433,7 +1433,7 @@ such as symbols, this is not enough.  For example, the~|OMS| encoding
 contains the symbol~`\S', but we need to be able to use the
 command~|\S| whatever the current encoding may be, without explicitly
 selecting the encoding~|OMS|.
-   
+
 \NEWdescription{1997/12/01}
 To allow this, \LaTeX{} has commands that declare default definitions
 for commands; these defaults are used when the command is not defined
@@ -1450,12 +1450,12 @@ definition files, since those files should declare only commands for use
 when that encoding has been selected.  They should instead be placed
 in packages; they must, of course, always refer to encodings that are
 known to be available.
- 
+
 \begin{decl}[1994/12/01]
    |\DeclareTextCommandDefault| \arg{cmd} \arg{definition}
 \end{decl}
-This command allows an encoding-specific command to be given a default 
-definition.  For example, the default definition for |\copyright| is 
+This command allows an encoding-specific command to be given a default
+definition.  For example, the default definition for |\copyright| is
 defined be be a circled `c' with:
 \begin{verbatim}
    \DeclareTextCommandDefault{\copyright}{\textcircled{c}}
@@ -1476,9 +1476,9 @@ encoding-specific command, not just those defined with
 |\DeclareTextAccent|.  Similarly, |\DeclareTextSymbolDefault| can be
 used on any encoding-specific command with no arguments, not just
 those defined with |\DeclareTextSymbol|.
- 
-For more examples of these definitions, see |ltoutenc.dtx|.  
- 
+
+For more examples of these definitions, see |ltoutenc.dtx|.
+
 \begin{decl}[1994/12/01]
    |\ProvideTextCommandDefault| \arg{cmd} \arg{definition}
 \end{decl}
@@ -1490,50 +1490,50 @@ a package might give a fake definition of |\textonequarter| by saying:
 \begin{verbatim}
    \ProvideTextCommandDefault{\textonequarter}{$\m@th\frac14$}
 \end{verbatim}
- 
+
  \subsection{Encoding defaults}
- 
+
 \begin{decl}
 |\DeclareFontEncodingDefaults| \arg{text-settings} \arg{math-settings}
 \end{decl}
- 
+
 Declares \m{text-settings} and \m{math-settings} for all encoding
 schemes.  These are executed before the encoding scheme dependent ones
 are executed so that one can use the defaults for the major cases and
 overwrite them if necessary using |\DeclareFontEncoding|.
- 
+
 If |\relax| is used as an argument, the current setting of this default
 is left unchanged.
- 
+
 This example is used by amsfonts.sty for accent positioning; it changes
 only the math settings:
 \begin{verbatim}
    \DeclareFontEncodingDefaults{\relax}{\def\accentclass@{7}}
 \end{verbatim}
- 
- 
+
+
 \begin{decl}
 |\DeclareFontSubstitution|  \arg{encoding} \arg{family} \arg{series}
                             \arg{shape}
 \end{decl}
- 
+
 Declares the default values for font substitution which will be used
 when a font with encoding \m{encoding}
 should be loaded but no font can be found with the current
 attributes.
- 
+
 These substitutions are local to the encoding scheme because the
 encoding scheme is never substituted!  They are tried in the order
 \m{shape} then  \m{series} and finally \m{family}.
- 
+
 If no defaults are set up for an encoding, the values given by
 |\DeclareErrorFont| are used.
- 
+
 The font specification for
 \m{encoding}\m{family}\m{series}\m{shape}
 must have been defined by |\DeclareFontShape|
 before the |\begin{document}| is reached.
- 
+
 Example:
 \begin{verbatim}
    \DeclareFontSubstitution{T1}{cmr}{m}{n}
@@ -1571,37 +1571,37 @@ been extended for use with some Cyrillic encodings.
 
 \section{Miscellanea}
 \label{Sec:misc}
- 
+
 This section covers the remaining font commands in \LaTeX{} and some
 other issues.
- 
+
 \subsection{Font substitution}
- 
+
 \begin{decl}
 |\DeclareErrorFont| \arg{encoding} \arg{family} \arg{series}
                     \arg{shape} \arg{size}
 \end{decl}
- 
+
 Declares \m{encoding}\m{family}\m{series}\m{shape} to be the font shape
 used in cases where the standard substitution mechanism fails
 (i.e.~would loop). For the standard mechanism see the command
 |\DeclareFontSubstitution| above.
- 
+
 The font specification for
 \m{encoding}\m{family}\m{series}\m{shape}
 must have been defined by |\DeclareFontShape|
 before the |\begin{document}| is reached.
- 
+
 Example:
 \begin{verbatim}
    \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
 \end{verbatim}
- 
- 
+
+
 \begin{decl}
 |\fontsubfuzz|
 \end{decl}
- 
+
 This parameter is used to decide whether or not to produce a terminal
 warning if a font size substitution takes place. If the difference
 between the requested and the chosen size is less than |\fontsubfuzz|
@@ -1610,28 +1610,28 @@ is |0.4pt|.  This can be redefined with |\renewcommand|, for example:
 \begin{verbatim}
    \renewcommand{\fontsubfuzz}{0pt}   % always warn
 \end{verbatim}
- 
+
 \subsection{Preloading}
- 
+
 \begin{decl}
 |\DeclarePreloadSizes| \arg{encoding} \arg{family} \arg{series}
                        \arg{shape}
 \arg{size-list}
 \end{decl}
- 
- 
+
+
 Specifies the fonts that should be preloaded by the format.  These
 commands should be put in a |preload.cfg| file, which is read in when
 the \LaTeX{} format is being built.
 Read |preload.dtx| for more information on how to built such a
 configuration file.
- 
+
 Example:
 \begin{verbatim}
    \DeclarePreloadSizes{OT1}{cmr}{m}{sl}{10,10.95,12}
 \end{verbatim}
- 
- 
+
+
 \subsection{Accented characters}
 
 \NEWdescription{1996/06/01}
@@ -1702,18 +1702,18 @@ correct typesetting, as will the default declarations such as
 
 
 \subsection{Naming conventions}
- 
+
 \begin{itemize}
 \item
 Math alphabet commands all start with |\math...|: examples are
 |\mathbf|, |\mathcal|, etc.
- 
+
 \item
 The text font changing commands with arguments all start with
 |\text...|: e.g.~|\textbf| and |\textrm|.  The exception to this is
 |\emph|, since it occurs very commonly in author documents and so
 deserves a shorter name.
- 
+
 \item
 Names for encoding schemes are strings of up to three letters (all
 upper case) plus digits.
@@ -1733,32 +1733,32 @@ a later release of \LaTeX.
 Encoding schemes which are local to a site or a system should start
 with |L|, experimental encodings intended for wide distribution will
 start with |E|, whilst |U| is for Unknown or Unclassified encodings.
- 
+
 \item
 Font family names should contain up to five lower case letters.
 Where possible, these should conform to the \emph{Filenames for fonts}
 font naming scheme.
- 
+
 \item
 Font series names should contain up to four lower case letters.
- 
+
 \item
 Font shapes should contain up to two letters lower case.
- 
+
 \item
 Names for symbol fonts are built from lower and upper case letters
 with no restriction.
 \end{itemize}
- 
+
 Whenever possible, you should use the series and shape names suggested
 in \emph{\LaTeXcomp} since this will make it easier to combine new
 fonts with existing fonts.
- 
+
 \NEWdescription{1994/12/01}
    Where possible, text symbols should be named as |\text| followed by
-   the Adobe glyph name: for example |\textonequarter| or 
-   |\textsterling|.  Similarly, math symbols should be named as 
-   |\math| followed by the glyph name, for example |\mathonequarter| 
+   the Adobe glyph name: for example |\textonequarter| or
+   |\textsterling|.  Similarly, math symbols should be named as
+   |\math| followed by the glyph name, for example |\mathonequarter|
    or |\mathsterling|.  Commands which can be used in text or math can
    then be defined using |\ifmmode|, for example:
 \begin{verbatim}
@@ -1808,7 +1808,7 @@ document and even, in rare cases, produce clearly wrong output, so
 it should not be used in the final formatting of `real documents'.
 
 \begin{thebibliography}{1}
- 
+
 \bibitem{A-W:MG2004}
 Frank Mittelbach and Michel Goossens.
 \newblock {\em The {\LaTeX} Companion second edition}.
@@ -1819,12 +1819,12 @@ Frank Mittelbach and Michel Goossens.
 Donald~E. Knuth.
 \newblock Typesetting concrete mathematics.
 \newblock {\em {TUG}boat}, 10(1):31--36, April 1989.
- 
+
 \bibitem{A-W:LLa94}
 Leslie Lamport.
 \newblock {\em {\LaTeX:} A Document Preparation System}.
 \newblock Addison-Wesley, Reading, Massachusetts, second edition, 1994.
- 
+
 \end{thebibliography}
- 
+
 \end{document}
diff --git a/Master/texmf-dist/source/latex/base/fontdef.dtx b/Master/texmf-dist/source/latex/base/fontdef.dtx
index d3acfab29f7..6ec2d69c688 100644
--- a/Master/texmf-dist/source/latex/base/fontdef.dtx
+++ b/Master/texmf-dist/source/latex/base/fontdef.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: fontdef.dtx
@@ -41,9 +41,9 @@
 %          \ProvidesFile{fontdef.dtx}
            [2004/02/04 v2.3a LaTeX Kernel
 % \iftrue  (\else
-%<text,   >(Text 
+%<text,   >(Text
 %<math,   >(Math
-%<+cfgtext>(Uncustomised text  
+%<+cfgtext>(Uncustomised text
 %<+cfgmath>(Uncustomised math
 %<+cfgprel>(Uncustomised preload
 % \fi
@@ -141,7 +141,7 @@
 %
 % Please note: the following standard encodings  have to
 % be defined in all local variants of \texttt{font....cfg} to guarantee
-% that all \LaTeX{} installations behave in the same way. 
+% that all \LaTeX{} installations behave in the same way.
 % \begin{center}
 % \begin{tabular}{ll}
 %   |T1|      &    Cork \TeX{} text encoding \\
@@ -149,7 +149,7 @@
 %   |U|        &   unknown encoding \\
 %   |OML|      &   old \TeX{} math letters encoding \\
 %   |OMS|      &   old \TeX{} math symbols encoding \\
-%   |OMX|      &   old \TeX{} math extension symbols encoding 
+%   |OMX|      &   old \TeX{} math extension symbols encoding
 % \end{tabular}
 % \end{center}
 % Notice that some of these encodings are `old' in the sense that we
@@ -203,7 +203,7 @@
 %
 % The next bit of code contains the documentation driver file for
 % \TeX{}, i.e.~the file that will produce the documentation you are
-% currently reading. It will be extracted from this file by the 
+% currently reading. It will be extracted from this file by the
 % \dst{} program.
 %    \begin{macrocode}
 %<*driver>
@@ -245,12 +245,12 @@
 %    the form \meta{enc}\texttt{enc.def}, e.g.~\texttt{ot1enc.def}. This
 %    allows other applications to make use of the declarations as
 %    well.
-%    
+%
 %    Similar to the default encoding, the loading of the encoding
 %    files for the two major text encodings shouldn't be changed.
 %    In particular, the \texttt{inputenc} package depends on this.
 % \changes{v2.2s}{1997/12/20}{Added documentation}
-%    
+%
 % \changes{v2.1d}{1994/01/05}{Removed nf prefix from file names.}
 % \changes{v2.1f}{1994/05/14}{Removed .def files.}
 % \changes{v2.1g}{1994/05/1g}{Removed \cs{DeclareFontEncoding} for ot1
@@ -280,7 +280,7 @@
 %    \begin{macrocode}
 \DeclareFontEncodingDefaults{}{}
 %    \end{macrocode}
-%    
+%
 %    Then we define the default substitution for every encoding.
 %    This release of \LaTeXe{} assumes that the ec fonts are
 %    available. It is possible to change this to point to some other
@@ -342,7 +342,7 @@
 \input {ot1cmtt.fd}
 \endgroup
 %    \end{macrocode}
-%    
+%
 %    Even with all the precautions it is still possible that NFSS will
 %    run into problems, for example, when a |.fd| file contains
 %    corrupted data. To guard against such cases NFSS has a very
@@ -435,7 +435,7 @@
 %</text>
 %    \end{macrocode}
 %
-%    
+%
 %
 %
 % \section{The \texttt{fontmath.ltx} file}
@@ -482,7 +482,7 @@
 \endgroup
 %    \end{macrocode}
 %
-%  \subsubsection{Symbolfont and Alphabet declarations}  
+%  \subsubsection{Symbolfont and Alphabet declarations}
 %
 %    We now define the basic symbol fonts used by \LaTeX{}.
 %    These four symbol fonts must be defined by this file.
@@ -508,7 +508,7 @@
 \SetSymbolFont{letters}  {bold}{OML}{cmm} {b}{it}
 \SetSymbolFont{symbols}  {bold}{OMS}{cmsy}{b}{n}
 %    \end{macrocode}
-%    
+%
 %    Below are the seven math alphabets which are defined by NFSS.
 %    Again they must be defined by this file.
 %    However, as before you can change the fonts used without losing
@@ -542,7 +542,7 @@
 %    size to be used for each text font size.
 %
 %    All occurences of sizes longer than a single character are replaced
-%    with the macro name that holds them, saving a number of 
+%    with the macro name that holds them, saving a number of
 %    tokens (but losing a bit of speed, so this may not stay this way).
 %    \begin{macrocode}
  \DeclareMathSizes{5}{5}{5}{5}
@@ -625,7 +625,7 @@
 \DeclareMathSymbol{Y}{\mathalpha}{letters}{`Y}
 \DeclareMathSymbol{Z}{\mathalpha}{letters}{`Z}
 %    \end{macrocode}
-%    
+%
 % \subsubsection{The digits}
 %
 %    \begin{macrocode}
@@ -641,7 +641,7 @@
 \DeclareMathSymbol{9}{\mathalpha}{operators}{`9}
 %    \end{macrocode}
 %
-%    
+%
 % \subsubsection{Punctuation, brace, etc. keys}
 %
 %    \begin{macrocode}
@@ -668,7 +668,7 @@
 %\DeclareMathSymbol{<}{\mathrel}{letters}{"3C}
 %\DeclareMathSymbol{>}{\mathrel}{letters}{"3E}
 %    \end{macrocode}
-%    
+%
 %    Should all of the following being activated by default? Probably
 %    not.
 %    \begin{macrocode}
@@ -698,7 +698,7 @@
 %    \end{macrocode}
 %
 % The next two are considered to be relations when not used in the context
-% of a delimiter! And worse, they do even represent different glyphs when 
+% of a delimiter! And worse, they do even represent different glyphs when
 % being used as delimiter and not as delimiter. This is a user level syntax
 % inherited from plain \TeX{}. Therefore we explicitly redefine the math
 % symbol definitions for these symbols afterwards.
@@ -852,10 +852,10 @@
    \let \varbigtriangledown \bigtriangledown
    \let \varbigtriangleup \bigtriangleup
 %    \end{macrocode}
-% 
+%
 % These last two synonyms are needed because the \textsf{stamryrd}
 % package redefines them as Operators.
-% 
+%
 %    \begin{macrocode}
 \DeclareMathSymbol{\wedge}{\mathbin}{symbols}{"5E}
    \let\land=\wedge
@@ -979,7 +979,7 @@
 \DeclareRobustCommand
   \joinrel{\mathrel{\mkern-3mu}}
 \DeclareRobustCommand
-  \relbar{\mathrel{\smash-}} % \smash, because - 
+  \relbar{\mathrel{\smash-}} % \smash, because -
                                % has the same height as +
 %    \end{macrocode}
 %    In contrast to \texttt{plain.tex} |\Relbar| got braces around the
@@ -1003,7 +1003,7 @@
 \DeclareRobustCommand
   \bowtie{\mathrel\triangleright\joinrel\mathrel\triangleleft}
 %    \end{macrocode}
-%    
+%
 % \changes{v2.2z}{2001/06/04}{Guard against math active equal and pipe
 %    sign in \cs{models} (pr/3333)}
 %    \begin{macrocode}
@@ -1082,13 +1082,13 @@
 \DeclareMathAccent{\widehat}{\mathord}{largesymbols}{"62}
 %    \end{macrocode}
 %    For some reason plain \TeX{} never bothered to provide
-%    a ring accent in math (although it is available in the fonts), 
+%    a ring accent in math (although it is available in the fonts),
 %    but since we got a request for it here we go:
 % \changes{v2.2t}{1998/04/11}{Added \cs{mathring} accent (pr2785)}
 %    \begin{macrocode}
 \DeclareMathAccent{\mathring}{\mathalpha}{operators}{"17}
 %    \end{macrocode}
-%    
+%
 %
 % \subsubsection{Radicals}
 %
@@ -1150,14 +1150,14 @@
 \DeclareMathDelimiter{\rmoustache}   % top from ), bottom from (
    {\mathclose}{largesymbols}{"7B}{largesymbols}{"41}
 \DeclareMathDelimiter{\arrowvert}    % arrow without arrowheads
-   {\mathord}{symbols}{"6A}{largesymbols}{"3C}  
+   {\mathord}{symbols}{"6A}{largesymbols}{"3C}
 \DeclareMathDelimiter{\Arrowvert}    % double arrow without arrowheads
    {\mathord}{symbols}{"6B}{largesymbols}{"3D}
 \DeclareMathDelimiter{\Vert}
-   {\mathord}{symbols}{"6B}{largesymbols}{"0D}  
+   {\mathord}{symbols}{"6B}{largesymbols}{"0D}
 \let\|=\Vert
 \DeclareMathDelimiter{\vert}
-   {\mathord}{symbols}{"6A}{largesymbols}{"0C} 
+   {\mathord}{symbols}{"6A}{largesymbols}{"0C}
 \DeclareMathDelimiter{\uparrow}
    {\mathrel}{symbols}{"22}{largesymbols}{"78}
 \DeclareMathDelimiter{\downarrow}
@@ -1171,7 +1171,7 @@
 \DeclareMathDelimiter{\Updownarrow}
    {\mathrel}{symbols}{"6D}{largesymbols}{"77}
 \DeclareMathDelimiter{\backslash}    % for double coset G\backslash H
-   {\mathord}{symbols}{"6E}{largesymbols}{"0F}  
+   {\mathord}{symbols}{"6E}{largesymbols}{"0F}
 \DeclareMathDelimiter{\rangle}
    {\mathclose}{symbols}{"69}{largesymbols}{"0B}
 \DeclareMathDelimiter{\langle}
@@ -1251,7 +1251,7 @@
 % \end{macro}
 %
 % \begin{macro}{\mathellipsis}
-%    This is plain \TeX's |\ldots|.  
+%    This is plain \TeX's |\ldots|.
 %    \begin{macrocode}
 \def\mathellipsis{\mathinner{\ldotp\ldotp\ldotp}}%
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/format.ins b/Master/texmf-dist/source/latex/base/format.ins
index f8cd89198c0..df915c33701 100644
--- a/Master/texmf-dist/source/latex/base/format.ins
+++ b/Master/texmf-dist/source/latex/base/format.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3b
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3c or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,18 +65,18 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
 \declarepreamble\cfgpreamble
 
-This is a generated file.  
+This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -86,7 +86,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file may only be distributed together with a copy of the LaTeX
@@ -149,7 +149,9 @@ the system are in the document `cfgguide.tex'.
    \file{tracefnt.sty}{%
           \from{ltfsstrc.dtx}{package,trace}}
    \file{flafter.sty}{%
-          \from{ltoutput.dtx}{flafter}}
+          \from{ltoutput.dtx}{flafter,trace}}
+   \file{fltrace.sty}{%
+          \from{ltoutput.dtx}{fltrace,trace}}
 %%% generate general option files modifying the kernel behavior
    \file{fleqn.clo}{%
           \from{ltmath.dtx}{fleqn}}
@@ -160,11 +162,6 @@ the system are in the document `cfgguide.tex'.
 
 
 
-% \generateFile{fltrace.sty}{t}{%       %%% not yet finished
-%  \from{ltoutput.dtx}{fltrace,trace}
-% }
-
-
 \generateFile{oldlfont.sty}{t}{%
   \from{oldlfont.dtx}{package}
 }
diff --git a/Master/texmf-dist/source/latex/base/graphpap.dtx b/Master/texmf-dist/source/latex/base/graphpap.dtx
index effe3f70092..83e69cfe200 100644
--- a/Master/texmf-dist/source/latex/base/graphpap.dtx
+++ b/Master/texmf-dist/source/latex/base/graphpap.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%
@@ -69,8 +69,8 @@
 %
 %  First, we define three counters.  The first two are defined
 %  as raw TeX counters since multiplication and division must be
-%  performed in them. 
-%    
+%  performed in them.
+%
 % \changes{v1.0b}{1994/04/28}{(DPC) Remove allocations.}
 %    \begin{macrocode}
 %<*package>
@@ -90,13 +90,13 @@
 %              \marg{number-of-lines}\marg{length-of-lines}\\
 %   |\@nonumvgrid|\parg{xpos,ypos}\marg{xincrement}^^A
 %              \marg{number-of-lines} \marg{length-of-lines}
-%     
+%
 %   HORIZONTAL GRIDS
 %
 %     |\@hgrid|\parg{xpos,ypos}\marg{yincrement}^^A
 %                \marg{number-of-lines}\marg{length-of-lines}\\
 %     |\@nonumhgrid| same as |\@hgrid| but no numbers drawn
-% 
+%
 %    \begin{macrocode}
 \def\@vgrid(#1,#2)#3#4#5{%
   \setcounter{@grid}{#1}%
@@ -136,7 +136,7 @@
 %
 % Finally, |\graphpaper| is defined in a straightforward way in terms of
 % the commands above.
-%    
+%
 %  \begin{macro}{\graphpaper}
 % \changes{v1.0c}{1994/08/09}{(DPC) add \cs{leavevmode}}
 %    \begin{macrocode}
@@ -145,7 +145,7 @@
 %  \end{macro}
 %
 %  \begin{macro}{\@grid}
-% 
+%
 % \changes{v1.0b}{1994/04/28}
 %     {(DPC) convert ignore spaces between arguments}
 %    \begin{macrocode}
@@ -154,7 +154,7 @@
 %  \end{macro}
 %
 %  \begin{macro}{\@grid@i}
-% 
+%
 % \changes{v1.0b}{1994/04/28}
 %     {(DPC) macro introduced}
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/graphpap.ins b/Master/texmf-dist/source/latex/base/graphpap.ins
index 78ec11ae0d7..20bec1c6ef0 100644
--- a/Master/texmf-dist/source/latex/base/graphpap.ins
+++ b/Master/texmf-dist/source/latex/base/graphpap.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/ifthen.dtx b/Master/texmf-dist/source/latex/base/ifthen.dtx
index 5ad576019e7..bf395982761 100644
--- a/Master/texmf-dist/source/latex/base/ifthen.dtx
+++ b/Master/texmf-dist/source/latex/base/ifthen.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%
@@ -62,7 +62,7 @@
 % \date{\filedate}
 % \author{David Carlisle}
 %  \maketitle
-% 
+%
 % \CheckSum{306}
 %
 %
@@ -127,10 +127,10 @@
 % primitive \TeX\ |\if| constructs, for example |\boolean{true}|
 % (|\iftrue|),  |\boolean{mmode}| (|\ifmmode|) etc.
 %
-% 
+%
 %  The commands:\\
-%  |\newboolean|\marg{name}\DescribeMacro{\newboolean}\ and\ 
-%  |\provideboolean|\marg{name}\DescribeMacro{\provideboolean}\ 
+%  |\newboolean|\marg{name}\DescribeMacro{\newboolean}\ and\
+%  |\provideboolean|\marg{name}\DescribeMacro{\provideboolean}\
 %  are provided so the user can easily create  new boolean flags.
 %  As for |\newcommand|, |\newboolean| generates an error if the
 %  command name is not new. |\provideboolean| silently does nothing in
@@ -149,7 +149,7 @@
 % first pass in an |\edef| expands clauses in all propositions.)
 %
 % Apart from the addition of the extra atomic propositions |\isodd|,
-% |\boolean|, |\lengthtest| and |\isundefined|, 
+% |\boolean|, |\lengthtest| and |\isundefined|,
 % the only known incompatibility is that
 % in this package the expression|\not\not|\meta{P} is equivalent to
 % \meta{P}.
@@ -274,7 +274,7 @@
   \TE@repl\and\TE@and
   \TE@repl\not\TE@neg
 %    \end{macrocode}
-%    
+%
 % \changes{v1.1c}{2001/05/25}{Added \cs{AND}, \cs{OR} and \cs{NOT} as
 %    boolean operators as alternative to the lower case versions
 %    (pr/3297)}
diff --git a/Master/texmf-dist/source/latex/base/ifthen.ins b/Master/texmf-dist/source/latex/base/ifthen.ins
index b0e3389f3c1..48939c6ffab 100644
--- a/Master/texmf-dist/source/latex/base/ifthen.ins
+++ b/Master/texmf-dist/source/latex/base/ifthen.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/inputenc.dtx b/Master/texmf-dist/source/latex/base/inputenc.dtx
index 20dfce417cf..0bdcb14dcbf 100644
--- a/Master/texmf-dist/source/latex/base/inputenc.dtx
+++ b/Master/texmf-dist/source/latex/base/inputenc.dtx
@@ -1,30 +1,30 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
-% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% Copyright 1993-2014
+% LaTeX3 Project and any individual authors listed elsewhere
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -46,7 +46,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{3467}
+% \CheckSum{3522}
 %
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -100,7 +100,7 @@
 % \changes{v0.9j}{1995/11/14}{Remove \cs{endinput} so docstrip reaches
 %    ansinew encoding}
 % \changes{v0.9k}{1995/11/29}{Replaced uses of \cs{textsterling} with
-%    \cs{pounds}.} 
+%    \cs{pounds}.}
 % \changes{v0.9m}{1995/12/04}{Added German version}
 % \changes{v0.9m}{1995/12/04}{Replaced \cs{textasciitilde} by
 %    \cs{nobreakspace}.}
@@ -138,7 +138,7 @@
 %       THIS MAY CHANGE}
 % \changes{v0.95}{1997/12/20}{Updated documentation}
 % \changes{v0.97}{1998/03/05}{Spanish ords changed to text chars, pr/2579}
-% \changes{v1.1b}{2006/03/04}{Number of normalisations in the LICR 
+% \changes{v1.1b}{2006/03/04}{Number of normalisations in the LICR
 %                             representation (pr/3849)}
 % \changes{v1.1c}{2006/11/18}{Added missing \cs{ProvidesFile} line for cp1257 (pr/3892)}
 %
@@ -161,7 +161,7 @@
 %    languages suggested that it might be preferable to allow changing
 %    the input encoding at any time, which is what is possible now
 %    (though that is quite computing resource intensive).
-% 
+%
 % The encodings provided by this package are:
 % \begin{itemize}
 % \item |ascii| ASCII encoding for the range 32--127 (all others are made
@@ -202,7 +202,7 @@
 %    input encoding definitions to change this set-up.  Similarly, whenever
 %    |\inputencoding| is encountered in a document, first the upper
 %    8-bit characters are set back to produce an error and then the
-%    definitions for the new input encoding are loaded, changing some of the 
+%    definitions for the new input encoding are loaded, changing some of the
 %    previous settings.
 %
 %
@@ -239,7 +239,7 @@
 %    better definition will not be over-written; their use is
 %    recommended since, in general, the best definition depends on the
 %    fonts available.
-%    
+%
 %    See the documentation in |fntguide.tex| and |ltoutenc.dtx| for
 %    details of how to declare text commands.
 %
@@ -365,7 +365,7 @@
 % font encoding then please contribute that work to this package so that
 % others can benefit too.
 %
-% 
+%
 %
 %
 
@@ -416,7 +416,7 @@
 %<cp858>  \ProvidesFile{cp858.def}
 %<cp437>  \ProvidesFile{cp437.def}
 %<cp437de>  \ProvidesFile{cp437de.def}
-%<cp865>  \ProvidesFile{cp865.def} 
+%<cp865>  \ProvidesFile{cp865.def}
 %<applemac>  \ProvidesFile{applemac.def}
 %<applemacce>  \ProvidesFile{macce.def}
 %<next>  \ProvidesFile{next.def}
@@ -424,16 +424,12 @@
 %<cp1252&!ansinew>  \ProvidesFile{cp1252.def}
 %<cp1250>  \ProvidesFile{cp1250.def}
 %<cp1257>  \ProvidesFile{cp1257.def}
-   [2008/03/30 v1.1d Input encoding file]
+   [2014/04/30 v1.2b Input encoding file]
 %<cp850>%%
 %<cp850>%% If you need a Euro symbol, try cp858 instead.
 %<cp850>%%
 %    \end{macrocode}
 %
-% Now we insert a |\makeatletter| at the beginning of all .def files.
-%    \begin{macrocode}
-%<-package>\makeatletter
-%    \end{macrocode}
 %
 % \section{The package}
 %
@@ -483,7 +479,7 @@
 %    The definition should contain only robust commands (and, for
 %    correct ligatures and kerning, they must be defined via the
 %    interfaces in the fontenc package).
-%    
+%
 % \changes{v0.9b}{1995/05/23}{Added hackery with \cs{IeC} in order to
 %       avoid space being gobbled.}
 %
@@ -516,17 +512,17 @@
 %    The definition of |\IeC| was modified not to insert a |\protect|
 %    unless it is needed, this means it works in |\hyphenation|
 %    commands, and other such delicate places.  It was then further
-%    changed to never insert a |\protect| as one is never needed; this 
+%    changed to never insert a |\protect| as one is never needed; this
 %    makes it work in even more places.
-% 
+%
 %    This still needs some attention.
-%    
+%
 % \changes{v0.9m}{1995/12/12}{Modified \cs{IeC} in order to
 %       work in \cs{hyphenation} latex/2004.}
-%    
+%
 % \changes{v0.94}{1997/12/17}{Changed non-typeset case from
 %       \cs{protect} to \cs{noexpand}: temporary fix.}
-%       
+%
 %    \begin{macrocode}
 \def\IeC{%
   \ifx\protect\@typeset@protect
@@ -550,16 +546,21 @@
 % \changes{v0.94}{1997/12/17}{Warning message reworded and line
 %       number added, also for latex/2608}
 % \changes{v0.95}{1997/12/20}{Changed to work in any vmode, for David}
-%
+% \changes{v1.2a}{2014/04/20}{Added alternative definition for xe/lua tex (pr/4024)}%
+% \changes{v1.2b}{2014/04/30}{Allow (x-)ascii and utf8x aliases for utf8 in xetex/luatex}%
 %    This sets the encoding to be |#1|.  It first sets all the
 %    characters 128--255 to be active (and sets their initial
 %    definition to be |\@inpenc@undefined|).
 %    It now also does this for some `low' codes below 32, but
 %    misses out Null, control-I, control-J, control-L and control-M.
-%    
+%
 %    It then inputs |#1.def|.  But it first sets up a test that
 %    produces a warning message if no suitable definitions get read.
-% 
+%
+%    \begin{macrocode}
+\ifx\Umathchar\@undefined
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \def\inputencoding#1{%
 %    \end{macrocode}
@@ -571,15 +572,16 @@
   \gdef\@inpenc@test{\global\let\@inpenc@test\relax}%
 %    \end{macrocode}
 %    Keyboard characters which don't get a definition will be mapped to
-%    |\@inpenc@undefined| which gets a definition producing an error 
+%    |\@inpenc@undefined| which gets a definition producing an error
 %    message indicating in which input encoding the current keyboard
 %    character is undefined:
 % \changes{v0.98}{1998/07/04}{Give better error message if key used
 %    is undefined (pr/2845)}
 % \changes{v0.993}{2000/01/24}{Fix error message for undefined chars
 %    (pr/3158)}
+% \changes{v1.2a}{2014/04/20}{add \cs{protect} so undefined characters are robust (pr/4182)}%
 %    \begin{macrocode}
-  \edef\@inpenc@undefined{\noexpand\@inpenc@undefined@{#1}}%
+  \edef\@inpenc@undefined{\noexpand\protect\noexpand\@inpenc@undefined@{#1}}%
 %    \end{macrocode}
 %    The |\edef| in the above definition is essential as |#1| may be
 %    |\CurrentOption| in which case a later use would return incorrect
@@ -589,7 +591,7 @@
 %    in a user accessible macro.
 % \changes{v1.1a}{2006/02/22}{Added \cs{inputencodingname}}
 %    \begin{macrocode}
-  \edef\inputencodingname{#1}% 
+  \edef\inputencodingname{#1}%
 %    \end{macrocode}
 %
 %    Now we make all potential input characters active.
@@ -606,18 +608,22 @@
 %    we need to ensure that we don't get any stray spaces into the
 %    horizontal mode or else we end up with extra space in the
 %    paragraph.
-% \changes{v0.998}{2001/05/25}{Suppress all spaces for horizontal mode 
+% \changes{v0.998}{2001/05/25}{Suppress all spaces for horizontal mode
 %                              (pr/3273)}
 % \changes{v1.0f}{2004/05/06}{Really do (pr/3273)}
 % \changes{v1.1d}{2007/08/06}{Set \cs{endlinechar} properly (pr/3926)}
+% \changes{ v1.1e}{2012/06/06}{Save and restore \cs{catcode} of @ (pr/4192)}
 %    \begin{macrocode}
   \xdef\saved@endlinechar@code{\the\endlinechar}%
   \endlinechar\m@ne
   \xdef\saved@space@catcode{\the\catcode`\ }%
-  \catcode`\ 9\relax                      
+  \catcode`\ 9\relax
+  \xdef\saved@at@catcode{\the\catcode`\@}%
+  \makeatletter
   \input{#1.def}%
   \endlinechar\saved@endlinechar@code\relax
   \catcode`\ \saved@space@catcode\relax
+  \catcode`\@\saved@at@catcode\relax
 %    \end{macrocode}
 %
 % If there have been no |\DeclareInputText| or |\DeclareInputMath|
@@ -634,11 +640,49 @@
 % \changes{v1.1a}{2006/02/22}{Added \cs{inpenc@posthook}}
 %    \begin{macrocode}
   \the\inpenc@posthook
-}  
+}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\else
+%    \end{macrocode}
+% Unicode based TeX engines do not require this package at all, and always use UTF-8
+% input. Allow the package to be used if |[uf8]| or |[ascii]| options are used to simplify
+% switching between TeX engines.
+%    \begin{macrocode}
+\def\inputencoding#1{%
+\edef\reserved@a{#1}%
+\def\reserved@b{utf8x}%
+\ifx\reserved@a\reserved@b\def\reserved@a{utf8}\fi
+\def\reserved@b{utf8}%
+\ifx\reserved@a\reserved@b
+\PackageWarningNoLine
+    {inputenc}%
+    {inputenc package ignored with utf8 based engines}%
+\else
+\def\reserved@b{x-ascii}%
+\ifx\reserved@a\reserved@b\def\reserved@a{ascii}\fi
+\def\reserved@b{ascii}%
+\ifx\reserved@a\reserved@b
+\PackageWarningNoLine
+    {inputenc}%
+    {inputenc can't be used to ensure 7bit clean source\MessageBreak
+    with a utf engine: Package ignored: utf8 assumed}%
+\else
+\PackageError
+    {inputenc}%
+    {inputenc is not designed for xetex or luatex.\MessageBreak
+     only UTF-8 supported}%
+    {For xelatex or lualatex save the document in UTF-8 encoding\MessageBreak
+    and do not use inputenc, or use the [utf8] option.}
+\fi
+\fi
+}
+\fi
 %    \end{macrocode}
 % \end{macro}
 %
-% 
+%
 % \begin{macro}{\inpenc@prehook}
 % \changes{v1.1a}{2006/02/22}{Hook added}
 % \begin{macro}{\inpenc@posthook}
@@ -651,7 +695,7 @@
 % \end{macro}
 % \end{macro}
 %
-% 
+%
 % \begin{macro}{\@inpenc@undefined@}
 %    This command will assigned to any active character unless it
 %    get a proper definition by the encoding. The argument is the
@@ -690,7 +734,7 @@
   \repeat}
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 %
 %    Then for each option, we input that encoding file.
 %    \begin{macrocode}
@@ -711,7 +755,7 @@
 %
 %    Note that this works reasonably well only because the encoding
 %    files for both |OT1| and |T1| are loaded in the standard LaTeX
-%    format. 
+%    format.
 %
 % \changes{v0.9a}{1995/04/23}{Default settings moved to own section}
 %
@@ -730,19 +774,19 @@
 %      {Added \cs{textblacksquare}}
 % \changes{v0.9u}{1996/10/29}
 %      {Corrected code for \cs{textblacksquare}}
-%      
+%
 % \changes{v0.9u}{1996/10/29}
 %      {Added cp865 and corrected cp850, cp852 and cp437 guards}
 % \changes{v0.94}{1997/12/17}{Removed entries that were solely in
 %       next.def}
 % \changes{v0.995}{2000/05/22}{Added latin2 option for textdegree
 %    (pr/3207) CAR}
-%       
+%
 % The name |\textblacksquare| is derived from the AMS symbol name since
 % Adobe seem not to want this symbol.  The default definition, as a
 % rule, makes no claim to being a good design.
-% 
-% Some entries are repeated in case guards must all be on one line. 
+%
+% Some entries are repeated in case guards must all be on one line.
 %    \begin{macrocode}
 %<*latin1|decmulti|latin2|latin3|latin4|latin5|latin9|applemacce|latin10>
 \ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
@@ -775,7 +819,7 @@
 %    characters.}
 %
 % Some commands can't be faked, so we have them generate an error
-% message. 
+% message.
 %     \begin{macrocode}
 %<*latin1|decmulti|latin5|latin9|cp850|cp858|cp865|cp437|cp437de>
 \ProvideTextCommandDefault{\textcent}
@@ -837,7 +881,7 @@
 %    `superior' glyphs.}
 % \changes{v0.97}{1998/03/05}{Removed ords:
 %    changed to text chars, pr/2579}
-%    
+%
 % Characters that are supposed to be used only in math will be defined
 % by |\providecommand| because \LaTeXe{} assumes that the font
 % encoding for math fonts is static.
@@ -873,7 +917,7 @@
 %    \end{macrocode}
 %
 % \changes{v0.94}{1997/12/17}{Merged latin1 with ansinew/cp1252}
-%    
+%
 % \section{The ISO Latin-2 encoding}
 %
 % The ISO Latin-2 encoding file defines the characters
@@ -999,7 +1043,7 @@
 % in the ISO 8859-3 encoding.  It was contributed by
 % by J\"org Knappen (\texttt{joerg.knappen@uni-mainz.de}) and
 % adapted by Chris Rowley.
-% 
+%
 % It can be used for general purpose applications in
 % typical office environments in the following languages:
 % Afrikaans, Catalan, English, Esperanto, French, Galician, German,
@@ -1116,7 +1160,7 @@
 % \section{The ISO Latin-4 encoding}
 %
 % The ISO Latin-4 encoding file defines the characters in the ISO
-% 8859-4 encoding. It was contributed by Hana Skoumalov\'a 
+% 8859-4 encoding. It was contributed by Hana Skoumalov\'a
 % (\texttt{hana.skoumalova@ff.cuni.cz}).
 %
 % It was created for Estonian, Latvian, Lithuanian, Finnish, Lappish,
@@ -1607,7 +1651,7 @@
 % \changes{v0.91}{1997/08/19}{Replaced \cs{dh}/\cs{DH} by
 %    \cs{dj}/\cs{DJ}.}
 % \changes{v0.99}{1999/04/14}{Changed 212, see pr/2992}
-% 
+%
 %    \begin{macrocode}
 %<*cp852>
 \DeclareInputText{128}{\c C}
@@ -1731,7 +1775,7 @@
 % The changes for cp865 are based on work by S\o ren Sandmann
 % (\texttt{sandmann@\linebreak[0]daimi.aau.dk}), with thanks to
 % them all.
-% 
+%
 % The DOS graphics `letters' and a few
 % other positions are ignored (left undefined).
 %
@@ -1751,7 +1795,7 @@
 % \changes{v0.9t}{1996/10/28}{Changed \cs{maththreesuperior} to
 %                             \cs{mathnsuperior}}
 % \changes{v0.94}{1997/12/17}{Changed 158 to \cs{DeclareInputText}}
-% 
+%
 %    \begin{macrocode}
 %<*cp437|cp437de|cp865>
 \DeclareInputText{128}{\c C}
@@ -1788,7 +1832,7 @@
 \DeclareInputText{157}{\textyen}
 %</cp437|cp437de>
 %<*cp865>
-\DeclareInputText{155}{\o} 
+\DeclareInputText{155}{\o}
 \DeclareInputText{156}{\pounds}
 \DeclareInputText{157}{\O}
 %</cp865>
@@ -1814,7 +1858,7 @@
 \DeclareInputText{173}{\textexclamdown}
 \DeclareInputText{174}{\guillemotleft}
 %<cp437|cp437de>\DeclareInputText{175}{\guillemotright}
-%<cp865>\DeclareInputText{175}{\textcurrency} 
+%<cp865>\DeclareInputText{175}{\textcurrency}
 %\DeclareInputText{176}{\textlightgraybox}
 %\DeclareInputText{177}{\textgraybox}
 %\DeclareInputText{178}{\textdarkgraybox}
@@ -1863,7 +1907,7 @@
 %\DeclareInputMath{218}{\ensuremath{\lceil}}  % upper left corner
 %\DeclareInputText{219}{} % black box
 %\DeclareInputText{220}{} % lower half of black box
-%\DeclareInputText{221}{} % left bar 
+%\DeclareInputText{221}{} % left bar
 %\DeclareInputText{222}{} % right bar
 %\DeclareInputText{223}{} % upper half of black box
 %    \end{macrocode}
@@ -1895,7 +1939,7 @@
 %\DeclareInputMath{244}{}   % upper part of integral sign
 %\DeclareInputMath{245}{}   % lower part of integral sign
 \DeclareInputMath{246}{\div}
-\DeclareInputMath{247}{\approx}  
+\DeclareInputMath{247}{\approx}
 \DeclareInputText{248}{\textdegree}
 \DeclareInputText{249}{\textperiodcentered}
 \DeclareInputText{250}{\textbullet}
@@ -2167,7 +2211,7 @@
 %    \cs{quotedblbase}: this may be temporary.}
 % \changes{v0.96}{1998/03/02}{Fixed typo in slot 159.}
 % \changes{v0.997}{2000/12/02}{Added all missing chars. (pr/3281)}
-%    
+%
 %    \begin{macrocode}
 %<*next>
 \DeclareInputText{128}{\nobreakspace}
@@ -2317,13 +2361,13 @@
 %
 % The MS Windows ANSI, cp 1252, input encoding was contributed by
 % Berthold K.P. Horn (\texttt{bkph@\linebreak[0]ai.mit.edu}).
-% 
+%
 % It has two very different names so the same code produces two files.
 % These encoding files both define the characters in the
 % MS Windows 3.1 ANSI encoding (Western Europe), also known as code
 % page 1252, which is based on ISO Latin-1 but has important additions
 % in the 128--159 range.
-% 
+%
 % Designed for:
 %       Danish, Dutch, English, Finnish, French, German, Icelandic,
 %       Italian, Norwegian, Portuguese, Spanish, and Swedish.
@@ -2343,12 +2387,12 @@
 %    French and Finnish. Further, a slot for the Euro currency sign has
 %    been added and this could be the killer argument for many 8-bit
 %    texts to be written in Latin-9 in the future.
-%    
+%
 % According to a Linux man page, ISO~Latin-9 supports Albanian, Basque,
 %    Breton, Catalan, Danish, Dutch,
-% English, Estonian, Faroese, Finnish, French, Frisian, Galician, German, 
-% Greenlandic, Icelandic, Irish Gaelic, Italian, Latin, Luxemburgish, 
-% Norwegian, Portuguese, Rhaeto-Romanic, Scottish Gaelic, Spanish and 
+% English, Estonian, Faroese, Finnish, French, Frisian, Galician, German,
+% Greenlandic, Icelandic, Irish Gaelic, Italian, Latin, Luxemburgish,
+% Norwegian, Portuguese, Rhaeto-Romanic, Scottish Gaelic, Spanish and
 % Swedish.
 %
 %    The characters added in |latin9.def| are (in \LaTeX{} notation):
@@ -2360,7 +2404,7 @@
 %       \textcurrency   \textbrokenbar   \"{}   \'{}   \c{}
 %       \textonequarter   \textonehalf   \textthreequarters
 % \end{verbatim}
-% 
+%
 % \changes{v0.9e}{1995/08/31}{Redeclared "AD to be soft hyphen.}
 % \changes{v0.9e}{1995/08/31}{Swapped ordfeminine and ordmasculine.}
 %
@@ -2368,7 +2412,7 @@
 %
 % \changes{v0.91}{1997/08/19}{Exchanged codes for
 %          \cs{textendash} and \cs{textemdash}.}
-%                  
+%
 % \changes{v0.94}{1997/12/17}{Added cp1252 and merged latin1}
 % \changes{v0.94}{1997/12/17}{Changed \cs{ldots} to \cs{dots}, this
 %          should be undetectable since \cs{ldots} is not robust.}
@@ -2376,7 +2420,7 @@
 % \changes{v0.99a}{2001/07/10}{Added latin9 (from Karsten Tinnefeld)}
 % \changes{v0.99b}{2002/06/16}{Added code points 142,158 for cp1252 (pr/3441)}
 % \changes{v0.99b}{2002/07/08}{Added code 128 (texteuro) for cp1252 (pr/3423)}
-%                  
+%
 %    \begin{macrocode}
 %<*cp1252>
 \DeclareInputText{128}{\texteuro}
@@ -2538,7 +2582,7 @@
 %</cp1252|latin1|latin9>
 %    \end{macrocode}
 %
-%    
+%
 %\section{The ISO 8859-16 (Latin10) encoding}
 %
 % \changes{v1.0c}{2004/02/04}{Added ISO 8859-16 Latin10 (pr/3568)}
@@ -2558,7 +2602,7 @@
 %  more widely implemented encoding suitable for Romanian.
 %
 % Data for the \LaTeX{} support was mainly provided by  Ionel Ciob\^{i}c\u{a}
-% with additions and corrections taken from\\ 
+% with additions and corrections taken from\\
 % \texttt{http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-16.TXT}.
 %
 % \changes{v1.1b}{2006/03/03}{Corrections (pr/3849)}
@@ -2578,7 +2622,7 @@
                        \fontsize\ssf@size\z@
                        \math@fontsfalse\selectfont,}\hidewidth}\egroup}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \ProvideTextCommandDefault\textpm{\ensuremath\pm}
 %    \end{macrocode}
@@ -2696,7 +2740,7 @@
 %\section{The MS Windows encoding cp1250}
 %
 %    This is an MS Windows encoding for Central and Eastern Europe,
-%    known as Code Page 1250; it was provided by Marcin Woli\'nski 
+%    known as Code Page 1250; it was provided by Marcin Woli\'nski
 %    \texttt{wolinski@melkor.mimuw.edu.pl} and edited by Chris Rowley
 %    (see v0.94 below) to make it consistent with other files.
 %
@@ -2715,7 +2759,7 @@
 %\DeclareInputText{129}{} % n/u
 \DeclareInputText{130}{\quotesinglbase}
 %\DeclareInputText{131}{} % n/u
-\DeclareInputText{132}{\quotedblbase} 
+\DeclareInputText{132}{\quotedblbase}
 \DeclareInputText{133}{\dots}
 \DeclareInputText{134}{\dag}
 \DeclareInputText{135}{\ddag}
@@ -2776,7 +2820,7 @@
 \DeclareInputText{187}{\guillemotright}
 \DeclareInputText{188}{\v L}% L caron (L') ?
 \DeclareInputText{189}{\H{}}
-\DeclareInputText{190}{\v l}% l caron (l') ? 
+\DeclareInputText{190}{\v l}% l caron (l') ?
 \DeclareInputText{191}{\.z}
 %    \end{macrocode}
 %
@@ -2856,9 +2900,9 @@
 %
 %    This is an MS Windows encoding for Baltic languages,
 %    known as Code Page 1257; provided by Heiko Oberdiek
-%    using the mappings to Unicode in
-%    \texttt{http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1257.TXT}
-%    and
+%    using the mappings to Unicode in\\
+%    \texttt{http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1257.TXT}\\
+%    and\\
 %    \texttt{http://www.microsoft.com/globaldev/reference/sbcs/1257.mspx}.
 %
 % \changes{v1.1b}{2006/03/03}{Large number of corrections (pr/3849)}
@@ -2992,13 +3036,6 @@
 %</cp1257>
 %    \end{macrocode}
 %
-%
-% Finally, we reset the category code of the at sign at the end of all
-%    .def files.
-%    \begin{macrocode}
-%<-package>\makeatother
-%    \end{macrocode}
-%
 % \DeleteShortVerb{\|}
 % \Finale
 \endinput
diff --git a/Master/texmf-dist/source/latex/base/inputenc.ins b/Master/texmf-dist/source/latex/base/inputenc.ins
index c2f5f64e273..3877951cf29 100644
--- a/Master/texmf-dist/source/latex/base/inputenc.ins
+++ b/Master/texmf-dist/source/latex/base/inputenc.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
@@ -95,8 +95,8 @@ extension .ins) which are part of the distribution.
    \file{latin10.def}{
         \from{inputenc.dtx}{latin10}}
    }
- 
- 
+
+
 
  \generate{
    \file{cp850.def}{
@@ -114,7 +114,7 @@ extension .ins) which are part of the distribution.
    \file{decmulti.def}{
         \from{inputenc.dtx}{decmulti}}
    }
- 
+
  \generate{
    \file{ascii.def}{
         \from{inputenc.dtx}{ascii}}
diff --git a/Master/texmf-dist/source/latex/base/latex209.dtx b/Master/texmf-dist/source/latex/base/latex209.dtx
index be20b24b1a9..ed0ffaed591 100644
--- a/Master/texmf-dist/source/latex/base/latex209.dtx
+++ b/Master/texmf-dist/source/latex/base/latex209.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \title{Compatibility mode for \LaTeXe{} emulating \LaTeX~2.09}
@@ -276,8 +276,8 @@
 % \begin{macro}{\ensuremath}
 % \begin{macro}{\lrbox}
 % \begin{macro}{\newcommand}
-%    These \LaTeXe{} commands are switched off in compatibility mode.  
-%    This is done by saving the old definition, and redefining the 
+%    These \LaTeXe{} commands are switched off in compatibility mode.
+%    This is done by saving the old definition, and redefining the
 %    command to call |\@latex@e@error| before executing the old version.
 %    \begin{macrocode}
 \def\@tempa#1#2{%
@@ -304,7 +304,7 @@
 % \changes{v0.24}
 %         {1994/05/14}{Removed \cs{if@latex@e@errors} and \cs{@@@}.}
 % \changes{v0.24}{1994/05/14}{Changed the error help.}
-% \changes{v0.36}{1994/10/17}{Initialized \cs{@latex@e@error} to do 
+% \changes{v0.36}{1994/10/17}{Initialized \cs{@latex@e@error} to do
 %    nothing, and switched it on at the begin document.}
 %
 % \begin{macro}{\@latex@e@error}
@@ -335,14 +335,14 @@
 % \changes{v0.36}{1994/10/17}
 %         {Allow 2e commands to be redefined once with \cs{newcommand}.}
 % \changes{v0.40}{1995/03/21}{
-%         (DPC) Add \cs{r} to the list of 2e commands latex/1424} 
+%         (DPC) Add \cs{r} to the list of 2e commands latex/1424}
 %
 % \begin{macro}{\@ifdefinable}
 % \begin{macro}{\@old@ifdefinable}
 % \begin{macro}{\@@ifdefinable}
 % \begin{macro}{\@latex@e@commands}
-%    We trap the |\@notdefinable| error message to check to see if the 
-%    command is a \LaTeXe{} command, in which case we allow the 
+%    We trap the |\@notdefinable| error message to check to see if the
+%    command is a \LaTeXe{} command, in which case we allow the
 %    definition to happen.   We keep a list of commands which are
 %    allowed to be redefined this way in |\@latex@e@commands|, and
 %    remove an entry each time it is defined.
@@ -395,9 +395,9 @@
 %    document class hook.}
 % \changes{v0.24}{1994/05/14}{Switched the box commands back on, for use
 %    in packages.}
-% \changes{v0.36}{1994/10/17}{Changed the way the 2e command error is 
+% \changes{v0.36}{1994/10/17}{Changed the way the 2e command error is
 %    activated.}
-% \changes{v0.51}{1996/05/24}{(DPC) Reimplemented for /2153.} 
+% \changes{v0.51}{1996/05/24}{(DPC) Reimplemented for /2153.}
 %    This macro is called by each use of |\documentclass|.  We define
 %    it to define |\@normalsize| and |\normalsize| if necessary,
 %    to input each unused option as a package, and to switch off the new
@@ -457,7 +457,7 @@
 % \begin{macro}{\@missingfileerror}
 %    If a |.cls| file is missing, we look to see if there is
 %    a file of the same name with a |.sty| extension.
-% \changes{v0.06}{1993/12/18}{Corrected a typo 
+% \changes{v0.06}{1993/12/18}{Corrected a typo
 %  \cs{@saved@missingfileerror}
 %    should have been \cs{saved@missingfileerror}.}
 % \changes{v0.07}{1993/12/18}{Corrected a typo, I'd forgotten to pass
@@ -621,7 +621,7 @@
 % is always the first thing in the argument. This is needed
 % as in compatibility mode footnotes are processed in math mode,
 % but the standard classes call |\@textsuperscript| in the definition
-% of |\thanks|. 
+% of |\thanks|.
 %    \begin{macrocode}
 \def\@textsuperscript#1{$\m@th^{\@gobble#1}$}
 %    \end{macrocode}
@@ -646,7 +646,7 @@
 \def\thempfootnote{\@alph\c@mpfootnote}
 %    \end{macrocode}
 %  \end{macro}
-% 
+%
 %  \begin{macro}{\@fnsymbol}
 % \changes{v0.46}{1995/06/30}{macro added}
 % \LaTeX\ version uses |\ensuremath| which does not work in
@@ -657,7 +657,7 @@
     \or \ddagger\ddagger \else\@ctrerr\fi}
 %    \end{macrocode}
 %  \end{macro}
-% 
+%
 % \begin{macro}{\@inmathwarn}
 % \changes{v0.50}{1995/12/08}{Switched off \cs{@inmathwarn}}
 % \LaTeX\ (1995/12/01) checks for text commands being used in math
@@ -783,7 +783,7 @@
 \long\def\@imakepicbox(#1,#2)[#3]#4{%
   \vbox to#2\unitlength
    {\let\mb@b\vss \let\mb@l\hss\let\mb@r\hss
-    \let\mb@t\vss 
+    \let\mb@t\vss
     \@tfor\reserved@a :=#3\do{%
       \if s\reserved@a
         \let\mb@l\relax\let\mb@r\relax
@@ -818,7 +818,7 @@
 % Some old document might depend on that changed spacing so\ldots
 %    \begin{macrocode}
 \def\nofiles{%
-  \@fileswfalse 
+  \@fileswfalse
   \typeout{No auxiliary output files.^^J}%
   \long\def\protected@write##1##2##3{}%
   \let\makeindex\relax
@@ -1106,12 +1106,12 @@
 %    \begin{macrocode}
 %<*openbib>
 \iffalse
- 
+
 The openbib option is now part of LaTeX thus this package is no
 longer necessary.  It is only retained for upward compatibility.
 See the 2nd edition of the LaTeX book, or the file usrguide.tex
 which comes with the LaTeX distribution, for more details.
- 
+
 \fi
 %</openbib>
 %    \end{macrocode}
@@ -1120,7 +1120,7 @@ which comes with the LaTeX distribution, for more details.
 %    \begin{macrocode}
 %<*bezier>
 \iffalse
- 
+
 The \bezier command is now part of LaTeX thus this package is no
 longer necessary.  It is only retained for upward compatibility.
 Also, please note that LaTeX now offers an extended bezier command
@@ -1128,7 +1128,7 @@ which automatically calculates the number of points needed for the
 plot.  See the 2nd edition of the LaTeX book, or the file
 usrguide.tex which comes with the LaTeX distribution, for more
 details.
- 
+
 \fi
 %</bezier>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/latex209.ins b/Master/texmf-dist/source/latex/base/latex209.ins
index b67e15de784..a48dd6257a6 100644
--- a/Master/texmf-dist/source/latex/base/latex209.ins
+++ b/Master/texmf-dist/source/latex/base/latex209.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
@@ -80,7 +80,7 @@ extension .ins) which are part of the distribution.
         \file{latex209.def}{
              \from{latex209.dtx}{head}
              \from{oldlfont.dtx}{latex209}
-             \from{latex209.dtx}{tail}} 
+             \from{latex209.dtx}{tail}}
         \file{article.sty}{
              \from{latex209.dtx}{article}}
         \file{book.sty}{
diff --git a/Master/texmf-dist/source/latex/base/latexbug.el b/Master/texmf-dist/source/latex/base/latexbug.el
index 492f0d18f67..b35cb987712 100644
--- a/Master/texmf-dist/source/latex/base/latexbug.el
+++ b/Master/texmf-dist/source/latex/base/latexbug.el
@@ -1,6 +1,6 @@
 ;;; latexbug.el
 ;;;
-;;; Version 0: `test of concept' 
+;;; Version 0: `test of concept'
 ;;;            Don't look to closely at my lisp coding style...
 ;;;
 ;;;            David Carlisle
@@ -20,7 +20,7 @@
 ;;; To use this code, place the file in a directory searched by lisp
 ;;; Add
 ;;;
-;;; (autoload 'report-latex-bug "latexbug" 
+;;; (autoload 'report-latex-bug "latexbug"
 ;;;               "LaTeX bug report generator" t)
 ;;;
 ;;; to your .emacs file (without the ;;;).
@@ -51,7 +51,7 @@
 ;;; (setq ltxbug-mail-headers "...") ; additional mail headers.
 ;;;        For example (setq ltxbug-mail-headers "FCC: ~/Mail/sent")
 ;;;        To log outgoing mail in a `sent' file.
-;;; 
+;;;
 ;;; (setq ltxbug-latex-command "...") ; latex command
 ;;;        Set this if LaTeX is not called latex, eg it may be latex2e.
 ;;;
@@ -87,7 +87,7 @@ This is in addition to `To' and `Subject'.")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defvar ltxbug-categories 
+(defvar ltxbug-categories
 '(("latex") ("tools") ("graphics")
        ("mfnfss") ("psnfss")  ("amslatex") ("babel") ("expl3") ("cyrillic"))
 "Valid GNATS categories")
@@ -105,19 +105,19 @@ This is in addition to `To' and `Subject'.")
 ;; and a smaller help window below.
   (delete-other-windows)
 ;;  (setq ltxbug-msg (switch-to-buffer "*latex-bugs*")); not emacs18
-  (switch-to-buffer 
+  (switch-to-buffer
        (setq ltxbug-msg (get-buffer-create "*latex-bugs*")))
   (erase-buffer)
-  (setq default-directory 
+  (setq default-directory
        (or ltxbug-directory current-default-directory))
   (setq major-mode 'ltxbug)
   (setq mode-name "LaTeX Bug Report")
-  (use-local-map ltxbug-map)      
+  (use-local-map ltxbug-map)
   (message "Running latex on latexbug.tex ....")
-  (split-window-vertically 
+  (split-window-vertically
 ;; -13 ;; old emacs's can't do this
    (- (window-height) 13))
-  (switch-to-buffer-other-window 
+  (switch-to-buffer-other-window
     (setq ltxbug-help (get-buffer-create "latexbugs help")))
 ;;
 ;; Initially fill the message buffer with the output from running
@@ -132,7 +132,7 @@ This is in addition to `To' and `Subject'.")
    (shell-command (concat
                ltxbug-latex-command
        " \\\\nonstopmode\\\\makeatletter\
-       \\\\def\\\\batch\\{\\}\\\\@@input latexbug ") t)   
+       \\\\def\\\\batch\\{\\}\\\\@@input latexbug ") t)
   (switch-to-buffer-other-window ltxbug-msg)
   (goto-char (point-min))
 ;;
@@ -161,7 +161,7 @@ This is in addition to `To' and `Subject'.")
 ;; Put the synopsis template into the Subject field.
 ;; Add the delimiter used by the mail-send function.
   (goto-char (point-min))
-  (let ((temp 
+  (let ((temp
     (concat "To: "
       (buffer-substring (match-beginning 1) (match-end 1)) "
 Subject: < SYNOPSIS >
@@ -198,7 +198,7 @@ corresponding to directories in the standard LaTeX distribution:
   cyrillic: Packages for using Cyrillic fonts (cyrillic).
 ")
   (let* ((completion-ignore-case t)
-        (cat (completing-read "Which Category ? " 
+        (cat (completing-read "Which Category ? "
            ltxbug-categories  nil t )))
     (set-buffer "*latex-bugs*")
     (ltxbug-replace "< CATEGORY >" (if (equal cat "") "latex" cat)))
@@ -218,7 +218,7 @@ corresponding to directories in the standard LaTeX distribution:
   (set-buffer ltxbug-msg)
   (let ((syn (read-from-minibuffer "Synopsis ? " )))
     (while (or (equal syn "") (> (length syn) 50))
-      (setq syn 
+      (setq syn
         (read-from-minibuffer "Synopsis (0 < length < 50) ? " syn)))
     (set-buffer "*latex-bugs*")
     (ltxbug-replace "< SYNOPSIS >" syn))
@@ -301,7 +301,7 @@ Possible classes of messages are:
           (progn
             (set-buffer ltxbug-help)
             (erase-buffer)
-            (insert 
+            (insert
 (format "%s%d%s" "
 !!!!
 Your test file is " lines " lines long!!!
@@ -310,8 +310,8 @@ Test files should be as short as possible, while still showing
 the behaviour. Please try to keep the file below 60 lines.
 "))
            (set-buffer ltxbug-msg))))
-      (let* ((log1 
-              (concat 
+      (let* ((log1
+              (concat
                 (substring temp 0 (string-match "\\.[^\\.]*$" temp))
                 ".log"))
             (log (read-file-name "Log file ? " "" log1 t  log1)))
@@ -377,7 +377,7 @@ LaTeX did not succesfully produce a bug report template."))
   (set-buffer ltxbug-msg)
   (goto-char (point-min))
   (let ((temp ""))
-    (if (re-search-forward 
+    (if (re-search-forward
           (concat"\n>" field ":\\( *\\)\\(.*\\)$") (point-max) t)
 ;; if field already there
       (progn
@@ -387,7 +387,7 @@ LaTeX did not succesfully produce a bug report template."))
     (re-search-forward ">Category:.*$")
     (insert (concat "\n>" field ":")))
  (insert " ")
- (let ((temp2 
+ (let ((temp2
     (completing-read (concat field " ? ") values nil t temp)))
  (insert (if (equal temp2 "")
             (car(car values)) temp2)))))
@@ -417,7 +417,7 @@ LaTeX did not succesfully produce a bug report template."))
 (defun ltxbug-confidential ()
   (interactive)
   (ltxbug-update-field
-    "Confidential" 
+    "Confidential"
     '(("no")("yes"))
 "
  You may set the >Confidential field to yes.
@@ -490,7 +490,7 @@ LaTeX did not succesfully produce a bug report template."))
 ")
  (set-buffer ltxbug-msg)
   (let* ((completion-ignore-case t)
-        (field (completing-read "Which field ? " 
+        (field (completing-read "Which field ? "
          '(("Class")("Confidential")("Priority")("Severity")
             ("Responsible"))
          nil t)))
diff --git a/Master/texmf-dist/source/latex/base/latexsym.dtx b/Master/texmf-dist/source/latex/base/latexsym.dtx
index 32a8cb44d4c..1fa41604923 100644
--- a/Master/texmf-dist/source/latex/base/latexsym.dtx
+++ b/Master/texmf-dist/source/latex/base/latexsym.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \CheckSum{82}
@@ -81,7 +81,7 @@
 %    |\lhd|~$\lhd$ \quad
 %    |\unlhd|~$\unlhd$ \quad
 %    |\rhd|~$\rhd$ \quad
-%    |\unrhd|~$\unrhd$ 
+%    |\unrhd|~$\unrhd$
 %    \end{quote}
 %
 % \StopEventually{}
@@ -138,11 +138,11 @@
 %    to undefine them before we can set them anew with
 %    |\DeclareMathSymbol|.
 %    \begin{macrocode}
-  \let\mho\undefined            \let\sqsupset\undefined 
-  \let\Join\undefined           \let\lhd\undefined      
-  \let\Box\undefined            \let\unlhd\undefined    
-  \let\Diamond\undefined        \let\rhd\undefined      
-  \let\leadsto\undefined        \let\unrhd\undefined    
+  \let\mho\undefined            \let\sqsupset\undefined
+  \let\Join\undefined           \let\lhd\undefined
+  \let\Box\undefined            \let\unlhd\undefined
+  \let\Diamond\undefined        \let\rhd\undefined
+  \let\leadsto\undefined        \let\unrhd\undefined
   \let\sqsubset\undefined
 %    \end{macrocode}
 % \changes{v2.2a}{1995/03/18}{\cs{lhd} and friends should be bin ops.}
@@ -160,7 +160,7 @@
   \DeclareMathSymbol\unrhd   {\mathbin}{lasy}{"04}
 %    \end{macrocode}
 %    To save some space we can remove the definition of |\not@base|
-%    since it isn't any longer needed. (We use |\@undefined| so that 
+%    since it isn't any longer needed. (We use |\@undefined| so that
 %    gives an error and not a recursive definition
 %    if it is still used somewhere.)
 % \changes{v2.2b}{1995/07/03}{Free space for \cs{not@base}}
diff --git a/Master/texmf-dist/source/latex/base/latexsym.ins b/Master/texmf-dist/source/latex/base/latexsym.ins
index bf1e828dc66..8555ca294dd 100644
--- a/Master/texmf-dist/source/latex/base/latexsym.ins
+++ b/Master/texmf-dist/source/latex/base/latexsym.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
@@ -74,9 +74,9 @@ extension .ins) which are part of the distribution.
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -86,7 +86,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex/base/lb2.err b/Master/texmf-dist/source/latex/base/lb2.err
index 05d4585a3bf..68aba155ed3 100644
--- a/Master/texmf-dist/source/latex/base/lb2.err
+++ b/Master/texmf-dist/source/latex/base/lb2.err
@@ -1,6 +1,6 @@
 \def\readRCS$#1 #2 #3 #4 #5${\def\erratafiledate{#4}}
 \readRCS
-$Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
+$Id: lb2.err 210 2014-02-22 14:54:09Z mittelba $
 
 \def\comando#1{\texttt{\string#1}}
 
@@ -22,7 +22,7 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
 \begin{filecontents}{ttcterrata.cls}
 %%
 %% Copyright (C) 1997,2004,2005,2007 Frank Mittelbach
-%% This class file is licenced under LPPL latest version; 
+%% This class file is licenced under LPPL latest version;
 %% see http://www.latex-project.org/lppl
 %
 %
@@ -32,7 +32,7 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
 %    Tools and Techniques for Computer Typesetting
 %
 % hence the name. However, anybody who likes to use it is free to apply it for
-% errata files of other books. 
+% errata files of other books.
 %
 % Changes:
 %
@@ -191,7 +191,7 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
 
 % some special shortcuts overwriting existing commands:
 
-\let\u\underline 
+\let\u\underline
 \renewcommand\>{$\to$}
 
 %%% some code suggested by Thorsten Hansen to count the number of
@@ -201,7 +201,7 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
 \def\count@contributors#1/#2/#3\@nil{
    \@ifundefined{c@#1}{\newcounter{#1}}{}\stepcounter{#1}%
 %%%   also count secondary:
-%%%   \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}% 
+%%%   \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}%
 }
 
 \renewcommand\erroronpage[5]{%
@@ -218,7 +218,7 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
    \displayrevisionfix{#1}{#5}
    \hideamp #2 \hideamp (\textsf{#3}) \hideamp
 }
- 
+
 \renewcommand\seriouserroronpage[5]{%
    \count@contributors#3/secondary/\@nil
    \endgobble
@@ -236,7 +236,7 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
 }
 
 \renewcommand\contributor[2]{\makebox[1cm][l]{%
-  \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par} 
+  \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par}
 
 \end{filecontents}
 
@@ -244,12 +244,12 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
 \begin{filecontents}{\jobname.cfg}
 %
 %
-% Configuration file for the errata listing of 
+% Configuration file for the errata listing of
 %
 %  Der LaTeX-Begleiter 2 Auflage
 %
 %
-% \erratastartdate 
+% \erratastartdate
 %
 % Specifies the date from which on errata entries should be listed.
 %
@@ -271,8 +271,8 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
 %    listing.
 %
 % The default below ensures that all entries relevant to the second
-%    printing are typeset. 
-%    
+%    printing are typeset.
+%
 %
 
 \renewcommand\myprinting{2}
@@ -300,6 +300,21 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
 
 \documentclass{ttcterrata}[2005/11/10]  % we want new class
 
+\usepackage[T1]{fontenc}
+\let\u\underline          % shortcut for this file
+
+\newcommand\meta[1]{$\langle$\textit{#1\/}$\rangle$}
+\newcommand\BibTeX{\textsc{Bib}\TeX}
+
+
+\usepackage{textcomp}
+
+\usepackage{url}
+
+\usepackage[ngerman]{babel}
+\usepackage[utf8]{inputenc}
+
+
 \renewcommand\erratatitle[2]
   {\begin{center}\LARGE\bfseries
       Errataliste f\"ur #1\\[5pt](\myprinting.\ Druck)\\[10pt]
@@ -315,19 +330,6 @@ $Id: lb2.err 207 2013-07-12 11:04:05Z mittelba $
 \renewcommand\printedentries{zwischen \erratastartdate\space und}
 
 
-\usepackage[T1]{fontenc}
-\let\u\underline          % shortcut for this file
-
-\newcommand\meta[1]{$\langle$\textit{#1\/}$\rangle$}
-\newcommand\BibTeX{\textsc{Bib}\TeX}
-
-
-\usepackage{textcomp}
-
-\usepackage{url}
-
-\usepackage[ngerman]{babel}
-\usepackage[utf8]{inputenc}
 
 \begin{document}
 
@@ -385,10 +387,10 @@ speziellen Nachdruck oder ab einem gewünschten Datum angezeigt werden.
 
 
 \begin{center}
-  \Large \bfseries  Irren ist menschlich -- Fehlerwettbewerb 
+  \Large \bfseries  Irren ist menschlich -- Fehlerwettbewerb
 \end{center}
 
- 
+
 Jeder gefundene und mitgeteilte Fehler ist ein Gewinn für alle Leser
 und Käufer unseres Buches. Aus diesem Grund schreiben wir, Pearson
 Studium und die Autoren, einen Preis aus -- halbjährlich, später (mehr)jährlich -- den
@@ -396,18 +398,18 @@ die Person erhält, die die meisten Fehler innerhalb dieser Zeit findet
 (im Falle einer Überschneidung wird das Los zwischen den "`besten"'
 Fehlersuchern entscheiden).  Eine Person kann nur einmal einen Preis
 bekommen; Fehler die durch die Autoren gefunden werden, zählen nicht.
-\begin{center} 
-Ihr Preis: Ein Lehrbuch Ihrer Wahl!  
+\begin{center}
+Ihr Preis: Ein Lehrbuch Ihrer Wahl!
 \end{center}
 Auswählen können Sie dieses unter \url{http://www.pearson-studium.de}.
 (Bundles und mehrbändige Bücher sind davon ausgenommen).
- 
+
 Wie üblich behalten sich die Autoren und der Verlag das Recht vor,
 selbst zu entscheiden ob ein Fehler tatsächlich als Fehler anzusehen
 ist oder ob ein wiederholt vorkommender Fehler als ein oder mehrere Fehler
 gezählt wird.
- 
-- Viel Erfolg -  
+
+- Viel Erfolg -
 
 \begin{center}
 \begin{tabular}{clr@{ Eingaben}}
@@ -439,9 +441,9 @@ Ende der Wettbewerbsperiode & Gewinner \\[4pt]
  \fi
 
 \erroronpage{}{}{RHe}{2006/06/10}{}
-  Einzelne Teile mehrgliedriger Abkürzungen werden im deutschsprachigen 
-  Satz normalerweise durch einen kleinen Zwischenraum (Spatium) getrennt; nur in 
-  englischsprachigen Texten wird zwischen den Abkürzungsteilen kein 
+  Einzelne Teile mehrgliedriger Abkürzungen werden im deutschsprachigen
+  Satz normalerweise durch einen kleinen Zwischenraum (Spatium) getrennt; nur in
+  englischsprachigen Texten wird zwischen den Abkürzungsteilen kein
   Zwischenraum gesetzt.
   Beispiele: z.\,B., u.\,a.\ anstatt z.B., u.a.
 
@@ -467,13 +469,13 @@ should be ``Francis\u{c}o''.
 
 \CHAPTER{Kapitel 2}
 
+\erroronpage{24}{Abs.1, Z.1}{MLi}{2013/07/12}{}
+  Das Kommando lautet \verb=\AskOption= (ohne ``s'')
+
 \erroronpage{26}{Abs.-3, Z.4}{JMa}{2006/01/03}{2}
- Zur schließenden Klammer in Zeile 5 gibt es keine öffnende; es sollte wohl 
+ Zur schließenden Klammer in Zeile 5 gibt es keine öffnende; es sollte wohl
 heißen: (zum Beispiel \ldots{}
 
-\erroronpage{29}{Abs.1, Z.1}{MLi}{2013/07/12}{}
-  Das Kommando lautet \verb=\AskOption= (ohne ``s'')
-
 \erroronpage{29}{Abs. nach 2-2-3, Z.7}{JMa}{2006/01/03}{2}
  Es muss ``mit unterschiedliche\u{n} Definitionen'' heißen.
 
@@ -493,11 +495,11 @@ Im Deutschen steht bei einer Aufzählung kein Komma vor ``oder''.
 Im Deutschen steht bei einer Aufzählung kein Komma vor ``oder''.
 
 \erroronpage{56}{Abs.3, Z.3}{JMa}{2006/01/03}{2}
-Hier fehlt ein Buchstabe: ``Das Beispiel zeigt, das\u{s} es 
+Hier fehlt ein Buchstabe: ``Das Beispiel zeigt, das\u{s} es
 wahrscheinlich''.
 
 \erroronpage{59}{2.3.6 Abs.\ 4, Z.\ 1}{RHe}{2006/06/10}{2}
-   Füge Komma ein: "`Um das \textsf{minitoc}-System zu initialisieren, 
+   Füge Komma ein: "`Um das \textsf{minitoc}-System zu initialisieren,
 muss ein \dots{}"'
 
 \erroronpage{60}{Tab.2.3, rechte Spalte, Z.1}{JMa}{2006/01/03}{2}
@@ -516,7 +518,7 @@ Es muss ``Ein solcher Wechsel'' statt ``Eine solcher Wechsel'' heißen.
 \LaTeX-Trennfehler: Verzeichnis-eintr"age statt Verzeichni-seintr"age.
 
 \erroronpage{70}{Abs.-1, Z.1-2}{JMa}{2006/01/03}{2}
-Hier fehlt ein Komma am Ende der ersten Zeile und ein Punkt am Ende des 
+Hier fehlt ein Komma am Ende der ersten Zeile und ein Punkt am Ende des
 ersten Satzes.
 
 \erroronpage{73}{Abs.2, Z.4}{JMa}{2006/01/03}{2}
@@ -526,7 +528,7 @@ Im Deutschen steht bei einer Aufzählung kein Komma vor ``oder''.
 Hier fehlt ein Komma vor ``wenn sie durch''.
 
 \erroronpage{75}{Abs.3, Z.1}{JMa}{2006/01/03}{2}
-Es fehlen zwei Buchstaben: ``ohne daf"ur einen eigen\u{en} Abstand 
+Es fehlen zwei Buchstaben: ``ohne daf"ur einen eigen\u{en} Abstand
 einzuf"ugen''.
 
 
@@ -540,12 +542,12 @@ Lösche s aus Grau\u{s}wertproblem
 Kein Komma vor und bei einer Aufzählung.
 
 \erroronpage{109}{Abs.\ 2, Z.\ 5}{RHe}{2006/06/10}{2}
-   Streiche Kommata: "`Möglich\_ und absolut nicht unwahrscheinlich\_ ist 
+   Streiche Kommata: "`Möglich\_ und absolut nicht unwahrscheinlich\_ ist
 beispielsweise, \dots{}"'
 
 \erroronpage{114}{para 3}{FMi/CBe}{2005/09/02}{2}
 Ersetze Absatz durch: "`Da es nicht empfehlenswert ist, die Einstellung von
-|\baselineskip| 
+|\baselineskip|
 direkt zu ändern, verfügt \LaTeX{} über den Befehl |\lineskip|\,, mit
 dem sich |\baselineskip| global für alle Größen ändern lässt.  Nach
 einer Anweisung wie etwa \verb!\linespread{1.5}\selectfont!  tritt der neue
@@ -558,22 +560,22 @@ Wert sofort in Kraft. [Fußnote: Die veraltete \LaTeX~2.09 Lösung
 
 
 \erroronpage{117}{3.2.1 Abs.\ 2, Z.\ 7}{RHe}{2006/06/10}{2}
-   Trennung der Hauptsätze: "`\dots{} der Zähler \texttt{footnote} wird 
+   Trennung der Hauptsätze: "`\dots{} der Zähler \texttt{footnote} wird
 weiter hochgesetzt, und die Darstellung erfolgt \dots{}"'
 
 \erroronpage{119}{Abs.\ 2, Z.\ 3}{RHe}{2006/06/10}{2}
-   Da die Beispiele unmittelbar folgen: "`\dots{} schematisch 
+   Da die Beispiele unmittelbar folgen: "`\dots{} schematisch
 dargestellt \u{und bedeuten}:"'
 
-%%Ebenfalls als Vorschlag zur Neuformulierung -- weil es um zwei 
-%%unterschiedliche Aspekte geht, sollte durch Punkt oder Semikolon 
+%%Ebenfalls als Vorschlag zur Neuformulierung -- weil es um zwei
+%%unterschiedliche Aspekte geht, sollte durch Punkt oder Semikolon
 %%getrennt werden:
 %
 % -maybe differently
 \erroronpage{121}{3.2.3 Abs.\ 2, Z.\ 3}{RHe}{2006/06/10}{2}
-   "`\u{Es wird ausreichend} Abstand zwischen 
-Fußnoten und Text gelassen 
-und die Fußnoten werden in einem kleineren Schriftgrad 
+   "`\u{Es wird ausreichend} Abstand zwischen
+Fußnoten und Text gelassen
+und die Fußnoten werden in einem kleineren Schriftgrad
 gesetzt."'
 
 
@@ -594,8 +596,8 @@ Der \LaTeX{}-Begleiter sollte stets mit Bindestrich geschrieben werden.
 
 
 \erroronpage{149}{Abs.\ 1, Z.\ 3}{RHe/FMi}{2006/06/10}{2}
-Ersetze: "`Bei vielen dieser Argumente wird der unten aufgeführte, voreingestellte 
-Wert verwendet, wenn ein leeres Argument angegeben wird. 
+Ersetze: "`Bei vielen dieser Argumente wird der unten aufgeführte, voreingestellte
+Wert verwendet, wenn ein leeres Argument angegeben wird.
 \>
 "`Bei vielen dieser Argumente erhält man den unten aufgeführten voreingestellten
 Wert, wenn ein leeres Argument angegeben wird."'
@@ -603,7 +605,7 @@ Wert, wenn ein leeres Argument angegeben wird."'
 
 
 
-\erroronpage{149}{Argument \textit{kopf-nach-abstand}, Z.\ 
+\erroronpage{149}{Argument \textit{kopf-nach-abstand}, Z.\
 2}{RHe}{2006/06/10}{2}
    Streiche Anführungszeichen bei "`Interpunktion"'.
 
@@ -613,15 +615,15 @@ Wert, wenn ein leeres Argument angegeben wird."'
 \erroronpage{158}{Bsp.3-3-28}{FMi/JBez}{2005/09/02}{}
   The vertical space above ``Return values'' is too small.
 
-  Das ist ein ziemlich versteckter \LaTeX-Fehler, mit dem man momentan noch
+  Das ist ein ziemlich versteckter \LaTeX-Fehler, mit dem man wohl
   leben muss.
 
 \erroronpage{159}{Abs.\ -1, Z.\ 1}{RHe}{2006/06/10}{2}
-   "`\dots{} unverändert, also "`wie über die Tastatur eingegeben"'\u{,} 
+   "`\dots{} unverändert, also "`wie über die Tastatur eingegeben"'\u{,}
 darstellen."'
 
 \erroronpage{160}{Abs.\ 2, Z.\ 2}{RHe}{2006/06/10}{2}
-   Anstelle "`extensiv"': "`\dots{} in der Vergangenheit \emph{intensiv} 
+   Anstelle "`extensiv"': "`\dots{} in der Vergangenheit \emph{intensiv}
 genutzt wurden, \dots{}"'
 
 \erroronpage{163}{Z.-3}{JMa}{2006/01/14}{2}
@@ -656,7 +658,7 @@ Streiche das zweite t aus setz\u{t}en.
 % - but also a national one, so could stay
 %
 % \erroronpage{204}{Abs.\ 2, Z.\ -2}{RHe}{2006/06/15}{}
-%    Streiche "`DIN"' in "`DIN A4"', da A4 nationaler (DIN 476), 
+%    Streiche "`DIN"' in "`DIN A4"', da A4 nationaler (DIN 476),
 % europ\"{a}ischer (EN 20 216) und internationaler (ISO 216) Standard ist.
 
 \erroronpage{205}{Tab.\ 4.2}{YiL}{2012/05/07}{}
@@ -667,21 +669,21 @@ Streiche das zweite t aus setz\u{t}en.
 
 
 \erroronpage{205}{4.2, Abs.\ 1, Z.\ 5}{RHe}{2006/06/15}{2}
-   F\"{u}ge Komma ein: "`\dots{} nicht v\"{o}llig unm\"{o}glich ist\u, sie 
+   F\"{u}ge Komma ein: "`\dots{} nicht v\"{o}llig unm\"{o}glich ist\u, sie
 \dots{} zu \"{a}ndern, \dots{}"'.
 
 \erroronpage{208}{Z. 1}{JMa}{2006/01/27}{2}
 Fehlendes Komma: "`zwei Pakete\u, mit deren"'
 
 \erroronpage{210}{Abs.\ 5, Z.\ 5}{RHe}{2006/06/15}{2}
-   Streiche Komma vor der Klammer: "`\dots{} von Listen Verwendung 
+   Streiche Komma vor der Klammer: "`\dots{} von Listen Verwendung
 finden\_ (\dots{})."'
 
 \erroronpage{210}{Abs.6, Z.-1}{JMa}{2006/01/27}{2}
 Fehlendes Komma: "`abliest), kann man"'
 
 \erroronpage{213}{Abs.\ 3, Z.\ -1}{RHe}{2006/06/15}{2}
-   F\"{u}ge Komma ein: "`\dots{} kann es angebracht sein, ihn 
+   F\"{u}ge Komma ein: "`\dots{} kann es angebracht sein, ihn
 einzubeziehen."'
 
 \erroronpage{213}{Abs.\ 2, Z.\-1}{FMi}{2006/09/25}{2}
@@ -692,30 +694,30 @@ einzubeziehen."'
      Es sollte wohl "`die ein\u{e} oder andere Einstellung"' hei"sen.
 
 \erroronpage{218}{Abs.\ 1, Z.\ 6}{RHe}{2006/06/15}{2}
-   F\"{u}ge Komma ein: "`\dots{} ist es jedoch besser, 
+   F\"{u}ge Komma ein: "`\dots{} ist es jedoch besser,
 \texttt{ignorehead} \dots{} zu verwenden."'
 
 % Über das nächste Infinitivproblem kann man sich durchaus streiten:
 \erroronpage{218}{Abs.\ 2, Z.\ -2}{RHe}{2006/06/15}{2}
-   F\"{u}ge Komma ein: "`\dots{} liegt es beim Anwender, 
+   F\"{u}ge Komma ein: "`\dots{} liegt es beim Anwender,
 sicherzustellen, dass \dots{}"'
 
 \erroronpage{218}{Abs.\ -1, Z.\ -3}{RHe}{2006/06/15}{2}
-   F\"{u}ge Komma ein: "`Da diese Option Fonts skaliert, anstatt 
+   F\"{u}ge Komma ein: "`Da diese Option Fonts skaliert, anstatt
 Originalfonts \dots{} einzusetzen, \dots{}"'
 
 \erroronpage{219}{Abs.\ -1, Z.\ -4ff}{RHe}{2006/06/15}{2}
-   F\"{u}ge "`werden"' ein und streiche Komma vor dem letzten Abschnitt 
-der Aufz\"{a}hlung: "`Zun\"{a}chst wird das Paket geladen, alle 
-R\"{a}nder \u{werden} auf einen Zoll gesetzt\_ und die Kolumnentitel \dots{} 
+   F\"{u}ge "`werden"' ein und streiche Komma vor dem letzten Abschnitt
+der Aufz\"{a}hlung: "`Zun\"{a}chst wird das Paket geladen, alle
+R\"{a}nder \u{werden} auf einen Zoll gesetzt\_ und die Kolumnentitel \dots{}
 festgelegt; \dots{}"'
 
 \erroronpage{220}{Abs.\ 1, Z.\ 3}{RHe}{2006/06/15}{2}
-   F\"{u}ge Komma zwischen den Haupts\"{a}tzen ein: "`\dots{} des 
+   F\"{u}ge Komma zwischen den Haupts\"{a}tzen ein: "`\dots{} des
 Paketes wieder her, und bei \verb"pass" wird das Paket deaktiviert."'
 
 \erroronpage{221}{Aufz. cam, Z.\ 1}{RHe}{2006/06/15}{2}
-   F\"{u}ge Komma ein: "`\dots{} welche die Ma{\ss}e der Nettoseite 
+   F\"{u}ge Komma ein: "`\dots{} welche die Ma{\ss}e der Nettoseite
 anzeigen, ohne sie zu ber\"{u}hren (\dots{})."'
 
 \erroronpage{221}{para 4, l.4}{FMi}{2006/09/09}{2}
@@ -727,23 +729,23 @@ anzeigen, ohne sie zu ber\"{u}hren (\dots{})."'
 \textsf{crop} erst \dots{} geladen werden sollte."'
 
 \erroronpage{221}{Abs.\ -1, Z.\ 3}{RHe}{2006/06/15}{2}
-   F\"{u}ge Komma ein: "`\dots{} normalerweise ist es n\"{u}tzlich, ihn 
+   F\"{u}ge Komma ein: "`\dots{} normalerweise ist es n\"{u}tzlich, ihn
 beizubehalten."'
 
 \erroronpage{222}{Abs.\ 1, Z.\ 3}{RHe}{2006/06/15}{2}
-   F\"{u}ge Komma ein: "`\dots{} versucht das Paket, den Druckertreiber 
+   F\"{u}ge Komma ein: "`\dots{} versucht das Paket, den Druckertreiber
 \dots{} zu bestimmen."'
 
 \erroronpage{223}{4.3, Abs.\ 1, Z.\ 2}{RHe}{2006/06/17}{2}
-   Füge Komma ein: "`\dots{} sammelt genug Material, um gut eine Seite 
+   Füge Komma ein: "`\dots{} sammelt genug Material, um gut eine Seite
 \dots{}"'
 
 \erroronpage{224}{Abs.\ -1, Z.\ 2}{RHe}{2006/06/17}{2}
-   Füge Komma ein: "`\dots{} entspricht dem Inhalt von \verb"\thepage", 
+   Füge Komma ein: "`\dots{} entspricht dem Inhalt von \verb"\thepage",
 wie er auf der \dots{}"'
 
 \erroronpage{225}{Abs.\ 1, Z.\ 1}{RHe}{2006/06/17}{2}
-   Füge Komma ein: "`\dots{} mithilfe von \verb"\AtEndDocument", um 
+   Füge Komma ein: "`\dots{} mithilfe von \verb"\AtEndDocument", um
 sicherzugehen, dass \dots{}"'
 
 \erroronpage{229}{Abs.\ 2, Z.\ 8,10,-1}{RHe}{2006/06/17}{2}
@@ -755,11 +757,11 @@ sicherzugehen, dass \dots{}"'
 
 
 \erroronpage{233}{Abs.\ 2, Z.\ 5}{RHe}{2006/06/17}{2}
-   Füge Komma ein: "`\dots{} um Längenparameter, sondern um Befehle 
+   Füge Komma ein: "`\dots{} um Längenparameter, sondern um Befehle
 \dots{}"'
 
 \erroronpage{234}{Abs.\ 1, Z.\ 7}{RHe}{2006/06/17}{2}
-   Ersetze Semikolon durch Komma und füge Wort ein: "Der Seitentyp wird mit `\dots{} 
+   Ersetze Semikolon durch Komma und füge Wort ein: "Der Seitentyp wird mit `\dots{}
 ausgewählt\u, der Bereich \u{dagegen} mit \dots{}"'
 
 
@@ -768,11 +770,11 @@ ausgewählt\u, der Bereich \u{dagegen} mit \dots{}"'
 
 
 \erroronpage{247}{Abs.\ 3, Z.\ 2}{RHe}{2006/06/17}{2}
-   Füge Komma ein: "`\dots{} dass sie fähig sein müssen, innerhalb des 
+   Füge Komma ein: "`\dots{} dass sie fähig sein müssen, innerhalb des
 Textes \dots{}"'
 
 \erroronpage{249}{Abs.3 in 5.1.1}{JMa}{2006/01/27}{2}
-Dieser Satz steht schon am Ende des ersten Absatzes dieses 
+Dieser Satz steht schon am Ende des ersten Absatzes dieses
 Abschnitts.
 
 \erroronpage{251}{Abs.\ -1}{FMi/CBe}{2005/09/02}{2}
@@ -783,7 +785,7 @@ Abschnitts.
 
 % -check
 \erroronpage{252}{Tabelle 5.2}{RHe}{2006/06/17}{2}
-   Ersetze alle amerikanischen Auslassungszeichen \{..\} durch deutsche 
+   Ersetze alle amerikanischen Auslassungszeichen \{..\} durch deutsche
 \{\dots{}\}.
 
 \erroronpage{253}{Z. -2}{JMa}{2006/01/27}{2}
@@ -796,7 +798,7 @@ Kein Komma vor "`erzeugt wurden"'
    Füge Komma ein: "`\dots{} üblicher, Farben \dots{} einzusetzen"'
 
 \erroronpage{269}{Abs.5, Z.1}{JMa}{2006/01/27}{2}
-\LaTeX-Trennfehler: Standar-dumgebung. \> Standard-umgebung 
+\LaTeX-Trennfehler: Standar-dumgebung. \> Standard-umgebung
 
 \erroronpage{277}{Abs.\ 1, Z.\ 1}{RHe}{2006/06/20}{2}
  Ersetze Anfang durch: "`Eine der Schwierigkeiten, \LaTeX{}-Tabellen mit außergewöhnlich
@@ -804,7 +806,7 @@ großen Einträgen zu setzen, ist eine gute Raumverteilung um diese Einträge he
  \dots"'
 
 \erroronpage{277}{Abs.\ -2, Z.\ 2}{RHe}{2006/06/20}{2}
-   Füge Komma ein: "`\dots{} optionales Argument, ähnlich dem von 
+   Füge Komma ein: "`\dots{} optionales Argument, ähnlich dem von
 \verb"\\"\u, erweitert."'
 
 \erroronpage{277}{Abs.\ -1, Z.\ 1}{RHe}{2006/06/20}{2}
@@ -841,7 +843,7 @@ to the ISO rules; $e$ is the charge of the electron.
 Es muss "`in den Abschnitte\u{n} 6.2.1 bzw. 6.2.2"' hei\ss{}en.
 
 \erroronpage{304}{Z.-5}{JMa}{2006/02/04}{2}
-Es muss "`{}"uber ein zus"atzliche\u{s} obligatorisches Argument"' 
+Es muss "`{}"uber ein zus"atzliche\u{s} obligatorisches Argument"'
 hei\ss{}en.
 
 \erroronpage{306}{Abs.\ -2, Z.\ 2}{RHe}{2006/08/07}{2}
@@ -910,7 +912,7 @@ Fehlendes Komma: "`einnimmt, ist der"'
 
 \erroronpage{358}{Abs.5, Z.6+7}{JS}{2006/11/08}{2}
  Ersetze:
-  "`Die \u{Computer Modern Typewriter und} Computer Modern Sans Fonts 
+  "`Die \u{Computer Modern Typewriter und} Computer Modern Sans Fonts
    verfügen nicht über \u{breite} sondern nur über breitfette"'
  \>
   "`Die Computer Modern Sans Fonts
@@ -918,7 +920,7 @@ Fehlendes Komma: "`einnimmt, ist der"'
 
 \erroronpage{361}{Tab 7.4}{AFV}{2008/08/08}{s}
 Die Tabelle zeigt |\mathtt| als Sans Serif Typewriter Font. Dies ist
-normalerweise nicht der Fall -- fast jede \LaTeX{} Installation verwendet 
+normalerweise nicht der Fall -- fast jede \LaTeX{} Installation verwendet
 Computer Modern Typewriter.
 
 \erroronpage{362}{Abs.-1, Z.4}{JMa}{2006/02/27}{2}
@@ -957,7 +959,7 @@ Streiche das n aus Name\u{n}.
 Fehlendes Komma: "`werden, normalerweise ohnehin"'
 
 \erroronpage{407}{Bsp. 7-7-21, 7-7-22}{TNdz}{2006/01/20}{2}
-    Fehlendes Komma: "`\ldots ist ein Blindtext, an dem sich 
+    Fehlendes Komma: "`\ldots ist ein Blindtext, an dem sich
     verschiedene \ldots"´
 
 \erroronpage{416}{Kapitel 7.8.6, Z.8}{RSi}{2005/12/07}{2}
@@ -1027,19 +1029,19 @@ Die "`Tabellen"uberschrift"' ist nicht im \textsf{sf}-Format.
 Ersetze:  "`gültigen US-Praxis"' \> "`vorherrschenden Praxis"'
 
 \erroronpage{494}{8.2.12 Abs.\ 1, Z.\ 5}{RHe}{2008/09/19}{2}
-   Füge Kommata ein: "`Die Schwierigkeit\u{,} eine abgesetzte Formel 
+   Füge Kommata ein: "`Die Schwierigkeit\u{,} eine abgesetzte Formel
 korrekt zu gestalten\u{,} kann \dots{}"'
 
 \erroronpage{496}{Abs.2, Z.1/2}{JMa}{2006/03/05}{2}
 Trennfehler: Mark-up sieht deutlich besser aus als Mar-kup.
 
 \erroronpage{496}{Abs.\ 3 (nach Bsp. 8-2-28), Z.\ 2}{RHe}{2008/09/19}{2}
-   Füge Komma ein: "`\dots{} allerdings \emph{nur}\u{,} wenn sie \dots{} 
+   Füge Komma ein: "`\dots{} allerdings \emph{nur}\u{,} wenn sie \dots{}
 verschoben wurde."'
 
 \erroronpage{503}{8.4.4 Abs.\ 1, Z.\ 3}{RHe}{2008/09/19}{2}
-   Lösche Komma (Regel §~72.2 "`gleichrangige Wortgruppen oder Wörter in 
-Aufzählungen (entweder -- oder)"'): "`\dots{} können entweder \dots{} 
+   Lösche Komma (Regel §~72.2 "`gleichrangige Wortgruppen oder Wörter in
+Aufzählungen (entweder -- oder)"'): "`\dots{} können entweder \dots{}
 positioniert werden\u{ } oder \dots{} rechts der Operatoren."'
 
 \erroronpage{504}{Abs.-2,Z.3}{JMa}{2006/03/05}{2}
@@ -1064,7 +1066,7 @@ Ersetze: "`Bei den \u{Hauptversionen} ($D'$,~$T'$~usw.{})"' \>
 Streiche ein "`die"'.
 
 \erroronpage{518}{8.7.5 Abs.\ 3 , Z.\ 3}{RHe}{2008/09/19}{2}
-   Füge Komma ein: "`\dots{} und verhält sich somit\u{,} als wären beide 
+   Füge Komma ein: "`\dots{} und verhält sich somit\u{,} als wären beide
 Maße gleich null."'
 
 \erroronpage{535}{Abs. 1, Z. 5}{RHe}{2008/09/19}{2}
@@ -1073,11 +1075,11 @@ Ersetze: "`\ldots{} existierenden, neu belebten Mediävalschriften."'
 
 \erroronpage{544}{Tab. 8-10/11}{FMi}{2006/08/09}{2}
    Fehlende Symbole aus amssymb hinzugef"ugt: |\circledR|, |\yen|,
-   |\checkmark| und |\maltese|. 
+   |\checkmark| und |\maltese|.
 
 \erroronpage{544}{Tab. 8.11}{LHe}{2008/02/08}{s}
     |\dag| und |\ddag| sind |\mathord|s und nicht |\mathbin| wie in Tabelle
-    8.13 behauptet. 
+    8.13 behauptet.
 
 \erroronpage{546}{Tab. 8.13}{LHe}{2008/02/08}{s}
     |\dag| und |\ddag| sind keine |\mathbin|s. Sie geh"oren deshalb nicht in
@@ -1085,7 +1087,7 @@ Ersetze: "`\ldots{} existierenden, neu belebten Mediävalschriften."'
     und |\ddagger|.
 
 \erroronpage{552}{8.9.6 Abs.\ 1 , Z.\ 4}{RHe}{2008/09/19}{2}
-   Füge Komma ein: "`\dots{} nicht der Symbolklasse Punctuation\u{,} 
+   Füge Komma ein: "`\dots{} nicht der Symbolklasse Punctuation\u{,}
 sondern Ordinary \dots{} zugeordnet sind."'
 
 \erroronpage{554}{Tab. 8-27}{DIs/FMi}{2006/08/09}{2}
@@ -1107,7 +1109,7 @@ Ersetze: "`Unterstützung für den Satz \ldots{}"'
   Und zudem die Seite eine Zeile zu lang.
 
 \erroronpage{560}{Z.\ -5}{RHe/FMi}{2006/09/21}{2}
-Ersetze: "`der Übersetzungen \u{für} Texte"' \> 
+Ersetze: "`der Übersetzungen \u{für} Texte"' \>
          "`der Übersetzungen generierter Texte"'
 
 
@@ -1127,7 +1129,7 @@ Streiche den letzten Buchstaben von sprachspezifische\u{n}.
    I got a translation ``s\l ownik termin{\'o}w'' which will eventually
    find its way into Babel.
 
-   Tja, so gehts. Auch als das deutsche Buch gesetzt wurden waren die Begriffe
+   Tja, so gehts. Auch als das deutsche Buch gesetzt wurde, waren die Begriffe
    auch noch nicht bekannt.
 
 \erroronpage{570}{Abs. -4("`Die Tilde"' , Z. 2}{RHe}{2006/09/20}{2}
@@ -1150,7 +1152,7 @@ Streiche die beiden letzten Buchstaben von ein\u{en}.
    Streiche Komma: "Wie der Befehl \verb"\nombre"\_ verfügt er \dots{}"'
 
 \erroronpage{590}{Abs.1, Z.5/6}{JMa}{2006/03/14}{2}
-Wenn  "`rumakeindex"' getrennt werden muss, sieht "`rumake-index"' deutlich 
+Wenn  "`rumakeindex"' getrennt werden muss, sieht "`rumake-index"' deutlich
 besser aus.
 
 \erroronpage{599}{Abs.2, Z.2}{JMa}{2006/03/14}{2}
@@ -1172,11 +1174,11 @@ Es fehlt  "`vtex"' als wichtiger Treiber; andererseits sind einige der
 aufgelisteten Treiber nur von historischer Bedeutung.
 
 \erroronpage{634}{Abs. 1, Z. 1}{RHe}{2006/10/16}{2}
-Füge Komma ein: "`\dots{} reelle Werte haben)\u{,} anstatt nach 
+Füge Komma ein: "`\dots{} reelle Werte haben)\u{,} anstatt nach
 \dots{}"'
 
 \erroronpage{637}{Abs. 1, Z. 1}{RHe}{2006/10/16}{2}
-Füge Komma ein: "`Lässt \LaTeX{} nach \dots{} suchen\u{,} anstatt nach 
+Füge Komma ein: "`Lässt \LaTeX{} nach \dots{} suchen\u{,} anstatt nach
 \dots{}"'
 
 \erroronpage{637}{viewport}{BMo/FMi}{2007/10/20}{s}
@@ -1203,9 +1205,9 @@ Streiche den letzten Buchstaben von vertikale\u{r}.
   internal default.
 
 \erroronpage{651}{Abs. -1, Z. 1}{RHe}{2006/10/16}{2}
-Ersetze: "`Die \dots{} Funktion ähnelt dem des \textsf{rotating}-Paketes 
+Ersetze: "`Die \dots{} Funktion ähnelt dem des \textsf{rotating}-Paketes
 \dots{}"'
- \>"`Die \dots{} Funktion ähnelt der des \textsf{rotating}-Paketes 
+ \>"`Die \dots{} Funktion ähnelt der des \textsf{rotating}-Paketes
 \dots{}"'
 
 \erroronpage{652}{editoral change}{FMi}{2006/10/21}{2}
@@ -1219,6 +1221,8 @@ Ersetze: "`verf"ugt"' \> "`verf"ugen"'
   Leider ist Th\`anhs Name falsch geschrieben. Die korrekte Schreibweise
   ist "`H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh"'.
 
+\erroronpage{672}{letzte Zeile}{BvdW}{2014/02/19}{}
+Ersetze ``wir'' durch ``wird''.
 
 
 \CHAPTER{Kapitel 11}
@@ -1332,7 +1336,7 @@ Ersetze: BibTexMng \> \textsf{BibTexMng}
 Streiche das Komma nach \texttt{size}.
 
 \erroronpage{821}{Tab.13.4, Z.-4}{JMa}{2006/04/11}{2}
-F"uge ein Leerzeichen nach "`Fachzeitschriften"' ein. Ferner ist die 
+F"uge ein Leerzeichen nach "`Fachzeitschriften"' ein. Ferner ist die
 "'Tabellen"uberschrift"' nicht im \textsf{sf}-Format.
 
 \erroronpage{828}{Tab. 13.5, Z. 1-2}{MSch}{2006/01/06}{2}
@@ -1349,7 +1353,7 @@ Ersetze: Abschnitte \> Abschnitten
 F"uge ein Leerzeichen vor "`hat"' ein.
 
 \erroronpage{842}{Abs.1, Z.-2}{JMa}{2006/04/11}{2}
-Entweder fehlt hier eine "offnende Klammer -- oder die schlie\ss{}ende ist 
+Entweder fehlt hier eine "offnende Klammer -- oder die schlie\ss{}ende ist
 zu viel.
 
 
@@ -1395,15 +1399,15 @@ Ersetze: "`so wird eine Fehlermeldung ausgegeben."'
 Ersetze: Abschnitte \> Abschnitten
 
 \erroronpage{888}{fig A.1, l.4}{FMi/JAn}{2005/09/09}{2}
-    ``Did\^ot'' \> ``Didot'' und entferne Komma nach "`Zoll"' 
+    ``Did\^ot'' \> ``Didot'' und entferne Komma nach "`Zoll"'
 
 \erroronpage{891}{Tab.A.3, Z.1}{JMa}{2006/05/03}{2}
 F"uge ein Komma vor "`der eine feste oder"' ein.
 
 \erroronpage{899}{A.2.3 Abs.\ 2, Z.\ 5}{RHe}{2006/06/10}{2}
-   Füge Komma ein: "`Diese Struts sind sehr nützlich, um die Höhe oder 
+   Füge Komma ein: "`Diese Struts sind sehr nützlich, um die Höhe oder
 \dots{}"'
-  
+
 \erroronpage{903}{Abs.-2, Z.1}{FMi}{2006/06/14}{2}
 Füge Wort ein:  "`nach der \u{letzten} Klammer \verb=}= und\ldots"'
 
@@ -1483,11 +1487,12 @@ Ersetze Orleans \> Orl\'{e}ans
 \CHAPTER{Bibliographie}
 
 \erroronpage{1017}{[57]}{RHe}{2006/06/07}{2}
-Ersetzte Erl\"auterung durch: "`Die 
+Ersetzte Erl\"auterung durch: "`Die
 \u{englische} erste Ausgabe dieses Buches."'
 
-\erroronpage{1017}{[58]}{FMi}{2009/08/01}{s}
+\erroronpage{1017/1018}{[58]}{FMi}{2009/08/01}{s}
 Eintrag sollte auf die zweite (aktuelle) Ausgabe verweisen.
+(Ab dem korrigierten Nachdruck von 2010 befindet sich [58] ganz auf seite 1018.)
 
 \erroronpage{1019}{[67], Z.-2}{JMa}{2006/05/28}{2}
 Schreibe "`Sprachengetrennt"' getrennt.
@@ -1499,9 +1504,9 @@ Schreibe "`Sprachengetrennt"' getrennt.
   Füge ``Lars Hellstr\"om'' als Autor hinzu. Datum ``Dezember 2004''
 
 \erroronpage{1025}{[116,  Z.\ 2]}{RHe}{2006/06/07}{2}
-   Vergleich mit "`(eben)so \dots{} setzen kann, wie sonst \dots{}"' 
+   Vergleich mit "`(eben)so \dots{} setzen kann, wie sonst \dots{}"'
 erfordert Komma
- 
+
 \erroronpage{1026}{[127], Z.1}{JMa}{2006/05/28}{2}
 F"uge ein Komma vor "`welche"' ein.
 
@@ -1535,6 +1540,12 @@ Ersetze Tinagh \> Tifinagh
 \erroronpage{1033}{2. Absatz, Z.4}{JMa}{2006/01/05}{2}
 Die Abkürzung NFSS sollte \textsf{NFSS} geschrieben werden.
 
+
+\erroronpage{1040}{rechte Spalte, Zeile 8}{BvdW}{2014/02/19}{}
+\verb=\AskOption= (ohne das ``s'' am Ende, siehe Errata Seite 2 zu Kapitel 2)
+
+
+
 \iffalse Nicht wirklich, aber auch nicht schoen so ... mal sehen
 
 \erroronpage{1068}{"`Gleichheits- und Relationszeichen"'}{MSch}{2005/12/31}{}
@@ -1544,15 +1555,13 @@ Die Abkürzung NFSS sollte \textsf{NFSS} geschrieben werden.
   Symbole"'.
 \fi
 
-% - not in index
-%
-% \erroronpage{1088}{rechte Spalte}{JMa}{2006/01/05}{}
-% Die Abkürzung NFSS sollte \textsf{NFSS} geschrieben werden.
+
+
 
 
 \CHAPTER{Biographien}
 
-\erroronpage{1129}{Abs. 2, Z.3}{SZi}{2005/11/24}{2} 
+\erroronpage{1129}{Abs. 2, Z.3}{SZi}{2005/11/24}{2}
   l"osche g aus Dok\u{g}umente
 
 \end{erratalist}
@@ -1564,8 +1573,8 @@ Die Abkürzung NFSS sollte \textsf{NFSS} geschrieben werden.
    gemeldet haben. Gelistet sind jeweils die Personen die ein Problem
    zuerst entdeckt haben. Einige Fehler wurden im englischen Original
    gefunden, weshalb auch ein paar Namen ohne Fehlerzahl auftauchen.]
-%\contributor{J-CCh}{Jean-C\^ome Charpentier}
 \contributor{AFe}{Alfonso Fernandez-Vazquez}
+\contributor{BvdW}{Berend G. van der Wall}
 \contributor{CBe}{Claudio Beccari}
 \contributor{ChB}{Christof B\"ockler}
 \contributor{DAl}{Daniel Alonso i Alemany}
@@ -1587,7 +1596,7 @@ Die Abkürzung NFSS sollte \textsf{NFSS} geschrieben werden.
 \contributor{RSi}{Roman Sigg}
 \contributor{SNe}{Stefan Neuhaus}
 \contributor{SZi}{Stefan Ziesemer}
-\contributor{TNdz}{Timo Niedenzu} 
+\contributor{TNdz}{Timo Niedenzu}
 \contributor{VVo}{Vladimir Volovich}
 \contributor{YiL}{Yiannis Lazarides}
 \end{multicols}
@@ -1606,7 +1615,7 @@ wenn möglich gleich in der für diese Datei benötigte Form, d.h.
 Hier ist ein Beispiel:
 \begin{verbatim}
 \erroronpage{5}{Abs.3, Z.1}{MOs}{2005/09/01}{}
-   Ersetze: "`LaTeX"' \> "`\LaTeX{}"' 
+   Ersetze: "`LaTeX"' \> "`\LaTeX{}"'
 \end{verbatim}
 Die Verwendung von Babelkommandos (etwa |"`|) ist möglich, aber Umlaute
 sollten möglichst nicht als 8-bit Zeichen eingegeben werden (also besser |"a|
diff --git a/Master/texmf-dist/source/latex/base/letter.dtx b/Master/texmf-dist/source/latex/base/letter.dtx
index a8318f46e76..9fb30db943a 100644
--- a/Master/texmf-dist/source/latex/base/letter.dtx
+++ b/Master/texmf-dist/source/latex/base/letter.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \CheckSum{980}
@@ -1006,13 +1006,13 @@
 %    It should use the following commands:
 %   \begin{itemize}
 %   \item |\toname| : name part of `to' address.
-%                     Will be one line long. 
+%                     Will be one line long.
 %   \item |\toaddress| : address part of `to' address.
 %                        The lines separated by |\\|.
 %   \item |\fromname| : name of sender.
 %   \item |\fromaddress| : argument of current |\address|
 %     declaration-- null if none.  Should use standard institutional
-%     address if null. 
+%     address if null.
 %   \item |\fromlocation| : argument of current |\location|
 %     declaration--null if none.
 %   \item |\telephonenum| : argument of current |\telephone|
@@ -1163,12 +1163,12 @@
 %    You have to define the following two commands:
 %    \begin{itemize}
 %    \item |\startlabels| : Should reset the page layout parameters if
-%      necessary. 
+%      necessary.
 %    \item |\mlabel|\marg{return address}\marg{to adress} : Command to
 %      generate a single label.
 %    \end{itemize}
 %
-%     
+%
 %
 % \begin{macro}{\returnaddress}
 %    The return address for the mailing labels can be stored in this
@@ -1179,7 +1179,7 @@
 % \end{macro}
 %
 % \begin{macro}{\labelcount}
-%    A register to count the labels 
+%    A register to count the labels
 %    \begin{macrocode}
 \newcount\labelcount
 %    \end{macrocode}
@@ -1878,7 +1878,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \subsection{The page style} 
+% \subsection{The page style}
 %    We have \pstyle{plain} pages in this document class by
 %    default. We use arabic page numbers.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/letter.ins b/Master/texmf-dist/source/latex/base/letter.ins
index 54d67f51728..4ce7765b05e 100644
--- a/Master/texmf-dist/source/latex/base/letter.ins
+++ b/Master/texmf-dist/source/latex/base/letter.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/lgc2.err b/Master/texmf-dist/source/latex/base/lgc2.err
index 72e6375050f..7b79ff91dec 100644
--- a/Master/texmf-dist/source/latex/base/lgc2.err
+++ b/Master/texmf-dist/source/latex/base/lgc2.err
@@ -20,7 +20,7 @@ $Id: lgc2.err 5886 2008-06-13 09:45:27Z mittelba $
 \begin{filecontents}{ttcterrata.cls}
 %%
 %% Copyright (C) 1997,2004,2005,2007 Frank Mittelbach
-%% This class file is licenced under LPPL latest version; 
+%% This class file is licenced under LPPL latest version;
 %% see http://www.latex-project.org/lppl
 %
 %
@@ -30,7 +30,7 @@ $Id: lgc2.err 5886 2008-06-13 09:45:27Z mittelba $
 %    Tools and Techniques for Computer Typesetting
 %
 % hence the name. However, anybody who likes to use it is free to apply it for
-% errata files of other books. 
+% errata files of other books.
 %
 % Changes:
 %
@@ -189,7 +189,7 @@ $Id: lgc2.err 5886 2008-06-13 09:45:27Z mittelba $
 
 % some special shortcuts overwriting existing commands:
 
-\let\u\underline 
+\let\u\underline
 \renewcommand\>{$\to$}
 
 %%% some code suggested by Thorsten Hansen to count the number of
@@ -199,7 +199,7 @@ $Id: lgc2.err 5886 2008-06-13 09:45:27Z mittelba $
 \def\count@contributors#1/#2/#3\@nil{
    \@ifundefined{c@#1}{\newcounter{#1}}{}\stepcounter{#1}%
 %%%   also count secondary:
-%%%   \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}% 
+%%%   \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}%
 }
 
 \renewcommand\erroronpage[5]{%
@@ -216,7 +216,7 @@ $Id: lgc2.err 5886 2008-06-13 09:45:27Z mittelba $
    \displayrevisionfix{#1}{#5}
    \hideamp #2 \hideamp (\textsf{#3}) \hideamp
 }
- 
+
 \renewcommand\seriouserroronpage[5]{%
    \count@contributors#3/secondary/\@nil
    \endgobble
@@ -234,7 +234,7 @@ $Id: lgc2.err 5886 2008-06-13 09:45:27Z mittelba $
 }
 
 \renewcommand\contributor[2]{\makebox[1cm][l]{%
-  \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par} 
+  \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par}
 
 \end{filecontents}
 
@@ -242,12 +242,12 @@ $Id: lgc2.err 5886 2008-06-13 09:45:27Z mittelba $
 \begin{filecontents}{\jobname.cfg}
 %
 %
-% Configuration file for the errata listing of 
+% Configuration file for the errata listing of
 %
 %  The LaTeX Graphics Companion, Second Edition
 %
 %
-% \erratastartdate 
+% \erratastartdate
 %
 % Specifies the date from which on errata entries should be listed.
 %
@@ -269,8 +269,8 @@ $Id: lgc2.err 5886 2008-06-13 09:45:27Z mittelba $
 %    listing.
 %
 % The default below ensures that all entries relevant to the x-th
-%    printing are typeset. 
-%    
+%    printing are typeset.
+%
 %
 
 \renewcommand\myprinting{2}
@@ -353,7 +353,7 @@ you own by changing the configuration in the file \texttt{\jobname.cfg}.
 \end{center}
 
 Any mistake found and reported is a gain for all readers of our book.
-For this reason Addison-Wesley and the authors offer a prize (for 6 
+For this reason Addison-Wesley and the authors offer a prize (for 6
 periods) to the eligible person who finds the largest
 number of bugs during that period (in case of a draw a random choice
 will be made between all those with the largest number of findings).
@@ -368,7 +368,7 @@ is, no boxed sets or multiple volume offers).
 As usual, the authors and publisher reserve the right to make various
 decisions such as whether a reported feature is an error for
 competitive purposes or whether similar features count as a single or
-multiple errors.  --- 
+multiple errors.  ---
 Good luck!
 
 \begin{center}
@@ -397,9 +397,9 @@ Contest period ends & Winner \\[4pt]
    To help you in assessing this errata document we have placed
    exclamation marks in front of each entry that we consider essential
    for correctly understanding the book contents.
-   
-\erroronpage{general}{}{FMi}{2007/07/01}{} 
-   
+
+\erroronpage{general}{}{FMi}{2007/07/01}{}
+
    Due to the printing process there may be small alignment problems
    between blue and black text on some pages. These can vary from book
    to book depending on how the paper was handled between print
@@ -428,7 +428,7 @@ There should be a bit more space in front  of the code block
 \seriouserroronpage{152}{exa 4-1-15}{HjG}{2007/08/17}{2}
   Output of example is missing! Oops \ldots\ it was there honest
 
-\erroronpage{177}{para 2, l.1}{MiV}{2008/05/22}{2} 
+\erroronpage{177}{para 2, l.1}{MiV}{2008/05/22}{2}
 Missing interword space: ``Flowcharts\u{ }are''
 
 \CHAPTER{Chapter 5}
@@ -453,11 +453,11 @@ Coding changed to:
 \end{pspicture}
 \end{verbatim}
 
-\erroronpage{240}{para 4, l.8}{MiV}{2008/05/22}{2} 
+\erroronpage{240}{para 4, l.8}{MiV}{2008/05/22}{2}
 Remove  backslash in:
  ``keyword setting \verb/\showpoints=true/''
 
-\erroronpage{254}{Ex 5-9-1}{MiV}{2008/05/22}{} 
+\erroronpage{254}{Ex 5-9-1}{MiV}{2008/05/22}{}
 The blue circle shouldn't be visible behind the black circle. This is a
 problem due to the printing process used for the book---it does not show up on
 all books.
@@ -471,7 +471,7 @@ or curve (path).
 \CHAPTER{Chapter 6}
 
 \erroronpage{335}{para 5, l.4}{JMi}{2008/06/23}{2}
-``\ldots{} summarized in \u{Table} 5.2 \ldots" \> ``\ldots{} summarized in 
+``\ldots{} summarized in \u{Table} 5.2 \ldots" \> ``\ldots{} summarized in
 \u{Figure} 5.2 \ldots''
 
 \erroronpage{406}{margin}{hv}{2007/08/20}{2}
@@ -494,17 +494,17 @@ but not ``Koaungli Un''. Sorry for the mistake.
 
 \CHAPTER{Chapter 8}
 
-\erroronpage{514}{tab. 8.3}{FMi}{2008/012/21}{2} 
+\erroronpage{514}{tab. 8.3}{FMi}{2008/012/21}{2}
 Slightly increase spacing after hline.
 
-\erroronpage{515}{tab. 8.4}{MiV}{2008/05/22}{2} 
+\erroronpage{515}{tab. 8.4}{MiV}{2008/05/22}{2}
 There should be vertical spacing in the first line (superscript $10^{24}$
 touches top line)
 
-\seriouserroronpage{579}{para 2, l.3}{MiV}{2008/05/22}{2} 
+\seriouserroronpage{579}{para 2, l.3}{MiV}{2008/05/22}{2}
  \verb=\ln= \>  \verb=\nl= (this will also change the index entry)
 
-\erroronpage{583}{para 4, l.9}{MiV}{2008/05/22}{2} 
+\erroronpage{583}{para 4, l.9}{MiV}{2008/05/22}{2}
 Replace: ``of the voltage $V_C$'' \> ``of the voltage $v_C$''
 
 \CHAPTER{Chapter 9}
@@ -530,15 +530,15 @@ release of the package.
 \erroronpage{720}{6th item}{MiV}{2008/05/22}{2}
 Replace: ``documentwide'' \> ``\u{D}ocumentwide''
 
-\erroronpage{726}{para 2, l.2}{MiV}{2008/05/22}{2} 
+\erroronpage{726}{para 2, l.2}{MiV}{2008/05/22}{2}
 Extra space after
 parenthesis: ``( in practice''
 
-\erroronpage{740}{para 2, l.1}{MiV}{2008/05/22}{2} 
+\erroronpage{740}{para 2, l.1}{MiV}{2008/05/22}{2}
 Replace: ``given
 by \textit{start\u{ row}}'' \> ``given by \textit{start} row''
 
-\seriouserroronpage{741}{Ex 11-3-5}{MiV}{2008/05/22}{2} 
+\seriouserroronpage{741}{Ex 11-3-5}{MiV}{2008/05/22}{2}
 Usage of
 \verb=\cellcolor= might introduce extra space in the output (as one can see in
 the example).
@@ -547,11 +547,11 @@ This can be argued as being a bug in the \texttt{colortbl} package. Given that t
 basic \verb=\color= command ignores spaces after it, \verb=\cellcolor= should
 behave similarly.
 
-\seriouserroronpage{744}{line after Ex 11-3-9}{MiV}{2008/05/22}{2} 
+\seriouserroronpage{744}{line after Ex 11-3-9}{MiV}{2008/05/22}{2}
 Replace: ``This does \u{not}, of course, affect'' \>
 ``This does, of course, \u{also} affect''
 
-\erroronpage{758}{para 3, l.2}{MiV}{2008/05/22}{2} 
+\erroronpage{758}{para 3, l.2}{MiV}{2008/05/22}{2}
 Add small space between values and units in frame dimension
 
 \erroronpage{760}{fig. 11.1}{MiV}{2008/05/22}{2}
@@ -563,15 +563,15 @@ Frank: because the author of this section used a real live example where he had
 used an optional argument to |\section| to make the toc have special text for
 some reason (should be mentioned in the source though).
 
-\erroronpage{774}{2nd snytax box}{hv}{2009/05/8}{2} 
+\erroronpage{774}{2nd snytax box}{hv}{2009/05/8}{2}
 The |\transduration| command takes ``time in seconds'' as mandatory argument
 (and not ``key/vals'')
 
-\erroronpage{779}{para 3, l.1}{MiV}{2008/05/22}{2} 
+\erroronpage{779}{para 3, l.1}{MiV}{2008/05/22}{2}
 ``in not shown''\>
 ``\u{is} not shown''
 
-\erroronpage{794}{exa 11--4-36}{hv}{2009/05/12}{2} 
+\erroronpage{794}{exa 11--4-36}{hv}{2009/05/12}{2}
 Replace ``pic2e'' \> ``pic\u{t}2e'' in output, corresponding input not
 displayed in the book.
 
@@ -594,7 +594,7 @@ the fonts.
 
 \CHAPTER{Bibliography}
 
-\erroronpage{822}{entry [32]}{MiV}{2008/05/22}{2} 
+\erroronpage{822}{entry [32]}{MiV}{2008/05/22}{2}
 Use capital C in ``Lecture Notes in computer Science''
 
 \erroronpage{823}{entry [35]}{JPFD}{2007/09/05}{2}
@@ -604,27 +604,27 @@ Use capital C in ``Lecture Notes in computer Science''
   An updated version of the manual can be downloaded from
   \url{http://www.tug.org/docs/metapost/mpman.pdf}
 
-\erroronpage{825}{entry [50]}{FMi}{2008/12/21}{2} 
+\erroronpage{825}{entry [50]}{FMi}{2008/12/21}{2}
 Use capital C in ``Lecture Notes in computer Science''
 
-\erroronpage{826}{entry [59]}{FMi}{2008/12/21}{2} 
+\erroronpage{826}{entry [59]}{FMi}{2008/12/21}{2}
   Add web url: \url{http://www.dante.de/dante/DTK/PDF/komoedie_2002_1.pdf}
 
-\erroronpage{826}{entry [60]}{FMi}{2008/12/21}{2} 
+\erroronpage{826}{entry [60]}{FMi}{2008/12/21}{2}
     Add web url: \url{http://www.dante.de/dante/DTK/PDF/komoedie_2002_2.pdf}
 
- \erroronpage{828}{entry [60]}{FMi}{2008/12/21}{2} 
+ \erroronpage{828}{entry [60]}{FMi}{2008/12/21}{2}
     Add web url: ``Sample chapter
   at: \url{http://www.latex-project.org/guides/books.html}''
 
- \erroronpage{829/830}{editorial change}{FMi}{2008/12/21}{2} 
+ \erroronpage{829/830}{editorial change}{FMi}{2008/12/21}{2}
     Page breaks changed due to other changes
 
-\erroronpage{833}{entry [128]}{FMi}{2008/12/21}{2} 
+\erroronpage{833}{entry [128]}{FMi}{2008/12/21}{2}
   Url changed to: \url{obsolete/graphics/pstricks/doc/code/pst-code.pdf}
 
 
-\erroronpage{833}{entry [129]}{FMi}{2008/12/21}{2} 
+\erroronpage{833}{entry [129]}{FMi}{2008/12/21}{2}
   Url changed to:   \url{macros/generic/multido/}
 
 
@@ -634,16 +634,16 @@ An ``s'' is missing in ``using'' (end of the first line of comment)
 
 \CHAPTER{Index}
 
- \erroronpage{856/860/866}{editorial change}{FMi}{2008/12/21}{2} 
+ \erroronpage{856/860/866}{editorial change}{FMi}{2008/12/21}{2}
     changed index entries due to changes above
 
 \erroronpage{886}{col.2, l.-7}{GTa}{2010/02/10}{}
  image(METAPOST) should also reference example on p.145
 
- \erroronpage{891}{editorial change}{FMi}{2008/12/21}{2} 
+ \erroronpage{891}{editorial change}{FMi}{2008/12/21}{2}
     changed index entries due to changes above
 
- \erroronpage{910/911}{editorial change}{FMi}{2008/12/21}{2} 
+ \erroronpage{910/911}{editorial change}{FMi}{2008/12/21}{2}
     changed index entries due to changes above
 
  \erroronpage{925}{editorial change}{FMi}{2008/12/21}{2}
@@ -673,8 +673,8 @@ An ``s'' is missing in ``using'' (end of the first line of comment)
 Other people have sent us corrections for errors already found.
 Thanks to all of you!
 
-If you find 
-further 
+If you find
+further
 errors please report them to one of the authors, e.g.,
 \begin{quote}\ttfamily
   frank.mittelbach@latex-project.org
diff --git a/Master/texmf-dist/source/latex/base/ltalloc.dtx b/Master/texmf-dist/source/latex/base/ltalloc.dtx
index eb5b322e119..16da34ff2b9 100644
--- a/Master/texmf-dist/source/latex/base/ltalloc.dtx
+++ b/Master/texmf-dist/source/latex/base/ltalloc.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
diff --git a/Master/texmf-dist/source/latex/base/ltbibl.dtx b/Master/texmf-dist/source/latex/base/ltbibl.dtx
index 44265b1b79f..43718f37979 100644
--- a/Master/texmf-dist/source/latex/base/ltbibl.dtx
+++ b/Master/texmf-dist/source/latex/base/ltbibl.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltbibl.dtx
@@ -70,13 +70,13 @@
 %     and tries to read in |mainfile.bbl|.
 %
 % \DescribeMacro{\bibliographystyle}
-%  |\bibliographystyle|\marg{style} : 
+%  |\bibliographystyle|\marg{style} :
 %     Writes a |\bibstyle| entry on the |.aux| file.
 %
 % \DescribeEnv{thebibliography}
 %  The |thebibliography| environment is a list environment.  To save the
 %  use of an extra counter, it should use  |enumiv|  as the item
-%  counter. 
+%  counter.
 %  Instead of using |\item|, items in the bibliography are produced by
 %  the  following commands:\\
 %    |\bibitem|\marg{name}    : Produces a numbered entry cited as
@@ -85,7 +85,7 @@
 %    \meta{Label} and cited by \meta{name}.
 %
 %  The former is used for bibliographies with citations like [1], [2],
-%  etc.; 
+%  etc.;
 %  the latter is used for citations like [Knuth82].
 %
 %  The document class must define the thebibliography environment.  This
@@ -98,14 +98,14 @@
 %  Entries are cited by the command |\cite|\marg{name}.
 %
 % \DescribeMacro{\nocite}
-% |\nocite|\marg{citations} 
+% |\nocite|\marg{citations}
 % puts information on the |.aux| file that causes
 % \BibTeX{} to include the \marg{citations} list in the bibliography,
 % but puts nothing in the text.
 %
 % |\nocite{*}| is special: it tells \BibTeX{} to put the whole of a
 % collection of references into the bibiography.
-% 
+%
 % \StopEventually{}
 %
 %
@@ -156,7 +156,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@lbibitem}
-% \changes{LaTeX2.09}{1992/02/26}{Added \cs{hfill} to restore 
+% \changes{LaTeX2.09}{1992/02/26}{Added \cs{hfill} to restore
 %        left-alignment of bibliography labels in alpha style}
 %    \begin{macrocode}
 \def\@lbibitem[#1]#2{\item[\@biblabel{#1}\hfill]\if@filesw
@@ -256,7 +256,7 @@
 %    Donald Arsenau.  Note that this one is inside the first argument
 %    of the |\@cite| hook.
 %    This decouples the top-level typesetting of the citation from
-%    the details of the other business conducted here.  All this really 
+%    the details of the other business conducted here.  All this really
 %    needs a complete rethink to get the right modularity.
 %
 % \changes{v1.1q}{2004/02/15}{Changed to use a hook with default
@@ -310,7 +310,7 @@
 %  \begin{macro}{\nocite}
 %    (Added 14 Jun 85)
 % \changes{v1.1c}{1994/11/10}{Fix \cs{nocite}\texttt{\char`\{*\char`\}}}
-%   
+%
 %    This puts information on the |.aux| file that causes
 %    \BibTeX{} to include the citation list in the bibliography,
 %    but puts nothing in the text.
@@ -376,7 +376,7 @@
 % \subsection{Default definitions}
 %
 %    This hook determines the `relative formatting' of the two logical
-%    parts of a citation with comment. 
+%    parts of a citation with comment.
 % \begin{macro}{\@cite}
 %    \begin{macrocode}
 \def\@cite#1#2{[{#1\if@tempswa , #2\fi}]}
@@ -387,7 +387,7 @@
 % \changes{v1.1q}{2004/02/15}{Added hook with default value \cs{hbox}}
 %    This is, in general, a command that appears to have one argument
 %    whose value is, in the kernel, a single cs whose name is the
-%    expansion of |b@\@citeb|; the expansion of this cs will 
+%    expansion of |b@\@citeb|; the expansion of this cs will
 %    typically be some hmode material that produces the detailed
 %    typeset form of just the citations themselves.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/ltboxes.dtx b/Master/texmf-dist/source/latex/base/ltboxes.dtx
index a93506ccd6d..89285e0a36a 100644
--- a/Master/texmf-dist/source/latex/base/ltboxes.dtx
+++ b/Master/texmf-dist/source/latex/base/ltboxes.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -39,7 +39,7 @@
 \GetFileInfo{ltboxes.dtx}
 \title{\filename}
 \date{\filedate}
-\author{David Carlisle\and 
+\author{David Carlisle\and
   Leslie Lamport\and
   Frank Mittelbach\and
   Chris Rowley}
@@ -59,7 +59,7 @@
 % \DescribeMacro\makebox
 % |\makebox[|\meta{wid}|][|\meta{pos}|]{|\meta{obj}|}|\\
 % Puts \meta{obj} in an |\hbox| of width \meta{wid}, positioned by
-% \meta{pos}. 
+% \meta{pos}.
 %
 % The possible \meta{pos} are:\\
 % \begin{tabular}{ll}
@@ -74,7 +74,7 @@
 %
 %  |\makebox(|\meta{x}|,|\meta{y}|)[|\meta{pos}|]{|\meta{obj}|}|\\
 %  Puts \meta{obj} in an |\hbox| of width $x * |\unitlength|$
-%            and height $y * |\unitlength|$.  
+%            and height $y * |\unitlength|$.
 % \meta{pos} arguments are
 %  |s|, |l|, |r| or |c| (default) for stretched, flushleft, flushright
 %  or centred, and  |t| or |b|
@@ -109,7 +109,7 @@
 %  to\\
 %  |\sbox{|\meta{cmd}|}{|\meta{text}|}|\\
 %  except that any white space at the beginning and end of \meta{text}
-%  is ignored. 
+%  is ignored.
 %
 % \DescribeMacro\framebox
 %  |\framebox| ...  : like |\makebox|, except it puts a `frame' around
@@ -125,9 +125,9 @@
 %
 % \DescribeMacro\parbox
 %  |\parbox[|\meta{pos}|][|\meta{height}|][|\meta{inner-pos}|]{|^^A
-%                    \meta{width}|}{|\meta{text}|}| : 
+%                    \meta{width}|}{|\meta{text}|}| :
 % Makes a box with |\hsize| \meta{width}, positioned by \meta{pos} as
-% follows: 
+% follows:
 %              c : |\vcenter| (placed in |$...$| if not in math mode)
 %              b : |\vbox|
 %              t : |\vtop|
@@ -171,7 +171,7 @@
 %
 %              |\textwidth| == |\columnwidth| == box width
 %
-%        changes footnotes by redefining:\\%             
+%        changes footnotes by redefining:\\%
 %              |\@mpfn|         == mpfootnote \\
 %              |\thempfn|       == |\thempfootnote|\\
 %              |\@footnotetext| == |\@mpfootnotetext|
@@ -191,22 +191,22 @@
 %
 %
 % \DescribeMacro\rule
-% |\rule[|\meta{raised}|]{|\meta{width}|}{|\meta{height}|}| : 
+% |\rule[|\meta{raised}|]{|\meta{width}|}{|\meta{height}|}| :
 % Makes a $\meta{width}*\meta{height}$ rule, raised \meta{raised}.
 %
 % \DescribeMacro\underline
 % |\underline{|\meta{text}|}| : Makes an underlined hbox with
-% \meta{text} in it. 
+% \meta{text} in it.
 %
 % \DescribeMacro\raisebox
 % |\raisebox{|\meta{distance}|}[|\meta{height}|][|\meta{depth}^^A
-%                 |]{|\meta{box}|}| :\\ 
+%                 |]{|\meta{box}|}| :\\
 % Raises \meta{box} up by \meta{distance} length (down if
 % \meta{distance} negative).  Makes \TeX\ think that the new box extends
 % \meta{height} above the line and \meta{depth} below, for a total
-% vertical length of \meta{height}+\meta{depth}.  Default values of 
+% vertical length of \meta{height}+\meta{depth}.  Default values of
 % \meta{height} \& \meta{depth} = actual height and depth of box in new
-% position. 
+% position.
 %
 % \StopEventually{}
 %
@@ -267,7 +267,7 @@
 % \changes{v0.1a}{1993/12/03}
 %         {macro added}
 % \changes{v0.1b}{1993/12/08}
-%         {Extra braces for color support 
+%         {Extra braces for color support
 %          (braces removed from other macros)}
 % \changes{v1.0f}{1994/05/11}
 %         {Use new \cs{color@setgroup} concept.}
@@ -327,7 +327,7 @@
   \@begin@tempboxa\hbox{#3}%
     \setlength\@tempdima{#1}%       support calc
     \hb@xt@\@tempdima{\csname bm@#2\endcsname}%
-  \@end@tempboxa}  
+  \@end@tempboxa}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -347,7 +347,7 @@
 \long\def\@imakepicbox(#1,#2)[#3]#4{%
   \vbox to#2\unitlength
    {\let\mb@b\vss \let\mb@l\hss\let\mb@r\hss
-    \let\mb@t\vss 
+    \let\mb@t\vss
     \@tfor\reserved@a :=#3\do{%
       \if s\reserved@a
         \let\mb@l\relax\let\mb@r\relax
@@ -403,7 +403,7 @@
 % These macros are initialy a no-op, but the colour package will
 % redefine them to be |\begingroup|, |\endgroup|,
 % |\begingroup\set@color|,\\ |\hbox\bgroup\color@begingroup|,
-% |\color@endgroup\egroup|. 
+% |\color@endgroup\egroup|.
 % and \meta{set to main document colour} respectively.
 %    \begin{macrocode}
 \let\color@begingroup\relax
@@ -565,7 +565,7 @@
       \vskip-\@wholewidth
       \hrule \@height\@wholewidth
       \hbox{%
-        \vrule\@width\@wholewidth 
+        \vrule\@width\@wholewidth
         #1%
         \vrule\@width\@wholewidth}%
       \hrule\@height\@wholewidth
@@ -643,7 +643,7 @@
 %    In order to set the whole box, including the frame to the
 %    specified dimension, we first determine that dimension
 %    from the natural size of the text, |#3|.
-%    calculated width. 
+%    calculated width.
 %    \begin{macrocode}
 \long\def\@iframebox[#1][#2]#3{%
   \leavevmode
@@ -720,7 +720,7 @@
     {\@iiiparbox c\relax[s]}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@iparbox}
 % \changes{v0.1d}{1993/12/15}
 %         {Changed default from `c' to `s'}
@@ -732,7 +732,7 @@
     {\@iiiparbox{#1}\relax[s]}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@iiparbox}
 % Optional argument handling.
 %    \begin{macrocode}
@@ -742,7 +742,7 @@
     {\@iiiparbox{#1}{#2}[#1]}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@iiiparbox}
 % \begin{macro}{\@parboxto}
 % \changes{v1.0j}{1994/10/18}
@@ -761,7 +761,7 @@
 %    \begin{macrocode}
 \let\@parboxto\@empty
 \long\def\@iiiparbox#1#2[#3]#4#5{%
-  \leavevmode 
+  \leavevmode
   \@pboxswfalse
   \setlength\@tempdima{#4}%
   \@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}%
@@ -789,7 +789,7 @@
 %
 % \begin{macro}{\@arrayparboxrestore}
 % Restore various paragraph parameters.
-% 
+%
 % The rational for allowing two normally global flags to be set
 % locally here was stated originally by
 % Donald Arsenau and extended by Chris Rowley.
@@ -800,7 +800,7 @@
 %
 % If anyone is unhappy with this argument then both flags should be
 % treated as in |\set@nobreak|; otherwise this command will be
-% redundant. 
+% redundant.
 % \changes{v1.1a}{1996/10/24}{Added local settings of flags: dangerous!!}
 %    \begin{macrocode}
 \def\@arrayparboxrestore{%
@@ -817,7 +817,7 @@
   \parindent\z@ \parskip\z@skip
   \everypar{}%
   \linewidth\hsize
-  \@totalleftmargin\z@ 
+  \@totalleftmargin\z@
   \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip
   \parfillskip\@flushglue \lineskip\normallineskip
   \baselineskip\normalbaselineskip
@@ -857,7 +857,7 @@
     {\@iiiminipage c\relax[s]}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@iminipage}
 % \changes{v0.1d}{1993/12/15}
 %         {Changed default from `c' to `s'}
@@ -869,7 +869,7 @@
     {\@iiiminipage{#1}\relax[s]}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@iiminipage}
 % Optional argument handling.
 %    \begin{macrocode}
@@ -879,7 +879,7 @@
     {\@iiiminipage{#1}{#2}[#1]}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@iiiminipage}
 % \changes{v1.0e}{1994/04/21}
 %     {Extra \cs{bgroup} for colour}
@@ -1023,7 +1023,7 @@
 % \end{macro}
 %
 % \begin{macro}{\underline}
-% \LaTeX\ version works outside math. 
+% \LaTeX\ version works outside math.
 % \task{???}{why the second `relax in `underline ?}
 %    \begin{macrocode}
 \def\underline#1{%
@@ -1121,11 +1121,11 @@
 % \changes{v1.0p}{1994/11/09}
 %         {Revert \cs{finalstrut} to 2.09 equivalent (from ltpatch)}.
 % \changes{v1.0x}{1995/10/31}
-%         {Add \cs{nobreak} in horiz mode to allow hyphenation. 
+%         {Add \cs{nobreak} in horiz mode to allow hyphenation.
 %                   internal/1931}
 %
 % The |\nobreak| was added (1995/10/31) to allow hyphenation of the
-% final word of the paragraph. 
+% final word of the paragraph.
 %    \begin{macrocode}
 \def\@finalstrut#1{%
   \unskip\ifhmode\nobreak\fi\vrule\@width\z@\@height\z@\@depth\dp#1}
diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx
index 38b38bd3658..1a01a1698ab 100644
--- a/Master/texmf-dist/source/latex/base/ltclass.dtx
+++ b/Master/texmf-dist/source/latex/base/ltclass.dtx
@@ -1,30 +1,30 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2013
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltclass.dtx}
-             [2007/08/05 v1.1h LaTeX Kernel (Class & Package Interface)]
+             [2013/07/07 v1.1i LaTeX Kernel (Class & Package Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltclass.dtx}
@@ -54,7 +54,7 @@
 % All rights reserved.
 % \fi
 %
-% \CheckSum{1194}
+% \CheckSum{1199}
 %
 % \changes{v1.0f}{1994/05/22}{Use new warning and error commands}
 % \changes{v1.0l}{1994/11/17}{\cs{@tempa} to \cs{reserved@a}}
@@ -227,7 +227,7 @@
 %
 % \DescribeMacro\PassOptionsToPackage
 % Packages can pass options to other packages using:\\
-% |\PassOptionsToPackage{|\meta{options}|}{|\meta{package}|}|.\\ 
+% |\PassOptionsToPackage{|\meta{options}|}{|\meta{package}|}|.\\
 % \DescribeMacro\PassOptionsToClass
 % This adds the \meta{options} to the options list of any future
 % |\RequirePackage| or |\usepackage| command.  For example:
@@ -261,7 +261,7 @@
 %   \LoadClass{article}
 %\end{verbatim}
 %
-% As used here, the effects are more or less the same, but the 
+% As used here, the effects are more or less the same, but the
 % version using |\LoadClassWithOptions| is slightly quicker
 % (and less to type).
 % If, however, the class declares options of its own then
@@ -291,8 +291,11 @@
 % |\@ifpackageloaded{|\meta{package}|}{|\meta{true}|}{|\meta{false}|}|.
 %
 % \DescribeMacro\@ifpackagelater
-% To find out if a package has already been loaded with a version more
-% recent than \meta{version}, use
+% \changes{v1.1i}{2013/07/07}{Correctly describe how the date in
+%       \cs{@ifpackagelater} is used}
+% To find out if a package has already been loaded with a version
+% equal to or more
+% recent than \meta{version}, use\\
 % \DescribeMacro\@ifclasslater
 % |\@ifpackagelater{|\meta{package}|}{|\meta{version}|}{|^^A
 % \meta{true}|}{|\meta{false}|}|.
@@ -655,13 +658,22 @@
 % |\reserved@b|.)
 % \changes{v0.2y}{1994/02/07}
 %         {Add extra ,s so `two' is not matched with `twocolumn'}
+% \changes{v1.1i}{2011/08/19}
+%         {Re-jig definition after more stringent \cs{in@} test.}
 %    \begin{macrocode}
 \def\@if@pti@ns#1#2{%
-  \let\reserved@a\@firstoftwo
-  \@for\reserved@b:=#2\do{%
-    \expandafter\in@\expandafter{\expandafter,\reserved@b,}{,#1,}%
-    \ifin@\else\let\reserved@a\@secondoftwo\fi}%
-  \reserved@a}
+ \let\reserved@a\@firstoftwo
+ \@for\reserved@b:=#2\do{%
+   \ifx\reserved@b\@empty
+   \else
+     \expandafter\in@\expandafter{\expandafter,\reserved@b,}{,#1,}%
+     \ifin@
+     \else
+       \let\reserved@a\@secondoftwo
+     \fi
+   \fi
+ }%
+ \reserved@a}
 \@onlypreamble\@if@pti@ns
 %    \end{macrocode}
 % \end{macro}
@@ -721,7 +733,7 @@
 %         {Delay definition of \cs{ProvidesFile} till ltfinal}
 % \changes{v1.1a}{1998/03/21}
 %         {Allow \&. Internal/2702}
-% \changes{v1.1d}{2001/05/25}{Explicitly set catcode of 
+% \changes{v1.1d}{2001/05/25}{Explicitly set catcode of
 %                              \cs{endlinechar} to 10 (pr/3334)}
 % \changes{v1.1e}{2001/06/04}{But only if it is a char (pr/3334)}
 % \changes{v1.1f}{2001/08/26}{Readded setting of space char (pr/3353)}
diff --git a/Master/texmf-dist/source/latex/base/ltcntrl.dtx b/Master/texmf-dist/source/latex/base/ltcntrl.dtx
index de7688c8b8a..fd294c42f5d 100644
--- a/Master/texmf-dist/source/latex/base/ltcntrl.dtx
+++ b/Master/texmf-dist/source/latex/base/ltcntrl.dtx
@@ -1,30 +1,30 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2014
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltcntrl.dtx}
-             [2007/08/06 v1.0h LaTeX Kernel (program control)]
+             [2014/04/21 v1.0h LaTeX Kernel (program control)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltcntrl.dtx}
@@ -62,7 +62,7 @@
 %         {Documentation improvements}
 %
 % \section{Program control structure}
-% 
+%
 % This section defines a number of control structure macros, such as
 % while-loops and for-loops.
 %
@@ -85,7 +85,7 @@
 %     Optimized for normal case of SWITCH initially false.
 %
 % \@for NAME := LIST \do {BODY} : Assumes that LIST expands to A1,A2,
-%      ... ,An . 
+%      ... ,An .
 %      Executes  BODY  n  times, with  NAME = Ai  on the i-th iteration.
 %      Optimized for the normal case of n = 1.  Works for n=0.
 %
@@ -97,7 +97,7 @@
 %  NOTES: 1. These macros use no \@temp sequences.
 %         2. These macros do not work if the body contains anything that
 %         looks syntactically to TeX like an improperly balanced \if
-%         \else \fi. 
+%         \else \fi.
 %
 % \@whilenum TEST \do {BODY} ==
 %  BEGIN
@@ -270,7 +270,7 @@
 %
 % \begin{macro}{\@tfor}
 % \changes{LaTeX209}{1991/10/17}
-%         {(Rms) \cs{xdef} replaced by \cs{def} 
+%         {(Rms) \cs{xdef} replaced by \cs{def}
 %          (See FMi's array.doc)}
 % \changes{v1.0c}{1994/03/13}
 %         {(DPC) Add \cs{@tf@r} so a single group is
@@ -298,9 +298,11 @@
 % \end{macro}
 %
 % \begin{macro}{\@removeelement}
-%    Removes an element from a comma-separated list and puts it into 
-%    a control sequence, called as 
+%    Removes an element from a comma-separated list and puts it into
+%    a control sequence, called as
 %    |\@removeelement{|\meta{element}|}{|\meta{list}|}{|\meta{cs}|}|.
+%    Due to the implementation method the \meta{element} is not allowed
+%    to contain braces.
 %    \begin{macrocode}
 \def\@removeelement#1#2#3{%
   \def\reserved@a##1,#1,##2\reserved@a{##1,##2\reserved@b}%
diff --git a/Master/texmf-dist/source/latex/base/ltcounts.dtx b/Master/texmf-dist/source/latex/base/ltcounts.dtx
index 8935968fdc1..4ccd7e9a043 100644
--- a/Master/texmf-dist/source/latex/base/ltcounts.dtx
+++ b/Master/texmf-dist/source/latex/base/ltcounts.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -68,7 +68,7 @@
 % \DescribeMacro{\newcounter}
 % To define a new counter.
 %
-% \DescribeMacro{\setcounter} 
+% \DescribeMacro{\setcounter}
 % To set the value of counters.
 %
 % \DescribeMacro{\addtocounter}
@@ -156,15 +156,15 @@
 %         |\label|\marg{bar} command causes |\ref|\marg{bar} to
 %          generate the current value of counter \meta{foo}.
 %
-%    |\@definecounter|\marg{foo}\\ 
+%    |\@definecounter|\marg{foo}\\
 %        Initializes counter \marg{foo} (with empty reset list), defines
 %        |\p@foo| and |\thefoo| to be null. Also adds \meta{foo}
 %        to |\cl@@ckpt| --
 %          the reset list of a dummy counter |@ckpt| used for taking
 %          checkpoints for the |\include| system.
 %
-%    |\@addtoreset|\marg{foo}\marg{bar} : 
-%          Adds counter \meta{foo} to the list of counters 
+%    |\@addtoreset|\marg{foo}\marg{bar} :
+%          Adds counter \meta{foo} to the list of counters
 %         |\cl@bar| to be reset  when counter \meta{bar} is stepped.
 %
 %
@@ -201,7 +201,7 @@
 % \begin{macro}{\newcounter}
 % |\newcounter|\marg{newctr}\oarg{oldctr}
 %    Defines \meta{newctr} to be a counter, which is reset when counter
-%       \meta{oldctr} is stepped.  If \meta{newctr} already defined 
+%       \meta{oldctr} is stepped.  If \meta{newctr} already defined
 % produces
 %           `|c@newctr  already defined|' error.
 %    \begin{macrocode}
@@ -238,7 +238,7 @@
 %       math mode}
 % \changes{v1.0d}{1994/04/09}
 %     {Use \cs{addtocounter} to have name checked}
-%    |\stepcounter|{foo} 
+%    |\stepcounter|{foo}
 %  Globally increments counter |\c@FOO|
 %                             and resets all subsidiary counters.
 %    \begin{macrocode}
@@ -338,7 +338,7 @@
 %     {Use \cs{mathsection} and \cs{mathparagraph}. latex/2445}
 %
 %    Representation of \meta{COUNTER} as a footnote
-%                           symbol: 1 = $*$, 2 = $\dagger$, etc.      
+%                           symbol: 1 = $*$, 2 = $\dagger$, etc.
 %    \begin{macrocode}
 \def\fnsymbol#1{\expandafter\@fnsymbol\csname c@#1\endcsname}
 %    \end{macrocode}
@@ -348,7 +348,7 @@
 % \changes{v1.0f}{1994/05/13}{Removed \cs{@Ialph}}
 %
 %  \begin{macro}{\@arabic}
-%     |\@arabic\FOOcounter| 
+%     |\@arabic\FOOcounter|
 %     Representation of |\FOOcounter| as arabic numerals.
 %    \begin{macrocode}
 \def\@arabic#1{\number #1}  %% changed 29 Apr 86
@@ -413,7 +413,7 @@
     Y\or Z\else\@ctrerr\fi}
 %    \end{macrocode}
 %  \end{macro}
-%    
+%
 %  \begin{macro}{\@fnsymbol}
 %  \changes{v1.1b}{1995/05/20}{Allowing both text and math}
 %    Typesetting old fashioned footnote symbols.
diff --git a/Master/texmf-dist/source/latex/base/ltdefns.dtx b/Master/texmf-dist/source/latex/base/ltdefns.dtx
index d6a51b6ea36..5bec77aebdf 100644
--- a/Master/texmf-dist/source/latex/base/ltdefns.dtx
+++ b/Master/texmf-dist/source/latex/base/ltdefns.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -56,23 +56,23 @@
 % \CheckSum{746}
 %
 % \changes{v1.0n}{1994/05/10}{(ASAJ) Added
-%    \cs{DeclareProtectedCommand}.} 
+%    \cs{DeclareProtectedCommand}.}
 % \changes{v1.0p}{1994/05/12}{(ASAJ) Fixed a bug with \cs{relax}
-%    which was 
+%    which was
 %    using \cs{@gobble} before defining it.}
 % \changes{v1.0q}{1994/05/13}{(ASAJ) Renamed
-%    \cs{DeclareProtectedCommand} to 
-%    \cs{DeclareRobustCommand}.  Removed \cs{@if@short@command}.} 
+%    \cs{DeclareProtectedCommand} to
+%    \cs{DeclareRobustCommand}.  Removed \cs{@if@short@command}.}
 % \changes{v1.0q}{1994/05/13}{(ASAJ) Replaces \cs{space} by `~' in
-%    \cs{csname}.} 
+%    \cs{csname}.}
 % \changes{v1.0r}{1994/05/13}{(ASAJ) Added logging message to
-%    \cs{DeclareProtectedCommand}.} 
+%    \cs{DeclareProtectedCommand}.}
 % \changes{v1.0s}{1994/05/13}{(ASAJ) Added \cs{@backslashchar}.}
 % \changes{v1.0s}{1994/05/13}{(ASAJ) Coded \cs{@ifdefinable} more
-%    efficiently.} 
+%    efficiently.}
 % \changes{v1.1a}{1994/05/16}{(ASAJ) Split from ltinit.dtx.}
 % \changes{v1.1b}{1994/05/17}{(ASAJ) Removed warnings and logging to
-%    lterror.dtx.} 
+%    lterror.dtx.}
 % \changes{v1.1b}{1994/05/17}{(ASAJ) Added definitions for protect.}
 % \changes{v1.1c}{1994/05/17}{(ASAJ) Redid definitions for protect.}
 % \changes{v1.1d}{1994/05/19}{(RmS) Added definitions for
@@ -88,11 +88,11 @@
 % \changes{v1.0g}{1994/11/17}
 %         {\cs{@tempa} to \cs{reserved@a}}
 % \changes{v1.0p}{1995/07/13}{Updates to documentation}
-%  
+%
 % \section{Definitions}
 %
 % This section contains commands used in defining other macros.
-% 
+%
 % \StopEventually{}
 %
 %    \begin{macrocode}
@@ -173,12 +173,12 @@
 %  The redefinition (via |\let|) of |\-| within tabbing also makes the
 %  use of a robust command advisable since then any redefinition
 %  of |\-| via |\DeclareRobustCommand| will not cause a conflict.
-%  
+%
 %  Therefore, macro writers should be hereby warned that
 %  these internals will probably change! It is likely that a future
 %  release of \LaTeX{} will make |\-| effectively an encoding specific
 %  text command.
-% 
+%
 %    \begin{macrocode}
 \let\@@hyph=\-        % Save original primitive definition
 \def\-{\discretionary{-}{}{}}
@@ -209,7 +209,7 @@
 % \changes{LaTeX2e}{1993/11/22}{Macro added}
 %  \begin{macro}{\@plus}
 % \changes{LaTeX2e}{1993/11/22}{Macro added}
-%    
+%
 %    The following definitions save token space.  E.g., using
 %    |\@height| instead of height saves 5 tokens at the cost in time
 %    of one macro expansion.
@@ -240,7 +240,7 @@
 % This section defines the following commands:
 %
 % \DescribeMacro
-%  {\@namedef}\marg{NAME}\\ Expands to |\def\|\marg{NAME}, 
+%  {\@namedef}\marg{NAME}\\ Expands to |\def\|\marg{NAME},
 %   except name can contain any characters.
 %
 % \DescribeMacro
@@ -250,7 +250,7 @@
 % \DescribeMacro
 %  {\@ifnextchar} X\marg{YES}\marg{NO}\\
 %    Expands to \meta{YES} if next character is an `X',
-%          and to \meta{NO} otherwise. 
+%          and to \meta{NO} otherwise.
 %          (Uses |\reserved@a|--|\reserved@c|.)
 %          NOTE: GOBBLES ANY SPACE FOLLOWING IT.
 %
@@ -329,7 +329,7 @@
 %                      instead of executing it.
 %
 % \changes{LaTeX209}{1992/03/18}
-%  {(RMS) changed input channel from 0 to \cs{@inputcheck} to avoid 
+%  {(RMS) changed input channel from 0 to \cs{@inputcheck} to avoid
 %     conflicts with other channels allocated by \cs{newread}}
 %
 %  \begin{macro}{\typein}
@@ -493,7 +493,7 @@
 % \changes{v1.2q}{1995/10/02}
 %     {Add \cs{aut@global} in autoload version}
 % \changes{v1.2z2}{1998/03/04}
-%     {Unnecessary \cs{expandafter} removed: pr/2758} 
+%     {Unnecessary \cs{expandafter} removed: pr/2758}
 %    \begin{macrocode}
 %<autoload>\aut@global
      \expandafter\def\expandafter#1\expandafter{%
@@ -530,7 +530,7 @@
 % be followed by |[|. If this command were only used in |\newcommand|
 % definitions then |#1| would be a single token and the braces could
 % be omitted from |{#1}| in the definition below, saving a bit of
-% memory. 
+% memory.
 % \changes{v1.1g}{2004/01/23}{Use kernel version of
 %                             \cs{@ifnextchar} (pr/3501)}
 %    \begin{macrocode}
@@ -545,7 +545,7 @@
 % Robust version of |\@testopt|. The extra argument (|#1|) must be a
 % single token. If protection is needed the call expands to |\protect|
 % applied to this token, and the 2nd and 3rd arguments are
-% discarded (by |\@x@protect|). Otherwise |\@testopt| is called on 
+% discarded (by |\@x@protect|). Otherwise |\@testopt| is called on
 % the 2nd and 3rd arguments.
 %
 % This method of making commands robust avoids the need for using up
@@ -564,9 +564,9 @@
 %  \begin{macro}{\@yargdef}
 %  \begin{macro}{\@yargd@f}
 % \changes{v1.3f}{1999/04/29}{New macro added}
-%    
-% \changes{LaTeX2e}{1993/11/23}{Macro interface changed} 
-% \changes{LaTeX2e}{1993/11/23}{Avoid \cs{@?@?} token} 
+%
+% \changes{LaTeX2e}{1993/11/23}{Macro interface changed}
+% \changes{LaTeX2e}{1993/11/23}{Avoid \cs{@?@?} token}
 % \changes{v1.0b}{1994/03/12}{Name changed from \cs{XXX@argdef}}
 % \changes{v1.3c}{1999/01/18}{New implementation DPC /2942}
 % \changes{v1.3d}{1999/02/09}{catch bad argument forms by re-inserting \#3}
@@ -580,7 +580,7 @@
 %    Reorganised slightly so that |\renewcommand{\reserved@a}[1]{foo}|
 %    works.  I am not sure this is worth it, as a following
 %    |\newcommand| would over-write the definition of |\reserved@a|.
-%    
+%
 %    Recall that \LaTeX2.09 goes into an infinite loop with
 %    |\renewcommand[1]{\@tempa}{foo}| (DPC 6 October 93).
 %
@@ -595,7 +595,7 @@
 %    this argument and use of) |\number| was added later in 1999.
 %
 %    It is not clear why these are still |\long|.
-%    
+%
 %    \begin{macrocode}
 \long \def \@yargdef #1#2#3{%
   \ifx#2\tw@
@@ -607,7 +607,7 @@
     \@yargd@f \expandafter{\number #3}#1%
 }
 %    \end{macrocode}
-%    
+%
 % The |\aut@global| command below is only used in the autoload
 % format. If it is |\global| then a global definition will be made.
 % \changes{v1.2q}{1995/10/02}
@@ -621,7 +621,7 @@
   \l@ngrel@x \reserved@a 0##1##2##3##4##5##6##7##8##9###1%
 }
 %    \end{macrocode}
-%    
+%
 %  \end{macro}
 %  \end{macro}
 %
@@ -652,7 +652,7 @@
 %  \changes{v1.2y}{1996/07/26}{use \cs{relax} in place of empty arg}
 %  \changes{v1.2y}{1996/07/26}{use \cs{noexpand} instead of \cs{string}}
 % \changes{v1.2z1}{1997/10/21}{Use \cs{begingroup}/\cs{endgroup} rather
-%    than braces for grouping, to avoid generating empty math atom.} 
+%    than braces for grouping, to avoid generating empty math atom.}
 %    \begin{macrocode}
 \def\renew@command#1{%
   \begingroup \escapechar\m@ne\xdef\@gtempa{{\string#1}}\endgroup
@@ -691,7 +691,7 @@
 %    \end{macrocode}
 %    Version of |\@ifdefinable| for use with |\renewcommand|.  Does
 %    not do the check this time, but restores the normal definition.
-%    \begin{macrocode} 
+%    \begin{macrocode}
 \long\def\@rc@ifdefinable#1#2{%
   \let\@ifdefinable\@@ifdefinable
   #2}
@@ -751,7 +751,7 @@
 %    here as there should not be a |@temp|\ldots\ environment.
 % \changes{LaTeX2e}{1993/11/23}{Macro reimplemented and extended}
 % \changes{v1.1f}{1994/05/2}{Removed surplus \cs{space} in error}
-%    \begin{macrocode} 
+%    \begin{macrocode}
 \def\renewenvironment{\@star@or@long\renew@environment}
 %    \end{macrocode}
 %
@@ -809,7 +809,7 @@
 % \changes{v1.2q}{1995/10/02}
 %     {Add \cs{aut@global} in autoload version}
 % And here's a different sort of allocation:
-% For example, 
+% For example,
 % |\newif\iffoo| creates |\footrue|, |\foofalse| to go with |\iffoo|.
 %    \begin{macrocode}
 \def\newif#1{%
@@ -839,9 +839,9 @@
 % |\providecommand| takes the same arguments as |\newcommand|, but
 % discards them if |#1| is already defined, Otherwise it just acts like
 % |\newcommand|. This implementation currently leaves any discarded
-% definition in |\reserved@a| (and possibly |\\reserved@a|) this 
-% wastes a bit of space, but it will be reclaimed as soon as these 
-% scratch macros are redefined. 
+% definition in |\reserved@a| (and possibly |\\reserved@a|) this
+% wastes a bit of space, but it will be reclaimed as soon as these
+% scratch macros are redefined.
 %
 % \changes{LaTeX2e}{1993/11/22}{Macro added}
 %    \begin{macrocode}
@@ -895,7 +895,7 @@
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@check@c}
 % \changes{v1.2i}{1995/04/25}{Make \cs{long} for latex/1346}
 %    |\CheckCommand| itself just grabs all the arguments we need,
@@ -921,7 +921,7 @@
 \def\@check@eq#1#2{%
   \ifx#1#2\else
      \@latex@warning@no@line
-               {Command \noexpand#1 has 
+               {Command \noexpand#1 has
                 changed.\MessageBreak
                 Check if current package is valid}%
   \fi}
@@ -953,7 +953,7 @@
 \long\def\@secondoftwo#1#2{#2}
 %    \end{macrocode}
 % \begin{macro}{\@iden}
-%    |\@iden| is another name for |\@firstofone| for 
+%    |\@iden| is another name for |\@firstofone| for
 %    compatibility reasons.
 %    \begin{macrocode}
 \let\@iden\@firstofone
@@ -993,16 +993,16 @@
 %    using \cs{@gobble} before defining it.}
 % \changes{v1.0q}{1994/05/13}{Renamed \cs{DeclareProtectedCommand} to
 %    \cs{DeclareRobustCommand}.  Removed \cs{@if@short@command}.
-%    Moved to after the definition of \cs{@gobble}.} 
+%    Moved to after the definition of \cs{@gobble}.}
 % \changes{v1.0r}{1994/05/13}{Added logging message to
-%    \cs{DeclareProtectedCommand}.} 
+%    \cs{DeclareProtectedCommand}.}
 %
 % \subsection{Robust commands and protect}
 %
 % \changes{v1.1b}{1994/05/17}{Added the discussion of protected
 %    commands, defined the values that \cs{protect} should have.}
 % \changes{v1.1c}{1994/05/18}{Redid the discussion and definitions, in
-%    line with the proposed new setting of \cs{protect} in the output 
+%    line with the proposed new setting of \cs{protect} in the output
 %    routine.}
 %
 % Fragile and robust commands are one of the thornier issues in
@@ -1013,14 +1013,14 @@
 % `moving arguments' by \LaTeX, and consist of:
 % \begin{itemize}
 % \item writing information to a file, such as indexes or tables of
-%    contents. 
+%    contents.
 % \item writing information to the screen.
 % \item inside an |\edef|, |\message|, |\mark|, or other command which
 %    evaluates its argument fully.
 % \end{itemize}
 % The method \LaTeX{} uses for making fragile commands robust is to
 % precede them with |\protect|.  This can have one of five possible
-% values: 
+% values:
 % \begin{itemize}
 % \item |\relax|, for normal typesetting.  So |\protect\foo| will
 %    execute |\foo|.
@@ -1063,19 +1063,19 @@
 %    This is a package-writers command, which has the same syntax as
 %    |\newcommand|, but which declares a protected command.  It does
 %    this by having\\
-%    |\DeclareRobustCommand\foo|\\ 
+%    |\DeclareRobustCommand\foo|\\
 %    define |\foo| to be
 %    |\protect\foo<space>|,\\
 %    and then use |\newcommand\foo<space>|.\\
 %    Since the internal command is |\foo<space>|, when it is written
-%    to an auxiliary file, it will appear as |\foo|.  
-%    
+%    to an auxiliary file, it will appear as |\foo|.
+%
 %    We have to be a
 %    bit cleverer if we're defining a short command, such as |\_|, in
 %    order to make sure that the auxiliary file does not include a
 %    space after the command, since |\_ a| and |\_a| aren't the same.
 %    In this case we define |\_| to be:
-%\begin{verbatim} 
+%\begin{verbatim}
 %    \x@protect\_\protect\_<space>
 %\end{verbatim}
 %    which expands to:
@@ -1088,7 +1088,7 @@
 %    Then if |\protect| is |\@typeset@protect| (normally |\relax|)
 %    then we just perform |\_<space>|, and otherwise
 %    |\@x@protect@| gobbles everything up and expands to
-%    |\protect\_|. 
+%    |\protect\_|.
 %
 %    \emph{Note}: setting |\protect| to any value other than |\relax|
 %    whilst in `typesetting' mode will cause commands to go into an
@@ -1159,12 +1159,12 @@
 % \end{macro}
 %
 % \changes{v1.2e}{1994/11/04}{Added commands for setting and restoring
-%    \cs{protect}.  ASAJ.} 
+%    \cs{protect}.  ASAJ.}
 %
 % \begin{macro}{\set@display@protect}
 % \begin{macro}{\set@typeset@protect}
 %    These macros set |\protect| appropriately for typesetting or
-%    displaying. 
+%    displaying.
 % \changes{v1.2o}{1995/07/03}{Use \cs{@typeset@protect} for init}
 %    \begin{macrocode}
 \def\set@display@protect{\let\protect\string}
@@ -1218,7 +1218,7 @@
 % \subsection{Internal defining commands}
 %
 % These commands are used internally to define other \LaTeX{}
-% commands. 
+% commands.
 % \begin{macro}{\@ifundefined}
 % \changes{LaTeX2e}{1993/11/23}{Redefined to remove a trailing \cs{fi}}
 %    Check if first arg is undefined or \cs{relax} and execute second or
@@ -1236,7 +1236,7 @@
 %
 % \begin{macro}{\@qend}
 % \begin{macro}{\@qrelax}
-% The following define |\@qend| and |\@qrelax| to be the strings 
+% The following define |\@qend| and |\@qrelax| to be the strings
 % `|end|' and `|relax|' with the characters |\catcode|d 12.
 %    \begin{macrocode}
 \edef\@qend{\expandafter\@cdr\string\end\@nil}
@@ -1248,7 +1248,7 @@
 %
 % \begin{macro}{\@ifnextchar}
 % \changes{LaTeX209}{1992/08/24}
-%     {(Rms) \cs{@ifnextchar} didn't work if its 
+%     {(Rms) \cs{@ifnextchar} didn't work if its
 %         first argument was an equal sign.}
 % \changes{v1.2q}{1995/10/02}
 %     {Use \cs{@let@token} }
@@ -1269,7 +1269,7 @@
   \futurelet\@let@token\@ifnch}
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 % \begin{macro}{\kernel@ifnextchar}
 % \changes{v1.3g}{2004/01/23}{Added macro (pr/3501)}
 %    This macro is the kernel version of |\@ifnextchar| which is used
@@ -1278,7 +1278,7 @@
 %    if an \texttt{fd} file
 %    is loaded in a random place then the optional argument to
 %    |\ProvidesFile| could get printed there instead of being written
-%    only in the log file.  This happened 
+%    only in the log file.  This happened
 %    when there was a space or a newline between the mandatory and
 %    optional arguments! It should really be fixed in the
 %    \texttt{amsmath} package one day, but\ldots
@@ -1335,7 +1335,7 @@
 %    \end{macrocode}
 % \end{macro}
 
-% \changes{v1.0n}{1994/05/10}{Added \cs{makeatletter} and 
+% \changes{v1.0n}{1994/05/10}{Added \cs{makeatletter} and
 %           \cs{makeatother} ASAJ.}
 %
 % \begin{macro}{\makeatletter}
@@ -1386,11 +1386,11 @@
 %
 %  \begin{macro}{\@onelevel@sanitize}
 % \changes{v1.2c}{1994/10/30}{Macro added}
-%    
+%
 %    This makes the whole ``meaning'' of |#1| (its one-level
 %    expansion) into catcode 12 tokens: it could be used in
 %    |\DeclareRobustCommand|.
-%    
+%
 %    If it is to be used on default float specifiers, this should be
 %    done when they are defined.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/ltdirchk.dtx b/Master/texmf-dist/source/latex/base/ltdirchk.dtx
index 62de66d8f16..eab328cdad1 100644
--- a/Master/texmf-dist/source/latex/base/ltdirchk.dtx
+++ b/Master/texmf-dist/source/latex/base/ltdirchk.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \ProvidesFile{ltdirchk.dtx}
@@ -61,7 +61,7 @@
 % \changes{v0.2j}{1994/02/25}
 %         {Remove need for drv file}
 % \changes{v0.2k}{1994/03/01}
-%         {Add unstripped module, 
+%         {Add unstripped module,
 %          so that dircheck.dtx may be used with initex}
 % \changes{v1.0a}{1994/03/08}
 %         {Reorganise driver module into `new style'}
@@ -104,7 +104,7 @@
 % want to make |\@currdir| a macro with arguments delimited by |.|
 % and/or \meta{space}. If the operating system has no concept of
 % directory structure, this macro should be defined to be empty.
-% 
+%
 %
 % \DescribeMacro{\input@path}
 % If the primitive |\openin| searches the same directories as the
@@ -116,8 +116,8 @@
 % defined to be a list of directories to search for input files. The
 % format for each directory is as for |\@currdir|, normally just a
 % prefix is required, but it may be a macro with space-delimited
-% argument. That is, if \meta{dir} is an entry in the input path, 
-% \TeX\ will try to load the expansion of 
+% argument. That is, if \meta{dir} is an entry in the input path,
+% \TeX\ will try to load the expansion of
 %   \meta{dir}\meta{filename}\meta{space}
 %
 % So either \meta{dir} should be defined as a macro with argument
@@ -127,7 +127,7 @@
 % syntax, each \meta{dir} should end with a slash, |/|.
 %
 % |\input@path| should expand to a list of such directories, each in a
-% |{}| group. 
+% |{}| group.
 %
 % \DescribeMacro{\filename@parse}
 % After a call of the form: |\filename@parse{|\meta{filename}|}|, the
@@ -137,7 +137,7 @@
 % \meta{filename}, |\filename@ext| should be |\let| to |\relax| (so this
 % case may be tested with |\@ifundefined{filename@ext}| and, perhaps a
 % default extension substituted).
-% 
+%
 % Normally one would not need to define this macro in |texsys.cfg| as
 % the automatic tests can supply parsers that work with UNIX and VMS and
 % Macintosh syntax, as well as a basic parser that will cover many other
@@ -148,7 +148,7 @@
 % Currently if the UNIX, VMS or Macintosh parser is not used,
 % |\filename@parse| is  defined to always return an empty area, and to
 % split the argument into  basename and extension at the first `|.|'
-% that occurs in the name. 
+% that occurs in the name.
 % Parsers for other formats may be defined in |texsys.cfg|,
 % in which case they will be used in preference to the default
 % definitions.
@@ -179,11 +179,11 @@
 %! LaTeX Error: \rubbish undefined.^^J^^JSee the LaTeX manual or LaTeX=
 % Companion
 % for explanation.^^JType  H <return>  for immediate help.
-% ...                                              
-%                                                  
+% ...
+%
 %l.3 \renewcommand{\rubbish}
 %                           {}
-%? 
+%?
 %\end{verbatim}
 % \endgroup\noindent
 % However if you put |\def\@TeXversion{3.14}| in \texttt{texsys.cfg}
@@ -194,13 +194,13 @@
 %See the LaTeX manual or LaTeX Companion for explanation.
 %Type  H <return>  for immediate help.
 %! .
-% ...                                              
-%                                                  
+% ...
+%
 %l.3 \renewcommand{\rubbish}
 %                           {}
-%? 
+%?
 %\end{verbatim}
-% Note that this has an extra line |! .| which does not appear in 
+% Note that this has an extra line |! .| which does not appear in
 % error messages that use the default settings with a current version of
 % \TeX, but this should not cause any confusion we hope.
 %
@@ -261,7 +261,7 @@
 % \changes{v1.0n}{1995/11/01}
 %         {Initialise \cs{@addtofilelist} to \cs{@gobble}}
 % This is a special version of |\ProvidesFile| for initex use.
-% \changes{v1.0x}{2001/05/25}{Explicitly set catcode of 
+% \changes{v1.0x}{2001/05/25}{Explicitly set catcode of
 %                              \cs{endlinechar} to 10 (pr/3334)}
 % \changes{v1.0y}{2001/06/04}{But only if it is a char (pr/3334)}
 %    \begin{macrocode}
@@ -314,7 +314,7 @@
 % not, all the text in this file between START and END is copied
 % verbatim to a new file |texsys,cfg|. If |texsys.cfg| is found, then it
 % is simply input. This is only done when this file is being used
-% unstripped.  
+% unstripped.
 %    \begin{macrocode}
 %<*docstrip>
 \openin15=texsys.cfg
@@ -330,7 +330,7 @@
      \immediate\write15{#1}%
      \expandafter\reserved@a\fi}%
 \def\reserved@d#1START^^M{\let\do\@makeother\dospecials\reserved@a}%
-\catcode`\%=12 
+\catcode`\%=12
 \def\reserved@c{%END}
 \reserved@d
 %    \end{macrocode}
@@ -356,7 +356,7 @@
 % want to make |\@currdir| a macro with arguments delimited by |.|
 % and/or \meta{space}. If the operating system has no concept of
 % directory structure, this macro should be defined to be empty.
-% 
+%
 %
 % \DescribeMacro{\input@path}
 % If the primitive |\openin| searches the same directories as the
@@ -368,8 +368,8 @@
 % defined to be a list of directories to search for input files. The
 % format for each directory is as for |\@currdir|, normally just a
 % prefix is required, but it may be a macro with space-delimited
-% argument. That is, if \meta{dir} is an entry in the input path, 
-% \TeX will try to load the expansion of 
+% argument. That is, if \meta{dir} is an entry in the input path,
+% \TeX will try to load the expansion of
 %
 %   \meta{dir}\meta{filename}\meta{space}
 %
@@ -383,7 +383,7 @@
 % and the  `current directory' to be searched.
 %
 % |\input@path| should expand to a list of such directories, each in a
-% |{}| group. 
+% |{}| group.
 %
 %
 % \DescribeMacro{\filename@parse}
@@ -394,7 +394,7 @@
 % \meta{filename}, |\filename@ext| should be |\let| to |\relax| (so this
 % case may be tested with |\@ifundefined{filename@ext}| and, perhaps a
 % default extension substituted).
-% 
+%
 % Normally one would not need to define this macro in |texsys.cfg| as
 % the automatic tests can supply parsers that work with UNIX and VMS
 % syntax, as well as a basic parser that willcover many other cases.
@@ -425,7 +425,7 @@
 % This implementation does make |\openin| and |\input| look in the same
 % places. Acceptable settings are made by |ltdirchk.dtx|, and so this
 % file may be empty. The definitions below are therefore just for
-% information. 
+% information.
 %    \begin{macrocode}
 %\def\@currdir{./}
 %\let\input@path\@undefined
@@ -449,7 +449,7 @@
 % This implementation does make |\openin| and |\input| look in the same
 % places. Acceptable settings are made by |ltdirchk.dtx|, and so this
 % file may be empty. The definitions below are therefore just for
-% information. 
+% information.
 %    \begin{macrocode}
 % \def\@currdir{./}
 % \let\input@path\@undefined
@@ -461,7 +461,7 @@
 % the following (with whatever directories are used at your site):
 % note that the directory names should end with |/|.
 % This assumes the implementation uses UNIX style |/| as the directory
-% separator. 
+% separator.
 %    \begin{macrocode}
 % \def\@currdir{./}
 % \def\input@path{%
@@ -475,7 +475,7 @@
 % This implementation does make |\openin| and |\input| look in the same
 % places. Acceptable settings are made by |ltdirchk.dtx|, and so this
 % file may be empty. The definitions below are therefore just for
-% information. 
+% information.
 %    \begin{macrocode}
 % \def\@currdir{[]}
 % \let\input@path\@undefined
@@ -497,7 +497,7 @@
 % This implementation does make |\openin| and |\input| look in the same
 % places. Acceptable settings are made by |ltdirchk.dtx|, and so this
 % file may be empty. The definitions below are therefore just for
-% information. 
+% information.
 %    \begin{macrocode}
 % \def\@currdir{:}
 % \let\input@path\@undefined
@@ -645,7 +645,7 @@
 % \changes{v0.2f}{1994/01/20}
 %         {\cs{@copytexsys} removed}
 % \changes{v1.0u}{1996/12/06}
-%         {*** removed from various messages for GNU Make. 
+%         {*** removed from various messages for GNU Make.
 %         internal/2338}
 %    \begin{macrocode}
   \ifx\@currdir\@undefined
@@ -659,7 +659,7 @@
 % that the syntax specified works on this system. (In case a complete
 % \LaTeX\  system has been copied from  one system to another.) If the
 % test fails, give up. The installer should remove or correct the
-% offending |texsys.cfg| and try again. 
+% offending |texsys.cfg| and try again.
 %    \begin{macrocode}
 \else
   \IfFileExists{\@currdir texsys.aux}{}{%
@@ -677,13 +677,13 @@
 % \changes{v0.2d}{1994/01/14}
 %         {Close the texsys.aux output stream}
 %    \begin{macrocode}
-\immediate\closeout15 %  
+\immediate\closeout15 %
 \endgroup
 %    \end{macrocode}
 %
 %    \begin{macrocode}
 \typeout{^^J^^J%
-         \noexpand\@currdir set to: 
+         \noexpand\@currdir set to:
            \expandafter\strip@prefix\meaning\@currdir.^^J%
          }
 %    \end{macrocode}
@@ -693,7 +693,7 @@
 %
 % \changes{v0.2a}{1993/12/13}
 %         {on the `docstrip' pass, do not check openin path}
-%   
+%
 % Stop here if the file is being used unstripped.
 %    \begin{macrocode}
 %<*docstrip>
@@ -717,7 +717,7 @@
 % Now set up the |\input@path|.
 %
 % |\input@path| should either be undefined, or a list of directories as
-% described in the introduction. 
+% described in the introduction.
 % \changes{v0.2e}{1994/01/19}
 %         {No longer check that an empty group is in the path}
 %    \begin{macrocode}
@@ -758,7 +758,7 @@
       \expandafter\filename@path#1/\\}
 %    \end{macrocode}
 %
-% Search for the last |/|. 
+% Search for the last |/|.
 %    \begin{macrocode}
     \def\filename@path#1/#2\\{%
       \ifx\\#2\\%
@@ -825,7 +825,7 @@
 %    \end{macrocode}
 % |\filename@parse| was not specified in |texsys.cfg|.
 % So just make a simple parser that always sets |\filename@area| to
-% empty. 
+% empty.
 %    \begin{macrocode}
     \typeout{^^JDefining generic filename parser.^^J}
     \def\filename@parse#1{%
@@ -897,7 +897,7 @@
 % After the format has been made, and article.cls moved with the
 % other files to the `standard input directory' as specified in
 % |install.txt|, the format may be checked by running the file
-% |ltxcheck.tex|. 
+% |ltxcheck.tex|.
 % \changes{v0.2f}{1994/01/20}
 %         {Modify all of ltxcheck}
 % \changes{v1.0h}{1994/10/11}
diff --git a/Master/texmf-dist/source/latex/base/lterror.dtx b/Master/texmf-dist/source/latex/base/lterror.dtx
index ebc070f11d1..510b59e9e2f 100644
--- a/Master/texmf-dist/source/latex/base/lterror.dtx
+++ b/Master/texmf-dist/source/latex/base/lterror.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -68,14 +68,14 @@
 % \changes{v1.1d}{1994/05/21}{(ASAJ) Made the error commands robust.}
 % \changes{v1.1e}{1994/05/22}{(ASAJ) Replaced bgroup by begingroup in
 %    error messages, to stop extra mathords creeping into math mode.}
-% \changes{v1.2a}{1994/05/22}{(ASAJ) Replaced \cs{@generic@message} and 
-%    \cs{@generic@error} by \cs{GenericError}, \cs{GenericWarning} and 
+% \changes{v1.2a}{1994/05/22}{(ASAJ) Replaced \cs{@generic@message} and
+%    \cs{@generic@error} by \cs{GenericError}, \cs{GenericWarning} and
 %    \cs{GenericInfo}.}
-% \changes{v1.2a}{1994/05/22}{(ASAJ) Made \cs{GenericError}, 
+% \changes{v1.2a}{1994/05/22}{(ASAJ) Made \cs{GenericError},
 %    \cs{GenericWarning} and \cs{GenericInfo} robust.}
-% \changes{v1.2a}{1994/05/22}{(ASAJ) Replaced \cmd\\ and tilde by 
+% \changes{v1.2a}{1994/05/22}{(ASAJ) Replaced \cmd\\ and tilde by
 %    \cs{MessageBreak} and \cs{space}.}
-% \changes{v1.2a}{1994/05/22}{(ASAJ) Replaces \cs{string} by 
+% \changes{v1.2a}{1994/05/22}{(ASAJ) Replaces \cs{string} by
 %    \cs{protect} in some messages.}
 % \changes{v1.2f}{1994/05/24}{(DPC) wrap long lines}
 % \changes{v1.2h}{1994/11/17}
@@ -106,9 +106,9 @@
 % \subsection{General commands}
 %
 % \begin{macro}{\MessageBreak}
-%    This command prints a new-line inside a message, followed by a 
-%    continuation line begun with |\@msg@continuation|.  Normally it is 
-%    defined to be |\relax|, but inside messages, it is let to 
+%    This command prints a new-line inside a message, followed by a
+%    continuation line begun with |\@msg@continuation|.  Normally it is
+%    defined to be |\relax|, but inside messages, it is let to
 %    |\@message@break|.
 %    \begin{macrocode}
 \let\MessageBreak\relax
@@ -119,7 +119,7 @@
 %    \cs{Generic*} commands.  ASAJ.}
 %
 % \begin{macro}{\GenericInfo}
-%    This takes two arguments: a continuation and a message, and sends 
+%    This takes two arguments: a continuation and a message, and sends
 %    the result to the log file.
 %    \begin{macrocode}
 \DeclareRobustCommand{\GenericInfo}[2]{%
@@ -133,7 +133,7 @@
 % \end{macro}
 %
 % \begin{macro}{\GenericWarning}
-%    This takes two arguments: a continuation and a message, and sends 
+%    This takes two arguments: a continuation and a message, and sends
 %    the result to the screen.
 %    \begin{macrocode}
 \DeclareRobustCommand{\GenericWarning}[2]{%
@@ -285,7 +285,7 @@ Type  H <return>  for immediate help.}%
 %    interactive prompt.  The |WarningNoLine| commands do the same,
 %    but don't print the input line number.  The |Info| commands write
 %    the message to the
-%    |log| file.  Within the messages, the command 
+%    |log| file.  Within the messages, the command
 %    |\MessageBreak| can be used to
 %    break a line, |\protect| can be used to protect command names,
 %    and |\space| is a space, for example:
@@ -708,7 +708,7 @@ Type  H <return>  for immediate help.}%
 %    \begin{macrocode}
 \gdef\@badlinearg{%
 %<!autoload>  \@latex@error{%
-%<!autoload>       Bad \protect\line\space or \protect\vector 
+%<!autoload>       Bad \protect\line\space or \protect\vector
 %<!autoload>       \space argument}\@ehb}
 %<autoload>  \@autoerr\@badlinearg}
 %    \end{macrocode}
@@ -799,10 +799,10 @@ Type  H <return>  for immediate help.}%
 %\def\@invalidchar{\@latex@error{Invalid character in input}\@ehc}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % As well as the above error commands some error messages are directly
 % coded to save space. The Messages alrerady present in \LaTeX2.09
-% included: 
+% included:
 %
 % |Environment --- undefined|\\
 %  Issued by |\begin| for undefined environment.
diff --git a/Master/texmf-dist/source/latex/base/ltfiles.dtx b/Master/texmf-dist/source/latex/base/ltfiles.dtx
index 1612509e988..09cf8dec943 100644
--- a/Master/texmf-dist/source/latex/base/ltfiles.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfiles.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -395,7 +395,7 @@
 % \changes{v1.1k}{1997/04/14}
 %            {Macro added (from patch file) latex/2404}
 % The setting of |\@empty| is just a flag. This command may be defined
-% in a class or package file. If it is still |\@empty| at 
+% in a class or package file. If it is still |\@empty| at
 % |\begin{document}| it will be defined to be |\frenchspacing| or
 % |\nonfrenchspacing|, depending on which of those appears to be in
 % effect at that point.
diff --git a/Master/texmf-dist/source/latex/base/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx
index 97fee1e3d9c..31aa3fcfc2c 100644
--- a/Master/texmf-dist/source/latex/base/ltfinal.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfinal.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -359,9 +359,9 @@
 %  \reserved@a{"7F}{"FF}
 %\fi
 %    \end{macrocode}
-%    
+%
 % \subsection{Lccodes and uccodes}
-%    
+%
 % \changes{v1.1b}{1998/05/20}{Set up uc/lccodes after loading
 %    hyphenation files: pr/2639}
 %    We now again set up the default (T1) uc/lccodes.
@@ -426,7 +426,7 @@
 % \begin{macro}{\@uclclist}
 %
 % \changes{v1.1a}{1997/10/20}{Removed \cs{aa} and \cs{AA} from
-%    \cs{@uclclist} as these are macros.} 
+%    \cs{@uclclist} as these are macros.}
 %
 %    And whilst we're doing things with uc/lc tables, here are two
 %    commands to upper- and lower-case a string.
@@ -496,7 +496,7 @@
              Applying patch file ltpatch.ltx^^J%
             =================================}
    \def\fmtversion@topatch{unknown}
-   \input{ltpatch.ltx} 
+   \input{ltpatch.ltx}
    \ifx\fmtversion\fmtversion@topatch
       \ifx\patch@level\@undefined
         \typeout{^^J^^J^^J%
@@ -576,14 +576,14 @@
 %
 % \begin{macro}{\errhelp}
 % \changes{v0.1g}{1994/05/05}{Set error help empty.}
-% \changes{v1.1d}{2000/09/01}{Set error help empty at very end 
+% \changes{v1.1d}{2000/09/01}{Set error help empty at very end
 %                             (pr/449 done correctly).}
 % Empty the error help message, which may have some rubbish:
 %    \begin{macrocode}
 \errhelp{}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \subsection{Initialise file list}
 %
 % \begin{macro}{\@providesfile}
@@ -615,7 +615,7 @@
 % \end{macro}
 %
 % \subsection{Dumping the format}
-%    Finally we make |@| into a letter, ensure the format will 
+%    Finally we make |@| into a letter, ensure the format will
 % be in the `normal' error mode, and dump everything into the
 %    format file.
 % \changes{v1.0t}{1995/06/13}
diff --git a/Master/texmf-dist/source/latex/base/ltfloat.dtx b/Master/texmf-dist/source/latex/base/ltfloat.dtx
index 2669e706b74..4ab1240289f 100644
--- a/Master/texmf-dist/source/latex/base/ltfloat.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfloat.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltfloat.dtx
@@ -115,22 +115,22 @@
 %
 %  \c@topnumber      : Number of floats allowed at the top of a column.
 %  \topfraction      : Fraction of column that can be devoted to floats.
-%  \c@dbltopnumber, \dbltopfraction 
+%  \c@dbltopnumber, \dbltopfraction
 %                    : Same as above, but for double-column floats.
-%  \c@bottomnumber, \bottomfraction 
+%  \c@bottomnumber, \bottomfraction
 %                    : Same as above for bottom of page.
 %  \c@totalnumber    : Number of floats allowed in a single column,
 %                          including in-text floats.
 %  \textfraction     :Minimum fraction of column that must contain text.
 %  \floatpagefraction: Minimum fraction of page that must be taken
 %                          up by float page.
-%  \dblfloatpagefraction 
+%  \dblfloatpagefraction
 %                    : Same as above, for double-column floats.
 %
 % The document style must define the following.
 %
 %    \fps@TYPE   : The default placement specifier for floats of type
-%                  TYPE. 
+%                  TYPE.
 %
 %    \ftype@TYPE : The type number for floats of type TYPE.
 %
@@ -141,7 +141,7 @@
 %    \fnum@TYPE  : A macro to generate the figure number for a caption.
 %                  For example, \fnum@TYPE == Figure \thefigure.
 %
-%    \@makecaption{NUM}{TEXT} : 
+%    \@makecaption{NUM}{TEXT} :
 %              A macro to make a caption, with NUM the value
 %              produced by \fnum@... and TEXT the text of the caption.
 %              It can assume it's in a \parbox of the appropriate width.
@@ -161,7 +161,7 @@
 %     \@captype ==L TYPE
 %     \@dblflset
 %     \@fps     ==L PLACEMENT
-%     \@onelevel@sanitize \@fps 
+%     \@onelevel@sanitize \@fps
 %     add default PLACEMENT if at most ! in PLACEMENT == \@fpsadddefault
 %     if inner
 %       then LaTeX Error: 'Not in outer paragraph mode.'
@@ -169,7 +169,7 @@
 %       else if \@freelist nonempty
 %              then \@currbox  :=L head of \@freelist
 %                   \@freelist :=G tail of \@freelist
-%                   \count\@currbox :=G 32*\ftype@TYPE + 
+%                   \count\@currbox :=G 32*\ftype@TYPE +
 %                                          bits determined by PLACEMENT
 %              else \@floatpenalty := 0
 %                   LaTeX Error: 'Too many unprocessed floats'
@@ -215,7 +215,7 @@
 %     a double-column float of type TYPE with PLACEMENT as the placement
 %     specifier.  The default value of PLACEMENT is 'tp'
 %     The environment is ended by \end@dblfloat.
-%     E.g., \figure* == \@dblfloat{figure}, 
+%     E.g., \figure* == \@dblfloat{figure},
 %           \endfigure* == \end@dblfloat.
 %
 %  \@dblfloat{TYPE}[PLACEMENT] ==
@@ -232,7 +232,7 @@
 % \begin{macro}{\caption}
 %
 %    This is set to be an error message outside a float since no
-%    captype is defined there; this may need to be changed by some 
+%    captype is defined there; this may need to be changed by some
 %    classes.
 % \changes{v1.1u}{1999/04/19}
 %    {Made caption an error oustside a float: latex/2815}
@@ -246,7 +246,7 @@
      \expandafter\@firstofone
    \fi
    {\@dblarg{\@caption\@captype}}%
-} 
+}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -273,7 +273,7 @@
 % The intention is that this emulates \TeX's `top of page' behaviour.
 % The flag must be set false at the start of the first paragraph. This
 % is achieved by a redefinition of |\everypar|, but the call to
-% |\@parboxrestore| removes that redefinition, so it is re-inserted 
+% |\@parboxrestore| removes that redefinition, so it is re-inserted
 % if needed. If the flag is already false then the |\caption| was not
 % the first entry in the float, and so some other paragraph has already
 % activated the special |\everypar|. In this case no further action is
@@ -310,7 +310,7 @@
     {\edef\reserved@a{\noexpand\@xfloat{#1}[\csname fps@#1\endcsname]}%
      \reserved@a}}
 %    \end{macrocode}
-%    
+%
 % \end{macro}
 % \end{macro}
 %
@@ -326,13 +326,13 @@
 %    \end{macrocode}
 %  \end{macro}
 %
-%    
+%
 %  \begin{macro}{\fps@dbl}
 % \changes{v1.1a}{1994/10/31}{Macro added}
 % \changes{v1.1g}{1994/12/10}{Macro removed temporarily}
 %  Note that all double floats have default fps `tp'.
 %  \end{macro}
-%  
+%
 %  \begin{macro}{\@setfps}
 % \changes{v1.1a}{1994/10/31}{Macro added}
 % \changes{v1.1c}{1994/11/05}
@@ -340,7 +340,7 @@
 % \changes{v1.1g}{1994/12/10}{Macro removed temporarily}
 %    This sets the fps, dealing with error conditions by adding
 %    the default.
-%    
+%
 %  \end{macro}
 %
 %  \begin{macro}{\@xfloat}
@@ -373,7 +373,7 @@
   \@nodocument
   \def \@captype {#1}%
    \def \@fps {#2}%
-   \@onelevel@sanitize \@fps 
+   \@onelevel@sanitize \@fps
    \def \reserved@b {!}%
    \ifx \reserved@b \@fps
      \@fpsadddefault
@@ -395,7 +395,7 @@
       {%
        \@tempcnta \sixt@@n
        \expandafter \@tfor \expandafter \reserved@a
-         \expandafter :\expandafter =\@fps 
+         \expandafter :\expandafter =\@fps
          \do
           {%
            \if \reserved@a h%
@@ -464,10 +464,10 @@
 }
 %    \end{macrocode}
 %  \end{macro}
-%  
+%
 %  \begin{macro}{\@floatboxreset}
 % \changes{v1.1a}{1994/10/31}{Macro added}
-%    
+%
 % The rational for allowing these normally global flags to be set
 % locally here, via |\@parboxrestore|, was stated originally by
 % Donald Arseneau and extended by Chris Rowley.
@@ -478,7 +478,7 @@
 %
 % If anyone is unhappy with this argument then both flags should be
 % treated as in |\set@nobreak|; otherwise this command will be
-% redundant. 
+% redundant.
 % \changes{v1.1p}{1996/10/24}
 %     {Added local settings of flags: dangerous!!}
 %    \begin{macrocode}
@@ -489,11 +489,11 @@
 }
 %    \end{macrocode}
 %  \end{macro}
-%  
+%
 %  \begin{macro}{\@setnobreak}
 % \changes{v1.1f}{1994/11/21}{Macro added}
 % \changes{v1.1n}{1996/07/26}{remove unecessary \cs{global} before
-%                 \cs{@nobreak...}}   
+%                 \cs{@nobreak...}}
 %    \begin{macrocode}
 \def \@setnobreak{%
   \if@nobreak
@@ -507,7 +507,7 @@
 %  \begin{macro}{\@setminipage}
 % \changes{v1.1f}{1994/11/21}{Macro added}
 % \changes{v1.1n}{1996/07/26}{remove unecessary \cs{global} before
-%                 \cs{@minipage...}}   
+%                 \cs{@minipage...}}
 %    \begin{macrocode}
 \def \@setminipage{%
   \@minipagetrue
@@ -582,7 +582,7 @@
 }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@endfloatbox}
 % \changes{v1.1n}{1995/10/25}{(CAR) macro added: to unify code for
 %    double and single versions}
@@ -605,29 +605,29 @@
 % \changes{v1.1f}{1994/11/21}{Corrected position of \cs{outer@nobreak}}
 % \changes{v1.1f}{1994/11/21}{Added reset of minipage flag}
 % \changes{v1.1n}{1996/07/26}{remove unecessary \cs{global} before
-%                 \cs{@minipage...}}   
+%                 \cs{@minipage...}}
 %    \begin{macrocode}
-      \@minipagefalse   
+      \@minipagefalse
       \outer@nobreak
     \egroup                  %% end of vbox
   \color@endbox
 }
-% 
+%
 % \begin{macro}{\outer@nobreak}
 % \changes{v1.0h}{1994/05/20}{Macro added: default is to do nothing.}
 %    \begin{macrocode}
 \let\outer@nobreak\@empty
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 %
 %  \begin{macro}{\@largefloatcheck}
 % \changes{v1.0e}{1994/04/25}{Command added}
-% 
+%
 %    This calculates by how much a float is oversize for the page and
 %    prints this in a warning message.
-%    
-%    \begin{macrocode}  
+%
+%    \begin{macrocode}
 \def \@largefloatcheck{%
   \ifdim \ht\@currbox>\textheight
     \@tempdima -\textheight
@@ -648,7 +648,7 @@
 % \changes{v1.1a}{1994/10/31}
 %     {Macros removed: \cs{@dbflt}, \cs{@xdblfloat}}
 % \changes{v1.1g}{1994/12/10}{Macros reinserted temporarily}
-%    
+%
 %
 %    \begin{macrocode}
 \def\@dbflt#1{\@ifnextchar[{\@xdblfloat{#1}}{\@xdblfloat{#1}[tp]}}
@@ -683,21 +683,21 @@
 %
 %  \begin{macro}{\@dblfloatplacement}
 % \changes{LaTeX2e}{1993/12/05}{Command changed}
-% 
+%
 %     This should be called only within a group.  Now changed to
 %     provide extra checks in |\@addtodblcol|, needed when processing a
 %     BANG float.
-%    
-%    \begin{macrocode}  
+%
+%    \begin{macrocode}
 \def \@dblfloatplacement {%
 %    \end{macrocode}
 %    Textpage bit: global, but need not be.
-%    \begin{macrocode}  
+%    \begin{macrocode}
   \global \@dbltopnum \c@dbltopnumber
   \global \@dbltoproom \dbltopfraction\@colht
 %    \end{macrocode}
 %   This new bit uses |\@textmin| to locally store the amount of extra
-%   room in the column.   
+%   room in the column.
 %    \begin{macrocode}
   \@textmin \@colht
   \advance \@textmin -\@dbltoproom
@@ -766,7 +766,7 @@
 %            \@savemarbox\@marbox{RTEXT}
 %            \box\@currbox :=G \box\@marbox
 %    fi
-%    \@xympar 
+%    \@xympar
 %   END
 %
 % \reversemarginpar == BEGIN \@mparbottom   :=G 0
@@ -818,7 +818,7 @@
   \@xympar}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@savemarbox}
 % \changes{v1.0b}{1994/03/12}
 %     {(DPC) Extra group for colour}
@@ -836,24 +836,24 @@
 % \changes{v1.1f}{1994/11/21}{Added resetting of size and font}
 % \changes{v1.1m}{1995/05/25}{(CAR) Resettings moved to hook}
 % \changes{v1.1n}{1996/07/26}{remove unecessary \cs{global} before
-%                 \cs{@minipage...}}   
+%                 \cs{@minipage...}}
 %    \begin{macrocode}
 \long\def \@savemarbox #1#2{%
   \global\setbox #1%
     \color@vbox
       \vtop{%
         \hsize\marginparwidth
-        \@parboxrestore 
+        \@parboxrestore
         \@marginparreset
         #2%
-        \@minipagefalse   
+        \@minipagefalse
         \outer@nobreak
         }%
     \color@endbox
 }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 %  \begin{macro}{\@marginparreset}
 % \changes{v1.1f}{1994/11/21}{Macro added}
 %
@@ -867,7 +867,7 @@
 %
 % If anyone is unhappy with this argument then both flags should be
 % treated as in |\set@nobreak|; otherwise this command will be
-% redundant. 
+% redundant.
 % \changes{v1.1p}{1996/10/24}
 %     {Added local settings of flags: dangerous!!}
 %    \begin{macrocode}
@@ -897,7 +897,7 @@
 %         {Use new \cs{color@hbox} concept.}
 % \changes{v1.1f}{1994/11/21}{Changed to \cs{color@vbox} }
 %     Setting the box here is done only because the code
-%     uses \cs{end@float}; it will be empty and gets discarded. 
+%     uses \cs{end@float}; it will be empty and gets discarded.
 % \changes{v1.1o}{1996/08/02}{Remove \cs{global} before \cs{@ignore...}}
 %    \begin{macrocode}
 \def \@xympar{%
@@ -948,7 +948,7 @@
 %                              \footnotemark \footnotetext .
 %
 %   As in PLAIN, footnotes use \insert\footins, and the following
-%   parameters: 
+%   parameters:
 %
 %   \footnotesize   : Size-changing command for footnotes.
 %
@@ -978,7 +978,7 @@
 %                  page is footnote number one.
 %
 %   \@thefnmark : Holds the current footnote's mark--e.g., \dag or '1'
-%                 or 'a'. 
+%                 or 'a'.
 %
 %   \@mpfnnumber  : A macro that generates the numbers for \footnote
 %                  and \footnotemark commands. It == \thefootnote
@@ -1113,7 +1113,7 @@
 %
 % \begin{macro}{\thempfootnote}
 % \changes{v1.1j}{1995/05/18}{Added \cs{itshape}.}
-% \changes{v1.1v}{2002/10/01}{Use braces around \cs{itshape} 
+% \changes{v1.1v}{2002/10/01}{Use braces around \cs{itshape}
 %    to keep font change local (pr/3460).}
 %    The default display for the footnote counter in minipages is to
 %    use italic letters. We use |\itshape| not |\textit| as the latter
@@ -1181,7 +1181,7 @@
 %             \cs{@xfootnote}, \cs{@xfootnotemark},
 %               and \cs{@xfootnotetext}}
 % \changes{LaTeX2.09}{1992/11/26}
-%         {(RmS) Changed all to 
+%         {(RmS) Changed all to
 %             `def`protect\string{`noexpand`protect`noexpand\string}}
 % \changes{v1.1b}{1994/11/26}
 %         {(ASAJ) Added \cs{protected@xdef}.}
@@ -1196,7 +1196,7 @@
 % \begin{macro}{\@xfootnote}
 %    \begin{macrocode}
 \def\@xfootnote[#1]{%
-   \begingroup 
+   \begingroup
      \csname c@\@mpfn\endcsname #1\relax
      \unrestored@protected@xdef\@thefnmark{\thempfn}%
    \endgroup
@@ -1236,7 +1236,7 @@
     \hsize\columnwidth \@parboxrestore
     \protected@edef\@currentlabel{%
        \csname p@footnote\endcsname\@thefnmark
-    }% 
+    }%
     \color@begingroup
       \@makefntext{%
         \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
@@ -1246,7 +1246,7 @@
 %
 % \begin{macro}{\footnotemark}
 % \changes{v1.1b}{1994/11/04}{Added \cs{protected@xdef} to
-%    \cs{footnotemark}.} 
+%    \cs{footnotemark}.}
 %    \begin{macrocode}
 \def\footnotemark{%
    \@ifnextchar[\@xfootnotemark
@@ -1259,7 +1259,7 @@
 % \begin{macro}{\@xfootnotemark}
 %    \begin{macrocode}
 \def\@xfootnotemark[#1]{%
-   \begingroup 
+   \begingroup
       \c@footnote #1\relax
       \unrestored@protected@xdef\@thefnmark{\thefootnote}%
    \endgroup
@@ -1292,7 +1292,7 @@
 % \begin{macro}{\@xfootnotenext}
 %    \begin{macrocode}
 \def\@xfootnotenext[#1]{%
-  \begingroup 
+  \begingroup
      \csname c@\@mpfn\endcsname #1\relax
      \unrestored@protected@xdef\@thefnmark{\thempfn}%
   \endgroup
diff --git a/Master/texmf-dist/source/latex/base/ltfntcmd.dtx b/Master/texmf-dist/source/latex/base/ltfntcmd.dtx
index f246d8b391b..2746e52bb54 100644
--- a/Master/texmf-dist/source/latex/base/ltfntcmd.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfntcmd.dtx
@@ -2,33 +2,33 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltfntcmd.dtx
-%% 
+%%
 %<*driver>
 % \fi
 \ProvidesFile{ltfntcmd.dtx}
@@ -47,7 +47,7 @@
 % \fi
 %
 % \CheckSum{258}
-% 
+%
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -308,24 +308,24 @@
 %    necessary concerning the italic correction at both ends.
 %
 %    The algorithm for deciding whether to put in an italic correction
-%    is not very subtle: one is added whenever the newly current font 
+%    is not very subtle: one is added whenever the newly current font
 %    is not itself positively sloped, unless the next token is a
 %    character in the `nocorr' list.  At the end of the text this
 %    is done after closing the group so as to check the `outer font'.
 %    Note that this
 %    will often result in adding an italic correction token after a
-%    character in an unsloped font; we believe (in early 2003) that 
-%    this is perhaps inefficient but not dangerous.  
-%    
+%    character in an unsloped font; we believe (in early 2003) that
+%    this is perhaps inefficient but not dangerous.
+%
 %    It also now checks for empty contents of the text command and optimises
 %    this case.  Some care is also taken to check that doing dangerous
 %    things in vertical mode is avoided.
 %
 %    The italic correction token is added to the horizontal list
-%    before (in the list) an immediately prceding non-zero glob of 
-%    glue (skip) and any non-zero penalty preceding that since, in 
+%    before (in the list) an immediately prceding non-zero glob of
+%    glue (skip) and any non-zero penalty preceding that since, in
 %    the typical case, this puts it immediately
-%    after the last character in the preceding word.  
+%    after the last character in the preceding word.
 %
 %
 % \changes{v3.3j}{1994/05/25}{Insertion of \cs{aftergroup}s moved}
@@ -334,7 +334,7 @@
 % \changes{v3.3u}{1996/10/08}{Removed \cs{check@icr} when in vmode
 % since it causes various errors (see pr/2157)}
 % \changes{v3.3w}{1997/10/17}{Reinstalled \cs{check@icr} as check is
-%    now done in \cs{check@nocorr@} (see PR/2646).} 
+%    now done in \cs{check@nocorr@} (see PR/2646).}
 % \changes{v3.3y}{2000/01/30}{Use \cs{hmode@bgroup} now (pr/3160)}
 %
 %    Note that it is necessary to put in the |\aftergroup\maybe@ic| at
@@ -435,7 +435,7 @@
 %    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
-%  
+%
 %  \begin{macro}{\text@command}
 %  \begin{macro}{\check@nocorr@}
 % \changes{v3.3a}{1994/04/20}{Macros added}
@@ -447,7 +447,7 @@
 %    and also for one in any other position not protected within
 %    braces (the latter is treated as if it were at the end of the
 %    argument).
-%    
+%
 %    Is this the correct action in the `empty' case? It is efficient but
 %    typographically it is, strictly, incorrect!
 % \changes{v3.3l}{1994/06/18}{Added check for empty text}
@@ -525,7 +525,7 @@
 % \begin{macro}{\ifmaybe@ic}
 % \changes{v3.4a}{2009/12/14}{Macro added}
 %    Switch used soley within |\maybe@ic| not interferring with other
-%    switches. 
+%    switches.
 %    \begin{macrocode}
 \newif\ifmaybe@ic
 %    \end{macrocode}
@@ -536,7 +536,7 @@
 %  \begin{macro}{\maybe@ic@}
 % \changes{v3.0a}{1993/12/11}{Macro and name changed}
 % \changes{v3.4a}{2009/12/14}{Use switch \cs{ifmaybe@ic} instead of
-%    \cs{if@tempswa}} 
+%    \cs{if@tempswa}}
 % \task{CAR}{Make this more efficient by checking for non-characters
 % first and using \cs{if} test?}
 %    These macros implement the italic correction.
@@ -595,7 +595,7 @@
 %    done via an |\if| thus their catcodes would not matter; but this
 %    will not work whilst |\futurelet| is used above.
 % \changes{v3.4a}{2009/12/14}{Use switch \cs{ifmaybe@ic} instead of
-%    \cs{if@tempswa}} 
+%    \cs{if@tempswa}}
 %    \begin{macrocode}
 \def \t@st@ic {%
   \expandafter\let\expandafter\reserved@b\expandafter=\reserved@a\relax
@@ -781,7 +781,7 @@
               is not defined:\MessageBreak
               there is probably something wrong with
               the class file}\@eha
-}            
+}
 %</2ekernel>
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/base/ltfssbas.dtx b/Master/texmf-dist/source/latex/base/ltfssbas.dtx
index 60007825c48..8e1c1559dad 100644
--- a/Master/texmf-dist/source/latex/base/ltfssbas.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssbas.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltfssbas.dtx
@@ -37,7 +37,7 @@
 %
 %<*driver>
 % \fi
-% 
+%
 %
 \ProvidesFile{ltfssbas.dtx}
              [2002/10/02 v3.0x LaTeX Kernel (NFSS Basic Macros)]
@@ -75,7 +75,7 @@
 % documentation of the \LaTeX\ `New' Font Selection Scheme.
 %
 % \begin{quote}
-%   \textbf{Warning:} 
+%   \textbf{Warning:}
 %  The macro documentation is still basically the documentation from the
 %  first NFSS release and therefore in some cases probably not
 %  completely accurate.
@@ -118,15 +118,15 @@
 % \changes{v1.2i}{1990/04/01}{Support for TeX3.}
 % \changes{v1.2g}{1990/02/16}{Support for changes of \cs{baselineskip}
 %          without changing the size.}
-%    
+%
 % \changes{v1.2c}{1990/01/23}{\cs{no@version@warning} renamed to
 %                           \cs{no@alphabet@error}.}
 % \changes{v1.0s}{1989/11/25}{All \cs{edef}\cs{font@name} changed to
 %                           \cs{xdef}\cs{font@name}.
-%                           Necessary after introduction of 
+%                           Necessary after introduction of
 %                           \cs{begingroup}/\cs{endgroup} in v1.0q.}
 % \changes{v1.0s}{1989/11/25}{extra// $\to$ + in \cs{extra@def}.}
-% \changes{v1.0o}{1989/11/08}{First parameter of 
+% \changes{v1.0o}{1989/11/08}{First parameter of
 %                           \cs{define@mathalphabet}
 %                           and \cs{define@mathgroup} changed
 %                           from string to control sequence.}
@@ -160,7 +160,7 @@
 % separate and will only be loaded if needed.
 %
 % If we are producing an autoload version of \LaTeXe{} then all those
-% parts with \textsf{def1} or \textsf{def2} docstrip guards will be 
+% parts with \textsf{def1} or \textsf{def2} docstrip guards will be
 % placed into the autoloadable files \texttt{autofss1.sty} and
 % \texttt{autofss2.sty}.
 %
@@ -189,7 +189,7 @@
 %    in math mode. It issues a warning message.
 %    \begin{macrocode}
 %<*2ekernel|autoload>
-\def\@nomath#1{\relax\ifmmode 
+\def\@nomath#1{\relax\ifmmode
    \@font@warning{Command \noexpand#1invalid in math mode}\fi}
 %</2ekernel|autoload>
 %    \end{macrocode}
@@ -217,7 +217,7 @@
     \@latex@error{Math\space alphabet\space identifier\space
           \noexpand#1is\space undefined\space in\space math\space
            version\space `\math@version'}%
-        {Your\space requested\space math\space alphabet\space 
+        {Your\space requested\space math\space alphabet\space
          is\space undefined\space in\space the\space current\space
           math\space version.^^JCheck\space the\space spelling\space
           or\space use\space the\space \noexpand\SetMathAlphabet\space
@@ -262,7 +262,7 @@
 % \section{Macros for setting up the tables}
 %
 %  \begin{macro}{\DeclareFontShape}
-%    
+%
 % \changes{v1.9a}{1992/07/26}{Introduced \cs{DeclareFontShape}}
 %    The macro |\DeclareFontShape| takes $6$ arguments:
 %    \begin{macrocode}
@@ -284,7 +284,7 @@
 %  \begin{macro}{\DeclareFontShape}
 % \changes{v2.1c}{1994/02/07}{revert catcode settings earlier}
 % \changes{v3.0m}{1995/11/01}
-%      {(DPC) Test for \cs{relax} not \cs{undefined}, internal/1933} 
+%      {(DPC) Test for \cs{relax} not \cs{undefined}, internal/1933}
 %    \begin{macrocode}
    \expandafter\endgroup
    \DeclareFontShape@}
@@ -311,7 +311,7 @@
 %
 %  \begin{macro}{\DeclareFixedFont}
 %    Define a direct font switch that avoids all overhead.
-% \changes{v2.1u}{1994/11/06}{Renamed 
+% \changes{v2.1u}{1994/11/06}{Renamed
 %                        \cs{every@size} to \cs{every@math@size}.}
 %    \begin{macrocode}
 \def\DeclareFixedFont#1#2#3#4#5#6{%
@@ -331,12 +331,12 @@
 %
 %
 %  \begin{macro}{\do@subst@correction}
-%    
+%
 %    \begin{macrocode}
 %<*2ekernel|autoload>
 \def\do@subst@correction{%
        \xdef\subst@correction{%
-          \font@name 
+          \font@name
           \global\expandafter\font
             \csname \curr@fontshape/\f@size\endcsname
             \noexpand\fontname\font
@@ -382,7 +382,7 @@
 %    We compare |\reserved@a| with |\@empty|
 %    If these two are the same we |\let| the `extra'
 %    macro equal to |\@empty| which is not the same a doing a |\let|
-%    to |\reserved@a| --- the latter would blow one extra memory 
+%    to |\reserved@a| --- the latter would blow one extra memory
 %    location rather  then reusing the one from |\@empty|.
 %    \begin{macrocode}
      \global
@@ -421,7 +421,7 @@
 %    \end{macrocode}
 %    First we start with ignoring all blanks and newlines since every
 %    surplus space in the second or third argument will come out in
-%    a weird place in the document.  
+%    a weird place in the document.
 % \changes{v2.1c}{1994/02/07}{revert catcode settings earlier}
 % \changes{v2.1t}{1994/10/19}{Add missing \cs{relax}.}
 % \changes{v2.1z}{1994/12/06}{use \cs{nfss@catcodes}}
@@ -457,7 +457,7 @@
      \@font@info{Redeclaring font encoding #1}%
   \fi
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
   \global\@namedef{T@#1}{#2}%
   \global\@namedef{M@#1}{\default@M#3}%
@@ -472,7 +472,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-%    
+%
 % \begin{macro}{\LastDeclaredEncoding}
 % \changes{v3.0w}{1999/01/06}{Added \cs{LastDeclaredEncoding} to
 %   support cyrillic integration (pr/2988)}
@@ -481,7 +481,7 @@
 \def\LastDeclaredEncoding{}
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 % \begin{macro}{\DeclareFontSubstitution}
 %    \begin{macrocode}
 \def\DeclareFontSubstitution#1#2#3#4{%
@@ -492,7 +492,7 @@
     \begingroup
 %    \end{macrocode}
 % \changes{v3.0x}{2002/10/02}{Adding \cs{LastDeclaredEncoding}
-%   introduced a bug as on some occasions that macro name was stored 
+%   introduced a bug as on some occasions that macro name was stored
 %   in the internal lists instead of the actual encoding. (pr/3459)}
 %    We loop through the |\cdp@list| and rebuild it anew in |\toks@|
 %    thereby replacing the defaults for the encoding in question with
@@ -626,7 +626,7 @@
 %    \begin{macrocode}
         \reserved@f}%
 %    \end{macrocode}
-%    We finish with reinserting the list of sizes after the 
+%    We finish with reinserting the list of sizes after the
 %    |\reserved@f|
 %    macro and appending an empty element so that the end of the list
 %    is recognized properly.
@@ -715,7 +715,7 @@
       \edef\f@encoding{#1}%
       \ifx\cf@encoding\f@encoding
 %    \end{macrocode}
-%    If the new encoding is the same as the old 
+%    If the new encoding is the same as the old
 %    encoding we have nothing to do.
 %    However, in case we had a sequence of several encoding changes
 %    without a |\selectfont| inbetween we can save processing by
@@ -724,7 +724,7 @@
         \let\enc@update\relax
       \else
 %    \end{macrocode}
-%    If current and new encoding differ we define the macro 
+%    If current and new encoding differ we define the macro
 %    |\enc@update|
 %    to contain all updates necessary at |\selectfont| time.
 %    \begin{macrocode}
@@ -796,7 +796,7 @@
 % \begin{macro}{\fontshape}
 % \changes{v2.1j}{1994/05/12}{Use \cs{DeclareRobustCommand}.}
 % \changes{v2.1y}{1994/11/30}{Use \cs{@current@cmd} in
-%    \cs{@@enc@update}.  ASAJ.} 
+%    \cs{@@enc@update}.  ASAJ.}
 % \begin{macro}{\f@shape}
 %    \begin{macrocode}
 \DeclareRobustCommand\fontfamily[1]{\edef\f@family{#1}}
@@ -835,7 +835,7 @@
 %  \begin{macro}{\fontsize}
 % \changes{v2.1j}{1994/05/12}{Redefined to use \cs{set@fontsize}}
 % \changes{v2.1p}{1994/05/16}{Pass \cs{baselinstretch} not
-%    \cs{f@linespread}} 
+%    \cs{f@linespread}}
 %    We also define a macro that allows to specify a size.  In this
 %    case, however, we also need the value of |\baselineskip|. As the
 %    first argument to |\set@fontsize| we pass the current value of
@@ -878,7 +878,7 @@
 %
 %
 %  \begin{macro}{\@defaultunits}
-%    
+%
 %    The function |\@defaultunits| when wrapped around a dimen or skip
 %    assignment supplies default units. Usage:
 %
@@ -931,7 +931,7 @@
 %    \begin{macrocode}
 \DeclareRobustCommand\mathversion[1]
          {\@nomath\mathversion
-          \expandafter\ifx\csname mv@#1\endcsname\relax 
+          \expandafter\ifx\csname mv@#1\endcsname\relax
           \@latex@error{Math version `#1' is not defined}\@eha\else
           \edef\math@version{#1}%
 %    \end{macrocode}
@@ -949,7 +949,7 @@
 %    Another way to enhance this code here is todo the setting only if
 %    the version really has changed after all. This might be
 %    interesting in case of \texttt{amstext} and \texttt{boldsymbol}.
-% \changes{v2.1b}{1994/01/25}{Corrections for math setup} 
+% \changes{v2.1b}{1994/01/25}{Corrections for math setup}
 %    \begin{macrocode}
           \aftergroup\glb@settings
           \fi}
@@ -957,7 +957,7 @@
 % \end{macro}
 % \end{macro}
 %
-% 
+%
 % If \TeX{} would support a hook just before the end of a formula
 % (opposite of |\everymath| so to speak) the implementation of the
 % algorithm would be much simpler because in that case we would set up
@@ -968,17 +968,17 @@
 % available. Note that this does not mean that a |$| couldn't be the
 % short-hand for starting and stopping that higher-level interface, it
 % only means that the direct \TeX{} function must be hidden.
-% 
+%
 % Anyway, since we don't have this and won't have it in \LaTeXe{} we
 % need to implement it in a somewhat slower way.
-% 
-% 
-% We test for the current math font setup on entry of a formula, 
+%
+%
+% We test for the current math font setup on entry of a formula,
 % i.e., on the
 % hooks |\everymath| and |\everydisplay|. But since these hooks may
 % contain user data we provide ourselves with an internal version of
 % these hooks which stays frozen.
-% 
+%
 %
 % \begin{macro}{\frozen@everymath}
 % \changes{v2.1a}{1994/01/17}{New math font setup}
@@ -1164,7 +1164,7 @@
 % for each font, to save some string memory in the kernel, and to
 % speed up the loading of some packages which may load fonts
 % The code is actually pre-loaded into the kernel and removed
-% at |\begin{document}|. The |\ifx| test below ensures that 
+% at |\begin{document}|. The |\ifx| test below ensures that
 % if |\usepackage{autofss2}| apears in the preamble, then  the code
 % is not removed at this time. Can not use |\AtBeginDocument| here
 % as it is not defined yet! Listing all the commands like this
@@ -1304,7 +1304,7 @@
 %    |\catcode|.
 % \changes{v2.1s}{1994/09/16}{Reset [ and ] as well, just in case}
 % \changes{v3.0r}{1996/08/25}{Reset the acute, grave and double quote
-%    chars as well} 
+%    chars as well}
 %    \begin{macrocode}
    \@makeother\<%
    \@makeother\>%
@@ -1337,7 +1337,7 @@
 %    Initialize all those internal variables which may or may not have
 %    values in the first seconds of NFSS' bootstraping process. Later
 %    on such values will be updated when an encoding is selected, etc.
-%    
+%
 %    We definitely don't want to set |\f@encoding|; we can set all the
 %    others since if they are left ``blank'' any selection would grap
 %    ``error default values'' as well. However, this probably should
@@ -1422,7 +1422,7 @@
 % its normal (empty) definition, to report the symbol generating the
 % font switch.
 %    \begin{macrocode}
-     \@font@warning{Font shape `\expandafter\string\reserved@a' 
+     \@font@warning{Font shape `\expandafter\string\reserved@a'
                      \expandafter\@gobble\string\@undefined\MessageBreak
                    using `\curr@fontshape' instead\@wrong@font@char}%
     \global\let\last@fontshape\reserved@a
@@ -1431,7 +1431,7 @@
 %    the document.
 % \changes{v3.0d}{1995/07/13}{Change a macro not a switch to flag
 %         default font substitutions}
-% \changes{v3.0k}{1995/10/24}{Make this code inline since it 
+% \changes{v3.0k}{1995/10/24}{Make this code inline since it
 %         happens only here}
 %    The macro |\@defaultsubs| is initially |\relax| but gets changed
 %    here if some default font substitution happens.
@@ -1448,7 +1448,7 @@
 %    the wanted combination equal to its substitution.
 %    This requires the use of four |\expandafter|'s
 %    since |\csname|\dots|\endcsname| has to be
-%    expanded before |\reserved@a| (i.e.\  the requested 
+%    expanded before |\reserved@a| (i.e.\  the requested
 %    combination),
 %    and this must happen before the |\let| is executed.
 %    \begin{macrocode}
@@ -1528,7 +1528,7 @@
 %
 %
 %  \begin{macro}{\math@fonts}
-%    
+%
 % \changes{v1.9a}{1992/07/26}{}
 %    \begin{macrocode}
 \let\math@fonts\@empty
@@ -1597,7 +1597,7 @@
 %  \xdef#1{\noexpand\use@mathgroup\noexpand#2%
 %          {\number\csname c@mv@\math@version\endcsname}}%
 %    \end{macrocode}
-%    \changes{v1.3c}{1992/05/12}{Added call to 
+%    \changes{v1.3c}{1992/05/12}{Added call to
 %             \cs{extract@alph@from@version}.}
 %    But this is not sufficient, as we learned the hard way.
 %    The problem here is that the loading of the fonts that comprise
@@ -1616,7 +1616,7 @@
 %    so that it calls |\getanddefine@fonts| directly in future as well.
 %    We use the macro |\extract@alph@from@version| to do this.
 %    It takes the math alphabet identifer |#1| and the math version
-%    macro as arguments.    
+%    macro as arguments.
 % \changes{v1.9a}{1992/07/26}{}
 %    \begin{macrocode}
 %     \expandafter\extract@alph@from@version
@@ -1630,7 +1630,7 @@
 %    have an argument (the third argument of |\use@mathgroup|
 %    or more exactly the argument od |\math@egroup| if the {\ttfamily
 %    margid} option is in force)
-%    which would swallow our closing |\fi|.  So 
+%    which would swallow our closing |\fi|.  So
 %    we use the |\expandafter| technique to remove the |\fi|
 %    before the |\use@mathgroup| is expanded.
 %    \begin{macrocode}
@@ -1743,7 +1743,7 @@
 % \changes{v2.1i}{1994/04/18}{Changed message to log only}
 %    Here is the default definition for |\calculate@math@sizes|
 %    a more elaborate interface
-%    is under testing in mthscale.sty. 
+%    is under testing in mthscale.sty.
 %    \begin{macrocode}
 %<*2ekernel|def1>
 \gdef\calculate@math@sizes{%
diff --git a/Master/texmf-dist/source/latex/base/ltfsscmp.dtx b/Master/texmf-dist/source/latex/base/ltfsscmp.dtx
index 89fce00b26e..6600111aca1 100644
--- a/Master/texmf-dist/source/latex/base/ltfsscmp.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfsscmp.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltfsscmp.dtx
@@ -33,7 +33,7 @@
 %
 %<*driver>
 % \fi
-% 
+%
 %
 \ProvidesFile{ltfsscmp.dtx}
              [1995/08/26 v3.0c LaTeX Kernel (NFSS1 Compatibility)]
@@ -70,7 +70,7 @@
 % Scheme.
 %
 % \begin{quote}
-%   \textbf{Warning:} 
+%   \textbf{Warning:}
 %  The macro documentation is still basically the documentation from the
 %  first NFSS release and therefore in some cases probably not
 %  completely accurate.
@@ -173,11 +173,11 @@
 %    The warning message used above.
 %    \begin{macrocode}
 \gdef\warn@rel@i#1#2{%
- \@font@warning{***  NFSS release 1 command 
-               \noexpand#1found\MessageBreak 
-   ***  Update by using release 2 command 
-        \string#2.\MessageBreak 
-   ***  Recovery is probably possible}% 
+ \@font@warning{***  NFSS release 1 command
+               \noexpand#1found\MessageBreak
+   ***  Update by using release 2 command
+        \string#2.\MessageBreak
+   ***  Recovery is probably possible}%
 }
 \@onlypreamble\warn@rel@i
 %    \end{macrocode}
@@ -222,13 +222,13 @@
         \reserved@a#3\@nil
       \fi
     \fi
-    \ifnum 0<0#2 
+    \ifnum 0<0#2
       \edef\reserved@d{subf*\reserved@c}%
       \ifcase #2\or
       \or
       \else
         \errmessage{*** What's this? NFSS release 0? ***}%
-      \fi   
+      \fi
     \else
       \edef\reserved@d{#2\reserved@c}%
     \fi
@@ -310,7 +310,7 @@
 %    \begin{macrocode}
 \gdef\err@rel@i#1#2{%
   \@latex@error{***  NFSS release 1 command \noexpand#1found%
-          ^^J***  Recovery not possible. Use \string#2}% 
+          ^^J***  Recovery not possible. Use \string#2}%
        {The new release of NFSS doesn't support the
         \noexpand#1command^^Jany longer.
         Please upgrade your file to the syntax of NFSS
@@ -333,11 +333,11 @@
 %    \begin{macrocode}
 \gdef\newmathalphabet{%
   \if@no@font@opt
-    \@latex@error{*** NFSS release 1 command 
+    \@latex@error{*** NFSS release 1 command
                     \noexpand\newmathalphabet found%
      ^^J \space*** Automatic recovery not possible.%
      ^^J \space*** TYPE H for Help%
-              }% 
+              }%
        {Please look at the file usrguide.tex for hints on
         how to resolve this problem.}%
   \else
diff --git a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
index 8a1f47e2178..4d8c4a90795 100644
--- a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx
@@ -1,30 +1,30 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2011
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltfssdcl.dtx
@@ -33,10 +33,10 @@
 %
 %<*driver>
 % \fi
-% 
+%
 %
 \ProvidesFile{ltfssdcl.dtx}
-            [2011/05/08 v3.0n LaTeX Kernel (NFSS Declarative Interface)]
+            [2011/09/03 v3.0o LaTeX Kernel (NFSS Declarative Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -52,7 +52,7 @@
 %<+checkmem>\CHECKMEM
 % \fi
 %
-% \CheckSum{1886}
+% \CheckSum{1885}
 %
 %
 % \GetFileInfo{ltfssdcl.dtx}
@@ -66,12 +66,12 @@
 % \maketitle
 %
 % This file contains the main implementation of the font selection
-% scheme commands. See other parts of the \LaTeX\ distribution, or 
+% scheme commands. See other parts of the \LaTeX\ distribution, or
 % \emph{The \LaTeX\ Companion} for higher level documentation of these
 % commands.
 %
 % \begin{quote}
-%   \textbf{Warning:} 
+%   \textbf{Warning:}
 %  The macro documentation is still basically the documentation from the
 %  first NFSS release and therefore in some cases probably not
 %  completely accurate.
@@ -342,16 +342,16 @@
        \globaldefs\@ne  \math@fonts
      \endgroup
      \init@restore@version
-     \xdef#1{\noexpand\use@mathgroup\noexpand#2%      
+     \xdef#1{\noexpand\use@mathgroup\noexpand#2%
              {\number\csname c@mv@\math@version\endcsname}}%
      \global\advance\csname c@mv@\math@version\endcsname\@ne
    \else
      \let#1\relax
-     \@latex@error{Too many math alphabets used in 
+     \@latex@error{Too many math alphabets used in
                    version \math@version}%
         \@eha
    \fi
- \else \expandafter\non@alpherr\fi 
+ \else \expandafter\non@alpherr\fi
  #1{#4}%
  }%
 }
@@ -439,13 +439,13 @@
      \endgroup
      \expandafter\extract@alph@from@version
          \csname mv@\math@version\expandafter\endcsname
-         \expandafter{\number\csname 
+         \expandafter{\number\csname
                        c@mv@\math@version\endcsname}%
           #1%
      \global\advance\csname c@mv@\math@version\endcsname\@ne
    \else
      \let#1\relax
-     \@latex@error{Too many math alphabets used 
+     \@latex@error{Too many math alphabets used
                    in version \math@version}%
         \@eha
   \fi
@@ -499,7 +499,7 @@
          \@latex@error{This NFSS system isn't set up properly}%
             {The system maintainer forgot to specify a suitable
              substitution
-             font shape using the \noexpand\DeclareErrorFont 
+             font shape using the \noexpand\DeclareErrorFont
              command}%
        \fi
     \endgroup
@@ -539,6 +539,8 @@
 % \end{macro}
 %
 % \begin{macro}{\new@mathversion}
+% \changes{v3.0o}{2011/09/03}
+%      {(Will) Remove \cs{global} before \cs{newcount} (unnecessary and caused etex bug).}
 %    \begin{macrocode}
 \def\new@mathversion#1{%
   \expandafter\in@\expandafter#1\expandafter{\version@list}%
@@ -546,7 +548,7 @@
     \@font@info{Redeclaring math version
                `\expandafter\@gobblefour\string#1'}%
   \else
-    \global\expandafter\newcount\csname c@\expandafter
+    \expandafter\newcount\csname c@\expandafter
                                 \@gobble\string#1\endcsname
     \def\version@elt{\noexpand\version@elt\noexpand}%
     \edef\version@list{\version@list\version@elt#1}%
@@ -705,7 +707,7 @@
 % \end{macro}
 %
 % \begin{macro}{\SetSymbolFont@}
-% \changes{v3.0l}{2007/08/31}{Font warning changed to info 
+% \changes{v3.0l}{2007/08/31}{Font warning changed to info
 %    for encoding change (pr/3975)}
 %    \begin{macrocode}
 \def\SetSymbolFont@#1#2#3{%
@@ -744,11 +746,11 @@
          \xdef#1{\the\toks@}%
       \endgroup
     \else
-       \@latex@error{Symbol font `\expandafter\@gobblefour\string#3' 
+       \@latex@error{Symbol font `\expandafter\@gobblefour\string#3'
                   not defined}\@eha
     \fi
   \else
-    \@latex@error{Math version `\expandafter\@gobblefour\string#1' 
+    \@latex@error{Math version `\expandafter\@gobblefour\string#1'
        is not
        defined}{You probably mispelled the name of the math
        version.^^JOr you have to specify an additional package.}%
@@ -980,7 +982,7 @@
 %    \begin{macrocode}
          \SetMathAlphabet@{#1}{#2}{#3}#4#5%
        \else
-         \@latex@error{Command `\string#5' not defined as a 
+         \@latex@error{Command `\string#5' not defined as a
                        math alphabet}%
             {Use \noexpand\DeclareMathAlphabet to define it.}%
        \fi
@@ -1144,7 +1146,7 @@
 %
 % \begin{macro}{\@xxDeclareMathDelimiter}
 % \changes{v3.0h}{1998/04/15}{Macro added (pr/2662)}
-%    This macro checks if the second arg is a ``math type'' such 
+%    This macro checks if the second arg is a ``math type'' such
 %    as |\mathopen|. The undocumented original code didn't use math
 %    types when the delimiter was a single letter.
 %    For this reason the coding is a bit strange as it tries to
@@ -1176,7 +1178,7 @@
       \endgroup
       \DeclareMathSymbol#1{#2}{#3}{#4}%
 %    \end{macrocode}
-%    Then we arrange that |\@xDeclareMathDelimiter| only gets |#1|, 
+%    Then we arrange that |\@xDeclareMathDelimiter| only gets |#1|,
 %    |#3|, |#4| \ldots\ as it does not expect a math type as argument.
 %    \begin{macrocode}
       \expandafter\@firstoftwo
@@ -1529,7 +1531,7 @@
      \group@list
      \toks@{\relax\ifmmode \else \non@alpherr#1\fi}%
      \edef#1{\the\toks@
-             \noexpand\use@mathgroup 
+             \noexpand\use@mathgroup
              \expandafter\noexpand\csname M@\reserved@a\endcsname
              \csname sym#2\endcsname}%
      \def#3{\protect#1}%
diff --git a/Master/texmf-dist/source/latex/base/ltfssini.dtx b/Master/texmf-dist/source/latex/base/ltfssini.dtx
index e96013c3c11..06023d48733 100644
--- a/Master/texmf-dist/source/latex/base/ltfssini.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssini.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltfssini.dtx
@@ -33,7 +33,7 @@
 %
 %<*driver>
 % \fi
-% 
+%
 %
 \ProvidesFile{ltfssini.dtx}
              [2001/06/01 v3.0k LaTeX Kernel (NFSS Initialisation)]
@@ -97,7 +97,7 @@
 %                        to \cs{fontfamily} etc.}
 % \changes{v1.1i}{1990/04/02}{\cs{input} of files now handled
 %                          by docstrip.}
-% \changes{v1.1g}{1990/02/08}{Protected the commands 
+% \changes{v1.1g}{1990/02/08}{Protected the commands
 %         \cs{family}, \cs{series},
 %         \cs{shape}, \cs{size}, \cs{selectfont}, and \cs{mathversion}.}
 % \changes{v1.1c}{1989/12/03}{Some internal macros renamed to make them
@@ -138,7 +138,7 @@
 % \changes{v2.1i}{1994/05/12}{Moved \cs{selectfont} to tracefnt.dtx}
 %
 %
-% 
+%
 % \subsection{Providing math \emph{versions}}
 %
 %  \LaTeX{} provides two \emph{versions}. We call them
@@ -194,18 +194,18 @@
 % We also have to define the {\em emphasize\/} font change command
 % (i.e.\ |\em|). This command will look is the current font is
 % sloped (i.e.\ has a positive |\fontdimen1|) and will then
-% select either |\upshape| or |\itshape|. 
+% select either |\upshape| or |\itshape|.
 % \changes{v1.2b}{1990/01/28}{Call to \cs{@nomath} added.}
 %    \begin{macrocode}
 \DeclareRobustCommand\em
-        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ 
+        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
                        \upshape \else \itshape \fi}
 %    \end{macrocode}
 %
 %
 %  \begin{macro}{\not@math@alphabet}
 %    This function generates an error message when it is called in
-%    math mode. The same function should be defined in 
+%    math mode. The same function should be defined in
 %    \texttt{newlfont.sty}.
 % \changes{v1.4d}{1992/09/21}{Macro defined.}
 % \changes{v2.1e}{1994/01/17}{Message changed}
@@ -218,7 +218,7 @@
    \ifmmode
      \@latex@error{Command \noexpand#1invalid in math mode}%
         {%
-         Please 
+         Please
          \ifx#2\relax
             define a new math alphabet^^J%
             if you want to use a special font in math mode%
@@ -239,7 +239,7 @@
 %
 %
 %
-% Finally we provide two abbreviations to switch to the \LaTeX{} 
+% Finally we provide two abbreviations to switch to the \LaTeX{}
 % \emph{versions}.
 %    \begin{macrocode}
 \def\boldmath{\@nomath\boldmath
@@ -337,7 +337,7 @@
 % \changes{v?}{1992/11/13}{Made expandable.}
 % \changes{v?}{1992/12/03}{Make it accept counters.}
 %    \begin{macrocode}
-\def\hexnumber@#1{\ifcase\number#1 
+\def\hexnumber@#1{\ifcase\number#1
  0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or 8\or
  9\or A\or B\or C\or D\or E\or F\fi}
 %    \end{macrocode}
@@ -355,7 +355,7 @@
 %    option one will get a sub style called \texttt{amstext} which will
 %    redefine the |\nfss@text| macro to produce correct text in all
 %    sizes.
-%    
+%
 %    We have to use |\def| instead of the shorter |\let| since
 %    |\mbox| is undefined when we reach this point.
 % \changes{v1.1k}{1990/06/23}{Changed to \cs{mbox}.}
@@ -372,11 +372,11 @@
 %    the copyright notice will come out differently if a different
 %    font family is in use.
 %    This command is commented out, since it is now defined in
-%    ltoutenc.dtx. 
+%    ltoutenc.dtx.
 % \changes{v1.1m}{1991/03/28}{Extra braces added.}
 % \changes{v2.1n}{1994/05/17}{Really add extra braces}
 % \changes{v2.2c}{1994/12/02}{\cs{copyright} is now in ltoutenc.
-%    ASAJ} 
+%    ASAJ}
 %    \begin{macrocode}
 %\DeclareRobustCommand\copyright
 %    {{\ooalign{\hfil
@@ -563,7 +563,7 @@
 % \end{macro}
 % \end{macro}
 %
-%  
+%
 % \begin{macro}{\cal}
 % \changes{v3.0a}{1995/05/24}
 %      {(DPC) Remove definition}
diff --git a/Master/texmf-dist/source/latex/base/ltfsstrc.dtx b/Master/texmf-dist/source/latex/base/ltfsstrc.dtx
index f6e61edefcf..40814815fe8 100644
--- a/Master/texmf-dist/source/latex/base/ltfsstrc.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfsstrc.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -65,7 +65,7 @@
 % \changes{v2.3l}{1994/11/17}
 %         {\cs{@tempa} to \cs{reserved@a}}
 % \changes{v2.3i}{1994/05/20}{Use new error command names}
-% \changes{v2.3g}{1994/05/13}{Removed typeouts as 
+% \changes{v2.3g}{1994/05/13}{Removed typeouts as
 %             \cs{ProvidesPackage} writes to log.}
 % \changes{v2.3e}{1994/04/27}{Corrected item that was forgotten
 %                               in last change.}
@@ -76,7 +76,7 @@
 % \changes{v2.1i}{1993/09/02}{Corrected name of sgen size function.}
 % \changes{v2.1h}{1993/07/16}{Changed layout of info messages}
 % \changes{v2.1b}{1993/03/18}
-%      {Changed all \cs{@tempdimb} in \cs{@tempdimx} 
+%      {Changed all \cs{@tempdimb} in \cs{@tempdimx}
 %                  to avoid killing \cs{numberline}}
 % \changes{v2.1b}{1993/03/18}
 %      {Changed all \cs{@tempdima} in \cs{@tempdimb}
@@ -91,7 +91,7 @@
 %
 % \GetFileInfo{ltfsstrc.dtx}
 % \title{The \texttt{tracefnt} package\thanks
-%               {This file has version number \fileversion, dated 
+%               {This file has version number \fileversion, dated
 %                \filedate.} \\
 %       for use with the new font selection scheme}
 % \author{Frank Mittelbach \and Rainer Sch\"opf}
@@ -100,41 +100,41 @@
 % \maketitle
 %
 % \section{Introduction}
-% 
+%
 % This package contains the code for tracing font loading and font
 % changes.  It basically overlays some of the low-level functions of
 % NFSS with additional code used for tracing.
-% 
+%
 % The package accepts the following options:
 % \begin{description}
 % \item[errorshow]      Write all information about font changes etc.\
-%   only to the transcript file unless an error happens. This means 
+%   only to the transcript file unless an error happens. This means
 %   that information about font substitution will not be shown on the
 %   terminal.
-% 
+%
 % \item[warningshow]    Show all NFSS warnings on the terminal. This
-%   setting corresponds to the default behaviour of NFSS if the 
+%   setting corresponds to the default behaviour of NFSS if the
 %   \texttt{tracefnt} package is \emph{not} loaded!
-% 
+%
 % \item[infoshow]       Show all NFSS warning and all NFSS info
 %   messages (that are normally only written to the transcript file)
 %   also on the terminal. This is the default if the \texttt{tracefnt}
 %   package is loaded.
-% 
+%
 % \item[debugshow]      In addition to \texttt{infoshow} show also
 %   changing of math fonts as far as possible (this option can produce a
 %   large amount of output.
-% 
+%
 % \item[loading]        Show the name of external fonts when they are
 %   loaded. This option shows only ``newly'' loaded fonts not those
 %   already preloaded in the format or the class file before the
 %   \texttt{tracefnt} package became active.
-% 
+%
 % \item[pausing]
 %   Turn all font warnings into errors so that \LaTeX{} will stop.
-% 
+%
 % \end{description}
-% 
+%
 %
 % \StopEventually{}
 %
@@ -171,7 +171,7 @@
 %   accurate.
 % \end{quote}
 %
-% If we are making a package file it is a good idea to test whether 
+% If we are making a package file it is a good idea to test whether
 % we are running under 2e.
 % This code is actually placed at the very beginning of this file
 % for easier maintenance, thus commented out here.
@@ -294,7 +294,7 @@
              {LaTeX Font Warning: #1}%
              {See the LaTeX Companion for details.}%
              {I'll stop for every LaTeX Font Warning because
-              you requested\MessageBreak the `pausing' option 
+              you requested\MessageBreak the `pausing' option
               to the tracefnt package.}}%
    }
 %    \end{macrocode}
@@ -322,7 +322,7 @@
 % \section{Macros common to \texttt{fam.tex} and \texttt{tracefnt.sty}}
 %
 % In the first versions of \texttt{tracefnt.dtx} some macros of
-% \texttt{fam.dtx}\footnote{This file is currently not distributed in 
+% \texttt{fam.dtx}\footnote{This file is currently not distributed in
 %     documented form. Its code is part of \texttt{ltfss.dtx}.}
 % were redefined to included the extra tracing
 % information. Now these macros are all defined in this file (i.e.\
@@ -371,7 +371,7 @@
 %    The next two lines execute the ``loading actions'' for the
 %    family and then for the individual font shape.
 %    \begin{macrocode}
-    \csname \f@encoding+\f@family\endcsname 
+    \csname \f@encoding+\f@family\endcsname
     \csname\curr@fontshape\endcsname
     \relax
        }
@@ -528,7 +528,7 @@
 %    |\selectfont| the internal value of |\f@linespread| is passed
 %    back to |\baselinestretch|.
 %    \begin{macrocode}
-    \let\baselinestretch\f@linespread 
+    \let\baselinestretch\f@linespread
 %    \end{macrocode}
 %    Additional processing will happen within |\selectfont|. For this
 %    reason the macro |\size@update| (which will be called in
@@ -546,8 +546,8 @@
 %    then to set up a new |\strutbox|
 %    \begin{macrocode}
         \setbox\strutbox\hbox{%
-          \vrule\@height.7\baselineskip 
-                \@depth.3\baselineskip 
+          \vrule\@height.7\baselineskip
+                \@depth.3\baselineskip
                 \@width\z@}%
 %    \end{macrocode}
 %    We end with a bit of tracing information.
@@ -597,7 +597,7 @@
       \else
         \def\reserved@a{\f@linespread x}%
       \fi
-      \@font@info{Restoring size to 
+      \@font@info{Restoring size to
                 \f@size/\reserved@a\f@baselineskip}}
 %</trace>
 %    \end{macrocode}
@@ -625,7 +625,7 @@
 %    up the whole math machinery.
 %
 %    Here we set the math size, script size and scriptscript size.
-%    If the |S@|\ldots{} macro is not defined we have to first 
+%    If the |S@|\ldots{} macro is not defined we have to first
 %    calculate the three sizes.
 %    \begin{macrocode}
      \expandafter\ifx\csname S@\f@size\endcsname\relax
@@ -656,7 +656,7 @@
 %    \begin{macrocode}
        \begingroup
          \escapechar\m@ne
-         \csname mv@\math@version \endcsname 
+         \csname mv@\math@version \endcsname
 %    \end{macrocode}
 %    Then we set |\globaldefs| to 1 so that all following changes are
 %    done globally.  The math font assignments recorded in
@@ -726,9 +726,9 @@
 %
 % \subsection{Math fonts setup}
 %
-% 
+%
 % \subsubsection{Outline of algorithm for math font sizes}
-% 
+%
 % \TeX{} uses the the math fonts that are current when the end of a
 % formula is reached. If we don't want to keep font setups local to
 % every formula (which would result in an enormous overhead, we have
@@ -740,20 +740,20 @@
 % Here the inner formulae |b| and |c\in Z| are typeset in |\small| but
 % we have to return to |\normalsize| before we reach the closing |$|
 % of the outer formula.
-% 
+%
 % This is handled in the following way:
 % \begin{enumerate}
 % \item At any point in the document the global variable
 %   |\gbl@currsize| contains the point size for which the math fonts
 %   currently are set up.
-% 
+%
 % \item \label{it:everymath} Whenever we start a formula we compare
 %   its value with the local variable |\f@size| that describes the
 %   current text font size.
-% 
+%
 % \item If both are the same we assume that we can use the current
 %   math font setup without adjustment.
-% 
+%
 % \item \label{it:everymathend} If they differ we call |\gbl@settings|
 %   which changes the math font setup and updates |\gbl@currsize|.
 %   \begin{enumerate}
@@ -765,8 +765,8 @@
 %      nested in some outer formula.
 %   \end{enumerate}
 % \end{enumerate}
-% 
-% 
+%
+%
 % The above algorithm has the following features:
 % \begin{itemize}
 % \item For sizes which are not containing any formula no math setup
@@ -778,15 +778,15 @@
 %   \item No time overhead due to unnecessary changes of the math font
 %      setup on entrance and exit of the text font size.
 %   \end{itemize}
-% 
+%
 % \item Math font setup changes for top-level formulae will survive
 %   (there is no restoration after the formula) thus any following
 %   formula in the same size will be directly typesetable. Compared to
-%   original implementation in NFSS2 
+%   original implementation in NFSS2
 %   the new algorithm has the overhead of one test per formula
 %   to see if the current math setup is valid (in the original
 %   algorithm the setup was always valid, thus no test was necessary).
-% 
+%
 % \item In nested formulae the math font setup is restored in the
 %   outer formula by a series of |\aftergroup| commands and checks.
 %   Compared to the original algorithm this involves additional checks
@@ -795,7 +795,7 @@
 % \end{itemize}
 %
 % \subsubsection{Code for math font size setting}
-% 
+%
 % \begin{macro}{\check@mathfonts}
 % \changes{v2.3a}{1994/01/17}{New math font setup}
 % \changes{v2.3c}{1994/01/26}{Correct trace info placement}
@@ -817,7 +817,7 @@
         \@font@info{*** MATH: setting up \f@size\space
          curr/global (\curr@math@size/\glb@currsize)}\fi
 %</trace>
-     \glb@settings 
+     \glb@settings
      \init@restore@glb@settings
   \fi
   \let\curr@math@size\f@size
@@ -851,7 +851,7 @@
 % \changes{v2.3a}{1994/01/17}{New math font setup}
 % \changes{v2.3c}{1994/01/26}{Correct trace info placement}
 %    This macro will be executed the first time after the current
-%    formula. 
+%    formula.
 %    \begin{macrocode}
 \def\restglb@settings{%
 %<*trace>
@@ -884,7 +884,7 @@
 % \begin{macro}{\use@mathgroup}
 % \changes{v1.2b}{1990/01/21}{Macro added to allow cleaner interface.}
 % \changes{v1.2h}{1990/03/30}{Third argument removed (see
-%    \cs{math@egroup}).} 
+%    \cs{math@egroup}).}
 %    The |\use@mathgroup| macro should be used in user
 %    macros to select a math group. Depending on whether or not the
 %    \texttt{margid} option is in force it has two or three arguments.
@@ -1042,7 +1042,7 @@
 %    We begin with a simple auxiliary macro. It checks
 %    whether its argument is the token |\@nil|. If so,
 %    it expands to |\@gobble| which discards the following
-%    argument, otherwise it expands to |\@firstofone| which 
+%    argument, otherwise it expands to |\@firstofone| which
 %    reproduces it argument.
 % \changes{v2.3n}{1995/05/08}{Use \cs{@firstofone}}
 %    \begin{macrocode}
@@ -1093,7 +1093,7 @@
 %    |\f@size|) for the requested font shape. The font information
 %    must already be present in |\font@info|.
 %    The central macro that does the real work is |\extract@fontinfo|.
-%    We will first give a simple example how this macro works, and 
+%    We will first give a simple example how this macro works, and
 %    describe it in full generality later.
 %
 %    Assume that the requested parameters are: {\em encoding scheme\/}
@@ -1341,7 +1341,7 @@
          \fi
        \fi
      \fi
-     \reserved@f}} 
+     \reserved@f}}
 %</2ekernel|def2|autoload>
 %    \end{macrocode}
 %  \end{macro}
@@ -1395,7 +1395,7 @@
           \let\reserved@f\@empty
         \fi
      \fi
-     \reserved@f} 
+     \reserved@f}
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -1426,7 +1426,7 @@
 %    from the designer. The body of the size function may use
 %    |\optional@arg| and |\mandatory@arg| denoting the optional and
 %    mandatory argument that may follow the size specification |<...>|.
-% \changes{v2.1c}{1993/03/18}{Added all args to avoid blanks problems} 
+% \changes{v2.1c}{1993/03/18}{Added all args to avoid blanks problems}
 %    \begin{macrocode}
 %<*2ekernel|autoload>
 \def\DeclareSizeFunction#1#2{\@namedef{s@fct@#1}{#2}}
@@ -1486,9 +1486,9 @@
 %<*2ekernel|def1>
 \gdef\try@size@substitution{%
 %    \end{macrocode}
-%    First we do some initializations. |\@tempdimb| 
+%    First we do some initializations. |\@tempdimb|
 %    will hold the difference between the wanted size and the best
-%    solution found so far, so we initialise it with |\maxdimen|. 
+%    solution found so far, so we initialise it with |\maxdimen|.
 %    The macro |\best@size| will hold the best size found, nothing
 %    found is indicated by the empty value.
 %    \begin{macrocode}
@@ -1616,12 +1616,12 @@
     \ifx \best@size\@empty
     \else
       \ifdim \@tempdimb>\font@submax \relax
-        \xdef \font@submax {\the\@tempdimb}% 
+        \xdef \font@submax {\the\@tempdimb}%
       \fi
       \let \f@user@size \f@size
       \let \f@size \best@size
       \ifdim \@tempdimb>\fontsubfuzz\relax
-        \@font@warning{Font\space shape\space 
+        \@font@warning{Font\space shape\space
             `\curr@fontshape'\space in\space size\space
              <\f@user@size>\space not\space available\MessageBreak
              size\space <\f@size>\space substituted}%
@@ -1796,7 +1796,7 @@
       \errmessage{No\space declaration\space for\space
                   shape\space \mandatory@arg}%
       \error@fontshape
-    \else   
+    \else
 %    \end{macrocode}
 %    Otherwise we warn the user about the substitution taking place.
 %    \begin{macrocode}
@@ -1856,7 +1856,7 @@
 %    font to be used is taken from the mandatory argument.
 %    If an optional argument is present it is used as the `at'
 %    size for the font. Otherwise the font is loaded at its design size.
-%    \begin{macrocode}         
+%    \begin{macrocode}
 %<*2ekernel|autoload>
 \DeclareSizeFunction{fixed}{\fixed@sfcnt\@font@warning}
 \DeclareSizeFunction{sfixed}{\fixed@sfcnt\@font@info}
diff --git a/Master/texmf-dist/source/latex/base/lthyphen.dtx b/Master/texmf-dist/source/latex/base/lthyphen.dtx
index eb9489a8d24..65a0bd5bb3e 100644
--- a/Master/texmf-dist/source/latex/base/lthyphen.dtx
+++ b/Master/texmf-dist/source/latex/base/lthyphen.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %<*driver>
@@ -79,7 +79,7 @@
 % \texttt{hyphen.cfg}. If this file exists, it will be loaded instead
 % of \texttt{hyphen.ltx}.  See the comments below for additional
 % information.
-% 
+%
 % \StopEventually{}
 %
 % To produce the printed version of this file the following code
@@ -133,7 +133,7 @@
 %    \end{macrocode}
 % The following example describes the possible contents of a file
 % |hyphen.cfg| that will load both US English and German hyphenation
-% patterns, making the former the default. 
+% patterns, making the former the default.
 % It sets |\language| to $0$ for the US patterns and to $1$ for the
 % German patterns.
 % Then |\language| is set to $0$ to make this the default and the
diff --git a/Master/texmf-dist/source/latex/base/ltidxglo.dtx b/Master/texmf-dist/source/latex/base/ltidxglo.dtx
index b919e137753..2b61bb2c4a6 100644
--- a/Master/texmf-dist/source/latex/base/ltidxglo.dtx
+++ b/Master/texmf-dist/source/latex/base/ltidxglo.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltidxglo.dtx
@@ -86,7 +86,7 @@
 %                                 \protect{X} == \string X\space
 %                                  %% added 3 Feb 87 for \index commands
 %                                  %% in \footnotes
-%                                  re-\catcode special characters 
+%                                  re-\catcode special characters
 %                                  to 'other'
 %                                  \@wrindex
 %   END
@@ -118,7 +118,7 @@
 %    \end{macrocode}
 %
 % \changes{v1.1b}{1994/11/04}{Removed \cs{if@filesw} from
-%    \cs{makeindex}.} 
+%    \cs{makeindex}.}
 %
 % \begin{macro}{\makeindex}
 %    \begin{macrocode}
@@ -138,13 +138,13 @@
 %    \begin{macrocode}
   \let\makeindex\@empty
 }
-\@onlypreamble\makeindex 
+\@onlypreamble\makeindex
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\@wrindex}
 % \changes{v1.1b}{1994/11/04}{Added \cs{protected@write} to
-%    \cs{@wrindex}.} 
+%    \cs{@wrindex}.}
 %    \begin{macrocode}
 \def\@wrindex#1{%
    \protected@write\@indexfile{}%
@@ -168,7 +168,7 @@
 %
 % \begin{macro}{\makeglossary}
 % \changes{v1.1b}{1994/11/04}{Removed \cs{if@filesw} from
-%    \cs{makeglossary}.} 
+%    \cs{makeglossary}.}
 %    \begin{macrocode}
 \def\makeglossary{%
   \newwrite\@glossaryfile
@@ -192,7 +192,7 @@
 %
 % \begin{macro}{\@wrglossary}
 % \changes{v1.1b}{1994/11/04}{Added \cs{protected@write} to
-%    \cs{@wrglossary}.} 
+%    \cs{@wrglossary}.}
 %    \begin{macrocode}
 \def\@wrglossary#1{%
    \protected@write\@glossaryfile{}%
diff --git a/Master/texmf-dist/source/latex/base/ltlength.dtx b/Master/texmf-dist/source/latex/base/ltlength.dtx
index 09def63be2e..374e383f1b0 100644
--- a/Master/texmf-dist/source/latex/base/ltlength.dtx
+++ b/Master/texmf-dist/source/latex/base/ltlength.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -109,7 +109,7 @@
 \def\addtolength#1#2{\advance#1 #2\relax}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 %
 % \begin{macro}{\settoheight}
 % \changes{LaTeX2e}{1993/11/22}{Macro added}
diff --git a/Master/texmf-dist/source/latex/base/ltlists.dtx b/Master/texmf-dist/source/latex/base/ltlists.dtx
index 2c128be3cf1..ecbfa956089 100644
--- a/Master/texmf-dist/source/latex/base/ltlists.dtx
+++ b/Master/texmf-dist/source/latex/base/ltlists.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltlists.dtx
@@ -656,8 +656,8 @@
 %    \end{macrocode}
 % \end{macro}
 %
-%    The definition of \cs{trivlist} used to be in ltspace.dtx 
-%    so that other commands could be `let to it'.  
+%    The definition of \cs{trivlist} used to be in ltspace.dtx
+%    so that other commands could be `let to it'.
 %    They now use \cs{def}.
 % \begin{macro}{\endtrivlist}
 % \changes{v1.2b ltspace}{1994/11/12}{Changed order of tests to make
@@ -698,19 +698,19 @@
 }
 %    \end{macrocode}
 % \end{macro}
-% 
 %
-% 
+%
+%
 % \begin{macro}{\@endparenv}
 % \begin{macro}{\@doendpe}
 % To suppress the paragraph indentation in text immediately following
 % a paragraph-making environment, \cs{everypar} is changed to remove the
 % space, and \cs{par} is redefined to restore \cs{everypar}.  Instead of
-% redefining \cs{par} and \cs{everpar}, \cs{@endparenv} was changed to 
-% set the @endpe switch, letting \cs{end} redefine \cs{par} and 
-% \cs{everypar}.  
+% redefining \cs{par} and \cs{everpar}, \cs{@endparenv} was changed to
+% set the @endpe switch, letting \cs{end} redefine \cs{par} and
+% \cs{everypar}.
 %
-% This allows paragraph-making environments to work right when called 
+% This allows paragraph-making environments to work right when called
 % by other environments. (Changed 27 Oct 86)
 %    \begin{macrocode}
 \def\@endparenv{%
@@ -721,19 +721,19 @@
 \def\@doendpe{\@endpetrue
      \def\par{\@restorepar\everypar{}\par\@endpefalse}\everypar
 %    \end{macrocode}
-%    
-%    Use |\setbox0=\lastbox| instead of   |\hskip -\parindent|   
-%    so that a \cs{noindent} becomes a no-op when used before 
+%
+%    Use |\setbox0=\lastbox| instead of   |\hskip -\parindent|
+%    so that a \cs{noindent} becomes a no-op when used before
 %    a line immediately following a list environment(23 Oct 86).
 % \changes{v1.0k}{1995/11/07}{Enclosed \cs{setbox0} assignment by a
-% group so that it leaves the contents of box $0$ intact.} 
+% group so that it leaves the contents of box $0$ intact.}
 %    \begin{macrocode}
                {{\setbox\z@\lastbox}\everypar{}\@endpefalse}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
-% 
+%
 % \begin{macro}{\if@endpe}
 % \begin{macro}{\@endpefalse}
 % \begin{macro}{\@endpeltrue}
@@ -743,7 +743,7 @@
 %    \end{macrocode}
 % \end{macro}\end{macro}\end{macro}
 %
-% 
+%
 % \begin{macro}{\@mklab}
 %    \begin{macrocode}
 \def\@mklab#1{\hfil #1}
@@ -814,7 +814,7 @@
 %    \end{macrocode}
 %    This |\if@inlabel| check is needed in case an item starts of
 %    inside a group so that |\everypar| does not become empty
-%    outside that group. 
+%    outside that group.
 % \@nobreakfalse, etc etc.
 %    \begin{macrocode}
     \if@inlabel
@@ -867,7 +867,7 @@
 % \changes{v1.0l}{1996/07/26}{Remove unecessary \cs{global} before
 %                 \cs{@nobreak...}}
 % \changes{v1.0m}{1996/10/23}{\cs{@nobreak...} moved into the
-%          \cs{everypar} and not executed unconditionally, see above} 
+%          \cs{everypar} and not executed unconditionally, see above}
 %    \begin{macrocode}
   \if@noitemarg
     \@noitemargfalse
@@ -886,7 +886,7 @@
   \global\setbox\@labels\hbox{%
     \unhbox\@labels
     \hskip \itemindent
-    \hskip -\labelwidth 
+    \hskip -\labelwidth
     \hskip -\labelsep
     \ifdim \wd\@tempboxa >\labelwidth
       \box\@tempboxa
@@ -1009,7 +1009,7 @@
     \advance\@enumdepth\@ne
     \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
 %    \end{macrocode}
-%    
+%
 % \changes{v1.0j}{1995/07/09}{Use \cs{expandafter}}
 %    \begin{macrocode}
       \expandafter
@@ -1055,7 +1055,7 @@
     \advance\@itemdepth\@ne
     \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
 %    \end{macrocode}
-%    
+%
 % \changes{v1.0j}{1995/07/09}{Use \cs{expandafter}}
 %    \begin{macrocode}
     \expandafter
diff --git a/Master/texmf-dist/source/latex/base/ltlogos.dtx b/Master/texmf-dist/source/latex/base/ltlogos.dtx
index 5736477a679..82487d092c7 100644
--- a/Master/texmf-dist/source/latex/base/ltlogos.dtx
+++ b/Master/texmf-dist/source/latex/base/ltlogos.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -83,7 +83,7 @@
 % \changes{v1.1d}{1994/06/01}
 %     {Add \cs{m@th} to force math size calculations}
 % \changes{v1.1e}{1994/07/20}{Save a few tokens}
-% 
+%
 % \changes{v1.1h}{1997/10/08}{Simplify macro (force loading of
 %    suitable math fonts once).}
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/ltmath.dtx b/Master/texmf-dist/source/latex/base/ltmath.dtx
index 420c7b287ff..8f776d71c9a 100644
--- a/Master/texmf-dist/source/latex/base/ltmath.dtx
+++ b/Master/texmf-dist/source/latex/base/ltmath.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltmath.dtx
@@ -68,7 +68,7 @@
 %     \cs{@ignoretrue} in various places.}
 % \changes{v1.1c}{1998/08/17}{(RmS) Minor documentation fixes.}
 % \changes{v1.1g}{2005/11/10}{(MH) Minor documentation fixes.}
-% 
+%
 % \section{Math setup}
 %
 % This file contains a lot of the original plain \TeX{} code, as well
@@ -204,7 +204,7 @@
 \interdisplaylinepenalty=100
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\choose}
 %    \begin{macrocode}
 \def\choose{\atopwithdelims()}
@@ -524,10 +524,10 @@
 %
 %
 % \changes{v1.0m}{1994/10/29}{ASAJ: Removed \cs{dag}, \cs{ddag}.}
-% \changes{v1.0m}{1994/10/29}{ASAJ: Renamed \cs{S} and \cs{P} to 
-%    \cs{mathsection} and \cs{mathparagraph} and made them 
-%    \cs{mathchardef}s.} 
-% \changes{v1.0m}{1994/10/29}{ASAJ: Added \cs{mathellipsis}, 
+% \changes{v1.0m}{1994/10/29}{ASAJ: Renamed \cs{S} and \cs{P} to
+%    \cs{mathsection} and \cs{mathparagraph} and made them
+%    \cs{mathchardef}s.}
+% \changes{v1.0m}{1994/10/29}{ASAJ: Added \cs{mathellipsis},
 %    \cs{mathdollar} and \cs{mathsterling}.}
 % \changes{v1.0n}{1994/10/30}{ASAJ: Moved the new commands to ltoutenc.}
 %
@@ -550,7 +550,7 @@
 % \changes{v1.1g}{2005/11/10}
 %                {(MH) Fixed potential problem in \cs{[} (pr/3399).}
 % \begin{macro}{\]}
-%    Produces |$$...$$| with checks that |\[| isn't used in math mode, 
+%    Produces |$$...$$| with checks that |\[| isn't used in math mode,
 %    and that |\]| is only used in math mode begun with |\]|.
 %    \begin{macrocode}
 \def\[{%
@@ -558,7 +558,7 @@
       \@badmath
    \else
       \ifvmode
-         \nointerlineskip 
+         \nointerlineskip
          \makebox[.6\linewidth]{}%
       \fi
       $$%%$$ BRACE MATCH HACK
@@ -575,7 +575,7 @@
          $$%%$$ BRACE MATCH HACK
       \fi
    \else
-      \@badmath 
+      \@badmath
    \fi
    \ignorespaces
 }
@@ -601,7 +601,7 @@
 %
 % \begin{environment}{equation}
 % \changes{LaTeX2.09}{1992/01/10}{RmS: put \cs{hbox} around \cs{@eqnnum}
-%    to typeset the equation number in text mode 
+%    to typeset the equation number in text mode
 %    (as in the eqnarray env.)}
 % \begin{macro}{\c@equation}
 %  Numbered equations, using the counter |\c@equation|.
@@ -657,7 +657,7 @@
 % \begin{macro}{\sqrt}
 % \changes{v1.0y}{1995/10/16}{(DPC) Make robust /1808}
 % \begin{macro}{\@sqrt}
-%    Add an optional argument to plain's |\sqrt| to give the $n$th root 
+%    Add an optional argument to plain's |\sqrt| to give the $n$th root
 %    of an expression $\sqrt[n]{e}$.
 % \changes{v1.0r}{1995/05/21}{Use \cs{sqrtsign}}
 %    \begin{macrocode}
@@ -670,7 +670,7 @@
 % \changes{LaTeX2.09}{1985/11/04}{produce warning message if line
 %      extends into margin.  Doesn't warn about formula
 %      overprinting equation number.}
-% \changes{LaTeX2.09}{1993/11/02}{RmS: 
+% \changes{LaTeX2.09}{1993/11/02}{RmS:
 %        Corrected description of \cs{@eqnsel}, moved \cs{@eqnsel}
 %        accordingly and removed extra \cs{tabskip} assignment.}
 % \changes{LaTeX2e}{1993/11/03}{RmS: Initialized \cs{everycr} to empty}
@@ -709,7 +709,7 @@
    $$\everycr{}\halign to\displaywidth\bgroup
        \hskip\@centering$\displaystyle\tabskip\z@skip{##}$\@eqnsel
       &\global\@eqcnt\@ne\hskip \tw@\arraycolsep \hfil${##}$\hfil
-      &\global\@eqcnt\tw@ \hskip \tw@\arraycolsep 
+      &\global\@eqcnt\tw@ \hskip \tw@\arraycolsep
          $\displaystyle{##}$\hfil\tabskip\@centering
       &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup
          \tabskip\z@skip
@@ -741,7 +741,7 @@
 \def\nonumber{\global\@eqnswfalse}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@eqncr}
 % \begin{macro}{\@xeqncr}
 % \begin{macro}{\@yeqncr}
@@ -816,7 +816,7 @@
 %
 % \begin{macro}{\ensuremath}
 %   In math mode, |\ensuremath{text}| is equivalent to text; in LR or
-%   paragraph mode, it is equivalent to |$|text|$|. 
+%   paragraph mode, it is equivalent to |$|text|$|.
 %   |\relax| is not needed
 %   in front of the |\ifmmode| as |\protect| will be |\let| to |\relax|.
 %   This version (due to Donald Arseneau) avoids duplicating its
@@ -828,11 +828,11 @@
 %      Leslie's book}
 % \changes{v1.1a}{1996/03/25}{Reimplement for amslatex/2104}
 %    \begin{macrocode}
-\DeclareRobustCommand{\ensuremath}{% 
+\DeclareRobustCommand{\ensuremath}{%
   \ifmmode
     \expandafter\@firstofone
   \else
-    \expandafter\@ensuredmath 
+    \expandafter\@ensuredmath
   \fi}
 %    \end{macrocode}
 % \end{macro}
@@ -882,7 +882,7 @@
 %
 %    To get the displayed math environments to print the contents
 %    flush left (with an indentation) we have to redefine all of
-%    \LaTeXe's displayed math environments. 
+%    \LaTeXe's displayed math environments.
 %
 %  \begin{macro}{\mathindent}
 %    The amount of indentation of the equations is stored in a register.
diff --git a/Master/texmf-dist/source/latex/base/ltmiscen.dtx b/Master/texmf-dist/source/latex/base/ltmiscen.dtx
index a040b11e1e4..43cff8d5260 100644
--- a/Master/texmf-dist/source/latex/base/ltmiscen.dtx
+++ b/Master/texmf-dist/source/latex/base/ltmiscen.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993-2010
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltmiscen.dtx
@@ -74,7 +74,7 @@
 % \changes{v1.1g}{1998/08/17}{(RmS) Minor documentation fixes.}
 %
 % \section{Miscellaneous Environments}
-%  This section implements the basic environment mechanism, and also 
+%  This section implements the basic environment mechanism, and also
 % a few specific environments including |document|, The math
 % environments and related commands, the `flushing' environments,
 % (|center|, |flushleft|, |flushright|), and |verbatim|.
@@ -98,7 +98,7 @@
 %  |\endgroup|.  Otherwise, |\end{foo}| does nothing.
 %
 %  If |\end{foo}| needs to ignore blanks after it, then |\endfoo| should
-%  globally set the |@ignore| switch true with |\@ignoretrue| 
+%  globally set the |@ignore| switch true with |\@ignoretrue|
 %  (this will automatically be global).
 %
 %
@@ -119,7 +119,7 @@
 %              if G@refundefined = true
 %               then LaTeX Warning: 'There are undefined references.' fi
 %              if @multiplelabels = true
-%                then LaTeX Warning: 
+%                then LaTeX Warning:
 %                    'One or more label(s) multiply defined.'
 %                else
 %                \@setckpt {ARG1}{ARG2} == null
@@ -177,7 +177,7 @@
 % \begin{macro}{\ignorespacesafterend}
 % \changes{v1.1e}{1996/07/26}{user level macro added}
 %    \begin{macrocode}
-\let\ignorespacesafterend\@ignoretrue 
+\let\ignorespacesafterend\@ignoretrue
 %    \end{macrocode}
 % \end{macro}
 %
@@ -186,7 +186,7 @@
 %         {Changed redefinition of \cs{global} to redefinition
 %               of \cs{@setckpt}.}
 % \changes{LaTeX2.09}{1993/09/08}
-%         {Added warning in case of undefined references.}%    
+%         {Added warning in case of undefined references.}%
 % \changes{v0.9e}{1993/12/09}{Hook added}
 %    \begin{macrocode}
 \def\enddocument{%
@@ -197,7 +197,7 @@
 %    the whole document effectively starts and ends with some special
 %    environment. However, this must be used with care, eg if two
 %    applications would use this without knowledge of each other the
-%    order of the environments will be wrong after all. 
+%    order of the environments will be wrong after all.
 %    |\AtEndDocument| is redefined
 %    at this point so that and such commands that get into the hook do
 %    not chase their tail\ldots
@@ -230,7 +230,7 @@
 %    We use |\@@input| to load the \texttt{.aux} file, so that it doesn't
 %    show up in the list of files produced by |\listfiles|.
 %    \begin{macrocode}
-       \@tempswafalse 
+       \@tempswafalse
        \makeatletter \@@input\jobname.aux
      \fi
 %    \end{macrocode}
@@ -274,9 +274,9 @@
 %    since a rerun will not solve that problem (unless one uses a
 %    package like \texttt{varioref} that generates labels on the fly),
 %    we suppress this message.
-% \changes{v1.0e}{1994/04/20}{Changed logic for producing 
+% \changes{v1.0e}{1994/04/20}{Changed logic for producing
 %                             warning messages}
-% \changes{v1.1b}{1995/10/24}{Changed logic for producing 
+% \changes{v1.1b}{1995/10/24}{Changed logic for producing
 %                             warning messages and removed switch}
 %    \begin{macrocode}
      \if@filesw
@@ -286,7 +286,7 @@
                Rerun to get cross-references right}%
          \fi
        \else
-         \@multiplelabels 
+         \@multiplelabels
        \fi
      \fi
    \endgroup
@@ -339,7 +339,7 @@
 % \begin{NAME} ==
 %  BEGIN
 %    IF \NAME undefined  THEN  \reserved@a == BEGIN report error END
-%                        ELSE  \reserved@a ==  
+%                        ELSE  \reserved@a ==
 %                                   (\@currenvir :=L NAME) \NAME
 %    FI
 %    @ignore :=G F      %% Added 30 Nov 88
@@ -377,8 +377,8 @@
 % \begin{macro}{\begin}
 % \changes{LaTeX2.09}{1992/03/18}{Changed \cs{@ignoretrue} to
 %               \cs{@ignorefalse} (as documented)}
-% \changes{LaTeX2.09}{1992/08/24}{Added code to \cs{begin} to 
-%      remember line number. Used by \cs{@badend} to display 
+% \changes{LaTeX2.09}{1992/08/24}{Added code to \cs{begin} to
+%      remember line number. Used by \cs{@badend} to display
 %      position of non-matching \cs{begin}.}
 % \changes{v1.1e}{1996/07/26}{remove \cs{global} before \cs{@ignore...}}
 %    \begin{macrocode}
@@ -388,7 +388,7 @@
     {\def\reserved@a{\def\@currenvir{#1}%
      \edef\@currenvline{\on@line}%
      \csname #1\endcsname}}%
-  \@ignorefalse 
+  \@ignorefalse
   \begingroup\@endpefalse\reserved@a}
 %    \end{macrocode}
 %  \end{macro}
@@ -449,7 +449,7 @@
 %
 % \raggedright has a more universal effect, however.  It sets
 % \@rightskip := flushglue.  Every environment, like the list
-% environments, 
+% environments,
 % that set \rightskip to its 'normal' value set it to \@rightskip
 %
 % \end{oldcomments}
@@ -562,7 +562,7 @@
 %  The verbatim environment uses the fixed-width |\ttfamily| font, turns
 %  blanks into spaces, starts a new line for each carrige return (or
 %  sequence of consecutive carriage returns), and interprets
-%  \emph{every} character literally. 
+%  \emph{every} character literally.
 %  I.e., all special characters |\, {, $|, etc.
 %   are |\catcode|'d to 'other'.
 %
@@ -599,7 +599,7 @@
 % \end{macro}
 %
 %  \begin{macro}{\@verbatim}
-% \changes{LaTeX2.09}{1991/07/24}{Added \cs{penalty}\cs{interlinepenalty} 
+% \changes{LaTeX2.09}{1991/07/24}{Added \cs{penalty}\cs{interlinepenalty}
 %               to definition of \cs{par} so that \cs{samepage} works}
 % \changes{v0.9h}{1993/12/13}{Removed optional argument of \cs{item}}
 %    Real start of verbatim environment
@@ -609,7 +609,7 @@
 % \changes{v1.0b}{1994/03/16}
 %         {Remove \cs{global}\cs{@inlabelfalse} again.}
 %    \begin{macrocode}
-\def\@verbatim{\trivlist \item\relax 
+\def\@verbatim{\trivlist \item\relax
   \if@minipage\else\vskip\parskip\fi
   \leftskip\@totalleftmargin\rightskip\z@skip
   \parindent\z@\parfillskip\@flushglue\parskip\z@skip
@@ -621,7 +621,7 @@
 %         {Only add \cs{penalty} if in hmode}
 %    \begin{macrocode}
   \@@par
-  \@tempswafalse 
+  \@tempswafalse
   \def\par{%
     \if@tempswa
 %    \end{macrocode}
@@ -655,7 +655,7 @@
 }
 %    \end{macrocode}
 %  \end{macro}
-%  
+%
 %  \begin{macro}{\verbatim}
 %  \begin{macro}{\endverbatim}
 %    (RmS 93/09/19) Protected against `missing item' error message
@@ -671,7 +671,7 @@
 % \changes{v0.9a}{1993/11/21}{Macro added}
 %    Macro to select the font  used for verbatim typesetting.
 %    It also does other work if necessary for the font used.
-% \changes{v0.9s}{1994/01/21}{Removed unnecessary category code 
+% \changes{v0.9s}{1994/01/21}{Removed unnecessary category code
 %                            hackery.}
 %    \begin{macrocode}
 \def\verbatim@font{\normalfont\ttfamily}
@@ -720,7 +720,7 @@
 %
 %  \begin{macro}{\verb}
 % \changes{LaTeX2.09}{1992/08/24}
-%         {Changed \cs{verb} and \cs{@sverb} to work correctly 
+%         {Changed \cs{verb} and \cs{@sverb} to work correctly
 %            in math mode}
 % \changes{v0.9a}{1993/11/21}{Use \cs{verbatim@font} instead of
 %                             \cs{tt}.}
@@ -746,7 +746,7 @@
 % Definitions of |\@sverb| and |\@verb| changed so |\verb+ foo+|
 % does not lose leading blanks when it comes at the beginning of a line.
 % Change made 24 May 89. Suggested by Frank Mittelbach and Rainer
-% Sch\"opf. 
+% Sch\"opf.
 %
 %    \begin{macrocode}
 \def\@sverb#1{%
@@ -773,7 +773,7 @@
 %    \end{macrocode}
 %  \end{macro}
 %
-%  \begin{macro}{\do@noligs}   
+%  \begin{macro}{\do@noligs}
 %    \begin{macrocode}
 \def\do@noligs#1{%
   \catcode`#1\active
diff --git a/Master/texmf-dist/source/latex/base/ltnews01.tex b/Master/texmf-dist/source/latex/base/ltnews01.tex
index 92090e17d01..d10a0e858cd 100644
--- a/Master/texmf-dist/source/latex/base/ltnews01.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews01.tex
@@ -2,62 +2,62 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews01.tex
- 
+
 % This is issue 1 of LaTeX News.
 
 \documentclass
 %   [type1fonts]
    {ltnews}
- 
+
 \publicationmonth{June}
 \publicationyear{1994}
 \publicationissue{1}
- 
+
 \begin{document}
- 
+
 \maketitle
- 
+
 \section{Welcome to \LaTeXNews}
- 
-An issue of \emph{\LaTeXNews} will accompany every future release of 
-\LaTeX.  It will tell you about important events, such as major bug 
+
+An issue of \emph{\LaTeXNews} will accompany every future release of
+\LaTeX.  It will tell you about important events, such as major bug
 fixes, newly available packages, or any other \LaTeX{} news.
- 
+
 \section{\LaTeXe---the new \LaTeX{} release}
- 
+
 The most important news is the release of \LaTeXe, the new version of
 the \LaTeX{} software.  This version has better support for fonts,
 graphics and colour, and will be actively maintained by the \LaTeX3
-project team.  Upgrades will be issued every six months, in June and 
+project team.  Upgrades will be issued every six months, in June and
 December.
- 
+
 \section{Why a new \LaTeX?}
- 
+
 Over the years many extensions have been developed for \LaTeX. This
 is, of course, a sure sign of its continuing popularity but it has had
 one unfortunate result: incompatible \LaTeX{} formats came into use at
@@ -65,7 +65,7 @@ different sites. Thus, to process documents from various places, a
 site maintainer was forced to keep \LaTeX{} (with and without \NFSS),
 \SLiTeX, \AmSLaTeX, and so on.  In addition, when looking at a source
 file it was not always clear for which format the document was written.
- 
+
 To put an end to this unsatisfactory
 situation a new release of \LaTeX{} was produced.
 It brings all such extensions back under a single format and thus
@@ -73,15 +73,15 @@ prevents the proliferation of mutually incompatible dialects of
 \LaTeX~2.09. The new release was available for several months as a
 test version, and the final release of 1~June officially
 replaces the old version.
- 
+
 \section{Processing documents with \LaTeXe}
- 
+
 Documents written for \LaTeX~2.09 will
 still be read by \LaTeXe.  Any such document is run in
 \emph{\LaTeX~2.09 compatibility mode}.
- 
-Unfortunately, compatibility mode comes with a price: it can run 
-up to 50\% slower than \LaTeX~2.09 did.  If you want to run your document 
+
+Unfortunately, compatibility mode comes with a price: it can run
+up to 50\% slower than \LaTeX~2.09 did.  If you want to run your document
 in the faster \emph{native mode}, you should try replacing the line:
 \begin{verbatim}
    \documentstyle[<options>,<packages>]{<class>}
@@ -91,17 +91,17 @@ with:
    \documentclass[<options>]{<class>}
    \usepackage{latexsym,<packages>}
 \end{verbatim}
-Unfortunately, this will not always work, because some \LaTeX~2.09 
-packages will only work in \LaTeXe{} compatibility mode.  You should find 
+Unfortunately, this will not always work, because some \LaTeX~2.09
+packages will only work in \LaTeXe{} compatibility mode.  You should find
 out if there is a \LaTeXe{} version of the package available.
- 
-\LaTeXe{} native mode also gives access to the new features of \LaTeXe, 
+
+\LaTeXe{} native mode also gives access to the new features of \LaTeXe,
 described in \emph{\LaTeXe{} for authors}.
- 
+
 \section{New packages}
- 
-\LaTeXe{} has much better support for graphics, colour, fonts, and 
-multi-lingual typesetting.  The following software should be available 
+
+\LaTeXe{} has much better support for graphics, colour, fonts, and
+multi-lingual typesetting.  The following software should be available
 from the distributor who brought you \LaTeXe:
 
 \begin{citations}
@@ -112,12 +112,12 @@ from the distributor who brought you \LaTeXe:
 \item[psnfss] for using Type~1 fonts.
 \item[tools]  other packages by the \LaTeX3 team.
 \end{citations}
-The packages come with full documentation, and are also described in 
-\emph{\LaTeX: A Document Processing System} or 
+The packages come with full documentation, and are also described in
+\emph{\LaTeX: A Document Processing System} or
 \emph{The \LaTeX{} Companion}.
- 
+
 \section{Further information}
- 
+
 More information about \LaTeXe{} is to be found in:
 
 \begin{citations}
@@ -126,11 +126,11 @@ More information about \LaTeXe{} is to be found in:
 \item[The \LaTeX{} Companion]
    Goossens, Mittelbach and Samarin, \AW, 1994.
 \end{citations}
-The \LaTeX{} distribution comes with documentation on the new features of 
+The \LaTeX{} distribution comes with documentation on the new features of
 \LaTeX:
 
 \begin{citations}
-\item[\LaTeXe{} for authors] 
+\item[\LaTeXe{} for authors]
    describes the new features of \LaTeX{} documents,
    in the file \verb|usrguide.tex|.
 \item[\LaTeXe{} for class and package writers]
@@ -141,12 +141,12 @@ The \LaTeX{} distribution comes with documentation on the new features of
    class and package writers,
    in the file \verb|fntguide.tex|.
 \end{citations}
-For more information on \TeX{} and \LaTeX, get in touch with your local 
-\TeX{} Users Group, or the international \TeX{} Users Group, 
-P.~O.~Box~869, Santa~Barbara, CA~93102-0869, USA, Fax:~+1~805~963~8358, 
+For more information on \TeX{} and \LaTeX, get in touch with your local
+\TeX{} Users Group, or the international \TeX{} Users Group,
+P.~O.~Box~869, Santa~Barbara, CA~93102-0869, USA, Fax:~+1~805~963~8358,
 EMail:~tug@tug.org.
- 
+
 \end{document}
- 
+
 
 
diff --git a/Master/texmf-dist/source/latex/base/ltnews02.tex b/Master/texmf-dist/source/latex/base/ltnews02.tex
index d46cb1b52f5..e263733a8b8 100644
--- a/Master/texmf-dist/source/latex/base/ltnews02.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews02.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews02.tex
 
@@ -99,28 +99,28 @@ be upwardly compatible with the test version.
  information structure and superior printed output for mathematical
  documents.
 
- There are far too many features of AMS-\LaTeX{} to list here.  
+ There are far too many features of AMS-\LaTeX{} to list here.
  AMS-\LaTeX{} is described in the accompanying documentation,
  and in \emph{The \LaTeX{} Companion}.
 
  Version 1.2beta of AMS-\LaTeX{} was released for testing by intrepid
- users in October 1994.  The full release of AMS-\LaTeX{}~1.2 is expected 
+ users in October 1994.  The full release of AMS-\LaTeX{}~1.2 is expected
  in early January 1995.
- 
+
  It will be divided into two bundles:
  \begin{itemize}
- 
+
  \item the \verb|amsfonts| packages, which give access to
     hundreds of new mathematical symbols, and new math fonts
     such as blackboard bold and fraktur.
-    
- \item the \verb|amsmath| packages, which provide finer control over 
+
+ \item the \verb|amsmath| packages, which provide finer control over
     mathematical typesetting, such as multi-line subscripts,
-    enhanced theorem and proof environments, 
-    and improved displayed equations, 
- 
+    enhanced theorem and proof environments,
+    and improved displayed equations,
+
  \end{itemize}
- For compatibility with older documents, an \verb|amstex| package will be 
+ For compatibility with older documents, an \verb|amstex| package will be
  provided.
 
 \section{\LaTeX{} on the internet}
diff --git a/Master/texmf-dist/source/latex/base/ltnews03.tex b/Master/texmf-dist/source/latex/base/ltnews03.tex
index d7c8ff0b205..552832c515b 100644
--- a/Master/texmf-dist/source/latex/base/ltnews03.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews03.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews03.tex
 
@@ -56,7 +56,7 @@ June.
 
 In the last \emph{\LaTeXNews}, we said ``we don't expect so much
 activity in the next six months,'' which has turned out not to be
-true! 
+true!
 
 \section{Additional input encodings}
 
@@ -106,7 +106,7 @@ One topic of discussion that has kept us busy is the distribution and
 modification conditions of \LaTeX.  We are committed to keeping
 \LaTeX{} as free reliable software, and ensuring that (as far as
 possible) \LaTeX{} documents will produce the same results on all
-systems. 
+systems.
 
 The modification conditions are currently under discussion, and we
 would like to hear from anyone interested.  Please read
diff --git a/Master/texmf-dist/source/latex/base/ltnews04.tex b/Master/texmf-dist/source/latex/base/ltnews04.tex
index 15e95999521..dba8d9f159c 100644
--- a/Master/texmf-dist/source/latex/base/ltnews04.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews04.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews04.tex
 
@@ -80,7 +80,7 @@ This release of the dc fonts fixes many bugs (including the missing
 many other ways. It is strongly recommended that you upgrade as soon as
 possible if currently you are using the old dc fonts, release 1.1 or
 earlier. The new fonts are available from the CTAN archives, in
-\texttt{tex-archive/fonts/dc}. 
+\texttt{tex-archive/fonts/dc}.
 
 The names of the font files are \emph{different}. This does not affect
 \LaTeX\ documents but \emph{does} affect the installation procedure as
@@ -123,18 +123,18 @@ of input of accented and other characters.
 
 Three new input encodings are now supported.
 \begin{itemize}
-\item \texttt{ansinew} the Windows ansi encoding, 
+\item \texttt{ansinew} the Windows ansi encoding,
                        as used in Microsoft Windows 3.x.
 \item \texttt{cp437de} a variant of \texttt{cp437}, which uses \ss\
   rather than $\beta$  in the appropriate slot.
-\item \texttt{next} the encoding used on Next computers. 
+\item \texttt{next} the encoding used on Next computers.
 \end{itemize}
 
 \section{Further information}
 
 For more information on \TeX{} and \LaTeX, get in touch with your local
 \TeX{} Users Group, or the international \TeX{} Users Group,
-1850 Union Street, \#1637, San Francisco, CA~94123, USA, 
+1850 Union Street, \#1637, San Francisco, CA~94123, USA,
 Fax:~+1~415~982~8559,
 EMail:~tug@tug.org.
 The \LaTeX{} home page is \verb|http://www.tex.ac.uk/ctan/latex/|
diff --git a/Master/texmf-dist/source/latex/base/ltnews05.tex b/Master/texmf-dist/source/latex/base/ltnews05.tex
index 9416f0e4ed3..87cbdbaacc8 100644
--- a/Master/texmf-dist/source/latex/base/ltnews05.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews05.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews05.tex
 
@@ -54,7 +54,7 @@ Most \LaTeX\ sectioning commands are defined using
 For example, the \textsf{article} class defines:
 \begin{small}
 \begin{verbatim}
-\newcommand\section{\@startsection 
+\newcommand\section{\@startsection
  {section}{1}{0pt}{-3.5ex plus-1ex minus-.2ex}%
  {2.3ex plus.2ex}{\normalfont\Large\bfseries}}
 \end{verbatim}
@@ -69,7 +69,7 @@ For example, one could use the \verb|\MakeUppercase| command to
 produce uppercase headings. A package or class file could contain:
 \begin{small}
 \begin{verbatim}
-\renewcommand\section{\@startsection 
+\renewcommand\section{\@startsection
  {section}{1}{0pt}{-3.5ex plus-1ex minus-.2ex}%
  {2.3ex plus.2ex}{\normalfont\Large\MakeUppercase}}
 \end{verbatim}
diff --git a/Master/texmf-dist/source/latex/base/ltnews06.tex b/Master/texmf-dist/source/latex/base/ltnews06.tex
index b5c7a28a245..22cbe3a6e69 100644
--- a/Master/texmf-dist/source/latex/base/ltnews06.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews06.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews06.tex
 
@@ -54,7 +54,7 @@ such as \texttt{T1cmr.fd} and \texttt{T1enc.def}.
 
 These file names cause problems on some systems (in particular they
 are illegal on the ISO 9660 CDROM format) and so in this release
-all file names have been made lowercase (for example 
+all file names have been made lowercase (for example
 \texttt{t1cmr.fd} and \texttt{t1enc.def}).
 
 This change should \emph{not} affect any document. Within \LaTeX,
@@ -69,7 +69,7 @@ should still work with this new release.
 The change \emph{does} affect the configuration files that may be used
 to make the \LaTeX\ format with initex. For example, the file
 \texttt{fonttext.ltx} previously specified \verb|\input{T1cmr.fd}|.
-It now has \verb|\input{t1cmr.fd}|. 
+It now has \verb|\input{t1cmr.fd}|.
 If you use a local file \texttt{fonttext.cfg}
 you will need to make similar changes, as \verb|\input{T1cmr.fd}|
 will not work as \texttt{T1cmr.fd} is no longer in the distribution.
@@ -109,7 +109,7 @@ you can use to avoid this problem; it should be inserted as shown here:
 \end{verbatim}
 
 \section{Docstrip improvements}
-The \textsf{docstrip} program that is used to unpack the \LaTeX\ 
+The \textsf{docstrip} program that is used to unpack the \LaTeX\
 sources has undergone further development. The new version should be
 able to process all old `batchfiles' but it allows a simpler syntax in
 new `batchfiles' (no need to define \verb|\def\batchfile{|\ldots).
diff --git a/Master/texmf-dist/source/latex/base/ltnews07.tex b/Master/texmf-dist/source/latex/base/ltnews07.tex
index 81d0ed3143c..def5df07bd2 100644
--- a/Master/texmf-dist/source/latex/base/ltnews07.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews07.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews07.tex
 
diff --git a/Master/texmf-dist/source/latex/base/ltnews08.tex b/Master/texmf-dist/source/latex/base/ltnews08.tex
index b43c4f53f9e..de069efa81b 100644
--- a/Master/texmf-dist/source/latex/base/ltnews08.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews08.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews08.tex
 
@@ -69,7 +69,7 @@ some of the internal names for the characters have changed.
 
 These additions to the \textsf{inputenc} package are
 \texttt{decmulti} (the DEC Multinational
-Character Set,  contributed by M.~Y.~Chartoire) 
+Character Set,  contributed by M.~Y.~Chartoire)
 and \texttt{cp1250} (an MS-Windows encoding for Central and Eastern
 Europe, contributed by Marcin Woli\'nski).  There is also a
 \texttt{cp1252} encoding that is identical to \texttt{ansinew}.
@@ -123,7 +123,7 @@ of syntax conventions and basic data-types that might form
 the basis for programming large scale projects in \TeX.
 They will be located in\\
 this CTAN directory:
-\begin{verbatim}  
+\begin{verbatim}
   CTAN:macros/latex/packages/expl3
 \end{verbatim}
 The documentation of this material is as follows: individual package
diff --git a/Master/texmf-dist/source/latex/base/ltnews09.tex b/Master/texmf-dist/source/latex/base/ltnews09.tex
index c4f8b43ec87..21a9807618f 100644
--- a/Master/texmf-dist/source/latex/base/ltnews09.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews09.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews09.tex
 
@@ -48,7 +48,7 @@
 \section{New math font encodings}
 
 A joint working group of the \TeX{} Users Group and the \LaTeX3
-Project is developing a new 8-bit math font encoding for \TeX{}.  
+Project is developing a new 8-bit math font encoding for \TeX{}.
 It is designed to overcome several limitations and implementation
 problems of the old math font encodings and to simplify switching
 between different sets of math fonts, much as the \LaTeX{} font
@@ -62,7 +62,7 @@ integrate it into the main \LaTeX{} distribution for the next
 release.
 
 Documents using only standard \LaTeX{} commands for math symbols
-should not be affected by switching to the new math font encodings  
+should not be affected by switching to the new math font encodings
 However, documents, classes or packages making specific assumptions
 about the encoding of math symbol fonts are likely to break.
 
@@ -73,7 +73,7 @@ the World Wide Web at \texttt{http://www.tug.org/twg/mfg/}.
 \section{A new math accent}
 
 A new math accent, \verb|\mathring|, has been added. This is a math mode
-version of the ring accent (\r{}) which is available in text 
+version of the ring accent (\r{}) which is available in text
 mode with the command \verb|\r|.
 
 \section{Extended \cs{DeclareMathDelimiter}}
@@ -111,19 +111,19 @@ environment and the \verb|\rule| command. For many other standard
 
 
 \section{Support for Cyrillic encodings}
- 
+
 We are very pleased that, after a lengthy period of development, a set
 of fonts, encodings and support files for using \LaTeX\ with Cyrillic
 characters will soon be available.
- 
+
 Test versions of the `LH' fonts for these Cyrillic encodings, based on
 the Computer Modern design, are available from CTAN archives in the
 directory \texttt{fonts/cyrillic/lh-test}.  The \LaTeX\ support files
 (by Werner Lemberg and Vladimir Volovich) are also available from CTAN
 archives in\\
  \texttt{macros/latex/contrib/supported/t2}
- 
- 
+
+
 \section{Default docstrip header}
 
 Many \LaTeX\ users now distribute packages in documented source form
diff --git a/Master/texmf-dist/source/latex/base/ltnews10.tex b/Master/texmf-dist/source/latex/base/ltnews10.tex
index d9e0d4de530..c75a011c722 100644
--- a/Master/texmf-dist/source/latex/base/ltnews10.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews10.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews10.tex 12/01/1998
 
@@ -61,13 +61,13 @@ quote (somewhat censored to protect the guilty) well reflects some of
 our feelings about working on \LaTeX{} over the years: \textit{the mere
 existence of \LaTeXe{} is a great miracle}.
 
-  
+
   \section{Restructuring the \LaTeX{} distribution}
-  
+
   Since the (once) `new' standard \LaTeX{} has reached such a venerable
   age, we are reviewing the way in which the system is presented to the
   world.
-  
+
   An early intention is to define, given the wide variety of good
   packages now available, what now constitutes a useful installation of
   \LaTeX{}. We also hope that such a definition will help document
@@ -75,14 +75,14 @@ existence of \LaTeXe{} is a great miracle}.
   designer can reasonably assume that a known list of
   facilities will be there for all users (so that each class
   need not supply them).
-  
+
   As a first small step towards this definition, we shall replace the
   \texttt{latex/packages} subdirectory on \ctan{}.
   This directory was a curious mixture of the important, such as the
   \LaTeX{} \texttt{tools}, that any self-respecting \LaTeX{}
   installation ought to have, and the esoteric or experimental.
 
-  The esoterica from \texttt{packages} will be moved to 
+  The esoterica from \texttt{packages} will be moved to
   new locations, as follows:
   \begin{quote}
     \texttt{expl3}  to \texttt{latex/exptl/project}\\
@@ -98,7 +98,7 @@ existence of \LaTeXe{} is a great miracle}.
 
  \section{\LaTeX\ Project on the Internet}
 A new \texttt{latex-project.org} domain has been registered.
-The web site is not yet fully functional but the old \LaTeX\ pages from 
+The web site is not yet fully functional but the old \LaTeX\ pages from
 \ctan\ are available at \texttt{http://www.latex-project.org/} and the
 \LaTeX\ bug reporting address has been changed to
 \texttt{latex-bugs@latex-project.org}.
@@ -129,7 +129,7 @@ including commonly used variants and Mongolian Cyrillic
 encodings). This provides platform independent and
 sophisticated basic support for high-quality typesetting in various
 Cyrillic-based languages.
- 
+
 For further information see the file \texttt{cyrguide.tex}.
 
 \section{Tools distribution}
diff --git a/Master/texmf-dist/source/latex/base/ltnews11.tex b/Master/texmf-dist/source/latex/base/ltnews11.tex
index 6587a691af9..0ed866a0c77 100644
--- a/Master/texmf-dist/source/latex/base/ltnews11.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews11.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews11.tex 01/06/1999
 % This is issue 11 of LaTeX News.
@@ -108,7 +108,7 @@ loaded, and with which options, do not work for the \pkg{fontenc}
 package.
 
 \section{New math font encodings}
-    
+
 As we announced in \LaTeX{} News~9, a joint working group of the
 \TeX{} Users Group and the \LaTeX3 Project has developed a new
 \mbox{8-bit} math font encoding for \TeX{}.
diff --git a/Master/texmf-dist/source/latex/base/ltnews12.tex b/Master/texmf-dist/source/latex/base/ltnews12.tex
index 47609689cea..5c225d15d41 100644
--- a/Master/texmf-dist/source/latex/base/ltnews12.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews12.tex
@@ -2,31 +2,31 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
-% Filename: ltnews12.tex 
+% Filename: ltnews12.tex
 %
 % This is issue 12 of LaTeX News.
 
@@ -131,7 +131,7 @@ on the list \texttt{LATEX-L}. You can join this list, which is
 intended solely for discussing ideas and concepts for future versions
 of \LaTeX, by sending mail to
 %\begin{quote}
-  \email{listserv@URZ.UNI-HEIDELBERG.DE} 
+  \email{listserv@URZ.UNI-HEIDELBERG.DE}
 %\end{quote}
 containing the line
   \begin{quote}
diff --git a/Master/texmf-dist/source/latex/base/ltnews13.tex b/Master/texmf-dist/source/latex/base/ltnews13.tex
index ae08f3d90d1..7f091737246 100644
--- a/Master/texmf-dist/source/latex/base/ltnews13.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews13.tex
@@ -2,31 +2,31 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
-% Filename: ltnews13.tex 
+% Filename: ltnews13.tex
 %
 % This is issue 13 of LaTeX News.
 
@@ -36,7 +36,7 @@
 
 % \usepackage[T1]{fontenc}
 
-\publicationmonth{June}  
+\publicationmonth{June}
 \publicationyear{2000}
 \publicationissue{13}
 
@@ -45,7 +45,7 @@
 
 \maketitle
 
-\raisefirstsection 
+\raisefirstsection
 \section{Yearly release cycle}
 
 We announced in \textit{\LaTeX{} News~11} that we intended to switch
@@ -72,7 +72,7 @@ to release patches as needed to fix significant bugs.
 \end{quote}
 
 \begin{latexonly}
-  \vspace{-\baselineskip} 
+  \vspace{-\baselineskip}
 \end{latexonly}
 
 \noindent
@@ -88,7 +88,7 @@ and the distribution has been `cleaned up'.  The file
 
 The documentation (in \file{psnfss2e.pdf}) has been completely
 rewritten to provide a comprehensive introduction to the use
-of PostScript fonts. 
+of PostScript fonts.
 
 Notice that the new \PSNFSS{} needs updated files for font metrics,
 virtual fonts and font definitions.  If you received the new
@@ -163,16 +163,16 @@ these support higher quality \emph{automated}\footnote
 page-breaking and page make-up\latex{\\}
 for complex pages---the best yet achieved with \TeX{}!
 
-A paper describing the new output routine is 
+A paper describing the new output routine is
 \begin{latexonly}
   at\\
   \file{http://www.latex-project.org/papers/xo-pfloat.pdf%
    \hspace*{-16pt}}\\
 \end{latexonly}
 \begin{htmlonly}
-  at \url{http://www.latex-project.org/papers/xo-pfloat.pdf}. 
+  at \url{http://www.latex-project.org/papers/xo-pfloat.pdf}.
 \end{htmlonly}
-All code examples and documentation are available 
+All code examples and documentation are available
 \begin{latexonly}
   at\\
    \file{http://www.latex-project.org/code/experimental/%
diff --git a/Master/texmf-dist/source/latex/base/ltnews14.tex b/Master/texmf-dist/source/latex/base/ltnews14.tex
index 84440dd7d35..a25cb37ecdf 100644
--- a/Master/texmf-dist/source/latex/base/ltnews14.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews14.tex
@@ -2,32 +2,32 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
-% Filename: ltnews14.tex 
-% 
+% Filename: ltnews14.tex
+%
 % This is issue 14 of LaTeX News.
 
 \documentclass
@@ -36,7 +36,7 @@
 
 % \usepackage[T1]{fontenc}
 
-\publicationmonth{June}  
+\publicationmonth{June}
 \publicationyear{2001}
 \publicationissue{14}
 
@@ -128,10 +128,10 @@ page-breaking and page make-up\latex{\\}
 for complex pages---the best yet achieved with \TeX{}!
 
 More recently we have added material to handle the complex front
-matter requirements of journal articles; this was presented at 
+matter requirements of journal articles; this was presented at
 Gutenberg\,2001 in Metz.
 
-A paper describing the new output routine is 
+A paper describing the new output routine is
 \begin{latexonly}
   at\\
 \begin{small}
@@ -139,9 +139,9 @@ A paper describing the new output routine is
 \end{small}
 \end{latexonly}
 \begin{htmlonly}
-  at \url{http://www.latex-project.org/papers/xo-pfloat.pdf}. 
+  at \url{http://www.latex-project.org/papers/xo-pfloat.pdf}.
 \end{htmlonly}
-All code examples and documentation are available 
+All code examples and documentation are available
 \begin{latexonly}
   at\\
 \begin{small}
diff --git a/Master/texmf-dist/source/latex/base/ltnews15.tex b/Master/texmf-dist/source/latex/base/ltnews15.tex
index 389ed6334d9..358f1aaadfe 100644
--- a/Master/texmf-dist/source/latex/base/ltnews15.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews15.tex
@@ -2,32 +2,32 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
-% Filename: ltnews15.tex 
-% 
+% Filename: ltnews15.tex
+%
 % This is issue 15 of LaTeX News.
 
 \documentclass
@@ -36,7 +36,7 @@
 
 % \usepackage[T1]{fontenc}
 
-\publicationmonth{December}  
+\publicationmonth{December}
 \publicationyear{2003}
 \publicationissue{15}
 
@@ -85,7 +85,7 @@ Jeff Licquia and Branden Robinson.
 
 The English has been corrected in \verb|\reftextbefore|
 (an incompatible change).  There are other extensions
-such as \verb|\labelformat|, \verb|\Ref|, \verb|\Vref| and \verb|\vpagerefnum|. 
+such as \verb|\labelformat|, \verb|\Ref|, \verb|\Vref| and \verb|\vpagerefnum|.
 Some Dutch text has also been changed and two\newline
 new options added: \package{slovak} and \package{slovene}.
 
@@ -113,8 +113,8 @@ A number of options have been added to the \package{textcomp} package,
 enabling only available glyphs to be used.
 Also, the `NFSS font families' are now divided into five different groups
 according to the subset of glyphs each provides from the full
-collection of symbols in the TS1 encoding. 
-Given sufficient information about a font family 
+collection of symbols in the TS1 encoding.
+Given sufficient information about a font family
 \package{textcomp} will use this in order to limit the\newline
 typesetting to those glyphs that are available.
 
@@ -133,7 +133,7 @@ tables in batch mode by providing a suitable input file.
 
 \section{New input encodings}
 
-The \package{inputenc} package has been extended as follows: 
+The \package{inputenc} package has been extended as follows:
 \package{macce} input encoding
 (Apple Central European),
 thanks to Radek Tryc and Marcin Wolinski; \package{cp1257}\newline
@@ -161,7 +161,7 @@ of standard \LaTeX{} Latin encodings.
 
 \section{And finally \ldots\ pict2e}
 
-The old, non-functional version of this package has been removed 
+The old, non-functional version of this package has been removed
  as there is now a fully working version from Hubert G\"a{\ss}lein
  and Rolf Niepraschk.  It is described
  in \textit{The \LaTeX{} Manual}.
diff --git a/Master/texmf-dist/source/latex/base/ltnews16.tex b/Master/texmf-dist/source/latex/base/ltnews16.tex
index 69e05973a8e..afff9a0f915 100644
--- a/Master/texmf-dist/source/latex/base/ltnews16.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews16.tex
@@ -2,32 +2,32 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
-% Filename: ltnews16.tex 
-% 
+% Filename: ltnews16.tex
+%
 % This is issue 16 of LaTeX News.
 
 \documentclass
@@ -36,7 +36,7 @@
 
 % \usepackage[T1]{fontenc}
 
-\publicationmonth{December}  
+\publicationmonth{December}
 \publicationyear{2003}
 \publicationissue{16}
 
@@ -72,16 +72,16 @@ and intellectual) by using it to discover
 masses of invaluable `insider information' about:
 \begin{itemize}
 \item the latest release of Standard \LaTeX{};
-\item over~200~extension packages; 
+\item over~200~extension packages;
 \item plus related software and systems.
 \end{itemize}
 For more information on this all new (??\ldots OK,\newline
 not \emph{all}, but over 90\%!!),
 all accurate (we hope!)\newline
-10th~Anniversary Edition, check out\newline 
+10th~Anniversary Edition, check out\newline
  \mbox{\url{http://www.awprofessional.com/titles/0201362996}}.
-  
-  
+
+
 \section{Future maintenance}
 
 We are currently exploring how best to support the very large and
@@ -105,7 +105,7 @@ in getting involved.
 \section{LPPL certification}
 
 There are still some outstanding diplomatic tasks around the
-\LaTeX{} Project Public Licence: these include 
+\LaTeX{} Project Public Licence: these include
 e.g.,~getting it `OSF certified' and ensuring that it gains
 more support and wider use, even in the FSF world\newline
 where it has long been tolerated.
@@ -121,7 +121,7 @@ making a definite announcement yet.
 
 Although the current release does not \emph{require} \eTeX{} features,
 we certainly recommend using an extended \TeX{}, especially if you
-need to debug macros. 
+need to debug macros.
 
 
 \section{End of `autoload' support}
@@ -144,7 +144,7 @@ and
 Since then a very large proportion of the The Team's efforts have been
 diverted to provide the core author team for TLC2, which provides
 over 1000 pages of carefully researched and tested documentation of
-many aspects of the vast world of \LaTeX{} related software that 
+many aspects of the vast world of \LaTeX{} related software that
 was developed over that same time period and that continues
 to grow and improve prodigiously.
 
diff --git a/Master/texmf-dist/source/latex/base/ltnews17.tex b/Master/texmf-dist/source/latex/base/ltnews17.tex
index c38243877a3..4848cf014cb 100644
--- a/Master/texmf-dist/source/latex/base/ltnews17.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews17.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews17.tex
 %
@@ -115,7 +115,7 @@ that.  Note also that \package{fixltx2e} will make use of the
 facilities in \eTeX{} whenever these are present (see below).
 
 The \package{calc} package has also been given an update with a few
-extra commands.  
+extra commands.
 The commands \verb|\maxof| and \verb|\minof|, each with two
 brace-delimited arguments, provide the usual numeric $\max$ and $\min$
 operations. The commands \verb|\settototalheight| and
@@ -125,7 +125,7 @@ operations. The commands \verb|\settototalheight| and
 \verb|\ifcase|.
 
 The \package{varioref} package has acquired a few more default
-strings but there are still a number of languages for 
+strings but there are still a number of languages for
 which good strings are still missing.
 
 The \package{showkeys} package has also been updated slightly to work
@@ -140,21 +140,21 @@ command \verb|\textsubscript| has been added as a complement to the
 command \verb|\textsuperscript| in the kernel.  Secondly, a new form of
 \verb|\DeclareMathSizes| that allows all of its arguments to have a
 dimension suffix.  This means you can now use expressions such as
-\verb|\DeclareMathSizes{9.5dd}{9.5dd}{7.4dd}{6.6dd}|.  
+\verb|\DeclareMathSizes{9.5dd}{9.5dd}{7.4dd}{6.6dd}|.
 
 The third new
 addition is the robust command \verb|\TextOrMath| which takes two
 arguments and executes one of them when typesetting in text or math
 mode respectively. This command also takes advantage of \eTeX{}
-extensions if available; more specifically, 
+extensions if available; more specifically,
 %%
 %%\pagebreak
 %%
 when the \eTeX{} extensions are available, it does not
-destroy kerning between previous letters and the text to be typeset. 
+destroy kerning between previous letters and the text to be typeset.
 The command is also used
 internally in \package{fixltx2e} to resolve a problem with
-\verb|\fnsymbol|.  
+\verb|\fnsymbol|.
 
 Also, further work has been done on reimplementing
 the command \verb|\addpenalty|, which is used internally in several
@@ -166,23 +166,23 @@ The \package{graphics} bundle now supports the
 \package{dvipdfmx} post-processor and Jonathan Kew's XE\TeX\
 program. By support we mean that the graphics packages recognize the
 new options \texttt{xetex} and \texttt{dvipdfmx} but we do not
-distribute the respective driver files. 
+distribute the respective driver files.
 
-This leads elegantly to a description of the 
+This leads elegantly to a description of the
 new policy concerning such driver files in the \package{graphics} bundle.
 Most driver files for our graphics packages are maintained by the
-developers of the associated post-processor or \TeX\ programs.  
+developers of the associated post-processor or \TeX\ programs.
 The teams developing these packages are working very hard: their rapid
 development offers a stark contrast to the current schedule of \LaTeX\
 releases.  It is therefore no longer practical
 for the \LaTeX\ Team to be responsible for distributing the
-latest versions of these driver files.  
+latest versions of these driver files.
 
 Therefore the installation files for \package{graphics} have been
 split: there is now \file{graphics.ins} to install the package files and
 \file{graphics-drivers.ins} for the driver files (located in
-\file{drivers.dtx}). 
-There is no need 
+\file{drivers.dtx}).
+There is no need
 to install all those provided in the file \file{drivers.dtx}.
 
 Please also note that, as requested by the maintainers of
@@ -203,28 +203,28 @@ programming environment. These packages have been lying dormant for some
 time while the \LaTeX\ Project Team were preoccupied by other things
 such as developing the experimental packages \package{xor},
 \package{template}, etc., (and also writing that indispensable
-and encyclopaedic volume,\\ 
+and encyclopaedic volume,\\
 The \LaTeX{} Companion -- 2nd edition).
 
 In October 2004 work on this code base was resumed with the goal of
 some day turning it into a kernel for \LaTeX3.  This work can now
 also make full use of the widely accepted \eTeX\ extensions. Currently
-two areas are central to this work. 
+two areas are central to this work.
 
-\begin{itemize} 
+\begin{itemize}
 \item Extending the
-  kernel code of \LaTeX3. 
+  kernel code of \LaTeX3.
 \item Converting the experimental packages
   such as \package{xor}, \package{template} to use the new
-  syntax internally. 
-\end{itemize} 
+  syntax internally.
+\end{itemize}
 
 Beware! Development of
 \package{expl3} is happening so fast that the descriptions above might
 be out of date when you read this! If you wish to see what's going on
 then go to
 \url{http://www.latex-project.org/code.html} where you can download
- fully working code (we hope!).  
+ fully working code (we hope!).
 
 \end{document}
 
diff --git a/Master/texmf-dist/source/latex/base/ltnews18.tex b/Master/texmf-dist/source/latex/base/ltnews18.tex
index 4e6090c02b8..94481d7f11b 100644
--- a/Master/texmf-dist/source/latex/base/ltnews18.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews18.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: ltnews18.tex
 %
diff --git a/Master/texmf-dist/source/latex/base/ltnews20.tex b/Master/texmf-dist/source/latex/base/ltnews20.tex
index f8eb9a8a7f1..b095411c676 100644
--- a/Master/texmf-dist/source/latex/base/ltnews20.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews20.tex
@@ -120,7 +120,7 @@ both cases; this has now been corrected.
 
   The 1.7 release of \texttt{multicol} adds support for languages that are typeset
   right-to-left. For those languages the order of the columns on the page
-  also need to be reversed---something that wasn't possible in earlier releases.
+  also needs to be reversed---something that wasn't possible in earlier releases.
 
 The new feature is supported through the
 commands \verb|\RLmulticolcolumns| (switching to right-to-left typesetting)
@@ -129,7 +129,7 @@ latter being the default.
 
 \paragraph{Improve French \texttt{babel} interaction with \texttt{varioref}}
 
- Extracting and saving the page number turned out to be a soure of subtle
+ Extracting and saving the page number turned out to be a source of subtle
  bugs. Initially it was done through an \verb"\edef" with a bunch of
 \verb"\expandafter" commands inside. This posed a problem if the page number
  itself contained code which needed protection (e.g., pr/4080) so this got
diff --git a/Master/texmf-dist/source/latex/base/ltnews21.tex b/Master/texmf-dist/source/latex/base/ltnews21.tex
new file mode 100644
index 00000000000..89aa353db84
--- /dev/null
+++ b/Master/texmf-dist/source/latex/base/ltnews21.tex
@@ -0,0 +1,258 @@
+% \iffalse meta-comment
+%
+% Copyright 2014
+% The LaTeX3 Project and any individual authors listed elsewhere
+% in this file.
+%
+% This file is part of the LaTeX base system.
+% -------------------------------------------
+%
+% It may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%    http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This file has the LPPL maintenance status "maintained".
+%
+% The list of all files belonging to the LaTeX base distribution is
+% given in the file `manifest.txt'. See also `legal.txt' for additional
+% information.
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
+% extension .ins) which are part of the distribution.
+%
+% \fi
+% Filename: ltnews21.tex
+%
+% This is issue 21 of LaTeX News.
+
+\documentclass{ltnews}
+
+\usepackage[T1]{fontenc}
+
+\usepackage{lmodern,url,hologo}
+
+\publicationmonth{May}
+\publicationyear{2014}
+
+\publicationissue{21}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+
+\bigskip
+
+\section{Scheduled \LaTeX\ bug-fix release}
+
+This issue of \LaTeX~News marks the second bug-fix release of
+\LaTeXe\ (standard \LaTeX) since shifting to a new build system in 2009.
+Provided sufficient changes are made, we expect to
+make such releases yearly or every two years, in sync with \TeX\ Live.
+
+
+
+\subsection{Release notes}
+
+This release makes no changes to the core code in the \LaTeXe\ format
+but there are a small number of documentation fixes (not listed
+here). In addition several packages in the \textsf{base} and
+\textsf{required} areas have been updated as detailed below.
+
+
+This has been done
+in accordance with the philosophy
+of minimising problems in both forwards and backwards compatibility, so most of
+these changes should not be noticed by the regular \LaTeX\ user.
+
+References in the text below of the form ``graphics/3873'' are to
+bug reports listed
+at:\\ \url{http://latex-project.org/cgi-bin/ltxbugs2html}
+
+
+\let\paragraph\subsubsection
+
+\paragraph{\textsf{fixltx2e} updates}
+
+
+
+There are a number of bugs and faulty design decisions in
+\LaTeXe{} that should have been corrected long ago in the kernel code.
+However, such corrections cannot be done
+as this would break
+backwards compatibility in the following sense. A large number of
+documents exist by now that have worked around the bug or have even made
+use of a particular misfeature.  Thus changing the kernel code would
+break too many existing documents.
+
+The corrections for these types of bug have therefore been collected together
+in a package that can be loaded only when needed; its name is \textsf{fixltx2e}.
+For this release we made the following changes to this package:
+\begin{itemize}
+\item
+   Misspelled float placement specifiers such as
+   \verb=\begin{figure}[tv]= instead of \texttt{tb} are silently
+   ignored by the kernel code.  Now we test for such letters and issue
+   an error message.
+\item
+   \LaTeX's float handling algorithm can get out of sync if you mix
+   single and double-column floats (as they are placed independently
+   of each other). This was corrected in \textsf{fixltx2e} a few years ago
+   but the fix was not perfect as one situation using
+   \verb=\enlargethispage= generated low-level \TeX{} error.
+   This behaviour of the package is now improved.
+\end{itemize}
+
+
+
+
+\paragraph{New \textsf{fltrace} package}
+
+For years the file \texttt{ltoutput.dtx} contained some hidden code to
+trace the detailed behavior of the float placement algorithm of
+\LaTeX. Prompted by questions on StackExchange we now extract this
+code into a new \textsf{fltrace} package. To see the float algorithm
+in action (or to understand why it decides to place all your floats at
+the very end of the document) use
+\begin{verbatim}
+ \usepackage{fltrace} \tracefloats
+\end{verbatim}
+To stop tracing somewhere in the document use
+\verb=\tracefloatsoff= and to see the current value of various float
+parameters use \verb=\tracefloatvals=. As the package is identical to
+the kernel code with tracing added, it may or may not work if you load any
+other package that manipulates that part of the kernel code. In such a
+case your best bet is to load \textsf{fltrace} first.
+
+\paragraph{\textsf{inputenc} package updates}
+
+The \textsf{inputenc} package allows different input encodings for
+\LaTeX\ documents to be specified including the important
+\texttt{utf8} option used to specify the Unicode UTF-8 encoding. A
+common mistake in documents has been to also include this option when
+using the Unicode-based TeX engines \hologo{LuaTeX} and \hologo{XeTeX}
+producing strange errors as these engines natively deal with UTF-8
+characters.
+
+If a document stored in an 8bit encoding is processed by \hologo{pdfTeX}, it needs the \textsf{inputenc} package to work correctly. However, if such a document is processed unchanged by \hologo{LuaTeX} or \hologo{XeTeX}, then accented characters may silently get dropped from the output.
+
+The package has been modified so that if used with \hologo{LuaTeX}
+or \hologo{XeTeX}, then it just issues a warning if \texttt{utf8}
+or \texttt{ascii}
+is specified,
+and stops with an error for any other encoding requested.
+
+
+
+One further improvement has been made to the encoding definition files
+(\texttt{.def}) used by \textsf{inputenc}: the catcode of \texttt{@}
+is now saved and restored when reading them instead of always using
+\verb=\makeatother= inside the files (latex/4192).
+
+
+
+\paragraph{The tools directory}
+
+In the past each of the sub-directories in the ``required'' section of
+the \LaTeX{} distribution contained a single \texttt{.ins} file to
+generate the code files from the source files. We have now
+started to provide individual \texttt{.ins} files for each those
+packages that are likely to require updates outside a major
+\LaTeX{} release.
+
+\paragraph{\textsf{multicol} updates}
+
+Version 1.8 of \textsf{multicol} implements some improvements/fixes
+and one extension. In the past the balancing algorithm enlarged the
+column height until it found a solution that satisfied all
+constraints. If there were insufficient break points then the final
+column height could have been much larger than expected and if that
+happened near the end of the page it resulted in the text overflowing
+into the bottom margin. This situation is now detected and in that
+case a normal page is cut and balancing is resumed on the next
+page. Some overflow is still allowed and controlled via the parameter
+\verb=\maxbalancingoverflow=.
+
+The use of \verb=\enlargethispage= is now properly supported within
+the environment. Finally a new command \verb=\docolaction= was added
+to allow the execution of code depending on the column in which the
+command is executed. See the documentation for details.
+
+Bug fixes: the new version fixes both a color leak that could happen
+in certain situations and the problem that \texttt{multicols} could
+mess up the positioning of \verb=\marginpar=s that followed the
+environment.
+
+
+\paragraph{\textsf{tabularx} updates}
+
+The restrictions on embedding \verb|\tabularx| \verb|\endtabularx|
+into the definition of a new environment have been relaxed
+slightly. See the package documentation for details.
+
+\paragraph{\textsf{showkeys} updates}
+
+The \textsf{showkeys} package has been updated to fix problems if used
+at the start of list items, and to work if brace groups (\verb|{| and
+\verb|}|) are used in the optional argument of
+\verb|\cite|. (tools/4162, tools/4173)
+
+
+\paragraph{\textsf{color} updates}
+
+The \verb|\nopagecolor| command suggested by Heiko Oberdiek,
+available for some years in the \textsf{pdftex} option, has been
+added to the core package as suggested in graphics/3873. Currently
+this is supported in the driver files for \textsf{dvips} and
+\textsf{pdftex}.  Patches to support other drivers are welcome.
+
+ \paragraph{\textsf{graphicx} updates}
+
+The \textsf{graphicx} version of \verb|\rotatebox| now allows
+\verb|\par| (and blank lines) in values, to match the change made
+to the \textsf{graphics} version some years ago. See graphics/4296.
+
+
+\paragraph{\textsf{keyval} updates}
+
+All parsing used in the \textsf{keyval} package has been changed
+to allow \verb|\par| (and blank lines) in values. Also only
+one rather than two levels of brace groups are now stripped from the
+value in a construct such as \verb|key={{{value}}}|. See
+graphics/3446.
+
+
+
+
+\vfill
+
+\section{Standard \LaTeX\ (\LaTeXe) and \textsf{expl3}}
+
+The substantial collection of innovative code in \textsf{expl3}
+implements a new programming language that has for a while now been
+used by some writers of \LaTeXe\ packages.  This code has recently
+also been made available for use on top of plain \TeX\ or {Context},
+largely to support generic packages that are supposed to work with
+different flavors of \TeX.  These uses in no way affect authors of
+\LaTeX\ documents and such \LaTeXe\ packages will continue to work as
+advertised by their authors with standard \LaTeX.
+
+This code base will also become an important foundation for the kernel
+of \LaTeX3 and so the new programming language can be described as
+`The \LaTeX3 Programming Language'. However, if you see or hear that a
+package `uses \LaTeX3' then it is remains very unlikely (yet) to mean
+that the package is part of some `new version of \LaTeX'.
+
+News about the development and use of \textsf{expl3} and about other
+developments in the \LaTeX3 code base is reported regularly in the
+\LaTeX3~News series (\url{http://latex-project.org/l3news/}), the most
+recent issue of which was published in March of this year.
+
+
+\end{document}
diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.dtx b/Master/texmf-dist/source/latex/base/ltoutenc.dtx
index a35ac2baa4e..cba9c6ca32c 100644
--- a/Master/texmf-dist/source/latex/base/ltoutenc.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutenc.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltoutenc.dtx
@@ -83,7 +83,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% 
+%
 % \changes{v1.99e}{2004/02/13}{Documentation fixes: typos}
 % \changes{v1.9k}{1998/01/12}{Added \cs{ProvidesPackage}
 %    for textcomp.sty}
@@ -95,9 +95,9 @@
 % \changes{v1.7r}{1995/11/28}{doc fixes}
 % \changes{v1.7h}{1995/04/21}{Added \cs{null} \cs{k}  latex/1274}
 % \changes{v1.7f}{1994/12/14}{Added braces to \cs{copyright} so it
-%    works unbraced in subscripts.} 
+%    works unbraced in subscripts.}
 % \changes{v1.7f}{1994/12/14}{Added check for math mode in
-%    \cs{@changed@cmd}.} 
+%    \cs{@changed@cmd}.}
 % \changes{v1.7f}{1994/12/14}{Commented out \cs{textasciicircum},
 %    \cs{textasciitilde}, \cs{textbackslash}, \cs{textbar},
 %    \cs{textgreater}, \cs{texthyphenchar}, \cs{texthyphen} and
@@ -116,14 +116,14 @@
 % \changes{v1.6i}{1994/11/22}{Corrected \cs{dots} so that there's no
 %    kerning in monowidth fonts.}
 % \changes{v1.6i}{1994/11/22}{Corrected typo with
-%    \cs{mathunderscore}.} 
+%    \cs{mathunderscore}.}
 % \changes{v1.6h}{1994/11/17}{(DPC) \cs{@tempa} to \cs{reserved@a}}
 % \changes{v1.6d}{1994/11/02}{Wrapped lines longer than 70 characters.}
 % \changes{v1.6d}{1994/10/30}{Added math commands.}
 % \changes{v1.6d}{1994/10/30}{Added OML encoding.}
 % \changes{v1.6d}{1994/10/30}{Added \cs{textcircled}.}
 % \changes{v1.6d}{1994/10/30}{Added \cs{DeclareTextCompositeCommand}.}
-% \changes{v1.6c}{1994/10/29}{Renamed \cs{P}, \cs{S}, \cs{dag} and 
+% \changes{v1.6c}{1994/10/29}{Renamed \cs{P}, \cs{S}, \cs{dag} and
 %    \cs{ddag} to \cs{textparagraph}, \cs{textsection},
 %    \cs{textdagger} and \cs{textdaggerdbl}.}
 % \changes{v1.6b}{1994/10/27}{Removed the enc.def files}
@@ -200,7 +200,7 @@
 % \changes{v1.2a}{1993/12/11}{Corrected for t1enc, math.}
 % \changes{v1.2}{1993/12/10}{Added source code for t1enc.sty.}
 % \changes{v1.1}{1993/12/07}{Made all character numbers decimal.}
-% \changes{v1.1}{1993/12/07}{Removed a lot of equal signs and the 
+% \changes{v1.1}{1993/12/07}{Removed a lot of equal signs and the
 %   like.}
 %
 %
@@ -218,7 +218,7 @@
 %    The |fontenc| package has options for encodings, of which the
 %    last option is the default encoding.  For example, to use the
 %    |OT2|, |OT3| and |T1| encodings, with |T1| as the default, you
-%    say: 
+%    say:
 %\begin{verbatim}
 %    \usepackage[OT2,OT3,T1]{fontenc}
 %\end{verbatim}
@@ -233,7 +233,7 @@
 %\end{verbatim}
 %    Note that the files in the standard |inputenc| package depend on
 %    this behaviour of the kernel.
-%    
+%
 %    The syntax for declaring encoding-specific commands is:
 %    \begin{quote}
 %      |\DeclareTextCommand{|^^A
@@ -260,7 +260,7 @@
 %         \meta{default}|]{|^^A
 %         \meta{commands}|}|
 %    \end{quote}
-%    This acts like |\DeclareTextCommand|, but does nothing if the 
+%    This acts like |\DeclareTextCommand|, but does nothing if the
 %    command is already defined.
 %    \begin{quote}
 %      |\DeclareTextSymbol{|^^A
@@ -309,9 +309,9 @@
 %    The \emph{command} will normally have been declared with
 %    |\DeclareTextAccent|, or as a one-argument |\DeclareTextCommand|.
 %
-%    |\DeclareTextComposite| is the most common example of using 
+%    |\DeclareTextComposite| is the most common example of using
 %    the more general declaration
-%    |\DeclareTextCompositeCommand|, which can define a composite 
+%    |\DeclareTextCompositeCommand|, which can define a composite
 %    to be an arbitrary piece of text.
 %    \begin{quote}
 %      |\DeclareTextCompositeCommand{|^^A
@@ -325,7 +325,7 @@
 %\begin{verbatim}
 %    \DeclareTextCompositeCommand{\r}{OT1}{A}
 %     {\leavevmode\setbox\z@\hbox{!}\dimen@\ht\z@\advance\dimen@-1ex%
-%      \rlap{\raise.67\dimen@\hbox{\char23}}A} 
+%      \rlap{\raise.67\dimen@\hbox{\char23}}A}
 %\end{verbatim}
 % \changes{v1.8e}{1996/11/23}
 %      {Corrected description}
@@ -334,34 +334,34 @@
 %
 %    The commands defined using the above declarations can be used in
 %    two ways.
-%    Normally they are used by just calling the command in the 
+%    Normally they are used by just calling the command in the
 %    appropriate encoding, for example |\ss|.  However, sometimes you
 %    may wish to use a command in an encoding where it is not defined.
-%    If the command has no arguments, then you can use it in another 
+%    If the command has no arguments, then you can use it in another
 %    encoding by calling |\UseTextSymbol|:
 %    \begin{quote}
 %      |\UseTextSymbol{|^^A
 %         \meta{encoding}|}{|^^A
 %         \meta{command}|}|
 %    \end{quote}
-% 
+%
 % \task{?}{Document the problems of these commands, see pr/3160}
 % \changes{v1.9e}{1997/08/05}{Corrected order of arguments in
 %          \cs{UseTextSymbol} example.}
-%    For example, |\UseTextSymbol{OT1}{\ss}| has the same effect as: 
+%    For example, |\UseTextSymbol{OT1}{\ss}| has the same effect as:
 %\begin{verbatim}
 %    {\fontencoding{OT1}\selectfont\ss}
 %\end{verbatim}
 %    If the command has one argument then you can use it in another
-%    encoding by calling  
-%    |\UseTextAccent|: 
+%    encoding by calling
+%    |\UseTextAccent|:
 %    \begin{quote}
 %      |\UseTextAccent{|^^A
 %         \meta{encoding}|}{|^^A
 %         \meta{command}|}{|^^A
 %         \meta{text}|}|
 %    \end{quote}
-%    For example, if the current encoding is |OT2| then 
+%    For example, if the current encoding is |OT2| then
 %    |\UseTextAccent{OT1}{\'}{a}| has the same effect as:
 %\begin{verbatim}
 %    {\fontencoding{OT1}\selectfont\'{\fontencoding{OT2}\selectfont a}}
@@ -380,12 +380,12 @@
 %    \end{quote}
 %    For example, the default definition of the command
 %    |\textonequarter| (which produces the fraction $\frac14$) could be
-%    built using math mode: 
+%    built using math mode:
 %\begin{verbatim}
 %    \DeclareTextCommandDefault{\textonequarter}{\ensuremath {\frac14}}
 %\end{verbatim}
-%    There is a matching |\Provide| command which will not override an 
-%    existing default definition: 
+%    There is a matching |\Provide| command which will not override an
+%    existing default definition:
 %    \begin{quote}
 %      |\ProvideTextCommandDefault{|^^A
 %         \meta{command}|}{|^^A
@@ -410,7 +410,7 @@
 %      |\DeclareTextCommandDefault[1]{|^^A
 %         \meta{command}|}|\\\hspace*{\fill}^^A
 %         |{\UseTextAccent{|^^A
-%         \meta{encoding}|}{|\meta{command}|}{#1}}| 
+%         \meta{encoding}|}{|\meta{command}|}{#1}}|
 %    \end{quote}
 %    For example, to make |OT1| the default encoding for |\ss| and
 %    |\'| you say:
@@ -418,10 +418,10 @@
 %    \DeclareTextSymbolDefault{\ss}{OT1}
 %    \DeclareTextAccentDefault{\'}{OT1}
 %\end{verbatim}
-%    Note that you can use these commands on any zero- or one-argument 
+%    Note that you can use these commands on any zero- or one-argument
 %    commands declared with |\DeclareText*| or |\ProvideText*|, not
 %    just those defined using |\DeclareTextSymbol| or
-%    |\DeclareTextAccent|. 
+%    |\DeclareTextAccent|.
 %
 % \subsection{Removing encoding-specific commands}
 %    \label{sec:removeencspec}
@@ -482,19 +482,19 @@
 % For the same reason default declarations should never come last since
 % they are implemented as a special encoding themselves (with the
 % name |?|).
-% Specifying them last would simply mean to make those encoding-specific 
+% Specifying them last would simply mean to make those encoding-specific
 % commands equally inefficient in all encodings. Therefore the
 % \texttt{textcomp} package, for example, first sets up all defaults
 % to point to \texttt{TS1} and then declares the commands in the
 % \texttt{TS1} encoding.
-% 
+%
 %
 % \StopEventually{}
 %
 % \subsection{Docstrip modules}
 %
 %    This |.dtx| file is be used to generate several related files
-%    containing font encoding definitions. The mutually exclusive 
+%    containing font encoding definitions. The mutually exclusive
 %    docstrip options are listed here.
 %    \begin{center}
 %    \begin{tabular}{lp{10cm}}
@@ -504,15 +504,15 @@
 %      |TS1sty|   & generates |textcomp.sty|, package that sets up use
 %                   of the Text Companion encoding. \\
 %      |OT1|      & generates |ot1enc.def| for Knuth's CM encoding. \\
-%      |OMS|      & generates |omsenc.def| for Knuth's 
+%      |OMS|      & generates |omsenc.def| for Knuth's
 %                   math symbol encoding. \\
-%      |OML|      & generates |omlenc.def| for Knuth's 
+%      |OML|      & generates |omlenc.def| for Knuth's
 %                   math letters encoding. \\
 %      |OT4|      & generates |ot4enc.def| for the Polish extension to
 %                   the OT1 encoding, created by B.~Jackowski and
 %                   M.~Ry\'cko for use with the Polish version of
 %                   Computer Modern and Computer Concrete.\\
-%      |package|  & generates |fontenc.sty| for 
+%      |package|  & generates |fontenc.sty| for
 %                   selecting encodings. \\
 %      |2ekernel| & for the kernel commands.\\
 %      |autoload| & for the `autoload' kernel commands.\\
@@ -569,7 +569,7 @@
 %    \end{macrocode}
 %
 % \changes{v1.5d}{1994/10/27}{Rewrote \cs{DeclareTextSymbol} to define
-%    its argument to use the current encoding by default, to fit with 
+%    its argument to use the current encoding by default, to fit with
 %    \cs{DeclareTextCommand}.}
 %
 % \changes{v1.7a}{1994/11/30}{Redefined \cs{@changed@cmd} to expand in
@@ -627,7 +627,7 @@
 %    complex low-level commands like this in packages?)
 %
 %    The problem it solves is that whereas both |\newcommand| and
-%    |\providecommand| (used just above) both handle the 
+%    |\providecommand| (used just above) both handle the
 %    resetting of |\@ifdefinable| (following its disabling in
 %    |\@dec@text@cmd|), the primitive |\chardef| neither needs the
 %    disabling, nor does the resetting.
@@ -650,7 +650,7 @@
 \@onlypreamble\DeclareTextCommand
 \@onlypreamble\DeclareTextSymbol
 %    \end{macrocode}
-%    The sneaky bit in all this is what |\T1-cmd \foo \T1\foo| does.  
+%    The sneaky bit in all this is what |\T1-cmd \foo \T1\foo| does.
 %    There are five possibilities, depending on the current values of
 %    |\protect|, |\cf@encoding| and |\ifmmode|:
 %    \begin{itemize}
@@ -659,12 +659,12 @@
 %       behaviour, and is optimized for speed.
 %    \item If |\protect| is |\@typeset@protect|, |\cf@encoding| is
 %       (say) |OT1|, and |\OT1\foo| is defined, then we execute
-%       |\OT1\foo|. 
+%       |\OT1\foo|.
 %    \item If |\protect| is |\@typeset@protect|, |\cf@encoding| is
 %       (say) |OT1|, we're in text mode,
 %       and |\OT1\foo| is undefined, then we define
 %       |\OT1\foo| to be the default value of |\foo|, and execute
-%       |\OT1\foo|. 
+%       |\OT1\foo|.
 %    \item If |\protect| is |\@typeset@protect|, |\cf@encoding| is
 %       (say) |OT1|, we're in math mode,
 %       and |\OT1\foo| is undefined, then we execute the default value
@@ -740,14 +740,14 @@
 %    would break ligatures and kerning between text symbols.
 %
 %    A more efficient solution would be to make |\@inmathwarn| and
-%    |\@inmatherr| equal to |\@empty| and |\relax| by default, and 
+%    |\@inmatherr| equal to |\@empty| and |\relax| by default, and
 %    to have
 %    |\everymath| reset them to their usual definitions.  This is left
 %    for future investigation (for example it may break some third
 %    party code).
 %    \begin{macrocode}
 \def\@inmathwarn#1{%
-   \ifmmode 
+   \ifmmode
       \@latex@warning{Command \protect#1 invalid in math mode}%
    \fi}
 %    \end{macrocode}
@@ -762,7 +762,7 @@
 % \end{macro}
 %
 % \changes{v1.7k}{1995/06/05}{Allowed \cs{ProvideTextCommandDefault}
-%    after the preamble.} 
+%    after the preamble.}
 %
 % \begin{macro}{\DeclareTextCommandDefault}
 % \begin{macro}{\ProvideTextCommandDefault}
@@ -810,7 +810,7 @@
 %
 % \changes{v1.7a}{1994/11/30}{Rewrote \cs{@text@composite} so it
 %    allows an empty argument, or an argument containing lots of
-%    commands.}  
+%    commands.}
 %
 %  \begin{macro}{\add@accent}
 % \changes{v1.7z}{1996/05/23}{macro added. latex/2133}
@@ -878,7 +878,7 @@
 % \begin{macro}{\DeclareTextComposite}
 % \changes{v1.7l}{1995/06/09}{Rewrote \cs{DeclareTextComposite} to
 %    define the composite as a no-argument command rather than a
-%    two-argument command.}  
+%    two-argument command.}
 % \begin{macro}{\@text@composite}
 % \begin{macro}{\@text@composite@x}
 % \begin{macro}{\@strip@args}
@@ -922,10 +922,10 @@
 %\end{verbatim}
 %    expands to
 %    |\\T1\foo-A| if |\\T1\foo-A| has been defined, and |{...}|
-%    otherwise. 
+%    otherwise.
 %
 %    Note that |\@text@composite| grabs the first token of the
-%    argument and puts just that in the 
+%    argument and puts just that in the
 %    csname.  This is so that |\'{\textit{e}}| will work---it checks
 %    whether |\\T1\'-\textit| is defined (which presumably it isn't)
 %    and so expands to |{\accent 1 \textit{e}}|.
@@ -1028,7 +1028,7 @@
 %    speed, and in order to make sure that |\UseTextSymbol| doesn't
 %    do anything which you're not allowed to do between an |\accent|
 %    and its glyph.
-%    
+%
 %    For a detailed discussion of this reimplementation and its
 %    deficiencies, see pr/3160.
 % \task{?}{Improve this and document its problems, see pr/3160}
@@ -1075,7 +1075,7 @@
 % \end{macro}
 %
 % \begin{macro}{\hmode@start@before@group}
-%    The |\hmode@start@before@group| starts hmode and should be 
+%    The |\hmode@start@before@group| starts hmode and should be
 %    immediately followed by an explicit |{...}|. Its purpose is to
 %    ensure that hmode is started before this group  is opened. Inside
 %    |\add@accent| and |\UseTextAccent| it is redefined to remove this
@@ -1087,11 +1087,11 @@
 \let\hmode@start@before@group\leavevmode
 %    \end{macrocode}
 % \end{macro}
-%     
+%
 % \begin{macro}{\DeclareTextSymbolDefault}
 % \begin{macro}{\DeclareTextAccentDefault}
 %    Some syntactic sugar.  Again, these should probably be optimized
-%    for speed. 
+%    for speed.
 %    \begin{macrocode}
 \def\DeclareTextSymbolDefault#1#2{%
    \DeclareTextCommandDefault#1{\UseTextSymbol{#2}#1}}
@@ -1128,17 +1128,17 @@
 %    \end{macrocode}
 %    Else: throw away that declaration.
 %    \begin{macrocode}
-     \global\expandafter\let\csname#2\string#1\endcsname 
+     \global\expandafter\let\csname#2\string#1\endcsname
             \@undefined
 %    \end{macrocode}
 %    But this is unfortunately not enough, we have to take a look
-%    at the top-level definition of the encoding specific command 
-%    which for a command |\foo| would look similar to 
+%    at the top-level definition of the encoding specific command
+%    which for a command |\foo| would look similar to
 %    |\T1-cmd \foo \T1\foo| (three tokens).
 %
 %    Of course, instead of |T1| one could see a different encoding name;
 %    which one depends the encoding for which |\foo| was declared
-%    last. 
+%    last.
 %
 %    Now assume we have just removed the declaration for |\foo| in |T1|
 %    and the top-level of |\foo| expands to the above. Then we better
@@ -1184,7 +1184,7 @@
 % \begin{macro}{\@@patterns}
 % \begin{macro}{\hyphenation}
 % \begin{macro}{\@@hyphenation}
-%    We redefine |\patterns| and |\hyphenation| to allow the use of 
+%    We redefine |\patterns| and |\hyphenation| to allow the use of
 %    commands declared with |\DeclareText*| to be used inside them.
 %    \begin{macrocode}
 %\let\@@patterns\patterns
@@ -1194,7 +1194,7 @@
 %      \let\protect\@empty
 %      \let\@typeset@protect\@empty
 %      \let\@changed@x\@changed@x@mouth
-%   \afterassignment\egroup   
+%   \afterassignment\egroup
 %   \@@patterns
 %}
 %\def\hyphenation{%
@@ -1202,7 +1202,7 @@
 %      \let\protect\@empty
 %      \let\@typeset@protect\@empty
 %      \let\@changed@x\@changed@x@mouth
-%   \afterassignment\egroup   
+%   \afterassignment\egroup
 %   \@@hyphenation
 %}
 %    \end{macrocode}
@@ -1238,11 +1238,11 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v1.6a}{1994/10/25}{Added the files OT1enc.def, T1enc.def and 
-%    OMSenc.def.} 
+% \changes{v1.6a}{1994/10/25}{Added the files OT1enc.def, T1enc.def and
+%    OMSenc.def.}
 % \changes{v1.6b}{1994/10/27}{Removed the files OT1enc.def, T1enc.def
-%    and OMSenc.def.} 
-% 
+%    and OMSenc.def.}
+%
 % \subsubsection{Default encodings}
 %
 % We define the default encodings for most commands to be either OT1,
@@ -1250,28 +1250,28 @@
 % fonts with these encodings must be available unless these
 % defaults are redefined elsewhere.  Recall that the standard kernel
 % loads the encoding files for these encodings, and also that for
-% the T1 encoding. 
+% the T1 encoding.
 %
-% The naming conventions in the kernel are not what we would use if we 
-% were starting from scratch\dots\  
+% The naming conventions in the kernel are not what we would use if we
+% were starting from scratch\dots\
 % Those defined by DEK (like |\ae| and |\ss|) or by the \TeX{} Users
-% Group Technical Working Group on multi-lingual typesetting (like 
-% |\th| and |\ng|) have short names.  Those which were added to the 
+% Group Technical Working Group on multi-lingual typesetting (like
+% |\th| and |\ng|) have short names.  Those which were added to the
 % kernel in 1993 and early 1994 are named after their Adobe glyph
 % names (like |\guillemotleft| and |\quotedblbase|).  Unfortunately,
-% this naming scheme won't work for all glyphs, since some names (like 
+% this naming scheme won't work for all glyphs, since some names (like
 % |\space|) are already used, and some (like |\endash|) are very
 % likely to be defined by users.  So we're now using the naming scheme
-% of |\text| followed by the Adobe name, (like |\textendash| and 
+% of |\text| followed by the Adobe name, (like |\textendash| and
 % |\textsterling|).  Except that some glyphs don't have Adobe names,
-% so we're using the names used by fontinst for those (like 
+% so we're using the names used by fontinst for those (like
 % |\textcompwordmark|).  Sigh.
 %
-% \changes{v1.6a}{1994/10/25}{Added the defaults.} 
-% \changes{v1.6b}{1994/10/27}{Added more defaults for OT1.} 
-% \changes{v1.6c}{1994/10/29}{Added commands like \cs{dots} for use in 
-%    text and math.} 
-% 
+% \changes{v1.6a}{1994/10/25}{Added the defaults.}
+% \changes{v1.6b}{1994/10/27}{Added more defaults for OT1.}
+% \changes{v1.6c}{1994/10/29}{Added commands like \cs{dots} for use in
+%    text and math.}
+%
 % Some accents from OT1:
 %    \begin{macrocode}
 \DeclareTextAccentDefault{\"}{OT1}
@@ -1329,7 +1329,7 @@
 %    \end{macrocode}
 % Some symbols from OMS:
 % \changes{v1.7t}{1995/11/29}{Added \cs{textbackslash} and
-%    \cs{textbar}.} 
+%    \cs{textbar}.}
 % \changes{v1.8c}{1996/10/27}
 %      {Added \cs{textasteriskcentered}}
 % \changes{v1.95}{2002/06/16}{Added default for \cs{textbardbl} (pr/3400)}
@@ -1350,15 +1350,15 @@
 %    \end{macrocode}
 %
 % \changes{v1.6d}{1994/10/30}{Added OML encoding.}
-% \changes{v1.6d}{1994/10/30}{Made \cs{textless} and \cs{textgreater} 
+% \changes{v1.6d}{1994/10/30}{Made \cs{textless} and \cs{textgreater}
 %    come from OML.}
 % \changes{v1.6d}{1994/10/30}{Added \cs{t}.}
 % \changes{v1.7k}{1995/06/05}{Commented out \cs{textless} and
-%    \cs{textgreater}.} 
+%    \cs{textgreater}.}
 %
 % Some symbols from OML:
 % \changes{v1.7t}{1995/11/29}{Added \cs{textless} and
-%    \cs{textgreater}.} 
+%    \cs{textgreater}.}
 %    \begin{macrocode}
 \DeclareTextSymbolDefault{\textless}{OML}
 \DeclareTextSymbolDefault{\textgreater}{OML}
@@ -1367,7 +1367,7 @@
 %
 % \changes{v1.6d}{1994/10/30}{Added \cs{textcircled}.}
 % \changes{v1.6d}{1994/10/30}{Rewrote \cs{copyright} to use
-%    \cs{textcircled}.} 
+%    \cs{textcircled}.}
 % \changes{v1.6d}{1994/10/30}{Removed \cs{textregistered}.}
 % \changes{v1.7k}{1995/06/05}{Save some tokens in
 %    \cs{textvisiblespace} and \cs{textunderscore}.}
@@ -1380,7 +1380,7 @@
 %                             \cs{copyright}}
 %
 % Some defaults we can fake.
-% 
+%
 % The interface for defining |\copyright| changed, it used to
 % use |\expandafter| to add braces at the appropriate points.
 % \begin{macrocode}
@@ -1437,7 +1437,7 @@
 \DeclareTextCommandDefault{\textordfeminine}{\textsuperscript{a}}
 \DeclareTextCommandDefault{\textordmasculine}{\textsuperscript{o}}
 %    \end{macrocode}
-%    
+%
 % \subsubsection{Math material}
 %
 %    Some commands can be used in both text and math mode:
@@ -1450,7 +1450,7 @@
 \DeclareRobustCommand{\dag}{\ifmmode{\dagger}\else\textdagger\fi}
 \DeclareRobustCommand{\ddag}{\ifmmode{\ddagger}\else\textdaggerdbl\fi}
 %    \end{macrocode}
-% 
+%
 % For historical reasons |\copyright|
 % needs |{}| around the definition in maths.
 %
@@ -1478,12 +1478,12 @@
 \let\ldots\dots
 %</2ekernel|autoload>
 %    \end{macrocode}
-% 
+%
 % \changes{v1.6d}{1994/10/30}{Moved math commands here from ltmath.}
 % \changes{v1.6f}{1994/11/04}{Added \cs{mathunderscore}.}
 % \changes{v1.7k}{1995/06/05}{Moved math commands to fontdef.dtx.}
 %
-% 
+%
 % \changes{1.4a}{1994/05/01}{Added the \cs{SaveAtCatcode} and
 %    \cs{RestoreAtCatcode} commands.}
 %
@@ -1519,7 +1519,7 @@
 %
 % The definitions for the `\TeX{} text' (OT1) encoding.
 %
-%    Declare the encoding.    
+%    Declare the encoding.
 %    \begin{macrocode}
 %<*OT1>
 \DeclareFontEncoding{OT1}{}{}
@@ -1613,15 +1613,15 @@
 %    \end{macrocode}
 %    In the OT1 encoding \r A has a hand-crafted definition, so we
 %    have here the first recorded explicit use of
-%    |\DeclareTextCompositeCommand|. 
+%    |\DeclareTextCompositeCommand|.
 % \changes{v1.8c}{1996/10/27}
 %      {Added \cs{r} A}
-% \changes{v1.96}{2002/10/28}{% 
+% \changes{v1.96}{2002/10/28}{%
 %   coding change, to follow bug fix by DEK in plain.tex (pr/3469)}
 %    \begin{macrocode}
 \DeclareTextCompositeCommand{\r}{OT1}{A}
    {\leavevmode\setbox\z@\hbox{!}\dimen@\ht\z@\advance\dimen@-1ex%
-    \rlap{\raise.67\dimen@\hbox{\char23}}A} 
+    \rlap{\raise.67\dimen@\hbox{\char23}}A}
 %    \end{macrocode}
 % \changes{v1.99h}{2005/11/08}
 %      {Added \cs{ij} and \cs{IJ} from babel. (pr/3771)}
@@ -1656,27 +1656,27 @@
    \fi
    \char`\$\egroup}
 %    \end{macrocode}
-%   
+%
 %    Here we are adding some more composite commands to the |OT1|
 %    encoding.  This makes the use of certain accents with |i|
 %    compatible with their use with the |T1| encoding; this
-%    enables them to become true \LaTeX{} internal representations. 
+%    enables them to become true \LaTeX{} internal representations.
 %    However, it will make these accents work a little less fast since
 %    a check will always be made for the existence of a composite.
-%     
+%
 % \changes{v1.93}{2001/05/28}{Added composites for compatibility with
-%                             T1, pr/3295} 
+%                             T1, pr/3295}
 % \changes{v1.94}{2001/06/05}{Text composite Commands need kludges for
 %                               `,' -- see tlb1903.lvt}
 %    \begin{macrocode}
-\DeclareTextComposite{\.}{OT1}{i}{`\i}   
-\DeclareTextComposite{\.}{OT1}{\i}{`\i}   
+\DeclareTextComposite{\.}{OT1}{i}{`\i}
+\DeclareTextComposite{\.}{OT1}{\i}{`\i}
 \DeclareTextCompositeCommand{\`}{OT1}{i}{\@tabacckludge`\i}
 \DeclareTextCompositeCommand{\'}{OT1}{i}{\@tabacckludge'\i}
 \DeclareTextCompositeCommand{\^}{OT1}{i}{\^\i}
 \DeclareTextCompositeCommand{\"}{OT1}{i}{\"\i}
 %    \end{macrocode}
-% 
+%
 %    \begin{macrocode}
 %</OT1>
 %    \end{macrocode}
@@ -1692,13 +1692,13 @@
 %    \cs{EncodingSpecific}.}
 % \changes{1.4a}{1994/05/01}{Rewrote for the new syntax.}
 % \changes{1.5a}{1994/05/12}{Rewrote for the new syntax.}
-% \changes{1.6a}{1994/10/25}{Added \cs{textdollar}, 
+% \changes{1.6a}{1994/10/25}{Added \cs{textdollar},
 %    \cs{textlbrace}, \cs{textrbrace}, \cs{textsterling},
-%    \cs{textunderline}.} 
+%    \cs{textunderline}.}
 % \changes{1.6a}{1994/10/25}{Removed
-%    \cs{textlbrace}, \cs{textrbrace}, \cs{textunderline} to give them 
+%    \cs{textlbrace}, \cs{textrbrace}, \cs{textunderline} to give them
 %    their proper names.}
-% \changes{1.6b}{1994/10/27}{Added 
+% \changes{1.6b}{1994/10/27}{Added
 %   \cs{textasciicircum}
 %   \cs{textasciitilde}
 %   \cs{textbackslash}
@@ -1776,30 +1776,30 @@
 \DeclareTextCommand{\textogonekcentered}{T1}[1]
    {\hmode@bgroup\ooalign{\null#1\crcr\hidewidth\char12\hidewidth}\egroup}
 %    \end{macrocode}
-%    
+%
 %    Some symbols are constructed.
 %
 % \changes{v1.9h}{1997/12/17}
 %    {Added \cs{textperthousand} and \cs{textpertenthousand}}
 %    Slot 24 contains a small circle intended for construction of
 %    these two glyphs.
-%    
+%
 %    \begin{macrocode}
 \DeclareTextCommand{\textperthousand}{T1}
    {\%\char 24 }          % space or `relax as delimiter?
 \DeclareTextCommand{\textpertenthousand}{T1}
    {\%\char 24\char 24 }  % space or `relax as delimiter?
 %    \end{macrocode}
-%    
+%
 %    Declare the text symbols.
 % \changes{v1.7t}{1995/11/29}{Added \cs{textasciicircum},
 %    \cs{textasciitilde}, \cs{textbackslash}, \cs{textbar},
-%    \cs{textgreater} and \cs{textless}.} 
+%    \cs{textgreater} and \cs{textless}.}
 % \changes{v1.8c}{1996/10/27}
 %      {Removed \cs{aa} and \cs{AA}}
 % \changes{v1.99h}{2005/11/08}
 %      {Added \cs{ij} and \cs{IJ} from babel. (pr/3771)}
-%      
+%
 %    \begin{macrocode}
 %\DeclareTextSymbol{\AA}{T1}{197}
 \DeclareTextSymbol{\AE}{T1}{198}
@@ -1858,7 +1858,7 @@
 \DeclareTextSymbol{\th}{T1}{254}
 %    \end{macrocode}
 %    Declare the composites.
-% \changes{v1.93}{2001/05/28}{Changed the effect of 
+% \changes{v1.93}{2001/05/28}{Changed the effect of
 %                             \cs{.}\cs{i}, pr/3295}
 %    \begin{macrocode}
 \DeclareTextComposite{\.}{T1}{i}{`\i}
@@ -2038,12 +2038,12 @@
 % \subsection{Definitions for the OMS encoding}
 %
 % \changes{v1.6a}{1994/10/25}{Added the OMS encoding.}
-% \changes{v1.6b}{1994/10/27}{Renamed \cs{textlbrace} to 
+% \changes{v1.6b}{1994/10/27}{Renamed \cs{textlbrace} to
 %    \cs{textbraceleft} and \cs{textrbrace} to \cs{textbraceright}.}
 % \changes{v1.6b}{1994/10/27}{Added \cs{textbackslash}.}
 % \changes{v1.6d}{1994/10/30}{Added \cs{textcircled}.}
 %
-% The definitions for the `\TeX{} math symbol' (OMS) encoding.  Even 
+% The definitions for the `\TeX{} math symbol' (OMS) encoding.  Even
 % though this is meant to be a math font, it includes some of the
 % standard \LaTeX{} text symbols.
 %
@@ -2054,7 +2054,7 @@
 %    \end{macrocode}
 %    Declare the symbols.
 % \changes{v1.7t}{1995/11/29}{Added \cs{textbackslash} and
-%    \cs{textbar}.} 
+%    \cs{textbar}.}
 % \changes{v1.8c}{1996/10/27}
 %      {Added \cs{textasteriskcentered}}
 % \changes{v1.9y}{2000/01/30}{Use \cs{hmode@bgroup} where applicable
@@ -2062,7 +2062,7 @@
 % \changes{v1.95}{2002/06/16}{Added \cs{textbardbl} (pr/3400)}
 %    \begin{macrocode}
 % \changes{v1.99}{2004/02/02}{Added \cs{textbigcircle}}
-%    Note that slot 13 has in places been named |\Orb|: please root 
+%    Note that slot 13 has in places been named |\Orb|: please root
 %    out and destroy this impolity wherever you find it!
 %    \begin{macrocode}
 \DeclareTextSymbol{\textasteriskcentered}{OMS}{3}   % "03
@@ -2080,7 +2080,7 @@
 \DeclareTextSymbol{\textbigcircle}{OMS}{13}         % "0D
 \DeclareTextCommand{\textcircled}{OMS}[1]{\hmode@bgroup
    \ooalign{%
-      \hfil \raise .07ex\hbox {\upshape#1}\hfil \crcr 
+      \hfil \raise .07ex\hbox {\upshape#1}\hfil \crcr
       \char 13 % "0D
    }%
  \egroup}
@@ -2091,7 +2091,7 @@
 %
 % \changes{v1.6d}{1994/10/30}{Added the OML encoding.}
 %
-% The definitions for the `\TeX{} math italic' (OML) encoding.  Even 
+% The definitions for the `\TeX{} math italic' (OML) encoding.  Even
 % though this is meant to be a math font, it includes some of the
 % standard \LaTeX{} text symbols.
 %
@@ -2102,7 +2102,7 @@
 %    \end{macrocode}
 %    Declare the symbols.
 % \changes{v1.7t}{1995/11/29}{Added \cs{textless} and
-%    \cs{textgreater}.} 
+%    \cs{textgreater}.}
 % \changes{v1.9h}{1997/12/17}{Changed to decimal codes.}
 % \changes{v1.9m}{1998/01/16}{fixed decimal codes. latex/2734}
 %    \begin{macrocode}
@@ -2113,22 +2113,22 @@
 %    \end{macrocode}
 %
 % \subsection{Definitions for the OT4 encoding}
-% 
+%
 % These definitions are for the Polish extension to the
 % `\TeX\ text' (OT1) encoding.
 % This encoding was created by B.~Jackowski and M.~Ry\'cko
 % for use with the Polish version of Computer Modern and Computer
 % Concrete.  In positions 0--127 it is identical to OT1 but it
-% contains some additional characters in the upper half.  The \LaTeX{} 
+% contains some additional characters in the upper half.  The \LaTeX{}
 % support was developed by Mariusz Olko.
-% 
+%
 % The PL fonts that use it are available as follows:\\
 % Metafont sources
 % \texttt{ftp://ftp.gust.org.pl/TeX/language/polish/pl-mf.zip};
 %
 % Font files
 % \texttt{ftp://ftp.gust.org.pl/TeX/language/polish/pl-tfm.zip}.
-% 
+%
 %    Declare the encoding.
 %    \begin{macrocode}
 %<*OT4>
@@ -2200,12 +2200,12 @@
 \DeclareTextSymbol{\textquoteright}{OT4}{`\'}
 %    \end{macrocode}
 %    Definition for \r A as in OT1:
-% \changes{v1.96}{2002/10/28}{% 
+% \changes{v1.96}{2002/10/28}{%
 %   coding change, to follow bug fix by DEK in plain.tex (pr/3469)}
 %    \begin{macrocode}
 \DeclareTextCompositeCommand{\r}{OT4}{A}
    {\leavevmode\setbox\z@\hbox{!}\dimen@\ht\z@\advance\dimen@-1ex%
-    \rlap{\raise.67\dimen@\hbox{\char23}}A} 
+    \rlap{\raise.67\dimen@\hbox{\char23}}A}
 %    \end{macrocode}
 %    In the OT4 encoding, \pounds~and \$ share a slot.
 % \changes{v1.9y}{2000/01/30}{Use \cs{hmode@bgroup} where applicable
@@ -2220,10 +2220,10 @@
    \char`\$\egroup}
 \DeclareTextCommand{\textsterling}{OT4}{\hmode@bgroup
    \ifdim \fontdimen\@ne\font >\z@
-      \itshape 
-   \else 
-      \fontshape{ui}\selectfont 
-   \fi 
+      \itshape
+   \else
+      \fontshape{ui}\selectfont
+   \fi
    \char`\$\egroup}
 %    \end{macrocode}
 %    Declare the composites.
@@ -2279,14 +2279,14 @@
 %
 % Accents for capital letters.
 %
-% These commands can be used by the end user either directly or through 
+% These commands can be used by the end user either directly or through
 % definitions of the type
 % \begin{verbatim}
 % \DeclareTextCompositeCommand{\'}{T1}{X}{\capitalacute X}
 % \end{verbatim}
 % None of the latter definitions are provided by default, since they
 % are probably rarely used.
-% 
+%
 %    "00 = 0
 %    \begin{macrocode}
 \DeclareTextAccent{\capitalgrave}{TS1}{0}
@@ -2298,7 +2298,7 @@
 \DeclareTextAccent{\capitalring}{TS1}{6}
 \DeclareTextAccent{\capitalcaron}{TS1}{7}
 %    \end{macrocode}
-%    "08 = 8 
+%    "08 = 8
 %    \begin{macrocode}
 \DeclareTextAccent{\capitalbreve}{TS1}{8}
 \DeclareTextAccent{\capitalmacron}{TS1}{9}
@@ -2312,7 +2312,7 @@
 % the new ties are centered in their boxes like all other accents.
 % They need a name: please tell us if you know what to call them.
 %
-%    " = 
+%    " =
 %    \begin{macrocode}
 \DeclareTextAccent{\t}{TS1}{26}
 \DeclareTextAccent{\capitaltie}{TS1}{27}
@@ -2346,13 +2346,13 @@
 \DeclareTextSymbol{\textleftarrow}{TS1}{24}
 \DeclareTextSymbol{\textrightarrow}{TS1}{25}
 %    \end{macrocode}
-%    "20 = 32 
+%    "20 = 32
 %    \begin{macrocode}
 \DeclareTextSymbol{\textblank}{TS1}{32}
 \DeclareTextSymbol{\textdollar}{TS1}{36}
 \DeclareTextSymbol{\textquotesingle}{TS1}{39}
 %    \end{macrocode}
-%    "28 = 40 
+%    "28 = 40
 %    \begin{macrocode}
 \DeclareTextSymbol{\textasteriskcentered}{TS1}{42}
 %    \end{macrocode}
@@ -2365,7 +2365,7 @@
 %
 % Oldstyle digits.
 %
-%    "30 = 48 
+%    "30 = 48
 %    \begin{macrocode}
 \DeclareTextSymbol{\textzerooldstyle}{TS1}{48}
 \DeclareTextSymbol{\textoneoldstyle}{TS1}{49}
@@ -2376,7 +2376,7 @@
 \DeclareTextSymbol{\textsixoldstyle}{TS1}{54}
 \DeclareTextSymbol{\textsevenoldstyle}{TS1}{55}
 %    \end{macrocode}
-%    "38 = 56 
+%    "38 = 56
 %    \begin{macrocode}
 \DeclareTextSymbol{\texteightoldstyle}{TS1}{56}
 \DeclareTextSymbol{\textnineoldstyle}{TS1}{57}
@@ -2413,31 +2413,31 @@
 %
 % More text companion symbols.
 %
-%    "50 = 80 
+%    "50 = 80
 %    \begin{macrocode}
 \DeclareTextSymbol{\textohm}{TS1}{87}
 %    \end{macrocode}
-%    "58 = 88 
+%    "58 = 88
 %    \begin{macrocode}
 \DeclareTextSymbol{\textlbrackdbl}{TS1}{91}
 \DeclareTextSymbol{\textrbrackdbl}{TS1}{93}
 \DeclareTextSymbol{\textuparrow}{TS1}{94}
 \DeclareTextSymbol{\textdownarrow}{TS1}{95}
 %    \end{macrocode}
-%    "60 = 96 
+%    "60 = 96
 %    \begin{macrocode}
 \DeclareTextSymbol{\textasciigrave}{TS1}{96}
 \DeclareTextSymbol{\textborn}{TS1}{98}
 \DeclareTextSymbol{\textdivorced}{TS1}{99}
 \DeclareTextSymbol{\textdied}{TS1}{100}
 %    \end{macrocode}
-%    "68 = 104 
+%    "68 = 104
 %    \begin{macrocode}
 \DeclareTextSymbol{\textleaf}{TS1}{108}
 \DeclareTextSymbol{\textmarried}{TS1}{109}
 \DeclareTextSymbol{\textmusicalnote}{TS1}{110}
 %    \end{macrocode}
-%    "78 = 120 
+%    "78 = 120
 %    \begin{macrocode}
 \DeclareTextSymbol{\texttildelow}{TS1}{126}
 %    \end{macrocode}
@@ -2448,7 +2448,7 @@
 %    \begin{macrocode}
 \DeclareTextSymbol{\textdblhyphenchar}{TS1}{127}
 %    \end{macrocode}
-%    "80 = 128 
+%    "80 = 128
 %    \begin{macrocode}
 \DeclareTextSymbol{\textasciibreve}{TS1}{128}
 \DeclareTextSymbol{\textasciicaron}{TS1}{129}
@@ -2459,7 +2459,7 @@
 % \changes{v1.9p}{1998/06/12}{Corrected 130 and 131, see pr/2834}
 %    \begin{macrocode}
 \DeclareTextSymbol{\textacutedbl}{TS1}{130}
-\DeclareTextSymbol{\textgravedbl}{TS1}{131} 
+\DeclareTextSymbol{\textgravedbl}{TS1}{131}
 \DeclareTextSymbol{\textdagger}{TS1}{132}
 \DeclareTextSymbol{\textdaggerdbl}{TS1}{133}
 \DeclareTextSymbol{\textbardbl}{TS1}{134}
@@ -2476,7 +2476,7 @@
 \DeclareTextSymbol{\textwon}{TS1}{142}
 \DeclareTextSymbol{\textnaira}{TS1}{143}
 %    \end{macrocode}
-%    "90 = 144 
+%    "90 = 144
 %    \begin{macrocode}
 \DeclareTextSymbol{\textguarani}{TS1}{144}
 \DeclareTextSymbol{\textpeso}{TS1}{145}
@@ -2487,7 +2487,7 @@
 \DeclareTextSymbol{\textdong}{TS1}{150}
 \DeclareTextSymbol{\texttrademark}{TS1}{151}
 %    \end{macrocode}
-%    "98 = 152 
+%    "98 = 152
 %    \begin{macrocode}
 \DeclareTextSymbol{\textpertenthousand}{TS1}{152}
 \DeclareTextSymbol{\textpilcrow}{TS1}{153}
@@ -2495,8 +2495,8 @@
 \DeclareTextSymbol{\textnumero}{TS1}{155}
 %    \end{macrocode}
 % This next name may change.
-% For the following sign we know only a german name, which is 
-% abz\"uglich. The meaning is something like ``commercial minus''. 
+% For the following sign we know only a german name, which is
+% abz\"uglich. The meaning is something like ``commercial minus''.
 % An ASCII ersatz is ./. (dot slash dot).
 % The temporary English name is |\textdiscount|.
 %    \begin{macrocode}
@@ -2505,7 +2505,7 @@
 \DeclareTextSymbol{\textopenbullet}{TS1}{158}
 \DeclareTextSymbol{\textservicemark}{TS1}{159}
 %    \end{macrocode}
-%    "A0 = 160 
+%    "A0 = 160
 %    \begin{macrocode}
 \DeclareTextSymbol{\textlquill}{TS1}{160}
 \DeclareTextSymbol{\textrquill}{TS1}{161}
@@ -2564,7 +2564,7 @@
 \DeclareTextSymbol{\textdiv}{TS1}{246}
 %</TS1>
 %    \end{macrocode}
-%    
+%
 % \section{Package files}
 %
 % \changes{v1.9h}{1997/12/17}{Added section.}
@@ -2578,7 +2578,7 @@
 % \changes{v1.5g}{1994/05/16}{Removed the lowercasing of the filename.}
 % \changes{v1.7a}{1994/11/30}{Always load the enc.def file, so that
 %    the default encoding for the commands will change.}
-% \changes{v1.7x}{1996/05/18}{Produce error if encoding not found. 
+% \changes{v1.7x}{1996/05/18}{Produce error if encoding not found.
 %                             pr/2054}
 % \changes{v1.7y}{1996/05/21}{Corrected error message (CAR)}
 % \changes{v1.8d}{1996/11/18}
@@ -2591,7 +2591,7 @@
 % In addition the package at the moment contains extra code to extend
 % the |\@uclclist| (list of upper/lower case pairs) for encodings that
 % involve cyrillic characters. THIS IS A TEMPORARY SOLUTION and will not
-% stay this way forever (or so we hope) but right now we are missing a 
+% stay this way forever (or so we hope) but right now we are missing a
 % proper interface for this and didn't wanted to rush it.
 % \changes{v1.9r}{1999/01/07}{Hackery to temp support cyrillic uc/lc}
 % \changes{v1.9t}{1999/02/24}{Corrected hackery cyrillic uc/lc list}
@@ -2694,19 +2694,19 @@
 \let\update@uclc@with@cyrillic\relax
 %    \end{macrocode}
 %
-% Finally we pretend that the fontenc package wasn't read in. This 
+% Finally we pretend that the fontenc package wasn't read in. This
 % allows for using it several times, e.g., in a class file and in the
-% preamble (at the cost of not getting any version info). 
-% That kind of hackery shows that using a general purpose 
-% package just for loading an encoding is not the right kind 
-% of interface for setting up encodings --- it will get replaced at 
+% preamble (at the cost of not getting any version info).
+% That kind of hackery shows that using a general purpose
+% package just for loading an encoding is not the right kind
+% of interface for setting up encodings --- it will get replaced at
 % some point in the future.
 % \changes{v1.9r}{1999/01/07}{Hackery to allow using fontenc several
 %    times}
 % \changes{v1.9u}{1999/06/10}{Ensure that we also forget old options
 %                             (pr/2888)}
 %    \begin{macrocode}
-\global\expandafter\let\csname ver@fontenc.sty\endcsname\relax    
+\global\expandafter\let\csname ver@fontenc.sty\endcsname\relax
 \global\expandafter\let\csname opt@fontenc.sty\endcsname\relax
 \global\let\@ifl@ter@@\@ifl@ter
 \def\@ifl@ter#1#2#3#4#5{\global\let\@ifl@ter\@ifl@ter@@}
@@ -2723,7 +2723,7 @@
 %    when one of these symbols is accessed and the current encoding
 %    does not provide it, the symbol will be supplied by a silent,
 %    local change to this encoding.
-%    
+%
 %    \begin{macrocode}
 %<*TS1sty>
 %    \end{macrocode}
@@ -2771,8 +2771,8 @@
     \space\space 1 = TS1 - \noexpand\textcircled- \string\t\MessageBreak
     \space\space 0 = TS1 (full)\MessageBreak
     Font families with sub-encoding setting implement\MessageBreak
-    only a restricted character set as indicated.\MessageBreak 
-    Family '?' is the default used for unknown fonts.\MessageBreak 
+    only a restricted character set as indicated.\MessageBreak
+    Family '?' is the default used for unknown fonts.\MessageBreak
     See the documentation for details\@gobble}
 %    \end{macrocode}
 %
@@ -2794,24 +2794,24 @@
 \@onlypreamble\DeclareEncodingSubset
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 %
 %  The options for the package are the following:
 %    \begin{description}
-%    \item[safe] 
+%    \item[safe]
 %       for unknown font families enables only symbols that are also
 %       in the ISO-Adobe character set; without "currency", which is
 %       often misused for the Euro.  Older Type1 fonts from the
 %       non-TeX world provide only this subset.
 %
-%    \item[euro] 
+%    \item[euro]
 %       enables the ``safe'' symbols plus the |\texteuro|
 %       command. Most newer fonts provide this.
 %
 %    \item[full] enables all |TS1| commands; useful only with fonts
 %       like EC or CM bright.
 %
-%    \item[almostfull] 
+%    \item[almostfull]
 %       same as ``full'', except that |\textcircled|
 %       and |\t| are \emph{not} redefined from their defaults to avoid
 %       that commands like |\copyright| suddenly no longer work.
@@ -2855,7 +2855,7 @@
 \def\tc@errorwarn{\PackageError}
 \DeclareOption{warn}{\gdef\tc@errorwarn#1#2#3{\PackageWarning{#1}{#2}}}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \ExecuteOptions{almostfull}
 \ProcessOptions\relax
@@ -2966,7 +2966,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-%    
+%
 % \begin{macro}{\tc@fake@euro}
 %    |\tc@fake@euro|  is an example of a ``fake'' definition to use in  arg |#3| of
 %    |\CheckEncodingSubset| when a symbol is not available in a
@@ -2986,7 +2986,7 @@
 }
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 % \begin{macro}{\tc@check@symbol}
 % \begin{macro}{\tc@check@accent}
 %    These are two abbreviations that we use below to check symbols
@@ -3087,7 +3087,7 @@
 \DeclareTextCommandDefault{\texteuro}
    {\CheckEncodingSubset\UseTextSymbol{TS1}\tc@fake@euro5\texteuro}
 %    \end{macrocode}
-%    
+%
 %    The |\textohm| is only available for subsets with id 3 or
 %    less. Otherwise we produce an error.
 %    \begin{macrocode}
@@ -3229,13 +3229,13 @@
 %    \begin{macrocode}
 \DeclareRobustCommand\oldstylenums[1]{%
  \begingroup
-  \ifmmode  
+  \ifmmode
    \mathgroup\symletters #1%
   \else
    \CheckEncodingSubset\@use@text@encoding{TS1}%
        {\PackageWarning{textcomp}%
           {Oldstyle digits unavailable for
-           family \f@family.\MessageBreak 
+           family \f@family.\MessageBreak
            Lining digits used instead}}%
        \tw@{#1}%
    \fi
@@ -3267,7 +3267,7 @@
 \DeclareEncodingSubset{TS1}{cmtl}    {0}
 \DeclareEncodingSubset{TS1}{ccr}     {0}
 %    \end{macrocode}
-%    
+%
 %    PSNFSS fonts:
 %    \begin{macrocode}
 \DeclareEncodingSubset{TS1}{ptm}     {4}
@@ -3281,7 +3281,7 @@
 \DeclareEncodingSubset{TS1}{bch}     {4}
 \DeclareEncodingSubset{TS1}{put}     {5}
 %    \end{macrocode}
-%    
+%
 %    Other CTAN fonts (probably not complete):
 %    \begin{macrocode}
 \DeclareEncodingSubset{TS1}{uag}     {5}
@@ -3309,7 +3309,7 @@
 \DeclareEncodingSubset{TS1}{lmssq}   {0}
 \DeclareEncodingSubset{TS1}{lmvtt}   {0}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareEncodingSubset{TS1}{qhv}     {0}
 \DeclareEncodingSubset{TS1}{qag}     {0}
@@ -3328,10 +3328,10 @@
 \DeclareEncodingSubset{TS1}{futx}    {4}
 \DeclareEncodingSubset{TS1}{futj}    {4}
 %    \end{macrocode}
-%    
+%
 %  Y\&Y's Lucida Bright
 %    \begin{macrocode}
-\DeclareEncodingSubset{TS1}{hlh}     {3} 
+\DeclareEncodingSubset{TS1}{hlh}     {3}
 \DeclareEncodingSubset{TS1}{hls}     {3}
 \DeclareEncodingSubset{TS1}{hlst}    {3}
 %    \end{macrocode}
@@ -3345,7 +3345,7 @@
 \DeclareEncodingSubset{TS1}{hlct}    {5}
 \DeclareEncodingSubset{TS1}{hlx}     {5}
 \DeclareEncodingSubset{TS1}{hlce}    {5}
-\DeclareEncodingSubset{TS1}{hlcn}    {5}  
+\DeclareEncodingSubset{TS1}{hlcn}    {5}
 \DeclareEncodingSubset{TS1}{hlcw}    {5}
 \DeclareEncodingSubset{TS1}{hlcf}    {5}
 %    \end{macrocode}
@@ -3357,7 +3357,7 @@
 \DeclareEncodingSubset{TS1}{ptmx}    {4}
 \DeclareEncodingSubset{TS1}{ptmj}    {4}
 %    \end{macrocode}
-%    
+%
 %    If the file \texttt{textcomp.cfg} exists it will be loaded at
 %    this point. This allows to define further subset encodings for
 %    font families not covered by default.
@@ -3366,12 +3366,12 @@
 \InputIfFileExists{textcomp.cfg}
   {\PackageInfo{textcomp}{Local configuration file used}}{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \fi
 %</TS1sty>
 %    \end{macrocode}
-%    
+%
 % \Finale
 %
 \endinput
diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.ins b/Master/texmf-dist/source/latex/base/ltoutenc.ins
index 2f197e84efd..fa7ea8af01c 100644
--- a/Master/texmf-dist/source/latex/base/ltoutenc.ins
+++ b/Master/texmf-dist/source/latex/base/ltoutenc.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/ltoutput.dtx b/Master/texmf-dist/source/latex/base/ltoutput.dtx
index 77428b44bb9..f57aa19be91 100644
--- a/Master/texmf-dist/source/latex/base/ltoutput.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutput.dtx
@@ -1,43 +1,45 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2014
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltoutput.dtx
 %<def1>\ProvidesFile{autoout1.sty}
 %<flafter>\ProvidesPackage{flafter}
-%<def1,flafter>       [2000/07/23 v1.2i
+%<fltrace>\ProvidesPackage{fltrace}
+%<def1,flafter,fltrace>       [2014/04/24 v1.2n
 %<def1>                     Output Routine autoload file]
 %<flafter>                  Standard LaTeX floats after reference (FMi)]
+%<fltrace>                  Tracing LaTeX floats algorithm (FMi)]
 %
 %<*driver>
 % \fi
 \ProvidesFile{ltoutput.dtx}
-             [2004/10/20 v1.2m LaTeX Kernel (Output Routine)]
+             [2014/04/24 v1.2n LaTeX Kernel (Output Routine)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltoutput.dtx}
@@ -51,7 +53,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{2764}
+% \CheckSum{2799}
 %
 %
 % \iffalse
@@ -71,7 +73,7 @@
 % The tracing in the file at present is mainly to help in testing the
 % code but it may well be developed into a full float tracing
 % package one day.
-% 
+%
 % ============================
 % \fi
 %
@@ -117,12 +119,12 @@
 % \changes{v1.1h}{1994/11/17}
 %         {\cs{@tempa} to \cs{reserved@a}.}
 % \changes{v1.1m}{1995/05/07}{Use \cs{hb@xt@}.}
-% 
+%
 % \StopEventually{}
 %
 % \def \ie {i.e.~}
 % \def \eg {e.g.~}
-% 
+%
 % \section{Output Routine}
 %
 % \subsection{Floats}
@@ -439,7 +441,7 @@
 %                             then \hbox{} \newpage fi
 %                     END
 %
-%  
+%
 % \twocolumn[BOX] : starts a new page, changing to twocolumn setting
 %     and puts BOX in a parbox of width \textwidth across the top.
 %     Useful for full-width titles for double-column pages.
@@ -754,7 +756,7 @@
 %         {Added macro}
 % \changes{v1.1f}{1994/11/14}{Use normal box register: why a box?}
 % \changes{v1.1l}{1995/04/24}{Add \cs{vbox} latex/1392}
-% 
+%
 %    We use a box register in which to put
 %    stuff that must appear before anything else in the
 %    |.dvi| file.
@@ -766,19 +768,19 @@
 \def \AtBeginDvi #1{%
   \global \setbox \@begindvibox
     \vbox{\unvbox \@begindvibox #1}%
-}                             
+}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-%  
+%
 %  \begin{macro}{\@maxdepth}
 %    This is not the right place to set this; it needs to be set in a
 %    class/style file when |\maxdepth| is set.
 %
 %    Also, many settings to |\maxdepth| should be to |\@maxdepth|,
-%    probably?     
+%    probably?
 % \task{All}{Sort out maxdepth: both should be set in the class files.}
-%    \begin{macrocode}  
+%    \begin{macrocode}
 \newdimen\@maxdepth
 \@maxdepth = \maxdepth
 %    \end{macrocode}
@@ -794,7 +796,7 @@
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-% 
+%
 % \begin{macro}{\if@insert}
 % \begin{macro}{\if@fcolmade}
 % \begin{macro}{\if@specialpage}
@@ -815,7 +817,7 @@
 \newif \if@specialpage \@specialpagefalse
 %    \end{macrocode}
 %    These should be global but are not always set globally in other
-%    files. 
+%    files.
 %    \begin{macrocode}
 \newif \if@firstcolumn \@firstcolumntrue
 \newif \if@twocolumn   \@twocolumnfalse
@@ -877,7 +879,7 @@
 %  \begin{macro}{\clearpage}
 % \changes{v1.1r}{1995/10/11}{Added a check so that it does not lose
 % the argument of \cs{twocolumn[...]}}
-% 
+%
 % The tests at the beginning are an experimental attempt to avoid a
 % completely empty page after a |\twocolumn[...]|.  This prevents the
 % text from the argument vanishing into a float box, never to be seen
@@ -902,7 +904,7 @@
 % \end{macro}
 %
 %  \begin{macro}{\cleardoublepage}
-%  
+%
 %    \begin{macrocode}
 \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page\else
     \hbox{}\newpage\if@twocolumn\hbox{}\newpage\fi\fi\fi}
@@ -939,18 +941,18 @@
 %
 %    All three tests are largely to make error processing more robust;
 %    that is why they all reset the flags explicitly, even when it
-%    would appear that this would be done by a |\leavevmode|. 
+%    would appear that this would be done by a |\leavevmode|.
 %    \begin{macrocode}
 \def \newpage {%
-  \if@noskipsec 
+  \if@noskipsec
     \ifx \@nodocument\relax
       \leavevmode
-      \global \@noskipsecfalse 
+      \global \@noskipsecfalse
     \fi
   \fi
   \if@inlabel
     \leavevmode
-    \global \@inlabelfalse 
+    \global \@inlabelfalse
   \fi
   \if@nobreak \@nobreakfalse \everypar{}\fi
   \par
@@ -958,12 +960,12 @@
   \penalty -\@M}
 %    \end{macrocode}
 %  \end{macro}
-%  
+%
 %  \begin{macro}{\@emptycol}
 % \changes{v1.0n}{1994/04/30}{Empty column action added:
 %                 \cs{@emptycol}}
 %    It may be better to use an invisible rule rather than an empty
-%    box here.  
+%    box here.
 %    \begin{macrocode}
 \def \@emptycol {\vbox{}\penalty -\@M}
 %    \end{macrocode}
@@ -1000,7 +1002,7 @@
   \@ifnextchar [\@topnewpage\@floatplacement
 }
 %    \end{macrocode}
-%    
+%
 %    Note that here, getting a box from the freelist can assume
 %    success since this comes just after a |\clearpage|.
 % \changes{v1.0n}{1994/04/30}{Added setting of \cs{col@number}}
@@ -1020,7 +1022,7 @@
   \@nodocument
   \@next\@currbox\@freelist{}{}%
   \global \setbox\@currbox
-    \color@vbox 
+    \color@vbox
       \normalcolor
       \vbox {%
         \hsize\textwidth
@@ -1063,14 +1065,14 @@
 %    \begin{macrocode}
   \global \@dbltopnum \m@ne
 %<*trace>
-    \tr@ce{dbltopnum set to -1 (= \the \@dbltopnum) (topnewpage)}%
+    \fl@trace{dbltopnum set to -1 (= \the \@dbltopnum) (topnewpage)}%
 %</trace>
 %    \end{macrocode}
 %    At points such as this we need to check that there is still a
 %    minimal amount of room left on the page; this uses an arbitrary
 %    small value at present; but note that this value is larger than
 %    that used when checking that page is too full of normal floats.
-%   
+%
 %    If there is little room left we just force a page-break, OK?
 %    This involves producing two empty columns.  The second empty
 %    column may be produced by |\output|, in which case an extra,
@@ -1080,7 +1082,7 @@
 %    float) the extra |\@emptycol| will be invoked in the second
 %    column by the conditional code guarded by the |\if@firstcolumn|
 %    test.
-%    
+%
 %    I now think that the cut-off point here should be |3\baselineskip|,
 %    but we make it a bit less so that 3 lines of text will be
 %    allowed, OK?
@@ -1156,7 +1158,7 @@
     \@whilesw \if@fcolmade \fi
       {%
 %<*trace>
-       \tr@ce{PAGE: float \if@twocolumn column \else page \fi
+       \fl@trace{PAGE: float \if@twocolumn column \else page \fi
                     completed}%
 %</trace>
        \@opcol\@startcolumn}%
@@ -1209,7 +1211,7 @@
 % \cs{@emptycol} is needed here}
 %    \begin{macrocode}
     \ifdim \@colroom<1.5\baselineskip
-      \ifdim \@colroom<\textheight  
+      \ifdim \@colroom<\textheight
         \@latex@warning@no@line {Text page \thepage\space
                                contains only floats}%
         \@emptycol
@@ -1256,7 +1258,7 @@
 %    \end{macrocode}
 %    Note that |\boxmaxdepth| should not be set here since we wish to
 %    record the natural depth of the holdpg box.
-%    
+%
 %    This is changed so as to not lose anything, such as writes
 %    and marks, which may get into box 255 and should be returned to
 %    the list.  This should only happen when the first penalty in the
@@ -1265,7 +1267,7 @@
 %    discarded whenever there is no box on the list.
 %
 %    It was just: |\setbox\@tempboxa \box \@cclv|.
-%    
+%
 %    The last box which is removed is the box put there by the
 %    double-penalty mechanism.  The |\unskip| then removes the
 %    |\topskip| which is put there since the box is the first on the
@@ -1313,7 +1315,7 @@
              \ifdim \wd\@kludgeins=\z@
                \advance \@pageht \ht\@kludgeins
 %<*trace>
-               \tr@ce {Extra size added: \the \ht\@kludgeins}%
+               \fl@trace {Extra size added: \the \ht\@kludgeins}%
 %</trace>
              \fi
            \fi
@@ -1332,7 +1334,7 @@
          \fi
          }\@latexbug
 %    \end{macrocode}
-%    A 2e change: use |\addpenalty| instead of |\penalty| here.  Some 
+%    A 2e change: use |\addpenalty| instead of |\penalty| here.  Some
 %    penalty is needed to create a potential break-point immediately
 %    after the reinserts (or the marginal).  Otherwise there can be no
 %    possibility to break here and this can cause the reinserts or the
@@ -1369,7 +1371,7 @@
 %    after any float pages created: this is a very bad bug since,
 %    for example, a kludge insert will be in quite the wrong place
 %    and, worse, be irremovable and uncancelable.
-%    
+%
 %    \begin{macrocode}
 %<*2ekernel|autoload>
 \def \@doclearpage {%
@@ -1384,9 +1386,9 @@
        \ifvbox\@kludgeins
          {\setbox \@tempboxa \box \@kludgeins}%
 %<*trace>
-         \tr@ce {kludgeins box made void}%
+         \fl@trace {kludgeins box made void}%
 %</trace>
-       \fi 
+       \fi
        \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa
        \setbox\@tempboxa\box\@cclv
        \xdef\@deferlist{\@toplist\@botlist\@deferlist}%
@@ -1448,7 +1450,7 @@
   \else
     \@outputpage
 %<*trace>
-    \tr@ce{PAGE: one column (float? see above) page completed}%
+    \fl@trace{PAGE: one column (float? see above) page completed}%
 %</trace>
 %    \end{macrocode}
 %    Not needed since it comes after |\@outputpage|:
@@ -1474,7 +1476,7 @@
 % \changes{v1.0b}{1993/11/29}{\cs{@makespecialcolbox} added}
 %    We must rewrite this macro to alllow for variations in page-makeup
 %    required by changes in page-length.
-%     
+%
 %    This uses a different macro if a special-length column is being
 %    produced.
 %
@@ -1496,9 +1498,9 @@
 %    But see also its use when combining floats.
 % \changes{v1.0l}{1994/03/15}{\cs{maxdepth} changed to \cs{@maxdepth}}
 %    \begin{macrocode}
-       \boxmaxdepth \@maxdepth                   
+       \boxmaxdepth \@maxdepth
 %    \end{macrocode}
-%    
+%
 % \changes{v1.2e}{1999/01/06}{Added negative vskip, as when processing
 %      outputbox below: suggested by Fred Bartlett pr/2892}
 % \changes{1.2i}{2000/07/12}{Removed negative vskip, as it gives
@@ -1509,7 +1511,7 @@
 %    \begin{macrocode}
 %       \@tempdima\dp\@cclv
        \unvbox \@cclv
-%       \vskip-\@tempdima  
+%       \vskip-\@tempdima
        \vskip \skip\footins
 %    \end{macrocode}
 % \changes{v1.1a}{1994/10/31}
@@ -1549,7 +1551,7 @@
 %    This extra reboxing is only needed to add the
 %    |\@texttop| and |\@textbotttom| but this could be done earlier,
 %    when the floats are added.
-%    
+%
 %    The |\boxmaxdepth| resetting here will have no effect unless
 %    |\@textbottom| ends with a box or rule.  So is this (or possibly
 %    |\@maxdepth|) the correct value?
@@ -1560,23 +1562,23 @@
 %    Thus very deep pages will overprint the footer; but these should
 %    have been prevented by suitable settings of the maxdepths at
 %    appropriate times.
-%    
+%
 %    If |\@textbottom| ends with a box or rule of non-zero depth
 %    then this skip adjustemnt should be done again after it.
-%    
+%
 %    I think that the final boxing of the main text page could have a
 %    common ending which may make it simpler to see what is going on.
-%    
+%
 %    This needs further investigation, especially in the `special
 %    case'.
 %    \task{CAR}{Further investigation of makecol}
 %
 %    Also, the |\boxmaxdepth| setting here affects what happens wthin
-%    |\@texttop| and |\@textbottom|, should it?  Is it needed at all? 
+%    |\@texttop| and |\@textbottom|, should it?  Is it needed at all?
 % \changes{v1.0l}{1994/03/15}{Removed boxmaxdepth setting.}
 %
 % RmS 91/10/22: Replaced |\dimen128| by |\dimen@|.
-%    
+%
 %    \begin{macrocode}
      \setbox\@outputbox \vbox to\@colht {%
 %       \boxmaxdepth \maxdepth                   %??
@@ -1621,7 +1623,7 @@
 %<*2ekernel|def1|fltrace>
 \gdef \@makespecialcolbox {%
 %<*trace>
-   \tr@ce{Kludgeins ht \the\ht\@kludgeins\space
+   \fl@trace{Kludgeins ht \the\ht\@kludgeins\space
                            dp \the\dp\@kludgeins\space
                            wd \the\wd\@kludgeins}%
 %</trace>
@@ -1631,7 +1633,7 @@
 %    See above for discussion of what is happening here.
 %
 %    This needs further investigation, especially in this `special
-%    case'. 
+%    case'.
 % \changes{v1.0k}{1994/02/08}{boxmaxdepth setting removed}
 %    \begin{macrocode}
    \setbox\@outputbox \vbox {%
@@ -1671,20 +1673,20 @@
 %    \task{CAR}{Further investigation of kludge-* space}
 %
 %    See above for a discussion of the |\boxmaxdepth| setting here.
-%    
+%
 % \changes{v1.0k}{1994/02/08}{boxmaxdepth setting added}
 % \changes{v1.0l}{1994/03/15}{Removed boxmaxdepth setting.}
 %    \begin{macrocode}
      \advance \@tempdima -\ht\@outputbox
      \advance \@tempdima \pageshrink
 %<*trace>
-     \tr@ce {Natural ht of col: \the \ht\@outputbox}%
-     \tr@ce {\string \@colht: \the \@colht}%
-     \tr@ce {Pageshrink added: \the \pageshrink}%
-     \tr@ce {Hence, space added: \the \@tempdima}%
+     \fl@trace {Natural ht of col: \the \ht\@outputbox}%
+     \fl@trace {\string \@colht: \the \@colht}%
+     \fl@trace {Pageshrink added: \the \pageshrink}%
+     \fl@trace {Hence, space added: \the \@tempdima}%
 %</trace>
      \setbox\@outputbox \vbox to \@colht {%
-%       \boxmaxdepth \maxdepth                 
+%       \boxmaxdepth \maxdepth
        \unvbox\@outputbox
        \vskip \@tempdima
        \@textbottom
@@ -1701,11 +1703,11 @@
    \else
      \advance \@tempdima -\ht\@kludgeins
 %<*trace>
-     \tr@ce {Natural ht of col: \the \ht\@outputbox}%
-     \tr@ce {\string \@colht: \the \@colht}%
-     \tr@ce {Extra size added: -\the \ht \@kludgeins}%
-     \tr@ce {Hence, height of inner box: \the \@tempdima}%
-     \tr@ce {Max? pageshrink available: \the \pageshrink}%
+     \fl@trace {Natural ht of col: \the \ht\@outputbox}%
+     \fl@trace {\string \@colht: \the \@colht}%
+     \fl@trace {Extra size added: -\the \ht \@kludgeins}%
+     \fl@trace {Hence, height of inner box: \the \@tempdima}%
+     \fl@trace {Max? pageshrink available: \the \pageshrink}%
 %</trace>
 %    \end{macrocode}
 %    This type of final packaging could be done always; this may
@@ -1726,7 +1728,7 @@
 %    \begin{macrocode}
    {\setbox \@tempboxa \box \@kludgeins}%
 %<*trace>
-     \tr@ce {kludgeins box made void}%
+     \fl@trace {kludgeins box made void}%
 %</trace>
 }
 %</2ekernel|def1|fltrace>
@@ -1747,7 +1749,7 @@
 %  \begin{macro}{\@resetactivechars}
 %  \begin{macro}{\@activechar@info}
 %
-% \changes{v1.0n}{1994/04/30}{\cs{@activechar@warning} changed to 
+% \changes{v1.0n}{1994/04/30}{\cs{@activechar@warning} changed to
 % \cs{@activechar@info}}
 % RmS 93/09/06:
 % added hook to protect against certain active characters in the
@@ -1756,13 +1758,13 @@
 %    \begin{macrocode}
 \def\@activechar@info #1{%
       \@latex@info@no@line {Active #1 character found while
-                            output routine is active  
+                            output routine is active
                             \MessageBreak
                             This may be a bug in a package file
                             you are using}%
 }
 %    \end{macrocode}
-%    
+%
 %    Do not put any spaces in this next bit!
 % \changes{1.2f}{1999/10/09}{Reset definition of active prime
 %    character (used in math mode)}
@@ -1810,22 +1812,22 @@
 % \changes{v1.1s}{1995/11/10}{In-lined}
 % \changes{v1.1w}{1996/09/21}{Added \cs{@parboxrestore} and made
 % consequent deletions: wait for the howls of protest}
-%         
+%
 %    The |\color@hbox| hooks here are used to avoid putting just a
 %    colour special into an otherwise empty box (in a header or
 %    footer).  These boxes are often set to be completely empty and so
 %    adding a special produces a very underfull box message.
-%    
+%
 %    There has been extensive tidying up of the old code here;
 %    including the removal of a level of grouping.
-% 
+%
 %    The setting of |\protect| immediately before the |\shipout|
 %    is needed so that protected commands within |\write|s are
 %    handled correctly.
-% 
+%
 %    Within shipout's vbox it is reset to its default value, |\relax|.
-% 
-%    Resetting it to its default value after the shipout has been 
+%
+%    Resetting it to its default value after the shipout has been
 %    completed (and the contents of the writes have been expanded)
 %    must be done by use of |\aftergroup|.
 %    This is because it must have the value |\relax|
@@ -1851,23 +1853,23 @@
 %    Now all the set-up stuff has been in-lined for Frank.
 %
 %    First the stuff for the writes.
-%    
-%    From here \ldots\ was in the command |\@writesetup|. 
+%
+%    From here \ldots\ was in the command |\@writesetup|.
 %    \begin{macrocode}
   \let \protect \noexpand
 %    \end{macrocode}
 %
-%    RmS 93/08/19: Redefined accents to allow changes in font encoding; 
+%    RmS 93/08/19: Redefined accents to allow changes in font encoding;
 %    but exactly why was this needed?
-% 
-%    The |\catcode`\ = 10| was removed as it was considered useless 
+%
+%    The |\catcode`\ = 10| was removed as it was considered useless
 %    (presumably because nothing gets tokenised during shipout).
-%    
-%    This was put in as some error produced active spaces in a mark, I 
+%
+%    This was put in as some error produced active spaces in a mark, I
 %    think.
-%    
+%
 %    Why was the hyphen reset?
-%    
+%
 %    \begin{macrocode}
   \@resetactivechars
 %    \end{macrocode}
@@ -1907,11 +1909,11 @@
 %      \baselineskip\normalbaselineskip
 %      \sloppy
 %    \end{verbatim}
-%    
+%
 %    \begin{macrocode}
   \@parboxrestore
 %    \end{macrocode}
-%    \ldots\ to here was in the command |\@writesetup|. 
+%    \ldots\ to here was in the command |\@writesetup|.
 %    \begin{macrocode}
   \shipout \vbox{%
     \set@typeset@protect
@@ -1921,12 +1923,12 @@
                                 % the group?
 %    \end{macrocode}
 %    This first bit has been moved inside the shipped out box.
-%    
-%    Now the setup inside the shipped out box; this should conatin all 
-%    the stuff that could only affect typesetting; other stuff may need 
+%
+%    Now the setup inside the shipped out box; this should conatin all
+%    the stuff that could only affect typesetting; other stuff may need
 %    to be reset for the writes also.
-%    
-%    From here \ldots\ was in the command |\@shipoutsetup|. 
+%
+%    From here \ldots\ was in the command |\@shipoutsetup|.
 %    \begin{macrocode}
   \if@specialpage
     \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
@@ -1939,18 +1941,18 @@
     \fi
   \fi
 %    \end{macrocode}
-%    
+%
 %    The rest was always inside the box.
 %
 %    RmS 91/08/15: aded this line:
 %    \begin{macrocode}
-  \reset@font 
+  \reset@font
 %    \end{macrocode}
 %    RmS 93/08/06 Added |\lineskiplimit=0pt| to guard against it being
 %              nonzero: e.g. by |\offinterlineskip| being in effect.
-%    
+%
 %    There are probably lots of other things that may need resetting.
-%    
+%
 %    \begin{macrocode}
   \normalsize
 %    \end{macrocode}
@@ -1973,7 +1975,7 @@
 %    \begin{macrocode}
   \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
 %    \end{macrocode}
-%    \ldots\ to here was in the command |\@shipoutsetup|. 
+%    \ldots\ to here was in the command |\@shipoutsetup|.
 %    \begin{macrocode}
     \@begindvi
     \vskip \topmargin
@@ -2024,13 +2026,13 @@
 % \changes{v1.1c}{1994/11/05}
 %         {Added macro}
 % \changes{v1.1f}{1994/11/14}{Use normal box register: why a box?}
-% 
+%
 %    This unboxes stuff that must appear before anything else in the
 %    |.dvi| file, then returns that box register to the free list and
 %    cancels itself.
 %
 %    The stuff in the box should not add any typeset material to the
-%    page. 
+%    page.
 %    \begin{macrocode}
 \def \@begindvi{%
   \unvbox \@begindvibox
@@ -2056,7 +2058,7 @@
     \ifx \@botlist\@empty \else \@cflb \fi
 }
 %    \end{macrocode}
-%  
+%
 % \changes{v1.0h}{1993/12/12}{defs changed to lets}
 %    \begin{macrocode}
 \def \@cflt{%
@@ -2101,7 +2103,7 @@
 % \begin{macro}{\@comflelt}
 % \begin{macro}{\@comdblflelt}
 % \begin{macro}{\@combinedblfloats}
-% 
+%
 %    \begin{macrocode}
 \def\@comflelt#1{\setbox\@tempboxa
       \vbox{\unvbox\@tempboxa\box #1\vskip\floatsep}}
@@ -2119,7 +2121,7 @@
     \setbox\@tempboxa \vbox{}%
     \let \@elt \@comdblflelt
     \@dbltoplist
-    \let \@elt \relax 
+    \let \@elt \relax
     \xdef \@freelist {\@freelist\@dbltoplist}%
     \global\let \@dbltoplist \@empty
     \setbox\@outputbox \vbox to\textheight
@@ -2134,7 +2136,7 @@
        \unvbox\@tempboxa\vskip-\dblfloatsep
 %    \end{macrocode}
 %    Here we need different typesetting if the top float comes from
-%    |\@topnewpage|. 
+%    |\@topnewpage|.
 % \changes{v1.0n}{1994/04/30}{Removed rule in topnewpage case}
 %    \begin{macrocode}
        \ifnum \@dbltopnum>\m@ne
@@ -2156,7 +2158,7 @@
 % \changes{v1.0f}{1993/12/05}{Command changed}
 %  \begin{macro}{\@startdblcolumn}
 % \changes{v1.0f}{1993/12/05}{Command changed}
-% 
+%
 %    We could combine (most of) these two into |\@startcol <list>|.
 %    Note that |\@xstartcol| was only used once (\ie in
 %    |\@startcolumn|); it has therefore been removed.  This is not quite
@@ -2172,7 +2174,7 @@
   \@tryfcolumn \@deferlist
   \if@fcolmade
 %<*trace>
-    \tr@ce{PAGE: float \if@twocolumn column \else page \fi
+    \fl@trace{PAGE: float \if@twocolumn column \else page \fi
                 completed}%
 %</trace>
   \else
@@ -2200,7 +2202,7 @@
   \@tryfcolumn \@dbldeferlist
   \if@fcolmade
 %<*trace>
-    \tr@ce{PAGE: double float page completed}%
+    \fl@trace{PAGE: double float page completed}%
 %</trace>
   \else
 %    \end{macrocode}
@@ -2228,9 +2230,9 @@
   \ifx #1\@empty
   \else
 %<*trace>
-     \tr@ce{PAGE: try float \if@twocolumn column/page\else page\fi
+     \fl@trace{PAGE: try float \if@twocolumn column/page\else page\fi
                   ---\string #1}%
-     \tr@ce{----- \string #1: #1}%
+     \fl@trace{----- \string #1: #1}%
 %</trace>
 %    \end{macrocode}
 % \changes{v1.0h}{1993/12/12}{defs changed to lets}
@@ -2376,11 +2378,11 @@
 %<*2ekernel|autoload|fltrace>
 \def \@addtobot {%
 %<*trace>
-   \tr@ce{***Start addtobot}%
+   \fl@trace{***Start addtobot}%
 %</trace>
    \@getfpsbit 4\relax
 %<*trace>
-   \tr@ce{fpstype \ifodd \@tempcnta OK \else not \fi bot:
+   \fl@trace{fpstype \ifodd \@tempcnta OK \else not \fi bot:
                                                      \the \@fpstype}%
 %</trace>
    \ifodd \@tempcnta
@@ -2390,28 +2392,28 @@
        \@flcheckspace \@botroom \@botlist
        \if@tempswa
 %    \end{macrocode}
-%    This next line means that this page is produced with box 255 
+%    This next line means that this page is produced with box 255
 %    having depth zero, rather than the normal maxdepth: is this
-%    needed, useful? 
+%    needed, useful?
 % \task{CAR/FMi}{Investigate resetting of maxdepth: I do not think it is
 % necessary here; Frank does.}
 %    \begin{macrocode}
          \global \maxdepth \z@
          \@flupdates \@botnum \@botroom \@botlist
 %<*trace>
-         \tr@ce{colroom (after-bot) = \the \@colroom}%
-         \tr@ce{colnum (after-bot) = \the \@colnum}%
-         \tr@ce{botnum (after-bot) = \the \@botnum}%
-         \tr@ce{***Success: bot}%
+         \fl@trace{colroom (after-bot) = \the \@colroom}%
+         \fl@trace{colnum (after-bot) = \the \@colnum}%
+         \fl@trace{botnum (after-bot) = \the \@botnum}%
+         \fl@trace{***Success: bot}%
 %</trace>
          \@inserttrue
        \fi
 %<*trace>
      \else
-       \tr@ce{Fail: botnum = \the \@botnum:
+       \fl@trace{Fail: botnum = \the \@botnum:
                                   fpstype \the \@fpstype=ORD?}%
        \ifnum \@fpstype<\sixt@@n
-         \tr@ce{ERROR: !b float not successful (addtobot)}%
+         \fl@trace{ERROR: !b float not successful (addtobot)}%
        \fi
 %</trace>
      \fi
@@ -2427,11 +2429,11 @@
 %    \begin{macrocode}
 \def \@addtotoporbot {%
 %<*trace>
-   \tr@ce{***Start addtotoporbot}%
+   \fl@trace{***Start addtotoporbot}%
 %</trace>
    \@getfpsbit \tw@
 %<*trace>
-   \tr@ce{fpstype \ifodd \@tempcnta OK \else not \fi top:
+   \fl@trace{fpstype \ifodd \@tempcnta OK \else not \fi top:
                                                      \the \@fpstype}%
 %</trace>
    \ifodd \@tempcnta
@@ -2442,30 +2444,30 @@
        \if@tempswa
          \@bitor\@currtype{\@midlist\@botlist}%
 %<*trace>
-           \tr@ce{(mid+bot)list: \@midlist, \@botlist:
+           \fl@trace{(mid+bot)list: \@midlist, \@botlist:
                               (addtotoporbot-before)}%
 %</trace>
          \if@test
 %<*trace>
-           \tr@ce{type already on list: mid or bot---sent to addtobot}%
+           \fl@trace{type already on list: mid or bot---sent to addtobot}%
 %</trace>
          \else
           \@flupdates \@topnum \@toproom \@toplist
 %<*trace>
-          \tr@ce{colroom (after-top) = \the \@colroom}%
-          \tr@ce{colnum (after-top) = \the \@colnum}%
-          \tr@ce{topnum (after-top) = \the \@topnum}%
-          \tr@ce{***Success: top}%
+          \fl@trace{colroom (after-top) = \the \@colroom}%
+          \fl@trace{colnum (after-top) = \the \@colnum}%
+          \fl@trace{topnum (after-top) = \the \@topnum}%
+          \fl@trace{***Success: top}%
 %</trace>
           \@inserttrue
          \fi
        \fi
 %<*trace>
      \else
-       \tr@ce{Fail: topnum = \the \@topnum: fpstype
+       \fl@trace{Fail: topnum = \the \@topnum: fpstype
                                             \the \@fpstype=ORD?}%
        \ifnum \@fpstype<\sixt@@n
-         \tr@ce{ERROR: !t float not successful (addtotoporbot)}%
+         \fl@trace{ERROR: !t float not successful (addtotoporbot)}%
        \fi
 %</trace>
      \fi
@@ -2473,7 +2475,7 @@
    \if@insert
    \else
 %<*trace>
-     \tr@ce{sent to addtobot (addtotoporbot)}%
+     \fl@trace{sent to addtobot (addtotoporbot)}%
 %</trace>
      \@addtobot
    \fi
@@ -2492,18 +2494,18 @@
 %<*2ekernel|autoload|fltrace|flafter>
 \def \@addtocurcol {%
 %<*trace>
-  \tr@ce{***Start addtocurcol}%
+  \fl@trace{***Start addtocurcol}%
 %</trace>
    \@insertfalse
    \@setfloattypecounts
    \ifnum \@fpstype=8
 %<*trace>
-     \tr@ce{fpstype !p only (addtocurcol): \the \@fpstype = 8?}%
+     \fl@trace{fpstype !p only (addtocurcol): \the \@fpstype = 8?}%
 %</trace>
    \else
      \ifnum \@fpstype=24
 %<*trace>
-       \tr@ce{fpstype p only (addtocurcol): \the \@fpstype = 24?}%
+       \fl@trace{fpstype p only (addtocurcol): \the \@fpstype = 24?}%
 %</trace>
      \else
        \@flsettextmin
@@ -2516,7 +2518,7 @@
 % |\@textmin| also.
 %    \begin{macrocode}
 %<*trace>
-       \tr@ce{textfloatsheight (before) = \the \@textfloatsheight}%
+       \fl@trace{textfloatsheight (before) = \the \@textfloatsheight}%
 %</trace>
        \advance \@textmin \@textfloatsheight
        \@reqcolroom \@pageht
@@ -2525,45 +2527,45 @@
 %    \begin{macrocode}
 %       \advance \@reqcolroom \@pagedp
 %<*trace>
-       \tr@ce{textmin + textfloatsheight: \the \@textmin}%
-       \tr@ce{page-so-far: \the \@reqcolroom}%
+       \fl@trace{textmin + textfloatsheight: \the \@textmin}%
+       \fl@trace{page-so-far: \the \@reqcolroom}%
 %</trace>
        \ifdim \@textmin>\@reqcolroom
          \@reqcolroom \@textmin
 %<*trace>
-         \tr@ce{ORD? textmin being used}%
+         \fl@trace{ORD? textmin being used}%
 %</trace>
        \fi
        \advance \@reqcolroom \ht\@currbox
 %<*trace>
-       \tr@ce{float size = \the \ht \@currbox (addtocurcol)}%
-       \tr@ce{colroom = \the \@colroom (addtocurcol)}%
-       \tr@ce{reqcolroom = \the \@reqcolroom (addtocurcol)}%
+       \fl@trace{float size = \the \ht \@currbox (addtocurcol)}%
+       \fl@trace{colroom = \the \@colroom (addtocurcol)}%
+       \fl@trace{reqcolroom = \the \@reqcolroom (addtocurcol)}%
 %</trace>
        \ifdim \@colroom>\@reqcolroom
          \@flsetnum \@colnum
          \ifnum \@colnum>\z@
            \@bitor\@currtype\@deferlist
 %<*trace>
-           \tr@ce{deferlist: \@deferlist: (addtocurcol-before)}%
+           \fl@trace{deferlist: \@deferlist: (addtocurcol-before)}%
 %</trace>
            \if@test
 %<*trace>
-             \tr@ce{type already on list: defer (addtocurcol)}%
+             \fl@trace{type already on list: defer (addtocurcol)}%
 %</trace>
            \else
              \@bitor\@currtype\@botlist
 %<*trace>
-           \tr@ce{botlist: \@botlist: (addtocurcol-before)}%
+           \fl@trace{botlist: \@botlist: (addtocurcol-before)}%
 %</trace>
              \if@test
 %<*trace>
-               \tr@ce{type already on list: bot---sent to addtobot}%
+               \fl@trace{type already on list: bot---sent to addtobot}%
 %</trace>
                \@addtobot
              \else
 %<*trace>
-               \tr@ce{fpstype \ifodd \@tempcnta OK \else not \fi
+               \fl@trace{fpstype \ifodd \@tempcnta OK \else not \fi
                       here: \the \@fpstype}%
 %</trace>
                \ifodd \count\@currbox
@@ -2577,15 +2579,15 @@
                    \global \advance \@textfloatsheight 2\intextsep
                    \@cons \@midlist \@currbox
 %<*trace>
-                   \tr@ce{***Success: here}%
-                   \tr@ce{textfloatsheight (after-here) =
+                   \fl@trace{***Success: here}%
+                   \fl@trace{textfloatsheight (after-here) =
                         \the \@textfloatsheight}%
-                   \tr@ce{colnum (after-here) = \the \@colnum}%
+                   \fl@trace{colnum (after-here) = \the \@colnum}%
 %</trace>
 %    \end{macrocode}
-% 
+%
 % CHANGE TO |\@addtocurcol|:
-% 
+%
 % |\penalty\z@| changed to |\penalty\interlinepenalty| so |\samepage|
 % works properly with figure and table environments.
 % (Changed 23 Oct 86)
@@ -2611,7 +2613,7 @@
 % \changes{v1.1i}{1994/11/21}
 %   {Added \cs{if@nobreak} test before float box}
 % \changes{v1.1z}{1996/10/24}{Added \cs{nobreak}, etc as appropriate}
-% 
+%
 % Typesetting starts here (we are in vertical mode).
 %    \begin{macrocode}
                    \if@nobreak
@@ -2633,22 +2635,29 @@
                    \@inserttrue
 %<*trace>
                  \else
-                   \tr@ce{Fail---no room at 2nd test of colroom
+                   \fl@trace{Fail---no room at 2nd test of colroom
                                  (addtocorcol \string\intextsep)}%
 %</trace>
                  \fi
                \fi
                \if@insert
                \else
+%    \end{macrocode}
+%   Next set of docstrip guards are a bit weird, essentially
+%   |\@addtotoporbot| ends up inside the kernel and the
+%   \texttt{fltrace} package and |\@addtotoporbot| shows up in the
+%   \texttt{flafter} package. Guess that could have been done a bit
+%   more obvious :-)
+%    \begin{macrocode}
 %<*2ekernel|autoload|fltrace>
 %<*trace>
-                 \tr@ce{not here: sent to addtotoporbot}%
+                 \fl@trace{not here: sent to addtotoporbot}%
 %</trace>
                  \@addtotoporbot
 %</2ekernel|autoload|fltrace>
 %<*!2ekernel&!autoload&!fltrace>
 %<*trace>
-                 \tr@ce{not here: sent to addtobot}%
+                 \fl@trace{not here: sent to addtobot}%
 %</trace>
                  \@addtobot
 %</!2ekernel&!autoload&!fltrace>
@@ -2657,16 +2666,16 @@
            \fi
 %<*trace>
          \else
-           \tr@ce{Fail: colnum = \the \@colnum:
+           \fl@trace{Fail: colnum = \the \@colnum:
                         fpstype \the \@fpstype=ORD?}%
            \ifnum \@fpstype<\sixt@@n
-             \tr@ce{ERROR: BANG float not successful (addtocurcol)}%
+             \fl@trace{ERROR: BANG float not successful (addtocurcol)}%
            \fi
 %</trace>
          \fi
 %<*trace>
        \else
-         \tr@ce{Fail---no room: fl box ht: \the \ht \@currbox
+         \fl@trace{Fail---no room: fl box ht: \the \ht \@currbox
                                                      (addtocurcol)}%
 %</trace>
        \fi
@@ -2676,11 +2685,11 @@
    \else
      \@resethfps
 %<*trace>
-     \tr@ce{put on deferlist (addtocurcol)}%
+     \fl@trace{put on deferlist (addtocurcol)}%
 %</trace>
      \@cons\@deferlist\@currbox
 %<*trace>
-     \tr@ce{deferlist: \@deferlist: (addtocurcol-after)}%
+     \fl@trace{deferlist: \@deferlist: (addtocurcol-after)}%
 %</trace>
    \fi
 }
@@ -2697,54 +2706,54 @@
 \def\@addtonextcol{%
   \begingroup
 %<*trace>
-   \tr@ce{***Start addtonextcol}%
+   \fl@trace{***Start addtonextcol}%
 %</trace>
    \@insertfalse
    \@setfloattypecounts
    \ifnum \@fpstype=8
 %<*trace>
-     \tr@ce{fpstype not curcol: \the \@fpstype = 8?}%
+     \fl@trace{fpstype not curcol: \the \@fpstype = 8?}%
 %</trace>
    \else
      \ifnum \@fpstype=24
 %<*trace>
-       \tr@ce{fpstype not curcol: \the \@fpstype = 24?}%
+       \fl@trace{fpstype not curcol: \the \@fpstype = 24?}%
 %</trace>
      \else
        \@flsettextmin
 %<*trace>
-       \tr@ce{text-so-far: 0pt (top of col)}%
+       \fl@trace{text-so-far: 0pt (top of col)}%
 %</trace>
        \@reqcolroom \ht\@currbox
 %<*trace>
-       \tr@ce{float size: \the \@reqcolroom (addtonextcol)}%
+       \fl@trace{float size: \the \@reqcolroom (addtonextcol)}%
 %</trace>
        \advance \@reqcolroom \@textmin
 %<*trace>
-       \tr@ce{colroom = \the \@colroom (addtonextcol)}%
-       \tr@ce{reqcolroom = \the \@reqcolroom (addtonextcol)}%
+       \fl@trace{colroom = \the \@colroom (addtonextcol)}%
+       \fl@trace{reqcolroom = \the \@reqcolroom (addtonextcol)}%
 %</trace>
        \ifdim \@colroom>\@reqcolroom
          \@flsetnum \@colnum
          \ifnum\@colnum>\z@
             \@bitor\@currtype\@deferlist
 %<*trace>
-            \tr@ce{deferlist: \@deferlist: (addtonextcol-before)}%
+            \fl@trace{deferlist: \@deferlist: (addtonextcol-before)}%
 %</trace>
             \if@test
 %<*trace>
-              \tr@ce{type already on list: defer (addtonextcol)}%
+              \fl@trace{type already on list: defer (addtonextcol)}%
 %</trace>
             \else
 %<*trace>
-              \tr@ce{sent to addtotoporbot (addtonextcol)}%
+              \fl@trace{sent to addtotoporbot (addtonextcol)}%
 %</trace>
               \@addtotoporbot
             \fi
          \fi
 %<*trace>
        \else
-         \tr@ce{Fail---no room: fl box ht: \the \ht \@currbox
+         \fl@trace{Fail---no room: fl box ht: \the \ht \@currbox
                                                   (addtonextcol)}%
 %</trace>
        \fi
@@ -2753,21 +2762,21 @@
    \if@insert
    \else
 %<*trace>
-     \tr@ce{put back on deferlist (addtonextcol)}%
+     \fl@trace{put back on deferlist (addtonextcol)}%
 %</trace>
      \@cons\@deferlist\@currbox
 %<*trace>
-     \tr@ce{deferlist: \@deferlist: (addtonextcol-after)}%
+     \fl@trace{deferlist: \@deferlist: (addtonextcol-after)}%
 %</trace>
    \fi
 %<*trace>
-   \tr@ce{End of addtonextcol -- locally counts:}%
-   \tr@ce{ col: \the \@colnum. top: \the \@topnum. bot: \the \@botnum.}%
+   \fl@trace{End of addtonextcol -- locally counts:}%
+   \fl@trace{ col: \the \@colnum. top: \the \@topnum. bot: \the \@botnum.}%
 %</trace>
   \endgroup
 %<*trace>
-  \tr@ce{End of addtonextcol -- globally counts:}%
-  \tr@ce{col: \the \@colnum. top: \the \@topnum. bot: \the \@botnum.}%
+  \fl@trace{End of addtonextcol -- globally counts:}%
+  \fl@trace{col: \the \@colnum. top: \the \@topnum. bot: \the \@botnum.}%
 %</trace>
 }
 %    \end{macrocode}
@@ -2781,13 +2790,13 @@
 \def\@addtodblcol{%
   \begingroup
 %<*trace>
-  \tr@ce{***Start addtodblcol}%
+  \fl@trace{***Start addtodblcol}%
 %</trace>
    \@insertfalse
    \@setfloattypecounts
    \@getfpsbit \tw@
 %<*trace>
-   \tr@ce{fpstype \ifodd \@tempcnta OK \else not \fi dbltop:
+   \fl@trace{fpstype \ifodd \@tempcnta OK \else not \fi dbltop:
                                                      \the \@fpstype}%
 %</trace>
    \ifodd\@tempcnta
@@ -2797,18 +2806,18 @@
        \ifdim \@dbltoproom>\ht\@currbox
          \@tempswatrue
 %<*trace>
-         \tr@ce{Space OK: \@dbltoproom =
+         \fl@trace{Space OK: \@dbltoproom =
                 \the \@dbltoproom > \the \ht \@currbox
                                          (dbltoproom)}%
 %</trace>
        \else
 %<*trace>
-         \tr@ce{fpstype: \the \@fpstype (addtodblcol)}%
+         \fl@trace{fpstype: \the \@fpstype (addtodblcol)}%
 %</trace>
          \ifnum \@fpstype<\sixt@@n
 %<*trace>
-           \tr@ce{BANG float ignoring \@dbltoproom}%
-           \tr@ce{\@spaces \@dbltoproom = \the \@dbltoproom.
+           \fl@trace{BANG float ignoring \@dbltoproom}%
+           \fl@trace{\@spaces \@dbltoproom = \the \@dbltoproom.
                            Ht float: \the \ht \@currbox-BANG}%
 %</trace>
 %    \end{macrocode}
@@ -2817,28 +2826,28 @@
 %    \begin{macrocode}
            \advance \@dbltoproom \@textmin
 %<*trace>
-           \tr@ce{Local value of texmin: \the\@textmin}%
-           \tr@ce{\@spaces space on page = \the \@dbltoproom.
+           \fl@trace{Local value of texmin: \the\@textmin}%
+           \fl@trace{\@spaces space on page = \the \@dbltoproom.
                            Ht float: \the \ht \@currbox-BANG}%
 %</trace>
            \ifdim \@dbltoproom>\ht\@currbox
              \@tempswatrue
 %<*trace>
-             \tr@ce{Space OK BANG: space on page = \the \@dbltoproom >
+             \fl@trace{Space OK BANG: space on page = \the \@dbltoproom >
                                               \the \ht \@currbox}%
            \else
-             \tr@ce{fpstype: \the \@fpstype}%
-             \tr@ce{Fail---no room dbltoproom-BANG?:}%
-             \tr@ce{\@spaces space on page = \the \@dbltoproom.
+             \fl@trace{fpstype: \the \@fpstype}%
+             \fl@trace{Fail---no room dbltoproom-BANG?:}%
+             \fl@trace{\@spaces space on page = \the \@dbltoproom.
                            Ht float: \the \ht \@currbox}%
 %</trace>
            \fi
            \advance \@dbltoproom -\@textmin
 %<*trace>
          \else
-           \tr@ce{fpstype: \the \@fpstype}%
-           \tr@ce{Fail---no room dbltoproom-ORD?:}%
-           \tr@ce{\@spaces \@dbltoproom = \the \@dbltoproom.
+           \fl@trace{fpstype: \the \@fpstype}%
+           \fl@trace{Fail---no room dbltoproom-ORD?:}%
+           \fl@trace{\@spaces \@dbltoproom = \the \@dbltoproom.
                            Ht float: \the \ht \@currbox}%
 %</trace>
          \fi
@@ -2846,11 +2855,11 @@
        \if@tempswa
            \@bitor \@currtype \@dbldeferlist
 %<*trace>
-           \tr@ce{dbldeferlist: \@dbldeferlist: (before)}%
+           \fl@trace{dbldeferlist: \@dbldeferlist: (before)}%
 %</trace>
            \if@test
 %<*trace>
-              \tr@ce{type already on list: dbldefer}%
+              \fl@trace{type already on list: dbldefer}%
 %</trace>
            \else
               \@tempdima -\ht\@currbox
@@ -2862,18 +2871,18 @@
               \global \advance \@dbltopnum \m@ne
               \@cons \@dbltoplist \@currbox
 %<*trace>
-              \tr@ce{dbltopnum (after) = \the \@dbltopnum}%
-              \tr@ce{***Success: dbltop}%
+              \fl@trace{dbltopnum (after) = \the \@dbltopnum}%
+              \fl@trace{***Success: dbltop}%
 %</trace>
               \@inserttrue
            \fi
        \fi
 %<*trace>
      \else
-       \tr@ce{Fail: dbltopnum = \the \@dbltopnum: fpstype
+       \fl@trace{Fail: dbltopnum = \the \@dbltopnum: fpstype
                                                   \the \@fpstype=ORD?}%
        \ifnum \@fpstype<\sixt@@n
-         \tr@ce{ERROR: !t float not successful (addtodblcol)}%
+         \fl@trace{ERROR: !t float not successful (addtodblcol)}%
        \fi
 %</trace>
      \fi
@@ -2881,21 +2890,21 @@
    \if@insert
    \else
 %<*trace>
-     \tr@ce{put on dbldeferlist}%
+     \fl@trace{put on dbldeferlist}%
 %</trace>
      \@cons\@dbldeferlist\@currbox
 %<*trace>
-     \tr@ce{dbldeferlist: \@dbldeferlist: (after)}%
+     \fl@trace{dbldeferlist: \@dbldeferlist: (after)}%
 %</trace>
    \fi
 %<*trace>
-   \tr@ce{End of addtodblcol -- locally count:}%
-   \tr@ce{ dbltop: \the \@dbltopnum.}%
+   \fl@trace{End of addtodblcol -- locally count:}%
+   \fl@trace{ dbltop: \the \@dbltopnum.}%
 %</trace>
   \endgroup
 %<*trace>
-  \tr@ce{End of addtodblcol -- globally count:}%
-  \tr@ce{dbltop: \the \@dbltopnum.}%
+  \fl@trace{End of addtodblcol -- globally count:}%
+  \fl@trace{dbltop: \the \@dbltopnum.}%
 %</trace>
 }
 %</2ekernel|autoload|fltrace>
@@ -3022,12 +3031,12 @@
    \@ifstar
      {%
 %<*trace>
-      \tr@ce{Enlarging page height * }%
+      \fl@trace{Enlarging page height * }%
 %</trace>
       \@enlargepage{\hbox{\kern\p@}}}%
      {%
 %<*trace>
-      \tr@ce{Enlarging page height exactly---}%
+      \fl@trace{Enlarging page height exactly---}%
 %</trace>
       \@enlargepage\@empty}%
 }
@@ -3048,7 +3057,7 @@
 %<*2ekernel|def1>
 \gdef\@enlargepage#1#2{%
 %<*trace>
-   \tr@ce{\@spaces\@spaces by #2}%
+   \fl@trace{\@spaces\@spaces by #2}%
 %</trace>
    \@tempskipa#2\relax
    \ifdim \@tempskipa>.5\maxdimen
@@ -3058,7 +3067,7 @@
    \else
      \ifdim \vsize<.5\maxdimen
 %<*trace>
-       \tr@ce {Kludgeins added--pagegoal before: \the\pagegoal}%
+       \fl@trace {Kludgeins added--pagegoal before: \the\pagegoal}%
 %</trace>
        \@bsphack
          \insert\@kludgeins{#1\vskip-\@tempskipa}%
@@ -3068,11 +3077,11 @@
 %    \begin{macrocode}
 %<*trace>
        \ifvmode \par
-         \tr@ce {Kludgeins added--pagegoal after: \the \pagegoal}%
+         \fl@trace {Kludgeins added--pagegoal after: \the \pagegoal}%
        \fi
 %</trace>
      \else
-       \@latexerr{Page\space height\space already\space 
+       \@latexerr{Page\space height\space already\space
                   too\space large}\@eha
      \fi
    \fi
@@ -3125,12 +3134,12 @@
 % mechanism.
 %
 % More tracing.
-%  \begin{macro}{\tr@ce}
-%  \begin{macro}{\notrace}
+%  \begin{macro}{\fl@trace}
+%  \begin{macro}{\tracefloatsoff}
 %  \begin{macro}{\tracefloats}
-%  \begin{macro}{\@traceval}
+%  \begin{macro}{\fl@traceval}
 %  \begin{macro}{\tracefloatvals}
-%  \begin{macro}{\@tracemessage}
+%  \begin{macro}{\fl@tracemessage}
 % \changes{v1.0c}{1993/11/30}{Commands added}
 % \changes{v1.0h}{1993/12/12}{Commands changed}
 % \changes{v1.0j}{1993/12/17}{tracefloatvals made a document command}
@@ -3138,32 +3147,72 @@
 %    produces mega-output.  Default is no tracing.
 % \changes{v1.1j}{1995/04/24}
 %   {Do not add to kernel unless `trace' specified}
-% \task{???}{Make proper tracing module}
+% \changes{v1.2n}{2014/04/24}
+%   {Renamed internal trace commands; provide as package}
 %
 %    \begin{macrocode}
-%<*trace>
-\def \@tracemessage #1{\typeout{LaTeX2e: #1}}
-\def \tracefloats{\let \tr@ce \@tracemessage}
-\def \notrace {\let \tr@ce \@gobble}
-\notrace
-\def \@traceval #1{\tr@ce{\string #1 = \the #1}}
+%<*fltrace>
+\def \fl@tracemessage #1{{\let\@elt\@empty\typeout{LaTeX2e: #1}}}
+\def \tracefloats{\let \fl@trace \fl@tracemessage}
+\def \tracefloatsoff {\let \fl@trace \@gobble}
+\tracefloatsoff
+\def \fl@traceval #1{\fl@trace{\string #1 = \the #1}}
 \def \tracefloatvals{%
   \@dblfloatplacement
   \@floatplacement
-  \@traceval\@colnum
-  \@traceval\@colroom
-  \@traceval\@topnum
-  \@traceval\@toproom
-  \@traceval\@botnum
-  \@traceval\@botroom
-  \@traceval\@fpmin
-  \tr@ce{\string\textfraction = \textfraction}%
-  \@traceval\@dbltopnum
-  \@traceval\@dbltoproom
+  \fl@trace{***Float placement parameters:}%
+  \fl@traceval\@colnum
+  \fl@traceval\@colroom
+  \fl@traceval\@topnum
+  \fl@traceval\@toproom
+  \fl@traceval\@botnum
+  \fl@traceval\@botroom
+  \fl@traceval\@fpmin
+  \fl@trace{\string\textfraction = \textfraction}%
+  \fl@traceval\@dbltopnum
+  \fl@traceval\@dbltoproom
+  \fl@trace{\string\textfraction = \textfraction}%
+  \fl@trace{toplist: \@toplist}%
+  \fl@trace{botlist: \@botlist}%
+  \fl@trace{midlist: \@midlist}%
+  \fl@trace{deferlist: \@deferlist}%
+  \fl@trace{dbltoplist: \@dbltoplist}%
+  \fl@trace{dbldeferlist: \@dbldeferlist}%
 }
-%</trace>
+%    \end{macrocode}
+%    We need to make sure that \texttt{fltrace} comes before
+%    \texttt{flafter} to make the tracing work.
+%    \begin{macrocode}
+\@ifpackageloaded{flafter}
+   {\PackageWarning{fltrace}{Load 'fltrace' before 'flafter'\MessageBreak
+                             Attempting to recover by reloading 'flafter'}%
+%    \end{macrocode}
+%    Hide the fact that \texttt{flafter} was already loaded and then
+%    request it anew.
+%    \begin{macrocode}
+    \expandafter\let\csname ver@flafter.sty\endcsname\relax
+    \RequirePackage{flafter}}{}
+%    \end{macrocode}
+%    With the changed algorithm in \texttt{fixltx2e} the situation is
+%    less good, right now the only option is to abort (but that could
+%   change in the future).
+%    \begin{macrocode}
+\AtBeginDocument{\@ifpackageloaded{fixltx2e}{%
+   \PackageError{fltrace}{'fltrace' can't be used together with
+     'fixltx2e'}%
+     {The 'fixltx2e' package has a corrected float algorithm that
+       currently \MessageBreak
+       can't be traced using 'fltrace'. Please remove
+       'fltrace' if you want\MessageBreak
+       to make use of the corrections in 'fixltx2e'.}\stop}{}}
+%</fltrace>
+%    \end{macrocode}
+%    As the code for \texttt{flafter} will contain tracing calls so
+%    that it works in conjunction with \texttt{fltrace} we need to
+%    provide a dummy definition for |\fl@trace| in that package.
+%    \begin{macrocode}
 %<*flafter>
-\providecommand\tr@ce[1]{}
+\providecommand\fl@trace[1]{}
 %</flafter>
 %    \end{macrocode}
 %  \end{macro}
@@ -3235,7 +3284,7 @@
 %  \begin{macro}{\@fpsadddefault}
 % \changes{v1.0f}{1993/12/05}{Command added}
 % Adds the default placement to what is already there.
-% 
+%
 % Should not need to change this, but could do it as follows:
 % \begin{verbatim}
 %\def \@fpsadddefault {%
@@ -3251,7 +3300,7 @@
 %<*2ekernel|autoload|fltrace>
 \def \@fpsadddefault {%
 %<*trace>
-   \tr@ce{fps changed from: \@fps}%
+   \fl@trace{fps changed from: \@fps}%
 %</trace>
    \edef \@fps {\@fps\csname fps@\@captype \endcsname}%
    \@latex@warning {%
@@ -3274,25 +3323,25 @@
   \divide\@currtype\@xxxii \multiply\@currtype\@xxxii
   \advance \@fpstype -\@currtype
 %<*trace>
-  \tr@ce{(mod 32) fpstype: \the \@fpstype}%
-  \tr@ce{(mult of 32) currtype: \the \@currtype}%
+  \fl@trace{(mod 32) fpstype: \the \@fpstype}%
+  \fl@trace{(mult of 32) currtype: \the \@currtype}%
 % Tracing only: but some should be changed into real errors/warnings?
   \ifnum \@fpstype<\sixt@@n
     \ifnum \@fpstype=\z@
-      \tr@ce{ERROR: no PLACEMENT, fpstype = \the \@fpstype = 0?}%
+      \fl@trace{ERROR: no PLACEMENT, fpstype = \the \@fpstype = 0?}%
     \fi
     \ifnum \@fpstype=\@ne
-      \tr@ce{WARNING: only h, fpstype = \the \@fpstype = 1?}%
+      \fl@trace{WARNING: only h, fpstype = \the \@fpstype = 1?}%
     \fi
-    \tr@ce{BANG float}%
+    \fl@trace{BANG float}%
   \else
     \ifnum \@fpstype=\sixt@@n
-      \tr@ce{ERROR: no PLACEMENT, fpstype = \the \@fpstype = 16?}%
+      \fl@trace{ERROR: no PLACEMENT, fpstype = \the \@fpstype = 16?}%
     \fi
     \ifnum \@fpstype=17
-      \tr@ce{WARNING: only h, fpstype = \the \@fpstype = 17?}%
+      \fl@trace{WARNING: only h, fpstype = \the \@fpstype = 17?}%
     \fi
-    \tr@ce{ORD float}%
+    \fl@trace{ORD float}%
   \fi
 %</trace>
 }
@@ -3373,7 +3422,7 @@
 %
 % Although it will leave |\@fpstype| set to 17 even if it was
 % originally 1, this does not matter since it is the last thing in
-% |\@addtocurcol|. 
+% |\@addtocurcol|.
 %    \begin{macrocode}
 %<*2ekernel|autoload|fltrace>
 \def \@resethfps {%
@@ -3387,7 +3436,7 @@
      \@latex@warning@no@line {%
        `\reserved@a h' float specifier changed to `\reserved@a ht'}%
 %<*trace>
-     \tr@ce{%
+     \fl@trace{%
         `t' added to `\reserved@a h'- new Count: \the \count\@currbox}%
 %</trace>
    \fi
@@ -3421,18 +3470,18 @@
 %    \begin{macrocode}
 \def \@flsetnum #1{%
 %<*trace>
-   \tr@ce{fpstype: \the \@fpstype (flsetnum \string#1)}%
+   \fl@trace{fpstype: \the \@fpstype (flsetnum \string#1)}%
 %</trace>
    \ifnum \@fpstype<\sixt@@n
      \ifnum #1=\z@
 %<*trace>
-       \tr@ce{BANG float resetting \string#1 to 1}%
+       \fl@trace{BANG float resetting \string#1 to 1}%
 %</trace>
        #1\@ne
      \fi
    \fi
 %<*trace>
-   \tr@ce{#1 (before) = \the #1}%
+   \fl@trace{#1 (before) = \the #1}%
 %</trace>
 }
 %    \end{macrocode}
@@ -3446,17 +3495,17 @@
 %    \begin{macrocode}
 \def \@flsettextmin {%
 %<*trace>
-   \tr@ce{fpstype: \the \@fpstype (flsettextmin)}%
+   \fl@trace{fpstype: \the \@fpstype (flsettextmin)}%
 %</trace>
    \ifnum \@fpstype<\sixt@@n
 %<*trace>
-     \tr@ce{BANG ignoring textmin}%
+     \fl@trace{BANG ignoring textmin}%
 %</trace>
      \@textmin \z@
    \else
      \@textmin \textfraction\@colht
 %<*trace>
-     \tr@ce{ORD textmin = \the \@textmin}%
+     \fl@trace{ORD textmin = \the \@textmin}%
 %</trace>
    \fi
 }
@@ -3476,42 +3525,42 @@
    \advance \@reqcolroom
      \ifx #2\@empty \textfloatsep \else \floatsep \fi
 %<*trace>
-   \tr@ce{colroom = \the \@colroom (flcheckspace \string#1 \string#2)}%
-   \tr@ce{reqcolroom = \the \@reqcolroom
+   \fl@trace{colroom = \the \@colroom (flcheckspace \string#1 \string#2)}%
+   \fl@trace{reqcolroom = \the \@reqcolroom
                                    (flcheckspace \string#1 \string#2)}%
 %</trace>
    \ifdim \@colroom>\@reqcolroom
      \ifdim #1>\ht\@currbox
        \@tempswatrue
 %<*trace>
-       \tr@ce{Space OK: #1 = \the #1 > \the \ht \@currbox
+       \fl@trace{Space OK: #1 = \the #1 > \the \ht \@currbox
                                    (flcheckspace \string#1 \string#2)}%
 %</trace>
      \else
 %<*trace>
-       \tr@ce{fpstype: \the \@fpstype
+       \fl@trace{fpstype: \the \@fpstype
                                    (flcheckspace \string#1 \string#2)}%
 %</trace>
        \ifnum \@fpstype<\sixt@@n
 %<*trace>
-         \tr@ce{BANG float ignoring #1
+         \fl@trace{BANG float ignoring #1
                                    (flcheckspace \string#1 \string#2):}%
-         \tr@ce{\@spaces #1 = \the #1.  Ht float: \the \ht \@currbox
+         \fl@trace{\@spaces #1 = \the #1.  Ht float: \the \ht \@currbox
                                                           BANG}%
 %</trace>
          \@tempswatrue
 %<*trace>
        \else
-         \tr@ce{Fail---no room (flcheckspace \string#1 \string#2)
+         \fl@trace{Fail---no room (flcheckspace \string#1 \string#2)
                        (fpstype \the \@fpstype=ORD?):}%
-         \tr@ce{\@spaces #1 = \the #1.  Ht float: \the \ht \@currbox
+         \fl@trace{\@spaces #1 = \the #1.  Ht float: \the \ht \@currbox
                                                           ORD?}%
 %</trace>
        \fi
      \fi
 %<*trace>
    \else
-     \tr@ce{Fail---no room at 2nd test of colroom
+     \fl@trace{Fail---no room at 2nd test of colroom
                    (flcheckspace \string#1 \string#2)}%
 %</trace>
    \fi
@@ -3557,11 +3606,11 @@
 %   \item The use |\@topnewpage| when |\dblfigrule| is non-trivial
 %   produced a rule in the wrong place.  This has been fixed by not
 %   using |\dblfigrule| when processing the `float' from
-%   |\@topnewpage|. 
+%   |\@topnewpage|.
 %   \item  If the specifier was just h and the float could not be put
 %     here, it went on the deferlist and stayed there until a clearpage.
 %     It now gets changed to a `th': this is only an error-recovery
-%     action, putting just h or !h should be deprecated.   
+%     action, putting just h or !h should be deprecated.
 %   \item |\@dblmaxsep| was `the maximum of |\dblfloatsep| and
 %     |\dbltexfloatsep|'. But it was never used!  Now gone completely,
 %     like |\@maxsep|.
@@ -3632,7 +3681,7 @@
 %     or rule, in which case the vskip to allow for its depth should
 %     also be added.  If it is kept, it should probably be the last
 %     thing in the box.  It has now been removed.
-%     
+%
 %     It would perhaps be better to document that |\@textbottom|
 %     and |\@texttop| must have natural height 0pt.
 %   \item  I cannot see why the vskip adjustement for the depth
@@ -3648,7 +3697,7 @@
 %     construction use their values outside the box group.
 %   \item  Should |\@maxdepth| store the setting of |\maxdepth| from
 %     lplain?  Or should we provide a proper interface to class files
-%     for setting these? 
+%     for setting these?
 % \end{enumerate}
 %
 % An analysis of various other macros.
@@ -3681,8 +3730,8 @@
   \endgroup
 %<*trace>
   \if@fcolmade
-    \tr@ce{PAGE: in \string\clearpage \if@twocolumn ---twocolumn\fi---}%
-    \tr@ce{----- float column/page completed from \string#1}%
+    \fl@trace{PAGE: in \string\clearpage \if@twocolumn ---twocolumn\fi---}%
+    \fl@trace{----- float column/page completed from \string#1}%
   \fi
 %</trace>
 }
@@ -3690,7 +3739,7 @@
 % This will line up the last baselines in the two
 % columns provided they are constructed in the normal way: \ie ending
 % in a skip of minus the original depth, with |\@textbottom| adding
-% nothing. 
+% nothing.
 %
 % Thus again it is essential for |\@textbottom| to have depth 0pt.
 % \changes{1.2g}{2000/07/12}{Ensure that rule is in \cs{normalcolor}}
@@ -3700,7 +3749,7 @@
     \global \@firstcolumnfalse
     \global \setbox\@leftcolumn \box\@outputbox
 %<*trace>
-    \tr@ce{PAGE: first column boxed}%
+    \fl@trace{PAGE: first column boxed}%
 %</trace>
   \else
     \global \@firstcolumntrue
@@ -3716,12 +3765,12 @@
                                              }%
                               }%
 %<*trace>
-    \tr@ce{PAGE: second column also boxed}%
+    \fl@trace{PAGE: second column also boxed}%
 %</trace>
     \@combinedblfloats
     \@outputpage
 %<*trace>
-    \tr@ce{PAGE: two column page completed}%
+    \fl@trace{PAGE: two column page completed}%
 %</trace>
     \begingroup
       \@dblfloatplacement
@@ -3733,7 +3782,7 @@
       \@whilesw\if@fcolmade \fi
         {\@outputpage
 %<*trace>
-      \tr@ce{PAGE: double float page completed}%
+      \fl@trace{PAGE: double float page completed}%
 %</trace>
          \@startdblcolumn}%
     \endgroup
@@ -3750,7 +3799,7 @@
 % package have been declared.  It also describes their use and sets
 % values for them which are reasonable for typical douments using
 % US letter or A4 sized paper.
-% 
+%
 % \paragraph{Limits for the placement of floating objects}
 %
 % \begin{macro}{\c@topnumber}
@@ -3900,7 +3949,7 @@
 %    When floating objects are placed on a seperate page or column,
 %    called a `float page', the layout of the page is controlled by
 %    these parameters, which are rubber lengths.
-%    
+%
 %    At the top of the page |\@fptop| is inserted;
 %    typically this supplies some stretchable whitespace.
 %    At the bottom of the page |\@fpbot| ais inserted.
@@ -3941,7 +3990,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% 
+%
 % \begin{macro}{\topfigrule}
 % \begin{macro}{\botfigrule}
 % \begin{macro}{\dblfigrule}
@@ -3958,7 +4007,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% 
-% 
+%
+%
 % \Finale
 \endinput
diff --git a/Master/texmf-dist/source/latex/base/ltpage.dtx b/Master/texmf-dist/source/latex/base/ltpage.dtx
index b29eefcdd28..11490ca6b53 100644
--- a/Master/texmf-dist/source/latex/base/ltpage.dtx
+++ b/Master/texmf-dist/source/latex/base/ltpage.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -71,7 +71,7 @@
 %  current and succeeding  pages to \emph{style}
 %
 %  |\thispagestyle|\marg{style} : sets the page style of the
-%  current page only to \emph{style}. 
+%  current page only to \emph{style}.
 %
 %  To define a page style \emph{style}, you must define
 %  |\ps@|\emph{style} to set the page style parameters.
@@ -84,7 +84,7 @@
 % commands, the page style defines the commands |\chaptermark|,
 % |\sectionmark|, etc., where |\chaptermark|\marg{text} is called by
 % |\chapter| to set a mark.  The |\...mark| commands and the |\...head|
-% macros are defined  with the help of the following macros.  
+% macros are defined  with the help of the following macros.
 %
 % (All the |\...mark| commands should be initialized to no-ops.)
 %
@@ -94,10 +94,10 @@
 % a `left' and a `right' mark, using the following commands:\\
 %     |\markboth|\marg{left}\marg{right} : Adds both marks.\\
 %     |\markright|\marg{right}      : Adds a 'right' mark.\\
-%     |\leftmark| : 
+%     |\leftmark| :
 %        Used in the output routine, gets the current `left'  mark.
 %        Works like \TeX's |\botmark.|\\
-%     |\rightmark| : 
+%     |\rightmark| :
 %        Used in the output routine, gets the current `right' mark.
 %        Works like \TeX's |\firstmark|.
 % The marking commands work reasonably well for right marks `numbered
@@ -179,7 +179,7 @@
 % \begin{macro}{\markright}
 % \changes{v1.0d}{1994/05/20}{Changed setting for \cs{protect}.}
 % \changes{v1.0e}{1994/11/04}{Added \cs{@unexpandable@protect}.
-%    ASAJ.} 
+%    ASAJ.}
 %
 % User commands for setting \LaTeX\ marks.
 %
@@ -275,7 +275,7 @@
 %  \end{macro}
 %
 % \begin{macro}{\flushbottom}
-% |\flushbottom|: 
+% |\flushbottom|:
 % Inverse of |\raggedbottom| --- makes all pages the same height.
 %    \begin{macrocode}
 \def\flushbottom{%
@@ -291,7 +291,7 @@
 % \changes{v1.0h}{1994/07/20}{Save a few tokens}
 %    \begin{macrocode}
 \def\sloppy{%
-  \tolerance 9999% 
+  \tolerance 9999%
   \emergencystretch 3em%
   \hfuzz .5\p@
   \vfuzz\hfuzz}
diff --git a/Master/texmf-dist/source/latex/base/ltpageno.dtx b/Master/texmf-dist/source/latex/base/ltpageno.dtx
index a779807b2bb..a76efad7b66 100644
--- a/Master/texmf-dist/source/latex/base/ltpageno.dtx
+++ b/Master/texmf-dist/source/latex/base/ltpageno.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
diff --git a/Master/texmf-dist/source/latex/base/ltpar.dtx b/Master/texmf-dist/source/latex/base/ltpar.dtx
index 83c3200eaa4..e8f67a988ce 100644
--- a/Master/texmf-dist/source/latex/base/ltpar.dtx
+++ b/Master/texmf-dist/source/latex/base/ltpar.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -46,7 +46,7 @@
   Leslie Lamport\and
   Frank Mittelbach\and
   Tobias Oetiker \thanks{Tobi did the documentation update}\and
-  Chris Rowley\and 
+  Chris Rowley\and
   Rainer Sch\"opf}
 \begin{document}
   \maketitle
@@ -78,8 +78,8 @@
 %
 % \section{Paragraphs}
 %
-% This section of the kernel declares the commands used to set 
-% |\par| and |\everypar| when ever their function needs to be 
+% This section of the kernel declares the commands used to set
+% |\par| and |\everypar| when ever their function needs to be
 % changed for a long time.
 %
 % \StopEventually{}
@@ -120,7 +120,7 @@
 % Short-term changes are made by the usual |\def\par| commands.
 % The original values are restored after a short-term change
 % by the |\@restorepar| commands.
-% 
+%
 % \DescribeMacro{\@@par}
 % |\@@par| always is defined to be the original \TeX{} |\par|.
 %
@@ -136,7 +136,7 @@
 %    \item |\minipage|
 % \end{itemize}
 %
-% When dealing with |\par| and |\everypar| remember the following two 
+% When dealing with |\par| and |\everypar| remember the following two
 % warnings:
 % \begin{enumerate}
 %  \item Commands that make short-term changes to |\par| and |\everypar|
@@ -144,14 +144,14 @@
 %     ones that do the restoration may be executed inside a group.  In
 %     particular, |\everypar| is executed inside a group whenever a new
 %     paragraph  begins with a left brace.  The |\everypar| command
-%     that restores its  definition should be local to the current 
+%     that restores its  definition should be local to the current
 %     group (in case the command
 %     is inside a minipage used inside someplace where |\everypar| has
 %     been redefined).  Thus, if |\everypar| is redefined to do an
 %     |\everypar{}| it could take several executions of |\everypar|
 %     before the restoration ``holds''.  This usually causes no problem.
-%     However, to prevent the extra executions from doing harm, 
-%     use a global switch to keep anything harmful in the new 
+%     However, to prevent the extra executions from doing harm,
+%     use a global switch to keep anything harmful in the new
 %     |\everypar| from being done twice.
 %   \item Commands that change |\everypar| should remember that
 %   |\everypar| might be supposed to set the following switches false:
@@ -190,7 +190,7 @@
 \def\@restorepar{\def\par{\@par}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \Finale
 \endinput
 
diff --git a/Master/texmf-dist/source/latex/base/ltpictur.dtx b/Master/texmf-dist/source/latex/base/ltpictur.dtx
index 1df3e4a1b32..8d26123d59e 100644
--- a/Master/texmf-dist/source/latex/base/ltpictur.dtx
+++ b/Master/texmf-dist/source/latex/base/ltpictur.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -73,11 +73,11 @@
 %  |\qbezier|\oarg{N}\parg{AX,AY}\parg{BX,BY}\parg{CX,CY}
 %  plots a quadratic Bezier curve from \parg{AX,AY} to \parg{CX,CY},
 %  with \parg{BX,BY}  as the third Bezier point, using $N+1$ points
-%  equally spaced parametrically.  
+%  equally spaced parametrically.
 %  If $N = 0$ (the default value), then a sufficient number of points
 %  are used to draw a connected curve--except that at most
 %  $|\qbeziermax| + 1$ points are drawn.  A ``point'' is a square of
-%  side |\@wholewidth|. 
+%  side |\@wholewidth|.
 %
 % \DescribeMacro{\bezier}
 % In addition, to be compatible with the old |bezier| package, a
@@ -332,7 +332,7 @@
 % \changes{LaTeX2.09}{1991/08/14}
 %         {(RmS) inserted extra braces around entry for NFSS}
 % \changes{LaTeX2.09}{1993/11/03}
-%         {(RmS) changed \cs{halign} to \cs{ialign} to initialize 
+%         {(RmS) changed \cs{halign} to \cs{ialign} to initialize
 %              \cs{tabskip} and \cs{everycr}}
 %
 % \begin{macro}{\@ishortstack}
@@ -562,10 +562,10 @@
 \ifnum \@yarg >\z@ \let\@upordown\raise \@clnht\z@
    \else\let\@upordown\lower \@clnht \ht\@linechar\fi
 \@clnwd \wd\@linechar
-\if@negarg 
+\if@negarg
   \hskip -\wd\@linechar \def\reserved@a{\hskip -2\wd\@linechar}%
 \else
-     \let\reserved@a\relax 
+     \let\reserved@a\relax
 \fi
 \@whiledim \@clnwd <\@linelen \do
   {\@upordown\@clnht\copy\@linechar
@@ -578,7 +578,7 @@
 \@tempdimb\@tempdima\advance\@tempdimb -\wd\@linechar
 \if@negarg \hskip -\@tempdimb \else \hskip \@tempdimb \fi
 \multiply\@tempdima \@m
-\@tempcnta \@tempdima 
+\@tempcnta \@tempdima
 \@tempdima \wd\@linechar \divide\@tempcnta \@tempdima
 \@tempdima \ht\@linechar \multiply\@tempdima \@tempcnta
 \divide\@tempdima \@m
@@ -594,7 +594,7 @@
 %    \begin{macrocode}
    \ifdim \@linelen = \z@
    \else
-     \@picture@warn 
+     \@picture@warn
    \fi
    \else\@upordown\@clnht\copy\@linechar\fi}
 %    \end{macrocode}
@@ -919,7 +919,7 @@
 %   BEGIN
 %     \@tempcnta       := integer coercion of (DIAM + 2pt)
 %                                           + 2pt added 1 Nov 88
-%     \@tempcnta       := \@tempcnta / integer coercion of 4pt 
+%     \@tempcnta       := \@tempcnta / integer coercion of 4pt
 %     if \@tempcnta > 10
 %       then \@tempcnta := 10 fi
 %     if \@tempcnta > 0
@@ -1104,7 +1104,7 @@
 % |\advance\@tempdima 2pt\relax| added 1 Nov 88 to fix bug in which
 % size of drawn circle not monotonic function of argument of |\circle|,
 % caused by different rounding for dimensions of large and small
-% circles. 
+% circles.
 %
 %    \begin{macrocode}
 %<*2ekernel|def>
@@ -1116,8 +1116,8 @@
 \gdef\@getcirc#1{\@tempdima #1\relax \advance\@tempdima 2\p@
   \@tempcnta\@tempdima
   \@tempdima 4\p@ \divide\@tempcnta\@tempdima
-  \ifnum \@tempcnta >10\relax 
-      \@picture@warn 
+  \ifnum \@tempcnta >10\relax
+      \@picture@warn
       \@tempcnta 10\relax
   \fi
   \ifnum \@tempcnta >\z@ \advance\@tempcnta\m@ne
@@ -1134,12 +1134,12 @@
 %
 % \begin{macro}{\@picture@warn}
 %     Generic warning for lines, vectors (used in |\@sline|) and
-%     oval or circle (used un |\@getcirc|) are not available at 
+%     oval or circle (used un |\@getcirc|) are not available at
 %     right size.
 % \changes{v1.1g}{1997/09/15}{Macro added pr/2524}
 %    \begin{macrocode}
 \def\@picture@warn{\@latex@warning{%
-     \string\oval, \string\circle, or \string\line\space 
+     \string\oval, \string\circle, or \string\line\space
      size unavailable}}
 %    \end{macrocode}
 % \end{macro}
@@ -1322,7 +1322,7 @@
 % \end{macro}
 % \end{macro}
 %
-% Initialization: ``|\thinlines|'' 
+% Initialization: ``|\thinlines|''
 % \changes{v1.1f}{1995/10/27}
 %      {Move initialisation to kernel from autoload file}
 %    \begin{macrocode}
@@ -1339,7 +1339,7 @@
 %
 % \subsection{Curves}
 % The new |\qbezier| command, based on the old |\bezier| defined in
-% |bezier.sty|. 
+% |bezier.sty|.
 % \changes{v0.1c}{1994/04/28}{bezier curves added}
 %
 % \begin{oldcomments}
@@ -1355,16 +1355,16 @@
 %             \@ya := |BY - AY|
 %             \@yb := |CY - BY|
 %             \@ya := Max(\@ya, \@yb)
-%             @sc := Max(\@xa, \@ya) 
-%             %% The coefficient .5 below is the degree of overlap of 
+%             @sc := Max(\@xa, \@ya)
+%             %% The coefficient .5 below is the degree of overlap of
 %             %% successive points, where 1 is no overlap and 0 is
 %             %% complete overlap.  A coefficient of C multiplies
 %             %% the number of points plotted by 1/C.
-%             %% 
-%             \@xa := .5 * \@halfwidth   
+%             %%
+%             \@xa := .5 * \@halfwidth
 %             @sc := @sc / \@halfwidth
 %             @sc := Max(@sc, qbeziermax)
-%          ELSE @sc := N    
+%          ELSE @sc := N
 %      @scp := @sc+1
 %      \@xb := 2 * (BX - AX) * \unitlength
 %      \@xa := ((CX-AX)*\unitlength - \@xb)/@sc
@@ -1392,7 +1392,7 @@
 %  \end{macro}
 %
 %
-% In the code below, to save registers |\@a| \ldots\ are not used. 
+% In the code below, to save registers |\@a| \ldots\ are not used.
 % Instead other registers are reused.
 %
 % |\newcounter{@sc} -> \c@multicnt|\par
@@ -1428,19 +1428,19 @@
   \ifnum #1=\z@
       \@ovxx #4\unitlength
         \advance\@ovxx -#2\unitlength
-        \ifdim \@ovxx<\z@ \@ovxx -\@ovxx \fi  
-      \@ovdx #6\unitlength 
+        \ifdim \@ovxx<\z@ \@ovxx -\@ovxx \fi
+      \@ovdx #6\unitlength
         \advance\@ovdx -#4\unitlength
-        \ifdim \@ovdx<\z@ \@ovdx -\@ovdx \fi  
+        \ifdim \@ovdx<\z@ \@ovdx -\@ovdx \fi
         \ifdim \@ovxx<\@ovdx \@ovxx \@ovdx \fi
-      \@ovyy #5\unitlength 
+      \@ovyy #5\unitlength
         \advance\@ovyy -#3\unitlength
-        \ifdim \@ovyy<\z@ \@ovyy -\@ovyy \fi  
-      \@ovdy #7\unitlength 
+        \ifdim \@ovyy<\z@ \@ovyy -\@ovyy \fi
+      \@ovdy #7\unitlength
         \advance\@ovdy -#5\unitlength
         \ifdim \@ovdy<\z@  \@ovdy -\@ovdy \fi
         \ifdim \@ovyy<\@ovdy \@ovyy  \@ovdy \fi
-      \@multicnt 
+      \@multicnt
          \ifdim \@ovxx>\@ovyy \@ovxx \else \@ovyy \fi
       \@ovxx .5\@halfwidth \divide\@multicnt\@ovxx
       \ifnum \qbeziermax<\@multicnt \@multicnt\qbeziermax\relax \fi
@@ -1455,26 +1455,26 @@
   \@ovyy #7\unitlength \advance\@ovyy -#3\unitlength
       \advance\@ovyy -\@ovdy \divide\@ovyy\@multicnt
 %    \end{macrocode}
-%    
+%
 % \changes{v1.1k}{2003/08/27}{added missing displacement pr/3566}
 %    \begin{macrocode}
   \setbox\@tempboxa\hbox{%
-            \hskip -\@halfwidth 
+            \hskip -\@halfwidth
             \vrule \@height\@halfwidth
                    \@depth \@halfwidth
                    \@width \@wholewidth}%
    \put(#2,#3){%
-     \count@\z@   
+     \count@\z@
      \@whilenum{\count@<\@tempcnta}\do
-        {\@xdim\count@\@ovxx 
-           \advance\@xdim\@ovdx 
-           \divide\@xdim\@multicnt 
-           \multiply\@xdim\count@ 
+        {\@xdim\count@\@ovxx
+           \advance\@xdim\@ovdx
+           \divide\@xdim\@multicnt
+           \multiply\@xdim\count@
          \@ydim\count@\@ovyy
             \advance\@ydim\@ovdy
             \divide\@ydim\@multicnt
-            \multiply\@ydim\count@ 
-         \raise \@ydim 
+            \multiply\@ydim\count@
+         \raise \@ydim
             \hb@xt@\z@{\kern\@xdim
                         \unhcopy\@tempboxa\hss}%
          \advance\count@\@ne}}}
diff --git a/Master/texmf-dist/source/latex/base/ltplain.dtx b/Master/texmf-dist/source/latex/base/ltplain.dtx
index ae5a0c7e6f9..bf34a59966e 100644
--- a/Master/texmf-dist/source/latex/base/ltplain.dtx
+++ b/Master/texmf-dist/source/latex/base/ltplain.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %%% From File: ltplain.dtx
@@ -39,7 +39,7 @@
 \begin{document}
 \title{\filename\\(The file plain.tex, modified for \LaTeX)}
 \author{Donald~E.~Knuth\\
- Modified by 
+ Modified by
  Leslie Lamport, Frank Mittelbach,\\
  Rainer Sch\"opf, David Carlisle}
 \date{\filedate}
@@ -87,10 +87,10 @@
 %    \vglue      \vgl@
 %    \hglue      \hgl@
 % \end{verbatim}
-% 
+%
 % This file is by now very small as most of it has been moved to more
 % appropriate kernel files: it may disappear completely one day.
-% 
+%
 % \LaTeX\ font definitions are done using NFSS2 so none of PLAIN's
 % font definitions are in \LaTeX.
 %
@@ -335,7 +335,7 @@
 %         {Remove some \cs{outer} declarations.}
 % \changes{v1.1h}{1995/04/24}
 %         {Remove remaining \cs{outer} declarations.}
-% Now, we define |\newcount|, |\newbox|, etc. so that you can say 
+% Now, we define |\newcount|, |\newbox|, etc. so that you can say
 % |\newcount\foo| and |\foo| will be defined (with |\countdef|) to
 % be the next counter.
 %
@@ -645,7 +645,7 @@
 % \begin{macro}{\magstep}
 %    \begin{macrocode}
 \def\magstephalf{1095 }
-\def\magstep#1{\ifcase#1 \@m\or 1200\or 1440\or 1728\or 
+\def\magstep#1{\ifcase#1 \@m\or 1200\or 1440\or 1728\or
                2074\or 2488\fi\relax}
 %    \end{macrocode}
 % \end{macro}
@@ -712,7 +712,7 @@
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-% 
+%
 % \begin{macro}{\endgraf}
 % \begin{macro}{\endline}
 %    \begin{macrocode}
@@ -767,7 +767,7 @@
 % \end{macro}
 %
 %  \begin{macro}{\loop}
-% \changes{v1.0h}{1994/05/16}{Use Kabelschacht method} 
+% \changes{v1.0h}{1994/05/16}{Use Kabelschacht method}
 %  \begin{macro}{\iterate}
 % \changes{v1.1b}{1994/11/10}
 %         {(CAR) added extra \cs{relax}}
@@ -790,7 +790,7 @@
 %    This setting of |\repeat| is needed to make |\loop...\if...\repeat|
 %    skippable within another |\if...|.
 %    \begin{macrocode}
-\let\repeat=\fi 
+\let\repeat=\fi
 %    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
@@ -882,15 +882,15 @@
 %  \end{macro}
 %
 % \begin{macro}{\m@th}
-% \changes{v1.0h}{1994/05/16}{Remove unnecssary space} 
+% \changes{v1.0h}{1994/05/16}{Remove unnecssary space}
 %    \begin{macrocode}
 \def\m@th{\mathsurround\z@}
 %    \end{macrocode}
 %  \end{macro}
 %
 % \begin{macro}{\underbar}
-%    Due to \LaTeX's redefinition of |\underline| plain \TeX's 
-%    |\underbar| can be done in a simpler fashion (but do we 
+%    Due to \LaTeX's redefinition of |\underline| plain \TeX's
+%    |\underbar| can be done in a simpler fashion (but do we
 %    need it at all?).
 % \changes{v1.1m}{1994/05/26}
 %         {(CAR/FMi) changed to use box \cs{tw@}}
@@ -920,8 +920,8 @@
 %
 % \changes{v1.0h}{1994/05/16}{Remove unnecessary def for \cs{item}}
 % \changes{v1.1i}{1995/04/27}
-%   {Move \cs{hang} and \cs{textindent} to latex209.def} 
-% \changes{RmS}{1991/11/04}{Removed \cs{itemitem} since never 
+%   {Move \cs{hang} and \cs{textindent} to latex209.def}
+% \changes{RmS}{1991/11/04}{Removed \cs{itemitem} since never
 %    needed/useful with \LaTeX.}
 %
 % \begin{macro}{\narrower}
@@ -932,8 +932,8 @@
 %    \end{macrocode}
 %  \end{macro}
 %
-% \changes{v1.1c}{1994/11/12}{Comment out more encoding specific 
-%                             commands} 
+% \changes{v1.1c}{1994/11/12}{Comment out more encoding specific
+%                             commands}
 % \LaTeX\ defines |\ae| and similar commands elsewhere.
 %
 %    \begin{macrocode}
@@ -944,7 +944,7 @@
 %
 % Most text commands are actually encoding specific and therefore
 % defined later, so commented out or removed from this file.
-% \changes{v1.0h}{1994/05/16}{Comment out encoding specific commands} 
+% \changes{v1.0h}{1994/05/16}{Comment out encoding specific commands}
 %
 % \begin{macro}{\leavevmode}
 % begins a paragraph, if necessary
@@ -1003,7 +1003,7 @@
 % This is the \LaTeX{} version of the second incarnation of the plain
 % macro |\sh@ft|, which takes a dimension as its argument.  It shifts
 % a pseudo-accent horizontally by an amount proportional to the product
-% of its argument and the slant-per-point (fontdimen 1).  
+% of its argument and the slant-per-point (fontdimen 1).
 %
 %    \begin{macrocode}
 \def\ltx@sh@ft #1{%
@@ -1015,7 +1015,7 @@
 %  \end{macro}
 %
 %
-%  
+%
 % \LaTeX{} change: the text commands such as
 % |\d|, |\b|, |\c|, |\copyright|,~|\TeX|
 % are now defined elsewhere.
@@ -1024,7 +1024,7 @@
 %     {1993/11/29}{All accents in decimals; suggested by Paul Taylor}
 % \changes{v1.0d}{1994/04/12}
 %         {Define \cs{@acci}}
-% \changes{v1.0h}{1994/05/16}{Remove \cs{@acci} and friends again} 
+% \changes{v1.0h}{1994/05/16}{Remove \cs{@acci} and friends again}
 %
 % \LaTeX{} change: Make |\t| work in a moving argument.
 % Now defined elsewhere.
@@ -1044,8 +1044,8 @@
 % The box in |\dotfill| originally contained (in plain.tex):
 % |\mkern 1.5mu .\mkern 1.5mu|; the width of .44em differs from this
 % by .04pt which is probably an acceptable difference within leaders.
-% \changes{v1.1u}{1996/10/28}{Removed math mode} 
-% \changes{v1.1v}{1996/10/29}{Got arithmetic correct (CAR)} 
+% \changes{v1.1u}{1996/10/28}{Removed math mode}
+% \changes{v1.1v}{1996/10/29}{Got arithmetic correct (CAR)}
 % \changes{v1.1w}{1996/11/03}{Saved tokens by using \cs{hb@xt@}}
 %    \begin{macrocode}
 \def\dotfill{%
@@ -1061,7 +1061,7 @@
 %    \begin{macrocode}
 \sfcode`\)=0 \sfcode`\'=0 \sfcode`\]=0
 %    \end{macrocode}
-% The |\nonfrenchspacing| macro will make further changes to 
+% The |\nonfrenchspacing| macro will make further changes to
 % |\sfcode| values.
 %
 %
@@ -1108,7 +1108,7 @@
 %
 %
 % \begin{macro}{\tracingall}
-% \changes{LaTeX209}{1991/08/26}{Added 
+% \changes{LaTeX209}{1991/08/26}{Added
 %    \cs{errorcontextlines}!=\cs{maxdimen}, suggested by J. Schrod}
 % \changes{v1.1n}{1995/07/02}{Use \cs{showoutput} to save space}
 % \changes{v1.1x}{2002/02/24}{Use newly added \cs{loggingoutput}}
@@ -1132,7 +1132,7 @@
 % Punctuation affects the spacing.
 %    \begin{macrocode}
 %<*2ekernel|autoload>
-\nonfrenchspacing 
+\nonfrenchspacing
 %</2ekernel|autoload>
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/base/ltsect.dtx b/Master/texmf-dist/source/latex/base/ltsect.dtx
index 2da55c90f5c..bd84b1efd15 100644
--- a/Master/texmf-dist/source/latex/base/ltsect.dtx
+++ b/Master/texmf-dist/source/latex/base/ltsect.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -44,7 +44,7 @@
   Leslie Lamport\and
   Frank Mittelbach\and
   Chris Rowley\and
-  Tobias Oetiker\thanks{Tobi updated 
+  Tobias Oetiker\thanks{Tobi updated
               the comments to `doc' conventions}\and
   Rainer Sch\"opf}
 
@@ -83,7 +83,7 @@
 % \changes{v1.0g}{1994/10/18}{Added \cs{normalcolor}}
 % \changes{v1.0i}{1994/11/17}
 %         {\cs{@tempa} to \cs{reserved@a}}
-% \changes{v1.0m}{1995/05/03}{TO: Promoted documentation to doc.sty 
+% \changes{v1.0m}{1995/05/03}{TO: Promoted documentation to doc.sty
 %         standard}
 %
 %    \begin{macrocode}
@@ -92,10 +92,10 @@
 %    \end{macrocode}
 %
 % \subsection{The Title}
-% 
+%
 % \DescribeMacro{\title}
 % The user defines the title and  author by the declarations
-% |\title|\marg{name}, 
+% |\title|\marg{name},
 % \DescribeMacro{\author}
 % |\author|\marg{name}
 %
@@ -152,7 +152,7 @@
 %  \end{macro}
 %
 % \changes{1.0h}{1994/11/04}{(ASAJ) Added \cs{protected@xdef} to
-%    \cs{thanks}.} 
+%    \cs{thanks}.}
 % \begin{macro}{\thanks}
 %    \begin{macrocode}
 \def\thanks#1{\footnotemark
@@ -181,7 +181,7 @@
 %    \end{macrocode}
 % \subsection{Sectioning}
 %
-% 
+%
 % \begin{macro}{\@secpenalty}
 %    \begin{macrocode}
 \newcount\@secpenalty
@@ -231,7 +231,7 @@
 % \end{description}
 %
 %  If `|*|' is  missing, then increment the counter.  If it is
-%  present, then there should be no |[|\meta{altheading}|]| argument. 
+%  present, then there should be no |[|\meta{altheading}|]| argument.
 %  The command uses the counter 'secnumdepth'. It contains a pointer
 %  to the highest section level that is to be numbered.
 %
@@ -249,9 +249,9 @@
 % \begin{oldcomments}
 % \@startsection {NAME}{LEVEL}{INDENT}{BEFORESKIP}{AFTERSKIP}{STYLE} ==
 %    BEGIN
-%     IF  @noskipsec = T  THEN  \leavevmode  FI  
+%     IF  @noskipsec = T  THEN  \leavevmode  FI
 %                              % true if previous section had no body.
-%                                                
+%
 %     \par
 %     \@tempskipa  := BEFORESKIP
 %     @afterindent := T
@@ -285,7 +285,7 @@
     \everypar{}%
   \else
     \addpenalty\@secpenalty\addvspace\@tempskipa
-  \fi 
+  \fi
   \@ifstar
     {\@ssect{#3}{#4}{#5}{#6}}%
     {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
@@ -320,7 +320,7 @@
 %                               \NAMEmark{ARG1}
 %                               \addcontentsline{toc}{NAME}
 %                                  { IF  LEVEL > \c@secnumdepth
-%                                      ELSE 
+%                                      ELSE
 %                                        \protect\numberline{\theNAME}
 %                                      FI
 %                                    ARG1 }
@@ -400,7 +400,7 @@
 %
 % \begin{macro}{\@xsect}%
 % Pseudocode for the |\@xsect| command
-% \begin{oldcomments} 
+% \begin{oldcomments}
 % \@xsect{AFTERSKIP} ==
 %  BEGIN
 %    IF AFTERSKIP > 0
@@ -417,7 +417,7 @@
 %                               \@svsechd
 %                             \endgroup
 %                             \unskip
-%                             \hskip -AFTERSKIP \relax 
+%                             \hskip -AFTERSKIP \relax
 %                                           %% relax added 14 Jan 91
 %                        ELSE \clubpenalty :=G \@clubpenalty
 %                             \everypar := NULL
@@ -429,7 +429,7 @@
 % \end{oldcomments}
 %
 % \changes{0.0}{1992/08/19}
-%     {(RmS) corrected bug: stretch and shrink in argument to 
+%     {(RmS) corrected bug: stretch and shrink in argument to
 %               \cs{hskip} previously not negated}
 %    \begin{macrocode}
 \def\@xsect#1{%
@@ -439,7 +439,7 @@
 %    Why not combine |\@sect| and |\@xsect| and save doing the
 %    same test twice? It is not possible to change this now as these
 %    have become hooks!
-%    
+%
 %    This |\par| seems unnecessary.
 %    \begin{macrocode}
     \par \nobreak
@@ -455,11 +455,11 @@
     \@nobreakfalse
     \global\@noskipsectrue
     \everypar{%
-      \if@noskipsec 
+      \if@noskipsec
         \global\@noskipsecfalse
        {\setbox\z@\lastbox}%
-        \clubpenalty\@M 
-        \begingroup \@svsechd \endgroup 
+        \clubpenalty\@M
+        \begingroup \@svsechd \endgroup
         \unskip
         \@tempskipa #1\relax
         \hskip -\@tempskipa
@@ -516,7 +516,7 @@
 %                 END
 %  END
 % \end{oldcomments}
-% 
+%
 %
 % \begin{macro}{\@ssect}
 %    \begin{macrocode}
@@ -550,7 +550,7 @@
   \@xsect{#3}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\if@afterindent}
 % \begin{macro}{\@afterindenttrue}
 %    \begin{macrocode}
@@ -561,9 +561,9 @@
 % \begin{macro}{\@afterheading}
 % \changes{v1.0v}{1996/08/02}{Removed \cs{global}
 %                             before \cs{@nobreak...}}
-% 
+%
 % This hook is used in setting up custom-built headings in classes.dtx.
-% 
+%
 %    \begin{macrocode}
 \def\@afterheading{%
   \@nobreaktrue
@@ -571,7 +571,7 @@
     \if@nobreak
       \@nobreakfalse
       \clubpenalty \@M
-      \if@afterindent \else 
+      \if@afterindent \else
         {\setbox\z@\lastbox}%
       \fi
     \else
@@ -580,7 +580,7 @@
     \fi}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 %
 % \begin{macro}{\@hangfrom}
 %
@@ -596,7 +596,7 @@
 % \end{macro}
 %
 % \begin{macro}{\c@secnumdepth}
-% \begin{macro}{\c@tocdepth} 
+% \begin{macro}{\c@tocdepth}
 %    \begin{macrocode}
 \newcount\c@secnumdepth
 \newcount\c@tocdepth
@@ -605,16 +605,16 @@
 %
 % \begin{macro}{\secdef}
 %
-% |\secdef{|\meta{unstarcmds}|}{|\meta{unstarcmds}|}{|% 
-%           \meta{starcmds}|}|\\ 
+% |\secdef{|\meta{unstarcmds}|}{|\meta{unstarcmds}|}{|%
+%           \meta{starcmds}|}|\\
 % When defining a |\chapter| or |\section| command without using
 % |\@startsection|, you can use |\secdef| as follows:
 % \begin{enumerate}
-% \item |\def\chapter{| \ldots  |\secdef| 
+% \item |\def\chapter{| \ldots  |\secdef|
 %                |\|\meta{starcmd} |\|\meta{unstarcmd} |}|
-% \item |\def\|\meta{starcmd}|[#1]#2{| \ldots |}| 
+% \item |\def\|\meta{starcmd}|[#1]#2{| \ldots |}|
 %            |%| Command to define |\chapter[|\ldots|]{|\ldots|}|
-% \item |\def\|\meta{unstarcmd}|#1{| \ldots |}|     
+% \item |\def\|\meta{unstarcmd}|#1{| \ldots |}|
 %   |%| Command to define |\chapter*{|\ldots|}|
 % \end{enumerate}
 %
@@ -650,12 +650,12 @@
 % \subsection{Table of Contents etc.}
 %
 % \subsubsection{Convention}
-% |\tf@|\meta{foo} = file number for output for table foo.  
+% |\tf@|\meta{foo} = file number for output for table foo.
 %       The file is opened only if |@filesw| = |true|.
 %
 % \subsubsection{Commands}
 %
-%  
+%
 %  A |\l@|\meta{type}|{|\meta{entry}|}{|\meta{page}|}| Macro needs to
 %  defined by document style for making an entry of type \meta{type}
 %  in a table of contents, etc.  E.g., the document style
@@ -675,14 +675,14 @@
 %  command.
 %
 % \begin{macro}{\@starttoc}
-% The |\@starttoc|\marg{ext} command is used to define the commands:\\ 
+% The |\@starttoc|\marg{ext} command is used to define the commands:\\
 % |\tableofcontents|, |\listoffigures|, etc.
 %
-% For example: 
+% For example:
 % |\@starttoc{lof}| is used in |\listoffigures|.  This command
 % reads the |.|\meta{ext} file and sets up to write the new
 % |.|\meta{ext} file.
-% 
+%
 % \begin{oldcomments}
 % \@starttoc{EXT} ==
 %   BEGIN
@@ -707,7 +707,7 @@
   \begingroup
     \makeatletter
     \@input{\jobname.#1}%
-    \if@filesw 
+    \if@filesw
       \expandafter\newwrite\csname tf@#1\endcsname
       \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax
     \fi
@@ -718,7 +718,7 @@
 %
 %  \begin{macro}{\addcontentsline}
 %  The |\addcontentsline{|\meta{table}|}{|\meta{type}|}{|%
-%  \meta{entry}|}| command allows the user to  add 
+%  \meta{entry}|}| command allows the user to  add
 %  his/her own entry to a table of contents, etc. The command adds the
 %  entry |\contentsline{|\meta{type}|}{|\meta{entry}|}{|\meta{page}|}|
 %  to the |.|\meta{table} file.
@@ -741,7 +741,7 @@
 % \changes{v1.0h}{1994/11/04}{Added \cs{protected@write} to
 %    \cs{addtocontents}.  ASAJ.}
 % \begin{macro}{\addtocontents}
-% 
+%
 %   The |\addtocontents{|\meta{table}|}{|\meta{text}|}| command
 %   adds \meta{text} to the |.|\meta{table} file, with no
 %   page number.
@@ -779,14 +779,14 @@
 %   Macro to produce a table of contents line with the following
 %   parameters:
 %   \begin{description}
-%   \item[level] If \meta{level} $>$ |\c@tocdepth|, then no line 
+%   \item[level] If \meta{level} $>$ |\c@tocdepth|, then no line
 %                produced.
 %   \item[indent] Total indentation from the left margin.
 %   \item[numwidth] Width of box for number if the \meta{title} has a
 %                |\numberline| command.
 %                As of 25 Jan 1988, this is also the amount of extra
 %                indentation added to second and later lines of a
-%                multiple line entry. 
+%                multiple line entry.
 %   \item[title] Contents of entry.
 %   \item[page] Page number.
 %  \end{description}
@@ -800,7 +800,7 @@
 %  \item[|\@dotsep|] Separation between dots, in mu units.
 %                  Should be |\def|'d to a number like 2 or 1.7
 %  \end{description}
-% 
+%
 % \begin{macro}{\@dottedtocline}
 % \changes{LaTeX2.09}{1991/09/29}
 %         {(RmS) added \cs{reset@font} for page number}
@@ -823,7 +823,7 @@
 %    \begin{macrocode}
      \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
      {#4}\nobreak
-     \leaders\hbox{$\m@th 
+     \leaders\hbox{$\m@th
 %    \end{macrocode}
 %    If a document uses fonts other than computer modern, the use of a
 %    dot from math can be very disturbing despite the fact that this
@@ -843,8 +843,8 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \textbf{Note:} |\nobreak|'s added 7 Jan 86 to prevent bad line break 
-% that left the page number dangling by itself at left edge of a new 
+% \textbf{Note:} |\nobreak|'s added 7 Jan 86 to prevent bad line break
+% that left the page number dangling by itself at left edge of a new
 % line.
 %
 % Changed 25 Jan 88 to use |\leftskip| instead of |\hangindent| so
diff --git a/Master/texmf-dist/source/latex/base/ltspace.dtx b/Master/texmf-dist/source/latex/base/ltspace.dtx
index 5f867a72a3b..4ad37e1c377 100644
--- a/Master/texmf-dist/source/latex/base/ltspace.dtx
+++ b/Master/texmf-dist/source/latex/base/ltspace.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -69,7 +69,7 @@
 % This section deals with spacing, and line- and page-breaking.
 %
 % \subsection{User Commands}
-% 
+%
 % \DescribeMacro\nopagebreak\oarg{i} : \meta{i} = 0,...,4.
 %
 % Default argument = 4.  Puts a penalty into the vertical list
@@ -80,15 +80,15 @@
 %                   3 : penalty = |\@highpenalty|\\
 %                   4 : penalty = 10000
 %
-% \DescribeMacro\pagebreak\oarg{i} : 
+% \DescribeMacro\pagebreak\oarg{i} :
 %          same as \nopagebreak except negatives of its penalty
 %
 % \DescribeMacro\linebreak\oarg{i} : analog of the above
 %
 % \DescribeMacro\nolinebreak\oarg{i} : analog of the above
 %
-% \DescribeMacro\samepage : 
-% inhibits page breaking most places by setting the 
+% \DescribeMacro\samepage :
+% inhibits page breaking most places by setting the
 % following penalties to 10000:\\
 %                    |\interlinepenalty|\\
 %                    |\postdisplaypenalty|\\
@@ -101,7 +101,7 @@
 %
 % \DescribeMacro{\\}         : initially defined to be |\newline|
 %
-% |\\|\oarg{length} : initially defined to be 
+% |\\|\oarg{length} : initially defined to be
 %              |\vspace|\marg{length}|\newline|\\
 %              Note: |\\*| adds a |\vadjust{\penalty 10000}|
 %
@@ -124,9 +124,9 @@
 % mechanisms:
 % \begin{itemize}
 % \item |\unskip| is used to remove the glue just added by
-% a space that has already had its effect; it is sometimes 
-% invoked after an |\ifdim| test on |\lastskip| (see below); 
-% \item |\ignorespaces| is used to ignore space-tokens yet to come. 
+% a space that has already had its effect; it is sometimes
+% invoked after an |\ifdim| test on |\lastskip| (see below);
+% \item |\ignorespaces| is used to ignore space-tokens yet to come.
 % \end{itemize}
 %
 % The test done on |\lastskip| is sometimes for equality with zero and
@@ -139,7 +139,7 @@
 % internally does an |\unskip|) and one bit of code (in |\@item|) even
 % has two |\unskips| before a |\par|.  These uses may be fossil code
 % but if they are necessary, maybe |\@killglue| would be even safer.
-% 
+%
 % Such removal of glue by |\unskip| may sometimes have the wrong result,
 % removing not the glue from a space-token but other explicit glue;
 % this is sometimes not what is intended.
@@ -168,14 +168,14 @@
 %
 % Also, the current rules do not work well when more than one such
 % command appears consecutively, separated by space-tokens; it leaves
-% glue between every other invisible. 
+% glue between every other invisible.
 %
 % There is also a question about what these commands should do when
 % they occur next to spaces that do not come from space tokens but,
 % for example, from |\hspace|.  Should they still produce `just one
 % space'?  If so, which one?  It is good to note that the manual
 % is sufficiently cautious about invisibles that we are not obliged to
-% make anything work. 
+% make anything work.
 %
 % Another interesting side-road to explore is whether the space-tokens
 % either side of an |\hspace{...}| should be ignored.
@@ -204,11 +204,11 @@
 % paragraphs, which is probably not what the author intended (since
 % there is no empty line after it).
 % \begin{verbatim}
-% 
+%
 %   \index{beginnings}
 %   Beginnings of paragraphs ...
 % \end{verbatim}
-% 
+%
 % I know of no algorithm that will handle satisfactorily even
 % all the most common cases; note that it could be that the best
 % algorithm may be different for different invisibles since,
@@ -224,7 +224,7 @@
 % to zero; examples of such glue are |\hskip 1sp| and, possibly better
 % but more complex, |\hskip -1sp \hskip 1sp|.  However, this only works
 % when it is known that user-supplied text is about to start.
-% 
+%
 % Some similar concerns apply to the handling of space and penalties
 % in vertical mode; there is an extra hurdle here as |\unskip| does
 % not work on the main vertical list.  The complexity of the tests done
@@ -265,11 +265,11 @@
 % \item Remove unnecessary |\unskips|.
 % \item Investigate and rationalise the `newline' code.
 % \item Find better algorithms for all sorts of things or, easier(?),
-%   fix \TeX{} itself. 
+%   fix \TeX{} itself.
 % \end{itemize}
-% 
+%
 % \subsection{The code}
-% 
+%
 %    \begin{macrocode}
 %<*2ekernel>
 \message{spacing,}
@@ -288,7 +288,7 @@
 %
 %
 %  \begin{macro}{\@no@pgbk}
-% \changes{v1.2h}{1995/07/05}{Macro replaces \cs{@pgbk} 
+% \changes{v1.2h}{1995/07/05}{Macro replaces \cs{@pgbk}
 %                 and \cs{@nopgbk}}
 %    \begin{macrocode}
 \def\@no@pgbk #1[#2]{%
@@ -313,7 +313,7 @@
 %  \end{macro}
 %  \end{macro}
 %  \begin{macro}{\@no@lnbk}
-% \changes{v1.2u}{1996/10/29}{Macro replaces \cs{@lnbk} 
+% \changes{v1.2u}{1996/10/29}{Macro replaces \cs{@lnbk}
 %                 and \cs{@nolnbk}}
 %    \begin{macrocode}
 \def\@no@lnbk #1[#2]{%
@@ -411,13 +411,13 @@
 \def\@gnewline #1{%
   \ifvmode
     \@nolnerr
-  \else 
+  \else
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break
   \fi}
 %    \end{macrocode}
 %  \end{macro}
 %
-%  
+%
 % \begin{macro}{\@getpen}
 %    \begin{macrocode}
 \def\@getpen#1{\ifcase #1 \z@ \or \@lowpenalty\or
@@ -516,21 +516,21 @@
 %    destroy them.
 %\begin{verbatim}
 %\def \@esphack{%
-%   \relax \ifvmode 
-%     \nobreak    
-%     \ifdim \@savsk=\z@ 
-%     \else 
+%   \relax \ifvmode
+%     \nobreak
+%     \ifdim \@savsk=\z@
+%     \else
 %       \vskip\@savsk
 %     \fi
-%   \else 
+%   \else
 %     \ifhmode
 %       \spacefactor \@savsf
-%       \ifdim \@savsk>\z@ 
+%       \ifdim \@savsk>\z@
 %         \ignorespaces
-%       \fi 
+%       \fi
 %     \fi
 %   \fi
-%} 
+%}
 %\end{verbatim}
 %    For the moment we are going to ignore the vertical versions until
 %    they are correct.
@@ -585,13 +585,13 @@
 %    not live in vmode (this is how some people feel about marginals).
 %
 %    If it occurs in vmode then it enters hmode and ensures that
-%    |\@savsk| is nonzero so that the |\ignorespaces| is put in later.  
+%    |\@savsk| is nonzero so that the |\ignorespaces| is put in later.
 %    It is not used at present.
 % \changes{v1.2f}{1995/05/25}{(CAR) not used so `removed'.}
 %\begin{verbatim}
 % \def \@vbsphack{ %
 %    \relax \ifvmode
-%      \leavevmode    
+%      \leavevmode
 %      \@savsk 1sp
 %      \@savsf \spacefactor
 %    \else
@@ -608,8 +608,8 @@
 % \subsection{Vertical spacing}
 %
 %
-% \LaTeX\ supports the plain \TeX\ commands 
-% |\smallskip|, |\medskip| and |\bigskip|. 
+% \LaTeX\ supports the plain \TeX\ commands
+% |\smallskip|, |\medskip| and |\bigskip|.
 % However, it redefines them using |\vspace| instead of |\vskip|.
 %
 % Extra vertical space is added by the command
@@ -675,7 +675,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% 
+%
 %  \begin{macro}{\addvspace}
 % \changes{v1.2b}{1994/11/12}{Corrected error message}
 % \changes{v1.2c}{1994/11/13}{Recorrected error message}
@@ -730,16 +730,16 @@
 % \begin{macro}{\@vspacer}
 % \changes{v1.2f}{1995/05/25}
 %         {(CAR) macros modified to be more efficient}
-% \changes{v1.2f}{1995/05/25}{(CAR) \cs{@restorepar} added to avoid 
+% \changes{v1.2f}{1995/05/25}{(CAR) \cs{@restorepar} added to avoid
 %   possible infinite tail recursion caused by a typo in the argument.}
 %    The new code for these commands depends on the following facts:
 %    \begin{itemize}
-%      \item The value of prevdepth is changed only when a box or rule 
+%      \item The value of prevdepth is changed only when a box or rule
 %        is created and added to a vertical list;
-%      \item The value of prevdepth is used only when a box is created 
+%      \item The value of prevdepth is used only when a box is created
 %        and added to a vertical list;
-%      \item The value of prevdepth is always local to the building of 
-%        one vertical list. 
+%      \item The value of prevdepth is always local to the building of
+%        one vertical list.
 %    \end{itemize}
 %    \begin{macrocode}
 \DeclareRobustCommand\vspace{\@ifstar\@vspacer\@vspace}
@@ -791,7 +791,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-%    
+%
 % \begin{macro}{\smallskipamount}
 % \begin{macro}{\medskipamount}
 % \begin{macro}{\bigskipamount}
@@ -814,7 +814,7 @@
 %    This idea is borrowed from the \textsf{amsmath} package but
 %    here we define a robust command.
 %
-%    This command is a low-level command designed for use only before 
+%    This command is a low-level command designed for use only before
 %    hyphens or dashes (such as |-|, |--|, or |---|).
 %
 %    It could probably be better implemented: it may need its own
@@ -851,7 +851,7 @@
 % \begin{macro}{\@xobeysp}
 % \changes{v1.2t}{1996/09/28}{Moved from ltmiscen.dtx and redefined to
 %                 use \cs{nobreakspace }}
-% 
+%
 %   This is a robust command that produces a horizontal space at
 %   which, in paragraph-mode, a line-break is not possible.  We then
 %   define an active |~| to expand to it since this is the documented
@@ -865,7 +865,7 @@
 %
 %   We need to keep \cs{@xobeysp} as it is widely used; so here it is
 %   let to the non-robust command \cs{nobreakspace }.
-%   
+%
 %    \begin{macrocode}
 \DeclareRobustCommand{\nobreakspace}{%
    \leavevmode\nobreak\ }
@@ -934,7 +934,7 @@
 %
 % \begin{macro}{\fill}
 %    \begin{macrocode}
-\newskip\fill 
+\newskip\fill
 \fill = 0pt plus 1fill
 %    \end{macrocode}
 % \end{macro}
@@ -973,7 +973,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% 
+%
 % \begin{macro}{\obeycr}
 % \begin{macro}{\restorecr}
 % The following definitions will probably get deleted or moved to
@@ -986,7 +986,7 @@
     \@gobblecr}%
 {\catcode`\^^M=13 \gdef\@gobblecr{\@ifnextchar
 \@gobble\ignorespaces}}
-\gdef\restorecr{\catcode`\^^M5 }} 
+\gdef\restorecr{\catcode`\^^M5 }}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/base/lttab.dtx b/Master/texmf-dist/source/latex/base/lttab.dtx
index 0e2b5c240a6..9bbbb68a095 100644
--- a/Master/texmf-dist/source/latex/base/lttab.dtx
+++ b/Master/texmf-dist/source/latex/base/lttab.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -87,7 +87,7 @@
 % \changes{v1.0f}{1994/05/21}{Use new error commands}
 % \changes{v1.0j}{1994/11/17}
 %         {\cs{@tempa} to \cs{reserved@a}}
-% 
+%
 % \subsection{tabbing}
 %
 % \begin{oldcomments}
@@ -115,7 +115,7 @@
 %                       be right-justified at the right margin.
 %
 %  \tabbingsep          = distance left by the \' command between the
-%                       current position and the field that is 
+%                       current position and the field that is
 %                       ``left-shifted''.
 %
 %  UTILITY MACROS
@@ -192,7 +192,7 @@
 %   \` == \@tabrj
 %   \' == \@tablab
 %   \\ == BEGIN \@stopline \@startline END
-%   \\[DIST] == BEGIN 
+%   \\[DIST] == BEGIN
 %                \@stopline \vskip DIST \@startline\ignorespaces END
 %   \\* == BEGIN \@stopline \penalty 10000 \@startline END
 %   \\*[DIST] == BEGIN \@stopline \penalty 10000 \vskip DIST
@@ -205,7 +205,7 @@
 %   if @minipage = F then \vskip \parskip fi
 %   \box\@tabfbox = \rlap{\indent\the\everypar}
 %                          % note: \the\everypar sets @inlabel :=G F
-%   \@itemfudge == BEGIN \box\@tabfbox END  
+%   \@itemfudge == BEGIN \box\@tabfbox END
 %   \@startline
 %   \ignorespaces
 %  END
@@ -330,12 +330,12 @@
 % \changes{v1.0c}{1994/05/07}{Changed \cs{@maxtab} to \cs{chardef}}
 %    \begin{macrocode}
 %<*2ekernel|autoload>
-\newdimen\@gtempa 
+\newdimen\@gtempa
 \chardef\@firsttab=\the\allocationnumber
 \newdimen\@gtempa\newdimen\@gtempa\newdimen\@gtempa\newdimen\@gtempa
 \newdimen\@gtempa\newdimen\@gtempa\newdimen\@gtempa\newdimen\@gtempa
 \newdimen\@gtempa\newdimen\@gtempa\newdimen\@gtempa\newdimen\@gtempa
-\newdimen\@gtempa 
+\newdimen\@gtempa
 \chardef\@maxtab=\the\allocationnumber
 \dimen\@firsttab=0pt
 %    \end{macrocode}
@@ -359,7 +359,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@curline}
 % \begin{macro}{\@curfield}
 % \begin{macro}{\@tabfbox}
@@ -386,7 +386,7 @@
 % \begin{macro}{\@startline}
 % \changes{v1.1f}{1995/10/23}{(CAR)Ensure that \cs{@nxttabmar} is never
 % larger than \cs{@hightab}}
-%    It is, in some sense, an error if the current margin 
+%    It is, in some sense, an error if the current margin
 %    tab setting is higher than the value of |\@hightab| (which is
 %    a local variable).  That this is allowed is a fundamental design
 %    flaw which is not going to be corrected now.
@@ -640,7 +640,7 @@
   \@contfield}
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 %    \begin{macrocode}
 %</2ekernel|def>
 %    \end{macrocode}
@@ -667,7 +667,7 @@
 % \begin{oldcomments}
 %
 % ARRAY PARMETERS:
-%  \arraycolsep    
+%  \arraycolsep
 %       : half the width separating columns in an array environment
 %  \tabcolsep
 %       : half the width separating columns in a tabular environment
@@ -916,14 +916,14 @@
     \set@typeset@protect
     \lineskip\z@skip\baselineskip\z@skip
 %    \end{macrocode}
-%    If the parsing of the preamble goes wrong there my be some 
+%    If the parsing of the preamble goes wrong there my be some
 %    characters left which \TeX{} then tries to typeset, i.e., we
 %    would be in horizontal mode. That would produce an endless loop
 %    because the |\halign| expects vertical mode thus issues a |\par|
 %    but that is a no-op at this point. So we better test this case
 %    issue some error message and make a crude recovery by ending that
 %    horizontal mode with force.
-%    A better fix would be to ensure that we never pick up more than a 
+%    A better fix would be to ensure that we never pick up more than a
 %    single character token (not done).
 % \changes{v1.1m}{1998/11/13}{Check for hmode to see if something
 %     went wrong during parsing (pr/2884)}
@@ -1032,11 +1032,11 @@
 %            |\tabcolsep| glue inserted by |\multicolumn|.
 %
 %
-% \changes{v1.0h}{1994/11/04}{(ASAJ) added \cs{set@typeset@protect}.} 
+% \changes{v1.0h}{1994/11/04}{(ASAJ) added \cs{set@typeset@protect}.}
 % \changes{v1.1i}{1996/10/21}{Make \cs{multicolumn} long (latex/2180)}
 % This has been made long so that, for example, a |p|-column can
 % contain multiple paragraphs; maybe the arguments of |@|-expressions
-% should also be able to contain multiple paragraphs.  
+% should also be able to contain multiple paragraphs.
 %    \begin{macrocode}
 \long\def\multicolumn#1#2#3{\multispan{#1}\begingroup
   \@mkpream{#2}%
@@ -1166,19 +1166,19 @@
 %                end case
 %  END
 %
-% \@arrayclassiv  ==  
+% \@arrayclassiv  ==
 %      BEGIN  \@preamble := \@preamble * $ \@nextchar$  END
 %
 % \@tabclassiv   == same as \@arrayclassv except without the $ ... $
 %
 % \@classv ==
 %   BEGIN
-%    \@preamble := 
+%    \@preamble :=
 %        \@preamble * \@startpbox{\@nextchar}\ignorespaces\@sharp
 %                               \@endpbox
 %   END
 %
-% \@expast{S}: 
+% \@expast{S}:
 %  Sets \reserved@a := S with all instances of *{N}{STRING}
 %  replaced by N copies of STRING, where N > 0.  An *
 %  appearing inside braces is ignored, but *-expressions
@@ -1522,7 +1522,7 @@
   \advance\@multispan\m@ne
   \ifnum\@multicnt=\@ne\@firstofone{&\omit}\fi
   \@multicnt#2%
-  \advance\@multicnt-#1% 
+  \advance\@multicnt-#1%
   \advance\@multispan\@ne
 %    \end{macrocode}
 % The original had |\unskip| at this point,
diff --git a/Master/texmf-dist/source/latex/base/ltthm.dtx b/Master/texmf-dist/source/latex/base/ltthm.dtx
index 1523b4fddf6..f88634c03ee 100644
--- a/Master/texmf-dist/source/latex/base/ltthm.dtx
+++ b/Master/texmf-dist/source/latex/base/ltthm.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -73,7 +73,7 @@
 %
 %  If \meta{counter} is given, then environment \meta{name} is numbered
 %  within \meta{counter}.
-% 
+%
 %  E.g., if \meta{counter} = |subsection|, then the first \meta{name} in
 %  subsection 7.2 is numbered \meta{text} 7.2.1.
 %
@@ -109,7 +109,7 @@
 %         environment for a 'theorem' named 'NAME NUMBER' --
 %         e.g., \@begintheorem{Lemma}{3.7} starts Lemma 3.7.
 %
-%  \@opargbegintheorem{NAME}{NUMBER}{OPARG} : 
+%  \@opargbegintheorem{NAME}{NUMBER}{OPARG} :
 %         A command that begins a theorem
 %         environment for a 'theorem' named 'NAME NUMBER' with optional
 %         argument OPARG -- e.g., \@begintheorem{Lemma}{3.7}{Jones}
@@ -200,7 +200,7 @@
   \expandafter\@ifdefinable\csname #1\endcsname
     {\@definecounter{#1}\@newctr{#1}[#3]%
      \expandafter\xdef\csname the#1\endcsname{%
-       \expandafter\noexpand\csname the#3\endcsname \@thmcountersep 
+       \expandafter\noexpand\csname the#3\endcsname \@thmcountersep
           \@thmcounter{#1}}%
      \global\@namedef{#1}{\@thm{#1}{#2}}%
      \global\@namedef{end#1}{\@endtheorem}}}
@@ -274,7 +274,7 @@
 %    Providing theorem defaults.
 %  \task{???}{add `reset@font?}
 %    \begin{macrocode}
-\def\@begintheorem#1#2{\trivlist 
+\def\@begintheorem#1#2{\trivlist
    \item[\hskip \labelsep{\bfseries #1\ #2}]\itshape}
 \def\@opargbegintheorem#1#2#3{\trivlist
       \item[\hskip \labelsep{\bfseries #1\ #2\ (#3)}]\itshape}
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index 421063536d5..2ee57caced8 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -1,30 +1,30 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2011
+% Copyright 1993-2014
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltvers.dtx}
-             [2011/06/27 v1.0m LaTeX Kernel (Version Info)]
+             [2014/04/24 v1.0n LaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltvers.dtx}
@@ -84,11 +84,11 @@
 %    \begin{macrocode}
 %<*2ekernel>
 \def\fmtname{LaTeX2e}
-\edef\fmtversion{2011/06/27}
+\edef\fmtversion{2014/05/01}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-% 
+%
 % Check that the format being made is not too old.
 % The error message complains about `more than 5 years'
 % but in fact the error is not triggered until 65 months.
diff --git a/Master/texmf-dist/source/latex/base/ltx3info.tex b/Master/texmf-dist/source/latex/base/ltx3info.tex
index e0aabafba49..85faeeb5e24 100644
--- a/Master/texmf-dist/source/latex/base/ltx3info.tex
+++ b/Master/texmf-dist/source/latex/base/ltx3info.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 \documentclass[a4paper]{article}
 
@@ -72,7 +72,7 @@
 
 \title{\Large The \LaTeX3 Project}
 
-\author{\copyright 1995--1999 \ 
+\author{\copyright 1995--1999 \
 Frank Mittelbach and
 Chris Rowley}
 
@@ -100,7 +100,7 @@ Chris Rowley}
   \item The printed documentation of CD-ROM collections that contain
     \LaTeX.
   \item On-line collections that include a significant proportion of
-    documents encoded in \LaTeX. 
+    documents encoded in \LaTeX.
 \end{itemize}
 \end{abstract}
 
@@ -110,7 +110,7 @@ The purposes of the \LaTeX3 system can be summarized thus: it will
 greatly increase the range of documents which can be processed; and it
 will provide a flexible interface for typographic designers to easily
 specify the formatting of a class of documents.
- 
+
 The \LaTeX3 Project Team is a small group of volunteers whose aim is
 to produce this major new document processing system based on the
 principles pioneered by Leslie Lamport in the current \LaTeX.
@@ -122,11 +122,11 @@ enhanced by extensions to that core system.  They will continue to
 develop and maintain this system, releasing updated versions every six
 months and recording these activities in the \LaTeX{} bugs database
 (see below).
-  
+
 Although \LaTeX{} may be distributed freely, the production and
 maintenance of the system does require expenditure of reasonably large
 sums of money.  The \LaTeX3 Project Fund has therefore been set up to
-channel money into this work.  We know that some users are 
+channel money into this work.  We know that some users are
 aware of this fund as they have already contributed to it---many
 thanks to all of them!  If you want to know more about how you can
 help the project, see Page \pageref{fund}---and thanks in advance for
@@ -143,7 +143,7 @@ described as a world-wide de facto standard for high quality
 typesetting. Its use is particularly common in specialized areas, such
 as technical documents of various kinds, and for multi-lingual
 requirements.
- 
+
 The \TeX{} system is fully programmable. This allows the development
 of high-level user interfaces whose input is processed by \TeX{}'s
 interpreter to produce low-level typesetting instructions; these are
@@ -154,7 +154,7 @@ long documents such as textbooks and manuals. It separates content and
 form as much as possible by providing the user with a generic (\ie
 logical rather than visual) mark-up interface; this is combined with
 style sheets which specify the formatting.
- 
+
 Recent years have shown that the concepts and approach of \LaTeX{} are
 now widely accepted. Indeed, \LaTeX{} has become the standard method
 of communicating and publishing documents in many academic
@@ -168,7 +168,7 @@ considered a powerful combination of great importance to such areas as
 corporate documentation and publishing.  This has also extended to
 on-line publishing using, for example, \PDF{} output incorporating
 hypertext and other active areas.
-  
+
 With the spreading use of \SGML{}-compliant systems (\eg Web-based
 publishing using \HTML{} or \XML{}) \TeX{} again is a common choice as
 the formatting engine for high quality typeset output: a widely used
@@ -210,9 +210,9 @@ necessary in, at least, the following areas:
    the extendibility (package interface);
  \item
    the layout specification of tabular material;
- \item 
+ \item
    the specification and inclusion of graphical material;
- \item 
+ \item
    the positioning of floating material, and other aspects of page
    layout;
  \item
@@ -235,7 +235,7 @@ necessary in, at least, the following areas:
 \item Font declaration and selection;
 \item Font and glyph handling within mathematical formulas;
 \item Handling multiple font glyph encodings within a document;
-\item Allowing multiple input character encodings within a document; 
+\item Allowing multiple input character encodings within a document;
 \item A uniform interface for graphics inclusion;
 \item Support for coloured text;
 \item Building and interfacing new classes and extension packages.
@@ -247,7 +247,7 @@ necessary in, at least, the following areas:
 The strengths of the present version of \LaTeX{} are
 as follows:
  \begin{itemize}
- \item excellent standard of typesetting for text, technical 
+ \item excellent standard of typesetting for text, technical
 formulas\\
 and tabular material;
  \item  separation of generic mark-up from visual formatting;
@@ -262,7 +262,7 @@ and tabular material;
  \begin{itemize}
  \item
  It will provide a syntax that allows highly automated translation
- from popular \SGML{} DTDs into \LaTeX{} document classes (these 
+ from popular \SGML{} DTDs into \LaTeX{} document classes (these
  will be provided as standard with the new version).
 
  The syntax of the new \LaTeX{} user-interface will, for example,
@@ -287,14 +287,14 @@ and tabular material;
  could easily be interfaced to a visually-oriented, menu-driven
  specification system.
 
- This interface will also support \DSSSL{} specifications and 
+ This interface will also support \DSSSL{} specifications and
  style-sheet concepts such as those used with \HTML{} and \XML{}.
- 
+
  \item
  It will provide an enhanced user-interface that allows expression of
  the typesetting requirements from a large range of subject areas. Some
  examples are listed here.
- 
+
  \begin{itemize}
  \item The requirements of technical documentation (\eg offset layout,\\
    change bars, etc).
@@ -306,19 +306,19 @@ and tabular material;
    within text.
  \item the integration of hypertext and other links in on-line
    documents using systems such as \HTML{}, \XML{} and \PDF{}.
-   
+
  \end{itemize}
 
  Special care will be taken to ensure that this interface is
  extensible: this will be achieved by use of modular designs.
- 
- 
+
+
   \item
   It will provide a more robust author-interface. For example,
   artificial restrictions on the nesting of commands will be removed.
   Error handling will be improved by adding
   a more effective, interactive help system.
- 
+
   \item
   It will provide access to arbitrary fonts from any family (such as
   the \PS{} and TrueType fonts) including a wide range of fonts for
@@ -330,17 +330,17 @@ and tabular material;
   system will provide extensive catalogues of examples, carefully
   designed to make the learning time for new users (both designers and
   authors) as short as possible.
- 
+
  \item
   The code itself will be thoroughly documented and it will be
   designed on modular principles.  Thus the system will be easy to
   maintain and to enhance.
 \end{itemize}
- 
+
 The resulting new \LaTeX{} will, like the present version, be usable
 with any standard \TeX{} system (or whatever replaces it) and so will
 be freely available on a wide range of platforms.
-  
+
 
 \section{\LaTeX{} documentation}
 
@@ -366,7 +366,7 @@ This \LaTeX{} distribution comes with documentation on several aspects
 of of the system.  The newer features of the system are described in
 the following documents:
 \begin{citations}
-\item[\LaTeXe{} for authors] 
+\item[\LaTeXe{} for authors]
    describes the new features of \LaTeX{} documents,
    in the file \texttt{usrguide.tex};
 \item[\LaTeXe{} for class and package writers]
@@ -394,7 +394,7 @@ sums of money.  There are many necessities that need substantial
 financing: examples are new or enhanced computing equipment and travel
 to team meetings (the volunteers come from many different countries,
 so getting together occasionally is a non-trivial exercise).
-  
+
 This is why we are appealing to you for contributions to the fund.
 Any sum will be much appreciated; the amount need not be large as
 small contributions add up to very useful amounts.  Contributions of
@@ -427,7 +427,7 @@ Contributions should be sent to one of the following addresses:
 \begin{quote}\small\label{addrs}
    \TeX{} Users Group, P.O. Box 2311, Portland, OR~97208-2311 USA\\
    Fax:~+1~503~223~3960 \ Email: \texttt{tug@tug.org}
-   
+
  \noindent
    UK TUG, 1 Eymore Close, Selly Oak, Birmingham B29~4LB UK\\
    Fax: +44 121 476 2159 \ Email: \texttt{uktug-enquiries@tex.ac.uk}
diff --git a/Master/texmf-dist/source/latex/base/ltxdoc.dtx b/Master/texmf-dist/source/latex/base/ltxdoc.dtx
index dc4274f9712..15349cf620b 100644
--- a/Master/texmf-dist/source/latex/base/ltxdoc.dtx
+++ b/Master/texmf-dist/source/latex/base/ltxdoc.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \iffalse
 %
@@ -36,7 +36,7 @@
 \documentclass{ltxdoc}
 \GetFileInfo{ltxdoc.cls}
 \providecommand\dst{\expandafter{\normalfont\scshape docstrip}}
-\title{The file \texttt{ltxdoc.dtx} for use with 
+\title{The file \texttt{ltxdoc.dtx} for use with
       \LaTeXe.\thanks{This file has version
            number \fileversion, dated \filedate.}\\[2pt]
       It contains the code for \texttt{ltxdoc.cls}}
@@ -158,7 +158,7 @@
 % \StopEventually{}
 %
 %
-% \section{Options}                       
+% \section{Options}
 %
 %    \begin{macrocode}
 %<*class>
@@ -180,7 +180,7 @@
                      *************************************}}
            {}
 %    \end{macrocode}
-%    
+%
 %
 % \section{Option Processing}
 %
@@ -280,7 +280,7 @@
   {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\oarg}
 %    |\oarg{text}| prints \oarg{text}, `optional argument'.
 %    \begin{macrocode}
@@ -310,12 +310,12 @@
 % implicitly adding the |\verb|. This procedure does not produce
 % particularly beautiful pages, but it allows us to fully document new
 % sections, and have some form of typeset comments on all the old
-% code. 
+% code.
 % \changes{v2.0e}{1994/03/18}{Use a fixed font.}
 %
 % Scan control names and put them in tt.
 % will actually (incorrectly) scan past |\\| but this does not matter as
-% this is almost never followed by a letter in practice.  
+% this is almost never followed by a letter in practice.
 % (ie |\\foo|) would put |foo| in |\ttfamily|.
 %    \begin{macrocode}
 \def\oc@scan#1{%
diff --git a/Master/texmf-dist/source/latex/base/ltxref.dtx b/Master/texmf-dist/source/latex/base/ltxref.dtx
index 489ed2385a8..c466365b2c0 100644
--- a/Master/texmf-dist/source/latex/base/ltxref.dtx
+++ b/Master/texmf-dist/source/latex/base/ltxref.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -171,9 +171,9 @@
 %    Referencing a |\label|.
 % RmS 91/10/25: added a few extra |\reset@font|,
 %               as suggested by Bernd Raichle
-%               
+%
 % RmS 92/08/14: made |\ref| and |\pageref| robust
-% 
+%
 % RmS 93/09/08: Added setting of refundefined switch.
 %    \begin{macrocode}
 \def\@setref#1#2#3{%
@@ -221,11 +221,11 @@
      \@latex@warning@no@line{Label `#2' multiply defined}}%
   \global\@namedef{#1@#2}{#3}}}
 %    \end{macrocode}
-%  
+%
 %    \begin{macrocode}
 \def\newlabel{\@newl@bel r}
 %    \end{macrocode}
-%  
+%
 %    \begin{macrocode}
 \@onlypreamble\@newl@bel
 %    \end{macrocode}
@@ -278,7 +278,7 @@
 % For |\label| commands that come before any environment
 %
 %    \begin{macrocode}
-\def\@currentlabel{} 
+\def\@currentlabel{}
 %    \end{macrocode}
 %  \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/base/makeindx.dtx b/Master/texmf-dist/source/latex/base/makeindx.dtx
index 86588be44d0..c81944431a8 100644
--- a/Master/texmf-dist/source/latex/base/makeindx.dtx
+++ b/Master/texmf-dist/source/latex/base/makeindx.dtx
@@ -2,33 +2,33 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %\CheckSum{178}
 %\iffalse
-% Copyright (C) 1985 by Leslie Lamport 
+% Copyright (C) 1985 by Leslie Lamport
 % Copyright (C) 1994-98 by \LaTeX3 Project and Johannes Braams
 %\fi
 %
@@ -55,7 +55,7 @@
 %  Frank Mittelbach\and
 %  Chris Rowley\and
 %  Rainer Sch\"opf}
-% 
+%
 % \date{1994/11/11}
 % \maketitle
 %
@@ -72,7 +72,7 @@
 %
 % \DescribeMacro\printindex
 %    This command can be used to include the sorted and formatted
-%    index in the document. 
+%    index in the document.
 %
 % \subsection{Showidx}
 %
@@ -101,7 +101,7 @@
 %
 %    The next bit of code contains the documentation driver file for
 %    \TeX{}, i.e., the file that will produce the documentation you are
-%    currently reading. It can be extracted from this file by the 
+%    currently reading. It can be extracted from this file by the
 %    {\sc docstrip} program.
 %    \begin{macrocode}
 %<*driver>
@@ -163,7 +163,7 @@
 %    This package is for documents prepared in the English language.
 %    To prepare a version for another language, various English words
 %    must be replaced.  All the English words that require replacement
-%    are% defined below in command names. 
+%    are% defined below in command names.
 % \changes{1.0g}{1994/03/07}{Replaced \cs{newcommand} by \cs{providecommand}.}
 %    \begin{macrocode}
 \providecommand\seename{see}
@@ -267,7 +267,7 @@
 %    \begin{macrocode}
 \renewcommand\raggedbottom{\def\@textbottom{\vskip
       \z@ plus.0001fil}\let\@texttop\@mkidx}
-\renewcommand\flushbottom{\let\@textbottom\relax 
+\renewcommand\flushbottom{\let\@textbottom\relax
                           \let\@texttop\@mkidx}
 %    \end{macrocode}
 % \end{macro}
@@ -302,7 +302,7 @@
 %    To make this work we have to execute either |\raggedbottom| or
 %    |\flushbottom|. Assuming this package is used most often with the
 %    document classes \texttt{report} and \texttt{book}, we execute
-%    |\flushbottom|. 
+%    |\flushbottom|.
 %    \begin{macrocode}
 \flushbottom
 %</showidx>
diff --git a/Master/texmf-dist/source/latex/base/makeindx.ins b/Master/texmf-dist/source/latex/base/makeindx.ins
index 35d1154a07a..cb24526ef95 100644
--- a/Master/texmf-dist/source/latex/base/makeindx.ins
+++ b/Master/texmf-dist/source/latex/base/makeindx.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/manual.err b/Master/texmf-dist/source/latex/base/manual.err
index 89a07a70b7a..b06bba047a4 100644
--- a/Master/texmf-dist/source/latex/base/manual.err
+++ b/Master/texmf-dist/source/latex/base/manual.err
@@ -19,13 +19,13 @@
 \def\ypmd{%                                                       %
 %                                                                 %
 %                                                                 %
-  Last modified on Mon 22 Aug 2005 at  1:21:28 UT by lamport        %
+  Last modified on Wed 18 Jan 2006 at 13:17:43 PST by lamport      %
   endypmd}                                                        %
 %                                                                 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newcommand{\moddate}{\expandafter\xpmd\ypmd}                     %
 \def\xpmd Last modified                                           %
-on #1 #2 #3 #4 at #5:#6:#7 #8 by #9 endypmd{#3 #2 #8}                %
+on #1 #2 #3 #4 at #5:#6:#7 #8 by #9 endypmd{#2 #3 #4}                %
 \newcommand{\prdate}{\noindent\fbox{\Large\moddate}}              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -47,7 +47,7 @@ indicated by page and line number, where the top line of a page is
 number 1 and the bottom line is number $-1$.  A running head and a
 page number are not considered to be lines, but all other lines are.
 Please report any additional errors to me.  My current email address
-can be found at 
+can be found at
 {\tt http://lamport.org}.
 
 
@@ -57,7 +57,7 @@ can be found at
 Replace \verb|{\em all\/}| by \verb|\emph{all}|.
  \reportedby{Rosemary Bailey}{29 Aug 1994}
 
-\erratum{page 28, first paragraph} 
+\erratum{page 28, first paragraph}
 Not an error, but it would be
 helpful to add the following sentence to the end of that paragraph:
  ``(If a declaration has arguments, they become additional
@@ -79,7 +79,7 @@ Change \verb|{\em ...}| to \verb|\emph{...}|
 \erratum{page 101}
 This is not an error, but some readers will find it helpful if, in the
 descriptions of \verb|\setlength| and \verb|\addtolength|,
-\verb|\gnat| were replaced by \verb|\parskip|.  
+\verb|\gnat| were replaced by \verb|\parskip|.
  \reportedby{Ellen Gilkerson}{9 Aug 1994}
 
 \erratum{page 108, lines 7 and 10}
@@ -153,7 +153,7 @@ Change ``\verb|\resettime|'' to ``\verb|\settime|''.
 \erratum{page 84, after line $11$} Add the following sentence: ``The
 \hbox{\verb|\onlyslides|} and \hbox{\verb|\onlynotes|} commands may
 not work right if a \texttt{slide}, \texttt{overlay}, or \texttt{note}
-environment appears in the argument of any command.'' 
+environment appears in the argument of any command.''
 \reportedby{Eike Ritter}{May 1996}
 
 \erratum{page 153, line 1}
@@ -164,11 +164,11 @@ Add ``or subentry'' after ``entry''.
 Add the following before line $-4$:
 \begin{description}
 \item[\mytt \bs columnwidth]
-Normal width 
+Normal width
   \cindex{columnwidth}%
 of a column;
-%  \index{column!width}% 
-  \index{width!of column}% 
+%  \index{column!width}%
+  \index{width!of column}%
 equals \verb|\textwidth| except for multiple-column styles.
 Its value should not be changed with the length-setting commands.
 \end{description}
@@ -176,7 +176,7 @@ Also, in line $-4$, change \verb|\textwidth| to \verb|\columnwidth|.
 %\reportedby{Volker Kuhlmav}{20 Jan 1995}
 \reportedby{Rosemary Bailey}{9 Sep 1994}
 
-\erratum{page 180, lines 15--19} 
+\erratum{page 180, lines 15--19}
 %
 Replace these five lines (which begin ``These commands are overridden'')
 with:
@@ -195,7 +195,7 @@ command immediately after the sectioning command.
 \end{itemize}
 \reportedby{Jerome Breitenbach}{14 Dec 1995}
 
-\erratum{page 182} 
+\erratum{page 182}
 The dimensions
 \verb|\pageheight| and \verb|\pagewidth|
 should be \verb|\paperheight| and \verb|\paperwidth|,
@@ -223,7 +223,7 @@ These declarations may not be used in math mode.
 Replace lines 16-19 (beginning ``None of these commands'') with
 \begin{quote}
 When these commands are used in math mode, the \emph{text}
-argument is processed in LR mode.  
+argument is processed in LR mode.
 
 These commands and declarations are robust.  Words typeset in
 typewriter style are not hyphenated except where permitted by \verb|\-|
@@ -254,21 +254,21 @@ Change ``through a symbol'' by ``through a relation symbol''.
 \erratum{page 137} This is not an error, but it would be better to
 change lines 23 and 24 to:
 \begin{quote}
-\LaTeX\ 
+\LaTeX\
   \index{file!not found error}%
   \index{file!nonexistent}%
 is trying to read a file that apparently doesn't exist.  If the missing
 file has the extension \texttt{tex}, then \LaTeX\ is trying to
   \index{input)@\verb+\input+!of nonexistent file}%
   \index{include)@\verb+\include+!of nonexistent file}%
-\verb|\input| or \verb|\include| it; if it 
+\verb|\input| or \verb|\include| it; if it
 \end{quote}
 
 \erratum{page 171, line 19}
 Change the description of \verb|\indent| to:
 \begin{description}
 \item[\mytt \bs indent]
-Produces a 
+Produces a
 %  \cindex{indent}%
 %  \index{paragraph!indentation}%
 horizontal space whose width equals the width of the
@@ -280,7 +280,7 @@ try typing \verb|\indent\indent|.)  Robust.
 
 \erratum{page 179, line 19}
 %
-Change to: 
+Change to:
 \begin{quote}
 page style for the \texttt{article} and \texttt{report} document classes.
 \end{quote}
@@ -293,7 +293,7 @@ with ``\textit{num}$_1$ and \textit{num}$_2$ are numbers''.
 
 \erratum{page 196, line $-5$}
 Change \verb|\newboolean{|\emph{name}\verb|}| to
-\verb|\newboolean{|\emph{nam}\verb|}|.  
+\verb|\newboolean{|\emph{nam}\verb|}|.
 \reportedby{Christopher von B\"{u}low}{28 Aug 2000}
 
 
@@ -322,22 +322,22 @@ Add a space after ``bibliography''.
 \reportedby{Marcin Wolinski}{17 Sep 2003}
 
 \subsection*{Error Corrected in the Twenty-First Printing}
-\erratum{page 198, line $-11$} 
+\erratum{page 198, line $-11$}
 The sentence beginning ``The last three rules'' is hard to read.  Better
 would be:
 \begin{quote}
-\noindent The last three rules are suspended when a 
+\noindent The last three rules are suspended when a
   \verb|\clearpage|,\linebreak
   \verb|\cleardoublepage|, or
-  \verb|\end{document}| command occurs, 
+  \verb|\end{document}| command occurs,
 at which point all unprocessed figures and tables are allowed a
 \hbox{\mytt p} option and printed.
 \end{quote}
 \reportedby{Paul Stanford}{9 Oct 2004}
 
-\subsection*{Errors in All Printings}
+\subsection*{Error Corrected in the Twenty-Second Printing}
 
-\erratum{page 253, column 2, lines $-5$ and $-6$} 
+\erratum{page 253, column 2, lines $-5$ and $-6$}
 
 The two index entries for \verb|\ldots| should be combined.
 
diff --git a/Master/texmf-dist/source/latex/base/modguide.tex b/Master/texmf-dist/source/latex/base/modguide.tex
index 147fec78781..67eaa9b30f2 100644
--- a/Master/texmf-dist/source/latex/base/modguide.tex
+++ b/Master/texmf-dist/source/latex/base/modguide.tex
@@ -2,34 +2,34 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: modguide.tex
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
- 
+
 \documentclass{ltxguide}[1995/11/28]
 
 \newcommand{\reasonsection}[1]{\subsubsection*{\it #1}}
@@ -39,16 +39,16 @@
 \setcounter{secnumdepth}{-1}
 
 \title{Modifying \LaTeX}
- 
+
 \author{\copyright~Copyright 1995, \LaTeX3 Project Team.\\
    All rights reserved.}
- 
+
 \date{12 December 1995}
- 
+
 \begin{document}
- 
+
 \maketitle
- 
+
 \tableofcontents
 
 \begin{abstract}
@@ -112,8 +112,8 @@ and wide-ranging uses of the \LaTeX{} system.
 
 \item  The packages that we maintain define a particular document
   interface and, in some cases, particular formatting of parts of a
-  document. 
-  
+  document.
+
 \item The interfaces between different parts of the \LaTeX{} system
   are very complex and it is therefore very difficult to check that a
   change to one file does not affect the functionality of both that
@@ -163,7 +163,7 @@ line:
 \begin{verbatim}
    \usepackage{array}[1994/10/16]
 \end{verbatim}
-  
+
 By supplying the optional argument, the document author is indicating
 that a version of the file \texttt{array.sty} dated no earlier than
 that date is required to run this document without error.
@@ -175,7 +175,7 @@ of a later date, but without the new feature.  If the document
 were processed using this `alternative array' then it would certainly
 produce `undefined command' errors and would probably not be
 processable at all.
- 
+
 
 \reasonsection{What's in a file-name?}
 \label{sec:jb}
@@ -273,13 +273,13 @@ of the system's many advantages.
 The simplest way to achieve this is to replace
 \begin{quote}
 \verb|\documentclass{article}|\quad by\quad
-\verb|\documentclass{myart}| 
+\verb|\documentclass{myart}|
 \end{quote}
 
 Nor do we wish to discourage the production of new packages improving
 on the functionality or implementation of those we distribute.  All we
 ask is that, in the best interests of all \LaTeX{} users, you give
-your superbly improved class or package file some other name. 
+your superbly improved class or package file some other name.
 
 \section{Configuration possibilities}
 \label{sec:conposs}
@@ -352,7 +352,7 @@ from Standard \LaTeX{} in every possible way, including the following.
 \item
   Ensure that it contains no file with a name the same as that of
   a file in the standard distribution but with different contents.
-  (If this is not possible then you must: 
+  (If this is not possible then you must:
   \begin{itemize}
   \item
     ensure that files from the non-\LaTeX{} system cannot be
@@ -375,14 +375,14 @@ from Standard \LaTeX{} in every possible way, including the following.
   whatever means is appropriate.
 
 \item Ensure that what is written at the beginning of the log file
-  clearly shows that your system has been used, and that it is 
+  clearly shows that your system has been used, and that it is
   not Standard \LaTeX{}.
   See the file \texttt{cfgguide.tex} for how to achieve this.
 
 \item
- Clearly explain to users that bug reports concerning your 
+ Clearly explain to users that bug reports concerning your
  system should not be sent to the maintainers of Standard
- \LaTeX{}. 
+ \LaTeX{}.
 \end{enumerate}
 
 \subsection*{Note to system administrators}
diff --git a/Master/texmf-dist/source/latex/base/newdc.ins b/Master/texmf-dist/source/latex/base/newdc.ins
index 414876eb4a6..c64968c8723 100644
--- a/Master/texmf-dist/source/latex/base/newdc.ins
+++ b/Master/texmf-dist/source/latex/base/newdc.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file may only be distributed together with a copy of the LaTeX
@@ -76,7 +76,7 @@ of this file under its original name.
 
 \Msg{*** Generating font defs for Cork encoded
          and Text Companion fonts ***}
- 
+
 \generate{
   \file{t1cmfib.fd}{
      \from{cmfonts.fdd}{fd,T1cmfib,new}}
@@ -101,7 +101,7 @@ of this file under its original name.
   \file{ts1cmvtt.fd}{
      \from{cmfonts.fdd}{fd,TS1cmvtt,new,tt}}
 }
- 
+
 
 \ifToplevel{
 \Msg{***********************************************************}
@@ -117,6 +117,6 @@ of this file under its original name.
 \Msg{* Happy TeXing}
 \Msg{***********************************************************}
 }
- 
+
 \endbatchfile
 
diff --git a/Master/texmf-dist/source/latex/base/newlfont.dtx b/Master/texmf-dist/source/latex/base/newlfont.dtx
index 7e0eec34f75..7648bd9a9eb 100644
--- a/Master/texmf-dist/source/latex/base/newlfont.dtx
+++ b/Master/texmf-dist/source/latex/base/newlfont.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %\iffalse   % this is a METACOMMENT !
 %
@@ -83,7 +83,7 @@
 %
 % \GetFileInfo{newlfont.dtx}
 %
-% \title{The file \texttt{newlfont.dtx} for use with 
+% \title{The file \texttt{newlfont.dtx} for use with
 %        \LaTeXe.\thanks{This file has version
 %        number \fileversion, dated \filedate.}\\[2pt]
 %        It contains the code for \texttt{newlfont.sty}}
@@ -179,7 +179,7 @@
    \ifmmode
      \@latex@error{Command \noexpand#1invalid in math mode}%
         {%
-         Please 
+         Please
          \ifx#2\relax
             define a new math alphabet^^J%
             if you want to use a special font in math mode%
diff --git a/Master/texmf-dist/source/latex/base/nfssfont.dtx b/Master/texmf-dist/source/latex/base/nfssfont.dtx
index 2fd5530a6b5..57d92f26131 100644
--- a/Master/texmf-dist/source/latex/base/nfssfont.dtx
+++ b/Master/texmf-dist/source/latex/base/nfssfont.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 \def\nfssfontfileversion{v2.2b}
 \def\nfssfontfiledate{2006/01/08}
@@ -51,10 +51,10 @@
 % Copyright (C) 1994-94, 2003, 2006 Frank Mittelbach,
 % all rights reserved.
 % \fi
-% 
+%
 %
 % \title{The program \texttt{nfssfont}}
-% \author{Frank Mittelbach\thanks{Adapted from code written 
+% \author{Frank Mittelbach\thanks{Adapted from code written
 %         by Donald E.~Knuth}}
 % \date{\nfssfontfiledate}
 %
@@ -71,7 +71,7 @@
 % Within the \NFSS{} distribution there is a \LaTeX{} file
 % \texttt{nfssfont.tex} which can be used to test new fonts, produce
 % font tables showing all characters, etc. This is an addaption of a
-% program originally written by Don Knuth. 
+% program originally written by Don Knuth.
 
 % When you run this file through \LaTeX{} you will be asked to enter
 % the name of the font to test. Your answer should be the external
@@ -96,14 +96,14 @@
 % This is at
 % the moment only a crude addaption of the test program for the
 % Computer Modern fonts by Donald Knuth.
-% 
+%
 % \StopEventually{}
-% 
+%
 % \section{A driver for this document}
 %
 % The next bit of code contains the documentation driver file for
 % \TeX{}, i.e., the file that will produce the documentation you are
-% currently reading. It will be extracted from this file by the 
+% currently reading. It will be extracted from this file by the
 % \dst{} program.
 %    \begin{macrocode}
 %<*driver>
@@ -148,7 +148,7 @@
 \hyphenpenalty=200
 \doublehyphendemerits=30000
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \newcount\m \newcount\n \newcount\p \newdimen\dim
 \chardef\other=12
@@ -162,7 +162,7 @@
   \twodigits\n\twodigits\m}
 \def\twodigits#1{\ifnum #1<10 0\fi \number#1}
 %    \end{macrocode}
-%    
+%
 %    We first ask for a real external font name\ldots
 %    \begin{macrocode}
 \def\init{%
@@ -184,7 +184,7 @@
 %    shape, and size offering a default each time.
 %    \begin{macrocode}
  \ifx\currfontname\empty
-  \typein[\encoding]{^^J^^J*** NFSS classification 
+  \typein[\encoding]{^^J^^J*** NFSS classification
                      ***^^J^^JFont encoding [T1]:}%
   \ifx\encoding\empty
    \fontencoding{T1}%
@@ -212,7 +212,7 @@
        {\PackageWarningNoLine{nfssfont}%
         {Encoding file `\next' not found.%
           \MessageBreak
-           You might have misspelt the name of the encoding 
+           You might have misspelt the name of the encoding
           \MessageBreak
            or perhaps this encoding is not a text encoding,
          \MessageBreak
@@ -264,20 +264,20 @@
  \startfont
  \message{Now type a test command (\string\help\space for help):}}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \def\startfont{\font\testfont=\currfontname
-  \leftline{\sevenrm Test of font \currfontname\unskip\ (encoding 
+  \leftline{\sevenrm Test of font \currfontname\unskip\ (encoding
             \encoding\unskip) on \today\ at \hours}
   \medskip
   \testfont \setbaselineskip
   \ifdim\fontdimen6\testfont<10pt \rightskip=0pt plus 20pt
   \else\rightskip=0pt plus 2em \fi
   \spaceskip=\fontdimen2\testfont % space between words (\raggedright)
-  \xspaceskip=\fontdimen2\testfont \advance\xspaceskip 
+  \xspaceskip=\fontdimen2\testfont \advance\xspaceskip
   by\fontdimen7\testfont}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 {\catcode`\|=0 \catcode`\\=\other
 |gdef|help{|message{%
@@ -305,7 +305,7 @@ and you can use ordinary TeX commands (e.g., to \input a file).}}}
 \loop\char\n \ifnum \n<255 \advance\n 1 \repeat}
 \baselineskip=6pt \advance\baselineskip\ht0 \advance\baselineskip\dp0 }
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \def\setchar#1{{\escapechar-1\message{\string#1 character = }%
   \def\do##1{\catcode`##1=\other}\dospecials
@@ -342,7 +342,7 @@ and you can use ordinary TeX commands (e.g., to \input a file).}}}
   \loop{#1} \ifnum\background<#5\m=\background\advance\m 1
   \chardef\background=\m \repeat}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \def\names{ {\AA}ngel\aa\ Beatrice Claire
   Diana \'Erica Fran\c{c}oise Ginette H\'el\`ene Iris
@@ -352,7 +352,7 @@ and you can use ordinary TeX commands (e.g., to \input a file).}}}
 \def\punct{\par\dopunct{min}\dopunct{pig}\dopunct{hid}
   \dopunct{HIE}\dopunct{TIP}\dopunct{fluff}
   \$1,234.56 + 7/8 = 9\% @ \#0\par}
-\def\dopunct#1{#1,\ #1:\ #1;\ `#1'\ ?`#1?\ !`#1!\ (#1)\ [#1]\ 
+\def\dopunct#1{#1,\ #1:\ #1;\ `#1'\ ?`#1?\ !`#1!\ (#1)\ [#1]\
                #1*\ #1.\par}
 
 \def\bigtest{\sample
@@ -438,7 +438,7 @@ and you can use ordinary TeX commands (e.g., to \input a file).}}}
 \def\centerlargechars{
   \def\reposition{\setbox0=\hbox{$\vcenter{\kern2pt\box0\kern2pt}$}}}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \def\text{{\advance\baselineskip-4pt
 \setbox0=\hbox{abcdefghijklmnopqrstuvwxyz}
@@ -467,7 +467,7 @@ official r\^ole in fluffy souffl\'es? }
 
 \def\sample{\table\text}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \def\bye{\end{document}}
 %    \end{macrocode}
@@ -492,7 +492,7 @@ official r\^ole in fluffy souffl\'es? }
 \ifx\noinit!\else\init\fi
 %</code>
 %    \end{macrocode}
-%    
+%
 %
 % \DeleteShortVerb{\|}
 % \Finale
diff --git a/Master/texmf-dist/source/latex/base/nfssfont.ins b/Master/texmf-dist/source/latex/base/nfssfont.ins
index 115a8b1b797..d8594e3946e 100644
--- a/Master/texmf-dist/source/latex/base/nfssfont.ins
+++ b/Master/texmf-dist/source/latex/base/nfssfont.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/olddc.ins b/Master/texmf-dist/source/latex/base/olddc.ins
index dae8b8638bb..45fa7935caa 100644
--- a/Master/texmf-dist/source/latex/base/olddc.ins
+++ b/Master/texmf-dist/source/latex/base/olddc.ins
@@ -3,46 +3,46 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
 
 \input docstrip
- 
+
 \preamble
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file may only be distributed together with a copy of the LaTeX
@@ -75,7 +75,7 @@ of this file under its original name.
 \usedir{tex/latex/base}
 
 \Msg{*** Generating font defs for Cork encoded fonts ***}
- 
+
 \generate{
   \file{t1cmfib.fd}{
      \from{cmfonts.fdd}{fd,T1cmfib,old}}
@@ -92,9 +92,9 @@ of this file under its original name.
   \file{t1cmvtt.fd}{
      \from{cmfonts.fdd}{fd,T1cmvtt,old}}
 }
- 
- 
- 
+
+
+
 \ifToplevel{
 \Msg{***********************************************************}
 \Msg{*}
@@ -109,5 +109,5 @@ of this file under its original name.
 \Msg{* Happy TeXing}
 \Msg{***********************************************************}
 }
- 
+
 \endbatchfile
diff --git a/Master/texmf-dist/source/latex/base/oldlfont.dtx b/Master/texmf-dist/source/latex/base/oldlfont.dtx
index 99a4c55f7c9..1c677fe21bb 100644
--- a/Master/texmf-dist/source/latex/base/oldlfont.dtx
+++ b/Master/texmf-dist/source/latex/base/oldlfont.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %\iffalse   % this is a METACOMMENT !
 %
@@ -77,7 +77,7 @@
 %
 % \GetFileInfo{oldlfont.dtx}
 %
-% \title{The file \texttt{oldlfont.dtx} for use with 
+% \title{The file \texttt{oldlfont.dtx} for use with
 %        \LaTeXe.\thanks{This file has version
 %        number \fileversion, dated \filedate.}\\[2pt]
 %        It contains the code for \texttt{oldlfont.sty}}
@@ -94,7 +94,7 @@
 %    \item The two-letter font-changing commands |\rm|, etc.~are
 %       defined to cancel each other out as they did in \LaTeX~2.09.
 %    \item The two-letter font-changing commands are allowed in math
-%       mode. 
+%       mode.
 %    \item The |latexsym| package is loaded.
 %    \end{itemize}
 %    For full compatibility mode, the file |latex209.def| is loaded by
diff --git a/Master/texmf-dist/source/latex/base/preload.dtx b/Master/texmf-dist/source/latex/base/preload.dtx
index 461bc326ae8..80478498624 100644
--- a/Master/texmf-dist/source/latex/base/preload.dtx
+++ b/Master/texmf-dist/source/latex/base/preload.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -97,7 +97,7 @@
 %   \begin{center}
 %   \begin{tabular}{ll}
 %   preload.min   &  minimal subset of fonts necessary to run NFSS2 \\
-%   preload.ori   &  preload of CM fonts similar to the old 
+%   preload.ori   &  preload of CM fonts similar to the old
 %                        \texttt{lfonts.tex}                       \\
 %   preload.ltx    &  The standard selection of preloads \\
 %   cmpreloa.xpt   &  preload of CM fonts for 10pt document size\\
@@ -145,7 +145,7 @@
 %    documents, thus this should be avoided if possible.
 %    \end{quote}
 %
-%    
+%
 % \StopEventually{}
 %
 % \section{Module switches for the \dst{} program}
@@ -249,26 +249,26 @@
          {5,6,7,8,9,10,10.95,12,14.4,17.28,20.74}
 %</ori>
 %    \end{macrocode}
-%    
+%
 %    The math fonts are the same for both DC and CM fonts. So far
 %    there isn't an agreed on standard.
 % \changes{v2.4e}{1995/12/04}
 %      {Ulrik Vieth. added 12pt OMS and OML preloads  /1989}
 %    \begin{macrocode}
-%<*xpt> 
+%<*xpt>
 \DeclarePreloadSizes{OML}{cmm}{m}{it}{5,7,10}
 \DeclarePreloadSizes{OMS}{cmsy}{m}{n}{5,7,10}
-%</xpt> 
-%<*xipt> 
+%</xpt>
+%<*xipt>
 \DeclarePreloadSizes{OML}{cmm}{m}{it}{6,8,10.95}
 \DeclarePreloadSizes{OMS}{cmsy}{m}{n}{6,8,10.95}
 %</xipt>
-%<*xiipt> 
+%<*xiipt>
 \DeclarePreloadSizes{OML}{cmm}{m}{it}{6,8,12}
 \DeclarePreloadSizes{OMS}{cmsy}{m}{n}{6,8,12}
-%</xiipt> 
+%</xiipt>
 %%
-%% LaTeX symbol fonts: 
+%% LaTeX symbol fonts:
 %%--------------------
 %<*ori>
 \DeclarePreloadSizes{U}{lasy}{m}{n}
diff --git a/Master/texmf-dist/source/latex/base/proc.dtx b/Master/texmf-dist/source/latex/base/proc.dtx
index ad341108d7e..2bab3793e09 100644
--- a/Master/texmf-dist/source/latex/base/proc.dtx
+++ b/Master/texmf-dist/source/latex/base/proc.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \CheckSum{173}
 %% \CharacterTable
@@ -114,7 +114,7 @@
 % \fi
 %
 % \title{Producing proceedings articles with \LaTeXe\thanks
-%    {File version \fileversion, dated \filedate}} 
+%    {File version \fileversion, dated \filedate}}
 %
 % \author{%
 %  Johannes Braams\and
@@ -124,7 +124,7 @@
 %  Frank Mittelbach\and
 %  Chris Rowley\and
 %  Rainer Sch\"opf}
-% 
+%
 % \date{\filedate}
 %
 % \maketitle
@@ -163,7 +163,7 @@
 % \section{Implementation}
 %
 %    In this case a check is needed to see wether \LaTeXe\ runs in
-%    compatibility mode. 
+%    compatibility mode.
 % \changes{v1.3i}{1994/05/27}{Added missing docstrip guard}
 %    \begin{macrocode}
 %<*style>
@@ -192,7 +192,7 @@
 %    \end{macrocode}
 %
 %    Also the \Lopt{onecolumn} option is disabled in this document
-%    class. 
+%    class.
 %    \begin{macrocode}
 \DeclareOption{onecolumn}%
     {\ClassError{proc}{Option `onecolumn' not supported}{}}
@@ -379,7 +379,7 @@
                  \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
 %    \end{macrocode}
 %    This document class always uses two column mode but the title is
-%    set to the full width of the text. 
+%    set to the full width of the text.
 %    \begin{macrocode}
    \twocolumn[\@maketitle]%
    \@thanks
@@ -444,7 +444,7 @@
 % \begin{macro}{\pagename}
 %    This document class is for documents prepared in the English
 %    language. To prepare a version for another language, one English
-%    word must be replaced.  It is defined below in a command name. 
+%    word must be replaced.  It is defined below in a command name.
 %    \begin{macrocode}
 \newcommand\pagename{Page}
 %</class|style>
diff --git a/Master/texmf-dist/source/latex/base/proc.ins b/Master/texmf-dist/source/latex/base/proc.ins
index a7717c87778..f7bd757800c 100644
--- a/Master/texmf-dist/source/latex/base/proc.ins
+++ b/Master/texmf-dist/source/latex/base/proc.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/slides.dtx b/Master/texmf-dist/source/latex/base/slides.dtx
index eebaf0a2117..5cd82f4c153 100644
--- a/Master/texmf-dist/source/latex/base/slides.dtx
+++ b/Master/texmf-dist/source/latex/base/slides.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % \CheckSum{2704}
 %% \CharacterTable
@@ -197,9 +197,9 @@
 % was done by producing individual slides one for each color and
 % placing them on top of each other.
 %
-% The availability of color printers and the |color| package make 
-% color separation obsolete, so it has been removed.  Although the 
-% |color| has also made |\invisible| obsolete, the command is 
+% The availability of color printers and the |color| package make
+% color separation obsolete, so it has been removed.  Although the
+% |color| has also made |\invisible| obsolete, the command is
 % retained in the \LaTeXe{} implementation, but there
 % are a few restrictions. Invisible fonts are implemented as special
 % shapes where the shape names are build by prefixing the normal shape
@@ -209,7 +209,7 @@
 % manner. To make this work it is necessary that the resulting font
 % shape group is defined. If not, the normal font substitution
 % mechanism of \LaTeXe{} will change the attribute until it finds a
-% usable font shape group with the result that the text may become 
+% usable font shape group with the result that the text may become
 % visible.
 %
 % As long as you use the standard fonts for slides this is not a
@@ -1716,7 +1716,7 @@
 %\def\@makefnmark{\hbox{$^{\@thefnmark}\m@th$}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 %
 % \subsection{The title}
 %     The commands |\title|, |\author|, and |\date| are already
@@ -1801,7 +1801,7 @@
 % \begin{tabular}{ll}
 %   |@bw|           & true if making black and white slides \\
 %   |@visible|      & true if visible output to be produced.\\
-%   |@makingslides| & true if making a slide/overlay/note 
+%   |@makingslides| & true if making a slide/overlay/note
 % \end{tabular}
 %
 %    \begin{macrocode}
@@ -1936,8 +1936,8 @@
 %                              %%                 @makingslides  := F
 %\end{verbatim}
 %    \begin{macrocode}
-\if@compatibility 
-% In compatibility mode, need to define \verb+\blackandwhite+, 
+\if@compatibility
+% In compatibility mode, need to define \verb+\blackandwhite+,
 % \verb+\colors+, \verb+\colorslides+, etc.
 \def\blackandwhite#1{\newpage\setcounter{page}{0}\@bwtrue\@visibletrue
 \if@onlyslidesw \xdef\@doslidelist{\@doglslidelist}%
@@ -2013,7 +2013,7 @@ COLOR LAYER\\[.75in]%
 \input #1
 \@makingslidesfalse}}
 %
-\else  %% if@compatibility 
+\else  %% if@compatibility
 %
 \def\setupcounters{\newpage\setcounter{page}{0}\@bwtrue\@visibletrue
 \if@onlyslidesw \xdef\@doslidelist{\@doglslidelist}%
@@ -2031,7 +2031,7 @@ COLOR LAYER\\[.75in]%
 %  BEGIN
 % \changes{v2.3}{1994/03/16}{Moved \cs{newpage} up front, here and in
 %    \cs{note} and \cs{overlay}}
-%   \par\break                           
+%   \par\break
 %   \stepcounter{slide}
 %   \setcounter{page}{0}                    % in case of non-slide pages
 %   \@slidesw :=G T
@@ -2135,7 +2135,7 @@ COLOR LAYER\\[.75in]%
 %\begin{verbatim}
 % \overlay COLORS ::=
 %  BEGIN
-%   \par\break                           
+%   \par\break
 %   \stepcounter{overlay}
 %   \setcounter{page}{0}                    % in case of non-slide pages
 %   \@slidesw :=G T
@@ -2201,7 +2201,7 @@ COLOR LAYER\\[.75in]%
 %\begin{verbatim}
 % \note ::=
 %  BEGIN
-%   \par\break                           
+%   \par\break
 %   \stepcounter{note}
 %   \setcounter{page}{0}                    % in case of non-slide pages
 %   if @bw = T
@@ -2322,7 +2322,7 @@ COLOR LAYER\\[.75in]%
 %
 %    We let |\familydefault| point at |\sfdefault|, to make it easier
 %    to use the document class slides with packages that set up other
-%    fonts. 
+%    fonts.
 %    \begin{macrocode}
 \renewcommand{\familydefault}{\sfdefault}
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/slides.ins b/Master/texmf-dist/source/latex/base/slides.ins
index a087b753eec..d9123b7fdd6 100644
--- a/Master/texmf-dist/source/latex/base/slides.ins
+++ b/Master/texmf-dist/source/latex/base/slides.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
@@ -86,11 +86,11 @@ extension .ins) which are part of the distribution.
 
 \preamble
 
-This is a generated file.  
+This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -100,7 +100,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file may only be distributed together with a copy of the LaTeX
@@ -125,9 +125,9 @@ the system are in the document `cfgguide.tex'.
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -137,7 +137,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file may only be distributed together with a copy of the LaTeX
diff --git a/Master/texmf-dist/source/latex/base/slifonts.fdd b/Master/texmf-dist/source/latex/base/slifonts.fdd
index cecffe67831..320a12a000b 100644
--- a/Master/texmf-dist/source/latex/base/slifonts.fdd
+++ b/Master/texmf-dist/source/latex/base/slifonts.fdd
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 %\iffalse        This is a META comment
@@ -51,7 +51,7 @@
 \documentclass{ltxdoc}
 \GetFileInfo{sfonts.drv}
 \providecommand\dst{\expandafter{\normalfont\scshape docstrip}}
-\title{The file \texttt{slifonts.fdd} for use with 
+\title{The file \texttt{slifonts.fdd} for use with
       \LaTeXe.\thanks{This file has version
            number \fileversion, dated \filedate.}}
 \date{\filedate}
@@ -133,7 +133,7 @@
 %
 % The next bit of code contains the documentation driver file for
 % \TeX{}, i.e., the file that will produce the documentation you are
-% currently reading. It will be extracted from this file by the 
+% currently reading. It will be extracted from this file by the
 % \dst{} program.
 % \changes{v2.1b}{1993/12/14}{Corrected \cs{documentclass}.}
 %    \begin{macrocode}
@@ -198,7 +198,7 @@
        }{}
 %</lccr>
 %    \end{macrocode}
-%    
+%
 % \subsection{Computer Modern Sans}
 %
 %    \begin{macrocode}
@@ -206,7 +206,7 @@
 %<!ec> \DeclareFontFamily{OT1}{lcmss}{\hyphenchar\font45 }
 %<ec>  \DeclareFontFamily{T1}{lcmss}{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{n}{%
 %<ec>  \DeclareFontShape{T1}{lcmss}{m}{n}{%
@@ -215,7 +215,7 @@
 %<ec>  eclq8%
        }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{In}{%
 %<ec>  \DeclareFontShape{T1}{lcmss}{m}{In}{%
@@ -224,7 +224,7 @@
 %<ec>  ieclq8%
        }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{sl}{%
 %<ec>  \DeclareFontShape{T1}{lcmss}{m}{sl}{%
@@ -233,7 +233,7 @@
 %<ec>  ecli8%
       }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{Isl}{%
 %<ec> \DeclareFontShape{T1}{lcmss}{m}{Isl}{%
@@ -242,19 +242,19 @@
 %<ec>  iecli8%
       }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{it}{%
 %<ec>  \DeclareFontShape{T1}{lcmss}{m}{it}{%
       <->sub*lcmss/m/sl}{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmss}{m}{Iit}{%
 %<ec>  \DeclareFontShape{T1}{lcmss}{m}{Iit}{%
       <->sub*lcmss/m/Isl}{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmss}{bx}{n}{%
 %<ec>  \DeclareFontShape{T1}{lcmss}{bx}{n}{%
@@ -263,7 +263,7 @@
 %<ec>  eclb8%
       }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmss}{bx}{In}{%
 %<ec>  \DeclareFontShape{T1}{lcmss}{bx}{In}{%
@@ -281,7 +281,7 @@
    eclo8%
       }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareFontShape{T1}{lcmss}{bx}{Isl}{%
       <13.82><16.59><19.907><23.89><28.66><34.4><41.28>%
@@ -292,7 +292,7 @@
 \DeclareFontShape{T1}{lcmss}{bx}{it}{%
       <->sub*lcmss/bx/sl}{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareFontShape{T1}{lcmss}{bx}{Iit}{%
       <->sub*lcmss/bx/Isl}{}
@@ -315,7 +315,7 @@
 %</!ec>
 %</lcmss>
 %    \end{macrocode}
-%    
+%
 % \subsection{Computer Modern Typewriter}
 %
 %    \begin{macrocode}
@@ -323,7 +323,7 @@
 %<!ec> \DeclareFontFamily{OT1}{lcmtt}{\hyphenchar\font\m@ne}
 %<ec>  \DeclareFontFamily{T1}{lcmtt}{\hyphenchar\font\m@ne}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmtt}{m}{n}{%
 %<ec> \DeclareFontShape{T1}{lcmtt}{m}{n}{%
@@ -332,7 +332,7 @@
 %<ec>  ecltt8%
       }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmtt}{m}{In}{%
 %<ec>  \DeclareFontShape{T1}{lcmtt}{m}{In}{%
@@ -341,7 +341,7 @@
 %<ec>  iecltt8%
       }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<!ec> \DeclareFontShape{OT1}{lcmtt}{m}{it}{%
 %<ec>  \DeclareFontShape{T1}{lcmtt}{m}{it}{%
@@ -363,47 +363,47 @@
 %</!ec>
 %</lcmtt>
 %    \end{macrocode}
-%    
+%
 % \subsection{Computer Modern Math}
 %
 %    \begin{macrocode}
 %<*lcmm>
 \DeclareFontFamily{OML}{lcmm}{\skewchar\font'177}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareFontShape{OML}{lcmm}{m}{it}{%
   <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>cmmi8%
       }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareFontShape{OML}{lcmm}{m}{Iit}{%
   <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>icmmi8%
       }{}
 %</lcmm>
 %    \end{macrocode}
-%    
+%
 % \subsection{Computer Modern Symbol}
 %
 %    \begin{macrocode}
 %<*lcmsy>
 \DeclareFontFamily{OMS}{lcmsy}{\skewchar\font'60}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareFontShape{OMS}{lcmsy}{m}{n}{%
   <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>cmsy8%
       }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareFontShape{OMS}{lcmsy}{m}{In}{%
   <7><8><10><12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>icmsy8%
       }{}
 %</lcmsy>
 %    \end{macrocode}
-%    
+%
 % \subsection{Computer Modern large symbols}
 %
 % \changes{v2.1g}{1994/03/01}{Removed extra pair of curly braces
@@ -415,14 +415,14 @@
        <->sfixed*[17.28]cmex10%
       }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareFontShape{OMX}{lcmex}{m}{In}{%
        <->sfixed*[17.28]icmex10%
       }{}
 %</lcmex>
 %    \end{macrocode}
-%    
+%
 % \subsection{\LaTeX{} symbols}
 %
 % \changes{v2.2d}{1997/10/20}{Removed superfluous pair of braces at
@@ -434,14 +434,14 @@
       <12><13.82><16.59><19.907><23.89><28.66><34.4><41.28>lasy8%
 }{}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \DeclareFontShape{U}{llasy}{m}{In}{%
       <13.82><16.59><19.907><23.89><28.66><34.4><41.28>ilasy8%
 }{}
 %</llasy>
 %    \end{macrocode}
-%    
+%
 % \section{Setting defaults}
 %
 %    The following statements go into the file \texttt{sfonts.def}
diff --git a/Master/texmf-dist/source/latex/base/source2e.tex b/Master/texmf-dist/source/latex/base/source2e.tex
index f6f5f8c6580..be65d79850f 100644
--- a/Master/texmf-dist/source/latex/base/source2e.tex
+++ b/Master/texmf-dist/source/latex/base/source2e.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 
 % This document will typeset the LaTeX sources as a single document.
@@ -33,7 +33,7 @@
 %
 % Some notes on processing this document are contained at the end
 % of this document, after \end{document}
-% 
+%
 % DPC 1997/11/17
 %
 % First a special index style for makeindex
@@ -256,7 +256,7 @@ page_precedence "rnaA"
  \DocInclude{preload}  % preload.ltx
 
  \DocInclude{ltfntcmd} % \textrm etc
- 
+
  \DocInclude{ltpageno} % Page numbering
 
  \DocInclude{ltxref}   % Cross referencing
@@ -380,7 +380,7 @@ or whatever...
 
 rm  -f source2e.gls source2e.ind source2e.toc
 
-# First run: 
+# First run:
 # Create new standard ltxdoc.cfg file
 # Pass the (possibly empty) list of arguments supplied on the
 # command line to article class.
@@ -427,7 +427,7 @@ latex source2e.tex
 
 # Running this script will process all the dtx fdd and *guide.tex
 # and ltnews*.tex files in the LaTeX distribution, except the dtx
-# files included in source2e.tex. 
+# files included in source2e.tex.
 # (The shell first script in the comments of source2e.tex will
 #  process those.)
 
@@ -465,7 +465,7 @@ then
 echo In source2e: $i
 else
 echo latex $i
-  if (latex $i > /dev/null) 
+  if (latex $i > /dev/null)
   then
     echo latex $i
     latex $i > /dev/null
diff --git a/Master/texmf-dist/source/latex/base/syntonly.dtx b/Master/texmf-dist/source/latex/base/syntonly.dtx
index 9c0c9676673..7479b121e7c 100644
--- a/Master/texmf-dist/source/latex/base/syntonly.dtx
+++ b/Master/texmf-dist/source/latex/base/syntonly.dtx
@@ -1,32 +1,32 @@
 % \iffalse meta-comment
 %
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2014
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
-%% \CheckSum{110}
+%% \CheckSum{113}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -57,7 +57,7 @@
 % \DoNotIndex{\toks,\toksdef,\write,\xdef,\z@}%
 %
 %
-%\title{The file \texttt{syntonly.dtx} for use with 
+%\title{The file \texttt{syntonly.dtx} for use with
 %      \LaTeXe.\thanks{This file has version
 %           number \fileversion, dated \filedate.}\\[2pt]
 %      It contains the code for \texttt{syntonly.sty}}
@@ -192,7 +192,7 @@
 %
 % \changes{v2.1b}{1995/05/25}{Removed non-outer newtoks@: newtoks is no
 %   longer outer}
-%    
+%
 % \begin{macro}{\nopages@}
 % \changes{v1.0b}{1990/01/14}{Rewrite of the \cs{nopages@} macro to
 %       correctly handle footnote insertions, floats and marginpars.}
@@ -239,6 +239,14 @@
 %    \begin{macrocode}
   \let\end@float\egroup
 %    \end{macrocode}
+%    The above would be enough also for two-column floats with the
+%   kernel algorithm. However with the refined algorithm inside
+%   \texttt{fixlxt2e} this doesn't any longer work, so there we also
+%   need to explicitly overwrite the end macro for two-column floats
+%   (the begin is still okay as it resolves to |\@xfloat| eventually).
+%    \begin{macrocode}
+  \let\end@dblfloat\egroup
+%    \end{macrocode}
 %    The redefinition of the |\marginpar| command is a bit more
 %    complicated since we have to check for the optional argument.
 %    First we redefine the command itself:
diff --git a/Master/texmf-dist/source/latex/base/syntonly.ins b/Master/texmf-dist/source/latex/base/syntonly.ins
index e66468358ce..0eb43d415e8 100644
--- a/Master/texmf-dist/source/latex/base/syntonly.ins
+++ b/Master/texmf-dist/source/latex/base/syntonly.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3b
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3b or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -40,9 +40,9 @@
 
 This is a generated file.
 
-Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+Copyright 1993-2014
 The LaTeX3 Project and any individual authors listed elsewhere
-in this file. 
+in this file.
 
 This file was generated from file(s) of the LaTeX base system.
 --------------------------------------------------------------
@@ -52,7 +52,7 @@ conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX 
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This file has the LPPL maintenance status "maintained".
@@ -65,8 +65,8 @@ The list of all files belonging to the LaTeX base distribution is
 given in the file `manifest.txt'. See also `legal.txt' for additional
 information.
 
-The list of derived (unpacked) files belonging to the distribution 
-and covered by LPPL is defined by the unpacking scripts (with 
+The list of derived (unpacked) files belonging to the distribution
+and covered by LPPL is defined by the unpacking scripts (with
 extension .ins) which are part of the distribution.
 \endpreamble
 
diff --git a/Master/texmf-dist/source/latex/base/tlc2.err b/Master/texmf-dist/source/latex/base/tlc2.err
index 712bd0b0e0c..8c26088bf38 100644
--- a/Master/texmf-dist/source/latex/base/tlc2.err
+++ b/Master/texmf-dist/source/latex/base/tlc2.err
@@ -22,7 +22,7 @@ $Id: tlc2.err 207 2013-07-12 11:04:05Z mittelba $
 \begin{filecontents}{ttcterrata.cls}
 %%
 %% Copyright (C) 1997,2004,2005,2007 Frank Mittelbach
-%% This class file is licenced under LPPL latest version; 
+%% This class file is licenced under LPPL latest version;
 %% see http://www.latex-project.org/lppl
 %
 %
@@ -32,7 +32,7 @@ $Id: tlc2.err 207 2013-07-12 11:04:05Z mittelba $
 %    Tools and Techniques for Computer Typesetting
 %
 % hence the name. However, anybody who likes to use it is free to apply it for
-% errata files of other books. 
+% errata files of other books.
 %
 % Changes:
 %
@@ -191,7 +191,7 @@ $Id: tlc2.err 207 2013-07-12 11:04:05Z mittelba $
 
 % some special shortcuts overwriting existing commands:
 
-\let\u\underline 
+\let\u\underline
 \renewcommand\>{$\to$}
 
 %%% some code suggested by Thorsten Hansen to count the number of
@@ -201,7 +201,7 @@ $Id: tlc2.err 207 2013-07-12 11:04:05Z mittelba $
 \def\count@contributors#1/#2/#3\@nil{
    \@ifundefined{c@#1}{\newcounter{#1}}{}\stepcounter{#1}%
 %%%   also count secondary:
-%%%   \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}% 
+%%%   \@ifundefined{c@#2}{\newcounter{#2}}{}\stepcounter{#2}%
 }
 
 \renewcommand\erroronpage[5]{%
@@ -218,7 +218,7 @@ $Id: tlc2.err 207 2013-07-12 11:04:05Z mittelba $
    \displayrevisionfix{#1}{#5}
    \hideamp #2 \hideamp (\textsf{#3}) \hideamp
 }
- 
+
 \renewcommand\seriouserroronpage[5]{%
    \count@contributors#3/secondary/\@nil
    \endgobble
@@ -236,7 +236,7 @@ $Id: tlc2.err 207 2013-07-12 11:04:05Z mittelba $
 }
 
 \renewcommand\contributor[2]{\makebox[1cm][l]{%
-  \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par} 
+  \sffamily#1} #2\@ifundefined{c@#1}{}{ (\arabic{#1})}\par}
 
 \end{filecontents}
 
@@ -244,12 +244,12 @@ $Id: tlc2.err 207 2013-07-12 11:04:05Z mittelba $
 \begin{filecontents}{\jobname.cfg}
 %
 %
-% Configuration file for the errata listing of 
+% Configuration file for the errata listing of
 %
 %  The LaTeX Companion, Second Edition
 %
 %
-% \erratastartdate 
+% \erratastartdate
 %
 % Specifies the date from which on errata entries should be listed.
 %
@@ -271,8 +271,8 @@ $Id: tlc2.err 207 2013-07-12 11:04:05Z mittelba $
 %    listing.
 %
 % The default below ensures that all entries relevant to the x-th
-%    printing are typeset. 
-%    
+%    printing are typeset.
+%
 %
 
 \renewcommand\myprinting{1}
@@ -357,7 +357,7 @@ you own by changing the configuration in the file \texttt{\jobname.cfg}.
 \end{center}
 
 Any mistake found and reported is a gain for all readers of our book.
-For this reason Addison-Wesley and the authors offer a prize (for 6 
+For this reason Addison-Wesley and the authors offer a prize (for 6
 periods) to the eligible person who finds the largest
 number of bugs during that period (in case of a draw a random choice
 will be made between all those with the largest number of findings).
@@ -372,7 +372,7 @@ is, no boxed sets or multiple volume offers).
 As usual, the authors and publisher reserve the right to make various
 decisions such as whether a reported feature is an error for
 competitive purposes or whether similar features count as a single or
-multiple errors.  --- 
+multiple errors.  ---
 Good luck!
 
 \begin{center}
@@ -404,9 +404,9 @@ Contest period ends & Winner \\[4pt]
    To help you in assessing this errata document we have placed
    exclamation marks in front of each entry that we consider essential
    for correctly understanding the book contents.
-   
-\erroronpage{general}{}{FMi}{2004/05/14}{} 
-   
+
+\erroronpage{general}{}{FMi}{2004/05/14}{}
+
    Due to the printing process there may be small alignment problems
    between blue and black text on some pages. These can vary from book
    to book depending on how the paper was handled between print
@@ -414,7 +414,7 @@ Contest period ends & Winner \\[4pt]
 
 
 
-\erroronpage{general}{}{FMi}{2004/07/28}{} 
+\erroronpage{general}{}{FMi}{2004/07/28}{}
    Slightly updated examples matching the second printing will be made
    available at CTAN: \texttt{info/examples/tlc2}. The book CD will
    have the original examples from the first printing.
@@ -440,7 +440,7 @@ Contest period ends & Winner \\[4pt]
    Each time a space is missing between package names in parentheses.
 
 \erroronpage{xxvii}{para 1, l.-2}{THa}{2004/06/21}{2}
-   Add: ``Thorsten Hansen (\textsf{bibunits}\u{, \textsf{multibib}}) 
+   Add: ``Thorsten Hansen (\textsf{bibunits}\u{, \textsf{multibib}})
 
 \erroronpage{xxvii}{para 4, l.2}{NBe}{2004/04/23}{2}
    Replace ``Wai Wing'' with ``Wai Wong'' (very sorry for this typo).
@@ -448,7 +448,7 @@ Contest period ends & Winner \\[4pt]
 \erroronpage{xxvii}{para 4, l.2}{MHCL/CAR}{2004/06/09}{2}
    Kai Tek airport is correctly named Kai Tak airport but the photo
    was actually taken at Hong Kong International Airport
-   
+
 \erroronpage{xxvii}{after para 4}{FMi}{2004/06/09}{2}
   Add following paragraph:
 ``Any mistake found and reported is a gain for all readers of our
@@ -599,7 +599,7 @@ the standard classes (file \texttt{classes.dtx}).''
       \thesection\par \centering#2\par}%          %   and number
      \@afterheading                               % prepare indentation handling
      \sectionmark{#1}%                            % add to running header
-     \addvspace{\baselineskip}}                   % space after heading 
+     \addvspace{\baselineskip}}                   % space after heading
 
   \newcommand\sAppendix[1]{%                      % Simplified (starred) form
     {\raggedleft\large\bfseries\appendixname\par \centering#1\par}%
@@ -625,7 +625,7 @@ the standard classes (file \texttt{classes.dtx}).''
 
 % not really a bug but ...
 \erroronpage{35}{para 1}{hajk}{2005/09/29}{}
-        Package fncychap also makes unwanted ``Chapter 0'' heading for 
+        Package fncychap also makes unwanted ``Chapter 0'' heading for
         |\chapter{Preface}| in |\frontmatter| of book.
 
   Comment: I don't really consider this a bug (as it is not surprising
@@ -671,14 +671,14 @@ the standard classes (file \texttt{classes.dtx}).''
    The lines of the ``heading text'' are wrapped at a place different
    from that indicated by the \verb=|<- \@tocrmarg ->|=.
 
-\seriouserroronpage{51}{descr. of 
+\seriouserroronpage{51}{descr. of
                  \texttt{\textbackslash
                  @pnumwidth}}{CBa}{2005/04/04}{4}
    Needs changing with |\renewcommand|!
 
-\seriouserroronpage{51}{descr. of 
+\seriouserroronpage{51}{descr. of
                  \texttt{\textbackslash @tocrmarg}}{HjG/FMi}{2004/05/20}{2}
-   Add additional sentence: 
+   Add additional sentence:
    ``It can be set to a rubber length, which results in the TOC being set
                    unjustified.''
 
@@ -720,7 +720,7 @@ Remove: ``\ldots are limited to three characters, like MS-DOS \u{or Windows}.''
 
  \erroronpage{58}{exa 2-3-8}{CBe}{2004/07/27}{2}
  km2 appears two times in the code and in the printed output;
- it should be \verb=km\textsuperscript={2} in the code 
+ it should be \verb=km\textsuperscript={2} in the code
  and km\textsuperscript{2} in the output.
 
 \erroronpage{62}{l.-11}{HjG}{2004/05/21}{2}
@@ -746,7 +746,7 @@ Remove: ``\ldots are limited to three characters, like MS-DOS \u{or Windows}.''
 
 \erroronpage{75}{para -1, l.2}{CKr}{2004/10/17}{4}
    Change: ``provided the \textit{keys}'' \>
-           ``provided the \textit{key}\u{s}'' 
+           ``provided the \textit{key}\u{s}''
 
 \seriouserroronpage{76}{para -2, l.5--8}{DAr/FMi}{2004/07/24}{2}
 Change marginal to ``{\itshape Unnumbered sections get moving
@@ -760,7 +760,7 @@ moving arguments, \ldots''
    Add:  ``In addition,  no \u{unrelated} |\addcontentsline| command is
 allowed to intervene between heading and label.''
 
-\erroronpage{78}{\S 2.4.5, l.1}{HjG}{2004/05/24}{2} 
+\erroronpage{78}{\S 2.4.5, l.1}{HjG}{2004/05/24}{2}
    Add: ``Sebastian
    Rahtz \u{(with contributions by Heiko Oberdiek and
    David Carlisle)} has developed\ldots''
@@ -773,7 +773,7 @@ allowed to intervene between heading and label.''
 
 \erroronpage{84}{}{DAr}{2004/07/23}{2}
 Change: ``For example, if the current size is \u{\ttfamily\textbackslash Large} then
-\verb=\relsize{-2}= would change to \u{\ttfamily\textbackslash normalsize}\,. 
+\verb=\relsize{-2}= would change to \u{\ttfamily\textbackslash normalsize}\,.
 
 \seriouserroronpage{84}{exa 3-1-7}{FMi}{2004/04/23}{2}
    To avoid extra space in the output, second line should read:\\
@@ -793,9 +793,9 @@ Change: ``For example, if the current size is \u{\ttfamily\textbackslash Large}
 
 \erroronpage{87}{exa. 3-1-16}{DHL}{2004/06/07}{2}
     The solid band produced by |\xout| is actually supposed to come
-    out as a series of separated ``/'' symbols. With the 
+    out as a series of separated ``/'' symbols. With the
     \texttt{ulem} package used for the first printing that works well
-    for most text fonts, but 
+    for most text fonts, but
     with Times Roman (used in the example) you get the result shown.
     The new package version fixes this defect.
 
@@ -855,7 +855,7 @@ highlighting color\u{ as demonstrated below}:
 
 \erroronpage{117}{para 3, l.3}{CBC}{2004/05/18}{2}
    Tense correction: ``\ldots they did not change when the text font
-   \u{was} modified''. 
+   \u{was} modified''.
 
 \erroronpage{117}{para 3,l.-3}{FMi}{2004/05/31}{2}
     Change: ``your list consist of'' \> ``your list\u{s} consist of''.
@@ -876,11 +876,11 @@ highlighting color\u{ as demonstrated below}:
 \erroronpage{124}{middle para, ll. -3/-2}{HjG}{2004/05/26}{2}
    Missing word: ``It is even possible \u{to} use \ldots''
 
-\iffalse 
+\iffalse
 %% only do if real error on page
 \erroronpage{125}{para 3 of \S 3.2.7, ll.-2/-1}{HjG}{2004/05/26}{}
    Word position: ``\ldots\ whenever |\endnote| or |\endnotemark|
-   \u{is used} without an optional argument.'' 
+   \u{is used} without an optional argument.''
 \fi
 
 \erroronpage{127}{para 3, l.last}{PYu}{2004/07/01}{2}
@@ -943,11 +943,11 @@ similar after the |\\| to prevent an underfull hbox-warning.
 
 \erroronpage{156}{para -1, l.4}{CBC}{2004/05/20}{2}
   Change: ``There is also the possibility to operate'' \> ``It is also
-  possible to operate''. 
+  possible to operate''.
 
 \erroronpage{157}{para 2, l.-4}{CBC}{2004/05/20}{2}
   Change: ``\ldots discussed below) are potentially'' \> ``\ldots
-  discussed below) \u{is} potentially''. 
+  discussed below) \u{is} potentially''.
 
 \erroronpage{158}{para3, l.3}{DHL/FMi}{2004/06/07}{2}
    Change word: ``tiny white rules \u{behind} the lines'' \> ``tiny white
@@ -1044,11 +1044,11 @@ similar after the |\\| to prevent an underfull hbox-warning.
 \CHAPTER{Chapter 4}
 
 \erroronpage{196}{table 4.2}{YiL}{2012/05/07}{}
-  The values shown in the table aren't any quite correct. These days 
-  some of them are calculated depending on the chosen paper size option 
+  The values shown in the table aren't any quite correct. These days
+  some of them are calculated depending on the chosen paper size option
   and so have slightly different values from what is listed in the table.
   The values listed are those that have been used in 2.09 (i.e., they
-  would be fully correct in compatibility mode, that is for documents 
+  would be fully correct in compatibility mode, that is for documents
   starting with |\documentstyle|).
 
 \erroronpage{199}{code block}{UFi}{2004/07/31}{2}
@@ -1076,7 +1076,7 @@ similar after the |\\| to prevent an underfull hbox-warning.
 
 \erroronpage{205}{para 4, l.4}{CAR}{2004/06/06}{2}
    Delete word: ``\ldots taken up by the binding\u{ method}. For
-   example,\ldots'' 
+   example,\ldots''
 
 \erroronpage{205}{para 5, l.2}{CBC}{2004/05/21}{2}
 Omitted word: ``one can \u{perform} the parameter calculations''.
@@ -1101,7 +1101,7 @@ Add a comment line: ``\verb=% syntax: \typearea[<binding corr.>]{<slices>}=''
 \erroronpage{209}{para 1, l.1--2}{BMo}{2004/05/16}{2}
    Replace:
    ``\ldots  and does not leave sufficient space for marginal notes
-   that fall outside the page.''  
+   that fall outside the page.''
    \>
    ``\ldots but does not adjust the size of the marginal boxes to fit
    in the remaining margin.''
@@ -1152,7 +1152,7 @@ Add a comment line: ``\verb=% syntax: \typearea[<binding corr.>]{<slices>}=''
    ``Table~9.2 on page~547 in Section~\u{9.2.1}''
    (or omit section refence completely)
 
-\erroronpage{223}{tab 4.3}{THa}{2004/06/22}{2}  
+\erroronpage{223}{tab 4.3}{THa}{2004/06/22}{2}
   Spurious space after superscript \textsuperscript{a} in footnote.
 
 \erroronpage{226}{para. 5, l.2}{PYu}{2004/07/05}{2}
@@ -1173,7 +1173,7 @@ Add a comment line: ``\verb=% syntax: \typearea[<binding corr.>]{<slices>}=''
 
 \erroronpage{229}{2.-1}{CBC}{2004/05/24}{2}
  Change: ``if the first B-head\ldots would have already been'' \> ``if
- the first B-head\ldots had already been''. 
+ the first B-head\ldots had already been''.
 
 \erroronpage{229}{para -2,l.-2}{HjG}{2005/05/09}{4}
    Replace:
@@ -1194,13 +1194,13 @@ Add a comment line: ``\verb=% syntax: \typearea[<binding corr.>]{<slices>}=''
 
 \seriouserroronpage{234}{First boxed command}{CBC}{2004/05/24}{2}
   Change: ``\verb=\enlargethispage*{=size\verb=}='' \>
-  ``\verb=\enlargethispage{=size\verb=}=''. 
+  ``\verb=\enlargethispage{=size\verb=}=''.
 
 \erroronpage{237}{para 1, l.3}{MKo}{2004/08/06}{2}
  Change: ``\textsf{scrpage}'' \> ``\textsf{scrpage2}''
 
 \erroronpage{237}{para 4, l.3}{DAl}{2005/01/11}{4}
-   Change: ``also works as \u{an} replacement'' \> ``also works as 
+   Change: ``also works as \u{an} replacement'' \> ``also works as
  \u{a} replacement''
 
 \erroronpage{237}{para 5, l.2}{CBe}{2004/07/27}{2}
@@ -1222,7 +1222,7 @@ the \verb|\kill| command.
 \erroronpage{242}{para -2}{DSch/FMi}{2005/09/19}{4}
   Replace para with:
 ``The \texttt{tabular*} environment has an additional width argument that
-specifies the required total width of the table. 
+specifies the required total width of the table.
 It needs stretchable spaces between columns, that have to be added using
 |\extracolsep|  (see page~246).''
 
@@ -1242,7 +1242,7 @@ It needs stretchable spaces between columns, that have to be added using
  environments. If all the cells of the row are smaller than the strut the effect
  is more or less similar to an enlargement of the inter-row space, while if at
  least one cell in the row is larger than the strut no spreading apart takes
- place other than that required by the largest cell. 
+ place other than that required by the largest cell.
 
 
 
@@ -1260,7 +1260,7 @@ It needs stretchable spaces between columns, that have to be added using
  Replace:   ``the sum of its value,
    added to the product
    |\baselineskip|${}\times{}$|\arraystretch}|''
- \> 
+ \>
  `` $|\arraystretch| \times (|\extrarowheight| + 0.7 |\baselineskip|)$''
 
 
@@ -1280,7 +1280,7 @@ It needs stretchable spaces between columns, that have to be added using
  Replace para with: ``A
  common use of |@{}| is to remove the space equal to
 the value of |\tabcolsep| (for \texttt{tabular}) that, by default,
-appears on each side of the table, 
+appears on each side of the table,
 except when the column specification starts or ends in a \verb=|=.''
 
 
@@ -1356,7 +1356,7 @@ Replace with: ``We then continue by
   explaining how you can define and use your own floating environments (Section~6.3.1),
   or, conversely, how captioning commands can  be used  to enter
   information into the list of figures and tables for nonfloating
-  material (Section~6.3.2). 
+  material (Section~6.3.2).
   Then methods for rotating the content of a float are described
   (Section~6.3.3).
 
@@ -1366,7 +1366,7 @@ Replace with: ``We then continue by
 
 \erroronpage{285}{item 3, l.3}{FMi}{2005/02/13}{4}
    Use typewriter:  ``the default is \texttt{12pt}
-   \texttt{plus} \texttt{2pt} \u{\texttt{minus}} 
+   \texttt{plus} \texttt{2pt} \u{\texttt{minus}}
      \texttt{2pt} for 10\,pt''
 
 \erroronpage{285}{item 3, l.3}{HjG}{2005/02/06}{4}
@@ -1388,7 +1388,7 @@ Replace with: ``We then continue by
 ``However, by itself this option
 forces all floats to appear \emph{before} the next section material is
 typeset, since the |\FloatBarrier| prevents a float from a current
-  section from appearing below 
+  section from appearing below
 the start of the new section, even if some material of the current
 section is present on the same page. ''
 
@@ -1474,7 +1474,7 @@ The Runaway error may be explained in a better way: the
 \fi
 
 \erroronpage{309}{para 4, l.3}{DAl}{2005/06/29}{4}
-   Missing comma: ``\ldots you will get a typical ``standard \LaTeX''  
+   Missing comma: ``\ldots you will get a typical ``standard \LaTeX''
    format\u{,} that is, \ldots''
 
 \erroronpage{312}{\texttt{position} option}{JS/FMi}{2005/09/14}{4}
@@ -1482,7 +1482,7 @@ The Runaway error may be explained in a better way: the
 
 \erroronpage{312}{para 2, l.2}{DAl}{2005/06/29}{4}
     Word in wrong position:  ``for example, ``above'' the caption if
-    caption is \u{the} placed at the bottom.'' 
+    caption is \u{the} placed at the bottom.''
  \>
    ``for example, ``above'' the caption if \u{the} caption is \ldots''
 
@@ -1510,9 +1510,9 @@ Remove: ``approach is to \u{to} specify\ldots''
 
 \CHAPTER{Chapter 7}
 
-\erroronpage{332}{para -2,l.2}{THa}{2004/07/21}{2}  
+\erroronpage{332}{para -2,l.2}{THa}{2004/07/21}{2}
   SinCE SEriFS arE noT alwayS horizonTaL: ``Serifs are the tiny
-  horizontal strokes\dots'' \> ``Serifs are the tiny strokes\dots''  
+  horizontal strokes\dots'' \> ``Serifs are the tiny strokes\dots''
 
 \erroronpage{338}{para -1, l.3}{HjG}{2004/06/29}{2}
    Missing word: ``command \u{and} declarative forms''
@@ -1668,7 +1668,7 @@ Modern Typewriter.
     Missing space between ``m,'' and ``bx'' in the middle column.
 
 \erroronpage{391}{tab. 7.15}{FMi}{2004/07/09}{2}
-   Row~1: Thickness of vertical line between first two columns too 
+   Row~1: Thickness of vertical line between first two columns too
    wide (printing problem).
 
 \erroronpage{391}{tab 7.15, l.-2}{RPa}{2004/09/14}{4}
@@ -1725,7 +1725,7 @@ Modern Typewriter.
  ``local guide''; I believe this is an obsolete concept, dating back to
  the times when \TeX\ and \LaTeX\ were used on multitasking mainframes;
  commercial distributions might still have a ``local guide'', but I have never
-  seen one. 
+  seen one.
 
 
 \erroronpage{414}{footnote}{hv}{2008/10/30}{}
@@ -1774,7 +1774,7 @@ These days the package |pst-char| has been integrated into  |pst-text|.
 
 \erroronpage{428}{item 6}{CKr}{2005/01/18}{4}
    Replace: ``Specified the quad width'' \> ``Specifie\u{s} the quad
-   width'' 
+   width''
 
 \erroronpage{432}{para 4, l.9}{HjG}{2004/07/11}{2}
    Not plural: ``\ldots: the outer text size\u{s} and the three math
@@ -1785,7 +1785,7 @@ These days the package |pst-char| has been integrated into  |pst-text|.
    ``\u{a}nd are usually placed in an \texttt{.fd} file.''
 
 \erroronpage{441}{para 5, l.1}{MKu/FMi}{2004/06/24}{2}
-   Replace: UTF8 \> UTF-8 
+   Replace: UTF8 \> UTF-8
 
 \erroronpage{442}{footnote, l.2}{usw}{2005/01/11}{4}
    Sentence begins with lowercase 's'.
@@ -1800,7 +1800,7 @@ produce a straight double quote, i.e., ")''
      \u{such a} way that \ldots''
 
 \erroronpage{444}{para 2, l.4}{DAl}{2005/08/01}{4}
-   Missing word: ``\ldots associates the number 224 \u{with} the  
+   Missing word: ``\ldots associates the number 224 \u{with} the
 command |\alpha|.''
 
 \erroronpage{445}{para 4, ll.3--5}{HjG}{2004/07/12}{2}
@@ -1816,14 +1816,14 @@ command |\alpha|.''
                   math glyph---comprehensible?
 
 \erroronpage{447}{Heading}{MKu/FMi}{2004/06/24}{2}
-   Replace: UTF8 \> UTF-8 
+   Replace: UTF8 \> UTF-8
 
 \erroronpage{451}{para 4, l.2}{HjG}{2004/07/12}{2}
    Wrong number:
    ``\texttt{\u{'240}} octal'' \> ``\texttt{\u{'344}} octal''
 
 \erroronpage{453}{para 2, l.2}{DAl}{2005/08/01}{4}
-   Missing word : ``\ldots an \emph{LICR-object} that is \u{to} be  
+   Missing word : ``\ldots an \emph{LICR-object} that is \u{to} be
 used whenever\ldots''
 
 \erroronpage{455}{para 3, l.-1}{JCh}{2004/07/17}{2}
@@ -1835,13 +1835,13 @@ used whenever\ldots''
    |\OE| $\leftrightarrow$ |\O| -- cf.\ |\o| and |\oe| on p.459
 
 \erroronpage{457}{tab. 7.33}{HjG}{2004/07/12}{2}
-   Entry |\`i|: ``(\u{avail})'' \> ``(\u{alias})'' 
+   Entry |\`i|: ``(\u{avail})'' \> ``(\u{alias})''
 
 \erroronpage{458}{\texttt{\string\copyright}}{FMi/usw}{2005/01/11}{4}
  Natively available in LY1 encoding
 
 \seriouserroronpage{458}{l. 27--30}{JLV}{2005/05/31}{4}
- Unfortunately |\guillemotleft|, |\guillemotright|, |\guilsinglleft|, and 
+ Unfortunately |\guillemotleft|, |\guillemotright|, |\guilsinglleft|, and
  |\guilsinglright| have no ``default'' and only function in |OT1| if
  \textsf{babel} is loaded
 
@@ -1900,7 +1900,7 @@ used whenever\ldots''
 \erroronpage{463}{para 1, l.2}{HjG}{2004/06/28}{2}
    Change:
    ``\ldots integrated in \u{1993})'' \>
-   ``\ldots integrated in \u{1994})'' 
+   ``\ldots integrated in \u{1994})''
 
 
 \CHAPTER{Chapter 8}
@@ -2002,7 +2002,7 @@ Poor Maxwell's equations! No doubt there are mathematical
 \erroronpage{500}{page}{FMi}{2004/04/23}{}
    Printing problem: blue color not properly aligned.
 \fi
-  
+
 \erroronpage{501}{exa 8-6-4}{HjG}{2004/06/21}{2}
    Surplus word (in source comment):\\
    ``\texttt{\% the old \u{the} definition of \textbackslash csc}''
@@ -2122,7 +2122,7 @@ Poor Maxwell's equations! No doubt there are mathematical
    The |fleqn| option is used, but in the output, the two equations
    seem to be right aligned rather than left aligned!\\
    Indeed true: this is because  in \textsf{amsmath} the |\mathindent|
-   added on the left is 
+   added on the left is
    actually a rubber length (see page 471) that is automatically
    shortend if there is not enough space.
 
@@ -2157,7 +2157,7 @@ Change: ``The unaccented ASCII Latin letters and Arabic
    Printing problem: blue color not properly aligned.
 \fi
 
- \erroronpage{527}{table 8.10}{BMo/CAR}{2004/05/21}{2} 
+ \erroronpage{527}{table 8.10}{BMo/CAR}{2004/05/21}{2}
          This table would be
          better if reordered, in particular so that the first row
          contains: \verb=\aleph \beth \gimmel \daleth=.  This would
@@ -2167,7 +2167,7 @@ Change: ``The unaccented ASCII Latin letters and Arabic
 
 \erroronpage{527,528}{table 8-10/11}{FMi}{2006/08/09}{s}
    Added the missing symbol from amssymb: |\circledR|, |\yen|,
-   |\checkmark|, and |\maltese|. 
+   |\checkmark|, and |\maltese|.
 
   The general distribution of symbols between the two tables is a bit
   questionable, but this will stay as it is.
@@ -2178,7 +2178,7 @@ Change: ``The unaccented ASCII Latin letters and Arabic
 
 \erroronpage{528}{table 8.11}{LHe}{2008/02/08}{}
     |\dag| and |\ddag| are |\mathord|s not |\mathbin| as claimed in table
-    8.13. 
+    8.13.
 
 
 \seriouserroronpage{529}{table 8.12, l.3}{JGr}{2004/06/10}{2}
@@ -2283,12 +2283,12 @@ Plural: ``Clearly, 8 bits \u{are} not sufficient\ldots''
     newzealand})''
 
     Add footnote: ``\textit{The option \texttt{\upshape english}
-  combines American hyphenation patterns 
-  with a British date format.}''  
+  combines American hyphenation patterns
+  with a British date format.}''
 
 
 \erroronpage{545}{exa 9-2-1}{JAn}{2005/09/09}{4}
-  The quotes surrounding R\'ef\'erences and Chapitre 
+  The quotes surrounding R\'ef\'erences and Chapitre
   should be the french ones: use |\og| and |\fg{}|. And similar those
   around German words should use |"`| and |"'|.
 
@@ -2353,7 +2353,7 @@ to show the differences between |"-|, |\-|, and no hyphen.
         and ``|~N~|\meta{letter}'' \> ``|~N|''
 
 \erroronpage{554}{exa 9-3-11}{UFi/MGo}{2004/06/03}{2}
- Replace body with: 
+ Replace body with:
    ``|En fran\c{c}ais on doit mettre un \fg petit espace\fg\|
      |devant la ponctuation double: comme cela!|
      \ldots''
@@ -2543,8 +2543,8 @@ The line:\\
  Replace ``\textsf{bang}'' with ``\textsf{bengali}''.  This
  package is available on CTAN in the \textsf{languages/bengali/pandey}.
 
-\seriouserroronpage{592}{para 3, l.4 }{PPN}{2004/05/25}{2} 
-  Replace ``\textsf{denag}'' with ``\textsf{devnag}''.  
+\seriouserroronpage{592}{para 3, l.4 }{PPN}{2004/05/25}{2}
+  Replace ``\textsf{denag}'' with ``\textsf{devnag}''.
   This package is on CTAN \texttt{languages/devanagari/velthuis}.
 
 \erroronpage{592}{para 5, l.1}{CKr}{2004/10/15}{4}
@@ -2552,7 +2552,7 @@ The line:\\
 
 \erroronpage{592}{general remarks}{PPn}{2004/05/25}{}
 Additional remarks not for inclusion in the book: For \TeX{}, \LaTeX{}
-in languages of India, 
+in languages of India,
 there are several nice packages.  An overview can be found in the
 following {\sc TUGboat} Articles;
 
@@ -2733,7 +2733,7 @@ some of the listed drivers are only of historical interest.
 \erroronpage{620}{para 5, l.2}{FMi}{2005/04/27}{4}
    Replace:
    ``\ldots in the \u{optional arguments}.'' \>
-   ``\ldots in the \textit{key/val-list}.'' 
+   ``\ldots in the \textit{key/val-list}.''
 
 %\erroronpage{621}{page}{FMi}{2004/04/23}{}
 %   Printing problem: blue color not properly aligned.
@@ -2805,7 +2805,7 @@ some of the listed drivers are only of historical interest.
   The variable parts do not show the right fonts.
 
 \erroronpage{641}{para 3, l.1}{ReSt}{2005/04/17}{4}
-  Remove: ``The |\Curve| command\u{s} is similar\ldots'' 
+  Remove: ``The |\Curve| command\u{s} is similar\ldots''
 
 \erroronpage{641}{para 3, l.2}{HjG}{2004/06/07}{2}
    Second occurrence of mandatory argument should use the same font as
@@ -2832,7 +2832,7 @@ some of the listed drivers are only of historical interest.
 \erroronpage{643}{para 4, l.5}{CBe}{2004/07/27}{2}
 Add: ``\ldots can be converted to PDF by
 ImageMagick's \texttt{convert} utility\u{, \texttt{eps2pdf}} (\u{both
-of} which call \texttt{ghostscript} 
+of} which call \texttt{ghostscript}
 internally), \texttt{Acrobat Distiller}, or\ldots''
 
 \erroronpage{646}{l.1}{HjG/FMi}{2004/06/08}{2}
@@ -2855,7 +2855,7 @@ page several output files are generated.)''
 \seriouserroronpage{654}{para 2 l.7}{UFi}{2004/06/01}{2}
   Missing |}|:  ``like
   |\index{\texttt{|\emph{key}|}|\u{\texttt{\textbraceright}} and''
-                                
+
 
 
 %That's a nice one: somehow the copy-editor has but the output is one
@@ -2897,7 +2897,7 @@ The source has now been edited to match the printed output.
 
 
 \erroronpage{656}{}{CBe}{2004/07/27}{s}
-   How horrible the page rotated counterclockwise! 
+   How horrible the page rotated counterclockwise!
 
 \erroronpage{657}{\texttt{-p} item, l.-1}{HjG}{2004/06/10}{2}
    Add word: ``\ldots the three \u{special} cases \ldots''
@@ -2906,7 +2906,7 @@ The source has now been edited to match the printed output.
  Swap the words ``single'' and ``double''
 
 \iffalse
-% not a bug make it look nicer 
+% not a bug make it look nicer
 \erroronpage{661}{tab. 11.2, right col.}{HjG}{2004/06/10}{}
    Inter-line spacing in multiple-line entries ???\\(Keywords:
    |headings_flag|, |item_x1|, |delim_0|, |page_precedence|)
@@ -2939,7 +2939,7 @@ page 666 changed to reflect rnaRA:\\
 `` \ldots\ assumes that pages numbered with lowercase Roman
 numerals precede those numbered with Arabic numerals, which in turn
 precede those numbered with the lowercase alphabet, uppercase Roman
-numerals and finally the uppercase alphabet. 
+numerals and finally the uppercase alphabet.
 
 
 \seriouserroronpage{661/664-5}{}{FMi}{2005/08/14}{4}
@@ -2955,8 +2955,8 @@ numerals and finally the uppercase alphabet.
 
 
 \seriouserroronpage{666}{para 4 l.5 and l.6}{UFi}{2004/06/01}{2}
-  Add extra visual space in second index: ``Likewise, 
-  \verb*=\index{a space}= and 
+  Add extra visual space in second index: ``Likewise,
+  \verb*=\index{a space}= and
   \verb*=\index{a  space}= produce\ldots''
 
 \erroronpage{668}{boxed text}{HjG}{2004/06/10}{2}
@@ -2981,15 +2981,15 @@ numerals and finally the uppercase alphabet.
    Section~11.3.4.
 
    Be aware that producing index entries in arguments of commands has
-   its own pitfalls, e.g., in 
-   \verb=\command{Properties of \Prog\index{\Prog}}=.  
+   its own pitfalls, e.g., in
+   \verb=\command{Properties of \Prog\index{\Prog}}=.
    Then \LaTeX{} commands might be expanded
    before they are written to the \texttt{idx} file and the placement
    in the index will depend on the expansion of \verb=\Prog=.''
 
 \erroronpage{669}{para -2, l.3}{MKu/FMi}{2004/07/01}{2}% already done by fmi
    Add: ``\ldots \verb|\usepackage[latin1]{inputenc}| to all her
-   documents \u{(or on recent Linux distributions the 
+   documents \u{(or on recent Linux distributions the
    option \texttt{utf8})}, while\ldots''
 
 \erroronpage{669}{section 11.3.2, para 2, L.3}{JMH}{2005/08/06}{4}
@@ -3057,7 +3057,7 @@ order to have the desired effect.
 
 \CHAPTER{Chapter 12}
 
-\erroronpage{general}{several pages}{HVo/FMi}{2004/05/21}{} 
+\erroronpage{general}{several pages}{HVo/FMi}{2004/05/21}{}
     The German word  ``Schuldrecht'' is incorrectly hyphenated as
     ``Schul\-drecht'' in several examples due to the fact that English
     hyphenation patterns are used unless the language is
@@ -3146,7 +3146,7 @@ it may result in \u{a normal space,} some extra space\u, or in starting a new li
    Add: ``when using \u{the} \texttt{chicago} \u{\BibTeX\ style}.''
 
 \seriouserroronpage{710}{para 4, l.2}{BMo}{2004/05/16}{2}
-      Replace: 
+      Replace:
       ``locate the printed version.'' \> ``locate the
      article within the journal.''
 
@@ -3161,7 +3161,7 @@ Add word: ``If you \u{only} want to specify an \textit{annotator},
   Extra word:  ``the \u{the} journal'' \\
   Correct explanation:  ``\ldots the journal name\u{, volume number,}
   and year of publication, which is why we got ``TUGboat \u{10
-  [}1989\u]''.'' 
+  [}1989\u]''.''
 
 \seriouserroronpage{719}{syntax box}{HjG/FMi}{2004/06/14}{2}
    Order of optional arguments are like |\cite| (i.e., swapped):\\
@@ -3185,7 +3185,7 @@ Add word: ``If you \u{only} want to specify an \textit{annotator},
 
 \seriouserroronpage{727}{para 3, l.-3}{JBe}{2004/06/01}{2}
   Replace: \texttt{\textbackslash jbnovarioref} \>
-  \texttt{\textbackslash jbignorevarioref} 
+  \texttt{\textbackslash jbignorevarioref}
 
 \erroronpage{727}{examples 12-5-21/22}{FMi}{2004/06/03}{2}
   Not wrong, but it looks funny: due to the chosen example height the
@@ -3208,9 +3208,9 @@ Add word: ``If you \u{only} want to specify an \textit{annotator},
  was changed to contain a slightly different set of citations (same
  change was made to example 12-5-27):
 \begin{verbatim}
-  Full citations: \cite{aschur} \cite{bschur} 
+  Full citations: \cite{aschur} \cite{bschur}
   not shown on the left!
-\newpage 
+\newpage
   text \cite[\S\,7]{aschur} text
   \cite[\S\,8]{aschur} \cite[\S\,16]{zpo}
   text \cite[\S\,7]{bschur} \cite{aschur}
@@ -3222,7 +3222,7 @@ And the text above the example was changed as follows:
 explicitly), then the following happens: the first citation of a
 publication automatically displays the full entry (citation~5 in the
 next example).  In case of repeated citations to unambiguous works
-only the name of the author(s) are shown (citation~8). For ambiguous citations 
+only the name of the author(s) are shown (citation~8). For ambiguous citations
 this will be done only for immediately following citations
 (citation~4). However, if there are
 intervening citations, then the name(s) and short titles are shown
@@ -3248,7 +3248,7 @@ Replace: ``in which case \u{the first} cross-reference \ldots''
 
 \seriouserroronpage{743}{item 3}{UFi}{2004/05/27}{2}
  Equal sign missing: \texttt{sortkey\u{ = }"Bismarck, Otto von"}.
- 
+
 \erroronpage{744}{exa 12-5-48/49}{HjG}{2004/06/15}{}
    There's a spurious space before all occurrences of
    ``\textsc{D. E. Knuth}''! \\ This is (partly, ie in the footnote)
@@ -3269,19 +3269,19 @@ Replace: ``in which case \u{the first} cross-reference \ldots''
    Replace (`bibtopic' column, row 4; `multibib' column, row 7):\\
    ``no'' \> ``No''
 
-\erroronpage{746}{Tab. 12.2}{THa}{2004/06/21}{2}  
+\erroronpage{746}{Tab. 12.2}{THa}{2004/06/21}{2}
   Change ``Requires tailored .bib files''  \> ``Works with standard
-  .bib files'' 
+  .bib files''
   (and change matching row entries)
 
-\erroronpage{746}{Tab. 12.2}{THa}{2004/06/21}{2} 
+\erroronpage{746}{Tab. 12.2}{THa}{2004/06/21}{2}
   Change: ``Above typeset together somewhere'' \>
  ``Group bibliographies together''
 
-\erroronpage{749}{para -1, l.1}{THa}{2004/06/22}{2} 
+\erroronpage{749}{para -1, l.1}{THa}{2004/06/22}{2}
   Missing accents: ``Jose Alberto Fernandez'' \> ``Jos\'e Alberto
-  Fern\'andez'' 
-  
+  Fern\'andez''
+
 \erroronpage{750}{para -3, l.-2}{CKr}{2005/03/31}{4}
  Delete surplus word: ``\ldots as \u{the} the auxiliary files would be
  overwritten.''
@@ -3293,7 +3293,7 @@ Replace: ``in which case \u{the first} cross-reference \ldots''
 \erroronpage{753}{para 4, l.5}{HjG}{2004/06/15}{2}
    Replace: ``|\bibliography|'' \> ``|\bibliographystyle|''
 
-\seriouserroronpage{755/756}{}{THa}{2004/06/21}{2}  
+\seriouserroronpage{755/756}{}{THa}{2004/06/21}{2}
   Wrong limitation of multibib: The whole passage from ``A final
   difference'' up to  ``|nocite|.'' should be replaced with something
   like: ``The multibib package (since version 2.3 of 2004/01/24) is
@@ -3477,7 +3477,7 @@ under the new name \textsf{JabRef}.''
    \texttt{apa.bst} -- add:
        ``American Psychology Association \u{\BibTeX\ style}'' \\
    \texttt{jmb.bst} -- add:
-       ``\emph{Journal of Molecular Biology}  \u{\BibTeX}\ style''\\ 
+       ``\emph{Journal of Molecular Biology}  \u{\BibTeX}\ style''\\
    Some journal names are written in italic, other's aren't:
        Astronomy; Behavioral and Brain Sciences; Human Biology.
 
@@ -3538,7 +3538,7 @@ under the new name \textsf{JabRef}.''
    Remove surplus word: ``\ldots, then it is all that \u{it} is necessary.''
 
 \erroronpage{800}{Citation scheme,l.2}{DAl}{2005/09/03}{4}
-    Replace letter: ``\ldots different questions th\u{a}n if you  
+    Replace letter: ``\ldots different questions th\u{a}n if you
  choose\ldots''
 
 \erroronpage{802}{para 2, l.4}{HjG}{2004/06/17}{2}
@@ -3547,7 +3547,7 @@ under the new name \textsf{JabRef}.''
 \erroronpage{802}{para -1, l.3}{FMi}{2005/06/02}{4}
    Replace wrong braces:
     ``|\urlprefix\url[|\textit{field-value}|]|'' \>
-    ``|\urlprefix\url{|\textit{field-value}|}|'' 
+    ``|\urlprefix\url{|\textit{field-value}|}|''
 
 \erroronpage{803}{para -2, l.2}{HjG}{2004/06/17}{2}
    Replace: ``in the second phase of the \u{formatting}'' \>
@@ -3574,7 +3574,7 @@ under the new name \textsf{JabRef}.''
    Replace: ``at the beginning of this section'' \>
             ``on the facing page''
 
-            
+
 
 \CHAPTER{Chapter 14}
 
@@ -3593,8 +3593,8 @@ under the new name \textsf{JabRef}.''
 \erroronpage{816}{para -3, l.4+}{HOb}{2004/05/28}{2}
  Change sentence:
   Note that \u{such short forms for \texttt{\textbackslash verb},
- just} like \texttt{\textbackslash verb} itself, 
- cannot appear in the argument of another command, but 
+ just} like \texttt{\textbackslash verb} itself,
+ cannot appear in the argument of another command, but
  \u{the characters} may be used
  freely inside \texttt{verbatim} and \texttt{macrocode} environments.
 
@@ -3609,7 +3609,7 @@ asked for, and lines 1, \u{3}, and 4 otherwise.''
   Entries not sorted correctly: swap |\CheckSum| and |\CheckModules|
 
 \seriouserroronpage{821}{descr.\ of
-           \ttfamily\textbackslash DeleteShortVerb}{UFi}{2004/05/23}{2} 
+           \ttfamily\textbackslash DeleteShortVerb}{UFi}{2004/05/23}{2}
  \verb=\MakeshortVerb= should be \verb=\Make=\u{S}\texttt{hortVerb}\\
  \verb=\MakeshortVerb*= should be \verb=\Make=\u{S}\texttt{hortVerb*}
 
@@ -3674,7 +3674,7 @@ asked for, and lines 1, \u{3}, and 4 otherwise.''
    Editorial comment: reprinted because of pagebreak changes.
 
 \erroronpage{828}{para 3, l.2}{DHL}{2004/05/16}{2}
-   Extra word: ``If so, \u{case}'' \> ``If so,'' 
+   Extra word: ``If so, \u{case}'' \> ``If so,''
 
 \seriouserroronpage{829}{syntax box}{HOb}{2004/05/29}{2}
    |\preamble|, |\endpreamble|, |\postamble|, and |\endpostamble| all
@@ -3725,7 +3725,7 @@ asked for, and lines 1, \u{3}, and 4 otherwise.''
   Missing \texttt{*}: |\DeclareDir|\u{\texttt{*}}|{tex/bibtex/...|
 
 \erroronpage{832}{code blocks}{DPa}{2004/08/04}{2}
-  Three instances of |tex/bibtex| in |\DeclareDir| should lose the |tex/| to 
+  Three instances of |tex/bibtex| in |\DeclareDir| should lose the |tex/| to
   conform to TDS and change made on page 831
 
 \erroronpage{832}{2. code block}{MSch}{2006/01/06}{s}
@@ -3815,7 +3815,7 @@ is not recognized as the start of a \texttt{figure*} environment}.''
 
 
 \erroronpage{843}{para 3, l.2}{YvH}{2004/05/28}{2}
-   Missing word: ``and |\z@| contain |@| \u{in} their name'' 
+   Missing word: ``and |\z@| contain |@| \u{in} their name''
 
 \erroronpage{843}{para 4, l.3}{PYu}{2004/07/03}{2}
    Change: ``to do: the difficult''  \>  ``to do\u; the difficult''
@@ -3848,7 +3848,7 @@ Replace: ``An error is raised if the definitions differ, ldots''
 
 \erroronpage{851}{para 5, l.-2}{FMi}{2004/07/20}{2}
   Add + change font: ``It also defines \u{the command}
-  |\the|\u{\textit{newctr}} to\ldots'' 
+  |\the|\u{\textit{newctr}} to\ldots''
 
 \erroronpage{852}{code block 1, l.2}{JGr}{2004/06/10}{2}
    Second \verb=\makeatletter= should be \verb=\makeatother=
@@ -3869,7 +3869,7 @@ Change:
 
 
 \erroronpage{853}{l.6}{THa/FMi}{2004/06/23}{2}
-  Missing space: ``c,\u{~}\dots, z'' 
+  Missing space: ``c,\u{~}\dots, z''
 
 \erroronpage{853}{para 4,ll.2+3}{HjG}{2004/05/25}{2}
    Add word: ``\ldots definitions for sectioning \u{counters}''
@@ -3877,8 +3877,8 @@ Change:
 \erroronpage{853}{counter code block}{FMi}{2005/06/09}{4}
 The order of declarations of the counters is incorrect; they have to be
 \begin{verbatim}
-\newcounter{part}                
-\newcounter{section}  
+\newcounter{part}
+\newcounter{section}
 \newcounter{subsection}[section]
 \newcounter{subsubsection}[subsection]
 \end{verbatim}
@@ -3893,14 +3893,14 @@ or you will receive a ``counter not defined'' error.
 
 \erroronpage{854}{ll. 1+2}{FMi}{2004/05/25}{2}
    Add word and commata: ``Only the representation\u{, prefix,} and
-             label field commands 
+             label field commands
              are defined \ldots''
 
 \seriouserroronpage{854}{code block 1}{HjG/FMi}{2004/05/25}{2}
 Replace with approx:\\[6pt]
 \hspace*{-140pt}\begin{minipage}[b]{\linewidth}
 \begin{verbatim}
-\renewcommand\theenumi  {\arabic{enumi}}       \renewcommand\theenumii{\alph{enumii}}   
+\renewcommand\theenumi  {\arabic{enumi}}       \renewcommand\theenumii{\alph{enumii}}
 \renewcommand\theenumiii{\roman{enumiii}}      \renewcommand\theenumiv{\Alph{enumiv}}
 \end{verbatim}
 \begin{verbatim}
@@ -3915,14 +3915,14 @@ Replace with approx:\\[6pt]
 
 
 \erroronpage{855}{fig A.1, l.4}{JAn}{2005/09/09}{4}
-  Change  ``Did\^ot'' \> ``Didot'' (no caret); and delete the 
-comma after inch 
+  Change  ``Did\^ot'' \> ``Didot'' (no caret); and delete the
+comma after inch
 
 
 \erroronpage{855}{fig A.1}{CBe/FMi}{2004/07/27}{2}
 Add: \texttt{ex} \quad Height of a small ``x'' in the current font \u{(approximately)}
 \\
-Add: \texttt{em} \quad Width 
+Add: \texttt{em} \quad Width
             of capital ``M'' in current font  \u{(approximately)}
 
 
@@ -3933,11 +3933,11 @@ Add: \texttt{em} \quad Width
 \erroronpage{856}{tab A.2, l.6}{PYu}{2004/07/05}{2}
   Add: ``a \u{solid} horizontal line''
 
-\erroronpage{857}{table A.3}{V-Li}{2004/09/14}{4} 
+\erroronpage{857}{table A.3}{V-Li}{2004/09/14}{4}
   |\vspace{len}| is missing
 
 \erroronpage{858}{l.-8}{HjG/FMi}{2004/05/26}{2}
-   Add: ``\u{missing or} misplaced |\item|'' 
+   Add: ``\u{missing or} misplaced |\item|''
 
 \erroronpage{858}{syntax box}{PYu}{2004/07/03}{2}
   |\addvspace{|\textit{space}|}| should be typeset in a smaller font.
@@ -3980,13 +3980,13 @@ Add: \texttt{em} \quad Width
                  paragraph.}
 
   Editorial comment: change moves pagebreak.
-    
+
 \seriouserroronpage{878}{codeline 4 (?)}{UFi}{2004/05/22}{2}
  |\usepackage[german]{varioref}[2001/09/0]:| day number is missing
  (test for version doesn't work then anymore!)
 
 \erroronpage{886}{fig.~A.1}{HjG}{2004/05/21}{2}
-   Add: \verb=\ProcessOptions= \u{\texttt{\char`\\relax}} 
+   Add: \verb=\ProcessOptions= \u{\texttt{\char`\\relax}}
    (cf. hint on p.~882!)
 
 
@@ -4004,7 +4004,7 @@ Missing letter: ``\verb=l.167 \par=\u{\texttt{t}}\verb={Text}=''
  Add: ``Technically, a moving argument is an argument
         that is internally expanded by \LaTeX{} without typesetting it
         directly\u{ (e.g.}, by using the internal \LaTeX{} construct
-        |\protected@edef|\textsuperscript{1}\u).'' 
+        |\protected@edef|\textsuperscript{1}\u).''
 
 \erroronpage{893}{para 2, l.8}{MHo/FMi}{2004/10/05}{4}
  Replace:
@@ -4040,11 +4040,11 @@ bitmap images such as \texttt{.jpg}, \texttt{.gif}, and \texttt{.png} files.''
 \erroronpage{899}{item 5}{UFi}{2004/05/23}{2}
   The ``\TeX{} Live CD'' is  spelled incorrectly as
  ``\TeX{} live'' or  ``\TeX live''
- 
+
 \erroronpage{901}{item 3}{UFi}{2004/05/23}{2}
   The ``\TeX{} Live CD'' is  spelled incorrectly as
  ``\TeX{} live'' or  ``\TeX live''
- 
+
 \seriouserroronpage{902}{l.5}{HjG}{2004/05/22}{2}
    Missing letter: ``\texttt{\char`\\dis\u{c}retionary}''
 
@@ -4094,9 +4094,9 @@ processing your document with e\TeX{} and additionally load the
 
 \erroronpage{917}{footnote}{HOb}{2004/05/29}{2}
   Replace footnote with: ``In modern distributions \LaTeX{} is automatically
-  using the e\TeX{} program. On older installations you may have to 
+  using the e\TeX{} program. On older installations you may have to
   call a different program (e.g.,  \texttt{elatex} instead of
-  \texttt{latex}) when processing a 
+  \texttt{latex}) when processing a
   document.''
 
 
@@ -4180,7 +4180,7 @@ processing your document with e\TeX{} and additionally load the
 
 \erroronpage{938}{para -1, l.3}{UFi/FMi}{2004/05/23}{2}
  Difficult to understand; replace:
-  ``\ldots a large \u{increase in} \texttt{t=} between'' 
+  ``\ldots a large \u{increase in} \texttt{t=} between''
 
 \erroronpage{939}{para 3, l.2}{HjG}{2004/05/23}{2}
    Words need to be swapped:
@@ -4316,13 +4316,13 @@ processing your document with e\TeX{} and additionally load the
    Missing word: ``for \LaTeX\ \u{and} a possible''
 
 \erroronpage{980}{[151]}{THa}{2004/06/25}{2}
-  Remove: ``\LaTeX\u{Joachim Schrod}.'' 
+  Remove: ``\LaTeX\u{Joachim Schrod}.''
 
 \erroronpage{980}{[153]}{THa}{2004/06/25}{2}
-  Swap words: ``often are'' \> ``are often'' 
+  Swap words: ``often are'' \> ``are often''
 
 \erroronpage{980}{[155]}{THa}{2004/06/25}{2}
-  Missing word:   ``For \u{the} \textsf{kuvio} system\ldots'' 
+  Missing word:   ``For \u{the} \textsf{kuvio} system\ldots''
 
 \erroronpage{980}{[157]}{HjG}{2004/05/20}{2}
   First line of online resources is not flush right (stray space?).
@@ -4386,7 +4386,7 @@ and
   Correct range: author-date citations / history of (699, 700)
 
 \erroronpage{992}{}{J-CCh}{2005/07/17}{s}
-  Correct:  ``B\u{\'e}zier'' 
+  Correct:  ``B\u{\'e}zier''
 
 \erroronpage{993}{}{SEg}{2005/04/26}{4}
   bibliographies/authors/name,formatting shows 798--1092 but should be
@@ -4416,7 +4416,7 @@ and
    oblique (333)
 
 \erroronpage{1020}{}{CKr}{2005/01/09}{4}
-  Replace ``fonts / URW Antigua'' \> ``fonts / URW Anti\u{q}ua'' 
+  Replace ``fonts / URW Antigua'' \> ``fonts / URW Anti\u{q}ua''
 
 \erroronpage{1034}{first col.}{FMi}{2004/05/15}{2}
   Add entry: ``lists / enumerated / user-defined, 151''
@@ -4426,18 +4426,18 @@ and
 
 \erroronpage{1041}{}{FMi}{2004/08/02}{2}
   ``\texttt{NACRO} \BibTeX{} command'' \>
-  ``\texttt{MACRO} \BibTeX{} command'' 
+  ``\texttt{MACRO} \BibTeX{} command''
 
 \erroronpage{1051}{secound col., l.14}{MSc}{2004/06/04}{2}
         missing index entries for ``pdftex'' on p.7 and p.643
 
 \erroronpage{1069}{}{FMi}{2004/11/07}{4}
   Replace: ``text symbols / setting-up''  \>
-           ``\u{math} symbols / setting-up''  
+           ``\u{math} symbols / setting-up''
 
 
 \erroronpage{1076}{}{CKr}{2005/01/09}{4}
-  Replace ``URW Antigua'' \> ``URW Anti\u{q}ua'' 
+  Replace ``URW Antigua'' \> ``URW Anti\u{q}ua''
 
 
 \CHAPTER{People}
@@ -4446,9 +4446,9 @@ and
    Editorial comment: Needs manual breaking in index output file for
    second and fourth printing.
 
-\erroronpage{1081}{col 1}{FMi}{2004/06/22}{2} 
-  Missing accents: ``Fernandez, Jose Alberto '' \> `Fern\'andez, Jos\'e Alberto'' 
-  
+\erroronpage{1081}{col 1}{FMi}{2004/06/22}{2}
+  Missing accents: ``Fernandez, Jose Alberto '' \> `Fern\'andez, Jos\'e Alberto''
+
 \erroronpage{1081}{col 1}{HjG}{2004/06/22}{2}
    Change page number in entry:
    ``Fukui, Rei, xxvii, 405, \u{969}'' \> ``\ldots, \u{968}''
@@ -4460,7 +4460,7 @@ and
 \erroronpage{1081}{col 2}{HjG}{2004/06/16}{2}
    Change page number in entry:
    ``Hufflen, Jean-Michel, 761, \u{971}'' \> ``\ldots, \u{970}''
-    
+
 \erroronpage{1081}{}{HjG}{2004/07/08}{2}
    Add page entries for ``Kettler, Howard'' and ``Frutiger, Adrian''
    to ``People'' index back to 374.
@@ -4503,7 +4503,7 @@ and
 
 \erroronpage{1089}{para 4, l.4}{FMi}{2004/07/21}{2}
   Add:  ``\ldots this typographical icing \u{(package
-  \textsf{pdfcprot})} was\ldots'' 
+  \textsf{pdfcprot})} was\ldots''
 
 \erroronpage{1089}{l.-5}{HjG}{2004/05/20}{2}
   Missing period: \ldots files\u. It \ldots
diff --git a/Master/texmf-dist/source/latex/base/unpack.ins b/Master/texmf-dist/source/latex/base/unpack.ins
index c246763930e..4a5484d10f9 100644
--- a/Master/texmf-dist/source/latex/base/unpack.ins
+++ b/Master/texmf-dist/source/latex/base/unpack.ins
@@ -3,33 +3,33 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
-%% in this file. 
-%% 
+%% in this file.
+%%
 %% This file is part of the LaTeX base system.
 %% -------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3b
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3b or later is part of all distributions of LaTeX 
+%% and version 1.3c or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
 %% it generates.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %%
 %% --------------- start of bootstrap commands ------------------
 %%
@@ -79,7 +79,7 @@
 \batchinput{ltoutenc.ins}
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% other classes and packages
 
 \batchinput{classes.ins}
diff --git a/Master/texmf-dist/source/latex/base/usrguide.tex b/Master/texmf-dist/source/latex/base/usrguide.tex
index 574d875aa68..617d27bf01d 100644
--- a/Master/texmf-dist/source/latex/base/usrguide.tex
+++ b/Master/texmf-dist/source/latex/base/usrguide.tex
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 % Filename: usrguide.tex
 
@@ -1296,21 +1296,21 @@ superscript position and in the correct size.
    \newcommand{\fauxguillemet}[1]{$\vcenter{\hbox{$\scriptscriptstyle#1$}}$}
    These commands produce various sorts of quotation mark.
    Rough representations of them are:
-   \fauxguillemet\ll a\fauxguillemet\gg{} 
-   \fauxguillemet<a\fauxguillemet> 
-   ,\kern -0.1em,\kern 0.05em a\kern -0.05em`` 
+   \fauxguillemet\ll a\fauxguillemet\gg{}
+   \fauxguillemet<a\fauxguillemet>
+   ,\kern -0.1em,\kern 0.05em a\kern -0.05em``
    ,\kern 0.05em a\kern -0.05em` and |"|a|"|.
 
 \NEWdescription{2001/06/01}
    There are therefore some extra short-form ligatures available for
    use in documents that will only be used with |T1|-encoded fonts.
-   
-   The guillemets |\guillemotleft| and |\guillemotright|% 
-   \footnote{We apologise once again for maintaining Adobe's 
-     enormous solipsism~(sic) of confusing a diving bird with 
-     punctuation marks!}  
-   can be obtained by typing |<<<<| and |>>>>| and |\quotedblbase| 
-   by typing |,,|\,.  
+
+   The guillemets |\guillemotleft| and |\guillemotright|%
+   \footnote{We apologise once again for maintaining Adobe's
+     enormous solipsism~(sic) of confusing a diving bird with
+     punctuation marks!}
+   can be obtained by typing |<<<<| and |>>>>| and |\quotedblbase|
+   by typing |,,|\,.
 
    Also, unlike the unexpected results with
    |OT1|-encoded fonts, |<<| and |>>| will produce \textless{} and
diff --git a/Master/texmf-dist/source/latex/base/utf8ienc.dtx b/Master/texmf-dist/source/latex/base/utf8ienc.dtx
index a35b9416ef7..abd5d627ff7 100644
--- a/Master/texmf-dist/source/latex/base/utf8ienc.dtx
+++ b/Master/texmf-dist/source/latex/base/utf8ienc.dtx
@@ -2,29 +2,29 @@
 %
 % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 % The LaTeX3 Project and any individual authors listed elsewhere
-% in this file. 
-% 
+% in this file.
+%
 % This file is part of the LaTeX base system.
 % -------------------------------------------
-% 
+%
 % It may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX 
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-% 
+%
 % This file has the LPPL maintenance status "maintained".
-% 
+%
 % The list of all files belonging to the LaTeX base distribution is
 % given in the file `manifest.txt'. See also `legal.txt' for additional
 % information.
-% 
-% The list of derived (unpacked) files belonging to the distribution 
-% and covered by LPPL is defined by the unpacking scripts (with 
+%
+% The list of derived (unpacked) files belonging to the distribution
+% and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
-% 
+%
 % \fi
 %
 % \iffalse
@@ -37,6 +37,7 @@
   Frank Mittelbach \and Chris Rowley\thanks{Borrowing heavily from
       code by David Carlisle and tables by Sebastian Rahtz; some table
       and code cleanup by Javier Bezos}}
+\usepackage[utf8]{inputenc}
 \begin{document}
  \maketitle
  \tableofcontents
@@ -54,10 +55,10 @@
 % [The whole section is rather unfinished \ldots\ just like the code, sorry!]
 %
 % \subsection{Background and general stuff}
-% 
+%
 % For many reasons what this package provides is a long way from any
 % type of `Unicode compliance'.
-% 
+%
 % In stark contrast to 8-bit character sets, with 16 or more bits it can
 % easily be very inefficient to support the full range.\footnote{In
 % fact, \LaTeX's current 8-bit support does not go so far as to make
@@ -66,63 +67,63 @@
 % an acceptable visual representation of a sequence of characters and
 % this, for \LaTeX{}, means having available a suitably encoded 8-bit
 % font.
-% 
+%
 % Unfortunately it is not possible to predict exactly what valid UTF-8
 % octet sequences will appear in a particular file so it is best to
 % make all the unsupported but valid sequences produce a reasonably
 % clear and noticeable error message.
-% 
+%
 % There are two directions from which to approach the question of what
 % to load.  One is to specify the ranges of Unicode characters that will
 % result in some sensible typesetting; this requires the provider to
 % ensure that suitable fonts are loaded and that these input characters
 % generate the correct typesetting via the encodings of those fonts.  The
 % other is to inspect the font encodings to be used and use these to
-% define which input Unicode characters should be supported.  
-% 
+% define which input Unicode characters should be supported.
+%
 % For Western European languages, at least, going in either direction
 % leads to many straightforward decisions and a few that are more
 % subjective.  In both cases some of the specifications are \TeX{}
 % specific whilst most are independent of the particular typesetting
 % software in use.
-% 
+%
 % As we have argued elsewhere, \LaTeX{} needs to refer to characters via
 % `seven-bit-text' names and, so far, these have been chosen by
 % reference to historical sources such as Plain \TeX{} or Adobe encoding
 % descriptions.  It is unclear whether this ad hoc naming structure should
 % simply be extended or whether it would be useful to
-% supplement it with standardised internal Unicode character names such as 
-% one or more of the following:\footnote{Burkhard und Holger Mittelbach 
+% supplement it with standardised internal Unicode character names such as
+% one or more of the following:\footnote{Burkhard und Holger Mittelbach
 %   spielen mit mir!  Sie haben etwas hier geschrieben.}
-% 
+%
 % \begin{verbatim}
-%   \ltxutwochar <4 hex digits>    
-% 
+%   \ltxutwochar <4 hex digits>
+%
 %   \ltxuchar {<hex digits>}
 %     B H U R R R
 %
-%   \ltxueightchartwo   <2 utf8 octets as 8-bit char tokens>    
-%   \ltxueightcharthree <3 utf8 octets ...>    
-%   \ltxueightcharfour  <4 utf8 octets ...>    
+%   \ltxueightchartwo   <2 utf8 octets as 8-bit char tokens>
+%   \ltxueightcharthree <3 utf8 octets ...>
+%   \ltxueightcharfour  <4 utf8 octets ...>
 % \end{verbatim}
-% 
-% 
+%
+%
 % \subsection{More specific stuff}
-% 
+%
 % In addition to setting up the mechanism for reading UTF-8 characters
 % and specifying the \LaTeX-level support available, this package
 % contains support for some default historically expected \TeX-related
 % characters and some example `Unicode definition files' for standard
 % font encodings.
-% 
-% 
+%
+%
 % \subsection{Notes}
-% 
+%
 % This package does not support Unicode combining characters as \TeX{}
 % is not really equipped to make this possible.
-% 
+%
 %  No attempt is made to be useful beyond Latin, and maybe Cyrillic,
-%  for European languages (as of now). 
+%  for European languages (as of now).
 %
 %
 % \subsection{Basic operation of the code}
@@ -132,7 +133,7 @@
 %    input encoding files to change this set-up.  Similarly, whenever
 %    |\inputencoding| is encountered in a document, first the upper
 %    8-bit characters are set back to produce an error and then the
-%    definitions for the new input encoding are loaded, changing some of the 
+%    definitions for the new input encoding are loaded, changing some of the
 %    previous settings.
 %
 %    The 8-bit input encodings currently supported by \texttt{inputenc}
@@ -219,7 +220,7 @@
 %<+all> \ProvidesFile{utf8enc.dfu}
    [2008/04/05 v1.1m UTF-8 support for inputenc]
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<*utf8>
 \makeatletter
@@ -232,7 +233,7 @@
 %    \begin{macrocode}
 \catcode`\ \saved@space@catcode
 %    \end{macrocode}
-%    
+%
 %
 %
 % \subsection{Parsing UTF-8 input}
@@ -266,19 +267,19 @@
     \UTFviii@defined\csname u8:#1\string#2\endcsname}
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 %    \begin{macrocode}
 \def\UTFviii@three@octets#1#2#3{\expandafter
     \UTFviii@defined\csname u8:#1\string#2\string#3\endcsname}
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 %    \begin{macrocode}
 \def\UTFviii@four@octets#1#2#3#4{\expandafter
     \UTFviii@defined\csname u8:#1\string#2\string#3\string#4\endcsname}
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 % \begin{macro}{\UTFviii@defined}
 %    This tests whether its argument is different from |\relax|: it
 %    either calls for a sensible error message (not done), or it gets
@@ -294,7 +295,7 @@
 % \changes{v1.1b}{2004/02/09}{No newlines allowed in error messages}
 % \changes{v1.1g}{2005/09/27}{Real spaces do not show up so use \cs{space}}
 %    \begin{macrocode}
-      \PackageError{inputenc}{Unicode\space char\space \string#1\space 
+      \PackageError{inputenc}{Unicode\space char\space \string#1\space
                               not\space set\space up\space
                               for\space use\space with\space LaTeX}\@eha
   \else\expandafter
@@ -303,7 +304,7 @@
 }
 %    \end{macrocode}
 % \end{macro}
-%    
+%
 % \begin{macro}{\UTFviii@loop}
 %    This wonderful bit of code from Dr Carlisle defines the starting
 %    octets to call |\UTFviii@two@octets| etc as appropriate. The starting
@@ -314,7 +315,7 @@
 %    |\count@| and ending at |\@tempcnta|${} - 1$, each time executing
 %    the code in |\UTFviii@tmp|.
 %
-%    All this is done in a group so that temporary catcode changes 
+%    All this is done in a group so that temporary catcode changes
 %    etc.~vanish after everything is set up.
 %
 %    It may be a good idea to add code to deal with `illegal utf8 octets':
@@ -326,7 +327,7 @@
 \catcode`\~13
 \catcode`\"12
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \def\UTFviii@loop{%
   \uccode`\~\count@
@@ -351,7 +352,7 @@
     \def\UTFviii@tmp{\xdef~{\noexpand\UTFviii@three@octets\string~}}
 \UTFviii@loop
 %    \end{macrocode}
-%    
+%
 %    Setting up 4-byte UTF-8:
 %    \begin{macrocode}
     \count@"F0
@@ -368,7 +369,7 @@
 %    \begin{macrocode}
 \@inpenc@test
 %    \end{macrocode}
-%    
+%
 %
 %    If this file (\texttt{utf8.def}) is not being read while setting
 %    up \texttt{inputenc}, i.e.~in the preamble, but when
@@ -376,8 +377,8 @@
 %    need to input the specific Unicode mappings again. We therefore
 %    stop reading the file at this point.
 %    \begin{macrocode}
-\ifx\@begindocumenthook\@undefined 
-  \makeatother 
+\ifx\@begindocumenthook\@undefined
+  \makeatother
 %    \end{macrocode}
 %    The |\fi| must be on the same line as |\endinput| or else it will
 %    never be seen!
@@ -388,12 +389,12 @@
 %
 % \subsection{Mapping Unicode codes to \LaTeX{} internal forms}
 %
-% 
+%
 % \begin{macro}{\DeclareUnicodeCharacter}
 %    The |\DeclareUnicodeCharacter| declaration defines a mapping from
 %    a Unicode character code point to a \LaTeX{} internal form. The first
 %    argument is the Unicode number as hexadecimal digits and the second is
-%    the actual \LaTeX{} internal form. 
+%    the actual \LaTeX{} internal form.
 %
 %    We start by making sure that some characters have the right
 %    |\catcode| when they are used in the definitions below.
@@ -407,7 +408,7 @@
 \catcode`\!=12
 \catcode`\~=13
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \gdef\DeclareUnicodeCharacter#1#2{%
    \count@"#1\relax
@@ -428,7 +429,7 @@
 %    single command with two character tokens as arguments:
 %    \begin{quote}
 %      [$t_{C2}$ and $t_{A3}$ are the characters corresponding to these
-%      two octets]\\  
+%      two octets]\\
 %      |\UTFviii@two@octets| $t_{\rm C2}t_{\rm A3}$
 %    \end{quote}
 %    what we actually need to produce is a definition of the form
@@ -453,7 +454,7 @@
 %    a csname after which the |\gdef| finally gets applied.
 %    We add an irrelevant |\IeC| and braces around the definition, in
 %    order to avoid any space after the command being gobbled up
-%    when the text is written out to an auxiliary file (see 
+%    when the text is written out to an auxiliary file (see
 %    \texttt{inputenc} for further details
 %    \begin{macrocode}
     \expandafter\expandafter\expandafter
@@ -494,11 +495,11 @@
 %  \uppercase{\count@\if x\noexpand#1"\else#1\fi#2}\relax
 %    \end{macrocode}
 %    As |\count@| already contains the right value we make
-%    |\parse@XML@charref| work without arguments. 
+%    |\parse@XML@charref| work without arguments.
 % \changes{v1.1g}{2005/09/27}{Real spaces do not show up so use \cs{space}}
 %    \begin{macrocode}
   \ifnum\count@<"A0\relax
-     \PackageError{inputenc}{Cannot\space define\space Unicode\space 
+     \PackageError{inputenc}{Cannot\space define\space Unicode\space
                              char\space value\space <\space 00A0}\@eha
 %    \end{macrocode}
 %    Do not ask us to provide an explanation for the code below, it is
@@ -552,7 +553,7 @@
      \uccode`#3\count@
      \uppercase{\gdef\UTFviii@tmp{#2#3#4}}}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \endgroup
 %    \end{macrocode}
@@ -568,7 +569,7 @@
 \@onlypreamble\parse@UTFviii@a
 \@onlypreamble\parse@UTFviii@b
 %    \end{macrocode}
-%    
+%
 %
 % \subsection{Loading Unicode mappings at begin document}
 %
@@ -640,7 +641,7 @@
   }
 %</utf8>
 %    \end{macrocode}
-%    
+%
 %
 %
 % \section{Mapping characters ---\newline based on font (glyph) encodings}
@@ -663,7 +664,7 @@
 %    is that and not |\^i|.
 %
 % This list has been built from several sources, obviously including
-% the Unicode Standard itself. These sources include Passive \TeX{} by 
+% the Unicode Standard itself. These sources include Passive \TeX{} by
 % Sebastian Rahtz, the \texttt{unicode}
 % package by Dominique P. G. Unruh (mainly for Latin encodings) and
 % \texttt{text4ht} by Eitan Gurari (for Cyrillic ones).
@@ -676,7 +677,7 @@
 % \subsection{About the table itself}
 %
 % In addition to generating indivdual files, the table below is, at present,
-% a one-one (we think) partial relationship between the (ill-defined) set 
+% a one-one (we think) partial relationship between the (ill-defined) set
 % of LICRs and the Unicode slots "0080 to "FFFF.  At present these entries
 % are used only to define a collection of partial mappings from Unicode
 % slots to LICRs; each of these mappings becomes full if we add an exception
@@ -685,7 +686,7 @@
 % It is probably not essential for the relationship in the full table to be
 % one-one; this raises questions suach as: the exact role of LICRs;
 % the formal relationships on the set of LICRs; the (non-mathematical)
-% relationship between 
+% relationship between
 % LICRs and Unicode (which has its own somewhat fuzzy equivalences);
 % and ultimately what a character is and what a character representation
 % and/or name is.
@@ -702,8 +703,8 @@
 % Of course, \TeX{} itself typically does not treat even many perfectly
 % `normal text' 7-bit slots as text characters, so it is unclear
 % whether \LaTeX{} should even attempt to deal in any consistent way with
-% those Unicode slots that are not definitive text characters.     
-% 
+% those Unicode slots that are not definitive text characters.
+%
 %
 % \subsection{The mapping table}
 %
@@ -711,7 +712,7 @@
 % than \texttt{00BF}.
 %
 % There are few notes about inconsistencies etc at the end of the table.
-% 
+%
 %    \begin{macrocode}
 %<all,t1,ot1,ly1>\DeclareUnicodeCharacter{00A1}{\textexclamdown}
 %<all,ts1,ly1>\DeclareUnicodeCharacter{00A2}{\textcent}
@@ -1001,7 +1002,7 @@
 %<all,ot2>\DeclareUnicodeCharacter{0472}{\CYRFITA}
 %<all,ot2>\DeclareUnicodeCharacter{0473}{\cyrfita}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<all,x2,ot2>\DeclareUnicodeCharacter{0474}{\CYRIZH}
 %<all,x2,ot2>\DeclareUnicodeCharacter{0475}{\cyrizh}
@@ -1013,7 +1014,7 @@
 %<all,x2>\DeclareUnicodeCharacter{0476}{\C\CYRIZH}
 %<all,x2>\DeclareUnicodeCharacter{0477}{\C\cyrizh}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<all,t2c>\DeclareUnicodeCharacter{048C}{\CYRSEMISFTSN}
 %<all,t2c>\DeclareUnicodeCharacter{048D}{\cyrsemisftsn}
@@ -1070,14 +1071,14 @@
 %    \end{macrocode}
 %    The character |\CYRpalochka| is not defined by OT2 and LCY. However it is
 %    looking identical to |\CYRII| and the Unicode standard explicitly refers
-%    to that (and to Latin I). So perhaps those encodings could get an alias? 
+%    to that (and to Latin I). So perhaps those encodings could get an alias?
 %    On the other hand, why are there two distinct slots in the T2 encodings
 %    even though they are so pressed for space? Perhaps they don't always look
 %    alike.
 %    \begin{macrocode}
 %<all,x2,t2c,t2b,t2a>\DeclareUnicodeCharacter{04C0}{\CYRpalochka}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{04C1}{\U\CYRZH}
 %<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{04C2}{\U\cyrzh}
@@ -1086,12 +1087,12 @@
 %    \end{macrocode}
 %    According to the Unicode standard Ux04C5 should be an L with ``tail'' not
 %    with descender (which also exists as Ux04A2) but it looks as if the char
-%    names do not make this distinction). Should they? 
+%    names do not make this distinction). Should they?
 %    \begin{macrocode}
 %<all,x2,t2c,t2b>\DeclareUnicodeCharacter{04C5}{\CYRLDSC}
 %<all,x2,t2c,t2b>\DeclareUnicodeCharacter{04C6}{\cyrldsc}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<all,x2,t2c,t2b>\DeclareUnicodeCharacter{04C7}{\CYRNHK}
 %<all,x2,t2c,t2b>\DeclareUnicodeCharacter{04C8}{\cyrnhk}
@@ -1105,7 +1106,7 @@
 %<all,x2,t2c>\DeclareUnicodeCharacter{04CD}{\CYRMDSC}
 %<all,x2,t2c>\DeclareUnicodeCharacter{04CE}{\cyrmdsc}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{04D0}{\U\CYRA}
 %<all,x2,t2c,t2b,t2a,ot2,lcy>\DeclareUnicodeCharacter{04D1}{\U\cyra}
@@ -1205,9 +1206,9 @@
 %<all,ts1>\DeclareUnicodeCharacter{25EF}{\textbigcircle}
 %<all,ts1>\DeclareUnicodeCharacter{266A}{\textmusicalnote}
 %    \end{macrocode}
-% 
+%
 % \subsection{Notes}
-% 
+%
 % \changes{v1.1e}{2004/05/22}{Added notes on inconsistency with `8-bit files'.}
 % The following inputs are inconsistent with the 8-bit inputenc files
 % since they will always only produce the `text character'.  This is an
@@ -1249,8 +1250,8 @@
 %\DeclareTextCommand{\c}{OT1}[1]
 %\DeclareTextCommand{\d}{OT1}[1]
 %\DeclareTextCommand{\k}{T1}[1]
-%\end{verbatim} 
-%    
+%\end{verbatim}
+%
 %
 %
 % \subsection{Mappings for OT1 glyphs}
@@ -1284,7 +1285,7 @@
 %\DeclareTextCommand{\c}{OT1}[1]
 %\DeclareTextCommand{\d}{OT1}[1]
 %\end{verbatim}
-%    
+%
 %
 %
 % \subsection{Mappings for OMS glyphs}
@@ -1305,8 +1306,8 @@
 %\DeclareTextSymbol{\textasteriskcentered}{OMS}{3}   % "03
 %\DeclareTextCommand{\textcircled}{OMS}
 %\end{verbatim}
-%    
-%    
+%
+%
 %
 %
 % \subsection{Mappings for TS1 glyphs}
@@ -1319,7 +1320,7 @@
 % There is also a collection of characters already set up in the kernel,
 % one way or the other. Since these do not clearly relate to any
 %    particular font encoding they are mapped when the
-% \texttt{utf8} support is first set up. 
+% \texttt{utf8} support is first set up.
 %
 % Also there are a number of |\providecommand|s in the various input
 % encoding files which may or may not go into this part.
@@ -1331,7 +1332,7 @@
 %    \end{macrocode}
 %
 %
-% \section{A test document} 
+% \section{A test document}
 %
 %    Here is a very small test document which may or may not survive
 %    if the current document is transfered from one place to the
@@ -1360,7 +1361,7 @@
  German umlauts in UTF-8: ^^c3^^a4^^c3^^b6^^c3^^bc
 
 
-Some codes that should produce errors as nothing is set up 
+Some codes that should produce errors as nothing is set up
 for them: ^^c3F ^^e1^^a4^^b6
 
 And some that are not legal utf8 sequences: ^^c3X ^^e1XY
@@ -1370,7 +1371,7 @@ And some that are not legal utf8 sequences: ^^c3X ^^e1XY
 \stop
 %</test>
 %    \end{macrocode}
-%    
+%
 % \Finale
 %
 \endinput
diff --git a/Master/texmf-dist/source/latex/base/webcomp.err b/Master/texmf-dist/source/latex/base/webcomp.err
index 2ca4b41daf1..48537411cd3 100644
--- a/Master/texmf-dist/source/latex/base/webcomp.err
+++ b/Master/texmf-dist/source/latex/base/webcomp.err
@@ -235,15 +235,15 @@
 \begin{filecontents}{\jobname.cfg}
 %
 %
-% Configuration file for the errata listing of 
+% Configuration file for the errata listing of
 %
 %  The LaTeX Web Companion
 %
 %
-% \erratastartdate 
+% \erratastartdate
 %
 %    Specifies the date from which on
-%    errata entries should be listed. 
+%    errata entries should be listed.
 %
 %    The format is YYYY/MM/DD.
 %
@@ -257,7 +257,7 @@
 %
 %    Specifies which (revised) printing you
 %    own. For example, if you have the second
-%    printing set this to 2 so that errors 
+%    printing set this to 2 so that errors
 %    already corrected in that printing will not
 %    appear in your errata listing.
 %
@@ -272,7 +272,7 @@
 % Specifies that all page numbers in the errata are shown in the same
 %    format (bold face) irregardless of whether or not they are fixed
 %    in some revision. The default is to print corrected errors in
-%    italic and add the revision number as a superscript. 
+%    italic and add the revision number as a superscript.
 %
 %
 % \showallerrors
@@ -327,7 +327,7 @@ entry.  Superscript numbers in the first column refer to the printed
 revision in which this entry was corrected. The second column gives
 the precise location, negative line numbers are counted from the
 bottom of the page. The third column shows the first finder of the
-problem.  
+problem.
 
 \end{list}
 
@@ -363,7 +363,7 @@ problem.
 If you find further errors please report them to one of the authors
 \begin{quote}\ttfamily
   sebastian.rahtz@oucs.ox.ac.uk\\
-  goossens@cern.ch 
+  goossens@cern.ch
 \end{quote}
 preferable in a form usable for this file, i.e.,
 \begin{flushleft}