summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx84
1 files changed, 58 insertions, 26 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx
index 1a9d8feaf3f..3eecfcf5481 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{2569}
+% \CheckSum{2591}
% \iffalse^^A meta-comment
% ======================================================================
% scrlayer-scrpage.dtx
@@ -57,7 +57,7 @@
% Right brace \} Tilde \~}
%
% \iffalse^^A meta-comment
-%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 2929 2018-02-05 06:37:22Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -66,9 +66,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2017-05-23 07:42:22 +0200 (Tue, 23 May 2017) $
+ \filedate$Date: 2018-02-05 07:37:22 +0100 (Mon, 05 Feb 2018) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 2647 $
+ \filerevision$Revision: 2929 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlayer-scrpage.dtx}%
@@ -1637,8 +1637,12 @@
\string#1 to low.\MessageBreak
At least \the\dimexpr \ht\z@+\dp\z@\relax\space needed,\MessageBreak
but only \the#1 found.\MessageBreak
- I'll enlarge \string#1, for further\MessageBreak
- processing, but you should do this yourself,\MessageBreak
+ \ifsls@autoenlarge
+ I'll enlarge \string#1, for further\MessageBreak
+ processing, but you should do this yourself,\MessageBreak
+ \else
+ You should enlarge \string#1,\MessageBreak
+ \fi
e.g.,
\scr@ifundefinedorrelax{geometry}{%
\scr@ifundefinedorrelax{typearea}{%
@@ -1661,19 +1665,23 @@
in your preamble%
\fi
}%
- .\MessageBreak
- I'll also
- \ifx #1\headheight decrease \string\topmargin
- \else increase \string\footskip\fi
+ \ifsls@autoenlarge
+ .\MessageBreak
+ I'll also
+ \ifx #1\headheight decrease \string\topmargin
+ \else increase \string\footskip\fi
+ \fi
}%
- \@tempdima\dimexpr \ht\z@+\dp\z@\relax
- \ifx #1\headheight
- \global\advance\topmargin by \dimexpr #1-(\ht\z@+\dp\z@)\relax
- \dp\z@\dimexpr \dp\z@+\ht\z@+\dp\z@-\headheight\relax
- \else
- \global\advance\footskip by \dimexpr \ht\z@+\dp\z@-#1\relax
+ \ifsls@autoenlarge
+ \@tempdima\dimexpr \ht\z@+\dp\z@\relax
+ \ifx #1\headheight
+ \global\advance\topmargin by \dimexpr #1-(\ht\z@+\dp\z@)\relax
+ \dp\z@\dimexpr \dp\z@+\ht\z@+\dp\z@-\headheight\relax
+ \else
+ \global\advance\footskip by \dimexpr \ht\z@+\dp\z@-#1\relax
+ \fi
+ \global#1\@tempdima
\fi
- \global#1\@tempdima
\fi
\usebox\z@
\endgroup
@@ -1683,17 +1691,33 @@
% \end{macrocode}
% \begin{option}{hmode}
% Switch automatically to the horizontal mode before setting a page head or
-% page footer element
+% page footer element.
% \begin{macrocode}
%<*options>
\KOMA@ifkey{hmode}{sls@leavevmode}
-\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode}%
-\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}%
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}
\scrlayer@AddCsToInterface{sls@leavevmode@linetrue}
\scrlayer@AddCsToInterface{sls@leavevmode@linefalse}
%</options>
% \end{macrocode}
-% \end{option}
+% \end{option}^^A hmode
+% \begin{option}{autoenlargeheadfoot}
+% \changes{v3.25}{2018/01/14}{new option}^^A
+% Automaticly enlarge vertical size of head or foot if the contents is to
+% large. This is the default.
+% \begin{macrocode}
+%<*options>
+\KOMA@ifkey{autoenlargeheadfoot}{sls@autoenlarge}
+\KOMAExecuteOptions{autoenlargeheadfoot=true}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot@default}
+\scrlayer@AddCsToInterface{sls@autoenlargetrue}
+\scrlayer@AddCsToInterface{sls@autoenlargefalse}
+%</options>
+% \end{macrocode}
+% \end{option}^^A autoenlargeheadfoot
% \end{macro}^^A \sls@secure@box
% \end{macro}^^A \sls@@@deffoot
% \end{macro}^^A \sls@@deffoot
@@ -1705,19 +1729,27 @@
% The low level page head font command. It is deprecated to redefine or use
% this and it may already be defined.
% \begin{macro}{\scr@fnt@pagehead}
+% \changes{v3.25}{2018/02/05}{don't use \cs{newkomafont} to avoid
+% warning}^^A
% \begin{macro}{\scr@fnt@wrn@pagehead}
-% \changes{v0.9}{2014/01/13}{warning always deactivated}
+% \changes{v0.9}{2014/01/13}{warning always deactivated}^^A
% \begin{macro}{\scr@fnt@pageheadfoot}
% \begin{macrocode}
%<*body>
\@ifundefined{scr@fnt@pagehead}{%
+ \scr@ifundefinedorrelax{scr@fnt@instead@pagehead}{}{%
+ \PackageInfo{scrlayer-scrpage}{%
+ Makeing stand-alone element `pagehead' from\MessageBreak
+ alias to `pageheadfoot'%
+ }%
+ \let\scr@fnt@instead@pagehead\relax
+ }%
\scrlayer@AddCsToInterface{scr@fnt@pagehead}%
\@ifundefined{@pageheadfont}{%
- \newkomafont{pagehead}{}%
+ \newcommand*{\@pageheadfont}{}%
\scrlayer@AddCsToInterface{@pageheadfont}%
- }{%
- \newcommand*{\scr@fnt@pagehead}{\@pageheadfont}%
- }%
+ }{}%
+ \newcommand*{\scr@fnt@pagehead}{\@pageheadfont}%
}{}
\@ifundefined{scr@fnt@pageheadfoot}{%
\newcommand*{\scr@fnt@pageheadfoot}{\headfont}%