From 8ca247e8fef4aa88e0f850179e7a9b0e82aa4d98 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 18 Sep 2010 22:37:13 +0000 Subject: koma-script (18sep10) git-svn-id: svn://tug.org/texlive/trunk@19797 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 +- Master/texmf-dist/tex/latex/koma-script/NF.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 +- .../tex/latex/koma-script/UScommercial9.lco | 2 +- .../tex/latex/koma-script/UScommercial9DW.lco | 2 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 15 +++--- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 15 +++--- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 58 ++++++++++++---------- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrjura.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 21 ++++---- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 15 +++--- .../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/scrtime.sty | 2 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 8 ++- .../texmf-dist/tex/latex/koma-script/typearea.sty | 3 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 2 +- 31 files changed, 102 insertions(+), 81 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 3444081ccb6..0418d206b86 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 e4c48ef6957..82e0d9d16df 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 fe0eec501e2..5e732d96125 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 5a23cc4b92b..b24eaccfcb2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco index c64de4b7974..46d4d910e22 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: scrklco.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 03c9352f2c1..947dbcef5de 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 897b8621fb7..35afc851168 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 6bb13eaedd5..f70dfe492af 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 25c8685db9a..dee1a7f46e0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 e35a376b2be..85ba0c8a3d1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 0042deb4664..8d7fed4db23 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 9a8bd2f18d3..a02cf9c7f8d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index 71bc6b95386..f5abbf3e231 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index c5dd9968496..0774d2dda50 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 7e2132dff63..db0688a2a6a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/06/09 v3.06} +\def\tocbasicversion{2010/09/14 v3.06a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \addtotoclist{toc} @@ -179,6 +179,7 @@ \@namedef{scr@v@3.05}{10} \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} +\@namedef{scr@v@3.07}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -570,7 +571,7 @@ \newcommand*{\cleardoubleoddstandardpage}{} \let\cleardoubleoddstandardpage=\cleardoublepage \newcommand*{\cleardoubleoddpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleoddstandardpage}} + {\pagestyle{#1}\cleardoubleoddstandardpage}} \newcommand*{\cleardoubleoddemptypage}{\cleardoubleoddpageusingstyle{empty}} \newcommand*{\cleardoubleoddplainpage}{\cleardoubleoddpageusingstyle{plain}} \newcommand*{\cleardoubleevenstandardpage}{% @@ -580,7 +581,7 @@ \fi\fi } \newcommand*{\cleardoubleevenpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleevenstandardpage}} + {\pagestyle{#1}\cleardoubleevenstandardpage}} \newcommand*{\cleardoubleevenemptypage}{\cleardoubleevenpageusingstyle{empty}} \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} @@ -594,7 +595,7 @@ \newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage} \newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage} \newcommand*{\cleardoublepageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoublestandardpage}} + {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} @@ -2572,7 +2573,8 @@ \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi - \hrule \@height\ftn@rule@height \@width\ftn@rule@width + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% \kern 2.6\p@} \newcommand*{\ftn@rule@test@values}{% \ifdim\ftn@rule@height <\z@ @@ -2606,6 +2608,7 @@ \fi \fi } +\newkomafont{footnoterule}{} \newcommand*{\ftn@rule@width}{.4\columnwidth} \newcommand*{\ftn@rule@height}{.4\p@} \newcommand*{\setfootnoterule}[2][]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 20320f26752..2682e3e5db9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 1906c4214af..beea8c9fa89 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/06/09 v3.06} +\def\tocbasicversion{2010/09/14 v3.06a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -181,6 +181,7 @@ \@namedef{scr@v@3.05}{10} \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} +\@namedef{scr@v@3.07}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -645,7 +646,7 @@ \newcommand*{\cleardoubleoddstandardpage}{} \let\cleardoubleoddstandardpage=\cleardoublepage \newcommand*{\cleardoubleoddpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleoddstandardpage}} + {\pagestyle{#1}\cleardoubleoddstandardpage}} \newcommand*{\cleardoubleoddemptypage}{\cleardoubleoddpageusingstyle{empty}} \newcommand*{\cleardoubleoddplainpage}{\cleardoubleoddpageusingstyle{plain}} \newcommand*{\cleardoubleevenstandardpage}{% @@ -655,7 +656,7 @@ \fi\fi } \newcommand*{\cleardoubleevenpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleevenstandardpage}} + {\pagestyle{#1}\cleardoubleevenstandardpage}} \newcommand*{\cleardoubleevenemptypage}{\cleardoubleevenpageusingstyle{empty}} \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} @@ -669,7 +670,7 @@ \newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage} \newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage} \newcommand*{\cleardoublepageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoublestandardpage}} + {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} @@ -3097,7 +3098,8 @@ \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi - \hrule \@height\ftn@rule@height \@width\ftn@rule@width + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% \kern 2.6\p@} \newcommand*{\ftn@rule@test@values}{% \ifdim\ftn@rule@height <\z@ @@ -3131,6 +3133,7 @@ \fi \fi } +\newkomafont{footnoterule}{} \newcommand*{\ftn@rule@width}{.4\columnwidth} \newcommand*{\ftn@rule@height}{.4\p@} \newcommand*{\setfootnoterule}[2][]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index 7fc36527f27..bf8fb0d1745 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index a7126d3bace..17fe7a8caf3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -4,8 +4,9 @@ %% %% The original source files were: %% -%% scrextend.dtx (with options: `package,extend,prepare') +%% scrextend.dtx (with options: `package,extend,preidentify') %% scrkvers.dtx (with options: `package,extend') +%% scrextend.dtx (with options: `package,extend,identify,prepare') %% scrkbase.dtx (with options: `load') %% scrextend.dtx (with options: `package,extend,option') %% scrkcomp.dtx (with options: `package,extend,option') @@ -74,27 +75,6 @@ }% \expandafter\endinput \fi -\newcommand*{\scr@ext@activate}[1]{% - \scr@ifundefinedorrelax{scr@ext@activate@#1}{% - \@namedef{scr@ext@immediate@#1}{% - \expandafter\let\csname scr@ext@immediate@#1\endcsname\relax - \csname scr@ext@activate@#1\endcsname - }% - }{% - \csname scr@ext@activate@#1\endcsname - \expandafter\let\csname scr@ext@activate@#1\endcsname\relax - }% -} -\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 @@ -117,8 +97,32 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup +%%% From File: scrextend.dtx +\ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package + (extend other classes with features of KOMA-Script classes)] +\newcommand*{\scr@ext@activate}[1]{% + \scr@ifundefinedorrelax{scr@ext@activate@#1}{% + \@namedef{scr@ext@immediate@#1}{% + \expandafter\let\csname scr@ext@immediate@#1\endcsname\relax + \csname scr@ext@activate@#1\endcsname + }% + }{% + \csname scr@ext@activate@#1\endcsname + \expandafter\let\csname scr@ext@activate@#1\endcsname\relax + }% +} +\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: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: scrextend.dtx @@ -216,6 +220,7 @@ \@namedef{scr@v@3.05}{10} \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} +\@namedef{scr@v@3.07}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -305,7 +310,7 @@ \newcommand*{\cleardoubleoddstandardpage}{} \let\cleardoubleoddstandardpage=\cleardoublepage \newcommand*{\cleardoubleoddpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleoddstandardpage}} + {\pagestyle{#1}\cleardoubleoddstandardpage}} \newcommand*{\cleardoubleoddemptypage}{\cleardoubleoddpageusingstyle{empty}} \newcommand*{\cleardoubleoddplainpage}{\cleardoubleoddpageusingstyle{plain}} \newcommand*{\cleardoubleevenstandardpage}{% @@ -315,7 +320,7 @@ \fi\fi } \newcommand*{\cleardoubleevenpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleevenstandardpage}} + {\pagestyle{#1}\cleardoubleevenstandardpage}} \newcommand*{\cleardoubleevenemptypage}{\cleardoubleevenpageusingstyle{empty}} \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} @@ -329,7 +334,7 @@ \newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage} \newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage} \newcommand*{\cleardoublepageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoublestandardpage}} + {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} %%% From File: scrkfloa.dtx @@ -951,6 +956,7 @@ \fi \fi } +\newkomafont{footnoterule}{} \newcommand*{\ftn@rule@width}{.4\columnwidth} \newcommand*{\ftn@rule@height}{.4\p@} \newcommand*{\setfootnoterule}[2][]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 548453ff17c..3b2f463bdbf 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: scrhack.dtx %%% using: package,identify diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index d0910e57f80..1887cd59464 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty @@ -7,7 +7,7 @@ %% scrjura.dtx (with options: `package') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 2007-2009 +%% Copyright (c) 2007-2010 %% 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/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 8d0b1caa6c4..0f6cb30110d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 461103c27ce..011d33b8d02 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -94,7 +94,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -171,6 +171,7 @@ \@namedef{scr@v@3.05}{10} \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} +\@namedef{scr@v@3.07}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -481,7 +482,7 @@ \newcommand*{\cleardoubleoddstandardpage}{} \let\cleardoubleoddstandardpage=\cleardoublepage \newcommand*{\cleardoubleoddpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleoddstandardpage}} + {\pagestyle{#1}\cleardoubleoddstandardpage}} \newcommand*{\cleardoubleoddemptypage}{\cleardoubleoddpageusingstyle{empty}} \newcommand*{\cleardoubleoddplainpage}{\cleardoubleoddpageusingstyle{plain}} \newcommand*{\cleardoubleevenstandardpage}{% @@ -491,7 +492,7 @@ \fi\fi } \newcommand*{\cleardoubleevenpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleevenstandardpage}} + {\pagestyle{#1}\cleardoubleevenstandardpage}} \newcommand*{\cleardoubleevenemptypage}{\cleardoubleevenpageusingstyle{empty}} \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} @@ -505,7 +506,7 @@ \newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage} \newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage} \newcommand*{\cleardoublepageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoublestandardpage}} + {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} @@ -2079,7 +2080,8 @@ \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi - \hrule \@height\ftn@rule@height \@width\ftn@rule@width + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% \kern 2.6\p@} \newcommand*{\ftn@rule@test@values}{% \ifdim\ftn@rule@height <\z@ @@ -2113,6 +2115,7 @@ \fi \fi } +\newkomafont{footnoterule}{} \newcommand*{\ftn@rule@width}{.4\columnwidth} \newcommand*{\ftn@rule@height}{.4\p@} \newcommand*{\setfootnoterule}[2][]{% @@ -2334,7 +2337,7 @@ \ifkomavarempty{fromname}{}{% {\usekomafont{fromname}% {\ignorespaces\usekomavar{fromname}}}\\[-8pt] - \rule{\useplength{firstheadwidth}}{.4pt}\\ + {\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\ }% \ifkomavarempty{fromaddress}{}{% \ignorespaces\usekomavar{fromaddress}% @@ -2804,7 +2807,7 @@ \typeout{Address (\@tempa\@tempb addressee)}% \endgroup% \move@topt\vskip\useplength{toaddrvpos}% - \vb@t@z{{\setlength{\parfillskip}{\z@ \@plus 1fil}% + \vb@t@z{{\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative \rlap{\move@topl \setlengthtoplength{\@tempskipa}{toaddrhpos}% \ifdim \@tempskipa<\z@ @@ -2889,9 +2892,7 @@ \endgroup% \move@topt\vskip\useplength{toaddrvpos}% \vb@t@z{{% - \setlength{\parfillskip}{\z@ \@plus 1fil}% - \setlength{\parindent}{\z@}% - \setlength{\parskip}{\z@}% + \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative \ifdim \useplength{toaddrindent}=\z@ \@setplength{toaddrindent}{8mm}% \fi diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 07384c5c051..759238d20b5 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/06/09 v3.06} +\def\tocbasicversion{2010/09/14 v3.06a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -181,6 +181,7 @@ \@namedef{scr@v@3.05}{10} \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} +\@namedef{scr@v@3.07}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -649,7 +650,7 @@ \newcommand*{\cleardoubleoddstandardpage}{} \let\cleardoubleoddstandardpage=\cleardoublepage \newcommand*{\cleardoubleoddpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleoddstandardpage}} + {\pagestyle{#1}\cleardoubleoddstandardpage}} \newcommand*{\cleardoubleoddemptypage}{\cleardoubleoddpageusingstyle{empty}} \newcommand*{\cleardoubleoddplainpage}{\cleardoubleoddpageusingstyle{plain}} \newcommand*{\cleardoubleevenstandardpage}{% @@ -659,7 +660,7 @@ \fi\fi } \newcommand*{\cleardoubleevenpageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoubleevenstandardpage}} + {\pagestyle{#1}\cleardoubleevenstandardpage}} \newcommand*{\cleardoubleevenemptypage}{\cleardoubleevenpageusingstyle{empty}} \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} @@ -673,7 +674,7 @@ \newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage} \newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage} \newcommand*{\cleardoublepageusingstyle}[1]{\clearpage - {\thispagestyle{#1}\cleardoublestandardpage}} + {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} @@ -3065,7 +3066,8 @@ \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax \ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi - \hrule \@height\ftn@rule@height \@width\ftn@rule@width + {\usekomafont{footnoterule}{% + \hrule \@height\ftn@rule@height \@width\ftn@rule@width}}% \kern 2.6\p@} \newcommand*{\ftn@rule@test@values}{% \ifdim\ftn@rule@height <\z@ @@ -3099,6 +3101,7 @@ \fi \fi } +\newkomafont{footnoterule}{} \newcommand*{\ftn@rule@width}{.4\columnwidth} \newcommand*{\ftn@rule@height}{.4\p@} \newcommand*{\setfootnoterule}[2][]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 576ba95dcee..0db1f7efee7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 5116d36a000..76b48d518c8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 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 40a8d0f67d6..95cf1f2c596 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index fc1c09987dc..9ef3a052cf9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 151f251a7c5..d3190279d75 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -39,7 +39,7 @@ %% standard classes created by The LaTeX3 Project 1994-1996. %% %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/06/09 v3.06} +\def\tocbasicversion{2010/09/14 v3.06a} \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{tocbasic} [\tocbasicversion\space KOMA-Script package @@ -83,7 +83,11 @@ or a mistake by the user.\MessageBreak }% }{% - \g@addto@macro\tb@listoftocs{\do{#2}{#1}}% + \begingroup + \protected@edef\reserved@a{% + \noexpand\g@addto@macro\noexpand\tb@listoftocs{% + \noexpand\do{#2}{#1}}}\reserved@a + \endgroup \ifx\relax #1\relax\else \@ifundefined{tb@#1@add@hook}{}{% \edef\reserved@a{% diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 9640c6e8fc5..419a0da2039 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -68,7 +68,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -622,6 +622,7 @@ \@namedef{scr@v@3.05}{10} \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} +\@namedef{scr@v@3.07}{10} \@namedef{scr@v@last}{10} %%% From File: scrktare.dtx \InputIfFileExists{typearea.cfg}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 3a57367dcc9..fbada963b57 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}% + \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% -- cgit v1.2.3