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/scrlttr2.cls | |
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/scrlttr2.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls | 216 |
1 files changed, 131 insertions, 85 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index e72cb65fac8..542dddaa311 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 %% <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 @@ -93,7 +93,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -108,12 +108,12 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script document class (\ClassName)% ] -%%% 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-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \newcommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -209,6 +209,8 @@ \@namedef{scr@v@3.17a}{15} \@namedef{scr@v@3.17c}{15} \@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -259,7 +261,7 @@ } \AtEndOfClass {\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 @@ -274,7 +276,7 @@ }{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 $ \newcommand*\@ptsize{% 12% } @@ -343,7 +345,7 @@ } %%% 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-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -448,7 +450,7 @@ \DeclareOption*{% \lco@test \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -456,7 +458,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -609,14 +614,14 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% 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 $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -630,7 +635,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -736,7 +741,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $ -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -807,7 +812,7 @@ \ifhmode\spacefactor\@x@sf\fi \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% 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 $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -1354,7 +1359,7 @@ parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% \begingroup @@ -1366,7 +1371,7 @@ \expandafter\endgroup\@tempa }% \fi -%%% 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 $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2048,7 +2053,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}{% \ClassInfo{scrlttr2% @@ -2417,112 +2422,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}% @@ -2742,7 +2774,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2753,7 +2785,7 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \newcommand*{\scr@selectfont}{} @@ -2836,7 +2868,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -2851,16 +2883,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } \newcommand*{\@list@extra}{% @@ -2879,7 +2911,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% 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*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -2979,7 +3011,7 @@ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -3258,7 +3290,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% 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 $ \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% Deprecated usage of \string\@firsthead.\MessageBreak @@ -4380,16 +4412,27 @@ \setkomavar{nextfoot}% } \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 + }% + \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 @@ -4403,6 +4446,9 @@ \g@addto@macro\flushbottom{% \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}% } +\newcounter{letter} +\newcommand*{\letterpagestyle}{% +} \newcommand{\AtBeginLetter}{\g@addto@macro\@beginletterhook} \newcommand{\@beginletterhook}{} \newcommand{\AtEndLetter}{\g@addto@macro\stopletter} |