diff options
author | Dr. Clea F. Rees <cfrees@imapmail.org> | 2008-12-10 20:53:15 +0000 |
---|---|---|
committer | Dr. Clea F. Rees <cfrees@imapmail.org> | 2008-12-10 20:53:15 +0000 |
commit | e580f05b6906cceb59c89211eb69c02b58b2d35d (patch) | |
tree | 66ecd115df66a84f35ac0458d18842214e42ba55 /Master/texmf-dist/tex/latex/koma-script/typearea.sty | |
parent | 2e59afec9907d090fa6cb3d54066333df8826741 (diff) |
koma-script update 2008/12/10
git-svn-id: svn://tug.org/texlive/trunk@11586 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 | 99 |
1 files changed, 91 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 017e05bd9d7..637dc792727 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -7,7 +7,10 @@ %% scrkvers.dtx (with options: `package,typearea') %% scrktare.dtx (with options: `package,identify') %% scrkbase.dtx (with options: `load') -%% scrktare.dtx (with options: `package,option,body') +%% scrktare.dtx (with options: `package,option') +%% scrkcomp.dtx (with options: `package,typearea,option') +%% scrktare.dtx (with options: `package,body') +%% scrkcomp.dtx (with options: `package,typearea,body') %% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 1994-2007 @@ -62,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -430,8 +433,20 @@ \if@tempswa\else \expandafter\maybe@pair#1::\@nil \if@tempswa - \setlength\paperheight{\@tempa}% - \setlength\paperwidth{\@tempb}% + \ifnum \scr@ta@compatibility<\@nameuse{scr@v@3.01b}\relax + \PackageWarningNoLine{typearea}{% + You may have to exchange height and width!\MessageBreak + Until KOMA-Script version 3.01b the semantic\MessageBreak + of option `paper' was `paper=height:width'\MessageBreak + 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}% + \else + \setlength\paperwidth{\@tempa}% + \setlength\paperheight{\@tempb}% + \fi \else \KOMA@unknown@keyval{paper}{#1}{% `letter', `legal', `executive', `a'<nr>, `b'<nr>, @@ -456,6 +471,65 @@ } \DeclareOption*{% \x@paper} +%%% From File: scrkcomp.dtx +\providecommand* + {\scr@compatibility}{\scr@v@last} +\newcommand*{\scr@ta@compatibility}{\scr@compatibility} +\KOMA@key{version}[last]{% + \scr@ifundefinedorrelax{scr@v@#1}{% + \def\scr@compatibility{0}% + \PackageWarningNoLine{% + typearea% + }{% + You have set option `version' to value `#1', but\MessageBreak + this value of version is not supported.\MessageBreak + Because of this, version was set to `first'% + }% + }{% + \PackageInfoNoLine{scrextend}{% + Switching compatibility level to `#1'% + }% + \edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}% + }% +} +\AtEndOfPackage{% + \KOMA@key{version}[]{% + \PackageError{% + typearea% + }{% + Option `version' too late% + }{% + Option `version' may be set only while loading the + package.\MessageBreak + But you've tried to set it up later.% + }% + }% +} +\@namedef{scr@v@first}{0} +\@namedef{scr@v@2.9}{0} +\@namedef{scr@v@2.9t}{0} +\@namedef{scr@v@2.9u}{1} +\@namedef{scr@v@2.95}{2} +\@namedef{scr@v@2.95a}{2} +\@namedef{scr@v@2.95b}{2} +\@namedef{scr@v@2.96}{2} +\@namedef{scr@v@2.96a}{3} +\@namedef{scr@v@2.97}{3} +\@namedef{scr@v@2.97a}{3} +\@namedef{scr@v@2.97b}{3} +\@namedef{scr@v@2.97c}{4} +\@namedef{scr@v@2.97d}{5} +\@namedef{scr@v@2.97e}{6} +\@namedef{scr@v@2.98}{6} +\@namedef{scr@v@2.98a}{6} +\@namedef{scr@v@2.98b}{6} +\@namedef{scr@v@2.98c}{7} +\@namedef{scr@v@3.00}{8} +\@namedef{scr@v@3.01}{8} +\@namedef{scr@v@3.01a}{8} +\@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@last}{9} +%%% From File: scrktare.dtx \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -821,17 +895,25 @@ \advance\@tempcnta by-4 \fi \ifnum\@tempcnta <-15 + \@tempcnta=-\@tempcnta \PackageWarningNoLine{typearea}{% - Bad DIV value!\MessageBreak + Bad type area settings!\MessageBreak + The detected line width is about + \the\@tempcnta\@percentchar\MessageBreak + larger than the heuristically detected line width.\MessageBreak You should e.g. decrease DIV, increase fontsize\MessageBreak or change papersize% }% + \@tempcnta=-\@tempcnta \else \ifnum\@tempcnta>15 \PackageWarningNoLine{typearea}{% - Bad DIV value!\MessageBreak - You should e.g. increase DIV, decrease fontsize\MessageBreak - or change papersize% + Maybe no optimal type area settings!\MessageBreak + The maximum limit of line width is about + \the\@tempcnta\@percentchar\MessageBreak + larger than the heuristically detected line width.\MessageBreak + You may e.g. increase DIV, decrease fontsize\MessageBreak + or change the papersize% } \fi\fi \ifnum\ta@div <6 @@ -955,6 +1037,7 @@ \activateareas } \typearea[current]{current} +%%% From File: scrkcomp.dtx %%% From File: scrlogo.dtx \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% |