diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlayer.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlayer.sty | 113 |
1 files changed, 68 insertions, 45 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index f49b2b25d7b..ea4ba7e04da 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,14 +43,14 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% 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: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (defining layers and page styles)] -%%% 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{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -115,7 +115,7 @@ \setlength{\footheight}{\baselineskip} \fi } -%%% 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}{% \begingroup @@ -281,7 +281,7 @@ \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% 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 \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} @@ -331,22 +331,25 @@ \providecommand*{\@mkright}{% \IfActiveMkBoth{\markright}{\@gobble}% }% -\providecommand*{\@mkdouble}[1]{% +\providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -\providecommand*{\markleft}[1]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markleft\@themark {#1}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi -} -\providecommand{\@markleft}[3]{% - \@temptokena {#2}% - \unrestored@protected@xdef\@themark{{#3}{\the\@temptokena}}% -} +\@ifundefined{markleft}{% + \DeclareRobustCommand{\markleft}[1]{% + \begingroup + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markleft\@themark {#1}% + \@temptokena \expandafter{\@themark}% + \mark{\the\@temptokena}% + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi + }% + \providecommand{\@markleft}[3]{% + \@temptokena {#2}% + \unrestored@protected@xdef\@themark{{#3}{\the\@temptokena}}% + }% +}{} +\providecommand{\markdouble}[1]{\markboth{#1}{#1}} \newcommand*{\manualmark}{% \begingroup \def\@elt##1{% @@ -364,15 +367,15 @@ \kernel@ifstar{\@automark}{\manualmark\@automark}% } \newcommand*{\@automark}[2][]{% - \ifstr{#2}{}{% - \ifstr{#1}{}{% + \Ifstr{#2}{}{% + \Ifstr{#1}{}{% \automark@basics }{% \automark@basics \automark@righthigh{#1}% }% }{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \automark@basics \automark@leftlow{#2}% }{% @@ -505,7 +508,7 @@ }{}% \begingroup \@tempswatrue - \def\@elt##1{\ifstr{#1}{##1}{\@tempswafalse}{}}% + \def\@elt##1{\Ifstr{#1}{##1}{\@tempswafalse}{}}% \scrlayer@level@list \if@tempswa \aftergroup\@firstofone @@ -1058,7 +1061,7 @@ \edef\reserved@a{% \unexpanded{% \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% - \ifstr{\csname scr@l@#2@mode\endcsname}% + \Ifstr{\csname scr@l@#2@mode\endcsname}% }{\csname scr@l@#2@mode\endcsname}% }\reserved@a{}{% \PackageWarning{scrlayer}{% @@ -1218,60 +1221,70 @@ \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @initialhook\endcsname {#1}% + \let\scr@opt@marker@initialhook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{oninit}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @hook\endcsname {#1}% + \let\scr@opt@marker@hook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{ononeside}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @onesidehook\endcsname {#1}% + \let\scr@opt@marker@onesidehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{ontwoside}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @twosidehook\endcsname {#1}% + \let\scr@opt@marker@twosidehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onoddpage}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @oddpagehook\endcsname {#1}% + \let\scr@opt@marker@oddpagehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onevenpage}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @evenpagehook\endcsname {#1}% + \let\scr@opt@marker@evenpagehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onfloatpage}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @floatpagehook\endcsname {#1}% + \let\scr@opt@marker@floatpagehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onnonfloatpage}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @nonfloatpagehook\endcsname {#1}% + \let\scr@opt@marker@nonfloatpagehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onbackground}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @backgroundhook\endcsname {#1}% + \let\scr@opt@marker@backgroundhook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onforeground}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @foregroundhook\endcsname {#1}% + \let\scr@opt@marker@foregroundhook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \newcommand*{\DeclarePageStyleByLayers}[3][]{% @@ -1433,7 +1446,7 @@ \@namedef{@ps@#1@layers}{}% \@for \reserved@a:=#3\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\@cons\csname @ps@#1@layers\endcsname{{\reserved@a}}% }% }% @@ -1673,7 +1686,7 @@ \IfLayerPageStyleExists{\reserved@b}{% \@for \reserved@a:=#2\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname {{\reserved@a}}% }% @@ -1699,7 +1712,7 @@ \IfLayerPageStyleExists{#1}{% \@for \reserved@a:=#2\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\remove@layer@from@page@style\expandafter{\reserved@a}% {\reserved@b}% }% @@ -1713,7 +1726,7 @@ \expandafter\let\expandafter\reserved@a\csname @ps@#2@layers\endcsname \expandafter\global\expandafter\let\csname @ps@#2@layers\endcsname\@empty \def\@elt##1{% - \ifstr{#1}{##1}{}{% + \Ifstr{#1}{##1}{}{% \expandafter\@cons\csname @ps@#2@layers\endcsname{{##1}}% }% }\reserved@a @@ -1742,12 +1755,12 @@ \csname @ps@\reserved@b @layers\endcsname \@namedef{@ps@\reserved@b @layers}{}% \def\@elt##1{% - \ifstr{##1}\@empty{}{% + \Ifstr{##1}\@empty{}{% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname{{##1}}% - \ifstr{##1}{#3}{% + \Ifstr{##1}{#3}{% \@for \reserved@a:=#2\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname {{\reserved@a}}% }% @@ -1769,11 +1782,11 @@ \csname @ps@\reserved@b @layers\endcsname \@namedef{@ps@\reserved@b @layers}{}% \def\@elt##1{% - \ifstr{##1}\@empty{}{% - \ifstr{##1}{#3}{% + \Ifstr{##1}\@empty{}{% + \Ifstr{##1}{#3}{% \@for \reserved@a:=#2\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname {{\reserved@a}}% }% @@ -1796,7 +1809,7 @@ \@namedef{@ps@\reserved@b @layers}{}% \begingroup \def\@elt##1{% - \ifstr{##1}\@empty{}{% + \Ifstr{##1}\@empty{}{% \remove@layer@from@page@style{##1}{\reserved@b}% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname{{##1}}% }% @@ -1830,11 +1843,21 @@ \@namedef{@ps@#1@twosidehook}{}% \@namedef{@ps@#1@floatpagehook}{}% \@namedef{@ps@#1@nonfloatpagehook}{}% + \let\scr@opt@marker@initialhook\@empty + \let\scr@opt@marker@hook\@empty + \let\scr@opt@marker@backgroundhook\@empty + \let\scr@opt@marker@foregroundhook\@empty + \let\scr@opt@marker@oddpagehook\@empty + \let\scr@opt@marker@evenpagehook\@empty + \let\scr@opt@marker@onesidehook\@empty + \let\scr@opt@marker@twosidehook\@empty + \let\scr@opt@marker@floatpagehook\@empty + \let\scr@opt@marker@nonfloatpagehook\@empty \FamilyExecuteOptions[.definelayerpagestyle]{KOMAarg}{#2}% \def\reserved@a{\endgroup}% \def\@sls@##1{% - \expandafter\let\expandafter\reserved@b\csname @ps@#1@##1hook\endcsname - \ifx\reserved@b\@empty\else + \expandafter\ifx \csname scr@opt@marker@##1hook\endcsname\@empty\else + \expandafter\let\expandafter\reserved@b\csname @ps@#1@##1hook\endcsname \l@addto@macro\reserved@a{\@namedef{@ps@#1@##1hook}}% \expandafter\l@addto@macro\expandafter\reserved@a\expandafter{% \expandafter{% @@ -1870,7 +1893,7 @@ } \AfterPackage*{tagpdf}{% \providecommand*{\scrlayer@beginartifact}[1]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \tagmcbegin{artifact}% }{% \tagmcbegin{artifact=#1}% @@ -1992,13 +2015,13 @@ \begingroup \edef\reserved@a{\GetRealPageStyle{#1}}% \@tempswafalse - \ifstr{#2}{}{% + \Ifstr{#2}{}{% \expandafter\ifx\csname @ps@\reserved@a @layers\endcsname\@empty \@tempswatrue \fi }{% \expandafter\ForEachLayerOfPageStyle\expandafter{% - \reserved@a}{\ifstr{##1}{#2}{\aftergroup\@tempswatrue}{}}% + \reserved@a}{\Ifstr{##1}{#2}{\aftergroup\@tempswatrue}{}}% }% \if@tempswa \aftergroup\@firstoftwo \else \aftergroup\@secondoftwo \fi \expandafter\endgroup @@ -2027,7 +2050,7 @@ \IfLayerPageStyleExists{#1}{% \begingroup \@tempswatrue - \ifstr{#2}{}{% + \Ifstr{#2}{}{% \edef\reserved@a{\GetRealPageStyle{#1}}% \expandafter\ifx\csname @scr@\reserved@a @layers\endcsname\@empty \else \@tempswafalse @@ -2060,13 +2083,13 @@ \expandafter\let\csname @ps@#1@nonfloatpagehook\endcsname\relax \expandafter\let\csname @ps@#1@layers\endcsname\relax \expandafter\let\csname ps@#1\endcsname\relax - \ifstr{\currentpagestyle}{#1}{% + \Ifstr{\currentpagestyle}{#1}{% \def\currentpagestyle{scrlayer@empty}% \let\@oddhead\@empty\let\@evenhead\@empty \let\@oddfoot\@empty\let\@evenfoot\@empty }{}% \if@specialpage - \ifstr{\@specialstyle}{#1}{% + \Ifstr{\@specialstyle}{#1}{% \global\let\@specialstyle\relax \global\@specialpagefalse }{}% @@ -2105,7 +2128,7 @@ \let\scrlayer@exec@after@pagestyle@hook\@gobble \def\ps@test{}% \pagestyle{test}% - \ifstr{\currentpagestyle}{test}{}{% + \Ifstr{\currentpagestyle}{test}{}{% \PackageError{scrlayer}{package incompatibility detected}{% Another package redefines \string\pagestyle\space incompatible with scrlayer.\MessageBreak @@ -2258,7 +2281,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% 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: final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} |