summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls1198
1 files changed, 778 insertions, 420 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 74b390edc19..8f48976170f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -71,7 +71,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -93,21 +93,27 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
+\providecommand*{\scr@clsextenstion}{\@clsextenstion}
+\AtBeginDocument{%
+ \let\scr@clsextension\@clsextension
+}
\newcommand*{\KOMAClassName}{%
scrlttr2%
}
\newcommand*{\ClassName}{%
letter%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -118,14 +124,22 @@
this value of version is not supported.\MessageBreak
Because of this, version was set to `first'%
}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{version}{first}%
}{%
\ClassInfoNoLine{\KOMAClassName}{%
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{version}{#1}%
}%
}
+\KOMA@kav@add{.\KOMAClassFileName}{version}{last}
\AtEndOfClass{%
\KOMA@key{version}[]{%
\ClassError{\KOMAClassName}{%
@@ -191,21 +205,41 @@
\@namedef{scr@v@3.14}{13}
\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@last}{14}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+\@namedef{scr@v@3.17}{15}
+\@namedef{scr@v@last}{15}
+\newcommand*{\scr@v@is@lt}[1]{%
+ \scr@compatibility<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@gt}[1]{%
+ \scr@compatibility>\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@le}[1]{%
+ \numexpr\scr@compatibility-\@ne\relax<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@ge}[1]{%
+ \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if@tempswa
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
\expandafter
@@ -222,16 +256,22 @@
}
\AtEndOfClass
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
\KOMA@set@ifkey{numericaldate}{@orgdate}{#1}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{numericaldate}{@orgdate}%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\@ptsize{%
12%
}
@@ -294,10 +334,13 @@
\@tempa
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -357,20 +400,52 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
\FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @tempswa%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \raggedbottom
+ \fi
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{twoside}{#1}%
+ \fi
}
+\KOMAExecuteOptions{twoside=false}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
- \FamilyKeyStateProcessed
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{twocolumn}{@twocolumn}%
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \fi
+}
+\AtEndOfClass{%
+ \expandafter\ifnum\scr@v@is@lt{3.17}%
+ \raggedbottom
+ \fi
}
+\KOMAExecuteOptions{twocolumn=false}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -379,6 +454,16 @@
\def\scr@parskip{#2}%
\def\scr@parfillskip{#3}%
\def\par@update{\let\par@update\default@par@update\par@updaterelative}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f@parindent}{\the\parindent}
\newcommand*{\f@parskip}{\the\parskip}
@@ -416,53 +501,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -476,6 +574,9 @@
}%
\or%11
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -503,11 +604,14 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{headinclude=#1}%
}{%
@@ -515,11 +619,13 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
@@ -527,8 +633,8 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
-\@twosidefalse
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -542,6 +648,9 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{current}%
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -550,6 +659,9 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{#1}%
}%
}{%
\ifx\@currname\KOMAClassName
@@ -560,6 +672,8 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}%
+ {cleardoublepage}{#1}%
}%
}{}%
\fi
@@ -592,6 +706,23 @@
\cleardoublestandardpage
\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{cleardoublepage}{%
+ \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi
+}
+\AtEndOfClass{%
+ \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
+ {%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@xadd{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{\@tempa}%
+}
\newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage}
\newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage}
\newcommand*{\cleardoublepageusingstyle}[1]{\clearpage
@@ -601,8 +732,8 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -621,17 +752,40 @@
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
}%
}
+\AtBeginDocument{%
+ \ifx\@footnotemark\scr@saved@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
+ \else\ifx\@footnotemark\scr@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
+ \fi\fi
+}
\newcommand*{\scr@footmisc@options}{}
\PassOptionsToPackage{\noexpand\scr@footmisc@options}{footmisc}
\newcommand*{\scr@saved@footnotemark}{%
@@ -649,9 +803,10 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
-\KOMA@ifkey{firsthead}{@firsthead}\@firstheadtrue
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $
+\KOMA@ifkey{firsthead}{@firsthead}
+\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
\KOMA@key{fromalign}{%
\KOMA@set@ncmdkey{fromalign}{@alignfrom}{%
@@ -663,14 +818,22 @@
{no}{10000},{false}{10000},{off}{10000}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{fromalign}{#1}%
\ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi
\fi
}
-\newcommand*{\@rulefrom}{0}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{fromalign}{left}
\KOMA@ncmdkey{fromrule}[below]{@rulefrom}{%
{false}{0},{no}{0},{off}{0},{aftername}{1},%
{below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}%
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{fromrule}{false}
\KOMA@ifkey{fromphone}{@phone}
\KOMA@ifkey{frommobilephone}{@mobilephone}
\KOMA@ifkey{fromfax}{@fax}
@@ -694,7 +857,7 @@
KOMA-Script version 3.03. I'll replace the usage of\MessageBreak
\string\@afieldtrue\space by
\string\KOMAoptions{addrfield=true}.\MessageBreak
- This may result in erros. A better solution would be\MessageBreak
+ This may result in errors. A better solution would be\MessageBreak
to change the code}%
\KOMAoptions{addrfield=true}}
\newcommand*{\@afieldfalse}{%
@@ -704,7 +867,7 @@
KOMA-Script version 3.03. I'll replace the usage of\MessageBreak
\string\@afieldfalse\space by
\string\KOMAoptions{addrfield=false}.\MessageBreak
- This may result in erros. A better solution would be\MessageBreak
+ This may result in errors. A better solution would be\MessageBreak
to change the code}%
\KOMAoptions{addrfield=false}}
\newcommand*{\@afieldmode}{\@ne}
@@ -719,9 +882,12 @@
{ppbackgroundimage}{3},{ppBackgroundImage}{3},{ppBackGroundImage}{3},%
{image}{4},{Image}{4},%
{PPimage}{4},{PPImage}{4},%
- {ppimage}{4},{ppImage}{4}%
+ {ppimage}{4},{ppImage}{4},%
+ {topaligned}{5},{alignedtop}{5}%
}
-\newcommand*{\ltr@priority}{0}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{addrfield}{true}
\KOMA@ncmdkey{priority}[A]{ltr@priority}{%
{no}{0},{off}{0},{false}{0},{manual}{1},%
{B}{1},{b}{1},%
@@ -731,6 +897,9 @@
{priority}{2},{Priority}{2},{PRIORITY}{2},%
{A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}%
}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{priority}{false}
\newcommand{\backaddr@format}[1]{}
\let\backaddr@format\underline
\newif\if@baddr\@baddrtrue
@@ -761,6 +930,27 @@
\else
\endgroup
\fi
+ \if@baddr
+ \ifx\backaddr@format\underline
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{backaddress}{underlined}%
+ \else
+ \ifx\backaddr@format\@firstofone
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{backaddress}{plain}%
+ \else
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{backaddress}{true}%
+ \fi
+ \fi
+ \else
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{backaddress}{false}%
+ \fi
\else
\endgroup
\FamilyKeyStateUnknownValue
@@ -774,15 +964,24 @@
\ifcase\@tempa
\endgroup
\@bigloctrue
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{locfield}{wide}%
\else
\endgroup
\@biglocfalse
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{locfield}{narrow}%
\fi
\else
\endgroup
\FamilyKeyStateUnknownValue
\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{locfield}{narrow}
\KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide}
\KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow}
\newif\if@fold\@foldtrue
@@ -838,7 +1037,21 @@
\expandafter\sc@nf@ldch@rs#1\@nil
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{foldmarks}{\@usefolds}%
+ \KOMA@kav@xadd{.%
+ \KOMAClassFileName
+ }{foldmarks}{\if@fold true\else false\fi}%
+ \fi
}
+\KOMA@kav@xadd{.%
+ \KOMAClassFileName
+}{foldmarks}{\@usefolds}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{foldmarks}{true}%
\newcommand*{\scr@removechar}[2]{%
\def\in@@##1#2##2##3\in@@{%
\ifx\in@##2\else
@@ -861,24 +1074,84 @@
\ifcase\@tempa
\endgroup
\@refwidetrue
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{wide}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{narrow}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{wide}%
\or
\endgroup
\@refwidefalse
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{wide}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{narrow}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{narrow}%
\or
\endgroup
\def\@datepos{2}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateleft}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateright}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{nodate}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{dateleft}%
\or
\endgroup
\def\@datepos{1}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateleft}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateright}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{nodate}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{dateright}%
\or
\endgroup
\def\@datepos{0}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateleft}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateright}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{nodate}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{nodate}%
\fi
\else
\endgroup
\FamilyKeyStateUnknownValue
\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{refline}{dateright}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{refline}{narrow}%
\newcommand{\subject@format}[1]{#1}
\newcommand*{\raggedsubject}{}
\newif\if@subj
@@ -918,7 +1191,43 @@
\aftergroup\FamilyKeyStateUnknownValue
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{subject}{\if@subj titled\else untitled\fi}%
+ \KOMA@kav@xadd{.%
+ \KOMAClassFileName
+ }{subject}{\if@subjafter after\else before\fi opening}%
+ \ifx\subject@format\undeline
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{subject}{underlined}%
+ \fi
+ \ifx\raggedsubject\raggedright
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{subject}{left}%
+ \else
+ \ifx\raggedsubject\raggedleft
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{subject}{right}%
+ \else
+ \ifx\raggedsubject\centering
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{subject}{centered}%
+ \fi
+ \fi
+ \fi
+ \fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{subject}{untitled}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{subject}{beforeopening}%
\KOMA@ifkey{enlargefirstpage}{@enlargefp}
\KOMA@ifkey{firstfoot}{@firstfoot}\@firstfoottrue
\newcommand*{\@pageat}{4}
@@ -967,10 +1276,35 @@
\def\@tempa{\endgroup\FamilyKeyStateUnknownValue}%
\fi
\@tempa
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{pagenumber}{%
+ \ifcase \@pageat
+ topleft%
+ \or
+ topmiddle%
+ \or
+ topright%
+ \or
+ botleft%
+ \or
+ botmiddle%
+ \or
+ botright%
+ \else
+ false%
+ \fi
+ }%
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{pagenumber}{botmiddle}
\newif\if@scrsymbols
\KOMA@key{symbolicnames}[true]{%
\KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{symbolicnames}{@scrsymbols}%
\if@scrsymbols
\if@atdocument
\begingroup
@@ -999,7 +1333,7 @@
\fi
\endgroup
\else
- \ifstr{\@currname.\@currext}{scrlttr2.cls}{%
+ \ifstr{\@currname.\@currext}{\KOMAClassFileName}{%
\expandafter\AtEndOfClass
}{%
\expandafter\@firstofone
@@ -1008,13 +1342,16 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{symbolicnames}{false}%
+%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -1026,9 +1363,9 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\scr@setlength[4]{%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
\else
\ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
@@ -1062,325 +1399,325 @@
\fi
\fi
}
-\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
- \ClassWarning{\KOMAClassName}{%
- Using fallback calculation to setup font sizes\MessageBreak
- for basic size `#2'}%
- \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%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \else
- \scr@setlength{\abovedisplayskip}%
- {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
- \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
- \scr@setlength{\belowdisplayshortskip}%
- {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
- \fi
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \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}%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \else
- \scr@setlength{\abovedisplayskip}%
- {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
- \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
- \scr@setlength{\belowdisplayshortskip}%
- {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
- \fi
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \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}%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
- \else
- \scr@setlength{\abovedisplayskip}%
- {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
- \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
- \scr@setlength{\belowdisplayshortskip}%
- {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
- \fi
- \setlength{\belowdisplayskip}{\abovedisplayskip}%
- \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
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \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
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \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
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
+\providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{fontsize}%
+ \@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%
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \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}%
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \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}%
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
+ \setlength{\belowdisplayskip}{\abovedisplayskip}%
+ \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
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \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
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \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
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \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
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
+ \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}%
+ \fi
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \scr@setlength{\parsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \fi
+ \@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
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \fi
+ \@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
+ }%
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}%
+ \fi
+ \@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
+ }%
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \fi
+ \@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
+ }%
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\topsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \fi
+ \setlength{\partopsep}{\z@ \@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\partopsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \edef\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \edef\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \edef\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \normalsize
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \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}%
- \fi
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \else
- \setlength{\@tempdimb}{\f@baselineskip}%
- \scr@setlength{\parsep}%
- {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
- \scr@setlength{\topsep}%
- {.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
- \fi
- \@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
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \else
- \scr@setlength{\parsep}%
- {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
- \scr@setlength{\topsep}%
- {.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
- \fi
- \@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
- }%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
- \else
- \scr@setlength{\parsep}%
- {.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}%
- \scr@setlength{\topsep}%
- {.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}%
- \fi
- \@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
- }%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \else
- \scr@setlength{\parsep}%
- {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
- \scr@setlength{\topsep}%
- {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
- \fi
- \@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
- }%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \else
- \scr@setlength{\topsep}%
- {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
- \fi
- \setlength{\partopsep}{\z@ \@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\partopsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
- \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}%
- \else
- \setlength{\@tempdimb}{\f@baselineskip}%
- \setlength{\footnotesep}{.555\@tempdimb}%
- \scr@setlength{\skip\footins}%
- {.75\@tempdimb}{.3333\@tempdimb}{.1667\@tempdimb}%
- \scr@setlength{\floatsep}%
- {\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
- \scr@setlength{\textfloatsep}%
- {1.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
- \setlength{\intextsep}{\floatsep}%
- \setlength{\dblfloatsep}{\floatsep}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{\z@ \@plus 1fil}%
- \setlength{\@fpsep}{.6667\@tempdimb \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{\@fptop}%
- \setlength{\@dblfpsep}{\@fpsep}%
- \setlength{\@dblfpbot}{\@fptop}%
- \scr@setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
- \fi
+ \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}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \setlength{\footnotesep}{.555\@tempdimb}%
+ \scr@setlength{\skip\footins}%
+ {.75\@tempdimb}{.3333\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\floatsep}%
+ {\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\textfloatsep}%
+ {1.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \setlength{\intextsep}{\floatsep}%
+ \setlength{\dblfloatsep}{\floatsep}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{\z@ \@plus 1fil}%
+ \setlength{\@fpsep}{.6667\@tempdimb \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{\@fptop}%
+ \setlength{\@dblfpsep}{\@fpsep}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \scr@setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
+ \fi
+}
+\scr@ifundefinedorrelax{changefontsizes}{%
+ \let\changefontsizes\simple@changefontsizes
+}{%
+ \ClassWarning{\KOMAClassName}{%
+ \string\changefontsizes\space already defined.\MessageBreak
+ I hope, the definition is compatible,\MessageBreak
+ because I do not change it%
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1389,20 +1726,29 @@
\edef\@tempb{\strip@pt\@tempdimb}%
\addtolength{\@tempdimb}{-10\p@}%
\edef\@ptsize{\strip@pt\@tempdimb}%
-\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{
+\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
\InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
- \changefontsizes{\@tempa}%
+ \edef\@tempa{%
+ \noexpand\changefontsizes{\@tempa}%
+ \noexpand\KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ }\@tempa
}%
}%
}
@@ -1455,20 +1801,18 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
\newcommand*{\scr@tpo}{0}
-\newcommand*{\is@thispageodd}{%
+\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
\begingroup
\@tempcnta=\scr@tpo
\advance\@tempcnta by\@ne
\xdef\scr@tpo{\the\@tempcnta}%
- \protected@write\@auxout{\let\arabic\relax}{%
- \string\new@tpo@label{\scr@tpo}{\arabic{page}}}%
\expandafter\ifx\csname tpo@\scr@tpo\endcsname\relax
\protect\G@refundefinedtrue
\ClassWarning{\KOMAClassName}{%
@@ -1483,8 +1827,15 @@
\aftergroup\thispagewasoddfalse
\fi
\endgroup
+ \edef\is@thispageodd@setlabel{%
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ }%
+ #1%
\@esphack
}
+\newcommand*{\is@thispageodd@setlabel}{}
\newif\ifthispagewasodd
\newcommand{\ifthispageodd}{%
\is@thispageodd
@@ -1531,7 +1882,7 @@
commands}
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage`}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
{\let\@restore@catcode@level=\z@}{}%
@@ -1646,7 +1997,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
\ClassInfo{scrlttr2%
@@ -2159,7 +2510,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\newkomavar}{%
\@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
\newcommand*{\@newkomavar}[2][\relax]{%
@@ -2285,7 +2636,7 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -2340,7 +2691,7 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2351,7 +2702,7 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\newcommand*{\scr@selectfont}{}
@@ -2477,7 +2828,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2497,9 +2848,11 @@
Font of page foot will also be changed%
}
\newcommand*{\scr@fnt@pagefoot}{\footfont}
-\newcommand*
- {\pagemark}{{\usekomafont{pagenumber}{%
- \pagename\ %
+\newcommand*{%
+ \pagemark
+}{%
+ {\usekomafont{pagenumber}{%
+ \pagename\nobreakspace
\thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{%
@@ -2571,13 +2924,11 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
- \raggedbottom
- \onecolumn
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -2714,7 +3065,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
\setlength{\leftmarginiii}{1.87em}
@@ -2809,7 +3160,7 @@
}
\newenvironment{addmargin*}{%
\@tempswafalse
- \if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi
\edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
@@ -2850,13 +3201,13 @@
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
}%
- \item\relax%
+ \item\is@thispageodd@setlabel\nobreak\ignorespaces
}
\newcommand*\descfont{\sffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -2882,7 +3233,9 @@
}%
}
\newcommand*{\scr@firsthead@postsetvar}{%
- \renewcommand*{\@alignfrom}{10000}%
+ \KOMAExecuteOptions[.%
+ \KOMAClassFileName
+ ]{fromalign=no}%
}
\newcommand*{\@gen@firsthead}{%
\ifcase\@alignfrom
@@ -3052,8 +3405,10 @@
\newkomafont{refvalue}{}
\fi
\newkomafont{placeanddate}{}
- \newkomafont{title}{\normalcolor\sffamily\bfseries}%
- \newkomafont{subject}{\normalcolor\bfseries}%
+\newkomafont{lettertitle}{\normalcolor\sffamily\bfseries}
+ \aliaskomafont{lettertitle}{title}%
+\newkomafont{lettersubject}{\normalfont\bfseries}
+ \aliaskomafont{lettersubject}{subject}%
\@newplength{foldmarkhpos}
\@newplength{foldmarkvpos}
\@newplength{tfoldmarkvpos}
@@ -3141,11 +3496,11 @@
\ignorespaces%
}
\newcommand{\vb@t@z}[1]{{%
- \setbox0\vbox to\z@{#1\vss}%
+ \setbox\z@\vbox to\z@{#1\vss}%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\setlength{\baselineskip}{\z@}%
\setlength{\@tempdima}{\ht0}\addtolength{\@tempdima}{\dp0}%
- \box0\vskip-\@tempdima%
+ \box\z@\vskip-\@tempdima%
}%
}
\newcommand*{\@foldmark}[2]{%
@@ -3242,7 +3597,7 @@
\begingroup%
\vbox to #2{#1#3}%
\if@savevbox@warning\@savevbox@warningfalse%
- \setbox0\vbox{#3}%
+ \setbox\z@\vbox{#3}%
\setlength{\@tempdima}{#2}%
\setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
\ifdim \@tempdimb>\@tempdima%
@@ -3351,7 +3706,7 @@
}%
}
\newcommand*{\@addrfield}{%
- \ifcase \@afieldmode\relax
+ \ifcase \ifnum\@afieldmode=5 \@ne\else\@afieldmode\fi\relax
\typeout{Address: No}%
\or
\begingroup%
@@ -3416,7 +3771,7 @@
\usekomafont{specialmail}\usekomavar{specialmail}}%
\hspace*{\useplength{specialmailrightindent}}}%
}%
- \vfil%
+ \ifnum\@afieldmode=\@ne\vfil\fi%
\noindent\hskip\useplength{toaddrindent}%
\setlength{\@tempdima}{\useplength{toaddrwidth}}%
\addtolengthplength[-2]{\@tempdima}{toaddrindent}%
@@ -3489,7 +3844,7 @@
\vbox to \dimexpr \useplength{PPheadheight}-2\fboxsep\relax{%
\setlength{\parindent}{0pt}%
\hsize \dimexpr \useplength{PPheadwidth}-2\fboxsep\relax
- \setbox\@tempboxa\hbox{%
+ \sbox\@tempboxa{%
{\fontsize{20.74pt}{20.74pt}\selectfont
\usekomafont{PPlogo}{P.P.}}\hskip 2mm%
}%
@@ -3740,11 +4095,11 @@
\newcommand*{\@set@reffield}[1]{%
\ifkomavarempty{#1}{}{%
\settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}%
- \setbox0\hbox{\strut\usekomafont{refname}\usekomavar*{#1}}%
+ \sbox\z@{\strut\usekomafont{refname}\usekomavar*{#1}}%
\ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi
\if@tempswa\enskip\hfill\fi
\parbox[t]{\@tempdima}{\noindent\raggedright
- \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{#1}}%
+ \strut\box\z@\\\usekomafont{refvalue}\strut\usekomavar{#1}}%
\@tempswatrue
}%
}
@@ -3826,14 +4181,14 @@
\@set@reffields%
\if@tempswa
\ifnum \@datepos=1 \@set@reffield{date}\fi%
- \setbox0\hbox{\usekomafont{refname}\strutbox}%
- \ifdim\ht0>\ht\strutbox
+ \sbox\z@{\usekomafont{refname}\strutbox}%
+ \ifdim\ht\z@>\ht\strutbox
\ClassWarningNoLine{scrlttr2}{%
Font element `refname' should not be larger than
\string\normalsize!}%
\fi
- \setbox0\hbox{\usekomafont{refvalue}\strutbox}%
- \ifdim\ht0>\ht\strutbox
+ \sbox\z@{\usekomafont{refvalue}\strutbox}%
+ \ifdim\ht\z@>\ht\strutbox
\ClassWarningNoLine{scrlttr2}{%
Font element `refvalue' should not be larger than
\string\normalsize!}%
@@ -3858,7 +4213,7 @@
}{%
\typeout{Title: yes}%
{\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
- \centering\LARGE\usekomafont{title}\usekomavar{title}\par}%
+ \centering\LARGE\usekomafont{lettertitle}\usekomavar{title}\par}%
\vskip\baselineskip%
}%
}
@@ -3888,7 +4243,7 @@
\move@topt\vskip\useplength{subjectvpos}%
\expandafter\vb@t@z\expandafter{%
\fi
- \usekomafont{subject}%
+ \usekomafont{lettersubject}%
\raggedsubject{\if@subj \subject@format{\strut\ignorespaces
\usekomavar*{subject}}\fi}%
\subject@format{\strut\ignorespaces\usekomavar{subject}}\par
@@ -4028,37 +4383,25 @@
\ifdim\useplength{subjectvpos}=\z@\if@subjafter\@subjfield\fi\fi
\@afterindentfalse\@afterheading
}
-\newcommand*{\@xtrimtempa}{%
- \@ifnextchar [{\@@xtrimtempa}{\@@xtrimtempa[]}}
-\newcommand*{\@@xtrimtempa}{}
-\def\@@xtrimtempa[#1]#2\@nil{\def\@tempa{#2}}
-\newcommand*{\@tempdimaismaxwidthof}{}
-\def\@tempdimaismaxwidthof#1\\#2\@nil{%
- \settowidth{\@tempdimb}{\strut\ignorespaces#1}%
- \ifdim\@tempdima<\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
- \def\@tempa{#2}\ifx\@tempa\@empty
- \let\@tempb\relax
- \else
- \expandafter\@xtrimtempa\@tempa\@nil
- \def\@tempb{\expandafter\@tempdimaismaxwidthof\@tempa\@nil}%
- \fi
- \@tempb
-}
\newcommand*{\closing}[1]{{%
- \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par%
- \nobreak\vskip\baselineskip%
- \stopbreaks\noindent%
- \setlength{\@tempdima}{0pt}%
- \expandafter\@tempdimaismaxwidthof\scr@signature@var\\\@nil
- \expandafter\@tempdimaismaxwidthof\strut\ignorespaces#1\\\@nil
+ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par
+ \nobreak\vskip\baselineskip
+ \stopbreaks\noindent
+ \settowidth{\@tempdima}{%
+ \begin{tabular}{@{}l@{}}
+ #1\tabularnewline
+ \usekomavar{signature}\tabularnewline
+ \end{tabular}
+ }%
\setlength{\@tempdimb}{\hsize}%
\addtolength{\@tempdimb}{-\useplength{sigindent}}%
- \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi%
+ \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
\hspace{\useplength{sigindent}}%
- \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces%
- #1\strut\\[\useplength{sigbeforevskip}]
- \strut\usekomavar{signature}\strut}}\par
- \nobreak\vskip\baselineskip%
+ \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces
+ #1\ifhmode\unskip\strut\fi\\[\useplength{sigbeforevskip}]
+ \strut\ignorespaces
+ \usekomavar{signature}\ifhmode\unskip\strut\fi}}\par
+ \nobreak\vskip\baselineskip
}
\newcommand\ps{\par%
\ifdim\parskip=\z@%
@@ -4160,7 +4503,22 @@
\usekomavar{subjectseparator}]{subject}
\newkomavar[\datename]{date}
\setkomavar{date}{\@date}
-%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
+\newcommand*{\scr@saved@date}{}
+\let\scr@saved@date\date
+\renewcommand*{\date}[1]{%
+ \ClassWarning{\KOMAClassName}{%
+ \string\date\space changes the internal \string\LaTeX\space date
+ only.\MessageBreak
+ You should note that this changes the default\MessageBreak
+ value of variable `date' only as long as someone\MessageBreak
+ uses `\string\setkomavar` to change the content of\MessageBreak
+ variable `date'.\MessageBreak
+ Therefore, usage of `\string\setkomavar' is recommended\MessageBreak
+ to change the letter's date%
+ }%
+ \scr@saved@date{#1}%
+}
+%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}
\newcommand*{\adrchar}{\addrchar}