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.dtx117
1 files changed, 81 insertions, 36 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 36dc001c395..1a9d8feaf3f 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrlayer-scrpage.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{2469}
+% \CheckSum{2569}
% \iffalse^^A meta-comment
% ======================================================================
% scrlayer-scrpage.dtx
-% Copyright (c) Markus Kohm, 2012-2016
+% Copyright (c) Markus Kohm, 2012-2017
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% Dieses Werk besteht aus den in manifest.txt aufgefuehrten Dateien.
% ----------------------------------------------------------------------
% scrlayer-scrpage.dtx
-% Copyright (c) Markus Kohm, 2012-2016
+% Copyright (c) Markus Kohm, 2012-2017
%
% Diese Datei ist Teil der LaTeX2e KOMA-Script-Sammlung.
%
@@ -57,19 +57,25 @@
% Right brace \} Tilde \~}
%
% \iffalse^^A meta-comment
-%<identify>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify)
-%<init>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (init)
-%<options>%%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (options)
-%<body>%%% 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 $
+%<identify>%%% (run: identify)
+%<init>%%% (run: init)
+%<options>%%% (run: options)
+%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $
- \def\filerevision$#1: #2 ${\gdef\filerevision{#2}}
- \filerevision$Revision: 2429 $
-\endgroup
-\ProvidesFile{scrlayer-scrpage.dtx}[\filedate\space r\filerevision\space
+ \filedate$Date: 2017-05-23 07:42:22 +0200 (Tue, 23 May 2017) $
+ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
+ \filerevision$Revision: 2647 $
+ \edef\reserved@a{%
+ \noexpand\endgroup
+ \noexpand\ProvidesFile{scrlayer-scrpage.dtx}%
+ [\filedate\space\filerevision\space
+ KOMA-Script package source
+ }%
+\reserved@a
%</dtx>
%<*identify>
%<interface>\NeedsTeXFormat{LaTeX2e}[1995/12/01]
@@ -103,8 +109,6 @@
\let\endbatchfile\relax
\fi
\endbatchfile
-%</dtx>
-%<*driver>
\documentclass{scrdoc}
\addtolength{\textwidth}{-1em}
\addtolength{\marginparwidth}{2em}
@@ -176,8 +180,6 @@
\PrintChanges
\PrintIndex
\end{document}
-%</driver>
-%<*dtx>
% \fi^^A meta-comment
%
% \selectlanguage{english}
@@ -1078,36 +1080,78 @@
% \end{macro}^^A \setheadtopline
%
% \begin{length}{\headheight}
-% Some classes set \Length{headheight} to a very, very small value. We'll
-% warn about that:
+% \changes{v3.24}{2017/05/22}{warning depends on option
+% \texttt{singlespacing}}^^A
+% Some classes set \Length{headheight} to a very, very small value. We'll
+% warn about that.
+% \begin{length}{\footheight}
+% \changes{v3.24}{2017/05/23}{also warn for low \cs{footheight}}^^A
+% If the \Length{headheight} is OK, we also test for \Length{footheight}.
% \begin{macrocode}
%<*body>
\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
}
%</body>
% \end{macrocode}
-% \end{length}
+% \end{length}^^A \footheight
+% \end{length}^^A \headheight
%
%
% \section{Style of Running Heads}
@@ -2267,6 +2311,7 @@
% \end{macro}^^A \sls@let@pair@page@style
% \end{macro}^^A \sls@init@pair@page@style
% \begin{macro}{\sls@def@pair@page@style@member}
+% \changes{v3.24}{2017/05/04}{improved \textsf{bidi} compatibility}^^A
% \begin{description}
% \item[\Parameter{string}:] name of the page style to be defined.
% \end{description}
@@ -2276,48 +2321,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}}%
}%
}%