summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlayer.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty111
1 files changed, 99 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index b08aa076da7..9cfcb3e9abd 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 1962 2015-02-26 08:34:33Z kohm $ (identify)
+%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2015/05/06 v3.17a KOMA-Script
+ 2015/07/02 v3.18 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z 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 1962 2015-02-26 08:34:33Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -265,7 +265,7 @@
\KOMA@ifkey{draft}{scrlayer@draft}
\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
-%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body)
\KOMAProcessOptions\relax
\newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty}
\newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty}
@@ -622,6 +622,12 @@
\csname @scr@l@\scr@current@layer @backgroundfalse\endcsname
\csname @scr@l@\scr@current@layer @foregroundtrue\endcsname
}
+\DefineFamilyKey[.definelayer]{KOMAarg}{backandforeground}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{backandforeground}{#1}%
+ \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname
+ \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname
+}
\DefineFamilyKey[.definelayer]{KOMAarg}{oddpage}[\relax]{%
\FamilyKeyStateProcessed
\scrlayer@testunexpectedarg{oddpage}{#1}%
@@ -634,6 +640,27 @@
\csname @scr@l@\scr@current@layer @oddfalse\endcsname
\csname @scr@l@\scr@current@layer @eventrue\endcsname
}
+\DefineFamilyKey[.definelayer]{KOMAarg}{oddorevenpage}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{oddorevenpage}{#1}%
+ \csname @scr@l@\scr@current@layer @oddtrue\endcsname
+ \csname @scr@l@\scr@current@layer @eventrue\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{evenoroddpage}[\relax]{%
+ \PackageWarning{scrlayer}{Option `evenoroddpage' unknown.\MessageBreak
+ Using `oddorevenpage' instead}%
+ \ExecuteFamilyOptions[.definelayer]{KOMAarg}{oddorevenpage=#1}
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{oddandevenpages}[\relax]{%
+ \PackageWarning{scrlayer}{Option `oddandevenpages' unknown.\MessageBreak
+ Using `oddorevenpage' instead}%
+ \ExecuteFamilyOptions[.definelayer]{KOMAarg}{oddorevenpage=#1}
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{evenandoddpages}[\relax]{%
+ \PackageWarning{scrlayer}{Option `evenandoddpages' unknown.\MessageBreak
+ Using `oddorevenpage' instead}%
+ \ExecuteFamilyOptions[.definelayer]{KOMAarg}{oddorevenpage=#1}
+}
\DefineFamilyKey[.definelayer]{KOMAarg}{floatpage}[\relax]{%
\FamilyKeyStateProcessed
\scrlayer@testunexpectedarg{floatpage}{#1}%
@@ -642,10 +669,41 @@
}
\DefineFamilyKey[.definelayer]{KOMAarg}{nonfloatpage}[\relax]{%
\FamilyKeyStateProcessed
- \scrlayer@testunexpectedarg{twoside}{#1}%
+ \scrlayer@testunexpectedarg{nonfloatpage}{#1}%
\csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname
\csname @scr@l@\scr@current@layer @floatpagefalse\endcsname
}
+\DefineFamilyKey[.definelayer]{KOMAarg}{floatornonfloatpage}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{floatornonfloatpage}{#1}%
+ \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname
+ \csname @scr@l@\scr@current@layer @floatpagetrue\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{nonfloatorfloatpage}[\relax]{%
+ \PackageWarning{scrlayer}{Option `nonfloatorfloatpage' unknown.\MessageBreak
+ Using `floatornonfloatpage' instead}%
+ \FamilyExecuteOptions[.definelayer]{KOMAarg}{floatornonfloatpage=#1}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{floatandnonfloatpages}[\relax]{%
+ \PackageWarning{scrlayer}{Option `floatandnonfloatpages' unknown.\MessageBreak
+ Using `floatornonfloatpage' instead}%
+ \FamilyExecuteOptions[.definelayer]{KOMAarg}{floatornonfloatpage=#1}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{nonfloatandfloatpages}[\relax]{%
+ \PackageWarning{scrlayer}{Option `nonfloatandfloatpages' unknown.\MessageBreak
+ Using `floatornonfloatpage' instead}%
+ \FamilyExecuteOptions[.definelayer]{KOMAarg}{floatornonfloatpage=#1}%
+}
+\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
+ \csname @scr@l@\scr@current@layer @floatpagetrue\endcsname
+}
\DefineFamilyKey[.definelayer]{KOMAarg}{oneside}[\relax]{%
\FamilyKeyStateProcessed
\scrlayer@testunexpectedarg{oneside}{#1}%
@@ -658,6 +716,22 @@
\csname @scr@l@\scr@current@layer @twosidetrue\endcsname
\csname @scr@l@\scr@current@layer @onesidefalse\endcsname
}
+\DefineFamilyKey[.definelayer]{KOMAarg}{everyside}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{everyside}{#1}%
+ \csname @scr@l@\scr@current@layer @twosidetrue\endcsname
+ \csname @scr@l@\scr@current@layer @onesidetrue\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{unrestricted}[\relax]{%
+ \FamilyKeyStateProcessed
+ \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 @floatpagetrue\endcsname
+ \csname @scr@l@\scr@current@layer @twosidetrue\endcsname
+ \csname @scr@l@\scr@current@layer @onesidetrue\endcsname
+}
\DefineFamilyKey[.definelayer]{KOMAarg}{addhoffset}{%
\expandafter\edef\csname scr@l@\scr@current@layer @x\endcsname{%
\noexpand\dimexpr \unexpanded\expandafter\expandafter\expandafter{%
@@ -1173,9 +1247,8 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@backgroundhook}%
\@nameuse{@ps@#1@backgroundhook}%
- \parbox[t][\headheight][t]{\textwidth}{%
+ \parbox[b][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
- -\headheight
-\ht\strutbox\relax
\hskip \dimexpr -\oddsidemargin-1in\relax
\strut\makebox[\z@][l]{%
@@ -1204,9 +1277,8 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@backgroundhook}%
\@nameuse{@ps@#1@backgroundhook}%
- \parbox[t][\headheight][t]{\textwidth}{%
+ \parbox[b][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
- -\headheight
-\ht\strutbox\relax
\hskip \dimexpr-\evensidemargin-1in\relax
\strut\makebox[\z@][l]{%
@@ -1298,13 +1370,28 @@
}%
}%
}
-\newcommand*{\ForEachLayerOfPageStyle}[2]{%
+\newcommand*{\ForEachLayerOfPageStyle}{%
+ \@ifstar {\@s@ForEachLayerOfPageStyle}{\@ForEachLayerOfPageStyle}%
+}
+\newcommand*{\@ForEachLayerOfPageStyle}[2]{%
\begingroup
\edef\reserved@a{\GetRealPageStyle{#1}}%
\def\@elt##1{\ifscrlayer@deactivate@layers\else #2\fi}%
\@nameuse{@ps@\reserved@a @layers}%
\endgroup
}
+\newcommand*{\@s@ForEachLayerOfPageStyle}[2]{%
+ \begingroup
+ \edef\reserved@a{\GetRealPageStyle{#1}}%
+ \def\reserved@b{\endgroup}%
+ \def\@elt##1{%
+ \l@addto@macro\reserved@b{%
+ \ifscrlayer@deactivate@layers\else #2\fi
+ }%
+ }%
+ \@nameuse{@ps@\reserved@a @layers}%
+ \reserved@b
+}
\newcommand*{\scrlayer@do@page@style@element@layer}[3]{%
\begingroup
\expandafter\ifx\csname if@scr@l@#3@\if@fcolmade\else non\fi floatpage%
@@ -2018,7 +2105,7 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (final)
+%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (final)
\DeclareNewPageStyleByLayers{@everystyle@}{}
\RedeclarePageStyleByLayers{empty}{}
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $