diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls')
| -rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls | 154 |
1 files changed, 98 insertions, 56 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 0858fdff444..df5aec63777 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -94,7 +94,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2011/02/19 v3.08a KOMA-Script}% + \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -174,6 +174,8 @@ \@namedef{scr@v@3.07}{10} \@namedef{scr@v@3.08}{10} \@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -774,15 +776,29 @@ \expandafter\in@@#1#2\in@\in@@ } \newif\if@refwide +\newcommand*{\@datepos}{1} \KOMA@key{refline}[wide]{% \begingroup - \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1}}{#1}% + \KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1},% + {dateleft}{2},{leftdate}{2},% + {dateright}{3},{rightdate}{3},% + {nodate}{4}% + }{#1}% \ifcase\@tempa \endgroup \@refwidetrue - \else + \or \endgroup \@refwidefalse + \or + \endgroup + \def\@datepos{2}% + \or + \endgroup + \def\@datepos{1}% + \or + \endgroup + \def\@datepos{0}% \fi } \newcommand{\subject@format}[1]{#1} @@ -1096,7 +1112,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listiv\endcsname \endgroup - \def\@listiv{\leftmargin\leftmarginiv + \edef\@listiv{\leftmargin\leftmarginiv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1105,7 +1121,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listv\endcsname \endgroup - \def\@listv{\leftmargin\leftmarginv + \edef\@listv{\leftmargin\leftmarginv \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1114,7 +1130,7 @@ \def\@list@extra{\aftergroup\@tempswatrue}% \csname @listvi\endcsname \endgroup - \def\@listvi{\leftmargin\leftmarginvi + \edef\@listvi{\leftmargin\leftmarginvi \labelwidth=\dimexpr \leftmargin-\labelsep \if@tempswa\noexpand\@list@extra\fi }% @@ -1465,6 +1481,24 @@ \providecaptionname{austrian}\wwwname{URL}% \providecaptionname{austrian}\bankname{Bankverbindung}% \g@addnumerical@date{austrian}{\number\day.\,\number\month.\,\number\year}% + \providecaptionname{naustrian}\yourrefname{Ihr Zeichen}% + \providecaptionname{naustrian}\yourmailname{Ihr Schreiben vom}% + \providecaptionname{naustrian}\myrefname{Unser Zeichen}% + \providecaptionname{naustrian}\customername{Kundennummer}% + \providecaptionname{naustrian}\invoicename{Rechnungsnummer}% + \providecaptionname{naustrian}\subjectname{Betrifft}% + \providecaptionname{naustrian}\ccname{Kopien an}% + \providecaptionname{naustrian}\enclname{Anlagen}% + \providecaptionname{naustrian}\headtoname{An}% + \providecaptionname{naustrian}\headfromname{Von}% + \providecaptionname{naustrian}\datename{Datum}% + \providecaptionname{naustrian}\pagename{Seite}% + \providecaptionname{naustrian}\phonename{Telefon}% + \providecaptionname{naustrian}\faxname{Fax}% + \providecaptionname{naustrian}\emailname{E-Mail}% + \providecaptionname{naustrian}\wwwname{URL}% + \providecaptionname{naustrian}\bankname{Bankverbindung}% + \g@addnumerical@date{naustrian}{\number\day.\,\number\month.\,\number\year}% \providecaptionname{french}\yourrefname{Vos r\'ef\'erences}% \providecaptionname{french}\yourmailname{Votre lettre du}% \providecaptionname{french}\myrefname{Nos r\'ef\'erences}% @@ -1653,6 +1687,10 @@ \captionsaustrian \dateaustrian \fi\fi + \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian + \captionsnaustrian + \datenaustrian + \fi\fi \ifx\l@german\undefined\else\ifnum\language=\l@german \captionsgerman \dategerman @@ -1715,7 +1753,7 @@ used language is `\languagename'.\MessageBreak Supported languages are `english', `UKenglish',\MessageBreak `british', `american', `USenglish',\MessageBreak - `german', `ngerman', `austrian',\MessageBreak + `german', `ngerman', `austrian', `naustrian',\MessageBreak `dutch', `italian', `spanish',\MessageBreak `croatian', `finnish', `norsk'% }% @@ -1803,17 +1841,17 @@ \newcommand*{\@usekomavar}[2][\@firstofone]{% \@ifundefined{scr@#2@var}{% \@komavar@err{use}{#2}% - }{% + }{% #1{\@nameuse{scr@#2@var}}% - }% - } + }% +} \newcommand*{\@usekomaname}[2][\@firstofone]{% \@ifundefined{scr@#2@var}{% \@komavar@err{use}{#2}% - }{% + }{% #1{\@nameuse{scr@#2@name}}% - }% - } + }% +} \DeclareRobustCommand*{\ifkomavar}[1]{% \scr@ifundefinedorrelax{scr@#1@var}{% \expandafter\@secondoftwo @@ -1855,7 +1893,7 @@ \newcommand*{\@newplength}[1]{% \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% - }{% + }{% \ClassError{scrlttr2}{% pseudo-length \expandafter\string\csname ltr@len@#1\endcsname already defined% @@ -3238,6 +3276,7 @@ \vskip-\useplength{locvpos}\move@frompt }% } +\newcommand*{\do@set@reffield}{} \newcommand*{\@set@reffield}[1]{% \ifkomavarempty{#1}{}{% \settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}% @@ -3249,9 +3288,14 @@ \@tempswatrue }% } +\newcommand*{\@test@reffield}[1]{% + \ifkomavarempty{#1}{}{% + \@tempswatrue + }% +} \newcommand*{\@set@reffields}{}% \newcommand*{\addtoreffields}[1]{% - \l@addto@macro{\@set@reffields}{\@set@reffield{#1}}% + \l@addto@macro{\@set@reffields}{\do@set@reffield{#1}}% } \newcommand*{\removereffields}{% \renewcommand*{\@set@reffields}{}% @@ -3281,7 +3325,8 @@ \@setplength{refhpos}{\oddsidemargin}% \@addtoplength{refhpos}{1in}% \fi - \else\ifdim\useplength{refhpos}=\z@ + \else + \ifdim\useplength{refhpos}=\z@ \begingroup \setlength\@tempdima{\textwidth}% \addtolengthplength[-]{\@tempdima}{refwidth}% @@ -3301,52 +3346,49 @@ \fi\fi \@tempswafalse \move@topt\vskip\useplength{refvpos}% - \rlap{\noindent\move@topl\hskip\useplength{refhpos}% - \vbox{\hsize\useplength{refwidth}% - \noindent\@set@reffields% - \if@tempswa - \setbox0\hbox{\usekomafont{refname}\strutbox}% - \ifdim\ht0>\ht\strutbox - \ClassWarningNoLine{scrlttr}{% - Font element `refname' should not be larger than - \string\normalsize!}% - \fi - \setbox0\hbox{\usekomafont{refvalue}\strutbox}% - \ifdim\ht0>\ht\strutbox - \ClassWarningNoLine{scrlttr}{% - Font element `refvalue' should not be larger than - \string\normalsize!}% - \fi - \fi - \ifkomavarempty{date}{% - \if@tempswa - \typeout{Reference line(s): with fields but without date}% - \else - \typeout{Reference line(s): no}% - \aftergroup\aftergroup\aftergroup\@tempswatrue + \@tempswafalse + \let\do@set@reffield\@test@reffield + \@set@reffields + \ifcase \@datepos\else\@test@reffield{date}\fi + \if@tempswa + \@tempswafalse + \rlap{\noindent\move@topl\hskip\useplength{refhpos}% + \vbox{\hsize\useplength{refwidth}% + \noindent + \ifnum \@datepos=2 + \@set@reffields + \if@tempswa + \@tempswafalse + \@set@reffield{date}% + \fi \fi - }{% + \let\do@set@reffield\@set@reffield + \@set@reffields% \if@tempswa - \typeout{Reference line(s): with fields and date}% - \settowidth{\@tempdima}{\strut - \usekomafont{refvalue}\usekomavar{date}}% - \setbox0\hbox{\usekomafont{refname}\usekomavar*{date}}% - \ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi - \enskip\hfill - \parbox[t]{\@tempdima}{\noindent\raggedright% - \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{date}}% + \ifnum \@datepos=1 \@set@reffield{date}\fi% + \setbox0\hbox{\usekomafont{refname}\strutbox}% + \ifdim\ht0>\ht\strutbox + \ClassWarningNoLine{scrlttr}{% + Font element `refname' should not be larger than + \string\normalsize!}% + \fi + \setbox0\hbox{\usekomafont{refvalue}\strutbox}% + \ifdim\ht0>\ht\strutbox + \ClassWarningNoLine{scrlttr}{% + Font element `refvalue' should not be larger than + \string\normalsize!}% + \fi \else - \typeout{Reference line: only place and date}% - \enskip\hfill - \ifkomavarempty{place}{}{% - \usekomavar{place}\usekomavar{placeseparator}}% - \usekomavar{date}% - \@tempswatrue + \ifcase \@datepos\else + \ifnum \@datepos=1 \enskip\hfill\fi + \ifkomavarempty{place}{}{% + \usekomavar{place}\usekomavar{placeseparator}}% + \usekomavar{date}% + \fi \fi - }% }% }% - \if@tempswa\vskip-\baselineskip\fi + \fi \vskip\useplength{refaftervskip}% }% } |