From 1c15eb0bc227a081215bf372a3756aadc4d19d09 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 7 Mar 2007 18:05:27 +0000 Subject: koma-script update (5mar07) git-svn-id: svn://tug.org/texlive/trunk@4009 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 2 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 2 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 2 +- .../texmf-dist/tex/latex/koma-script/scraddr.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 514 ++++++++++++++--- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 638 +++++++++++++++++---- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 2 +- Master/texmf-dist/tex/latex/koma-script/scrdoc.cls | 4 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 341 ++++++----- .../texmf-dist/tex/latex/koma-script/scrlettr.cls | 2 +- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 80 ++- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 378 ++++++++++-- .../texmf-dist/tex/latex/koma-script/scrpage.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 628 ++++++++++++++++---- .../texmf-dist/tex/latex/koma-script/scrtime.sty | 2 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 89 ++- 19 files changed, 2106 insertions(+), 588 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index ee0ce0ed8e4..9fc8fba3dcd 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -8,7 +8,7 @@ %% scrklco.dtx (with options: `lco,DIN,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index e014d075779..c64957bd552 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -8,7 +8,7 @@ %% scrklco.dtx (with options: `lco,DINmoretext,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index da507a3db4f..62495cce7d9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -9,7 +9,7 @@ %% scrknpap.dtx (with options: `lco,KOMAold,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index 170018d7502..3aee13c41b8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -8,7 +8,7 @@ %% scrklco.dtx (with options: `lco,SN,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 6431b8f07a1..5467ac27ef7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -8,7 +8,7 @@ %% scrklco.dtx (with options: `lco,SwissLeft,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty index c2c9511b15c..2fa995b34cb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty @@ -7,7 +7,7 @@ %% scraddr.dtx (with options: `scraddr') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 45f625b161c..01d30698a87 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -6,6 +6,7 @@ %% %% scrkvers.dtx (with options: `class,article') %% scrkbase.dtx (with options: `load') +%% scrkcomp.dtx (with options: `class,article,option') %% scrkmisc.dtx (with options: `class,article,option') %% scrklang.dtx (with options: `class,article,option') %% scrkfont.dtx (with options: `class,article,option') @@ -21,6 +22,7 @@ %% scrkidx.dtx (with options: `class,article,option') %% scrklist.dtx (with options: `class,article,option') %% scrkmisc.dtx (with options: `class,article,execoption') +%% scrkcomp.dtx (with options: `class,article,body') %% scrkfont.dtx (with options: `class,article,body') %% scrklang.dtx (with options: `class,article,body') %% scrktare.dtx (with options: `class,article,body') @@ -37,7 +39,7 @@ %% scrklist.dtx (with options: `class,article,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -89,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2006/07/30 v2.95b KOMA-Script}% + \@CheckKOMAScriptVersion{2007/03/02 v2.97 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -102,6 +104,41 @@ ] %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] +%%% From File: scrkcomp.dtx +\newcommand*{\scr@compatibility}{0} +\KOMA@key{version}[last]{% + \scr@ifundefined{scr@v@#1}{% + \def\scr@compatibility{0}% + \ClassWarningNoLine{\KOMAClassName}{% + 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'% + }% + }{% + \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + }% +} +\AtEndOfClass{% + \KOMA@key{version}[]{% + \ClassError{\KOMAClassName}{% + Option `version' too late% + }{% + Option `version' may be set only while loading the class.\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@last}{3} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -117,7 +154,7 @@ %%% From File: scrklang.dtx %%% From File: scrkfont.dtx \newcommand*\@ptsize{% - 1% + 11% } \newcommand*{\@pt@scan}{% \expandafter\@pt@@scan\CurrentOption pt\@pt@@scan% @@ -131,14 +168,13 @@ }{\@headlines}% } \KOMA@key{fontsize}{% - \begingroup - \setlength{\@tempdima}{#1}% - \addtolength{\@tempdima}{-10\p@}% - \edef\@tempa{\endgroup\noexpand\renewcommand*\noexpand\@ptsize{% - \strip@pt\@tempdima}}% - \@tempa + \scr@ifundefined{changefontsizes}{% + \@defaultunits\@tempdima#1pt\relax\@nnil + \edef\@ptsize{#1}% + }{% + \changefontsizes{#1}% + }% } -\@onlypreamble\KV@KOMA@fontsize %%% From File: scrktare.dtx \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} @@ -197,12 +233,31 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } +\KOMA@key{headlines}{% + \PassOptionsToPackage{headlines=#1}{typearea}% +} +\KOMA@key{headinclude}[true]{\PassOptionsToPackage{headinclude=#1}{typearea}} +\KOMA@key{footinclude}[true]{\PassOptionsToPackage{footinclude=#1}{typearea}} +\KOMA@key{mpinclude}[true]{\PassOptionsToPackage{mpinclude=#1}{typearea}} +\KOMA@key{BCOR}{% + \PassOptionsToPackage{BCOR=#1}{typearea}% +} +\KOMA@key{DIV}[calc]{% + \PassOptionsToPackage{DIV=#1}{typearea}% +} \KOMA@key{twoside}[true]{% \KOMA@set@ifkey{twoside}{@twoside}{#1}% \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi% - \csname recalctypearea\endcsname } -\KOMA@DeclareObsoleteOption[\PackageInfo]{oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% +} +\KOMA@key{pagesize}[auto]{% + \PassOptionsToPackage{pagesize=#1}{typearea}% +} +\KOMA@key{paper}{% + \PassOptionsToPackage{paper=#1}{typearea}% +} %%% From File: scrkpar.dtx \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -319,11 +374,12 @@ %%% From File: scrktitl.dtx \newif\if@titlepage \@titlepagefalse -\DeclareOption{titlepage}{\@titlepagetrue} -\DeclareOption{notitlepage}{\@titlepagefalse} -\newif\if@abstrt -\DeclareOption{abstracton}{\@abstrttrue} -\DeclareOption{abstractoff}{\@abstrtfalse} +\KOMA@ifkey{titlepage}{@titlepage} +\KOMA@DeclareObsoleteOption[\ClassInfo]{notitlepage}{titlepage=false} +\newif\if@abstrt\@abstrtfalse +\KOMA@ifkey{abstract}{@abstrt} +\KOMA@DeclareObsoleteOption[\ClassInfo]{abstracton}{abstract=true} +\KOMA@DeclareObsoleteOption[\ClassInfo]{abstractoff}{abstract=false} %%% From File: scrksect.dtx \DeclareOption{pointednumbers}{% \AtEndOfClass{\@altsecnumformattrue @@ -436,6 +492,7 @@ If you'll continue, option `smallheadings' will be used% }% } +\@bigheadings %%% From File: scrkpage.dtx \newif\if@hsl \KOMA@key{headsepline}[true]{% @@ -443,7 +500,7 @@ \@ifpackageloaded{typearea}{% \KOMAoptions{headinclude=#1}% }{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }% } \KOMA@DeclareObsoleteOption[\PackageInfo]{headnosepline}{headsepline=false} @@ -453,7 +510,7 @@ \@ifpackageloaded{typearea}{% \KOMAoptions{footinclude=#1}% }{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }% } \KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false} @@ -461,11 +518,13 @@ \begingroup% \def\@tempc{% \endgroup% - \KOMA@unkown@keyval{cleardoublepage}{#1}{% + \KOMA@unknown@keyval{cleardoublepage}{#1}{% 'current' or any defined pagestyle e.g. 'empty','plain'}% }% \ifstr{#1}{current}{% - \let\cleardoublepage\cleardoublestandardpage + \def\@tempc{\endgroup% + \let\cleardoublepage\cleardoublestandardpage + }% }{% \ifnotundefined{ps@#1}{% \def\@tempc{\endgroup% @@ -488,7 +547,7 @@ cleardoublepage=plain% } \KOMA@DeclareObsoleteOption[\PackageInfo]{cleardoublestandard}{% - cleardoublepage=standard% + cleardoublepage=current% } %%% From File: scrkfloa.dtx \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -539,6 +598,15 @@ \newif\if@dynlist \DeclareOption{listsleft}{\@dynlisttrue} \DeclareOption{listsindent}{\@dynlistfalse} +\newcommand*{\@chapterlistsgap}{10\p@} +\newif\if@chaptertolists\@chaptertolistsfalse +\KOMA@key{chapteratlists}[entry]{% + \ifstr{#1}{entry}{% + \@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}% + }{% + \@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}% + }% +} %%% From File: scrkbib.dtx \DeclareOption{openbib}{% \AtEndOfPackage{% @@ -587,32 +655,259 @@ draft=false,headsepline=false,footsepline=false,parskip=false% ,twoside=false% } -\ExecuteOptions{% - bigheadings% - ,abstractoff% -} \ProcessOptions\relax +%%% From File: scrkcomp.dtx %%% From File: scrkfont.dtx -\@tempcnta=10 -\advance\@tempcnta by\@ptsize -\xdef\@tempa{% - size% - \the\@tempcnta.clo} -\InputIfFileExists{\@tempa}{}{% - \ClassError{\KOMAClassName}{% - File `\@tempa' not found!\MessageBreak - This error is fatal!% - }{% - To every fontsize you want to select by class - option,\MessageBreak - you need a corresponding - size-class-option-file declaring all\MessageBreak - the macros based on fontsize.\MessageBreak - Ask a wizzard for more information or use another - fontsize.\MessageBreak - You cannot continue!% - }% - \batchmode \csname @@end\endcsname \end +\newcommand*{\changefontsizes}[2][1.2\@tempdima]{% + \ClassWarning{\KOMAClassName}{% + Using fallback calculation to setup font sizes\MessageBreak + for basic size `#2'}% + \@defaultunits\@tempdima#2pt\relax\@nnil + \setlength{\@tempdimc}{\@tempdima}% + \addtolength{\@tempdimc}{-10\p@}% + \edef\@ptsize{\strip@pt\@tempdimc}% + \@defaultunits\@tempdimb#1pt\relax\@nnil + \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}% + \edef\@tempb{\the\@tempdimc}% + \setlength{\@tempdimc}{\@tempdima}% + \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}% + \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\normalsize{% + \noexpand\@setfontsize\noexpand\normalsize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listI + }% + \setlength{\@tempdima}{0.9125\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\small{% + \noexpand\@setfontsize\noexpand\small + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@small + }% + \setlength{\@tempdima}{.83334\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\footnotesize{% + \noexpand\@setfontsize\noexpand\footnotesize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@footnotesize + }% + \setlength{\@tempdima}{.66667\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\scriptsize{% + \noexpand\@setfontsize\noexpand\scriptsize + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{.5\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\tiny{% + \noexpand\@setfontsize\noexpand\tiny + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.2\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\large{% + \noexpand\@setfontsize\noexpand\large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.44\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Large{% + \noexpand\@setfontsize\noexpand\Large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.728\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\LARGE{% + \noexpand\@setfontsize\noexpand\LARGE + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.074\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\huge{% + \noexpand\@setfontsize\noexpand\huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.488\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Huge{% + \noexpand\@setfontsize\noexpand\Huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \normalsize + \setlength{\footnotesep}{.7\@tempdimc}% + \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus + .6\@tempdimc}% + \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dbltextfloatsep}{\textfloatsep}% + \setlength{\@fptop}{0\p@ \@plus 1fil}% + \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@fpbot}{\@fptop}% + \setlength{\@dblfptop}{0\p@ \@plus 1fil}% + \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@dblfpbot}{\@fptop}% + \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus + .5\@tempdimc}% + \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \let\@listI\@listi + \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus + .41667\@tempdimc}% + \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@small{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@footnotesize{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listii\endcsname + \endgroup + \edef\@listii{\leftmargin\leftmarginii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiii\endcsname + \endgroup + \edef\@listiii{\leftmargin\leftmarginiii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \z@ + \partopsep \the\parsep + \itemsep \topsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiv\endcsname + \endgroup + \def\@listiv{\leftmargin\leftmarginiv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listv\endcsname + \endgroup + \def\@listv{\leftmargin\leftmarginv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listvi\endcsname + \endgroup + \def\@listvi{\leftmargin\leftmarginvi + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@listi +} +\providecommand*{\@fontsizefilebase}{scrsize} +\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil +\edef\@tempa{\@ptsize}% +\setlength{\@tempdimb}{\@tempdima}% +\edef\@tempb{\strip@pt\@tempdimb}% +\addtolength{\@tempdimb}{-10\p@}% +\edef\@ptsize{\strip@pt\@tempdimb}% +\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{ + \ClassInfo{\KOMAClassName}{% + File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}% +}{% + \InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{% + \ClassInfo{\KOMAClassName}{% + File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak + file `\@fontsizefilebase\@tempa.clo' to setup font sizes}% + }{% + \InputIfFileExists{size\@tempb.clo}{% + \ClassInfo{\KOMAClassName}{% + File `size\@tempb.clo' used to setup font sizes}% + }{% + \changefontsizes{\@tempa}% + }% + }% } \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} \DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} @@ -654,7 +949,7 @@ }% }% } -\ifundefined{unexpanded}{% +\scr@ifundefined{unexpanded}{% \newcommand*{\g@addto@macro@temp}{}% \newcommand{\l@addto@macro}[2]{% \begingroup% @@ -718,8 +1013,10 @@ `#1' that is an alias of element `\csname scr@fnt@instead@#1\endcsname'\MessageBreak }% + \expandafter\expandafter\expandafter\usekomafont + \expandafter\expandafter\expandafter{% + \csname scr@fnt@instead@#1\endcsname}% }% - \@nameuse{scr@fnt@instead@#1}% }{% \@nameuse{scr@fnt@#1}% }% @@ -969,7 +1266,7 @@ \g@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}} \g@addto@macro{\small}{\protect\add@extra@listi{sml}} \newcommand*{\@list@extra}{% - \ifdim\parskip>\z@\topsep\z@\parskip\parskip\itemsep\z@\fi + \ifdim\parskip>\z@\topsep\z@\parsep\parskip\itemsep\z@\fi } \@lowpenalty = 51 \@medpenalty =151 @@ -1004,8 +1301,9 @@ \noindent\@extratitle\next@tpage\cleardoublepage \thispagestyle{empty}% \fi + \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \ifx\@titlehead\@empty \else - \noindent\begin{minipage}[t]{\textwidth}% + \begin{minipage}[t]{\textwidth}% \@titlehead \end{minipage}\par \fi @@ -1031,11 +1329,11 @@ \@thanks \vfill\null \if@twoside\next@tpage - \noindent\begin{minipage}[t]{\textwidth} + \begin{minipage}[t]{\textwidth} \@uppertitleback \end{minipage}\par \vfill - \noindent\begin{minipage}[b]{\textwidth} + \begin{minipage}[b]{\textwidth} \@lowertitleback \end{minipage} \fi @@ -1132,8 +1430,9 @@ \ifx\@extratitle\@empty \else \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi \fi + \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \ifx\@titlehead\@empty \else - \noindent\begin{minipage}[t]{\textwidth} + \begin{minipage}[t]{\textwidth} \@titlehead \end{minipage}\par \fi @@ -1247,7 +1546,7 @@ \addtocounter{#1}{-1}\scr@sect{#1}% } \BeforeClosingMainAux{% - \if@autodot\if@filesw\write\@mainaux{% + \if@autodot\if@filesw\immediate\write\@mainaux{% \string\global\string\@altsecnumformattrue}% \fi\fi} \newcommand*\autodot{\if@altsecnumformat.\fi} @@ -1271,9 +1570,11 @@ \renewcommand*{\thesubparagraph}{% \theparagraph.\@arabic\c@subparagraph } -\newcommand*{\othersectionlevelsformat}[1]{% - \csname the#1\endcsname\autodot\enskip} -\renewcommand*{\@seccntformat}{\protect\othersectionlevelsformat} +\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip} +\renewcommand*{\@seccntformat}[1]{% + \protect\othersectionlevelsformat{#1}{% + \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}% +} \newcommand*\partname{Part} \newcommand*\abstractname{Abstract} \newcommand*\appendixname{Appendix} @@ -1306,10 +1607,10 @@ \interlinepenalty \@M \normalfont\sectfont\nobreak \ifnum \c@secnumdepth >\m@ne - \size@partnumber\partformat + \size@partnumber{\partformat}% \partheadmidvskip \fi - \size@part #2\strut% + \size@part{#2}\strut% \partmark{#1}\par \endgroup \nobreak @@ -1322,7 +1623,7 @@ \raggedpart \interlinepenalty \@M \normalfont - \sectfont\nobreak\size@part #1\strut\@mkboth{}{}\par + \sectfont\nobreak\size@part{#1}\strut\@mkboth{}{}\par \endgroup \nobreak \partheadendvskip @@ -1350,36 +1651,43 @@ \newcommand\section{\@startsection{section}{1}{\z@}% {-3.5ex \@plus -1ex \@minus -.2ex}% {2.3ex \@plus.2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@section\nobreak}% + {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@ + plus 1fil}\fi + \raggedsection\normalfont\sectfont\size@section}% } \newcommand\subsection{\@startsection{subsection}{2}{\z@}% {-3.25ex\@plus -1ex \@minus -.2ex}% {1.5ex \@plus .2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@subsection\nobreak + {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@ + plus 1fil}\fi + \raggedsection\normalfont\sectfont\size@subsection }% } \newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% {-3.25ex\@plus -1ex \@minus -.2ex}% {1.5ex \@plus .2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@subsubsection - \nobreak + {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@ + plus 1fil}\fi + \raggedsection\normalfont\sectfont\size@subsubsection }% } \newcommand\paragraph{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus1ex \@minus.2ex}% {-1em}% - {\raggedsection\normalfont\sectfont\nobreak\size@paragraph\nobreak}% + {\raggedsection\normalfont\sectfont\size@paragraph}% } \newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}% {3.25ex \@plus1ex \@minus .2ex}% {-1em}% - {\raggedsection\normalfont\sectfont\nobreak\size@subparagraph - \nobreak - }% + {\raggedsection\normalfont\sectfont\size@subparagraph}% } +\newkomafont{minisec}{} \newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex {\parindent \z@ - \raggedsection\normalfont\sectfont\nobreak#1\par\nobreak}\nobreak% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax + \setlength{\parfillskip}{\z@ plus 1fil}\fi + \raggedsection\normalfont\sectfont + \usekomafont{minisec}#1\par\nobreak}\nobreak% \@afterheading } \newcommand*{\raggedsection}{} @@ -1402,7 +1710,6 @@ \newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} \newcommand*{\scr@fnt@paragraph}{\size@paragraph} \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} -\aliaskomafont{minisec}{disposition} \aliaskomafont{sectioning}{disposition} \newcommand*\l@part[2]{% \ifnum \c@tocdepth >-2\relax @@ -1421,18 +1728,25 @@ \advance\leftskip\@tempdima \hskip -\leftskip #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par - \if@compatibility - \global\@nobreaktrue - \everypar{\global\@nobreakfalse\everypar{}}% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96} + \endgroup + \penalty20010 \else - \penalty\@highpenalty - \fi - \endgroup + \if@compatibility + \global\@nobreaktrue + \everypar{\global\@nobreakfalse\everypar{}}% + \else + \penalty\@highpenalty + \fi + \endgroup + \fi \fi } \newcommand*\l@section[2]{% \ifnum \c@tocdepth >\z@ - \addpenalty{\@secpenalty}% + \ifnum \lastpenalty<20009 + \addpenalty{\@secpenalty}% + \fi \addvspace{1.0em \@plus\p@}% \setlength\@tempdima{1.5em}% \if@tocleft @@ -1446,14 +1760,38 @@ \leavevmode \sectfont \advance\leftskip\@tempdima \hskip -\leftskip - #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par + #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par\nobreak \endgroup + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96} + \penalty20008 + \fi + \fi +} +\newcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{2.3em}} +\newcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{3.2em}} +\newcommand*\l@paragraph{\bprot@dottedtocline{4}{7.0em}{4.1em}} +\newcommand*\l@subparagraph{\bprot@dottedtocline{5}{10em}{5em}} +\newcommand*{\bprot@dottedtocline}[5]{% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96} + \ifnum #1>\c@tocdepth \else + \begingroup + \@tempcnta 20010 + \advance \@tempcnta by -#1 + \ifnum \@tempcnta>\lastpenalty + \endgroup + \addpenalty{\@lowpenalty}% + \else + \endgroup + \fi + \@dottedtocline{#1}{#2}{#3}{#4}{#5}% + \@tempcnta 20009 + \advance \@tempcnta by -#1 + \penalty\@tempcnta + \fi + \else + \@dottedtocline{#1}{#2}{#3}{#4}{#5}% \fi } -\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}} -\newcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{3.2em}} -\newcommand*\l@paragraph{\@dottedtocline{4}{7.0em}{4.1em}} -\newcommand*\l@subparagraph{\@dottedtocline{5}{10em}{5em}} %%% From File: scrkmisc.dtx \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -1732,9 +2070,8 @@ \ifdim \@tempdimb<2em \ClassWarning{\KOMAClassName}{% caption beside will be very, very small.\MessageBreak - In most cases this will result in overfull and - underfull\MessageBreak - \string\hbox\space messages% + In most cases this will result in overfull and\MessageBreak + underfull \string\hbox\space messages% }% \fi \onelinecaptionsfalse @@ -1842,6 +2179,13 @@ \newcommand*{\setcapwidth}[2][]{% \begingroup% \setlength{\@tempdima}{#2}% + \ifdim\@tempdima <\z@ + \@tempdima\z@ + \ClassWarning{\KOMAClassName}{% + caption width less than 0pt not allowed.\MessageBreak + Setting caption width to 0pt% + }% + \fi \edef\@tempa{\endgroup\def\noexpand\cap@width{\the\@tempdima}}% \@tempa \begingroup diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 359f62a9ecf..610a3b25eb4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -6,6 +6,7 @@ %% %% scrkvers.dtx (with options: `class,book') %% scrkbase.dtx (with options: `load') +%% scrkcomp.dtx (with options: `class,book,option') %% scrkmisc.dtx (with options: `class,book,option') %% scrklang.dtx (with options: `class,book,option') %% scrkfont.dtx (with options: `class,book,option') @@ -21,6 +22,7 @@ %% scrkidx.dtx (with options: `class,book,option') %% scrklist.dtx (with options: `class,book,option') %% scrkmisc.dtx (with options: `class,book,execoption') +%% scrkcomp.dtx (with options: `class,book,body') %% scrkfont.dtx (with options: `class,book,body') %% scrklang.dtx (with options: `class,book,body') %% scrktare.dtx (with options: `class,book,body') @@ -37,7 +39,7 @@ %% scrklist.dtx (with options: `class,book,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -89,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2006/07/30 v2.95b KOMA-Script}% + \@CheckKOMAScriptVersion{2007/03/02 v2.97 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -102,6 +104,41 @@ ] %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] +%%% From File: scrkcomp.dtx +\newcommand*{\scr@compatibility}{0} +\KOMA@key{version}[last]{% + \scr@ifundefined{scr@v@#1}{% + \def\scr@compatibility{0}% + \ClassWarningNoLine{\KOMAClassName}{% + 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'% + }% + }{% + \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + }% +} +\AtEndOfClass{% + \KOMA@key{version}[]{% + \ClassError{\KOMAClassName}{% + Option `version' too late% + }{% + Option `version' may be set only while loading the class.\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@last}{3} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -117,7 +154,7 @@ %%% From File: scrklang.dtx %%% From File: scrkfont.dtx \newcommand*\@ptsize{% - 1% + 11% } \newcommand*{\@pt@scan}{% \expandafter\@pt@@scan\CurrentOption pt\@pt@@scan% @@ -131,14 +168,13 @@ }{\@headlines}% } \KOMA@key{fontsize}{% - \begingroup - \setlength{\@tempdima}{#1}% - \addtolength{\@tempdima}{-10\p@}% - \edef\@tempa{\endgroup\noexpand\renewcommand*\noexpand\@ptsize{% - \strip@pt\@tempdima}}% - \@tempa + \scr@ifundefined{changefontsizes}{% + \@defaultunits\@tempdima#1pt\relax\@nnil + \edef\@ptsize{#1}% + }{% + \changefontsizes{#1}% + }% } -\@onlypreamble\KV@KOMA@fontsize %%% From File: scrktare.dtx \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} @@ -197,12 +233,31 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } +\KOMA@key{headlines}{% + \PassOptionsToPackage{headlines=#1}{typearea}% +} +\KOMA@key{headinclude}[true]{\PassOptionsToPackage{headinclude=#1}{typearea}} +\KOMA@key{footinclude}[true]{\PassOptionsToPackage{footinclude=#1}{typearea}} +\KOMA@key{mpinclude}[true]{\PassOptionsToPackage{mpinclude=#1}{typearea}} +\KOMA@key{BCOR}{% + \PassOptionsToPackage{BCOR=#1}{typearea}% +} +\KOMA@key{DIV}[calc]{% + \PassOptionsToPackage{DIV=#1}{typearea}% +} \KOMA@key{twoside}[true]{% \KOMA@set@ifkey{twoside}{@twoside}{#1}% \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi% - \csname recalctypearea\endcsname } -\KOMA@DeclareObsoleteOption[\PackageInfo]{oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% +} +\KOMA@key{pagesize}[auto]{% + \PassOptionsToPackage{pagesize=#1}{typearea}% +} +\KOMA@key{paper}{% + \PassOptionsToPackage{paper=#1}{typearea}% +} %%% From File: scrkpar.dtx \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -319,10 +374,11 @@ %%% From File: scrktitl.dtx \newif\if@titlepage \@titlepagetrue -\DeclareOption{titlepage}{\@titlepagetrue} -\DeclareOption{notitlepage}{\@titlepagefalse} +\KOMA@ifkey{titlepage}{@titlepage} +\KOMA@DeclareObsoleteOption[\ClassInfo]{notitlepage}{titlepage=false} %%% From File: scrksect.dtx \newif\if@openright +\@openrighttrue \DeclareOption{openright}{\@openrighttrue} \DeclareOption{openany}{\@openrightfalse} \DeclareOption{pointednumbers}{% @@ -460,15 +516,20 @@ If you'll continue, option `smallheadings' will be used% }% } -\newif\if@chapterprefix -\DeclareOption{chapterprefix}{\@chapterprefixtrue} -\DeclareOption{nochapterprefix}{\@chapterprefixfalse} -\DeclareOption{appendixprefix}{% - \def\appendixmore{\@chapterprefixtrue}% -} -\DeclareOption{noappendixprefix}{% - \def\appendixmore{\@chapterprefixfalse}% +\@bigheadings +\newif\if@chapterprefix\@chapterprefixfalse +\KOMA@ifkey{chapterprefix}{@chapterprefix} +\KOMA@DeclareObsoleteOption{nochapterprefix}{chapterprefix=false} +\KOMA@key{appendixprefix}[true]{% + \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% + \if@tempswa + \def\appendixmore{\@chapterprefixtrue}% + \else + \def\appendixmore{\@chapterprefixfalse}% + \fi } +\KOMA@DeclareObsoleteOption[\ClassInfo]{noappendixprefix}{% + appendixprefix=false} %%% From File: scrkpage.dtx \newif\if@hsl \KOMA@key{headsepline}[true]{% @@ -476,7 +537,7 @@ \@ifpackageloaded{typearea}{% \KOMAoptions{headinclude=#1}% }{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }% } \KOMA@DeclareObsoleteOption[\PackageInfo]{headnosepline}{headsepline=false} @@ -486,7 +547,7 @@ \@ifpackageloaded{typearea}{% \KOMAoptions{footinclude=#1}% }{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }% } \KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false} @@ -494,11 +555,13 @@ \begingroup% \def\@tempc{% \endgroup% - \KOMA@unkown@keyval{cleardoublepage}{#1}{% + \KOMA@unknown@keyval{cleardoublepage}{#1}{% 'current' or any defined pagestyle e.g. 'empty','plain'}% }% \ifstr{#1}{current}{% - \let\cleardoublepage\cleardoublestandardpage + \def\@tempc{\endgroup% + \let\cleardoublepage\cleardoublestandardpage + }% }{% \ifnotundefined{ps@#1}{% \def\@tempc{\endgroup% @@ -521,7 +584,7 @@ cleardoublepage=plain% } \KOMA@DeclareObsoleteOption[\PackageInfo]{cleardoublestandard}{% - cleardoublepage=standard% + cleardoublepage=current% } %%% From File: scrkfloa.dtx \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -572,6 +635,15 @@ \newif\if@dynlist \DeclareOption{listsleft}{\@dynlisttrue} \DeclareOption{listsindent}{\@dynlistfalse} +\newcommand*{\@chapterlistsgap}{10\p@} +\newif\if@chaptertolists\@chaptertolistsfalse +\KOMA@key{chapteratlists}[entry]{% + \ifstr{#1}{entry}{% + \@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}% + }{% + \@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}% + }% +} %%% From File: scrkbib.dtx \DeclareOption{openbib}{% \AtEndOfPackage{% @@ -621,40 +693,263 @@ draft=false,headsepline=false,footsepline=false,parskip=false% ,twoside% } -\ExecuteOptions{% - bigheadings% - ,nochapterprefix,openright% -} \ProcessOptions\relax +%%% From File: scrkcomp.dtx %%% From File: scrkfont.dtx -\@tempcnta=10 -\advance\@tempcnta by\@ptsize -\xdef\@tempa{% - bk% - \the\@tempcnta.clo} -\InputIfFileExists{\@tempa}{}{% - \xdef\@tempb{size\the\@tempcnta.clo}% - \InputIfFileExists{\@tempb}{% - \ClassWarning{\KOMAClassName}{% - File `\@tempa' not found!\MessageBreak - Used `\@tempb' instead% - }% +\newcommand*{\changefontsizes}[2][1.2\@tempdima]{% + \ClassWarning{\KOMAClassName}{% + Using fallback calculation to setup font sizes\MessageBreak + for basic size `#2'}% + \@defaultunits\@tempdima#2pt\relax\@nnil + \setlength{\@tempdimc}{\@tempdima}% + \addtolength{\@tempdimc}{-10\p@}% + \edef\@ptsize{\strip@pt\@tempdimc}% + \@defaultunits\@tempdimb#1pt\relax\@nnil + \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}% + \edef\@tempb{\the\@tempdimc}% + \setlength{\@tempdimc}{\@tempdima}% + \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}% + \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\normalsize{% + \noexpand\@setfontsize\noexpand\normalsize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listI + }% + \setlength{\@tempdima}{0.9125\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\small{% + \noexpand\@setfontsize\noexpand\small + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@small + }% + \setlength{\@tempdima}{.83334\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\footnotesize{% + \noexpand\@setfontsize\noexpand\footnotesize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@footnotesize + }% + \setlength{\@tempdima}{.66667\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\scriptsize{% + \noexpand\@setfontsize\noexpand\scriptsize + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{.5\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\tiny{% + \noexpand\@setfontsize\noexpand\tiny + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.2\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\large{% + \noexpand\@setfontsize\noexpand\large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.44\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Large{% + \noexpand\@setfontsize\noexpand\Large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.728\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\LARGE{% + \noexpand\@setfontsize\noexpand\LARGE + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.074\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\huge{% + \noexpand\@setfontsize\noexpand\huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.488\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Huge{% + \noexpand\@setfontsize\noexpand\Huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \normalsize + \setlength{\footnotesep}{.7\@tempdimc}% + \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus + .6\@tempdimc}% + \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dbltextfloatsep}{\textfloatsep}% + \setlength{\@fptop}{0\p@ \@plus 1fil}% + \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@fpbot}{\@fptop}% + \setlength{\@dblfptop}{0\p@ \@plus 1fil}% + \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@dblfpbot}{\@fptop}% + \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus + .5\@tempdimc}% + \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \let\@listI\@listi + \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus + .41667\@tempdimc}% + \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@small{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@footnotesize{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listii\endcsname + \endgroup + \edef\@listii{\leftmargin\leftmarginii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiii\endcsname + \endgroup + \edef\@listiii{\leftmargin\leftmarginiii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \z@ + \partopsep \the\parsep + \itemsep \topsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiv\endcsname + \endgroup + \def\@listiv{\leftmargin\leftmarginiv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listv\endcsname + \endgroup + \def\@listv{\leftmargin\leftmarginv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listvi\endcsname + \endgroup + \def\@listvi{\leftmargin\leftmarginvi + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@listi +} +\providecommand*{\@fontsizefilebase}{scrsize} +\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil +\edef\@tempa{\@ptsize}% +\setlength{\@tempdimb}{\@tempdima}% +\edef\@tempb{\strip@pt\@tempdimb}% +\addtolength{\@tempdimb}{-10\p@}% +\edef\@ptsize{\strip@pt\@tempdimb}% +\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{ + \ClassInfo{\KOMAClassName}{% + File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}% +}{% + \InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{% + \ClassInfo{\KOMAClassName}{% + File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak + file `\@fontsizefilebase\@tempa.clo' to setup font sizes}% }{% - \ClassError{\KOMAClassName}{% - File `\@tempa' not found!\MessageBreak - This error is fatal!% + \InputIfFileExists{bk\@tempb.clo}{% + \ClassInfo{\KOMAClassName}{% + File `bk\@tempb.clo' used to setup font sizes}% }{% - To every fontsize you want to select by class - option,\MessageBreak - you need a corresponding - bk-class-option-file or\MessageBreak at least a - size-class-option-file declaring all\MessageBreak - the macros based on fontsize.\MessageBreak - Ask a wizzard for more information or use another - fontsize.\MessageBreak - You cannot continue!% + \InputIfFileExists{size\@tempb.clo}{% + \ClassInfo{\KOMAClassName}{% + File `size\@tempb.clo' used to setup font sizes}% + }{% + \changefontsizes{\@tempa}% + }% }% - \batchmode \csname @@end\endcsname \end }% } \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} @@ -697,7 +992,7 @@ }% }% } -\ifundefined{unexpanded}{% +\scr@ifundefined{unexpanded}{% \newcommand*{\g@addto@macro@temp}{}% \newcommand{\l@addto@macro}[2]{% \begingroup% @@ -761,8 +1056,10 @@ `#1' that is an alias of element `\csname scr@fnt@instead@#1\endcsname'\MessageBreak }% + \expandafter\expandafter\expandafter\usekomafont + \expandafter\expandafter\expandafter{% + \csname scr@fnt@instead@#1\endcsname}% }% - \@nameuse{scr@fnt@instead@#1}% }{% \@nameuse{scr@fnt@#1}% }% @@ -1012,7 +1309,7 @@ \g@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}} \g@addto@macro{\small}{\protect\add@extra@listi{sml}} \newcommand*{\@list@extra}{% - \ifdim\parskip>\z@\topsep\z@\parskip\parskip\itemsep\z@\fi + \ifdim\parskip>\z@\topsep\z@\parsep\parskip\itemsep\z@\fi } \@lowpenalty = 51 \@medpenalty =151 @@ -1047,8 +1344,9 @@ \noindent\@extratitle\next@tpage\cleardoublepage \thispagestyle{empty}% \fi + \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \ifx\@titlehead\@empty \else - \noindent\begin{minipage}[t]{\textwidth}% + \begin{minipage}[t]{\textwidth}% \@titlehead \end{minipage}\par \fi @@ -1074,11 +1372,11 @@ \@thanks \vfill\null \if@twoside\next@tpage - \noindent\begin{minipage}[t]{\textwidth} + \begin{minipage}[t]{\textwidth} \@uppertitleback \end{minipage}\par \vfill - \noindent\begin{minipage}[b]{\textwidth} + \begin{minipage}[b]{\textwidth} \@lowertitleback \end{minipage} \fi @@ -1175,8 +1473,9 @@ \ifx\@extratitle\@empty \else \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi \fi + \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \ifx\@titlehead\@empty \else - \noindent\begin{minipage}[t]{\textwidth} + \begin{minipage}[t]{\textwidth} \@titlehead \end{minipage}\par \fi @@ -1272,7 +1571,7 @@ \addtocounter{#1}{-1}\scr@sect{#1}% } \BeforeClosingMainAux{% - \if@autodot\if@filesw\write\@mainaux{% + \if@autodot\if@filesw\immediate\write\@mainaux{% \string\global\string\@altsecnumformattrue}% \fi\fi} \newcommand*\autodot{\if@altsecnumformat.\fi} @@ -1283,7 +1582,7 @@ \newcounter{chapter} \renewcommand*{\thechapter}{\@arabic\c@chapter} \newcommand*{\chapterformat}{% - \chapappifchapterprefix{\ }\thechapter\autodot\enskip + \mbox{\chapappifchapterprefix{~}\thechapter\autodot\enskip}% } \newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }% \thechapter\autodot\enskip} @@ -1302,9 +1601,11 @@ \renewcommand*{\thesubparagraph}{% \theparagraph.\@arabic\c@subparagraph } -\newcommand*{\othersectionlevelsformat}[1]{% - \csname the#1\endcsname\autodot\enskip} -\renewcommand*{\@seccntformat}{\protect\othersectionlevelsformat} +\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip} +\renewcommand*{\@seccntformat}[1]{% + \protect\othersectionlevelsformat{#1}{% + \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}% +} \newcommand*\partname{Part} \newcommand*\chaptername{Chapter} \newcommand*\appendixname{Appendix} @@ -1362,10 +1663,10 @@ \interlinepenalty \@M \normalfont\sectfont\nobreak \ifnum \c@secnumdepth >-2\relax - \size@partnumber\partformat + \size@partnumber{\partformat}% \partheadmidvskip \fi - \size@part #2\strut% + \size@part{#2}\strut% \partmark{#1}\par \endgroup \@endpart @@ -1376,7 +1677,7 @@ \raggedpart \interlinepenalty \@M \normalfont - \sectfont\nobreak\size@part #1\strut\@mkboth{}{}\par + \sectfont\nobreak\size@part{#1}\strut\@mkboth{}{}\par \endgroup \@endpart } @@ -1461,28 +1762,59 @@ \refstepcounter{chapter}% \@maybeautodot\thechapter \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}#1}% + \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}% + \if@chaptertolists + \addcontentsline{lof}{chapteratlist}{% + \protect\numberline{\thechapter}#1}% + \addcontentsline{lot}{chapteratlist}{% + \protect\numberline{\thechapter}#1}% + \@ifundefined{float@addtolists}{}{% + \float@addtolists{% + \protect\contentsline{chapteratlist}{% + \protect\numberline{\thechapter}#1}{\thepage}% + }% + }% + \fi \else \addcontentsline{toc}{chapter}{#1}% + \if@chaptertolists + \addcontentsline{lof}{chapteratlist}{#1}% + \addcontentsline{lot}{chapteratlist}{#1}% + \@ifundefined{float@addtolists}{}{% + \float@addtolists{% + \protect\contentsline{chapteratlist}{#1}{\thepage}% + }% + }% + \fi \fi - \else - \addcontentsline{toc}{chapter}{#1}% + \else + \addcontentsline{toc}{chapter}{#1}% + \if@chaptertolists + \addcontentsline{lof}{chapteratlist}{#1}% + \addcontentsline{lot}{chapteratlist}{#1}% + \@ifundefined{float@addtolists}{}{% + \float@addtolists{% + \protect\contentsline{chapteratlist}{#1}{\thepage}% + }% + }% \fi - \chaptermark{#1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% + \fi + \chaptermark{#1}% + \ifdim \@chapterlistsgap>\z@ + \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% + \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% \@ifundefined{float@addtolists}{}{% - \float@addtolists{\protect\addvspace{10\p@}}% + \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% }% - \if@twocolumn - \if@at@twocolumn - \@makechapterhead{#2}% - \else - \@topnewpage[\@makechapterhead{#2}]% - \fi - \else + \fi + \if@twocolumn + \if@at@twocolumn \@makechapterhead{#2}% + \else + \@topnewpage[\@makechapterhead{#2}]% + \fi + \else + \@makechapterhead{#2}% \@afterheading \fi } @@ -1492,21 +1824,29 @@ \use@preamble{chapter@u}\nobreak } \newcommand*{\@@makechapterhead}[1]{\chapterheadstartvskip - {\normalfont\sectfont\size@chapter + {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% + \normalfont\sectfont\size@chapter{}% \if@chapterprefix \let\@tempa\raggedsection \else \let\@tempa\@hangfrom \fi \@tempa{\ifnum \c@secnumdepth >\m@ne% - \if@mainmatter - \chapterformat + \if@mainmatter + \if@chapterprefix + \expandafter\size@chapterprefix + \else + \expandafter\size@chapter + \fi + {\chapterformat}% + \if@chapterprefix + \size@chapterprefix{}\endgraph\nobreak\vskip.5\baselineskip + \fi \fi \fi }% - \if@chapterprefix\par\nobreak\vskip.5\baselineskip\fi - {\raggedsection \interlinepenalty \@M #1\par}}% + {\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}% \nobreak\chapterheadendvskip } \newcommand*{\@schapter}[1]{% @@ -1523,9 +1863,9 @@ } \newcommand*{\@@makeschapterhead}[1]{% \chapterheadstartvskip% - {\normalfont\sectfont\size@chapter + {\normalfont\sectfont\size@chapter{}% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \raggedsection \interlinepenalty \@M #1\par}% + \raggedsection \interlinepenalty \@M \size@chapter{#1}\par}% \nobreak\chapterheadendvskip% } \newcommand*{\@makeschapterhead}[1]{% @@ -1542,6 +1882,24 @@ \newcommand*{\@addchap}{} \def\@addchap[#1]#2{\@schapter{#2}% \addcontentsline{toc}{chapter}{#1}% + \if@chaptertolists + \addcontentsline{lof}{chapteratlist}{#1}% + \addcontentsline{lot}{chapteratlist}{#1}% + \@ifundefined{float@addtolists}{}{% + \float@addtolists{% + \protect\contentsline{chapteratlist}{#1}{\thepage}% + }% + }% + \fi + \ifnum \@nameuse{scr@v@2.96}<\scr@compatibility + \ifdim \@chapterlistsgap>\z@ + \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% + \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% + \@ifundefined{float@addtolists}{}{% + \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% + }% + \fi + \fi \if@twoside\@mkboth{#1}{}\else\@mkboth{}{#1}\fi } \newcommand*{\@saddchap}[1]{\@schapter{#1}\@mkboth{}{}} @@ -1562,36 +1920,43 @@ \newcommand\section{\@startsection{section}{1}{\z@}% {-3.5ex \@plus -1ex \@minus -.2ex}% {2.3ex \@plus.2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@section\nobreak}% + {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@ + plus 1fil}\fi + \raggedsection\normalfont\sectfont\size@section}% } \newcommand\subsection{\@startsection{subsection}{2}{\z@}% {-3.25ex\@plus -1ex \@minus -.2ex}% {1.5ex \@plus .2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@subsection\nobreak + {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@ + plus 1fil}\fi + \raggedsection\normalfont\sectfont\size@subsection }% } \newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% {-3.25ex\@plus -1ex \@minus -.2ex}% {1.5ex \@plus .2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@subsubsection - \nobreak + {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@ + plus 1fil}\fi + \raggedsection\normalfont\sectfont\size@subsubsection }% } \newcommand\paragraph{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus1ex \@minus.2ex}% {-1em}% - {\raggedsection\normalfont\sectfont\nobreak\size@paragraph\nobreak}% + {\raggedsection\normalfont\sectfont\size@paragraph}% } \newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}% {3.25ex \@plus1ex \@minus .2ex}% {-1em}% - {\raggedsection\normalfont\sectfont\nobreak\size@subparagraph - \nobreak - }% + {\raggedsection\normalfont\sectfont\size@subparagraph}% } +\newkomafont{minisec}{} \newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex {\parindent \z@ - \raggedsection\normalfont\sectfont\nobreak#1\par\nobreak}\nobreak% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax + \setlength{\parfillskip}{\z@ plus 1fil}\fi + \raggedsection\normalfont\sectfont + \usekomafont{minisec}#1\par\nobreak}\nobreak% \@afterheading } \newcommand*{\raggedsection}{} @@ -1602,6 +1967,7 @@ \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} \newcommand*{\size@chapter}{} +\newcommand*{\size@chapterprefix}{\size@chapter} \newcommand*{\size@section}{} \newcommand*{\size@subsection}{} \newcommand*{\size@subsubsection}{} @@ -1611,12 +1977,12 @@ \newcommand*{\scr@fnt@part}{\size@part} \newcommand*{\scr@fnt@partnumber}{\size@partnumber} \newcommand*{\scr@fnt@chapter}{\size@chapter} +\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix} \newcommand*{\scr@fnt@section}{\size@section} \newcommand*{\scr@fnt@subsection}{\size@subsection} \newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} \newcommand*{\scr@fnt@paragraph}{\size@paragraph} \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} -\aliaskomafont{minisec}{disposition} \aliaskomafont{sectioning}{disposition} \newcommand*{\use@preamble}[1]{% \@ifundefined{#1@preamble}{}{% @@ -1747,13 +2113,20 @@ \advance\leftskip\@tempdima \hskip -\leftskip #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par - \penalty\@highpenalty - \endgroup + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96} + \endgroup + \penalty20010 + \else + \penalty\@highpenalty + \endgroup + \fi \fi } \newcommand*\l@chapter[2]{% \ifnum \c@tocdepth >\m@ne - \addpenalty{-\@highpenalty}% + \ifnum \lastpenalty<20010 + \addpenalty{-\@highpenalty}% + \fi \vskip 1.0em \@plus\p@ \setlength\@tempdima{1.5em}% \if@tocleft @@ -1768,15 +2141,42 @@ \advance\leftskip\@tempdima \hskip -\leftskip #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par - \penalty\@highpenalty - \endgroup + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96} + \endgroup + \penalty20009 + \else + \penalty\@highpenalty + \endgroup + \fi + \fi +} +\newcommand*{\l@chapteratlist}{\l@chapter} +\newcommand*\l@section{\bprot@dottedtocline{1}{1.5em}{2.3em}} +\newcommand*\l@subsection{\bprot@dottedtocline{2}{3.8em}{3.2em}} +\newcommand*\l@subsubsection{\bprot@dottedtocline{3}{7.0em}{4.1em}} +\newcommand*\l@paragraph{\bprot@dottedtocline{4}{10em}{5em}} +\newcommand*\l@subparagraph{\bprot@dottedtocline{5}{12em}{6em}} +\newcommand*{\bprot@dottedtocline}[5]{% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96} + \ifnum #1>\c@tocdepth \else + \begingroup + \@tempcnta 20010 + \advance \@tempcnta by -#1 + \ifnum \@tempcnta>\lastpenalty + \endgroup + \addpenalty{\@lowpenalty}% + \else + \endgroup + \fi + \@dottedtocline{#1}{#2}{#3}{#4}{#5}% + \@tempcnta 20009 + \advance \@tempcnta by -#1 + \penalty\@tempcnta + \fi + \else + \@dottedtocline{#1}{#2}{#3}{#4}{#5}% \fi } -\newcommand*\l@section{\@dottedtocline{1}{1.5em}{2.3em}} -\newcommand*\l@subsection{\@dottedtocline{2}{3.8em}{3.2em}} -\newcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{4.1em}} -\newcommand*\l@paragraph{\@dottedtocline{4}{10em}{5em}} -\newcommand*\l@subparagraph{\@dottedtocline{5}{12em}{6em}} %%% From File: scrkmisc.dtx \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -2068,9 +2468,8 @@ \ifdim \@tempdimb<2em \ClassWarning{\KOMAClassName}{% caption beside will be very, very small.\MessageBreak - In most cases this will result in overfull and - underfull\MessageBreak - \string\hbox\space messages% + In most cases this will result in overfull and\MessageBreak + underfull \string\hbox\space messages% }% \fi \onelinecaptionsfalse @@ -2178,6 +2577,13 @@ \newcommand*{\setcapwidth}[2][]{% \begingroup% \setlength{\@tempdima}{#2}% + \ifdim\@tempdima <\z@ + \@tempdima\z@ + \ClassWarning{\KOMAClassName}{% + caption width less than 0pt not allowed.\MessageBreak + Setting caption width to 0pt% + }% + \fi \edef\@tempa{\endgroup\def\noexpand\cap@width{\the\@tempdima}}% \@tempa \begingroup diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index d111c410519..d95843ecceb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -7,7 +7,7 @@ %% scrtime.dtx (with options: `scrdate') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls index 1173529737d..df50594a97a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls @@ -1,6 +1,6 @@ % ====================================================================== % scrdoc.dtx -% Copyright (C) 2002-2006 Markus Kohm +% Copyright (C) 2002-2007 Markus Kohm % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrdoc.dtx -% Copyright (C) 2002-2006 Markus Kohm +% Copyright (C) 2002-2007 Markus Kohm % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3b, verteilt und/oder veraendert werden. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 0f2579aa369..b62bd261183 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -10,7 +10,7 @@ %% scrkbase.dtx (with options: `package,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -62,102 +62,154 @@ \fi } \fi - \@CheckKOMAScriptVersion{2006/07/30 v2.95b KOMA-Script}% + \@CheckKOMAScriptVersion{2007/03/02 v2.97 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{scrkbase}[% \KOMAScriptVersion\space package (basics and keyval use)] -%%% From File: scrlfile.dtx -\def\scrlfileversion{2006/03/28 v2.95} -\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} -\@tempa -%%% From File: scrkbase.dtx \RequirePackage{keyval} -\begingroup - \def\@tempa#1=#2=#3\relax{% - \KV@@sp@def\@tempa{#1}% - \ifx\@tempa\@empty\else - \expandafter\let\expandafter\@tempc - \csname\KV@prefix\@tempa\endcsname - \ifx\@tempc\relax - \KV@errx - {\@tempa\space undefined}% - \else - \ifx\@empty#3\@empty - \KV@default - \else - \KV@@sp@def\@tempb{#2}% - \expandafter\@tempc\expandafter{\@tempb}\relax - \fi - \fi - \fi} - \@check@eq\KV@split\@tempa -\endgroup -\def\KV@split#1=#2=#3\relax{% - \KV@@sp@def\@tempa{#1}% - \ifx\@tempa\@empty\else - \expandafter\let\expandafter\@tempc - \csname\KV@prefix\@tempa\endcsname - \ifx\@tempc\relax - \scr@KV@errx{\@tempa}% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname ifcsname\endcsname + \newcommand{\scr@ifundefined}[1]{% + \ifcsname #1\endcsname + \expandafter\@secondoftwo \else - \ifx\@empty#3\@empty - \KV@default - \else - \KV@@sp@def\@tempb{#2}% - \expandafter\@tempc\expandafter{\@tempb}\relax - \fi + \expandafter\@firstoftwo \fi - \fi} -\CheckCommand*{\KV@default}{% - \expandafter\let\expandafter\@tempb - \csname\KV@prefix\@tempa @default\endcsname - \ifx\@tempb\relax - \KV@err{No value specified for \@tempa}% - \else - \@tempb\relax - \fi} -\renewcommand*{\KV@default}{% - \expandafter\let\expandafter\@tempb - \csname\KV@prefix\@tempa @default\endcsname - \ifx\@tempb\relax - \scr@KV@err{\@tempa}% - \else - \@tempb\relax - \fi} -\newcommand*{\scr@KV@errx}[1]{% - \expandafter\ifx\csname\KV@prefix nokey\endcsname\relax - \KV@errx{#1\space undefined}% - \else - \csname\KV@prefix nokey\endcsname{#1}% - \fi -} -\newcommand*{\scr@KV@err}[1]{% - \expandafter\ifx\csname\KV@prefix noval\endcsname\relax - \KV@err{No value specified for #1}% - \else - \csname\KV@prefix noval\endcsname{#1}% - \fi + } +\else + \newcommand{\scr@ifundefined}[1]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname #1\endcsname\relax + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + } +\fi +\newcommand*{\DeclareKeyValOption}[2][% + \ifx\@currext\@clsextension\OptionNotUsed\else\@unkownoptionerror\fi +]{% + \DeclareOption*{% + \def\@tempa##1=##2=##3\@nil{% + \scr@ifundefined{KV@#2@##1}{#1}{% + \@expandtwoargs\setkeys{#2}\CurrentOption + }% + }% + \expandafter\@tempa\CurrentOption==\@nil + }% } +\newcommand*{\KOMA@key}{\define@key{KOMA}} +\newcommand*{\dont@let@as@internal@defined}{/} +\KOMA@key{internalonly}{% + \begingroup + \@expandtwoargs\in@{#1}\dont@let@as@internal@defined + \expandafter\endgroup + \ifin@\else\g@addto@macro\dont@let@as@internal@defined{#1/}\fi +} +\DeclareKeyValOption{KOMA} +\ProcessOptions\relax +\newcommand*{\@globaloptionslist}{} +\scr@ifundefined{XKV@classooptionslist}{% + \let\@globaloptionslist\@classoptionslist +}{% + \let\@globaloptionslist\XKV@classoptionslist +} +\@expandtwoargs\in@{,internalonly=}{,\@globaloptionslist} +\ifin@ + \begingroup + \catcode`\=12\catcode`\:=12 + \def\@do@internalonly #1internalonly=#2\@nil{% + \ifx\relax#1\relax\setkeys{KOMA}{internalonly=#2}\fi + \@expandtwoargs\@removeelement{internalonly=#2}\@unusedoptionlist + \@unusedoptionlist + }% + \expandafter\@for\expandafter\@tempa\expandafter:\expandafter=% + \@globaloptionslist\do{% + \expandafter\@do@internalonly\@tempa\@nil + }% + \global\let\@unusedoptionlist\@unusedoptionlist + \endgroup +\fi +%%% From File: scrlfile.dtx +\def\scrlfileversion{2006/07/19 v2.96} +\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} +\@tempa +%%% From File: scrkbase.dtx \newif\if@atdocument \AtBeginDocument{\@atdocumenttrue} \@onlypreamble\@atdocumentrue \@onlypreamble\@atdocumentfalse -\newcommand{\ifundefined}[1]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #1\endcsname\relax - \expandafter\@firstoftwo +\newcommand*{\let@as@internal@defined}[1]{% + \begingroup + \@expandtwoargs\in@{/#1/}\dont@let@as@internal@defined + \expandafter\endgroup + \ifin@ + \PackageInfo{% + scrkbase% + }{% + \expandafter\string\csname #1\endcsname\space excluded from being + defined% + }% \else - \expandafter\@secondoftwo + \@ifundefined{#1}{% + \begingroup + \expandafter\def\expandafter\@tempa + \expandafter{\csname scr@#1\endcsname} + \expandafter\def\expandafter\@tempb + \expandafter{\csname #1\endcsname} + \expandafter\expandafter\expandafter\endgroup + \expandafter\expandafter\expandafter\let\expandafter\@tempb\@tempa + \if@atdocument\else + \g@addto@macro\document{% + \expandafter\ifx\csname #1\expandafter\endcsname + \csname scr@#1\endcsname + \else + \PackageWarning{scrkbase}{% + \expandafter\string\csname #1\endcsname\space was + redefined\MessageBreak + at the document preamble.\MessageBreak + If you did not redefine it by yourself, have a\MessageBreak + a look at the description of this command at\MessageBreak + the manual of every package you are using\@gobble + }% + \fi + }% + \fi + }{% + \PackageInfo{% + scrkbase% + }{% + \expandafter\string\csname #1\endcsname\space already + defined.\MessageBreak + If \expandafter\string\csname #1\endcsname\space does not behave + like\MessageBreak + it was described at the KOMA-Script manual, try to\MessageBreak + load `scrkbase.sty' earlier or find out at which\MessageBreak + package or class \expandafter\string\csname #1\endcsname\space + was defined before\@gobble + }% + }% \fi } -\newcommand{\ifnotundefined}[1]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #1\endcsname\relax - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi +\let@as@internal@defined{ifundefined} +\scr@ifundefined{ifcsname}{% + \newcommand{\ifnotundefined}[1]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname #1\endcsname\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi + }% +}{% + \newcommand{\ifnotundefined}[1]{% + \ifcsname #1\endcsname + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + }% } \newcommand\ifstr[2]{% \begingroup\edef\@tempa{#1}\edef\@tempb{#2}% @@ -251,30 +303,6 @@ }% }% } -\newcommand*{\let@as@internal@defined}[1]{ - \@ifundefined{#1}{% - \begingroup - \expandafter\def\expandafter\@tempa - \expandafter{\csname scr@#1\endcsname} - \expandafter\def\expandafter\@tempb - \expandafter{\csname #1\endcsname} - \expandafter\expandafter\expandafter\endgroup - \expandafter\expandafter\expandafter\let\expandafter\@tempb\@tempa - }{% - \PackageInfo{% - scrkbase% - }{% - \expandafter\string\csname #1\endcsname\space already - defined.\MessageBreak - If \expandafter\string\csname #1\endcsname\space does not behave - like\MessageBreak - it was described at the KOMA-Script manual, try to\MessageBreak - load `scrkbase.sty' earlier or find out at which\MessageBreak - package or class \expandafter\string\csname #1\endcsname\space - was defined before\@gobble - }% - }% -} \newcommand{\scr@ifpdftex}{\ifnotundefined{pdftexversion}} \let@as@internal@defined{ifpdftex} \BeforePackage{pdfcprot}{\let\ifpdftex\relax} @@ -282,8 +310,8 @@ \newcommand{\scr@ifvtex}{\ifnotundefined{VTeXversion}} \let@as@internal@defined{ifvtex} \newcommand{\scr@ifpdfoutput}{% - \ifundefined{pdfoutput}{% - \ifundefined{OpMode}{% + \scr@ifundefined{pdfoutput}{% + \scr@ifundefined{OpMode}{% \expandafter\@secondoftwo% }{% \ifnum\OpMode=1 @@ -322,8 +350,8 @@ } \let@as@internal@defined{ifpsoutput} \newcommand*{\scr@ifdvioutput}{% - \ifundefined{pdfoutput}{% - \ifundefined{OpMode}{% + \scr@ifundefined{pdfoutput}{% + \scr@ifundefined{OpMode}{% \expandafter\@firstoftwo }{% \ifnum\OpMode=0 @@ -341,77 +369,25 @@ }% } \let@as@internal@defined{ifdvioutput} -\newcommand*{\DeclareKeyValOption}[2][% - \ifx\@currext\@clsextension\OptionNotUsed\else\@unkownoptionerror\fi -]{% - \DeclareOption*{ - \expandafter\let\expandafter\@KV@saved@nokey - \csname KV@#2@nokey\endcsname - \@namedef{KV@#2@nokey}{#1\@gobble}% - \@expandtwoargs\setkeys{#2}\CurrentOption - \expandafter\let\csname KV@#2@nokey\endcsname\@KV@saved@nokey - }% -} -\newcommand*{\Pr@cessL@calKeyValOptions}[1]{% - \edef\@curroptions{\@ptionlist{\@currname.\@currext}}% - \ifx\@curroptions\@empty\else - \expandafter\let\expandafter\@KV@saved@nokey\csname KV@#1@nokey\endcsname - \@namedef{KV@#1@nokey}{\in@false\@gobble}% - \@for\CurrentOption:=\@curroptions\do{% - \ifx\CurrentOption\@empty\else - \in@true\@expandtwoargs\setkeys{#1}\CurrentOption - \ifin@ - \ifx\@currext\@clsextension - \@expandtwoargs\@removeelement\CurrentOption - \@unusedoptionlist\@unusedoptionlist - \else - \@expandtwoargs\@removeelement\CurrentOption - \@curroptions\@curroptions - \fi - \fi - \fi - }% - \let\CurrentOption\@empty - \ifx\@currext\@clsextension\else - \expandafter\let\csname opt@\@currname.\@currext\endcsname\@curroptions - \fi - \expandafter\let\csname KV@#1@nokey\endcsname\@KV@saved@nokey - \fi -} -\newcommand*{\Pr@cessGl@balKeyValOptions}[1]{% - \ifx\@currext\@clsextension\else - \expandafter\let\expandafter\@KV@saved@nokey - \csname KV@#1@nokey\endcsname - \@namedef{KV@#1@nokey}{\in@false\@gobble}% - \@for\CurrentOption:=\@classoptionslist\do{% - \ifx\CurrentOption\@empty\else - \in@true\@expandtwoargs\setkeys{#1}\CurrentOption - \ifin@ - \@expandtwoargs\@removeelement\CurrentOption - \@unusedoptionlist\@unusedoptionlist - \fi - \fi - }% - \let\CurrentOption\@empty - \expandafter\let\csname KV@#1@nokey\endcsname\@KV@saved@nokey - \fi -} -\newcommand*{\ProcessKeyValOptions}[1]{% - \Pr@cessGl@balKeyValOptions{#1}% - \Pr@cessL@calKeyValOptions{#1}% -} -\newcommand*{\ProcessAllOptions}{% - \@ifstar\@Pr@cessAll@pti@ns\Pr@cessAll@pti@ns -} -\newcommand*{\@Pr@cessAll@pti@ns}[1]{% - \ProcessKeyValOptions{#1}\ProcessOptions* -} -\newcommand*{\Pr@cessAll@pti@ns}[1]{% - \ProcessKeyValOptions{#1}\ProcessOptions\relax -} -\newcommand*{\KOMA@key}{\define@key{KOMA}} \newcommand*{\KOMAoptions}[1]{% + \let\post@kopt@hook\@empty \setkeys{KOMA}{#1}% + \post@kopt@hook\let\post@kopt@hook\relax +} +\newcommand*{\post@kopt@hook}{} +\let\post@kopt@hook\relax +\newcommand*{\AfterKOMAoptions}{% + \ifx\post@kopt@hook\relax + \PackageWarning{scrkbase}{% + \string\AfterKOMAoptions\space can only be used inside a\MessageBreak + KOMA-Script option that is called using \space\KOMAoptions.\MessageBreak + Because if this, command will be ignored% + }% + \expandafter\@gobbletwo + \else + \expandafter\l@addto@macro + \fi + \post@kopt@hook } \KOMA@key{nokey}{% \PackageError{% @@ -516,8 +492,13 @@ \fi \@tempa } +\newcommand*{\scr@sr@co}{} \newcommand*{\KOMA@DeclareObsoleteOption}[3][\@gobbletwo]{% - \DeclareOption{#2}{\KOMA@UseObsolete{option}{#1}{#2}{#3}}% + \DeclareOption{#2}{% + \let\scr@sr@co\CurrentOption + \KOMA@UseObsolete{option}{#1}{#2}{#3}% + \let\CurrentOption\scr@sr@co + }% } \newcommand*{\KOMA@UseObsolete}[4]{% #2{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls index 3f4e2ceca78..b5a13d21aae 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls @@ -7,7 +7,7 @@ %% scrlettr.dtx (with options: `scrlettr') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index a2a4ca5eabb..53ec2056688 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -7,19 +7,22 @@ %% scrlfile.dtx (with options: `scrlfile') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2002 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- %% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.2 -%% of this license or (at your option) any later version. +%% This work may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, version 1.3b of the license. %% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.2 or later is part of all distributions of LaTeX -%% version 1999/12/01 or later. +%% http://www.latex-project.org/lppl.txt +%% and version 1.3b or later is part of all distributions of LaTeX +%% version 2005/12/01 or later and of this work. +%% +%% This work has the LPPL maintenance status "author-maintained". +%% +%% The Current Maintainer and author of this work is Markus Kohm. %% %% This file may only be distributed together with the files %% `scrlogo.dtx', `scrlfile.dtx' and `scrlfile.ins'. You may however @@ -38,7 +41,7 @@ %% standard classes created by The LaTeX3 Project 1994-1996. %% %%% From File: scrlfile.dtx -\def\scrlfileversion{2006/03/28 v2.95} +\def\scrlfileversion{2006/07/19 v2.96} \ProvidesPackage{scrlfile}[% \scrlfileversion\space KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% @@ -50,10 +53,63 @@ \IfFileExists{#1}% {#2\@addtofilelist{#1}\@@input \@filef@und}} \renewcommand{\InputIfFileExists}[2]{% - \IfFileExists{#1}{% - \scr@load@hook{before}{#1}% - #2\@addtofilelist{#1}\@@input \@filef@und - \scr@load@hook{after}{#1}}} + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname #1-@alias\endcsname\relax + \expandafter\@secondoftwo + \else + \scr@replacefile@msg{\csname #1-@alias\endcsname}{#1}% + \expandafter\@firstoftwo + \fi + {% + \expandafter\InputIfFileExists\expandafter{\csname + #1-@alias\endcsname}{#2}% + }% + {\IfFileExists{#1}{% + \scr@load@hook{before}{#1}% + #2\@addtofilelist{#1}% + \@@input \@filef@und + \scr@load@hook{after}{#1}% + }}% +} +\newcommand*{\scr@loadwithoptions}{} +\let\scr@loadwithoptions\@loadwithoptions +\renewcommand*{\@loadwithoptions}[3]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname #3.#1-@aliasname\endcsname\relax + \scr@loadwithoptions{#1}{#2}{#3}% + \else + \scr@replacefile@msg{\csname #3.#1-@aliasname\endcsname.#1}{#3.#1}% + \@loadwithoptions{#1}{#2}{\csname #3.#1-@aliasname\endcsname}% + \fi +} +\newcommand*{\scr@onefilewithoptions}{} +\let\scr@onefilewithoptions\@onefilewithoptions +\def\@onefilewithoptions#1[#2][#3]#4{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname #1.#4-@aliasname\endcsname\relax + \scr@onefilewithoptions{#1}[{#2}][{#3}]{#4}% + \else + \scr@replacefile@msg{\csname #1.#4-@aliasname\endcsname.#4}{#1.#4}% + \expandafter\@onefilewithoptions\expandafter{% + \csname #1.#4-@aliasname\endcsname + }[{#2}][{#3}]{#4}% + \fi +} +\newcommand*{\ReplaceFile}[2]{% + \expandafter\edef\csname #1-@alias\endcsname{#2}% +} +\newcommand*{\@replacefilewithext}[3]{% + \expandafter\edef\csname #1.#3-@aliasname\endcsname{#2}% +} +\newcommand*{\ReplacePackage}[2]{% + \@replacefilewithext{#1}{#2}\@pkgextension +} +\newcommand*{\ReplaceClass}[2]{% + \@replacefilewithext{#1}{#2}\@clsextension +} +\newcommand*{\scr@replacefile@msg}[2]{% + \PackageInfo{scrlfile}{inputting `#1' instead of `#2'}% +} \newcommand*{\scr@load@hook}[2]{% \@ifundefined{#2-@#1}{}{% \@nameuse{#2-@#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index b3adea55192..5402941504f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -39,7 +39,7 @@ %% scrkcile.dtx (with options: `class,letter,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -91,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2006/07/30 v2.95b KOMA-Script}% + \@CheckKOMAScriptVersion{2007/03/02 v2.97 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -107,7 +107,7 @@ %%% From File: scrkcomp.dtx \newcommand*{\scr@compatibility}{0} \KOMA@key{version}[last]{% - \ifundefined{scr@v@#1}{% + \scr@ifundefined{scr@v@#1}{% \def\scr@compatibility{0}% \ClassWarningNoLine{\KOMAClassName}{% You have set option `version' to value `#1', but\MessageBreak @@ -133,7 +133,12 @@ \@namedef{scr@v@2.9t}{0} \@namedef{scr@v@2.9u}{1} \@namedef{scr@v@2.95}{2} -\@namedef{scr@v@last}{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@last}{3} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -164,7 +169,7 @@ \KOMA@DeclareObsoleteOption[\PackageInfo]{orgdate}{numericaldate=false} %%% From File: scrkfont.dtx \newcommand*\@ptsize{% - 2% + 12% } \newcommand*{\@pt@scan}{% \expandafter\@pt@@scan\CurrentOption pt\@pt@@scan% @@ -178,14 +183,13 @@ }{\@headlines}% } \KOMA@key{fontsize}{% - \begingroup - \setlength{\@tempdima}{#1}% - \addtolength{\@tempdima}{-10\p@}% - \edef\@tempa{\endgroup\noexpand\renewcommand*\noexpand\@ptsize{% - \strip@pt\@tempdima}}% - \@tempa + \scr@ifundefined{changefontsizes}{% + \@defaultunits\@tempdima#1pt\relax\@nnil + \edef\@ptsize{#1}% + }{% + \changefontsizes{#1}% + }% } -\@onlypreamble\KV@KOMA@fontsize %%% From File: scrkvars.dtx %%% From File: scrkplen.dtx %%% From File: scrktare.dtx @@ -246,12 +250,31 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } +\KOMA@key{headlines}{% + \PassOptionsToPackage{headlines=#1}{typearea}% +} +\KOMA@key{headinclude}[true]{\PassOptionsToPackage{headinclude=#1}{typearea}} +\KOMA@key{footinclude}[true]{\PassOptionsToPackage{footinclude=#1}{typearea}} +\KOMA@key{mpinclude}[true]{\PassOptionsToPackage{mpinclude=#1}{typearea}} +\KOMA@key{BCOR}{% + \PassOptionsToPackage{BCOR=#1}{typearea}% +} +\KOMA@key{DIV}[calc]{% + \PassOptionsToPackage{DIV=#1}{typearea}% +} \KOMA@key{twoside}[true]{% \KOMA@set@ifkey{twoside}{@twoside}{#1}% \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi% - \csname recalctypearea\endcsname } -\KOMA@DeclareObsoleteOption[\PackageInfo]{oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% +} +\KOMA@key{pagesize}[auto]{% + \PassOptionsToPackage{pagesize=#1}{typearea}% +} +\KOMA@key{paper}{% + \PassOptionsToPackage{paper=#1}{typearea}% +} %%% From File: scrkpar.dtx \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -372,7 +395,7 @@ \@ifpackageloaded{typearea}{% \KOMAoptions{headinclude=#1}% }{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }% } \KOMA@DeclareObsoleteOption[\PackageInfo]{headnosepline}{headsepline=false} @@ -382,7 +405,7 @@ \@ifpackageloaded{typearea}{% \KOMAoptions{footinclude=#1}% }{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }% } \KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false} @@ -390,11 +413,13 @@ \begingroup% \def\@tempc{% \endgroup% - \KOMA@unkown@keyval{cleardoublepage}{#1}{% + \KOMA@unknown@keyval{cleardoublepage}{#1}{% 'current' or any defined pagestyle e.g. 'empty','plain'}% }% \ifstr{#1}{current}{% - \let\cleardoublepage\cleardoublestandardpage + \def\@tempc{\endgroup% + \let\cleardoublepage\cleardoublestandardpage + }% }{% \ifnotundefined{ps@#1}{% \def\@tempc{\endgroup% @@ -417,7 +442,7 @@ cleardoublepage=plain% } \KOMA@DeclareObsoleteOption[\PackageInfo]{cleardoublestandard}{% - cleardoublepage=standard% + cleardoublepage=current% } %%% From File: scrkfloa.dtx %%% From File: scrkftn.dtx @@ -442,8 +467,35 @@ \KOMA@ifkey{fromlogo}{@logo} \newif\if@afield\@afieldtrue \KOMA@ifkey{addrfield}{@afield} +\newcommand{\backaddr@format}[1]{} +\let\backaddr@format\underline \newif\if@baddr\@baddrtrue -\KOMA@ifkey{backaddress}{@baddr} +\KOMA@key{backaddress}[true]{% + \begingroup + \KOMA@set@ncmdkey{backaddress}{@tempa}{% + {false}{0},{off}{0},{no}{0},% + {true}{1},{on}{1},{yes}{1},% + {underlined}{2},% + {plain}{3}% + }{#1}% + \ifcase\@tempa + \endgroup + \@baddrfalse + \or + \endgroup + \@baddrtrue + \or + \endgroup + \@baddrtrue + \let\backaddr@format\underline + \or + \endgroup + \@baddrtrue + \let\backaddr@format\@firstofone + \else + \endgroup + \fi +} \newif\if@bigloc \KOMA@key{locfield}[wide]{% \begingroup @@ -466,10 +518,10 @@ \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1}}{#1}% \ifcase\@tempa \endgroup - \@refwidefalse + \@refwidetrue \else \endgroup - \@refwidetrue + \@refwidefalse \fi } \newif\if@subj @@ -551,8 +603,6 @@ draft=false,headsepline=false,footsepline=false,parskip=false% ,twoside=false% } -\ExecuteOptions{% -} \ProcessOptions\relax %%% From File: scrkcomp.dtx \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility @@ -567,26 +617,256 @@ }% \fi %%% From File: scrkfont.dtx -\@tempcnta=10 -\advance\@tempcnta by\@ptsize -\xdef\@tempa{% - size% - \the\@tempcnta.clo} -\InputIfFileExists{\@tempa}{}{% - \ClassError{\KOMAClassName}{% - File `\@tempa' not found!\MessageBreak - This error is fatal!% - }{% - To every fontsize you want to select by class - option,\MessageBreak - you need a corresponding - size-class-option-file declaring all\MessageBreak - the macros based on fontsize.\MessageBreak - Ask a wizzard for more information or use another - fontsize.\MessageBreak - You cannot continue!% - }% - \batchmode \csname @@end\endcsname \end +\newcommand*{\changefontsizes}[2][1.2\@tempdima]{% + \ClassWarning{\KOMAClassName}{% + Using fallback calculation to setup font sizes\MessageBreak + for basic size `#2'}% + \@defaultunits\@tempdima#2pt\relax\@nnil + \setlength{\@tempdimc}{\@tempdima}% + \addtolength{\@tempdimc}{-10\p@}% + \edef\@ptsize{\strip@pt\@tempdimc}% + \@defaultunits\@tempdimb#1pt\relax\@nnil + \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}% + \edef\@tempb{\the\@tempdimc}% + \setlength{\@tempdimc}{\@tempdima}% + \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}% + \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\normalsize{% + \noexpand\@setfontsize\noexpand\normalsize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listI + }% + \setlength{\@tempdima}{0.9125\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\small{% + \noexpand\@setfontsize\noexpand\small + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@small + }% + \setlength{\@tempdima}{.83334\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\footnotesize{% + \noexpand\@setfontsize\noexpand\footnotesize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@footnotesize + }% + \setlength{\@tempdima}{.66667\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\scriptsize{% + \noexpand\@setfontsize\noexpand\scriptsize + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{.5\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\tiny{% + \noexpand\@setfontsize\noexpand\tiny + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.2\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\large{% + \noexpand\@setfontsize\noexpand\large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.44\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Large{% + \noexpand\@setfontsize\noexpand\Large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.728\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\LARGE{% + \noexpand\@setfontsize\noexpand\LARGE + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.074\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\huge{% + \noexpand\@setfontsize\noexpand\huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.488\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Huge{% + \noexpand\@setfontsize\noexpand\Huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \normalsize + \setlength{\footnotesep}{.7\@tempdimc}% + \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus + .6\@tempdimc}% + \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dbltextfloatsep}{\textfloatsep}% + \setlength{\@fptop}{0\p@ \@plus 1fil}% + \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@fpbot}{\@fptop}% + \setlength{\@dblfptop}{0\p@ \@plus 1fil}% + \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@dblfpbot}{\@fptop}% + \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus + .5\@tempdimc}% + \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \let\@listI\@listi + \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus + .41667\@tempdimc}% + \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@small{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@footnotesize{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listii\endcsname + \endgroup + \edef\@listii{\leftmargin\leftmarginii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiii\endcsname + \endgroup + \edef\@listiii{\leftmargin\leftmarginiii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \z@ + \partopsep \the\parsep + \itemsep \topsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiv\endcsname + \endgroup + \def\@listiv{\leftmargin\leftmarginiv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listv\endcsname + \endgroup + \def\@listv{\leftmargin\leftmarginv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listvi\endcsname + \endgroup + \def\@listvi{\leftmargin\leftmarginvi + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@listi +} +\providecommand*{\@fontsizefilebase}{scrsize} +\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil +\edef\@tempa{\@ptsize}% +\setlength{\@tempdimb}{\@tempdima}% +\edef\@tempb{\strip@pt\@tempdimb}% +\addtolength{\@tempdimb}{-10\p@}% +\edef\@ptsize{\strip@pt\@tempdimb}% +\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{ + \ClassInfo{\KOMAClassName}{% + File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}% +}{% + \InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{% + \ClassInfo{\KOMAClassName}{% + File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak + file `\@fontsizefilebase\@tempa.clo' to setup font sizes}% + }{% + \InputIfFileExists{size\@tempb.clo}{% + \ClassInfo{\KOMAClassName}{% + File `size\@tempb.clo' used to setup font sizes}% + }{% + \changefontsizes{\@tempa}% + }% + }% } \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} \DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} @@ -628,7 +908,7 @@ }% }% } -\ifundefined{unexpanded}{% +\scr@ifundefined{unexpanded}{% \newcommand*{\g@addto@macro@temp}{}% \newcommand{\l@addto@macro}[2]{% \begingroup% @@ -692,8 +972,10 @@ `#1' that is an alias of element `\csname scr@fnt@instead@#1\endcsname'\MessageBreak }% + \expandafter\expandafter\expandafter\usekomafont + \expandafter\expandafter\expandafter{% + \csname scr@fnt@instead@#1\endcsname}% }% - \@nameuse{scr@fnt@instead@#1}% }{% \@nameuse{scr@fnt@#1}% }% @@ -1614,7 +1896,7 @@ \g@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}} \g@addto@macro{\small}{\protect\add@extra@listi{sml}} \newcommand*{\@list@extra}{% - \ifdim\parskip>\z@\topsep\z@\parskip\parskip\itemsep\z@\fi + \ifdim\parskip>\z@\topsep\z@\parsep\parskip\itemsep\z@\fi } \@lowpenalty = 51 \@medpenalty =151 @@ -2201,7 +2483,7 @@ \ifkomavarempty{backaddress}{}{{% \noindent% \def\\{\usekomavar{backaddressseparator}\@ogobble}% - \underline{\scriptsize\usekomafont{backaddress}% + \backaddr@format{\scriptsize\usekomafont{backaddress}% \usekomavar{backaddress}}}}% \fi }{backaddress}{backaddrheight}{\setkomavar}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty index 9bc1e8c7466..fcfffc74282 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty @@ -7,7 +7,7 @@ %% scrpage.dtx (with options: `scrpage,v1') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index 57ded19152e..e152a442f4e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty @@ -7,7 +7,7 @@ %% scrpage.dtx (with options: `scrpage,v2') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index b98fa5ee2f8..ad85f3dd205 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -6,6 +6,7 @@ %% %% scrkvers.dtx (with options: `class,report') %% scrkbase.dtx (with options: `load') +%% scrkcomp.dtx (with options: `class,report,option') %% scrkmisc.dtx (with options: `class,report,option') %% scrklang.dtx (with options: `class,report,option') %% scrkfont.dtx (with options: `class,report,option') @@ -21,6 +22,7 @@ %% scrkidx.dtx (with options: `class,report,option') %% scrklist.dtx (with options: `class,report,option') %% scrkmisc.dtx (with options: `class,report,execoption') +%% scrkcomp.dtx (with options: `class,report,body') %% scrkfont.dtx (with options: `class,report,body') %% scrklang.dtx (with options: `class,report,body') %% scrktare.dtx (with options: `class,report,body') @@ -37,7 +39,7 @@ %% scrklist.dtx (with options: `class,report,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -89,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2006/07/30 v2.95b KOMA-Script}% + \@CheckKOMAScriptVersion{2007/03/02 v2.97 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -102,6 +104,41 @@ ] %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] +%%% From File: scrkcomp.dtx +\newcommand*{\scr@compatibility}{0} +\KOMA@key{version}[last]{% + \scr@ifundefined{scr@v@#1}{% + \def\scr@compatibility{0}% + \ClassWarningNoLine{\KOMAClassName}{% + 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'% + }% + }{% + \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + }% +} +\AtEndOfClass{% + \KOMA@key{version}[]{% + \ClassError{\KOMAClassName}{% + Option `version' too late% + }{% + Option `version' may be set only while loading the class.\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@last}{3} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -117,7 +154,7 @@ %%% From File: scrklang.dtx %%% From File: scrkfont.dtx \newcommand*\@ptsize{% - 1% + 11% } \newcommand*{\@pt@scan}{% \expandafter\@pt@@scan\CurrentOption pt\@pt@@scan% @@ -131,14 +168,13 @@ }{\@headlines}% } \KOMA@key{fontsize}{% - \begingroup - \setlength{\@tempdima}{#1}% - \addtolength{\@tempdima}{-10\p@}% - \edef\@tempa{\endgroup\noexpand\renewcommand*\noexpand\@ptsize{% - \strip@pt\@tempdima}}% - \@tempa + \scr@ifundefined{changefontsizes}{% + \@defaultunits\@tempdima#1pt\relax\@nnil + \edef\@ptsize{#1}% + }{% + \changefontsizes{#1}% + }% } -\@onlypreamble\KV@KOMA@fontsize %%% From File: scrktare.dtx \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} @@ -197,12 +233,31 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } +\KOMA@key{headlines}{% + \PassOptionsToPackage{headlines=#1}{typearea}% +} +\KOMA@key{headinclude}[true]{\PassOptionsToPackage{headinclude=#1}{typearea}} +\KOMA@key{footinclude}[true]{\PassOptionsToPackage{footinclude=#1}{typearea}} +\KOMA@key{mpinclude}[true]{\PassOptionsToPackage{mpinclude=#1}{typearea}} +\KOMA@key{BCOR}{% + \PassOptionsToPackage{BCOR=#1}{typearea}% +} +\KOMA@key{DIV}[calc]{% + \PassOptionsToPackage{DIV=#1}{typearea}% +} \KOMA@key{twoside}[true]{% \KOMA@set@ifkey{twoside}{@twoside}{#1}% \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi% - \csname recalctypearea\endcsname } -\KOMA@DeclareObsoleteOption[\PackageInfo]{oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% +} +\KOMA@key{pagesize}[auto]{% + \PassOptionsToPackage{pagesize=#1}{typearea}% +} +\KOMA@key{paper}{% + \PassOptionsToPackage{paper=#1}{typearea}% +} %%% From File: scrkpar.dtx \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -319,13 +374,15 @@ %%% From File: scrktitl.dtx \newif\if@titlepage \@titlepagetrue -\DeclareOption{titlepage}{\@titlepagetrue} -\DeclareOption{notitlepage}{\@titlepagefalse} -\newif\if@abstrt -\DeclareOption{abstracton}{\@abstrttrue} -\DeclareOption{abstractoff}{\@abstrtfalse} +\KOMA@ifkey{titlepage}{@titlepage} +\KOMA@DeclareObsoleteOption[\ClassInfo]{notitlepage}{titlepage=false} +\newif\if@abstrt\@abstrtfalse +\KOMA@ifkey{abstract}{@abstrt} +\KOMA@DeclareObsoleteOption[\ClassInfo]{abstracton}{abstract=true} +\KOMA@DeclareObsoleteOption[\ClassInfo]{abstractoff}{abstract=false} %%% From File: scrksect.dtx \newif\if@openright +\@openrightfalse \DeclareOption{openright}{\@openrighttrue} \DeclareOption{openany}{\@openrightfalse} \DeclareOption{pointednumbers}{% @@ -463,15 +520,20 @@ If you'll continue, option `smallheadings' will be used% }% } -\newif\if@chapterprefix -\DeclareOption{chapterprefix}{\@chapterprefixtrue} -\DeclareOption{nochapterprefix}{\@chapterprefixfalse} -\DeclareOption{appendixprefix}{% - \def\appendixmore{\@chapterprefixtrue}% -} -\DeclareOption{noappendixprefix}{% - \def\appendixmore{\@chapterprefixfalse}% +\@bigheadings +\newif\if@chapterprefix\@chapterprefixfalse +\KOMA@ifkey{chapterprefix}{@chapterprefix} +\KOMA@DeclareObsoleteOption{nochapterprefix}{chapterprefix=false} +\KOMA@key{appendixprefix}[true]{% + \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% + \if@tempswa + \def\appendixmore{\@chapterprefixtrue}% + \else + \def\appendixmore{\@chapterprefixfalse}% + \fi } +\KOMA@DeclareObsoleteOption[\ClassInfo]{noappendixprefix}{% + appendixprefix=false} %%% From File: scrkpage.dtx \newif\if@hsl \KOMA@key{headsepline}[true]{% @@ -479,7 +541,7 @@ \@ifpackageloaded{typearea}{% \KOMAoptions{headinclude=#1}% }{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }% } \KOMA@DeclareObsoleteOption[\PackageInfo]{headnosepline}{headsepline=false} @@ -489,7 +551,7 @@ \@ifpackageloaded{typearea}{% \KOMAoptions{footinclude=#1}% }{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }% } \KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false} @@ -497,11 +559,13 @@ \begingroup% \def\@tempc{% \endgroup% - \KOMA@unkown@keyval{cleardoublepage}{#1}{% + \KOMA@unknown@keyval{cleardoublepage}{#1}{% 'current' or any defined pagestyle e.g. 'empty','plain'}% }% \ifstr{#1}{current}{% - \let\cleardoublepage\cleardoublestandardpage + \def\@tempc{\endgroup% + \let\cleardoublepage\cleardoublestandardpage + }% }{% \ifnotundefined{ps@#1}{% \def\@tempc{\endgroup% @@ -524,7 +588,7 @@ cleardoublepage=plain% } \KOMA@DeclareObsoleteOption[\PackageInfo]{cleardoublestandard}{% - cleardoublepage=standard% + cleardoublepage=current% } %%% From File: scrkfloa.dtx \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -575,6 +639,15 @@ \newif\if@dynlist \DeclareOption{listsleft}{\@dynlisttrue} \DeclareOption{listsindent}{\@dynlistfalse} +\newcommand*{\@chapterlistsgap}{10\p@} +\newif\if@chaptertolists\@chaptertolistsfalse +\KOMA@key{chapteratlists}[entry]{% + \ifstr{#1}{entry}{% + \@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}% + }{% + \@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}% + }% +} %%% From File: scrkbib.dtx \DeclareOption{openbib}{% \AtEndOfPackage{% @@ -624,32 +697,259 @@ draft=false,headsepline=false,footsepline=false,parskip=false% ,twoside=false% } -\ExecuteOptions{% - bigheadings% - ,nochapterprefix,openany,abstractoff% -} \ProcessOptions\relax +%%% From File: scrkcomp.dtx %%% From File: scrkfont.dtx -\@tempcnta=10 -\advance\@tempcnta by\@ptsize -\xdef\@tempa{% - size% - \the\@tempcnta.clo} -\InputIfFileExists{\@tempa}{}{% - \ClassError{\KOMAClassName}{% - File `\@tempa' not found!\MessageBreak - This error is fatal!% - }{% - To every fontsize you want to select by class - option,\MessageBreak - you need a corresponding - size-class-option-file declaring all\MessageBreak - the macros based on fontsize.\MessageBreak - Ask a wizzard for more information or use another - fontsize.\MessageBreak - You cannot continue!% - }% - \batchmode \csname @@end\endcsname \end +\newcommand*{\changefontsizes}[2][1.2\@tempdima]{% + \ClassWarning{\KOMAClassName}{% + Using fallback calculation to setup font sizes\MessageBreak + for basic size `#2'}% + \@defaultunits\@tempdima#2pt\relax\@nnil + \setlength{\@tempdimc}{\@tempdima}% + \addtolength{\@tempdimc}{-10\p@}% + \edef\@ptsize{\strip@pt\@tempdimc}% + \@defaultunits\@tempdimb#1pt\relax\@nnil + \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}% + \edef\@tempb{\the\@tempdimc}% + \setlength{\@tempdimc}{\@tempdima}% + \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}% + \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\normalsize{% + \noexpand\@setfontsize\noexpand\normalsize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listI + }% + \setlength{\@tempdima}{0.9125\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\small{% + \noexpand\@setfontsize\noexpand\small + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@small + }% + \setlength{\@tempdima}{.83334\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\footnotesize{% + \noexpand\@setfontsize\noexpand\footnotesize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@footnotesize + }% + \setlength{\@tempdima}{.66667\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\scriptsize{% + \noexpand\@setfontsize\noexpand\scriptsize + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{.5\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\tiny{% + \noexpand\@setfontsize\noexpand\tiny + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.2\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\large{% + \noexpand\@setfontsize\noexpand\large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.44\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Large{% + \noexpand\@setfontsize\noexpand\Large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.728\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\LARGE{% + \noexpand\@setfontsize\noexpand\LARGE + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.074\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\huge{% + \noexpand\@setfontsize\noexpand\huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.488\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Huge{% + \noexpand\@setfontsize\noexpand\Huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \normalsize + \setlength{\footnotesep}{.7\@tempdimc}% + \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus + .6\@tempdimc}% + \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dbltextfloatsep}{\textfloatsep}% + \setlength{\@fptop}{0\p@ \@plus 1fil}% + \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@fpbot}{\@fptop}% + \setlength{\@dblfptop}{0\p@ \@plus 1fil}% + \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@dblfpbot}{\@fptop}% + \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus + .5\@tempdimc}% + \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \let\@listI\@listi + \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus + .41667\@tempdimc}% + \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@small{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@footnotesize{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listii\endcsname + \endgroup + \edef\@listii{\leftmargin\leftmarginii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiii\endcsname + \endgroup + \edef\@listiii{\leftmargin\leftmarginiii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \z@ + \partopsep \the\parsep + \itemsep \topsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiv\endcsname + \endgroup + \def\@listiv{\leftmargin\leftmarginiv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listv\endcsname + \endgroup + \def\@listv{\leftmargin\leftmarginv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listvi\endcsname + \endgroup + \def\@listvi{\leftmargin\leftmarginvi + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@listi +} +\providecommand*{\@fontsizefilebase}{scrsize} +\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil +\edef\@tempa{\@ptsize}% +\setlength{\@tempdimb}{\@tempdima}% +\edef\@tempb{\strip@pt\@tempdimb}% +\addtolength{\@tempdimb}{-10\p@}% +\edef\@ptsize{\strip@pt\@tempdimb}% +\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{ + \ClassInfo{\KOMAClassName}{% + File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}% +}{% + \InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{% + \ClassInfo{\KOMAClassName}{% + File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak + file `\@fontsizefilebase\@tempa.clo' to setup font sizes}% + }{% + \InputIfFileExists{size\@tempb.clo}{% + \ClassInfo{\KOMAClassName}{% + File `size\@tempb.clo' used to setup font sizes}% + }{% + \changefontsizes{\@tempa}% + }% + }% } \DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} \DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} @@ -691,7 +991,7 @@ }% }% } -\ifundefined{unexpanded}{% +\scr@ifundefined{unexpanded}{% \newcommand*{\g@addto@macro@temp}{}% \newcommand{\l@addto@macro}[2]{% \begingroup% @@ -755,8 +1055,10 @@ `#1' that is an alias of element `\csname scr@fnt@instead@#1\endcsname'\MessageBreak }% + \expandafter\expandafter\expandafter\usekomafont + \expandafter\expandafter\expandafter{% + \csname scr@fnt@instead@#1\endcsname}% }% - \@nameuse{scr@fnt@instead@#1}% }{% \@nameuse{scr@fnt@#1}% }% @@ -1006,7 +1308,7 @@ \g@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}} \g@addto@macro{\small}{\protect\add@extra@listi{sml}} \newcommand*{\@list@extra}{% - \ifdim\parskip>\z@\topsep\z@\parskip\parskip\itemsep\z@\fi + \ifdim\parskip>\z@\topsep\z@\parsep\parskip\itemsep\z@\fi } \@lowpenalty = 51 \@medpenalty =151 @@ -1041,8 +1343,9 @@ \noindent\@extratitle\next@tpage\cleardoublepage \thispagestyle{empty}% \fi + \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \ifx\@titlehead\@empty \else - \noindent\begin{minipage}[t]{\textwidth}% + \begin{minipage}[t]{\textwidth}% \@titlehead \end{minipage}\par \fi @@ -1068,11 +1371,11 @@ \@thanks \vfill\null \if@twoside\next@tpage - \noindent\begin{minipage}[t]{\textwidth} + \begin{minipage}[t]{\textwidth} \@uppertitleback \end{minipage}\par \vfill - \noindent\begin{minipage}[b]{\textwidth} + \begin{minipage}[b]{\textwidth} \@lowertitleback \end{minipage} \fi @@ -1169,8 +1472,9 @@ \ifx\@extratitle\@empty \else \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi \fi + \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \ifx\@titlehead\@empty \else - \noindent\begin{minipage}[t]{\textwidth} + \begin{minipage}[t]{\textwidth} \@titlehead \end{minipage}\par \fi @@ -1287,7 +1591,7 @@ \addtocounter{#1}{-1}\scr@sect{#1}% } \BeforeClosingMainAux{% - \if@autodot\if@filesw\write\@mainaux{% + \if@autodot\if@filesw\immediate\write\@mainaux{% \string\global\string\@altsecnumformattrue}% \fi\fi} \newcommand*\autodot{\if@altsecnumformat.\fi} @@ -1298,7 +1602,7 @@ \newcounter{chapter} \renewcommand*{\thechapter}{\@arabic\c@chapter} \newcommand*{\chapterformat}{% - \chapappifchapterprefix{\ }\thechapter\autodot\enskip + \mbox{\chapappifchapterprefix{~}\thechapter\autodot\enskip}% } \newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }% \thechapter\autodot\enskip} @@ -1317,9 +1621,11 @@ \renewcommand*{\thesubparagraph}{% \theparagraph.\@arabic\c@subparagraph } -\newcommand*{\othersectionlevelsformat}[1]{% - \csname the#1\endcsname\autodot\enskip} -\renewcommand*{\@seccntformat}{\protect\othersectionlevelsformat} +\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip} +\renewcommand*{\@seccntformat}[1]{% + \protect\othersectionlevelsformat{#1}{% + \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}% +} \newcommand*\partname{Part} \newcommand*\chaptername{Chapter} \newcommand*\abstractname{Abstract} @@ -1378,10 +1684,10 @@ \interlinepenalty \@M \normalfont\sectfont\nobreak \ifnum \c@secnumdepth >-2\relax - \size@partnumber\partformat + \size@partnumber{\partformat}% \partheadmidvskip \fi - \size@part #2\strut% + \size@part{#2}\strut% \partmark{#1}\par \endgroup \@endpart @@ -1392,7 +1698,7 @@ \raggedpart \interlinepenalty \@M \normalfont - \sectfont\nobreak\size@part #1\strut\@mkboth{}{}\par + \sectfont\nobreak\size@part{#1}\strut\@mkboth{}{}\par \endgroup \@endpart } @@ -1476,25 +1782,47 @@ \refstepcounter{chapter}% \@maybeautodot\thechapter \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}#1}% - \else - \addcontentsline{toc}{chapter}{#1}% + \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}% + \if@chaptertolists + \addcontentsline{lof}{chapteratlist}{% + \protect\numberline{\thechapter}#1}% + \addcontentsline{lot}{chapteratlist}{% + \protect\numberline{\thechapter}#1}% + \@ifundefined{float@addtolists}{}{% + \float@addtolists{% + \protect\contentsline{chapteratlist}{% + \protect\numberline{\thechapter}#1}{\thepage}% + }% + }% + \fi + \else + \addcontentsline{toc}{chapter}{#1}% + \if@chaptertolists + \addcontentsline{lof}{chapteratlist}{#1}% + \addcontentsline{lot}{chapteratlist}{#1}% + \@ifundefined{float@addtolists}{}{% + \float@addtolists{% + \protect\contentsline{chapteratlist}{#1}{\thepage}% + }% + }% \fi - \chaptermark{#1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% + \fi + \chaptermark{#1}% + \ifdim \@chapterlistsgap>\z@ + \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% + \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% \@ifundefined{float@addtolists}{}{% - \float@addtolists{\protect\addvspace{10\p@}}% + \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% }% - \if@twocolumn - \if@at@twocolumn - \@makechapterhead{#2}% - \else - \@topnewpage[\@makechapterhead{#2}]% - \fi - \else + \fi + \if@twocolumn + \if@at@twocolumn \@makechapterhead{#2}% + \else + \@topnewpage[\@makechapterhead{#2}]% + \fi + \else + \@makechapterhead{#2}% \@afterheading \fi } @@ -1504,19 +1832,27 @@ \use@preamble{chapter@u}\nobreak } \newcommand*{\@@makechapterhead}[1]{\chapterheadstartvskip - {\normalfont\sectfont\size@chapter + {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% + \normalfont\sectfont\size@chapter{}% \if@chapterprefix \let\@tempa\raggedsection \else \let\@tempa\@hangfrom \fi \@tempa{\ifnum \c@secnumdepth >\m@ne% - \chapterformat + \if@chapterprefix + \expandafter\size@chapterprefix + \else + \expandafter\size@chapter + \fi + {\chapterformat}% + \if@chapterprefix + \size@chapterprefix{}\endgraph\nobreak\vskip.5\baselineskip + \fi \fi }% - \if@chapterprefix\par\nobreak\vskip.5\baselineskip\fi - {\raggedsection \interlinepenalty \@M #1\par}}% + {\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}% \nobreak\chapterheadendvskip } \newcommand*{\@schapter}[1]{% @@ -1533,9 +1869,9 @@ } \newcommand*{\@@makeschapterhead}[1]{% \chapterheadstartvskip% - {\normalfont\sectfont\size@chapter + {\normalfont\sectfont\size@chapter{}% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \raggedsection \interlinepenalty \@M #1\par}% + \raggedsection \interlinepenalty \@M \size@chapter{#1}\par}% \nobreak\chapterheadendvskip% } \newcommand*{\@makeschapterhead}[1]{% @@ -1552,6 +1888,24 @@ \newcommand*{\@addchap}{} \def\@addchap[#1]#2{\@schapter{#2}% \addcontentsline{toc}{chapter}{#1}% + \if@chaptertolists + \addcontentsline{lof}{chapteratlist}{#1}% + \addcontentsline{lot}{chapteratlist}{#1}% + \@ifundefined{float@addtolists}{}{% + \float@addtolists{% + \protect\contentsline{chapteratlist}{#1}{\thepage}% + }% + }% + \fi + \ifnum \@nameuse{scr@v@2.96}<\scr@compatibility + \ifdim \@chapterlistsgap>\z@ + \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% + \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% + \@ifundefined{float@addtolists}{}{% + \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% + }% + \fi + \fi \if@twoside\@mkboth{#1}{}\else\@mkboth{}{#1}\fi } \newcommand*{\@saddchap}[1]{\@schapter{#1}\@mkboth{}{}} @@ -1564,36 +1918,43 @@ \newcommand\section{\@startsection{section}{1}{\z@}% {-3.5ex \@plus -1ex \@minus -.2ex}% {2.3ex \@plus.2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@section\nobreak}% + {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@ + plus 1fil}\fi + \raggedsection\normalfont\sectfont\size@section}% } \newcommand\subsection{\@startsection{subsection}{2}{\z@}% {-3.25ex\@plus -1ex \@minus -.2ex}% {1.5ex \@plus .2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@subsection\nobreak + {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@ + plus 1fil}\fi + \raggedsection\normalfont\sectfont\size@subsection }% } \newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% {-3.25ex\@plus -1ex \@minus -.2ex}% {1.5ex \@plus .2ex}% - {\raggedsection\normalfont\sectfont\nobreak\size@subsubsection - \nobreak + {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@ + plus 1fil}\fi + \raggedsection\normalfont\sectfont\size@subsubsection }% } \newcommand\paragraph{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus1ex \@minus.2ex}% {-1em}% - {\raggedsection\normalfont\sectfont\nobreak\size@paragraph\nobreak}% + {\raggedsection\normalfont\sectfont\size@paragraph}% } \newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}% {3.25ex \@plus1ex \@minus .2ex}% {-1em}% - {\raggedsection\normalfont\sectfont\nobreak\size@subparagraph - \nobreak - }% + {\raggedsection\normalfont\sectfont\size@subparagraph}% } +\newkomafont{minisec}{} \newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex {\parindent \z@ - \raggedsection\normalfont\sectfont\nobreak#1\par\nobreak}\nobreak% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax + \setlength{\parfillskip}{\z@ plus 1fil}\fi + \raggedsection\normalfont\sectfont + \usekomafont{minisec}#1\par\nobreak}\nobreak% \@afterheading } \newcommand*{\raggedsection}{} @@ -1604,6 +1965,7 @@ \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} \newcommand*{\size@chapter}{} +\newcommand*{\size@chapterprefix}{\size@chapter} \newcommand*{\size@section}{} \newcommand*{\size@subsection}{} \newcommand*{\size@subsubsection}{} @@ -1613,12 +1975,12 @@ \newcommand*{\scr@fnt@part}{\size@part} \newcommand*{\scr@fnt@partnumber}{\size@partnumber} \newcommand*{\scr@fnt@chapter}{\size@chapter} +\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix} \newcommand*{\scr@fnt@section}{\size@section} \newcommand*{\scr@fnt@subsection}{\size@subsection} \newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} \newcommand*{\scr@fnt@paragraph}{\size@paragraph} \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} -\aliaskomafont{minisec}{disposition} \aliaskomafont{sectioning}{disposition} \newcommand*{\use@preamble}[1]{% \@ifundefined{#1@preamble}{}{% @@ -1749,13 +2111,20 @@ \advance\leftskip\@tempdima \hskip -\leftskip #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par - \penalty\@highpenalty - \endgroup + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96} + \endgroup + \penalty20010 + \else + \penalty\@highpenalty + \endgroup + \fi \fi } \newcommand*\l@chapter[2]{% \ifnum \c@tocdepth >\m@ne - \addpenalty{-\@highpenalty}% + \ifnum \lastpenalty<20010 + \addpenalty{-\@highpenalty}% + \fi \vskip 1.0em \@plus\p@ \setlength\@tempdima{1.5em}% \if@tocleft @@ -1770,15 +2139,42 @@ \advance\leftskip\@tempdima \hskip -\leftskip #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par - \penalty\@highpenalty - \endgroup + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96} + \endgroup + \penalty20009 + \else + \penalty\@highpenalty + \endgroup + \fi + \fi +} +\newcommand*{\l@chapteratlist}{\l@chapter} +\newcommand*\l@section{\bprot@dottedtocline{1}{1.5em}{2.3em}} +\newcommand*\l@subsection{\bprot@dottedtocline{2}{3.8em}{3.2em}} +\newcommand*\l@subsubsection{\bprot@dottedtocline{3}{7.0em}{4.1em}} +\newcommand*\l@paragraph{\bprot@dottedtocline{4}{10em}{5em}} +\newcommand*\l@subparagraph{\bprot@dottedtocline{5}{12em}{6em}} +\newcommand*{\bprot@dottedtocline}[5]{% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.96} + \ifnum #1>\c@tocdepth \else + \begingroup + \@tempcnta 20010 + \advance \@tempcnta by -#1 + \ifnum \@tempcnta>\lastpenalty + \endgroup + \addpenalty{\@lowpenalty}% + \else + \endgroup + \fi + \@dottedtocline{#1}{#2}{#3}{#4}{#5}% + \@tempcnta 20009 + \advance \@tempcnta by -#1 + \penalty\@tempcnta + \fi + \else + \@dottedtocline{#1}{#2}{#3}{#4}{#5}% \fi } -\newcommand*\l@section{\@dottedtocline{1}{1.5em}{2.3em}} -\newcommand*\l@subsection{\@dottedtocline{2}{3.8em}{3.2em}} -\newcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{4.1em}} -\newcommand*\l@paragraph{\@dottedtocline{4}{10em}{5em}} -\newcommand*\l@subparagraph{\@dottedtocline{5}{12em}{6em}} %%% From File: scrkmisc.dtx \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -2066,9 +2462,8 @@ \ifdim \@tempdimb<2em \ClassWarning{\KOMAClassName}{% caption beside will be very, very small.\MessageBreak - In most cases this will result in overfull and - underfull\MessageBreak - \string\hbox\space messages% + In most cases this will result in overfull and\MessageBreak + underfull \string\hbox\space messages% }% \fi \onelinecaptionsfalse @@ -2176,6 +2571,13 @@ \newcommand*{\setcapwidth}[2][]{% \begingroup% \setlength{\@tempdima}{#2}% + \ifdim\@tempdima <\z@ + \@tempdima\z@ + \ClassWarning{\KOMAClassName}{% + caption width less than 0pt not allowed.\MessageBreak + Setting caption width to 0pt% + }% + \fi \edef\@tempa{\endgroup\def\noexpand\cap@width{\the\@tempdima}}% \@tempa \begingroup diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index b22295559a9..e19c135a003 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -7,7 +7,7 @@ %% scrtime.dtx (with options: `scrtime') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 72c50031e09..9078819aa54 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -10,7 +10,7 @@ %% scrktare.dtx (with options: `package,option,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2006 +%% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2006/07/30 v2.95b KOMA-Script}% + \@CheckKOMAScriptVersion{2007/03/02 v2.97 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -72,7 +72,7 @@ \@spaces\@spaces\@spaces\@spaces\space\space Copyright (C) Frank Neukam, 1992-1994^^J% \@spaces\@spaces\@spaces\@spaces\space\space - Copyright (C) Markus Kohm, 1994-2002^^J% + Copyright (C) Markus Kohm, 1994-^^J% } %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] @@ -250,6 +250,12 @@ \AtEndOfPackage{\KOMA@key{DIV}{\typearea[current]{#1}}} \KOMA@DeclareObsoleteOption[\PackageInfo]{DIVcalc}{DIV=calc} \KOMA@DeclareObsoleteOption[\PackageInfo]{DIVclassic}{DIV=classic} +\KOMA@key{twoside}[true]{% + \KOMA@set@ifkey{twoside}{@twoside}{#1}% + \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi% + \csname recalctypearea\endcsname +} +\KOMA@DeclareObsoleteOption[\PackageInfo]{oneside}{twoside=false} \KOMA@key{twocolumn}[true]{% \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% \csname recalctypearea\endcsname @@ -416,7 +422,7 @@ }{} \DeclareKeyValOption[\x@paper]{KOMA} \KOMAoptions{headinclude=false,footinclude=false,paper=A4} -\ProcessAllOptions{KOMA} +\ProcessOptions*\relax \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} \newlength{\ta@hblk} @@ -488,6 +494,12 @@ \if@fincl \advance\ta@temp by-\footskip \fi + \scr@ifundefined{@ptsize}{% + \topskip=\f@size\p@ + }{% + \topskip=\@ptsize\p@ + \advance\topskip by 10\p@ + }% \textheight=\topskip \@whiledim\textheight <\ta@temp \do{\advance\textheight by\baselineskip}% @@ -529,8 +541,12 @@ \divide\ta@temp by26 \fi } -\AtBeginDocument{% - \newcommand\@typearea@end{% +\newcommand*{\AfterCalculatingTypearea}{% + \@ifstar \l@addto@macro \g@addto@macro \@typearea@end +} +\newcommand*{\@typearea@end}{} +\newcommand*{\activateareas}{% + \if@atdocument \PackageWarning{typearea}{% Typearea changed!\MessageBreak You should do this only at preamble, because only\MessageBreak @@ -549,8 +565,8 @@ \fi \hsize=\columnwidth \linewidth\hsize - \ifundefined{@pagesizelast}{}{\KOMAoptions{pagesize=\@pagesizelast}}% - }% + \scr@ifundefined{@pagesizelast}{}{\KOMAoptions{pagesize=\@pagesizelast}}% + \fi } \newcommand*{\ta@divfor}[1]{% \if@mincl @@ -562,16 +578,26 @@ \ta@div=2 \else \xdef\@tempa{\ta@divlist{}}% - \ta@div=#1\relax - \@whilenum \ta@div >-9 \do {% - \ifx\@tempa\empty - \else \xdef\@tempa{\expandafter\@cdr\@tempa\@nil}\fi - \advance\ta@div by-1 - }% + \@tempdima=#1pt + \addtolength{\@tempdima}{.5\p@}% + \divide\@tempdima by\p@ + \setlength{\@tempdimb}{\@tempdima}% + \multiply\@tempdimb by\p@ + \ifdim \@tempdimb=#1pt + \ta@div=#1\relax + \@whilenum \ta@div >-9 \do {% + \ifx\@tempa\empty + \else \xdef\@tempa{\expandafter\@cdr\@tempa\@nil}\fi + \advance\ta@div by-1 + }% + \else + \let\@tempa\empty + \fi \ifx\@tempa\empty - \ta@div=10 \advance\ta@div by#1 + \setlength{\@tempdima}{#1\p@}% + \addtolength{\@tempdima}{10\p@}% \PackageWarningNoLine{typearea}{% - DIV for \the\ta@div pt and used papersize\MessageBreak + DIV for \the\@tempdima\space and used papersize\MessageBreak not defined!\MessageBreak Using DIV=\ta@divlistelse }% @@ -587,6 +613,20 @@ \fi } \newcommand*\typearea[2][\z@]{% + \scr@ifundefined{currentgrouptype}{}{% + \ifcase\currentgrouptype\else + \PackageWarning{typearea}{% + \string\typearea\space used at group level + \the\currentgrouplevel.\MessageBreak + Using \string\typearea\space inside any group, e.g.\MessageBreak + environments, math mode, boxes, etc. may result in\MessageBreak + many type setting problems. Because of this you\MessageBreak + should never do this. You should move the + \string\typearea\MessageBreak + outside all groups% + }% + \fi + }% \edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else \setlength{\ta@bcor}{#1}% \fi @@ -622,7 +662,7 @@ \marginparpush=0.45\baselineskip \ifnum\ta@div=\z@ \@ifundefined{@ptsize}{% - \@tempdima=\f@size pt + \@tempdima=\f@size\p@ \advance\@tempdima by.5pt \ta@div=\@tempdima \divide\ta@div by65536 @@ -630,7 +670,7 @@ \xdef\@ptsize{\the\ta@div}% \PackageWarningNoLine{typearea}{% \string\@ptsize\space not defined!\MessageBreak - Fontsize ist \f@size.\MessageBreak + Fontsize is \f@size pt.\MessageBreak Defining \string\@ptsize\space to \@ptsize% }% }{}% @@ -772,7 +812,8 @@ \space\string\baselineskip\space\space\space=% \space\the\baselineskip\MessageBreak }% - \if@atdocument\@typearea@end\fi + \@typearea@end + \activateareas \fi } \AtEndOfPackage{\newcommand*{\recalctypearea}{\typearea[current]{last}}} @@ -780,7 +821,7 @@ \edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else \setlength{\ta@bcor}{#1}% \fi - \if@atdocument\newpage\fi + \if@atdocument\newpage\fi \setlength{\textwidth}{#2}% \setlength{\textheight}{#3}% \def\@lastdiv{areaset}% @@ -799,6 +840,12 @@ \advance\oddsidemargin by\ta@bcor \evensidemargin\oddsidemargin \fi + \scr@ifundefined{@ptsize}{% + \topskip=\f@size\p@ + }{% + \topskip=\@ptsize\p@ + \advance\topskip by 10\p@ + }% \headheight=15\p@ \advance\headheight by\f@size\p@ \advance\headheight by-10\p@ @@ -827,7 +874,7 @@ \fi \marginparsep=1cc \marginparpush=0.45\baselineskip - \if@atdocument\@typearea@end\fi + \activateareas } \typearea[current]{current} %%% From File: scrlogo.dtx -- cgit v1.2.3