7 files changed, 83 insertions, 80 deletions
diff --git a/Master/texmf-dist/doc/latex/layouts/README b/Master/texmf-dist/doc/latex/layouts/README
index e0166320162..fa2abbe7272 100644
--- a/Master/texmf-dist/doc/latex/layouts/README
+++ b/Master/texmf-dist/doc/latex/layouts/README
@@ -1,3 +1,6 @@
+___________________
+The LAYOUTS package
+
     The layouts package enables the display of various elements of a
 document's layout including: the general page layout; disposition
 of floats; layout of paragraphs, lists, footnotes, table of contents, 
@@ -5,51 +8,56 @@ and sectional headings; font boxes.
 Facilities are provided for a document designer to experiment with
 the layout parameters.
 
+
+______________
+Change History
+
+Version v2.6d (2009/09/02)
+- New maintainer (Will Robertson)
+
 Changes in version v2.6c (2004/10/25)
-o Privatised some internal macro names (no change in functionality)
+- Privatised some internal macro names (no change in functionality)
 
 Changes in version v2.6b (2003/11/25)
-o Fixed some spelling and gramatical errors
+- Fixed some spelling and gramatical errors
 
 Changes in version v2.6a (2002/12/12)
-o Fixed problem with negative length in list layout
-o NO CHANGE TO THE MANUAL
+- Fixed problem with negative length in list layout
+- NO CHANGE TO THE MANUAL
 
 Changes in version v2.6 (2002/06/09)
-o Expanded page layout options
+- Expanded page layout options
 
 Changes in version v2.5a (2002/03/24)
-o Fixed problem with footer size on page diagrams
+- Fixed problem with footer size on page diagrams
 
 Changes in version v2.5 (2001/11/11)
-o Cleaner seperation between generic and designed layouts
-o Added controls over the appearance of pictures
-o Lengths may be printed using any TeX unit (except scaled point)
+- Cleaner seperation between generic and designed layouts
+- Added controls over the appearance of pictures
+- Lengths may be printed using any TeX unit (except scaled point)
 
 Changes in version v2.4 (2001/04/30)
-o Added switch for drawing marginal notes
-o Added support for the memoir class page layout
+- Added switch for drawing marginal notes
+- Added support for the memoir class page layout
 
 
 Changes in version v2.3 (1999/03/06)
-o Added tabulation of actual layout values.
-o Corrected the ToC layout.
-o Reduced the number of counters used.
+- Added tabulation of actual layout values.
+- Corrected the ToC layout.
+- Reduced the number of counters used.
 
 ----------------------------------------------------------------- 
-  Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-  Copyright 1998 --- 2004 Peter R. Wilson
+  Author: Peter Wilson (Herries Press)
+  Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+  Copyright 1998--2004 Peter R. Wilson
  
   This work may be distributed and/or modified under the
   conditions of the LaTeX Project Public License, either
-  version 1.3 of this license or (at your option) any 
-  later version.
-  The latest version of the license is in
-     http://www.latex-project.org/lppl.txt
-  and version 1.3 or later is part of all distributions of
-  LaTeX version 2003/06/01 or later.
- 
-  This work has the LPPL maintenance status "author-maintained".
+  version 1.3c of this license or (at your option) any 
+  later version: <http://www.latex-project.org/lppl.txt>
+
+  This work has the LPPL maintenance status "maintained".
+  The Current Maintainer of this work is Will Robertson.
  
   This work consists of the files:
 README (this file)
@@ -68,24 +76,23 @@ layman.pdf      (User Manual in PDF)
 ----------------------------------------------------------------- 
 
     To install the package:
-o run: latex layouts.ins (which will generate layouts.sty)
-o Move layouts.sty to a location where LaTeX will find it
+- run: latex layouts.ins (which will generate layouts.sty)
+- Move layouts.sty to a location where LaTeX will find it
   (typically in a local texmf tree at /tex/latex/layouts)
   and refresh the file database. See the FAQ on CTAN at
   /help/uk-tex-faq or http://www.tex.ac.uk/faq for more 
   information on this.
 
     To process the user manual:
-o run: latex layman (twice) and print for the user manual
+- run: latex layman (twice) and print for the user manual
   
     For a printed version of the package source:
-o run: latex layouts.dtx
+- run: latex layouts.dtx
   If you want an index run: makeindex -s gind.ist layouts
-o run: latex layouts.dtx
-o Print layouts.dvi for a hardcopy of the package source
+- run: latex layouts.dtx
+- Print layouts.dvi for a hardcopy of the package source
 
 2004/10/25
 Peter Wilson
-herries dot press at earthlink dot net
 
 
diff --git a/Master/texmf-dist/doc/latex/layouts/layman.pdf b/Master/texmf-dist/doc/latex/layouts/layman.pdf
index 313b71c2f38..ae160b9a7af 100644
--- a/Master/texmf-dist/doc/latex/layouts/layman.pdf
+++ b/Master/texmf-dist/doc/latex/layouts/layman.pdf
diff --git a/Master/texmf-dist/doc/latex/layouts/layouts.pdf b/Master/texmf-dist/doc/latex/layouts/layouts.pdf
new file mode 100644
index 00000000000..e160bb3f126
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/layouts/layouts.pdf
diff --git a/Master/texmf-dist/doc/latex/layouts/layman.tex b/Master/texmf-dist/source/latex/layouts/layman.tex
index 84e007300cd..e4cc94906af 100644
--- a/Master/texmf-dist/doc/latex/layouts/layman.tex
+++ b/Master/texmf-dist/source/latex/layouts/layman.tex
@@ -1,5 +1,5 @@
 % layman.tex  User Manual for layouts.sty
-%% Copyright 1998 --- 2004  Peter R. Wilson
+%% Copyright 1998--2004  Peter R. Wilson
 %% All rights reserved
 %% 
 
@@ -111,9 +111,11 @@
 \makeatother
 
 \title{The \file{layouts} package: User manual}
-\author{Peter R. Wilson \\
-        Herries Press \\
-        (\texttt{herries.press@earthlink.net}) }
+\author{
+  Author: Peter Wilson, Herries Press \\
+  Maintainer: Will Robertson \\
+  \texttt{will dot robertson at latex-project dot org}
+}
 \date{October 2004\thanks{Previous versions were dated 
       November 2003, July 2002, March 2002, November 2001, July 2001 and January 1999.}}
 
diff --git a/Master/texmf-dist/source/latex/layouts/layouts.dtx b/Master/texmf-dist/source/latex/layouts/layouts.dtx
index bca1485ea2b..54b8bdb7247 100644
--- a/Master/texmf-dist/source/latex/layouts/layouts.dtx
+++ b/Master/texmf-dist/source/latex/layouts/layouts.dtx
@@ -1,19 +1,17 @@
 % \iffalse meta-comment
 %
 % layouts.dtx
-% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net) 
-% Copyright 1998 --- 2004 Peter R. Wilson
+% Author: Peter Wilson (Herries Press)) 
+% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+% Copyright 1998--2004 Peter R. Wilson
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any 
-% later version.
-% The latest version of the license is in
-%    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2003/06/01 or later.
+% version 1.3c of this license or (at your option) any 
+% later version: <http://www.latex-project.org/lppl.txt>
 %
-% This work has the LPPL maintenance status "author-maintained".
+% This work has the LPPL maintenance status "maintained".
+% The Current Maintainer of this work is Will Robertson.
 %
 % This work consists of the files listed in the README file.
 %
@@ -91,6 +89,7 @@
 % \def\fileversion{v2.6a} \def\filedate{2002/12/12}
 % \def\fileversion{v2.6b} \def\filedate{2003/11/25}
 % \def\fileversion{v2.6c} \def\filedate{2004/10/25}
+% \def\fileversion{v2.6d} \def\filedate{2009/09/02}
 % \newcommand*{\Lpack}[1]{\textsf {#1}}           ^^A typeset a package
 % \newcommand*{\Lopt}[1]{\textsf {#1}}            ^^A typeset an option
 % \newcommand*{\file}[1]{\texttt {#1}}            ^^A typeset a file
@@ -102,10 +101,10 @@
 %        file (\texttt{\dtxfile}) has version number \fileversion, last revised
 %        \filedate.}}
 %
-% \author{%
-% Peter Wilson \\
-% Herries Press \\
-% (\texttt{herries.press@earthlink.net})
+% \author{
+%   Author: Peter Wilson, Herries Press \\
+%   Maintainer: Will Robertson \\
+%   \texttt{will dot robertson at latex-project dot org}
 % }
 % \date{\filedate}
 % \maketitle
@@ -167,7 +166,7 @@
 %    \begin{macrocode}
 %<*lays>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{layouts}[2004/10/25 v2.6c graphical depiction of document elements]
+\ProvidesPackage{layouts}[2009/09/02 v2.6d graphical depiction of document elements]
 
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/layouts/layouts.ins b/Master/texmf-dist/source/latex/layouts/layouts.ins
index 37d9472a956..c5dfd03a872 100644
--- a/Master/texmf-dist/source/latex/layouts/layouts.ins
+++ b/Master/texmf-dist/source/latex/layouts/layouts.ins
@@ -1,17 +1,15 @@
 %% layouts.ins
-%% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%% Copyright 1998 --- 2004 Peter R. Wilson
+%% Author: Peter Wilson (Herries Press)
+%% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+%% Copyright 1998--2004 Peter R. Wilson
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
-%% version 1.3 of this license or (at your option) any 
-%% later version.
-%% The latest version of the license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
+%% version 1.3c of this license or (at your option) any 
+%% later version: <http://www.latex-project.org/lppl.txt>
 %%
-%% This work has the LPPL maintenance status "author-maintained".
+%% This work has the LPPL maintenance status "maintained".
+%% The Current Maintainer of this work is Will Robertson.
 %%
 %% This work consists of the files listed in the README file.
 %%
@@ -27,33 +25,32 @@
 \preamble
 
 ----------------------------------------------------------------- 
-  Author: Peter Wilson (Herries Press)  herries dot press at earthlink dot net
-  Copyright 1998 --- 2004 Peter R. Wilson
+  Author: Peter Wilson (Herries Press) 
+  Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+  Copyright 1998--2004 Peter R. Wilson
  
   This work may be distributed and/or modified under the
   conditions of the LaTeX Project Public License, either
-  version 1.3 of this license or (at your option) any 
-  later version.
-  The latest version of the license is in
-     http://www.latex-project.org/lppl.txt
-  and version 1.3 or later is part of all distributions of
-  LaTeX version 2003/06/01 or later.
- 
-  This work has the LPPL maintenance status "author-maintained".
+  version 1.3c of this license or (at your option) any 
+  later version: <http://www.latex-project.org/lppl.txt>
+
+  This work has the LPPL maintenance status "maintained".
+  The Current Maintainer of this work is Will Robertson.
  
   This work consists of the files listed in the README file.
 ----------------------------------------------------------------- 
 
 \endpreamble
 
+\askforoverwritefalse
 \keepsilent
 
 %%% \Msg{*** Generating the driver file ***}
-%%% \generateFile{layouts.drv}{t}{\from{layouts.dtx}{driver}}
+%%% \generate{\file{layouts.drv}{\from{layouts.dtx}{driver}}}
 
 \Msg{*** Generating the LaTeX2e package files ***}
 
-\generateFile{layouts.sty}{t}{\from{layouts.dtx}{lays}}
+\generate{\file{layouts.sty}{\from{layouts.dtx}{lays}}}
 
 \Msg{***********************************************************}
 \Msg{*}
diff --git a/Master/texmf-dist/tex/latex/layouts/layouts.sty b/Master/texmf-dist/tex/latex/layouts/layouts.sty
index 6caec41ade8..10b812322b0 100644
--- a/Master/texmf-dist/tex/latex/layouts/layouts.sty
+++ b/Master/texmf-dist/tex/latex/layouts/layouts.sty
@@ -7,25 +7,23 @@
 %% layouts.dtx  (with options: `lays')
 %% 
 %% -----------------------------------------------------------------
-%%   Author: Peter Wilson (Herries Press)  herries dot press at earthlink dot net
-%%   Copyright 1998 --- 2004 Peter R. Wilson
+%%   Author: Peter Wilson (Herries Press)
+%%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+%%   Copyright 1998--2004 Peter R. Wilson
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
-%%   version 1.3 of this license or (at your option) any
-%%   later version.
-%%   The latest version of the license is in
-%%      http://www.latex-project.org/lppl.txt
-%%   and version 1.3 or later is part of all distributions of
-%%   LaTeX version 2003/06/01 or later.
+%%   version 1.3c of this license or (at your option) any
+%%   later version: <http://www.latex-project.org/lppl.txt>
 %% 
-%%   This work has the LPPL maintenance status "author-maintained".
+%%   This work has the LPPL maintenance status "maintained".
+%%   The Current Maintainer of this work is Will Robertson.
 %% 
 %%   This work consists of the files listed in the README file.
 %% -----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{layouts}[2004/10/25 v2.6c graphical depiction of document elements]
+\ProvidesPackage{layouts}[2009/09/02 v2.6d graphical depiction of document elements]
 
 \@ifundefined{bs}{\newcommand{\bs}{\texttt{\char`\\}}}%
   {\renewcommand{\bs}{\texttt{\char`\\}}}