diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty | 89 |
1 files changed, 46 insertions, 43 deletions
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 840d9f6ff8c..e2b8b7f225f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -13,7 +13,7 @@ %% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 2012-2017 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2012-2019 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -41,18 +41,18 @@ %% %% The KOMA-Script bundle (but maybe not this file) was based upon the %% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e -%% standard classes created by The LaTeX3 Project 1994-1996. You may +%% standard classes created by The LaTeX3 Project 1994-1996. You can %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer-scrpage.dtx 3017 2018-09-05 06:27:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2019/02/01 v3.26b KOMA-Script + 2019/10/12 v3.27 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $ +%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -64,7 +64,7 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% From File: $Id: scrlayer-scrpage.dtx 3017 2018-09-05 06:27:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ %%% (run: init) \AtEndOfPackage{% \sls@auto@pagestyleset% @@ -81,7 +81,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $ +%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z 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 3017 2018-09-05 06:27:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ %%% (run: options) \KOMA@key{headwidth}{% \begingroup @@ -719,7 +719,7 @@ KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot@default} \scrlayer@AddCsToInterface{sls@autoenlargetrue} \scrlayer@AddCsToInterface{sls@autoenlargefalse} -%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $ +%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z 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 3017 2018-09-05 06:27:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ %%% (run: body) \scrlayerAddToInterface\setheadwidth{% \newcommand*{\setheadwidth}[2][]{% @@ -974,6 +974,9 @@ \fi \fi } +\@ifundefined{LaTeXcentering}{\let\LaTeXcentering\centering}{} +\@ifundefined{LaTeXraggedleft}{\let\LaTeXraggedleft\raggedleft}{} +\@ifundefined{LaTeXraggedright}{\let\LaTeXraggedright\raggedright}{} \scrlayerAddToInterface\defpagestyle{% \newcommand*{\defpagestyle}[3]{% \sls@defhead{#1}#2\@empty\@empty\@empty @@ -1611,48 +1614,48 @@ \newcommand*{\sls@def@pair@page@style@member}[1]{% \defpagestyle{#1}{% {% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright \strut\@nameuse{sls@ps@#1@even@left@head}\strut}}% - \parbox{\sls@headwidth}{\centering + \parbox{\sls@headwidth}{\LaTeXcentering \strut\@nameuse{sls@ps@#1@even@middle@head}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft \strut\@nameuse{sls@ps@#1@even@right@head}\strut}}% }{% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}% - \parbox{\sls@headwidth}{\centering + \parbox{\sls@headwidth}{\LaTeXcentering \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}% }{% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}% - \parbox{\sls@headwidth}{\centering + \parbox{\sls@headwidth}{\LaTeXcentering \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}% }% }{% {% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright \strut\@nameuse{sls@ps@#1@even@left@foot}\strut}}% - \parbox{\sls@footwidth}{\centering + \parbox{\sls@footwidth}{\LaTeXcentering \strut\@nameuse{sls@ps@#1@even@middle@foot}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft \strut\@nameuse{sls@ps@#1@even@right@foot}\strut}}% }{% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}% - \parbox{\sls@footwidth}{\centering + \parbox{\sls@footwidth}{\LaTeXcentering \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}% }{% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}% - \parbox{\sls@footwidth}{\centering + \parbox{\sls@footwidth}{\LaTeXcentering \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}% }% }% @@ -1741,10 +1744,10 @@ \newcommand*{\@ihead}{\kernel@ifnextchar[{\@@@ihead}{\@@ihead}}% } \scrlayerAddToInterface\@@ihead{% - \newcommand*{\@@ihead}[1]{\rehead{#1}\lohead{#1}}% + \newcommand{\@@ihead}[1]{\rehead{#1}\lohead{#1}}% } \scrlayerAddToInterface\@@@ihead{% - \newcommand*{\@@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}% + \newcommand{\@@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}% } \scrlayerAddToInterface\ohead{% \newcommand*{\ohead}{\kernel@ifstar {\@dblarg\@@@ohead}{\@ohead}}% @@ -1753,10 +1756,10 @@ \newcommand*{\@ohead}{\kernel@ifnextchar[{\@@@ohead}{\@@ohead}}% } \scrlayerAddToInterface\@@ohead{% - \newcommand*{\@@ohead}[1]{\lehead{#1}\rohead{#1}}% + \newcommand{\@@ohead}[1]{\lehead{#1}\rohead{#1}}% } \scrlayerAddToInterface\@@@ohead{% - \newcommand*{\@@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}% + \newcommand{\@@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}% } \scrlayerAddToInterface\chead{% \newcommand*{\chead}{\kernel@ifstar {\@dblarg\@@@chead}{\@chead}}% @@ -1765,10 +1768,10 @@ \newcommand*{\@chead}{\kernel@ifnextchar[{\@@@chead}{\@@chead}}% } \scrlayerAddToInterface\@@chead{% - \newcommand*{\@@chead}[1]{\cehead{#1}\cohead{#1}}% + \newcommand{\@@chead}[1]{\cehead{#1}\cohead{#1}}% } \scrlayerAddToInterface\@@@chead{% - \newcommand*{\@@@chead}[2][]{\cehead[{#1}]{#2}\cohead[{#1}]{#2}}% + \newcommand{\@@@chead}[2][]{\cehead[{#1}]{#2}\cohead[{#1}]{#2}}% } \scrlayerAddToInterface\lehead{% \newcommand*{\lehead}{\sls@renewelement{even}{left}{head}}% @@ -1795,10 +1798,10 @@ \newcommand*{\@ifoot}{\kernel@ifnextchar[{\@@@ifoot}{\@@ifoot}}% } \scrlayerAddToInterface\@@ifoot{% - \newcommand*{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}% + \newcommand{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}% } \scrlayerAddToInterface\@@@ifoot{% - \newcommand*{\@@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}% + \newcommand{\@@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}% } \scrlayerAddToInterface\ofoot{% \newcommand*{\ofoot}{\kernel@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}% @@ -1807,10 +1810,10 @@ \newcommand*{\@ofoot}{\kernel@ifnextchar[{\@@@ofoot}{\@@ofoot}}% } \scrlayerAddToInterface\@@ofoot{% - \newcommand*{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}% + \newcommand{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}% } \scrlayerAddToInterface\@@@ofoot{% - \newcommand*{\@@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}% + \newcommand{\@@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}% } \scrlayerAddToInterface\cfoot{% \newcommand*{\cfoot}{\kernel@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}% @@ -1819,10 +1822,10 @@ \newcommand*{\@cfoot}{\kernel@ifnextchar[{\@@@cfoot}{\@@cfoot}}% } \scrlayerAddToInterface\@@cfoot{% - \newcommand*{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}% + \newcommand{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}% } \scrlayerAddToInterface\@@@cfoot{% - \newcommand*{\@@@cfoot}[2][]{\cefoot[{#1}]{#2}\cofoot[{#1}]{#2}}% + \newcommand{\@@@cfoot}[2][]{\cefoot[{#1}]{#2}\cofoot[{#1}]{#2}}% } \scrlayerAddToInterface\lefoot{% \newcommand*{\lefoot}{\sls@renewelement{even}{left}{foot}}% @@ -1856,7 +1859,7 @@ }% } \scrlayerAddToInterface\sls@@@renewelement{% - \newcommand*{\sls@@@renewelement}[4]{% + \newcommand{\sls@@@renewelement}[4]{% \scr@ifundefinedorrelax{sls@ps@\sls@currentheadings @#1@#2@#3}{% \@namedef{sls@ps@scrheadings@#1@#2@#3}{#4}% }{% @@ -1865,13 +1868,13 @@ }% } \scrlayerAddToInterface\sls@@@@renewelement{% - \def\sls@@@@renewelement#1#2#3[#4]#5{% + \long\def\sls@@@@renewelement#1#2#3[#4]#5{% \sls@@renewplainelement{#1}{#2}{#3}{#4}% \sls@@@renewelement{#1}{#2}{#3}{#5}% }% } \scrlayerAddToInterface\sls@@renewplainelement{% - \newcommand*{\sls@@renewplainelement}[4]{% + \newcommand{\sls@@renewplainelement}[4]{% \scr@ifundefinedorrelax{sls@ps@\sls@currentplain @#1@#2@#3}{% \@namedef{sls@ps@plain.scrheadings@#1@#2@#3}{#4}% }{% |