diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrlfile.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrlfile.dtx | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx index cc64485ec6e..8746d73643c 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlfile.dtx @@ -1,8 +1,8 @@ -% \CheckSum{839} +% \CheckSum{849} % \iffalse^^A meta-comment % ====================================================================== % scrlfile.dtx -% Copyright (c) Markus Kohm, 2002-2019 +% Copyright (c) Markus Kohm, 2002-2020 % % This file is part of the work `scrlfile' which is part of the LaTeX2e % KOMA-Script bundle. @@ -21,7 +21,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrlfile.dtx -% Copyright (c) Markus Kohm, 2002-2019 +% Copyright (c) Markus Kohm, 2002-2020 % % Diese Datei ist Teil des Werks `scrlfile', das wiederum Teil des % LaTeX2e KOMA-Script Pakets ist. @@ -59,12 +59,12 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrlfile.dtx 3399 2019-11-21 09:01:49Z kohm $ +%%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $ %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2019-11-21 10:01:49 +0100 (Thu, 21 Nov 2019) $ + \filedate$Date: 2020-01-06 17:40:47 +0100 (Mon, 06 Jan 2020) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 2631 $ \edef\reserved@a{% @@ -444,9 +444,11 @@ \newcommand*{\scr@load@hook}[2]{% % \end{macrocode} % \begin{macro}{\scrlfile@cmp@hook} -% \changes{v3.27a}{2019/10/23}{local macros renamed} +% \changes{v3.27a}{2019/10/23}{local macros renamed}%^^A % \begin{macro}{\scrlfile@hookname} -% \changes{v3.27a}{2019/10/23}{local macros renamed} +% \changes{v3.27a}{2019/10/23}{local macros renamed}%^^A +% \changes{v3.29}{2020/06/01}{do the class and package load hooks only in the +% document preamble}%^^A --> https://komascript.de/node/2274 % Workaround for strange handling of the \cs{AtEndOfPackage} hook in % \cs{@onefilewithoptions} (becomes \cs{@empty}, if the package already has % been loaded and is not loaded again). This workaround is not nice but @@ -454,19 +456,24 @@ % later. To decide whether to define or remove the marker, two local macros % are used \cs{scrlfile@hookname} and \cs{scrlfile@cmp@hook}. The first has % the name of the current hook from the first argument. The other is a compare -% string. The first one is also valid while processing the hook. The names are -% very unique, so we do not reserve them using \cs{newcommand} outside. The -% name of the marker is less unique. Nevertheless it is not reserved. +% string. The first one is also valid while processing the hook, but only in +% the document preamble. The names are very unique, so we do not reserve them +% using \cs{newcommand} outside. The name of the marker is less +% unique. Nevertheless it is not reserved. % Note: For recursive loading of files this does not work. But this also does % not matter, because it is needed only for packages and classes, which are -% never loaded recursive. +% never loaded recursive. For the same reason from \KOMAScript{} 3.29 this is +% only used inside the document preamble. After the document preamble it can +% be dangerous, e.g., inside a |tabular| or |array|. % \begin{macrocode} - \edef\scrlfile@hookname{#1}% - \def\scrlfile@cmp@hook{before}% - \ifx\scrlfile@hookname\scrlfile@cmp@hook - \expandafter\def\csname #2-l@ading\endcsname{#2}% + \ifx\@begindocumenthook\@undefined\else + \edef\scrlfile@hookname{#1}% + \def\scrlfile@cmp@hook{before}% + \ifx\scrlfile@hookname\scrlfile@cmp@hook + \expandafter\def\csname #2-l@ading\endcsname{#2}% + \fi + \let\scrlfile@cmp@hook\@undefined \fi - \let\scrlfile@cmp@hook\@undefined \@ifundefined{#2-@#1}{}{% \@nameuse{#2-@#1}% \expandafter\let\csname #2-@#1\endcsname\relax @@ -474,13 +481,15 @@ % \end{macrocode} % The hook could destroy \cs{scrlfile@hookname} so define it again: % \begin{macrocode} - \edef\scrlfile@hookname{#1}% - \def\scrlfile@cmp@hook{after}% - \ifx\scrlfile@hookname\scrlfile@cmp@hook - \expandafter\let\csname #2-l@ading\endcsname\@undefined + \ifx\@begindocumenthook\@undefined\else + \edef\scrlfile@hookname{#1}% + \def\scrlfile@cmp@hook{after}% + \ifx\scrlfile@hookname\scrlfile@cmp@hook + \expandafter\let\csname #2-l@ading\endcsname\@undefined + \fi + \let\scrlfile@cmp@hook\@undefined + \let\scrlfile@hookname\@undefined \fi - \let\scrlfile@cmp@hook\@undefined - \let\scrlfile@hookname\@undefined } % \end{macrocode} % \end{macro} |