diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrletter.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrletter.sty | 84 |
1 files changed, 29 insertions, 55 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index fc50677cf69..232400cf92b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -62,7 +62,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -84,20 +84,20 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}% + \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2017/09/07 v3.24 KOMA-Script + 2018/03/30 v3.25 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $ %%% (run: init) \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% @@ -121,30 +121,7 @@ } \providecommand*{\par@updaterelative}{} }{} -\newcommand*{\scr@renewforletter}{% - \kernel@ifstar {\@renewforletter*}% - {\@renewforletter{}}% -} -\newcommand*{\@renewforletter}[2]{% - \g@addto@macro\do@renewforletter@list{\do#2}% - \edef\reserved@a{% - \noexpand\newcommand\noexpand#1\expandafter\noexpand - \csname scrletter@extra@\string#2\endcsname - }% - \expandafter\reserved@a -} -\newcommand*{\do@renewforletter@list}{} -\newcommand*{\do@renewforletter}{% - \begingroup - \def\do##1{% - \aftergroup\let\aftergroup##1 - \expandafter\aftergroup\csname scrletter@extra@\string##1\endcsname - }% - \do@renewforletter@list - \endgroup - \let\do@renewforletter@list\@empty -} -%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2950 2018-03-05 07:54:19Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -213,12 +190,13 @@ \@namedef{scr@v@3.22}{16} \@namedef{scr@v@3.23}{16} \@namedef{scr@v@3.24}{16} -\@namedef{scr@v@last}{16} -%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $ +\@namedef{scr@v@3.25}{17} +\@namedef{scr@v@last}{17} +%%% From File: $Id: scrkernel-typearea.dtx 2959 2018-03-15 13:32:29Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $ %%% (run: option) \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -252,15 +230,15 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 2753 2017-11-29 08:58:32Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -782,14 +760,15 @@ }{symbolicnames}{false}% %%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2929 2018-02-05 06:37:22Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2712 2017-11-21 09:27:02Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2640 2017-05-08 09:36:55Z kohm $ +\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2700 2017-11-15 07:19:59Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -1660,7 +1639,7 @@ }% \endgroup } -%%% From File: $Id: scrkernel-pseudolengths.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 2753 2017-11-29 08:58:32Z kohm $ %%% (run: body) \newcommand*{\@newplength}[1]{% \@ifundefined{ltr@len@#1}{% @@ -1678,19 +1657,14 @@ Don't use this KOMA-Script internal macro}% }% } -\scr@ifundefinedorrelax{dimexpr}{% - \newcommand*{\useplength}[1]{% - \number \csname ltx@len@#1\endcsname\relax}% -}{% - \newcommand*{\useplength}[1]{% - \dimexpr \csname ltr@len@#1\endcsname\relax}% -} +\newcommand*{\useplength}[1]{% + \glueexpr \csname ltr@len@#1\endcsname\relax}% \newcommand*{\setlengthtoplength}[3][]{% \setlength{#2}{\useplength{#3}}% \setlength{#2}{#1#2}} \newcommand*{\@setplength}[3][]{% \begingroup% - \setlength{\@tempskipa}{#3}% + \setlength{\@tempskipa}{\glueexpr #3\relax}% \setlength{\@tempskipa}{#1\@tempskipa}% \edef\@tempa{\noexpand\endgroup% \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*% @@ -1707,7 +1681,7 @@ } \newcommand*{\@addtoplength}[3][]{% \begingroup% - \setlength{\@tempskipa}{#3}% + \setlength{\@tempskipa}{\glueexpr #3\relax}% \setlength{\@tempskipa}{#1\@tempskipa}% \addtolengthplength{\@tempskipa}{#2}% \edef\@tempa{\noexpand\endgroup% @@ -1748,7 +1722,7 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2700 2017-11-15 07:19:59Z kohm $ %%% (run: body) \newkomavar{firsthead} \setkomavar{firsthead}{% @@ -2368,8 +2342,8 @@ \raggedright \fontsize{8pt}{9pt}\selectfont\usekomafont{PPdata}% \usekomavar*{fromzipcode}\usekomavar{zipcodeseparator}% - \usekomavar{fromzipcode}\unskip\strut\\ - \usekomavar{place}\unskip\strut + \usekomavar{fromzipcode}\scr@endstrut\\ + \usekomavar{place}\scr@endstrut \hfill }% }% @@ -2892,10 +2866,10 @@ \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi \hspace{\useplength{sigindent}}% \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces - #1\ifhmode\unskip\strut\\[\useplength{sigbeforevskip}] + #1\ifhmode\scr@endstrut\\[\useplength{sigbeforevskip}] \else\vskip \useplength{sigbeforevskip}\fi \strut\ignorespaces - \usekomavar{signature}\ifhmode\unskip\strut\fi}}\par + \usekomavar{signature}\ifhmode\scr@endstrut\fi}}\par \nobreak\vskip\baselineskip } \newcommand\ps{\par% |