summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/catchfilebetweentags/catchfilebetweentags.pdfbin170726 -> 190846 bytes
-rw-r--r--Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.drv32
-rw-r--r--Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.dtx249
-rw-r--r--Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.ins8
-rw-r--r--Master/texmf-dist/tex/latex/catchfilebetweentags/catchfilebetweentags.sty4
5 files changed, 191 insertions, 102 deletions
diff --git a/Master/texmf-dist/doc/latex/catchfilebetweentags/catchfilebetweentags.pdf b/Master/texmf-dist/doc/latex/catchfilebetweentags/catchfilebetweentags.pdf
index c60ed199b59..ef0f1e15507 100644
--- a/Master/texmf-dist/doc/latex/catchfilebetweentags/catchfilebetweentags.pdf
+++ b/Master/texmf-dist/doc/latex/catchfilebetweentags/catchfilebetweentags.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.drv b/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.drv
index 5c922e253fd..e3de7da3b84 100644
--- a/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.drv
+++ b/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.drv
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% catchfilebetweentags : 2010/06/20 v1.0 - catchfilebetweentags : catch file between delimiters or tags
+%% catchfilebetweentags : 2011/02/19 v1.1 - catchfilebetweentags : catch file between delimiters or tags
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -24,9 +24,9 @@
%% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%%
\edef\thisfile{\jobname}
-\def\thisinfo{catch file between delimiters or tags (\FC)}
-\def\thisdate{2010/06/20}
-\def\thisversion{1.0}
+\def\thisinfo{catch file between delimiters or tags}
+\def\thisdate{2011/02/19}
+\def\thisversion{1.1}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -34,19 +34,35 @@
\newcommand*\CTANhrefnost[2][/contrib/]{\href{\CTANbaseurl#1#2}{\nolinkurl{\CTANdisplay#1#2}}}
\let\loadclass\LoadClass
\def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}}
+{\makeatletter{\endlinechar`\^^J\obeyspaces
+ \gdef\ErrorUpdate#1=#2,{\@ifpackagelater{#1}{#2}{}{\let\CheckDate\errmessage\toks@\expandafter{\the\toks@
+ \thisfile-documentation: updates required !
+ package #1 must be later than #2
+ to compile this documentation.}}}}%
+ \gdef\CheckDate#1{{\let\CheckDate\relax\toks@{}\@for\x:=\thisfile=\thisdate,#1\do{\expandafter\ErrorUpdate\x,}\CheckDate\expandafter{\the\toks@}}}}
+\AtBeginDocument{\CheckDate{interfaces=2011/02/19,tabu=2011/02/19}}
+\PassOptionsToPackage{svgnames}{xcolor}
+\PassOptionsToPackage{hyperfootnotes=true}{hyperref}
\documentclass[a4paper,oneside]{ltxdoc}
+\AtBeginDocument{\DeleteShortVerb{\|}}
\usepackage[latin1]{inputenc}
\usepackage[american]{babel}
\usepackage[T1]{fontenc}
-\usepackage{etoolbox,geometry,lastpage,titlesec,tocloft,graphicx,xcolor,xspace,tabularx,fancyhdr,bbding,embedfile,framed,multirow,txfonts,makecell,enumitem,arydshln,atveryend,catchfile}
+\usepackage{ltxnew,etoolbox,geometry,graphicx,xcolor,needspace,ragged2e} % general tools
+\usepackage{lmodern,bbding,hologo,relsize,moresize,manfnt,pifont,upgreek} % fonts
+\usepackage[official]{eurosym} % font
+\usepackage{xspace,tocloft,titlesec,fancyhdr,lastpage,enumitem,marginnote} % paragraphs & pages management
+\usepackage{holtxdoc,bookmark,hypbmsec,enumitem-zref} % hyper-links
+\usepackage{array,delarray,longtable,colortbl,multirow,makecell,booktabs} % tabulars
+\usepackage{bbding,embedfile,framed,txfonts,catchfile}
\usepackage{interfaces}
-\usepackage[hyperindex=false,pdfusetitle,colorlinks,pdfpagelabels,pdfencoding=auto]{hyperref}
+\usepackage{tabu}
\csname endofdump\endcsname
-\usepackage{holtxdoc}
\CodelineNumbered
\usepackage{fancyvrb}
+\usepackage{catchfilebetweentags}
\lastlinefit999
-\geometry{top=1.2cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm}
+\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm}
\hypersetup{%
pdftitle={The catchfilebetweentags package},
pdfsubject={catch file between delimiters or tags},
diff --git a/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.dtx b/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.dtx
index cd8af61b31f..ed73b1b4793 100644
--- a/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.dtx
+++ b/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.dtx
@@ -1,5 +1,5 @@
% \iffalse meta-comment
-% catchfilebetweentags : 2010/06/20 v1.0 - catchfilebetweentags : catch file between delimiters or tags]
+% catchfilebetweentags : 2011/02/19 v1.1 - catchfilebetweentags : catch file between delimiters or tags]
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -22,7 +22,7 @@
%
% Documentation:
% (pdf)latex catchfilebetweentags.dtx
-% Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
+% Copyright (C) 2010-2011 by Florent Chervet <florent.chervet@free.fr>
%<*ignore>
\begingroup
\def\x{LaTeX2e}%
@@ -36,7 +36,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: 2010/06/20 v1.0 - catchfilebetweentags : catch file between delimiters or tags}
+\Msg{* Package: 2011/02/19 v1.1 - catchfilebetweentags : catch file between delimiters or tags}
\Msg{************************************************************************}
\keepsilent
@@ -47,7 +47,7 @@
This is a generated file.
-catchfilebetweentags : 2010/06/20 v1.0 - catchfilebetweentags : catch file between delimiters or tags
+catchfilebetweentags : 2011/02/19 v1.1 - catchfilebetweentags : catch file between delimiters or tags
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -70,7 +70,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\file{catchfilebetweentags.sty}{\from{catchfilebetweentags.dtx}{package}}%
}
-\askforoverwritetrue
+\askforoverwritefalse
\generate{%
\file{catchfilebetweentags.drv}{\from{catchfilebetweentags.dtx}{driver}}%
}
@@ -97,9 +97,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%</ignore>
%<*driver>
\edef\thisfile{\jobname}
-\def\thisinfo{catch file between delimiters or tags (\FC)}
-\def\thisdate{2010/06/20}
-\def\thisversion{1.0}
+\def\thisinfo{catch file between delimiters or tags}
+\def\thisdate{2011/02/19}
+\def\thisversion{1.1}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/macros/latex}
\def\CTANdisplay{CTAN:macros/latex}
\makeatletter\protected\def\CTANhref{\@ifstar\CTANhrefstar\CTANhrefnost}\makeatother
@@ -107,19 +107,35 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\newcommand*\CTANhrefnost[2][/contrib/]{\href{\CTANbaseurl#1#2}{\nolinkurl{\CTANdisplay#1#2}}}
\let\loadclass\LoadClass
\def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}}
+{\makeatletter{\endlinechar`\^^J\obeyspaces
+ \gdef\ErrorUpdate#1=#2,{\@ifpackagelater{#1}{#2}{}{\let\CheckDate\errmessage\toks@\expandafter{\the\toks@
+ \thisfile-documentation: updates required !
+ package #1 must be later than #2
+ to compile this documentation.}}}}%
+ \gdef\CheckDate#1{{\let\CheckDate\relax\toks@{}\@for\x:=\thisfile=\thisdate,#1\do{\expandafter\ErrorUpdate\x,}\CheckDate\expandafter{\the\toks@}}}}
+\AtBeginDocument{\CheckDate{interfaces=2011/02/19,tabu=2011/02/19}}
+\PassOptionsToPackage{svgnames}{xcolor}
+\PassOptionsToPackage{hyperfootnotes=true}{hyperref}
\documentclass[a4paper,oneside]{ltxdoc}
+\AtBeginDocument{\DeleteShortVerb{\|}}
\usepackage[latin1]{inputenc}
\usepackage[american]{babel}
\usepackage[T1]{fontenc}
-\usepackage{etoolbox,geometry,lastpage,titlesec,tocloft,graphicx,xcolor,xspace,tabularx,fancyhdr,bbding,embedfile,framed,multirow,txfonts,makecell,enumitem,arydshln,atveryend,catchfile}
+\usepackage{ltxnew,etoolbox,geometry,graphicx,xcolor,needspace,ragged2e} % general tools
+\usepackage{lmodern,bbding,hologo,relsize,moresize,manfnt,pifont,upgreek} % fonts
+\usepackage[official]{eurosym} % font
+\usepackage{xspace,tocloft,titlesec,fancyhdr,lastpage,enumitem,marginnote} % paragraphs & pages management
+\usepackage{holtxdoc,bookmark,hypbmsec,enumitem-zref} % hyper-links
+\usepackage{array,delarray,longtable,colortbl,multirow,makecell,booktabs} % tabulars
+\usepackage{bbding,embedfile,framed,txfonts,catchfile}
\usepackage{interfaces}
-\usepackage[hyperindex=false,pdfusetitle,colorlinks,pdfpagelabels,pdfencoding=auto]{hyperref}
+\usepackage{tabu}
\csname endofdump\endcsname
-\usepackage{holtxdoc}
\CodelineNumbered
\usepackage{fancyvrb}
+\usepackage{catchfilebetweentags}
\lastlinefit999
-\geometry{top=1.2cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=2.5cm,right=1cm}
+\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm}
\hypersetup{%
pdftitle={The catchfilebetweentags package},
pdfsubject={catch file between delimiters or tags},
@@ -137,7 +153,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%</driver>
% \fi
%
-% \CheckSum{0}
+% \CheckSum{191}
%
% \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
@@ -181,8 +197,6 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \newrobustcmd\ClearPage{\@ifstar\clearpage{}}
% \makeatletter
% \newrobustcmd*\FC{{\color{copper}\usefont{T1}{fts}xn FC}}
-% ^^A\MakeShortVerb{\+}\DefineShortVerb{\|}
-% \DeleteShortVerb{\|}\DeleteShortVerb{\+}
% \catcode`\§ \active \def§{\@ifnextchar §{\par\nobreak\vskip-2\parskip}{\par\nobreak\vskip-\parskip}}
% \def\pkgcolor{\color{teal}}
% \def\thispackage{\xpackage{{\pkgcolor\thisfile}}\xspace}
@@ -202,10 +216,20 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \newrobustcmd\verbfont{\usefont{T1}{\ttdefault}{\f@series}{n}} \let\vb\verbfont
% \newrobustcmd\vbbf{\usefont{T1}{\ttdefault}bn}
% \renewrobustcmd\#[1]{{\usefont{T1}{pcr}{bx}{n}\char`\##1}}
-% \newrobustcmd\csred[1]{\textcolor{red}{\cs{#1}}}
-% \renewrobustcmd\cs[2][]{\mbox{\vb#1\expandafter\@gobble\string\\#2}}
+% \newrobustcmd*\grabcs{\leavevmode\hbox\bgroup\bgroup\makeatletter\aftergroup\endgrabcs}
+% \def\endgrabcs{\egroup\xspaceverb}
+% \renewrobustcmd*\cs{\grabcs\cs@}
+% \newrobustcmd\cs@[2][]{\begingroup\escapechar\m@ne\def\x ##1{\endgroup\@maybehyperlink{##1}{\texttt{#1{\@backslashchar##1}}}}\expandafter\x\expandafter{\string#2}\egroup}
+% \newcommand*\cs@pdf[1]{\@backslashchar\if\@backslashchar\string#1 \else\string#1\fi}
+% \newrobustcmd*\csbf{\cs[\textbf]}
+% \newrobustcmd\csref[2][]{{\escapechar\m@ne\edef\my@tempa{\string#2}\edef\x ##1{\noexpand\hyperref{}{declcs}{\my@tempa}{\noexpand\cs[{##1}]{\my@tempa}}}\expandafter}\x{#1}}
+% \newrobustcmd*\@maybehyperlink [2]{\ifcsname CatchFBT@declcs.\detokenize{#1}\endcsname \hyperref{}{declcs}{#1}{#2}\else #2\fi}
+% \csundef{CatchFBT@declcs.begin}
+% \newcommand\env{\texorpdfstring \env@ \env@pdf}
+% \newcommand*\env@pdf[1]{#1}
+% \newrobustcmd*\env@{\@ifstar {\env@starsw[environment]}{\env@starsw[]}}
+% \new\def\env@starsw[#1]#2{\textt{#2}\ifblank{#1}{}{ #1}\Xspace}
% \newrobustcmd\CSbf[1]{\textbf{\CS{#1}}}
-% \newrobustcmd\csbf[2][]{\textbf{\cs[{#1}]{#2}}}
% \newrobustcmd\textttbf[1]{\textbf{\texttt{#1}}}
% \renewrobustcmd*\bf{\bfseries}\newcommand\nnn{\normalfont\mdseries\upshape}\newcommand\nbf{\normalfont\bfseries\upshape}
% \newrobustcmd*\blue{\color{blue}}\newcommand*\red{\color{dr}}\newcommand*\green{\color{green}}\newcommand\rred{\color{red}}
@@ -220,88 +244,124 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \newrobustcmd\textt[2][]{\texttt{#1#2}}
% \newcommand\cellstrut{}\let\cellstrut\bottopstrut
% \def\M{\@ifstar{\M@i\@firstofone}{\M@i\meta}}
-% \def\M@i#1{\@ifnextchar[^^A]
-% {\M@square#1}
-% {\@ifnextchar(^^A)
-% {\M@paren#1}
-% {\M@brace#1}}^^A
-% }
-% \def\M@square#1[#2]{\M@Bracket[{#1{#2}}]}
-% \def\M@paren#1(#2){\M@Bracket({#1{#2}})}
-% \def\M@brace#1#2{\M@Bracket\{{#1{#2}}\}}
+% \def\M@i#1{\@ifnextchar[\M@square
+% {\ifx (\@let@token^^A)
+% \expandafter\M@paren
+% \else\ifx |\@let@token
+% \expandafter\expandafter\expandafter\M@bar
+% \else \expandafter\expandafter\expandafter\M@brace
+% \fi\fi#1}}
+% \def\M@square #1[#2]{\M@Bracket[{#1{#2}}]}
+% \def\M@paren #1(#2){\M@Bracket({#1{#2}})}
+% \def\M@bar #1|#2|{\M@Bracket\textbar{#1{#2}}\textbar}
+% \def\M@brace #1#2{\M@Bracket\{{#1{#2}}\}}
% \def\M@Bracket#1#2#3{{\ttfamily#1#2#3}}
+% \newrobustcmd*\thisyear{\begingroup
+% \def\thisyear##1/##2\@nil{\endgroup
+% \oldstylenums{\ifnum##1=2010\else 2010\,\textendash\,\fi ##1}^^A
+% }\expandafter\thisyear\thisdate\@nil
+% }
+% \newrobustcmd*\csanchor[2][]{^^A
+% \immediate\write\@mainaux{\csgdef{CatchFBT@declcs.\string\detokenize{#2}}{}}^^A
+% \raisedhyperdef[14pt]{declcs}{#2}{\cs[{#1}]{#2}}^^A
+% }
% \renewrobustcmd\declcs[2][]{^^A
-% \par\addvspace{0ex plus 1ex}\noindent
-% \hspace{-\leftmargini}^^A
-% \def\*{\unskip\,\texttt{*}}^^A
-% \begin{tabular}{|l|}^^A
-% \hline
+% \if@nobreak \par\nobreak
+% \else \par\addvspace\parskip
+% \Needspace{.08\textheight}\fi
+% \changefont{size+=2.5pt,spread=1,fam=\ttdefault}^^A
+% \def\*{\unskip\,\texttt{*}}\noindent
+% \hskip-\leftmargini
+% \begin{tabu}{|l|}\hline
% \expandafter\SpecialUsageIndex\csname #2\endcsname
-% \cs[{#1}]{#2}^^A
-% }
+% \csanchor[{#1}]{#2}}
+% \renewcommand\enddeclcs{%
+% \crcr \hline \end{tabu}\nobreak
+% \par \nobreak \noindent
+% \ignorespacesafterend
+% }
+% \def\declmargin{\hspace*\declmarginwidth }
+% \def\declmarginwidth{\dimexpr -\leftmargini +\arrayrulewidth +\tabcolsep\relax}
+% \let\plainllap\llap
+% \newrobustcmd\macro@llap[1]{{\global\let\llap\plainllap
+% \setbox0=\hbox\bgroup \raisedhyperdef{macro}{\saved@macroname}{#1}\egroup
+% \ifdim\wd0>32mm
+% \hbox to\z@ \bgroup\hss \hbox to32mm{\unhcopy0\hss}\egroup
+% \edef\@tempa{\hskip\dimexpr\the\wd0-32mm}\global\everypar\expandafter{\the\expandafter\everypar
+% \@tempa \global\everypar{}}^^A
+% \else \llap{\unhbox0}\fi}}
+% \AtBeginEnvironment{macro}{\if@nobreak\else\Needspace{2\baselineskip}\fi
+% \MacrocodeTopsep\z@skip \MacroTopsep\z@skip \parsep\z@ \topsep\z@ \itemsep\z@ \partopsep\z@
+% \let\llap\macro@llap}
+% \AtEndEnvironment{macro}{\goodbreak\vskip.3\parskip}
+% \newrobustcmd*\xspaceverb{\ifnum\catcode`\ =\active\else\expandafter\xspace\fi}
+% \new\let\Xspace \xspaceverb
+% \newrobustcmd*\stform{\ifincsname\else\expandafter\@stform\fi}
+% \newrobustcmd*\@stform{\@ifnextchar*{\@@stform[]\textasteriskcentered\@gobble}\@@stform}
+% \newrobustcmd*\@@stform[2][\string]{\textttbf{#1#2}\Xspace}
+%
% \pagesetup{
% head/font=\color[gray]{.35}\footnotesize,
% foot/font=\color[gray]{.35}\scriptsize,
-% head/rule/font=\color[gray]{.35},%
-% head/rule/width=.4pt,
-% foot/rule=.0pt,
-% head/left=The \thispackage package -- \thisinfo,
-% foot/left=\thispackage\,[rev.\thisversion]\,\copyright\,\oldstylenums{2010}\,\lower.3ex\hbox{\pkgcolor\NibRight}\,\FC,
-% foot/right=\oldstylenums{\thepage} / \oldstylenums{\pageref{LastPage}}}
-% \pagestyle{fancy}
+% head/color=LightSteelBlue,
+% left/offset=3cm,foot/left/offset+=.5cm,right/offset=1cm,
+% head/left=\moveleft1cm\vbox to\z@{\vss\setbox0=\null\ht0=\z@\wd0=\paperwidth\dp0=\headheight\rlap{\colorbox{GhostWhite}{\box0}}}\vskip-\headheight\thispackage\ -- \thisinfo,
+% foot/left=\vbox to\baselineskip{\vss{{\rotatebox[origin=l]{90}{\thispackage\,[rev.\thisversion]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC}}}},
+% foot/right=\oldstylenums{\arabic{page}} / \oldstylenums{\pageref{LastPage}},
+% }
% \pagesetup[plain]{
-% foot/right=\oldstylenums{\arabic{page}} / \oldstylenums{\pageref{LastPage}}}
+% foot/font=\color[gray]{.35}\scriptsize,
+% foot/right=\oldstylenums{\arabic{page}} / \oldstylenums{\pageref{LastPage}},
+% left/offset=3cm,foot/left/offset+=.5cm,right/offset=1cm,
+% foot/left=\vbox to\baselineskip{\vss{{\rotatebox[origin=l]{90}{\thispackage\,[rev.\thisversion]\,\copyright\,\thisyear\,\lower.4ex\hbox{\pkgcolor\NibRight}\,\FC\quad \xemail{florent.chervet at free.fr}}}}},
+% }
%
% \newrobustcmd*\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.18,0.00,0.45}
% \newrobustcmd*\IMPLEMENTATION{%
% \hypersetup{bookmarksopenlevel=1}
% \bookmarksetup{bold=true,italic=true}
-% \newgeometry{top=1.2cm,headheight=1cm,headsep=.3cm,bottom=1.4cm,footskip=.5cm,left=4cm,right=.5cm}
+% ^^A\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=1.5cm}
+% \newgeometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=4cm,right=.5cm}
+% \pagesetup*{right/offset-=1cm}
% \section{Implementation} \label{sec:implementation}
% \bookmarksetup{bold=false,italic=false}}
-% \def\macro@llap#1{\setbox\z@\hbox{#1}\ifdim\wd\z@>3cm\hbox to\z@{\hss\hbox to3cm{#1\hss}}\else\hbox to\z@{\hss#1}\fi\setbox\z@\box\voidb@x}
-% \pretocmd\macro{\let\llap\macro@llap}{}{}
-% \apptocmd\endmacro{\goodbreak}{}{}
%
-% \newcommand\reflinkcolor{\color{reflink}}\definecolor{reflink}{rgb}{0.49,0.00,0.00}
-% \newrobustcmd\stform{\@ifnextchar*{\@stform[]\textasteriskcentered\@gobble}\@stform}
-% \newrobustcmd\@stform[2][\string]{\textttbf{\rred#1#2}\xspace}
+% \colorlet{reflink}{CornflowerBlue!40!Indigo}
%
% \makeatother
%
% \deffootnote{1em}{0pt}{\rlap{\textsuperscript{\thefootnotemark}}\kern1em}
%
% \title{\vspace*{-28pt}\mdseries The {\bfseries\thispackage\footnotemark}\kern.6em package}
-% \author{\tiny\xemail{florent.chervet at free.fr}}
-% \date{\thisdate~--~version \thisversion}
-% \subtitle{\thisinfo}
-% ^^A\subject{\thisinfo}
-% \enlargethispage{\baselineskip}
+% \author{\small\thisdate~--~\hyperref[\thisversion]{version \thisversion}}
+% \date{}
+% \subtitle{Catch a part of a file between two tags or delimiters.}
% \maketitle
%
% \makeatletter\begingroup\let\@thefnmark\@empty\let\@makefntext\@firstofone
% \footnotetext{\noindent
-% This documentation is produced with the \xpackage{DocStrip} utility.\loggingall {\topsep=0pt\relax^^A\showthe\partopsep\showthe\parskip
-% \begin{tabbing}
-% \qquad\=\smex\=To get the documentation, \= run (thrice):\quad\= \texttt{pdflatex \thisfile.dtx} \\
-% \qquad\>\>To get the index, \> run:\>\texttt{makeindex -s gind.ist \thisfile.idx} \\
-% \>\smex\>To get the package, \> run:\> \texttt{etex \thisfile.dtx}
-% \end{tabbing}}§\tracingnone
+% This documentation is produced with the \xpackage{DocStrip} utility.\par
+% \begin{tabu}{X[-3]X[-1]X}
+% \smex To get the package, &run: &\texttt{etex \thisfile.dtx} \\
+% \smex To get the documentation &run (thrice): &\textt{pdflatex \thisfile.dtx} \\
+% \leavevmode\hphantom\smex To get the index, &run: &\texttt{makeindex -s gind.ist \thisfile.idx}
+% \end{tabu}§
% The \xext{dtx} file is embedded into this pdf file thank to \xpackage{embedfile} by H. Oberdiek.}
% \endgroup\makeatother
%
% \deffootnote{1em}{0pt}{\rlap{\thefootnotemark.}\kern1em}
% \vspace*{-26pt}
+% {\let\quotation\relax\let\endquotation\relax
% \begin{abstract}\parindent0pt\noindent\leftskip1cm\rightskip\leftskip\lastlinefit0\advance\linewidth by-2\leftskip
%
-% \thispackage provides a macro \csbf{CatchFileBetweenTags} to capture the content of a file between two
-% docstrip tags, and a macro \cs{CatchFileBetweenDelims} to capture between two strings (delimiters):
-%
-%
-% {\def\theadfont{\large\scshape\db}\noindent
-% \begin{tabularx}\linewidth{*{2}{>{\centering\arraybackslash}X}}
-% \thead{docstrip tags example} & \thead{delimiters example} \cr
-% \csbf[\copper]{CatchFileBetweenTags} & \csbf[\copper]{CatchFileBetweenDelims} \\[.5ex]
+% \thispackage provides a macro \cs\CatchFileBetweenTags to capture the content of a file between two
+% docstrip tags, and a macro \cs\CatchFileBetweenDelims to capture between two strings (delimiters):
+%
+% {\noindent\tabulinesep=.5mm
+% \begin{tabu}{*2{X[c]}}
+% \rowfont{\large\scshape\db}
+% docstrip tags example & delimiters example \\[.5ex]
+% \cs\CatchFileBetweenTags & \cs\CatchFileBetweenDelims \\[.5ex]
% \makecell[{{>{\ttfamily}c}}]{\dg\%<*meta> \kern2cm\cr
% something \cr
% to \cr
@@ -313,32 +373,32 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% to \cr
% capture \cr
% \dr</meta>\kern2cm} \cr
-% \end{tabularx}}
+% \end{tabu}
+% }
%
% \bigskip
%
-% Alternatively, it is possible to execute the content of a captured-part with \csbf{ExecuteMetaData}.
+% Alternatively, it is possible to execute the content of a captured-part with \cs\ExecuteMetaData.
% \medskip
%
-% This packages requires \eTeX, and the \Xpackage[oberdiek/catchfile]{catchfile} package.
-%
-% This is the first version.
+% This packages requires \eTeX, and the \Xpackage[oberdiek/catchfile]{catchfile} package by H. Oberdiek.
%
% \end{abstract}
+% }
%
% \sectionformat\section{%
% label=\arabic{section}\,\hbox{\color{teal}\small\HandRight},%
% labelsep=.5em
% }
% \tocsetup{%
+% title=Contents\quad{\pkgcolor\leaders\vrule height3.4pt depth-3pt\hfill\null},
% title/bottom=0pt,%
% twocolumns,
% section/skip=4pt plus2pt minus2pt,%
% subsection/skip=0pt plus2pt minus2pt,
% section/leaders,section/dotsep,%
-% after=\vskip\baselineskip\hrule height3.4pt depth-3pt\relax
+% after=\noindent{\pkgcolor\hrule height3.4pt depth-3pt\relax},
% }
-% \gdef\contentsname{Contents\quad\leaders\vrule height3.4pt depth-3pt\hfill\null\kern0pt}
% \tableofcontents
%
% \hypersetup{bookmarksopenlevel=2}
@@ -349,7 +409,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \section{User interface}
% \label{userinterface}
%
-% \bookmarksetup{color=copper}
+% \bookmarksetup{color*=copper}
% \subsection[\cs{CatchFileBetweenTags}]{\cs[\copper]{CatchFileBetweenTags}}
%
% \begin{declcs}[\red]{CatchFileBetweenTags}\stform[\phantom]*\M{cs-name}\M{file-name}\M{tag}\\
@@ -396,7 +456,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% %<*tag> ($nnn and) %</tag>
%\end{Verb}
%
-% Then the code found is immediately expanded. {\small(You may say for example: \cs{AtBeginDocument}\cs{ExecuteMetaData}).}
+% The captured code is immediately expanded. {\small(You may say for example: \cs\AtBeginDocument\cs\ExecuteMetaData).}
%
% This is a wrapper for:
% \begin{Verb}[commandchars=$()]
@@ -413,8 +473,11 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \subsection[\cs{CatchFileBetweenDelims}]{\cs[\copper]{CatchFileBetweenDelims}}
%
-% \begin{declcs}{CatchFileBetweenDelims}\M{cs-name}\M{file-name}\M{start-delimiter}\M{stop-delimiter}\M[setup]
+% {\smaller
+% \begin{declcs}{CatchFileBetweenDelims}\M{cs-name}\M{file-name}\M{start-delimiter}\M{stop-delimiter}\\
+% \hphantom{\cs\CatchFileBetweenTags\M{cs-name}\M{file-name}\M{start-delimiter}\qquad}\M[setup]
% \end{declcs}
+% }
%
% This command will catch the file given its name \meta{file-name} and store the (first) part of this file
% found between the two string delimiters \meta{start-delimiter} and \meta{stop-delimiter} into either:
@@ -444,7 +507,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
[2005/12/01]% LaTeX must be 2005/12/01 or younger
\ProvidesPackage{catchfilebetweentags}
- [2010/06/20 v1.0 - Catch file between tags (FOC)]
+ [2011/02/19 v1.1 - Catch file between tags (FC)]
% \end{macrocode}
%
% \subsection{Requirements}
@@ -602,15 +665,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \end{macrocode}
%
% \DeleteShortVerb{\+}
-% \restoregeometry
-% \global\labelindent=0pt\global\itemindent\labelindent
-% \begin{History}
-%
-% \begin{Version}{2010/06/20 v1.0}
-% \item First version.
-% \end{Version}
-%
-% \end{History}
+% % ^^A\restoregeometry
%
% \begin{thebibliography}{9}
%
@@ -619,8 +674,26 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% 2009/09/25 v2.5d;
% \CTAN{macros/latex/base/}.
%
+% \bibitem{catchfile}
+% \textit{The \xpackage{catchfile} package};
+% 2010/04/28 v1.5; Heiko Oberdiek.
+% \href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/catchfile.html}{CTAN:catchfile}
% \end{thebibliography}
%
+% \sectionformat\subsection{font=\normalsize\bfseries,top=0pt,bottom=0pt}
+%
+% \begin{History}
+%
+% \begin{Version}{2011/02/19 v1.1}\HistLabel{1.1}
+% \item Recompilation of the documentation after \Xpackage{tabu} v2.5 and \Xpackage{interfaces} v3.1 release.
+% \end{Version}
+%
+% \begin{Version}{2010/06/20 v1.0}\HistLabel{1.0}
+% \item First version.
+% \end{Version}
+%
+% \end{History}
+%
% \PrintIndex
%
% \Finale
diff --git a/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.ins b/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.ins
index 58e4f94a788..d601bbd66bb 100644
--- a/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.ins
+++ b/Master/texmf-dist/source/latex/catchfilebetweentags/catchfilebetweentags.ins
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% catchfilebetweentags : 2010/06/20 v1.0 - catchfilebetweentags : catch file between delimiters or tags
+%% catchfilebetweentags : 2011/02/19 v1.1 - catchfilebetweentags : catch file between delimiters or tags
%%
%% 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/06/20 v1.0 - catchfilebetweentags : catch file between delimiters or tags}
+\Msg{* Package: 2011/02/19 v1.1 - catchfilebetweentags : catch file between delimiters or tags}
\Msg{************************************************************************}
\keepsilent
@@ -37,7 +37,7 @@
This is a generated file.
-catchfilebetweentags : 2010/06/20 v1.0 - catchfilebetweentags : catch file between delimiters or tags
+catchfilebetweentags : 2011/02/19 v1.1 - catchfilebetweentags : catch file between delimiters or tags
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -60,7 +60,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\file{catchfilebetweentags.sty}{\from{catchfilebetweentags.dtx}{package}}%
}
-\askforoverwritetrue
+\askforoverwritefalse
\generate{%
\file{catchfilebetweentags.drv}{\from{catchfilebetweentags.dtx}{driver}}%
}
diff --git a/Master/texmf-dist/tex/latex/catchfilebetweentags/catchfilebetweentags.sty b/Master/texmf-dist/tex/latex/catchfilebetweentags/catchfilebetweentags.sty
index e201739d3f7..13f0b9a7139 100644
--- a/Master/texmf-dist/tex/latex/catchfilebetweentags/catchfilebetweentags.sty
+++ b/Master/texmf-dist/tex/latex/catchfilebetweentags/catchfilebetweentags.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% catchfilebetweentags : 2010/06/20 v1.0 - catchfilebetweentags : catch file between delimiters or tags
+%% catchfilebetweentags : 2011/02/19 v1.1 - catchfilebetweentags : catch file between delimiters or tags
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,7 +26,7 @@
\NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
[2005/12/01]% LaTeX must be 2005/12/01 or younger
\ProvidesPackage{catchfilebetweentags}
- [2010/06/20 v1.0 - Catch file between tags (FOC)]
+ [2011/02/19 v1.1 - Catch file between tags (FC)]
\RequirePackage{etex,etoolbox,ltxcmds}
\RequirePackage{catchfile}
\globtoks\CatchFBT@tok