From 899fb3d535cb0d801d8f1f8b528b47581e73f2f7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Jan 2009 18:47:01 +0000 Subject: koma-script update (7jan09) git-svn-id: svn://tug.org/texlive/trunk@11872 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 4 +-- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 4 +-- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 4 +-- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 4 +-- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 4 +-- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 4 +-- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 4 +-- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 4 +-- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 4 +-- Master/texmf-dist/tex/latex/koma-script/SN.lco | 4 +-- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 4 +-- .../texmf-dist/tex/latex/koma-script/scraddr.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 15 +++++--- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 4 +-- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 28 ++++++++++----- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 10 +++--- Master/texmf-dist/tex/latex/koma-script/scrdoc.cls | 4 +-- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 11 ++++-- .../texmf-dist/tex/latex/koma-script/scrjura.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 4 +-- .../texmf-dist/tex/latex/koma-script/scrlettr.cls | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 41 +++++++++++++++++++--- .../texmf-dist/tex/latex/koma-script/scrpage.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 28 ++++++++++----- .../tex/latex/koma-script/scrsize10pt.clo | 4 +-- .../tex/latex/koma-script/scrsize11pt.clo | 4 +-- .../tex/latex/koma-script/scrsize12pt.clo | 4 +-- .../texmf-dist/tex/latex/koma-script/scrtime.sty | 4 +-- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 4 +-- .../texmf-dist/tex/latex/koma-script/tocstyle.sty | 2 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 6 ++-- 32 files changed, 148 insertions(+), 79 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index a3798958777..7980b7922ba 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 fe8ae0fd953..98ee9eeb7a9 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 586c8aedce0..0742cabe76f 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -61,7 +61,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 175ba9142d5..3dcadb64599 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 7765437f4c2..c167dabb726 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 b9bea62d17f..51e158fb068 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 d1fa72a0d9b..8d6521af7e0 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 824fe9268a1..943d3212067 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 f5ec9958dd4..493f1d59fa2 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 fdccc44d045..f03184293b6 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 c7c69b10c44..ad442a1ff8a 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty index 2fa995b34cb..cf0c251fa13 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-2007 +%% Copyright (c) 1994-2009 %% 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 d425ea05cea..6555e9cbe68 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -40,7 +40,7 @@ %% scrklist.dtx (with options: `class,article,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -106,7 +106,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2008/11/13 v3.01} +\def\tocbasicversion{2009/01/01 v3.02} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \addtotoclist{toc} @@ -164,6 +164,8 @@ \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} \@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@3.01c}{9} +\@namedef{scr@v@3.02}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -3008,7 +3010,10 @@ }{% \endlist } -\newcommand\labelinglabel[1]{#1\hfil\sc@septext} +\newcommand\labelinglabel[1]{% + \usekomafont{labelinglabel}{#1\hfil + \usekomafont{labelingseparator}{\sc@septext}}% +} \newenvironment{verse}{% \let\\=\@centercr \list{}{\itemsep=\z@ @@ -3076,6 +3081,8 @@ } \newcommand*\descfont{\sffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} +\newkomafont{labelinglabel}{} +\newkomafont{labelingseparator}{} %%% 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/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 57d7c739783..93239094d8e 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-2007 +%% Copyright (c) 1994-2009 %% 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{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 b5cd0cfebe6..ff3bd2d5ce2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -40,7 +40,7 @@ %% scrklist.dtx (with options: `class,book,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -106,7 +106,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2008/11/13 v3.01} +\def\tocbasicversion{2009/01/01 v3.02} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -166,6 +166,8 @@ \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} \@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@3.01c}{9} +\@namedef{scr@v@3.02}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -1851,6 +1853,13 @@ \newcommand*{\partheadendvskip}{% \vfil\newpage } +\newcommand*{\partheademptypage}{% + \if@twoside\if@openright + \null% + \thispagestyle{empty}% + \newpage + \fi\fi +} \newcommand\part{\if@openright\cleardoublepage\else\clearpage\fi \thispagestyle{\partpagestyle}% \if@twocolumn @@ -1899,11 +1908,7 @@ } \newcommand*{\@endpart}{\vbox to\z@{\use@preamble{part@u}\vss}% \partheadendvskip - \if@twoside\if@openright - \null% - \thispagestyle{empty}% - \newpage - \fi\fi + \partheademptypage \if@tempswa \twocolumn \fi @@ -3532,7 +3537,10 @@ }{% \endlist } -\newcommand\labelinglabel[1]{#1\hfil\sc@septext} +\newcommand\labelinglabel[1]{% + \usekomafont{labelinglabel}{#1\hfil + \usekomafont{labelingseparator}{\sc@septext}}% +} \newenvironment{verse}{% \let\\=\@centercr \list{}{\itemsep=\z@ @@ -3600,6 +3608,8 @@ } \newcommand*\descfont{\sffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} +\newkomafont{labelinglabel}{} +\newkomafont{labelingseparator}{} %%% 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/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index d95843ecceb..05c87aca453 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -7,7 +7,7 @@ %% scrtime.dtx (with options: `scrdate') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -40,7 +40,7 @@ %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrdate} - [2006/03/30 v1.1o LaTeX2e KOMA-Script + [2009/01/01 v1.1p LaTeX2e KOMA-Script package] \newcommand\todaysname{% \begingroup% @@ -140,8 +140,10 @@ {\v{C}etvrtak}{Petak}{Subota}{Nedjelja} \newdaylanguage{dutch}{Maandag}{Dinsdag}{Woensdag} {Donderdag}{Vrijdag}{Zaterdag}{Zondag} -\newdaylanguage{finnish}{maanantai}{tiistai}{keskiviikko} - {torstai}{perjantai}{lauantai}{sunnuntai} +\newdaylanguage{finnish}{Maanantai}{Tiistai}{Keskiviikko} + {Torstai}{Perjantai}{Lauantai}{Sunnuntai} +\newdaylanguage{norsk}{Mandag}{Tirsdag}{Onsdag} + {Torsdag}{Fredag}{L\o{}rdag}{S\o{}ndag} \def\@dayname#1{% \begingroup% \@tempcnta #1% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls index aaf384edefc..adaa86d374e 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) 2002-2008 Markus Kohm +% Copyright (C) 2002-2009 Markus Kohm % % 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) 2002-2008 Markus Kohm +% Copyright (C) 2002-2009 Markus Kohm % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3b, 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 b6d1b19eb0e..69b0c133c5e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -29,7 +29,7 @@ %% scrklist.dtx (with options: `package,extend,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -114,7 +114,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] @@ -201,6 +201,8 @@ \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} \@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@3.01c}{9} +\@namedef{scr@v@3.02}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -1114,7 +1116,10 @@ }{% \endlist } -\newcommand\labelinglabel[1]{#1\hfil\sc@septext} +\newcommand\labelinglabel[1]{% + \usekomafont{labelinglabel}{#1\hfil + \usekomafont{labelingseparator}{\sc@septext}}% +} \newenvironment{addmargin}{% \@tempswafalse\@addmargin }{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index 9c944df757d..269e191ecf3 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-2008 +%% Copyright (c) 2007-2009 %% 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 c646440c497..27eccf89002 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -10,7 +10,7 @@ %% scrkbase.dtx (with options: `package,body,koma') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls index b5a13d21aae..0566b005b08 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-2007 +%% Copyright (c) 1994-2009 %% 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/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index b6bf0bfb179..0504eba71d2 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -91,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -156,6 +156,8 @@ \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} \@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@3.01c}{9} +\@namedef{scr@v@3.02}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -1592,6 +1594,24 @@ \providecaptionname{finnish}\wwwname{URL}% \providecaptionname{finnish}\bankname{Pankkitilin numero}% \g@addnumerical@date{finnish}{\number\day.\number\month.\number\year}% + \providecaptionname{norsk}\yourrefname{Deres ref.}% + \providecaptionname{norsk}\yourmailname{Deres brev av:}% + \providecaptionname{norsk}\myrefname{V\aa{}r ref:}% + \providecaptionname{norsk}\customername{Kundenummer}% + \providecaptionname{norsk}\invoicename{Fakturanummer}% + \providecaptionname{norsk}\subjectname{Emne}% + \providecaptionname{norsk}\ccname{Kopi til}% + \providecaptionname{norsk}\enclname{Vedlegg}% + \providecaptionname{norsk}\headtoname{Til}% + \providecaptionname{norsk}\headfromname{Fra}% + \providecaptionname{norsk}\datename{Dato}% + \providecaptionname{norsk}\pagename{Side}% + \providecaptionname{norsk}\phonename{Telefon}% + \providecaptionname{norsk}\faxname{Telefaks}% + \providecaptionname{norsk}\emailname{E-post}% + \providecaptionname{norsk}\wwwname{Url}% + \providecaptionname{norsk}\bankname{Bankkontonummer}% + \g@addnumerical@date{norsk}{\number\day.\number\month.\number\year}% \captionsenglish \dateenglish \begingroup\expandafter\expandafter\expandafter\endgroup @@ -1663,6 +1683,14 @@ \captionsdutch \datedutch \fi\fi + \ifx\l@finnish\undefined\else\ifnum\language=\l@finnish + \captionsfinnish + \datefinnish + \fi\fi + \ifx\l@norsk\undefined\else\ifnum\language=\l@norsk + \captionsnorsk + \datenorsk + \fi\fi \else \edef\@tempa{nohyphenation}% \ifx\languagename\@tempa @@ -1687,7 +1715,7 @@ `british', `american', `USenglish',\MessageBreak `german', `ngerman', `austrian',\MessageBreak `dutch', `italian', `spanish',\MessageBreak - `croatian', 'finnish'% + `croatian', `finnish', `norsk'% }% \fi \fi @@ -2204,7 +2232,10 @@ }{% \endlist } -\newcommand\labelinglabel[1]{#1\hfil\sc@septext} +\newcommand\labelinglabel[1]{% + \usekomafont{labelinglabel}{#1\hfil + \usekomafont{labelingseparator}{\sc@septext}}% +} \newenvironment{verse}{% \let\\=\@centercr \list{}{\itemsep=\z@ @@ -2272,6 +2303,8 @@ } \newcommand*\descfont{\sffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} +\newkomafont{labelinglabel}{} +\newkomafont{labelingseparator}{} %%% From File: scrknpap.dtx \newcommand*{\@firsthead}{\noindent% \parbox[b]{\useplength{firstheadwidth}}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty index 7c33a0858db..f5224fd62bb 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-2007 +%% Copyright (c) 1994-2009 %% 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 6ad7b156b24..326bba430df 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-2007 +%% Copyright (c) 1994-2009 %% 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 2e5b27fdc98..0a2bdd8a451 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -40,7 +40,7 @@ %% scrklist.dtx (with options: `class,report,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -106,7 +106,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2008/11/13 v3.01} +\def\tocbasicversion{2009/01/01 v3.02} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -166,6 +166,8 @@ \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} \@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@3.01c}{9} +\@namedef{scr@v@3.02}{9} \@namedef{scr@v@last}{9} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -1868,6 +1870,13 @@ \newcommand*{\partheadendvskip}{% \vfil\newpage } +\newcommand*{\partheademptypage}{% + \if@twoside\if@openright + \null% + \thispagestyle{empty}% + \newpage + \fi\fi +} \newcommand\part{\if@openright\cleardoublepage\else\clearpage\fi \thispagestyle{\partpagestyle}% \if@twocolumn @@ -1916,11 +1925,7 @@ } \newcommand*{\@endpart}{\vbox to\z@{\use@preamble{part@u}\vss}% \partheadendvskip - \if@twoside\if@openright - \null% - \thispagestyle{empty}% - \newpage - \fi\fi + \partheademptypage \if@tempswa \twocolumn \fi @@ -3502,7 +3507,10 @@ }{% \endlist } -\newcommand\labelinglabel[1]{#1\hfil\sc@septext} +\newcommand\labelinglabel[1]{% + \usekomafont{labelinglabel}{#1\hfil + \usekomafont{labelingseparator}{\sc@septext}}% +} \newenvironment{verse}{% \let\\=\@centercr \list{}{\itemsep=\z@ @@ -3570,6 +3578,8 @@ } \newcommand*\descfont{\sffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} +\newkomafont{labelinglabel}{} +\newkomafont{labelingseparator}{} %%% 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/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index d4fe99be26b..3d500e7995a 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 05252a78368..7fe6c2a2c92 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 9d1b5bfdd39..c4fec910041 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-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 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 e19c135a003..332ddbc9578 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -7,7 +7,7 @@ %% scrtime.dtx (with options: `scrtime') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2007 +%% Copyright (c) 1994-2009 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -40,7 +40,7 @@ %%% From File: scrtime.dtx \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrtime} - [2006/03/30 v1.1o LaTeX2e KOMA-Script + [2009/01/01 v1.1p LaTeX2e KOMA-Script package] \newif\if@Hxii \DeclareOption{12h}{\@Hxiitrue} diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 1ff55e7203f..f9e2d2a6f07 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-2008 +%% Copyright (c) 2007-2009 %% 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{2008/11/13 v3.01} +\def\tocbasicversion{2009/01/01 v3.02} \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{tocbasic} [\tocbasicversion diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty index ac668525223..69df0f5abe5 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-2008 by Markus Kohm +%% Copyright (c) 2007-2009 by Markus Kohm %% %% 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 637dc792727..cb14f6d7fe8 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-2007 +%% Copyright (c) 1994-2009 %% 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{2008/12/09 v3.01b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/01/01 v3.02 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -528,6 +528,8 @@ \@namedef{scr@v@3.01}{8} \@namedef{scr@v@3.01a}{8} \@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@3.01c}{9} +\@namedef{scr@v@3.02}{9} \@namedef{scr@v@last}{9} %%% From File: scrktare.dtx \InputIfFileExists{typearea.cfg}{% -- cgit v1.2.3