summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/typearea.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-24 23:19:31 +0000
committerKarl Berry <karl@freefriends.org>2015-04-24 23:19:31 +0000
commit0a00b3b492fd27dc12cddae602b2c43206a17d74 (patch)
tree40a09bf2208cc13bcd727626e1ee058e2caa68b1 /Master/texmf-dist/tex/latex/koma-script/typearea.sty
parent77b150bbd42aa48ba71627e09763785b26adfcfd (diff)
koma-script (24apr15)
git-svn-id: svn://tug.org/texlive/trunk@37036 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.sty217
1 files changed, 183 insertions, 34 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 5882d629bcb..d80dd35afb2 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 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,23 +67,27 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package (type area)]
\typeout{%
- Package typearea, \csname ver@typearea.sty\endcsname^^J%
+ Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J%
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Frank Neukam, 1992-1994^^J%
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Markus Kohm, 1994-^^J%
}
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
\newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}}
\newlength{\ta@bcor}
@@ -228,6 +232,8 @@
\endgroup
\def\ta@hh{#1\baselineskip}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headlines}{#1}%
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1\baselineskip}%
}
\KOMA@key{footlines}{%
\begingroup
@@ -235,6 +241,8 @@
\endgroup
\def\ta@fh{#1\baselineskip}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footlines}{#1}%
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1\baselineskip}%
}
\KOMA@key{headheight}{%
\begingroup
@@ -242,6 +250,8 @@
\endgroup
\def\ta@hh{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{headlines}%
}
\KOMA@key{footheight}{%
\begingroup
@@ -249,6 +259,8 @@
\endgroup
\def\ta@fh{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{footlines}%
}
\newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl}
\KOMA@ifkey{headinclude}{@hincl}
@@ -259,10 +271,11 @@
\KOMA@ifkey{mpinclude}{@mincl}
\KOMA@DeclareDeprecatedOption[typearea]{mpexclude}{mpinclude=false}
\KOMA@key{BCOR}{%
- \edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else
+ \ifstr{#1}{current}{}{%
\setlength{\ta@bcor}{#1}%
- \fi
+ }%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{BCOR}{#1}%
}
\AtEndOfPackage{%
\KOMA@key{BCOR}{\typearea[{#1}]{last}\FamilyKeyStateProcessed}%
@@ -280,6 +293,7 @@
\fi
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{DIV}{#1}%
}
\AtEndOfPackage{%
\KOMA@key{DIV}{\typearea[current]{#1}\FamilyKeyStateProcessed}%
@@ -291,25 +305,41 @@
\g@addto@macro\@twosidetrue\@semitwosidefalse
\g@addto@macro\@twosidefalse\@semitwosidefalse
\KOMA@key{twoside}[true]{%
- \if@atdocument\if@twoside\cleardoublepage\else\clearpage\fi\fi
+ \if@atdocument\if@twoside
+ \scr@ifundefinedorrelax{cleardoubleoddpage}{%
+ \cleardoublepage
+ }{%
+ \cleardoubleoddpage
+ }%
+ \else\clearpage\fi\fi
\ifstr{#1}{semi}{%
\@twosidetrue
\@semitwosidetrue
\FamilyKeyStateProcessed
}{%
\def\FamilyElseValue{, `semi'}%
- \KOMA@set@ifkey{twoside}{@twoside}{#1}%
+ \KOMA@set@ifkey{twoside}{%
+ @twoside%
+ }{#1}%
}%
- \if@twoside
- \if@semitwoside
- \@mparswitchfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ typearea.\scr@pkgextension
+ }{twoside}{#1}%
+ \if@twoside
+ \if@semitwoside
+ \@mparswitchfalse
+ \else
+ \@mparswitchtrue
+ \fi
\else
- \@mparswitchtrue
- \fi
- \else
- \@mparswitchfalse
- \fi%
- \csname recalctypearea\endcsname
+ \@mparswitchfalse
+ \fi%
+ \csname recalctypearea\endcsname
+ \fi
+}
+\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twoside}{%
+ \if@twoside true\else false\fi
}
\KOMA@DeclareStandardOption%
[typearea]%
@@ -317,11 +347,16 @@
\KOMA@key{twocolumn}[true]{%
\if@atdocument\clearpage\fi
\KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
- \ifx\FamilyKeyState
- \FamilyKeyStateProcessed
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ typearea.\scr@pkgextension
+ }{twocolumn}{@twocolumn}%
\csname recalctypearea\endcsname
\fi
}
+\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twocolumn}{%
+ \if@twocolumn true\else false\fi
+}
\KOMA@DeclareStandardOption%
[typearea]%
{onecolumn}{twocolumn=false}
@@ -352,6 +387,7 @@
\endgroup
\set@dvipdfmxpagesize
\fi
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{pagesize}{#1}%
\edef\@pagesizelast{#1}%
\else
\endgroup
@@ -381,7 +417,7 @@
\if@seascape\special{! TeXDict begin /landplus90{true}store end }\fi
}%
}%
- \ifnum \scr@compatibility>\@nameuse{scr@v@3.02b}\relax
+ \expandafter\ifnum\scr@ta@v@is@gt{3.02b}\relax
\let\set@dvipspagesize=\@empty
\else
\let\set@dvipspagesize=\setnot@dvipspagesize
@@ -435,7 +471,7 @@
\ifnotundefined{pdfpagewidth}{\pdfpagewidth=\paperwidth}{}%
\ifnotundefined{pdfpageheight}{\pdfpageheight=\paperheight}{}%
}%
- \ifnum \scr@compatibility>\@nameuse{scr@v@3.02b}\relax
+ \expandafter\ifnum\scr@ta@v@is@gt{3.02b}\relax
\renewcommand*{\set@dvipspagesize}{%
\begingroup
\@tempswafalse
@@ -550,6 +586,8 @@
\setlength\paperwidth {8.5in}%
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{letter}%
}{%
\ifstr{#1}{legal}{%
\if@landscape
@@ -560,6 +598,8 @@
\setlength\paperwidth {8.5in}%
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{legal}%
}{%
\ifstr{#1}{executive}{%
\if@landscape
@@ -570,14 +610,18 @@
\setlength\paperwidth {7.25in}%
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{executive}%
}{%
\iso@paper{#1}%
\if@tempswa
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{#1}%
\else
\expandafter\maybe@pair#1::\@nil
\if@tempswa
- \ifnum \scr@ta@compatibility<\@nameuse{scr@v@3.01b}\relax
+ \expandafter\ifnum \scr@ta@v@is@lt{3.01b}\relax
\PackageWarningNoLine{typearea}{%
You may have to exchange height and width!\MessageBreak
Until KOMA-Script version 3.01b the semantic\MessageBreak
@@ -592,7 +636,13 @@
\setlength\paperheight{\@tempb}%
\fi
\FamilyKeyStateProcessed
- \else
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \if@landscape
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}%
+ \else
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}%
+ \fi
+ \else
\KOMA@unknown@keyval{paper}{#1}{%
`letter', `legal', `executive', `a'<nr>, `b'<nr>,
`c'<nr>, `d'<nr>,\MessageBreak
@@ -603,6 +653,17 @@
}%
}%
}%
+ \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
}%
}%
}%
@@ -616,9 +677,10 @@
\ifx\@tempb\@empty\@tempswafalse\else\@tempswatrue\fi
\fi
}
+\KOMA@ifkey{usegeometry}{@ta@usegeometry}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -632,6 +694,10 @@
this value of version is not supported.\MessageBreak
Because of this, version was set to `first'%
}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ typearea.\scr@pkgextension
+ }{version}{first}%
}{%
\PackageInfoNoLine{%
typearea%
@@ -640,6 +706,9 @@
}%
\edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ typearea.\scr@pkgextension
+ }{version}{#1}%
}%
}
\AtEndOfPackage{%
@@ -709,8 +778,21 @@
\@namedef{scr@v@3.14}{13}
\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@last}{14}
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+\@namedef{scr@v@3.17}{15}
+\@namedef{scr@v@last}{15}
+\newcommand*{\scr@ta@v@is@lt}[1]{%
+ \scr@ta@compatibility<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@ta@v@is@gt}[1]{%
+ \scr@ta@compatibility>\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@ta@v@is@le}[1]{%
+ \numexpr\scr@ta@compatibility-\@ne <\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@ta@v@is@ge}[1]{%
+ \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1}
+}
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -719,7 +801,7 @@
}
}{}
\providecommand*{\defaultpapersize}{A4}
-\KOMAExecuteOptions{paper=\defaultpapersize}
+\KOMAExecuteOptions{paper=\defaultpapersize,pagesize}
\if@twoside
\if@semitwoside
\KOMAExecuteOptions{twoside=semi}
@@ -760,7 +842,7 @@
\if@semitwoside
\advance\oddsidemargin by1.5\ta@hblk
\advance\oddsidemargin by\ta@bcor
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@ta@v@is@lt{3.12}\relax
\evensidemargin=\oddsidemargin
\else
\advance\evensidemargin by1.5\ta@hblk
@@ -894,8 +976,62 @@
\scr@ifundefinedorrelax{@pagesizelast}{}{%
\KOMAoptions{pagesize=\@pagesizelast}%
}%
+ \expandafter\ifnum\scr@ta@v@is@ge{3.17}%
+ \csname par@updaterelative\endcsname
+ \fi
+ \fi
+ \edef\scr@geometryargs{%
+ bindingoffset=\the\ta@bcor,
+ lmargin=\the\dimexpr 1in+\oddsidemargin-\ta@bcor\relax,
+ textwidth=\the\textwidth,
+ \if@hincl
+ includehead,%
+ top=\the\dimexpr 1in+\topmargin\relax,
+ \else
+ includehead=false,%
+ top=\the\dimexpr 1in+\topmargin+\headheight+\headsep\relax,
+ \fi
+ headheight=\the\headheight,
+ headsep=\the\headsep,
+ textheight=\the\textheight,
+ \if@fincl
+ includefoot,
+ \else
+ includefoot=false,
+ \fi
+ footskip=\the\footskip,
+ \if@mincl
+ includemp,
+ \else
+ includemp=false,
+ \fi
+ marginparwidth=\the\marginparwidth,
+ marginparsep=\the\marginparsep
+ }%
+ \if@ta@usegeometry
+ \@ifundefined{Gm@save}{%
+ \if@atdocument\else
+ \edef\scr@geometryargs{%
+ paperwidth=\the\paperwidth,paperheight=\the\paperheight,%
+ \scr@geometryargs
+ }%
+ \PassOptionsToPackage{\scr@geometryargs}{geometry}%
+ \fi
+ }{%
+ \edef\Gm@restore@org{\Gm@restore}%
+ \if@atdocument
+ \expandafter\newgeometry\expandafter{\scr@geometryargs}%
+ \else
+ \edef\scr@geometryargs{%
+ paperwidth=\the\paperwidth,paperheight=\the\paperheight,%
+ \scr@geometryargs
+ }%
+ \expandafter\geometry\expandafter{\scr@geometryargs}%
+ \fi
+ }%
\fi
}
+\newcommand*{\scr@geometryargs}{}
\newcommand*{\scr@grouplevel@test}[1]{%
\ifcase\currentgrouptype\else
\PackageWarning{typearea}{%
@@ -941,6 +1077,11 @@
\noexpand\def\noexpand\@lastdiv{\@lastdiv}%
\noexpand\marginparsep=\the\marginparsep\space
\noexpand\marginparwidth=\the\marginparwidth\space
+ \noexpand\def
+ \expandafter\noexpand\csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname{%
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname}%
+ }%
}%
}%
\reserved@a
@@ -1162,6 +1303,10 @@
}
\fi
\ta@layoutinfo{\number\ta@div}{\the\@tempcnta}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{DIV}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{DIV}{\@lastdiv}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{BCOR}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{BCOR}{\the\ta@bcor}%
\@typearea@end
\activateareas
\ifdim \dimexpr 1in+\topmargin
@@ -1222,6 +1367,10 @@
\setlength{\textwidth}{#2}%
\setlength{\textheight}{#3}%
\def\@lastdiv{areaset}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{DIV}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{DIV}{areaset}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{BCOR}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{BCOR}{\the\ta@bcor}%
\ta@hblk=\paperwidth
\advance\ta@hblk by-\ta@bcor
\advance\ta@hblk by-\textwidth
@@ -1240,7 +1389,7 @@
\if@semitwoside
\advance\oddsidemargin by1.5\ta@hblk
\advance\oddsidemargin by\ta@bcor
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@ta@v@is@lt{3.12}\relax
\evensidemargin=\oddsidemargin
\else
\advance\evensidemargin by1.5\ta@hblk
@@ -1329,7 +1478,7 @@
\ifdim \dimexpr 1in+\topmargin
+\headheight+\headsep
+\textheight
- +\footskip+\dp\strutbox\relax
+ +\footskip+\footheight-\ht\strutbox\relax
>\paperheight
\PackageWarningNoLine{typearea}{%
page content and margins higher than paper.\MessageBreak
@@ -1340,7 +1489,7 @@
\fi
}
\typearea[current]{current}
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z 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%