summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-13 21:40:52 +0000
committerKarl Berry <karl@freefriends.org>2019-10-13 21:40:52 +0000
commited8702df3768e21a3ef87a2eec9ca8341aad9b7a (patch)
treed2eb8a06d685acdcb364d57efb2334dbd3b2914d /Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
parent4b6c2d7660365ff9963bcecf7a802e8060eb1bbc (diff)
koma-script (13oct19)
git-svn-id: svn://tug.org/texlive/trunk@52369 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.cls356
1 files changed, 240 insertions, 116 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 76ff91f260d..9bda6855229 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -41,7 +41,7 @@
%% scrkernel-circularletters.dtx (with options: `class,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -69,11 +69,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -104,19 +104,19 @@
\newcommand*{\KOMAClassName}{%
scrlttr2%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\newcommand*{\ClassName}{%
letter%
}
-\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
-\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -189,10 +189,11 @@
\@namedef{scr@v@3.26}{17}
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
+\@namedef{scr@v@3.27}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
@@ -242,7 +243,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -296,7 +297,7 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -314,7 +315,7 @@
}
\AtEndOfClass
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
@@ -330,9 +331,9 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-\newcommand*\@ptsize{%
+\providecommand*\@ptsize{%
12%
}
\newcommand*{\@pt@scan}{%
@@ -416,11 +417,11 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -435,7 +436,10 @@
}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\expandafter\ifnum\scr@v@is@ge{3.17}%
- \raggedbottom
+ \if@twoside\flushbottom
+ \else
+ \if@twocolumn\sloppy\flushbottom\else\raggedbottom\fi
+ \fi
\fi
\KOMA@kav@xreplacevalue{.%
\KOMAClassFileName
@@ -457,7 +461,12 @@
{\expandafter\AtEndOfClass}\fi
{\expandafter\ifnum\scr@v@is@ge{3.17}%
\if@twocolumn\twocolumn\sloppy\flushbottom
- \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \else
+ \onecolumn
+ \if@twoside\flushbottom\else
+ \raggedbottom
+ \fi
+ \fi
\fi}%
\fi
}
@@ -529,7 +538,7 @@
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -695,7 +704,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
@@ -800,9 +809,9 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -873,9 +882,9 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -1143,7 +1152,7 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\aftergroup\FamilyKeyStateProcessed
- \ifcase\@tempa
+ \ifcase\@tempa% wide
\endgroup
\@refwidetrue
\KOMA@kav@remove{.%
@@ -1155,7 +1164,7 @@
\KOMA@kav@add{.%
\KOMAClassFileName
}{refline}{wide}%
- \or
+ \or% narrow
\endgroup
\@refwidefalse
\KOMA@kav@remove{.%
@@ -1167,7 +1176,7 @@
\KOMA@kav@add{.%
\KOMAClassFileName
}{refline}{narrow}%
- \or
+ \or% dateleft
\endgroup
\def\@datepos{2}%
\KOMA@kav@remove{.%
@@ -1182,7 +1191,7 @@
\KOMA@kav@add{.%
\KOMAClassFileName
}{refline}{dateleft}%
- \or
+ \or% dateright
\endgroup
\def\@datepos{1}%
\KOMA@kav@remove{.%
@@ -1197,7 +1206,7 @@
\KOMA@kav@add{.%
\KOMAClassFileName
}{refline}{dateright}%
- \or
+ \or% nodate
\endgroup
\def\@datepos{0}%
\KOMA@kav@remove{.%
@@ -1374,66 +1383,101 @@
\newif\if@scrsymbols
\KOMA@key{symbolicnames}[true]{%
\KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}%
- \KOMA@kav@replacebool{.%
- \KOMAClassFileName
- }{symbolicnames}{@scrsymbols}%
- \if@scrsymbols
- \if@atdocument
- \begingroup
- \@tempswafalse
- \scr@ifundefinedorrelax{Telefon}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{FAX}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{Email}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{Mobilefone}{\@tempswatrue}{%
- }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \def\scr@symbols@font{marvosym}%
+ \else
+ \KOMA@set@ncmdkey{symbolicnames}{reserved@a}{%
+ {marvosym}{0},%
+ {fontawesome}{1},{awesome}{1},%
+ }{#1}%
+ \ifx \FamilyKeyState\FamilyKeyStateProcessed
+ \@scrsymbolstrue
+ \ifcase \number\reserved@a
+ \def\scr@symbols@font{marvosym}%
+ \else
+ \def\scr@symbols@font{fontawesome}%
+ \fi
+ \fi
+ \fi
+ \ifx \FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{symbolicnames}{#1}%
+ \if@scrsymbols
+ \ifstr{\scr@symbols@font}{marvosym}{%
+ \def\scr@symbol@phone{\Telefon}%
+ \def\scr@symbol@fax{\FAX}%
+ \def\scr@symbol@email{\Email}%
+ \def\scr@symbol@mobilephone{\Mobilefone}%
+ \def\scr@symbol@www{\@empty}%
+ }{%
+ \def\scr@symbol@phone{\faPhone}%
+ \def\scr@symbol@fax{\faFax}%
+ \def\scr@symbol@email{\faEnvelopeO}%
+ \def\scr@symbol@mobilephone{\faMobilePhone}%
+ \def\scr@symbol@www{\faGlobe}%
+ }%
+ \if@atdocument
+ \begingroup
+ \@tempswafalse
+ \expandafter\ifdefined\scr@symbol@phone\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@fax\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@email\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@mobilephone\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@www\else\@tempswatrue\fi
+ \if@tempswa
+ \aftergroup\@scrsymbolsfalse
+ \ClassWarning{\KOMAClassName}{%
+ Option `symbolicnames=#1'
+ ignorred.\MessageBreak
+ You've tried to set option `symbolicnames'\MessageBreak
+ after \string\begin{document}, but without\MessageBreak
+ loading package `\scr@symbols@font' before.\MessageBreak
+ You should either switch on option\MessageBreak
+ `symbolicnames' before \string\begin{document}\MessageBreak
+ or load package `\scr@letter@symbols@font' in the
+ document\MessageBreak
+ preamble to avoid this warning%
}%
- }%
- }%
- \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
- \ifx\@fileswith@pti@ns\@badrequireerror
- \ifstr{\@currext}{\@clsextension}{%
- \expandafter\AtEndOfClass
- }{%
- \ifstr{\@currext}{\@pksextension}{%
- \expandafter\AtEndOfPackage
+ \fi
+ \endgroup
+ \else
+ \ifx\@fileswith@pti@ns\@badrequireerror
+ \ifstr{\@currext}{\@clsextension}{%
+ \expandafter\AtEndOfClass
}{%
- \expandafter\AtBeginDocument
+ \ifstr{\@currext}{\@pkgextension}{%
+ \expandafter\AtEndOfPackage
+ }{%
+ \expandafter\AtBeginDocument
+ }%
}%
- }%
- \else
- \expandafter\@firstofone
+ \else
+ \expandafter\@firstofone
+ \fi
+ {\RequirePackage{\scr@symbols@font}}%
\fi
- {\RequirePackage{marvosym}}%
\fi
\fi
}
\KOMA@kav@add{.%
\KOMAClassFileName
}{symbolicnames}{false}%
-%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+\newcommand*{\scr@symbols@font}{}
+\newcommand*{\scr@symbol@phone}{\undefined}
+\newcommand*{\scr@symbol@fax}{\undefined}
+\newcommand*{\scr@symbol@email}{\undefined}
+\newcommand*{\scr@symbol@mobilephone}{\undefined}
+\newcommand*{\scr@symbol@www}{\undefined}
+%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
@@ -1446,7 +1490,7 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -1921,7 +1965,7 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
@@ -2033,7 +2077,7 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage'}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
@@ -2207,7 +2251,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
@@ -2288,7 +2332,7 @@
english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\bankname{Bank account}%
\g@addnumerical@date{american}{\number\month/\number\day/\number\year}%
- \g@addnumerical@date{australien}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{australian}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{british}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{canadian}{\number\year/\number\month/\number\day}%
\g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
@@ -2778,7 +2822,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\newkomavar}{%
\kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
@@ -2905,8 +2949,52 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
+\newcommand*{\foreachkomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{\unexpanded{#2}{\reserved@a}}\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachkomavarifempty}[3]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}%
+ {\unexpanded{#2}{\reserved@a}}%
+ {\unexpanded{#3}{\reserved@a}}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachemptykomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachnonemptykomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
+\newcommand*{\if@plength}[1]{%
+ \@ifundefined{ltr@len@#1}{\@secondoftwo}{\@firstoftwo}%
+}
+\newcommand*{\Ifplength}{\if@plength}
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -2916,11 +3004,10 @@
pseudo-length \expandafter\string\csname ltr@len@#1\endcsname
already defined%
}{%
- You tried to define a new pseudo-length using
- \string\@newplength\MessageBreak
- which is already defined. Try another name or
- better\MessageBreak
- Don't use this KOMA-Script internal macro}%
+ You've tried to define a new pseudo-length using\MessageBreak
+ \string\@newplength\space
+ or \string\newplength.\MessageBreak
+ Please, try another name}%
}%
}
\newcommand*{\newplength}{\@newplength}
@@ -3001,7 +3088,7 @@
\@tempa%
}
\newcommand*{\addtoplength}{\@addtoplength}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -3013,7 +3100,7 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
@@ -3131,6 +3218,19 @@
\expandafter\let\csname #1@listi\endcsname=\@listi
\def\@listi{\csname #1@listi\endcsname\@list@extra}%
}
+\AfterPackage{amsthm}{%
+ \RequirePackage{xpatch}%
+ \xpatchcmd{\deferred@thm@head}{\addvspace{-\parskip}}{}{%
+ \ClassInfoNoLine{\KOMAClassName}{%
+ amsthm's \string\deferred@thm@head\space patched}%
+ }{%
+ \ClassWarningNoLine{\KOMAClassName}{%
+ cannot patch amsthm's \string\deferred@thm@head.\MessageBreak
+ This could result in wrong spacing before theorem\MessageBreak
+ environments defined by package `amsthm'%
+ }%
+ }%
+}
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
\l@addto@macro{\@listii}{\@list@extra}%
@@ -3140,7 +3240,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -3237,12 +3337,12 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
@@ -3400,7 +3500,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
@@ -3551,7 +3651,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
@@ -3571,7 +3671,6 @@
{\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\
}%
\ifkomavarempty{fromaddress}{}{%
- \csname scr@default@firsthead@fromaddress@hook\endcsname
\ignorespaces\usekomavar{fromaddress}%
}%
}%
@@ -3841,7 +3940,7 @@
\ignorespaces%
}
\newcommand{\vb@t@z}[1]{{%
- \setbox\z@\vbox to\z@{#1\vss}%
+ \setbox\z@\vbox to\z@{\color@begingroup #1\color@endgroup\vss}%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\setlength{\baselineskip}{\z@}%
\setlength{\@tempdima}{\ht0}\addtolength{\@tempdima}{\dp0}%
@@ -3879,9 +3978,9 @@
}
\newcommand*{\@vfoldmark}[1]{%
\begingroup
- \@expandtwoargs\in@{#1}{\@usefolds}%
- \ifin@
- \ifdim \useplength{lfoldmarkhpos}=\z@\else
+ \ifdim \useplength{lfoldmarkhpos}=\z@\else
+ \@expandtwoargs\in@{#1}{\@usefolds}%
+ \ifin@
\vb@t@z{%
\ifdim \useplength{foldmarkvpos}<\z@
\nobreak\vskip \paperheight\nobreak
@@ -3942,7 +4041,7 @@
\begingroup%
\vbox to #2{#1#3}%
\if@savevbox@warning\@savevbox@warningfalse%
- \setbox\z@\vbox{#3}%
+ \setbox\z@\vbox{\color@begingroup #3\color@endgroup}%
\setlength{\@tempdima}{#2}%
\setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
\ifdim \@tempdimb>\@tempdima%
@@ -4312,7 +4411,7 @@
\fi
\ifkomavarempty{location}{%
\typeout{Location field: empty}%
- }{%
+ }{%
\typeout{Location field: yes}%
\ifdim \useplength{lochpos}=\z@%
\@setplength{lochpos}{\useplength{toaddrhpos}}%
@@ -4469,7 +4568,8 @@
\addtoreffields{invoice}%
}
\defaultreffields
-\newcommand*{\@datefield}{{%
+\newcommand*{\@datefield}{%
+ {%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\ifdim\useplength{refwidth}=\z@
\if@refwide
@@ -4674,7 +4774,21 @@
\setkomavar{nextfoot}%
}
\newenvironment{letter}[2][]{%
+ \if@twocolumn
+ \ClassWarning{\KOMAClassName}{%
+ twocolumn mode not supported.\MessageBreak
+ If you really want a twocolumned letter, you should\MessageBreak
+ use package `multicol' and add a `multicols'\MessageBreak
+ environment inside your letter.\MessageBreak
+ Switching back to oneside%
+ }%
+ \letter@restonecoltrue
+ \expandafter\onecolumn
+ \else
+ \letter@restonecolfalse
+ \fi
\cleardoubleoddemptypage
+ \raggedbottom
\scr@ifundefinedorrelax{letterpagestyle}{}{%
\ifx\letterpagestyle\@empty\else
\pagestyle{\letterpagestyle}%
@@ -4692,19 +4806,27 @@
\let\@currentlabel\thisletter
\label{\thisletter.lastpage}%
\@@par\pagebreak\@@par%
+ \ifletter@restonecol\twocolumn\fi
}
+\newif\ifletter@restonecol
\newcommand*{\thisletter}{outside.letter.undefined}
\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}}
\newcommand*{\stopletter}{}
\newcommand{\@processto}[1]{%
- \ifx\relax#1\relax\else
- \expandafter\@xproc#1\\\@nil\ifkomavarempty{toaddress}{}{%
- \expandafter\@xproc#1\@nil}%
- \fi
+ \IfArgIsEmpty{#1}{%
+ }{%
+ \expandafter\@xproc#1\\\@nil
+ \ifx\reserved@b\@empty\else\expandafter\@xproc#1\@nil\fi
+ \protected@edef\reserved@a{%
+ \noexpand\setkomavar{toname}{\reserved@a}%
+ \noexpand\setkomavar{toaddress}{\reserved@b}%
+ }\reserved@a
+ }%
}
\newcommand*{\@xproc}{}
\long\def\@xproc#1\\#2\@nil{%
- \setkomavar{toname}{#1}\setkomavar{toaddress}{#2}}
+ \def\reserved@a{#1}\def\reserved@b{#2}%
+}
\g@addto@macro\flushbottom{%
\g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}%
}
@@ -4729,8 +4851,10 @@
\@PapersizeWarning
\@gen@firsthead
\@mkboth{\scr@fromname@var}{\scr@subject@var}%
- \thispagestyle{empty}\noindent
- \@foldmarks\@firstheadfootfield\@addrfield\@locfield
+ \thispagestyle{empty}%
+ \noindent
+ \@foldmarks\@firstheadfootfield
+ \@addrfield\@locfield
\ifdim\useplength{subjectvpos}=\z@\else\@subjfield\fi
\@datefield
\@makelettertitle
@@ -4825,17 +4949,17 @@
\setkomavar{enclseparator}{: }
\newkomavar{backaddressseparator}
\setkomavar{backaddressseparator}{,\nobreakspace}
-\newkomavar[\if@scrsymbols\Telefon\else\phonename\fi]{phoneseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@phone\else\phonename\fi]{phoneseparator}
\setkomavar{phoneseparator}{\if@scrsymbols\else:\fi\nobreakspace}
\newkomavar[%
- \if@scrsymbols\Mobilefone\else\mobilephonename\fi
+ \if@scrsymbols\scr@symbol@mobilephone\else\mobilephonename\fi
]{mobilephoneseparator}
\setkomavar{mobilephoneseparator}{\usekomavar{phoneseparator}}
-\newkomavar[\if@scrsymbols\FAX\else\faxname\fi]{faxseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@fax\else\faxname\fi]{faxseparator}
\setkomavar{faxseparator}{\if@scrsymbols\else:\fi\nobreakspace}
-\newkomavar[\if@scrsymbols\Email\else\emailname\fi]{emailseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@email\else\emailname\fi]{emailseparator}
\setkomavar{emailseparator}{\if@scrsymbols\else:\fi\nobreakspace}
-\newkomavar[\if@scrsymbols\else\wwwname\fi]{urlseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@www\else\wwwname\fi]{urlseparator}
\setkomavar{urlseparator}{\if@scrsymbols\else:\nobreakspace\fi}
\newkomavar{zipcodeseparator}
\setkomavar{zipcodeseparator}{\,--\,}
@@ -4878,7 +5002,7 @@
}%
\scr@saved@date{#1}%
}
-%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}