From e580f05b6906cceb59c89211eb69c02b58b2d35d Mon Sep 17 00:00:00 2001 From: "Dr. Clea F. Rees" Date: Wed, 10 Dec 2008 20:53:15 +0000 Subject: koma-script update 2008/12/10 git-svn-id: svn://tug.org/texlive/trunk@11586 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 | 8 +- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 5 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 8 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 25 ++++-- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 8 +- .../texmf-dist/tex/latex/koma-script/scrpage.sty | 16 +++- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 36 ++++++-- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 8 +- .../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 | 99 ++++++++++++++++++++-- 24 files changed, 192 insertions(+), 51 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index f51457e6094..a3798958777 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 dec52aa59a2..fe8ae0fd953 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 f0223f1247a..586c8aedce0 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 a3414326ac8..175ba9142d5 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 99974918362..7765437f4c2 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 3c224093011..b9bea62d17f 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 9f090541315..d1fa72a0d9b 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 ef7034cd3bb..824fe9268a1 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 cad5857d665..f5ec9958dd4 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 1531c45e3fa..fdccc44d045 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 0c58db3e393..c7c69b10c44 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 7c2eeb8734f..d425ea05cea 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -113,7 +113,8 @@ \addtotoclist[float]{lof} \addtotoclist[float]{lot} %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{\scr@v@last} +\newcommand* + {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -162,7 +163,8 @@ \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} -\@namedef{scr@v@last}{8} +\@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index c06f7bf0a84..57d7c739783 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -703,6 +703,7 @@ }{% \begingroup \let\@tempa\endgroup + \let #2\undefined\relax \csname captions#1\endcsname \ifx #2\undefined \edef\@tempb{#1}% @@ -738,6 +739,7 @@ \@namedef{captions#1}{}% }{}% \begingroup + \let #2\undefined\relax \csname captions#1\endcsname \ifx #2\undefined\else \PackageError{scrbase}{% @@ -778,6 +780,7 @@ \@namedef{captions#1}{}% }{}% \begingroup + \let #2\undefined\relax \csname captions#1\endcsname \ifx #2\undefined \PackageError{scrbase}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index d414f803857..b5cd0cfebe6 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -115,7 +115,8 @@ \addtotoclist[float]{lof} \addtotoclist[float]{lot} %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{\scr@v@last} +\newcommand* + {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -164,7 +165,8 @@ \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} -\@namedef{scr@v@last}{8} +\@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 0f48dc1ce4b..b6d1b19eb0e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -85,6 +85,13 @@ \newcommand*{\scr@ext@activateable}[1]{% \expandafter\newcommand\expandafter*\csname scr@ext@activate@#1\endcsname } +\newcommand*{\scr@ext@addto@activateable}[1]{% + \scr@ifundefinedorrelax{scr@ext@activate@#1}{% + \expandafter\newcommand\expandafter*\csname scr@ext@activate@#1\endcsname + }{% + \expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname + }% +} %%% From File: scrkvers.dtx \begingroup \makeatletter @@ -107,7 +114,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] @@ -139,11 +146,14 @@ }% } %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{\scr@v@last} +\providecommand* + {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% - \PackageWarningNoLine{scrextend}{% + \PackageWarningNoLine{% + scrextend% + }{% 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'% @@ -157,7 +167,9 @@ } \AtEndOfPackage{% \KOMA@key{version}[]{% - \PackageError{scrextend}{% + \PackageError{% + scrextend% + }{% Option `version' too late% }{% Option `version' may be set only while loading the @@ -188,7 +200,8 @@ \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} -\@namedef{scr@v@last}{8} +\@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -699,7 +712,7 @@ }% } %%% From File: scrktitl.dtx -\scr@ext@activateable{title}{% +\scr@ext@addto@activateable{title}{% \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% ##1% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 7619d8a0e9b..c646440c497 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index d7fa2e9d08e..b6bf0bfb179 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -105,7 +105,8 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{\scr@v@last} +\newcommand* + {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -154,7 +155,8 @@ \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} -\@namedef{scr@v@last}{8} +\@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty index b77ac7d5f40..7c33a0858db 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty @@ -41,10 +41,18 @@ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrpage}[2008/02/29 v1.3e KOMA-Script package] -\DeclareOption{headinclude}{\PassOptionsToPackage{headinclude}{typearea}} -\DeclareOption{headexclude}{\PassOptionsToPackage{headexclude}{typearea}} -\DeclareOption{footinclude}{\PassOptionsToPackage{footinclude}{typearea}} -\DeclareOption{footexclude}{\PassOptionsToPackage{footexclude}{typearea}} +\DeclareOption{headinclude}{% + \PassOptionsToPackage{headinclude}{typearea}% +} +\DeclareOption{headexclude}{% + \PassOptionsToPackage{headexclude}{typearea}% +} +\DeclareOption{footinclude}{% + \PassOptionsToPackage{footinclude}{typearea}% +} +\DeclareOption{footexclude}{% + \PassOptionsToPackage{footexclude}{typearea}% +} \ExecuteOptions{% headinclude,footinclude% } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index 794fdf1e80c..6ad7b156b24 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty @@ -40,12 +40,38 @@ %%% From File: scrpage.dtx \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrpage2} - [2008/11/19 v2.2g LaTeX2e KOMA-Script + [2008/12/08 v2.3 LaTeX2e KOMA-Script package] -\DeclareOption{headinclude}{\PassOptionsToPackage{headinclude}{typearea}} -\DeclareOption{headexclude}{\PassOptionsToPackage{headexclude}{typearea}} -\DeclareOption{footinclude}{\PassOptionsToPackage{footinclude}{typearea}} -\DeclareOption{footexclude}{\PassOptionsToPackage{footexclude}{typearea}} +\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{% + \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}% + \ifin@ + \PackageWarningNoLine{scrpage2}{% + deprecated passing option `\CurrentOption' to scrpage2.\MessageBreak + If you are using package typearea or\MessageBreak + a KOMA-Script class since version 3.00\MessageBreak + you may use `\string\KOMAoptions{#1}' and\MessageBreak + remove passing `\CurrentOption' to scrpage2% + }% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname KOMAoptions\endcsname\relax + \PassOptionsToPackage{#1}{typearea}% + \else + \KOMAoptions{#1}\csname relcalctypearea\endcsname + \fi + \fi +} +\DeclareOption{headinclude}{% + \@Pass@Obsolete@Option@To@Typearea{headinclude}% +} +\DeclareOption{headexclude}{% + \@Pass@Obsolete@Option@To@Typearea{headinclude=false}% +} +\DeclareOption{footinclude}{% + \@Pass@Obsolete@Option@To@Typearea{footinclude}% +} +\DeclareOption{footexclude}{% + \@Pass@Obsolete@Option@To@Typearea{footinclude=false}% +} \@ifundefined{@mincltrue}{\newif\if@mincl}{} \DeclareOption{mpinclude}{\@mincltrue} \DeclareOption{mpexclude}{\@minclfalse} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 63ec8309b54..2e5b27fdc98 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -115,7 +115,8 @@ \addtotoclist[float]{lof} \addtotoclist[float]{lot} %%% From File: scrkcomp.dtx -\newcommand*{\scr@compatibility}{\scr@v@last} +\newcommand* + {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -164,7 +165,8 @@ \@namedef{scr@v@3.00}{8} \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} -\@namedef{scr@v@last}{8} +\@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 0b82d2a6b9e..d4fe99be26b 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 1a52c76352a..05252a78368 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 831ea0ea953..9d1b5bfdd39 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/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b 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 017e05bd9d7..637dc792727 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -7,7 +7,10 @@ %% scrkvers.dtx (with options: `package,typearea') %% scrktare.dtx (with options: `package,identify') %% scrkbase.dtx (with options: `load') -%% scrktare.dtx (with options: `package,option,body') +%% scrktare.dtx (with options: `package,option') +%% scrkcomp.dtx (with options: `package,typearea,option') +%% scrktare.dtx (with options: `package,body') +%% scrkcomp.dtx (with options: `package,typearea,body') %% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 1994-2007 @@ -62,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/23 v3.01a KOMA-Script}% + \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -430,8 +433,20 @@ \if@tempswa\else \expandafter\maybe@pair#1::\@nil \if@tempswa - \setlength\paperheight{\@tempa}% - \setlength\paperwidth{\@tempb}% + \ifnum \scr@ta@compatibility<\@nameuse{scr@v@3.01b}\relax + \PackageWarningNoLine{typearea}{% + You may have to exchange height and width!\MessageBreak + Until KOMA-Script version 3.01b the semantic\MessageBreak + of option `paper' was `paper=height:width'\MessageBreak + instead of `paper=width:height'.\MessageBreak + I've switched back to that old interpretation\MessageBreak + because of the given compatiblity settings}% + \setlength\paperheight{\@tempa}% + \setlength\paperwidth{\@tempb}% + \else + \setlength\paperwidth{\@tempa}% + \setlength\paperheight{\@tempb}% + \fi \else \KOMA@unknown@keyval{paper}{#1}{% `letter', `legal', `executive', `a', `b', @@ -456,6 +471,65 @@ } \DeclareOption*{% \x@paper} +%%% From File: scrkcomp.dtx +\providecommand* + {\scr@compatibility}{\scr@v@last} +\newcommand*{\scr@ta@compatibility}{\scr@compatibility} +\KOMA@key{version}[last]{% + \scr@ifundefinedorrelax{scr@v@#1}{% + \def\scr@compatibility{0}% + \PackageWarningNoLine{% + typearea% + }{% + You have set option `version' to value `#1', but\MessageBreak + this value of version is not supported.\MessageBreak + Because of this, version was set to `first'% + }% + }{% + \PackageInfoNoLine{scrextend}{% + Switching compatibility level to `#1'% + }% + \edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}% + }% +} +\AtEndOfPackage{% + \KOMA@key{version}[]{% + \PackageError{% + typearea% + }{% + Option `version' too late% + }{% + Option `version' may be set only while loading the + package.\MessageBreak + But you've tried to set it up later.% + }% + }% +} +\@namedef{scr@v@first}{0} +\@namedef{scr@v@2.9}{0} +\@namedef{scr@v@2.9t}{0} +\@namedef{scr@v@2.9u}{1} +\@namedef{scr@v@2.95}{2} +\@namedef{scr@v@2.95a}{2} +\@namedef{scr@v@2.95b}{2} +\@namedef{scr@v@2.96}{2} +\@namedef{scr@v@2.96a}{3} +\@namedef{scr@v@2.97}{3} +\@namedef{scr@v@2.97a}{3} +\@namedef{scr@v@2.97b}{3} +\@namedef{scr@v@2.97c}{4} +\@namedef{scr@v@2.97d}{5} +\@namedef{scr@v@2.97e}{6} +\@namedef{scr@v@2.98}{6} +\@namedef{scr@v@2.98a}{6} +\@namedef{scr@v@2.98b}{6} +\@namedef{scr@v@2.98c}{7} +\@namedef{scr@v@3.00}{8} +\@namedef{scr@v@3.01}{8} +\@namedef{scr@v@3.01a}{8} +\@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@last}{9} +%%% From File: scrktare.dtx \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -821,17 +895,25 @@ \advance\@tempcnta by-4 \fi \ifnum\@tempcnta <-15 + \@tempcnta=-\@tempcnta \PackageWarningNoLine{typearea}{% - Bad DIV value!\MessageBreak + Bad type area settings!\MessageBreak + The detected line width is about + \the\@tempcnta\@percentchar\MessageBreak + larger than the heuristically detected line width.\MessageBreak You should e.g. decrease DIV, increase fontsize\MessageBreak or change papersize% }% + \@tempcnta=-\@tempcnta \else \ifnum\@tempcnta>15 \PackageWarningNoLine{typearea}{% - Bad DIV value!\MessageBreak - You should e.g. increase DIV, decrease fontsize\MessageBreak - or change papersize% + Maybe no optimal type area settings!\MessageBreak + The maximum limit of line width is about + \the\@tempcnta\@percentchar\MessageBreak + larger than the heuristically detected line width.\MessageBreak + You may e.g. increase DIV, decrease fontsize\MessageBreak + or change the papersize% } \fi\fi \ifnum\ta@div <6 @@ -955,6 +1037,7 @@ \activateareas } \typearea[current]{current} +%%% From File: scrkcomp.dtx %%% From File: scrlogo.dtx \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% -- cgit v1.2.3