diff options
author | Karl Berry <karl@freefriends.org> | 2019-10-13 21:40:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-10-13 21:40:52 +0000 |
commit | ed8702df3768e21a3ef87a2eec9ca8341aad9b7a (patch) | |
tree | d2eb8a06d685acdcb364d57efb2334dbd3b2914d /Master/texmf-dist/tex/latex/koma-script/scrlfile.sty | |
parent | 4b6c2d7660365ff9963bcecf7a802e8060eb1bbc (diff) |
koma-script (13oct19)
git-svn-id: svn://tug.org/texlive/trunk@52369 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlfile.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlfile.sty | 62 |
1 files changed, 41 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index ea3c70aa091..8f21ce83202 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -7,7 +7,7 @@ %% scrlfile.dtx (with options: `scrlfile') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 2002-2017 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2002-2019 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -35,21 +35,36 @@ %% %% The KOMA-Script bundle (but maybe not this file) was based upon the %% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e -%% standard classes created by The LaTeX3 Project 1994-1996. You may +%% standard classes created by The LaTeX3 Project 1994-1996. You can %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlfile.dtx 3011 2018-08-29 07:35:17Z kohm $ +%%% From File: $Id: scrlfile.dtx 3243 2019-10-07 13:32:53Z kohm $ \ProvidesPackage{scrlfile}[% - 2019/02/01 v3.26b KOMA-Script + 2019/10/12 v3.27 KOMA-Script package (loading files)] \ExecuteOptions{} \ProcessOptions\relax -\CheckCommand{\InputIfFileExists}[2]{% +\long\def\reserved@a#1#2{% \IfFileExists{#1}% - {#2\@addtofilelist{#1}\@@input \@filef@und}} -\renewcommand{\InputIfFileExists}[2]{% + {#2\@addtofilelist{#1}\@@input \@filef@und}}% +\ifx\reserved@a\InputIfFileExists\else + \expandafter\CheckCommand\expandafter*\expandafter\InputIfFileExists + \expandafter{% + \expandafter\protect\csname InputIfFileExists \endcsname + }% + \expandafter\CheckCommand \csname InputIfFileExists \endcsname[2]{% + \IfFileExists {#1}{% + \expandafter \@swaptwoargs \expandafter {\@filef@und }% + {#2\@addtofilelist {#1}\@@input }% + }% + }% +\fi +\expandafter\renewcommand\expandafter*\expandafter\InputIfFileExists +\expandafter{\expandafter + \protect\csname InputIfFileExists \endcsname}% +\expandafter\long\expandafter\def\csname InputIfFileExists \endcsname#1#2{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1-@alias\endcsname\relax \expandafter\@secondoftwo @@ -62,12 +77,15 @@ #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}% }}% } +\newcommand{\scr@input@withhook}[3]{% + \scr@load@hook{before}{#2}% + #3\@addtofilelist{#2}% + \@@input #1% + \scr@load@hook{after}{#2}% +}% \newcommand*{\scr@@loadwithoptions}{} \newcommand*{\scr@loadwithoptions}{} \let\scr@loadwithoptions\@loadwithoptions @@ -160,11 +178,12 @@ }% } \newcommand*{\@@@AfterClass}[2]{% - \begingroup\ifx\csname #2.\@clsextension-h@@k\endcsname\relax - \aftergroup\@sAfterClass - \else - \aftergroup\AfterAtEndOfClass - \fi + \begingroup + \expandafter\ifx\csname #2.\@clsextension-h@@k\endcsname\relax + \aftergroup\@sAfterClass + \else + \aftergroup\AfterAtEndOfClass + \fi \endgroup{#2}% } \newcommand*{\AfterAtEndOfClass}[1]{% @@ -200,11 +219,12 @@ }% } \newcommand*{\@@@AfterPackage}[2]{% - \begingroup\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax - \aftergroup\@sAfterPackage - \else - \aftergroup\AfterAtEndOfPackage - \fi + \begingroup + \expandafter\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax + \aftergroup\@sAfterPackage + \else + \aftergroup\AfterAtEndOfPackage + \fi \endgroup{#2}% } \newcommand*{\AfterAtEndOfPackage}[1]{% |