summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-10-11 23:46:49 +0000
committerKarl Berry <karl@freefriends.org>2007-10-11 23:46:49 +0000
commit82dc50c595ce8268fd46c4af7ce77bf20af120d0 (patch)
tree6c051b86aedada971bc69a4cd18495683df13e8b /Master/texmf-dist/tex/latex
parentbc91a8ed9ae14ad4f0805df6c244b55063d69414 (diff)
koma-script 2.97c (10oct07)
git-svn-id: svn://tug.org/texlive/trunk@5160 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco5
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco5
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco5
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco5
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco5
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls754
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls772
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty313
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls859
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage.sty227
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty491
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls766
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty27
13 files changed, 2130 insertions, 2104 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 9fc8fba3dcd..70b8467a7fc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -6,7 +6,6 @@
%%
%% scrklco.dtx (with options: `lco,DIN,head')
%% scrklco.dtx (with options: `lco,DIN,body')
-%% scrlogo.dtx (with options: `logo')
%%
%% Copyright (c) 1994-2007
%% Markus Kohm and any individual authors listed elsewhere in this file.
@@ -103,10 +102,6 @@
\@setplength{sigindent}{0mm}
\@setplength{sigbeforevskip}{2\baselineskip}
\let\raggedsignature=\centering
-%%% 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 `DIN.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index c64957bd552..802f5a90a86 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -6,7 +6,6 @@
%%
%% scrklco.dtx (with options: `lco,DINmoretext,head')
%% scrklco.dtx (with options: `lco,DINmoretext,body')
-%% scrlogo.dtx (with options: `logo')
%%
%% Copyright (c) 1994-2007
%% Markus Kohm and any individual authors listed elsewhere in this file.
@@ -119,10 +118,6 @@
}%
}%
}
-%%% 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 `DINmtext.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index 62495cce7d9..446b9cd0184 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -7,7 +7,6 @@
%% scrklco.dtx (with options: `lco,KOMAold,head')
%% scrklco.dtx (with options: `lco,KOMAold,body')
%% scrknpap.dtx (with options: `lco,KOMAold,body')
-%% scrlogo.dtx (with options: `logo')
%%
%% Copyright (c) 1994-2007
%% Markus Kohm and any individual authors listed elsewhere in this file.
@@ -165,10 +164,6 @@
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
%%% From File: scrknpap.dtx
\def\setpresigskip{\@setplength{sigbeforevskip}}
-%%% 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 `KOMAold.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index 3aee13c41b8..1a43f091306 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -6,7 +6,6 @@
%%
%% scrklco.dtx (with options: `lco,SN,head')
%% scrklco.dtx (with options: `lco,SN,body')
-%% scrlogo.dtx (with options: `logo')
%%
%% Copyright (c) 1994-2007
%% Markus Kohm and any individual authors listed elsewhere in this file.
@@ -103,10 +102,6 @@
\@setplength{sigindent}{0mm}
\@setplength{sigbeforevskip}{2\baselineskip}
\let\raggedsignature=\centering
-%%% 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 `SN.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index 5467ac27ef7..2e506ffa65a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -6,7 +6,6 @@
%%
%% scrklco.dtx (with options: `lco,SwissLeft,head')
%% scrklco.dtx (with options: `lco,SwissLeft,body')
-%% scrlogo.dtx (with options: `logo')
%%
%% Copyright (c) 1994-2007
%% Markus Kohm and any individual authors listed elsewhere in this file.
@@ -103,10 +102,6 @@
\@setplength{sigindent}{0mm}
\@setplength{sigbeforevskip}{2\baselineskip}
\let\raggedsignature=\centering
-%%% 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 `SNleft.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 99cf49dfe6f..c80f5fb7b79 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/03/07 v2.97a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrartcl%
@@ -107,7 +107,7 @@
%%% From File: scrkcomp.dtx
\newcommand*{\scr@compatibility}{0}
\KOMA@key{version}[last]{%
- \scr@ifundefined{scr@v@#1}{%
+ \scr@ifundefinedorrelax{scr@v@#1}{%
\def\scr@compatibility{0}%
\ClassWarningNoLine{\KOMAClassName}{%
You have set option `version' to value `#1', but\MessageBreak
@@ -139,6 +139,8 @@
\@namedef{scr@v@2.96a}{3}
\@namedef{scr@v@2.97}{3}
\@namedef{scr@v@2.97a}{3}
+\@namedef{scr@v@2.97b}{3}
+\@namedef{scr@v@2.97c}{3}
\@namedef{scr@v@last}{3}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -164,12 +166,12 @@
\def\@pt@@scan #1pt#2\@pt@@scan{%
\ifstr{#2}{pt}{%
\ifnumber{#1}{%
- \KOMA@UseObsolete{option}{\PackageInfo}{#1#2}{fontsize=#1#2}%
+ \KOMA@UseObsoleteOption{\PackageInfo}{#1#2}{fontsize=#1#2}%
}{\@headlines}%
}{\@headlines}%
}
\KOMA@key{fontsize}{%
- \scr@ifundefined{changefontsizes}{%
+ \scr@ifundefinedorrelax{changefontsizes}{%
\@defaultunits\@tempdima#1pt\relax\@nnil
\edef\@ptsize{#1}%
}{%
@@ -234,31 +236,8 @@
\newcommand*{\scr@pti@nerr@r}{
\OptionNotUsed
}
-\KOMA@key{headlines}{%
- \PassOptionsToPackage{headlines=#1}{typearea}%
-}
-\KOMA@key{headinclude}[true]{\PassOptionsToPackage{headinclude=#1}{typearea}}
-\KOMA@key{footinclude}[true]{\PassOptionsToPackage{footinclude=#1}{typearea}}
-\KOMA@key{mpinclude}[true]{\PassOptionsToPackage{mpinclude=#1}{typearea}}
-\KOMA@key{BCOR}{%
- \PassOptionsToPackage{BCOR=#1}{typearea}%
-}
-\KOMA@key{DIV}[calc]{%
- \PassOptionsToPackage{DIV=#1}{typearea}%
-}
-\KOMA@key{twoside}[true]{%
- \KOMA@set@ifkey{twoside}{@twoside}{#1}%
- \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi%
-}
-\KOMA@key{twocolumn}[true]{%
- \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
-}
-\KOMA@key{pagesize}[auto]{%
- \PassOptionsToPackage{pagesize=#1}{typearea}%
-}
-\KOMA@key{paper}{%
- \PassOptionsToPackage{paper=#1}{typearea}%
-}
+\DeclareOption*{%
+ \x@paper}
%%% From File: scrkpar.dtx
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -500,9 +479,7 @@
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
\@ifpackageloaded{typearea}{%
\KOMAoptions{headinclude=#1}%
- }{%
- \PassOptionsToPackage{headinclude=#1}{typearea}%
- }%
+ }{}%
}
\KOMA@DeclareObsoleteOption[\PackageInfo]{headnosepline}{headsepline=false}
\newif\if@fsl
@@ -510,11 +487,10 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\@ifpackageloaded{typearea}{%
\KOMAoptions{footinclude=#1}%
- }{%
- \PassOptionsToPackage{footinclude=#1}{typearea}%
- }%
+ }{}%
}
\KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false}
+\@twosidefalse
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -647,244 +623,253 @@
}
%%% From File: scrklist.dtx
%%% From File: scrkmisc.dtx
-\DeclareKeyValOption[%
- \let\scr@pti@nerr@r
- \OptionNotUsed
- \x@paper
-]{KOMA}
-\KOMAoptions{%
- draft=false,headsepline=false,footsepline=false,parskip=false%
- ,twoside=false%
-}
-\ProcessOptions\relax
+\KOMAExecuteOptions{%
+ parskip=false%
+}
+\KOMAProcessOptions\relax
%%% From File: scrkcomp.dtx
%%% From File: scrkfont.dtx
\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
\ClassWarning{\KOMAClassName}{%
Using fallback calculation to setup font sizes\MessageBreak
for basic size `#2'}%
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \setlength{\@tempdimc}{\@tempdima}%
- \addtolength{\@tempdimc}{-10\p@}%
- \edef\@ptsize{\strip@pt\@tempdimc}%
- \@defaultunits\@tempdimb#1pt\relax\@nnil
- \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
- \edef\@tempb{\the\@tempdimc}%
- \setlength{\@tempdimc}{\@tempdima}%
- \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
- \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\normalsize{%
- \noexpand\@setfontsize\noexpand\normalsize
+ \scr@ifundefinedorrelax{dimexpr}{%
+ \ClassError{\KOMAClassName}{%
+ feature only allowed using e-TeX%
+ }{%
+ The fallback calculation to setup font sizes was implemented
+ using e-TeX.\MessageBreak
+ You should not continue, because the fallback calculation would fail%
+ }
+ }{%
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \setlength{\@tempdimc}{\@tempdima}%
+ \addtolength{\@tempdimc}{-10\p@}%
+ \edef\@ptsize{\strip@pt\@tempdimc}%
+ \@defaultunits\@tempdimb#1pt\relax\@nnil
+ \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+ \edef\@tempb{\the\@tempdimc}%
+ \setlength{\@tempdimc}{\@tempdima}%
+ \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
+ \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\normalsize{%
+ \noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listI
- }%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\small{%
- \noexpand\@setfontsize\noexpand\small
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listI
+ }%
+ \setlength{\@tempdima}{0.9125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\small{%
+ \noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\footnotesize{%
- \noexpand\@setfontsize\noexpand\footnotesize
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{.83334\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\footnotesize{%
+ \noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
- \noexpand\@setfontsize\noexpand\scriptsize
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{.66667\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsize{%
+ \noexpand\@setfontsize\noexpand\scriptsize
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
- \noexpand\@setfontsize\noexpand\tiny
+ }%
+ \setlength{\@tempdima}{.5\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tiny{%
+ \noexpand\@setfontsize\noexpand\tiny
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
- \noexpand\@setfontsize\noexpand\large
+ }%
+ \setlength{\@tempdima}{1.2\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\large{%
+ \noexpand\@setfontsize\noexpand\large
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
- \noexpand\@setfontsize\noexpand\Large
+ }%
+ \setlength{\@tempdima}{1.44\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Large{%
+ \noexpand\@setfontsize\noexpand\Large
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
- \noexpand\@setfontsize\noexpand\LARGE
+ }%
+ \setlength{\@tempdima}{1.728\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\LARGE{%
+ \noexpand\@setfontsize\noexpand\LARGE
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
+ }%
+ \setlength{\@tempdima}{2.074\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\huge{%
+ \noexpand\@setfontsize\noexpand\huge
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
+ }%
+ \setlength{\@tempdima}{2.488\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Huge{%
+ \noexpand\@setfontsize\noexpand\Huge
{\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \let\@listI\@listi
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@small{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@footnotesize{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listii\endcsname
+ \endgroup
+ \edef\@listii{\leftmargin\leftmarginii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiii\endcsname
+ \endgroup
+ \edef\@listiii{\leftmargin\leftmarginiii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \z@
+ \partopsep \the\parsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \def\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \def\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \def\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
}%
- \normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@small{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@footnotesize{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listii\endcsname
- \endgroup
- \edef\@listii{\leftmargin\leftmarginii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiii\endcsname
- \endgroup
- \edef\@listiii{\leftmargin\leftmarginiii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \z@
- \partopsep \the\parsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \def\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \def\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \def\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
}
\providecommand*{\@fontsizefilebase}{scrsize}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -950,20 +935,6 @@
}%
}%
}
-\scr@ifundefined{unexpanded}{%
- \newcommand*{\g@addto@macro@temp}{}%
- \newcommand{\l@addto@macro}[2]{%
- \begingroup%
- \toks@\expandafter{#1#2}%
- \xdef\g@addto@macro@temp{\the\toks@}%
- \endgroup
- \let#1\g@addto@macro@temp
- }%
-}{%
- \newcommand{\l@addto@macro}[2]{%
- \edef#1{\unexpanded\expandafter{#1#2}}%
- }%
-}
\newcommand*{\addtokomafont}[2]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{%
@@ -1279,6 +1250,8 @@
\newcommand{\titlehead}[1]{\gdef\@titlehead{#1}}
\newcommand*{\@subject}{}
\newcommand*{\subject}[1]{\gdef\@subject{#1}}
+\newcommand*{\subtitle}[1]{\gdef\@subtitle{#1}}
+\newcommand*{\@subtitle}{}
\newcommand*{\@publishers}{}
\newcommand{\publishers}[1]{\gdef\@publishers{#1}}
\newcommand*{\@uppertitleback}{}
@@ -1299,7 +1272,7 @@
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tpage\cleardoublepage
+ \noindent\@extratitle\next@tpage\cleardoubleemptypage
\thispagestyle{empty}%
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -1315,7 +1288,9 @@
\vskip 3em
\fi
{\titlefont\huge \@title\par}%
- \vskip 3em
+ \vskip 1em
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ \vskip 2em
{\Large \lineskip 0.75em
\begin{tabular}[t]{c}
\@author
@@ -1342,7 +1317,7 @@
\next@tpage\null\vfill
{\centering \Large \@dedication \par}%
\vskip \z@ \@plus3fill
- \if@twoside \next@tpage\cleardoublepage \fi
+ \if@twoside \next@tpage\cleardoubleemptypage \fi
\fi
\end{titlepage}
\setcounter{footnote}{0}%
@@ -1352,6 +1327,7 @@
\global\let\@author\@empty
\global\let\@date\@empty
\global\let\@title\@empty
+ \global\let\@subtitle\@empty
\global\let\@extratitle\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
@@ -1405,6 +1381,7 @@
\global\let\@author\@empty
\global\let\@date\@empty
\global\let\@title\@empty
+ \global\let\@subtitle\@empty
\global\let\@extratitle\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
@@ -1445,7 +1422,9 @@
\vskip 1.5em
\fi
{\titlefont\huge \@title \par}%
- \vskip 1.5em%
+ \vskip .5em
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ \vskip 1em
{\Large
\lineskip .5em%
\begin{tabular}[t]{c}
@@ -1466,6 +1445,7 @@
}
\newcommand*\titlefont{\sectfont}
\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}
+\newkomafont{subtitle}{\usekomafont{title}\large}
\newcommand*{\scr@fnt@title}{\titlefont}
\newcommand*{\scr@fnt@subject}{\subject@font}
\if@titlepage
@@ -1654,14 +1634,14 @@
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@
plus 1fil}\fi
- \raggedsection\normalfont\sectfont\size@section}%
+ \raggedsection\normalfont\sectfont\nobreak\size@section}%
}
\newcommand\subsection{\@startsection{subsection}{2}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@
plus 1fil}\fi
- \raggedsection\normalfont\sectfont\size@subsection
+ \raggedsection\normalfont\sectfont\nobreak\size@subsection
}%
}
\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
@@ -1669,25 +1649,25 @@
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@
plus 1fil}\fi
- \raggedsection\normalfont\sectfont\size@subsubsection
+ \raggedsection\normalfont\sectfont\nobreak\size@subsubsection
}%
}
\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
- {\raggedsection\normalfont\sectfont\size@paragraph}%
+ {\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
- {\raggedsection\normalfont\sectfont\size@subparagraph}%
+ {\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
}
\newkomafont{minisec}{}
\newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex
{\parindent \z@
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont
+ \raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}#1\par\nobreak}\nobreak%
\@afterheading
}
@@ -1696,6 +1676,10 @@
\newcommand*{\raggedpart}{}
\let\raggedpart\raggedsection
\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
+\newkomafont{partentry}{\usekomafont{sectioning}\large}
+\newkomafont{partentrypagenumber}{}
+\newkomafont{sectionentry}{\usekomafont{sectioning}}
+\newkomafont{sectionentrypagenumber}{}
\newcommand*{\size@part}{}
\newcommand*{\size@partnumber}{}
\newcommand*{\size@section}{}
@@ -1713,7 +1697,7 @@
\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
\aliaskomafont{sectioning}{disposition}
\newcommand*\l@part[2]{%
- \ifnum \c@tocdepth >-2\relax
+ \ifnum \c@tocdepth >\m@ne\relax
\addpenalty{\@secpenalty}%
\addvspace{2.25em \@plus\p@}%
\setlength{\@tempdima}{2em}%
@@ -1725,10 +1709,12 @@
\begingroup
\parindent \z@ \rightskip \@pnumwidth
\parfillskip -\@pnumwidth
- \leavevmode\sectfont\large
+ \leavevmode
\advance\leftskip\@tempdima
\hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \usekomafont{partentry}{#1\nobreak
+ \usekomafont{partentrypagenumber}{\hfil\nobreak
+ \hb@xt@\@pnumwidth{\hss#2}}}\par
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}
\endgroup
\penalty20010
@@ -1756,18 +1742,23 @@
\fi
\fi
\begingroup
- \parindent \z@ \rightskip \@pnumwidth
+ \raggedsectionentry
+ \parindent \z@ \advance\rightskip \@pnumwidth
\parfillskip -\@pnumwidth
- \leavevmode \sectfont
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par\nobreak
+ \interlinepenalty\@M
+ \leavevmode
+ \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+ \usekomafont{sectionentry}{#1\nobreak
+ \usekomafont{sectionentrypagenumber}{%
+ \hfill\nobreak
+ \hb@xt@\@pnumwidth{\hss#2}}}\par
\endgroup
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}
\penalty20008
\fi
\fi
}
+\newcommand*{\raggedsectionentry}{}
\newcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{2.3em}}
\newcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{3.2em}}
\newcommand*\l@paragraph{\bprot@dottedtocline{4}{7.0em}{4.1em}}
@@ -1877,114 +1868,77 @@
\aliaskomafont{pagination}{pagenumber}
\newcommand*{\scr@fnt@pagehead}{\headfont}
\newcommand*{\scr@fnt@wrn@pagehead}[1]{%
- font selection of elements `pagehead' and `pagefoot'\MessageBreak
- changed, because they are same%
+ `pagehead' and `pagefoot' are aliases for the same^^b8\MessageBreak
+ font element, changed%
}
\aliaskomafont{pagefoot}{pagehead}
\newcommand*{\pagemark}{{\usekomafont{pagenumber}%
\thepage}}
-\if@twoside
- \renewcommand*{\ps@plain}{%
- \renewcommand*{\@evenhead}{}%
- \renewcommand*{\@oddhead}{}%
- \renewcommand*{\@evenfoot}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark}}}}\hss}%
- }%
- \newcommand*{\ps@headings}{\let\@mkboth\markboth
- \renewcommand*{\@evenhead}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
- \renewcommand*{\@evenfoot}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark}}}}\hss}%
- \renewcommand*{\sectionmark}[1]{%
- \markboth{\ifnum \c@secnumdepth >\z@%
- \sectionmarkformat\fi ##1}{}}%
- \renewcommand*{\subsectionmark}[1]{%
+\renewcommand*{\ps@plain}{%
+ \renewcommand*{\@oddhead}{}%
+ \let\@evenhead\@oddhead
+ \renewcommand*{\@evenfoot}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
+ \renewcommand*{\@oddfoot}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\hfil\pagemark
+ \if@twoside\else\hfil\fi}}}}\hss}%
+}%
+\newcommand*{\ps@headings}{\let\@mkboth\markboth
+ \renewcommand*{\@evenhead}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
+ \renewcommand*{\@oddhead}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark
+ \if@twoside\else\hfil\fi}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
+ \renewcommand*{\@evenfoot}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
+ \renewcommand*{\@oddfoot}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\hfil\pagemark
+ \if@twoside\else\hfil\fi}}}}\hss}%
+ \renewcommand*{\sectionmark}[1]{%
+ \if@twoside\expandafter\markboth\else\expandafter\markright\fi
+ {\ifnum \c@secnumdepth >\z@%
+ \sectionmarkformat\fi ##1}{}}%
+ \renewcommand*{\subsectionmark}[1]{%
+ \if@twoside
\markright{\ifnum \c@secnumdepth >\@ne%
- \subsectionmarkformat\fi ##1}}%
+ \subsectionmarkformat\fi ##1}%
+ \fi
}%
- \newcommand*{\ps@myheadings}{\let\@mkboth\@gobbletwo
- \renewcommand*{\@evenhead}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
- \renewcommand*{\@evenfoot}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark}}}}\hss}%
- \renewcommand*{\subsectionmark}[1]{}%
- \renewcommand*{\sectionmark}[1]{}%
- }
-\else
- \renewcommand*{\ps@plain}{%
- \renewcommand*{\@oddhead}{%
- }%
- \let\@evenhead\@oddhead%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark\hfil}}}}\hss
- }%
- \let\@evenfoot\@oddfoot
- }
- \newcommand*{\ps@headings}{\let\@mkboth\markboth
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark\hfil}}
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss
- }%
- \let\@evenhead\@oddhead
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark\hfil}}}\hss}}%
- \renewcommand*{\subsectionmark}[1]{}%
- \renewcommand*{\sectionmark}[1]{%
- \markright{\ifnum \c@secnumdepth >\z@\sectionmarkformat\fi
- ##1}}%
- \let\@evenfoot\@oddfoot
- }
- \newcommand*{\ps@myheadings}{%
- \let\@mkboth\@gobbletwo
- \renewcommand*{\@evenhead}{}%
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark\hfil}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
- \renewcommand*{\@evenfoot}{}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark\hfil}}}}\hss}%
- \renewcommand*{\subsectionmark}[1]{}%
- \renewcommand*{\sectionmark}[1]{}%
- }
-\fi
+}%
+\newcommand*{\ps@myheadings}{\let\@mkboth\@gobbletwo
+ \renewcommand*{\@evenhead}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
+ \renewcommand*{\@oddhead}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark
+ \if@twoside\else\hfil\fi}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
+ \renewcommand*{\@evenfoot}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
+ \renewcommand*{\@oddfoot}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\hfil\pagemark
+ \if@twoside\else\hfil\fi}}}}\hss}%
+ \renewcommand*{\subsectionmark}[1]{}%
+ \renewcommand*{\sectionmark}[1]{}%
+}
\newcommand*{\titlepagestyle}{plain}
\newcommand*{\partpagestyle}{plain}
\newcommand*{\indexpagestyle}{plain}
@@ -2328,7 +2282,7 @@
\sbox\@tempboxa{%
{\capfont\strut\ignorespaces
#1{{\caplabelfont#2\captionformat}}%
- #3}%
+ #3\unskip\strut}%
}%
\let\@footnotetext=\scr@tmp@footnotetext
\let\scr@tmp@footnotetext=\undefined
@@ -2343,23 +2297,23 @@
\hb@xt@\hsize{%
\setbox\@tempboxa\vbox{\hsize=\cap@width
\ifdofullc@p
- {\capfont\@hangfrom{\strut\ignorespaces
- #1{{\caplabelfont#2\captionformat}}}%
- {#3\par}}%
+ {\capfont\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont#2\captionformat}}}}%
+ {#3\unskip\strut\par}}%
\else%
\ifdim\cap@indent<\z@
{\capfont\strut\ignorespaces
#1{{\caplabelfont #2\captionformat\par}}%
- \noindent\hspace*{-\cap@indent}#3\par}%
+ \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}%
\else%
\if@capbreak
{\capfont\strut\ignorespaces
#1{{\caplabelfont #2\captionformat\par}}%
\noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}%
\else
- {\capfont\@hangfrom{\strut\hspace*{\cap@indent}}%
- {\hspace{-\cap@indent}\ignorespaces#1%
- {{\caplabelfont#2\captionformat}}#3\par}}%
+ {\capfont\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
+ {{\caplabelfont#2\captionformat}}}#3\unskip\strut\par}}%
\fi
\fi
\fi
@@ -2376,8 +2330,8 @@
\else
\global \@minipagefalse
\sbox\@tempboxa{%
- {\capfont\strut\ignorespaces
- #1{{\caplabelfont#2\captionformat}}%
+ {\capfont\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont#2\captionformat}}}%
#3}%
}%
\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 73ad231cc42..3409d50a09c 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/03/07 v2.97a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -107,7 +107,7 @@
%%% From File: scrkcomp.dtx
\newcommand*{\scr@compatibility}{0}
\KOMA@key{version}[last]{%
- \scr@ifundefined{scr@v@#1}{%
+ \scr@ifundefinedorrelax{scr@v@#1}{%
\def\scr@compatibility{0}%
\ClassWarningNoLine{\KOMAClassName}{%
You have set option `version' to value `#1', but\MessageBreak
@@ -139,6 +139,8 @@
\@namedef{scr@v@2.96a}{3}
\@namedef{scr@v@2.97}{3}
\@namedef{scr@v@2.97a}{3}
+\@namedef{scr@v@2.97b}{3}
+\@namedef{scr@v@2.97c}{3}
\@namedef{scr@v@last}{3}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -164,12 +166,12 @@
\def\@pt@@scan #1pt#2\@pt@@scan{%
\ifstr{#2}{pt}{%
\ifnumber{#1}{%
- \KOMA@UseObsolete{option}{\PackageInfo}{#1#2}{fontsize=#1#2}%
+ \KOMA@UseObsoleteOption{\PackageInfo}{#1#2}{fontsize=#1#2}%
}{\@headlines}%
}{\@headlines}%
}
\KOMA@key{fontsize}{%
- \scr@ifundefined{changefontsizes}{%
+ \scr@ifundefinedorrelax{changefontsizes}{%
\@defaultunits\@tempdima#1pt\relax\@nnil
\edef\@ptsize{#1}%
}{%
@@ -234,31 +236,8 @@
\newcommand*{\scr@pti@nerr@r}{
\OptionNotUsed
}
-\KOMA@key{headlines}{%
- \PassOptionsToPackage{headlines=#1}{typearea}%
-}
-\KOMA@key{headinclude}[true]{\PassOptionsToPackage{headinclude=#1}{typearea}}
-\KOMA@key{footinclude}[true]{\PassOptionsToPackage{footinclude=#1}{typearea}}
-\KOMA@key{mpinclude}[true]{\PassOptionsToPackage{mpinclude=#1}{typearea}}
-\KOMA@key{BCOR}{%
- \PassOptionsToPackage{BCOR=#1}{typearea}%
-}
-\KOMA@key{DIV}[calc]{%
- \PassOptionsToPackage{DIV=#1}{typearea}%
-}
-\KOMA@key{twoside}[true]{%
- \KOMA@set@ifkey{twoside}{@twoside}{#1}%
- \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi%
-}
-\KOMA@key{twocolumn}[true]{%
- \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
-}
-\KOMA@key{pagesize}[auto]{%
- \PassOptionsToPackage{pagesize=#1}{typearea}%
-}
-\KOMA@key{paper}{%
- \PassOptionsToPackage{paper=#1}{typearea}%
-}
+\DeclareOption*{%
+ \x@paper}
%%% From File: scrkpar.dtx
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -537,9 +516,7 @@
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
\@ifpackageloaded{typearea}{%
\KOMAoptions{headinclude=#1}%
- }{%
- \PassOptionsToPackage{headinclude=#1}{typearea}%
- }%
+ }{}%
}
\KOMA@DeclareObsoleteOption[\PackageInfo]{headnosepline}{headsepline=false}
\newif\if@fsl
@@ -547,11 +524,10 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\@ifpackageloaded{typearea}{%
\KOMAoptions{footinclude=#1}%
- }{%
- \PassOptionsToPackage{footinclude=#1}{typearea}%
- }%
+ }{}%
}
\KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false}
+\@twosidetrue
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -685,244 +661,253 @@
}
%%% From File: scrklist.dtx
%%% From File: scrkmisc.dtx
-\DeclareKeyValOption[%
- \let\scr@pti@nerr@r
- \OptionNotUsed
- \x@paper
-]{KOMA}
-\KOMAoptions{%
- draft=false,headsepline=false,footsepline=false,parskip=false%
- ,twoside%
-}
-\ProcessOptions\relax
+\KOMAExecuteOptions{%
+ parskip=false%
+}
+\KOMAProcessOptions\relax
%%% From File: scrkcomp.dtx
%%% From File: scrkfont.dtx
\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
\ClassWarning{\KOMAClassName}{%
Using fallback calculation to setup font sizes\MessageBreak
for basic size `#2'}%
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \setlength{\@tempdimc}{\@tempdima}%
- \addtolength{\@tempdimc}{-10\p@}%
- \edef\@ptsize{\strip@pt\@tempdimc}%
- \@defaultunits\@tempdimb#1pt\relax\@nnil
- \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
- \edef\@tempb{\the\@tempdimc}%
- \setlength{\@tempdimc}{\@tempdima}%
- \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
- \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\normalsize{%
- \noexpand\@setfontsize\noexpand\normalsize
+ \scr@ifundefinedorrelax{dimexpr}{%
+ \ClassError{\KOMAClassName}{%
+ feature only allowed using e-TeX%
+ }{%
+ The fallback calculation to setup font sizes was implemented
+ using e-TeX.\MessageBreak
+ You should not continue, because the fallback calculation would fail%
+ }
+ }{%
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \setlength{\@tempdimc}{\@tempdima}%
+ \addtolength{\@tempdimc}{-10\p@}%
+ \edef\@ptsize{\strip@pt\@tempdimc}%
+ \@defaultunits\@tempdimb#1pt\relax\@nnil
+ \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+ \edef\@tempb{\the\@tempdimc}%
+ \setlength{\@tempdimc}{\@tempdima}%
+ \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
+ \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\normalsize{%
+ \noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listI
- }%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\small{%
- \noexpand\@setfontsize\noexpand\small
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listI
+ }%
+ \setlength{\@tempdima}{0.9125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\small{%
+ \noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\footnotesize{%
- \noexpand\@setfontsize\noexpand\footnotesize
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{.83334\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\footnotesize{%
+ \noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
- \noexpand\@setfontsize\noexpand\scriptsize
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{.66667\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsize{%
+ \noexpand\@setfontsize\noexpand\scriptsize
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
- \noexpand\@setfontsize\noexpand\tiny
+ }%
+ \setlength{\@tempdima}{.5\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tiny{%
+ \noexpand\@setfontsize\noexpand\tiny
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
- \noexpand\@setfontsize\noexpand\large
+ }%
+ \setlength{\@tempdima}{1.2\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\large{%
+ \noexpand\@setfontsize\noexpand\large
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
- \noexpand\@setfontsize\noexpand\Large
+ }%
+ \setlength{\@tempdima}{1.44\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Large{%
+ \noexpand\@setfontsize\noexpand\Large
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
- \noexpand\@setfontsize\noexpand\LARGE
+ }%
+ \setlength{\@tempdima}{1.728\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\LARGE{%
+ \noexpand\@setfontsize\noexpand\LARGE
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
+ }%
+ \setlength{\@tempdima}{2.074\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\huge{%
+ \noexpand\@setfontsize\noexpand\huge
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
+ }%
+ \setlength{\@tempdima}{2.488\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Huge{%
+ \noexpand\@setfontsize\noexpand\Huge
{\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \let\@listI\@listi
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@small{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@footnotesize{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listii\endcsname
+ \endgroup
+ \edef\@listii{\leftmargin\leftmarginii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiii\endcsname
+ \endgroup
+ \edef\@listiii{\leftmargin\leftmarginiii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \z@
+ \partopsep \the\parsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \def\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \def\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \def\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
}%
- \normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@small{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@footnotesize{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listii\endcsname
- \endgroup
- \edef\@listii{\leftmargin\leftmarginii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiii\endcsname
- \endgroup
- \edef\@listiii{\leftmargin\leftmarginiii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \z@
- \partopsep \the\parsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \def\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \def\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \def\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
}
\providecommand*{\@fontsizefilebase}{scrsize}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -993,20 +978,6 @@
}%
}%
}
-\scr@ifundefined{unexpanded}{%
- \newcommand*{\g@addto@macro@temp}{}%
- \newcommand{\l@addto@macro}[2]{%
- \begingroup%
- \toks@\expandafter{#1#2}%
- \xdef\g@addto@macro@temp{\the\toks@}%
- \endgroup
- \let#1\g@addto@macro@temp
- }%
-}{%
- \newcommand{\l@addto@macro}[2]{%
- \edef#1{\unexpanded\expandafter{#1#2}}%
- }%
-}
\newcommand*{\addtokomafont}[2]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{%
@@ -1322,6 +1293,8 @@
\newcommand{\titlehead}[1]{\gdef\@titlehead{#1}}
\newcommand*{\@subject}{}
\newcommand*{\subject}[1]{\gdef\@subject{#1}}
+\newcommand*{\subtitle}[1]{\gdef\@subtitle{#1}}
+\newcommand*{\@subtitle}{}
\newcommand*{\@publishers}{}
\newcommand{\publishers}[1]{\gdef\@publishers{#1}}
\newcommand*{\@uppertitleback}{}
@@ -1342,7 +1315,7 @@
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tpage\cleardoublepage
+ \noindent\@extratitle\next@tpage\cleardoubleemptypage
\thispagestyle{empty}%
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -1358,7 +1331,9 @@
\vskip 3em
\fi
{\titlefont\huge \@title\par}%
- \vskip 3em
+ \vskip 1em
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ \vskip 2em
{\Large \lineskip 0.75em
\begin{tabular}[t]{c}
\@author
@@ -1385,7 +1360,7 @@
\next@tpage\null\vfill
{\centering \Large \@dedication \par}%
\vskip \z@ \@plus3fill
- \if@twoside \next@tpage\cleardoublepage \fi
+ \if@twoside \next@tpage\cleardoubleemptypage \fi
\fi
\end{titlepage}
\setcounter{footnote}{0}%
@@ -1395,6 +1370,7 @@
\global\let\@author\@empty
\global\let\@date\@empty
\global\let\@title\@empty
+ \global\let\@subtitle\@empty
\global\let\@extratitle\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
@@ -1448,6 +1424,7 @@
\global\let\@author\@empty
\global\let\@date\@empty
\global\let\@title\@empty
+ \global\let\@subtitle\@empty
\global\let\@extratitle\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
@@ -1488,7 +1465,9 @@
\vskip 1.5em
\fi
{\titlefont\huge \@title \par}%
- \vskip 1.5em%
+ \vskip .5em
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ \vskip 1em
{\Large
\lineskip .5em%
\begin{tabular}[t]{c}
@@ -1509,6 +1488,7 @@
}
\newcommand*\titlefont{\sectfont}
\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}
+\newkomafont{subtitle}{\usekomafont{title}\large}
\newcommand*{\scr@fnt@title}{\titlefont}
\newcommand*{\scr@fnt@subject}{\subject@font}
\newenvironment{titlepage}{%
@@ -1827,7 +1807,7 @@
\newcommand*{\@@makechapterhead}[1]{\chapterheadstartvskip
{%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
- \normalfont\sectfont\size@chapter{}%
+ \normalfont\sectfont\nobreak\size@chapter{}%
\if@chapterprefix
\let\@tempa\raggedsection
\else
@@ -1842,7 +1822,7 @@
\fi
{\chapterformat}%
\if@chapterprefix
- \size@chapterprefix{}\endgraph\nobreak\vskip.5\baselineskip
+ \size@chapterprefix{}\endgraf\nobreak\vskip.5\baselineskip
\fi
\fi
\fi
@@ -1864,7 +1844,7 @@
}
\newcommand*{\@@makeschapterhead}[1]{%
\chapterheadstartvskip%
- {\normalfont\sectfont\size@chapter{}%
+ {\normalfont\sectfont\nobreak\size@chapter{}%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}%
\nobreak\chapterheadendvskip%
@@ -1923,14 +1903,14 @@
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@
plus 1fil}\fi
- \raggedsection\normalfont\sectfont\size@section}%
+ \raggedsection\normalfont\sectfont\nobreak\size@section}%
}
\newcommand\subsection{\@startsection{subsection}{2}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@
plus 1fil}\fi
- \raggedsection\normalfont\sectfont\size@subsection
+ \raggedsection\normalfont\sectfont\nobreak\size@subsection
}%
}
\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
@@ -1938,25 +1918,25 @@
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@
plus 1fil}\fi
- \raggedsection\normalfont\sectfont\size@subsubsection
+ \raggedsection\normalfont\sectfont\nobreak\size@subsubsection
}%
}
\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
- {\raggedsection\normalfont\sectfont\size@paragraph}%
+ {\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
- {\raggedsection\normalfont\sectfont\size@subparagraph}%
+ {\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
}
\newkomafont{minisec}{}
\newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex
{\parindent \z@
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont
+ \raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}#1\par\nobreak}\nobreak%
\@afterheading
}
@@ -1965,6 +1945,10 @@
\newcommand*{\raggedpart}{}
\let\raggedpart\centering
\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
+\newkomafont{partentry}{\usekomafont{sectioning}\large}
+\newkomafont{partentrypagenumber}{}
+\newkomafont{chapterentry}{\usekomafont{sectioning}}
+\newkomafont{chapterentrypagenumber}{}
\newcommand*{\size@part}{}
\newcommand*{\size@partnumber}{}
\newcommand*{\size@chapter}{}
@@ -2110,10 +2094,12 @@
\begingroup
\parindent \z@ \rightskip \@pnumwidth
\parfillskip -\@pnumwidth
- \leavevmode\sectfont\large
+ \leavevmode
\advance\leftskip\@tempdima
\hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \usekomafont{partentry}{#1\nobreak
+ \usekomafont{partentrypagenumber}{\hfil\nobreak
+ \hb@xt@\@pnumwidth{\hss#2}}}\par
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}
\endgroup
\penalty20010
@@ -2136,12 +2122,16 @@
\fi
\fi
\begingroup
- \parindent \z@ \rightskip \@pnumwidth
+ \raggedchapterentry
+ \parindent \z@ \advance\rightskip \@pnumwidth
\parfillskip -\@pnumwidth
- \leavevmode \sectfont
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \interlinepenalty\@M
+ \leavevmode
+ \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+ \usekomafont{chapterentry}{#1\nobreak
+ \usekomafont{chapterentrypagenumber}{%
+ \hfill\nobreak
+ \hb@xt@\@pnumwidth{\hss#2}}}\par
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}
\endgroup
\penalty20009
@@ -2151,6 +2141,7 @@
\fi
\fi
}
+\newcommand*{\raggedchapterentry}{}
\newcommand*{\l@chapteratlist}{\l@chapter}
\newcommand*\l@section{\bprot@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\l@subsection{\bprot@dottedtocline{2}{3.8em}{3.2em}}
@@ -2264,124 +2255,83 @@
\aliaskomafont{pagination}{pagenumber}
\newcommand*{\scr@fnt@pagehead}{\headfont}
\newcommand*{\scr@fnt@wrn@pagehead}[1]{%
- font selection of elements `pagehead' and `pagefoot'\MessageBreak
- changed, because they are same%
+ `pagehead' and `pagefoot' are aliases for the same^^b8\MessageBreak
+ font element, changed%
}
\aliaskomafont{pagefoot}{pagehead}
\newcommand*{\pagemark}{{\usekomafont{pagenumber}%
\thepage}}
-\if@twoside
- \renewcommand*{\ps@plain}{%
- \renewcommand*{\@evenhead}{}%
- \renewcommand*{\@oddhead}{}%
- \renewcommand*{\@evenfoot}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark}}}}\hss}%
- }%
- \newcommand*{\ps@headings}{\let\@mkboth\markboth
- \renewcommand*{\@evenhead}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
- \renewcommand*{\@evenfoot}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark}}}}\hss}%
- \renewcommand*{\chaptermark}[1]{%
- \markboth{\ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \chaptermarkformat
- \fi
+\renewcommand*{\ps@plain}{%
+ \renewcommand*{\@oddhead}{}%
+ \let\@evenhead\@oddhead
+ \renewcommand*{\@evenfoot}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
+ \renewcommand*{\@oddfoot}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\hfil\pagemark
+ \if@twoside\else\hfil\fi}}}}\hss}%
+}%
+\newcommand*{\ps@headings}{\let\@mkboth\markboth
+ \renewcommand*{\@evenhead}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
+ \renewcommand*{\@oddhead}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark
+ \if@twoside\else\hfil\fi}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
+ \renewcommand*{\@evenfoot}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
+ \renewcommand*{\@oddfoot}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\hfil\pagemark
+ \if@twoside\else\hfil\fi}}}}\hss}%
+ \renewcommand*{\chaptermark}[1]{%
+ \if@twoside\expandafter\markboth\else\expandafter\markright\fi
+ {\ifnum \c@secnumdepth >\m@ne
+ \if@mainmatter
+ \chaptermarkformat
\fi
- ##1}{}%
- }%
- \renewcommand*{\sectionmark}[1]{%
+ \fi
+ ##1}{}%
+ }%
+ \renewcommand*{\sectionmark}[1]{%
+ \if@twoside
\markright{\ifnum \c@secnumdepth >\z@
- \sectionmarkformat\fi
- ##1}}%
+ \sectionmarkformat\fi
+ ##1}%
+ \fi
}%
- \newcommand*{\ps@myheadings}{\let\@mkboth\@gobbletwo
- \renewcommand*{\@evenhead}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
- \renewcommand*{\@evenfoot}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark}}}}\hss}%
- \renewcommand*{\chaptermark}[1]{}%
- \renewcommand*{\sectionmark}[1]{}%
- }
-\else
- \renewcommand*{\ps@plain}{%
- \renewcommand*{\@oddhead}{%
- }%
- \let\@evenhead\@oddhead%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark\hfil}}}}\hss
- }%
- \let\@evenfoot\@oddfoot
- }
- \newcommand*{\ps@headings}{\let\@mkboth\markboth
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark\hfil}}
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss
- }%
- \let\@evenhead\@oddhead
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark\hfil}}}\hss}}%
- \renewcommand*{\sectionmark}[1]{}%
- \renewcommand*{\chaptermark}[1]{%
- \markright{\ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \chaptermarkformat
- \fi
- \fi
- ##1}}%
- \let\@evenfoot\@oddfoot
- }
- \newcommand*{\ps@myheadings}{%
- \let\@mkboth\@gobbletwo
- \renewcommand*{\@evenhead}{}%
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark\hfil}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
- \renewcommand*{\@evenfoot}{}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark\hfil}}}}\hss}%
- \renewcommand*{\chaptermark}[1]{}%
- \renewcommand*{\sectionmark}[1]{}%
- }
-\fi
+}%
+\newcommand*{\ps@myheadings}{\let\@mkboth\@gobbletwo
+ \renewcommand*{\@evenhead}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
+ \renewcommand*{\@oddhead}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark
+ \if@twoside\else\hfil\fi}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
+ \renewcommand*{\@evenfoot}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
+ \renewcommand*{\@oddfoot}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\hfil\pagemark
+ \if@twoside\else\hfil\fi}}}}\hss}%
+ \renewcommand*{\chaptermark}[1]{}%
+ \renewcommand*{\sectionmark}[1]{}%
+}
\newcommand*{\titlepagestyle}{plain}
\newcommand*{\partpagestyle}{plain}
\newcommand*{\chapterpagestyle}{plain}
@@ -2726,7 +2676,7 @@
\sbox\@tempboxa{%
{\capfont\strut\ignorespaces
#1{{\caplabelfont#2\captionformat}}%
- #3}%
+ #3\unskip\strut}%
}%
\let\@footnotetext=\scr@tmp@footnotetext
\let\scr@tmp@footnotetext=\undefined
@@ -2741,23 +2691,23 @@
\hb@xt@\hsize{%
\setbox\@tempboxa\vbox{\hsize=\cap@width
\ifdofullc@p
- {\capfont\@hangfrom{\strut\ignorespaces
- #1{{\caplabelfont#2\captionformat}}}%
- {#3\par}}%
+ {\capfont\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont#2\captionformat}}}}%
+ {#3\unskip\strut\par}}%
\else%
\ifdim\cap@indent<\z@
{\capfont\strut\ignorespaces
#1{{\caplabelfont #2\captionformat\par}}%
- \noindent\hspace*{-\cap@indent}#3\par}%
+ \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}%
\else%
\if@capbreak
{\capfont\strut\ignorespaces
#1{{\caplabelfont #2\captionformat\par}}%
\noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}%
\else
- {\capfont\@hangfrom{\strut\hspace*{\cap@indent}}%
- {\hspace{-\cap@indent}\ignorespaces#1%
- {{\caplabelfont#2\captionformat}}#3\par}}%
+ {\capfont\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
+ {{\caplabelfont#2\captionformat}}}#3\unskip\strut\par}}%
\fi
\fi
\fi
@@ -2774,8 +2724,8 @@
\else
\global \@minipagefalse
\sbox\@tempboxa{%
- {\capfont\strut\ignorespaces
- #1{{\caplabelfont#2\captionformat}}%
+ {\capfont\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont#2\captionformat}}}%
#3}%
}%
\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 5ee1baa8120..84b9cb5280e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -62,23 +62,15 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2007/03/07 v2.97a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{scrkbase}[%
\KOMAScriptVersion\space package (basics and keyval use)]
\RequirePackage{keyval}
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname ifcsname\endcsname
- \newcommand{\scr@ifundefined}[1]{%
- \ifcsname #1\endcsname
- \expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
- \fi
- }
-\else
- \newcommand{\scr@ifundefined}[1]{%
+\expandafter\ifx\csname ifcsname\endcsname\relax
+ \newcommand{\scr@ifundefinedorrelax}[1]{%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname #1\endcsname\relax
\expandafter\@firstoftwo
@@ -86,51 +78,109 @@
\expandafter\@secondoftwo
\fi
}
+\else
+ \newcommand{\scr@ifundefinedorrelax}[1]{%
+ \ifcsname #1\endcsname
+ \expandafter\ifx\csname #1\endcsname\relax
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \else
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \fi
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ }
\fi
-\newcommand*{\DeclareKeyValOption}[2][%
- \ifx\@currext\@clsextension\OptionNotUsed\else\@unkownoptionerror\fi
-]{%
- \DeclareOption*{%
- \def\@tempa##1=##2=##3\@nil{%
- \scr@ifundefined{KV@#2@##1}{#1}{%
- \@expandtwoargs\setkeys{#2}\CurrentOption
+\newcommand*{\KOMA@key}[1][.\@currname.\@currext]{%
+ \edef\reserved@a{\noexpand\in@{KOMA#1,}{\KOMA@key@familylist}}\reserved@a
+ \ifin@\else\xdef\KOMA@key@familylist{\KOMA@key@familylist KOMA#1,}\fi
+ \define@key{KOMA#1}%
+}
+\newcommand*{\KOMA@key@familylist}{}
+\newcommand*{\@globaloptionslist}{}
+\let\@globaloptionslist\@classoptionslist
+\scr@ifundefinedorrelax{XKV@classoptionslist}{}{%
+ \ifx\XKV@classoptionslist\@empty\else
+ \let\@globaloptionslist\XKV@classoptionslist
+ \fi
+}
+\newcommand*{\KOMAProcessOptions}[1][KOMA]{%
+ \let\ds@\@empty
+ \edef\@curroptions{\@ptionlist{\@currname.\@currext}}%
+ \ifx\@currext\@clsextension\else
+ \@for\CurrentOption:=\@globaloptionslist\do{%
+ \ifx\CurrentOption\@empty\else
+ \@expandtwoargs\in@{,\CurrentOption,}{,\@declaredoptions,}%
+ \ifin@
+ \@use@ption
+ \expandafter\let\csname ds@\CurrentOption\endcsname\@empty
+ \else
+ \KOMA@optiontest{#1}\CurrentOption{}{%
+ \@use@ption
+ \@expandtwoargs\setkeys{#1}%
+ \CurrentOption
+ }%
+ \KOMA@optiontest{#1.\@currname.\@currext}\CurrentOption{}{%
+ \@use@ption
+ \@expandtwoargs\setkeys{#1.\@currname.\@currext}%
+ \CurrentOption
+ }%
+ \fi
+ \fi
+ }%
+ \fi
+ \@for\CurrentOption:=\@curroptions\do{%
+ \@use@ption
+ \scr@ifundefinedorrelax{ds@\CurrentOption}{%
+ \KOMA@optiontest{#1}\CurrentOption{%
+ \KOMA@optiontest{#1.\@currname.\@currext}\CurrentOption{%
+ \default@ds
+ }{%
+ \let\scr@sr@co\CurrentOption
+ \@expandtwoargs\setkeys{#1.\@currname.\@currext}%
+ \CurrentOption
+ \let\CurrentOption\scr@sr@co
+ }%
+ }{%
+ \@expandtwoargs\setkeys{#1}%
+ \CurrentOption
+ \KOMA@optiontest{#1.\@currname.\@currext}\CurrentOption{}{%
+ \@expandtwoargs\setkeys{#1.\@currname.\@currext}%
+ \CurrentOption
+ }%
}%
+ }{%
}%
- \expandafter\@tempa\CurrentOption==\@nil
}%
+ \@for\CurrentOption:=\@declaredoptions\do{%
+ \expandafter\let\csname ds@\CurrentOption\endcsname\relax}%
+ \let\CurrentOption\@empty
+ \let\@fileswith@pti@ns\@@fileswith@pti@ns
+ \AtEndOfPackage{\let\@unprocessedoptions\relax}%
}
-\newcommand*{\KOMA@key}{\define@key{KOMA}}
-\newcommand*{\dont@let@as@internal@defined}{/}
-\KOMA@key{internalonly}{%
- \begingroup
- \@expandtwoargs\in@{#1}\dont@let@as@internal@defined
- \expandafter\endgroup
- \ifin@\else\g@addto@macro\dont@let@as@internal@defined{#1/}\fi
+\@onlypreamble\KOMA@process@options
+\@onlypreamble\KOMAProcessOptions
+\newcommand*{\KOMA@optiontest}[2]{%
+ \edef\reserved@a{\noexpand\KOMA@pti@ntest{#1}#2=\noexpand\@nil}%
+ \reserved@a
}
-\DeclareKeyValOption{KOMA}
-\ProcessOptions\relax
-\newcommand*{\@globaloptionslist}{}
-\scr@ifundefined{XKV@classooptionslist}{%
- \let\@globaloptionslist\@classoptionslist
-}{%
- \let\@globaloptionslist\XKV@classoptionslist
+\newcommand*{\KOMA@pti@ntest}{}
+\def\KOMA@pti@ntest#1#2=#3\@nil{\scr@ifundefinedorrelax{KV@#1@#2}}
+\newcommand*{\scr@sr@co}{}
+\newcommand*{\dont@let@as@internal@defined}{/}
+\newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse
+\KOMA@key{internalonly}[\relax]{%
+ \ifx\relax#1\relax
+ \@let@as@internalonly@definedtrue
+ \else
+ \@let@as@internalonly@definedfalse
+ \begingroup
+ \@expandtwoargs\in@{#1}\dont@let@as@internal@defined
+ \expandafter\endgroup
+ \ifin@\else\g@addto@macro\dont@let@as@internal@defined{#1/}\fi
+ \fi
}
-\@expandtwoargs\in@{,internalonly=}{,\@globaloptionslist}
-\ifin@
- \begingroup
- \catcode`\=12\catcode`\:=12
- \def\@do@internalonly #1internalonly=#2\@nil{%
- \ifx\relax#1\relax\setkeys{KOMA}{internalonly=#2}\fi
- \@expandtwoargs\@removeelement{internalonly=#2}\@unusedoptionlist
- \@unusedoptionlist
- }%
- \expandafter\@for\expandafter\@tempa\expandafter:\expandafter=%
- \@globaloptionslist\do{%
- \expandafter\@do@internalonly\@tempa\@nil
- }%
- \global\let\@unusedoptionlist\@unusedoptionlist
- \endgroup
-\fi
+\KOMAProcessOptions\relax
%%% From File: scrlfile.dtx
\def\scrlfileversion{2007/03/07 v2.97a}
\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
@@ -142,7 +192,11 @@
\@onlypreamble\@atdocumentfalse
\newcommand*{\let@as@internal@defined}[1]{%
\begingroup
- \@expandtwoargs\in@{/#1/}\dont@let@as@internal@defined
+ \if@let@as@internalonly@defined
+ \in@true
+ \else
+ \@expandtwoargs\in@{/#1/}\dont@let@as@internal@defined
+ \fi
\expandafter\endgroup
\ifin@
\PackageInfo{%
@@ -192,8 +246,8 @@
}%
\fi
}
-\let@as@internal@defined{ifundefined}
-\scr@ifundefined{ifcsname}{%
+\let@as@internal@defined{ifundefinedorrelax}
+\scr@ifundefinedorrelax{ifcsname}{%
\newcommand{\ifnotundefined}[1]{%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname #1\endcsname\relax
@@ -307,11 +361,11 @@
\let@as@internal@defined{ifpdftex}
\BeforePackage{pdfcprot}{\let\ifpdftex\relax}
\AfterPackage{pdfcprot}{\let@as@internal@defined{ifpdftex}}
-\newcommand{\scr@ifvtex}{\ifnotundefined{VTeXversion}}
-\let@as@internal@defined{ifvtex}
+\newcommand{\scr@ifVTeX}{\ifnotundefined{VTeXversion}}
+\let@as@internal@defined{ifVTeX}
\newcommand{\scr@ifpdfoutput}{%
- \scr@ifundefined{pdfoutput}{%
- \scr@ifundefined{OpMode}{%
+ \scr@ifundefinedorrelax{pdfoutput}{%
+ \scr@ifundefinedorrelax{OpMode}{%
\expandafter\@secondoftwo%
}{%
\ifnum\OpMode=1
@@ -350,8 +404,8 @@
}
\let@as@internal@defined{ifpsoutput}
\newcommand*{\scr@ifdvioutput}{%
- \scr@ifundefined{pdfoutput}{%
- \scr@ifundefined{OpMode}{%
+ \scr@ifundefinedorrelax{pdfoutput}{%
+ \scr@ifundefinedorrelax{OpMode}{%
\expandafter\@firstoftwo
}{%
\ifnum\OpMode=0
@@ -369,11 +423,80 @@
}%
}
\let@as@internal@defined{ifdvioutput}
+\newcommand*{\scr@smashdp}[1]{%
+ \begingroup
+ \def\finsm@sh{\dp\z@\z@\box\z@}%
+ \smash{#1}%
+ \endgroup
+}
+\newcommand*{\KOMAExecuteOptions}[2][KOMA]{%
+ \def\reserved@a##1\@nil{%
+ \@for\KOMA@key@atlist:=#2\do{%
+ \expandafter\KOMA@key@split@name@value\KOMA@key@atlist==\@nil
+ \scr@ifundefinedorrelax{KV@#1@\KOMA@key@name}{}{%
+ \edef\reserved@a{\noexpand\setkeys{#1}{\KOMA@key@atlist}%
+ }%
+ \reserved@a
+ }%
+ \scr@ifundefinedorrelax{KV@#1.\@currname.\@currext @\KOMA@key@name}{}{%
+ \edef\reserved@a{%
+ \noexpand\setkeys{#1.\@currname.\@currext}{\KOMA@key@atlist}%
+ }%
+ \reserved@a
+ }%
+ \let\CurrentOption\KOMA@key@atlist
+ \csname ds@\CurrentOption\endcsname
+ }%
+ \edef\CurrentOption{##1}%
+ }%
+ \expandafter\reserved@a\CurrentOption\@nil
+}
+\@onlypreamble\KOMAExecuteOptions
\newcommand*{\KOMAoptions}[1]{%
\let\post@kopt@hook\@empty
- \setkeys{KOMA}{#1}%
+ \KOMA@options{#1}{%
+ \PackageError{scrkbase}{%
+ unknown KOMA option `\KOMA@key@name'%
+ }{%
+ You have used \string\KOMAoptions\space to set
+ `\KOMA@key@atlist',\MessageBreak
+ but KOMA-Script does not know any option named
+ `\KOMA@key@name'.\MessageBreak
+ See the KOMA-Script manual for more informations about options
+ and\MessageBreak
+ their values.%
+ }%
+ }%
\post@kopt@hook\let\post@kopt@hook\relax
}
+\newcommand*{\KOMA@options}[2]{%
+ \@for\KOMA@key@atlist:=#1\do{%
+ \expandafter\KOMA@key@split@name@value\KOMA@key@atlist==\@nil
+ \KOMA@key@found@false
+ \@for\@tempa:=\KOMA@key@familylist\do{%
+ \scr@ifundefinedorrelax{KV@\@tempa @\KOMA@key@name}{}{%
+ \KOMA@key@found@true
+ \edef\reserved@a{\noexpand\setkeys{\@tempa}{\KOMA@key@atlist}%
+ \noexpand\edef\noexpand\@tempa{\@tempa}%
+ \noexpand\edef\noexpand\KOMA@key@atlist{\KOMA@key@atlist}%
+ \noexpand\edef\noexpand\KOMA@key@name{\KOMA@key@name}%
+ \noexpand\edef\noexpand\KOMA@key@value{\KOMA@key@value}%
+ }%
+ \reserved@a
+ }%
+ }%
+ \ifKOMA@key@found@\else#2\fi
+ }%
+}
+\newif\ifKOMA@key@found@
+\newcommand*{\KOMA@key@atlist}{}
+\newcommand*{\KOMA@key@name}{}
+\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}%
+}
\newcommand*{\post@kopt@hook}{}
\let\post@kopt@hook\relax
\newcommand*{\AfterKOMAoptions}{%
@@ -389,33 +512,20 @@
\fi
\post@kopt@hook
}
-\KOMA@key{nokey}{%
- \PackageError{%
- scrkeyval%
- }{%
- unknown KOMA option `#1'%
- }{%
- You've tried to use the KOMA option `#1'.\MessageBreak
- But there is no KOMA option with that name.\MessageBreak
- See the manual of KOMA-Script for information about known KOMA
- options.%
+\scr@ifundefinedorrelax{unexpanded}{%
+ \newcommand*{\g@addto@macro@temp}{}%
+ \newcommand{\l@addto@macro}[2]{%
+ \begingroup%
+ \toks@\expandafter{#1#2}%
+ \xdef\g@addto@macro@temp{\the\toks@}%
+ \endgroup
+ \let#1\g@addto@macro@temp
}%
-}%
-\KOMA@key{noval}{%
- \PackageError{%
- scrkbase%
- }{%
- KOMA option `#1' needs a value%
- }{%
- You've tried to use the KOMA option `#1' without a
- value.\MessageBreak
- But this option has no default value, so you have to set a
- value.\MessageBreak
- See the manual of KOMA-Script for information about the option and
- all known\MessageBreak
- values.%
+}{%
+ \newcommand{\l@addto@macro}[2]{%
+ \edef#1{\unexpanded\expandafter{#1#2}}%
}%
-}%
+}
\newcommand*{\KOMA@unknown@keyval}[3]{%
\PackageError{%
scrkbase%
@@ -492,26 +602,33 @@
\fi
\@tempa
}
-\newcommand*{\scr@sr@co}{}
\newcommand*{\KOMA@DeclareObsoleteOption}[3][\@gobbletwo]{%
- \DeclareOption{#2}{%
- \let\scr@sr@co\CurrentOption
- \KOMA@UseObsolete{option}{#1}{#2}{#3}%
- \let\CurrentOption\scr@sr@co
+ \DeclareOption{#2}{\KOMA@UseObsoleteOption{#1}{#2}{#3}}%
+}
+\newcommand*{\KOMA@UseObsoleteOption}[3]{%
+ \let\scr@sr@co\CurrentOption
+ #1{scrkbase}{%
+ You've used obsolete option `#2'.\MessageBreak
+ \protect\KOMAExecuteOptions{#3} will be\MessageBreak
+ used instead.\MessageBreak
+ You may simply replace `#2'\MessageBreak
+ by `#3'%
}%
+ \KOMAExecuteOptions{#3}%
+ \let\CurrentOption\scr@sr@co
+}
+\newcommand*{\KOMA@newobsoletecommand}[3][\@gobbletwo]{%
+ \newcommand*{#2}{\KOMA@UseObsoleteCommand{#1}{\string#2}{#3}}%
}
-\newcommand*{\KOMA@UseObsolete}[4]{%
- #2{%
+\newcommand*{\KOMA@UseObsoleteCommand}[3]{%
+ #1{%
scrkbase%
}{%
- You've used the obsolete #1 `#3'.\MessageBreak
- \protect\KOMAoptions{#4} will be used instead.\MessageBreak
- You should do this change too%
+ You've used the obsolete command `#2'.\MessageBreak
+ \protect\KOMAoptions{#3} will be used instead.\MessageBreak
+ You should also replace `#2' by `\protect\KOMAoptions{#3}'%
}%
- \KOMAoptions{#4}%
-}
-\newcommand*{\KOMA@newobsoletecommand}[3][\@gobbletwo]{%
- \newcommand*{#2}{\KOMA@UseObsolete{command}{#1}{\string#2}{#3}}%
+ \KOMAoptions{#3}%
}
%%% From File: scrlogo.dtx
\@ifundefined{KOMAScript}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 5d7e1758a34..6049ff40a0d 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/03/07 v2.97a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -107,7 +107,7 @@
%%% From File: scrkcomp.dtx
\newcommand*{\scr@compatibility}{0}
\KOMA@key{version}[last]{%
- \scr@ifundefined{scr@v@#1}{%
+ \scr@ifundefinedorrelax{scr@v@#1}{%
\def\scr@compatibility{0}%
\ClassWarningNoLine{\KOMAClassName}{%
You have set option `version' to value `#1', but\MessageBreak
@@ -139,6 +139,8 @@
\@namedef{scr@v@2.96a}{3}
\@namedef{scr@v@2.97}{3}
\@namedef{scr@v@2.97a}{3}
+\@namedef{scr@v@2.97b}{3}
+\@namedef{scr@v@2.97c}{3}
\@namedef{scr@v@last}{3}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -153,10 +155,15 @@
%%% From File: scrklco.dtx
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
- \let\scr@pti@nerr@r\@gobble
- \expandafter\AtEndOfClass\expandafter{\expandafter\LoadLetterOption
- \expandafter{\CurrentOption}}%
- }%
+ \expandafter\AtEndOfClass\expandafter{%
+ \expandafter\LoadLetterOption\expandafter{\CurrentOption}%
+ }%
+ \expandafter\def\expandafter\scr@pti@nerr@r\expandafter{%
+ \expandafter\def\expandafter\scr@pti@nerr@r\expandafter{%
+ \scr@pti@nerr@r
+ }%
+ }%
+ }{}%
}
\AtEndOfClass{\LoadLetterOption{DIN}}
%%% From File: scrklang.dtx
@@ -179,12 +186,12 @@
\def\@pt@@scan #1pt#2\@pt@@scan{%
\ifstr{#2}{pt}{%
\ifnumber{#1}{%
- \KOMA@UseObsolete{option}{\PackageInfo}{#1#2}{fontsize=#1#2}%
+ \KOMA@UseObsoleteOption{\PackageInfo}{#1#2}{fontsize=#1#2}%
}{\@headlines}%
}{\@headlines}%
}
\KOMA@key{fontsize}{%
- \scr@ifundefined{changefontsizes}{%
+ \scr@ifundefinedorrelax{changefontsizes}{%
\@defaultunits\@tempdima#1pt\relax\@nnil
\edef\@ptsize{#1}%
}{%
@@ -251,31 +258,9 @@
\newcommand*{\scr@pti@nerr@r}{
\OptionNotUsed
}
-\KOMA@key{headlines}{%
- \PassOptionsToPackage{headlines=#1}{typearea}%
-}
-\KOMA@key{headinclude}[true]{\PassOptionsToPackage{headinclude=#1}{typearea}}
-\KOMA@key{footinclude}[true]{\PassOptionsToPackage{footinclude=#1}{typearea}}
-\KOMA@key{mpinclude}[true]{\PassOptionsToPackage{mpinclude=#1}{typearea}}
-\KOMA@key{BCOR}{%
- \PassOptionsToPackage{BCOR=#1}{typearea}%
-}
-\KOMA@key{DIV}[calc]{%
- \PassOptionsToPackage{DIV=#1}{typearea}%
-}
-\KOMA@key{twoside}[true]{%
- \KOMA@set@ifkey{twoside}{@twoside}{#1}%
- \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi%
-}
-\KOMA@key{twocolumn}[true]{%
- \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
-}
-\KOMA@key{pagesize}[auto]{%
- \PassOptionsToPackage{pagesize=#1}{typearea}%
-}
-\KOMA@key{paper}{%
- \PassOptionsToPackage{paper=#1}{typearea}%
-}
+\DeclareOption*{%
+ \lco@test
+ \x@paper}
%%% From File: scrkpar.dtx
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -395,9 +380,7 @@
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
\@ifpackageloaded{typearea}{%
\KOMAoptions{headinclude=#1}%
- }{%
- \PassOptionsToPackage{headinclude=#1}{typearea}%
- }%
+ }{}%
}
\KOMA@DeclareObsoleteOption[\PackageInfo]{headnosepline}{headsepline=false}
\newif\if@fsl
@@ -405,11 +388,10 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\@ifpackageloaded{typearea}{%
\KOMAoptions{footinclude=#1}%
- }{%
- \PassOptionsToPackage{footinclude=#1}{typearea}%
- }%
+ }{}%
}
\KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false}
+\@twosidefalse
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -503,10 +485,10 @@
\KOMA@set@ncmdkey{locfield}{@tempa}{{wide}{0},{narrow}{1}}{#1}%
\ifcase\@tempa
\endgroup
- \@biglocfalse
+ \@bigloctrue
\else
\endgroup
- \@bigloctrue
+ \@biglocfalse
\fi
}
\DeclareOption{wlocfield}{\@ObsoleteOption{locfield=wide}}
@@ -525,29 +507,40 @@
\@refwidefalse
\fi
}
+\newcommand{\subject@format}[1]{#1}
+\newcommand*{\raggedsubject}{}
\newif\if@subj
\newif\if@subjafter
\KOMA@key{subject}{%
\begingroup
- \KOMA@set@ncmdkey{locfield}{@tempa}{%
+ \KOMA@set@ncmdkey{subject}{@tempa}{%
{titled}{0},%
{untitled}{1},%
{afteropening}{2},%
- {beforeopening}{3}%
+ {beforeopening}{3},%
+ {underlined}{4},%
+ {left}{5},%
+ {right}{6},%
+ {centered}{7}%
}{#1}%
\ifcase\@tempa
- \endgroup
- \@subjtrue
+ \aftergroup\@subjtrue
\or
- \endgroup
- \@subjfalse
+ \aftergroup\@subjfalse
\or
- \endgroup
- \@subjaftertrue
- \else
- \endgroup
- \@subjafterfalse
+ \aftergroup\@subjaftertrue
+ \or
+ \aftergroup\@subjafterfalse
+ \or
+ \aftergroup\let\aftergroup\subject@format\aftergroup\underline
+ \or
+ \aftergroup\let\aftergroup\raggedsubject\aftergroup\raggedright
+ \or
+ \aftergroup\let\aftergroup\raggedsubject\aftergroup\raggedleft
+ \or
+ \aftergroup\let\aftergroup\raggedsubject\aftergroup\centering
\fi
+ \endgroup
}
\KOMA@ifkey{enlargefirstpage}{@enlargefp}
\newcommand*{\@pageat}{4}
@@ -594,17 +587,10 @@
}
%%% From File: scrkcile.dtx
%%% From File: scrkmisc.dtx
-\DeclareKeyValOption[%
- \let\scr@pti@nerr@r
- \OptionNotUsed
- \lco@test
- \x@paper
-]{KOMA}
-\KOMAoptions{%
- draft=false,headsepline=false,footsepline=false,parskip=false%
- ,twoside=false%
+\KOMAExecuteOptions{%
+ parskip=false%
}
-\ProcessOptions\relax
+\KOMAProcessOptions\relax
%%% From File: scrkcomp.dtx
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility
\newcommand*{\@setif}[2][]{%
@@ -622,228 +608,243 @@
\ClassWarning{\KOMAClassName}{%
Using fallback calculation to setup font sizes\MessageBreak
for basic size `#2'}%
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \setlength{\@tempdimc}{\@tempdima}%
- \addtolength{\@tempdimc}{-10\p@}%
- \edef\@ptsize{\strip@pt\@tempdimc}%
- \@defaultunits\@tempdimb#1pt\relax\@nnil
- \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
- \edef\@tempb{\the\@tempdimc}%
- \setlength{\@tempdimc}{\@tempdima}%
- \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
- \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\normalsize{%
- \noexpand\@setfontsize\noexpand\normalsize
+ \scr@ifundefinedorrelax{dimexpr}{%
+ \ClassError{\KOMAClassName}{%
+ feature only allowed using e-TeX%
+ }{%
+ The fallback calculation to setup font sizes was implemented
+ using e-TeX.\MessageBreak
+ You should not continue, because the fallback calculation would fail%
+ }
+ }{%
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \setlength{\@tempdimc}{\@tempdima}%
+ \addtolength{\@tempdimc}{-10\p@}%
+ \edef\@ptsize{\strip@pt\@tempdimc}%
+ \@defaultunits\@tempdimb#1pt\relax\@nnil
+ \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+ \edef\@tempb{\the\@tempdimc}%
+ \setlength{\@tempdimc}{\@tempdima}%
+ \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
+ \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\normalsize{%
+ \noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listI
- }%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\small{%
- \noexpand\@setfontsize\noexpand\small
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listI
+ }%
+ \setlength{\@tempdima}{0.9125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\small{%
+ \noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\footnotesize{%
- \noexpand\@setfontsize\noexpand\footnotesize
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{.83334\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\footnotesize{%
+ \noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
- \noexpand\@setfontsize\noexpand\scriptsize
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{.66667\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsize{%
+ \noexpand\@setfontsize\noexpand\scriptsize
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
- \noexpand\@setfontsize\noexpand\tiny
+ }%
+ \setlength{\@tempdima}{.5\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tiny{%
+ \noexpand\@setfontsize\noexpand\tiny
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
- \noexpand\@setfontsize\noexpand\large
+ }%
+ \setlength{\@tempdima}{1.2\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\large{%
+ \noexpand\@setfontsize\noexpand\large
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
- \noexpand\@setfontsize\noexpand\Large
+ }%
+ \setlength{\@tempdima}{1.44\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Large{%
+ \noexpand\@setfontsize\noexpand\Large
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
- \noexpand\@setfontsize\noexpand\LARGE
+ }%
+ \setlength{\@tempdima}{1.728\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\LARGE{%
+ \noexpand\@setfontsize\noexpand\LARGE
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
+ }%
+ \setlength{\@tempdima}{2.074\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\huge{%
+ \noexpand\@setfontsize\noexpand\huge
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
+ }%
+ \setlength{\@tempdima}{2.488\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Huge{%
+ \noexpand\@setfontsize\noexpand\Huge
{\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \let\@listI\@listi
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@small{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@footnotesize{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listii\endcsname
+ \endgroup
+ \edef\@listii{\leftmargin\leftmarginii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiii\endcsname
+ \endgroup
+ \edef\@listiii{\leftmargin\leftmarginiii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \z@
+ \partopsep \the\parsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \def\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \def\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \def\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
}%
- \normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@small{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@footnotesize{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listii\endcsname
- \endgroup
- \edef\@listii{\leftmargin\leftmarginii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiii\endcsname
- \endgroup
- \edef\@listiii{\leftmargin\leftmarginiii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \z@
- \partopsep \the\parsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \def\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \def\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \def\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
}
\providecommand*{\@fontsizefilebase}{scrsize}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -909,20 +910,6 @@
}%
}%
}
-\scr@ifundefined{unexpanded}{%
- \newcommand*{\g@addto@macro@temp}{}%
- \newcommand{\l@addto@macro}[2]{%
- \begingroup%
- \toks@\expandafter{#1#2}%
- \xdef\g@addto@macro@temp{\the\toks@}%
- \endgroup
- \let#1\g@addto@macro@temp
- }%
-}{%
- \newcommand{\l@addto@macro}[2]{%
- \edef#1{\unexpanded\expandafter{#1#2}}%
- }%
-}
\newcommand*{\addtokomafont}[2]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{%
@@ -1536,7 +1523,7 @@
but \expandafter\string\csname
date\languagename\endcsname\space not defined!\MessageBreak
This seems to be a bug at you're `hyphen.cfg'.\MessageBreak
- I'l undefine \string\languagename\space to avoid errors%
+ Undefining macro \string\languagename\space to avoid errors%
}%
\let\languagename=\undefined
\fi
@@ -1755,8 +1742,13 @@
Don't use this KOMA-Script internal macro}%
}%
}
-\newcommand*{\useplength}[1]{%
- \expandafter\number\expandafter\csname ltr@len@#1\endcsname}
+\scr@ifundefinedorrelax{dimexpr}{%
+ \newcommand*{\useplength}[1]{%
+ \number \csname ltx@len@#1\endcsname\relax}%
+}{%
+ \newcommand*{\useplength}[1]{%
+ \dimexpr \csname ltr@len@#1\endcsname\relax}%
+}
\newcommand*{\setlengthtoplength}[3][]{%
\setlength{#2}{\useplength{#3}}%
\setlength{#2}{#1#2}}
@@ -1916,79 +1908,79 @@
\aliaskomafont{pagination}{pagenumber}
\newcommand*{\scr@fnt@pagehead}{\headfont}
\newcommand*{\scr@fnt@wrn@pagehead}[1]{%
- font selection of elements `pagehead' and `pagefoot'\MessageBreak
- changed, because they are same%
+ `pagehead' and `pagefoot' are aliases for the same^^b8\MessageBreak
+ font element, changed%
}
\aliaskomafont{pagefoot}{pagehead}
\newcommand*{\pagemark}{{\usekomafont{pagenumber}%
\pagename\ %
\thepage}}
- \renewcommand*{\ps@plain}{%
- \renewcommand*{\@oddhead}{%
- \vbox{\vbox{\hsize=\textwidth\hbox to\textwidth{%
- \parbox[b]{\textwidth}{\strut
- \ifnum\@pageat>-1
- \ifnum\@pageat<3
- \ifcase\@pageat\raggedright\or\centering\or\raggedleft\fi
- \pagemark
- \else
- \hfill
- \fi
+\renewcommand*{\ps@plain}{%
+ \renewcommand*{\@oddhead}{%
+ \vbox{\vbox{\hsize=\textwidth\hbox to\textwidth{%
+ \parbox[b]{\textwidth}{\strut
+ \ifnum\@pageat>-1
+ \ifnum\@pageat<3
+ \ifcase\@pageat\raggedright\or\centering\or\raggedleft\fi
+ \pagemark
\else
\hfill
\fi
- }%
+ \else
+ \hfill
+ \fi
}%
- \if@hsl\kern1pt\rule{\textwidth}{.4pt}\fi
}%
+ \if@hsl\kern1pt\rule{\textwidth}{.4pt}\fi
}%
}%
- \let\@evenhead\@oddhead%
- \renewcommand*{\@oddfoot}{%
- \parbox[t]{\textwidth}{%
- \if@fsl
- {%
- \raggedright%
- \vskip-\baselineskip\vskip.4pt
- \hrulefill\\
- }%
- \fi
- \ifnum\@pageat>2
- \ifcase\@pageat\or\or\or\raggedright\or\centering\or\raggedleft\fi
- \strut\pagemark
- \else
- \hfill
- \fi
- }%
+ }%
+ \let\@evenhead\@oddhead%
+ \renewcommand*{\@oddfoot}{%
+ \parbox[t]{\textwidth}{%
+ \if@fsl
+ {%
+ \raggedright%
+ \vskip-\baselineskip\vskip.4pt
+ \hrulefill\\
+ }%
+ \fi
+ \ifnum\@pageat>2
+ \ifcase\@pageat\or\or\or\raggedright\or\centering\or\raggedleft\fi
+ \strut\pagemark
+ \else
+ \hfill
+ \fi
}%
- \let\@evenfoot\@oddfoot
- }
- \newcommand*{\ps@headings}{\let\@mkboth\markboth
- \renewcommand*{\@oddhead}{%
- \vbox{%
- \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\@nexthead}}%
- \if@hsl\kern1pt\rule{\textwidth}{.4pt}\fi%
- }%
+ }%
+ \let\@evenfoot\@oddfoot
+}
+\newcommand*{\ps@headings}{\let\@mkboth\markboth
+ \renewcommand*{\@oddhead}{%
+ \vbox{%
+ \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\@nexthead}}%
+ \if@hsl\kern1pt\rule{\textwidth}{.4pt}\fi%
}%
- \let\@evenhead\@oddhead
- \renewcommand*{\@oddfoot}{%
- \parbox[t]{\textwidth}{%
- \if@fsl
- {%
- \raggedright%
- \vskip-\baselineskip\vskip.4pt
- \hrulefill\\
- }%
- \fi
- \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\@nextfoot}}%
- }%
+ }%
+ \let\@evenhead\@oddhead
+ \renewcommand*{\@oddfoot}{%
+ \parbox[t]{\textwidth}{%
+ \if@fsl
+ {%
+ \raggedright%
+ \vskip-\baselineskip\vskip.4pt
+ \hrulefill\\
+ }%
+ \fi
+ \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\@nextfoot}}%
}%
- \let\@evenfoot\@oddfoot
- }
- \newcommand*{\ps@myheadings}{%
- \ps@headings
- \let\@mkboth\@gobbletwo
- }
+ }%
+ \let\@evenfoot\@oddfoot
+}
+\newcommand*{\ps@myheadings}{%
+ \ps@headings
+ \let\@mkboth\@gobbletwo
+}
\pagestyle{plain}
\pagenumbering{arabic}
\raggedbottom
@@ -2185,15 +2177,17 @@
\usekomavar{fromname}%
{%
\ifnum\@rulefrom=1\\[-.5\baselineskip]%
- \setlength{\@tempdima}{\useplength{fromrulewidth}}%
- \ifdim\@tempdima=\z@
- \setlength{\@tempdima}{\textwidth}%
- \if@logo
- \settowidth{\@tempdimb}{\usekomavar{fromlogo}}%
- \addtolength{\@tempdima}{-\@tempdimb}%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \if@logo
+ \settowidth{\@tempdimb}{\usekomavar{fromlogo}}%
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \fi
\fi
- \fi
- \expandafter\rule\expandafter{\the\@tempdima}{.4pt}%
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
\fi
}%
\\
@@ -2205,11 +2199,13 @@
\if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
\if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
\ifnum\@rulefrom=2\\[-.5\baselineskip]%
- \setlength{\@tempdima}{\useplength{fromrulewidth}}%
- \ifdim\@tempdima=\z@
- \setlength{\@tempdima}{\textwidth}%
- \fi
- \expandafter\rule\expandafter{\the\@tempdima}{.4pt}%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
\fi
\\
}%
@@ -2225,11 +2221,13 @@
\usekomavar{fromname}%
{%
\ifnum\@rulefrom=1\\[-.5\baselineskip]%
- \setlength{\@tempdima}{\useplength{fromrulewidth}}%
- \ifdim\@tempdima=\z@
- \setlength{\@tempdima}{\textwidth}%
- \fi
- \expandafter\rule\expandafter{\the\@tempdima}{.4pt}%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
\fi
}%
\\
@@ -2241,11 +2239,13 @@
\if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
\if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
\ifnum\@rulefrom=2\\[-.5\baselineskip]%
- \setlength{\@tempdima}{\useplength{fromrulewidth}}%
- \ifdim\@tempdima=\z@
- \setlength{\@tempdima}{\textwidth}%
- \fi
- \expandafter\rule\expandafter{\the\@tempdima}{.4pt}%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
\fi
\\
}%
@@ -2261,15 +2261,17 @@
\usekomavar{fromname}%
{%
\ifnum\@rulefrom=1\\[-.5\baselineskip]%
- \setlength{\@tempdima}{\useplength{fromrulewidth}}%
- \ifdim\@tempdima=\z@
- \setlength{\@tempdima}{\textwidth}%
- \if@logo
- \settowidth{\@tempdimb}{\usekomavar{fromlogo}}%
- \addtolength{\@tempdima}{-\@tempdimb}%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \if@logo
+ \settowidth{\@tempdimb}{\usekomavar{fromlogo}}%
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \fi
\fi
- \fi
- \expandafter\rule\expandafter{\the\@tempdima}{.4pt}%
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
\fi
}%
\\
@@ -2281,11 +2283,13 @@
\if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
\if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
\ifnum\@rulefrom=2\\[-.5\baselineskip]%
- \setlength{\@tempdima}{\useplength{fromrulewidth}}%
- \ifdim\@tempdima=\z@
- \setlength{\@tempdima}{\textwidth}%
- \fi
- \expandafter\rule\expandafter{\the\@tempdima}{.4pt}%
+ \usekomafont{fromrule}{%
+ \setlength{\@tempdima}{\useplength{fromrulewidth}}%
+ \ifdim\@tempdima=\z@
+ \setlength{\@tempdima}{\textwidth}%
+ \fi
+ \expandafter\rule\expandafter{\the\@tempdima}{%
+ \useplength{fromrulethickness}}}%
\fi
\\
}%
@@ -2297,14 +2301,24 @@
\renewcommand*{\@alignfrom}{10000}%
\renewcommand*{\@firsthead}{\noindent#1}%
}
+\newkomafont{foldmark}{}
\newkomafont{fromname}{}
\newkomafont{fromaddress}{}
+\newkomafont{fromrule}{}
\newkomafont{backaddress}{\sffamily}
+\newkomafont{specialmail}{}
+\newkomafont{addressee}{}
+\newkomafont{toname}{}
+\newkomafont{toaddress}{}
+\newkomafont{refname}{\sffamily\scriptsize}
+\newkomafont{refvalue}{\sffamily\scriptsize}
\newkomafont{title}{\normalcolor\sffamily\bfseries}
\newkomafont{subject}{\normalcolor\bfseries}
\@newplength{foldmarkhpos}
\@newplength{tfoldmarkvpos}
\@newplength{bfoldmarkvpos}
+\@newplength{foldmarkthickness}
+\@setplength{foldmarkthickness}{.2pt}
\@newplength{toaddrvpos}
\@newplength{backaddrheight}
\@newplength{toaddrhpos}
@@ -2326,6 +2340,8 @@
\@newplength{firstheadwidth}
\@newplength{fromrulewidth}
\@setplength{fromrulewidth}{0pt}
+\@newplength{fromrulethickness}
+\@setplength{fromrulethickness}{.4pt}
\newcommand*{\@firstfoot}{}
\newcommand{\firstfoot}[1]{%
\renewcommand*{\@firstfoot}{\noindent#1}%
@@ -2362,9 +2378,12 @@
}%
}
\newcommand*{\@foldmark}[2]{%
- \vb@t@z{\vskip #1%
+ \vb@t@z{\setlength{\@tempdima}{#1}%
+ \addtolengthplength[-.5]{\@tempdima}{foldmarkthickness}%
+ \vskip \@tempdima
\rlap{\move@topl\hskip\useplength{foldmarkhpos}%
- \rule{#2}{.2pt}}}%
+ \usekomafont{foldmark}{%
+ \rule{#2}{\useplength{foldmarkthickness}}}}}%
\ignorespaces%
}
\newcommand*{\@foldmarks}{%
@@ -2491,15 +2510,18 @@
\ifkomavarempty{specialmail}{}{%
\vbox{\hsize\useplength{toaddrwidth}%
\noindent\hspace*{\useplength{specialmailindent}}%
- \underline{\usekomavar{specialmail}}%
+ \specialmail@format{%
+ \usekomafont{specialmail}\usekomavar{specialmail}}%
\hspace*{\useplength{specialmailrightindent}}}%
}%
\vfil%
\noindent\hskip\useplength{toaddrindent}%
\setlength{\@tempdima}{\useplength{toaddrwidth}}%
\addtolengthplength[-2]{\@tempdima}{toaddrindent}%
- \vbox{\hsize\@tempdima%
- \noindent\usekomavar{toname}\\\usekomavar{toaddress}}%
+ \vbox{\hsize\@tempdima\raggedright
+ \usekomafont{addressee}{%
+ \usekomafont{toname}{\usekomavar{toname}\\}%
+ \usekomafont{toaddress}{\usekomavar{toaddress}}}}%
\vfil\null}%
{address field}{toaddrheight}%
{\begin{letter} or you\MessageBreak
@@ -2511,6 +2533,8 @@
\typeout{Address: No}%
\fi
}
+\newcommand*{\specialmail@format}[1]{}
+\let\specialmail@format\underline
\newcommand*{\@ogobble}[1][]{}
\newcommand*{\@locfield}{%
\ifdim \useplength{locwidth}=\z@%
@@ -2566,12 +2590,12 @@
}
\newcommand*{\@set@reffield}[1]{%
\ifkomavarempty{#1}{}{%
- \settowidth{\@tempdima}{\strut\usekomavar{#1}}%
- \setbox0\hbox{\strut\scriptsize\sffamily\usekomavar*{#1}}%
+ \settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}%
+ \setbox0\hbox{\strut\usekomafont{refname}\usekomavar*{#1}}%
\ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi
\if@tempswa\enskip\hfill\fi
\parbox[t]{\@tempdima}{\noindent\raggedright
- \strut\box0\\\strut\usekomavar{#1}}%
+ \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{#1}}%
\@tempswatrue
}%
}
@@ -2629,7 +2653,21 @@
\move@topt\vskip\useplength{refvpos}%
\rlap{\noindent\move@topl\hskip\useplength{refhpos}%
\vbox{\hsize\useplength{refwidth}%
- \noindent\@set@reffields
+ \noindent\@set@reffields%
+ \if@tempswa
+ \setbox0\hbox{\usekomafont{refname}\strutbox}%
+ \ifdim\ht0>\ht\strutbox
+ \ClassWarningNoLine{scrlttr}{%
+ Font element `refname' should not be larger than
+ \string\normalsize!}%
+ \fi
+ \setbox0\hbox{\usekomafont{refvalue}\strutbox}%
+ \ifdim\ht0>\ht\strutbox
+ \ClassWarningNoLine{scrlttr}{%
+ Font element `refvalue' should not be larger than
+ \string\normalsize!}%
+ \fi
+ \fi
\ifkomavarempty{date}{%
\if@tempswa
\typeout{Reference line(s): with fields but without date}%
@@ -2640,12 +2678,13 @@
}{%
\if@tempswa
\typeout{Reference line(s): with fields and date}%
- \settowidth{\@tempdima}{\strut\usekomavar{date}}%
- \setbox0\hbox{\scriptsize\sffamily\usekomavar*{date}}%
+ \settowidth{\@tempdima}{\strut
+ \usekomafont{refvalue}\usekomavar{date}}%
+ \setbox0\hbox{\usekomafont{refname}\usekomavar*{date}}%
\ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi
\enskip\hfill
\parbox[t]{\@tempdima}{\noindent\raggedright%
- \strut\box0\\\strut\usekomavar{date}}%
+ \strut\box0\\\strut\usekomafont{refvalue}\usekomavar{date}}%
\else
\typeout{Reference line: only place and date}%
\enskip\hfill
@@ -2676,15 +2715,22 @@
\ifkomavarempty{subject}{%
\typeout{Subject: no}%
}{%
- \if@subjafter%
- \typeout{Subject: after opening}%
- \centering%
- \else%
- \typeout{Subject: before opening}%
- \noindent%
- \fi%
- {\usekomafont{subject}\if@subj\@hangfrom{\usekomavar*{subject}}\fi%
- {\usekomavar{subject}}\par}\vskip2\baselineskip%
+ \ifx\raggedsubject\@empty
+ \if@subjafter%
+ \typeout{Subject: after opening}%
+ \let\raggedsubject\centering%
+ \else%
+ \typeout{Subject: before opening}%
+ \def\raggedsubject{\noindent\@hangfrom}%
+ \fi%
+ \fi
+ {%
+ \usekomafont{subject}%
+ \show\raggedsubject
+ \raggedsubject{\if@subj \subject@format{\strut\ignorespaces
+ \usekomavar*{subject}}\fi}%
+ \subject@format{\strut\ignorespaces\usekomavar{subject}}\par
+ }\vskip2\baselineskip%
}%
}%
}
@@ -2746,6 +2792,9 @@
\newcommand*{\@xproc}{}
\long\def\@xproc#1\\#2\@nil{%
\setkomavar{toname}{#1}\setkomavar{toaddress}{#2}}
+\g@addto@macro\flushbottom{%
+ \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}%
+}
\newcommand{\AtBeginLetter}{\g@addto@macro\@beginletterhook}
\newcommand{\@beginletterhook}{}
\newcommand{\AtEndLetter}{\g@addto@macro\stopletter}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
index fcfffc74282..57d06c2d22e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
@@ -58,7 +58,10 @@ headinclude,footinclude%
\fi
\def\@tempa{\newif\if@mainmatter\@mainmattertrue}
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname mainmatter\endcsname\relax\else\let\@tempa\relax\fi
+\expandafter\ifx\csname mainmatter\endcsname\relax
+\else
+ \let\@tempa\relax
+\fi
\@tempa
\let\headmark\relax
\DeclareRobustCommand\pagemark{{\pnumfont\thepage}}
@@ -81,25 +84,25 @@ headinclude,footinclude%
\if@mainmatter\chaptermarkformat\fi\fi ####1}}%
\def\sectionmark####1{%
\markright {\ifnum \c@secnumdepth >\z@%
- \sectionmarkformat\fi ####1}}
+ \sectionmarkformat\fi ####1}}%
\else
\def\sectionmark####1{%
\markboth {\ifnum \c@secnumdepth >\z@%
- \sectionmarkformat\fi ####1}{%
+ \if@mainmatter\sectionmarkformat\fi\fi ####1}{%
\ifnum \c@secnumdepth >\z@%
- \sectionmarkformat\fi ####1}}
+ \ifmainmatter\sectionmarkformat\fi\fi ####1}}%
\def\subsectionmark####1{%
\markright {\ifnum \c@secnumdepth >\@ne%
- \subsectionmarkformat\fi ####1}}
+ \subsectionmarkformat\fi ####1}}%
\fi
\else
\let\@mkboth\@gobbletwo
\if@chapter
- \def\chaptermark####1{}
+ \def\chaptermark####1{}%
\else
- \def\subsectionmark####1{}
+ \def\subsectionmark####1{}%
\fi
- \def\sectionmark####1{}
+ \def\sectionmark####1{}%
\fi
\def@twosidehead#3
\def@twosidefoot#4
@@ -116,78 +119,78 @@ headinclude,footinclude%
\def\chaptermark####1{%
\markright {\ifnum \c@secnumdepth >\m@ne%
\if@mainmatter\chaptermarkformat\fi\fi ####1}}%
- \def\sectionmark####1{}
+ \def\sectionmark####1{}%
\else
\def\sectionmark####1{%
\markright{\ifnum \c@secnumdepth >\z@%
- \sectionmarkformat\fi ####1}}
- \def\subsectionmark####1{}
+ \if@mainmatter\sectionmarkformat\fi\fi ####1}}%
+ \def\subsectionmark####1{}%
\fi
\else
\let\@mkboth\@gobbletwo
\if@chapter
- \def\chaptermark####1{}
+ \def\chaptermark####1{}%
\else
- \def\subsectionmark####1{}
+ \def\subsectionmark####1{}%
\fi
- \def\sectionmark####1{}
+ \def\sectionmark####1{}%
\fi
\def@onesidehead#3
\def@onesidefoot#4
}
}
\fi
-\def\def@twosidehead(#1,#2)#3#4#5(#6,#7){
+\def\def@twosidehead(#1,#2)#3#4#5(#6,#7){%
\def\@evenhead{\let\headmark\leftmark%
\hss\hskip\@evenheadshift\vbox{\hsize=\@headwidth\relax%
\hf@rule{#1}{#2}{\@headwidth}%
\vskip#2
- \vskip\baselineskip%
+ \vskip\baselineskip
\hb@xt@\@headwidth{{%
\headfont\strut #3}}%
\hf@rule{#6}{#7}{\@headwidth}%
- }\hskip\@oddheadshift\hss}
- \def\@oddhead{\let\headmark\rightmark%
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax%
+ }\hskip\@oddheadshift\hss}%
+ \def\@oddhead{\let\headmark\rightmark
+ \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
\hf@rule{#1}{#2}{\@headwidth}%
- \vskip#2
- \vskip\baselineskip%
+ \vskip#2%
+ \vskip\baselineskip
\hb@xt@\@headwidth{{%
\headfont\strut #4}}%
\hf@rule{#6}{#7}{\@headwidth}%
- }\hskip\@evenheadshift\hss}
+ }\hskip\@evenheadshift\hss}%
}
-\def\def@onesidehead(#1,#2)#3#4#5(#6,#7){
- \def\@evenhead{}
- \def\@oddhead{\let\headmark\rightmark%
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax%
+\def\def@onesidehead(#1,#2)#3#4#5(#6,#7){%
+ \def\@evenhead{}%
+ \def\@oddhead{\let\headmark\rightmark
+ \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
\hf@rule{#1}{#2}{\@headwidth}%
\vskip#2%
- \vskip\baselineskip%
+ \vskip\baselineskip
\hb@xt@\@headwidth{{%
- \headfont\strut #5}}
+ \headfont\strut #5}}%
\hf@rule{#6}{#7}{\@headwidth}%
- }\hskip\@evenheadshift\hss}
+ }\hskip\@evenheadshift\hss}%
}
-\def\def@twosidefoot(#1,#2)#3#4#5(#6,#7){
- \def\@evenfoot{\let\headmark\leftmark%
- \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax%
+\def\def@twosidefoot(#1,#2)#3#4#5(#6,#7){%
+ \def\@evenfoot{\let\headmark\leftmark
+ \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax
\topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
\headfont\strut #3}}%
- \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss}
- \def\@oddfoot{\let\headmark\rightmark%
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax%
+ \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss}%
+ \def\@oddfoot{\let\headmark\rightmark
+ \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
\topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
\headfont\strut #4}}%
- \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}
+ \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
}
-\def\def@onesidefoot(#1,#2)#3#4#5(#6,#7){
- \def\@evenfoot{}
- \def\@oddfoot{\let\headmark\rightmark%
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax%
+\def\def@onesidefoot(#1,#2)#3#4#5(#6,#7){%
+ \def\@evenfoot{}%
+ \def\@oddfoot{\let\headmark\rightmark
+ \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
\topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
\headfont\strut #5}}
- \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}
+ \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
}
\newcommand\topfoot@rule[2]{%
\@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip
@@ -201,7 +204,7 @@ headinclude,footinclude%
}
\newcommand\hf@rule[3]{%
\setlength{\@tempdimb}{#1}
- \setlength{\@tempdimb}{.5\@tempdimb}
+ \setlength{\@tempdimb}{.5\@tempdimb}%
\hb@xt@#3{%
\hfill%
\llap{\vrule\@depth#2\@height\z@\@width\@tempdimb}%
@@ -213,46 +216,46 @@ headinclude,footinclude%
\@ifstar
{\@newpagestyle[-]}%
{\@newpagestyle[+]}}
-\def\@newpagestyle[#1]#2#3#4{
+\def\@newpagestyle[#1]#2#3#4{%
\expandafter\ifx\csname ps@#2\endcsname\relax
- \@defpagestyle[#1]{#2}{#3}{#4}
+ \@defpagestyle[#1]{#2}{#3}{#4}%
\else
\PackageError
- {scrpage}
+ {scrpage}%
{Your command was ignored}%
{There is already a pagestyle named ``#1''.\MessageBreak%
Use \protect\defpagestyle\space, \protect\renewpagestyle or
- \protect\providepagestyle.}
+ \protect\providepagestyle.}%
\fi
}
\def\renewpagestyle{%
\@ifstar
{\@renewpagestyle[-]}%
{\@renewpagestyle[+]}}
-\def\@renewpagestyle[#1]#2#3#4{
+\def\@renewpagestyle[#1]#2#3#4{%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ps@#2\endcsname\relax
\PackageError
- {scrpage}
+ {scrpage}%
{Your command was ignored}%
{There is no pagestyle named ``#1''.\MessageBreak%
Use \protect\defpagestyle, \protect\newpagestyle or
- \protect\providepagestyle.}
+ \protect\providepagestyle.}%
\else
- \@defpagestyle[#1]{#2}{#3}{#4}
+ \@defpagestyle[#1]{#2}{#3}{#4}%
\fi
}
\def\providepagestyle{%
\@ifstar
{\@providepagestyle[-]}%
{\@providepagestyle[+]}}
-\def\@providepagestyle[#1]#2#3#4{
+\def\@providepagestyle[#1]#2#3#4{%
\expandafter\ifx\csname ps@#2\endcsname\relax
- \@defpagestyle[#1]{#2}{#3}{#4}
+ \@defpagestyle[#1]{#2}{#3}{#4}%
\else
\PackageInfo
- {scrpage}
- {\protect\providepagestyle\protect{#1\protect} ignored.}
+ {scrpage}%
+ {\protect\providepagestyle\protect{#1\protect} ignored.}%
\fi
}
\def\deftripstyle{%
@@ -260,72 +263,72 @@ headinclude,footinclude%
{\@deftripstyle[-]}%
{\@deftripstyle[+]}}
\def\@deftripstyle[#1]#2{%
- \@ifnextchar[
+ \@ifnextchar[%]
{\@@deftripstyle[#1]{#2}}%
{\@@deftripstyle[#1]{#2}[\z@]}}
-\def\@@deftripstyle[#1]#2[#3]{
- \def\@tempa{#1}
- \@ifnextchar[
+\def\@@deftripstyle[#1]#2[#3]{%
+ \def\@tempa{#1}%
+ \@ifnextchar[%]
{\@@@deftripstyle#2[#3]}%
{\@@@deftripstyle#2[\z@][#3]}}
\def\@@@deftripstyle#1[#2][#3]#4#5#6#7#8#9{%
- \def\@tempb{+}
- \ifx\@tempa\@tempb%
+ \def\@tempb{+}%
+ \ifx\@tempa\@tempb
\defpagestyle{#1}%
{(\@headwidth,#2)%
{\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
{\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
{\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}
+ (\@headwidth,#3)}%
{(\@footwidth,#3)%
{\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
{\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
{\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}
+ (\@footwidth,#2)}%
\else
\defpagestyle*{#1}%
{(\@headwidth,#2)%
{\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
{\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
{\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}
+ (\@headwidth,#3)}%
{(\@footwidth,#3)%
{\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
{\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
{\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}
+ (\@footwidth,#2)}%
\fi
}
\newcommand*{\settowidthof}[2]{%
- \edef\@tempa{#2}
+ \edef\@tempa{#2}%
\edef\@tempb{paper}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}
+ \setlength{#1}{\paperwidth}%
\else\edef\@tempb{text}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}
+ \setlength{#1}{\textwidth}%
\else\edef\@tempb{textwithmarginpar}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}
- \addtolength{#1}{\marginparwidth}
- \addtolength{#1}{\marginparsep}
+ \setlength{#1}{\textwidth}%
+ \addtolength{#1}{\marginparwidth}%
+ \addtolength{#1}{\marginparsep}%
\else\edef\@tempb{head}\ifx\@tempa\@tempb
- \setlength{#1}{\@headwidth}
+ \setlength{#1}{\@headwidth}%
\else\edef\@tempb{foot}\ifx\@tempa\@tempb
- \setlength{#1}{\@footwidth}
+ \setlength{#1}{\@footwidth}%
\else\edef\@tempb{headtopline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@headabove@linelength}
+ \setlength{#1}{\scr@headabove@linelength}%
\else\edef\@tempb{headsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@headbelow@linelength}
+ \setlength{#1}{\scr@headbelow@linelength}%
\else\edef\@tempb{footsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@footabove@linelength}
+ \setlength{#1}{\scr@footabove@linelength}%
\else\edef\@tempb{footbotline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@footbelow@linelength}
+ \setlength{#1}{\scr@footbelow@linelength}%
\else\edef\@tempb{page}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}
+ \setlength{#1}{\paperwidth}%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ta@bcor\endcsname\relax\else
- \addtolength{#1}{-\ta@bcor}
+ \addtolength{#1}{-\ta@bcor}%
\fi
\else
- \setlength{#1}{#2}
+ \setlength{#1}{#2}%
\fi
\fi
\fi
@@ -339,72 +342,72 @@ headinclude,footinclude%
}
\newcommand*{\deftowidthof}[2]{%
\edef\@tempa{#2}\edef\@tempb{autohead}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@headwidth}
+ \expandafter\def\csname #1\endcsname{\@headwidth}%
\else\edef\@tempb{autofoot}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@footwidth}
+ \expandafter\def\csname #1\endcsname{\@footwidth}%
\else
- \settowidthof{\@tempdima}{#2}
- \expandafter\edef\csname #1\endcsname{\the\@tempdima}
+ \settowidthof{\@tempdima}{#2}%
+ \expandafter\edef\csname #1\endcsname{\the\@tempdima}%
\fi
\fi
}
\newcommand*{\setheadwidth}[2][\@empty]{%
- \set@hf@width{head}{#1}{#2}
+ \set@hf@width{head}{#1}{#2} %
}
\newcommand*{\setfootwidth}[2][\@empty]{%
- \set@hf@width{foot}{#1}{#2}
+ \set@hf@width{foot}{#1}{#2}%
}
\newcommand*{\set@hf@width}[3]{%
- \settowidthof{\@tempdima}{#3}
+ \settowidthof{\@tempdima}{#3}%
\ifdim\@tempdima>\paperwidth
\PackageWarning
- {scrpage}
+ {scrpage}%
{You've set width of #1 to a value\MessageBreak
greater than width of page!\MessageBreak%
- I`ll reduce width of #1 to width of page}
- \setlength{\@tempdima}{\paperwidth}
+ I`ll reduce width of #1 to width of page}%
+ \setlength{\@tempdima}{\paperwidth}%
\else
\ifdim\@tempdima<\z@
\PackageWarning
- {scrpage}
+ {scrpage}%
{You've set width of #1 to negative value!\MessageBreak%
- I'll set it to 0pt}
- \setlength{\@tempdima}{\z@}
+ I'll set it to 0pt}%
+ \setlength{\@tempdima}{\z@}%
\fi
\fi
- \expandafter\edef\csname @#1width\endcsname{\the\@tempdima}
- \edef\@tempa{#2}
- \setlength{\@tempdima}{\textwidth}
- \addtolength{\@tempdima}{-\csname @#1width\endcsname}
+ \expandafter\edef\csname @#1width\endcsname{\the\@tempdima}%
+ \edef\@tempa{#2}%
+ \setlength{\@tempdima}{\textwidth}%
+ \addtolength{\@tempdima}{-\csname @#1width\endcsname}%
\ifx\@tempa\@empty
\if@twoside
- \setlength{\@tempdimb}{.3333333333\@tempdima}
+ \setlength{\@tempdimb}{.3333333333\@tempdima}%
\else
- \setlength{\@tempdimb}{.5\@tempdima}
+ \setlength{\@tempdimb}{.5\@tempdima}%
\fi
\else
- \setlength{\@tempdimb}{#2}
+ \setlength{\@tempdimb}{#2}%
\fi
- \addtolength{\@tempdima}{-\@tempdimb}
+ \addtolength{\@tempdima}{-\@tempdimb}%
\ifdim\@tempdimb<\z@
- \setlength{\@tempdimb}{-\@tempdimb}
- \expandafter\edef\csname @odd#1shift\endcsname{-\the\@tempdimb}
+ \setlength{\@tempdimb}{-\@tempdimb}%
+ \expandafter\edef\csname @odd#1shift\endcsname{-\the\@tempdimb}%
\else
- \expandafter\edef\csname @odd#1shift\endcsname{\the\@tempdimb}
+ \expandafter\edef\csname @odd#1shift\endcsname{\the\@tempdimb}%
\fi
\ifdim\@tempdima<\z@
- \setlength{\@tempdima}{-\@tempdima}
- \expandafter\edef\csname @even#1shift\endcsname{-\the\@tempdima}
+ \setlength{\@tempdima}{-\@tempdima}%
+ \expandafter\edef\csname @even#1shift\endcsname{-\the\@tempdima}%
\else
- \expandafter\edef\csname @even#1shift\endcsname{\the\@tempdima}
+ \expandafter\edef\csname @even#1shift\endcsname{\the\@tempdima}%
\fi
}
-\newcommand*{\@headwidth}{\textwidth}
-\newcommand*{\@oddheadshift}{\z@}
-\newcommand*{\@evenheadshift}{\z@}
-\newcommand*{\@footwidth}{\textwidth}
-\newcommand*{\@oddfootshift}{\z@}
-\newcommand*{\@evenfootshift}{\z@}
+\newcommand*{\@headwidth}{\textwidth}%
+\newcommand*{\@oddheadshift}{\z@}%
+\newcommand*{\@evenheadshift}{\z@}%
+\newcommand*{\@footwidth}{\textwidth}%
+\newcommand*{\@oddfootshift}{\z@}%
+\newcommand*{\@evenfootshift}{\z@}%
\providecommand\pnumfont{\normalfont}
\providecommand\headfont{\normalfont%
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index e152a442f4e..8189fd75643 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -40,7 +40,7 @@
%%% From File: scrpage.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}
- [2006/03/29 v2.2c LaTeX2e KOMA-Script
+ [2007/07/23 v2.2e LaTeX2e KOMA-Script
package]
\DeclareOption{headinclude}{\PassOptionsToPackage{headinclude}{typearea}}
\DeclareOption{headexclude}{\PassOptionsToPackage{headexclude}{typearea}}
@@ -128,7 +128,20 @@
\fi
\def\@tempa{\newif\if@mainmatter\@mainmattertrue}
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname mainmatter\endcsname\relax\else\let\@tempa\relax\fi
+\expandafter\ifx\csname mainmatter\endcsname\relax
+\else
+ \@ifundefined{@mainmattertrue}{%
+ \PackageWarningNoLine{scrpage2}{%
+ \string\mainmatter\space defined without
+ \string\if@mainmatter!\MessageBreak
+ This switch is obligatory for scrpage2 to omit\MessageBreak
+ running head chapter numbers in front and\MessageBreak
+ back matter and will be defined now%
+ }%
+ }{%
+ \let\@tempa\relax
+ }%
+\fi
\@tempa
\let\headmark\relax
\DeclareRobustCommand\pagemark{{\pnumfont\thepage}}
@@ -155,13 +168,13 @@
}
\fi
\def\def@twosidehead{%
- \@ifnextchar(
- {\def@@twosidehead}
+ \@ifnextchar(%)
+ {\def@@twosidehead}%
{\def@@twosidehead(\scr@headabove@linelength,%
\scr@headabove@linethickness)}}
\def\def@@twosidehead(#1,#2)#3#4#5{%
- \@ifnextchar(
- {\def@@@twosidehead({#1},{#2}){#3}{#4}{#5}}
+ \@ifnextchar(%)
+ {\def@@@twosidehead({#1},{#2}){#3}{#4}{#5}}%
{\def@@@twosidehead({#1},{#2}){#3}{#4}{#5}%
(\scr@headbelow@linelength,%
\scr@headbelow@linethickness)}}
@@ -171,96 +184,96 @@
\hf@rule{#1}{#2}{\@headwidth}%
{headabove}%
\vskip#2
- \vskip\baselineskip%
+ \vskip\baselineskip
\hb@xt@\@headwidth{{%
- \scr@nouppercase%
+ \scr@nouppercase
\headfont\strut #3}}%
\hf@rule{#6}{#7}{\@headwidth}%
{headbelow}%
- }\hskip\@oddheadshift\hss}
- \def\@oddhead{\let\headmark\rightmark%
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax%
+ }\hskip\@oddheadshift\hss}%
+ \def\@oddhead{\let\headmark\rightmark
+ \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
\hf@rule{#1}{#2}{\@headwidth}%
{headabove}%
- \vskip#2
- \vskip\baselineskip%
+ \vskip#2%
+ \vskip\baselineskip
\hb@xt@\@headwidth{{%
- \scr@nouppercase%
+ \scr@nouppercase
\headfont\strut #4}}%
\hf@rule{#6}{#7}{\@headwidth}%
{headbelow}%
- }\hskip\@evenheadshift\hss}
+ }\hskip\@evenheadshift\hss}%
}
\def\def@onesidehead{%
- \@ifnextchar(
- {\def@@onesidehead}
+ \@ifnextchar(%)
+ {\def@@onesidehead}%
{\def@@onesidehead(\scr@headabove@linelength,%
\scr@headabove@linethickness)}}
\def\def@@onesidehead(#1,#2)#3#4#5{%
- \@ifnextchar(
- {\def@@@onesidehead({#1},{#2}){#3}{#4}{#5}}
+ \@ifnextchar(%)
+ {\def@@@onesidehead({#1},{#2}){#3}{#4}{#5}}%
{\def@@@onesidehead({#1},{#2}){#3}{#4}{#5}%
(\scr@headbelow@linelength,%
\scr@headbelow@linethickness)}}
\def\def@@@onesidehead(#1,#2)#3#4#5(#6,#7){%
- \def\@evenhead{}
- \def\@oddhead{\let\headmark\rightmark%
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax%
+ \def\@evenhead{}%
+ \def\@oddhead{\let\headmark\rightmark
+ \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
\hf@rule{#1}{#2}{\@headwidth}%
{headabove}%
\vskip#2%
- \vskip\baselineskip%
+ \vskip\baselineskip
\hb@xt@\@headwidth{{%
- \scr@nouppercase%
- \headfont\strut #5}}
+ \scr@nouppercase
+ \headfont\strut #5}}%
\hf@rule{#6}{#7}{\@headwidth}%
{headbelow}%
- }\hskip\@evenheadshift\hss}
+ }\hskip\@evenheadshift\hss}%
}
\def\def@twosidefoot{%
- \@ifnextchar(
+ \@ifnextchar(%)
{\def@@twosidefoot}
{\def@@twosidefoot(\scr@footabove@linelength,%
\scr@footabove@linethickness)}}
\def\def@@twosidefoot(#1,#2)#3#4#5{%
- \@ifnextchar(
- {\def@@@twosidefoot({#1},{#2}){#3}{#4}{#5}}
+ \@ifnextchar(%)
+ {\def@@@twosidefoot({#1},{#2}){#3}{#4}{#5}}%
{\def@@@twosidefoot({#1},{#2}){#3}{#4}{#5}%
(\scr@footbelow@linelength,%
\scr@footbelow@linethickness)}}
\def\def@@@twosidefoot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{\let\headmark\leftmark%
- \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax%
+ \def\@evenfoot{\let\headmark\leftmark
+ \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax
\topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \scr@nouppercase%
+ \scr@nouppercase
\headfont\strut #3}}%
- \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss}
- \def\@oddfoot{\let\headmark\rightmark%
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax%
+ \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss}%
+ \def\@oddfoot{\let\headmark\rightmark
+ \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
\topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \scr@nouppercase%
+ \scr@nouppercase
\headfont\strut #4}}%
- \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}
+ \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
}
\def\def@onesidefoot{%
- \@ifnextchar(
- {\def@@onesidefoot}
+ \@ifnextchar(%)
+ {\def@@onesidefoot}%
{\def@@onesidefoot(\scr@footabove@linelength,%
\scr@footabove@linethickness)}}
\def\def@@onesidefoot(#1,#2)#3#4#5{%
- \@ifnextchar(
- {\def@@@onesidefoot({#1},{#2}){#3}{#4}{#5}}
+ \@ifnextchar(%)
+ {\def@@@onesidefoot({#1},{#2}){#3}{#4}{#5}}%
{\def@@@onesidefoot({#1},{#2}){#3}{#4}{#5}%
(\scr@footbelow@linelength,%
\scr@footbelow@linethickness)}}
\def\def@@@onesidefoot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{}
- \def\@oddfoot{\let\headmark\rightmark%
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax%
+ \def\@evenfoot{}%
+ \def\@oddfoot{\let\headmark\rightmark
+ \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
\topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \scr@nouppercase%
+ \scr@nouppercase
\headfont\strut #5}}
- \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}
+ \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
}
\newcommand\topfoot@rule[2]{%
\@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip
@@ -289,7 +302,7 @@
\edef\@tempa{\hfline@adjust}%
\fi
\ifnum\@tempa=1
- \setlength{\@tempdimb}{.5\@tempdimb}
+ \setlength{\@tempdimb}{.5\@tempdimb}%
\fi
\hb@xt@#3{%
\ifnum\@tempa>0
@@ -316,46 +329,46 @@
\@ifstar
{\@newpagestyle[-]}%
{\@newpagestyle[+]}}
-\def\@newpagestyle[#1]#2#3#4{
+\def\@newpagestyle[#1]#2#3#4{%
\expandafter\ifx\csname ps@#2\endcsname\relax
- \@defpagestyle[#1]{#2}{#3}{#4}
+ \@defpagestyle[#1]{#2}{#3}{#4}%
\else
\PackageError
- {scrpage2}
+ {scrpage2}%
{Your command was ignored}%
{There is already a pagestyle named ``#1''.\MessageBreak%
Use \protect\defpagestyle\space, \protect\renewpagestyle or
- \protect\providepagestyle.}
+ \protect\providepagestyle.}%
\fi
}
\def\renewpagestyle{%
\@ifstar
{\@renewpagestyle[-]}%
{\@renewpagestyle[+]}}
-\def\@renewpagestyle[#1]#2#3#4{
+\def\@renewpagestyle[#1]#2#3#4{%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ps@#2\endcsname\relax
\PackageError
- {scrpage2}
+ {scrpage2}%
{Your command was ignored}%
{There is no pagestyle named ``#1''.\MessageBreak%
Use \protect\defpagestyle, \protect\newpagestyle or
- \protect\providepagestyle.}
+ \protect\providepagestyle.}%
\else
- \@defpagestyle[#1]{#2}{#3}{#4}
+ \@defpagestyle[#1]{#2}{#3}{#4}%
\fi
}
\def\providepagestyle{%
\@ifstar
{\@providepagestyle[-]}%
{\@providepagestyle[+]}}
-\def\@providepagestyle[#1]#2#3#4{
+\def\@providepagestyle[#1]#2#3#4{%
\expandafter\ifx\csname ps@#2\endcsname\relax
- \@defpagestyle[#1]{#2}{#3}{#4}
+ \@defpagestyle[#1]{#2}{#3}{#4}%
\else
\PackageInfo
- {scrpage2}
- {\protect\providepagestyle\protect{#1\protect} ignored.}
+ {scrpage2}%
+ {\protect\providepagestyle\protect{#1\protect} ignored.}%
\fi
}
\def\deftripstyle{%
@@ -363,50 +376,50 @@
{\@deftripstyle[-]}%
{\@deftripstyle[+]}}
\def\@deftripstyle[#1]#2{%
- \@ifnextchar[
+ \@ifnextchar[%]
{\@@deftripstyle[#1]{#2}}%
{\@@deftripstyle[#1]{#2}[\z@]}}
-\def\@@deftripstyle[#1]#2[#3]{
- \def\@tempa{#1}
- \@ifnextchar[
+\def\@@deftripstyle[#1]#2[#3]{%
+ \def\@tempa{#1}%
+ \@ifnextchar[%]
{\@@@deftripstyle#2[#3]}%
{\@@@deftripstyle#2[\z@][#3]}}
\def\@@@deftripstyle#1[#2][#3]#4#5#6#7#8#9{%
- \def\@tempb{+}
- \ifx\@tempa\@tempb%
+ \def\@tempb{+}%
+ \ifx\@tempa\@tempb
\defpagestyle{#1}%
{(\@headwidth,#2)%
{\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
{\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
{\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}
+ (\@headwidth,#3)}%
{(\@footwidth,#3)%
{\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
{\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
{\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}
+ (\@footwidth,#2)}%
\else
\defpagestyle*{#1}%
{(\@headwidth,#2)%
{\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
{\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
{\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}
+ (\@headwidth,#3)}%
{(\@footwidth,#3)%
{\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
{\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
{\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}
+ (\@footwidth,#2)}%
\fi
}
\newcommand*{\@iflevelok}[4]{%
- \begingroup%
- \edef\@tempa{#1}\ifx\@tempa\@empty\def\@tempa{\endgroup #3}\else%
+ \begingroup
+ \edef\@tempa{#1}\ifx\@tempa\@empty\def\@tempa{\endgroup #3}\else
\def\@tempa{\csname #1level\endcsname}%
\def\@tempb{\csname #2level\endcsname}%
- \ifnum \@tempa>\@tempb%
+ \ifnum \@tempa>\@tempb
\def\@tempa{\endgroup#3}%
- \else%
+ \else
\def\@tempa{\endgroup#4}%
\fi\fi\@tempa}
\providecommand{\markleft}[1]{%
@@ -425,13 +438,13 @@
\begingroup
\edef\@tempa{#2}\ifx\@tempa\@empty
\endgroup
- \PackageWarning{scrpage2}
- {\string\automark\space with empty obligatory argument}
+ \PackageWarning{scrpage2}%
+ {\string\automark\space with empty obligatory argument}%
\else
\endgroup
\expandafter\def\csname #2mark\endcsname##1{%
\begingroup
- \def\@tempa{\csname #2level\endcsname}
+ \def\@tempa{\csname #2level\endcsname}%
\@tempswafalse
\ifnum \c@secnumdepth <\@tempa\else\if@mainmatter
\@tempswatrue
@@ -440,7 +453,7 @@
\if@twoside\edef\@tempb{#2}\else\let\@tempb\@tempa\fi
\ifx\@tempa\@tempb
\if@tempswa
- \@mkboth{\MakeMarkcase{\csname #2markformat\endcsname ##1}}
+ \@mkboth{\MakeMarkcase{\csname #2markformat\endcsname ##1}}%
{\MakeMarkcase{\csname #2markformat\endcsname ##1}}%
\else%
\@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
@@ -456,14 +469,14 @@
\else
\@iflevelok{#1}{#2}{%
\@mkboth{\MakeMarkcase{##1}}{}}{%
- \ifx\@mkboth\markboth\markleft{\MakeMarkcase{##1}}\fi}
+ \ifx\@mkboth\markboth\markleft{\MakeMarkcase{##1}}\fi}%
\fi
\fi
\endgroup
}
\fi
\begingroup
- \edef\@tempa{#1}\edef\@tempb{#2}
+ \edef\@tempa{#1}\edef\@tempb{#2}%
\if@autooneside\if@twoside\else\let\@tempa\@empty\fi\fi
\ifx\@tempa\@empty
\endgroup
@@ -474,7 +487,7 @@
\endgroup
\expandafter\def\csname #1mark\endcsname##1{%
\begingroup
- \def\@tempa{\csname #1level\endcsname}
+ \def\@tempa{\csname #1level\endcsname}%
\@tempswafalse
\ifnum \c@secnumdepth <\@tempa\else\if@mainmatter
\@tempswatrue
@@ -486,13 +499,13 @@
##1}}%
\fi}{%
\@mkboth{}{\MakeMarkcase{\csname #1markformat\endcsname
- ##1}}}
+ ##1}}}%
\else
\@iflevelok{#1}{#2}{%
\ifx\@mkboth\markboth
\markright{\MakeMarkcase{##1}}%
\fi}{%
- \@mkboth{}{\MakeMarkcase{##1}}}
+ \@mkboth{}{\MakeMarkcase{##1}}}%
\fi
\endgroup
}
@@ -520,7 +533,7 @@
\newcommand*{\subsubsectionlevel}{3}
\newcommand*{\paragraphlevel}{4}
\newcommand*{\subparagraphlevel}{5}
-\@ifundefined{MakeMarkcase}{
+\@ifundefined{MakeMarkcase}{%
\@ifclassloaded{scrbook}{\let\MakeMarkcase\relax}{%
\@ifclassloaded{scrreprt}{\let\MakeMarkcase\relax}{%
\@ifclassloaded{scrartcl}{\let\MakeMarkcase\relax}{%
@@ -532,44 +545,44 @@
use of scrpage2 with unknown class.\MessageBreak
Please mail to markus.kohm@gmx.de, if
headmarks\MessageBreak
- are lower case without use of scrpage2}}}}
+ are lower case without use of scrpage2}}}}%
\let\MakeMarkcase\MakeUppercase}}}}}{}
-\@ifundefined{scrheadings@style}{
+\@ifundefined{scrheadings@style}{%
\@ifclassloaded{scrbook}{\def\scrheadings@style{koma}}{%
\@ifclassloaded{scrreprt}{\def\scrheadings@style{koma}}{%
\@ifclassloaded{scrartcl}{\def\scrheadings@style{koma}}{%
\@ifclassloaded{scrlttr2}{\def\scrheadings@style{koma}}{%
\def\scrheadings@style{standard}}}}}}{}
\newcommand*{\settowidthof}[2]{%
- \edef\@tempa{#2}
+ \edef\@tempa{#2}%
\edef\@tempb{paper}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}
+ \setlength{#1}{\paperwidth}%
\else\edef\@tempb{text}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}
+ \setlength{#1}{\textwidth}%
\else\edef\@tempb{textwithmarginpar}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}
- \addtolength{#1}{\marginparwidth}
- \addtolength{#1}{\marginparsep}
+ \setlength{#1}{\textwidth}%
+ \addtolength{#1}{\marginparwidth}%
+ \addtolength{#1}{\marginparsep}%
\else\edef\@tempb{head}\ifx\@tempa\@tempb
- \setlength{#1}{\@headwidth}
+ \setlength{#1}{\@headwidth}%
\else\edef\@tempb{foot}\ifx\@tempa\@tempb
- \setlength{#1}{\@footwidth}
+ \setlength{#1}{\@footwidth}%
\else\edef\@tempb{headtopline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@headabove@linelength}
+ \setlength{#1}{\scr@headabove@linelength}%
\else\edef\@tempb{headsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@headbelow@linelength}
+ \setlength{#1}{\scr@headbelow@linelength}%
\else\edef\@tempb{footsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@footabove@linelength}
+ \setlength{#1}{\scr@footabove@linelength}%
\else\edef\@tempb{footbotline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@footbelow@linelength}
+ \setlength{#1}{\scr@footbelow@linelength}%
\else\edef\@tempb{page}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}
+ \setlength{#1}{\paperwidth}%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ta@bcor\endcsname\relax\else
- \addtolength{#1}{-\ta@bcor}
+ \addtolength{#1}{-\ta@bcor}%
\fi
\else
- \setlength{#1}{#2}
+ \setlength{#1}{#2}%
\fi
\fi
\fi
@@ -583,81 +596,81 @@
}
\newcommand*{\deftowidthof}[2]{%
\edef\@tempa{#2}\edef\@tempb{autohead}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@headwidth}
+ \expandafter\def\csname #1\endcsname{\@headwidth}%
\else\edef\@tempb{autofoot}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@footwidth}
+ \expandafter\def\csname #1\endcsname{\@footwidth}%
\else
- \settowidthof{\@tempdima}{#2}
- \expandafter\edef\csname #1\endcsname{\the\@tempdima}
+ \settowidthof{\@tempdima}{#2}%
+ \expandafter\edef\csname #1\endcsname{\the\@tempdima}%
\fi
\fi
}
\newcommand*{\setheadwidth}[2][\@empty]{%
- \set@hf@width{head}{#1}{#2}
+ \set@hf@width{head}{#1}{#2} %
}
\newcommand*{\setfootwidth}[2][\@empty]{%
- \set@hf@width{foot}{#1}{#2}
+ \set@hf@width{foot}{#1}{#2}%
}
\newcommand*{\set@hf@width}[3]{%
- \settowidthof{\@tempdima}{#3}
+ \settowidthof{\@tempdima}{#3}%
\ifdim\@tempdima>\paperwidth
\PackageWarning
- {scrpage2}
+ {scrpage2}%
{You've set width of #1 to a value\MessageBreak
greater than width of page!\MessageBreak%
- I`ll reduce width of #1 to width of page}
- \setlength{\@tempdima}{\paperwidth}
+ I`ll reduce width of #1 to width of page}%
+ \setlength{\@tempdima}{\paperwidth}%
\else
\ifdim\@tempdima<\z@
\PackageWarning
- {scrpage2}
+ {scrpage2}%
{You've set width of #1 to negative value!\MessageBreak%
- I'll set it to 0pt}
- \setlength{\@tempdima}{\z@}
+ I'll set it to 0pt}%
+ \setlength{\@tempdima}{\z@}%
\fi
\fi
- \expandafter\edef\csname @#1width\endcsname{\the\@tempdima}
- \edef\@tempa{#2}
- \setlength{\@tempdima}{\textwidth}
- \addtolength{\@tempdima}{-\csname @#1width\endcsname}
+ \expandafter\edef\csname @#1width\endcsname{\the\@tempdima}%
+ \edef\@tempa{#2}%
+ \setlength{\@tempdima}{\textwidth}%
+ \addtolength{\@tempdima}{-\csname @#1width\endcsname}%
\ifx\@tempa\@empty
\if@twoside
- \setlength{\@tempdimb}{.3333333333\@tempdima}
+ \setlength{\@tempdimb}{.3333333333\@tempdima}%
\else
- \setlength{\@tempdimb}{.5\@tempdima}
+ \setlength{\@tempdimb}{.5\@tempdima}%
\fi
\else
- \setlength{\@tempdimb}{#2}
+ \setlength{\@tempdimb}{#2}%
\fi
- \addtolength{\@tempdima}{-\@tempdimb}
+ \addtolength{\@tempdima}{-\@tempdimb}%
\ifdim\@tempdimb<\z@
- \setlength{\@tempdimb}{-\@tempdimb}
- \expandafter\edef\csname @odd#1shift\endcsname{-\the\@tempdimb}
+ \setlength{\@tempdimb}{-\@tempdimb}%
+ \expandafter\edef\csname @odd#1shift\endcsname{-\the\@tempdimb}%
\else
- \expandafter\edef\csname @odd#1shift\endcsname{\the\@tempdimb}
+ \expandafter\edef\csname @odd#1shift\endcsname{\the\@tempdimb}%
\fi
\ifdim\@tempdima<\z@
- \setlength{\@tempdima}{-\@tempdima}
- \expandafter\edef\csname @even#1shift\endcsname{-\the\@tempdima}
+ \setlength{\@tempdima}{-\@tempdima}%
+ \expandafter\edef\csname @even#1shift\endcsname{-\the\@tempdima}%
\else
- \expandafter\edef\csname @even#1shift\endcsname{\the\@tempdima}
+ \expandafter\edef\csname @even#1shift\endcsname{\the\@tempdima}%
\fi
}
-\newcommand*{\@headwidth}{\textwidth}
-\newcommand*{\@oddheadshift}{\z@}
-\newcommand*{\@evenheadshift}{\z@}
-\newcommand*{\@footwidth}{\textwidth}
-\newcommand*{\@oddfootshift}{\z@}
-\newcommand*{\@evenfootshift}{\z@}
+\newcommand*{\@headwidth}{\textwidth}%
+\newcommand*{\@oddheadshift}{\z@}%
+\newcommand*{\@evenheadshift}{\z@}%
+\newcommand*{\@footwidth}{\textwidth}%
+\newcommand*{\@oddfootshift}{\z@}%
+\newcommand*{\@evenfootshift}{\z@}%
\if@mincl
- \renewcommand*{\@headwidth}{}
- \renewcommand*{\@footwidth}{}
+ \renewcommand*{\@headwidth}{}%
+ \renewcommand*{\@footwidth}{}%
\AtBeginDocument{%
\ifx\@headwidth\@empty
- \setheadwidth[0pt]{textwithmarginpar}
+ \setheadwidth[0pt]{textwithmarginpar}%
\fi
\ifx\@footwidth\@empty
- \setfootwidth[0pt]{textwithmarginpar}
+ \setfootwidth[0pt]{textwithmarginpar}%
\fi
}
\fi
@@ -718,7 +731,7 @@
\newcommand*{\ps@save@myheadings}{}
\let\ps@save@myheadings\ps@myheadings
\def\ps@headings{%
- \PackageWarning{scrpage2}
+ \PackageWarning{scrpage2}%
{you've used pagestyle ``headings''.\MessageBreak
You should not use this pagestyle with a\MessageBreak
scrpage2-pagestyle!\MessageBreak
@@ -726,7 +739,7 @@
\let\ps@plain\ps@save@plain%
\ps@save@headings\@automarktrue}
\def\ps@myheadings{%
- \PackageWarning{scrpage2}
+ \PackageWarning{scrpage2}%
{you've used pagestyle ``myheadings''.\MessageBreak
You should not use this pagestyle with a\MessageBreak
scrpage2-pagestyle!\MessageBreak
@@ -735,78 +748,78 @@
\ps@save@myheadings\@automarkfalse}
\newcommand*{\ps@useheadings}{%
\if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
- \let\ps@plain\ps@use@plain%
- \let\save@@mkboth\@mkboth%
- \let\save@chaptermark\chaptermark%
- \let\save@sectionmark\sectionmark%
- \let\save@subsectionmark\subsectionmark%
- \ifx\@mkboth\markboth\ps@save@headings\else\ps@save@myheadings\fi%
- \let\@mkboth\save@@mkboth%
- \let\chaptermark\save@chaptermark%
- \let\sectionmark\save@sectionmark%
- \let\subsectionmark\save@subsectionmark%
+ \let\ps@plain\ps@use@plain
+ \let\save@@mkboth\@mkboth
+ \let\save@chaptermark\chaptermark
+ \let\save@sectionmark\sectionmark
+ \let\save@subsectionmark\subsectionmark
+ \ifx\@mkboth\markboth\ps@save@headings\else\ps@save@myheadings\fi
+ \let\@mkboth\save@@mkboth
+ \let\chaptermark\save@chaptermark
+ \let\sectionmark\save@sectionmark
+ \let\subsectionmark\save@subsectionmark
}
\newcommand*{\ps@scrplain}{\let\ps@plain\ps@@scrplain\ps@plain}
\newpagestyle{@scrplain}
{%
- (\scrplain@headabove@linelength,\scr@headabove@linethickness)
+ (\scrplain@headabove@linelength,\scr@headabove@linethickness)%
{%
- \rlap{\parbox{\@headwidth}{\raggedright%
+ \rlap{\parbox{\@headwidth}{\raggedright
\strut\scrplain@even@left@head\strut}}%
- \hfill%
- \parbox{\@headwidth}{\centering\strut%
+ \hfill
+ \parbox{\@headwidth}{\centering\strut
\scrplain@even@middle@head\strut}%
- \hfill%
- \llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrplain@even@right@head\strut}}}
+ \hfill
+ \llap{\parbox{\@headwidth}{\raggedleft
+ \strut\scrplain@even@right@head\strut}}}%
{%
- \rlap{\parbox{\@headwidth}{\raggedright%
+ \rlap{\parbox{\@headwidth}{\raggedright
\strut\scrplain@odd@left@head\strut}}%
- \hfill%
- \parbox{\@headwidth}{\centering%
+ \hfill
+ \parbox{\@headwidth}{\centering
\strut\scrplain@odd@middle@head\strut}%
- \hfill%
- \llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrplain@odd@right@head\strut}}}
+ \hfill
+ \llap{\parbox{\@headwidth}{\raggedleft
+ \strut\scrplain@odd@right@head\strut}}}%
{%
- \rlap{\parbox{\@headwidth}{\raggedright%
+ \rlap{\parbox{\@headwidth}{\raggedright
\strut\scrplain@odd@left@head\strut}}%
- \hfill%
- \parbox{\@headwidth}{\centering%
+ \hfill
+ \parbox{\@headwidth}{\centering
\strut\scrplain@odd@middle@head\strut}%
- \hfill%
- \llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrplain@odd@right@head\strut}}}
+ \hfill
+ \llap{\parbox{\@headwidth}{\raggedleft
+ \strut\scrplain@odd@right@head\strut}}}%
(\scrplain@headbelow@linelength,\scr@headbelow@linethickness)
}{%
(\scrplain@footabove@linelength,\scr@footabove@linethickness)
{%
- \rlap{\parbox{\@footwidth}{\raggedright%
+ \rlap{\parbox{\@footwidth}{\raggedright
\strut\scrplain@even@left@foot\strut}}%
- \hfill%
- \parbox{\@footwidth}{\centering%
+ \hfill
+ \parbox{\@footwidth}{\centering
\strut\scrplain@even@middle@foot\strut}%
- \hfill%
- \llap{\parbox{\@footwidth}{\raggedleft%
- \strut\scrplain@even@right@foot\strut}}}
+ \hfill
+ \llap{\parbox{\@footwidth}{\raggedleft
+ \strut\scrplain@even@right@foot\strut}}}%
{%
- \rlap{\parbox{\@footwidth}{\raggedright%
+ \rlap{\parbox{\@footwidth}{\raggedright
\strut\scrplain@odd@left@foot\strut}}%
- \hfill%
- \parbox{\@footwidth}{\centering%
+ \hfill
+ \parbox{\@footwidth}{\centering
\strut\scrplain@odd@middle@foot\strut}%
- \hfill%
- \llap{\parbox{\@footwidth}{\raggedleft%
- \strut\scrplain@odd@right@foot\strut}}}
+ \hfill
+ \llap{\parbox{\@footwidth}{\raggedleft
+ \strut\scrplain@odd@right@foot\strut}}}%
{%
- \rlap{\parbox{\@footwidth}{\raggedright%
+ \rlap{\parbox{\@footwidth}{\raggedright
\strut\scrplain@odd@left@foot\strut}}%
- \hfill%
- \parbox{\@footwidth}{\centering%
+ \hfill
+ \parbox{\@footwidth}{\centering
\strut\scrplain@odd@middle@foot\strut}%
- \hfill%
- \llap{\parbox{\@footwidth}{\raggedleft%
- \strut\scrplain@odd@right@foot\strut}}}
+ \hfill
+ \llap{\parbox{\@footwidth}{\raggedleft
+ \strut\scrplain@odd@right@foot\strut}}}%
(\scrplain@footbelow@linelength,\scr@footbelow@linethickness)
}
\newcommand*{\scrplain@even@left@head}{}
@@ -825,60 +838,62 @@
\newpagestyle{@scrheadings}
{%
{%
- \rlap{\parbox{\@headwidth}{\raggedright%
+ \rlap{\parbox{\@headwidth}{\raggedright
\strut\scrheadings@even@left@head\strut}}%
- \hfill%
- \parbox{\@headwidth}{\centering%
+ \hfill
+ \parbox{\@headwidth}{\centering
\strut\scrheadings@even@middle@head\strut}%
- \hfill%
+ \hfill
\llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrheadings@even@right@head\strut}}}
+ \strut\scrheadings@even@right@head\strut}}}%
{%
- \rlap{\parbox{\@headwidth}{\raggedright%
+ \rlap{\parbox{\@headwidth}{\raggedright
\strut\scrheadings@odd@left@head\strut}}%
- \hfill%
- \parbox{\@headwidth}{\centering%
+ \hfill
+ \parbox{\@headwidth}{\centering
\strut\scrheadings@odd@middle@head\strut}%
- \hfill%
+ \hfill
\llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrheadings@odd@right@head\strut}}}
+ \strut\scrheadings@odd@right@head\strut}}}%
{%
- \rlap{\parbox{\@headwidth}{\raggedright%
+ \rlap{\parbox{\@headwidth}{\raggedright
\strut\scrheadings@odd@left@head\strut}}%
- \hfill%
- \parbox{\@headwidth}{\centering%
+ \hfill
+ \parbox{\@headwidth}{\centering
\strut\scrheadings@odd@middle@head\strut}%
- \hfill%
- \llap{\parbox{\@headwidth}{\raggedleft%
- \strut\scrheadings@odd@right@head\strut}}}}
+ \hfill
+ \llap{\parbox{\@headwidth}{\raggedleft
+ \strut\scrheadings@odd@right@head\strut}}}}%
{%
{%
- \rlap{\parbox{\@footwidth}{\raggedright%
+ \rlap{\parbox{\@footwidth}{\raggedright
\strut\scrheadings@even@left@foot\strut}}%
- \hfill%
- \parbox{\@footwidth}{\centering%
+ \hfill
+ \parbox{\@footwidth}{\centering
\strut\scrheadings@even@middle@foot\strut}%
- \hfill%
- \llap{\parbox{\@footwidth}{\raggedleft%
- \strut\scrheadings@even@right@foot\strut}}}
+ \hfill
+ \llap{\parbox{\@footwidth}{\raggedleft
+ \strut\scrheadings@even@right@foot\strut}}}%
{%
- \rlap{\parbox{\@footwidth}{\raggedright%
+ \rlap{\parbox{\@footwidth}{\raggedright
\strut\scrheadings@odd@left@foot\strut}}%
- \hfill%
- \parbox{\@footwidth}{\centering%
+ \hfill
+ \parbox{\@footwidth}{\centering
\strut\scrheadings@odd@middle@foot\strut}%
- \hfill%
- \llap{\parbox{\@footwidth}{\raggedleft%
- \strut\scrheadings@odd@right@foot\strut}}}
+ \hfill
+ \llap{\parbox{\@footwidth}{\raggedleft
+ \strut\scrheadings@odd@right@foot\strut}}}%
{%
- \rlap{\parbox{\@footwidth}{\raggedright%
+ \rlap{\parbox{\@footwidth}{\raggedright
\strut\scrheadings@odd@left@foot\strut}}%
- \hfill%
- \parbox{\@footwidth}{\centering%
+ \hfill
+ \parbox{\@footwidth}{\centering
\strut\scrheadings@odd@middle@foot\strut}%
- \hfill%
- \llap{\parbox{\@footwidth}{\raggedleft%
- \strut\scrheadings@odd@right@foot\strut}}}}
+ \hfill
+ \llap{\parbox{\@footwidth}{\raggedleft
+ \strut\scrheadings@odd@right@foot\strut}}%
+ }%
+}
\newcommand*{\scrheadings@even@left@head}{}
\newcommand*{\scrheadings@even@middle@head}{}
\newcommand*{\scrheadings@even@right@head}{}
@@ -974,18 +989,18 @@
\newcommand*{\clearscrheadfoot}{%
\ihead[]{}\chead[]{}\ohead[]{}\ifoot[]{}\cfoot[]{}\ofoot[]{}}
\newcommand*{\clearscrplain}{%
- \renewcommand*{\scrplain@even@left@head}{}
- \renewcommand*{\scrplain@even@middle@head}{}
- \renewcommand*{\scrplain@even@right@head}{}
- \renewcommand*{\scrplain@odd@left@head}{}
- \renewcommand*{\scrplain@odd@middle@head}{}
- \renewcommand*{\scrplain@odd@right@head}{}
- \renewcommand*{\scrplain@even@left@foot}{}
- \renewcommand*{\scrplain@even@middle@foot}{}
- \renewcommand*{\scrplain@even@right@foot}{}
- \renewcommand*{\scrplain@odd@left@foot}{}
- \renewcommand*{\scrplain@odd@middle@foot}{}
- \renewcommand*{\scrplain@odd@right@foot}{}
+ \renewcommand*{\scrplain@even@left@head}{}%
+ \renewcommand*{\scrplain@even@middle@head}{}%
+ \renewcommand*{\scrplain@even@right@head}{}%
+ \renewcommand*{\scrplain@odd@left@head}{}%
+ \renewcommand*{\scrplain@odd@middle@head}{}%
+ \renewcommand*{\scrplain@odd@right@head}{}%
+ \renewcommand*{\scrplain@even@left@foot}{}%
+ \renewcommand*{\scrplain@even@middle@foot}{}%
+ \renewcommand*{\scrplain@even@right@foot}{}%
+ \renewcommand*{\scrplain@odd@left@foot}{}%
+ \renewcommand*{\scrplain@odd@middle@foot}{}%
+ \renewcommand*{\scrplain@odd@right@foot}{}%
}
\def\@tempa{koma}\ifx\scrheadings@style\@tempa
\@ifclassloaded{scrlttr2}{%
@@ -1025,7 +1040,7 @@
\ihead{\headmark}
\ohead{\pagemark}
\cfoot[\pagemark]{}
- \else\PackageErrorNoLine{scrpage2}{unknown scrheadings style}
+ \else\PackageErrorNoLine{scrpage2}{unknown scrheadings style}%
{Somehow \string\scrheadings@style was
defined\MessageBreak
as ``\scrheadings@style''.\MessageBreak
@@ -1050,9 +1065,9 @@
* Local config file scrpage.cfg used^^J%
*************************************}}
{}
-\AtBeginDocument{
+\AtBeginDocument{%
\ifdim\headheight=12pt
- \PackageWarningNoLine{scrpage2}
+ \PackageWarningNoLine{scrpage2}%
{seems you are using a constant headheight.\MessageBreak
If you get overfull \string\vbox\space warnings at almost every%
\MessageBreak
@@ -1060,9 +1075,9 @@
\space\string\setlength{\string\headheight}{%
1.1\string\baselineskip}\MessageBreak
into the preamble of your document.\MessageBreak
- A better solution would be to use typearea package}
+ A better solution would be to use typearea package}%
\else\ifdim\headheight<1.07\baselineskip
- \PackageWarningNoLine{scrpage2}
+ \PackageWarningNoLine{scrpage2}%
{seems you are using a very small headheight.\MessageBreak
If you get overfull \string\vbox\space warnings at almost every%
\MessageBreak
@@ -1070,7 +1085,7 @@
\space\string\setlength{\string\headheight}{%
1.1\string\baselineskip}\MessageBreak
into the preamble of your document.\MessageBreak
- A better solution would be to use typearea package}
+ A better solution would be to use typearea package}%
\fi\fi}
%%% From File: scrlogo.dtx
\@ifundefined{KOMAScript}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index c9279b226b5..d5d01f1b1aa 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/03/07 v2.97a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrreprt%
@@ -107,7 +107,7 @@
%%% From File: scrkcomp.dtx
\newcommand*{\scr@compatibility}{0}
\KOMA@key{version}[last]{%
- \scr@ifundefined{scr@v@#1}{%
+ \scr@ifundefinedorrelax{scr@v@#1}{%
\def\scr@compatibility{0}%
\ClassWarningNoLine{\KOMAClassName}{%
You have set option `version' to value `#1', but\MessageBreak
@@ -139,6 +139,8 @@
\@namedef{scr@v@2.96a}{3}
\@namedef{scr@v@2.97}{3}
\@namedef{scr@v@2.97a}{3}
+\@namedef{scr@v@2.97b}{3}
+\@namedef{scr@v@2.97c}{3}
\@namedef{scr@v@last}{3}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -164,12 +166,12 @@
\def\@pt@@scan #1pt#2\@pt@@scan{%
\ifstr{#2}{pt}{%
\ifnumber{#1}{%
- \KOMA@UseObsolete{option}{\PackageInfo}{#1#2}{fontsize=#1#2}%
+ \KOMA@UseObsoleteOption{\PackageInfo}{#1#2}{fontsize=#1#2}%
}{\@headlines}%
}{\@headlines}%
}
\KOMA@key{fontsize}{%
- \scr@ifundefined{changefontsizes}{%
+ \scr@ifundefinedorrelax{changefontsizes}{%
\@defaultunits\@tempdima#1pt\relax\@nnil
\edef\@ptsize{#1}%
}{%
@@ -234,31 +236,8 @@
\newcommand*{\scr@pti@nerr@r}{
\OptionNotUsed
}
-\KOMA@key{headlines}{%
- \PassOptionsToPackage{headlines=#1}{typearea}%
-}
-\KOMA@key{headinclude}[true]{\PassOptionsToPackage{headinclude=#1}{typearea}}
-\KOMA@key{footinclude}[true]{\PassOptionsToPackage{footinclude=#1}{typearea}}
-\KOMA@key{mpinclude}[true]{\PassOptionsToPackage{mpinclude=#1}{typearea}}
-\KOMA@key{BCOR}{%
- \PassOptionsToPackage{BCOR=#1}{typearea}%
-}
-\KOMA@key{DIV}[calc]{%
- \PassOptionsToPackage{DIV=#1}{typearea}%
-}
-\KOMA@key{twoside}[true]{%
- \KOMA@set@ifkey{twoside}{@twoside}{#1}%
- \if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi%
-}
-\KOMA@key{twocolumn}[true]{%
- \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
-}
-\KOMA@key{pagesize}[auto]{%
- \PassOptionsToPackage{pagesize=#1}{typearea}%
-}
-\KOMA@key{paper}{%
- \PassOptionsToPackage{paper=#1}{typearea}%
-}
+\DeclareOption*{%
+ \x@paper}
%%% From File: scrkpar.dtx
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -541,9 +520,7 @@
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
\@ifpackageloaded{typearea}{%
\KOMAoptions{headinclude=#1}%
- }{%
- \PassOptionsToPackage{headinclude=#1}{typearea}%
- }%
+ }{}%
}
\KOMA@DeclareObsoleteOption[\PackageInfo]{headnosepline}{headsepline=false}
\newif\if@fsl
@@ -551,11 +528,10 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\@ifpackageloaded{typearea}{%
\KOMAoptions{footinclude=#1}%
- }{%
- \PassOptionsToPackage{footinclude=#1}{typearea}%
- }%
+ }{}%
}
\KOMA@DeclareObsoleteOption[\PackageInfo]{footnosepline}{footsepline=false}
+\@twosidefalse
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -689,244 +665,253 @@
}
%%% From File: scrklist.dtx
%%% From File: scrkmisc.dtx
-\DeclareKeyValOption[%
- \let\scr@pti@nerr@r
- \OptionNotUsed
- \x@paper
-]{KOMA}
-\KOMAoptions{%
- draft=false,headsepline=false,footsepline=false,parskip=false%
- ,twoside=false%
-}
-\ProcessOptions\relax
+\KOMAExecuteOptions{%
+ parskip=false%
+}
+\KOMAProcessOptions\relax
%%% From File: scrkcomp.dtx
%%% From File: scrkfont.dtx
\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
\ClassWarning{\KOMAClassName}{%
Using fallback calculation to setup font sizes\MessageBreak
for basic size `#2'}%
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \setlength{\@tempdimc}{\@tempdima}%
- \addtolength{\@tempdimc}{-10\p@}%
- \edef\@ptsize{\strip@pt\@tempdimc}%
- \@defaultunits\@tempdimb#1pt\relax\@nnil
- \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
- \edef\@tempb{\the\@tempdimc}%
- \setlength{\@tempdimc}{\@tempdima}%
- \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
- \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\normalsize{%
- \noexpand\@setfontsize\noexpand\normalsize
+ \scr@ifundefinedorrelax{dimexpr}{%
+ \ClassError{\KOMAClassName}{%
+ feature only allowed using e-TeX%
+ }{%
+ The fallback calculation to setup font sizes was implemented
+ using e-TeX.\MessageBreak
+ You should not continue, because the fallback calculation would fail%
+ }
+ }{%
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \setlength{\@tempdimc}{\@tempdima}%
+ \addtolength{\@tempdimc}{-10\p@}%
+ \edef\@ptsize{\strip@pt\@tempdimc}%
+ \@defaultunits\@tempdimb#1pt\relax\@nnil
+ \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+ \edef\@tempb{\the\@tempdimc}%
+ \setlength{\@tempdimc}{\@tempdima}%
+ \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
+ \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\normalsize{%
+ \noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listI
- }%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\small{%
- \noexpand\@setfontsize\noexpand\small
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listI
+ }%
+ \setlength{\@tempdima}{0.9125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\small{%
+ \noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \edef\footnotesize{%
- \noexpand\@setfontsize\noexpand\footnotesize
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{.83334\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \edef\footnotesize{%
+ \noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
- \noexpand\@setfontsize\noexpand\scriptsize
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{.66667\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsize{%
+ \noexpand\@setfontsize\noexpand\scriptsize
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
- \noexpand\@setfontsize\noexpand\tiny
+ }%
+ \setlength{\@tempdima}{.5\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tiny{%
+ \noexpand\@setfontsize\noexpand\tiny
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
- \noexpand\@setfontsize\noexpand\large
+ }%
+ \setlength{\@tempdima}{1.2\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\large{%
+ \noexpand\@setfontsize\noexpand\large
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
- \noexpand\@setfontsize\noexpand\Large
+ }%
+ \setlength{\@tempdima}{1.44\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Large{%
+ \noexpand\@setfontsize\noexpand\Large
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
- \noexpand\@setfontsize\noexpand\LARGE
+ }%
+ \setlength{\@tempdima}{1.728\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\LARGE{%
+ \noexpand\@setfontsize\noexpand\LARGE
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
+ }%
+ \setlength{\@tempdima}{2.074\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\huge{%
+ \noexpand\@setfontsize\noexpand\huge
{\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
+ }%
+ \setlength{\@tempdima}{2.488\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Huge{%
+ \noexpand\@setfontsize\noexpand\Huge
{\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \let\@listI\@listi
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@small{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@footnotesize{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listii\endcsname
+ \endgroup
+ \edef\@listii{\leftmargin\leftmarginii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiii\endcsname
+ \endgroup
+ \edef\@listiii{\leftmargin\leftmarginiii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \z@
+ \partopsep \the\parsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \def\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \def\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \def\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
}%
- \normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@small{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@footnotesize{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listii\endcsname
- \endgroup
- \edef\@listii{\leftmargin\leftmarginii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiii\endcsname
- \endgroup
- \edef\@listiii{\leftmargin\leftmarginiii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \z@
- \partopsep \the\parsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \def\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \def\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \def\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
}
\providecommand*{\@fontsizefilebase}{scrsize}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -992,20 +977,6 @@
}%
}%
}
-\scr@ifundefined{unexpanded}{%
- \newcommand*{\g@addto@macro@temp}{}%
- \newcommand{\l@addto@macro}[2]{%
- \begingroup%
- \toks@\expandafter{#1#2}%
- \xdef\g@addto@macro@temp{\the\toks@}%
- \endgroup
- \let#1\g@addto@macro@temp
- }%
-}{%
- \newcommand{\l@addto@macro}[2]{%
- \edef#1{\unexpanded\expandafter{#1#2}}%
- }%
-}
\newcommand*{\addtokomafont}[2]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{%
@@ -1321,6 +1292,8 @@
\newcommand{\titlehead}[1]{\gdef\@titlehead{#1}}
\newcommand*{\@subject}{}
\newcommand*{\subject}[1]{\gdef\@subject{#1}}
+\newcommand*{\subtitle}[1]{\gdef\@subtitle{#1}}
+\newcommand*{\@subtitle}{}
\newcommand*{\@publishers}{}
\newcommand{\publishers}[1]{\gdef\@publishers{#1}}
\newcommand*{\@uppertitleback}{}
@@ -1341,7 +1314,7 @@
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tpage\cleardoublepage
+ \noindent\@extratitle\next@tpage\cleardoubleemptypage
\thispagestyle{empty}%
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -1357,7 +1330,9 @@
\vskip 3em
\fi
{\titlefont\huge \@title\par}%
- \vskip 3em
+ \vskip 1em
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ \vskip 2em
{\Large \lineskip 0.75em
\begin{tabular}[t]{c}
\@author
@@ -1384,7 +1359,7 @@
\next@tpage\null\vfill
{\centering \Large \@dedication \par}%
\vskip \z@ \@plus3fill
- \if@twoside \next@tpage\cleardoublepage \fi
+ \if@twoside \next@tpage\cleardoubleemptypage \fi
\fi
\end{titlepage}
\setcounter{footnote}{0}%
@@ -1394,6 +1369,7 @@
\global\let\@author\@empty
\global\let\@date\@empty
\global\let\@title\@empty
+ \global\let\@subtitle\@empty
\global\let\@extratitle\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
@@ -1447,6 +1423,7 @@
\global\let\@author\@empty
\global\let\@date\@empty
\global\let\@title\@empty
+ \global\let\@subtitle\@empty
\global\let\@extratitle\@empty
\global\let\@titlehead\@empty
\global\let\@subject\@empty
@@ -1487,7 +1464,9 @@
\vskip 1.5em
\fi
{\titlefont\huge \@title \par}%
- \vskip 1.5em%
+ \vskip .5em
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ \vskip 1em
{\Large
\lineskip .5em%
\begin{tabular}[t]{c}
@@ -1508,6 +1487,7 @@
}
\newcommand*\titlefont{\sectfont}
\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}
+\newkomafont{subtitle}{\usekomafont{title}\large}
\newcommand*{\scr@fnt@title}{\titlefont}
\newcommand*{\scr@fnt@subject}{\subject@font}
\if@titlepage
@@ -1835,7 +1815,7 @@
\newcommand*{\@@makechapterhead}[1]{\chapterheadstartvskip
{%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
- \normalfont\sectfont\size@chapter{}%
+ \normalfont\sectfont\nobreak\size@chapter{}%
\if@chapterprefix
\let\@tempa\raggedsection
\else
@@ -1849,7 +1829,7 @@
\fi
{\chapterformat}%
\if@chapterprefix
- \size@chapterprefix{}\endgraph\nobreak\vskip.5\baselineskip
+ \size@chapterprefix{}\endgraf\nobreak\vskip.5\baselineskip
\fi
\fi
}%
@@ -1870,7 +1850,7 @@
}
\newcommand*{\@@makeschapterhead}[1]{%
\chapterheadstartvskip%
- {\normalfont\sectfont\size@chapter{}%
+ {\normalfont\sectfont\nobreak\size@chapter{}%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}%
\nobreak\chapterheadendvskip%
@@ -1921,14 +1901,14 @@
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@
plus 1fil}\fi
- \raggedsection\normalfont\sectfont\size@section}%
+ \raggedsection\normalfont\sectfont\nobreak\size@section}%
}
\newcommand\subsection{\@startsection{subsection}{2}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@
plus 1fil}\fi
- \raggedsection\normalfont\sectfont\size@subsection
+ \raggedsection\normalfont\sectfont\nobreak\size@subsection
}%
}
\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
@@ -1936,25 +1916,25 @@
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\setlength{\parfillskip}{\z@
plus 1fil}\fi
- \raggedsection\normalfont\sectfont\size@subsubsection
+ \raggedsection\normalfont\sectfont\nobreak\size@subsubsection
}%
}
\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
- {\raggedsection\normalfont\sectfont\size@paragraph}%
+ {\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
- {\raggedsection\normalfont\sectfont\size@subparagraph}%
+ {\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
}
\newkomafont{minisec}{}
\newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex
{\parindent \z@
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont
+ \raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}#1\par\nobreak}\nobreak%
\@afterheading
}
@@ -1963,6 +1943,10 @@
\newcommand*{\raggedpart}{}
\let\raggedpart\centering
\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
+\newkomafont{partentry}{\usekomafont{sectioning}\large}
+\newkomafont{partentrypagenumber}{}
+\newkomafont{chapterentry}{\usekomafont{sectioning}}
+\newkomafont{chapterentrypagenumber}{}
\newcommand*{\size@part}{}
\newcommand*{\size@partnumber}{}
\newcommand*{\size@chapter}{}
@@ -2108,10 +2092,12 @@
\begingroup
\parindent \z@ \rightskip \@pnumwidth
\parfillskip -\@pnumwidth
- \leavevmode\sectfont\large
+ \leavevmode
\advance\leftskip\@tempdima
\hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \usekomafont{partentry}{#1\nobreak
+ \usekomafont{partentrypagenumber}{\hfil\nobreak
+ \hb@xt@\@pnumwidth{\hss#2}}}\par
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}
\endgroup
\penalty20010
@@ -2134,12 +2120,16 @@
\fi
\fi
\begingroup
- \parindent \z@ \rightskip \@pnumwidth
+ \raggedchapterentry
+ \parindent \z@ \advance\rightskip \@pnumwidth
\parfillskip -\@pnumwidth
- \leavevmode \sectfont
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \interlinepenalty\@M
+ \leavevmode
+ \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+ \usekomafont{chapterentry}{#1\nobreak
+ \usekomafont{chapterentrypagenumber}{%
+ \hfill\nobreak
+ \hb@xt@\@pnumwidth{\hss#2}}}\par
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}
\endgroup
\penalty20009
@@ -2149,6 +2139,7 @@
\fi
\fi
}
+\newcommand*{\raggedchapterentry}{}
\newcommand*{\l@chapteratlist}{\l@chapter}
\newcommand*\l@section{\bprot@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\l@subsection{\bprot@dottedtocline{2}{3.8em}{3.2em}}
@@ -2262,120 +2253,81 @@
\aliaskomafont{pagination}{pagenumber}
\newcommand*{\scr@fnt@pagehead}{\headfont}
\newcommand*{\scr@fnt@wrn@pagehead}[1]{%
- font selection of elements `pagehead' and `pagefoot'\MessageBreak
- changed, because they are same%
+ `pagehead' and `pagefoot' are aliases for the same^^b8\MessageBreak
+ font element, changed%
}
\aliaskomafont{pagefoot}{pagehead}
\newcommand*{\pagemark}{{\usekomafont{pagenumber}%
\thepage}}
-\if@twoside
- \renewcommand*{\ps@plain}{%
- \renewcommand*{\@evenhead}{}%
- \renewcommand*{\@oddhead}{}%
- \renewcommand*{\@evenfoot}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark}}}}\hss}%
+\renewcommand*{\ps@plain}{%
+ \renewcommand*{\@oddhead}{}%
+ \let\@evenhead\@oddhead
+ \renewcommand*{\@evenfoot}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
+ \renewcommand*{\@oddfoot}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\hfil\pagemark
+ \if@twoside\else\hfil\fi}}}}\hss}%
+}%
+\newcommand*{\ps@headings}{\let\@mkboth\markboth
+ \renewcommand*{\@evenhead}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
+ \renewcommand*{\@oddhead}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark
+ \if@twoside\else\hfil\fi}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
+ \renewcommand*{\@evenfoot}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
+ \renewcommand*{\@oddfoot}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\hfil\pagemark
+ \if@twoside\else\hfil\fi}}}}\hss}%
+ \renewcommand*{\chaptermark}[1]{%
+ \if@twoside\expandafter\markboth\else\expandafter\markright\fi
+ {\ifnum \c@secnumdepth >\m@ne
+ \chaptermarkformat
+ \fi
+ ##1}{}%
}%
- \newcommand*{\ps@headings}{\let\@mkboth\markboth
- \renewcommand*{\@evenhead}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
- \renewcommand*{\@evenfoot}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark}}}}\hss}%
- \renewcommand*{\chaptermark}[1]{%
- \markboth{\ifnum \c@secnumdepth >\m@ne
- \chaptermarkformat
- \fi
- ##1}{}%
- }%
- \renewcommand*{\sectionmark}[1]{%
+ \renewcommand*{\sectionmark}[1]{%
+ \if@twoside
\markright{\ifnum \c@secnumdepth >\z@
- \sectionmarkformat\fi
- ##1}}%
+ \sectionmarkformat\fi
+ ##1}%
+ \fi
}%
- \newcommand*{\ps@myheadings}{\let\@mkboth\@gobbletwo
- \renewcommand*{\@evenhead}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
- \renewcommand*{\@evenfoot}{%
- \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark}}}}\hss}%
- \renewcommand*{\chaptermark}[1]{}%
- \renewcommand*{\sectionmark}[1]{}%
- }
-\else
- \renewcommand*{\ps@plain}{%
- \renewcommand*{\@oddhead}{%
- }%
- \let\@evenhead\@oddhead%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark\hfil}}}}\hss
- }%
- \let\@evenfoot\@oddfoot
- }
- \newcommand*{\ps@headings}{\let\@mkboth\markboth
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark\hfil}}
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss
- }%
- \let\@evenhead\@oddhead
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark\hfil}}}\hss}}%
- \renewcommand*{\sectionmark}[1]{}%
- \renewcommand*{\chaptermark}[1]{%
- \markright{\ifnum \c@secnumdepth >\m@ne
- \chaptermarkformat
- \fi
- ##1}}%
- \let\@evenfoot\@oddfoot
- }
- \newcommand*{\ps@myheadings}{%
- \let\@mkboth\@gobbletwo
- \renewcommand*{\@evenhead}{}%
- \renewcommand*{\@oddhead}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark\hfil}}%
- \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
- \renewcommand*{\@evenfoot}{}%
- \renewcommand*{\@oddfoot}{%
- \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
- \if@fsl \hrule \vskip 3\p@ \fi
- \hb@xt@ \@tempdima{{\hfil\pagemark\hfil}}}}\hss}%
- \renewcommand*{\chaptermark}[1]{}%
- \renewcommand*{\sectionmark}[1]{}%
- }
-\fi
+}%
+\newcommand*{\ps@myheadings}{\let\@mkboth\@gobbletwo
+ \renewcommand*{\@evenhead}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\strut\leftmark\hfil}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}}%
+ \renewcommand*{\@oddhead}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \hb@xt@ \@tempdima{{\headfont\hfil\strut\rightmark
+ \if@twoside\else\hfil\fi}}%
+ \if@hsl \vskip 1.5\p@ \hrule \fi}}\hss}%
+ \renewcommand*{\@evenfoot}{%
+ \set@tempdima@hw\hss\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\pagemark\hfil}}}}}%
+ \renewcommand*{\@oddfoot}{%
+ \set@tempdima@hw\hb@xt@ \@tempdima{\vbox{%
+ \if@fsl \hrule \vskip 3\p@ \fi
+ \hb@xt@ \@tempdima{{\hfil\pagemark
+ \if@twoside\else\hfil\fi}}}}\hss}%
+ \renewcommand*{\chaptermark}[1]{}%
+ \renewcommand*{\sectionmark}[1]{}%
+}
\newcommand*{\titlepagestyle}{plain}
\newcommand*{\partpagestyle}{plain}
\newcommand*{\chapterpagestyle}{plain}
@@ -2720,7 +2672,7 @@
\sbox\@tempboxa{%
{\capfont\strut\ignorespaces
#1{{\caplabelfont#2\captionformat}}%
- #3}%
+ #3\unskip\strut}%
}%
\let\@footnotetext=\scr@tmp@footnotetext
\let\scr@tmp@footnotetext=\undefined
@@ -2735,23 +2687,23 @@
\hb@xt@\hsize{%
\setbox\@tempboxa\vbox{\hsize=\cap@width
\ifdofullc@p
- {\capfont\@hangfrom{\strut\ignorespaces
- #1{{\caplabelfont#2\captionformat}}}%
- {#3\par}}%
+ {\capfont\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont#2\captionformat}}}}%
+ {#3\unskip\strut\par}}%
\else%
\ifdim\cap@indent<\z@
{\capfont\strut\ignorespaces
#1{{\caplabelfont #2\captionformat\par}}%
- \noindent\hspace*{-\cap@indent}#3\par}%
+ \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}%
\else%
\if@capbreak
{\capfont\strut\ignorespaces
#1{{\caplabelfont #2\captionformat\par}}%
\noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}%
\else
- {\capfont\@hangfrom{\strut\hspace*{\cap@indent}}%
- {\hspace{-\cap@indent}\ignorespaces#1%
- {{\caplabelfont#2\captionformat}}#3\par}}%
+ {\capfont\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
+ {{\caplabelfont#2\captionformat}}}#3\unskip\strut\par}}%
\fi
\fi
\fi
@@ -2768,8 +2720,8 @@
\else
\global \@minipagefalse
\sbox\@tempboxa{%
- {\capfont\strut\ignorespaces
- #1{{\caplabelfont#2\captionformat}}%
+ {\capfont\scr@smashdp{\strut\ignorespaces
+ #1{{\caplabelfont#2\captionformat}}}%
#3}%
}%
\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index c7bc1aed94e..99acf116586 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/03/07 v2.97a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2007/09/28 v2.97c KOMA-Script}%
\endgroup
%%% From File: scrktare.dtx
\ProvidesPackage{typearea}[%
@@ -216,10 +216,12 @@
\endgroup
\def\ta@hh{#1\baselineskip}%
}
+\newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl}
\KOMA@ifkey{headinclude}{@hincl}
\KOMA@DeclareObsoleteOption[\PackageInfo]{headexclude}{%
headinclude=false%
}
+\newif\if@fincl\@ifundefined{if@fsl}{}{\let\if@fincl\if@fsl}
\KOMA@ifkey{footinclude}{@fincl}
\KOMA@DeclareObsoleteOption[\PackageInfo]{footexclude}{%
footinclude=false%
@@ -251,12 +253,14 @@
\KOMA@DeclareObsoleteOption[\PackageInfo]{DIVcalc}{DIV=calc}
\KOMA@DeclareObsoleteOption[\PackageInfo]{DIVclassic}{DIV=classic}
\KOMA@key{twoside}[true]{%
+ \if@atdocument\if@twoside\cleardoublepage\else\clearpage\fi\fi
\KOMA@set@ifkey{twoside}{@twoside}{#1}%
\if@twoside\@mparswitchtrue\else\@mparswitchfalse\fi%
\csname recalctypearea\endcsname
}
\KOMA@DeclareObsoleteOption[\PackageInfo]{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
+ \if@atdocument\clearpage\fi
\KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
\csname recalctypearea\endcsname
}
@@ -413,6 +417,8 @@
}
\newcommand*{\maybe@@pair}{}
\def\@maybepair(#1,#2)\scr@next{\def\@tempa{#1}\def\@tempb{#2}}%
+\DeclareOption*{%
+ \x@paper}
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -420,9 +426,13 @@
***************************************%
}
}{}
-\DeclareKeyValOption[\x@paper]{KOMA}
-\KOMAoptions{headinclude=false,footinclude=false,paper=A4}
-\ProcessOptions*\relax
+\KOMAExecuteOptions{paper=A4}
+\if@twoside
+ \KOMAExecuteOptions{twoside}
+\else
+ \KOMAExecuteOptions{twoside=false}
+\fi
+\KOMAProcessOptions
\providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}}
\providecommand\ta@divlistelse{1}
\newlength{\ta@hblk}
@@ -494,12 +504,13 @@
\if@fincl
\advance\ta@temp by-\footskip
\fi
- \scr@ifundefined{@ptsize}{%
+ \scr@ifundefinedorrelax{@ptsize}{%
\topskip=\f@size\p@
}{%
\topskip=\@ptsize\p@
\advance\topskip by 10\p@
}%
+ \maxdepth=.5\topskip
\textheight=\topskip
\@whiledim\textheight <\ta@temp
\do{\advance\textheight by\baselineskip}%
@@ -565,7 +576,7 @@
\fi
\hsize=\columnwidth
\linewidth\hsize
- \scr@ifundefined{@pagesizelast}{}{\KOMAoptions{pagesize=\@pagesizelast}}%
+ \scr@ifundefinedorrelax{@pagesizelast}{}{\KOMAoptions{pagesize=\@pagesizelast}}%
\fi
}
\newcommand*{\ta@divfor}[1]{%
@@ -613,7 +624,7 @@
\fi
}
\newcommand*\typearea[2][\z@]{%
- \scr@ifundefined{currentgrouptype}{}{%
+ \scr@ifundefinedorrelax{currentgrouptype}{}{%
\ifcase\currentgrouptype\else
\PackageWarning{typearea}{%
\string\typearea\space used at group level
@@ -840,7 +851,7 @@
\advance\oddsidemargin by\ta@bcor
\evensidemargin\oddsidemargin
\fi
- \scr@ifundefined{@ptsize}{%
+ \scr@ifundefinedorrelax{@ptsize}{%
\topskip=\f@size\p@
}{%
\topskip=\@ptsize\p@