diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty b/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty index 682ed649d7d..bb3d60279fc 100644 --- a/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty +++ b/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty @@ -1,4 +1,4 @@ -%% Copyright (C) 2011-2019 by Martin Scharrer <martin@scharrer-online.de> +%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de> %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -18,10 +18,13 @@ %% and pgf-filehook.sty %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{filehook-scrlfile}[2011/01/03 v0.1 filehook patch for scrlfile package] +\ProvidesPackage{filehook-scrlfile}[2020/02/02 v0.2 filehook patch for scrlfile package] \RequirePackage{filehook} \begingroup -\long\def\scrlfile@InputIfFileExists#1#2{% +\expandafter\def\expandafter\sclrfile@InputIfFileExists\expandafter{% + \expandafter\protect\csname InputIfFileExists\space\endcsname +} +\expandafter\long\expandafter\def\csname scrlfile@InputIfFileExists\space\endcsname#1#2{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1-@alias\endcsname\relax \expandafter\@secondoftwo @@ -31,16 +34,13 @@ \fi {% \expandafter\InputIfFileExists\expandafter{\csname - #1-@alias\endcsname}{#2}% +#1-@alias\endcsname}{#2}% }% {\IfFileExists{#1}{% - \scr@load@hook{before}{#1}% - #2\@addtofilelist{#1}% - \@@input \@filef@und - \scr@load@hook{after}{#1}% - }}% + \expandafter\scr@input@withhook\expandafter{\@filef@und}{#1}{#2}}% + }% } -\long\def\filehook@scrlfile@InputIfFileExists#1#2{% +\DeclareRobustCommand\filehook@scrlfile@InputIfFileExists[2]{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1-@alias\endcsname\relax \expandafter\@secondoftwo @@ -65,8 +65,9 @@ \scr@load@hook{after}{#1}% }}% } -\long\def\filehook@@scrlfile@InputIfFileExists#1#2{% - \let\InputIfFileExists\filehook@InputIfFileExists +\filehook@glet{filehook@scrlfile@InputIfFileExists}{filehook@scrlfile@InputIfFileExists}% +\DeclareRobustCommand\filehook@@scrlfile@InputIfFileExists[2]{% + \filehook@let{InputIfFileExists}{filehook@InputIfFileExists}% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1-@alias\endcsname\relax \expandafter\@secondoftwo @@ -89,21 +90,26 @@ \scr@load@hook{after}{#1}% }}% } -\ifcase - \ifx\InputIfFileExists\latex@InputIfFileExists 0\else - \ifx\InputIfFileExists\scrlfile@InputIfFileExists 0\else - 1% - \fi\fi -\relax - \global\let\filehook@InputIfFileExists\filehook@scrlfile@InputIfFileExists - \global\let\filehook@@InputIfFileExists\filehook@@scrlfile@InputIfFileExists - \global\let\InputIfFileExists\filehook@InputIfFileExists +\filehook@glet{filehook@@scrlfile@InputIfFileExists}{filehook@@scrlfile@InputIfFileExists}% +\@tempswafalse +\filehook@cmp{InputIfFileExists}{filehook@InputIfFileExists}% + {\@tempswatrue}% + {% + \filehook@cmp{InputIfFileExists}{scrlfile@InputIfFileExists}% + {\@tempswatrue}% + {}% + }% + +\if@tempswa + \filehook@glet{filehook@InputIfFileExists}{filehook@scrlfile@InputIfFileExists}% + \filehook@glet{filehook@@InputIfFileExists}{filehook@@scrlfile@InputIfFileExists}% + \filehook@glet{InputIfFileExists}{filehook@InputIfFileExists}% \PackageInfo{filehook}{Package 'scrlfile' detected and compensated for}% \else \iffilehook@force - \global\let\filehook@InputIfFileExists\filehook@default@InputIfFileExists - \global\let\filehook@@InputIfFileExists\filehook@@default@InputIfFileExists - \global\let\InputIfFileExists\filehook@InputIfFileExists + \filehook@glet{filehook@InputIfFileExists}{filehook@scrlfile@InputIfFileExists}% + \filehook@glet{filehook@@InputIfFileExists}{filehook@@scrlfile@InputIfFileExists}% + \filehook@glet{InputIfFileExists}{filehook@InputIfFileExists}% \PackageWarning{filehook}{Detected 'scrlfile' package with unknown definition of \string\InputIfFileExists.^^J% The 'force' option of 'filehook' is in effect. Macro is overwritten with default!}% \else |