summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/typearea.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/typearea.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty214
1 files changed, 104 insertions, 110 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index d80dd35afb2..777c1136df4 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 2081 2015-04-23 06:46:09Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,16 +67,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2015/04/23 v3.17 KOMA-Script
+ 2015/05/06 v3.17a KOMA-Script
package (type area)]
\typeout{%
Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J%
@@ -87,7 +87,7 @@
}
%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $
\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
\newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}}
\newlength{\ta@bcor}
@@ -361,116 +361,49 @@
[typearea]%
{onecolumn}{twocolumn=false}
\KOMA@key{pagesize}[auto]{%
- \begingroup
- \KOMA@set@ncmdkey{pagesize}{@tempa}{%
- {off}{-1},{no}{-1},{false}{-1},%
- {auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3},{dvipdfmx}{4}%
- }{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \aftergroup\FamilyKeyStateProcessed
- \ifcase\number\@tempa\relax
- \endgroup
+ \KOMA@set@ncmdkey{pagesize}{@pagesizelast}{%
+ {off}{-1},{no}{-1},{false}{-1},%
+ {auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3},{dvipdfmx}{4}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase\number\@pagesizelast\relax
+ \edef\@pagesizelast{auto}%
+ \if@atdocument
\set@pdftexpagesize
\set@dvipspagesize
- \or
- \endgroup
- \set@pdftexpagesize
+ \fi
+ \or
+ \edef\@pagesizelast{automedia}%
+ \if@atdocument
+ \set@pdftextpagesize
\set@vtexpagesize
\set@dvipspagesize
- \or
- \endgroup
+ \fi
+ \or
+ \edef\@pagesizelast{dvips}%
+ \if@atdocument
\set@dvipspagesize
- \or
- \endgroup
+ \fi
+ \or
+ \edef\@pagesizelast{pdftex}%
+ \if@atdocument
\set@pdftexpagesize
- \or
- \endgroup
+ \fi
+ \or
+ \edef\@pagesizelast{dvipdfmx}%
+ \if@atdocument
\set@dvipdfmxpagesize
- \fi
- \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{pagesize}{#1}%
- \edef\@pagesizelast{#1}%
- \else
- \endgroup
- \FamilyKeyStateUnknownValue
- \fi
-}
-\newcommand{\set@pdftexpagesize}{%
- \AtBeginDocument{%
- \ifnotundefined{pdfpagewidth}{\pdfpagewidth=\paperwidth}{}%
- \ifnotundefined{pdfpageheight}{\pdfpageheight=\paperheight}{}%
- }%
- \let\set@pdftexpagesize=\@empty
-}
-\newcommand{\set@dvipspagesize}{%
- \begingroup
- \@tempswafalse
- \scr@ifdvioutput{\@tempswatrue}{%
- \ifnotundefined{if@dvips}{%
- \expandafter\let\csname if@tempswa\expandafter\endcsname
- \csname if@dvips\endcsname
- }{}%
- }%
- \if@tempswa
- \endgroup
- \AtBeginDocument{\AtBeginDvi{%
- \special{papersize=\the\paperwidth,\the\paperheight}%
- \if@seascape\special{! TeXDict begin /landplus90{true}store end }\fi
- }%
- }%
- \expandafter\ifnum\scr@ta@v@is@gt{3.02b}\relax
- \let\set@dvipspagesize=\@empty
- \else
- \let\set@dvipspagesize=\setnot@dvipspagesize
\fi
\else
- \endgroup
+ \edef\@pagesizelast{false}%
+ \fi
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}%
+ {pagesize}{\@pagesizelast}%
\fi
}
-\newcommand{\setnot@dvipspagesize}{%
- \scr@ifdvioutput{%
- \PackageWarning{%
- typearea%
- }{%
- With dvi output option `pagesize=auto',\MessageBreak
- `pagesize=automedia' or `pagesize=dvips'\MessageBreak
- may be used only once at preamble.\MessageBreak
- Option ignored%
- }%
- }{}%
-}
-\newcommand*{\set@dvipdfmxpagesize}{%
- \scr@ifdvioutput{%
- \AtBeginDocument{\AtBeginDvi{%
- \special{papersize=\the\paperwidth,\the\paperheight}%
- }%
- }%
- }{}%
-}
-\newcommand{\set@vtexpagesize}{%
- \AtBeginDocument{%
- \ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}%
- \ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}%
- }%
- \let\set@vtexpagesize=\@empty
-}
-\newcommand*{\scr@updatedvipspagesize}{%
- \scr@ifundefinedorrelax{XeTeXversion}{%
- \special{ps::\@percentchar\@percentchar
- PageBoundingBox: 0 0 \the\numexpr\paperwidth/\dimexpr 1bp\relax\relax
- \space \the\numexpr\paperheight/\dimexpr 1bp\relax\relax^^J%
- \@percentchar\@percentchar BeginPageSetup^^J%
- << /PageSize [\the\numexpr\paperwidth/\dimexpr 1bp\relax\relax\space
- \the\numexpr\paperheight/\dimexpr 1bp\relax\relax]
- >> setpagedevice^^J%<<
- 0 0 bop^^J%
- \@percentchar\@percentchar EndPageSetup}%
- }{}%
-}
+\newcommand\@pagesizelast{auto}
\AtBeginDocument{%
- \renewcommand*{\set@pdftexpagesize}{%
- \ifnotundefined{pdfpagewidth}{\pdfpagewidth=\paperwidth}{}%
- \ifnotundefined{pdfpageheight}{\pdfpageheight=\paperheight}{}%
- }%
+ \KOMAExecuteOptions[.typearea.\scr@pkgextension]{pagesize=\@pagesizelast}%
\expandafter\ifnum\scr@ta@v@is@gt{3.02b}\relax
\renewcommand*{\set@dvipspagesize}{%
\begingroup
@@ -528,10 +461,70 @@
\special{papersize=\the\paperwidth,\the\paperheight}%
}{}%
}%
- \renewcommand*{\set@vtexpagesize}{%
- \ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}%
- \ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}%
- }%
+}
+\newcommand{\set@pdftexpagesize}{%
+ \ifnotundefined{pdfpagewidth}{\pdfpagewidth=\paperwidth}{}%
+ \ifnotundefined{pdfpageheight}{\pdfpageheight=\paperheight}{}%
+}
+\newcommand{\set@dvipspagesize}{%
+ \begingroup
+ \@tempswafalse
+ \scr@ifdvioutput{\@tempswatrue}{%
+ \ifnotundefined{if@dvips}{%
+ \expandafter\let\csname if@tempswa\expandafter\endcsname
+ \csname if@dvips\endcsname
+ }{}%
+ }%
+ \if@tempswa
+ \endgroup
+ \AtBeginDvi{%
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ \if@seascape\special{! TeXDict begin /landplus90{true}store end }\fi
+ }%
+ \expandafter\ifnum\scr@ta@v@is@gt{3.02b}\relax
+ \let\set@dvipspagesize=\@empty
+ \else
+ \let\set@dvipspagesize=\setnot@dvipspagesize
+ \fi
+ \else
+ \endgroup
+ \fi
+}
+\newcommand{\setnot@dvipspagesize}{%
+ \scr@ifdvioutput{%
+ \PackageWarning{%
+ typearea%
+ }{%
+ With dvi output option `pagesize=auto',\MessageBreak
+ `pagesize=automedia' or `pagesize=dvips'\MessageBreak
+ may be used only once at preamble.\MessageBreak
+ Option ignored%
+ }%
+ }{}%
+}
+\newcommand*{\set@dvipdfmxpagesize}{%
+ \scr@ifdvioutput{%
+ \AtBeginDvi{%
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ }%
+ }{}%
+}
+\newcommand{\set@vtexpagesize}{%
+ \ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}%
+ \ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}%
+}
+\newcommand*{\scr@updatedvipspagesize}{%
+ \scr@ifundefinedorrelax{XeTeXversion}{%
+ \special{ps::\@percentchar\@percentchar
+ PageBoundingBox: 0 0 \the\numexpr\paperwidth/\dimexpr 1bp\relax\relax
+ \space \the\numexpr\paperheight/\dimexpr 1bp\relax\relax^^J%
+ \@percentchar\@percentchar BeginPageSetup^^J%
+ << /PageSize [\the\numexpr\paperwidth/\dimexpr 1bp\relax\relax\space
+ \the\numexpr\paperheight/\dimexpr 1bp\relax\relax]
+ >> setpagedevice^^J%<<
+ 0 0 bop^^J%
+ \@percentchar\@percentchar EndPageSetup}%
+ }{}%
}
\KOMA@DeclareStandardOption[typearea]{dvips}{%
pagesize=automedia%
@@ -680,7 +673,7 @@
\KOMA@ifkey{usegeometry}{@ta@usegeometry}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -779,6 +772,7 @@
\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@3.16}{14}
\@namedef{scr@v@3.17}{15}
+\@namedef{scr@v@3.17a}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@ta@v@is@lt}[1]{%
\scr@ta@compatibility<\@nameuse{scr@v@#1}
@@ -792,7 +786,7 @@
\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 $
+%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -1489,7 +1483,7 @@
\fi
}
\typearea[current]{current}
-%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z 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%