5 files changed, 58 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/mylatexformat/mylatexformat.pdf b/Master/texmf-dist/doc/latex/mylatexformat/mylatexformat.pdf
index 6fab689d54b..e974cfe095a 100644
--- a/Master/texmf-dist/doc/latex/mylatexformat/mylatexformat.pdf
+++ b/Master/texmf-dist/doc/latex/mylatexformat/mylatexformat.pdf
diff --git a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.drv b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.drv
index 8a72d6a75f5..f13e468aefe 100644
--- a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.drv
+++ b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.drv
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% mylatexformat : 2010/04/30 v1.0 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+%% mylatexformat : 2010/06/20 v2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -25,8 +25,8 @@
 %% 
 \edef\thisfile{\jobname}
 \def\thisinfo{Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file}
-\def\thisdate{2010/04/30}
-\def\thisversion{1.0}
+\def\thisdate{2010/06/20}
+\def\thisversion{2}
 \let\loadclass\LoadClass
 \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}}
 \documentclass[a4paper,oneside]{ltxdoc}
diff --git a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.dtx b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.dtx
index d7684e67168..0c50012e2db 100644
--- a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.dtx
+++ b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.dtx
@@ -1,5 +1,5 @@
 % \iffalse meta-comment
-% mylatexformat : 2010/04/30 v1.0 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file]
+% mylatexformat : 2010/06/20 v2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file]
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -36,7 +36,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package 2010/04/30 v1.0 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file*}
+\Msg{* Package 2010/06/20 v2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file*}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -47,7 +47,7 @@
 
 This is a generated file.
 
-mylatexformat : 2010/04/30 v1.0 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+mylatexformat : 2010/06/20 v2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -98,8 +98,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %<*driver>
 \edef\thisfile{\jobname}
 \def\thisinfo{Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file}
-\def\thisdate{2010/04/30}
-\def\thisversion{1.0}
+\def\thisdate{2010/06/20}
+\def\thisversion{2}
 \let\loadclass\LoadClass
 \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}}
 \documentclass[a4paper,oneside]{ltxdoc}
@@ -126,7 +126,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %</driver>
 % \fi
 %
-% \CheckSum{0}
+% \CheckSum{208}
 %
 % \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
@@ -573,8 +573,12 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 %% Save the original definition.
 \makeatletter
 \let\etex@primitive@openout\openout
-\def\openout#1 {\g@addto@macro\MYLATEXopens{\immediate\etex@primitive@openout#1 }}
-\let\MYLATEXopens\@empty
+\let\ltx@listfiles\listfiles
+\def\openout#1 {\g@addto@macro\MYLATEXopens{\immediate\openout#1 }}
+\def\MYLATEXopens{%
+   \let\openout\etex@primitive@openout
+   \let\etex@primitive@openout\ltx@undefined
+}% \MYLATEXopens
 %% \begin is overloaded in order to stop \dump at begin document
 %% if the macro \endofdump is not given somewhere in the preamble.
 %% Rem: it is NOT POSSIBLE to redefine \document, for the macro
@@ -605,14 +609,14 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
       \ifdefined\footnotesize\footnotesize\fi
       \ifdefined\tiny\tiny\fi
    }}%
-   \let\openout\etex@primitive@openout
-   \let\etex@primitive@openout\@undefined
+   \let\openout\etex@primitive@openout% just in case - normally not necessary
    \let\begin\MYLATEX@latex@begin
    \let\MYLATEX@latex@begin\@undefined
+   \the\MYLATEX@hook\MYLATEX@hook{}%
    \makeatother
    \everyjob\expandafter{\the\everyjob
       \begingroup
-         \listfiles
+         \listfiles\let\listfiles\ltx@listfiles
          \expandafter\MYLATEXcustomised\@dofilelist
       \endgroup}%
    \catcode`\\=13\relax%
@@ -673,6 +677,20 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
             /MYLATEX}%
       ^^M}%
 }% Leaving simple groupe (level 1) => start reading document
+%    \end{macrocode}
+%
+%\begin{macro}{\AtEndOfDump}
+% This is just a hook to be executed when \cs{endofdump} is encoutered,
+% (or \cs{begin}\{document\}). Therefore, the code having been set \cs{AtEndOfDump}
+% is included in the format:
+%    \begin{macrocode}
+\newtoks\MYLATEX@hook
+\def\AtEndOfDump{\addto@hook\MYLATEX@hook}
+\AtEndOfDump{\let\AtEndOfDump\@undefined}
+%    \end{macrocode}
+%\end{macro}
+%
+%    \begin{macrocode}
 %% Trick lookahead to allow mylatex.ltx and the document filename to be
 %% given on the same command line. (initex &latex mylatex.ltx {abc.tex})
 \expandafter\input\endinput%
@@ -682,6 +700,16 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
 % \DeleteShortVerb{\+}^^A\UndefineShortVerb{\+}
 % \begin{History}
 %
+%   \begin{Version}{2010/06/20 v2}
+%   \item Added: \cs{AtEndOfDump} macro to include some code in the format, just before \cs{dump}.
+%   \item Added: \cs{listfiles} is now available in the preamble, after \cs{endofdump}, when the document is compiled with its format.
+%   \end{Version}
+%
+%   \begin{Version}{2010/05/20 v1.2}
+%   \item Fixed a bug in \cs{MYLATEXopens} \\
+%         (There was problems when including an index in the format for example...)
+%   \end{Version}
+%
 %   \begin{Version}{2010/04/30 v1.0}
 %   \item First version.
 %   \end{Version}
diff --git a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.ins b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.ins
index f7bad01d93f..646ea59b029 100644
--- a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.ins
+++ b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.ins
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% mylatexformat : 2010/04/30 v1.0 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+%% mylatexformat : 2010/06/20 v2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -26,7 +26,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package 2010/04/30 v1.0 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file*}
+\Msg{* Package 2010/06/20 v2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file*}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -37,7 +37,7 @@
 
 This is a generated file.
 
-mylatexformat : 2010/04/30 v1.0 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+mylatexformat : 2010/06/20 v2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/mylatexformat/mylatexformat.ltx b/Master/texmf-dist/tex/latex/mylatexformat/mylatexformat.ltx
index 02454aaeec3..90656e39f6b 100644
--- a/Master/texmf-dist/tex/latex/mylatexformat/mylatexformat.ltx
+++ b/Master/texmf-dist/tex/latex/mylatexformat/mylatexformat.ltx
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% mylatexformat : 2010/04/30 v1.0 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+%% mylatexformat : 2010/06/20 v2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -177,8 +177,12 @@
 %% Save the original definition.
 \makeatletter
 \let\etex@primitive@openout\openout
-\def\openout#1 {\g@addto@macro\MYLATEXopens{\immediate\etex@primitive@openout#1 }}
-\let\MYLATEXopens\@empty
+\let\ltx@listfiles\listfiles
+\def\openout#1 {\g@addto@macro\MYLATEXopens{\immediate\openout#1 }}
+\def\MYLATEXopens{%
+   \let\openout\etex@primitive@openout
+   \let\etex@primitive@openout\ltx@undefined
+}% \MYLATEXopens
 %% \begin is overloaded in order to stop \dump at begin document
 %% if the macro \endofdump is not given somewhere in the preamble.
 %% Rem: it is NOT POSSIBLE to redefine \document, for the macro
@@ -209,14 +213,14 @@
       \ifdefined\footnotesize\footnotesize\fi
       \ifdefined\tiny\tiny\fi
    }}%
-   \let\openout\etex@primitive@openout
-   \let\etex@primitive@openout\@undefined
+   \let\openout\etex@primitive@openout% just in case - normally not necessary
    \let\begin\MYLATEX@latex@begin
    \let\MYLATEX@latex@begin\@undefined
+   \the\MYLATEX@hook\MYLATEX@hook{}%
    \makeatother
    \everyjob\expandafter{\the\everyjob
       \begingroup
-         \listfiles
+         \listfiles\let\listfiles\ltx@listfiles
          \expandafter\MYLATEXcustomised\@dofilelist
       \endgroup}%
    \catcode`\\=13\relax%
@@ -276,6 +280,9 @@
             /MYLATEX}%
       ^^M}%
 }% Leaving simple groupe (level 1) => start reading document
+\newtoks\MYLATEX@hook
+\def\AtEndOfDump{\addto@hook\MYLATEX@hook}
+\AtEndOfDump{\let\AtEndOfDump\@undefined}
 %% Trick lookahead to allow mylatex.ltx and the document filename to be
 %% given on the same command line. (initex &latex mylatex.ltx {abc.tex})
 \expandafter\input\endinput%