diff options
author | Karl Berry <karl@freefriends.org> | 2020-04-21 21:21:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-04-21 21:21:23 +0000 |
commit | 52b5238ab893a61a4e2c64843d074cd296836359 (patch) | |
tree | 134947d55aee4d68d2f1ef4ac63c59a08eebec82 /Master/texmf-dist/tex/latex/koma-script/scrbase.sty | |
parent | 7c0b908f1a6e1489834fbdb0789766eed8a37b49 (diff) |
koma-script (21apr20)
git-svn-id: svn://tug.org/texlive/trunk@54825 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbase.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrbase.sty | 72 |
1 files changed, 45 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 08516529225..1349e8b938d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,19 +67,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (% KOMA-Script-independent @@ -110,6 +110,16 @@ \expandafter\reserved@a\expandafter{\reserved@b} \RequirePackage{keyval} \providecommand*\kernel@ifstar[1]{\kernel@ifnextchar*{\@firstoftwo{#1}}} +\newcommand{\rloop}[1]{} +\long\def\rloop#1\repeat{% + \ifdefined\iterate + \edef\iterate{\unexpanded{#1\relax\expandafter\iterate\fi\def\iterate}% + {\unexpanded\expandafter{\iterate}}}% + \else + \def\iterate{#1\relax\expandafter\iterate\fi\let\iterate\relax}% + \fi + \iterate +} \newcommand{\scr@ifundefinedorrelax}[1]{% \ifcsname #1\endcsname \expandafter\ifx\csname #1\endcsname\relax @@ -454,7 +464,7 @@ \long\def\l@addto@macro#1#2{% \edef#1{\unexpanded\expandafter{#1#2}}% }% -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: option) \DefineFamily{KOMA} \DefineFamilyMember{KOMA} @@ -466,13 +476,13 @@ \RelaxFamilyKey[.scrbase.sty]{KOMA}{internalonly}% } \FamilyProcessOptions{KOMA}\relax -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) %%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $ \RequirePackage{scrlfile}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax @@ -1255,12 +1265,12 @@ }% }% } -\newcommand{\scr@ifpdftex}{\ifnotundefined{pdftexversion}} -\newcommand{\scr@ifluatex}{\ifnotundefined{luatexversion}} +\newcommand{\scr@ifpdftex}{\Ifnotundefined{pdftexversion}} +\newcommand{\scr@ifluatex}{\Ifnotundefined{luatexversion}} \newcommand*{\scr@ifpdforluatex}{% \scr@ifpdftex{\@firstoftwo}{\scr@ifluatex{\@firstoftwo}{\@secondoftwo}}% } -\newcommand{\scr@ifVTeX}{\ifnotundefined{VTeXversion}} +\newcommand{\scr@ifVTeX}{\Ifnotundefined{VTeXversion}} \newcommand{\scr@ifpdfoutput}{% \scr@ifundefinedorrelax{pdfoutput}{% \scr@ifundefinedorrelax{outputmode}{% @@ -1299,14 +1309,14 @@ } \newcommand*{\Ifpdfoutput}{\scr@ifpdfoutput} \newcommand*{\scr@ifpsoutput}{% - \ifnotundefined{if@dvips}{% + \Ifnotundefined{if@dvips}{% \if@dvips \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi }{% - \ifnotundefined{OpMode}{% + \Ifnotundefined{OpMode}{% \ifnum\OpMode=2 \expandafter\@firstoftwo \else @@ -1933,7 +1943,7 @@ Setting this command to a non empty\MessageBreak value for option `#2' of\MessageBreak family `#1' is deprecated,\MessageBreak - but has been found + but has been found% }% \fi } @@ -2247,18 +2257,20 @@ but do-hook specificators must not be empty.% }% }{% - \let\scr@hookname\relax - \edef\scr@hookargument{#1}% - \loop - \scr@hooksplit@specificator\scr@hookname\scr@hookargument - \scr@hookargument - \begingroup\edef\reserved@a{% - \unexpanded{\endgroup #2}{\scr@hookname}{\scr@hookargument}% - }\reserved@a - \ifx\scr@hookargument\@empty\else - \repeat - \let\scr@hookname\relax - \let\scr@hookargument\relax + \begingroup + \def\scr@hookrun{\endgroup}% + \let\scr@hookname\relax + \edef\scr@hookargument{#1}% + \rloop + \scr@hooksplit@specificator\scr@hookname\scr@hookargument + \scr@hookargument + \edef\scr@hookrun{% + \unexpanded\expandafter{\scr@hookrun}% + \unexpanded{#2}{\scr@hookname}{\scr@hookargument}% + }% + \ifx\scr@hookargument\@empty\else + \repeat + \scr@hookrun }% } \newcommand*{\SplitDoHook}[3]{% @@ -2331,7 +2343,7 @@ }% }% } -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: body) \newcommand*{\defcaptionname}{% \kernel@ifstar\scr@def@scaptionname\scr@def@captionname @@ -2539,6 +2551,7 @@ \let#2\relax \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% + \let\renewcommand\providecommand \csname extras\scr@reserved@a\endcsname \csname captions\scr@reserved@a\endcsname \ifx #2\relax \aftergroup\@firstofone @@ -2582,6 +2595,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname captions\scr@reserved@a\endcsname @@ -2629,6 +2643,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname captions\scr@reserved@a\endcsname @@ -2679,6 +2694,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname captions\scr@reserved@a\endcsname @@ -2732,6 +2748,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname captions\scr@reserved@a\endcsname @@ -2781,6 +2798,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname extras\scr@reserved@a\endcsname |