From 1610548529befd1cb7d72da00a3a889261436642 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 2 Apr 2018 21:16:13 +0000 Subject: koma-script (2apr18) git-svn-id: svn://tug.org/texlive/trunk@47249 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/koma-script/typearea.sty | 50 +++++++++++++++------- 1 file changed, 35 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script/typearea.sty') diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index f4640a772bf..3a751f344e2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -48,7 +48,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,23 +70,23 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}% + \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% 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 $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2017/09/07 v3.24 KOMA-Script + 2018/03/30 v3.25 KOMA-Script package (type area)] -%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -156,12 +156,13 @@ \@namedef{scr@v@3.22}{16} \@namedef{scr@v@3.23}{16} \@namedef{scr@v@3.24}{16} -\@namedef{scr@v@last}{16} -%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $ +\@namedef{scr@v@3.25}{17} +\@namedef{scr@v@last}{17} +%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $ %%% (run: init) \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} -%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -216,7 +217,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% 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 $ %%% (run: options) \providecommand*{\PaperNameToSize}[2][warning]{% \ifstr{#2}{letter}{% @@ -966,11 +967,24 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $ %%% (run: body) -%%% 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 $ %%% (run: 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 @@ -978,7 +992,8 @@ width% }% \ta@div=\tw@ - \else + \fi + \ifnum \ta@div=\z@ \xdef\@tempa{\ta@divlist{}}% \@tempdima=#1pt \addtolength{\@tempdima}{.5\p@}% @@ -1001,7 +1016,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 @@ -1681,7 +1701,7 @@ \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end } \newcommand*{\@areaset@end}{} -%%% 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 $ %%% (run: final) \typearea[current]{current} %%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ -- cgit v1.2.3