From 3ecf59827473ef50811e6d2ca409aa7838d9f23d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 19 Jan 2011 00:47:57 +0000 Subject: mylatexformat 3.2 (18jan11) git-svn-id: svn://tug.org/texlive/trunk@21118 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/mylatexformat/mylatexformat.drv | 6 +-- .../source/latex/mylatexformat/mylatexformat.dtx | 57 +++++++++++++--------- .../source/latex/mylatexformat/mylatexformat.ins | 6 +-- 3 files changed, 39 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/source/latex/mylatexformat') diff --git a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.drv b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.drv index 2d43f763274..32312113331 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/14 v331 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file +%% mylatexformat : 2011/01/18 v3.2 - 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/14} -\def\thisversion{3.1} +\def\thisdate{2011/01/18} +\def\thisversion{3.2} \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 f1f1985c594..971f3244d19 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/14 v3.1 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file] +% mylatexformat : 2011/01/18 v3.2 - 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/14 v331 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file*} +\Msg{* Package 2011/01/18 v3.2 - 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/14 v331 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file +mylatexformat : 2011/01/18 v3.2 - 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 %<*driver> \edef\thisfile{\jobname} \def\thisinfo{Make a format based on the preamble of any \texorpdfstring{\LaTeX{}}{LaTeX} file} -\def\thisdate{2011/01/14} -\def\thisversion{3.1} +\def\thisdate{2011/01/18} +\def\thisversion{3.2} \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 % % \fi % -% \CheckSum{297} +% \CheckSum{304} % % \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 @@ -189,6 +189,7 @@ Copyright (C) 2010-2011 by Florent Chervet % {\xpackage{{\thisfile}}\Xspace} % {\xpackage{{\pkgcolor\thisfile}}\Xspace}} % \def\ThisPackage{\Xpackage{\thisfile}\xspace} +% \def\CTANpackage#1{\href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/#1.html}{\xpackage{#1}}} % \def\Xpackage{\@dblarg\X@package} % \def\X@package[#1]#2{\@testopt{\X@@package{#1}{#2}}{}} % \def\X@@package#1#2[#3]{% @@ -425,9 +426,9 @@ Copyright (C) 2010-2011 by Florent Chervet % \end{tabu} % \medskip % -% \thispackage was primarily written from \href{{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/mylatex.html}}{\xpackage{mylatex}} +% \thispackage was primarily written from \CTANpackage{mylatex} % by David Carlisle, but it is different in many points (see \ref{mylatex}). In particular, \thispackage allows to put almost -% any package in the format, with one exception: the package \href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/minitoc.html}{\xpackage{minitoc}} +% any package in the format, with one exception: the package \CTANpackage{minitoc} % cannot be included in the format (you must use \csref{endofdump} before \cs{usepackage}\M*{minitoc}). % % \end{abstract} @@ -565,7 +566,7 @@ Copyright (C) 2010-2011 by Florent Chervet %%% mylatexformat.ltx %%% ^^^^^^^^^^^^^^^^^ %%% From an original idea by David Carlisle - mylatex.ltx 1994/09/27 -%%% © lppl 2010-2011 - F Chervet - 2011/01/14 +%%% © lppl 2010-2011 - F Chervet - 2011/01/18 v3.2 %%% _____________________________________________________________________ %%% %%% Use this file to make a format based on the preamble of any LaTeX @@ -740,14 +741,16 @@ Copyright (C) 2010-2011 by Florent Chervet %% Rem: it is NOT POSSIBLE to redefine \document, for the macro %% \document is changed or patched by some classes or packages %% (auxhook, etoolbox etc.) -\let\MYLATEX@ltx@begin \begin -\def\begin#1{% - \expandafter \ifx\csname#1\endcsname\document - \expandafter\expandafter\expandafter\endofdump - \expandafter\@gobble - \else \expandafter\MYLATEX@ltx@begin - \fi{#1}% -}% \begin +{ + \def\x #1{\gdef\begin ##1{\MYLATEX@StopAtdocument{##1}#1}%ù + }\expandafter\x\expandafter{\begin{#1}}% +} +\def\MYLATEX@restore@begin{% + \long\def\MYLATEX@restore@begin##1\MYLATEX@StopAtdocument##2##3\@nil{% + \gdef\begin ####1{##1##3}% + }\expandafter\MYLATEX@restore@begin\begin{##1}\@nil + \global\let\MYLATEX@restore@begin \@undefined +}% \MYLATEX@restore@begin %% 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, @@ -768,8 +771,9 @@ Copyright (C) 2010-2011 by Florent Chervet \ifdefined\tiny\tiny\fi }}% \let\openout \etex@primitive@openout% just in case - normally not necessary - \let\begin \MYLATEX@ltx@begin - \let\MYLATEX@ltx@begin \@undefined + \MYLATEX@restore@begin +%% \let\begin \MYLATEX@ltx@begin +%% \let\MYLATEX@ltx@begin \@undefined \MYLATEX@cmap@hook \makeatother \everyjob\expandafter{\the\everyjob @@ -846,18 +850,23 @@ Copyright (C) 2010-2011 by Florent Chervet % % \end{macrocode} % -% +% \restoregeometry\pagesetup*{left/offset+=1cm,right/offset+=1.5cm-2mm} % \begin{History} % \sectionformat\subsection{font+=\smaller,bottom=\smallskipamount,top=\medskipamount} % +% \begin{Version}{2011/01/18 v3.2}\HistLabel{3.2} +% \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} +% % \begin{Version}{2011/01/14 v3.1}\HistLabel{3.1} % \item \cs{@for} loop introduced for compatibility with the \xpackage{cmap} package had the bad side effect to define a control sequence \cs{x}. Fixed. % \end{Version} % % \begin{Version}{2011/01/12 v3.0}\HistLabel{3.0} -% \item Fix a problem with package \href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/mylatexformat.html}{\xpackage{cmap}} which could not be +% \item Fix a problem with package \CTANpackage{cmap} which could not be % included in the format. -% \item Documentation revisited after Users' feedback (and the \href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/interfaces.html}{\xpackage{interfaces}} package). +% \item Documentation revisited after Users' feedback (and the \CTANpackage{interfaces} package). % \end{Version} % % \begin{Version}{2010/08/09 v2.9}\HistLabel{2.9} @@ -881,8 +890,8 @@ Copyright (C) 2010-2011 by Florent Chervet % \end{Version} % % \end{History} -% -% \restoregeometry\pagesetup*{left/offset+=1cm,right/offset+=1.5cm-2mm} +% +% ^^A\restoregeometry\pagesetup*{left/offset+=1cm,right/offset+=1.5cm-2mm} % \PrintIndex % % \Finale \ No newline at end of file diff --git a/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.ins b/Master/texmf-dist/source/latex/mylatexformat/mylatexformat.ins index 7ddb5e31b20..572fb663583 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/14 v331 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file +%% mylatexformat : 2011/01/18 v3.2 - 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/14 v331 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file*} +\Msg{* Package 2011/01/18 v3.2 - 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/14 v331 - Use mylatexformat.ltx to make a format based on the preamble of any LaTeX file +mylatexformat : 2011/01/18 v3.2 - 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 -- cgit v1.2.3