diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty | 100 |
1 files changed, 72 insertions, 28 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 a8fc3f2fae7..b8d1ac3b452 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -13,7 +13,7 @@ %% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 2012-2016 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2012-2017 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -43,15 +43,17 @@ %% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e %% standard classes created by The LaTeX3 Project 1994-1996. You may %% find a complete unmodified copy of LaTeX2e at -%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. +%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify) +%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $ +%%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2017/04/13 v3.23 KOMA-Script + 2017/09/07 v3.24 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $ +%%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -62,7 +64,8 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (init) +%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $ +%%% (run: init) \AtEndOfPackage{% \sls@auto@pagestyleset% } @@ -78,7 +81,8 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $ +%%% (run: options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% \begingroup @@ -203,6 +207,7 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}% } +\KOMA@ifkey{singlespacing}{@ps@singlespacing} \KOMA@key{deactivatepagestylelayers}[true]{% \KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}% \KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers} @@ -221,7 +226,8 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (options) +%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $ +%%% (run: options) \KOMA@key{headwidth}{% \begingroup \sls@split@at@iicolons#1:::\@nil @@ -706,7 +712,8 @@ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}% \scrlayer@AddCsToInterface{sls@leavevmode@linetrue} \scrlayer@AddCsToInterface{sls@leavevmode@linefalse} -%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $ +%%% (run: body) \KOMAProcessOptions\relax \expandafter\let \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax @@ -777,7 +784,8 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (body) +%%% From File: $Id: scrlayer-scrpage.dtx 2647 2017-05-23 05:42:22Z kohm $ +%%% (run: body) \scrlayerAddToInterface\setheadwidth{% \newcommand*{\setheadwidth}[2][]{% \KOMAoptions{headwidth=#2:#1}% @@ -901,26 +909,62 @@ \scrlayer@AddCsToInterface{scr@fnt@footbotline}% }{} \AtBeginDocument{% - \ifdim \headheight <\baselineskip + \ifdim \headheight + <\if@ps@singlespacing\f@baselineskip\else\baselineskip\fi\relax \PackageWarningNoLine{scrlayer-scrpage}{Very small head height detected!\MessageBreak Using scrlayer-scrpage the head height\MessageBreak should be at least \string\baselineskip, which is\MessageBreak - \the\baselineskip\space currently.\MessageBreak + \if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi\space + currently.\MessageBreak But head height is currently \the\headheight\space only.\MessageBreak You may use\MessageBreak \@ifpackageloaded{geometry}{% - geometry option `head=\the\baselineskip'% + geometry option + `head=\if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi'% }{% \@ifpackageloaded{typearea}{% - typearea option `headheight=\the\baselineskip'% + typearea option `headheight=% + \if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi'% }{% - \string\setlength{\string\headheight}{\the\baselineskip}% + \string\setlength{\string\headheight}% + {\if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi}% }% }\MessageBreak + \if@ps@singlespacing\else\ifdim \headheight<\f@baselineskip\else + or load package `scrlayer-scrpage' with\MessageBreak + option `singlespacing=true'\MessageBreak + \fi\fi to avoid this warning% }% + \else + \ifdim \footheight + <\if@ps@singlespacing\f@baselineskip\else\baselineskip\fi\relax + \PackageWarningNoLine{scrlayer-scrpage}{Very small foot height + detected!\MessageBreak + Using scrlayer-scrpage the foot height\MessageBreak + should be at least \string\baselineskip, which is\MessageBreak + \if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi\space + currently.\MessageBreak + But foot height is currently + \the\footheight\space only.\MessageBreak + You may use\MessageBreak + \@ifpackageloaded{typearea}{% + typearea option `footheight=% + \if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi'% + }{% + \string\setlength{\string\footheight}% + {\if@ps@singlespacing\f@baselineskip\else\the\baselineskip\fi}% + }% + \MessageBreak + \if@ps@singlespacing\else\ifdim \footheight<\f@baselineskip\else + or load package `scrlayer-scrpage' with\MessageBreak + option `singlespacing=true'\MessageBreak + \fi\fi + to avoid this warning% + }% + \fi \fi } \scrlayerAddToInterface\defpagestyle{% @@ -1546,48 +1590,48 @@ \newcommand*{\sls@def@pair@page@style@member}[1]{% \defpagestyle{#1}{% {% - \makebox[0pt][l]{\parbox{\sls@headwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright \strut\@nameuse{sls@ps@#1@even@left@head}\strut}}% \parbox{\sls@headwidth}{\centering \strut\@nameuse{sls@ps@#1@even@middle@head}\strut}% - \makebox[0pt][r]{\parbox{\sls@headwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft \strut\@nameuse{sls@ps@#1@even@right@head}\strut}}% }{% - \makebox[0pt][l]{\parbox{\sls@headwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}% \parbox{\sls@headwidth}{\centering \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}% - \makebox[0pt][r]{\parbox{\sls@headwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}% }{% - \makebox[0pt][l]{\parbox{\sls@headwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}% \parbox{\sls@headwidth}{\centering \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}% - \makebox[0pt][r]{\parbox{\sls@headwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}% }% }{% {% - \makebox[0pt][l]{\parbox{\sls@footwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright \strut\@nameuse{sls@ps@#1@even@left@foot}\strut}}% \parbox{\sls@footwidth}{\centering \strut\@nameuse{sls@ps@#1@even@middle@foot}\strut}% - \makebox[0pt][r]{\parbox{\sls@footwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft \strut\@nameuse{sls@ps@#1@even@right@foot}\strut}}% }{% - \makebox[0pt][l]{\parbox{\sls@footwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}% \parbox{\sls@footwidth}{\centering \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}% - \makebox[0pt][r]{\parbox{\sls@footwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}% }{% - \makebox[0pt][l]{\parbox{\sls@footwidth}{\raggedright + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}% \parbox{\sls@footwidth}{\centering \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}% - \makebox[0pt][r]{\parbox{\sls@footwidth}{\raggedleft + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}% }% }% @@ -1867,7 +1911,7 @@ \scrlayerAddCsToInterface{ps@plain.useheadings}{% \@namedef{ps@plain.useheadings}{\@nameuse{ps@plain.scrheadings}}% } -%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} |