diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-11 21:26:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-11 21:26:48 +0000 |
commit | 39c10427f8eee057dc28928380060a585e1e017b (patch) | |
tree | 6750074338d5e6b808cfca3671e2ab9763c328ae /Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx | |
parent | a49931ca8756327265b8929a7a147045bf2b3506 (diff) |
koma-script (11may16)
git-svn-id: svn://tug.org/texlive/trunk@41038 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx | 172 |
1 files changed, 121 insertions, 51 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx index f03f9855718..36dc001c395 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx @@ -2,7 +2,7 @@ % \iffalse^^A meta-comment % ====================================================================== % scrlayer-scrpage.dtx -% Copyright (c) Markus Kohm, 2012-2015 +% Copyright (c) Markus Kohm, 2012-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien. % ---------------------------------------------------------------------- % scrlayer-scrpage.dtx -% Copyright (c) Markus Kohm, 2012-2015 +% Copyright (c) Markus Kohm, 2012-2016 % % Diese Datei ist Teil der LaTeX2e KOMA-Script-Sammlung. % @@ -57,17 +57,17 @@ % Right brace \} Tilde \~} % % \iffalse^^A meta-comment -%<identify>%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (identify) -%<init>%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (init) -%<options>%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (options) -%<body>%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (body) +%<identify>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify) +%<init>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (init) +%<options>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (options) +%<body>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-06-24 08:16:16 +0200 (Wed, 24 Jun 2015) $ + \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} - \filerevision$Revision: 2147 $ + \filerevision$Revision: 2429 $ \endgroup \ProvidesFile{scrlayer-scrpage.dtx}[\filedate\space r\filerevision\space %</dtx> @@ -941,9 +941,13 @@ } % \end{macrocode} % \begin{macro}{\sls@setline} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@setline} % \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 % \begin{macro}{\sls@@@@setline} % \changes{v3.18}{2015/06/17}{explicit reuse of the current length}^^A % Helper to set up the line attributes processing the parameters of the @@ -951,7 +955,7 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@setline{% \newcommand*\sls@setline[2]{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\sls@@setline{#1}{#2}}{\sls@@@setline{#1#2}}% }% } @@ -1003,7 +1007,7 @@ `\string\setkomafont' or `\string\addtokomafont' to\MessageBreak setup the colour% }% - \@ifnextchar[%] + \kernel@ifnextchar[%] {% \sls@@@@setline{#1}% }{% @@ -1346,7 +1350,11 @@ } % \end{macrocode} % \begin{macro}{\sls@defhead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@defhead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@@defhead} % \changes{v0.9}{2014/08/18}{fix names of layers \texttt{\dots head.odd} and % \texttt{\dots head.even}}%^^A @@ -1370,14 +1378,14 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@defhead{% \newcommand*\sls@defhead[1]{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\sls@@defhead{#1}}% {\sls@@defhead{#1}(\sls@headabove@linelength,\sls@headabove@linethickness)}% }% } \scrlayerAddToInterface\sls@@defhead{% \def\sls@@defhead#1(#2,#3)#4#5#6{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\sls@@@defhead{#1}({#2},{#3}){#4}{#5}{#6}}% {\sls@@@defhead{#1}% ({#2},{#3})% @@ -1450,7 +1458,11 @@ } % \end{macrocode} % \begin{macro}{\sls@deffoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@deffoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\sls@@@deffoot} % \changes{v0.9}{2014/08/18}{fix names of layers \texttt{\dots foot.odd} and % \texttt{\dots foot.even}}%^^A @@ -1474,14 +1486,14 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@deffoot{% \newcommand*\sls@deffoot[1]{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\sls@@deffoot{#1}}% {\sls@@deffoot{#1}(\sls@footabove@linelength,\sls@footabove@linethickness)}% }% } \scrlayerAddToInterface\sls@@deffoot{% \def\sls@@deffoot#1(#2,#3)#4#5#6{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\sls@@@deffoot{#1}({#2},{#3}){#4}{#5}{#6}}% {\sls@@@deffoot{#1}% ({#2},{#3})% @@ -1914,7 +1926,11 @@ } % \end{macrocode} % \begin{macro}{\scrlayer@triplestyle} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\scrlayer@@triplestyle} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\scrlayer@@@triplestyle} % Helpers, that do the real work. Parameters are same, but \cs{reserved@a} has % to be one of \Macro{defpagestyle}, \Macro{newpagestyle}, @@ -1922,14 +1938,14 @@ % \begin{macrocode} \scrlayerAddToInterface\scrlayer@triplestyle{% \def\scrlayer@triplestyle#1{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\scrlayer@@triplestyle{#1}}% {\scrlayer@@triplestyle{#1}[\z@]}% } } \scrlayerAddToInterface\scrlayer@@triplestyle{% \def\scrlayer@@triplestyle#1[#2]{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\scrlayer@@@triplestyle{#1}[#2]}% {\scrlayer@@@triplestyle{#1}[\z@][#2]}% }% @@ -2160,6 +2176,8 @@ % \end{macro}^^A \sls@currentplain % \end{macro}^^A \sls@currentheadings % \begin{macro}{\sls@init@pair@page@style} +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\sls@init@@pair@page@style} % \begin{description} % \item[\Parameter{string}:] the name of the page style, that should be @@ -2178,8 +2196,8 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@init@pair@page@style{% \newcommand*{\sls@init@pair@page@style}{% - \@ifstar {% - \@ifstar {% + \kernel@ifstar {% + \kernel@ifstar {% \sls@let@pair@page@style\relax }{% \sls@let@pair@page@style\@empty @@ -2421,41 +2439,77 @@ % % % \begin{macro}{\ihead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ohead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\chead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\lehead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\lohead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\rehead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\rohead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cehead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cohead} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ifoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\ofoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cfoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\lefoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\lofoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\refoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\rofoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cefoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\cofoot} -% \changes{v3.14}{2014/09/19}{new star version double the argument} +% \changes{v3.14}{2014/09/19}{new star version double the argument}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % We also need macros to define the contents of the three part head % and foot. Each macro defines one of the part of head or foot of the % headings page style member and optional of the plain page style @@ -2463,16 +2517,18 @@ % \begin{macrocode} %<*body> \scrlayerAddToInterface\ihead{% - \newcommand*{\ihead}{\@ifstar {\@dblarg\@@@ihead}{\@ihead}}% + \newcommand*{\ihead}{\kernel@ifstar {\@dblarg\@@@ihead}{\@ihead}}% } % \end{macrocode} % \begin{macro}{\@ihead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@ihead} % \begin{macro}{\@@@ihead} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@ihead{% - \newcommand*{\@ihead}{\@ifnextchar[{\@@@ihead}{\@@ihead}}% + \newcommand*{\@ihead}{\kernel@ifnextchar[{\@@@ihead}{\@@ihead}}% } \scrlayerAddToInterface\@@ihead{% \newcommand*{\@@ihead}[1]{\rehead{#1}\lohead{#1}}% @@ -2486,16 +2542,18 @@ % \end{macro}^^A \@ihead % \begin{macrocode} \scrlayerAddToInterface\ohead{% - \newcommand*{\ohead}{\@ifstar {\@dblarg\@@@ohead}{\@ohead}}% + \newcommand*{\ohead}{\kernel@ifstar {\@dblarg\@@@ohead}{\@ohead}}% } % \end{macrocode} % \begin{macro}{\@ohead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@ohead} % \begin{macro}{\@@@ohead} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@ohead{% - \newcommand*{\@ohead}{\@ifnextchar[{\@@@ohead}{\@@ohead}}% + \newcommand*{\@ohead}{\kernel@ifnextchar[{\@@@ohead}{\@@ohead}}% } \scrlayerAddToInterface\@@ohead{% \newcommand*{\@@ohead}[1]{\lehead{#1}\rohead{#1}}% @@ -2509,16 +2567,18 @@ % \end{macro}^^A \@ohead % \begin{macrocode} \scrlayerAddToInterface\chead{% - \newcommand*{\chead}{\@ifstar {\@dblarg\@@@chead}{\@chead}}% + \newcommand*{\chead}{\kernel@ifstar {\@dblarg\@@@chead}{\@chead}}% } % \end{macrocode} % \begin{macro}{\@chead} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@chead} % \begin{macro}{\@@@chead} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@chead{% - \newcommand*{\@chead}{\@ifnextchar[{\@@@chead}{\@@chead}}% + \newcommand*{\@chead}{\kernel@ifnextchar[{\@@@chead}{\@@chead}}% } \scrlayerAddToInterface\@@chead{% \newcommand*{\@@chead}[1]{\cehead{#1}\cohead{#1}}% @@ -2552,16 +2612,18 @@ % \end{macrocode} % \begin{macrocode} \scrlayerAddToInterface\ifoot{% - \newcommand*{\ifoot}{\@ifstar {\@dblarg\@@@ifoot}{\@ifoot}}% + \newcommand*{\ifoot}{\kernel@ifstar {\@dblarg\@@@ifoot}{\@ifoot}}% } % \end{macrocode} % \begin{macro}{\@ifoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@ifoot} % \begin{macro}{\@@@ifoot} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@ifoot{% - \newcommand*{\@ifoot}{\@ifnextchar[{\@@@ifoot}{\@@ifoot}}% + \newcommand*{\@ifoot}{\kernel@ifnextchar[{\@@@ifoot}{\@@ifoot}}% } \scrlayerAddToInterface\@@ifoot{% \newcommand*{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}% @@ -2575,16 +2637,18 @@ % \end{macro}^^A \@ifoot % \begin{macrocode} \scrlayerAddToInterface\ofoot{% - \newcommand*{\ofoot}{\@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}% + \newcommand*{\ofoot}{\kernel@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}% } % \end{macrocode} % \begin{macro}{\@ofoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@ofoot} % \begin{macro}{\@@@ofoot} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@ofoot{% - \newcommand*{\@ofoot}{\@ifnextchar[{\@@@ofoot}{\@@ofoot}}% + \newcommand*{\@ofoot}{\kernel@ifnextchar[{\@@@ofoot}{\@@ofoot}}% } \scrlayerAddToInterface\@@ofoot{% \newcommand*{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}% @@ -2598,16 +2662,18 @@ % \end{macro}^^A \@ofoot % \begin{macrocode} \scrlayerAddToInterface\cfoot{% - \newcommand*{\cfoot}{\@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}% + \newcommand*{\cfoot}{\kernel@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}% } % \end{macrocode} % \begin{macro}{\@cfoot} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@@cfoot} % \begin{macro}{\@@@cfoot} % Two helpers for the previous one to double the command and it's arguments. % \begin{macrocode} \scrlayerAddToInterface\@cfoot{% - \newcommand*{\@cfoot}{\@ifnextchar[{\@@@cfoot}{\@@cfoot}}% + \newcommand*{\@cfoot}{\kernel@ifnextchar[{\@@@cfoot}{\@@cfoot}}% } \scrlayerAddToInterface\@@cfoot{% \newcommand*{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}% @@ -2641,6 +2707,10 @@ % \end{macrocode} % \begin{macro}{\sls@renewelement} % \begin{macro}{\sls@@renewelement} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A +% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar} +% ersetzt}^^A % \begin{macro}{\sls@@@renewelement} % \begin{macro}{\sls@@@@renewelement} % \begin{macro}{\sls@@renewplainelement} @@ -2648,13 +2718,13 @@ % \begin{macrocode} \scrlayerAddToInterface\sls@renewelement{% \newcommand*{\sls@renewelement}[3]{% - \@ifstar{\@dblarg{\sls@@@@renewelement{#1}{#2}{#3}}}% - {\sls@@renewelement{#1}{#2}{#3}}% + \kernel@ifstar{\@dblarg{\sls@@@@renewelement{#1}{#2}{#3}}}% + {\sls@@renewelement{#1}{#2}{#3}}% }% } \scrlayerAddToInterface\sls@@renewelement{% \newcommand*{\sls@@renewelement}[3]{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\sls@@@@renewelement{#1}{#2}{#3}}% {\sls@@@renewelement{#1}{#2}{#3}}% }% |