summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrlayer.dtx')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrlayer.dtx55
1 files changed, 30 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
index b28620dc017..c08a1c3a156 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{3314}
+% \CheckSum{3321}
% \iffalse^^A meta-comment
% ======================================================================
% scrlayer.dtx
@@ -57,18 +57,18 @@
% Right brace \} Tilde \~}
%
% \iffalse^^A meta-comment
-%<identify>%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (identify)
-%<init>%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (init)
-%<options>%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (options)
-%<body>%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (body)
-%<final>%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (final)
+%<identify>%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (identify)
+%<init>%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (init)
+%<options>%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (options)
+%<body>%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (body)
+%<final>%%% From File: $Id: scrlayer.dtx 1895 2014-12-28 14:13:29Z kohm $ (final)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2014-10-20 09:35:25 +0200 (Mon, 20 Oct 2014) $
+ \filedate$Date: 2014-12-28 15:13:29 +0100 (Sun, 28 Dec 2014) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 1810 $
+ \filerevision$Revision: 1895 $
\endgroup
\ProvidesFile{scrlayer.dtx}[\filedate\space\filerevision\space
%</dtx>
@@ -744,7 +744,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%
}%
@@ -779,7 +779,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%
}%
@@ -796,16 +796,16 @@
\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
% \end{macrocode}
% Level of left mark is greater than level of right mark. e.g., section >
% chapter. This is unusual. Nevertheless we'll handle it.
% \begin{macrocode}
\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
% \end{macrocode}
% Level of left mark is equal to level of right mark. This is
% nice and very easy to handle.
@@ -814,7 +814,7 @@
\@mkdouble{%
\MakeMarkcase{%
\ifnum \c@secnumdepth<\numexpr
- \csname #2level\endcsname +0\relax
+ \csname #2numdepth\endcsname +0\relax
\else
\if@mainmatter \csname #2markformat\endcsname\fi
\fi
@@ -837,7 +837,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
@@ -850,7 +850,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%
}%
@@ -867,7 +867,7 @@
% \begin{macrocode}
\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
@@ -902,7 +902,7 @@
% \begin{macrocode}
%<*package&body>
\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
}{}%
@@ -950,10 +950,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}%
}%
@@ -2184,6 +2187,8 @@
}
% \end{macrocode}
% \begin{macro}{\scrlayer@declare@ps@by@layers}
+% \changes{v3.15}{2014/12/28}{fix: \cs{linewidth} replaced by
+% \cs{textwidth}}^^A
% Needed, because of page style aliases. Same arguments like
% \cs{DeclarePageStyleByLayers} but, \#1 is the name of the page style, \#2 is
% the list of options and \#3 is still the list of layers.
@@ -2218,7 +2223,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
@@ -2249,7 +2254,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
@@ -2280,7 +2285,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
@@ -2314,7 +2319,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