From 345df745f9c4bb7fe8030e4605141267e59a8a03 Mon Sep 17 00:00:00 2001 From: "Dr. Clea F. Rees" Date: Wed, 3 Dec 2008 00:37:19 +0000 Subject: koma-script 3.01a git-svn-id: svn://tug.org/texlive/trunk@11504 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/KakuLL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponRL.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/scrartcl.cls | 107 +++++++++---------- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 113 +++++++++----------- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 17 +-- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 50 ++++++++- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 59 ++++++----- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 117 +++++++++------------ .../tex/latex/koma-script/scrsize10pt.clo | 2 +- .../tex/latex/koma-script/scrsize11pt.clo | 2 +- .../tex/latex/koma-script/scrsize12pt.clo | 2 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 46 ++++---- 23 files changed, 280 insertions(+), 265 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index 737de55beba..f51457e6094 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index ffdc38880a0..dec52aa59a2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 05f7ae37b8c..f0223f1247a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -61,7 +61,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index fc220f43538..a3414326ac8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index bd13cc5abe4..99974918362 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco index 6fdb8841c8b..3c224093011 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco index 0b142b692b9..9f090541315 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco index ffdb806363c..ef7034cd3bb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco index fe7509b936e..cad5857d665 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index d765e54b7c1..1531c45e3fa 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 38b11deed8b..0c58db3e393 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 9dc74cf92f6..7c2eeb8734f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -113,7 +113,7 @@ \addtotoclist[float]{lof} \addtotoclist[float]{lot} %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{0} +\newcommand*{\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -123,6 +123,9 @@ Because of this, version was set to `first'% }% }{% + \ClassInfoNoLine{\KOMAClassName}{% + Switching compatibility level to `#1'% + }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% }% } @@ -158,6 +161,7 @@ \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} +\@namedef{scr@v@3.01a}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -168,7 +172,7 @@ \setlength{\overfullrule}{\z@}% \fi } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{final}{draft=false} +\KOMA@DeclareStandardOption{final}{draft=false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} %%% From File: scrklang.dtx @@ -281,11 +285,13 @@ \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false} +\KOMA@DeclareStandardOption% + {oneside}{twoside=false} \KOMA@key{twocolumn}[true]{% \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false} +\KOMA@DeclareStandardOption% + {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} %%% From File: scrkpar.dtx @@ -393,25 +399,24 @@ \endgroup \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip-}{parskip=full-} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip+}{parskip=full+} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip*}{parskip=full*} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip}{parskip=half} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip-}{parskip=half-} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip+}{parskip=half+} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip*}{parskip=half*} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parindent}{parskip=false} +\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-} +\KOMA@DeclareDeprecatedOption{parskip+}{parskip=full+} +\KOMA@DeclareDeprecatedOption{parskip*}{parskip=full*} +\KOMA@DeclareDeprecatedOption{halfparskip}{parskip=half} +\KOMA@DeclareDeprecatedOption{halfparskip-}{parskip=half-} +\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} +\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} +\KOMA@DeclareDeprecatedOption{parindent}{parskip=false} %%% From File: scrktitl.dtx \newif\if@titlepage \@titlepagefalse \KOMA@ifkey{titlepage}{@titlepage}% -\KOMA@DeclareObsoleteOption% - [\PackageInfoNoLine]% +\KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} \newif\if@abstrt\@abstrtfalse \KOMA@ifkey{abstract}{@abstrt} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{abstracton}{abstract=true} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{abstractoff}{abstract=false} +\KOMA@DeclareStandardOption{abstracton}{abstract=true} +\KOMA@DeclareStandardOption{abstractoff}{abstract=false} %%% From File: scrksect.dtx %% \fi \newcommand*{\scr@dotchangeatdocument}[1]{% @@ -453,10 +458,8 @@ \newcommand*{\scr@altsecnumhookfalse}{% \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{pointednumbers}% - {numbers=enddot} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{pointlessnumbers}% - {numbers=noenddot} +\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot} +\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot} \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} \newcommand*{\size@section}{} @@ -505,27 +508,22 @@ \or \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{bigheadings}% - {headings=big} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{normalheadings}% - {headings=normal} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{smallheadings}% - {headings=small} +\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} +\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} +\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} %%% From File: scrkpage.dtx \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \KOMA@options{headinclude=#1}{}% } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{headnosepline}{% - headsepline=false} +\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} \newif\if@fsl \KOMA@key{footsepline}[true]{% \KOMA@set@ifkey{footsepline}{@fsl}{#1}% \KOMA@options{footinclude=#1}{}% } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{footnosepline}{% - footsepline=false} +\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} \@twosidefalse \KOMA@key{cleardoublepage}{% \begingroup% @@ -581,12 +579,9 @@ {\thispagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoubleempty}% - {cleardoublepage=empty} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoubleplain}% - {cleardoublepage=plain} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoublestandard}% - {cleardoublepage=current} +\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} +\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} +\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: scrkfloa.dtx \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\ifonelinecaptions\onelinecaptionstrue @@ -633,16 +628,12 @@ \renewcommand*{\scap@valign}{b}% \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{tablecaptionabove}% - {captions=tableheading} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{tablecaptionbelow}% - {captions=tablesignature} +\KOMA@DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading} +\KOMA@DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature} \newif\if@komalongtable\@komalongtabletrue \DeclareOption{origlongtable}{\@komalongtablefalse} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{onelinecaption} - {captions=oneline} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{noonelinecaption} - {captions=nooneline} +\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} +\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} %%% From File: scrkftn.dtx \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -726,8 +717,8 @@ \@tocleftfalse \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{tocleft}{toc=flat} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{tocindent}{toc=graduated} +\KOMA@DeclareDeprecatedOption{tocleft}{toc=flat} +\KOMA@DeclareDeprecatedOption{tocindent}{toc=graduated} \newcommand*{\float@@listhead}{% \section* } @@ -776,11 +767,10 @@ }% \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{liststotoc}{listof=totoc} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{liststotocnumbered} - {listof=numbered} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{listsleft}{listof=flat} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{listsindent}{listof=graduated} +\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc} +\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} +\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} +\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated} %%% From File: scrkbib.dtx \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -866,10 +856,9 @@ \csname scr@bibstyle@#1\endcsname }% } -\KOMA@DeclareObsoleteOption[\ClassInfoNoLine]{openbib}{bibliography=openstyle} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{bibtotoc}{bibliography=totoc} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{bibtotocnumbered}{% - bibliography=totocnumbered} +\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} +\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} +\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} %%% From File: scrkidx.dtx \newcommand*{\idx@@heading}{% \section* @@ -889,7 +878,7 @@ }% \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{idxtotoc}{index=totoc} +\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: scrklist.dtx %%% From File: scrkmisc.dtx \KOMAExecuteOptions{% @@ -2707,9 +2696,9 @@ \kern\multiplefootnotemarker\relax } \@ifundefined{FN@mf@prepare}{}{} -\newcommand*{\scr@saved@footnotetext}{} +\newcommand{\scr@saved@footnotetext}{} \let\scr@saved@footnotetext\@footnotetext -\renewcommand*{\@footnotetext}[1]{% +\renewcommand{\@footnotetext}[1]{% \scr@saved@footnotetext{#1}% \csname FN@mf@prepare\endcsname } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index d19931d6d6f..c06f7bf0a84 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 83417dde5e0..d414f803857 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -115,7 +115,7 @@ \addtotoclist[float]{lof} \addtotoclist[float]{lot} %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{0} +\newcommand*{\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -125,6 +125,9 @@ Because of this, version was set to `first'% }% }{% + \ClassInfoNoLine{\KOMAClassName}{% + Switching compatibility level to `#1'% + }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% }% } @@ -160,6 +163,7 @@ \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} +\@namedef{scr@v@3.01a}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -170,7 +174,7 @@ \setlength{\overfullrule}{\z@}% \fi } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{final}{draft=false} +\KOMA@DeclareStandardOption{final}{draft=false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} %%% From File: scrklang.dtx @@ -283,11 +287,13 @@ \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false} +\KOMA@DeclareStandardOption% + {oneside}{twoside=false} \KOMA@key{twocolumn}[true]{% \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false} +\KOMA@DeclareStandardOption% + {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} %%% From File: scrkpar.dtx @@ -395,20 +401,19 @@ \endgroup \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip-}{parskip=full-} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip+}{parskip=full+} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip*}{parskip=full*} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip}{parskip=half} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip-}{parskip=half-} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip+}{parskip=half+} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip*}{parskip=half*} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parindent}{parskip=false} +\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-} +\KOMA@DeclareDeprecatedOption{parskip+}{parskip=full+} +\KOMA@DeclareDeprecatedOption{parskip*}{parskip=full*} +\KOMA@DeclareDeprecatedOption{halfparskip}{parskip=half} +\KOMA@DeclareDeprecatedOption{halfparskip-}{parskip=half-} +\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} +\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} +\KOMA@DeclareDeprecatedOption{parindent}{parskip=false} %%% From File: scrktitl.dtx \newif\if@titlepage \@titlepagetrue \KOMA@ifkey{titlepage}{@titlepage}% -\KOMA@DeclareObsoleteOption% - [\PackageInfoNoLine]% +\KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} %%% From File: scrksect.dtx \newif\if@openright @@ -430,8 +435,8 @@ \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}% \fi } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{openright}{open=right} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{openany}{open=any} +\KOMA@DeclareStandardOption{openright}{open=right} +\KOMA@DeclareStandardOption{openany}{open=any} %% \fi \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -472,14 +477,11 @@ \newcommand*{\scr@altsecnumhookfalse}{% \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{pointednumbers}% - {numbers=enddot} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{pointlessnumbers}% - {numbers=noenddot} +\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot} +\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot} \newif\if@chapterprefix\@chapterprefixfalse \KOMA@ifkey{chapterprefix}{@chapterprefix} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{nochapterprefix}% - {chapterprefix=false} +\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \KOMA@key{appendixprefix}[true]{% \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% \if@tempswa @@ -488,8 +490,7 @@ \def\appendixmore{\@chapterprefixfalse}% \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{noappendixprefix}% - {appendixprefix=false} +\KOMA@DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false} \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} \newcommand*{\size@chapter}{} @@ -582,27 +583,22 @@ \KOMA@options{appendixprefix=false}{}% \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{bigheadings}% - {headings=big} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{normalheadings}% - {headings=normal} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{smallheadings}% - {headings=small} +\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} +\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} +\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} %%% From File: scrkpage.dtx \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \KOMA@options{headinclude=#1}{}% } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{headnosepline}{% - headsepline=false} +\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} \newif\if@fsl \KOMA@key{footsepline}[true]{% \KOMA@set@ifkey{footsepline}{@fsl}{#1}% \KOMA@options{footinclude=#1}{}% } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{footnosepline}{% - footsepline=false} +\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} \@twosidetrue \KOMA@key{cleardoublepage}{% \begingroup% @@ -658,12 +654,9 @@ {\thispagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoubleempty}% - {cleardoublepage=empty} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoubleplain}% - {cleardoublepage=plain} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoublestandard}% - {cleardoublepage=current} +\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} +\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} +\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: scrkfloa.dtx \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\ifonelinecaptions\onelinecaptionstrue @@ -710,16 +703,12 @@ \renewcommand*{\scap@valign}{b}% \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{tablecaptionabove}% - {captions=tableheading} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{tablecaptionbelow}% - {captions=tablesignature} +\KOMA@DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading} +\KOMA@DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature} \newif\if@komalongtable\@komalongtabletrue \DeclareOption{origlongtable}{\@komalongtablefalse} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{onelinecaption} - {captions=oneline} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{noonelinecaption} - {captions=nooneline} +\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} +\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} %%% From File: scrkftn.dtx \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -803,8 +792,8 @@ \@tocleftfalse \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{tocleft}{toc=flat} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{tocindent}{toc=graduated} +\KOMA@DeclareDeprecatedOption{tocleft}{toc=flat} +\KOMA@DeclareDeprecatedOption{tocindent}{toc=graduated} \newcommand*{\float@@listhead}{% \chapter* } @@ -865,11 +854,10 @@ \KOMA@options{chapteratlists=\baselineskip}{}% \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{liststotoc}{listof=totoc} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{liststotocnumbered} - {listof=numbered} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{listsleft}{listof=flat} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{listsindent}{listof=graduated} +\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc} +\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} +\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} +\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated} \newcommand*{\@chapterlistsgap}{10\p@} \newif\if@chaptertolists\@chaptertolistsfalse \KOMA@key{chapteratlists}[entry]{% @@ -964,10 +952,9 @@ \csname scr@bibstyle@#1\endcsname }% } -\KOMA@DeclareObsoleteOption[\ClassInfoNoLine]{openbib}{bibliography=openstyle} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{bibtotoc}{bibliography=totoc} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{bibtotocnumbered}{% - bibliography=totocnumbered} +\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} +\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} +\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} %%% From File: scrkidx.dtx \newcommand*{\idx@@heading}{% \chapter* @@ -987,7 +974,7 @@ }% \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{idxtotoc}{index=totoc} +\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: scrklist.dtx %%% From File: scrkmisc.dtx \KOMAExecuteOptions{% @@ -3232,9 +3219,9 @@ \kern\multiplefootnotemarker\relax } \@ifundefined{FN@mf@prepare}{}{} -\newcommand*{\scr@saved@footnotetext}{} +\newcommand{\scr@saved@footnotetext}{} \let\scr@saved@footnotetext\@footnotetext -\renewcommand*{\@footnotetext}[1]{% +\renewcommand{\@footnotetext}[1]{% \scr@saved@footnotetext{#1}% \csname FN@mf@prepare\endcsname } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index ec2243895dc..0f48dc1ce4b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -107,7 +107,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] @@ -139,7 +139,7 @@ }% } %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{0} +\newcommand*{\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -149,6 +149,9 @@ Because of this, version was set to `first'% }% }{% + \PackageInfoNoLine{scrextend}{% + Switching compatibility level to `#1'% + }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% }% } @@ -184,6 +187,7 @@ \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} +\@namedef{scr@v@3.01a}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -194,7 +198,7 @@ \setlength{\overfullrule}{\z@}% \fi } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{final}{draft=false} +\KOMA@DeclareStandardOption{final}{draft=false} %%% From File: scrkfont.dtx \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% @@ -239,7 +243,8 @@ \let\scr@ext@immediate@title\relax }% } -\KOMA@DeclareObsoleteOption% +\KOMA@DeclareStandardOption% + [scrextend]% {notitlepage}{titlepage=false} %%% From File: scrksect.dtx %%% From File: scrkpage.dtx @@ -1063,9 +1068,9 @@ \kern\multiplefootnotemarker\relax } \@ifundefined{FN@mf@prepare}{}{} -\newcommand*{\scr@saved@footnotetext}{} +\newcommand{\scr@saved@footnotetext}{} \let\scr@saved@footnotetext\@footnotetext -\renewcommand*{\@footnotetext}[1]{% +\renewcommand{\@footnotetext}[1]{% \scr@saved@footnotetext{#1}% \csname FN@mf@prepare\endcsname } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 62cd1cf6bd5..7619d8a0e9b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -140,6 +140,54 @@ \newcommand*{\KOMA@set@ifkey}{\FamilySetBool{KOMA}} \newcommand*{\KOMA@ncmdkey}{\FamilyNumericalKey{KOMA}} \newcommand*{\KOMA@set@ncmdkey}{\FamilySetNumerical{KOMA}} +\newcommand*{\KOMA@DeclareDeprecatedOption}{% + \@ifnextchar [%] + {\KOMA@@DeclareDeprecatedOption}% + {\KOMA@@@DeclareDeprecatedOption{\ClassWarningNoLine{\KOMAClassName}}}% +} +\newcommand*{\KOMA@@DeclareDeprecatedOption}[1][]{% + \KOMA@@@DeclareDeprecatedOption{\PackageWarningNoLine{#1}}% +} +\newcommand*{\KOMA@@@DeclareDeprecatedOption}[3]{% + \DeclareOption{#2}{\KOMA@UseDeprecatedOption{#1}{#2}{#3}}% +} +\newcommand*{\KOMA@UseDeprecatedOption}[3]{% + \let\scr@sr@co\CurrentOption + #1{% + You've used obsolete option `#2'.\MessageBreak + Usage of this option indicates an old document and\MessageBreak + changes compatibility level using\MessageBreak + `#3,version=first'.\MessageBreak + If you don't want this, you should simply replace\MessageBreak + usage of option `#2' by `#3'% + }% + \KOMAExecuteOptions{#3,version=first}% + \let\CurrentOption\scr@sr@co +} +\newcommand*{\KOMA@DeclareStandardOption}{% + \@ifnextchar [%] + {\KOMA@@DeclareStandardOption}% + {\KOMA@@@DeclareStandardOption{\ClassInfoNoLine{\KOMAClassName}}}% +} +\newcommand*{\KOMA@@DeclareStandardOption}[1][]{% + \KOMA@@@DeclareStandardOption{\PackageInfoNoLine{#1}}% +} +\newcommand*{\KOMA@@@DeclareStandardOption}[3]{% + \DeclareOption{#2}{\KOMA@UseStandardOption{#1}{#2}{#3}}% +} +\newcommand*{\KOMA@UseStandardOption}[3]{% + \let\scr@sr@co\CurrentOption + #1{% + You've used standard option `#2'.\MessageBreak + This is correct!\MessageBreak + Internaly I'm using `#3'.\MessageBreak + If you'd like to set the option with \string\KOMAoptions,\MessageBreak + you'd have to use `#3' there\MessageBreak + instead of `#2', too% + }% + \KOMAExecuteOptions{#3}% + \let\CurrentOption\scr@sr@co +} \newcommand*{\KOMA@DeclareObsoleteOption}{% \@ifnextchar [%] {\KOMA@@DeclareObsoleteOption}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 124ff301da3..d7fa2e9d08e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -91,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -105,7 +105,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{0} +\newcommand*{\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -115,6 +115,9 @@ Because of this, version was set to `first'% }% }{% + \ClassInfoNoLine{\KOMAClassName}{% + Switching compatibility level to `#1'% + }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% }% } @@ -150,6 +153,7 @@ \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} +\@namedef{scr@v@3.01a}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -160,7 +164,7 @@ \setlength{\overfullrule}{\z@}% \fi } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{final}{draft=false} +\KOMA@DeclareStandardOption{final}{draft=false} %%% From File: scrklco.dtx \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -182,8 +186,8 @@ \KOMA@set@ifkey{numericaldate}{@orgdate}{#1}% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{scrdate}{numericaldate=true} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{orgdate}{numericaldate=false} +\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} +\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} %%% From File: scrkfont.dtx \newcommand*\@ptsize{% 12% @@ -295,11 +299,13 @@ \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false} +\KOMA@DeclareStandardOption% + {oneside}{twoside=false} \KOMA@key{twocolumn}[true]{% \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false} +\KOMA@DeclareStandardOption% + {onecolumn}{twocolumn=false} \DeclareOption*{% \lco@test \x@paper} @@ -408,29 +414,27 @@ \endgroup \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip-}{parskip=full-} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip+}{parskip=full+} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip*}{parskip=full*} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip}{parskip=half} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip-}{parskip=half-} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip+}{parskip=half+} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip*}{parskip=half*} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parindent}{parskip=false} +\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-} +\KOMA@DeclareDeprecatedOption{parskip+}{parskip=full+} +\KOMA@DeclareDeprecatedOption{parskip*}{parskip=full*} +\KOMA@DeclareDeprecatedOption{halfparskip}{parskip=half} +\KOMA@DeclareDeprecatedOption{halfparskip-}{parskip=half-} +\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} +\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} +\KOMA@DeclareDeprecatedOption{parindent}{parskip=false} %%% From File: scrkpage.dtx \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \KOMA@options{headinclude=#1}{}% } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{headnosepline}{% - headsepline=false} +\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} \newif\if@fsl \KOMA@key{footsepline}[true]{% \KOMA@set@ifkey{footsepline}{@fsl}{#1}% \KOMA@options{footinclude=#1}{}% } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{footnosepline}{% - footsepline=false} +\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} \@twosidefalse \KOMA@key{cleardoublepage}{% \begingroup% @@ -486,12 +490,9 @@ {\thispagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoubleempty}% - {cleardoublepage=empty} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoubleplain}% - {cleardoublepage=plain} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoublestandard}% - {cleardoublepage=current} +\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} +\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} +\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: scrkfloa.dtx %%% From File: scrkftn.dtx \KOMA@key{footnotes}{% @@ -606,8 +607,8 @@ \@biglocfalse \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{wlocfield}{locfield=wide} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{slocfield}{locfield=narrow} +\KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide} +\KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow} \newif\if@fold\@foldtrue \newcommand*{\@usefolds}{TMBPL} \KOMA@key{foldmarks}[true]{% @@ -2124,9 +2125,9 @@ \kern\multiplefootnotemarker\relax } \@ifundefined{FN@mf@prepare}{}{} -\newcommand*{\scr@saved@footnotetext}{} +\newcommand{\scr@saved@footnotetext}{} \let\scr@saved@footnotetext\@footnotetext -\renewcommand*{\@footnotetext}[1]{% +\renewcommand{\@footnotetext}[1]{% \scr@saved@footnotetext{#1}% \csname FN@mf@prepare\endcsname } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index 148e307167a..794fdf1e80c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty @@ -40,13 +40,13 @@ %%% From File: scrpage.dtx \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrpage2} - [2008/02/14 v2.2f LaTeX2e KOMA-Script + [2008/11/19 v2.2g LaTeX2e KOMA-Script package] \DeclareOption{headinclude}{\PassOptionsToPackage{headinclude}{typearea}} \DeclareOption{headexclude}{\PassOptionsToPackage{headexclude}{typearea}} \DeclareOption{footinclude}{\PassOptionsToPackage{footinclude}{typearea}} \DeclareOption{footexclude}{\PassOptionsToPackage{footexclude}{typearea}} -\@ifundefined{mincltrue}{\newif\if@mincl}{} +\@ifundefined{@mincltrue}{\newif\if@mincl}{} \DeclareOption{mpinclude}{\@mincltrue} \DeclareOption{mpexclude}{\@minclfalse} \newcommand*{\scr@headabove@linethickness}{0pt} @@ -133,7 +133,7 @@ \@ifundefined{@mainmattertrue}{% \PackageWarningNoLine{scrpage2}{% \string\mainmatter\space defined without - \string\if@mainmatter!\MessageBreak + \expandafter\string\csname if@mainmatter\endcsname!\MessageBreak This switch is obligatory for scrpage2 to omit\MessageBreak running head chapter numbers in front and\MessageBreak back matter and will be defined now% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 303b0d0c715..63ec8309b54 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -115,7 +115,7 @@ \addtotoclist[float]{lof} \addtotoclist[float]{lot} %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{0} +\newcommand*{\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -125,6 +125,9 @@ Because of this, version was set to `first'% }% }{% + \ClassInfoNoLine{\KOMAClassName}{% + Switching compatibility level to `#1'% + }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% }% } @@ -160,6 +163,7 @@ \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} +\@namedef{scr@v@3.01a}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -170,7 +174,7 @@ \setlength{\overfullrule}{\z@}% \fi } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{final}{draft=false} +\KOMA@DeclareStandardOption{final}{draft=false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} %%% From File: scrklang.dtx @@ -283,11 +287,13 @@ \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false} +\KOMA@DeclareStandardOption% + {oneside}{twoside=false} \KOMA@key{twocolumn}[true]{% \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false} +\KOMA@DeclareStandardOption% + {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} %%% From File: scrkpar.dtx @@ -395,25 +401,24 @@ \endgroup \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip-}{parskip=full-} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip+}{parskip=full+} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parskip*}{parskip=full*} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip}{parskip=half} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip-}{parskip=half-} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip+}{parskip=half+} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{halfparskip*}{parskip=half*} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{parindent}{parskip=false} +\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-} +\KOMA@DeclareDeprecatedOption{parskip+}{parskip=full+} +\KOMA@DeclareDeprecatedOption{parskip*}{parskip=full*} +\KOMA@DeclareDeprecatedOption{halfparskip}{parskip=half} +\KOMA@DeclareDeprecatedOption{halfparskip-}{parskip=half-} +\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} +\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} +\KOMA@DeclareDeprecatedOption{parindent}{parskip=false} %%% From File: scrktitl.dtx \newif\if@titlepage \@titlepagetrue \KOMA@ifkey{titlepage}{@titlepage}% -\KOMA@DeclareObsoleteOption% - [\PackageInfoNoLine]% +\KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} \newif\if@abstrt\@abstrtfalse \KOMA@ifkey{abstract}{@abstrt} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{abstracton}{abstract=true} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{abstractoff}{abstract=false} +\KOMA@DeclareStandardOption{abstracton}{abstract=true} +\KOMA@DeclareStandardOption{abstractoff}{abstract=false} %%% From File: scrksect.dtx \newif\if@openright \@openrightfalse @@ -434,8 +439,8 @@ \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}% \fi } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{openright}{open=right} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{openany}{open=any} +\KOMA@DeclareStandardOption{openright}{open=right} +\KOMA@DeclareStandardOption{openany}{open=any} %% \fi \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -476,14 +481,11 @@ \newcommand*{\scr@altsecnumhookfalse}{% \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{pointednumbers}% - {numbers=enddot} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{pointlessnumbers}% - {numbers=noenddot} +\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot} +\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot} \newif\if@chapterprefix\@chapterprefixfalse \KOMA@ifkey{chapterprefix}{@chapterprefix} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{nochapterprefix}% - {chapterprefix=false} +\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \KOMA@key{appendixprefix}[true]{% \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% \if@tempswa @@ -492,8 +494,7 @@ \def\appendixmore{\@chapterprefixfalse}% \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{noappendixprefix}% - {appendixprefix=false} +\KOMA@DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false} \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} \newcommand*{\size@chapter}{} @@ -586,27 +587,22 @@ \KOMA@options{appendixprefix=false}{}% \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{bigheadings}% - {headings=big} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{normalheadings}% - {headings=normal} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{smallheadings}% - {headings=small} +\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} +\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} +\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} %%% From File: scrkpage.dtx \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \KOMA@options{headinclude=#1}{}% } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{headnosepline}{% - headsepline=false} +\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} \newif\if@fsl \KOMA@key{footsepline}[true]{% \KOMA@set@ifkey{footsepline}{@fsl}{#1}% \KOMA@options{footinclude=#1}{}% } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{footnosepline}{% - footsepline=false} +\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} \@twosidefalse \KOMA@key{cleardoublepage}{% \begingroup% @@ -662,12 +658,9 @@ {\thispagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoubleempty}% - {cleardoublepage=empty} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoubleplain}% - {cleardoublepage=plain} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{cleardoublestandard}% - {cleardoublepage=current} +\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} +\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} +\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: scrkfloa.dtx \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\ifonelinecaptions\onelinecaptionstrue @@ -714,16 +707,12 @@ \renewcommand*{\scap@valign}{b}% \fi } -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{tablecaptionabove}% - {captions=tableheading} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{tablecaptionbelow}% - {captions=tablesignature} +\KOMA@DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading} +\KOMA@DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature} \newif\if@komalongtable\@komalongtabletrue \DeclareOption{origlongtable}{\@komalongtablefalse} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{onelinecaption} - {captions=oneline} -\KOMA@DeclareObsoleteOption[\PackageWarningNoLine]{noonelinecaption} - {captions=nooneline} +\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} +\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} %%% From File: scrkftn.dtx \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -807,8 +796,8 @@ \@tocleftfalse \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{tocleft}{toc=flat} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{tocindent}{toc=graduated} +\KOMA@DeclareDeprecatedOption{tocleft}{toc=flat} +\KOMA@DeclareDeprecatedOption{tocindent}{toc=graduated} \newcommand*{\float@@listhead}{% \chapter* } @@ -869,11 +858,10 @@ \KOMA@options{chapteratlists=\baselineskip}{}% \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{liststotoc}{listof=totoc} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{liststotocnumbered} - {listof=numbered} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{listsleft}{listof=flat} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{listsindent}{listof=graduated} +\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc} +\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} +\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} +\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated} \newcommand*{\@chapterlistsgap}{10\p@} \newif\if@chaptertolists\@chaptertolistsfalse \KOMA@key{chapteratlists}[entry]{% @@ -968,10 +956,9 @@ \csname scr@bibstyle@#1\endcsname }% } -\KOMA@DeclareObsoleteOption[\ClassInfoNoLine]{openbib}{bibliography=openstyle} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{bibtotoc}{bibliography=totoc} -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{bibtotocnumbered}{% - bibliography=totocnumbered} +\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} +\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} +\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} %%% From File: scrkidx.dtx \newcommand*{\idx@@heading}{% \chapter* @@ -991,7 +978,7 @@ }% \fi } -\KOMA@DeclareObsoleteOption[\ClassWarningNoLine]{idxtotoc}{index=totoc} +\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: scrklist.dtx %%% From File: scrkmisc.dtx \KOMAExecuteOptions{% @@ -3202,9 +3189,9 @@ \kern\multiplefootnotemarker\relax } \@ifundefined{FN@mf@prepare}{}{} -\newcommand*{\scr@saved@footnotetext}{} +\newcommand{\scr@saved@footnotetext}{} \let\scr@saved@footnotetext\@footnotetext -\renewcommand*{\@footnotetext}[1]{% +\renewcommand{\@footnotetext}[1]{% \scr@saved@footnotetext{#1}% \csname FN@mf@prepare\endcsname } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 07fe5656f82..0b82d2a6b9e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 6f01dc3044b..1a52c76352a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index 9e05080cfdc..831ea0ea953 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 8a30c498428..017e05bd9d7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -229,18 +229,12 @@ } \newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl} \KOMA@ifkey{headinclude}{@hincl} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{headexclude}{% - headinclude=false% -} +\KOMA@DeclareDeprecatedOption[typearea]{headexclude}{headinclude=false} \newif\if@fincl\@ifundefined{if@fsl}{}{\let\if@fincl\if@fsl} \KOMA@ifkey{footinclude}{@fincl} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{footexclude}{% - footinclude=false% -} +\KOMA@DeclareDeprecatedOption[typearea]{footexclude}{footinclude=false} \KOMA@ifkey{mpinclude}{@mincl} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{mpexclude}{% - mpinclude=false% -} +\KOMA@DeclareDeprecatedOption[typearea]{mpexclude}{mpinclude=false} \KOMA@key{BCOR}{% \edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else \setlength{\ta@bcor}{#1}% @@ -261,8 +255,8 @@ \fi } \AtEndOfPackage{\KOMA@key{DIV}{\typearea[current]{#1}}} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{DIVcalc}{DIV=calc} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{DIVclassic}{DIV=classic} +\KOMA@DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc} +\KOMA@DeclareDeprecatedOption[typearea]{DIVclassic}{DIV=classic} \newif\if@semitwoside \g@addto@macro\@twosidetrue\@semitwosidefalse \g@addto@macro\@twosidefalse\@semitwosidefalse @@ -286,13 +280,17 @@ \fi% \csname recalctypearea\endcsname } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false} +\KOMA@DeclareStandardOption% + [typearea]% + {oneside}{twoside=false} \KOMA@key{twocolumn}[true]{% \if@atdocument\clearpage\fi \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% \csname recalctypearea\endcsname } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false} +\KOMA@DeclareStandardOption% + [typearea]% + {onecolumn}{twocolumn=false} \KOMA@key{pagesize}[auto]{% \begingroup \KOMA@set@ncmdkey{pagesize}{@tempa}{% @@ -370,20 +368,20 @@ \ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}% }% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{dvips}{% +\KOMA@DeclareStandardOption[typearea]{dvips}{% pagesize=automedia% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{pdftex}{% +\KOMA@DeclareStandardOption[typearea]{pdftex}{% pagesize=pdftex% } -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{a4paper}{paper=a4} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{a5paper}{paper=a5} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{b5paper}{paper=b5} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{letterpaper}{paper=letter} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{legalpaper}{paper=legal} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{executivepaper}{paper=executive} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{landscape}{paper=landscape} -\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{portrait}{paper=portrait} +\KOMA@DeclareStandardOption[typearea]{a4paper}{paper=a4} +\KOMA@DeclareStandardOption[typearea]{a5paper}{paper=a5} +\KOMA@DeclareStandardOption[typearea]{b5paper}{paper=b5} +\KOMA@DeclareStandardOption[typearea]{letterpaper}{paper=letter} +\KOMA@DeclareStandardOption[typearea]{legalpaper}{paper=legal} +\KOMA@DeclareStandardOption[typearea]{executivepaper}{paper=executive} +\KOMA@DeclareStandardOption[typearea]{landscape}{paper=landscape} +\KOMA@DeclareStandardOption[typearea]{portrait}{paper=portrait} \KOMA@key{paper}{% \ifstr{#1}{landscape}{% \if@landscape\else -- cgit v1.2.3