summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrletter.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.sty140
1 files changed, 79 insertions, 61 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
index 86b25a5dc81..04932f6225a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% scrkernel-version.dtx (with options: `package,letter')
-%% scrkernel-basics.dtx (with options: `load')
+%% scrkernel-basics.dtx (with options: `package,load')
%% scrkernel-miscellaneous.dtx (with options: `package,letter,init')
%% scrkernel-typearea.dtx (with options: `package,letter,init')
%% scrkernel-miscellaneous.dtx (with options: `package,letter,option')
@@ -61,7 +61,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
@@ -83,20 +83,20 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2019/10/12 v3.27 KOMA-Script
+ 2019/12/23 v3.28 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% 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-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: init)
\scr@ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
@@ -120,11 +120,11 @@
}
\providecommand*{\par@updaterelative}{}
}{}
-%%% 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-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)
-%%% 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}{%
@@ -142,7 +142,7 @@
}
\AtEndOfPackage
{\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]{%
@@ -158,15 +158,15 @@
}{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)
-%%% 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-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)
-%%% 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}
@@ -668,7 +668,7 @@
scrletter.\scr@pkgextension
}{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}%
@@ -707,10 +707,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
@@ -735,15 +735,15 @@
\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)
\KOMAProcessOptions\relax
-%%% 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)
-%%% 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)
\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\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: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
@@ -795,7 +795,7 @@
\ifx\usepackage\@notprerr
\unexpanded{\let\usepackage\@notprerr}%
\else
- \noexpand\def\noexpand\Rusepackage{%
+ \noexpand\def\noexpand\usepackage{%
\unexpanded\expandafter{\usepackage}%
}%
\fi
@@ -915,7 +915,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}{%
@@ -1486,7 +1486,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}}
@@ -1576,20 +1576,38 @@
#1{\@nameuse{scr@#2@name}}%
}%
}
-\DeclareRobustCommand*{\ifkomavar}[1]{%
+\newcommand*{\ifkomavar}{%
+ \PackageWarning{scrletter}{%
+ 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}{%
+ \PackageWarning{scrletter}{%
+ 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
@@ -1626,7 +1644,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
@@ -1638,7 +1656,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
}%
@@ -1648,7 +1666,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
}%
@@ -1752,7 +1770,7 @@
\@tempa%
}
\newcommand*{\addtoplength}{\@addtoplength}
-%%% 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*{%
\letterpagemark
@@ -1784,18 +1802,18 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% 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)
\newkomavar{firsthead}
\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}%
}%
}%
@@ -2239,7 +2257,7 @@
\or
\begingroup%
\if@baddr
- \ifkomavarempty{backaddress}{%
+ \Ifkomavarempty{backaddress}{%
\let\@tempa\@empty\let\@tempb\@empty
}{%
\def\@tempa{backaddress}\def\@tempb{,\space}%
@@ -2248,7 +2266,7 @@
\let\@tempa\@empty\let\@tempb\@empty
\fi
\ifcase \ltr@priority
- \ifkomavarempty{specialmail}{}{%
+ \Ifkomavarempty{specialmail}{}{%
\edef\@tempa{\@tempa\@tempb specialmail}\def\@tempb{,\space}%
}%
\or
@@ -2271,7 +2289,7 @@
\@savevbox[\vss]{\useplength{backaddrheight}}{%
\hsize\useplength{toaddrwidth}%
\if@baddr
- \ifkomavarempty{backaddress}{}{{%
+ \Ifkomavarempty{backaddress}{}{{%
\noindent%
\def\\{\usekomavar{backaddressseparator}\@ogobble}%
\backaddr@format{\scriptsize\usekomafont{backaddress}%
@@ -2292,7 +2310,7 @@
-PRIORITY}}%
}%
\fi
- \ifkomavarempty{specialmail}{}{%
+ \Ifkomavarempty{specialmail}{}{%
\vbox{\hsize\useplength{toaddrwidth}%
\noindent\hspace*{\useplength{specialmailindent}}%
\specialmail@format{%
@@ -2325,14 +2343,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
@@ -2447,7 +2465,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}%
@@ -2485,15 +2503,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}%
@@ -2522,14 +2540,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
@@ -2572,7 +2590,7 @@
\or
\raggedleft
\if@logo
- \ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}%
+ \Ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}%
\fi
{\usekomafont{fromname}\strut\ignorespaces
\usekomavar{fromname}%
@@ -2621,7 +2639,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
@@ -2632,7 +2650,7 @@
}%
}
\newcommand*{\@test@reffield}[1]{%
- \ifkomavarempty{#1}{}{%
+ \Ifkomavarempty{#1}{}{%
\@tempswatrue
}%
}
@@ -2725,7 +2743,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
@@ -2737,7 +2755,7 @@
}%
}
\newcommand*{\@makelettertitle}{%
- \ifkomavarempty{title}{%
+ \Ifkomavarempty{title}{%
\typeout{Title: no}%
}{%
\typeout{Title: yes}%
@@ -2748,7 +2766,7 @@
}
\newcommand*{\@subjfield}{{%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
- \ifkomavarempty{subject}{%
+ \Ifkomavarempty{subject}{%
\typeout{Subject: no}%
}{%
\ifx\raggedsubject\@empty
@@ -2870,9 +2888,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
}%
}
@@ -2952,7 +2970,7 @@
\fi\noindent%
\begingroup
\parbox[t]{\textwidth}{%
- \ifkomavarempty*{ccseparator}{}{%
+ \Ifkomavarempty*{ccseparator}{}{%
\@hangfrom{%
\strut\usekomavar*{ccseparator}\usekomavar{ccseparator}}%
}%
@@ -2966,7 +2984,7 @@
\fi\noindent%
\begingroup
\parbox[t]{\textwidth}{%
- \ifkomavarempty*{enclseparator}{}{%
+ \Ifkomavarempty*{enclseparator}{}{%
\@hangfrom{%
\strut\usekomavar*{enclseparator}\usekomavar{enclseparator}}%
}%
@@ -2980,10 +2998,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}