From 33a91552392adacad1480db2e7ea4e966c0f4533 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 16 May 2012 23:12:50 +0000 Subject: koma-script (15may12) git-svn-id: svn://tug.org/texlive/trunk@26455 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 +- Master/texmf-dist/tex/latex/koma-script/float.hak | 2 +- .../texmf-dist/tex/latex/koma-script/floatrow.hak | 2 +- .../texmf-dist/tex/latex/koma-script/hyperref.hak | 2 +- .../texmf-dist/tex/latex/koma-script/listings.hak | 2 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 25 ++++++++--- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 25 ++++++++--- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 4 +- .../tex/latex/koma-script/scrfontsizes.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 22 ++++++++-- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 25 ++++++++--- .../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/scrwfile.sty | 2 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 4 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 48 ++++++++++++++++++---- .../texmf-dist/tex/latex/koma-script/visualize.lco | 2 +- 36 files changed, 153 insertions(+), 58 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index ad12c19825e..d278b305c82 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 f020fa4aafb..57826e4a000 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 497b06600c6..3b805c60958 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 ce09b6582bf..cf4be08dfbc 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 87eadad739b..2467a41874a 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 b280dbb6293..69daecae666 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 43f5183e314..3170a9e86f7 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 19db4613598..341b860e3f5 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 d85528a1d57..98fbaac3323 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 63e1c932df1..dd8aef8d769 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 2db4c2364ba..d6d7767a211 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 ed2d07d4eab..711fd2e817b 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 7326c3c4028..6f50762ee53 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 882dd5debf5..d1dcc7a3823 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 8a9561e30a8..7aad971320e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrhack.dtx \ProvidesFile{float.hak} diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak index 2cb7157522d..3f9ec6f8043 100644 --- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak +++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrhack.dtx \ProvidesFile{floatrow.hak} diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index 2c28212daa5..1c0c50cba33 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrhack.dtx \ProvidesFile{hyperref.hak} diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index 0bd2ef6ccbd..5b498c18d81 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrhack.dtx \ProvidesFile{listings.hak} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 5b4846952d6..f7ba793a4c6 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2011/05/30 v3.09a} +\def\tocbasicversion{2012/04/04 v3.10b} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \addtotoclist{toc} @@ -187,6 +187,8 @@ \@namedef{scr@v@3.09a}{10} \@namedef{scr@v@3.10}{10} \@namedef{scr@v@3.10a}{10} +\@namedef{scr@v@3.10b}{10} +\@namedef{scr@v@3.11}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -1304,9 +1306,21 @@ }% } \AfterPackage{everysel}{% - \g@addto@macro\@EverySelectfont@Init{% - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname + \scr@ifundefinedorrelax{@EverySelectfont@Init}{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont + \ClassWarningNoLine{\KOMAClassName}{% + \string\selectfont\space already changed}% + \else + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + \fi + }{% + \g@addto@macro\@EverySelectfont@Init{% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + }% }% } \AfterPackage{tracefnt}{% @@ -1944,6 +1958,7 @@ \ifx\scr@ds@tocentry\@empty\else \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{% \scr@ds@tocentry}% + \fi \@spart{#2}% \ifx\partmark\@gobble \@mkboth{}{}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index df3d9b460e8..0c97aa6d666 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 3cd0a8feb95..3aa0b172fdc 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2011/05/30 v3.09a} +\def\tocbasicversion{2012/04/04 v3.10b} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -189,6 +189,8 @@ \@namedef{scr@v@3.09a}{10} \@namedef{scr@v@3.10}{10} \@namedef{scr@v@3.10a}{10} +\@namedef{scr@v@3.10b}{10} +\@namedef{scr@v@3.11}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -1405,9 +1407,21 @@ }% } \AfterPackage{everysel}{% - \g@addto@macro\@EverySelectfont@Init{% - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname + \scr@ifundefinedorrelax{@EverySelectfont@Init}{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont + \ClassWarningNoLine{\KOMAClassName}{% + \string\selectfont\space already changed}% + \else + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + \fi + }{% + \g@addto@macro\@EverySelectfont@Init{% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + }% }% } \AfterPackage{tracefnt}{% @@ -2084,6 +2098,7 @@ \ifx\scr@ds@tocentry\@empty\else \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{% \scr@ds@tocentry}% + \fi \@spart{#2}% \ifx\partmark\@gobble \@mkboth{}{}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index e07a7476b2a..c3d48aa1162 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 f35cf967ca5..f5880c0b08d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -97,7 +97,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrextend.dtx \ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package @@ -228,6 +228,8 @@ \@namedef{scr@v@3.09a}{10} \@namedef{scr@v@3.10}{10} \@namedef{scr@v@3.10a}{10} +\@namedef{scr@v@3.10b}{10} +\@namedef{scr@v@3.11}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index a370af9b826..794bc4168b0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesPackage{scrfontsizes}[% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 5a9c71e4823..a7404a63447 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrhack.dtx %%% using: package,identify diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index a839a1f0d13..468ed54a0a4 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 8aad9920301..d7f9e2a372a 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -179,6 +179,8 @@ \@namedef{scr@v@3.09a}{10} \@namedef{scr@v@3.10}{10} \@namedef{scr@v@3.10a}{10} +\@namedef{scr@v@3.10b}{10} +\@namedef{scr@v@3.11}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -1971,9 +1973,21 @@ }% } \AfterPackage{everysel}{% - \g@addto@macro\@EverySelectfont@Init{% - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname + \scr@ifundefinedorrelax{@EverySelectfont@Init}{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont + \ClassWarningNoLine{\KOMAClassName}{% + \string\selectfont\space already changed}% + \else + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + \fi + }{% + \g@addto@macro\@EverySelectfont@Init{% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + }% }% } \AfterPackage{tracefnt}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index a2f67d62d78..306ce0b4327 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2011/05/30 v3.09a} +\def\tocbasicversion{2012/04/04 v3.10b} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -189,6 +189,8 @@ \@namedef{scr@v@3.09a}{10} \@namedef{scr@v@3.10}{10} \@namedef{scr@v@3.10a}{10} +\@namedef{scr@v@3.10b}{10} +\@namedef{scr@v@3.11}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -1404,9 +1406,21 @@ }% } \AfterPackage{everysel}{% - \g@addto@macro\@EverySelectfont@Init{% - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname + \scr@ifundefinedorrelax{@EverySelectfont@Init}{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont + \ClassWarningNoLine{\KOMAClassName}{% + \string\selectfont\space already changed}% + \else + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + \fi + }{% + \g@addto@macro\@EverySelectfont@Init{% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + }% }% } \AfterPackage{tracefnt}{% @@ -2099,6 +2113,7 @@ \ifx\scr@ds@tocentry\@empty\else \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{% \scr@ds@tocentry}% + \fi \@spart{#2}% \ifx\partmark\@gobble \@mkboth{}{}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 3948ff2c439..b2d051dbf0f 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 26b5991099d..93b80934453 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 88fe3f5b2e8..7d060da0834 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 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 5af9b5f4913..77ab22ea69c 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty index d5fc9f4e55e..177de6fea03 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty @@ -47,7 +47,7 @@ %%% From File: scrwfile.dtx \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrwfile} - [2011/09/11 v0.1c-alpha LaTeX2e KOMA-Script package (write and clone files)] + [2012/03/05 v0.1d-alpha LaTeX2e KOMA-Script package (write and clone files)] \PackageWarningNoLine{scrwfile}{% THIS IS AN ALPHA VERSION!\MessageBreak USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index e658ea8b018..79e6fe43728 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{2011/05/30 v3.09a} +\def\tocbasicversion{2012/04/04 v3.10b} \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{tocbasic} [\tocbasicversion\space KOMA-Script package @@ -627,7 +627,7 @@ \expandafter\noexpand\csname \tb@nt@type name\endcsname \noexpand\nobreakspace \expandafter\noexpand\csname the\tb@nt@type\endcsname - \csname autodot\endcsname + \noexpand\csname autodot\endcsname }% \noexpand\newcommand*\expandafter\noexpand \csname fnum@\tb@nt@type\endcsname{% diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 7d67056013c..4b7c03c7aca 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{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -263,6 +263,7 @@ \AtEndOfPackage{\KOMA@key{DIV}{\typearea[current]{#1}}} \KOMA@DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc} \KOMA@DeclareDeprecatedOption[typearea]{DIVclassic}{DIV=classic} +\KOMA@ifkey{areasetadvanced}{@areasetadvanced} \newif\if@semitwoside \g@addto@macro\@twosidetrue\@semitwosidefalse \g@addto@macro\@twosidefalse\@semitwosidefalse @@ -630,6 +631,8 @@ \@namedef{scr@v@3.09a}{10} \@namedef{scr@v@3.10}{10} \@namedef{scr@v@3.10a}{10} +\@namedef{scr@v@3.10b}{10} +\@namedef{scr@v@3.11}{10} \@namedef{scr@v@last}{10} %%% From File: scrktare.dtx \InputIfFileExists{typearea.cfg}{% @@ -783,6 +786,10 @@ \@ifstar \l@addto@macro \g@addto@macro \@typearea@end } \newcommand*{\@typearea@end}{} +\newcommand*{\AfterSettingArea}{% + \@ifstar \l@addto@macro \g@addto@macro \@areaset@end +} +\newcommand*{\@areaset@end}{} \newcommand*{\activateareas}{% \if@atdocument \PackageWarning{typearea}{% @@ -1115,7 +1122,15 @@ \ta@hblk=\paperwidth \advance\ta@hblk by-\ta@bcor \advance\ta@hblk by-\textwidth - \divide\ta@hblk by3 + \if@areasetadvanced + \if@mincl + \divide\ta@hblk by4 + \else + \divide\ta@hblk by3 + \fi + \else + \divide\ta@hblk by3 + \fi \oddsidemargin=-1in \evensidemargin=-1in \if@twoside @@ -1139,9 +1154,18 @@ \topskip=\@ptsize\p@ \advance\topskip by 10\p@ }% - \headheight=15\p@ - \advance\headheight by\f@size\p@ - \advance\headheight by-10\p@ + \if@areasetadvanced + \normalsize + \@ifundefined{ta@hh}{% + \headheight=1.25\baselineskip + }{% + \headheight=\ta@hh + }% + \else + \headheight=15\p@ + \advance\headheight by\f@size\p@ + \advance\headheight by-10\p@ + \fi \headsep=1.5\baselineskip \footskip=3.5\baselineskip \ta@vblk=\paperheight @@ -1154,8 +1178,8 @@ \if@fincl \advance\textheight by-\footskip \fi - \topmargin \ta@vblk - \advance\topmargin by-1in + \topmargin=-1in + \advance\topmargin by\ta@vblk \if@hincl \else \advance\topmargin by-\headheight \advance\topmargin by-\headsep @@ -1170,8 +1194,18 @@ \marginparwidth=\ta@hblk \fi \marginparsep=1cc + \if@areasetadvanced + \if@mincl + \marginparwidth=\ta@hblk + \if@twoside\if@semitwoside\else + \advance\evensidemargin by\marginparwidth + \fi\fi + \advance\marginparwidth by-\marginparsep + \fi + \fi \marginparpush=0.45\baselineskip \ta@layoutinfo{areaset}{}% + \@areaset@end \activateareas } \typearea[current]{current} diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 3dc92872226..09dedcd6ccf 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/03/08 v3.10a KOMA-Script}% + \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% -- cgit v1.2.3