mylatexformat 3.3 (19jan11)

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

5 files changed, 28 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/mylatexformat/mylatexformat.pdf b/Master/texmf-dist/doc/latex/mylatexformat/mylatexformat.pdf
index 5018e22de00..c29cc3a6bfa 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 32312113331..59ddbe0e637 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 : 2011/01/18 v3.2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+%% mylatexformat : 2011/01/19 v3.3 - 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{Make a format based on the preamble of any \texorpdfstring{\LaTeX{}}{LaTeX} file}
-\def\thisdate{2011/01/18}
-\def\thisversion{3.2}
+\def\thisdate{2011/01/19}
+\def\thisversion{3.3}
 \let\loadclass\LoadClass
 \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}}
 \PassOptionsToPackage{svgnames}{xcolor}
diff --git a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.dtx b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.dtx
index 971f3244d19..7c9845faa66 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 : 2011/01/18 v3.2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file]
+% mylatexformat : 2011/01/19 v3.3 - 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 2011/01/18 v3.2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file*}
+\Msg{* Package 2011/01/19 v3.3 - 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 : 2011/01/18 v3.2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+mylatexformat : 2011/01/19 v3.3 - 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-2011 by Florent Chervet <florent.chervet@free.fr>
 %<*driver>
 \edef\thisfile{\jobname}
 \def\thisinfo{Make a format based on the preamble of any \texorpdfstring{\LaTeX{}}{LaTeX} file}
-\def\thisdate{2011/01/18}
-\def\thisversion{3.2}
+\def\thisdate{2011/01/19}
+\def\thisversion{3.3}
 \let\loadclass\LoadClass
 \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}}
 \PassOptionsToPackage{svgnames}{xcolor}
@@ -134,7 +134,7 @@ Copyright (C) 2010-2011 by Florent Chervet <florent.chervet@free.fr>
 %</driver>
 % \fi
 %
-% \CheckSum{304}
+% \CheckSum{313}
 %
 % \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
@@ -566,7 +566,7 @@ Copyright (C) 2010-2011 by Florent Chervet <florent.chervet@free.fr>
 %%%                           mylatexformat.ltx
 %%%                           ^^^^^^^^^^^^^^^^^
 %%% From an original idea by David Carlisle - mylatex.ltx 1994/09/27
-%%% © lppl 2010-2011 - F Chervet - 2011/01/18 v3.2
+%%% © lppl 2010-2011 - F Chervet - 2011/01/19 v3.3
 %%% _____________________________________________________________________
 %%%
 %%% Use this file to make a format based on the preamble of any LaTeX
@@ -742,7 +742,7 @@ Copyright (C) 2010-2011 by Florent Chervet <florent.chervet@free.fr>
 %%      \document is changed or patched by some classes or packages
 %%      (auxhook, etoolbox etc.)
 {
-   \def\x #1{\gdef\begin ##1{\MYLATEX@StopAtdocument{##1}#1}%ù
+   \def\x #1{\gdef\begin ##1{\MYLATEX@StopAtdocument{##1}#1}%
    }\expandafter\x\expandafter{\begin{#1}}%
 }
 \def\MYLATEX@restore@begin{%
@@ -750,7 +750,12 @@ Copyright (C) 2010-2011 by Florent Chervet <florent.chervet@free.fr>
       \gdef\begin ####1{##1##3}%
    }\expandafter\MYLATEX@restore@begin\begin{##1}\@nil
    \global\let\MYLATEX@restore@begin \@undefined
+   \global\let\MYLATEX@StopAtdocument \@undefined
 }% \MYLATEX@restore@begin
+\def\MYLATEX@StopAtdocument#1{%
+   \expandafter\ifx\csname#1\endcsname\document
+   \expandafter\endofdump\fi
+}% \MYLATEX@StopAtdocument
 %% The version of \document to use on the initex run.
 %% Just preloads some fonts, puts back \document and \openout,
 %% sets up the banner to display the file list of files preloaded,
@@ -772,8 +777,6 @@ Copyright (C) 2010-2011 by Florent Chervet <florent.chervet@free.fr>
    }}%
    \let\openout \etex@primitive@openout% just in case - normally not necessary
    \MYLATEX@restore@begin
-%%   \let\begin \MYLATEX@ltx@begin
-%%   \let\MYLATEX@ltx@begin \@undefined
    \MYLATEX@cmap@hook
    \makeatother
    \everyjob\expandafter{\the\everyjob
@@ -854,7 +857,7 @@ Copyright (C) 2010-2011 by Florent Chervet <florent.chervet@free.fr>
 % \begin{History}
 %   \sectionformat\subsection{font+=\smaller,bottom=\smallskipamount,top=\medskipamount}
 %
-%   \begin{Version}{2011/01/18 v3.2}\HistLabel{3.2}
+%   \begin{Version}{2011/01/19 v3.3}\HistLabel{3.3}
 %   \item Modification of the code for \cs{begin} in order to keep the patching introduced by
 %         \CTANpackage{etoolbox} version \textt{2.1} for the hooks \cs{AtBeginEnvironment}...\cs{AtEndEnvironement}.
 %   \end{Version}
diff --git a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.ins b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.ins
index 572fb663583..d393483482e 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 : 2011/01/18 v3.2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+%% mylatexformat : 2011/01/19 v3.3 - 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 2011/01/18 v3.2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file*}
+\Msg{* Package 2011/01/19 v3.3 - 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 : 2011/01/18 v3.2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+mylatexformat : 2011/01/19 v3.3 - 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 a6706d7e980..629824038d0 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 : 2011/01/18 v3.2 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file
+%% mylatexformat : 2011/01/19 v3.3 - 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
@@ -27,7 +27,7 @@
 %%%                           mylatexformat.ltx
 %%%                           ^^^^^^^^^^^^^^^^^
 %%% From an original idea by David Carlisle - mylatex.ltx 1994/09/27
-%%% ^^a9 lppl 2010-2011 - F Chervet - 2011/01/18 v3.2
+%%% ^^a9 lppl 2010-2011 - F Chervet - 2011/01/19 v3.3
 %%% _____________________________________________________________________
 %%%
 %%% Use this file to make a format based on the preamble of any LaTeX
@@ -203,7 +203,7 @@
 %%      \document is changed or patched by some classes or packages
 %%      (auxhook, etoolbox etc.)
 {
-   \def\x #1{\gdef\begin ##1{\MYLATEX@StopAtdocument{##1}#1}%^^f9
+   \def\x #1{\gdef\begin ##1{\MYLATEX@StopAtdocument{##1}#1}%
    }\expandafter\x\expandafter{\begin{#1}}%
 }
 \def\MYLATEX@restore@begin{%
@@ -211,7 +211,12 @@
       \gdef\begin ####1{##1##3}%
    }\expandafter\MYLATEX@restore@begin\begin{##1}\@nil
    \global\let\MYLATEX@restore@begin \@undefined
+   \global\let\MYLATEX@StopAtdocument \@undefined
 }% \MYLATEX@restore@begin
+\def\MYLATEX@StopAtdocument#1{%
+   \expandafter\ifx\csname#1\endcsname\document
+   \expandafter\endofdump\fi
+}% \MYLATEX@StopAtdocument
 %% The version of \document to use on the initex run.
 %% Just preloads some fonts, puts back \document and \openout,
 %% sets up the banner to display the file list of files preloaded,
@@ -233,8 +238,6 @@
    }}%
    \let\openout \etex@primitive@openout% just in case - normally not necessary
    \MYLATEX@restore@begin
-%%   \let\begin \MYLATEX@ltx@begin
-%%   \let\MYLATEX@ltx@begin \@undefined
    \MYLATEX@cmap@hook
    \makeatother
    \everyjob\expandafter{\the\everyjob