summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/typearea.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-30 22:17:03 +0000
committerKarl Berry <karl@freefriends.org>2019-12-30 22:17:03 +0000
commitaab00778035c28a028f94e501e3c13f6b4081f87 (patch)
treee5dd29eebc30d1b86ec710496c42250384425061 /Master/texmf-dist/tex/latex/koma-script/typearea.sty
parentf56dddc3f3fce9850405369b12615d3544254bee (diff)
koma-script (30dec19)
git-svn-id: svn://tug.org/texlive/trunk@53270 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.sty88
1 files changed, 45 insertions, 43 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 1c7d8c64e75..29e871442db 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
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -70,23 +70,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2019/10/12 v3.27 KOMA-Script
+ 2019/12/23 v3.28 KOMA-Script
package
(type area)]
-%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
%%% (run: init)
\providecommand*
{\scr@compatibility}{\scr@v@last}
@@ -161,12 +161,14 @@
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
\@namedef{scr@v@3.27}{17}
+\@namedef{scr@v@3.27a}{17}
+\@namedef{scr@v@3.28}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: init)
\providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}}
\providecommand\ta@divlistelse{1}
-%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
@@ -221,22 +223,22 @@
\newcommand*{\scr@ta@v@is@ge}[1]{%
\numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: options)
\providecommand*{\PaperNameToSize}[2][warning]{%
- \ifstr{#2}{letter}{%
+ \Ifstr{#2}{letter}{%
\setlength\paperheight{11in}%
\setlength\paperwidth {8.5in}%
}{%
- \ifstr{#2}{legal}{%
+ \Ifstr{#2}{legal}{%
\setlength\paperheight{14in}%
\setlength\paperwidth {8.5in}%
}{%
- \ifstr{#2}{executive}{%
+ \Ifstr{#2}{executive}{%
\setlength\paperheight{10.5in}%
\setlength\paperwidth {7.25in}%
}{%
- \ifstr{#2}{}{%
+ \Ifstr{#2}{}{%
\ISO@PaperNameToSize[#1]{}{}\@nil
}{%
\edef\reserved@a{\noexpand\ISO@PaperNameToSize[#1]#2 \noexpand\@nil}%
@@ -251,28 +253,28 @@
\lowercase{\edef\reserved@a{#2}}%
\@tempswafalse
\if \reserved@a a%
- \ifnumber{#3}{%
+ \Ifnumber{#3}{%
\setlength{\paperwidth}{841sp}%
\setlength{\paperheight}{1189sp}%
\@tempswatrue
}{}%
\else
\if \reserved@a b%
- \ifnumber{#3}{%
+ \Ifnumber{#3}{%
\setlength{\paperwidth}{1000sp}%
\setlength{\paperheight}{1414sp}%
\@tempswatrue
}{}%
\else
\if \reserved@a c%
- \ifnumber{#3}{%
+ \Ifnumber{#3}{%
\setlength{\paperwidth}{917sp}%
\setlength{\paperheight}{1297sp}%
\@tempswatrue
}{}%
\else
\if \reserved@a d%
- \ifnumber{#3}{%
+ \Ifnumber{#3}{%
\setlength{\paperwidth}{771sp}%
\setlength{\paperheight}{1090sp}%
\@tempswatrue
@@ -340,7 +342,7 @@
\KOMA@DeclareStandardOption[typearea]{landscape}{paper=landscape}
\KOMA@DeclareStandardOption[typearea]{portrait}{paper=portrait}
\KOMA@key{paper}{%
- \ifstr{#1}{seascape}{%
+ \Ifstr{#1}{seascape}{%
\@seascapetrue
\expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
\@landscapetrue
@@ -354,7 +356,7 @@
\KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
\KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}%
}{%
- \ifstr{#1}{landscape}{%
+ \Ifstr{#1}{landscape}{%
\@seascapefalse
\expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
\@landscapetrue
@@ -368,7 +370,7 @@
\KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
\KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}%
}{%
- \ifstr{#1}{portrait}{%
+ \Ifstr{#1}{portrait}{%
\expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax
\@landscapefalse
\scr@setpaperorientation
@@ -381,7 +383,7 @@
\KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}%
\KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}%
}{%
- \ifstr{#1}{letter}{%
+ \Ifstr{#1}{letter}{%
\if@landscape
\setlength\paperheight{8.5in}%
\setlength\paperwidth {11in}%
@@ -397,7 +399,7 @@
\if@landscape landscape\else portrait\fi\fi
}%
}{%
- \ifstr{#1}{legal}{%
+ \Ifstr{#1}{legal}{%
\if@landscape
\setlength\paperheight{8.5in}%
\setlength\paperwidth {14in}%
@@ -413,7 +415,7 @@
\if@landscape landscape\else portrait\fi\fi
}%
}{%
- \ifstr{#1}{executive}{%
+ \Ifstr{#1}{executive}{%
\if@landscape
\setlength\paperheight{7.25in}%
\setlength\paperwidth {10.5in}%
@@ -546,7 +548,7 @@
\begingroup
\@tempswafalse
\scr@ifdvioutput{\@tempswatrue}{%
- \ifnotundefined{if@dvips}{%
+ \Ifnotundefined{if@dvips}{%
\expandafter\let\csname if@tempswa\expandafter\endcsname
\csname if@dvips\endcsname
}{}%
@@ -611,7 +613,7 @@
\begingroup
\@tempswafalse
\scr@ifdvioutput{\@tempswatrue}{%
- \ifnotundefined{if@dvips}{%
+ \Ifnotundefined{if@dvips}{%
\expandafter\let\csname if@tempswa\expandafter\endcsname
\csname if@dvips\endcsname
}{}%
@@ -661,8 +663,8 @@
}{}%
}
\newcommand*{\set@vtexpagesize}{%
- \ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}%
- \ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}%
+ \Ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}%
+ \Ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}%
}
\newcommand*{\scr@updatedvipspagesize}{%
\scr@ifundefinedorrelax{XeTeXversion}{%
@@ -694,7 +696,7 @@
\cleardoubleoddpage
}%
\else\clearpage\fi\fi
- \ifstr{#1}{semi}{%
+ \Ifstr{#1}{semi}{%
\@twosidetrue
\@semitwosidetrue
\FamilyKeyStateProcessed
@@ -801,7 +803,7 @@
\newlength{\ta@bcor}
\newcount\ta@div
\KOMA@key{BCOR}{%
- \ifstr{#1}{current}{}{%
+ \Ifstr{#1}{current}{}{%
\setlength{\ta@bcor}{#1}%
}%
\FamilyKeyStateProcessed
@@ -883,15 +885,15 @@
\else\if #1D\@tempswatrue
\fi\fi\fi\fi\fi\fi\fi\fi
\if@tempswa
- \ifnumber{#2}{\isopaper[#1]{#2}}{\@tempswafalse}%
+ \Ifnumber{#2}{\isopaper[#1]{#2}}{\@tempswafalse}%
\fi
}
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
- \ifstr{#1}{}{%
- \ifstr{#3}{BCOR}{%
- \ifdimen{#2}{%
+ \Ifstr{#1}{}{%
+ \Ifstr{#3}{BCOR}{%
+ \Ifdimen{#2}{%
\KOMA@UseDeprecatedOption{%
\PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}%
}{\scr@pti@nerr@r}%
@@ -903,7 +905,7 @@
\def\@@DIV #1DIV#2DIV#3\@@DIV{%
\edef\@tempa{#1}\ifx\@tempa\@empty
\edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb
- \ifnumber{#2}{%
+ \Ifnumber{#2}{%
\KOMA@UseDeprecatedOption{%
\PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}%
}{\scr@pti@nerr@r}%
@@ -925,18 +927,18 @@
}
\newcommand*{\x@@paper}{}
\def\x@@paper #1#2paper#3\x@@paper{%
- \ifstr{#3}{paper}{%
- \ifnumber{#2}{%
- \ifstr{#1}{a}{%
+ \Ifstr{#3}{paper}{%
+ \Ifnumber{#2}{%
+ \Ifstr{#1}{a}{%
\isopaper[a]{#2}%
}{%
- \ifstr{#1}{b}{%
+ \Ifstr{#1}{b}{%
\isopaper[b]{#2}%
}{%
- \ifstr{#1}{c}{%
+ \Ifstr{#1}{c}{%
\isopaper[c]{#2}%
}{%
- \ifstr{#1}{d}{%
+ \Ifstr{#1}{d}{%
\isopaper[d]{#2}%
}{\scr@pti@nerr@r}%
}%
@@ -971,9 +973,9 @@
\KOMAExecuteOptions{twoside=false}
\fi
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\newcommand*{\ta@divfor}[1]{%
\ta@div=\z@
@@ -1711,7 +1713,7 @@
\kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end
}
\newcommand*{\@areaset@end}{}
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: final)
\typearea[current]{current}
%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $