diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbase.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrbase.sty | 485 |
1 files changed, 289 insertions, 196 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 51a91eae932..8ac43e23e43 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,19 +67,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (% KOMA-Script-independent @@ -121,9 +121,6 @@ \expandafter\@firstoftwo \fi } -\newcommand*\PackageErrorNoLine[2]{% - \PackageError{#1}{#2\@gobble}% -} \newcommand*{\DefineFamily}[1]{% \scr@ifundefinedorrelax{#1@key@familylist}{% \@namedef{#1@key@familylist}{}% @@ -457,31 +454,25 @@ \long\def\l@addto@macro#1#2{% \edef#1{\unexpanded\expandafter{#1#2}}% }% -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: option) -\newcommand*{\dont@let@as@internal@defined}{/} -\newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse \DefineFamily{KOMA} \DefineFamilyMember{KOMA} \DefineFamilyKey{KOMA}{internalonly}[\relax]{% - \ifx\relax#1\relax - \@let@as@internalonly@definedtrue - \else - \@let@as@internalonly@definedfalse - \begingroup - \@expandtwoargs\in@{#1}\dont@let@as@internal@defined - \expandafter\endgroup - \ifin@\else\g@addto@macro\dont@let@as@internal@defined{#1/}\fi - \fi + \PackageInfo{scrbase}{Ignoring deprecated option `internalonly'}% + \FamilyKeyStateProcessed +} +\AtEndOfPackage{% + \RelaxFamilyKey[.scrbase.sty]{KOMA}{internalonly}% } \FamilyProcessOptions{KOMA}\relax -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: option) -%%% From File: $Id: scrlfile.dtx 3243 2019-10-07 13:32:53Z kohm $ +%%% From File: $Id: scrlfile.dtx 3399 2019-11-21 09:01:49Z kohm $ \RequirePackage{scrlfile}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax @@ -510,73 +501,33 @@ \AtBeginDocument{\@atdocumenttrue} \@onlypreamble\@atdocumentrue \@onlypreamble\@atdocumentfalse -\newcommand*{\let@as@internal@defined}[1]{% - \begingroup - \if@let@as@internalonly@defined - \in@true - \else - \@expandtwoargs\in@{/#1/}\dont@let@as@internal@defined - \fi - \expandafter\endgroup - \ifin@ - \PackageInfo{% - scrbase% - }{% - \expandafter\string\csname #1\endcsname\space excluded from being - defined% - }% - \else - \@ifundefined{#1}{% - \begingroup - \expandafter\def\expandafter\reserved@a - \expandafter{\csname scr@#1\endcsname}% - \expandafter\def\expandafter\reserved@b - \expandafter{\csname #1\endcsname}% - \expandafter\expandafter\expandafter\endgroup - \expandafter\expandafter\expandafter\let\expandafter\reserved@b\reserved@a - \if@atdocument\else - \g@addto@macro\document{% - \expandafter\ifx\csname #1\expandafter\endcsname - \csname scr@#1\endcsname - \else - \PackageWarning{scrbase}{% - \expandafter\string\csname #1\endcsname\space was - redefined\MessageBreak - at the document preamble.\MessageBreak - If you did not redefine it by yourself, have a\MessageBreak - a look at the description of this command at\MessageBreak - the manual of every package you are using\@gobble - }% - \fi - \ignorespaces - }% - \fi - }{% - \PackageInfo{% - scrbase% - }{% - \expandafter\string\csname #1\endcsname\space already - defined.\MessageBreak - If \expandafter\string\csname #1\endcsname\space does not behave - like\MessageBreak - it was described at the KOMA-Script manual, try to\MessageBreak - load `scrbase.\scr@pkgextension' earlier or find out at - which\MessageBreak - package or class \expandafter\string\csname #1\endcsname\space - was defined before\@gobble - }% - }% - \fi +\newcommand*{\Ifundefinedorrelax}{scr@ifundefinedorrelax}% +\providecommand*{\ifnotundefined}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifnotundefined'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifnotundefined' by `\string\Ifnotundefined'% + }% + \Ifnotundefined } -\let@as@internal@defined{ifundefinedorrelax} -\newcommand{\ifnotundefined}[1]{% +\newcommand{\Ifnotundefined}[1]{% \ifcsname #1\endcsname \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi } -\newcommand\ifstr[2]{% +\providecommand*{\ifstr}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifstr'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifstr' by `\string\Ifstr'% + }% + \Ifstr +} +\newcommand\Ifstr[2]{% \begingroup\protected@edef\reserved@a{#1}\protected@edef\reserved@b{#2}% \ifx\reserved@a\reserved@b \endgroup\expandafter\@firstoftwo @@ -584,7 +535,16 @@ \endgroup\expandafter\@secondoftwo \fi } -\newcommand*{\ifstrstart}[2]{% +\providecommand*{\ifstrstart}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifstrstart'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifstrstart' by `\string\Ifstrstart'% + }% + \Ifstrstart +} +\newcommand*{\Ifstrstart}[2]{% \begingroup \edef\reserved@a{\noexpand\@ifstrstart{#1}{#2}}% \reserved@a{\aftergroup\@firstoftwo}{\aftergroup\@secondoftwo}% @@ -605,14 +565,14 @@ } \newcommand*{\scr@ifislengthprimitive}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifislengthprimitive }{% \def\reserved@c{\aftergroup\scr@secondoftwoAfterNil}% \@for\reserved@a:=\baselineskip,\dp,\hsize,\ht,\lineskip,% \parindent,\parskip,\pdfpageheight,\pdfpagewidth,% \wd,\vsize \do {% - \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \expandafter\Ifstr\expandafter{\expandafter\string\reserved@a}{% \meaning #1% }{% \def\reserved@c{\aftergroup\scr@TestDimenAssignTillNil}% @@ -623,15 +583,24 @@ \endgroup #1% } -\newcommand*{\ifisdimen}[1]{% +\providecommand*{\ifisdimen}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisdimen'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisdimen' by `\string\Ifisdimen'% + }% + \Ifisdimen +} +\newcommand*{\Ifisdimen}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimen#1\@nil}% } \newcommand*{\scr@ifisdimen}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisdimen }{% - \ifstrstart{\meaning #1}{\string\dimen}{% + \Ifstrstart{\meaning #1}{\string\dimen}{% \aftergroup\scr@TestDimenAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -649,16 +618,16 @@ \newcommand*\scr@AfterEndGroupIfArgIsRelaxTillNnil{} \def\scr@AfterEndGroupIfArgIsRelaxTillNnil#1\@nnil{% \endgroup - \ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% - \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \Ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% + \Ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% \scr@IfArgIsRelaxAfterRelaxTillNnil #1\@nnil }{\@secondoftwo}% }% } \newcommand*\scr@IfArgIsRelaxAfterRelaxTillNnil{} \def\scr@IfArgIsRelaxAfterRelaxTillNnil \relax#1\@nnil{% - \ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% - \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \Ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% + \Ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% \scr@IfArgIsRelaxAfterRelaxTillNnil #1\@nnil }{\@secondoftwo}% }% @@ -666,15 +635,24 @@ \newcommand*{\scr@secondoftwoAfterNil}{\scr@@secondoftwoAfterNil\@empty} \newcommand*{\scr@@secondoftwoAfterNil}{} \def\scr@@secondoftwoAfterNil#1\@nil{\@secondoftwo} -\newcommand*{\ifisskip}[1]{% +\providecommand*{\ifisskip}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisskip'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisskip' by `\string\Ifisskip'% + }% + \Ifisskip +} +\newcommand*{\Ifisskip}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisskip#1\@nil}% } \newcommand*{\scr@ifisskip}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisskip }{% - \ifstrstart{\meaning #1}{\string\skip}{% + \Ifstrstart{\meaning #1}{\string\skip}{% \aftergroup\scr@TestSkipAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -689,15 +667,24 @@ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil \@tempskipa=#1\relax\@nnil } -\newcommand*{\ifiscount}[1]{% +\providecommand*{\ifiscount}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifiscount'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifiscount' by `\string\Ifiscount'% + }% + \Ifiscount +} +\newcommand*{\Ifiscount}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifiscount#1\@nil}% } \newcommand*{\scr@ifiscount}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifiscount }{% - \ifstrstart{\meaning #1}{\string\count}{% + \Ifstrstart{\meaning #1}{\string\count}{% \aftergroup\scr@TestCountAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -712,15 +699,24 @@ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil \@tempcnta=#1\relax\@nnil } -\newcommand*{\ifisdimexpr}[1]{% +\providecommand*{\ifisdimexpr}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisdimexpr'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisdimexpr' by `\string\Ifisdimexpr'% + }% + \Ifisdimexpr +} +\newcommand*{\Ifisdimexpr}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimexpr#1\relax\@nil}% } \newcommand*{\scr@ifisdimexpr}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisdimexpr }{% - \ifstrstart{\meaning #1}{\string\dimexpr}{% + \Ifstrstart{\meaning #1}{\string\dimexpr}{% \aftergroup\scr@TestDimenAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -729,15 +725,24 @@ \endgroup #1% } -\newcommand*{\ifisglueexpr}[1]{% +\providecommand*{\ifisglueexpr}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisglueexpr'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisglueexpr' by `\string\Ifisglueexpr'% + }% + \Ifisglueexpr +} +\newcommand*{\Ifisglueexpr}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisglueexpr#1\relax\@nil}% } \newcommand*{\scr@ifisglueexpr}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisglueexpr }{% - \ifstrstart{\meaning #1}{\string\glueexpr}{% + \Ifstrstart{\meaning #1}{\string\glueexpr}{% \aftergroup\scr@TestSkipAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -746,15 +751,24 @@ \endgroup #1% } -\newcommand*{\ifisnumexpr}[1]{% +\providecommand*{\ifisnumexpr}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisnumexpr'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisnumexpr' by `\string\Ifisnumexpr'% + }% + \Ifisnumexpr +} +\newcommand*{\Ifisnumexpr}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisnumexpr#1\relax\@nil}% } \newcommand*{\scr@ifisnumexpr}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisnumexpr }{% - \ifstrstart{\meaning #1}{\string\numexpr}{% + \Ifstrstart{\meaning #1}{\string\numexpr}{% \aftergroup\scr@TestCountAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -768,10 +782,10 @@ } \newcommand*{\scr@ifisdefchar}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisdefchar }{% - \ifstrstart{\meaning #1}{\string\char\string"}{% + \Ifstrstart{\meaning #1}{\string\char\string"}{% \aftergroup\scr@TestCountAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -780,7 +794,16 @@ \endgroup #1% } -\newcommand*{\ifiscounter}[1]{% +\providecommand*{\ifiscounter}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifiscounter'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifiscounter' by `\string\Ifiscounter'% + }% + \Ifiscounter +} +\newcommand*{\Ifiscounter}[1]{% \begingroup \scr@ifundefinedorrelax{c@#1}{% \aftergroup\@secondoftwo @@ -789,15 +812,24 @@ }% \endgroup } -\newcommand*{\ifisinteger}[1]{% +\providecommand*{\ifisinteger}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisinteger'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisinteger' by `\string\Ifisinteger'% + }% + \Ifisinteger +} +\newcommand*{\Ifisinteger}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisinteger#1\@nil}% } \def\scr@ifisinteger#1{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisinteger\aftergroup#1% }{% - \ifstrstart{\meaning #1}{\detokenize{the character}}{% + \Ifstrstart{\meaning #1}{\detokenize{the character}}{% \if #1-\aftergroup\scr@ifisinteger \else \if #1+\aftergroup\scr@ifisinteger @@ -815,7 +847,7 @@ \fi \fi }{% - \ifstrstart{\meaning #1}{\string\char\string"}{% + \Ifstrstart{\meaning #1}{\string\char\string"}{% \aftergroup\scr@TestCountAssignTillNil }{% \def\reserved@c{% @@ -844,7 +876,7 @@ \tolerance,\topskip,% \wd,\vbadness,\vfuzz,\vsize \do {% - \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \expandafter\Ifstr\expandafter{\expandafter\string\reserved@a}{% \meaning #1% }{% \def\reserved@c{\aftergroup\scr@TestCountAssignTillNil}% @@ -868,18 +900,27 @@ \fi \endgroup } -\newcommand*{\ifisdimension}[1]{% +\providecommand*{\ifisdimension}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisdimension'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisdimension' by `\string\Ifisdimension'% + }% + \Ifisdimension +} +\newcommand*{\Ifisdimension}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimension#1\@nil}% } \newcommand*{\scr@ifisdimension}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisdimension\aftergroup#1% }{% - \ifstrstart{\meaning #1}{\detokenize{the character}}{% + \Ifstrstart{\meaning #1}{\detokenize{the character}}{% \if #1-\aftergroup\scr@ifisdimension \else - \if #1-\aftergroup\scr@ifisdimension + \if #1+\aftergroup\scr@ifisdimension \else \if #1.% \aftergroup\scr@TestDimensionAssignTillNil @@ -906,7 +947,7 @@ \fi \fi }{% - \ifstrstart{\meaning #1}{\string\char\string"}{% + \Ifstrstart{\meaning #1}{\string\char\string"}{% \aftergroup\scr@TestDimensionAssignTillNil }{% \def\reserved@c{% @@ -936,7 +977,7 @@ \tolerance,\topskip,% \wd,\vbadness,\vfuzz,\vsize \do {% - \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \expandafter\Ifstr\expandafter{\expandafter\string\reserved@a}{% \meaning #1% }{% \def\reserved@c{\aftergroup\scr@TestDimensionAssignTillNil}% @@ -958,32 +999,41 @@ \newcommand*\scr@AfterEndGroupIfArgIsRelaxTillptNnil{} \def\scr@AfterEndGroupIfArgIsRelaxTillptNnil#1\@nnil{% \endgroup - \ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% - \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \Ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% + \Ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% \scr@IfArgIsRelaxAfterRelaxTillptNnil #1\@nnil }{\@secondoftwo}% }% } \newcommand*\scr@IfArgIsRelaxAfterRelaxTillptNnil{} \def\scr@IfArgIsRelaxAfterRelaxTillptNnil \relax#1pt\@nnil{% - \ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% - \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \Ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% + \Ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% \scr@IfArgIsRelaxAfterRelaxTillptNnil #1\@nnil }{\@secondoftwo}% }% } -\newcommand*{\ifisglue}[1]{% +\providecommand*{\ifisglue}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisglue'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisglue' by `\string\Ifisglue'% + }% + \Ifisglue +} +\newcommand*{\Ifisglue}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisglue#1\@nil}% } \newcommand*{\scr@ifisglue}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisglue\aftergroup#1% }{% - \ifstrstart{\meaning #1}{\detokenize{the character}}{% + \Ifstrstart{\meaning #1}{\detokenize{the character}}{% \if #1-\aftergroup\scr@ifisglue \else - \if #1-\aftergroup\scr@ifisdimension + \if #1+\aftergroup\scr@ifisglue \else \if #1.% \aftergroup\scr@TestGlueAssignTillNil @@ -1010,7 +1060,7 @@ \fi \fi }{% - \ifstrstart{\meaning #1}{\string\char\string"}{% + \Ifstrstart{\meaning #1}{\string\char\string"}{% \aftergroup\scr@TestGlueAssignTillNil }{% \def\reserved@c{% @@ -1040,7 +1090,7 @@ \tolerance,\topskip,% \wd,\vbadness,\vfuzz,\vsize \do {% - \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \expandafter\Ifstr\expandafter{\expandafter\string\reserved@a}{% \meaning #1% }{% \def\reserved@c{\aftergroup\scr@TestGlueAssignTillNil}% @@ -1059,7 +1109,18 @@ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillptNnil \@tempskipa=#1pt\@nnil } -\newcommand\ifnumber[1]{% +\providecommand*{\ifnumber}{% + \scr@ifundefinedorrelax{ver@babelbib.sty}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifnumber'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifnumber' by `\string\Ifnumber'% + }% + }{}% + \Ifnumber +} +\newcommand\Ifnumber[1]{% \begingroup\@tempswafalse\let\scr@next\test@number \IfArgIsEmpty{#1}{}{\expandafter\scr@next#1\scr@next}% \if@tempswa @@ -1086,7 +1147,16 @@ } \newcommand*{\gobble@till@scr@next}{} \def\gobble@till@scr@next#1\scr@next{} -\newcommand\ifintnumber[1]{% +\providecommand*{\ifintnumber}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifintnumber'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifintnumber' by `\string\Ifintnumber'% + }% + \Ifintnumber +} +\newcommand\Ifintnumber[1]{% \begingroup\@tempswafalse\let\scr@next\scr@test@sign \expandafter\scr@next#1\scr@next \if@tempswa @@ -1110,7 +1180,16 @@ \fi \scr@next } -\newcommand{\ifdimen}[1]{% +\providecommand*{\ifdimen}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifdimen'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifdimen' by `\string\Ifdimen'% + }% + \Ifdimen +} +\newcommand{\Ifdimen}[1]{% \begingroup\@tempswatrue\let\scr@next\test@posdimen \expandafter\test@dimen#1\scr@next \if@tempswa @@ -1150,19 +1229,19 @@ } \newcommand*\test@@ifdimunt[1]{% \@tempswafalse - \ifstr{#1}{pt}{\@tempswatrue}{% - \ifstr{#1}{pc}{\@tempswatrue}{% - \ifstr{#1}{in}{\@tempswatrue}{% - \ifstr{#1}{bp}{\@tempswatrue}{% - \ifstr{#1}{cm}{\@tempswatrue}{% - \ifstr{#1}{mm}{\@tempswatrue}{% - \ifstr{#1}{dd}{\@tempswatrue}{% - \ifstr{#1}{cc}{\@tempswatrue}{% - \ifstr{#1}{sp}{\@tempswatrue}{% - \ifstr{#1}{ex}{\@tempswatrue}{% - \ifstr{#1}{em}{\@tempswatrue}{% + \Ifstr{#1}{pt}{\@tempswatrue}{% + \Ifstr{#1}{pc}{\@tempswatrue}{% + \Ifstr{#1}{in}{\@tempswatrue}{% + \Ifstr{#1}{bp}{\@tempswatrue}{% + \Ifstr{#1}{cm}{\@tempswatrue}{% + \Ifstr{#1}{mm}{\@tempswatrue}{% + \Ifstr{#1}{dd}{\@tempswatrue}{% + \Ifstr{#1}{cc}{\@tempswatrue}{% + \Ifstr{#1}{sp}{\@tempswatrue}{% + \Ifstr{#1}{ex}{\@tempswatrue}{% + \Ifstr{#1}{em}{\@tempswatrue}{% \scr@ifpdfoutput{% - \ifstr{#1}{px}{\@tempswatrue}{}% + \Ifstr{#1}{px}{\@tempswatrue}{}% }{}% }% }% @@ -1177,15 +1256,11 @@ }% } \newcommand{\scr@ifpdftex}{\ifnotundefined{pdftexversion}} -\let@as@internal@defined{ifpdftex} -\BeforePackage{pdfcprot}{\let\ifpdftex\relax} -\AfterPackage{pdfcprot}{\let@as@internal@defined{ifpdftex}} \newcommand{\scr@ifluatex}{\ifnotundefined{luatexversion}} \newcommand*{\scr@ifpdforluatex}{% \scr@ifpdftex{\@firstoftwo}{\scr@ifluatex{\@firstoftwo}{\@secondoftwo}}% } \newcommand{\scr@ifVTeX}{\ifnotundefined{VTeXversion}} -\let@as@internal@defined{ifVTeX} \newcommand{\scr@ifpdfoutput}{% \scr@ifundefinedorrelax{pdfoutput}{% \scr@ifundefinedorrelax{outputmode}{% @@ -1213,7 +1288,16 @@ \fi }% }% -\let@as@internal@defined{ifpdfoutput} +\providecommand*{\ifpdfoutput}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifpdfoutput'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifpdfoutput' by `\string\Ifpdfoutput'% + }% + \Ifpdfoutput +} +\newcommand*{\Ifpdfoutput}{\scr@ifpdfoutput} \newcommand*{\scr@ifpsoutput}{% \ifnotundefined{if@dvips}{% \if@dvips @@ -1233,7 +1317,16 @@ }% }% } -\let@as@internal@defined{ifpsoutput} +\providecommand*{\ifpsoutput}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifpsoutput'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifpsoutput' by `\string\Ifpsoutput'% + }% + \Ifpsoutput +} +\newcommand*{\Ifpsoutput}{\scr@ifpsoutput} \newcommand*{\scr@ifdvioutput}{% \scr@ifundefinedorrelax{pdfoutput}{% \scr@ifundefinedorrelax{outputmode}{% @@ -1261,7 +1354,16 @@ \fi }% } -\let@as@internal@defined{ifdvioutput} +\providecommand*{\ifdvioutput}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifdvioutput'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifdvioutput' by `\string\Ifdvioutput'% + }% + \Ifdvioutput +} +\newcommand*{\Ifdvioutput}{\scr@ifdvioutput} \newcommand*{\scr@smashdp}[1]{% \begingroup \def\finsm@sh{\dp\z@\z@\box\z@}% @@ -1390,7 +1492,7 @@ }% }{% \scr@execute@option{#2}% - \ifstr{#1}{}{}{% + \Ifstr{#1}{}{}{% \scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{% \scr@ifundefinedorrelax{KV@#2#1@@else@}{}{% \scr@execute@elseoption{#2#1}% @@ -1477,7 +1579,7 @@ \edef\reserved@a{#1,\csname #1@key@familylist\endcsname}% \@for\reserved@a:=\reserved@a\do{% \scr@ifundefinedorrelax{KV@\reserved@a @\scr@key@name}{% - \ifstr{\reserved@a}{#1}{}{% + \Ifstr{\reserved@a}{#1}{}{% \scr@ifundefinedorrelax{KV@\reserved@a @@else@}{}{% \expandafter\scr@execute@elseoption\expandafter{\reserved@a}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -1535,8 +1637,7 @@ `\expandafter\detokenize\expandafter{\scr@key@value}'% \fi.\MessageBreak Here's what each member says: - \scr@key@run@errors\MessageBreak - o\expandafter\@gobble + \scr@key@run@errors }% }{% \scr@execute@elseoption{#1}% @@ -1567,8 +1668,7 @@ `\expandafter\detokenize\expandafter{\scr@key@value}'% \fi.\MessageBreak Here's what each member says: - \scr@key@run@errors\MessageBreak - o\expandafter\@gobble + \scr@key@run@errors }% \fi }% @@ -1845,13 +1945,13 @@ \DefineFamilyKey[{#1}]{#2}{#3}[true]{\FamilySetBool{#2}{#3}{#4}{##1}}% } \newcommand*{\FamilySetBool}[4]{% - \ifstr{#4}{}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% - \ifstr{#4}{true}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% - \ifstr{#4}{on}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% - \ifstr{#4}{yes}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% - \ifstr{#4}{false}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% - \ifstr{#4}{off}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% - \ifstr{#4}{no}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{true}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{on}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{yes}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{false}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{off}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{no}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% \FamilyUnknownKeyValue{#1}{#2}{#4}{% `true', `on', `yes', `false', `off', `no'% }% @@ -1899,13 +1999,13 @@ \begingroup \protected@edef\reserved@a{#4}% \def\reserved@b{\endgroup\value{#3}=#4\relax\FamilyKeyStateProcessed}% - \expandafter\ifiscount\expandafter{\reserved@a}{}{% - \expandafter\ifisdimen\expandafter{\reserved@a}{}{% - \expandafter\ifisskip\expandafter{\reserved@a}{}{% - \expandafter\ifisnumexpr\expandafter{\reserved@a}{}{% - \expandafter\ifisdimexpr\expandafter{\reserved@a}{}{% - \expandafter\ifisinteger\expandafter{\reserved@a}{}{% - \expandafter\ifiscounter\expandafter{\reserved@a}{% + \expandafter\Ifiscount\expandafter{\reserved@a}{}{% + \expandafter\Ifisdimen\expandafter{\reserved@a}{}{% + \expandafter\Ifisskip\expandafter{\reserved@a}{}{% + \expandafter\Ifisnumexpr\expandafter{\reserved@a}{}{% + \expandafter\Ifisdimexpr\expandafter{\reserved@a}{}{% + \expandafter\Ifisinteger\expandafter{\reserved@a}{}{% + \expandafter\Ifiscounter\expandafter{\reserved@a}{% \def\reserved@b{% \endgroup\value{#3}=\value{#4}\FamilyKeyStateProcessed }% @@ -1974,41 +2074,34 @@ } \newcommand*{\FamilySetLength}[4]{% \begingroup - \protected@edef\reserved@a{#4}% - \expandafter\ifiscount\expandafter{\reserved@a}{% - \aftergroup\@firstoftwo - }{% - \expandafter\ifisdimen\expandafter{\reserved@a}{% + \protected@edef\reserved@a{#4}% + \expandafter\Ifisdimen\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% - \expandafter\ifisskip\expandafter{\reserved@a}{% + \expandafter\Ifisskip\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% - \expandafter\ifisnumexpr\expandafter{\reserved@a}{% - \aftergroup\@firstoftwo - }{% - \expandafter\ifisdimexpr\expandafter{\reserved@a}{% + \expandafter\Ifisdimexpr\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% - \expandafter\ifisglueexpr\expandafter{\reserved@a}{% + \expandafter\Ifisglueexpr\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% - \expandafter\ifisglue\expandafter{\reserved@a}{% + \expandafter\Ifisglue\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% \aftergroup\@secondoftwo }% }% }% - }% }% }% - }% \endgroup {#3=#4\FamilyKeyStateProcessed}% {% \FamilyUnknownKeyValue{#1}{#2}{#4}{% - length values, counters, lengths, skips, dimens + length values, + lengths, skips, dimens }% }% } @@ -2148,7 +2241,7 @@ \DefineFamilyKey[{#1}]{#2}{#3}{\@namedef{#4}{##1}\FamilyKeyStateProcessed}% } \newcommand*{\ForDoHook}[2]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \PackageError{scrbase}{empty do-hook specificator}{% You've tried to use an empty do-hook specificator,\MessageBreak but do-hook specificators must not be empty.% @@ -2169,7 +2262,7 @@ }% } \newcommand*{\SplitDoHook}[3]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \PackageWarning{scrbase}{empty do-hook specificator}% \let#2\@empty\let#3\@empty }{% @@ -2213,7 +2306,7 @@ }% } \newcommand*{\AddtoDoHook}[2]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \PackageError{scrbase}{empty hook specificator}{% As hook specificators can never be empty, the first argument\MessageBreak of \string\AddtoDoHook\space must expand to an not empty string.% @@ -2226,7 +2319,7 @@ }% } \newcommand*{\AddtoOneTimeDoHook}[2]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \PackageError{scrbase}{empty hook specificator}{% As hook specificators can never be empty, the first argument\MessageBreak of \string\AddtoDoHook\space must expand to an not empty string.% @@ -2238,7 +2331,7 @@ }% }% } -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: body) \newcommand*{\defcaptionname}{% \kernel@ifstar\scr@def@scaptionname\scr@def@captionname @@ -2624,7 +2717,7 @@ \if@atdocument \expandafter\@firstofone \else - \scr@ifactivelanguageisoneof{#1}{\renewcommand*{#2}{#3}}{}% + \scr@ifactivelanguageisoneof{#1}{\ifdefined#2\renewcommand*{#2}{#3}\fi}{}% \expandafter\AtBeginDocument \fi {% @@ -2673,7 +2766,7 @@ \if@atdocument \expandafter\@firstofone \else - \scr@ifactivelanguageisoneof{#1}{\renewcommand*{#2}{#3}}{}% + \scr@ifactivelanguageisoneof{#1}{\ifdefined#2\renewcommand*{#2}{#3}\fi}{}% \expandafter\AtBeginDocument \fi {% |