koma-script (2apr18)

git-svn-id: svn://tug.org/texlive/trunk@47249 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 48 insertions, 27 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
index b8d1ac3b452..9eff8fe3b32 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
@@ -45,14 +45,14 @@
 %% find a complete unmodified copy of LaTeX2e at
 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
 %% 
-%%% 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 $
 %%%            (run: identify)
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{scrlayer-scrpage}[%
-  2017/09/07 v3.24 KOMA-Script
+  2018/03/30 v3.25 KOMA-Script
   package
   (end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
 %%%            (run: init)
 \RequirePackage{scrlayer}
 \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
@@ -64,7 +64,7 @@
 }
 \let\scrlayer@AtEndOfPackage\AtEndOfPackage
 \scrlayerInitInterface
-%%% 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 $
 %%%            (run: init)
 \AtEndOfPackage{%
   \sls@auto@pagestyleset%
@@ -81,7 +81,7 @@
     {pagestyleset=KOMA-Script}%
   }%
 }
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
 %%%            (run: options)
 \KOMA@key{markcase}{%
 \scrlayer@AtEndOfPackage{%
@@ -226,7 +226,7 @@
   \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
                        {scrlayer@autoremoveinterfaces}%
 }
-%%% 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 $
 %%%            (run: options)
 \KOMA@key{headwidth}{%
   \begingroup
@@ -708,11 +708,18 @@
   markcase=ignoreuppercase%
 }
 \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}
-%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+\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}
+%%% From File: $Id: scrlayer.dtx 2684 2017-10-13 13:35:13Z kohm $
 %%%            (run: body)
 \KOMAProcessOptions\relax
 \expandafter\let
@@ -784,7 +791,7 @@
 \expandafter\let
   \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
   \relax
-%%% 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 $
 %%%            (run: body)
 \scrlayerAddToInterface\setheadwidth{%
   \newcommand*{\setheadwidth}[2][]{%
@@ -1167,8 +1174,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}{%
@@ -1191,32 +1202,42 @@
               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
   }%
 }
 \@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}%