diff options
| author | Karl Berry <karl@freefriends.org> | 2007-12-26 22:26:13 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2007-12-26 22:26:13 +0000 |
| commit | d892fc1b7f46275b1e5c291db0305eac83abe9e3 (patch) | |
| tree | 50dac7763bbe931304c867a5da111a3f324b0a89 /Master/texmf-dist/tex | |
| parent | adb11f7c6718f766a22dbb2ce1b196a36acc197d (diff) | |
koma-script update (25dec07)
git-svn-id: svn://tug.org/texlive/trunk@5924 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
19 files changed, 2266 insertions, 117 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index 70b8467a7fc..05692e32a95 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -4,6 +4,7 @@ %% %% The original source files were: %% +%% scrkvers.dtx (with options: `trace') %% scrklco.dtx (with options: `lco,DIN,head') %% scrklco.dtx (with options: `lco,DIN,body') %% @@ -37,6 +38,30 @@ %% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e %% standard classes created by The LaTeX3 Project 1994-1996. %% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup %%% From File: scrklco.dtx \ProvidesFile{% DIN% @@ -67,7 +92,9 @@ }{a4} \@setplength{foldmarkhpos}{3.5mm} \@setplength{tfoldmarkvpos}{105mm} +\@setplength{mfoldmarkvpos}{\z@} \@setplength{bfoldmarkvpos}{210mm} +\@setplength{lfoldmarkhpos}{\z@} \@setplength{toaddrvpos}{45mm} \@setplength{refvpos}{98.5mm} \@setplength{refaftervskip}{\baselineskip} diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 802f5a90a86..72ebf05c936 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -4,6 +4,7 @@ %% %% The original source files were: %% +%% scrkvers.dtx (with options: `trace') %% scrklco.dtx (with options: `lco,DINmoretext,head') %% scrklco.dtx (with options: `lco,DINmoretext,body') %% @@ -37,6 +38,30 @@ %% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e %% standard classes created by The LaTeX3 Project 1994-1996. %% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup %%% From File: scrklco.dtx \ProvidesFile{% DINmtext% @@ -67,7 +92,9 @@ }{a4} \@setplength{foldmarkhpos}{3.5mm} \@setplength{tfoldmarkvpos}{87mm} +\@setplength{mfoldmarkvpos}{\z@} \@setplength{bfoldmarkvpos}{192mm} +\@setplength{lfoldmarkhpos}{\z@} \@setplength{toaddrvpos}{27mm} \@setplength{refvpos}{80.5mm} \@setplength{refaftervskip}{\baselineskip} diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 446b9cd0184..0155d40623b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -4,6 +4,7 @@ %% %% The original source files were: %% +%% scrkvers.dtx (with options: `trace') %% scrklco.dtx (with options: `lco,KOMAold,head') %% scrklco.dtx (with options: `lco,KOMAold,body') %% scrknpap.dtx (with options: `lco,KOMAold,body') @@ -38,6 +39,30 @@ %% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e %% standard classes created by The LaTeX3 Project 1994-1996. %% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup %%% From File: scrklco.dtx \ProvidesFile{% KOMAold% @@ -68,7 +93,9 @@ }{a4} \@setplength{foldmarkhpos}{3.5mm} \@setplength{tfoldmarkvpos}{103.5mm} +\@setplength{mfoldmarkvpos}{\z@} \@setplength{bfoldmarkvpos}{202.5mm} +\@setplength{lfoldmarkhpos}{\z@} \@setplength{toaddrvpos}{49mm} \@setplength{refvpos}{89.5mm} \@setplength[2]{refaftervskip}{\baselineskip} diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco new file mode 100644 index 00000000000..d8defb766fb --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -0,0 +1,143 @@ +%% +%% This is file `KakuLL.lco', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scrkvers.dtx (with options: `trace') +%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,head') +%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,body') +%% +%% Copyright (c) 1994-2007 +%% Markus Kohm and any individual authors listed elsewhere in this file. +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you are not allowed to distribute it. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. +%% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup +%%% From File: japanlco.dtx +\ProvidesFile{% + Kaku% + L% + L% +}[\KOMAScriptVersion\space Japanese letter-class-option] +\providecommand*\LCOWarningNoLine[2]{% + \LCOWarning{#1}{#2\@gobble}% +} +\providecommand*\LCOWarning[2]{% + \GenericWarning{% + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + }{% + Letter class option #1 Warning: #2% + }% +} +%%% From File: japanlco.dtx +\@ifundefined{scr@fromname@var}{% + \LCOWarningNoLine{% + Kaku% + L% + L% + }{% + This letter class option file was made only\MessageBreak + to be used with KOMA-Script letter class\MessageBreak + `scrlttr2'. Use with other classes may result\MessageBreak + in a lot of errors% + }% +}{} +\LetterOptionNeedsPapersize{% + Kaku% + L% + L% +}{a4} +\@setplength{foldmarkhpos}{3.5mm} +\@setplength{tfoldmarkvpos}{83mm} +\@setplength{tfoldmarklength}{4mm} +\@setplength{mfoldmarkvpos}{116mm} +\@setplength{mfoldmarklength}{2mm} +\@setplength{bfoldmarkvpos}{232mm} +\@setplength{bfoldmarklength}{2mm} +\@setplength{foldmarkvpos}{3.5mm} +\@setplength{lfoldmarkhpos}{202mm} +\@setplength{refvpos}{69mm} +\@setplength{refaftervskip}{\baselineskip} +\@setplength{toaddrhpos}{25mm} +\@setplength{toaddrwidth}{90mm} +\@setplength{toaddrvpos}{24mm} +\@setplength{toaddrheight}{40mm} +\@setplength{toaddrindent}{\z@} +\@setplength{backaddrheight}{5mm} +\@setplength{specialmailindent}{\fill} +\@setplength{specialmailrightindent}{1em} +\@setplength{locwidth}{\z@} +\@setplength{locheight}{45mm}% +\@setplength{firstheadvpos}{8mm} +\@setplength{firstheadwidth}{\paperwidth} +\ifdim \useplength{toaddrhpos}>\z@ + \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} +\else + \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} +\fi +\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\@setplength{firstfootvpos}{\paperheight} +\@addtoplength{firstfootvpos}{-16mm} +\@setplength{refwidth}{\z@} +\@setplength{sigindent}{\z@} +\@setplength{sigbeforevskip}{2\baselineskip} +\let\raggedsignature=\centering +\ifcase\@alignfrom + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\fi +\endinput +%% +%% End of file `KakuLL.lco'. diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco new file mode 100644 index 00000000000..59588ba3642 --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -0,0 +1,143 @@ +%% +%% This is file `NipponEH.lco', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scrkvers.dtx (with options: `trace') +%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,head') +%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,body') +%% +%% Copyright (c) 1994-2007 +%% Markus Kohm and any individual authors listed elsewhere in this file. +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you are not allowed to distribute it. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. +%% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup +%%% From File: japanlco.dtx +\ProvidesFile{% + Nippon% + E% + H% +}[\KOMAScriptVersion\space Japanese letter-class-option] +\providecommand*\LCOWarningNoLine[2]{% + \LCOWarning{#1}{#2\@gobble}% +} +\providecommand*\LCOWarning[2]{% + \GenericWarning{% + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + }{% + Letter class option #1 Warning: #2% + }% +} +%%% From File: japanlco.dtx +\@ifundefined{scr@fromname@var}{% + \LCOWarningNoLine{% + Nippon% + E% + H% + }{% + This letter class option file was made only\MessageBreak + to be used with KOMA-Script letter class\MessageBreak + `scrlttr2'. Use with other classes may result\MessageBreak + in a lot of errors% + }% +}{} +\LetterOptionNeedsPapersize{% + Nippon% + E% + H% +}{a4} +\@setplength{foldmarkhpos}{3.5mm} +\@setplength{tfoldmarkvpos}{83mm} +\@setplength{tfoldmarklength}{4mm} +\@setplength{mfoldmarkvpos}{116mm} +\@setplength{mfoldmarklength}{2mm} +\@setplength{bfoldmarkvpos}{232mm} +\@setplength{bfoldmarklength}{2mm} +\@setplength{foldmarkvpos}{3.5mm} +\@setplength{lfoldmarkhpos}{202mm} +\@setplength{refvpos}{69mm} +\@setplength{refaftervskip}{\baselineskip} +\@setplength{toaddrhpos}{22mm} +\@setplength{toaddrwidth}{90mm} +\@setplength{toaddrvpos}{12mm} +\@setplength{toaddrheight}{50mm} +\@setplength{toaddrindent}{\z@} +\@setplength{backaddrheight}{5mm} +\@setplength{specialmailindent}{\fill} +\@setplength{specialmailrightindent}{1em} +\@setplength{locwidth}{\z@} +\@setplength{locheight}{55mm}% +\@setplength{firstheadvpos}{8mm} +\@setplength{firstheadwidth}{\paperwidth} +\ifdim \useplength{toaddrhpos}>\z@ + \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} +\else + \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} +\fi +\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\@setplength{firstfootvpos}{\paperheight} +\@addtoplength{firstfootvpos}{-16mm} +\@setplength{refwidth}{\z@} +\@setplength{sigindent}{\z@} +\@setplength{sigbeforevskip}{2\baselineskip} +\let\raggedsignature=\centering +\ifcase\@alignfrom + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\fi +\endinput +%% +%% End of file `NipponEH.lco'. diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco new file mode 100644 index 00000000000..0fe362401cb --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -0,0 +1,143 @@ +%% +%% This is file `NipponEL.lco', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scrkvers.dtx (with options: `trace') +%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,head') +%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,body') +%% +%% Copyright (c) 1994-2007 +%% Markus Kohm and any individual authors listed elsewhere in this file. +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you are not allowed to distribute it. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. +%% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup +%%% From File: japanlco.dtx +\ProvidesFile{% + Nippon% + E% + L% +}[\KOMAScriptVersion\space Japanese letter-class-option] +\providecommand*\LCOWarningNoLine[2]{% + \LCOWarning{#1}{#2\@gobble}% +} +\providecommand*\LCOWarning[2]{% + \GenericWarning{% + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + }{% + Letter class option #1 Warning: #2% + }% +} +%%% From File: japanlco.dtx +\@ifundefined{scr@fromname@var}{% + \LCOWarningNoLine{% + Nippon% + E% + L% + }{% + This letter class option file was made only\MessageBreak + to be used with KOMA-Script letter class\MessageBreak + `scrlttr2'. Use with other classes may result\MessageBreak + in a lot of errors% + }% +}{} +\LetterOptionNeedsPapersize{% + Nippon% + E% + L% +}{a4} +\@setplength{foldmarkhpos}{3.5mm} +\@setplength{tfoldmarkvpos}{83mm} +\@setplength{tfoldmarklength}{4mm} +\@setplength{mfoldmarkvpos}{116mm} +\@setplength{mfoldmarklength}{2mm} +\@setplength{bfoldmarkvpos}{232mm} +\@setplength{bfoldmarklength}{2mm} +\@setplength{foldmarkvpos}{3.5mm} +\@setplength{lfoldmarkhpos}{202mm} +\@setplength{refvpos}{69mm} +\@setplength{refaftervskip}{\baselineskip} +\@setplength{toaddrhpos}{22mm} +\@setplength{toaddrwidth}{90mm} +\@setplength{toaddrvpos}{12mm} +\@setplength{toaddrheight}{40mm} +\@setplength{toaddrindent}{\z@} +\@setplength{backaddrheight}{5mm} +\@setplength{specialmailindent}{\fill} +\@setplength{specialmailrightindent}{1em} +\@setplength{locwidth}{\z@} +\@setplength{locheight}{55mm}% +\@setplength{firstheadvpos}{8mm} +\@setplength{firstheadwidth}{\paperwidth} +\ifdim \useplength{toaddrhpos}>\z@ + \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} +\else + \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} +\fi +\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\@setplength{firstfootvpos}{\paperheight} +\@addtoplength{firstfootvpos}{-16mm} +\@setplength{refwidth}{\z@} +\@setplength{sigindent}{\z@} +\@setplength{sigbeforevskip}{2\baselineskip} +\let\raggedsignature=\centering +\ifcase\@alignfrom + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\fi +\endinput +%% +%% End of file `NipponEL.lco'. diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco new file mode 100644 index 00000000000..43be3c342a2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -0,0 +1,143 @@ +%% +%% This is file `NipponLH.lco', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scrkvers.dtx (with options: `trace') +%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,head') +%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,body') +%% +%% Copyright (c) 1994-2007 +%% Markus Kohm and any individual authors listed elsewhere in this file. +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you are not allowed to distribute it. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. +%% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup +%%% From File: japanlco.dtx +\ProvidesFile{% + Nippon% + L% + H% +}[\KOMAScriptVersion\space Japanese letter-class-option] +\providecommand*\LCOWarningNoLine[2]{% + \LCOWarning{#1}{#2\@gobble}% +} +\providecommand*\LCOWarning[2]{% + \GenericWarning{% + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + }{% + Letter class option #1 Warning: #2% + }% +} +%%% From File: japanlco.dtx +\@ifundefined{scr@fromname@var}{% + \LCOWarningNoLine{% + Nippon% + L% + H% + }{% + This letter class option file was made only\MessageBreak + to be used with KOMA-Script letter class\MessageBreak + `scrlttr2'. Use with other classes may result\MessageBreak + in a lot of errors% + }% +}{} +\LetterOptionNeedsPapersize{% + Nippon% + L% + H% +}{a4} +\@setplength{foldmarkhpos}{3.5mm} +\@setplength{tfoldmarkvpos}{83mm} +\@setplength{tfoldmarklength}{4mm} +\@setplength{mfoldmarkvpos}{116mm} +\@setplength{mfoldmarklength}{2mm} +\@setplength{bfoldmarkvpos}{232mm} +\@setplength{bfoldmarklength}{2mm} +\@setplength{foldmarkvpos}{3.5mm} +\@setplength{lfoldmarkhpos}{202mm} +\@setplength{refvpos}{69mm} +\@setplength{refaftervskip}{\baselineskip} +\@setplength{toaddrhpos}{25mm} +\@setplength{toaddrwidth}{90mm} +\@setplength{toaddrvpos}{12mm} +\@setplength{toaddrheight}{50mm} +\@setplength{toaddrindent}{\z@} +\@setplength{backaddrheight}{5mm} +\@setplength{specialmailindent}{\fill} +\@setplength{specialmailrightindent}{1em} +\@setplength{locwidth}{\z@} +\@setplength{locheight}{55mm}% +\@setplength{firstheadvpos}{8mm} +\@setplength{firstheadwidth}{\paperwidth} +\ifdim \useplength{toaddrhpos}>\z@ + \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} +\else + \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} +\fi +\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\@setplength{firstfootvpos}{\paperheight} +\@addtoplength{firstfootvpos}{-16mm} +\@setplength{refwidth}{\z@} +\@setplength{sigindent}{\z@} +\@setplength{sigbeforevskip}{2\baselineskip} +\let\raggedsignature=\centering +\ifcase\@alignfrom + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\fi +\endinput +%% +%% End of file `NipponLH.lco'. diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco new file mode 100644 index 00000000000..102653fa69f --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -0,0 +1,143 @@ +%% +%% This is file `NipponLL.lco', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scrkvers.dtx (with options: `trace') +%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,head') +%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,body') +%% +%% Copyright (c) 1994-2007 +%% Markus Kohm and any individual authors listed elsewhere in this file. +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you are not allowed to distribute it. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. +%% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup +%%% From File: japanlco.dtx +\ProvidesFile{% + Nippon% + L% + L% +}[\KOMAScriptVersion\space Japanese letter-class-option] +\providecommand*\LCOWarningNoLine[2]{% + \LCOWarning{#1}{#2\@gobble}% +} +\providecommand*\LCOWarning[2]{% + \GenericWarning{% + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + }{% + Letter class option #1 Warning: #2% + }% +} +%%% From File: japanlco.dtx +\@ifundefined{scr@fromname@var}{% + \LCOWarningNoLine{% + Nippon% + L% + L% + }{% + This letter class option file was made only\MessageBreak + to be used with KOMA-Script letter class\MessageBreak + `scrlttr2'. Use with other classes may result\MessageBreak + in a lot of errors% + }% +}{} +\LetterOptionNeedsPapersize{% + Nippon% + L% + L% +}{a4} +\@setplength{foldmarkhpos}{3.5mm} +\@setplength{tfoldmarkvpos}{83mm} +\@setplength{tfoldmarklength}{4mm} +\@setplength{mfoldmarkvpos}{116mm} +\@setplength{mfoldmarklength}{2mm} +\@setplength{bfoldmarkvpos}{232mm} +\@setplength{bfoldmarklength}{2mm} +\@setplength{foldmarkvpos}{3.5mm} +\@setplength{lfoldmarkhpos}{202mm} +\@setplength{refvpos}{69mm} +\@setplength{refaftervskip}{\baselineskip} +\@setplength{toaddrhpos}{25mm} +\@setplength{toaddrwidth}{90mm} +\@setplength{toaddrvpos}{12mm} +\@setplength{toaddrheight}{40mm} +\@setplength{toaddrindent}{\z@} +\@setplength{backaddrheight}{5mm} +\@setplength{specialmailindent}{\fill} +\@setplength{specialmailrightindent}{1em} +\@setplength{locwidth}{\z@} +\@setplength{locheight}{55mm}% +\@setplength{firstheadvpos}{8mm} +\@setplength{firstheadwidth}{\paperwidth} +\ifdim \useplength{toaddrhpos}>\z@ + \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} +\else + \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} +\fi +\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\@setplength{firstfootvpos}{\paperheight} +\@addtoplength{firstfootvpos}{-16mm} +\@setplength{refwidth}{\z@} +\@setplength{sigindent}{\z@} +\@setplength{sigbeforevskip}{2\baselineskip} +\let\raggedsignature=\centering +\ifcase\@alignfrom + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\fi +\endinput +%% +%% End of file `NipponLL.lco'. diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco new file mode 100644 index 00000000000..0581ed23660 --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -0,0 +1,143 @@ +%% +%% This is file `NipponRL.lco', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scrkvers.dtx (with options: `trace') +%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,head') +%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,body') +%% +%% Copyright (c) 1994-2007 +%% Markus Kohm and any individual authors listed elsewhere in this file. +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you are not allowed to distribute it. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. +%% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup +%%% From File: japanlco.dtx +\ProvidesFile{% + Nippon% + R% + L% +}[\KOMAScriptVersion\space Japanese letter-class-option] +\providecommand*\LCOWarningNoLine[2]{% + \LCOWarning{#1}{#2\@gobble}% +} +\providecommand*\LCOWarning[2]{% + \GenericWarning{% + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + }{% + Letter class option #1 Warning: #2% + }% +} +%%% From File: japanlco.dtx +\@ifundefined{scr@fromname@var}{% + \LCOWarningNoLine{% + Nippon% + R% + L% + }{% + This letter class option file was made only\MessageBreak + to be used with KOMA-Script letter class\MessageBreak + `scrlttr2'. Use with other classes may result\MessageBreak + in a lot of errors% + }% +}{} +\LetterOptionNeedsPapersize{% + Nippon% + R% + L% +}{a4} +\@setplength{foldmarkhpos}{3.5mm} +\@setplength{tfoldmarkvpos}{83mm} +\@setplength{tfoldmarklength}{4mm} +\@setplength{mfoldmarkvpos}{116mm} +\@setplength{mfoldmarklength}{2mm} +\@setplength{bfoldmarkvpos}{232mm} +\@setplength{bfoldmarklength}{2mm} +\@setplength{foldmarkvpos}{3.5mm} +\@setplength{lfoldmarkhpos}{202mm} +\@setplength{refvpos}{84mm} +\@setplength{refaftervskip}{\baselineskip} +\@setplength{toaddrhpos}{-22mm} +\@setplength{toaddrwidth}{90mm} +\@setplength{toaddrvpos}{28mm} +\@setplength{toaddrheight}{40mm} +\@setplength{toaddrindent}{\z@} +\@setplength{backaddrheight}{5mm} +\@setplength{specialmailindent}{\fill} +\@setplength{specialmailrightindent}{1em} +\@setplength{locwidth}{\z@} +\@setplength{locheight}{55mm}% +\@setplength{firstheadvpos}{8mm} +\@setplength{firstheadwidth}{\paperwidth} +\ifdim \useplength{toaddrhpos}>\z@ + \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} +\else + \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} +\fi +\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\@setplength{firstfootvpos}{\paperheight} +\@addtoplength{firstfootvpos}{-16mm} +\@setplength{refwidth}{\z@} +\@setplength{sigindent}{\z@} +\@setplength{sigbeforevskip}{2\baselineskip} +\let\raggedsignature=\centering +\ifcase\@alignfrom + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\or + \KOMAoptions{fromalign=locationright}% +\fi +\endinput +%% +%% End of file `NipponRL.lco'. diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index 1a43f091306..21f83a696f7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -4,6 +4,7 @@ %% %% The original source files were: %% +%% scrkvers.dtx (with options: `trace') %% scrklco.dtx (with options: `lco,SN,head') %% scrklco.dtx (with options: `lco,SN,body') %% @@ -37,6 +38,30 @@ %% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e %% standard classes created by The LaTeX3 Project 1994-1996. %% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup %%% From File: scrklco.dtx \ProvidesFile{% SN% @@ -67,7 +92,9 @@ }{a4} \@setplength{foldmarkhpos}{3.5mm} \@setplength{tfoldmarkvpos}{105mm} +\@setplength{mfoldmarkvpos}{\z@} \@setplength{bfoldmarkvpos}{210mm} +\@setplength{lfoldmarkhpos}{\z@} \@setplength{toaddrvpos}{45mm} \@setplength{refvpos}{98.5mm} \@setplength{refaftervskip}{\baselineskip} diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 2e506ffa65a..88e876b73a9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -4,6 +4,7 @@ %% %% The original source files were: %% +%% scrkvers.dtx (with options: `trace') %% scrklco.dtx (with options: `lco,SwissLeft,head') %% scrklco.dtx (with options: `lco,SwissLeft,body') %% @@ -37,6 +38,30 @@ %% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e %% standard classes created by The LaTeX3 Project 1994-1996. %% +%%% From File: scrkvers.dtx +\begingroup + \makeatletter + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% +\endgroup %%% From File: scrklco.dtx \ProvidesFile{% SNleft% @@ -67,7 +92,9 @@ }{a4} \@setplength{foldmarkhpos}{3.5mm} \@setplength{tfoldmarkvpos}{105mm} +\@setplength{mfoldmarkvpos}{\z@} \@setplength{bfoldmarkvpos}{210mm} +\@setplength{lfoldmarkhpos}{\z@} \@setplength{toaddrvpos}{35.5mm} \@setplength{refvpos}{89mm} \@setplength{refaftervskip}{\baselineskip} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 1759eea91fc..dd0a30e7592 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -91,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2007/10/12 v2.97d KOMA-Script}% + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -142,7 +142,9 @@ \@namedef{scr@v@2.97b}{3} \@namedef{scr@v@2.97c}{4} \@namedef{scr@v@2.97d}{5} -\@namedef{scr@v@last}{5} +\@namedef{scr@v@2.97e}{6} +\@namedef{scr@v@2.98}{6} +\@namedef{scr@v@last}{6} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -215,16 +217,16 @@ \ifstr{#3}{paper}{% \ifnumber{#2}{% \ifstr{#1}{a}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{b}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{c}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{d}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{\scr@pti@nerr@r}% }% }% @@ -237,6 +239,14 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } +\KOMA@key{twoside}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% +} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% +} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} %%% From File: scrkpar.dtx @@ -1871,7 +1881,7 @@ \aliaskomafont{pagination}{pagenumber} \newcommand*{\scr@fnt@pagehead}{\headfont} \newcommand*{\scr@fnt@wrn@pagehead}[1]{% - `pagehead' and `pagefoot' are aliases for the same^^b8\MessageBreak + `pagehead' and `pagefoot' are aliases for the same\MessageBreak font element, changed% } \aliaskomafont{pagefoot}{pagehead} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 24d2665c433..649e57d059f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -91,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2007/10/12 v2.97d KOMA-Script}% + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -142,7 +142,9 @@ \@namedef{scr@v@2.97b}{3} \@namedef{scr@v@2.97c}{4} \@namedef{scr@v@2.97d}{5} -\@namedef{scr@v@last}{5} +\@namedef{scr@v@2.97e}{6} +\@namedef{scr@v@2.98}{6} +\@namedef{scr@v@last}{6} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -215,16 +217,16 @@ \ifstr{#3}{paper}{% \ifnumber{#2}{% \ifstr{#1}{a}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{b}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{c}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{d}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{\scr@pti@nerr@r}% }% }% @@ -237,6 +239,14 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } +\KOMA@key{twoside}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% +} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% +} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} %%% From File: scrkpar.dtx @@ -1571,7 +1581,14 @@ \newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }% \thechapter\autodot\enskip} \newcounter{section}[chapter] -\renewcommand*\thesection{\thechapter.\@arabic\c@section} +\renewcommand*\thesection{% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax + \if@mainmatter\thechapter.\fi + \else + \thechapter.% + \fi + \@arabic\c@section +} \newcommand*\sectionmarkformat{\thesection\autodot\enskip} \newcounter{subsection}[section] \renewcommand*{\thesubsection}{\thesection.\@arabic\c@subsection} @@ -2200,7 +2217,11 @@ \setlength\fboxrule{.4\p@} \@addtoreset{equation}{chapter} \renewcommand*\theequation{% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax + \if@mainmatter\thechapter.\fi + \else \thechapter.% + \fi \@arabic\c@equation } \newcommand*{\new@tpo@label}{\@newl@bel{tpo}} @@ -2258,7 +2279,7 @@ \aliaskomafont{pagination}{pagenumber} \newcommand*{\scr@fnt@pagehead}{\headfont} \newcommand*{\scr@fnt@wrn@pagehead}[1]{% - `pagehead' and `pagefoot' are aliases for the same^^b8\MessageBreak + `pagehead' and `pagefoot' are aliases for the same\MessageBreak font element, changed% } \aliaskomafont{pagefoot}{pagehead} @@ -2820,7 +2841,11 @@ \newcommand*\tablename{Table} \newcounter{figure}[chapter] \renewcommand*\thefigure{% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax + \if@mainmatter\thechapter.\fi + \else \thechapter.% + \fi \@arabic\c@figure } \newcommand*{\figureformat}{% @@ -2843,7 +2868,11 @@ } \newcounter{table}[chapter] \renewcommand*\thetable{% + \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax + \if@mainmatter\thechapter.\fi + \else \thechapter.% + \fi \@arabic\c@table } \newcommand*{\tableformat}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 449004e3752..78eea55c639 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{2007/10/12 v2.97d KOMA-Script}% + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{scrkbase}[% @@ -182,7 +182,7 @@ } \KOMAProcessOptions\relax %%% From File: scrlfile.dtx -\def\scrlfileversion{2007/03/07 v2.97a} +\def\scrlfileversion{2007/12/18 v2.98} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx @@ -497,8 +497,8 @@ \newcommand*{\KOMA@key@value}{} \newcommand*{\KOMA@key@split@name@value}{} \def\KOMA@key@split@name@value#1=#2=#3\@nil{% - \def\KOMA@key@name{#1}% - \def\KOMA@key@value{#2}% + \KV@@sp@def\KOMA@key@name{#1}% + \KV@@sp@def\KOMA@key@value{#2}% } \newcommand*{\post@kopt@hook}{} \let\post@kopt@hook\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 5e198a35254..390c3b16720 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{2007/03/07 v2.97a} +\def\scrlfileversion{2007/12/18 v2.98} \ProvidesPackage{scrlfile}[% \scrlfileversion\space KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% @@ -91,13 +91,13 @@ \def\@onefilewithoptions#1[#2][#3]#4{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1.#4-@aliasname\endcsname\relax - \scr@onefilewithoptions{#1}[{#2}][{#3}]{#4}% + \def\scr@@onefilewithoptions{\scr@onefilewithoptions{#1}}% \else \scr@replacefile@msg{\csname #1.#4-@aliasname\endcsname.#4}{#1.#4}% - \expandafter\@onefilewithoptions\expandafter{% - \csname #1.#4-@aliasname\endcsname - }[{#2}][{#3}]{#4}% + \edef\scr@@onefilewithoptions{% + \noexpand\@onefilewithoptions{\csname #1.#4-@aliasname\endcsname}}% \fi + \scr@@onefilewithoptions[{#2}][{#3}]{#4}% } \newcommand*{\ReplaceFile}[2]{% \expandafter\edef\csname #1-@alias\endcsname{#2}% @@ -112,7 +112,7 @@ \@replacefilewithext{#1}{#2}\@clsextension } \newcommand*{\scr@replacefile@msg}[2]{% - \PackageInfo{scrlfile}{inputting `#1' instead of `#2'}% + \PackageInfo{scrlfile}{inputing `#1' instead of `#2'}% } \newcommand*{\scr@load@hook}[2]{% \@ifundefined{#2-@#1}{}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 5490047073d..b02516826bc 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{2007/10/12 v2.97d KOMA-Script}% + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -142,7 +142,9 @@ \@namedef{scr@v@2.97b}{3} \@namedef{scr@v@2.97c}{4} \@namedef{scr@v@2.97d}{5} -\@namedef{scr@v@last}{5} +\@namedef{scr@v@2.97e}{6} +\@namedef{scr@v@2.98}{6} +\@namedef{scr@v@last}{6} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -237,16 +239,16 @@ \ifstr{#3}{paper}{% \ifnumber{#2}{% \ifstr{#1}{a}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{b}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{c}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{d}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{\scr@pti@nerr@r}% }% }% @@ -259,6 +261,14 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } +\KOMA@key{twoside}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% +} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% +} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false} \DeclareOption*{% \lco@test \x@paper} @@ -434,12 +444,18 @@ %%% From File: scrkftn.dtx %%% From File: scrklist.dtx %%% From File: scrknpap.dtx +\KOMA@ifkey{firsthead}{@firsthead}\@firstheadtrue \newcommand*{\@alignfrom}{0} -\KOMA@ncmdkey{fromalign}{@alignfrom}{% - {left}{0},% - {center}{1},{centered}{1},{middle}{1},% - {right}{2},% - {no}{10000},{false}{10000},{off}{10000}% +\KOMA@key{fromalign}{% + \KOMA@set@ncmdkey{fromalign}{@alignfrom}{% + {left}{0},% + {center}{1},{centered}{1},{middle}{1},% + {right}{2},% + {locationleft}{3},{leftlocation}{3},% + {locationright}{4},{rightlocation}{4},{location}{4},% + {no}{10000},{false}{10000},{off}{10000}% + }{#1}% + \ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi } \newcommand*{\@rulefrom}{0} \KOMA@ncmdkey{fromrule}[below]{@rulefrom}{% @@ -497,7 +513,82 @@ \DeclareOption{wlocfield}{\@ObsoleteOption{locfield=wide}} \DeclareOption{slocfield}{\@ObsoleteOption{locfield=narrow}} \newif\if@fold\@foldtrue -\KOMA@ifkey{foldmarks}{@fold} +\newcommand*{\@usefolds}{TMBPL} +\KOMA@key{foldmarks}[true]{% + \begingroup + \def\KOMA@unknown@keyval##1##2##3{% + \def\sc@nf@ldch@rs####1{% + \ifx ####1\@nil\else + \if ####1T\g@addto@macro\@usefolds{####1}\else + \if ####1M\g@addto@macro\@usefolds{####1}\else + \if ####1B\g@addto@macro\@usefolds{####1}\else + \if ####1P\g@addto@macro\@usefolds{####1}\else + \if ####1L\g@addto@macro\@usefolds{####1}\else + \if ####1V\g@addto@macro\@usefolds{L}\else + \if ####1H\g@addto@macro\@usefolds{TMBP}\else + \if ####1t\scr@removechar\@usefolds{T}\else + \if ####1m\scr@removechar\@usefolds{M}\else + \if ####1b\scr@removechar\@usefolds{B}\else + \if ####1p\scr@removechar\@usefolds{P}\else + \if ####1l\scr@removechar\@usefolds{L}\else + \if ####1v% + \scr@removechar\@usefolds{L}% + \else + \if ####1h% + \scr@removechar\@usefolds{T}% + \scr@removechar\@usefolds{M}% + \scr@removechar\@usefolds{B}% + \else + \ClassError{\KOMAClassName}{% + unknown fold mark switch `####1'}{% + You should use option `foldmarks' + either with one of\MessageBreak + \@spaces `true', `on', or `yes' to + switch fold marks on,\MessageBreak + \@spaces `false', `off', or `no' to + switch fold marks off,\MessageBreak + or a combination of\MessageBreak + \@spaces `T', `M', `B', 'P', 'L', `V', + `H' to select dedicated fold + marks\MessageBreak + or\MessageBreak + \@spaces `t', `m', 'b', 'p', 'l', 'v', + 'h' to deselect dedicated fold + marks.\MessageBreak + See the KOMA-Script manual for more + information. + }% + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \expandafter\sc@nf@ldch@rs + \fi + }% + \expandafter\sc@nf@ldch@rs#1\@nil + }% + \KOMA@set@ifkey\@empty{@fold}{#1}% + \if@fold\aftergroup\@foldtrue\else\aftergroup\@foldfalse\fi + \endgroup +} +\newcommand*{\scr@removechar}[2]{% + \def\in@@##1#2##2##3\in@@{% + \ifx\in@##2\else + \def\in@@####1#2\in@{\gdef#1{##1####1}}% + \in@@##2##3% + \fi}% + \expandafter\in@@#1#2\in@\in@@ +} \newif\if@refwide \KOMA@key{refline}[wide]{% \begingroup @@ -546,6 +637,7 @@ \endgroup } \KOMA@ifkey{enlargefirstpage}{@enlargefp} +\KOMA@ifkey{firstfoot}{@firstfoot}\@firstfoottrue \newcommand*{\@pageat}{4} \KOMA@key{pagenumber}{% \begingroup @@ -1911,7 +2003,7 @@ \aliaskomafont{pagination}{pagenumber} \newcommand*{\scr@fnt@pagehead}{\headfont} \newcommand*{\scr@fnt@wrn@pagehead}[1]{% - `pagehead' and `pagefoot' are aliases for the same^^b8\MessageBreak + `pagehead' and `pagefoot' are aliases for the same\MessageBreak font element, changed% } \aliaskomafont{pagefoot}{pagehead} @@ -2322,8 +2414,16 @@ \newkomafont{title}{\normalcolor\sffamily\bfseries} \newkomafont{subject}{\normalcolor\bfseries} \@newplength{foldmarkhpos} +\@newplength{foldmarkvpos} \@newplength{tfoldmarkvpos} +\@newplength{mfoldmarkvpos} \@newplength{bfoldmarkvpos} +\@newplength{lfoldmarkhpos} +\@newplength{pfoldmarklength} +\@newplength{tfoldmarklength} +\@newplength{mfoldmarklength} +\@newplength{bfoldmarklength} +\@newplength{lfoldmarklength} \@newplength{foldmarkthickness} \@setplength{foldmarkthickness}{.2pt} \@newplength{toaddrvpos} @@ -2334,7 +2434,10 @@ \@newplength{toaddrindent} \@newplength{toaddrwidth} \@newplength{toaddrheight} +\@newplength{locvpos} \@newplength{locwidth} +\@newplength{lochpos} +\@newplength{locheight} \@newplength{refvpos} \@newplength{refwidth} \@newplength{refhpos} @@ -2376,7 +2479,7 @@ \ifodd\value{page}\hskip \oddsidemargin\else\hskip \evensidemargin\fi% \ignorespaces% } -\newcommand*{\vb@t@z}[1]{{% +\newcommand{\vb@t@z}[1]{{% \setbox0\vbox to\z@{#1\vss}% \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative \setlength{\baselineskip}{\z@}% @@ -2391,15 +2494,83 @@ \rlap{\move@topl\hskip\useplength{foldmarkhpos}% \usekomafont{foldmark}{% \rule{#2}{\useplength{foldmarkthickness}}}}}% - \ignorespaces% + \ignorespaces +} +\newcommand*{\@hfoldmark}[1]{% + \begingroup + \@expandtwoargs\in@{#1}{\@usefolds}% + \ifin@ + \lowercase{% + \edef\@tempa{% + \noexpand\ifdim \noexpand\useplength{#1foldmarkvpos}=\noexpand\z@ + \noexpand\else + \noexpand\@foldmark{% + \noexpand\useplength{#1foldmarkvpos}% + }{% + \noexpand\useplength{#1foldmarklength}% + }% + \noexpand\fi + }% + }% + \@tempa + \fi + \endgroup +} +\newcommand*{\@vfoldmark}[1]{% + \begingroup + \@expandtwoargs\in@{#1}{\@usefolds}% + \ifin@ + \ifdim \useplength{lfoldmarkhpos}=\z@\else + \vb@t@z{% + \ifdim \useplength{foldmarkvpos}<\z@ + \nobreak\vskip \paperheight\nobreak + \fi + \vskip \useplength{foldmarkvpos}% + \vskip \useplength{foldmarkthickness}% + \rlap{\move@topl + \setlength{\@tempdima}{\useplength{lfoldmarkhpos}}% + \addtolengthplength[-.5]{\@tempdima}{foldmarkthickness}% + \hskip\@tempdima + \usekomafont{foldmark}{% + \rule{\useplength{foldmarkthickness}}% + {\useplength{lfoldmarklength}}% + }% + }% + }% + \ignorespaces + \fi + \fi + \endgroup } \newcommand*{\@foldmarks}{% \if@fold% \typeout{Foldmarks: yes}% \move@topt - \@foldmark{\useplength{tfoldmarkvpos}}{2mm}% - \@foldmark{.5\paperheight}{4mm}% - \@foldmark{\useplength{bfoldmarkvpos}}{2mm}% + \ifdim \useplength{pfoldmarklength}=\z@ + \@setplength{pfoldmarklength}{4mm}% + \fi + \ifdim \useplength{tfoldmarklength}=\z@ + \@setplength{tfoldmarklength}{2mm}% + \fi + \ifdim \useplength{mfoldmarklength}=\z@ + \@setplength{mfoldmarklength}{2mm}% + \fi + \ifdim \useplength{bfoldmarklength}=\z@ + \@setplength{bfoldmarklength}{2mm}% + \fi + \ifdim \useplength{lfoldmarklength}=\z@ + \@setplength{lfoldmarklength}{4mm}% + \fi + \begingroup + \@expandtwoargs\in@{P}{\@usefolds}% + \ifin@ + \@foldmark{.5\paperheight}{\useplength{pfoldmarklength}}% + \fi + \endgroup + \@hfoldmark{T}% + \@hfoldmark{M}% + \@hfoldmark{B}% + \@vfoldmark{L}% \move@frompt \else \typeout{Foldmarks: no}% @@ -2430,40 +2601,48 @@ \endgroup% } \newcommand*{\@firstheadfootfield}{% - \typeout{Head of first page}% - \move@topt\vskip\useplength{firstheadvpos}% - \vb@t@z{% - \rlap{\move@topl - \setlength\@tempskipa{.5\paperwidth}% - \addtolengthplength[-.5]{\@tempskipa}{firstheadwidth}% - \hskip\@tempskipa - \vbox{\hsize\useplength{firstheadwidth}% - \setlength{\@tempskipa}{\useplength{toaddrvpos}}% - \addtolengthplength[-1]{\@tempskipa}{firstheadvpos}% - \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}% + \if@firsthead + \typeout{Head of first page}% + \move@topt\vskip\useplength{firstheadvpos}% + \vb@t@z{% + \rlap{\move@topl + \setlength\@tempskipa{.5\paperwidth}% + \addtolengthplength[-.5]{\@tempskipa}{firstheadwidth}% + \hskip\@tempskipa + \vbox{\hsize\useplength{firstheadwidth}% + \setlength{\@tempskipa}{\useplength{toaddrvpos}}% + \addtolengthplength[-1]{\@tempskipa}{firstheadvpos}% + \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}% + }% }% }% - }% - \vskip-\useplength{firstheadvpos}\move@frompt - \typeout{Foot of first page}% + \vskip-\useplength{firstheadvpos}\move@frompt + \else + \typeout{No head at first page}% + \fi \move@topt - \vb@t@z{% - \rlap{\move@topl - \setlength\@tempskipa{.5\paperwidth}% - \addtolengthplength[-.5]{\@tempskipa}{firstfootwidth}% - \hskip\@tempskipa% - \vbox{\hsize\useplength{firstfootwidth}% - \vskip\useplength{firstfootvpos}% - \setlength{\textwidth}{\useplength{firstfootwidth}}% - \setlength{\parfillskip}{\z@ \@plus 1fil}% - \vbox{\hsize\useplength{firstfootwidth}\@firstfoot}% + \if@firstfoot + \typeout{Foot of first page}% + \vb@t@z{% + \rlap{\move@topl + \setlength\@tempskipa{.5\paperwidth}% + \addtolengthplength[-.5]{\@tempskipa}{firstfootwidth}% + \hskip\@tempskipa% + \vbox{\hsize\useplength{firstfootwidth}% + \vskip\useplength{firstfootvpos}% + \setlength{\textwidth}{\useplength{firstfootwidth}}% + \setlength{\parfillskip}{\z@ \@plus 1fil}% + \vbox{\hsize\useplength{firstfootwidth}\@firstfoot}% + }% }% }% - }% + \else + \typeout{No foot at first page}% + \fi \move@frompt% {% \setlength{\@tempdima}{1in}\addtolength{\@tempdima}{\topmargin}% @@ -2471,7 +2650,11 @@ \addtolength{\@tempdima}{\headsep}% \addtolength{\@tempdima}{\textheight}% \addtolength{\@tempdima}{\footskip}% - \addtolengthplength[-1]{\@tempdima}{firstfootvpos}% + \if@firstfoot + \addtolengthplength[-1]{\@tempdima}{firstfootvpos}% + \else + \addtolength{\@tempdima}{-\paperheight}% + \fi \ifdim\@tempdima>\z@\enlargethispage{-\@tempdima}% \else\if@enlargefp\enlargethispage{-\@tempdima}\fi\fi }% @@ -2558,43 +2741,140 @@ \@setplength[.5]{locwidth}{\useplength{locwidth}}% \fi% \fi% - \ifnum 1=\@alignfrom + \ifcase\@alignfrom + \or \if@logo - \ifkomavarempty{location}{% - \setkomavar{location}{\null}}{}% + \ifkomavarempty{location}{\setkomavar{location}{\null}}{}% \fi + \or + \or + \ifkomavarempty{location}{\setkomavar{location}{\null}}{}% + \or + \ifkomavarempty{location}{\setkomavar{location}{\null}}{}% \fi \ifkomavarempty{location}{% \typeout{Location field: empty}% }{% \typeout{Location field: yes}% - \move@topt\vskip\useplength{toaddrvpos}% - \vb@t@z{\rlap{% + \ifdim \useplength{lochpos}=\z@% + \@setplength{lochpos}{\useplength{toaddrhpos}}% + \fi + \ifdim \useplength{locvpos}=\z@% + \@setplength{locvpos}{\useplength{toaddrvpos}}% + \fi + \ifdim \useplength{locheight}=\z@% + \@setplength{locheight}{\useplength{toaddrheight}}% + \@addtoplength{locheight}{\useplength{backaddrheight}}% + \fi + \move@topt\vskip\useplength{locvpos}% + \vb@t@z{\noindent\makebox[0pt][l]{% \move@topl - \setlengthtoplength[-]{\@tempskipa}{toaddrhpos}% + \setlengthtoplength[-]{\@tempskipa}{lochpos}% \ifdim \@tempskipa<\z@ \addtolength{\@tempskipa}{\paperwidth}% \else \addtolengthplength{\@tempskipa}{locwidth}% \fi \hskip\@tempskipa - \llap{% - \@savevbox{\useplength{toaddrheight}}{% + \makebox[0pt][r]{% + \@savevbox{\useplength{locheight}}{% \noindent\hsize\useplength{locwidth}% - \ifnum 1=\@alignfrom + \ifcase\@alignfrom + \usekomavar{location}% + \or \if@logo - \ifkomavarempty{fromlogo}{}{% + \ifkomavarempty{fromlogo}{\null}{% {\raggedleft\noindent\usekomavar{fromlogo}\\ \vskip\parskip}\noindent}% \fi + \or + \usekomavar{location}% + \or + \if@logo + \ifkomavarempty{fromlogo}{}{% + \raggedleft\usekomavar{fromlogo}\par}% + \fi + \raggedright + {\usekomafont{fromname}\strut\ignorespaces + \usekomavar{fromname}% + {% + \ifnum\@rulefrom=1\\[-.5\baselineskip]% + \usekomafont{fromrule}{% + \setlength{\@tempdima}{\useplength{fromrulewidth}}% + \ifdim\@tempdima=\z@ + \setlength{\@tempdima}{\useplength{locwidth}}% + \fi + \expandafter\rule\expandafter{\the\@tempdima}{% + \useplength{fromrulethickness}}% + }% + \fi + }% + \\ + }% + {\usekomafont{fromaddress}\strut\ignorespaces + \usekomavar{fromaddress}% + \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi% + \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi% + \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi% + \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi% + \ifnum\@rulefrom=2\\[-.5\baselineskip]% + \usekomafont{fromrule}{% + \setlength{\@tempdima}{\useplength{fromrulewidth}}% + \ifdim\@tempdima=\z@ + \setlength{\@tempdima}{\useplength{locwidth}}% + \fi + \expandafter\rule\expandafter{\the\@tempdima}{% + \useplength{fromrulethickness}}}% + \fi + \\ + }% + \or + \raggedleft + \if@logo + \ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}% + \fi + {\usekomafont{fromname}\strut\ignorespaces + \usekomavar{fromname}% + {% + \ifnum\@rulefrom=1\\[-.5\baselineskip]% + \usekomafont{fromrule}{% + \setlength{\@tempdima}{\useplength{fromrulewidth}}% + \ifdim\@tempdima=\z@ + \setlength{\@tempdima}{\useplength{locwidth}}% + \fi + \expandafter\rule\expandafter{\the\@tempdima}{% + \useplength{fromrulethickness}}% + }% + \fi + }% + \\ + }% + {\usekomafont{fromaddress}\strut\ignorespaces + \usekomavar{fromaddress}% + \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi% + \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi% + \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi% + \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi% + \ifnum\@rulefrom=2\\[-.5\baselineskip]% + \usekomafont{fromrule}{% + \setlength{\@tempdima}{\useplength{fromrulewidth}}% + \ifdim\@tempdima=\z@ + \setlength{\@tempdima}{\useplength{locwidth}}% + \fi + \expandafter\rule\expandafter{\the\@tempdima}{% + \useplength{fromrulethickness}}}% + \fi + \\ + }% + \usekomavar{location}% \fi - \usekomavar{location}\vskip \z@ \@plus .00001fil}% - {location field}{toaddrheight}{\setkomavar}% - }}% - }% - \vskip-\useplength{toaddrvpos}\move@frompt + \vskip \z@ \@plus .00001fil}% + {location field}{locheight}{\setkomavar}% + }}% }% - } + \vskip-\useplength{locvpos}\move@frompt + }% +} \newcommand*{\@set@reffield}[1]{% \ifkomavarempty{#1}{}{% \settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index d971141d9f4..77f91c54c57 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -91,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2007/10/12 v2.97d KOMA-Script}% + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -142,7 +142,9 @@ \@namedef{scr@v@2.97b}{3} \@namedef{scr@v@2.97c}{4} \@namedef{scr@v@2.97d}{5} -\@namedef{scr@v@last}{5} +\@namedef{scr@v@2.97e}{6} +\@namedef{scr@v@2.98}{6} +\@namedef{scr@v@last}{6} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -215,16 +217,16 @@ \ifstr{#3}{paper}{% \ifnumber{#2}{% \ifstr{#1}{a}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{b}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{c}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{% \ifstr{#1}{d}{% - \PassOptionsToPackage{#1#2#3}{typearea}% + \PassOptionsToPackage{#3=#1#2}{typearea}% }{\scr@pti@nerr@r}% }% }% @@ -237,6 +239,14 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } +\KOMA@key{twoside}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% +} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% +} +\KOMA@DeclareObsoleteOption[\PackageInfoNoLine]{onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} %%% From File: scrkpar.dtx @@ -1591,7 +1601,10 @@ \newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }% \thechapter\autodot\enskip} \newcounter{section}[chapter] -\renewcommand*\thesection{\thechapter.\@arabic\c@section} +\renewcommand*\thesection{% + \thechapter.% + \@arabic\c@section +} \newcommand*\sectionmarkformat{\thesection\autodot\enskip} \newcounter{subsection}[section] \renewcommand*{\thesubsection}{\thesection.\@arabic\c@subsection} @@ -2256,7 +2269,7 @@ \aliaskomafont{pagination}{pagenumber} \newcommand*{\scr@fnt@pagehead}{\headfont} \newcommand*{\scr@fnt@wrn@pagehead}[1]{% - `pagehead' and `pagefoot' are aliases for the same^^b8\MessageBreak + `pagehead' and `pagefoot' are aliases for the same\MessageBreak font element, changed% } \aliaskomafont{pagefoot}{pagehead} diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty new file mode 100644 index 00000000000..d221819ca8e --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty @@ -0,0 +1,808 @@ +%% +%% This is file `tocstyle.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% tocstyle.dtx (with options: `package,trace,tocstyle') +%% scrlogo.dtx (with options: `logo') +%% +%% Copyright (c) 2007 by Markus Kohm <komascript(at)gmx.info> +%% +%% Copyright (c) 1994-2007 +%% Markus Kohm and any individual authors listed elsewhere in this file. +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% This work may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, version 1.3b of the license. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3b or later is part of all distributions of LaTeX +%% version 2005/12/01 or later and of this work. +%% +%% This work has the LPPL maintenance status "author-maintained". +%% +%% The Current Maintainer and author of this work is Markus Kohm. +%% +%% This file may only be distributed together with the file +%% `tocstyle.dtx' and `scrlogo.dtx'. You may however distribute the files +%% `tocstyle.dtx' and `scrlogo.dtx' without this file. +%% +%% If this file is a beta version, you are not allowed to distribute it. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% The english manual is at `tocstyle.dtx', too. +%% +%% The KOMA-Script bundle (but not this file) was based upon the LaTeX2.09 +%% Script family created by Frank Neukam 1993 and the LaTeX2e standard +%% classes created by The LaTeX3 Project 1994-1996. +%% +%% THIS IS AN ALPHA VERSION! +%% USAGE OF THIS VERSION IS ON YOUR OWN RISK! +%% EVERYTHING MAY HAPPEN! +%% EVERYTHING MAY CHANGE IN FUTURE! +%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE! +%% +%%% From File: tocstyle.dtx +\NeedsTeXFormat{LaTeX2e}[1995/06/01] +\ProvidesPackage{tocstyle} + [2007/12/21 v0.2alpha LaTeX2e KOMA-Script package (versatile toc styles)] +\PackageWarningNoLine{tocstyle}{% + THIS IS AN ALPHA VERSION!\MessageBreak + USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak + EVERYTHING MAY HAPPEN!\MessageBreak + EVERYTHING MAY CHANGE IN FUTURE!\MessageBreak + THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!\MessageBreak + Maybe it would be better, not to load this package% +} +\newif\if@tocstyle@penalties +\newif\iftocstyle@autolength +\newif\iftocstyle@indentnotnumbered +\newcount\tocstyle@indentstyle\tocstyle@indentstyle=\z@ +\newcommand*{\selecttocstyleoption}[1]{% + \begingroup + \edef\@tempa{#1}% + \edef\@tempb{tocbreaksstrict}% + \ifx\@tempa\@tempb\aftergroup\@tocstyle@penaltiestrue\else + \edef\@tempb{tocbreakscareless}% + \ifx\@tempa\@tempb\aftergroup\@tocstyle@penaltiesfalse\else + \edef\@tempb{tocindentauto} + \ifx\@tempa\@tempb\aftergroup\tocstyle@autolengthtrue\else + \edef\@tempb{tocindentmanual}% + \ifx\@tempa\@tempb\aftergroup\tocstyle@autolengthfalse\else + \edef\@tempb{tocgraduated}% + \ifx\@tempa\@tempb + \aftergroup\tocstyle@indentstyle\aftergroup\z@ + \else + \edef\@tempb{tocflat}% + \ifx\@tempa\@tempb + \aftergroup\tocstyle@indentstyle\aftergroup\@ne + \aftergroup\relax + \else + \edef\@tempb{tocfullflat}% + \ifx\@tempa\@tempb + \aftergroup\tocstyle@indentstyle\aftergroup\tw@ + \aftergroup\relax + \else + \edef\@tempb{toctextentriesindented}% + \ifx\@tempa\@tempb\aftergroup\tocstyle@indentnotnumberedtrue + \else + \edef\@tempb{toctextentriesleft}% + \ifx\@tempa\@tempb + \aftergroup\tocstyle@indentnotnumberedfalse + \else + \PackageError{tocstyle}{unknown option `#1'}{% + You've told me to select toc style option + `#1',\MessageBreak + but tocstyle doesn't know an option named `#1'}% + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \endgroup +} +\DeclareOption{tocbreaksstrict}{\selecttocstyleoption\CurrentOption} +\DeclareOption{tocbreakscareless}{\selecttocstyleoption\CurrentOption} +\DeclareOption{tocindentauto}{\selecttocstyleoption\CurrentOption} +\DeclareOption{tocindentmanual}{\selecttocstyleoption\CurrentOption} +\DeclareOption{toctextentriesindented}{\selecttocstyleoption\CurrentOption} +\DeclareOption{toctextentriesleft}{\selecttocstyleoption\CurrentOption} +\DeclareOption{tocgraduated}{\selecttocstyleoption\CurrentOption} +\DeclareOption{tocflat}{\selecttocstyleoption\CurrentOption} +\DeclareOption{tocfullflat}{\selecttocstyleoption\CurrentOption} +\ExecuteOptions{tocbreaksstrict,tocindentauto,tocgraduated,% + toctextentriesleft} +\ProcessOptions\relax +\ifcsname if@tocleft\endcsname + \if@tocleft + \PackageWarningNoLine{tocstyle}{% + You should not use class option `tocleft'!\MessageBreak + This may result in errors or unexpected results.\MessageBreak + I'll try to deactivate `tocleft', now.\MessageBreak + You may use options `tocflat' and\MessageBreak + `tocindentauto' instead of `tocleft'}% + \csname @tocleftfalse\endcsname + \fi +\fi +\newcommand*\tocstyle@saved@starttoc{} +\let\tocstyle@saved@starttoc\@starttoc +\renewcommand*{\@starttoc}[1]{% + \tocstyle@pre@starttoc{#1}% + \tocstyle@saved@starttoc{#1}% + \tocstyle@post@starttoc{#1}% +} +\newcommand*{\tocstyle@saved@dottedtocline}{} +\newcommand*{\tocstyle@dottedtocline}[5]{% + \let\numberline\tocstyle@numberline + \ifnum #1>\c@tocdepth \else + \if@tocstyle@penalties + \begingroup + \@tempcnta 20010 + \advance \@tempcnta by -#1 + \ifnum \@tempcnta>\lastpenalty + \aftergroup\penalty\aftergroup\@lowpenalty + \fi + \endgroup + \fi + \edef\tocstyledepth{#1}% + \tocstyle@activate@features + \ifx\tocstyle@feature@entryvskip\relax + \vskip \z@ \@plus.2\p@ + \else + \addvspace{\tocstyle@feature@entryvskip}% + \fi + {% + \parskip \z@ \parindent \z@ \leftskip \z@ \rightskip \z@ + \tocstyle@feature@raggedhook + \@tempdima #3\relax + \@tempdimb #2\relax + \typeout{m (\tocstyleTOC, \tocstyledepth): \the\@tempdima}% + \ifnum #1>\z@\relax + \@tempcnta #1\relax \advance\@tempcnta \m@ne + \ifcsname tocstyle@skipwidth@\tocstyleTOC @\the\@tempcnta\endcsname + \ifcsname tocstyle@numwidth@\tocstyleTOC @\the\@tempcnta\endcsname + \@tempdimb + \csname tocstyle@skipwidth@\tocstyleTOC @\the\@tempcnta\endcsname + \advance\@tempdimb + \csname tocstyle@numwidth@\tocstyleTOC @\the\@tempcnta\endcsname + \fi + \fi + \fi + \typeout{C (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}% + \ifcsname tocstyle@skipwidth@\tocstyleTOC @#1\endcsname + \ifdim \@tempdimb> + \csname tocstyle@skipwidth@\tocstyleTOC @#1\endcsname\relax + \expandafter\xdef\csname tocstyle@skipwidth@\tocstyleTOC + @#1\endcsname{\the\@tempdimb}% + \fi + \else + \expandafter\xdef\csname tocstyle@skipwidth@\tocstyleTOC + @#1\endcsname{\the\@tempdimb}% + \fi + \iftocstyle@autolength + \ifcsname tocstyle@maxskipwidth@\tocstyleTOC @#1\endcsname + \@tempdimb \csname tocstyle@maxskipwidth@\tocstyleTOC @#1\endcsname + \relax + \fi + \ifcsname tocstyle@maxnumwidth@\tocstyleTOC @#1\endcsname + \@tempdima \csname tocstyle@maxnumwidth@\tocstyleTOC @#1\endcsname + \relax + \fi + \typeout{a (\tocstyleTOC, \tocstyledepth): \the\@tempdima}% + \typeout{A (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}% + \else + \@tempdimb #2\relax + \typeout{M (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}% + \fi + \ifcsname tocstyle@unumwidth@\tocstyleTOC @\endcsname + \ifdim \@tempdima> + \csname tocstyle@unumwidth@\tocstyleTOC @\endcsname\relax + \expandafter\xdef\csname tocstyle@unumwidth@\tocstyleTOC + @\endcsname{\the\@tempdima}% + \fi + \else + \expandafter\xdef\csname tocstyle@unumwidth@\tocstyleTOC + @\endcsname{\the\@tempdima}% + \fi + \ifcase\tocstyle@indentstyle\relax\else + \@tempdimb \z@ + \ifcsname tocstyle@maxunumwidth@\tocstyleTOC @\endcsname + \@tempdima \csname tocstyle@maxunumwidth@\tocstyleTOC @\endcsname + \relax + \fi + \typeout{s (\tocstyleTOC, \tocstyledepth): \the\@tempdima}% + \typeout{S (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}% + \fi + \advance\parindent \@tempdimb\@afterindenttrue + \advance\leftskip \parindent + \advance\rightskip \@tocrmarg + \parfillskip -\rightskip + \ifx\tocstyle@feature@parfillskip\relax\else + \advance\parfillskip \tocstyle@feature@parfillskip\relax + \fi + \interlinepenalty\@M + \leavevmode + \advance\leftskip \@tempdima + \null\nobreak + \iftocstyle@indentnotnumbered\else + \hskip -\leftskip + \fi + \tocstyle@feature@entryhook + {#4}\nobreak + \ifx\tocstyle@feature@leaders\relax + \leaders\hbox{$\m@th + \mkern \@dotsep mu\hbox{\tocstyle@feature@dothook .}% + \mkern \@dotsep mu$}\hfill + \else + \tocstyle@feature@leaders + \fi + \nobreak + \ifx\tocstyle@feature@pagenumberbox\relax + \hb@xt@\@pnumwidth{\hfil\tocstyle@feature@pagenumberhook #5}% + \else + \tocstyle@feature@pagenumberbox{\tocstyle@feature@pagenumberhook #5}% + \fi + \par + }% + \if@tocstyle@penalties + \bgroup + \@tempcnta 20009 + \advance\@tempcnta by -#1 + \edef\reserved@a{\egroup\penalty\the\@tempcnta\relax}% + \reserved@a + \fi + \fi} +\newcommand*{\tocstyle@saved@numberline}{} +\newcommand*{\tocstyle@numberline}[1]{% + \begingroup + \ifx\tocstyle@feature@spaceafternumber\relax + \settowidth\@tempdima{\tocstyle@@numberline{#1}\enskip}% + \else + \settowidth\@tempdima{\tocstyle@@numberline{#1}}% + \advance \@tempdima \tocstyle@feature@spaceafternumber\relax + \fi + \ifcsname tocstyle@numwidth@\tocstyleTOC @\tocstyledepth\endcsname + \ifdim \@tempdima > + \csname tocstyle@numwidth@\tocstyleTOC @\tocstyledepth\endcsname\relax + \expandafter\xdef\csname tocstyle@numwidth@\tocstyleTOC + @\tocstyledepth\endcsname{\the\@tempdima}% + \fi + \else + \expandafter\xdef\csname tocstyle@numwidth@\tocstyleTOC + @\tocstyledepth\endcsname{\the\@tempdima}% + \fi + \endgroup + \iftocstyle@indentnotnumbered + \hskip -\leftskip + \fi + \ifcase \tocstyle@indentstyle + \hb@xt@\@tempdima{\tocstyle@@numberline{#1}\hfil}% + \or + \hb@xt@\@tempdima{\tocstyle@@numberline{#1}\hfil}% + \else + \ifx\tocstyle@feature@spaceafternumber\relax + \hbox{\tocstyle@@numberline{#1}\enskip}% + \else + \hbox{\tocstyle@@numberline{#1}\hskip + \tocstyle@feature@spaceafternumber\relax}% + \fi + \fi +} +\newcommand*{\tocstyle@@numberline}[1]{% + #1\csname autodot\endcsname +} +\AtBeginDocument{% + \ifcsname l@part\endcsname + \ifcsname l@chapter\endcsname + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@part{\tocstyle@l@define{part}{-1}}{}}% + \else + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@part{\tocstyle@l@define{part}{0}}{}}% + \fi + \fi + \ifcsname l@chapter\endcsname + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@chapter{\tocstyle@l@define{chapter}{0}}{}}% + \fi + \ifcsname l@section\endcsname + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@section{\tocstyle@l@define{section}{1}}{}}% + \fi + \ifcsname l@subsection\endcsname + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@subsection{\tocstyle@l@define{subsection}{2}}{}}% + \fi + \ifcsname l@subsubsection\endcsname + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@subsubsection{\tocstyle@l@define{subsubsection}{3}}{}}% + \fi + \ifcsname l@paragraph\endcsname + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@paragraph{\tocstyle@l@define{paragraph}{4}}{}}% + \fi + \ifcsname l@subparagraph\endcsname + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@subparagraph{\tocstyle@l@define{subparagraph}{5}}{}}% + \fi + \ifcsname l@table\endcsname + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@table{\tocstyle@l@define{table}{1}}{}}% + \fi + \ifcsname l@figure\endcsname + \setbox\@tempboxa\vbox{\hsize\maxdimen + \l@figure{\tocstyle@l@define{figure}{1}}{}}% + \fi + \def\@tempa#1#2#3#4#5{% + \ifnum #1>\c@tocdepth \else + \vskip \z@ \@plus.2\p@ + {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip + \parindent #2\relax\@afterindenttrue + \interlinepenalty\@M + \leavevmode + \@tempdima #3\relax + \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip + {#4}\nobreak + \leaders\hbox{$\m@th + \mkern \@dotsep mu\hbox{.}\mkern \@dotsep + mu$}\hfill + \nobreak + \hb@xt@\@pnumwidth{\hfil \normalfont \normalcolor #5}% + \par}% + \fi}% + \ifx\@dottedtocline\@tempa\else + \tocstyle@macrochangewarning\@dottedtocline + \fi + \let\tocstyle@saved@dottedtocline\@dottedtocline + \def\@tempa#1{\hb@xt@\@tempdima{#1\autodot\hfil}}% + \ifx\numberline\@tempa\else + \def\@tempa#1{\hb@xt@\@tempdima{#1\hfil}}% + \ifx\numberline@tempa\else + \tocstyle@macrochangewarning\numberline + \fi + \fi + \let\tocstyle@saved@numberline\numberline +} +\newcommand*{\tocstyle@macrochangewarning}[1]{% + \PackageWarningNoLine{tocstyle}{% + unexpected \string#1\space definition!\MessageBreak + You are either using an unknown LaTeX kernel\MessageBreak + version, an unknown class or package, that redefines\MessageBreak + \string#1, or a \string#1\space + redefinition\MessageBreak + at the document preamble.\MessageBreak + Because of this you may get unexpected results!\MessageBreak + Maybe it would be better not to use package tocstyle}% + \PackageInfo{tocstyle}{Unexpected definition is:\MessageBreak + \meaning#1}% +} +\newcommand*{\tocstyle@activate@all@l}{} +\newcommand*{\tocstyle@l@define}[2]{% + \advance\leftskip-\@tempdima + \edef\@tempa{% + \noexpand\global\noexpand\let + \expandafter\noexpand\csname tocstyle@saved@l@#1\endcsname + \expandafter\noexpand\csname l@#1\endcsname + \noexpand\gdef + \expandafter\noexpand\csname tocstyle@l@#1\endcsname{% + \noexpand\@dottedtocline{#2}{\the\leftskip}{\the\@tempdima}}% + \noexpand\g@addto@macro\noexpand\tocstyle@activate@all@l{% + \noexpand\let\expandafter\noexpand\csname l@#1\endcsname + \expandafter\noexpand\csname tocstyle@l@#1\endcsname + }% + }% + \PackageInfo{tocstyle}{prepare \expandafter\string + \csname l@#1\endcsname\space for redefinition}% + \@tempa +} +\newcommand*{\showtoc}[2][\aliastoc\tocstyleTOC\tocstyleAliasTOC]{% + \ifcsname tocstyle@copyname@#2\endcsname + \@tempcnta \csname tocstyle@copyname@#2\endcsname\relax + \advance\@tempcnta \@ne + \expandafter\xdef\csname tocstyle@copyname@#2\endcsname{\the\@tempcnta}% + \else + \expandafter\xdef\csname tocstyle@copyname@#2\endcsname{1}% + \fi + \ifx\@dofilelist\relax\let\@dofilelist\@empty\fi + \edef\@tempa{\noexpand\g@addto@macro\noexpand\@dofilelist{% + \noexpand\tocstyle@copy@toc{#2}{\csname + tocstyle@copyname@#2\endcsname}}% + }\@tempa% + \begingroup + \edef\tocstyleAliasTOC{#2}% + \edef\tocstyleTOC{#2\csname tocstyle@copyname@#2\endcsname}% + #1 + \tocstyle@pre@starttoc{#2\csname tocstyle@copyname@#2\endcsname}% + \makeatletter + \@input{\jobname.#2\csname tocstyle@copyname@#2\endcsname}% + \@nobreakfalse + \tocstyle@post@starttoc{#2\csname tocstyle@copyname@#2\endcsname}% + \endgroup +} +\newcommand*{\tocstyle@copy@toc}[2]{% + \if@filesw + \begingroup + \endlinechar=\m@ne + \immediate\closeout\csname tf@#1\endcsname + \immediate\openin\@inputcheck \jobname.#1 + \immediate\openout\@partaux \jobname.#1#2 + \loop\unless\ifeof\@inputcheck + \immediate\readline\@inputcheck to \@tempa + \immediate\write\@partaux{\@tempa}% + \repeat + \immediate\closeout\@partaux + \immediate\closein\@inputcheck + \endgroup + \fi +} +\newcommand*{\aliastoc}[2]{% + \expandafter\edef\csname tocstyle@alias@TOC@#1\endcsname{#2}% +} +\newcommand*{\tocstyle@pre@starttoc}[1]{% + \begingroup + \expandafter\ifx\csname tocstyle@deactivated@\endcsname\relax + \expandafter\ifx\csname tocstyle@deactivated@#1\endcsname\relax\relax + \tocstyle@activetrue + \else + \tocstyle@activefalse + \fi + \else + \tocstyle@activefalse + \fi + \iftocstyle@active + \let\@dottedtocline\tocstyle@dottedtocline + \parskip \z@ + \parindent \z@ + \parfillskip \z@\@plus 1fil + \ifcsname tocstyle@alias@TOC@#1\endcsname + \edef\tocstyleAliasTOC{\csname tocstyle@alias@TOC@#1\endcsname}% + \else + \edef\tocstyleAliasTOC{#1}% + \fi + \edef\tocstyleTOC{#1}% + \tocstyle@activate@all@l + \fi +} +\newcommand*{\tocstyle@post@starttoc}[1]{% + \iftocstyle@active + \if@filesw + \ifcsname tocstyle@unumwidth@#1@\endcsname + \protected@write\@auxout{}{% + \protect\tocstyle@set@width{unum}{#1}{}{% + \csname tocstyle@unumwidth@#1@\endcsname}% + }% + \fi + \expandafter\let\expandafter\@tempa + \csname tocstyle@depthlist@#1\endcsname + \ifx\@tempa\relax\else + \expandafter\@for \expandafter\@tempa\expandafter:\expandafter=\@tempa + \do {% + \ifcsname tocstyle@numwidth@#1@\@tempa\endcsname + \protected@write\@auxout{}{% + \protect\tocstyle@set@width{num}{#1}{\@tempa}{% + \csname tocstyle@numwidth@#1@\@tempa\endcsname}% + }% + \fi + \ifcsname tocstyle@skipwidth@#1@\@tempa\endcsname + \protected@write\@auxout{}{% + \protect\tocstyle@set@width{skip}{#1}{\@tempa}{% + \csname tocstyle@skipwidth@#1@\@tempa\endcsname}% + }% + \fi + }% + \fi + \fi + \fi + \endgroup +} +\newcommand*{\tocstyle@set@width}[4]{% + \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{#4}% +} +\newcommand*{\tocstyleTOC}{} +\newcommand*{\tocstyleAliasTOC}{} +\newcommand*{\tocstyledepth}{} +\newif\iftocstyle@active +\newcommand*{\deactivatetocstyle}[1][]{% + \expandafter\let\csname tocstyle@deactivated@#1\endcsname\@empty} +\newcommand*{\reactivatetocstyle}[1][]{% + \expandafter\let\csname tocstyle@deactivated@#1\endcsname\relax} +\newcommand*{\@settocfeature}[1][]{% + \@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]} +} +\def\@@settocfeature[#1][#2]#3#4{% + \typeout{exclude: \tocstyle@feature@excludelist}% + \@expandtwoargs\in@{,#3,}{,\tocstyle@feature@excludelist,}% + \ifin@\else + \expandafter\ifcsname tocstyle@feature@#3\endcsname + \@namedef{tocstyle@feature@#3@#1@#2}{#4}% + \begingroup + \expandafter\let\expandafter\@tempa + \csname tocstyle@commandlist@#1\endcsname + \@expandtwoargs\in@{,tocstyle@feature@#3@#1@#2,}{,\@tempa,}% + \ifin@\let\@tempa\endgroup\else + \edef\@tempa{\endgroup + \noexpand\expandafter\noexpand\ifx + \noexpand\csname tocstyle@commandlist@#1\noexpand\endcsname\relax + \noexpand\expandafter\noexpand\expandafter\noexpand\expandafter + \noexpand\def + \noexpand\else + \noexpand\expandafter\noexpand\expandafter\noexpand\expandafter + \noexpand\l@addto@macro + \noexpand\fi + \noexpand\csname tocstyle@commandlist@#1\noexpand\endcsname% + {tocstyle@feature@#3@#1@#2,}}% + \fi + \@tempa + \else + \PackageError{tocstyle}{unkown feature `#3'}{% + You've told me to set up toc style feature `#3',\MessageBreak + but I don't know this feature.\MessageBreak + See the tocstyle manual for all known feature.\MessageBreak + }% + \fi + \fi +} +\newcommand*{\settocfeature}{} +\let\settocfeature\@settocfeature +\providecommand{\l@addto@macro}[2]{% + \edef#1{\unexpanded\expandafter{#1#2}}% +}% +\newcommand*{\@settocstylefeature}{% + \@ifnextchar[ {\@settocfeature[]}{\@settocfeature[][]}% +} +\newcommand*{\settocstylefeature}{} +\let\settocstylefeature\@settocstylefeature +\newcommand*{\tocstyle@activate@features}{% + \expandafter\ifx\csname tocstyle@depthlist@\tocstyleTOC\endcsname\relax + \expandafter\xdef\csname tocstyle@depthlist@\tocstyleTOC\endcsname{% + \tocstyledepth}% + \else + \expandafter\let\expandafter\@tempa + \csname tocstyle@depthlist@\tocstyleTOC\endcsname + \@expandtwoargs\in@{,\tocstyledepth,}{,\@tempa,}% + \ifin@\else + \expandafter\xdef\csname tocstyle@depthlist@\tocstyleTOC\endcsname{% + \csname tocstyle@depthlist@\tocstyleTOC\endcsname,\tocstyledepth}% + \fi + \fi + \expandafter\@for \expandafter\@tempa + \expandafter:\expandafter=\tocstyle@featurelist \do + {% + \@ifundefined{tocstyle@feature@\@tempa @\tocstyleAliasTOC @\tocstyledepth}{% + \@ifundefined{tocstyle@feature@\@tempa @@\tocstyledepth}{% + \@ifundefined{tocstyle@feature@\@tempa @\tocstyleAliasTOC @}{% + \@ifundefined{tocstyle@feature@\@tempa @@}{% + \expandafter\let\csname tocstyle@feature@\@tempa\endcsname\relax + }{% + \expandafter\let\csname tocstyle@feature@\@tempa + \expandafter\endcsname + \csname tocstyle@feature@\@tempa @@\endcsname + }% + }{% + \expandafter\let\csname tocstyle@feature@\@tempa + \expandafter\endcsname + \csname tocstyle@feature@\@tempa @\tocstyleAliasTOC @\endcsname + }% + }{% + \expandafter\let\csname tocstyle@feature@\@tempa + \expandafter\endcsname + \csname tocstyle@feature@\@tempa @@\tocstyledepth\endcsname + }% + }{% + \expandafter\let\csname tocstyle@feature@\@tempa + \expandafter\endcsname + \csname tocstyle@feature@\@tempa @\tocstyleAliasTOC @\tocstyledepth\endcsname + }% + }% +} +\newcommand*{\newtocstyle}{% + \@ifnextchar [{\@newtocstyle}{\@newtocstyle[]}} +\newcommand*{\@newtocstyle}{} +\def\@newtocstyle[#1]{% + \@ifnextchar [{\@@newtocstyle[{#1}]}{\@newtocstyle[{#1}][]}} +\newcommand*{\@@newtocstyle}{} +\def\@@newtocstyle[#1][#2]#3#4{% + \@ifundefined{tocstyle@style@#3}{% + \@ifundefined{tocstyle@style@#1}{% + \ifx \relax#1\relax\else + \PackageError{tocstyle}{unknown parent TOC style `#1'}{% + You've told me to inheritate parent TOC style `#1',\MessageBreak + but there's no TOC style `#1' defined.}% + \fi + \expandafter\def\csname tocstyle@style@#3\endcsname{#4}% + }{% + \expandafter\def\csname tocstyle@style@#3\endcsname{% + \edef\reserved@a{% + \noexpand\l@addto@macro\noexpand\tocstyle@feature@excludelist{#2}% + \noexpand\@usetocstyle{#1}% + \noexpand\def\noexpand\tocstyle@feature@excludelist{% + \tocstyle@feature@excludelist}% + }\reserved@a + #4% + }% + }% + }{% + \PackageError{tocstyle}{TOC style `#3' already defined}{% + You've tried to define a new TOC style `#3',\MessageBreak + but there's already a TOC style named `#3'.}% + }% +} +\newcommand*{\tocstyle@feature@excludelist}{} +\newcommand*{\usetocstyle}[2][]{% + \@ifundefined{tocstyle@style@#2}{% + \PackageError{tocstyle}{unknown TOC style `#2'}{% + You've told me to use TOC style `#2',\MessageBreak + but there's no TOC style `#2' defined.}% + }{% + \def\settocfeature{% + \@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}% + }% + \let\settocstylefeature\settocfeature + \expandafter\ifx\csname tocstyle@commandlist@#1\endcsname\relax + \else + \expandafter\expandafter\expandafter\@for + \expandafter\expandafter\expandafter\@tempa + \expandafter\expandafter\expandafter:% + \expandafter\expandafter\expandafter=% + \csname tocstyle@commandlist@#1\endcsname + \do{% + \expandafter\let\csname \@tempa\endcsname\relax + }% + \expandafter\let\csname tocstyle@commandlist@#1\endcsname\relax + \fi + \@usetocstyle{#2}% + \let\settocfeature\@settocfeature + \let\settocstylefeature\@settocstylefeature + }% +} +\newcommand*{\@usetocstyle}[1]{% + \csname tocstyle@style@#1\endcsname +} +\newcommand*{\tocstyle@featurelist}{% + pagenumberhook,entryhook,dothook,entryvskip,leaders,raggedhook,% + spaceafternumber,parfillskip,pagenumberbox,% +} +\newcommand*{\tocstyle@feature@pagenumberhook}{} +\let\tocstyle@feature@pagenumberhook\relax +\newcommand*{\tocstyle@feature@pagenumberbox}{} +\let\tocstyle@feature@pagenumberbox\relax +\newcommand*{\tocstye@feature@entryhook}{} +\let\tocstyle@feature@entryhook\relax +\newcommand*{\tocstye@feature@dothook}{} +\let\tocstyle@feature@dothook\relax +\newcommand*{\tocstye@feature@entryvskip}{} +\let\tocstyle@feature@entryvskip\relax +\newcommand*{\tocstye@feature@leaders}{} +\let\tocstyle@feature@leaders\relax +\newcommand*{\tocstye@feature@parfillskip}{} +\let\tocstyle@feature@parfillskip\relax +\newcommand*{\tocstye@feature@raggedhook}{} +\let\tocstyle@feature@raggedhook\relax +\newcommand*{\tocstye@feature@spaceafternumber}{} +\let\tocstyle@feature@spaceafternumber\relax +\newcommand*{\iftochasdepth}[2]{% + \begingroup + \expandafter\let\expandafter\@tempa\csname tocstyle@depthlist@#1\endcsname + \ifx\@tempa\relax + \aftergroup\@secondoftwo + \else + \@expandtwoargs\in@{,#2,}{,\@tempa}% + \expandafter\aftergroup\ifin@ + \@firstoftwo + \else + \@secondoftwo + \fi + \fi + \endgroup +} +\newtocstyle{standard}{% + \settocfeature{dothook}{\normalfont}% + \settocfeature[-1]{entryhook}{\bfseries}% + \settocfeature[-1]{entryvskip}{2.25em\@plus\p@}% + \settocfeature[-1]{leaders}{\hfill}% + \settocfeature[0]{entryvskip}{1em\@plus\p@}% + \settocfeature[0]{leaders}{\hfill}% + \settocfeature[0]{entryhook}{% + \begingroup + \edef\@tempa{toc}% + \ifx\tocstyleAliasTOC\@tempa\aftergroup\bfseries\fi + \endgroup + }% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname l@chapter\endcsname\relax + \settocfeature[1]{entryvskip}{1em\@plus\p@}% + \settocfeature[1]{leaders}{\hfill}% + \settocfeature[1]{entryhook}{% + \begingroup + \edef\@tempa{toc}% + \ifx\tocstyleAliasTOC\@tempa\aftergroup\bfseries\fi + \endgroup + }% + \fi +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname sectfont\endcsname\relax + \newtocstyle{KOMAScript}{% + \settocfeature{dothook}{\normalfont}% + \settocfeature[-1]{entryhook}{\sffamily\bfseries}% + \settocfeature[-1]{entryvskip}{2.25em\@plus\p@}% + \settocfeature[0]{entryvskip}{1em\@plus\p@}% + \settocfeature[0]{leaders}{\hfill}% + \settocfeature[0]{entryhook}{% + \begingroup + \edef\@tempa{toc}% + \ifx\tocstyleAliasTOC\@tempa\aftergroup\sffamily\bfseries\fi + \endgroup + }% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname l@chapter\endcsname\relax + \settocfeature[1]{entryvskip}{1em\@plus\p@}% + \settocfeature[1]{leaders}{\hfill}% + \settocfeature[1]{entryhook}{% + \begingroup + \edef\@tempa{toc}% + \ifx\tocstyleAliasTOC\@tempa\aftergroup\sffamily\bfseries\fi + \endgroup + }% + \fi + } +\else + \newtocstyle{KOMAScript}{% + \settocfeature{dothook}{\normalfont}% + \settocfeature[-1]{entryhook}{\sectfont}% + \settocfeature[-1]{entryvskip}{2.25em\@plus\p@}% + \settocfeature[0]{entryvskip}{1em\@plus\p@}% + \settocfeature[0]{leaders}{\hfill}% + \settocfeature[0]{entryhook}{% + \begingroup + \edef\@tempa{toc}% + \ifx\tocstyleAliasTOC\@tempa\aftergroup\sectfont\fi + \endgroup + }% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname l@chapter\endcsname\relax + \settocfeature[1]{entryvskip}{1em\@plus\p@}% + \settocfeature[1]{leaders}{\hfill}% + \settocfeature[1]{entryhook}{% + \begingroup + \edef\@tempa{toc}% + \ifx\tocstyleAliasTOC\@tempa\aftergroup\sectfont\fi + \endgroup + }% + \fi + } +\fi +\newtocstyle[KOMAScript]{classic}{% + \settocfeature{pagenumberhook}{\normalfont\normalcolor}% + \settocfeature{raggedhook}{\raggedright}% +} +\newtocstyle[classic][leaders]{allwithdot}{} +\newtocstyle[allwithdot]{noonewithdot}{% + \settocfeature{leaders}{\hfill}% +} +\newtocstyle[classic][leaders]{nopagecolumn}{% + \settocfeature{leaders}{\quad}% + \settocfeature{parfillskip}{\z@ plus 1fil}% + \settocfeature{pagenumberbox}{\hbox}% +} +\InputIfFileExists{tocstyle.cfg}{% + \PackageInfo{tocstyle}{using tocstyle.cfg}% +}{% + \PackageInfo{tocstyle}{no tocstyle.cfg found}% +} +%%% From File: scrlogo.dtx +\@ifundefined{KOMAScript}{% + \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% + M\kern.05em A\kern.1em-\kern.1em Script}}}{} +\endinput +%% +%% End of file `tocstyle.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 3a3018a8ab0..eb193344299 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2007/10/12 v2.97d KOMA-Script}% + \@CheckKOMAScriptVersion{2007/12/24 v2.98 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -162,6 +162,11 @@ } \multiply\paperwidth by186468 \multiply\paperheight by186468 + \if@landscape + \setlength{\@tempdima}{\paperwidth}% + \setlength{\paperwidth}{\paperheight}% + \setlength{\paperheight}{\@tempdima}% + \fi } \newcommand*{\iso@paper}[1]{\expandafter\iso@@paper#1\@nil} \newcommand*{\iso@@paper}{} @@ -374,20 +379,35 @@ \fi }{% \ifstr{#1}{letter}{% - \setlength\paperheight{11in}% - \setlength\paperwidth {8.5in}% + \if@landscape + \setlength\paperheight{8.5in}% + \setlength\paperwidth {11in}% + \else + \setlength\paperheight{11in}% + \setlength\paperwidth {8.5in}% + \fi }{% \ifstr{#1}{legal}{% - \setlength\paperheight{14in}% - \setlength\paperwidth {8.5in}% + \if@landscape + \setlength\paperheight{8.5in}% + \setlength\paperwidth {14in}% + \else + \setlength\paperheight{14in}% + \setlength\paperwidth {8.5in}% + \fi }{% \ifstr{#1}{executive}{% - \setlength\paperheight{10.5in}% - \setlength\paperwidth {7.25in}% + \if@landscape + \setlength\paperheight{7.25in}% + \setlength\paperwidth {10.5in}% + \else + \setlength\paperheight{10.5in}% + \setlength\paperwidth {7.25in}% + \fi }{% \iso@paper{#1}% \if@tempswa\else - \expandafter\maybe@pair#1\scr@next + \expandafter\maybe@pair#1::\@nil \if@tempswa \setlength\paperheight{\@tempa}% \setlength\paperwidth{\@tempb}% @@ -395,28 +415,24 @@ \KOMA@unknown@keyval{paper}{#1}{% `letter', `legal', `executive', `a'<nr>, `b'<nr>, `c'<nr>, `d'<nr>,\MessageBreak - `('<width>`,'<height>`)', `landscape' and `portrait'% + <width>`:'<height>, `landscape' and `portrait'% }% \fi \fi }% }% }% - \if@landscape - \setlength{\@tempdima}{\paperwidth}% - \setlength{\paperwidth}{\paperheight}% - \setlength{\paperheight}{\@tempdima}% - \fi }% }% } \newif\if@landscape -\newcommand*{\maybe@pair}{% - \@ifnextchar (% - {\@tempswatrue\maybe@@pair}{\@tempswafalse\gobble@till@scr@next}% +\newcommand*{\maybe@pair}{} +\def\maybe@pair#1:#2:#3\@nil{% + \edef\@tempa{#1}\edef\@tempb{#2}% + \ifx\@tempa\@empty\@tempswafalse\else + \ifx\@tempb\@empty\@tempswafalse\else\@tempswatrue\fi + \fi } -\newcommand*{\maybe@@pair}{} -\def\@maybepair(#1,#2)\scr@next{\def\@tempa{#1}\def\@tempb{#2}}% \DeclareOption*{% \x@paper} \InputIfFileExists{typearea.cfg}{% @@ -432,7 +448,7 @@ \else \KOMAExecuteOptions{twoside=false} \fi -\KOMAProcessOptions +\KOMAProcessOptions\relax \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} \newlength{\ta@hblk} |