diff options
author | Karl Berry <karl@freefriends.org> | 2020-04-21 21:21:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-04-21 21:21:23 +0000 |
commit | 52b5238ab893a61a4e2c64843d074cd296836359 (patch) | |
tree | 134947d55aee4d68d2f1ef4ac63c59a08eebec82 /Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls | |
parent | 7c0b908f1a6e1489834fbdb0789766eed8a37b49 (diff) |
koma-script (21apr20)
git-svn-id: svn://tug.org/texlive/trunk@54825 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 | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index ef52912f715..60729877530 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -110,13 +110,13 @@ letter% } \ProvidesClass{\KOMAClassName}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -193,10 +193,11 @@ \@namedef{scr@v@3.27a}{17} \@namedef{scr@v@3.28}{17} \@namedef{scr@v@3.29}{17} +\@namedef{scr@v@3.30}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -246,7 +247,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -300,7 +301,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -318,7 +319,7 @@ } \AtEndOfClass {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% @@ -424,7 +425,7 @@ %%% (run: option) %%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -486,7 +487,8 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \Ifstr{#1}{}{% \Ifstr{#3}{BCOR}{% - \PassOptionsToPackage{BCOR#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{BCOR#2}{typearea}}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -495,7 +497,8 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \PassOptionsToPackage{DIV#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{DIV#2}{typearea}}% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -887,7 +890,7 @@ \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -1474,13 +1477,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 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% @@ -1968,7 +1971,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} @@ -2089,7 +2092,7 @@ `parskip' with one of it's several values} \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage'} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -2263,7 +2266,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% @@ -3118,7 +3121,7 @@ \@tempa% } \newcommand*{\addtoplength}{\@addtoplength} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -3681,7 +3684,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ %%% (run: body) \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% @@ -4219,9 +4222,12 @@ \if@baddr \Ifkomavarempty{backaddress}{}{{% \noindent% - \def\\{\usekomavar{backaddressseparator}\@ogobble}% - \backaddr@format{\scriptsize\usekomafont{backaddress}% - \usekomavar{backaddress}}}}% + \backaddr@format{\scriptsize + {% + \def\\{\usekomavar{backaddressseparator}\@ogobble}% + \usekomafont{backaddress}% + {\usekomavar{backaddress}}% + }}}}% \fi }{backaddress}{backaddrheight}{\setkomavar}% \ifcase \ltr@priority |