texlive[51910] Master/texmf-dist: filehook (19aug19)

commits+karl at tug.org commits+karl at tug.org
Mon Aug 19 22:57:51 CEST 2019


Revision: 51910
          http://tug.org/svn/texlive?view=revision&revision=51910
Author:   karl
Date:     2019-08-19 22:57:51 +0200 (Mon, 19 Aug 2019)
Log Message:
-----------
filehook (19aug19)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/filehook/README
    trunk/Master/texmf-dist/doc/latex/filehook/filehook.pdf
    trunk/Master/texmf-dist/source/latex/filehook/filehook.dtx
    trunk/Master/texmf-dist/source/latex/filehook/filehook.ins
    trunk/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty
    trunk/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty
    trunk/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty
    trunk/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty
    trunk/Master/texmf-dist/tex/latex/filehook/filehook.sty
    trunk/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty

Modified: trunk/Master/texmf-dist/doc/latex/filehook/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/filehook/README	2019-08-19 20:57:34 UTC (rev 51909)
+++ trunk/Master/texmf-dist/doc/latex/filehook/README	2019-08-19 20:57:51 UTC (rev 51910)
@@ -1,6 +1,6 @@
 LaTeX package 'filehook'
 ~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2010-2011 by Martin Scharrer <martin at scharrer-online.de>
+Copyright (c) 2010-2019 by Martin Scharrer <martin at scharrer-online.de>
 WWW: http://latex.scharrer-online.de/
 Code repository: https://bitbucket.org/martin_scharrer/filehook
 

Modified: trunk/Master/texmf-dist/doc/latex/filehook/filehook.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/filehook/filehook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/filehook/filehook.dtx	2019-08-19 20:57:34 UTC (rev 51909)
+++ trunk/Master/texmf-dist/source/latex/filehook/filehook.dtx	2019-08-19 20:57:51 UTC (rev 51910)
@@ -1,40 +1,40 @@
 % \iffalse meta-comment
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin at scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%<=*COPYRIGHT>
+%% Copyright (C) 2011-2019 by Martin Scharrer <martin at scharrer-online.de>
+%% ----------------------------------------------------------------------
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%
 %%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
 %% This work has the LPPL maintenance status `maintained'.
 %%
 %% The Current Maintainer of this work is Martin Scharrer.
 %%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
 %%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
+%<=/COPYRIGHT>
 % \fi
 %
 % \iffalse
 %<*driver>
-\ProvidesFile{filehook.dtx}
-%</driver>
-%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{filehook}
-%<*package>
-    [2011/10/12 v0.5d Hooks for input files]
-%</package>
-%
-%<*driver>
-\documentclass{ydoc}[2011/03/19]
-\usepackage{filehook}[2011/10/12]
+\ProvidesFile{filehook.dtx}[%
+%<=*DATE>
+    2019/08/19
+%<=/DATE>
+%<=*VERSION>
+    v0.5e
+%<=/VERSION>
+    Hooks for input files]
+\documentclass{ydoc}
+\GetFileInfo{filehook.dtx}
+\usepackage{filehook}[\filedate]
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
@@ -55,7 +55,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1018}
+% \CheckSum{1051}
 %
 % \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
@@ -509,11 +509,18 @@
 %<*filehook.sty>
 % \fi
 %    \begin{macrocode}
+%<!COPYRIGHT>
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{filehook}
-    [2011/10/12 v0.5d Hooks for input files]
+\ProvidesPackage{filehook}[%
+%<!DATE>
+%<!VERSION>
+%<*DRIVER>
+    2099/01/01 develop
+%</DRIVER>
+    Hooks for input files]
 %    \end{macrocode}
 %
+%
 % \subsection{Options}
 %    \begin{macrocode}
 \newif\iffilehook at force
@@ -522,7 +529,6 @@
 %    \end{macrocode}
 %
 %
-%
 % \subsection{Initialisation of Hooks}
 % The general hooks are initialised to call the file specific hooks.
 %
@@ -1100,10 +1106,10 @@
 % This is always done inside a group to keep them temporary only.
 % The token register is used to avoid doubling of macro argument characters.
 %
-% \begin{macro}{\latex at InputIfFileExists}
-% Standard \LaTeX\ definition of \Macro\InputIfFileExists.
+% \begin{macro}{\oldlatex at InputIfFileExists}
+% Original standard \LaTeX\ definition of \Macro\InputIfFileExists.
 %    \begin{macrocode}
-\long\def\latex at InputIfFileExists#1#2{%
+\long\def\oldlatex at InputIfFileExists#1#2{%
   \IfFileExists{#1}%
     {#2\@addtofilelist{#1}%
      \@@input\@filef at und
@@ -1113,6 +1119,30 @@
 % \end{macro}
 %
 %
+% \begin{macro}{\latex at InputIfFileExists}
+% Standard \`LaTeX\ definition of \Macro\InputIfFileExists starting from LaTeX Kernal 2019/02/07 v1.1n.
+%    \begin{macrocode}
+\long\def\newlatex at InputIfFileExists#1#2{%
+  \IfFileExists{#1}%
+    {%
+  \expandafter\@swaptwoargs\expandafter
+      {\@filef at und}{#2\@addtofilelist{#1}\@@input}}}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\latex at InputIfFileExists}
+% Standard \`LaTeX\ definition of \Macro\InputIfFileExists starting from LaTeX Kernal 2019/02/07 v1.1n.
+%    \begin{macrocode}
+\@ifundefined{@swaptwoargs}{%
+  \let\latex at InputIfFileExists\oldlatex at InputIfFileExists
+}{%
+  \let\latex at InputIfFileExists\newlatex at InputIfFileExists
+}%
+%    \end{macrocode}
+% \end{macro}
+%
+%
 % \begin{macro}{\filehook at default@InputIfFileExists}
 %    \begin{macrocode}
 \long\gdef\filehook at default@InputIfFileExists#1#2{%
@@ -1270,6 +1300,7 @@
   \RequirePackage{filehook-memoir}%
 }%
 %    \end{macrocode}
+%
 % Finally, if no specific alternate definition is detected the original \LaTeX\ definition is checked for and a
 % error is given if any other unknown definition is detected.
 % The \opt{force} option will change the error into a warning and overwrite the macro with the default.
@@ -1276,8 +1307,8 @@
 %    \begin{macrocode}
 \ifcase
     \ifx\InputIfFileExists\filehook at InputIfFileExists 0\else
-    \ifx\InputIfFileExists\latex at InputIfFileExists 1\else
-    \iffilehook at force 1\else
+    \ifx\InputIfFileExists\newlatex at InputIfFileExists 1\else
+    \ifx\InputIfFileExists\oldlatex at InputIfFileExists 1\else
     9%
     \fi\fi\fi
 \relax% 0
@@ -1285,13 +1316,17 @@
     \let\filehook at InputIfFileExists\filehook at default@InputIfFileExists
     \let\filehook@@InputIfFileExists\filehook@@default at InputIfFileExists
     \let\InputIfFileExists\filehook at InputIfFileExists
+\else
     \iffilehook at force
+      \let\filehook at InputIfFileExists\filehook at default@InputIfFileExists
+      \let\filehook@@InputIfFileExists\filehook@@default at InputIfFileExists
+      \let\InputIfFileExists\filehook at InputIfFileExists
       \PackageWarning{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
                                 The 'force' option of 'filehook' is in effect. Macro is overwritten with default!}%
+    \else
+      \PackageError{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
+                                Use the 'force' option of 'filehook' to overwrite it.}{}%
     \fi
-\else
-    \PackageError{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
-                            Use the 'force' option of 'filehook' to overwrite it.}{}%
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -1312,9 +1347,13 @@
 % \iffalse
 %<*filehook-memoir.sty>
 % \fi
+%    \begin{macrocode}
+%<!COPYRIGHT>
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{filehook-memoir}[2011/01/03 v0.1 filehook patch for memoir class]
+%    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{filehook-memoir}[2011/01/03 v0.1 filehook patch for memoir class]
 \RequirePackage{filehook}
 \begingroup
 %    \end{macrocode}
@@ -1369,9 +1408,13 @@
 % \iffalse
 %<*filehook-listings.sty>
 % \fi
+%    \begin{macrocode}
+%<!COPYRIGHT>
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{filehook-listings}[2011/01/02 v0.1 Patch for listings to avoid hooks for verbatim input files]
+%    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{filehook-listings}[2011/01/02 v0.1 Patch for listings to avoid hooks for verbatim input files]
 \begingroup
 
 \long\def\patch#1\def\lst at next#2#3\endpatch{%
@@ -1401,8 +1444,9 @@
 % \iffalse
 %<*filehook-scrlfile.sty>
 % \fi
-%
 %    \begin{macrocode}
+%<!COPYRIGHT>
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{filehook-scrlfile}[2011/01/03 v0.1 filehook patch for scrlfile package]
 \RequirePackage{filehook}
 \begingroup
@@ -1532,9 +1576,13 @@
 % \iffalse
 %<*filehook-fink.sty>
 % \fi
+%    \begin{macrocode}
+%<!COPYRIGHT>
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{filehook-fink}[011/01/03 v0.1 filehook compatibility code for fink package]
+%    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{filehook-fink}[2011/01/03 v0.1 filehook compatibility code for fink package]
 \RequirePackage{filehook}
 \RequirePackage{currfile}%
 

Modified: trunk/Master/texmf-dist/source/latex/filehook/filehook.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/filehook/filehook.ins	2019-08-19 20:57:34 UTC (rev 51909)
+++ trunk/Master/texmf-dist/source/latex/filehook/filehook.ins	2019-08-19 20:57:51 UTC (rev 51910)
@@ -1,6 +1,6 @@
 % See file 'filehook.dtx' for copyright and licence.
 %
-\input docstrip.tex
+\input ydocstrip.tex
 \keepsilent
 \askforoverwritefalse
 \generate{%
@@ -12,3 +12,4 @@
     \file{pgf-filehook.sty}{\nopreamble\from{filehook.dtx}{pgf-filehook.sty}}%
 }
 \endbatchfile
+% vim: ft=tex

Modified: trunk/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty	2019-08-19 20:57:34 UTC (rev 51909)
+++ trunk/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty	2019-08-19 20:57:51 UTC (rev 51910)
@@ -1,25 +1,24 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin at scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2019 by Martin Scharrer <martin at scharrer-online.de>
+%% ----------------------------------------------------------------------
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%
 %%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
 %% This work has the LPPL maintenance status `maintained'.
 %%
 %% The Current Maintainer of this work is Martin Scharrer.
 %%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
 %%
-%% $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]
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{filehook-fink}[011/01/03 v0.1 filehook compatibility code for fink package]
 \RequirePackage{filehook}
 \RequirePackage{currfile}%
 

Modified: trunk/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty	2019-08-19 20:57:34 UTC (rev 51909)
+++ trunk/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty	2019-08-19 20:57:51 UTC (rev 51910)
@@ -1,24 +1,23 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin at scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2019 by Martin Scharrer <martin at scharrer-online.de>
+%% ----------------------------------------------------------------------
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%
 %%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
 %% This work has the LPPL maintenance status `maintained'.
 %%
 %% The Current Maintainer of this work is Martin Scharrer.
 %%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
 %%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{filehook-listings}[2011/01/02 v0.1 Patch for listings to avoid hooks for verbatim input files]
 \begingroup
 

Modified: trunk/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty	2019-08-19 20:57:34 UTC (rev 51909)
+++ trunk/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty	2019-08-19 20:57:51 UTC (rev 51910)
@@ -1,24 +1,23 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin at scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2019 by Martin Scharrer <martin at scharrer-online.de>
+%% ----------------------------------------------------------------------
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%
 %%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
 %% This work has the LPPL maintenance status `maintained'.
 %%
 %% The Current Maintainer of this work is Martin Scharrer.
 %%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
 %%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{filehook-memoir}[2011/01/03 v0.1 filehook patch for memoir class]
 \RequirePackage{filehook}
 \begingroup

Modified: trunk/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty	2019-08-19 20:57:34 UTC (rev 51909)
+++ trunk/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty	2019-08-19 20:57:51 UTC (rev 51910)
@@ -1,24 +1,23 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin at scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2019 by Martin Scharrer <martin at scharrer-online.de>
+%% ----------------------------------------------------------------------
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%
 %%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
 %% This work has the LPPL maintenance status `maintained'.
 %%
 %% The Current Maintainer of this work is Martin Scharrer.
 %%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
 %%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{filehook-scrlfile}[2011/01/03 v0.1 filehook patch for scrlfile package]
 \RequirePackage{filehook}
 \begingroup

Modified: trunk/Master/texmf-dist/tex/latex/filehook/filehook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/filehook/filehook.sty	2019-08-19 20:57:34 UTC (rev 51909)
+++ trunk/Master/texmf-dist/tex/latex/filehook/filehook.sty	2019-08-19 20:57:51 UTC (rev 51910)
@@ -1,27 +1,27 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin at scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2019 by Martin Scharrer <martin at scharrer-online.de>
+%% ----------------------------------------------------------------------
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
-%%
 %%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
 %% This work has the LPPL maintenance status `maintained'.
 %%
 %% The Current Maintainer of this work is Martin Scharrer.
 %%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
 %%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{filehook}
-    [2011/10/12 v0.5d Hooks for input files]
+\ProvidesPackage{filehook}[%
+    2019/08/19
+    v0.5e
+    Hooks for input files]
 \newif\iffilehook at force
 \DeclareOption{force}{\filehook at forcetrue}
 \ProcessOptions\relax
@@ -245,12 +245,22 @@
     \expandafter\filehook@@ensuretex#1\empty.tex\empty\empty
 }
 \def\filehook@@ensuretex#1.tex\empty#2\empty{#1.tex}
-\long\def\latex at InputIfFileExists#1#2{%
+\long\def\oldlatex at InputIfFileExists#1#2{%
   \IfFileExists{#1}%
     {#2\@addtofilelist{#1}%
      \@@input\@filef at und
     }%
 }
+\long\def\newlatex at InputIfFileExists#1#2{%
+  \IfFileExists{#1}%
+    {%
+  \expandafter\@swaptwoargs\expandafter
+      {\@filef at und}{#2\@addtofilelist{#1}\@@input}}}
+\@ifundefined{@swaptwoargs}{%
+  \let\latex at InputIfFileExists\oldlatex at InputIfFileExists
+}{%
+  \let\latex at InputIfFileExists\newlatex at InputIfFileExists
+}%
 \long\gdef\filehook at default@InputIfFileExists#1#2{%
   \IfFileExists{#1}%
     {\expandafter\filehook at swap
@@ -369,8 +379,8 @@
 }%
 \ifcase
     \ifx\InputIfFileExists\filehook at InputIfFileExists 0\else
-    \ifx\InputIfFileExists\latex at InputIfFileExists 1\else
-    \iffilehook at force 1\else
+    \ifx\InputIfFileExists\newlatex at InputIfFileExists 1\else
+    \ifx\InputIfFileExists\oldlatex at InputIfFileExists 1\else
     9%
     \fi\fi\fi
 \relax% 0
@@ -378,13 +388,17 @@
     \let\filehook at InputIfFileExists\filehook at default@InputIfFileExists
     \let\filehook@@InputIfFileExists\filehook@@default at InputIfFileExists
     \let\InputIfFileExists\filehook at InputIfFileExists
+\else
     \iffilehook at force
+      \let\filehook at InputIfFileExists\filehook at default@InputIfFileExists
+      \let\filehook@@InputIfFileExists\filehook@@default at InputIfFileExists
+      \let\InputIfFileExists\filehook at InputIfFileExists
       \PackageWarning{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
                                 The 'force' option of 'filehook' is in effect. Macro is overwritten with default!}%
+    \else
+      \PackageError{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
+                                Use the 'force' option of 'filehook' to overwrite it.}{}%
     \fi
-\else
-    \PackageError{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
-                            Use the 'force' option of 'filehook' to overwrite it.}{}%
 \fi
 \AtBeginDocument{%
     \ifx\InputIfFileExists\filehook at InputIfFileExists\else

Modified: trunk/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty	2019-08-19 20:57:34 UTC (rev 51909)
+++ trunk/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty	2019-08-19 20:57:51 UTC (rev 51910)
@@ -1,24 +1,3 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin at scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%
-%%   http://www.latex-project.org/lppl.txt
-%%
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
-%%
-%% $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}



More information about the tex-live-commits mailing list