filehook (13oct11)

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

3 files changed, 8 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/filehook/filehook.pdf b/Master/texmf-dist/doc/latex/filehook/filehook.pdf
index 347ea5e0ae9..9f81070476e 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 ce45eaef8b3..01dd5bbedcd 100644
--- a/Master/texmf-dist/source/latex/filehook/filehook.dtx
+++ b/Master/texmf-dist/source/latex/filehook/filehook.dtx
@@ -29,12 +29,12 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{filehook}
 %<*package>
-    [2011/10/07 v0.5c Hooks for input files]
+    [2011/10/12 v0.5d Hooks for input files]
 %</package>
 %
 %<*driver>
 \documentclass{ydoc}[2011/03/19]
-\usepackage{filehook}[2011/07/18]
+\usepackage{filehook}[2011/10/12]
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
@@ -55,7 +55,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1019}
+% \CheckSum{1018}
 %
 % \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
@@ -94,6 +94,7 @@
 % \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}.}
 % \changes{v0.5c}{2011/10/07}{Added fall-back code for non-eTeX compilers.}
+% \changes{v0.5d}{2011/10/12}{Fix for fall-back code.}
 %
 % \GetFileInfo{filehook.dtx}
 %
@@ -510,7 +511,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{filehook}
-    [2011/10/07 v0.5c Hooks for input files]
+    [2011/10/12 v0.5d Hooks for input files]
 %    \end{macrocode}
 %
 % \subsection{Options}
@@ -529,11 +530,10 @@
 % \begin{macro}{\filehook@csuse}
 %    \begin{macrocode}
 \begingroup
+\gdef\filehook@csuse#1{\ifcsname #1\endcsname\csname #1\expandafter\endcsname\fi}
 \expandafter\ifx\csname csuse\endcsname\relax
     \expandafter\ifx\csname ifcsname\endcsname\relax
         \gdef\filehook@csuse#1{\expandafter\ifx\csname #1\endcsname\relax\else\csname #1\expandafter\endcsname\fi}
-    \else
-        \gdef\filehook@csuse#1{\ifcsname #1\endcsname\csname #1\expandafter\endcsname\fi}
     \fi
 \else
     \global\let\filehook@csuse\csuse
diff --git a/Master/texmf-dist/tex/latex/filehook/filehook.sty b/Master/texmf-dist/tex/latex/filehook/filehook.sty
index 377d7ee2171..728462c2436 100644
--- a/Master/texmf-dist/tex/latex/filehook/filehook.sty
+++ b/Master/texmf-dist/tex/latex/filehook/filehook.sty
@@ -21,16 +21,15 @@
 %% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{filehook}
-    [2011/10/07 v0.5c Hooks for input files]
+    [2011/10/12 v0.5d Hooks for input files]
 \newif\iffilehook@force
 \DeclareOption{force}{\filehook@forcetrue}
 \ProcessOptions\relax
 \begingroup
+\gdef\filehook@csuse#1{\ifcsname #1\endcsname\csname #1\expandafter\endcsname\fi}
 \expandafter\ifx\csname csuse\endcsname\relax
     \expandafter\ifx\csname ifcsname\endcsname\relax
         \gdef\filehook@csuse#1{\expandafter\ifx\csname #1\endcsname\relax\else\csname #1\expandafter\endcsname\fi}
-    \else
-        \gdef\filehook@csuse#1{\ifcsname #1\endcsname\csname #1\expandafter\endcsname\fi}
     \fi
 \else
     \global\let\filehook@csuse\csuse