summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-27 19:01:38 +0000
committerKarl Berry <karl@freefriends.org>2011-01-27 19:01:38 +0000
commit2b311b90f06b68e1cb123c58c3b380ea6533eea0 (patch)
tree06df1db9ecc0e0557987e581462d056ef498e1ef /Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
parent7d072ac46075608b02b7af6ac92a174183cbcb32 (diff)
koma-script (26jan11)
git-svn-id: svn://tug.org/texlive/trunk@21195 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.cls218
1 files changed, 161 insertions, 57 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 011d33b8d02..f54bd7a89eb 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -39,7 +39,7 @@
%% scrkcile.dtx (with options: `class,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2010
+%% Copyright (c) 1994-2011
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -94,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -172,6 +172,7 @@
\@namedef{scr@v@3.05a}{10}
\@namedef{scr@v@3.06}{10}
\@namedef{scr@v@3.07}{10}
+\@namedef{scr@v@3.08}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -356,54 +357,68 @@
\KOMA@key{parskip}[true]{%
\begingroup
\KOMA@set@ncmdkey{parskip}{@tempa}{%
- {false}{0},{off}{0},{no}{0},%
- {full-}{1},%
- {half-}{2},%
- {full}{3},{true}{3},{on}{3},{yes}{3},%
- {half}{4},%
- {full+}{5},%
- {half+}{6},%
- {full*}{7},%
- {half*}{8},%
- {relative}{9},%
- {absolute}{10},%
+ {never}{0},%
+ {false}{1},{off}{1},{no}{1},%
+ {full-}{2},%
+ {half-}{3},%
+ {full}{4},{true}{4},{on}{4},{yes}{4},%
+ {half}{5},%
+ {full+}{6},%
+ {half+}{7},%
+ {full*}{8},%
+ {half*}{9},%
+ {relative}{10},%
+ {absolute}{11}%
}{#1}%
\ifcase\number\@tempa% 0
\endgroup
- \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
+ \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 2
+ \endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
- \or% 2
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
- \or%3
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 4
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
- \or%4
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
- \or%5
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 6
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
- \or%6
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
- \or%7
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 8
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \or%8
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
- \or%9
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 10
\endgroup
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
@@ -416,7 +431,7 @@
\fi
\let\default@par@update=\par@updaterelative
}%
- \or%10
+ \or%11
\endgroup
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
@@ -1576,6 +1591,24 @@
\providecaptionname{norsk}\wwwname{Url}%
\providecaptionname{norsk}\bankname{Bankkontonummer}%
\g@addnumerical@date{norsk}{\number\day.\number\month.\number\year}%
+ \providecaptionname{swedish}\yourrefname{Er ref}%
+ \providecaptionname{swedish}\yourmailname{Ert brev av}%
+ \providecaptionname{swedish}\myrefname{V\aa{}r ref}%
+ \providecaptionname{swedish}\customername{Kundnummer}%
+ \providecaptionname{swedish}\invoicename{Fakturanummer}%
+ \providecaptionname{swedish}\subjectname{\"Amne}%
+ \providecaptionname{swedish}\ccname{Kopia till}%
+ \providecaptionname{swedish}\enclname{Bilagor}% Singular: Bilaga
+ \providecaptionname{swedish}\headtoname{Till}%
+ \providecaptionname{swedish}\headfromname{Fr\aa{}n}%
+ \providecaptionname{swedish}\datename{Datum}%
+ \providecaptionname{swedish}\pagename{Sida}%
+ \providecaptionname{swedish}\phonename{Telefon}%
+ \providecaptionname{swedish}\faxname{Telefax}%
+ \providecaptionname{swedish}\emailname{E-post}%
+ \providecaptionname{swedish}\wwwname{Hemsida}%
+ \providecaptionname{swedish}\bankname{Bankgiro}% PlusGiro
+ \g@addnumerical@date{swedish}{\number\day/\number\month~\number\year}%
\captionsenglish
\dateenglish
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -1655,6 +1688,10 @@
\captionsnorsk
\datenorsk
\fi\fi
+ \ifx\l@swedish\undefined\else\ifnum\language=\l@swedish
+ \captionsswedish
+ \dateswedish
+ \fi\fi
\else
\edef\@tempa{nohyphenation}%
\ifx\languagename\@tempa
@@ -1697,28 +1734,28 @@
\fi%
\expandafter\let\csname scr@#2@var\endcsname=\@empty
\if@tempswa\addtoreffields{#2}\fi
- }{%
+ }{%
\ClassError{%
scrlttr2%
- }{%
+ }{%
This should never happen%
- }{%
+ }{%
The contents of the KOMA-Script variable `#2'\MessageBreak
is undefined, but the name of the variable is
defined.\MessageBreak
This should never happen. So someone crashs me!%
- }%
}%
- }{%
+ }%
+ }{%
\ClassError{%
scrlttr2%
- }{%
+ }{%
Variable `#2' already defined%
- }{%
+ }{%
I'll ignore this command, if you'll continue.%
- }%
}%
- }
+ }%
+}
\newcommand*{\setkomavar}{%
\@ifstar {\@setkomaname}{\@setkomavar}}
\newcommand*{\@setkomavar}[1]{%
@@ -1727,23 +1764,26 @@
\newcommand*{\@setkomaname}[2]{%
\@ifundefined{scr@#1@var}{%
\@komavar@err{set}{#1}%
- }{%
+ }{%
\@namedef{scr@#1@name}{#2}%
- }%
- }
+ \csname scr@#1@postsetname\endcsname
+ }%
+}
\newcommand*{\@@setkomavar}{}
\long\def\@@setkomavar#1[#2]#3{%
\@ifundefined{scr@#1@var}{%
\@komavar@err{set}{#1}%
- }{%
+ }{%
\@namedef{scr@#1@var}{#3}%
+ \csname scr@#1@postsetvar\endcsname
\begingroup
\def\@tempa{#2}\def\@tempb{\relax}%
\ifx\@tempa\@tempb\endgroup\else
\endgroup\@namedef{scr@#1@name}{#2}%
+ \csname scr@#1@postsetname\endcsname
\fi
- }%
- }
+ }%
+}
\newcommand*{\@komavar@err}[2]{%
\ClassError{%
scrlttr2%
@@ -2044,7 +2084,8 @@
\newcommand*{\ps@headings}{\let\@mkboth\markboth
\renewcommand*{\@oddhead}{%
\vbox{%
- \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\@nexthead}}%
+ \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\noindent
+ \usekomavar{nexthead}}}%
\if@hsl\kern1pt\rule{\textwidth}{.4pt}\fi%
}%
}%
@@ -2058,7 +2099,8 @@
\hrulefill\\
}%
\fi
- \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\footfont\@nextfoot}}%
+ \vbox{\hsize=\textwidth\hbox to\textwidth{\headfont\footfont\noindent
+ \usekomavar{nextfoot}}}%
}%
}%
\let\@evenfoot\@oddfoot
@@ -2331,7 +2373,16 @@
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
%%% From File: scrknpap.dtx
-\newcommand*{\@firsthead}{\noindent%
+\newcommand*{\@firsthead}{%
+ \ClassWarning{scrlttr2}{%
+ Deprecated usage of \string\@firsthead.\MessageBreak
+ \string\usekomavar{firsthead} should be used\MessageBreak
+ instead of \string\@firsthead
+ }%
+ \usekomavar{firsthead}%
+}
+\newkomavar{firsthead}
+\setkomavar{firsthead}{%
\parbox[b]{\useplength{firstheadwidth}}%
{\centering\usekomafont{fromaddress}{%
\ifkomavarempty{fromname}{}{%
@@ -2345,9 +2396,12 @@
}%
}%
}
+\newcommand*{\scr@firsthead@postsetvar}{%
+ \renewcommand*{\@alignfrom}{10000}%
+}
\newcommand*{\@gen@firsthead}{%
\ifcase\@alignfrom
- \renewcommand*{\@firsthead}{\noindent
+ \setkomavar{firsthead}{%
\parbox[b]{\textwidth}{\raggedright
{\usekomafont{fromname}\strut\ignorespaces
\usekomavar{fromname}%
@@ -2390,8 +2444,9 @@
\llap{\usekomavar{fromlogo}}%
\fi
}%
+ \renewcommand*{\@alignfrom}{0}%
\or
- \renewcommand*{\@firsthead}{\noindent
+ \setkomavar{firsthead}{%
\parbox[b]{\textwidth}{\centering
{\usekomafont{fromname}\strut\ignorespaces
\usekomavar{fromname}%
@@ -2427,8 +2482,9 @@
}%
}%
}%
+ \renewcommand*{\@alignfrom}{1}%
\or
- \renewcommand*{\@firsthead}{\noindent
+ \setkomavar{firsthead}{%
\if@logo
\rlap{\usekomavar{fromlogo}}%
\fi
@@ -2471,11 +2527,16 @@
}%
}%
}%
+ \renewcommand*{\@alignfrom}{2}%
\fi
}
-\newcommand{\firsthead}[1]{%
- \renewcommand*{\@alignfrom}{10000}%
- \renewcommand*{\@firsthead}{\noindent#1}%
+\newcommand{\firsthead}{%
+ \ClassWarning{scrlttr2}{%
+ Deprecated usage of \string\firsthead.\MessageBreak
+ You should use \string\setkomavar{firsthead}\MessageBreak
+ instead of \string\firsthead
+ }
+ \setkomavar{firsthead}%
}
\newkomafont{foldmark}{}
\newkomafont{fromname}{}
@@ -2544,9 +2605,22 @@
\@setplength{fromrulewidth}{0pt}
\@newplength{fromrulethickness}
\@setplength{fromrulethickness}{.4pt}
-\newcommand*{\@firstfoot}{}
-\newcommand{\firstfoot}[1]{%
- \renewcommand*{\@firstfoot}{\noindent#1}%
+\newkomavar{firstfoot}
+\newcommand*{\@firstfoot}{%
+ \ClassWarning{scrlttr2}{%
+ Deprecated usage of \string\@firstfoot.\MessageBreak
+ \string\usekomavar{firstfoot} should be used\MessageBreak
+ instead of \string\@firstfoot
+ }%
+ \usekomavar{firstfoot}%
+}
+\newcommand{\firstfoot}{%
+ \ClassWarning{scrlttr2}{%
+ Deprecated usage of \string\firstfoot.\MessageBreak
+ You should use \string\setkomavar{firstfoot}\MessageBreak
+ instead of \string\firstfoot
+ }
+ \setkomavar{firstfoot}%
}
\newcommand*{\move@topt}{%
\null\vskip -1in\vskip -\topmargin%
@@ -2722,8 +2796,9 @@
\addtolength{\@tempskipa}{-\baselineskip}%
\setlength{\textwidth}{\useplength{firstheadwidth}}%
\setlength{\parfillskip}{\z@ \@plus 1fil}%
- \@savevbox{\@tempskipa}{\@firsthead\vskip \z@ \@plus .00001fil}%
- {head of first page}{firstheadvpos}{\firsthead}%
+ \@savevbox{\@tempskipa}{\noindent\usekomavar{firsthead}%
+ \vskip \z@ \@plus .00001fil}%
+ {head of first page}{firstheadvpos}{\setkomavar}%
}%
}%
}%
@@ -2758,7 +2833,8 @@
\vskip\useplength{firstfootvpos}%
\setlength{\textwidth}{\useplength{firstfootwidth}}%
\setlength{\parfillskip}{\z@ \@plus 1fil}%
- \vbox{\hsize\useplength{firstfootwidth}\@firstfoot}%
+ \vbox{\hsize\useplength{firstfootwidth}\noindent
+ \usekomavar{firstfoot}}%
}%
}%
}%
@@ -3330,6 +3406,15 @@
\@newplength{subjectbeforevskip}
\@setplength{subjectbeforevskip}{0pt}
\newcommand*{\@nexthead}{%
+ \ClassWarning{scrlttr2}{%
+ Deprecated usage of \string\@nexthead.\MessageBreak
+ \string\usekomavar{nexthead} should be used\MessageBreak
+ instead of \string\@nexthead
+ }%
+ \usekomavar{nexthead}%
+}
+\newkomavar{nexthead}
+\setkomavar{nexthead}{%
\rlap{\parbox[c]{\textwidth}{\raggedright\strut
\ifnum\@pageat=0\pagemark\else\leftmark\fi\strut}}%
\parbox[c]{\textwidth}{%
@@ -3352,10 +3437,24 @@
\rightmark
\fi\strut}}%
}%
-\newcommand{\nexthead}[1]{%
- \renewcommand*{\@nexthead}{\noindent#1}%
+\newcommand{\nexthead}{%
+ \ClassWarning{scrlttr2}{%
+ Deprecated usage of \string\nexthead.\MessageBreak
+ You should use \string\setkomavar{nexthead}\MessageBreak
+ instead of \string\nexthead
+ }
+ \setkomavar{nexthead}%
}
\newcommand*{\@nextfoot}{%
+ \ClassWarning{scrlttr2}{%
+ Deprecated usage of \string\@nextfoot.\MessageBreak
+ \string\usekomavar{nextfoot} should be used\MessageBreak
+ instead of \string\@nextfoot
+ }%
+ \usekomavar{nextfoot}%
+}
+\newkomavar{nextfoot}
+\setkomavar{nextfoot}{%
\ifnum\@pageat>2
\parbox[c]{\textwidth}{%
\ifcase\@pageat\or\or\or\raggedright\or\centering\or\raggedleft\fi
@@ -3363,8 +3462,13 @@
}%
\fi
}
-\newcommand{\nextfoot}[1]{%
- \renewcommand*{\@nextfoot}{\noindent#1}%
+\newcommand{\nextfoot}{%
+ \ClassWarning{scrlttr2}{%
+ Deprecated usage of \string\nextfoot.\MessageBreak
+ You should use \string\setkomavar{nextfoot}\MessageBreak
+ instead of \string\nextfoot
+ }
+ \setkomavar{nextfoot}%
}
\newenvironment{letter}[2][]{%
\newpage