summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx44
1 files changed, 32 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx
index 3cbcdb47e33..68823a2e0be 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-typearea.dtx
@@ -1,8 +1,8 @@
-%\CheckSum{2811}
+%\CheckSum{2864}
% \iffalse meta-comment
% ======================================================================
% scrkernel-typearea.dtx
-% Copyright (c) Markus Kohm, 2002-2017
+% Copyright (c) Markus Kohm, 2002-2018
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrkernel-typearea.dtx
-% Copyright (c) Markus Kohm, 2002-2017
+% Copyright (c) Markus Kohm, 2002-2018
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
% Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
% Right brace \} Tilde \~}
%
% \iffalse meta-comment
-%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z 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-07-24 21:45:16 +0200 (Mon, 24 Jul 2017) $
+ \filedate$Date: 2018-03-15 14:32:29 +0100 (Thu, 15 Mar 2018) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 1872 $
+ \filerevision$Revision: 2959 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-typearea.dtx}[%
@@ -1468,13 +1468,27 @@
% We also need a macro to get one of the values stored at \cs{ta@divlist}
% depending on the font size given by the real number argument. The real
% number will be rounded to the nearest integer.
-% \changes{v2.4g}{1996/11/04}{usage of the default value list}
-% \changes{v2.6}{2000/01/04}{usage of the extended list}^^A
-% \changes{v2.8q}{2002/03/28}{respect option \Option{mpinclude}}^^A
-% \changes{v2.96}{2006/08/11}{font size does not need to be an integer}^^A
+% \changes{v2.4g}{1996/11/04}{usage of the default value list}
+% \changes{v2.6}{2000/01/04}{usage of the extended list}^^A
+% \changes{v2.8q}{2002/03/28}{respect option \Option{mpinclude}}^^A
+% \changes{v2.96}{2006/08/11}{font size does not need to be an integer}^^A
+% \changes{v3.25}{2018/03/05}{paper size test added}^^A
% \begin{macrocode}
%<*package&typearea&body>
\newcommand*{\ta@divfor}[1]{%
+ \ta@div=\z@
+ \expandafter\ifnum\scr@ta@v@is@ge{3.25}\relax
+ \ifnum \z@=\ifdim \paperwidth<207mm \z@\else\ifdim \paperwidth>213mm \z@
+ \else\ifdim \paperheight<294mm \z@\else
+ \ifdim \paperheight>300mm \z@\else \@ne\fi\fi\fi\fi
+ \PackageInfoNoLine{typearea}{%
+ With paper sizes other than (almost) `A4' predefined\MessageBreak
+ DIV values do not exist. Using DIV calculation for good\MessageBreak
+ line width (unless using `version=3.24` or prior)%
+ }%
+ \ta@div=\tw@
+ \fi
+ \fi
\if@mincl
\PackageInfo{typearea}{%
With option `mpinclude' there are no predefined\MessageBreak
@@ -1482,7 +1496,8 @@
width%
}%
\ta@div=\tw@
- \else
+ \fi
+ \ifnum \ta@div=\z@
\xdef\@tempa{\ta@divlist{}}%
\@tempdima=#1pt
\addtolength{\@tempdima}{.5\p@}%
@@ -1508,7 +1523,12 @@
\PackageWarningNoLine{typearea}{%
DIV for \the\@tempdima\space and used papersize\MessageBreak
not defined!\MessageBreak
- Using DIV=\ta@divlistelse
+ Using DIV=\ifnum\number\ta@divlistelse>\m@ne
+ \ifcase \ta@divlistelse default%
+ \or calc%
+ \or calc%
+ \or classic%
+ \else\ta@divlistelse\fi\else\ta@divlistelse\fi
}%
\ta@div=\ta@divlistelse\relax
\else