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.sty49
1 files changed, 26 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index 3867be8f5d3..f34763b02a0 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 1810 2014-10-20 07:35:25Z kohm $ (identify)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2014/10/28 v3.14 KOMA-Script
+ 2015/01/14 v3.15 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z 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 1810 2014-10-20 07:35:25Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -225,7 +225,7 @@
\KOMA@ifkey{draft}{scrlayer@draft}
\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (body)
\KOMAProcessOptions\relax
\@ifundefined{headmark}{}{%
\PackageWarningNoLine{scrlayer}{%
@@ -377,7 +377,7 @@
\if@tempswa
\@mkright{%
\MakeMarkcase{%
- \ifnum \c@secnumdepth<\numexpr \csname #1level\endcsname +0\relax
+ \ifnum \c@secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
\else\if@mainmatter \csname #1markformat\endcsname\fi\fi
##1%
}%
@@ -396,7 +396,7 @@
\fi
{%
\MakeMarkcase{%
- \ifnum \c@secnumdepth<\numexpr \csname #1level\endcsname +0\relax
+ \ifnum \c@secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
\else\if@mainmatter \csname #1markformat\endcsname\fi\fi
##1%
}%
@@ -407,17 +407,17 @@
\newcommand*{\automark@both}[2]{%
\ifscrlayer@level@prepared{#1}{%
\ifscrlayer@level@prepared{#2}{%
- \ifnum \numexpr \csname #1level\endcsname +0\relax
- > \numexpr \csname #2level\endcsname +0\relax
+ \ifnum \numexpr \csname #1numdepth\endcsname +0\relax
+ > \numexpr \csname #2numdepth\endcsname +0\relax
\automark@leftlow{#2}%
\automark@righthigh{#1}%
- \else \ifnum \numexpr \csname #1level\endcsname +0\relax
- = \numexpr \csname #2level\endcsname +0\relax
+ \else \ifnum \numexpr \csname #1numdepth\endcsname +0\relax
+ = \numexpr \csname #2numdepth\endcsname +0\relax
\expandafter\def\csname #2mark\endcsname##1{%
\@mkdouble{%
\MakeMarkcase{%
\ifnum \c@secnumdepth<\numexpr
- \csname #2level\endcsname +0\relax
+ \csname #2numdepth\endcsname +0\relax
\else
\if@mainmatter \csname #2markformat\endcsname\fi
\fi
@@ -436,7 +436,7 @@
\@mkleft{%
\MakeMarkcase{%
\ifnum \c@secnumdepth
- < \numexpr\csname #1level\endcsname +0\relax
+ < \numexpr\csname #1numdepth\endcsname +0\relax
\else
\if@mainmatter \csname #1markformat\endcsname\fi
\fi
@@ -449,7 +449,7 @@
\@mkboth{}{%
\MakeMarkcase{%
\ifnum \c@secnumdepth
- < \numexpr \csname #2level\endcsname +0\relax
+ < \numexpr \csname #2numdepth\endcsname +0\relax
\else\if@mainmatter \csname #2markformat\endcsname\fi\fi
##1%
}%
@@ -462,7 +462,7 @@
}
\newcommand*{\ifscrlayer@level@prepared}[1]{%
\typeout{1: \detokenize{#1}}%
- \scr@ifundefinedorrelax{#1level}{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
\PackageError{scrlayer}{numbering depth of `#1' unknown}{%
Someone told me to use a section mark for level `#1',\MessageBreak
but the numbering depth hasn't been declared before. You may solve this
@@ -475,7 +475,7 @@
}%
}
\newcommand*{\DeclareSectionNumberDepth}[2]{%
- \expandafter\edef\csname #1level\endcsname{\the\numexpr #2\relax}%
+ \expandafter\edef\csname #1numdepth\endcsname{\the\numexpr #2\relax}%
\@ifundefined{#1mark}{%
\expandafter\let\csname #1mark\endcsname\@gobble
}{}%
@@ -512,10 +512,13 @@
\scr@ifundefinedorrelax{\reserved@a}{%
\@tempswafalse
}{%
- \@ifundefined{\reserved@a level}{%
+ \@ifundefined{\reserved@a numdepth}{%
\expandafter\DeclareSectionNumberDepth
\expandafter{\reserved@a}{\@tempcnta}%
- }{}%
+ }{%
+ \expandafter\DeclareSectionNumberDepth
+ \expandafter{\reserved@a}{\csname \reserved@a numdepth\endcsname}%
+ }%
\advance \@tempcnta by \@ne
\edef\reserved@a{sub\reserved@a}%
}%
@@ -1082,7 +1085,7 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@backgroundhook}%
\@nameuse{@ps@#1@backgroundhook}%
- \parbox[t][\headheight][t]{\linewidth}{%
+ \parbox[t][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
-\headheight
-\ht\strutbox\relax
@@ -1113,7 +1116,7 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@backgroundhook}%
\@nameuse{@ps@#1@backgroundhook}%
- \parbox[t][\headheight][t]{\linewidth}{%
+ \parbox[t][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
-\headheight
-\ht\strutbox\relax
@@ -1144,7 +1147,7 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@foregroundhook}%
\@nameuse{@ps@#1@foregroundhook}%
- \parbox[t][\headheight][t]{\linewidth}{%
+ \parbox[t][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
-\headheight
-\headsep
@@ -1178,7 +1181,7 @@
\@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
\@nameuse{@ps@@everystyle@@foregroundhook}%
\@nameuse{@ps@#1@foregroundhook}%
- \parbox[t][\headheight][t]{\linewidth}{%
+ \parbox[t][\headheight][t]{\textwidth}{%
\vskip \dimexpr -\topmargin-1in
-\headheight
-\headsep
@@ -1922,7 +1925,7 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (final)
+%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (final)
\DeclareNewPageStyleByLayers{@everystyle@}{}
\RedeclarePageStyleByLayers{empty}{}
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 01:17:28 +0000