summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/typearea.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-29 22:32:58 +0000
committerKarl Berry <karl@freefriends.org>2017-01-29 22:32:58 +0000
commite02235dda0e68d2131b9cf111af5448fa125ad58 (patch)
tree37ea12425820b8b346764911b170eefcc0a68b44 /Master/texmf-dist/tex/latex/koma-script/typearea.sty
parent687ffbc778abf7b367ab1c6ed91c016e8138c2ad (diff)
koma-script (29jan17)
git-svn-id: svn://tug.org/texlive/trunk@43084 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/typearea.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty154
1 files changed, 104 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 1fc15a0feb4..1453f16575d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -45,7 +45,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,16 +67,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2016/06/14 v3.21 KOMA-Script
+ 2017/01/03 v3.22 KOMA-Script
package (type area)]
\typeout{%
Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J%
@@ -85,9 +85,9 @@
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Markus Kohm, 1994-^^J%
}
-%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $
\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
\newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}}
\newlength{\ta@bcor}
@@ -97,7 +97,10 @@
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
\ifstr{#1}{}{%
\ifstr{#3}{BCOR}{%
- \ifdimen{#2}{\setlength{\ta@bcor}{#2}}{\scr@pti@nerr@r}%
+ \ifdimen{#2}{%
+ \KOMA@UseDeprecatedOption{%
+ \PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}%
+ }{\scr@pti@nerr@r}%
}{\scr@pti@nerr@r}%
}{\scr@pti@nerr@r}%
}
@@ -106,7 +109,10 @@
\def\@@DIV #1DIV#2DIV#3\@@DIV{%
\edef\@tempa{#1}\ifx\@tempa\@empty
\edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
- \ifnumber{#2}{\ta@div=#2\relax}{\scr@pti@nerr@r}%
+ \ifnumber{#2}{%
+ \KOMA@UseDeprecatedOption{%
+ \PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}%
+ }{\scr@pti@nerr@r}%
\else\scr@pti@nerr@r\fi
\else\@BCOR\fi
}
@@ -173,12 +179,22 @@
}
\multiply\paperwidth by186468
\multiply\paperheight by186468
- \if@landscape
- \setlength{\@tempdima}{\paperwidth}%
- \setlength{\paperwidth}{\paperheight}%
- \setlength{\paperheight}{\@tempdima}%
+ \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
+ \scr@setpaperorientation
+ \else
+ \if@landscape\scr@switchpapersizes\fi
+ \fi
+}
+\newcommand*\scr@setpaperorientation{%
+ \ifdim\paperheight>\paperwidth
+ \if@landscape\scr@switchpapersizes\fi
+ \else
+ \if@landscape\else\scr@switchpapersizes\fi
\fi
}
+\newcommand*\scr@switchpapersizes{%
+ \@tempdima\paperwidth\paperwidth\paperheight\paperheight\@tempdima
+}
\newcommand*{\iso@paper}[1]{\expandafter\iso@@paper#1\@nil}
\newcommand*{\iso@@paper}{}
\def\iso@@paper#1#2\@nil{%
@@ -490,6 +506,16 @@
\expandafter\let\csname if@tempswa\expandafter\endcsname
\csname if@dvips\endcsname
}{}%
+ }{}%
+ \scr@ifundefinedorrelax{pr@nextbb}{}{%
+ \expandafter\ifx\csname ifPreview\expandafter\endcsname
+ \csname iftrue\endcsname
+ \PackageInfo{typearea}{%
+ package `preview' with option `tightpage' detected.\MessageBreak
+ initial page size special deactivated%
+ }%
+ \@tempswafalse
+ \fi
}%
\if@tempswa
\endgroup
@@ -559,32 +585,44 @@
\KOMA@key{paper}{%
\ifstr{#1}{seascape}{%
\@seascapetrue
- \if@landscape\else
- \setlength{\@tempdima}{\paperwidth}%
- \setlength{\paperwidth}{\paperheight}%
- \setlength{\paperheight}{\@tempdima}%
+ \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
\@landscapetrue
+ \scr@setpaperorientation
+ \else
+ \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}%
}{%
\ifstr{#1}{landscape}{%
\@seascapefalse
- \if@landscape\else
- \setlength{\@tempdima}{\paperwidth}%
- \setlength{\paperwidth}{\paperheight}%
- \setlength{\paperheight}{\@tempdima}%
+ \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
\@landscapetrue
+ \scr@setpaperorientation
+ \else
+ \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}%
}{%
\ifstr{#1}{portrait}{%
- \if@landscape
- \setlength{\@tempdima}{\paperwidth}%
- \setlength{\paperwidth}{\paperheight}%
- \setlength{\paperheight}{\@tempdima}%
+ \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
\@landscapefalse
+ \scr@setpaperorientation
+ \else
+ \if@landscape\scr@switchpapersizes\@landscapefalse\fi
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}%
+ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}%
}{%
\ifstr{#1}{letter}{%
\if@landscape
@@ -597,6 +635,10 @@
\FamilyKeyStateProcessed
\KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
\KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{letter}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
}{%
\ifstr{#1}{legal}{%
\if@landscape
@@ -609,6 +651,10 @@
\FamilyKeyStateProcessed
\KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
\KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{legal}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
}{%
\ifstr{#1}{executive}{%
\if@landscape
@@ -617,19 +663,29 @@
\else
\setlength\paperheight{10.5in}%
\setlength\paperwidth {7.25in}%
- \fi
- \FamilyKeyStateProcessed
- \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{executive}%
+ \fi
+ \FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{executive}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
}{%
\iso@paper{#1}%
\if@tempswa
\FamilyKeyStateProcessed
\KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
\KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{#1}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
\else
\expandafter\maybe@pair#1::\@nil
\if@tempswa
+ \FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
\expandafter\ifnum \scr@ta@v@is@lt{3.01b}\relax
\PackageWarningNoLine{typearea}{%
You may have to exchange height and width!\MessageBreak
@@ -638,20 +694,28 @@
instead of `paper=width:height'.\MessageBreak
I've switched back to that old interpretation\MessageBreak
because of the given compatiblity settings}%
- \setlength\paperheight{\@tempa}%
\setlength\paperwidth{\@tempb}%
+ \setlength\paperheight{\@tempa}%
\else
\setlength\paperwidth{\@tempa}%
\setlength\paperheight{\@tempb}%
\fi
- \FamilyKeyStateProcessed
- \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
- \if@landscape
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}%
+ \expandafter\ifnum \scr@ta@v@is@lt{3.22}\relax
+ \if@landscape
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}%
+ \else
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}%
+ \fi
\else
- \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}%
+ \scr@setpaperorientation
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \the\paperwidth:\the\paperheight}%
\fi
- \else
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{%
+ \if@seascape seascape\else
+ \if@landscape landscape\else portrait\fi\fi
+ }%
+ \else
\KOMA@unknown@keyval{paper}{#1}{%
`letter', `legal', `executive', `a'<nr>, `b'<nr>,
`c'<nr>, `d'<nr>,\MessageBreak
@@ -662,17 +726,6 @@
}%
}%
}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \if@landscape
- \if@seascape
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}%
- \else
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}%
- \fi
- \else
- \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}%
- \fi
- \fi
}%
}%
}%
@@ -689,7 +742,7 @@
\KOMA@ifkey{usegeometry}{@ta@usegeometry}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -796,7 +849,8 @@
\@namedef{scr@v@3.19a}{15}
\@namedef{scr@v@3.20}{15}
\@namedef{scr@v@3.21}{15}
-\@namedef{scr@v@last}{15}
+\@namedef{scr@v@3.22}{16}
+\@namedef{scr@v@last}{16}
\newcommand*{\scr@ta@v@is@lt}[1]{%
\scr@ta@compatibility<\@nameuse{scr@v@#1}
}
@@ -809,7 +863,7 @@
\newcommand*{\scr@ta@v@is@ge}[1]{%
\numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -1527,7 +1581,7 @@
\fi
}
\typearea[current]{current}
-%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%