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.sty67
1 files changed, 60 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index f34763b02a0..34ba0cffb1b 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 1895 2014-12-28 14:13:29Z kohm $ (identify)
+%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2015/01/14 v3.15 KOMA-Script
+ 2015/02/07 v3.16 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z 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 1895 2014-12-28 14:13:29Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -225,8 +225,14 @@
\KOMA@ifkey{draft}{scrlayer@draft}
\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
-%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (body)
\KOMAProcessOptions\relax
+\newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty}
+\newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty}
+\newcommand*{\righttopmark}{\expandafter\@rightmark\topmark\@empty\@empty}
+\newcommand*{\leftfirstmark}{\expandafter\@leftmark\firstmark\@empty\@empty}
+\newcommand*{\leftbotmark}{\expandafter\@leftmark\botmark\@empty\@empty}
+\newcommand*{\lefttopmark}{\expandafter\@leftmark\topmark\@empty\@empty}
\@ifundefined{headmark}{}{%
\PackageWarningNoLine{scrlayer}{%
\string\headmark\space detected!\MessageBreak
@@ -612,6 +618,42 @@
\csname @scr@l@\scr@current@layer @twosidetrue\endcsname
\csname @scr@l@\scr@current@layer @onesidefalse\endcsname
}
+\DefineFamilyKey[.definelayer]{KOMAarg}{addhoffset}{%
+ \expandafter\edef\csname scr@l@\scr@current@layer @x\endcsname{%
+ \noexpand\dimexpr \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@l@\scr@current@layer @x\endcsname + (#1)\relax}}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{addvoffset}{%
+ \expandafter\edef\csname scr@l@\scr@current@layer @y\endcsname{%
+ \noexpand\dimexpr \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@l@\scr@current@layer @y\endcsname + (#1)\relax}}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{addwidth}{%
+ \expandafter\edef\csname scr@l@\scr@current@layer @w\endcsname{%
+ \noexpand\dimexpr \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@l@\scr@current@layer @w\endcsname + (#1)\relax}}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{addheight}{%
+ \expandafter\edef\csname scr@l@\scr@current@layer @h\endcsname{%
+ \noexpand\dimexpr \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@l@\scr@current@layer @h\endcsname + (#1)\relax}}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{addcontents}{%
+ \expandafter\edef\csname scr@l@\scr@current@layer @contents\endcsname{%
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@l@\scr@current@layer @contents\endcsname #1}}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{pretocontents}{%
+ \expandafter\edef\csname scr@l@\scr@current@layer @contents\endcsname{%
+ \unexpanded{#1}\unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@l@\scr@current@layer @contents\endcsname}}%
+ \FamilyKeyStateProcessed
+}
\DefineFamilyKey[.definelayer]{KOMAarg}{page}[\relax]{%
\FamilyKeyStateProcessed
\scrlayer@testunexpectedarg{page}{#1}%
@@ -878,6 +920,12 @@
\DeclareLayer[{#1}]{#2}%
}%
}
+\newcommand*{\GetLayerContents}[1]{%
+ \IfLayerExists{#1}{\@nameuse{scr@l@#1@contents}}{%
+ \PackageError{scrlayer}{unknown layer `#1'}{%
+ You can ask only for the contents of an existing layer.}%
+ }%
+}
\newcommand*{\DestroyLayer}[1]{%
\IfLayerExists{#1}{%
\expandafter\let\csname scr@l@#1@x\endcsname\relax
@@ -1753,7 +1801,10 @@
}
\newcommand*{\currentpagestyle}{}
\PackageInfo{scrlayer}{patching LaTeX kernel macro \string\pagestyle}
-\def\reserved@a{\scrlayer@exec@before@pagestyle@hook{##1}}
+\def\reserved@a{%
+ \iftoplevelpagestyle\edef\toplevelpagestyle{##1}\toplevelpagestylefalse\fi
+ \scrlayer@exec@before@pagestyle@hook{##1}%
+}
\expandafter\expandafter\expandafter\renewcommand
\expandafter\expandafter\expandafter*%
\expandafter\expandafter\expandafter\pagestyle
@@ -1765,7 +1816,9 @@
\pagestyle{#1}%
\edef\currentpagestyle{\GetRealPageStyle{#1}}%
\scrlayer@exec@after@pagestyle@hook{#1}%
+ \toplevelpagestyletrue
}
+\newif\iftoplevelpagestyle\toplevelpagestyletrue
\AtBeginDocument{%
\begingroup
\let\scrlayer@exec@before@pagestyle@hook\@gobble
@@ -1925,7 +1978,7 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (final)
+%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (final)
\DeclareNewPageStyleByLayers{@everystyle@}{}
\RedeclarePageStyleByLayers{empty}{}
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $