diff options
author | Karl Berry <karl@freefriends.org> | 2013-12-26 23:18:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-12-26 23:18:36 +0000 |
commit | 9b219d1b664067729034647a4b37626cf2bf5e26 (patch) | |
tree | 00708467b44f90736dc32ed1bebb95e9c4710139 /Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls | |
parent | c00c8298eb6913b74270a36c1f1018f1e9946f7b (diff) |
koma-script (26dec13)
git-svn-id: svn://tug.org/texlive/trunk@32489 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls | 1067 |
1 files changed, 708 insertions, 359 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index cc24f44765e..3ee13c1b7fa 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -1,46 +1,45 @@ %% %% This is file `scrlttr2.cls', -%% generated with the docstrip utility. +%% generated with the docstrip utility, extended by scrdocstrip. %% %% The original source files were: %% -%% scrkvers.dtx (with options: `class,letter') -%% scrkbase.dtx (with options: `load') -%% scrkcomp.dtx (with options: `class,letter,option') -%% scrkmisc.dtx (with options: `class,letter,option') -%% scrklco.dtx (with options: `class,letter,option') -%% scrklang.dtx (with options: `class,letter,option') -%% scrkfont.dtx (with options: `class,letter,option') -%% scrkvars.dtx (with options: `class,letter,option') -%% scrkplen.dtx (with options: `class,letter,option') -%% scrktare.dtx (with options: `class,letter,option') -%% scrkpar.dtx (with options: `class,letter,option') -%% scrkpage.dtx (with options: `class,letter,option') -%% scrkfloa.dtx (with options: `class,letter,option') -%% scrkftn.dtx (with options: `class,letter,option') -%% scrklist.dtx (with options: `class,letter,option') -%% scrknpap.dtx (with options: `class,letter,option') -%% scrkcile.dtx (with options: `class,letter,option') -%% scrkmisc.dtx (with options: `class,letter,execoption') -%% scrkcomp.dtx (with options: `class,letter,body') -%% scrkfont.dtx (with options: `class,letter,body') -%% scrkmisc.dtx (with options: `class,letter,body') -%% scrklco.dtx (with options: `class,letter,body') -%% scrklang.dtx (with options: `class,letter,body') -%% scrkvars.dtx (with options: `class,letter,body') -%% scrkplen.dtx (with options: `class,letter,body') -%% scrktare.dtx (with options: `class,letter,body') -%% scrkpar.dtx (with options: `class,letter,body') -%% scrkpage.dtx (with options: `class,letter,body') -%% scrkfloa.dtx (with options: `class,letter,body') -%% scrkftn.dtx (with options: `class,letter,body') -%% scrklist.dtx (with options: `class,letter,body') -%% scrknpap.dtx (with options: `class,letter,body') -%% scrkcile.dtx (with options: `class,letter,body') +%% scrkernel-version.dtx (with options: `class,letter') +%% scrkernel-basics.dtx (with options: `load') +%% scrkernel-compatibility.dtx (with options: `class,letter,option') +%% scrkernel-miscellaneous.dtx (with options: `class,letter,option') +%% scrkernel-letterclassoptions.dtx (with options: `class,letter,option') +%% scrkernel-language.dtx (with options: `class,letter,option') +%% scrkernel-fonts.dtx (with options: `class,letter,option') +%% scrkernel-variables.dtx (with options: `class,letter,option') +%% scrkernel-pseudolengths.dtx (with options: `class,letter,option') +%% scrkernel-typearea.dtx (with options: `class,letter,option') +%% scrkernel-paragraphs.dtx (with options: `class,letter,option') +%% scrkernel-pagestyles.dtx (with options: `class,letter,option') +%% scrkernel-floats.dtx (with options: `class,letter,option') +%% scrkernel-footnotes.dtx (with options: `class,letter,option') +%% scrkernel-listsandtabulars.dtx (with options: `class,letter,option') +%% scrkernel-notepaper.dtx (with options: `class,letter,option') +%% scrkernel-circularletters.dtx (with options: `class,letter,option') +%% scrkernel-miscellaneous.dtx (with options: `class,letter,execoption') +%% scrkernel-compatibility.dtx (with options: `class,letter,body') +%% scrkernel-fonts.dtx (with options: `class,letter,body') +%% scrkernel-miscellaneous.dtx (with options: `class,letter,body') +%% scrkernel-letterclassoptions.dtx (with options: `class,letter,body') +%% scrkernel-language.dtx (with options: `class,letter,body') +%% scrkernel-variables.dtx (with options: `class,letter,body') +%% scrkernel-pseudolengths.dtx (with options: `class,letter,body') +%% scrkernel-typearea.dtx (with options: `class,letter,body') +%% scrkernel-paragraphs.dtx (with options: `class,letter,body') +%% scrkernel-pagestyles.dtx (with options: `class,letter,body') +%% scrkernel-floats.dtx (with options: `class,letter,body') +%% scrkernel-footnotes.dtx (with options: `class,letter,body') +%% scrkernel-listsandtabulars.dtx (with options: `class,letter,body') +%% scrkernel-notepaper.dtx (with options: `class,letter,body') +%% scrkernel-circularletters.dtx (with options: `class,letter,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2012 -%% Markus Kohm and any individual authors listed elsewhere in this file. +%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -72,9 +71,9 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: scrkvers.dtx +%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $ \begingroup - \makeatletter + \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined \newcommand*{\@CheckKOMAScriptVersion}[1]{% \gdef\KOMAScriptVersion{#1}% @@ -94,7 +93,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}% + \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -103,11 +102,12 @@ letter% } \ProvidesClass{\KOMAClassName}[% - \KOMAScriptVersion\space document class (\ClassName)% + 2013/12/19 v3.12 KOMA-Script + document class (\ClassName)% ] -%%% From File: scrkbase.dtx +%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: scrkcomp.dtx +%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $ \newcommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -123,6 +123,7 @@ Switching compatibility level to `#1'% }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + \FamilyKeyStateProcessed }% } \AtEndOfClass{% @@ -134,6 +135,7 @@ class.\MessageBreak But you've tried to set it up later.% }% + \FamilyKeyStateProcessed }% } \@namedef{scr@v@first}{0} @@ -183,19 +185,22 @@ \@namedef{scr@v@3.11}{10} \@namedef{scr@v@3.11a}{10} \@namedef{scr@v@3.11b}{10} -\@namedef{scr@v@last}{10} -%%% From File: scrkmisc.dtx +\@namedef{scr@v@3.12}{11} +\@namedef{scr@v@last}{11} +%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $ \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% - \if@tempswa - \setlength{\overfullrule}{5pt}% - \else - \setlength{\overfullrule}{\z@}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@tempswa + \setlength{\overfullrule}{5pt}% + \else + \setlength{\overfullrule}{\z@}% + \fi \fi } \KOMA@DeclareStandardOption {final}{draft=false} -%%% From File: scrklco.dtx +%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $ \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% \expandafter\AtEndOfClass\expandafter{% @@ -209,7 +214,7 @@ }{}% } \AtEndOfClass{\LoadLetterOption{DIN}} -%%% From File: scrklang.dtx +%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $ \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi @@ -218,7 +223,7 @@ } \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: scrkfont.dtx +%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $ \newcommand*\@ptsize{% 12% } @@ -229,8 +234,23 @@ \def\@pt@@scan #1pt#2\@pt@@scan{% \ifstr{#2}{pt}{% \ifnumber{#1}{% - \KOMA@UseObsoleteOption{\PackageInfoNoLine{\KOMAClassName}}% - {#1#2}{fontsize=#1#2}% + \ifstr{#1}{10}{% + \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% + {#1#2}{fontsize=#1#2}% + }{% + \ifstr{#1}{11}{% + \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% + {#1#2}{fontsize=#1#2}% + }{% + \ifstr{#1}{12}{% + \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% + {#1#2}{fontsize=#1#2}% + }{% + \KOMA@UseDeprecatedOption{\PackageWarningNoLine{\KOMAClassName}}% + {#1#2}{fontsize=#1#2}% + }% + }% + } }{\@headlines}% }{\@headlines}% } @@ -265,10 +285,11 @@ }% \@tempa }% + \FamilyKeyStateProcessed } -%%% From File: scrkvars.dtx -%%% From File: scrkplen.dtx -%%% From File: scrktare.dtx +%%% From File: $Id: scrkernel-variables.dtx 1389 2013-10-01 16:06:04Z mjk $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 1388 2013-10-01 16:03:42Z mjk $ +%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -339,7 +360,7 @@ \DeclareOption*{% \lco@test \x@paper} -%%% From File: scrkpar.dtx +%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -380,82 +401,88 @@ {relative}{10},% {absolute}{11}% }{#1}% - \ifcase\number\@tempa% 0 - \endgroup - \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 1 - \endgroup - \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 2 - \endgroup - \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% - \z@ \@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 3 - \endgroup - \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% - \z@ \@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 4 - \endgroup - \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% - 1em \@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 5 - \endgroup - \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% - 1em \@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 6 - \endgroup - \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% - .3333\linewidth\@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 7 - \endgroup - \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% - .3333\linewidth \@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 8 - \endgroup - \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% - .25\linewidth \@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 9 - \endgroup - \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% - .25\linewidth \@plus 1fil}% - \if@atdocument\AfterKOMAoptions{\selectfont}\fi - \or% 10 - \endgroup - \ifx\par@updaterelative\undefined - \expandafter\AtEndOfClass - \else - \expandafter\@firstofone - \fi - {% - \ifx\par@update\default@par@update - \let\par@update\par@updaterelative + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \aftergroup\FamilyKeyStateProcessed + \ifcase\number\@tempa% 0 + \endgroup + \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 1 + \endgroup + \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 2 + \endgroup + \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% + \z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 3 + \endgroup + \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% + \z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 4 + \endgroup + \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% + 1em \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 5 + \endgroup + \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% + 1em \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 6 + \endgroup + \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% + .3333\linewidth\@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 7 + \endgroup + \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% + .3333\linewidth \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 8 + \endgroup + \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% + .25\linewidth \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 9 + \endgroup + \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% + .25\linewidth \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 10 + \endgroup + \ifx\par@updaterelative\undefined + \expandafter\AtEndOfClass + \else + \expandafter\@firstofone \fi - \let\default@par@update=\par@updaterelative - }% - \or%11 - \endgroup - \ifx\par@updaterelative\undefined - \expandafter\AtEndOfClass - \else - \expandafter\@firstofone - \fi - {% - \ifx\par@update\default@par@update - \let\par@update\relax + {% + \ifx\par@update\default@par@update + \let\par@update\par@updaterelative + \fi + \let\default@par@update=\par@updaterelative + }% + \or%11 + \endgroup + \ifx\par@updaterelative\undefined + \expandafter\AtEndOfClass + \else + \expandafter\@firstofone \fi - \let\default@par@update=\relax - }% - \else% sonst - \endgroup + {% + \ifx\par@update\default@par@update + \let\par@update\relax + \fi + \let\default@par@update=\relax + }% + \else% should never be + \endgroup + \fi + \else + \endgroup + \FamilyKeyStateUnkownValue \fi } \KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-} @@ -466,17 +493,29 @@ \KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} \KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} -%%% From File: scrkpage.dtx +%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% - \KOMA@options{headinclude=#1}{}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \@ifundefined{typearea}{% + \PassOptionsToPackage{typearea}{headinclude=#1}% + }{% + \KOMAoptions{headinclude=#1}{}% + }% + \fi } \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} \newif\if@fsl \KOMA@key{footsepline}[true]{% \KOMA@set@ifkey{footsepline}{@fsl}{#1}% - \KOMA@options{footinclude=#1}{}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \@ifundefined{typearea}{% + \PassOptionsToPackage{typearea}{headinclude=#1}% + }{% + \KOMAoptions{footinclude=#1,DIV=current}% + }% + \fi } \KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} \@twosidefalse @@ -492,6 +531,7 @@ \def\cleardoublepage{\cleardoublestandardpage}% \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% \def\cleardoubleevenpage{\cleardoubleevenstandardpage}% + \FamilyKeyStateProcessed }% }{% \ifnotundefined{ps@#1}{% @@ -499,6 +539,7 @@ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% + \FamilyKeyStateProcessed }% }{}% }% @@ -537,8 +578,8 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: scrkfloa.dtx -%%% From File: scrkftn.dtx +%%% 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 $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -556,11 +597,13 @@ \let\@footnotemark\scr@footnotemark \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% + \FamilyKeyStateProcessed }{% \ifstr{#1}{nomultiple}{% \let\@footnotemark\scr@saved@footnotemark \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty + \FamilyKeyStateProcessed }{% \KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}% }% @@ -583,8 +626,8 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: scrklist.dtx -%%% From File: scrknpap.dtx +%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $ +%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $ \KOMA@ifkey{firsthead}{@firsthead}\@firstheadtrue \newcommand*{\@alignfrom}{0} \KOMA@key{fromalign}{% @@ -596,7 +639,9 @@ {locationright}{4},{rightlocation}{4},{location}{4},% {no}{10000},{false}{10000},{off}{10000}% }{#1}% - \ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi + \fi } \newcommand*{\@rulefrom}{0} \KOMA@ncmdkey{fromrule}[below]{@rulefrom}{% @@ -604,6 +649,7 @@ {below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}% } \KOMA@ifkey{fromphone}{@phone} +\KOMA@ifkey{frommobilephone}{@mobilephone} \KOMA@ifkey{fromfax}{@fax} \KOMA@ifkey{fromemail}{@email} \KOMA@ifkey{fromurl}{@www} @@ -673,35 +719,46 @@ {underlined}{2},% {plain}{3}% }{#1}% - \ifcase\@tempa - \endgroup - \@baddrfalse - \or - \endgroup - \@baddrtrue - \or - \endgroup - \@baddrtrue - \let\backaddr@format\underline - \or - \endgroup - \@baddrtrue - \let\backaddr@format\@firstofone - \else + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \aftergroup\FamilyKeyStateProcessed + \ifcase\@tempa + \endgroup + \@baddrfalse + \or + \endgroup + \@baddrtrue + \or + \endgroup + \@baddrtrue + \let\backaddr@format\underline + \or + \endgroup + \@baddrtrue + \let\backaddr@format\@firstofone + \else + \endgroup + \fi + \else \endgroup - \fi + \FamilyKeyStateUnknownValue + \fi } \newif\if@bigloc \KOMA@key{locfield}[wide]{% \begingroup \KOMA@set@ncmdkey{locfield}{@tempa}{{wide}{0},{narrow}{1}}{#1}% - \ifcase\@tempa - \endgroup - \@bigloctrue + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \ifcase\@tempa + \endgroup + \@bigloctrue + \else + \endgroup + \@biglocfalse + \fi \else \endgroup - \@biglocfalse - \fi + \FamilyKeyStateUnknownValue + \fi } \KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide} \KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow} @@ -709,48 +766,35 @@ \newcommand*{\@usefolds}{TMBPL} \KOMA@key{foldmarks}[true]{% \begingroup - \def\FamilyUnknownKeyValue##1##2##3##4{% - \def\sc@nf@ldch@rs####1{% - \ifx ####1\@nil\else - \if ####1T\g@addto@macro\@usefolds{####1}\else - \if ####1M\g@addto@macro\@usefolds{####1}\else - \if ####1B\g@addto@macro\@usefolds{####1}\else - \if ####1P\g@addto@macro\@usefolds{####1}\else - \if ####1L\g@addto@macro\@usefolds{####1}\else - \if ####1V\g@addto@macro\@usefolds{L}\else - \if ####1H\g@addto@macro\@usefolds{TMBP}\else - \if ####1t\scr@removechar\@usefolds{T}\else - \if ####1m\scr@removechar\@usefolds{M}\else - \if ####1b\scr@removechar\@usefolds{B}\else - \if ####1p\scr@removechar\@usefolds{P}\else - \if ####1l\scr@removechar\@usefolds{L}\else - \if ####1v% + \KOMA@set@ifkey\@empty{@fold}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@fold\aftergroup\@foldtrue\else\aftergroup\@foldfalse\fi + \aftergroup\FamilyKeyStateProcessed + \else + \aftergroup\FamilyKeyStateProcessed + \def\sc@nf@ldch@rs##1{% + \ifx ##1\@nil\else + \if ##1T\g@addto@macro\@usefolds{##1}\else + \if ##1M\g@addto@macro\@usefolds{##1}\else + \if ##1B\g@addto@macro\@usefolds{##1}\else + \if ##1P\g@addto@macro\@usefolds{##1}\else + \if ##1L\g@addto@macro\@usefolds{##1}\else + \if ##1V\g@addto@macro\@usefolds{L}\else + \if ##1H\g@addto@macro\@usefolds{TMBP}\else + \if ##1t\scr@removechar\@usefolds{T}\else + \if ##1m\scr@removechar\@usefolds{M}\else + \if ##1b\scr@removechar\@usefolds{B}\else + \if ##1p\scr@removechar\@usefolds{P}\else + \if ##1l\scr@removechar\@usefolds{L}\else + \if ##1v% \scr@removechar\@usefolds{L}% \else - \if ####1h% + \if ##1h% \scr@removechar\@usefolds{T}% \scr@removechar\@usefolds{M}% \scr@removechar\@usefolds{B}% \else - \ClassError{\KOMAClassName}{% - unknown fold mark switch `####1'}{% - You should use option `foldmarks' - either with one of\MessageBreak - \@spaces `true', `on', or `yes' to - switch fold marks on,\MessageBreak - \@spaces `false', `off', or `no' to - switch fold marks off,\MessageBreak - or a combination of\MessageBreak - \@spaces `T', `M', `B', 'P', 'L', `V', - `H' to select dedicated fold - marks\MessageBreak - or\MessageBreak - \@spaces `t', `m', 'b', 'p', 'l', 'v', - 'h' to deselect dedicated fold - marks.\MessageBreak - See the KOMA-Script manual for more - information. - }% + \aftergroup\FamilyKeyStateUnknownValue \fi \fi \fi @@ -769,9 +813,7 @@ \fi }% \expandafter\sc@nf@ldch@rs#1\@nil - }% - \KOMA@set@ifkey\@empty{@fold}{#1}% - \if@fold\aftergroup\@foldtrue\else\aftergroup\@foldfalse\fi + \fi \endgroup } \newcommand*{\scr@removechar}[2]{% @@ -787,26 +829,32 @@ \KOMA@key{refline}[wide]{% \begingroup \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1},% - {dateleft}{2},{leftdate}{2},% - {dateright}{3},{rightdate}{3},% - {nodate}{4}% - }{#1}% - \ifcase\@tempa - \endgroup - \@refwidetrue - \or - \endgroup - \@refwidefalse - \or - \endgroup - \def\@datepos{2}% - \or - \endgroup - \def\@datepos{1}% - \or + {dateleft}{2},{leftdate}{2},% + {dateright}{3},{rightdate}{3},% + {nodate}{4}% + }{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \aftergroup\FamilyKeyStateProcessed + \ifcase\@tempa + \endgroup + \@refwidetrue + \or + \endgroup + \@refwidefalse + \or + \endgroup + \def\@datepos{2}% + \or + \endgroup + \def\@datepos{1}% + \or + \endgroup + \def\@datepos{0}% + \fi + \else \endgroup - \def\@datepos{0}% - \fi + \FamilyKeyStateUnknownValue + \fi } \newcommand{\subject@format}[1]{#1} \newcommand*{\raggedsubject}{} @@ -824,22 +872,27 @@ {right}{6},% {centered}{7}% }{#1}% - \ifcase\@tempa - \aftergroup\@subjtrue - \or - \aftergroup\@subjfalse - \or - \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 + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \aftergroup\FamilyKeyStateProcessed + \ifcase\@tempa + \aftergroup\@subjtrue + \or + \aftergroup\@subjfalse + \or + \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 + \else + \aftergroup\FamilyKeyStateUnknownValue \fi \endgroup } @@ -861,40 +914,83 @@ {top}{10},{head}{10},{bot}{11},{foot}{11},% {left}{20},{middle}{21},{center}{21},{centered}{21},{right}{22}% }{#1}% - \ifnum\@tempa<10 - \edef\@tempa{\endgroup\edef\noexpand\@pageat{\@tempa}}% - \else - \ifnum\@tempa<20 - \@tempcnta\@pageat\relax - \ifnum\@tempcnta>2 - \advance\@tempcnta by -3 - \fi - \ifnum\@tempa=11 - \advance\@tempcnta by 3 - \fi - \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \aftergroup\FamilyKeyStateProcessed + \ifnum\@tempa<10 + \edef\@tempa{\endgroup\edef\noexpand\@pageat{\@tempa}}% \else - \ifnum\@pageat>2 - \edef\@pageat{3}% + \ifnum\@tempa<20 + \@tempcnta\@pageat\relax + \ifnum\@tempcnta>2 + \advance\@tempcnta by -3 + \fi + \ifnum\@tempa=11 + \advance\@tempcnta by 3 + \fi + \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}% \else - \edef\@pageat{0}% + \ifnum\@pageat>2 + \edef\@pageat{3}% + \else + \edef\@pageat{0}% + \fi + \@tempcnta\@tempa + \advance\@tempcnta by -20 + \advance\@tempcnta by\@pageat + \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}% \fi - \@tempcnta\@tempa - \advance\@tempcnta by -20 - \advance\@tempcnta by\@pageat - \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}% \fi + \else + \def\@tempa{\endgroup\FamilyKeyStateUnknownValue}% \fi \@tempa } -%%% From File: scrkcile.dtx -%%% From File: scrkmisc.dtx +\newif\if@scrsymbols +\KOMA@key{symbolicnames}[true]{% + \KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}% + \if@scrsymbols + \if@atdocument + \begingroup + \@tempswafalse + \scr@ifundefinedorrelax{Telefon}{\@tempswatrue}{% + \scr@ifundefinedorrelax{FAX}{\@tempswatrue}{% + \scr@ifundefinedorrelax{Email}{\@tempswatrue}{% + \scr@ifundefinedorrelax{Mobilefone}{\@tempswatrue}{% + }% + }% + }% + }% + \if@tempswa + \aftergroup\@scrsymbolsfalse + \ClassWarning{scrlttr2}{Option `symbolicnames' + ignorred.\MessageBreak + You've tried to set option `symbolicnames'\MessageBreak + after \string\begin{document}, but without\MessageBreak + loading package `marvosym' before.\MessageBreak + You should either switch on option\MessageBreak + `symbolicnames' before \string\begin{document}\MessageBreak + or load package `marvosym' in the document\MessageBreak + preamble to avoid this warning% + }% + \fi + \endgroup + \else + \ifstr{\@currname.\@currext}{scrlttr2.cls}{% + \expandafter\AtEndOfClass + }{% + \expandafter\@firstofone + }% + {\RequirePackage{marvosym}}% + \fi + \fi +} +%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $ \KOMAExecuteOptions{% parskip=false,% - headings=big% } \KOMAProcessOptions\relax -%%% From File: scrkcomp.dtx +%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $ \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% \begingroup @@ -906,7 +1002,42 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: scrkfont.dtx +%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $ +\newcommand*\scr@setlength[4]{% + \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax + \setlength{#1}{#2 \@plus#3 \@minus#4}% + \else + \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi + \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi + \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi + \setlength{#1}{\p@ \@plus\p@ \@minus\p@}% + \else + \setlength{#1}{\p@ \@plus\p@ \@minus#4}% + \fi + \else + \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi + \setlength{#1}{\p@ \@plus#3 \@minus\p@}% + \else + \setlength{#1}{\p@ \@plus#3 \@minus#4}% + \fi + \fi + \else + \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi + \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi + \setlength{#1}{#2 \@plus\p@ \@minus\p@}% + \else + \setlength{#1}{#2 \@plus\p@ \@minus#4}% + \fi + \else + \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi + \setlength{#1}{#2 \@plus#3 \@minus\p@}% + \else + \setlength{#1}{#2 \@plus#3 \@minus#4}% + \fi + \fi + \fi + \fi +} \newcommand*{\changefontsizes}[2][1.2\@tempdima]{% \ClassWarning{\KOMAClassName}{% Using fallback calculation to setup font sizes\MessageBreak @@ -930,12 +1061,20 @@ \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}% + \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}% - \setlength{\belowdisplayshortskip}{% - .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% \edef\normalsize{% \noexpand\@setfontsize\noexpand\normalsize {\the\@tempdima}{\the\@tempdimb}% @@ -947,12 +1086,20 @@ }% \setlength{\@tempdima}{0.9125\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \setlength{\abovedisplayskip}{% - \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% - \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@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}% - \setlength{\belowdisplayshortskip}{% - .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% \edef\small{% \noexpand\@setfontsize\noexpand\small {\the\@tempdima}{\the\@tempdimb}% @@ -964,12 +1111,20 @@ }% \setlength{\@tempdima}{.83334\@tempdimc}% \setlength{\@tempdimb}{\@tempb\@tempdima}% - \setlength{\abovedisplayskip}{% - \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% - \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@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}% - \setlength{\belowdisplayshortskip}{% - .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% \edef\footnotesize{% \noexpand\@setfontsize\noexpand\footnotesize {\the\@tempdima}{\the\@tempdimb}% @@ -1022,29 +1177,37 @@ {\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@}% + \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}% @@ -1057,9 +1220,16 @@ \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@}% + \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}% @@ -1071,9 +1241,16 @@ \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@}% + \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}% @@ -1085,8 +1262,15 @@ \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@}% + \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}% @@ -1099,8 +1283,13 @@ \itemsep \parsep \if@tempswa\noexpand\@list@extra\fi }% - \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% - \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}% + \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}% @@ -1110,7 +1299,7 @@ \labelwidth=\dimexpr \leftmargin-\labelsep \topsep \the\topsep \parsep \z@ - \partopsep \the\parsep + \partopsep \the\partopsep \itemsep \topsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1120,7 +1309,7 @@ \csname @listiv\endcsname \endgroup \edef\@listiv{\leftmargin\leftmarginiv - \labelwidth=\dimexpr \leftmargin-\labelsep + \labelwidth=\dimexpr \leftmargin-\labelsep\relax \if@tempswa\noexpand\@list@extra\fi }% \@tempswafalse @@ -1129,7 +1318,7 @@ \csname @listv\endcsname \endgroup \edef\@listv{\leftmargin\leftmarginv - \labelwidth=\dimexpr \leftmargin-\labelsep + \labelwidth=\dimexpr \leftmargin-\labelsep\relax \if@tempswa\noexpand\@list@extra\fi }% \@tempswafalse @@ -1138,15 +1327,36 @@ \csname @listvi\endcsname \endgroup \edef\@listvi{\leftmargin\leftmarginvi - \labelwidth=\dimexpr \leftmargin-\labelsep + \labelwidth=\dimexpr \leftmargin-\labelsep\relax \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}% + \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 }% } \expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil @@ -1172,18 +1382,56 @@ }% }% } -\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} -\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} -\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} -\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf} -\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} -\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl} -\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc} -\DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{% +\newcommand*{\scr@DeclareOldFontCommand}[3]{% + \DeclareRobustCommand #1{\@fontswitch {% + \ClassWarning{\KOMAClassName}{% + Usage of deprecated font command `\string#1'!\MessageBreak + You should note, that in 1994 font command `\string#1' has\MessageBreak + been defined for compatiblitiy to Script 2.0 only.\MessageBreak + Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak + shouldn't use such commands any longer and within\MessageBreak + KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak + See `fntguide.pdf' for more information about\MessageBreak + recommended font commands.\MessageBreak + Note also, that KOMA-Script will remove the definition\MessageBreak + of `\string#1' anytime until release of about version 3.20.\MessageBreak + But for now, KOMA-Script will replace deprecated + `\string#1'\MessageBreak + by `\detokenize{#2}'% + }% + #2% + }{% + \ClassWarning{\KOMAClassName}{% + Usage of deprecated font command `\string#1'!\MessageBreak + You should note, that in 1994 font command `\string#1' has\MessageBreak + been defined for compatiblitiy to Script 2.0 only.\MessageBreak + Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak + shouldn't use such commands any longer and within\MessageBreak + KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak + See `fntguide.pdf' for more information about\MessageBreak + recommended font commands.\MessageBreak + Note also, that KOMA-Script will remove the definition\MessageBreak + of `\string#1' anytime until release of about version 3.20.\MessageBreak + But for now, KOMA-Script will replace deprecated + `\string#1'\MessageBreak + by `\detokenize{#3}'% + }% + #3% + }% + }% +} +\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} +\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} +\scr@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} +\scr@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf} +\scr@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} +\scr@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl} +\scr@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc} +\scr@DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{% \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: scrkmisc.dtx +%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $ \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} \setlength\fboxrule{.4\p@} @@ -1228,7 +1476,37 @@ \providecommand*{\@textsubscript}[1]{% {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } -%%% From File: scrklco.dtx +\newcommand*{\scr@package@not@recommended}[2]{% + \BeforePackage{#1}{% + \ClassWarning{\KOMAClassName}{% + Usage of package `#1' together\MessageBreak + with a KOMA-Script class is not recommended.\MessageBreak + \if\relax\detokenize{#2}\relax\else + I'd suggest to use #2.\MessageBreak + \fi + Nevertheless, using requested\MessageBreak + package `#1'% + }% + }% +} +\scr@package@not@recommended{emptypage}{% + option\MessageBreak + `cleardoublepage' with one of it's\MessageBreak + several values} +\scr@package@not@recommended{parskip}{% + option\MessageBreak + `parskip' with one of it's several values} +\scr@package@not@recommended{fancyhdr}{% + \MessageBreak + package `scrpage2' or `scrlayer-scrpage'} +\scr@package@not@recommended{titlesec}{% + the package only\MessageBreak + if you really need it, because it breaks several\MessageBreak + KOMA-Script features, i.e., option `headings' and\MessageBreak + the extended optional argument of the section\MessageBreak + commands +} +%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $ \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% {\let\@restore@catcode@level=\z@}{}% @@ -1270,13 +1548,26 @@ \newcommand*{\LOPNP@size}{} \newcommand*{\@PapersizeWarning}{% \begingroup% - \edef\@tempc{\noexpand\@tempswatrue - \noexpand\ifdim\paperwidth=\the\paperwidth\noexpand\else - \noexpand\@tempswafalse\noexpand\fi - \noexpand\ifdim\paperheight=\the\paperheight\noexpand\else - \noexpand\@tempswafalse\noexpand\fi + \edef\@tempc{\noexpand\@tempswafalse + \noexpand\ifdim\paperwidth<\the\dimexpr\paperwidth-.1mm\relax + \relax + \noexpand\else + \noexpand\ifdim\paperwidth>\the\dimexpr\paperwidth+.1mm\relax + \relax + \noexpand\else + \noexpand\ifdim\paperheight<\the\dimexpr\paperheight-.1mm\relax + \relax + \noexpand\else + \noexpand\ifdim\paperheight>\the\dimexpr\paperheight+.1mm\relax + \relax + \noexpand\else + \noexpand\@tempswatrue + \noexpand\fi + \noexpand\fi + \noexpand\fi + \noexpand\fi \noexpand\@@PapersizeWarning - } + }% \def\@tempb{letter}\ifx\LOPNP@size\@tempb% \setlength{\paperheight}{11in}\setlength{\paperwidth}{8.5in}% \else\def\@tempb{legal}\ifx\LOPNP@size\@tempb% @@ -1317,8 +1608,8 @@ } \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% - } -%%% From File: scrklang.dtx +} +%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $ \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \ClassInfo{% @@ -1357,6 +1648,7 @@ \providecaptionname{english}\datename{Date}% \providecaptionname{english}\pagename{Page}% \providecaptionname{english}\phonename{Phone}% + \providecaptionname{english}\mobilephonename{Mobile phone}% \providecaptionname{english}\faxname{Fax}% \providecaptionname{english}\emailname{Email}% \providecaptionname{english}\wwwname{Url}% @@ -1375,6 +1667,7 @@ \providecaptionname{USenglish}\datename{Date}% \providecaptionname{USenglish}\pagename{Page}% \providecaptionname{USenglish}\phonename{Phone}% + \providecaptionname{USenglish}\mobilephonename{Cell phone}% \providecaptionname{USenglish}\faxname{Fax}% \providecaptionname{USenglish}\emailname{Email}% \providecaptionname{USenglish}\wwwname{Url}% @@ -1393,6 +1686,7 @@ \providecaptionname{american}\datename{Date}% \providecaptionname{american}\pagename{Page}% \providecaptionname{american}\phonename{Phone}% + \providecaptionname{american}\mobilephonename{Cell phone}% \providecaptionname{american}\faxname{Fax}% \providecaptionname{american}\emailname{Email}% \providecaptionname{american}\wwwname{Url}% @@ -1411,6 +1705,7 @@ \providecaptionname{british}\datename{Date}% \providecaptionname{british}\pagename{Page}% \providecaptionname{british}\phonename{Phone}% + \providecaptionname{british}\mobilephonename{Mobile phone}% \providecaptionname{british}\faxname{Fax}% \providecaptionname{british}\emailname{Email}% \providecaptionname{british}\wwwname{Url}% @@ -1429,6 +1724,7 @@ \providecaptionname{UKenglish}\datename{Date}% \providecaptionname{UKenglish}\pagename{Page}% \providecaptionname{UKenglish}\phonename{Phone}% + \providecaptionname{UKenglish}\mobilephonename{Mobile phone}% \providecaptionname{UKenglish}\faxname{Fax}% \providecaptionname{UKenglish}\emailname{Email}% \providecaptionname{UKenglish}\wwwname{Url}% @@ -1447,6 +1743,7 @@ \providecaptionname{german}\datename{Datum}% \providecaptionname{german}\pagename{Seite}% \providecaptionname{german}\phonename{Telephon}% + \providecaptionname{german}\mobilephonename{Mobiltelephon}% \providecaptionname{german}\faxname{Fax}% \providecaptionname{german}\emailname{E-Mail}% \providecaptionname{german}\wwwname{URL}% @@ -1465,6 +1762,7 @@ \providecaptionname{ngerman}\datename{Datum}% \providecaptionname{ngerman}\pagename{Seite}% \providecaptionname{ngerman}\phonename{Telefon}% + \providecaptionname{ngerman}\mobilephonename{Handy}% \providecaptionname{ngerman}\faxname{Fax}% \providecaptionname{ngerman}\emailname{E-Mail}% \providecaptionname{ngerman}\wwwname{URL}% @@ -1483,6 +1781,7 @@ \providecaptionname{austrian}\datename{Datum}% \providecaptionname{austrian}\pagename{Seite}% \providecaptionname{austrian}\phonename{Telefon}% + \providecaptionname{austrian}\mobilephonename{Mobiltelefon}% \providecaptionname{austrian}\faxname{Fax}% \providecaptionname{austrian}\emailname{E-Mail}% \providecaptionname{austrian}\wwwname{URL}% @@ -1501,6 +1800,7 @@ \providecaptionname{naustrian}\datename{Datum}% \providecaptionname{naustrian}\pagename{Seite}% \providecaptionname{naustrian}\phonename{Telefon}% + \providecaptionname{naustrian}\phonename{Handy}% \providecaptionname{naustrian}\faxname{Fax}% \providecaptionname{naustrian}\emailname{E-Mail}% \providecaptionname{naustrian}\wwwname{URL}% @@ -1519,6 +1819,7 @@ \providecaptionname{french}\datename{Date}% \providecaptionname{french}\pagename{Page}% \providecaptionname{french}\phonename{T\'el\'ephone}% + \providecaptionname{french}\mobilephonename{Portable}% \providecaptionname{french}\faxname{T\'el\'efax}% \providecaptionname{french}\emailname{E-mail}% \providecaptionname{french}\wwwname{URL}% @@ -1538,6 +1839,7 @@ \providecaptionname{italian}\datename{Data}% \providecaptionname{italian}\pagename{Pagina}% \providecaptionname{italian}\phonename{Telefono}% + \providecaptionname{italian}\mobilephonename{Telefonino}% \providecaptionname{italian}\faxname{Fax}% \providecaptionname{italian}\emailname{Email}% \providecaptionname{italian}\wwwname{Sito Web}% @@ -1556,6 +1858,7 @@ \providecaptionname{spanish}\datename{Fecha}% \providecaptionname{spanish}\pagename{P\'agina}% \providecaptionname{spanish}\phonename{Tel\'efono}% + \providecaptionname{spanish}\mobilephonename{M\'ovil}% \providecaptionname{spanish}\faxname{Fax}% \providecaptionname{spanish}\emailname{Email}% or Correo electr\'onico \providecaptionname{spanish}\wwwname{URL}% or P\`agina web @@ -1574,6 +1877,7 @@ \providecaptionname{croatian}\datename{Nadnevak}% \providecaptionname{croatian}\pagename{Stranica}% \providecaptionname{croatian}\phonename{Telefon}% + \providecaptionname{croatian}\mobilphonename{Mobitel}% \providecaptionname{croatian}\faxname{Fax}% \providecaptionname{croatian}\emailname{E-Mail}% \providecaptionname{croatian}\wwwname{URL}% @@ -1592,6 +1896,7 @@ \providecaptionname{dutch}\datename{Datum}% \providecaptionname{dutch}\pagename{Pagina}% \providecaptionname{dutch}\phonename{Telefoon}% + \providecaptionname{dutch}\mobilephonename{Mobieltje}% \providecaptionname{dutch}\faxname{Fax}% \providecaptionname{dutch}\emailname{E--mail}% \providecaptionname{dutch}\wwwname{URL}% @@ -1610,6 +1915,7 @@ \providecaptionname{finnish}\datename{P\"aiv\"a}% \providecaptionname{finnish}\pagename{Sivu}% \providecaptionname{finnish}\phonename{Puhelin}% + \providecaptionname{finnish}\mobilephonename{Matkapuhelin}% \providecaptionname{finnish}\faxname{Faksi}% \providecaptionname{finnish}\emailname{S\"ahk\"oposti}% \providecaptionname{finnish}\wwwname{URL}% @@ -1628,6 +1934,7 @@ \providecaptionname{norsk}\datename{Dato}% \providecaptionname{norsk}\pagename{Side}% \providecaptionname{norsk}\phonename{Telefon}% + \providecaptionname{norsk}\mobilephonename{Mobiltelefon}% \providecaptionname{norsk}\faxname{Telefaks}% \providecaptionname{norsk}\emailname{E-post}% \providecaptionname{norsk}\wwwname{Url}% @@ -1646,6 +1953,7 @@ \providecaptionname{swedish}\datename{Datum}% \providecaptionname{swedish}\pagename{Sida}% \providecaptionname{swedish}\phonename{Telefon}% + \providecaptionname{swedish}\mobilephonename{Mobiltelefon}% \providecaptionname{swedish}\faxname{Telefax}% \providecaptionname{swedish}\emailname{E-post}% \providecaptionname{swedish}\wwwname{Hemsida}% @@ -1753,7 +2061,12 @@ will be used% }% \else - \expandafter\selectlanguage\expandafter{\languagename}% + \ClassInfo{scrlttr2}{% + trying to activate captions and date\MessageBreak + of language `\languagename'% + }% + \csname date\languagename\endcsname + \csname captions\languagename\endcsname \ClassInfo{% scrlttr2% }{% @@ -1762,12 +2075,12 @@ `british', `american', `USenglish',\MessageBreak `german', `ngerman', `austrian', `naustrian',\MessageBreak `dutch', `italian', `spanish',\MessageBreak - `croatian', `finnish', `norsk'% + `croatian', `finnish', `norsk', `swedish'% }% \fi \fi } -%%% From File: scrkvars.dtx +%%% From File: $Id: scrkernel-variables.dtx 1389 2013-10-01 16:06:04Z mjk $ \newcommand*{\newkomavar}{% \@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} \newcommand*{\@newkomavar}[2][\relax]{% @@ -1896,7 +2209,7 @@ }% \endgroup } -%%% From File: scrkplen.dtx +%%% From File: $Id: scrkernel-pseudolengths.dtx 1388 2013-10-01 16:03:42Z mjk $ \newcommand*{\@newplength}[1]{% \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% @@ -1950,7 +2263,7 @@ }% \@tempa% } -%%% From File: scrktare.dtx +%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -1961,7 +2274,7 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: scrkpar.dtx +%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \newcommand*{\scr@selectfont}{} @@ -2087,7 +2400,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: scrkpage.dtx +%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -2182,11 +2495,11 @@ \pagenumbering{arabic} \raggedbottom \onecolumn -%%% From File: scrkfloa.dtx +%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: scrkftn.dtx +%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -2323,7 +2636,7 @@ \endgroup \@footnotemark } -%%% From File: scrklist.dtx +%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $ \setlength{\leftmargini}{2.5em} \setlength{\leftmarginii}{2.2em} \setlength{\leftmarginiii}{1.87em} @@ -2419,8 +2732,22 @@ \newenvironment{addmargin*}{% \@tempswafalse \if@twoside\ifthispageodd{}{\@tempswatrue}\fi + \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}% \@addmargin }{% + \unskip\nobreak\ifthispageodd{}{}% + \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else + \ClassWarning{\KOMAClassName}{% + page break inside `addmargin*' environment.\MessageBreak + A `addmargin*' environment starting on page + \scr@addmargin@startpage\MessageBreak + ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak + This will result in potential wrong margins on\MessageBreak + every other page.\MessageBreak + So maybe you should change the `addmargin*'\MessageBreak + environment, that ends% + }% + \fi \advance\@listdepth\@ne \endlist } @@ -2451,7 +2778,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: scrknpap.dtx +%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $ \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% Deprecated usage of \string\@firsthead.\MessageBreak @@ -2504,6 +2831,9 @@ {\usekomafont{fromaddress}\strut\ignorespaces \usekomavar{fromaddress}% \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi% + \if@mobilephone + \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}% + \fi% \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi% \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi% \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi% @@ -2545,6 +2875,9 @@ {\usekomafont{fromaddress}\strut\ignorespaces \usekomavar{fromaddress}% \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi% + \if@mobilephone + \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}% + \fi% \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi% \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi% \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi% @@ -2590,6 +2923,9 @@ {\usekomafont{fromaddress}\strut\ignorespaces \usekomavar{fromaddress}% \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi% + \if@mobilephone + \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}% + \fi% \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi% \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi% \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi% @@ -2636,6 +2972,7 @@ \else \newkomafont{refvalue}{} \fi +\newkomafont{placeanddate}{} \newkomafont{title}{\normalcolor\sffamily\bfseries} \newkomafont{subject}{\normalcolor\bfseries} \@newplength{foldmarkhpos} @@ -3255,6 +3592,9 @@ {\usekomafont{fromaddress}\strut\ignorespaces \usekomavar{fromaddress}% \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi% + \if@mobilephone + \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}% + \fi% \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi% \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi% \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi% @@ -3293,6 +3633,9 @@ {\usekomafont{fromaddress}\strut\ignorespaces \usekomavar{fromaddress}% \if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi% + \if@mobilephone% + \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}% + \fi% \if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi% \if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi% \if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi% @@ -3421,9 +3764,9 @@ \else \ifcase \@datepos\else \ifnum \@datepos=1 \enskip\hfill\fi - \ifkomavarempty{place}{}{% - \usekomavar{place}\usekomavar{placeseparator}}% - \usekomavar{date}% + {\usekomafont{placeanddate}{\ifkomavarempty{place}{}{% + \usekomavar{place}\usekomavar{placeseparator}}% + \usekomavar{date}}}% \fi \fi }% @@ -3693,7 +4036,7 @@ \newkomavar{PPdatamatrix} \newkomavar{addresseeimage} \newkomavar[\usekomavar{place}]{placeseparator} -\setkomavar{placeseparator}{,~} +\setkomavar{placeseparator}{,\nobreakspace} \newkomavar[\subjectname]{subjectseparator} \setkomavar{subjectseparator}{: } \newkomavar[\ccname]{ccseparator} @@ -3701,15 +4044,19 @@ \newkomavar[\enclname]{enclseparator} \setkomavar{enclseparator}{: } \newkomavar{backaddressseparator} -\setkomavar{backaddressseparator}{,~} -\newkomavar[\phonename]{phoneseparator} -\setkomavar{phoneseparator}{:~} -\newkomavar[\faxname]{faxseparator} -\setkomavar{faxseparator}{:~} -\newkomavar[\emailname]{emailseparator} -\setkomavar{emailseparator}{:~} -\newkomavar[\wwwname]{urlseparator} -\setkomavar{urlseparator}{:~} +\setkomavar{backaddressseparator}{,\nobreakspace} +\newkomavar[\if@scrsymbols\Telefon\else\phonename\fi]{phoneseparator} +\setkomavar{phoneseparator}{\if@scrsymbols\else:\fi\nobreakspace} +\newkomavar[% + \if@scrsymbols\Mobilefone\else\mobilephonename\fi +]{mobilephoneseparator} +\setkomavar{mobilephoneseparator}{\usekomavar{phoneseparator}} +\newkomavar[\if@scrsymbols\FAX\else\faxname\fi]{faxseparator} +\setkomavar{faxseparator}{\if@scrsymbols\else:\fi\nobreakspace} +\newkomavar[\if@scrsymbols\Email\else\emailname\fi]{emailseparator} +\setkomavar{emailseparator}{\if@scrsymbols\else:\fi\nobreakspace} +\newkomavar[\if@scrsymbols\else\wwwname\fi]{urlseparator} +\setkomavar{urlseparator}{\if@scrsymbols\else:\nobreakspace\fi} \newkomavar{zipcodeseparator} \setkomavar{zipcodeseparator}{\,--\,} \newkomavar[\headfromname]{fromname} @@ -3718,6 +4065,8 @@ \newkomavar[\usekomavar{toname}]{toaddress} \newkomavar[\usekomavar*{phoneseparator}% \usekomavar{phoneseparator}]{fromphone} +\newkomavar[\usekomavar*{mobilephoneseparator}% + \usekomavar{mobilephoneseparator}]{frommobilephone} \newkomavar[\usekomavar*{faxseparator}% \usekomavar{faxseparator}]{fromfax} \newkomavar[\usekomavar*{emailseparator}% @@ -3734,7 +4083,7 @@ \usekomavar{subjectseparator}]{subject} \newkomavar[\datename]{date} \setkomavar{date}{\@date} -%%% From File: scrkcile.dtx +%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $ \newcommand*{\adrentry}[7]{% \addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}} \newcommand*{\adrchar}{\addrchar} @@ -3745,7 +4094,7 @@ \expandafter\def\csname #9\endcsname{#2 #1\\#3}% \fi \fi} \newcommand*{\addrchar}[1]{} -%%% From File: scrlogo.dtx +%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} |