From b2ff7bb7e5f8e65740f50a0bc9d2621659187209 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Aug 2019 20:57:51 +0000 Subject: filehook (19aug19) git-svn-id: svn://tug.org/texlive/trunk@51910 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/filehook/filehook-fink.sty | 23 +++++----- .../tex/latex/filehook/filehook-listings.sty | 21 +++++---- .../tex/latex/filehook/filehook-memoir.sty | 21 +++++---- .../tex/latex/filehook/filehook-scrlfile.sty | 21 +++++---- Master/texmf-dist/tex/latex/filehook/filehook.sty | 52 ++++++++++++++-------- .../texmf-dist/tex/latex/filehook/pgf-filehook.sty | 21 --------- 6 files changed, 74 insertions(+), 85 deletions(-) (limited to 'Master/texmf-dist/tex/latex/filehook') diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty b/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty index 9cd67a08f04..0485e1bc74b 100644 --- a/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty +++ b/Master/texmf-dist/tex/latex/filehook/filehook-fink.sty @@ -1,25 +1,24 @@ -%% Copyright (c) 2010-2011 by Martin Scharrer -%% ----------------------------------------------------------------- -%% +%% Copyright (C) 2011-2019 by Martin Scharrer +%% ---------------------------------------------------------------------- %% 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.3c or later is part of all distributions of LaTeX -%% version 2008/05/04 or later. +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 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}% diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty b/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty index b4f8ecd945b..e43aa1dd864 100644 --- a/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty +++ b/Master/texmf-dist/tex/latex/filehook/filehook-listings.sty @@ -1,24 +1,23 @@ -%% Copyright (c) 2010-2011 by Martin Scharrer -%% ----------------------------------------------------------------- -%% +%% Copyright (C) 2011-2019 by Martin Scharrer +%% ---------------------------------------------------------------------- %% 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.3c or later is part of all distributions of LaTeX -%% version 2008/05/04 or later. +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 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 diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty b/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty index 19d8a605ea5..24f9ffec076 100644 --- a/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty +++ b/Master/texmf-dist/tex/latex/filehook/filehook-memoir.sty @@ -1,24 +1,23 @@ -%% Copyright (c) 2010-2011 by Martin Scharrer -%% ----------------------------------------------------------------- -%% +%% Copyright (C) 2011-2019 by Martin Scharrer +%% ---------------------------------------------------------------------- %% 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.3c or later is part of all distributions of LaTeX -%% version 2008/05/04 or later. +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 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 diff --git a/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty b/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty index 9ed93dcb436..682ed649d7d 100644 --- a/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty +++ b/Master/texmf-dist/tex/latex/filehook/filehook-scrlfile.sty @@ -1,24 +1,23 @@ -%% Copyright (c) 2010-2011 by Martin Scharrer -%% ----------------------------------------------------------------- -%% +%% Copyright (C) 2011-2019 by Martin Scharrer +%% ---------------------------------------------------------------------- %% 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.3c or later is part of all distributions of LaTeX -%% version 2008/05/04 or later. +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 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 diff --git a/Master/texmf-dist/tex/latex/filehook/filehook.sty b/Master/texmf-dist/tex/latex/filehook/filehook.sty index 728462c2436..cf29c75c56b 100644 --- a/Master/texmf-dist/tex/latex/filehook/filehook.sty +++ b/Master/texmf-dist/tex/latex/filehook/filehook.sty @@ -1,27 +1,27 @@ -%% Copyright (c) 2010-2011 by Martin Scharrer -%% ----------------------------------------------------------------- -%% +%% Copyright (C) 2011-2019 by Martin Scharrer +%% ---------------------------------------------------------------------- %% 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.3c or later is part of all distributions of LaTeX -%% version 2008/05/04 or later. +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 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@force \DeclareOption{force}{\filehook@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@InputIfFileExists#1#2{% +\long\def\oldlatex@InputIfFileExists#1#2{% \IfFileExists{#1}% {#2\@addtofilelist{#1}% \@@input\@filef@und }% } +\long\def\newlatex@InputIfFileExists#1#2{% + \IfFileExists{#1}% + {% + \expandafter\@swaptwoargs\expandafter + {\@filef@und}{#2\@addtofilelist{#1}\@@input}}} +\@ifundefined{@swaptwoargs}{% + \let\latex@InputIfFileExists\oldlatex@InputIfFileExists +}{% + \let\latex@InputIfFileExists\newlatex@InputIfFileExists +}% \long\gdef\filehook@default@InputIfFileExists#1#2{% \IfFileExists{#1}% {\expandafter\filehook@swap @@ -369,8 +379,8 @@ }% \ifcase \ifx\InputIfFileExists\filehook@InputIfFileExists 0\else - \ifx\InputIfFileExists\latex@InputIfFileExists 1\else - \iffilehook@force 1\else + \ifx\InputIfFileExists\newlatex@InputIfFileExists 1\else + \ifx\InputIfFileExists\oldlatex@InputIfFileExists 1\else 9% \fi\fi\fi \relax% 0 @@ -378,13 +388,17 @@ \let\filehook@InputIfFileExists\filehook@default@InputIfFileExists \let\filehook@@InputIfFileExists\filehook@@default@InputIfFileExists \let\InputIfFileExists\filehook@InputIfFileExists +\else \iffilehook@force + \let\filehook@InputIfFileExists\filehook@default@InputIfFileExists + \let\filehook@@InputIfFileExists\filehook@@default@InputIfFileExists + \let\InputIfFileExists\filehook@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@InputIfFileExists\else diff --git a/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty b/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty index 23346d1f954..e7e1e9deb5b 100644 --- a/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty +++ b/Master/texmf-dist/tex/latex/filehook/pgf-filehook.sty @@ -1,24 +1,3 @@ -%% Copyright (c) 2010-2011 by Martin Scharrer -%% ----------------------------------------------------------------- -%% -%% 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} -- cgit v1.2.3