diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
41 files changed, 569 insertions, 247 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index 0418d206b86..6af76945c04 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -8,7 +8,7 @@ %% scrklco.dtx (with options: `lco,DIN,head') %% scrklco.dtx (with options: `lco,DIN,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 82e0d9d16df..d207deaee79 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -8,7 +8,7 @@ %% scrklco.dtx (with options: `lco,DINmoretext,head') %% scrklco.dtx (with options: `lco,DINmoretext,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 5e732d96125..559ec2a7f70 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -9,7 +9,7 @@ %% scrklco.dtx (with options: `lco,KOMAold,body') %% scrknpap.dtx (with options: `lco,KOMAold,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 b24eaccfcb2..3c277de6319 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,head') %% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 46d4d910e22..2ed8de8d5b9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -8,7 +8,7 @@ %% scrklco.dtx (with options: `lco,NF,head') %% scrklco.dtx (with options: `lco,NF,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 947dbcef5de..d79debd3617 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,head') %% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 35afc851168..4f1ee6a82f6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,head') %% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 f70dfe492af..b9a4869223d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,head') %% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 dee1a7f46e0..d747393db71 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,LATE,LOW,head') %% japanlco.dtx (with options: `lco,Ni,LATE,LOW,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 85ba0c8a3d1..09f5c36e8e7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,head') %% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 8d7fed4db23..60487eb0d7e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -8,7 +8,7 @@ %% scrklco.dtx (with options: `lco,SN,head') %% scrklco.dtx (with options: `lco,SN,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 a02cf9c7f8d..35e38d75c0f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -8,7 +8,7 @@ %% scrklco.dtx (with options: `lco,SwissLeft,head') %% scrklco.dtx (with options: `lco,SwissLeft,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 f5abbf3e231..22f63a020e1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -9,7 +9,7 @@ %% scrbeta.dtx (with options: `UScommercial9,betarelease,lco') %% scrklco.dtx (with options: `lco,UScommercial9,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 0774d2dda50..3e5e3feaf4c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -9,7 +9,7 @@ %% scrbeta.dtx (with options: `UScommercial9DW,betarelease,lco') %% scrklco.dtx (with options: `lco,UScommercial9DW,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index d17132552d0..a2737069c51 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -7,7 +7,7 @@ %% scrhack.dtx (with options: `hack,float,identify') %% scrhack.dtx (with options: `hack,float,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% 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/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index 143b7544836..5ba91af4c9e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -7,7 +7,7 @@ %% scrhack.dtx (with options: `hack,hyperref,identify') %% scrhack.dtx (with options: `hack,hyperref,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% 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/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index dbd0ea4859e..fcfaff85af2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -7,7 +7,7 @@ %% scrhack.dtx (with options: `hack,listings,identify') %% scrhack.dtx (with options: `hack,listings,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty index 061ed15a964..422fd9aefd2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty @@ -7,7 +7,7 @@ %% scraddr.dtx (with options: `scraddr') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index db0688a2a6a..7d7eaa0d439 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -6,7 +6,7 @@ %% %% scrkvers.dtx (with options: `class,article') %% scrkbase.dtx (with options: `load') -%% tocbasic.dtx (with options: `load') +%% tocbasic.dtx (with options: `class,load') %% scrkcomp.dtx (with options: `class,article,option') %% scrkmisc.dtx (with options: `class,article,option') %% scrklang.dtx (with options: `class,article,option') @@ -40,7 +40,7 @@ %% scrklist.dtx (with options: `class,article,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/09/14 v3.06a} +\def\tocbasicversion{2010/10/01 v3.07a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \addtotoclist{toc} @@ -180,6 +180,7 @@ \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} \@namedef{scr@v@3.07}{10} +\@namedef{scr@v@3.08}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -341,54 +342,68 @@ \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% - {false}{0},{off}{0},{no}{0},% - {full-}{1},% - {half-}{2},% - {full}{3},{true}{3},{on}{3},{yes}{3},% - {half}{4},% - {full+}{5},% - {half+}{6},% - {full*}{7},% - {half*}{8},% - {relative}{9},% - {absolute}{10},% + {never}{0},% + {false}{1},{off}{1},{no}{1},% + {full-}{2},% + {half-}{3},% + {full}{4},{true}{4},{on}{4},{yes}{4},% + {half}{5},% + {full+}{6},% + {half+}{7},% + {full*}{8},% + {half*}{9},% + {relative}{10},% + {absolute}{11}% }{#1}% \ifcase\number\@tempa% 0 \endgroup - \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup + \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 2 + \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \or% 2 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \or%3 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 4 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \or%4 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \or%5 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 6 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \or%6 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \or%7 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 8 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%8 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%9 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 10 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -401,7 +416,7 @@ \fi \let\default@par@update=\par@updaterelative }% - \or%10 + \or%11 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -1671,9 +1686,9 @@ \ifnum \c@secnumdepth >\m@ne \refstepcounter{part}% \@maybeautodot\thepart% - \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}% + \addparttocentry{\thepart}{#1}% \else - \addcontentsline{toc}{part}{#1}% + \addparttocentry{}{#1}% \fi \begingroup \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative @@ -1703,6 +1718,9 @@ \partheadendvskip \@afterheading } +\newcommand*{\addparttocentry}[2]{% + \addtocentrydefault{part}{#1}{#2}% +} \newcommand\addpart{% \par \partheadstartvskip% @@ -1712,7 +1730,8 @@ \newcommand*{\@addpart}{} \def\@addpart[#1]#2{% \csname phantomsection\endcsname - \addcontentsline{toc}{part}{#1}\@spart{#2}% + \addparttocentry{}{#1}% + \@spart{#2}% \ifx\partmark\@gobble\else\@mkboth{#1}{}\fi } \newcommand*{\@saddpart}{\@spart} @@ -2102,11 +2121,14 @@ \def\scap@caption{% \if c\scap@valign \setlength{\abovecaptionskip}{\z@}% - \setlength{\belowcaptionskip}{\z@}% - \else - \setlength{\abovecaptionskip}{-\ht\strutbox}% - \setlength{\belowcaptionskip}{-\dp\strutbox}% + \else \if t\scap@valign + \setlength{\abovecaptionskip}{-\ht\strutbox}% + \else \if b\scap@valign + \setlength{\abovecaptionskip}{\z@}% + \fi + \fi \fi + \setlength{\belowcaptionskip}{-\dp\strutbox}% \captionbelow[{#1}]{#2}% }% \begin{lrbox}{\c@pti@nb@sid@b@x}% @@ -2767,6 +2789,13 @@ \newcommand*{\tableofcontents}{% \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup } +\newcommand{\addtocentrydefault}[3]{% + \ifstr{#2}{}{% + \addcontentsline{toc}{#1}{#3}% + }{% + \addcontentsline{toc}{#1}{\protect\numberline{#2}#3}% + }% +} \newcommand*{\float@listhead}[1]{% \scr@float@listhead@warning \float@@listhead{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 2682e3e5db9..183011b3201 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -12,7 +12,7 @@ %% scrklang.dtx (with options: `package,body,base') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -248,7 +248,7 @@ \FamilyProcessOptions{KOMA}\relax %%% From File: scrklang.dtx %%% From File: scrlfile.dtx -\def\scrlfileversion{2009/03/25 v3.03} +\def\scrlfileversion{2010/11/05 v3.08} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx @@ -545,22 +545,27 @@ } \newcommand*{\Family@Options}[3]{% \@for\scr@key@atlist:=#2\do{% - \expandafter\scr@key@split@name@value\scr@key@atlist==\@nil - \scr@key@found@false - \edef\@tempa{\csname #1@key@familylist\endcsname}% - \@for\@tempa:=\@tempa\do{% - \scr@ifundefinedorrelax{KV@\@tempa @\scr@key@name}{}{% - \scr@key@found@true - \protected@edef\reserved@a{\noexpand\setkeys{\@tempa}{\scr@key@atlist}% - \noexpand\def\noexpand\@tempa{\@tempa}% - \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}% - \noexpand\def\noexpand\scr@key@name{\scr@key@name}% - \noexpand\def\noexpand\scr@key@value{\scr@key@value}% + \ifx\scr@key@atlist\@empty\else + \ifx\scr@key@atlist\space\else + \expandafter\scr@key@split@name@value\scr@key@atlist==\@nil + \scr@key@found@false + \edef\@tempa{\csname #1@key@familylist\endcsname}% + \@for\@tempa:=\@tempa\do{% + \scr@ifundefinedorrelax{KV@\@tempa @\scr@key@name}{}{% + \scr@key@found@true + \protected@edef\reserved@a{% + \noexpand\setkeys{\@tempa}{\scr@key@atlist}% + \noexpand\def\noexpand\@tempa{\@tempa}% + \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}% + \noexpand\def\noexpand\scr@key@name{\scr@key@name}% + \noexpand\def\noexpand\scr@key@value{\scr@key@value}% + }% + \reserved@a + }% }% - \reserved@a - }% - }% - \ifscr@key@found@\else#3\fi + \ifscr@key@found@\else#3\fi + \fi + \fi }% } \newif\ifscr@key@found@ @@ -601,7 +606,9 @@ \let\reserved@a\@empty \@for\@tempa:=#3\do{% \expandafter\KV@@sp@def\expandafter\@tempa\expandafter{\@tempa}% - \protected@edef\reserved@a{\reserved@a,\scr@key@name=\@tempa}% + \ifx\@tempa\@empty\else + \protected@edef\reserved@a{\reserved@a,\scr@key@name=\@tempa}% + \fi }% \ifx\reserved@a\@empty \protected@edef\reserved@a{\noexpand\setkeys{\@tempb}{\scr@key@name}}% @@ -709,6 +716,17 @@ \@tempa \let\FamilyElseValues\@empty } +\newcommand*{\FamilyStringKey}[3][.\@currname.\@currext]{% + \@ifnextchar [%] + {\Family@String@Key{#1}{#2}{#3}}{\Family@@String@@Key{#1}{#2}{#3}}% +} +\newcommand*{\Family@@String@@Key}{} +\long\def\Family@@Numerical@@Key#1#2#3[#4]#5{% + \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\def#5{##1}}% +} +\newcommand{\Family@String@Key}[4]{% + \DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}}% +} %%% From File: scrklang.dtx \newcommand*{\providecaptionname}[3]{% \@ifundefined{captions#1}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index beea8c9fa89..42398cd5826 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -6,7 +6,7 @@ %% %% scrkvers.dtx (with options: `class,book') %% scrkbase.dtx (with options: `load') -%% tocbasic.dtx (with options: `load,chapter') +%% tocbasic.dtx (with options: `class,load,chapter') %% scrkcomp.dtx (with options: `class,book,option') %% scrkmisc.dtx (with options: `class,book,option') %% scrklang.dtx (with options: `class,book,option') @@ -40,7 +40,7 @@ %% scrklist.dtx (with options: `class,book,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/09/14 v3.06a} +\def\tocbasicversion{2010/10/01 v3.07a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -182,6 +182,7 @@ \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} \@namedef{scr@v@3.07}{10} +\@namedef{scr@v@3.08}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -343,54 +344,68 @@ \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% - {false}{0},{off}{0},{no}{0},% - {full-}{1},% - {half-}{2},% - {full}{3},{true}{3},{on}{3},{yes}{3},% - {half}{4},% - {full+}{5},% - {half+}{6},% - {full*}{7},% - {half*}{8},% - {relative}{9},% - {absolute}{10},% + {never}{0},% + {false}{1},{off}{1},{no}{1},% + {full-}{2},% + {half-}{3},% + {full}{4},{true}{4},{on}{4},{yes}{4},% + {half}{5},% + {full+}{6},% + {half+}{7},% + {full*}{8},% + {half*}{9},% + {relative}{10},% + {absolute}{11}% }{#1}% \ifcase\number\@tempa% 0 \endgroup - \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup + \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 2 + \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \or% 2 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \or%3 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 4 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \or%4 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \or%5 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 6 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \or%6 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \or%7 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 8 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%8 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%9 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 10 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -403,7 +418,7 @@ \fi \let\default@par@update=\par@updaterelative }% - \or%10 + \or%11 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -1801,9 +1816,9 @@ \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% \@maybeautodot\thepart% - \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}% + \addparttocentry{\thepart}{#1}% \else - \addcontentsline{toc}{part}{#1}% + \addparttocentry{}{#1}% \fi \begingroup \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative @@ -1836,6 +1851,9 @@ \twocolumn \fi } +\newcommand*{\addparttocentry}[2]{% + \addtocentrydefault{part}{#1}{#2}% +} \newcommand\addpart{% \if@openright\cleardoublepage\else\clearpage\fi \thispagestyle{\partpagestyle}% @@ -1852,7 +1870,8 @@ \newcommand*{\@addpart}{} \def\@addpart[#1]#2{% \csname phantomsection\endcsname - \addcontentsline{toc}{part}{#1}\@spart{#2}% + \addparttocentry{}{#1}% + \@spart{#2}% \ifx\partmark\@gobble\else\@mkboth{#1}{}\fi } \newcommand*{\@saddpart}{\@spart} @@ -1906,7 +1925,7 @@ \refstepcounter{chapter}% \@maybeautodot\thechapter \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}% + \addchaptertocentry{\thechapter}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -1930,7 +1949,7 @@ }% \fi \else - \addcontentsline{toc}{chapter}{#1}% + \addchaptertocentry{}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -1952,7 +1971,7 @@ \fi \fi \else - \addcontentsline{toc}{chapter}{#1}% + \addchaptertocentry{}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -2027,6 +2046,9 @@ {\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}% \nobreak\chapterheadendvskip } +\newcommand*{\addchaptertocentry}[2]{% + \addtocentrydefault{chapter}{#1}{#2}% +} \newcommand*{\@schapter}[1]{% \if@twocolumn \if@at@twocolumn @@ -2059,7 +2081,7 @@ }% \newcommand*{\@addchap}{}% \def\@addchap[#1]#2{\@schapter{#2}% - \addcontentsline{toc}{chapter}{#1}% + \addchaptertocentry{}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -2615,11 +2637,14 @@ \def\scap@caption{% \if c\scap@valign \setlength{\abovecaptionskip}{\z@}% - \setlength{\belowcaptionskip}{\z@}% - \else - \setlength{\abovecaptionskip}{-\ht\strutbox}% - \setlength{\belowcaptionskip}{-\dp\strutbox}% + \else \if t\scap@valign + \setlength{\abovecaptionskip}{-\ht\strutbox}% + \else \if b\scap@valign + \setlength{\abovecaptionskip}{\z@}% + \fi + \fi \fi + \setlength{\belowcaptionskip}{-\dp\strutbox}% \captionbelow[{#1}]{#2}% }% \begin{lrbox}{\c@pti@nb@sid@b@x}% @@ -3299,6 +3324,13 @@ \newcommand*{\tableofcontents}{% \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup } +\newcommand{\addtocentrydefault}[3]{% + \ifstr{#2}{}{% + \addcontentsline{toc}{#1}{#3}% + }{% + \addcontentsline{toc}{#1}{\protect\numberline{#2}#3}% + }% +} \newcommand*{\float@listhead}[1]{% \scr@float@listhead@warning \float@@listhead{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index bf8fb0d1745..10eeb236e78 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -11,7 +11,7 @@ %% scrtime.dtx (with options: `package,scrdate,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] @@ -194,6 +194,10 @@ {Torstai}{Perjantai}{Lauantai}{Sunnuntai} \newdaylanguage{norsk}{Mandag}{Tirsdag}{Onsdag} {Torsdag}{Fredag}{L\o{}rdag}{S\o{}ndag} +\newdaylanguage{danish}{Mandag}{Tirsdag}{Onsdag} + {Torsdag}{Fredag}{L\o{}rdag}{S\o{}ndag} +\newdaylanguage{swedish}{M\aa{}ndag}{Tisdag}{Onsdag} + {Torsdag}{Fredag}{L\"ordag}{S\"ondag} \def\@dayname#1{% \ifcase #1 Monday\or Tuesday\or Wednesday\or Thursday\or diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls index 27e6244c8be..1e4d7c611d5 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls @@ -1,6 +1,6 @@ % ====================================================================== % scrdoc.dtx -% Copyright (c) Markus Kohm, 2002-2010 +% Copyright (c) Markus Kohm, 2002-2011 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrdoc.dtx -% Copyright (c) Markus Kohm, 2002-2010 +% Copyright (c) Markus Kohm, 2002-2011 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 17fe7a8caf3..1adb8590337 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -30,7 +30,7 @@ %% scrklist.dtx (with options: `package,extend,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -97,7 +97,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup %%% From File: scrextend.dtx \ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package @@ -221,6 +221,7 @@ \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} \@namedef{scr@v@3.07}{10} +\@namedef{scr@v@3.08}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 3b2f463bdbf..fe51c784a1b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -11,7 +11,7 @@ %% scrhack.dtx (with options: `package,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 1887cd59464..c1ad2569b1b 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-2010 +%% Copyright (c) 2007-2011 %% 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 0f6cb30110d..486ee92f0d2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -12,7 +12,7 @@ %% scrkfont.dtx (with options: `package,body,scrkbase') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -85,7 +85,7 @@ \KOMAProcessOptions\relax %%% From File: scrkfont.dtx %%% From File: scrlfile.dtx -\def\scrlfileversion{2009/03/25 v3.03} +\def\scrlfileversion{2010/11/05 v3.08} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx @@ -115,8 +115,8 @@ \ifx\post@kopt@hook\relax \PackageWarning{scrkbase}{% \string\AfterKOMAoptions\space can only be used inside a\MessageBreak - KOMA-Script option that is called using \space\KOMAoptions.\MessageBreak - Because if this, command will be ignored% + KOMA-Script option that is called using \string\KOMAoptions.\MessageBreak + Because of this, command will be ignored% }% \expandafter\@gobbletwo \else diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls index 801432e46e2..61344386420 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls @@ -7,7 +7,7 @@ %% scrlettr.dtx (with options: `scrlettr') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 325d0f5c279..26586957fbf 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -41,7 +41,7 @@ %% standard classes created by The LaTeX3 Project 1994-1996. %% %%% From File: scrlfile.dtx -\def\scrlfileversion{2009/03/25 v3.03} +\def\scrlfileversion{2010/11/05 v3.08} \ProvidesPackage{scrlfile}[% \scrlfileversion\space KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% @@ -155,6 +155,97 @@ \endgroup {#1}% } +\newcommand*{\scrlfile@excludedpackages}{} +\let\scrlfile@excludedpackages\@empty +\newcommand*{\scrlfile@saved@RequirePackage}{} +\newcommand*{\PreventPackageFromLoading}[1]{% + \edef\reserved@b{#1}% + \ifx \reserved@b\@empty + \PackageWarning{scrlfile}{% + \string\PreventPackageFromLoading\space with empty argument\MesageBreak + ignored% + }% + \else + \ifx\scrlfile@excludedpackages\@empty + \let\scrlfile@saved@RequirePackage\RequirePackage + \let\RequirePackage\scrlfile@RequirePackage + \def\reserved@a#1{% + \@latex@error + {\noexpand \usepackage before \string\documentclass}% + {\noexpand \usepackage may only appear in the document + preamble, i.e.,\MessageBreak + between \noexpand\documentclass and + \string\begin{document}.}% + \@gobble}% + \ifx\reserved@a\usepackage\else + \ifx\usepackage\scrlfile@saved@RequirePackage\else + \PackageWarning{scrlfile}{% + Maybe serious problem: unexpected definition of\MessageBreak + \string\usepackage + }% + \fi + \let\usepackage\RequirePackage + \fi + \fi + \expandafter\@for \expandafter\reserved@a\expandafter:\expandafter=% + \reserved@b\do {% + \ifx\reserved@a\@empty\else + \expandafter\@ifpackageloaded\expandafter{\reserved@a}{% + \PackageWarning{scrlfile}{% + package `\reserved@a' already loaded.\MessageBreak + Cannot prevent it from beeing loaded% + }% + }{% + \edef\scrlfile@excludedpackages{,\reserved@a}% + }% + \fi + }% + \ifx\scrlfile@excludedpackages\@empty + \ResetPreventPackageFromLoading + \fi + \fi +} +\@onlypreamble\PreventPackageFromLoading +\newcommand*{\ResetPreventPackageFromLoading}{% + \let\scrlfile@excludedpackages\@empty + \ifx\RequirePackage\scrlfile@RequirePackage + \ifx\usepackage\RequirePackage + \let\usepackage\scrlfile@saved@RequirePackage + \fi + \let\RequirePackage\scrlfile@saved@RequirePackage + \fi +} +\@onlypreamble\ResetPreventPackageFromLoading +\newcommand*{\StorePreventPackageFromLoading}[1]{% + \let#1\scrlfile@excludedpackages +} +\@onlypreamble\StorePreventPackageFromLoading +\newcommand*{\scrlfile@RequirePackage}[2][]{% + \let\reserved@c\@empty + \@for\reserved@b:=#2\do {% + \begingroup + \@tempswatrue + \@for\reserved@a:=\scrlfile@excludedpackages\do {% + \ifx\reserved@a\reserved@b + \PackageInfo{scrlfile}{Excluding package `\reserved@b'\MessageBreak + from loading}% + \@tempswafalse + \fi + }% + \if@tempswa + \xdef\reserved@c{\reserved@c,\reserved@b}% + \fi + \endgroup + }% + \ifx\reserved@c\@empty + \let\reserved@a\@gobbleopt + \else + \edef\reserved@a{\noexpand\scrlfile@saved@RequirePackage[#1]{% + \expandafter\@gobble\reserved@c\@empty}}% + \fi + \reserved@a +} +\providecommand{\@gobbleopt}[1][]{} \AtEndDocument{% \let\scr@saved@checkend=\@checkend \renewcommand*{\@checkend}[1]{% @@ -215,6 +306,7 @@ \ifx\scr@hook@bcma\@empty \gdef\scr@hook@bcma{% \renewcommand*{\BeforeClosingMainAux}[1]{####1}% + \let\protected@write\protected@immediate@write \scr@redefine@newpage }% \fi @@ -224,10 +316,20 @@ \ifx\scr@hook@acma\@empty \gdef\scr@hook@acma{% \renewcommand*{\AfterReadingMainAux}[1]{####1}% + \let\protected@write\protected@immediate@write }% \fi \g@addto@macro\scr@hook@acma% } +\long\def\protected@immediate@write#1#2#3{% + \begingroup + #2% + \let\protect\@unexpandable@protect + \edef\reserved@a{\immediate\write#1{#3}}% + \reserved@a + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi +} %%% From File: scrlogo.dtx \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 011d33b8d02..f54bd7a89eb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -39,7 +39,7 @@ %% scrkcile.dtx (with options: `class,letter,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -94,7 +94,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -172,6 +172,7 @@ \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} \@namedef{scr@v@3.07}{10} +\@namedef{scr@v@3.08}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -356,54 +357,68 @@ \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% - {false}{0},{off}{0},{no}{0},% - {full-}{1},% - {half-}{2},% - {full}{3},{true}{3},{on}{3},{yes}{3},% - {half}{4},% - {full+}{5},% - {half+}{6},% - {full*}{7},% - {half*}{8},% - {relative}{9},% - {absolute}{10},% + {never}{0},% + {false}{1},{off}{1},{no}{1},% + {full-}{2},% + {half-}{3},% + {full}{4},{true}{4},{on}{4},{yes}{4},% + {half}{5},% + {full+}{6},% + {half+}{7},% + {full*}{8},% + {half*}{9},% + {relative}{10},% + {absolute}{11}% }{#1}% \ifcase\number\@tempa% 0 \endgroup - \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup + \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 2 + \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \or% 2 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \or%3 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 4 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \or%4 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \or%5 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 6 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \or%6 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \or%7 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 8 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%8 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%9 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 10 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -416,7 +431,7 @@ \fi \let\default@par@update=\par@updaterelative }% - \or%10 + \or%11 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -1576,6 +1591,24 @@ \providecaptionname{norsk}\wwwname{Url}% \providecaptionname{norsk}\bankname{Bankkontonummer}% \g@addnumerical@date{norsk}{\number\day.\number\month.\number\year}% + \providecaptionname{swedish}\yourrefname{Er ref}% + \providecaptionname{swedish}\yourmailname{Ert brev av}% + \providecaptionname{swedish}\myrefname{V\aa{}r ref}% + \providecaptionname{swedish}\customername{Kundnummer}% + \providecaptionname{swedish}\invoicename{Fakturanummer}% + \providecaptionname{swedish}\subjectname{\"Amne}% + \providecaptionname{swedish}\ccname{Kopia till}% + \providecaptionname{swedish}\enclname{Bilagor}% Singular: Bilaga + \providecaptionname{swedish}\headtoname{Till}% + \providecaptionname{swedish}\headfromname{Fr\aa{}n}% + \providecaptionname{swedish}\datename{Datum}% + \providecaptionname{swedish}\pagename{Sida}% + \providecaptionname{swedish}\phonename{Telefon}% + \providecaptionname{swedish}\faxname{Telefax}% + \providecaptionname{swedish}\emailname{E-post}% + \providecaptionname{swedish}\wwwname{Hemsida}% + \providecaptionname{swedish}\bankname{Bankgiro}% PlusGiro + \g@addnumerical@date{swedish}{\number\day/\number\month~\number\year}% \captionsenglish \dateenglish \begingroup\expandafter\expandafter\expandafter\endgroup @@ -1655,6 +1688,10 @@ \captionsnorsk \datenorsk \fi\fi + \ifx\l@swedish\undefined\else\ifnum\language=\l@swedish + \captionsswedish + \dateswedish + \fi\fi \else \edef\@tempa{nohyphenation}% \ifx\languagename\@tempa @@ -1697,28 +1734,28 @@ \fi% \expandafter\let\csname scr@#2@var\endcsname=\@empty \if@tempswa\addtoreffields{#2}\fi - }{% + }{% \ClassError{% scrlttr2% - }{% + }{% This should never happen% - }{% + }{% The contents of the KOMA-Script variable `#2'\MessageBreak is undefined, but the name of the variable is defined.\MessageBreak This should never happen. So someone crashs me!% - }% }% - }{% + }% + }{% \ClassError{% scrlttr2% - }{% + }{% Variable `#2' already defined% - }{% + }{% I'll ignore this command, if you'll continue.% - }% }% - } + }% +} \newcommand*{\setkomavar}{% \@ifstar {\@setkomaname}{\@setkomavar}} \newcommand*{\@setkomavar}[1]{% @@ -1727,23 +1764,26 @@ \newcommand*{\@setkomaname}[2]{% \@ifundefined{scr@#1@var}{% \@komavar@err{set}{#1}% - }{% + }{% \@namedef{scr@#1@name}{#2}% - }% - } + \csname scr@#1@postsetname\endcsname + }% +} \newcommand*{\@@setkomavar}{} \long\def\@@setkomavar#1[#2]#3{% \@ifundefined{scr@#1@var}{% \@komavar@err{set}{#1}% - }{% + }{% \@namedef{scr@#1@var}{#3}% + \csname scr@#1@postsetvar\endcsname \begingroup \def\@tempa{#2}\def\@tempb{\relax}% \ifx\@tempa\@tempb\endgroup\else \endgroup\@namedef{scr@#1@name}{#2}% + \csname scr@#1@postsetname\endcsname \fi - }% - } + }% +} \newcommand*{\@komavar@err}[2]{% \ClassError{% scrlttr2% @@ -2044,7 +2084,8 @@ \newcommand*{\ps@headings}{\let\@mkboth\markboth \renewcommand*{\@oddhead}{% \vbox{% - \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\@nexthead}}% + \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\noindent + \usekomavar{nexthead}}}% \if@hsl\kern1pt\rule{\textwidth}{.4pt}\fi% }% }% @@ -2058,7 +2099,8 @@ \hrulefill\\ }% \fi - \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\footfont\@nextfoot}}% + \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\footfont\noindent + \usekomavar{nextfoot}}}% }% }% \let\@evenfoot\@oddfoot @@ -2331,7 +2373,16 @@ \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} %%% From File: scrknpap.dtx -\newcommand*{\@firsthead}{\noindent% +\newcommand*{\@firsthead}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\@firsthead.\MessageBreak + \string\usekomavar{firsthead} should be used\MessageBreak + instead of \string\@firsthead + }% + \usekomavar{firsthead}% +} +\newkomavar{firsthead} +\setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% {\centering\usekomafont{fromaddress}{% \ifkomavarempty{fromname}{}{% @@ -2345,9 +2396,12 @@ }% }% } +\newcommand*{\scr@firsthead@postsetvar}{% + \renewcommand*{\@alignfrom}{10000}% +} \newcommand*{\@gen@firsthead}{% \ifcase\@alignfrom - \renewcommand*{\@firsthead}{\noindent + \setkomavar{firsthead}{% \parbox[b]{\textwidth}{\raggedright {\usekomafont{fromname}\strut\ignorespaces \usekomavar{fromname}% @@ -2390,8 +2444,9 @@ \llap{\usekomavar{fromlogo}}% \fi }% + \renewcommand*{\@alignfrom}{0}% \or - \renewcommand*{\@firsthead}{\noindent + \setkomavar{firsthead}{% \parbox[b]{\textwidth}{\centering {\usekomafont{fromname}\strut\ignorespaces \usekomavar{fromname}% @@ -2427,8 +2482,9 @@ }% }% }% + \renewcommand*{\@alignfrom}{1}% \or - \renewcommand*{\@firsthead}{\noindent + \setkomavar{firsthead}{% \if@logo \rlap{\usekomavar{fromlogo}}% \fi @@ -2471,11 +2527,16 @@ }% }% }% + \renewcommand*{\@alignfrom}{2}% \fi } -\newcommand{\firsthead}[1]{% - \renewcommand*{\@alignfrom}{10000}% - \renewcommand*{\@firsthead}{\noindent#1}% +\newcommand{\firsthead}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\firsthead.\MessageBreak + You should use \string\setkomavar{firsthead}\MessageBreak + instead of \string\firsthead + } + \setkomavar{firsthead}% } \newkomafont{foldmark}{} \newkomafont{fromname}{} @@ -2544,9 +2605,22 @@ \@setplength{fromrulewidth}{0pt} \@newplength{fromrulethickness} \@setplength{fromrulethickness}{.4pt} -\newcommand*{\@firstfoot}{} -\newcommand{\firstfoot}[1]{% - \renewcommand*{\@firstfoot}{\noindent#1}% +\newkomavar{firstfoot} +\newcommand*{\@firstfoot}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\@firstfoot.\MessageBreak + \string\usekomavar{firstfoot} should be used\MessageBreak + instead of \string\@firstfoot + }% + \usekomavar{firstfoot}% +} +\newcommand{\firstfoot}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\firstfoot.\MessageBreak + You should use \string\setkomavar{firstfoot}\MessageBreak + instead of \string\firstfoot + } + \setkomavar{firstfoot}% } \newcommand*{\move@topt}{% \null\vskip -1in\vskip -\topmargin% @@ -2722,8 +2796,9 @@ \addtolength{\@tempskipa}{-\baselineskip}% \setlength{\textwidth}{\useplength{firstheadwidth}}% \setlength{\parfillskip}{\z@ \@plus 1fil}% - \@savevbox{\@tempskipa}{\@firsthead\vskip \z@ \@plus .00001fil}% - {head of first page}{firstheadvpos}{\firsthead}% + \@savevbox{\@tempskipa}{\noindent\usekomavar{firsthead}% + \vskip \z@ \@plus .00001fil}% + {head of first page}{firstheadvpos}{\setkomavar}% }% }% }% @@ -2758,7 +2833,8 @@ \vskip\useplength{firstfootvpos}% \setlength{\textwidth}{\useplength{firstfootwidth}}% \setlength{\parfillskip}{\z@ \@plus 1fil}% - \vbox{\hsize\useplength{firstfootwidth}\@firstfoot}% + \vbox{\hsize\useplength{firstfootwidth}\noindent + \usekomavar{firstfoot}}% }% }% }% @@ -3330,6 +3406,15 @@ \@newplength{subjectbeforevskip} \@setplength{subjectbeforevskip}{0pt} \newcommand*{\@nexthead}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\@nexthead.\MessageBreak + \string\usekomavar{nexthead} should be used\MessageBreak + instead of \string\@nexthead + }% + \usekomavar{nexthead}% +} +\newkomavar{nexthead} +\setkomavar{nexthead}{% \rlap{\parbox[c]{\textwidth}{\raggedright\strut \ifnum\@pageat=0\pagemark\else\leftmark\fi\strut}}% \parbox[c]{\textwidth}{% @@ -3352,10 +3437,24 @@ \rightmark \fi\strut}}% }% -\newcommand{\nexthead}[1]{% - \renewcommand*{\@nexthead}{\noindent#1}% +\newcommand{\nexthead}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\nexthead.\MessageBreak + You should use \string\setkomavar{nexthead}\MessageBreak + instead of \string\nexthead + } + \setkomavar{nexthead}% } \newcommand*{\@nextfoot}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\@nextfoot.\MessageBreak + \string\usekomavar{nextfoot} should be used\MessageBreak + instead of \string\@nextfoot + }% + \usekomavar{nextfoot}% +} +\newkomavar{nextfoot} +\setkomavar{nextfoot}{% \ifnum\@pageat>2 \parbox[c]{\textwidth}{% \ifcase\@pageat\or\or\or\raggedright\or\centering\or\raggedleft\fi @@ -3363,8 +3462,13 @@ }% \fi } -\newcommand{\nextfoot}[1]{% - \renewcommand*{\@nextfoot}{\noindent#1}% +\newcommand{\nextfoot}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\nextfoot.\MessageBreak + You should use \string\setkomavar{nextfoot}\MessageBreak + instead of \string\nextfoot + } + \setkomavar{nextfoot}% } \newenvironment{letter}[2][]{% \newpage diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty index 396661cc31f..5b30e529e2e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty @@ -7,7 +7,7 @@ %% scrpage.dtx (with options: `scrpage,v1') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index cbb80421476..bff9a989924 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty @@ -7,7 +7,7 @@ %% scrpage.dtx (with options: `scrpage,v2') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 759238d20b5..42fc0931d5f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -6,7 +6,7 @@ %% %% scrkvers.dtx (with options: `class,report') %% scrkbase.dtx (with options: `load') -%% tocbasic.dtx (with options: `load,chapter') +%% tocbasic.dtx (with options: `class,load,chapter') %% scrkcomp.dtx (with options: `class,report,option') %% scrkmisc.dtx (with options: `class,report,option') %% scrklang.dtx (with options: `class,report,option') @@ -40,7 +40,7 @@ %% scrklist.dtx (with options: `class,report,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/09/14 v3.06a} +\def\tocbasicversion{2010/10/01 v3.07a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -182,6 +182,7 @@ \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} \@namedef{scr@v@3.07}{10} +\@namedef{scr@v@3.08}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -343,54 +344,68 @@ \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% - {false}{0},{off}{0},{no}{0},% - {full-}{1},% - {half-}{2},% - {full}{3},{true}{3},{on}{3},{yes}{3},% - {half}{4},% - {full+}{5},% - {half+}{6},% - {full*}{7},% - {half*}{8},% - {relative}{9},% - {absolute}{10},% + {never}{0},% + {false}{1},{off}{1},{no}{1},% + {full-}{2},% + {half-}{3},% + {full}{4},{true}{4},{on}{4},{yes}{4},% + {half}{5},% + {full+}{6},% + {half+}{7},% + {full*}{8},% + {half*}{9},% + {relative}{10},% + {absolute}{11}% }{#1}% \ifcase\number\@tempa% 0 \endgroup - \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup + \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 2 + \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \or% 2 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \or%3 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 4 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \or%4 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \or%5 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 6 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \or%6 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \or%7 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 8 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%8 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%9 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 10 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -403,7 +418,7 @@ \fi \let\default@par@update=\par@updaterelative }% - \or%10 + \or%11 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -1816,9 +1831,9 @@ \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% \@maybeautodot\thepart% - \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}% + \addparttocentry{\thepart}{#1}% \else - \addcontentsline{toc}{part}{#1}% + \addparttocentry{}{#1}% \fi \begingroup \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative @@ -1851,6 +1866,9 @@ \twocolumn \fi } +\newcommand*{\addparttocentry}[2]{% + \addtocentrydefault{part}{#1}{#2}% +} \newcommand\addpart{% \if@openright\cleardoublepage\else\clearpage\fi \thispagestyle{\partpagestyle}% @@ -1867,7 +1885,8 @@ \newcommand*{\@addpart}{} \def\@addpart[#1]#2{% \csname phantomsection\endcsname - \addcontentsline{toc}{part}{#1}\@spart{#2}% + \addparttocentry{}{#1}% + \@spart{#2}% \ifx\partmark\@gobble\else\@mkboth{#1}{}\fi } \newcommand*{\@saddpart}{\@spart} @@ -1920,7 +1939,7 @@ \refstepcounter{chapter}% \@maybeautodot\thechapter \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}% + \addchaptertocentry{\thechapter}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -1944,7 +1963,7 @@ }% \fi \else - \addcontentsline{toc}{chapter}{#1}% + \addchaptertocentry{}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -2017,6 +2036,9 @@ {\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}% \nobreak\chapterheadendvskip } +\newcommand*{\addchaptertocentry}[2]{% + \addtocentrydefault{chapter}{#1}{#2}% +} \newcommand*{\@schapter}[1]{% \if@twocolumn \if@at@twocolumn @@ -2049,7 +2071,7 @@ }% \newcommand*{\@addchap}{}% \def\@addchap[#1]#2{\@schapter{#2}% - \addcontentsline{toc}{chapter}{#1}% + \addchaptertocentry{}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -2591,11 +2613,14 @@ \def\scap@caption{% \if c\scap@valign \setlength{\abovecaptionskip}{\z@}% - \setlength{\belowcaptionskip}{\z@}% - \else - \setlength{\abovecaptionskip}{-\ht\strutbox}% - \setlength{\belowcaptionskip}{-\dp\strutbox}% + \else \if t\scap@valign + \setlength{\abovecaptionskip}{-\ht\strutbox}% + \else \if b\scap@valign + \setlength{\abovecaptionskip}{\z@}% + \fi + \fi \fi + \setlength{\belowcaptionskip}{-\dp\strutbox}% \captionbelow[{#1}]{#2}% }% \begin{lrbox}{\c@pti@nb@sid@b@x}% @@ -3267,6 +3292,13 @@ \newcommand*{\tableofcontents}{% \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup } +\newcommand{\addtocentrydefault}[3]{% + \ifstr{#2}{}{% + \addcontentsline{toc}{#1}{#3}% + }{% + \addcontentsline{toc}{#1}{\protect\numberline{#2}#3}% + }% +} \newcommand*{\float@listhead}[1]{% \scr@float@listhead@warning \float@@listhead{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 0db1f7efee7..c5dd5122d5c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -8,7 +8,7 @@ %% scrkfont.dtx (with options: `clo,10pt') %% scrkpar.dtx (with options: `clo,10pt') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 76b48d518c8..725442c5c1d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -8,7 +8,7 @@ %% scrkfont.dtx (with options: `clo,11pt') %% scrkpar.dtx (with options: `clo,11pt') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 95cf1f2c596..6ad38176617 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -8,7 +8,7 @@ %% scrkfont.dtx (with options: `clo,12pt') %% scrkpar.dtx (with options: `clo,12pt') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 9ef3a052cf9..e84ca2acce8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -11,7 +11,7 @@ %% scrtime.dtx (with options: `package,scrtime,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -66,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 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 d3190279d75..c93fc431187 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -7,7 +7,7 @@ %% tocbasic.dtx (with options: `package') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 2007-2010 +%% Copyright (c) 2007-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -39,7 +39,7 @@ %% standard classes created by The LaTeX3 Project 1994-1996. %% %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/09/14 v3.06a} +\def\tocbasicversion{2010/10/01 v3.07a} \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{tocbasic} [\tocbasicversion\space KOMA-Script package @@ -439,6 +439,7 @@ } \newcommand*{\tocbasicautomode}{% \let\tb@saved@starttoc\@starttoc + \let\@starttoc\tocbasic@starttoc \BeforeStartingTOC{% \let\@starttoc\tb@saved@starttoc \expandafter\ifattoclist\expandafter{\@currext}{}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty index 816c9a97981..27a42c24aec 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty @@ -7,7 +7,7 @@ %% tocstyle.dtx (with options: `package,trace,tocstyle') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 2007-2010 by Markus Kohm <komascript(at)gmx.info> +%% Copyright (c) 2007-2011 by Markus Kohm <komascript(at)gmx.info> %% %% Copyright (c) 1994-2007 %% Markus Kohm and any individual authors listed elsewhere in this file. diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 419a0da2039..6ea978b3f4f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -13,7 +13,7 @@ %% scrkcomp.dtx (with options: `package,typearea,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -68,7 +68,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -623,6 +623,7 @@ \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} \@namedef{scr@v@3.07}{10} +\@namedef{scr@v@3.08}{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 fbada963b57..0ba65ff6081 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -10,7 +10,7 @@ %% scrklco.dtx (with options: `lco,visualize,body') %% scrknpap.dtx (with options: `lco,visualize,body') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% @@ -234,8 +234,7 @@ \fi \showfield{\@tempskipa}{\useplength{toaddrvpos}}% {\useplength{toaddrwidth}}% - {\dimexpr\useplength{toaddrheight}+ - \useplength{backaddrheight}\relax}% + {\dimexpr\useplength{toaddrheight}\relax}% } \newcommand*{\showfield@location}{% \begingroup @@ -261,7 +260,6 @@ \fi \ifdim \useplength{locheight}=\z@% \@setplength{locheight}{\useplength{toaddrheight}}% - \@addtoplength{locheight}{\useplength{backaddrheight}}% \fi \setlengthtoplength[-]{\@tempskipa}{lochpos}% \ifdim \@tempskipa<\z@ |