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 | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 6584f9057a9..af8f7729828 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,13 +43,13 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init) \RequirePackage{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -113,7 +113,7 @@ \setlength{\footheight}{\baselineskip} \fi } -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -173,9 +173,21 @@ \scrlayer@testunexpectedarg{automark}{#1}% \scrlayer@AtEndOfPackage{% \if@chapter - \automark[section]{chapter}% + \scr@ifundefinedorrelax{section}{% + \automark{chapter}% + }{% + \automark[section]{chapter}% + }% \else - \automark[subsection]{section}% + \scr@ifundefinedorrelax{section}{% + \automark{}% + }{% + \scr@ifundefinedorrelax{subsection}{% + \automark{section}% + }{% + \automark[subsection]{section}% + } + }% \fi }% \FamilyKeyStateProcessed @@ -265,7 +277,7 @@ \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} \newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty} @@ -703,8 +715,6 @@ \DefineFamilyKey[.definelayer]{KOMAarg}{everypage}[\relax]{% \FamilyKeyStateProcessed \scrlayer@testunexpectedarg{everypage}{#1}% - \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname - \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname \csname @scr@l@\scr@current@layer @oddtrue\endcsname \csname @scr@l@\scr@current@layer @eventrue\endcsname \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname @@ -733,7 +743,9 @@ \scrlayer@testunexpectedarg{unrestricted}{#1}% \csname @scr@l@\scr@current@layer @oddtrue\endcsname \csname @scr@l@\scr@current@layer @eventrue\endcsname - \csname @scr@l@\scr@current@layer @nonfloatpagefalse\endcsname + \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname + \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname + \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname \csname @scr@l@\scr@current@layer @floatpagetrue\endcsname \csname @scr@l@\scr@current@layer @twosidetrue\endcsname \csname @scr@l@\scr@current@layer @onesidetrue\endcsname @@ -2150,7 +2162,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (final) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ |