diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-03 22:31:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-03 22:31:24 +0000 |
commit | 09db320caf1490e42da924b8386dcf8ef4a04af0 (patch) | |
tree | 46a39f4e8efc04a9db65d3edbd829999d8abac11 /Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty | |
parent | 6b26ea27ae626fbcac559ab5bc3a5c7ae977ded5 (diff) |
filehook (3feb20)
git-svn-id: svn://tug.org/texlive/trunk@53655 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty | 47 |
1 files changed, 32 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty b/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty index 24f9ffec076..fe1bf3a4773 100644 --- a/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty +++ b/Master/texmf-dist/tex/latex/filehook/filehook-memoir.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,33 +18,50 @@ %% and pgf-filehook.sty %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{filehook-memoir}[2011/01/03 v0.1 filehook patch for memoir class] +\ProvidesPackage{filehook-memoir}[2020/02/02 v0.2 filehook patch for memoir class] \RequirePackage{filehook} \begingroup -\long\def\memoir@InputIfFileExists#1#2{% +\ifcsname InputIfFileExists\space\endcsname + \DeclareRobustCommand \memoir@InputIfFileExists[2]{% + \IfFileExists{#1}% + {% + \expandafter\@swaptwoargs\expandafter + {\@filef@und\m@matendf{#1}\killm@matf{#1}}{% + #2\@addtofilelist{#1}\m@matbeginf{#1}\@@input% + }% + }% + } +\else + % Old definition +\renewcommand{\memoir@InputIfFileExists}[2]{% \IfFileExists{#1}% {#2\@addtofilelist{#1}\m@matbeginf{#1}% \@@input \@filef@und \m@matendf{#1}% \killm@matf{#1}}% } -\ifcase - \ifx\InputIfFileExists\latex@InputIfFileExists 0\else - \ifx\InputIfFileExists\memoir@InputIfFileExists 0\else - 1% - \fi\fi -\relax - \global\let\filehook@InputIfFileExists\filehook@default@InputIfFileExists - \global\let\filehook@@InputIfFileExists\filehook@@default@InputIfFileExists - \global\let\InputIfFileExists\filehook@InputIfFileExists +\fi +\@tempswafalse +\filehook@cmp{InputIfFileExists}{filehook@InputIfFileExists}% + {\@tempswatrue}% + {% + \filehook@cmp{InputIfFileExists}{memoir@InputIfFileExists}% + {\@tempswatrue}% + {}% + }% + +\if@tempswa + \filehook@glet{filehook@InputIfFileExists}{filehook@default@InputIfFileExists}% + \filehook@glet{filehook@@InputIfFileExists}{filehook@@default@InputIfFileExists}% + \filehook@glet{InputIfFileExists}{filehook@InputIfFileExists}% \filehook@appendwarg\filehook@atbegin{\m@matbeginf{#1}}% \filehook@prefixwarg\filehook@atend{\m@matendf{#1}\killm@matf{#1}}% \PackageInfo{filehook}{Detected 'memoir' class: the memoir hooks will be moved to the `At...OfFiles' hooks} \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@default@InputIfFileExists}% + \filehook@glet{filehook@@InputIfFileExists}{filehook@@default@InputIfFileExists}% + \filehook@glet{InputIfFileExists}{filehook@InputIfFileExists}% \PackageWarning{filehook}{Detected 'memoir' class with unknown definition of \string\InputIfFileExists.^^J% The 'force' option of 'filehook' is in effect. Macro is overwritten with default!}% \else |