summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/koma-script/source/scrlayer-scrpage.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/koma-script/source/scrlayer-scrpage.dtx')
-rw-r--r--macros/latex/contrib/koma-script/source/scrlayer-scrpage.dtx87
1 files changed, 50 insertions, 37 deletions
diff --git a/macros/latex/contrib/koma-script/source/scrlayer-scrpage.dtx b/macros/latex/contrib/koma-script/source/scrlayer-scrpage.dtx
index 5be2ae2021..22dfc382b8 100644
--- a/macros/latex/contrib/koma-script/source/scrlayer-scrpage.dtx
+++ b/macros/latex/contrib/koma-script/source/scrlayer-scrpage.dtx
@@ -57,7 +57,7 @@
% Right brace \} Tilde \~}
%
% \iffalse^^A meta-comment
-%%% 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 $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -66,9 +66,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2019-04-05 09:52:27 +0200 (Fri, 05 Apr 2019) $
+ \filedate$Date: 2019-11-18 18:09:35 +0100 (Mon, 18 Nov 2019) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3141 $
+ \filerevision$Revision: 3390 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlayer-scrpage.dtx}%
@@ -321,6 +321,7 @@
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth@default}
% \end{macrocode}
% \begin{macro}{\sls@split@at@iicolons}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{description}
% \item[\texttt{\meta{balanced}:^^A
% \meta{balanced}:^^A
@@ -333,9 +334,9 @@
% \begin{macrocode}
\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
@@ -353,6 +354,7 @@
% \end{macro}%^^A \sls@split@at@iicolons
% \begin{macro}{\sls@set@hf@width}
% \changes{v0.9.1757}{2014/04/09}{new: two offsets available}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{description}
% \item[\Parameter{head} or \Parameter{foot}:] to complete the macro names
% for page head or footer.
@@ -384,7 +386,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@}
@@ -398,7 +400,7 @@
}{%
\sls@settowidthof{\@tempdimb}{#2}%
}%
- \ifstr{#3}{}{%
+ \Ifstr{#3}{}{%
\addtolength{\@tempdima}{-\@tempdimb}%
}{%
\sls@settowidthof{\@tempdima}{#3}%
@@ -461,7 +463,9 @@
% \end{macro}%^^A \sls@evenfootshift
%
% \begin{macro}{\sls@settowidthof}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{macro}{\sls@deftowidthof}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% the special dimensional expressions may be either one of the strings
% \texttt{paper}, \texttt{text}, \texttt{marginpar},
% \texttt{textwithmarginpar}, \texttt{head}, \texttt{foot},
@@ -472,39 +476,39 @@
% \begin{macrocode}
\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
@@ -528,10 +532,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}%
@@ -626,6 +630,7 @@
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footbotline@default}
% \end{macrocode}
% \begin{macro}{\sls@set@values}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{description}
% \item[\OParameter{option name}:] either empty or the name of the option
% that sets the line,
@@ -641,7 +646,7 @@
\scrlayerAddToInterface\sls@set@values{%
\newcommand*{\sls@set@values}[4][]{%
\begingroup
- \ifstr{#1}{}{%
+ \Ifstr{#1}{}{%
\FamilyKeyStateUnknown
}{%
\KOMA@set@ifkey{#1}{@tempswa}{#4}%
@@ -689,7 +694,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
@@ -700,6 +705,7 @@
% \end{macrocode}
% \end{macro}%^^A \sls@set@values
% \begin{macro}{\sls@split@at@colon}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{description}
% \item[\texttt{\meta{balanced}:^^A
% \meta{balanced}:^^A
@@ -712,8 +718,8 @@
% \begin{macrocode}
\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
@@ -946,12 +952,15 @@
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel@ifnextchar}}%^^A
% \begin{macro}{\sls@@setline}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{macro}{\sls@@@setline}
% \changes{v3.17}[2015/02/27]{internal use of the corresponding options}%^^A
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel@ifnextchar}}%^^A
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{macro}{\sls@@@@setline}
% \changes{v3.18}{2015/06/17}{explicit reuse of the current length}%^^A
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% Helper to set up the line attributes processing the parameters of the
% commands above.
% \begin{macrocode}
@@ -963,7 +972,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}%
@@ -974,17 +983,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}%
}{%
@@ -1018,9 +1027,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}%
}%
}%
@@ -1250,7 +1259,9 @@
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@pagestyleset}
% \end{macrocode}
% \begin{macro}{\sls@ps@style@standard}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{macro}{\sls@ps@style@KOMA-Script}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% These are the predefined page style sets.
% \begin{macrocode}
\scrlayerAddToInterface\sls@ps@style@standard{%
@@ -1276,7 +1287,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}{%
% \end{macrocode}
% We are using \Class{scrlttr2}, so we have to initialise the page style
% different:
@@ -1387,6 +1398,7 @@
% may be removed some times. The layer interface doesn't support this.
%
% \begin{macro}{\defpagestyle}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{description}
% \item[\Parameter{string}:] the name of the page style to be defined (must
% be fully expandable and expand to a string only).
@@ -1420,7 +1432,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
@@ -2138,6 +2150,7 @@
% interface.
%
% \begin{macro}{\defpairofpagestyles}
+% \changes{v3.28}{2019/11/18}{\cs{ifstr} umbenannt in \cs{Ifstr}}%^^A
% \begin{description}
% \item[\OParameter{string}:] name of a parent page style, that will be used
% to initialise the new page style (must be fully expandable and expand to
@@ -2167,7 +2180,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,