diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrpage.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrpage.dtx | 110 |
1 files changed, 81 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrpage.dtx b/Master/texmf-dist/source/latex/koma-script/scrpage.dtx index c74023d6c8b..1425c5e2227 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrpage.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrpage.dtx @@ -2,7 +2,7 @@ % \iffalse % ====================================================================== % scrpage.dtx -% Copyright (c) Markus Kohm, 1995-2013 +% Copyright (c) Markus Kohm, 1995-2016 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrpage.dtx -% Copyright (c) Markus Kohm, 1995-2013 +% Copyright (c) Markus Kohm, 1995-2016 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,7 +55,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $ +%%% From File: $Id: scrpage.dtx 2428 2016-04-12 10:31:07Z kohm $ %<scrpage>\NeedsTeXFormat{LaTeX2e}[1995/06/01] %<*driver> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi @@ -568,21 +568,25 @@ % % \begin{macro}{\def@head} % \changes{v2.5}{2010/04/22}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\def@@head} % \changes{v2.0}{2001/04/20}{Thickness and length of the lines are % optional} % \changes{v2.0j}{2001/08/18}{Use of \cs{scr@nouppercase}} % \changes{v2.5}{2010/04/22}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % This was real simple, but we already have to do the real definition % of the heads and foots. First the head: % \begin{macrocode} \def\def@head{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\def@@head}% {\def@@head(\scr@headabove@linelength,% \scr@headabove@linethickness)}} \def\def@@head(#1,#2)#3#4#5{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\def@@@head({#1},{#2}){#3}{#4}{#5}}% {\def@@@head({#1},{#2}){#3}{#4}{#5}% (\scr@headbelow@linelength,% @@ -622,8 +626,12 @@ % \changes{v1.3}{2001/03/30}{Use of \cmd\@footwidth instead of % \cs{textwidth}} % \changes{v2.5}{2010/04/22}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\def@@foot} % \changes{v2.5}{2010/04/22}{new (internal)} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\def@@@foot} % \changes{v2.0j}{2001/08/18}{Use of \cs{scr@nouppercase}} % \changes{v2.2f}{2008/02/14}{Use of \cs{footfont}} @@ -631,12 +639,12 @@ % And last twosided and onesided foot: % \begin{macrocode} \def\def@foot{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\def@@foot} {\def@@foot(\scr@footabove@linelength,% \scr@footabove@linethickness)}} \def\def@@foot(#1,#2)#3#4#5{% - \@ifnextchar(%) + \kernel@ifnextchar(%) {\def@@@foot({#1},{#2}){#3}{#4}{#5}}% {\def@@@foot({#1},{#2}){#3}{#4}{#5}% (\scr@footbelow@linelength,% @@ -887,9 +895,11 @@ % \end{macro} % Next we check, if there is an optional argument: % \begin{macro}{\@deftripstyle} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macrocode} \def\@deftripstyle[#1]#2{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\@@deftripstyle[#1]{#2}}% {\@@deftripstyle[#1]{#2}[\z@]}} % \end{macrocode} @@ -899,11 +909,13 @@ % \begin{macrocode} \def\@@deftripstyle[#1]#2[#3]{% % \end{macrocode} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % Ok, now we have the problem, that there can be only 9 arguments. So we % have to distinguish the star-versions by a macro: % \begin{macrocode} \def\@tempa{#1}% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\@@@deftripstyle#2[#3]}% {\@@@deftripstyle#2[\z@][#3]}} % \end{macrocode} @@ -1434,17 +1446,21 @@ \newcommand*{\setfootbotline}{\scr@setline{foot}{below}} % \end{macrocode} % \begin{macro}{\scr@setline} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@scr@setline} % \changes{v2.0d}{2001/06/19}{symbolic values implemented} % \begin{macro}{\@@scr@setline} % \changes{v2.0d}{2001/06/18}{macro name fixed} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\@scr@set@pre@line} % \changes{v2.2}{2004/07/05}{New internal} % The real change of the lines is done with the macros % \cs{scr@setline}, \cs{@scr@setline} and \cs{@@scr@setline}: % \begin{macrocode} \def\scr@setline#1#2{% - \@ifnextchar[%] + \kernel@ifnextchar[%] {\@scr@setline{#1}{#2}}{\@@scr@setline{#1#2}}% } \def\@scr@setline#1#2[#3]{% @@ -1462,7 +1478,7 @@ \expandafter\edef\csname scr@#1@linethickness\endcsname% {\the\@tempdima}% \fi\fi - \@ifnextchar[%] + \kernel@ifnextchar[%] {\@src@set@pre@line{#1}}{}% } \def\@src@set@pre@line#1[#2]{% @@ -1874,118 +1890,154 @@ % % \begin{macro}{\ihead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\ohead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\chead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\lehead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\lohead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\rehead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\rohead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cehead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cohead} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\ifoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\ofoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cfoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\lefoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\lofoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\refoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\rofoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cefoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^A % \begin{macro}{\cofoot} % \changes{v2.0}{2001/04/20}{New} +% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by +% \cs{kernel@ifnextchar}}^^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 % scrheadings pagestyle and optional of the scrplain pagestyle. % \begin{macrocode} -\newcommand{\ihead}{\@ifnextchar[{\@@lhead}{\@lhead}} +\newcommand{\ihead}{\kernel@ifnextchar[{\@@lhead}{\@lhead}} \newcommand{\@lhead}[1]{\@rehead{#1}\@lohead{#1}} \newcommand{\@@lhead}[2][]{\@@rehead[{#1}]{#2}\@@lohead[{#1}]{#2}} -\newcommand{\ohead}{\@ifnextchar[{\@@rhead}{\@rhead}} +\newcommand{\ohead}{\kernel@ifnextchar[{\@@rhead}{\@rhead}} \newcommand{\@rhead}[1]{\@lehead{#1}\@rohead{#1}} \newcommand{\@@rhead}[2][]{\@@lehead[{#1}]{#2}\@@rohead[{#1}]{#2}} -\newcommand{\chead}{\@ifnextchar[{\@@chead}{\@chead}} +\newcommand{\chead}{\kernel@ifnextchar[{\@@chead}{\@chead}} \newcommand{\@chead}[1]{\@cehead{#1}\@cohead{#1}} \newcommand{\@@chead}[2][]{\@@cehead[{#1}]{#2}\@@cohead[{#1}]{#2}} -\newcommand{\lehead}{\@ifnextchar[{\@@lehead}{\@lehead}} +\newcommand{\lehead}{\kernel@ifnextchar[{\@@lehead}{\@lehead}} \newcommand{\@lehead}[1]{\renewcommand*{\scrheadings@even@left@head}{#1}} \newcommand{\@@lehead}[2][]{% \renewcommand*{\scrplain@even@left@head}{#1}% \renewcommand*{\scrheadings@even@left@head}{#2}} -\newcommand{\lohead}{\@ifnextchar[{\@@lohead}{\@lohead}} +\newcommand{\lohead}{\kernel@ifnextchar[{\@@lohead}{\@lohead}} \newcommand{\@lohead}[1]{\renewcommand*{\scrheadings@odd@left@head}{#1}} \newcommand{\@@lohead}[2][]{% \renewcommand*{\scrplain@odd@left@head}{#1}% \renewcommand*{\scrheadings@odd@left@head}{#2}} -\newcommand{\rehead}{\@ifnextchar[{\@@rehead}{\@rehead}} +\newcommand{\rehead}{\kernel@ifnextchar[{\@@rehead}{\@rehead}} \newcommand{\@rehead}[1]{\renewcommand*{\scrheadings@even@right@head}{#1}} \newcommand{\@@rehead}[2][]{% \renewcommand*{\scrplain@even@right@head}{#1}% \renewcommand*{\scrheadings@even@right@head}{#2}} -\newcommand{\rohead}{\@ifnextchar[{\@@rohead}{\@rohead}} +\newcommand{\rohead}{\kernel@ifnextchar[{\@@rohead}{\@rohead}} \newcommand{\@rohead}[1]{\renewcommand*{\scrheadings@odd@right@head}{#1}} \newcommand{\@@rohead}[2][]{% \renewcommand*{\scrplain@odd@right@head}{#1}% \renewcommand*{\scrheadings@odd@right@head}{#2}} -\newcommand{\cehead}{\@ifnextchar[{\@@cehead}{\@cehead}} +\newcommand{\cehead}{\kernel@ifnextchar[{\@@cehead}{\@cehead}} \newcommand{\@cehead}[1]{\renewcommand*{\scrheadings@even@middle@head}{#1}} \newcommand{\@@cehead}[2][]{% \renewcommand*{\scrplain@even@middle@head}{#1}% \renewcommand*{\scrheadings@even@middle@head}{#2}} -\newcommand{\cohead}{\@ifnextchar[{\@@cohead}{\@cohead}} +\newcommand{\cohead}{\kernel@ifnextchar[{\@@cohead}{\@cohead}} \newcommand{\@cohead}[1]{\renewcommand*{\scrheadings@odd@middle@head}{#1}} \newcommand{\@@cohead}[2][]{% \renewcommand*{\scrplain@odd@middle@head}{#1}% \renewcommand*{\scrheadings@odd@middle@head}{#2}} -\newcommand{\ifoot}{\@ifnextchar[{\@@lfoot}{\@lfoot}} +\newcommand{\ifoot}{\kernel@ifnextchar[{\@@lfoot}{\@lfoot}} \newcommand{\@lfoot}[1]{\@refoot{#1}\@lofoot{#1}} \newcommand{\@@lfoot}[2][]{\@@refoot[{#1}]{#2}\@@lofoot[{#1}]{#2}} -\newcommand{\ofoot}{\@ifnextchar[{\@@rfoot}{\@rfoot}} +\newcommand{\ofoot}{\kernel@ifnextchar[{\@@rfoot}{\@rfoot}} \newcommand{\@rfoot}[1]{\@lefoot{#1}\@rofoot{#1}} \newcommand{\@@rfoot}[2][]{\@@lefoot[{#1}]{#2}\@@rofoot[{#1}]{#2}} -\newcommand{\cfoot}{\@ifnextchar[{\@@cfoot}{\@cfoot}} +\newcommand{\cfoot}{\kernel@ifnextchar[{\@@cfoot}{\@cfoot}} \newcommand{\@cfoot}[1]{\@cefoot{#1}\@cofoot{#1}} \newcommand{\@@cfoot}[2][]{\@@cefoot[{#1}]{#2}\@@cofoot[{#1}]{#2}} -\newcommand{\lefoot}{\@ifnextchar[{\@@lefoot}{\@lefoot}} +\newcommand{\lefoot}{\kernel@ifnextchar[{\@@lefoot}{\@lefoot}} \newcommand{\@lefoot}[1]{\renewcommand*{\scrheadings@even@left@foot}{#1}} \newcommand{\@@lefoot}[2][]{% \renewcommand*{\scrplain@even@left@foot}{#1}% \renewcommand*{\scrheadings@even@left@foot}{#2}} -\newcommand{\lofoot}{\@ifnextchar[{\@@lofoot}{\@lofoot}} +\newcommand{\lofoot}{\kernel@ifnextchar[{\@@lofoot}{\@lofoot}} \newcommand{\@lofoot}[1]{\renewcommand*{\scrheadings@odd@left@foot}{#1}} \newcommand{\@@lofoot}[2][]{% \renewcommand*{\scrplain@odd@left@foot}{#1}% \renewcommand*{\scrheadings@odd@left@foot}{#2}} -\newcommand{\refoot}{\@ifnextchar[{\@@refoot}{\@refoot}} +\newcommand{\refoot}{\kernel@ifnextchar[{\@@refoot}{\@refoot}} \newcommand{\@refoot}[1]{\renewcommand*{\scrheadings@even@right@foot}{#1}} \newcommand{\@@refoot}[2][]{% \renewcommand*{\scrplain@even@right@foot}{#1}% \renewcommand*{\scrheadings@even@right@foot}{#2}} -\newcommand{\rofoot}{\@ifnextchar[{\@@rofoot}{\@rofoot}} +\newcommand{\rofoot}{\kernel@ifnextchar[{\@@rofoot}{\@rofoot}} \newcommand{\@rofoot}[1]{\renewcommand*{\scrheadings@odd@right@foot}{#1}} \newcommand{\@@rofoot}[2][]{% \renewcommand*{\scrplain@odd@right@foot}{#1}% \renewcommand*{\scrheadings@odd@right@foot}{#2}} -\newcommand{\cefoot}{\@ifnextchar[{\@@cefoot}{\@cefoot}} +\newcommand{\cefoot}{\kernel@ifnextchar[{\@@cefoot}{\@cefoot}} \newcommand{\@cefoot}[1]{\renewcommand*{\scrheadings@even@middle@foot}{#1}} \newcommand{\@@cefoot}[2][]{% \renewcommand*{\scrplain@even@middle@foot}{#1}% \renewcommand*{\scrheadings@even@middle@foot}{#2}} -\newcommand{\cofoot}{\@ifnextchar[{\@@cofoot}{\@cofoot}} +\newcommand{\cofoot}{\kernel@ifnextchar[{\@@cofoot}{\@cofoot}} \newcommand{\@cofoot}[1]{\renewcommand*{\scrheadings@odd@middle@foot}{#1}} \newcommand{\@@cofoot}[2][]{% \renewcommand*{\scrplain@odd@middle@foot}{#1}% |