summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-30 22:17:03 +0000
committerKarl Berry <karl@freefriends.org>2019-12-30 22:17:03 +0000
commitaab00778035c28a028f94e501e3c13f6b4081f87 (patch)
treee5dd29eebc30d1b86ec710496c42250384425061 /Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
parentf56dddc3f3fce9850405369b12615d3544254bee (diff)
koma-script (30dec19)
git-svn-id: svn://tug.org/texlive/trunk@53270 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.cls217
1 files changed, 123 insertions, 94 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 9bda6855229..ab1ecd1a4e4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% scrkernel-version.dtx (with options: `class,letter')
-%% scrkernel-basics.dtx (with options: `load')
+%% scrkernel-basics.dtx (with options: `class,load')
%% scrkernel-compatibility.dtx (with options: `class,letter,init')
%% scrkernel-typearea.dtx (with options: `class,scrlttr2,init')
%% scrkernel-compatibility.dtx (with options: `class,letter,option')
@@ -73,7 +73,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -110,13 +110,13 @@
letter%
}
\ProvidesClass{\KOMAClassName}[%
- 2019/10/12 v3.27 KOMA-Script
+ 2019/12/23 v3.28 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -190,10 +190,12 @@
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
\@namedef{scr@v@3.27}{17}
+\@namedef{scr@v@3.27a}{17}
+\@namedef{scr@v@3.28}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
@@ -243,7 +245,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -297,7 +299,7 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
%%% (run: option)
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -315,7 +317,7 @@
}
\AtEndOfClass
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
%%% (run: option)
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
@@ -331,7 +333,7 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
\providecommand*\@ptsize{%
12%
@@ -341,17 +343,17 @@
}
\newcommand*{\@pt@@scan}{}
\def\@pt@@scan #1pt#2\@pt@@scan{%
- \ifstr{#2}{pt}{%
- \ifnumber{#1}{%
- \ifstr{#1}{10}{%
+ \Ifstr{#2}{pt}{%
+ \Ifnumber{#1}{%
+ \Ifstr{#1}{10}{%
\KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
{#1#2}{fontsize=#1#2}%
}{%
- \ifstr{#1}{11}{%
+ \Ifstr{#1}{11}{%
\KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
{#1#2}{fontsize=#1#2}%
}{%
- \ifstr{#1}{12}{%
+ \Ifstr{#1}{12}{%
\KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
{#1#2}{fontsize=#1#2}%
}{%
@@ -417,15 +419,15 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
- \ifstr{#1}{semi}{%
+ \Ifstr{#1}{semi}{%
\@twosidetrue
\FamilyKeyStateProcessed
}{%
@@ -481,8 +483,8 @@
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
- \ifstr{#1}{}{%
- \ifstr{#3}{BCOR}{%
+ \Ifstr{#1}{}{%
+ \Ifstr{#3}{BCOR}{%
\PassOptionsToPackage{BCOR#2}{typearea}%
}{\scr@pti@nerr@r}%
}{\scr@pti@nerr@r}%
@@ -510,18 +512,18 @@
}
\newcommand*{\x@@paper}{}
\def\x@@paper #1#2paper#3\x@@paper{%
- \ifstr{#3}{paper}{%
- \ifnumber{#2}{%
- \ifstr{#1}{a}{%
+ \Ifstr{#3}{paper}{%
+ \Ifnumber{#2}{%
+ \Ifstr{#1}{a}{%
\PassOptionsToPackage{#3=#1#2}{typearea}%
}{%
- \ifstr{#1}{b}{%
+ \Ifstr{#1}{b}{%
\PassOptionsToPackage{#3=#1#2}{typearea}%
}{%
- \ifstr{#1}{c}{%
+ \Ifstr{#1}{c}{%
\PassOptionsToPackage{#3=#1#2}{typearea}%
}{%
- \ifstr{#1}{d}{%
+ \Ifstr{#1}{d}{%
\PassOptionsToPackage{#3=#1#2}{typearea}%
}{\scr@pti@nerr@r}%
}%
@@ -704,7 +706,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $
%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
@@ -719,7 +721,7 @@
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
- \ifstr{#1}{current}{%
+ \Ifstr{#1}{current}{%
\def\@tempc{\endgroup%
\def\cleardoublepage{\cleardoublestandardpage}%
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
@@ -730,7 +732,7 @@
}{cleardoublepage}{current}%
}%
}{%
- \ifnotundefined{ps@#1}{%
+ \Ifnotundefined{ps@#1}{%
\def\@tempc{\endgroup%
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
@@ -743,7 +745,7 @@
}{%
\ifx\@currname\KOMAClassName
\ifx\@currext\@clsextension
- \ifstr{#1}{headings}{%
+ \Ifstr{#1}{headings}{%
\def\@tempc{\endgroup%
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
@@ -809,9 +811,9 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -826,7 +828,7 @@
option `footnotes=#1'}%
\fi
\fi
- \ifstr{#1}{multiple}{%
+ \Ifstr{#1}{multiple}{%
\let\@footnotemark\scr@footnotemark
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
@@ -835,7 +837,7 @@
\KOMAClassFileName
}{footnotes}{multiple}%
}{%
- \ifstr{#1}{nomultiple}{%
+ \Ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
@@ -882,9 +884,9 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -1404,7 +1406,7 @@
\KOMAClassFileName
}{symbolicnames}{#1}%
\if@scrsymbols
- \ifstr{\scr@symbols@font}{marvosym}{%
+ \Ifstr{\scr@symbols@font}{marvosym}{%
\def\scr@symbol@phone{\Telefon}%
\def\scr@symbol@fax{\FAX}%
\def\scr@symbol@email{\Email}%
@@ -1443,10 +1445,10 @@
\endgroup
\else
\ifx\@fileswith@pti@ns\@badrequireerror
- \ifstr{\@currext}{\@clsextension}{%
+ \Ifstr{\@currext}{\@clsextension}{%
\expandafter\AtEndOfClass
}{%
- \ifstr{\@currext}{\@pkgextension}{%
+ \Ifstr{\@currext}{\@pkgextension}{%
\expandafter\AtEndOfPackage
}{%
\expandafter\AtBeginDocument
@@ -1471,13 +1473,13 @@
\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 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
%%% (run: body)
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
@@ -1490,7 +1492,7 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -1965,7 +1967,7 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: body)
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
@@ -2013,7 +2015,16 @@
}
\newcommand*{\is@thispageodd@setlabel}{}
\newif\ifthispagewasodd
-\newcommand{\ifthispageodd}{%
+\providecommand*{\ifthispageodd}{%
+ \PackageWarning{scrbase}{Usage of deprecated command
+ `\string\ifthispageodd'.\MessageBreak
+ The command has been renamed because of a\MessageBreak
+ recommendation of The LaTeX Project Team.\MessageBreak
+ Please replace `\string\ifthispageodd' by `\string\Ifthispageodd'%
+ }%
+ \Ifthispageodd
+}
+\newcommand{\Ifthispageodd}{%
\is@thispageodd
\ifthispagewasodd
\expandafter\@firstoftwo
@@ -2077,7 +2088,7 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage'}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
@@ -2129,7 +2140,7 @@
\ifx\usepackage\@notprerr
\unexpanded{\let\usepackage\@notprerr}%
\else
- \noexpand\def\noexpand\Rusepackage{%
+ \noexpand\def\noexpand\usepackage{%
\unexpanded\expandafter{\usepackage}%
}%
\fi
@@ -2251,7 +2262,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
%%% (run: body)
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
@@ -2822,7 +2833,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $
%%% (run: body)
\newcommand*{\newkomavar}{%
\kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
@@ -2912,20 +2923,38 @@
#1{\@nameuse{scr@#2@name}}%
}%
}
-\DeclareRobustCommand*{\ifkomavar}[1]{%
+\newcommand*{\ifkomavar}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated command `\string\ifkomavar'.\MessageBreak
+ The command has been renamed to because of a\MessageBreak
+ recommendation of LaTeX3 team members.\MessageBreak
+ Please replace `\string\ifkomavar' by `\string\Ifkomavar'%
+ }%
+ \Ifkomavar
+}
+\DeclareRobustCommand*{\Ifkomavar}[1]{%
\scr@ifundefinedorrelax{scr@#1@var}{%
\expandafter\@secondoftwo
}{%
\expandafter\@firstoftwo
}%
}
-\DeclareRobustCommand*{\ifkomavarempty}{%
+\newcommand*{\ifkomavarempty}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated command `\string\ifkomavarempty'.\MessageBreak
+ The command has been renamed to because of a\MessageBreak
+ recommendation of LaTeX3 team members.\MessageBreak
+ Please replace `\string\ifkomavarempty' by `\string\Ifkomavarempty'%
+ }%
+ \Ifkomavarempty
+}
+\DeclareRobustCommand*{\Ifkomavarempty}{%
\begingroup
\kernel@ifstar {\@tempswatrue\@ifkomavarempty}%
{\@tempswafalse\@ifkomavarempty}%
}
\newcommand{\@ifkomavarempty}[1]{%
- \ifkomavar{#1}{%
+ \Ifkomavar{#1}{%
\if@tempswa
\@ifundefined{scr@#1@name}{%
\aftergroup\@firstoftwo
@@ -2962,7 +2991,7 @@
\scr@trim@spaces\reserved@a
\ifx\reserved@a\@empty\else
\edef\reserved@a{%
- \noexpand\ifkomavarempty{\reserved@a}%
+ \noexpand\Ifkomavarempty{\reserved@a}%
{\unexpanded{#2}{\reserved@a}}%
{\unexpanded{#3}{\reserved@a}}%
}\expandafter\reserved@a
@@ -2974,7 +3003,7 @@
\scr@trim@spaces\reserved@a
\ifx\reserved@a\@empty\else
\edef\reserved@a{%
- \noexpand\ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}%
+ \noexpand\Ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}%
}\expandafter\reserved@a
\fi
}%
@@ -2984,7 +3013,7 @@
\scr@trim@spaces\reserved@a
\ifx\reserved@a\@empty\else
\edef\reserved@a{%
- \noexpand\ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}%
+ \noexpand\Ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}%
}\expandafter\reserved@a
\fi
}%
@@ -3088,7 +3117,7 @@
\@tempa%
}
\newcommand*{\addtoplength}{\@addtoplength}
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -3240,7 +3269,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $
%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -3337,12 +3366,12 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
@@ -3387,10 +3416,10 @@
\newcommand*{\ftn@rule@width}{.4\columnwidth}
\newcommand*{\ftn@rule@height}{.4\p@}
\newcommand*{\setfootnoterule}[2][]{%
- \ifstr{#1}{}{}{%
+ \IfArgIsEmpty{#1}{}{%
\renewcommand*{\ftn@rule@height}{#1}%
}%
- \ifstr{#2}{}{}{%
+ \IfArgIsEmpty{#2}{}{%
\renewcommand*{\ftn@rule@width}{#2}%
}%
\ftn@rule@test@values
@@ -3500,7 +3529,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: body)
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
@@ -3601,7 +3630,7 @@
\@addmargin
}{%
\if@twoside
- \unskip\nobreak\ifthispageodd{}{}%
+ \unskip\nobreak\Ifthispageodd{}{}%
\expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
\ClassWarning{\KOMAClassName}{%
page break inside `addmargin*' environment.\MessageBreak
@@ -3651,7 +3680,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
@@ -3665,12 +3694,12 @@
\setkomavar{firsthead}{%
\parbox[b]{\useplength{firstheadwidth}}%
{\centering\usekomafont{fromaddress}{%
- \ifkomavarempty{fromname}{}{%
+ \Ifkomavarempty{fromname}{}{%
{\usekomafont{fromname}%
{\ignorespaces\usekomavar{fromname}}\\[-8pt]}
{\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\
}%
- \ifkomavarempty{fromaddress}{}{%
+ \Ifkomavarempty{fromaddress}{}{%
\ignorespaces\usekomavar{fromaddress}%
}%
}%
@@ -4155,7 +4184,7 @@
\or
\begingroup%
\if@baddr
- \ifkomavarempty{backaddress}{%
+ \Ifkomavarempty{backaddress}{%
\let\@tempa\@empty\let\@tempb\@empty
}{%
\def\@tempa{backaddress}\def\@tempb{,\space}%
@@ -4164,7 +4193,7 @@
\let\@tempa\@empty\let\@tempb\@empty
\fi
\ifcase \ltr@priority
- \ifkomavarempty{specialmail}{}{%
+ \Ifkomavarempty{specialmail}{}{%
\edef\@tempa{\@tempa\@tempb specialmail}\def\@tempb{,\space}%
}%
\or
@@ -4187,7 +4216,7 @@
\@savevbox[\vss]{\useplength{backaddrheight}}{%
\hsize\useplength{toaddrwidth}%
\if@baddr
- \ifkomavarempty{backaddress}{}{{%
+ \Ifkomavarempty{backaddress}{}{{%
\noindent%
\def\\{\usekomavar{backaddressseparator}\@ogobble}%
\backaddr@format{\scriptsize\usekomafont{backaddress}%
@@ -4208,7 +4237,7 @@
-PRIORITY}}%
}%
\fi
- \ifkomavarempty{specialmail}{}{%
+ \Ifkomavarempty{specialmail}{}{%
\vbox{\hsize\useplength{toaddrwidth}%
\noindent\hspace*{\useplength{specialmailindent}}%
\specialmail@format{%
@@ -4241,14 +4270,14 @@
\or
\def\@tempa{image-mode}\def\@tempb{,\space}%
\fi
- \ifkomavarempty{backaddress}{}{%
+ \Ifkomavarempty{backaddress}{}{%
\edef\@tempa{\@tempa\@tempb backaddress ignored}\def\@tempb{,\space}%
}%
\else
\let\@tempa\@empty\let\@tempb\@empty
\fi
\ifcase \ltr@priority
- \ifkomavarempty{specialmail}{}{%
+ \Ifkomavarempty{specialmail}{}{%
\edef\@tempa{\@tempa\@tempb specialmail ignored}\def\@tempb{,\space}%
}%
\or
@@ -4363,7 +4392,7 @@
\setlength{\@tempdima}{\useplength{toaddrwidth}}%
\addtolengthplength[-2]{\@tempdima}{toaddrindent}%
\vbox{\hsize\@tempdima
- \ifkomavarempty{PPdatamatrix}{}{%
+ \Ifkomavarempty{PPdatamatrix}{}{%
\addtolength{\hsize}{-2mm}%
\settowidth\@tempdima{\usekomavar{PPdatamatrix}}%
\addtolength{\hsize}{-\@tempdima}%
@@ -4401,15 +4430,15 @@
\ifcase\@alignfrom
\or
\if@logo
- \ifkomavarempty{location}{\setkomavar{location}{\null}}{}%
+ \Ifkomavarempty{location}{\setkomavar{location}{\null}}{}%
\fi
\or
\or
- \ifkomavarempty{location}{\setkomavar{location}{\null}}{}%
+ \Ifkomavarempty{location}{\setkomavar{location}{\null}}{}%
\or
- \ifkomavarempty{location}{\setkomavar{location}{\null}}{}%
+ \Ifkomavarempty{location}{\setkomavar{location}{\null}}{}%
\fi
- \ifkomavarempty{location}{%
+ \Ifkomavarempty{location}{%
\typeout{Location field: empty}%
}{%
\typeout{Location field: yes}%
@@ -4438,14 +4467,14 @@
\ifcase\@alignfrom
\or
\if@logo
- \ifkomavarempty{fromlogo}{\null}{%
+ \Ifkomavarempty{fromlogo}{\null}{%
{\raggedleft\noindent\usekomavar{fromlogo}\\
\vskip\parskip}\noindent}%
\fi
\or
\or
\if@logo
- \ifkomavarempty{fromlogo}{}{%
+ \Ifkomavarempty{fromlogo}{}{%
\raggedleft\usekomavar{fromlogo}\par}%
\fi
\raggedright
@@ -4488,7 +4517,7 @@
\or
\raggedleft
\if@logo
- \ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}%
+ \Ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}%
\fi
{\usekomafont{fromname}\strut\ignorespaces
\usekomavar{fromname}%
@@ -4537,7 +4566,7 @@
}
\newcommand*{\do@set@reffield}{}
\newcommand*{\@set@reffield}[1]{%
- \ifkomavarempty{#1}{}{%
+ \Ifkomavarempty{#1}{}{%
\settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}%
\sbox\z@{\strut\usekomafont{refname}\usekomavar*{#1}}%
\ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi
@@ -4548,7 +4577,7 @@
}%
}
\newcommand*{\@test@reffield}[1]{%
- \ifkomavarempty{#1}{}{%
+ \Ifkomavarempty{#1}{}{%
\@tempswatrue
}%
}
@@ -4641,7 +4670,7 @@
\else
\ifcase \@datepos\else
\ifnum \@datepos=1 \enskip\hfill\fi
- {\usekomafont{placeanddate}{\ifkomavarempty{place}{}{%
+ {\usekomafont{placeanddate}{\Ifkomavarempty{place}{}{%
\usekomavar{place}\usekomavar{placeseparator}}%
\usekomavar{date}}}%
\fi
@@ -4653,7 +4682,7 @@
}%
}
\newcommand*{\@makelettertitle}{%
- \ifkomavarempty{title}{%
+ \Ifkomavarempty{title}{%
\typeout{Title: no}%
}{%
\typeout{Title: yes}%
@@ -4664,7 +4693,7 @@
}
\newcommand*{\@subjfield}{{%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
- \ifkomavarempty{subject}{%
+ \Ifkomavarempty{subject}{%
\typeout{Subject: no}%
}{%
\ifx\raggedsubject\@empty
@@ -4817,9 +4846,9 @@
}{%
\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}%
+ \edef\reserved@a{%
+ \noexpand\setkomavar{toname}{\unexpanded\expandafter{\reserved@a}}%
+ \noexpand\setkomavar{toaddress}{\unexpanded\expandafter{\reserved@b}}%
}\reserved@a
}%
}
@@ -4898,7 +4927,7 @@
\fi\noindent%
\begingroup
\parbox[t]{\textwidth}{%
- \ifkomavarempty*{ccseparator}{}{%
+ \Ifkomavarempty*{ccseparator}{}{%
\@hangfrom{%
\strut\usekomavar*{ccseparator}\usekomavar{ccseparator}}%
}%
@@ -4912,7 +4941,7 @@
\fi\noindent%
\begingroup
\parbox[t]{\textwidth}{%
- \ifkomavarempty*{enclseparator}{}{%
+ \Ifkomavarempty*{enclseparator}{}{%
\@hangfrom{%
\strut\usekomavar*{enclseparator}\usekomavar{enclseparator}}%
}%
@@ -4926,10 +4955,10 @@
\newkomavar{location}
\newkomavar{backaddress}
\setkomavar{backaddress}{%
- \ifkomavarempty{fromname}{}{%
+ \Ifkomavarempty{fromname}{}{%
\strut\ignorespaces\usekomavar{fromname}%
- \ifkomavarempty{fromaddress}{}{\\}}%
- \ifkomavarempty{fromaddress}{}{%
+ \Ifkomavarempty{fromaddress}{}{\\}}%
+ \Ifkomavarempty{fromaddress}{}{%
\strut\ignorespaces\usekomavar{fromaddress}}%
}
\newkomavar{specialmail}