From aab00778035c28a028f94e501e3c13f6b4081f87 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Dec 2019 22:17:03 +0000 Subject: koma-script (30dec19) git-svn-id: svn://tug.org/texlive/trunk@53270 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/koma-script/scrlayer-scrpage.sty | 84 +++++++++++----------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty') diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty index e2b8b7f225f..f02c7143810 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -45,14 +45,14 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -64,7 +64,7 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: init) \AtEndOfPackage{% \sls@auto@pagestyleset% @@ -81,7 +81,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% @@ -226,7 +226,7 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: options) \KOMA@key{headwidth}{% \begingroup @@ -262,9 +262,9 @@ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth@default} \scrlayerAddToInterface\sls@split@at@iicolons{% \def\sls@split@at@iicolons#1:#2:#3:#4\@nil{% - \ifstr{#4}{}{}{% - \ifstr{#4}{:}{}{% - \ifstr{#4}{::}{}{% + \Ifstr{#4}{}{}{% + \Ifstr{#4}{:}{}{% + \Ifstr{#4}{::}{}{% \PackageWarning{scrlayer}{extra `:' found!\MessageBreak You've used more than two colons at the argument\MessageBreak of a two value option.\MessageBreak @@ -300,7 +300,7 @@ \expandafter\edef\csname sls@#1width\endcsname{\the\@tempdima}% \setlength{\@tempdima}{\textwidth}% \addtolength{\@tempdima}{-\csname sls@#1width\endcsname}% - \ifstr{#2}{}{% + \Ifstr{#2}{}{% \ifdim \csname sls@#1width\endcsname = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax \setlength{\@tempdimb}{\z@} @@ -314,7 +314,7 @@ }{% \sls@settowidthof{\@tempdimb}{#2}% }% - \ifstr{#3}{}{% + \Ifstr{#3}{}{% \addtolength{\@tempdima}{-\@tempdimb}% }{% \sls@settowidthof{\@tempdima}{#3}% @@ -358,39 +358,39 @@ \scrlayerAddToInterface\sls@evenfootshift{\newcommand*{\sls@evenfootshift}{0pt}} \scrlayerAddToInterface\sls@settotwidthof{% \newcommand*{\sls@settowidthof}[2]{% - \ifstr{#2}{paper}{% + \Ifstr{#2}{paper}{% \setlength{#1}{\paperwidth}% }{% - \ifstr{#2}{text}{% + \Ifstr{#2}{text}{% \setlength{#1}{\textwidth}% }{% - \ifstr{#2}{marginpar}{% + \Ifstr{#2}{marginpar}{% \setlength{#1}{\dimexpr \marginparwidth+\marginparsep\relax}% }{% - \ifstr{#2}{textwithmarginpar}{% + \Ifstr{#2}{textwithmarginpar}{% \setlength{#1}{\dimexpr\textwidth +\marginparwidth +\marginparsep\relax}% }{% - \ifstr{#2}{head}{% + \Ifstr{#2}{head}{% \setlength{#1}{\sls@headwidth}% }{% - \ifstr{#2}{foot}{% + \Ifstr{#2}{foot}{% \setlength{#1}{\sls@footwidth}% }{% - \ifstr{#2}{headtopline}{% + \Ifstr{#2}{headtopline}{% \setlength{#1}{\sls@headabove@linelength}% }{% - \ifstr{#2}{headsepline}{% + \Ifstr{#2}{headsepline}{% \setlength{#1}{\sls@headbelow@linelength}% }{% - \ifstr{#2}{footsepline}{% + \Ifstr{#2}{footsepline}{% \setlength{#1}{\sls@footabove@linelength}% }{% - \ifstr{#2}{footbotline}{% + \Ifstr{#2}{footbotline}{% \setlength{#1}{\sls@footbelow@linelength}% }{% - \ifstr{#2}{page}{% + \Ifstr{#2}{page}{% \setlength{#1}{\paperwidth}% \begingroup \expandafter\expandafter\expandafter\endgroup @@ -414,10 +414,10 @@ } \scrlayerAddToInterface\sls@deftowidthof{% \newcommand*{\sls@deftowidthof}[2]{% - \ifstr{#2}{autohead}{% + \Ifstr{#2}{autohead}{% \expandafter\def\csname #1\endcsname{\sls@headwidth}% }{% - \ifstr{#2}{autofoot}{% + \Ifstr{#2}{autofoot}{% \expandafter\def\csname #1\endcsname{\sls@footwidth}% }{% \sls@settowidthof{\@tempdima}{#2}% @@ -449,7 +449,7 @@ \scrlayerAddToInterface\sls@set@values{% \newcommand*{\sls@set@values}[4][]{% \begingroup - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \FamilyKeyStateUnknown }{% \KOMA@set@ifkey{#1}{@tempswa}{#4}% @@ -497,7 +497,7 @@ \fi \reserved@b \FamilyKeyStateProcessed - \ifstr{#1}{}{}{% + \Ifstr{#1}{}{}{% \KOMA@kav@xreplacevalue{.scrlayer-scrpage.sty}{#1}{% \csname sls@#2#3@linethickness\endcsname :\csname sls@#2#3@linelength\endcsname @@ -507,8 +507,8 @@ } \scrlayerAddToInterface\sls@split@at@colon{% \def\sls@split@at@colon#1:#2:#3\@nil{% - \ifstr{#3}{}{}{% - \ifstr{#3}{:}{}{% + \Ifstr{#3}{}{}{% + \Ifstr{#3}{:}{}{% \PackageWarning{scrlayer}{extra `:' found!\MessageBreak You've used more than one colon at the argument\MessageBreak of a two value option.\MessageBreak @@ -669,7 +669,7 @@ \ofoot[\if@twoside\pagemark\fi]{\if@twoside\pagemark\fi}% \cfoot[\if@twoside\else\pagemark\fi]{\if@twoside\else\pagemark\fi}% \scr@ifundefinedorrelax{KOMAClassName}{}{% - \ifstr{\KOMAClassName}{scrlttr2}{% + \Ifstr{\KOMAClassName}{scrlttr2}{% \clearpairofpagestyles \lehead[\ifnum\@pageat=\z@\pagemark\fi] {\ifnum\@pageat=\z@\pagemark\else\leftmark\fi}% @@ -719,7 +719,7 @@ KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot@default} \scrlayer@AddCsToInterface{sls@autoenlargetrue} \scrlayer@AddCsToInterface{sls@autoenlargefalse} -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -791,7 +791,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \scrlayerAddToInterface\setheadwidth{% \newcommand*{\setheadwidth}[2][]{% @@ -823,7 +823,7 @@ } \scrlayerAddToInterface\sls@@setline{% \def\sls@@setline#1#2[#3]{% - \ifstr{#3}{auto}{% + \Ifstr{#3}{auto}{% \sls@deftowidthof{sls@#1#2@linelength}{#3#1}% }{% \sls@deftowidthof{sls@#1#2@linelength}{#3}% @@ -834,17 +834,17 @@ \scrlayerAddToInterface\sls@@@setline{% \def\sls@@@setline#1#2{% \edef\@tempa{#2}\edef\@tempb{current}% - \ifstr{#2}{}{}{% - \ifstr{#2}{current}{}{% + \Ifstr{#2}{}{}{% + \Ifstr{#2}{current}{}{% \setlength{\@tempdima}{#2}% - \ifstr{#1}{headabove}{% + \Ifstr{#1}{headabove}{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% {headtopline=\@tempdima:\csname sls@#1@linelength\endcsname}% - }{\ifstr{#1}{headbelow}{% + }{\Ifstr{#1}{headbelow}{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% {headsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{% - \ifstr{#1}{footabove}{% + \Ifstr{#1}{footabove}{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% {footsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{% @@ -878,9 +878,9 @@ } \scrlayerAddToInterface\sls@@@@setline{% \def\sls@@@@setline#1[#2]{% - \ifstr{#1}{headabove}{\setkomafont{headtopline}{#2}}{% - \ifstr{#1}{headbelow}{\setkomafont{headsepline}{#2}}{% - \ifstr{#1}{footabove}{\setkomafont{footsepline}{#2}}{% + \Ifstr{#1}{headabove}{\setkomafont{headtopline}{#2}}{% + \Ifstr{#1}{headbelow}{\setkomafont{headsepline}{#2}}{% + \Ifstr{#1}{footabove}{\setkomafont{footsepline}{#2}}{% \setkomafont{footbotline}{#2}% }% }% @@ -999,7 +999,7 @@ \noexpand\DestroyLayer{#1.foot.oneside}% \noexpand\DestroyLayer{#1.foot.above.line}% \noexpand\DestroyLayer{#1.foot.below.line}% - \noexpand\ifstr{\noexpand\currentpagestyle}{#1}{% + \noexpand\Ifstr{\noexpand\currentpagestyle}{#1}{% \noexpand\PackageWarning{scrlayer-scrpage}{% page style `#1' not longer valid.\noexpand\MessageBreak The page style has been defined using\noexpand\MessageBreak @@ -1445,7 +1445,7 @@ \newcommand*{\defpairofpagestyles}[3][]{% \def\reserved@a##1##2##3##4##5##6##7\@nil{##1##2##3##4##5##6}% \edef\reserved@a{\expandafter\reserved@a #2xxxxxx\@nil}% - \ifstr\reserved@a{plain.}{% + \Ifstr\reserved@a{plain.}{% \PackageError{scrlayer-scrpage}{plain page style `#2' not allowed}{% You may not define a plain page style using \string\defpairofpagestyles, \string\newpairofpagestyles, -- cgit v1.2.3