diff options
author | Karl Berry <karl@freefriends.org> | 2015-04-24 23:19:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-04-24 23:19:31 +0000 |
commit | 0a00b3b492fd27dc12cddae602b2c43206a17d74 (patch) | |
tree | 40a09bf2208cc13bcd727626e1ee058e2caa68b1 /Master/texmf-dist/tex/latex/koma-script/scrletter.sty | |
parent | 77b150bbd42aa48ba71627e09763785b26adfcfd (diff) |
koma-script (24apr15)
git-svn-id: svn://tug.org/texlive/trunk@37036 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrletter.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrletter.sty | 353 |
1 files changed, 280 insertions, 73 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index 1cb5d89c21e..5455841f31c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -60,7 +60,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -82,15 +82,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}% \endgroup +\providecommand*{\scr@pkgextension}{\@pkgextension} +\AtBeginDocument{% + \let\scr@pkgextension\@pkgextension +} \ProvidesPackage{scrletter}[% - 2015/02/07 v3.16 KOMA-Script + 2015/04/23 v3.17 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% Cannot detect any KOMA-Script class.\MessageBreak @@ -125,8 +129,8 @@ \endgroup \let\do@renewforletter@list\@empty } -%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $ -%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% \expandafter @@ -143,21 +147,28 @@ } \AtEndOfPackage {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi \KOMA@set@ifkey{numericaldate}{@orgdate}{#1}% + \KOMA@kav@replacebool{.% + scrletter.\scr@pkgextension + }{numericaldate}{@orgdate}% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi } +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $ -%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $ -%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $ -%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $ -\KOMA@ifkey{firsthead}{@firsthead}\@firstheadtrue +%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $ +\KOMA@ifkey{firsthead}{@firsthead} +\KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} \KOMA@key{fromalign}{% \KOMA@set@ncmdkey{fromalign}{@alignfrom}{% @@ -169,14 +180,22 @@ {no}{10000},{false}{10000},{off}{10000}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.% + scrletter.\scr@pkgextension + }{fromalign}{#1}% \ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi \fi } -\newcommand*{\@rulefrom}{0} +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{fromalign}{left} \KOMA@ncmdkey{fromrule}[below]{@rulefrom}{% {false}{0},{no}{0},{off}{0},{aftername}{1},% {below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}% } +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{fromrule}{false} \KOMA@ifkey{fromphone}{@phone} \KOMA@ifkey{frommobilephone}{@mobilephone} \KOMA@ifkey{fromfax}{@fax} @@ -195,9 +214,12 @@ {ppbackgroundimage}{3},{ppBackgroundImage}{3},{ppBackGroundImage}{3},% {image}{4},{Image}{4},% {PPimage}{4},{PPImage}{4},% - {ppimage}{4},{ppImage}{4}% + {ppimage}{4},{ppImage}{4},% + {topaligned}{5},{alignedtop}{5}% } -\newcommand*{\ltr@priority}{0}% +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{addrfield}{true} \KOMA@ncmdkey{priority}[A]{ltr@priority}{% {no}{0},{off}{0},{false}{0},{manual}{1},% {B}{1},{b}{1},% @@ -207,6 +229,9 @@ {priority}{2},{Priority}{2},{PRIORITY}{2},% {A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}% }% +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{priority}{false} \newcommand{\backaddr@format}[1]{} \let\backaddr@format\underline \newif\if@baddr\@baddrtrue @@ -237,6 +262,27 @@ \else \endgroup \fi + \if@baddr + \ifx\backaddr@format\underline + \KOMA@kav@replacevalue{.% + scrletter.\scr@pkgextension + }{backaddress}{underlined}% + \else + \ifx\backaddr@format\@firstofone + \KOMA@kav@replacevalue{.% + scrletter.\scr@pkgextension + }{backaddress}{plain}% + \else + \KOMA@kav@replacevalue{.% + scrletter.\scr@pkgextension + }{backaddress}{true}% + \fi + \fi + \else + \KOMA@kav@replacevalue{.% + scrletter.\scr@pkgextension + }{backaddress}{false}% + \fi \else \endgroup \FamilyKeyStateUnknownValue @@ -250,15 +296,24 @@ \ifcase\@tempa \endgroup \@bigloctrue + \KOMA@kav@replacevalue{.% + scrletter.\scr@pkgextension + }{locfield}{wide}% \else \endgroup \@biglocfalse + \KOMA@kav@replacevalue{.% + scrletter.\scr@pkgextension + }{locfield}{narrow}% \fi \else \endgroup \FamilyKeyStateUnknownValue \fi } +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{locfield}{narrow} \KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide} \KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow} \newif\if@fold\@foldtrue @@ -314,7 +369,21 @@ \expandafter\sc@nf@ldch@rs#1\@nil \fi \endgroup + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.% + scrletter.\scr@pkgextension + }{foldmarks}{\@usefolds}% + \KOMA@kav@xadd{.% + scrletter.\scr@pkgextension + }{foldmarks}{\if@fold true\else false\fi}% + \fi } +\KOMA@kav@xadd{.% + scrletter.\scr@pkgextension +}{foldmarks}{\@usefolds}% +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{foldmarks}{true}% \newcommand*{\scr@removechar}[2]{% \def\in@@##1#2##2##3\in@@{% \ifx\in@##2\else @@ -337,24 +406,84 @@ \ifcase\@tempa \endgroup \@refwidetrue + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{wide}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{narrow}% + \KOMA@kav@add{.% + scrletter.\scr@pkgextension + }{refline}{wide}% \or \endgroup \@refwidefalse + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{wide}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{narrow}% + \KOMA@kav@add{.% + scrletter.\scr@pkgextension + }{refline}{narrow}% \or \endgroup \def\@datepos{2}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{dateleft}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{dateright}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{nodate}% + \KOMA@kav@add{.% + scrletter.\scr@pkgextension + }{refline}{dateleft}% \or \endgroup \def\@datepos{1}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{dateleft}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{dateright}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{nodate}% + \KOMA@kav@add{.% + scrletter.\scr@pkgextension + }{refline}{dateright}% \or \endgroup \def\@datepos{0}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{dateleft}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{dateright}% + \KOMA@kav@remove{.% + scrletter.\scr@pkgextension + }{refline}{nodate}% + \KOMA@kav@add{.% + scrletter.\scr@pkgextension + }{refline}{nodate}% \fi \else \endgroup \FamilyKeyStateUnknownValue \fi } +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{refline}{dateright}% +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{refline}{narrow}% \newcommand{\subject@format}[1]{#1} \newcommand*{\raggedsubject}{} \newif\if@subj @@ -394,7 +523,43 @@ \aftergroup\FamilyKeyStateUnknownValue \fi \endgroup + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.% + scrletter.\scr@pkgextension + }{subject}{\if@subj titled\else untitled\fi}% + \KOMA@kav@xadd{.% + scrletter.\scr@pkgextension + }{subject}{\if@subjafter after\else before\fi opening}% + \ifx\subject@format\undeline + \KOMA@kav@add{.% + scrletter.\scr@pkgextension + }{subject}{underlined}% + \fi + \ifx\raggedsubject\raggedright + \KOMA@kav@add{.% + scrletter.\scr@pkgextension + }{subject}{left}% + \else + \ifx\raggedsubject\raggedleft + \KOMA@kav@add{.% + scrletter.\scr@pkgextension + }{subject}{right}% + \else + \ifx\raggedsubject\centering + \KOMA@kav@add{.% + scrletter.\scr@pkgextension + }{subject}{centered}% + \fi + \fi + \fi + \fi } +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{subject}{untitled}% +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{subject}{beforeopening}% \KOMA@ifkey{enlargefirstpage}{@enlargefp} \KOMA@ifkey{firstfoot}{@firstfoot}\@firstfoottrue \newcommand*{\@pageat}{4} @@ -443,10 +608,35 @@ \def\@tempa{\endgroup\FamilyKeyStateUnknownValue}% \fi \@tempa + \KOMA@kav@xreplacevalue{.% + scrletter.\scr@pkgextension + }{pagenumber}{% + \ifcase \@pageat + topleft% + \or + topmiddle% + \or + topright% + \or + botleft% + \or + botmiddle% + \or + botright% + \else + false% + \fi + }% } +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{pagenumber}{botmiddle} \newif\if@scrsymbols \KOMA@key{symbolicnames}[true]{% \KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}% + \KOMA@kav@replacebool{.% + scrletter.\scr@pkgextension + }{symbolicnames}{@scrsymbols}% \if@scrsymbols \if@atdocument \begingroup @@ -475,7 +665,7 @@ \fi \endgroup \else - \ifstr{\@currname.\@currext}{scrletter.sty}{% + \ifstr{\@currname.\@currext}{scrletter.\scr@pkgextension}{% \expandafter\AtEndOfPackage }{% \expandafter\@firstofone @@ -484,12 +674,15 @@ \fi \fi } -%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $ -%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $ +\KOMA@kav@add{.% + scrletter.\scr@pkgextension +}{symbolicnames}{false}% +%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $ -%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $ -%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% {\let\@restore@catcode@level=\z@}{}% @@ -604,7 +797,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \PackageInfo{scrletter% @@ -1117,7 +1310,7 @@ \fi \fi } -%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ \newcommand*{\newkomavar}{% \@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} \newcommand*{\@newkomavar}[2][\relax]{% @@ -1243,7 +1436,7 @@ }% \endgroup } -%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ \newcommand*{\@newplength}[1]{% \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% @@ -1298,7 +1491,13 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +\newcommand*{% + \letterpagemark +}{% + {\usekomafont{pagenumber}{% + \pagename\nobreakspace + \thepage}}} \RequirePackage{scrlayer-scrpage} \newpairofpagestyles{letter}{% \clearpairofpagestyles @@ -1323,7 +1522,7 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $ \newkomavar{firsthead} \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% @@ -1341,7 +1540,9 @@ }% } \newcommand*{\scr@firsthead@postsetvar}{% - \renewcommand*{\@alignfrom}{10000}% + \KOMAExecuteOptions[.% + scrletter.\scr@pkgextension + ]{fromalign=no}% } \newcommand*{\@gen@firsthead}{% \ifcase\@alignfrom @@ -1499,11 +1700,13 @@ \newkomafont{refname}{\sffamily\scriptsize} \newkomafont{refvalue}{} \newkomafont{placeanddate}{} +\newkomafont{lettertitle}{\normalcolor\sffamily\bfseries} \scr@ifundefinedorrelax{scr@fnt@title}{% - \newkomafont{title}{\normalcolor\sffamily\bfseries}% + \aliaskomafont{lettertitle}{title}% }{} +\newkomafont{lettersubject}{\normalfont\bfseries} \scr@ifundefinedorrelax{scr@fnt@subject}{% - \newkomafont{subject}{\normalcolor\bfseries}% + \aliaskomafont{lettersubject}{subject}% }{} \@newplength{foldmarkhpos} \@newplength{foldmarkvpos} @@ -1576,11 +1779,11 @@ \ignorespaces% } \newcommand{\vb@t@z}[1]{{% - \setbox0\vbox to\z@{#1\vss}% + \setbox\z@\vbox to\z@{#1\vss}% \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative \setlength{\baselineskip}{\z@}% \setlength{\@tempdima}{\ht0}\addtolength{\@tempdima}{\dp0}% - \box0\vskip-\@tempdima% + \box\z@\vskip-\@tempdima% }% } \newcommand*{\@foldmark}[2]{% @@ -1677,7 +1880,7 @@ \begingroup% \vbox to #2{#1#3}% \if@savevbox@warning\@savevbox@warningfalse% - \setbox0\vbox{#3}% + \setbox\z@\vbox{#3}% \setlength{\@tempdima}{#2}% \setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}% \ifdim \@tempdimb>\@tempdima% @@ -1786,7 +1989,7 @@ }% } \newcommand*{\@addrfield}{% - \ifcase \@afieldmode\relax + \ifcase \ifnum\@afieldmode=5 \@ne\else\@afieldmode\fi\relax \typeout{Address: No}% \or \begingroup% @@ -1851,7 +2054,7 @@ \usekomafont{specialmail}\usekomavar{specialmail}}% \hspace*{\useplength{specialmailrightindent}}}% }% - \vfil% + \ifnum\@afieldmode=\@ne\vfil\fi% \noindent\hskip\useplength{toaddrindent}% \setlength{\@tempdima}{\useplength{toaddrwidth}}% \addtolengthplength[-2]{\@tempdima}{toaddrindent}% @@ -1924,7 +2127,7 @@ \vbox to \dimexpr \useplength{PPheadheight}-2\fboxsep\relax{% \setlength{\parindent}{0pt}% \hsize \dimexpr \useplength{PPheadwidth}-2\fboxsep\relax - \setbox\@tempboxa\hbox{% + \sbox\@tempboxa{% {\fontsize{20.74pt}{20.74pt}\selectfont \usekomafont{PPlogo}{P.P.}}\hskip 2mm% }% @@ -2175,11 +2378,11 @@ \newcommand*{\@set@reffield}[1]{% \ifkomavarempty{#1}{}{% \settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}% - \setbox0\hbox{\strut\usekomafont{refname}\usekomavar*{#1}}% + \sbox\z@{\strut\usekomafont{refname}\usekomavar*{#1}}% \ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi \if@tempswa\enskip\hfill\fi \parbox[t]{\@tempdima}{\noindent\raggedright - \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{#1}}% + \strut\box\z@\\\usekomafont{refvalue}\strut\usekomavar{#1}}% \@tempswatrue }% } @@ -2261,14 +2464,14 @@ \@set@reffields% \if@tempswa \ifnum \@datepos=1 \@set@reffield{date}\fi% - \setbox0\hbox{\usekomafont{refname}\strutbox}% - \ifdim\ht0>\ht\strutbox + \sbox\z@{\usekomafont{refname}\strutbox}% + \ifdim\ht\z@>\ht\strutbox \PackageWarningNoLine{scrletter}{% Font element `refname' should not be larger than \string\normalsize!}% \fi - \setbox0\hbox{\usekomafont{refvalue}\strutbox}% - \ifdim\ht0>\ht\strutbox + \sbox\z@{\usekomafont{refvalue}\strutbox}% + \ifdim\ht\z@>\ht\strutbox \PackageWarningNoLine{scrletter}{% Font element `refvalue' should not be larger than \string\normalsize!}% @@ -2293,7 +2496,7 @@ }{% \typeout{Title: yes}% {\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative - \centering\LARGE\usekomafont{title}\usekomavar{title}\par}% + \centering\LARGE\usekomafont{lettertitle}\usekomavar{title}\par}% \vskip\baselineskip% }% } @@ -2323,7 +2526,7 @@ \move@topt\vskip\useplength{subjectvpos}% \expandafter\vb@t@z\expandafter{% \fi - \usekomafont{subject}% + \usekomafont{lettersubject}% \raggedsubject{\if@subj \subject@format{\strut\ignorespaces \usekomavar*{subject}}\fi}% \subject@format{\strut\ignorespaces\usekomavar{subject}}\par @@ -2379,6 +2582,7 @@ \newenvironment{letter}[2][]{% \newpage \if@twoside\ifodd\c@page\else\thispagestyle{empty}\null\newpage\fi\fi +\let\pagemark\letterpagemark \setcounter{page}{\@ne}% \setcounter{footnote}{0}% \interlinepenalty=200\@processto{#2}% @@ -2431,37 +2635,25 @@ \ifdim\useplength{subjectvpos}=\z@\if@subjafter\@subjfield\fi\fi \@afterindentfalse\@afterheading } -\newcommand*{\@xtrimtempa}{% - \@ifnextchar [{\@@xtrimtempa}{\@@xtrimtempa[]}} -\newcommand*{\@@xtrimtempa}{} -\def\@@xtrimtempa[#1]#2\@nil{\def\@tempa{#2}} -\newcommand*{\@tempdimaismaxwidthof}{} -\def\@tempdimaismaxwidthof#1\\#2\@nil{% - \settowidth{\@tempdimb}{\strut\ignorespaces#1}% - \ifdim\@tempdima<\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi - \def\@tempa{#2}\ifx\@tempa\@empty - \let\@tempb\relax - \else - \expandafter\@xtrimtempa\@tempa\@nil - \def\@tempb{\expandafter\@tempdimaismaxwidthof\@tempa\@nil}% - \fi - \@tempb -} \newcommand*{\closing}[1]{{% - \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par% - \nobreak\vskip\baselineskip% - \stopbreaks\noindent% - \setlength{\@tempdima}{0pt}% - \expandafter\@tempdimaismaxwidthof\scr@signature@var\\\@nil - \expandafter\@tempdimaismaxwidthof\strut\ignorespaces#1\\\@nil + \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par + \nobreak\vskip\baselineskip + \stopbreaks\noindent + \settowidth{\@tempdima}{% + \begin{tabular}{@{}l@{}} + #1\tabularnewline + \usekomavar{signature}\tabularnewline + \end{tabular} + }% \setlength{\@tempdimb}{\hsize}% \addtolength{\@tempdimb}{-\useplength{sigindent}}% - \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi% + \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi \hspace{\useplength{sigindent}}% - \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces% - #1\strut\\[\useplength{sigbeforevskip}] - \strut\usekomavar{signature}\strut}}\par - \nobreak\vskip\baselineskip% + \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces + #1\ifhmode\unskip\strut\fi\\[\useplength{sigbeforevskip}] + \strut\ignorespaces + \usekomavar{signature}\ifhmode\unskip\strut\fi}}\par + \nobreak\vskip\baselineskip } \newcommand\ps{\par% \ifdim\parskip=\z@% @@ -2563,7 +2755,22 @@ \usekomavar{subjectseparator}]{subject} \newkomavar[\datename]{date} \setkomavar{date}{\@date} -%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $ +\newcommand*{\scr@saved@date}{} +\let\scr@saved@date\date +\renewcommand*{\date}[1]{% + \PackageWarning{scrletter}{% + \string\date\space changes the internal \string\LaTeX\space date + only.\MessageBreak + You should note that this changes the default\MessageBreak + value of variable `date' only as long as someone\MessageBreak + uses `\string\setkomavar` to change the content of\MessageBreak + variable `date'.\MessageBreak + Therefore, usage of `\string\setkomavar' is recommended\MessageBreak + to change the letter's date% + }% + \scr@saved@date{#1}% +} +%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $ \newcommand*{\adrentry}[7]{% \addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}} \newcommand*{\adrchar}{\addrchar} |