From dd8cd465b253cee19fa61fc89383c0c61a0791e4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Jun 2016 22:41:14 +0000 Subject: koma-script (20jun16) git-svn-id: svn://tug.org/texlive/trunk@41508 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 41 ++++++++++++---------- 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls') diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 9a9be159fa3..d2f8649e0d7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -71,7 +71,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -93,7 +93,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}% + \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -108,12 +108,12 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2016/05/10 v3.20 KOMA-Script + 2016/06/14 v3.21 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ \newcommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -213,6 +213,7 @@ \@namedef{scr@v@3.19}{15} \@namedef{scr@v@3.19a}{15} \@namedef{scr@v@3.20}{15} +\@namedef{scr@v@3.21}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -226,7 +227,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -246,6 +247,10 @@ \KOMA@kav@add{.\KOMAClassFileName}{draft}{false} \KOMA@DeclareStandardOption {final}{draft=false} +\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles} +\newcommand*{\@gr@gsffamily}{% + \if@egregdoesnotlikesansseriftitles\else\sffamily\fi +} %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -365,7 +370,7 @@ } %%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -743,7 +748,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ %%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -815,7 +820,7 @@ \ifhmode\spacefactor\@x@sf\fi \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -1365,12 +1370,12 @@ \KOMAClassFileName }{symbolicnames}{false}% %%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% \begingroup @@ -1856,7 +1861,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} \setlength\fboxrule{.4\p@} @@ -2830,7 +2835,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -3064,7 +3069,7 @@ } \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } @@ -3347,7 +3352,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $ \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% Deprecated usage of \string\@firsthead.\MessageBreak @@ -3529,7 +3534,7 @@ \newkomafont{fromname}{} \newkomafont{fromaddress}{} \newkomafont{fromrule}{} -\newkomafont{backaddress}{\sffamily} +\newkomafont{backaddress}{\@gr@gsffamily} \newkomafont{specialmail}{} \newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries} \newkomafont{prioritykey}{\fontsize{24.88pt}{24.88pt}\selectfont} @@ -3538,14 +3543,14 @@ \newkomafont{addressee}{} \newkomafont{toname}{} \newkomafont{toaddress}{} -\newkomafont{refname}{\sffamily\scriptsize} +\newkomafont{refname}{\@gr@gsffamily\scriptsize} \ifnum\scr@compatibility=\@nameuse{scr@v@2.97}\relax \newkomafont{refvalue}{\sffamily\scriptsize} \else \newkomafont{refvalue}{} \fi \newkomafont{placeanddate}{} -\newkomafont{lettertitle}{\normalcolor\sffamily\bfseries} +\newkomafont{lettertitle}{\normalcolor\@gr@gsffamily\bfseries} \aliaskomafont{title}{lettertitle}% \newkomafont{lettersubject}{\normalfont\bfseries} \aliaskomafont{subject}{lettersubject}% -- cgit v1.2.3