diff options
author | Karl Berry <karl@freefriends.org> | 2015-09-30 21:16:51 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-09-30 21:16:51 +0000 |
commit | 21923df0aa733309adbfcc3169c7ffc0e0ab8b1c (patch) | |
tree | f81789ab91c6edd088e331eac5983464e7f21c6b /Master/texmf-dist/tex/latex/koma-script/scrletter.sty | |
parent | 197071e9b5aaa66a56c464229f4a9fc81c0c8b1f (diff) |
koma-script (30sep15)
git-svn-id: svn://tug.org/texlive/trunk@38504 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 | 180 |
1 files changed, 111 insertions, 69 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index 67cca69968b..b22c16927b8 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 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -82,17 +82,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \scr@ifundefinedorrelax{KOMAClassName}{% @@ -147,7 +147,7 @@ } \AtEndOfPackage {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi @@ -162,11 +162,11 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z 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 2130 2015-06-10 09:36:46Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -680,7 +680,7 @@ %%% 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 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \newcommand*{\LoadLetterOption}[1]{% @@ -845,7 +845,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \PackageInfo{scrletter% @@ -1214,112 +1214,139 @@ package\MessageBreak (e.g. `Babel', `german', `ngerman', ...)}% \ifx\l@american\undefined\else\ifnum\language=\l@american - \captionsamerican - \dateamerican + \@nameuse{captionsamerican}% + \@nameuse{extrasamerican}% + \@nameuse{dateamerican}% \fi\fi \ifx\l@australian\undefined\else\ifnum\language=\l@australian - \captionsaustralian - \dateaustralian + \@nameuse{captionsaustralian}% + \@nameuse{extrasaustralian}% + \@nameuse{dateaustralian}% \fi\fi \ifx\l@british\undefined\else\ifnum\language=\l@british - \captionsbritish - \datebritish + \@nameuse{captionsbritish}% + \@nameuse{extrasbritish}% + \@nameuse{datebritish}% \fi\fi \ifx\l@canadian\undefined\else\ifnum\language=\l@canadian - \captionscanadian - \datecanadian + \@nameuse{captionscanadian}% + \@nameuse{extrascanadian}% + \@nameuse{datecanadian}% \fi\fi \ifx\l@newzealand\undefined\else\ifnum\language=\l@newzealand - \captionsnewzealand - \datenewzealand + \@nameuse{captionsnewzealand}% + \@nameuse{extrasnewzealand}% + \@nameuse{datenewzealand}% \fi\fi \ifx\l@UKenglish\undefined\else\ifnum\language=\l@UKenglish - \captionsUKenglish - \dateUKenglish + \@nameuse{captionsUKenglish}% + \@nameuse{extrasUKenglish}% + \@nameuse{dateUKenglish}% \fi\fi \ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish - \captionsUSenglish - \dateUSenglish + \@nameuse{captionsUSenglish}% + \@nameuse{extrasUSenglish}% + \@nameuse{dateUSenglish}% \fi\fi \ifx\l@austrian\undefined\else\ifnum\language=\l@austrian - \captionsaustrian - \dateaustrian + \@nameuse{captionsaustrian}% + \@nameuse{extrasaustrian}% + \@nameuse{dateaustrian}% \fi\fi \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian - \captionsnaustrian - \datenaustrian + \@nameuse{captionsnaustrian}% + \@nameuse{extrasnaustrian}% + \@nameuse{datenaustrian}% \fi\fi \ifx\l@german\undefined\else\ifnum\language=\l@german - \captionsgerman - \dategerman + \@nameuse{captionsgerman}% + \@nameuse{extrasgerman}% + \@nameuse{dategerman}% \fi\fi \ifx\l@ngerman\undefined\else\ifnum\language=\l@ngerman - \captionsngerman - \datengerman + \@nameuse{captionsngerman}% + \@nameuse{extrasngerman}% + \@nameuse{datengerman}% \fi\fi \ifx\l@swissgerman\undefined\else\ifnum\language=\l@swissgerman - \captionsswissgerman - \dateswissgerman + \@nameuse{captionsswissgerman}% + \@nameuse{extrasswissgerman}% + \@nameuse{dateswissgerman}% \fi\fi \ifx\l@nswissgerman\undefined\else\ifnum\language=\l@nswissgerman - \captionsnswissgerman - \datenswissgerman + \@nameuse{captionsnswissgerman}% + \@nameuse{extrasnswissgerman}% + \@nameuse{datenswissgerman}% \fi\fi \ifx\l@acadian\undefined\else\ifnum\language=\l@acadian - \captionsacadian - \dateacadian + \@nameuse{captionsacadian}% + \@nameuse{extrasacadian}% + \@nameuse{dateacadian}% \fi\fi \ifx\l@canadien\undefined\else\ifnum\language=\l@canadien - \captionscanadien - \datecanadien + \@nameuse{captionscanadien}% + \@nameuse{extrascanadien}% + \@nameuse{datecanadien}% \fi\fi \ifx\l@francais\undefined\else\ifnum\language=\l@francais - \captionsfrancais - \datefrancais + \@nameuse{captionsfrancais}% + \@nameuse{extrasfrancais}% + \@nameuse{datefrancais}% \fi\fi \ifx\l@french\undefined\else\ifnum\language=\l@french - \captionsfrench - \datefrench + \@nameuse{captionsfrench}% + \@nameuse{extrasfrench}% + \@nameuse{datefrench}% \fi\fi \ifx\l@italian\undefined\else\ifnum\language=\l@italian - \captionsitalian - \dateitalian + \@nameuse{captionsitalian}% + \@nameuse{extrasitalian}% + \@nameuse{dateitalian}% \fi\fi \ifx\l@spanish\undefined\else\ifnum\language=\l@spanish - \captionsspanish - \datespanish + \@nameuse{captionsspanish}% + \@nameuse{extrasspanish}% + \@nameuse{datespanish}% \fi\fi \ifx\l@croatian\undefined\else\ifnum\language=\l@croatian - \captionscroatian - \datecroatian + \@nameuse{captionscroatian}% + \@nameuse{extrascroatian}% + \@nameuse{datecroatian}% \fi\fi \ifx\l@dutch\undefined\else\ifnum\language=\l@dutch - \captionsdutch - \datedutch + \@nameuse{captionsdutch}% + \@nameuse{extrasdutch}% + \@nameuse{datedutch}% \fi\fi \ifx\l@finnish\undefined\else\ifnum\language=\l@finnish - \captionsfinnish - \datefinnish + \@nameuse{captionsfinnish}% + \@nameuse{extrasfinnish}% + \@nameuse{datefinnish}% \fi\fi \ifx\l@norsk\undefined\else\ifnum\language=\l@norsk - \captionsnorsk - \datenorsk + \@nameuse{captionsnorsk}% + \@nameuse{extrasnorsk}% + \@nameuse{datenorsk}% \fi\fi \ifx\l@swedish\undefined\else\ifnum\language=\l@swedish - \captionsswedish - \dateswedish + \@nameuse{captionsswedish}% + \@nameuse{extrasswedish}% + \@nameuse{dateswedish}% \fi\fi \ifx\l@polish\undefined\else\ifnum\language=\l@polish - \captionspolish - \datepolish + \@nameuse{captionspolish}% + \@nameuse{extraspolish}% + \@nameuse{datepolish}% \fi\fi \ifx\l@czech\undefined\else\ifnum\language=\l@czech - \captionsczech - \dateczech + \@nameuse{captionsczech}% + \@nameuse{extrasczech}% + \@nameuse{dateczech}% \fi\fi \ifx\l@slovak\undefined\else\ifnum\language=\l@slovak - \captionsslovak - \dateslovak + \@nameuse{captionsslovak}% + \@nameuse{extrasslovak}% + \@nameuse{dateslovak}% \fi\fi \else \edef\@tempa{nohyphenation}% @@ -1539,7 +1566,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{% \letterpagemark }{% @@ -1570,7 +1597,7 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \newkomavar{firsthead} \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% @@ -2628,17 +2655,28 @@ \fi } \newenvironment{letter}[2][]{% - \newpage - \if@twoside\ifodd\c@page\else\thispagestyle{empty}\null\newpage\fi\fi + \cleardoubleoddemptypage + \scr@ifundefinedorrelax{letterpagestyle}{}{% + \ifx\letterpagestyle\@empty\else + \pagestyle{\letterpagestyle}% + \fi + }% \let\pagemark\letterpagemark + \refstepcounter{letter}% + \let\thisletter\@currentlabel \setcounter{page}{\@ne}% \setcounter{footnote}{0}% \interlinepenalty=200\@processto{#2}% \KOMAoptions{#1}% \@beginletterhook }{% - \stopletter\@@par\pagebreak\@@par% + \stopletter + \let\@currentlabel\thisletter + \label{\thisletter.lastpage}% + \@@par\pagebreak\@@par% } +\newcommand*{\thisletter}{outside.letter.undefined} +\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}} \newcommand*{\stopletter}{} \newcommand{\@processto}[1]{% \ifx\relax#1\relax\else @@ -2652,6 +2690,10 @@ \g@addto@macro\flushbottom{% \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}% } +\newcounter{letter} +\newcommand*{\letterpagestyle}{% + plain.letter% +} \newcommand{\AtBeginLetter}{\g@addto@macro\@beginletterhook} \newcommand{\@beginletterhook}{} \newcommand{\AtEndLetter}{\g@addto@macro\stopletter} |