9 files changed, 46 insertions, 51 deletions
diff --git a/Master/texmf-dist/doc/latex/filehook/README b/Master/texmf-dist/doc/latex/filehook/README
index e054de1ffae..6b3ca8a1e8c 100644
--- a/Master/texmf-dist/doc/latex/filehook/README
+++ b/Master/texmf-dist/doc/latex/filehook/README
@@ -1,7 +1,8 @@
 LaTeX package 'filehook'
 ~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2010 by Martin Scharrer <martin@scharrer-online.de>
+Copyright (c) 2010-2011 by Martin Scharrer <martin@scharrer-online.de>
 WWW: http://latex.scharrer-online.de/
+Code repository: https://bitbucket.org/martin_scharrer/filehook
 
 Provides several file hooks for files read by \input, \include and \InputIfFileExists.
 
diff --git a/Master/texmf-dist/doc/latex/filehook/filehook.pdf b/Master/texmf-dist/doc/latex/filehook/filehook.pdf
index 4dca96939dd..c12f85b9032 100644
--- a/Master/texmf-dist/doc/latex/filehook/filehook.pdf
+++ b/Master/texmf-dist/doc/latex/filehook/filehook.pdf
diff --git a/Master/texmf-dist/source/latex/filehook/filehook.dtx b/Master/texmf-dist/source/latex/filehook/filehook.dtx
index 25b7fdebe91..2feb5425f91 100644
--- a/Master/texmf-dist/source/latex/filehook/filehook.dtx
+++ b/Master/texmf-dist/source/latex/filehook/filehook.dtx
@@ -19,7 +19,7 @@
 %% This work consists of the files filehook.dtx, filehook.ins
 %% and the derived file filehook.sty.
 %%
-%% $Id: filehook.dtx 2252 2011-03-09 19:21:15Z martin $
+%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
 % \fi
 %
 % \iffalse
@@ -29,20 +29,15 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{filehook}
 %<*package>
-    [2011/03/09 v0.5a Hooks for input files]
+    [2011/07/18 v0.5b Hooks for input files]
 %</package>
 %
 %<*driver>
-\documentclass{ydoc}[2011/01/09]
-\usepackage{filehook}[2011/01/09]
-\usepackage{ifpdf}
-\usepackage{hyperref}
-\usepackage{array}
-\usepackage{booktabs}
+\documentclass{ydoc}[2011/03/19]
+\usepackage{filehook}[2011/07/18]
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
-\providecommand*\pkg{\texttt}
 \makeatletter
 \providecommand*\tablecaption{%
     \@tempdima=\abovecaptionskip
@@ -60,7 +55,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{977}
+% \CheckSum{989}
 %
 % \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
@@ -97,30 +92,15 @@
 % }
 % \changes{v0.5}{2011/01/09}{Added PGF key interface for hooks. Added macro to clear hooks.}
 % \changes{v0.5a}{2011/03/09}{Added required \string\long\space to an internal macro.}
+% \changes{v0.5b}{2011/07/18}{Replaced \cs{@nameuse} for use with eTeX code to avoid the definition of non-existing hooks to \cs{relax}.}
 %
 % \GetFileInfo{filehook.dtx}
 %
 % \DoNotIndex{\newcommand,\newenvironment}
 %
-% \ifpdf
-% \hypersetup{%
-%   pdfauthor   = {Martin Scharrer <martin@scharrer-online.de>},
-%   pdftitle    = {The filehook package},
-%   pdfsubject  = {Documentation of LaTeX package 'filehook'},
-%   pdfkeywords = {current filename, filename, file, name, LaTeX, TeX}
-% }%
-% \fi
-% \clearpage
-% \null
-% \vspace*{-2em}
-% \begin{center}
-%   {\LARGE\sffamily The \emph{filehook} Package\\[\medskipamount]}
-%   {\large Martin Scharrer \\[\medskipamount]\normalsize 
-%   \url{martin@scharrer-online.de}\\[.8ex]
-%   \url{http://www.ctan.org/pkg/filehook/}\\[\bigskipamount]}
-%   {\large Version \fileversion\ -- \filedate}\\
-% \end{center}
-% \vspace{1.2em}%
+% \author{Martin Scharrer}
+% \email{martin@scharrer-online.de}
+% \maketitle
 %
 % \begin{abstract}
 % This package provides hooks for input files. Document and package authors can use these hooks to
@@ -539,11 +519,20 @@
 % \subsection{Initialisation of Hooks}
 % The general hooks are initialised to call the file specific hooks.
 %
+%
+%    \begin{macrocode}
+\@ifpackageloaded{etoolbox}{%
+    \let\filehook@csuse\csuse
+}{%
+    \def\filehook@csuse#1{\ifcsname #1\endcsname\csname #1\expandafter\endcsname\fi}
+}
+%    \end{macrocode}
+%
 % \begin{macro}{\filehook@include@atbegin}
 %    \begin{macrocode}
 \def\filehook@include@atbegin#1{%
   \let\InputIfFileExists\filehook@@InputIfFileExists
-  \@nameuse{\filehook@include@atbegin@#1}%
+  \filehook@csuse{\filehook@include@atbegin@#1}%
   \filehook@include@@atbegin
 }
 %    \end{macrocode}
@@ -559,7 +548,7 @@
 %    \begin{macrocode}
 \def\filehook@include@atend#1{%
   \filehook@include@@atend
-  \@nameuse{\filehook@include@atend@#1}%
+  \filehook@csuse{\filehook@include@atend@#1}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -574,7 +563,7 @@
 %    \begin{macrocode}
 \def\filehook@include@after#1{%
   \filehook@include@@after
-  \@nameuse{\filehook@include@after@#1}%
+  \filehook@csuse{\filehook@include@after@#1}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -589,7 +578,7 @@
 %    \begin{macrocode}
 \def\filehook@input@atbegin#1{%
   \let\InputIfFileExists\filehook@@InputIfFileExists
-  \@nameuse{\filehook@input@atbegin@\filehook@ensureext{#1}}%
+  \filehook@csuse{\filehook@input@atbegin@\filehook@ensureext{#1}}%
   \filehook@input@@atbegin
 }
 %    \end{macrocode}
@@ -605,7 +594,7 @@
 %    \begin{macrocode}
 \def\filehook@input@atend#1{%
   \filehook@input@@atend
-  \@nameuse{\filehook@input@atend@\filehook@ensureext{#1}}%
+  \filehook@csuse{\filehook@input@atend@\filehook@ensureext{#1}}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -619,7 +608,7 @@
 % \begin{macro}{\filehook@atbegin}
 %    \begin{macrocode}
 \def\filehook@atbegin#1{%
-  \@nameuse{\filehook@atbegin@\filehook@ensureext{#1}}%
+  \filehook@csuse{\filehook@atbegin@\filehook@ensureext{#1}}%
   \filehook@@atbegin
 }
 %    \end{macrocode}
@@ -635,7 +624,7 @@
 %    \begin{macrocode}
 \def\filehook@atend#1{%
   \filehook@@atend
-  \@nameuse{\filehook@atend@\filehook@ensureext{#1}}%
+  \filehook@csuse{\filehook@atend@\filehook@ensureext{#1}}%
 }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty b/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty
index 68c8b79d1f2..9cd67a08f04 100644
--- a/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty
+++ b/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty
@@ -18,7 +18,7 @@
 %% This work consists of the files filehook.dtx, filehook.ins
 %% and the derived file filehook.sty.
 %%
-%% $Id: filehook.dtx 2252 2011-03-09 19:21:15Z martin $
+%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
 \ProvidesPackage{filehook-fink}[2011/01/03 v0.1 filehook compatibility code for fink package]
 \RequirePackage{filehook}
 \RequirePackage{currfile}%
diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty b/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty
index 2266e9d004c..b4f8ecd945b 100644
--- a/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty
+++ b/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty
@@ -18,7 +18,7 @@
 %% This work consists of the files filehook.dtx, filehook.ins
 %% and the derived file filehook.sty.
 %%
-%% $Id: filehook.dtx 2252 2011-03-09 19:21:15Z martin $
+%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
 \ProvidesPackage{filehook-listings}[2011/01/02 v0.1 Patch for listings to avoid hooks for verbatim input files]
 \begingroup
 
diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty b/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty
index 5b579a2de7e..19d8a605ea5 100644
--- a/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty
+++ b/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty
@@ -18,7 +18,7 @@
 %% This work consists of the files filehook.dtx, filehook.ins
 %% and the derived file filehook.sty.
 %%
-%% $Id: filehook.dtx 2252 2011-03-09 19:21:15Z martin $
+%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
 \ProvidesPackage{filehook-memoir}[2011/01/03 v0.1 filehook patch for memoir class]
 \RequirePackage{filehook}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty b/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty
index 7ba97cf8bd9..9ed93dcb436 100644
--- a/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty
@@ -18,7 +18,7 @@
 %% This work consists of the files filehook.dtx, filehook.ins
 %% and the derived file filehook.sty.
 %%
-%% $Id: filehook.dtx 2252 2011-03-09 19:21:15Z martin $
+%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
 \ProvidesPackage{filehook-scrlfile}[2011/01/03 v0.1 filehook patch for scrlfile package]
 \RequirePackage{filehook}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/filehook/filehook.sty b/Master/texmf-dist/tex/latex/filehook/filehook.sty
index 54f7b28a700..acdce91068a 100644
--- a/Master/texmf-dist/tex/latex/filehook/filehook.sty
+++ b/Master/texmf-dist/tex/latex/filehook/filehook.sty
@@ -18,48 +18,53 @@
 %% This work consists of the files filehook.dtx, filehook.ins
 %% and the derived file filehook.sty.
 %%
-%% $Id: filehook.dtx 2252 2011-03-09 19:21:15Z martin $
+%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{filehook}
-    [2011/03/09 v0.5a Hooks for input files]
+    [2011/07/18 v0.5b Hooks for input files]
 \newif\iffilehook@force
 \DeclareOption{force}{\filehook@forcetrue}
 \ProcessOptions\relax
+\@ifpackageloaded{etoolbox}{%
+    \let\filehook@csuse\csuse
+}{%
+    \def\filehook@csuse#1{\ifcsname #1\endcsname\csname #1\expandafter\endcsname\fi}
+}
 \def\filehook@include@atbegin#1{%
   \let\InputIfFileExists\filehook@@InputIfFileExists
-  \@nameuse{\filehook@include@atbegin@#1}%
+  \filehook@csuse{\filehook@include@atbegin@#1}%
   \filehook@include@@atbegin
 }
 \def\filehook@include@@atbegin{}
 \def\filehook@include@atend#1{%
   \filehook@include@@atend
-  \@nameuse{\filehook@include@atend@#1}%
+  \filehook@csuse{\filehook@include@atend@#1}%
 }
 \def\filehook@include@@atend{}
 \def\filehook@include@after#1{%
   \filehook@include@@after
-  \@nameuse{\filehook@include@after@#1}%
+  \filehook@csuse{\filehook@include@after@#1}%
 }
 \def\filehook@include@@after{}
 \def\filehook@input@atbegin#1{%
   \let\InputIfFileExists\filehook@@InputIfFileExists
-  \@nameuse{\filehook@input@atbegin@\filehook@ensureext{#1}}%
+  \filehook@csuse{\filehook@input@atbegin@\filehook@ensureext{#1}}%
   \filehook@input@@atbegin
 }
 \def\filehook@input@@atbegin{}
 \def\filehook@input@atend#1{%
   \filehook@input@@atend
-  \@nameuse{\filehook@input@atend@\filehook@ensureext{#1}}%
+  \filehook@csuse{\filehook@input@atend@\filehook@ensureext{#1}}%
 }
 \def\filehook@input@@atend{}
 \def\filehook@atbegin#1{%
-  \@nameuse{\filehook@atbegin@\filehook@ensureext{#1}}%
+  \filehook@csuse{\filehook@atbegin@\filehook@ensureext{#1}}%
   \filehook@@atbegin
 }
 \def\filehook@@atbegin{}
 \def\filehook@atend#1{%
   \filehook@@atend
-  \@nameuse{\filehook@atend@\filehook@ensureext{#1}}%
+  \filehook@csuse{\filehook@atend@\filehook@ensureext{#1}}%
 }
 \def\filehook@@atend{}
 \def\filehook@every@atbegin#1{%
diff --git a/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty b/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty
index d9e1d63dd15..23346d1f954 100644
--- a/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty
+++ b/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty
@@ -18,7 +18,7 @@
 %% This work consists of the files filehook.dtx, filehook.ins
 %% and the derived file filehook.sty.
 %%
-%% $Id: filehook.dtx 2252 2011-03-09 19:21:15Z martin $
+%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
 \ProvidesPackage{pgf-filehook}[2010/01/07 v1.0 PGF keys for the filehook package]
 \RequirePackage{filehook}
 \RequirePackage{pgfkeys}