From 990207a7872817b3d9945d710a389a0d76fe0260 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 27 Jan 2009 02:00:27 +0000 Subject: koma-script update (26jan09) git-svn-id: svn://tug.org/texlive/trunk@11990 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 2 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 2 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 2 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 41 +++++++++++----------- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 9 +++-- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 41 +++++++++++----------- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 3 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 3 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 41 +++++++++++----------- .../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/tocbasic.sty | 10 +++--- .../texmf-dist/tex/latex/koma-script/typearea.sty | 3 +- 23 files changed, 96 insertions(+), 85 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 7980b7922ba..c890a2ff324 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 98ee9eeb7a9..daf00ac70ba 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 0742cabe76f..f38c53d1a65 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -61,7 +61,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 3dcadb64599..3938dc39fdb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup %%% From File: japanlco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index c167dabb726..ae4855b5335 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 51e158fb068..9f7ec422a67 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 8d6521af7e0..1a63c2ef716 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 943d3212067..5b94f58c675 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 493f1d59fa2..854aa9d8946 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 f03184293b6..2ddab3058dc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 ad442a1ff8a..78a27df3be2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 6555e9cbe68..39620173f1d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -106,7 +106,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2009/01/01 v3.02} +\def\tocbasicversion{2009/01/20 v3.02a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \addtotoclist{toc} @@ -166,6 +166,7 @@ \@namedef{scr@v@3.01b}{9} \@namedef{scr@v@3.01c}{9} \@namedef{scr@v@3.02}{9} +\@namedef{scr@v@3.02b}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -2456,9 +2457,9 @@ \let\scr@tmp@footnotetext=\@footnotetext \let\@footnotetext=\@gobble \sbox\@tempboxa{% - {\capfont\strut\ignorespaces - #1{{\caplabelfont#2\captionformat}}% - #3\unskip\strut}% + {\capfont{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat}}}% + #3\unskip\strut}}% }% \let\@footnotetext=\scr@tmp@footnotetext \let\scr@tmp@footnotetext=\undefined @@ -2473,23 +2474,23 @@ \hb@xt@\hsize{% \setbox\@tempboxa\vbox{\hsize=\cap@width \ifdofullc@p - {\capfont\@hangfrom{\scr@smashdp{\strut\ignorespaces - #1{{\caplabelfont#2\captionformat}}}}% - {#3\unskip\strut\par}}% + {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat}}}}}% + {#3\unskip\strut\par}}}% \else% \ifdim\cap@indent<\z@ - {\capfont\strut\ignorespaces - #1{{\caplabelfont #2\captionformat\par}}% - \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}% + {\capfont{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat\par}}}% + \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}% \else% \if@capbreak - {\capfont\strut\ignorespaces - #1{{\caplabelfont #2\captionformat\par}}% - \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}% + {\capfont{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat\par}}}% + \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}% \else - {\capfont\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}% + {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}% {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1% - {{\caplabelfont#2\captionformat}}}#3\unskip\strut\par}}% + {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}% \fi \fi \fi @@ -2506,11 +2507,11 @@ \else \global \@minipagefalse \sbox\@tempboxa{% - {\capfont\scr@smashdp{\strut\ignorespaces - #1{{\caplabelfont#2\captionformat}}}% - #3}% + {\capfont{\scr@smashdp{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat}}}}% + #3}}% }% - \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}% + {\capfont{\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}% \fi \endgroup } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 93239094d8e..72d01ad5014 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -477,7 +477,12 @@ \newcommand*{\scr@smashdp}[1]{% \begingroup \def\finsm@sh{\dp\z@\z@\box\z@}% - \smash{#1}% + \ifmmode + \expandafter\mathpalette\expandafter\mathsm@sh + \else + \expandafter\makesm@sh + \fi + {#1}% \endgroup } \providecommand*{\PackageInfoNoLine}[2]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index ff3bd2d5ce2..479de0783b6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -106,7 +106,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2009/01/01 v3.02} +\def\tocbasicversion{2009/01/20 v3.02a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -168,6 +168,7 @@ \@namedef{scr@v@3.01b}{9} \@namedef{scr@v@3.01c}{9} \@namedef{scr@v@3.02}{9} +\@namedef{scr@v@3.02b}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -2969,9 +2970,9 @@ \let\scr@tmp@footnotetext=\@footnotetext \let\@footnotetext=\@gobble \sbox\@tempboxa{% - {\capfont\strut\ignorespaces - #1{{\caplabelfont#2\captionformat}}% - #3\unskip\strut}% + {\capfont{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat}}}% + #3\unskip\strut}}% }% \let\@footnotetext=\scr@tmp@footnotetext \let\scr@tmp@footnotetext=\undefined @@ -2986,23 +2987,23 @@ \hb@xt@\hsize{% \setbox\@tempboxa\vbox{\hsize=\cap@width \ifdofullc@p - {\capfont\@hangfrom{\scr@smashdp{\strut\ignorespaces - #1{{\caplabelfont#2\captionformat}}}}% - {#3\unskip\strut\par}}% + {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat}}}}}% + {#3\unskip\strut\par}}}% \else% \ifdim\cap@indent<\z@ - {\capfont\strut\ignorespaces - #1{{\caplabelfont #2\captionformat\par}}% - \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}% + {\capfont{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat\par}}}% + \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}% \else% \if@capbreak - {\capfont\strut\ignorespaces - #1{{\caplabelfont #2\captionformat\par}}% - \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}% + {\capfont{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat\par}}}% + \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}% \else - {\capfont\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}% + {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}% {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1% - {{\caplabelfont#2\captionformat}}}#3\unskip\strut\par}}% + {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}% \fi \fi \fi @@ -3019,11 +3020,11 @@ \else \global \@minipagefalse \sbox\@tempboxa{% - {\capfont\scr@smashdp{\strut\ignorespaces - #1{{\caplabelfont#2\captionformat}}}% - #3}% + {\capfont{\scr@smashdp{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat}}}}% + #3}}% }% - \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}% + {\capfont{\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}% \fi \endgroup } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 69b0c133c5e..fa88d74a8b0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -114,7 +114,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] @@ -203,6 +203,7 @@ \@namedef{scr@v@3.01b}{9} \@namedef{scr@v@3.01c}{9} \@namedef{scr@v@3.02}{9} +\@namedef{scr@v@3.02b}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 27eccf89002..dce968a1700 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 0504eba71d2..7c1448ca5f9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -91,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -158,6 +158,7 @@ \@namedef{scr@v@3.01b}{9} \@namedef{scr@v@3.01c}{9} \@namedef{scr@v@3.02}{9} +\@namedef{scr@v@3.02b}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 0a2bdd8a451..b11db22bf1e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -106,7 +106,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2009/01/01 v3.02} +\def\tocbasicversion{2009/01/20 v3.02a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -168,6 +168,7 @@ \@namedef{scr@v@3.01b}{9} \@namedef{scr@v@3.01c}{9} \@namedef{scr@v@3.02}{9} +\@namedef{scr@v@3.02b}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -2947,9 +2948,9 @@ \let\scr@tmp@footnotetext=\@footnotetext \let\@footnotetext=\@gobble \sbox\@tempboxa{% - {\capfont\strut\ignorespaces - #1{{\caplabelfont#2\captionformat}}% - #3\unskip\strut}% + {\capfont{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat}}}% + #3\unskip\strut}}% }% \let\@footnotetext=\scr@tmp@footnotetext \let\scr@tmp@footnotetext=\undefined @@ -2964,23 +2965,23 @@ \hb@xt@\hsize{% \setbox\@tempboxa\vbox{\hsize=\cap@width \ifdofullc@p - {\capfont\@hangfrom{\scr@smashdp{\strut\ignorespaces - #1{{\caplabelfont#2\captionformat}}}}% - {#3\unskip\strut\par}}% + {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat}}}}}% + {#3\unskip\strut\par}}}% \else% \ifdim\cap@indent<\z@ - {\capfont\strut\ignorespaces - #1{{\caplabelfont #2\captionformat\par}}% - \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}% + {\capfont{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat\par}}}% + \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}% \else% \if@capbreak - {\capfont\strut\ignorespaces - #1{{\caplabelfont #2\captionformat\par}}% - \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}% + {\capfont{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat\par}}}% + \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}% \else - {\capfont\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}% + {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}% {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1% - {{\caplabelfont#2\captionformat}}}#3\unskip\strut\par}}% + {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}% \fi \fi \fi @@ -2997,11 +2998,11 @@ \else \global \@minipagefalse \sbox\@tempboxa{% - {\capfont\scr@smashdp{\strut\ignorespaces - #1{{\caplabelfont#2\captionformat}}}% - #3}% + {\capfont{\scr@smashdp{\strut\ignorespaces + #1{{\caplabelfont{#2\captionformat}}}}% + #3}}% }% - \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}% + {\capfont{\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}% \fi \endgroup } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 3d500e7995a..b473e9da1f6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 7fe6c2a2c92..9adeb39344a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b 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 c4fec910041..8dca161adec 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index f9e2d2a6f07..a696bbe8914 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{2009/01/01 v3.02} +\def\tocbasicversion{2009/01/20 v3.02a} \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{tocbasic} [\tocbasicversion @@ -289,21 +289,21 @@ \subsection[##1]{##1}% }{% \subsection*{##1}% + \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi \iftocfeature{\@currext}{totoc}{% \addcontentsline{toc}{subsection}{##1}% }{}% }% - \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi }{% \iftocfeature{\@currext}{numbered}{% \section[##1]{##1\@mkboth{##1}{##1}}% }{% \section*{##1}% + \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}% \iftocfeature{\@currext}{totoc}{% \addcontentsline{toc}{section}{##1}% }{}% }% - \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}% }% }% \else @@ -316,18 +316,18 @@ \iftocfeature{\@currext}{totoc}{% \addcontentsline{toc}{section}{##1}% }{}% + \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi }% - \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi }{% \iftocfeature{\@currext}{numbered}{% \chapter[##1]{##1\@mkboth{##1}{##1}}% }{% \chapter*{##1}% + \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}% \iftocfeature{\@currext}{totoc}{% \addcontentsline{toc}{chapter}{##1}% }{}% }% - \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}% }% }% \fi diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index cb14f6d7fe8..24e09b20773 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -530,6 +530,7 @@ \@namedef{scr@v@3.01b}{9} \@namedef{scr@v@3.01c}{9} \@namedef{scr@v@3.02}{9} +\@namedef{scr@v@3.02b}{9} \@namedef{scr@v@last}{9} %%% From File: scrktare.dtx \InputIfFileExists{typearea.cfg}{% -- cgit v1.2.3