diff options
author | Karl Berry <karl@freefriends.org> | 2007-12-26 22:26:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-12-26 22:26:13 +0000 |
commit | d892fc1b7f46275b1e5c291db0305eac83abe9e3 (patch) | |
tree | 50dac7763bbe931304c867a5da111a3f324b0a89 /Master/texmf-dist/tex/latex/koma-script/typearea.sty | |
parent | adb11f7c6718f766a22dbb2ce1b196a36acc197d (diff) |
koma-script update (25dec07)
git-svn-id: svn://tug.org/texlive/trunk@5924 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.sty | 56 |
1 files changed, 36 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 3a3018a8ab0..eb193344299 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2007/10/12 v2.97d KOMA-Script}% + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -162,6 +162,11 @@ } \multiply\paperwidth by186468 \multiply\paperheight by186468 + \if@landscape + \setlength{\@tempdima}{\paperwidth}% + \setlength{\paperwidth}{\paperheight}% + \setlength{\paperheight}{\@tempdima}% + \fi } \newcommand*{\iso@paper}[1]{\expandafter\iso@@paper#1\@nil} \newcommand*{\iso@@paper}{} @@ -374,20 +379,35 @@ \fi }{% \ifstr{#1}{letter}{% - \setlength\paperheight{11in}% - \setlength\paperwidth {8.5in}% + \if@landscape + \setlength\paperheight{8.5in}% + \setlength\paperwidth {11in}% + \else + \setlength\paperheight{11in}% + \setlength\paperwidth {8.5in}% + \fi }{% \ifstr{#1}{legal}{% - \setlength\paperheight{14in}% - \setlength\paperwidth {8.5in}% + \if@landscape + \setlength\paperheight{8.5in}% + \setlength\paperwidth {14in}% + \else + \setlength\paperheight{14in}% + \setlength\paperwidth {8.5in}% + \fi }{% \ifstr{#1}{executive}{% - \setlength\paperheight{10.5in}% - \setlength\paperwidth {7.25in}% + \if@landscape + \setlength\paperheight{7.25in}% + \setlength\paperwidth {10.5in}% + \else + \setlength\paperheight{10.5in}% + \setlength\paperwidth {7.25in}% + \fi }{% \iso@paper{#1}% \if@tempswa\else - \expandafter\maybe@pair#1\scr@next + \expandafter\maybe@pair#1::\@nil \if@tempswa \setlength\paperheight{\@tempa}% \setlength\paperwidth{\@tempb}% @@ -395,28 +415,24 @@ \KOMA@unknown@keyval{paper}{#1}{% `letter', `legal', `executive', `a'<nr>, `b'<nr>, `c'<nr>, `d'<nr>,\MessageBreak - `('<width>`,'<height>`)', `landscape' and `portrait'% + <width>`:'<height>, `landscape' and `portrait'% }% \fi \fi }% }% }% - \if@landscape - \setlength{\@tempdima}{\paperwidth}% - \setlength{\paperwidth}{\paperheight}% - \setlength{\paperheight}{\@tempdima}% - \fi }% }% } \newif\if@landscape -\newcommand*{\maybe@pair}{% - \@ifnextchar (% - {\@tempswatrue\maybe@@pair}{\@tempswafalse\gobble@till@scr@next}% +\newcommand*{\maybe@pair}{} +\def\maybe@pair#1:#2:#3\@nil{% + \edef\@tempa{#1}\edef\@tempb{#2}% + \ifx\@tempa\@empty\@tempswafalse\else + \ifx\@tempb\@empty\@tempswafalse\else\@tempswatrue\fi + \fi } -\newcommand*{\maybe@@pair}{} -\def\@maybepair(#1,#2)\scr@next{\def\@tempa{#1}\def\@tempb{#2}}% \DeclareOption*{% \x@paper} \InputIfFileExists{typearea.cfg}{% @@ -432,7 +448,7 @@ \else \KOMAExecuteOptions{twoside=false} \fi -\KOMAProcessOptions +\KOMAProcessOptions\relax \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} \newlength{\ta@hblk} |