summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
committerKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
commit4832d732052d6e2b43b5e3ff45aa31bfbc0cbdc2 (patch)
tree968a3b4cdf4631c0272fc725330ea28a554c8471 /Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
parent59d9a998c6236de39603cb2ea077c5371e06b842 (diff)
koma-script (6dec14)
git-svn-id: svn://tug.org/texlive/trunk@35754 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.cls622
1 files changed, 348 insertions, 274 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 3ee13c1b7fa..986982b7572 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 @@
%% scrkernel-circularletters.dtx (with options: `class,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -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 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -93,7 +93,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -102,12 +102,12 @@
letter%
}
\ProvidesClass{\KOMAClassName}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -186,8 +186,11 @@
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@last}{11}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+\@namedef{scr@v@3.13}{12}
+\@namedef{scr@v@3.13a}{13}
+\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@last}{14}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -200,10 +203,12 @@
}
\KOMA@DeclareStandardOption
{final}{draft=false}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
- \expandafter\AtEndOfClass\expandafter{%
+ \expandafter
+ \AtEndOfClass
+ \expandafter{%
\expandafter\LoadLetterOption\expandafter{\CurrentOption}%
}%
\expandafter\def\expandafter\scr@pti@nerr@r\expandafter{%
@@ -213,8 +218,9 @@
}%
}{}%
}
-\AtEndOfClass{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+\AtEndOfClass
+ {\LoadLetterOption{DIN}}
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
@@ -287,9 +293,9 @@
}%
\FamilyKeyStateProcessed
}
-%%% From File: $Id: scrkernel-variables.dtx 1389 2013-10-01 16:06:04Z mjk $
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1388 2013-10-01 16:03:42Z mjk $
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% 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-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -349,18 +355,20 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -493,7 +501,7 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
@@ -511,9 +519,9 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\@ifundefined{typearea}{%
- \PassOptionsToPackage{typearea}{headinclude=#1}%
+ \PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
- \KOMAoptions{footinclude=#1,DIV=current}%
+ \KOMAoptions{footinclude=#1}%
}%
\fi
}
@@ -524,7 +532,7 @@
\def\@tempc{%
\endgroup%
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
- 'current' or any defined pagestyle e.g. 'empty','plain'}%
+ 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
\ifstr{#1}{current}{%
\def\@tempc{\endgroup%
@@ -541,7 +549,20 @@
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
}%
- }{}%
+ }{%
+ \ifx\@currname\KOMAClassName
+ \ifx\@currext\@clsextension
+ \ifstr{#1}{headings}{%
+ \def\@tempc{\endgroup%
+ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
+ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
+ \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }{}%
+ \fi
+ \fi
+ }%
}%
\@tempc
}
@@ -627,7 +648,7 @@
\ifhmode\spacefactor\@x@sf\fi
\relax}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
\KOMA@ifkey{firsthead}{@firsthead}\@firstheadtrue
\newcommand*{\@alignfrom}{0}
\KOMA@key{fromalign}{%
@@ -962,7 +983,8 @@
}%
\if@tempswa
\aftergroup\@scrsymbolsfalse
- \ClassWarning{scrlttr2}{Option `symbolicnames'
+ \ClassWarning{scrlttr2}{%
+ Option `symbolicnames'
ignorred.\MessageBreak
You've tried to set option `symbolicnames'\MessageBreak
after \string\begin{document}, but without\MessageBreak
@@ -985,12 +1007,12 @@
\fi
}
%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -1431,7 +1453,7 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
@@ -1506,7 +1528,7 @@
the extended optional argument of the section\MessageBreak
commands
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
{\let\@restore@catcode@level=\z@}{}%
@@ -1523,27 +1545,41 @@
\@tempcnta=\@restore@catcode@level\relax
\advance\@tempcnta by \@ne\relax
\edef\@restore@catcode@level{\the\@tempcnta}%
- \InputIfFileExists{#1.lco}{%
- \ClassInfo{%
- scrlttr2%
+ \KV@@sp@def\reserved@a{#1}%
+ \edef\reserved@a{\noexpand\InputIfFileExists{\reserved@a.lco}{%
+ \noexpand\ClassInfo{scrlttr2%
}{Letter-Class-Option `#1' loaded}%
}{%
- \ClassError{%
- scrlttr2%
+ \noexpand\ClassError{scrlttr2%
}{%
- Letter-Class-Option file `#1.lco' not found%
+ Letter-Class-Option file `#1.lco' not found%
}{%
- You've told me to load the Letter-Class-Option `#1'. So I have
- to load\MessageBreak
- the file `#1.lco'. But the file isn't available.}%
+ You've told me to load the Letter-Class-Option `#1'. So I have
+ to load\noexpand\MessageBreak
+ the file `#1.lco'. But the file isn't available.}%
}%
+ }%
+ \reserved@a
\@tempcnta=\@restore@catcode@level\relax
\advance\@tempcnta by \m@ne\relax
\edef\@restore@catcode@level{\the\@tempcnta}%
\ifnum\@tempcnta =\z@
\@restore@catcode
\fi
- }
+}
+\newcommand*{\LoadLetterOptions}[1]{%
+ \begingroup
+ \def\reserved@a{\endgroup}%
+ \@for\reserved@b:=#1\do{%
+ \ifx\reserved@b\@empty\else
+ \ifx\reserved@b\space\else
+ \edef\reserved@a{\expandafter\unexpanded\expandafter{\reserved@a
+ \LoadLetterOption}{\reserved@b}\relax}%
+ \fi
+ \fi
+ }%
+ \reserved@a
+}
\newcommand*{\LOPNP@option}{}
\newcommand*{\LOPNP@size}{}
\newcommand*{\@PapersizeWarning}{%
@@ -1576,8 +1612,7 @@
\setlength{\paperheight}{10.5in}\setlength{\paperwidth}{7.25in}%
\else%
\def\ta@opt@err{%
- \ClassError{%
- scrlttr2%
+ \ClassError{scrlttr2%
}{papersize `\LOPNP@size' undefined}{%
You've told me to check for paper size
`\LOPNP@size'\MessageBreak
@@ -1594,9 +1629,8 @@
}
\newcommand*{\@@PapersizeWarning}{%
\if@tempswa\else%
- \ClassWarningNoLine{%
- scrlttr2%
- }{%
+ \ClassWarningNoLine{scrlttr2%
+ }{%
Letter option file `\LOPNP@option.lco'\MessageBreak
needs paper size `\LOPNP@size'.\MessageBreak
Current paper size is not `\LOPNP@size'!\MessageBreak
@@ -1609,11 +1643,10 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
- \ClassInfo{%
- scrlttr2%
+ \ClassInfo{scrlttr2%
}{%
no date found for language `#1'\MessageBreak
--> skipped%
@@ -1635,195 +1668,134 @@
\space\number\day, \number\year}%
}%
}{}%
- \providecaptionname{english}\yourrefname{Your ref.}%
- \providecaptionname{english}\yourmailname{Your letter of}%
- \providecaptionname{english}\myrefname{Our ref.}%
- \providecaptionname{english}\customername{Customer no.}%
- \providecaptionname{english}\invoicename{Invoice no.}%
- \providecaptionname{english}\subjectname{Subject}%
- \providecaptionname{english}\ccname{cc}%
- \providecaptionname{english}\enclname{encl}%
- \providecaptionname{english}\headtoname{To}%
- \providecaptionname{english}\headfromname{From}%
- \providecaptionname{english}\datename{Date}%
- \providecaptionname{english}\pagename{Page}%
- \providecaptionname{english}\phonename{Phone}%
- \providecaptionname{english}\mobilephonename{Mobile phone}%
- \providecaptionname{english}\faxname{Fax}%
- \providecaptionname{english}\emailname{Email}%
- \providecaptionname{english}\wwwname{Url}%
- \providecaptionname{english}\bankname{Bank account}%
- \g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
- \providecaptionname{USenglish}\yourrefname{Your ref.}%
- \providecaptionname{USenglish}\yourmailname{Your letter of}%
- \providecaptionname{USenglish}\myrefname{Our ref.}%
- \providecaptionname{USenglish}\customername{Customer no.}%
- \providecaptionname{USenglish}\invoicename{Invoice no.}%
- \providecaptionname{USenglish}\subjectname{Subject}%
- \providecaptionname{USenglish}\ccname{cc}%
- \providecaptionname{USenglish}\enclname{encl}%
- \providecaptionname{USenglish}\headtoname{To}%
- \providecaptionname{USenglish}\headfromname{From}%
- \providecaptionname{USenglish}\datename{Date}%
- \providecaptionname{USenglish}\pagename{Page}%
- \providecaptionname{USenglish}\phonename{Phone}%
- \providecaptionname{USenglish}\mobilephonename{Cell phone}%
- \providecaptionname{USenglish}\faxname{Fax}%
- \providecaptionname{USenglish}\emailname{Email}%
- \providecaptionname{USenglish}\wwwname{Url}%
- \providecaptionname{USenglish}\bankname{Bank account}%
- \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}%
- \providecaptionname{american}\yourrefname{Your ref.}%
- \providecaptionname{american}\yourmailname{Your letter of}%
- \providecaptionname{american}\myrefname{Our ref.}%
- \providecaptionname{american}\customername{Customer no.}%
- \providecaptionname{american}\invoicename{Invoice no.}%
- \providecaptionname{american}\subjectname{Subject}%
- \providecaptionname{american}\ccname{cc}%
- \providecaptionname{american}\enclname{encl}%
- \providecaptionname{american}\headtoname{To}%
- \providecaptionname{american}\headfromname{From}%
- \providecaptionname{american}\datename{Date}%
- \providecaptionname{american}\pagename{Page}%
- \providecaptionname{american}\phonename{Phone}%
- \providecaptionname{american}\mobilephonename{Cell phone}%
- \providecaptionname{american}\faxname{Fax}%
- \providecaptionname{american}\emailname{Email}%
- \providecaptionname{american}\wwwname{Url}%
- \providecaptionname{american}\bankname{Bank account}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\yourrefname{Your ref.}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\yourmailname{Your letter of}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\myrefname{Our ref.}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\customername{Customer no.}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\invoicename{Invoice no.}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\subjectname{Subject}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\ccname{cc}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\enclname{encl}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\headtoname{To}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\headfromname{From}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\datename{Date}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\pagename{Page}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\phonename{Phone}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\mobilephonename{Mobile phone}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\faxname{Fax}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\emailname{Email}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\wwwname{Url}%
+ \providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}\bankname{Bank account}%
\g@addnumerical@date{american}{\number\month/\number\day/\number\year}%
- \providecaptionname{british}\yourrefname{Your ref.}%
- \providecaptionname{british}\yourmailname{Your letter of}%
- \providecaptionname{british}\myrefname{Our ref.}%
- \providecaptionname{british}\customername{Customer no.}%
- \providecaptionname{british}\invoicename{Invoice no.}%
- \providecaptionname{british}\subjectname{Subject}%
- \providecaptionname{british}\ccname{cc}%
- \providecaptionname{british}\enclname{encl}%
- \providecaptionname{british}\headtoname{To}%
- \providecaptionname{british}\headfromname{From}%
- \providecaptionname{british}\datename{Date}%
- \providecaptionname{british}\pagename{Page}%
- \providecaptionname{british}\phonename{Phone}%
- \providecaptionname{british}\mobilephonename{Mobile phone}%
- \providecaptionname{british}\faxname{Fax}%
- \providecaptionname{british}\emailname{Email}%
- \providecaptionname{british}\wwwname{Url}%
- \providecaptionname{british}\bankname{Bank account}%
+ \g@addnumerical@date{australien}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{british}{\number\day/\number\month/\number\year}%
- \providecaptionname{UKenglish}\yourrefname{Your ref.}%
- \providecaptionname{UKenglish}\yourmailname{Your letter of}%
- \providecaptionname{UKenglish}\myrefname{Our ref.}%
- \providecaptionname{UKenglish}\customername{Customer no.}%
- \providecaptionname{UKenglish}\invoicename{Invoice no.}%
- \providecaptionname{UKenglish}\subjectname{Subject}%
- \providecaptionname{UKenglish}\ccname{cc}%
- \providecaptionname{UKenglish}\enclname{encl}%
- \providecaptionname{UKenglish}\headtoname{To}%
- \providecaptionname{UKenglish}\headfromname{From}%
- \providecaptionname{UKenglish}\datename{Date}%
- \providecaptionname{UKenglish}\pagename{Page}%
- \providecaptionname{UKenglish}\phonename{Phone}%
- \providecaptionname{UKenglish}\mobilephonename{Mobile phone}%
- \providecaptionname{UKenglish}\faxname{Fax}%
- \providecaptionname{UKenglish}\emailname{Email}%
- \providecaptionname{UKenglish}\wwwname{Url}%
- \providecaptionname{UKenglish}\bankname{Bank account}%
+ \g@addnumerical@date{canadian}{\number\year/\number\month/\number\day}%
+ \g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{newzealand}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{USenglish}{\number\month/\number\day/\number\year}%
\g@addnumerical@date{UKenglish}{\number\day/\number\month/\number\year}%
- \providecaptionname{german}\yourrefname{Ihr Zeichen}%
- \providecaptionname{german}\yourmailname{Ihr Schreiben vom}%
- \providecaptionname{german}\myrefname{Unser Zeichen}%
- \providecaptionname{german}\customername{Kundennummer}%
- \providecaptionname{german}\invoicename{Rechnungsnummer}%
- \providecaptionname{german}\subjectname{Betrifft}%
- \providecaptionname{german}\ccname{Kopien an}%
- \providecaptionname{german}\enclname{Anlagen}%
- \providecaptionname{german}\headtoname{An}%
- \providecaptionname{german}\headfromname{Von}%
- \providecaptionname{german}\datename{Datum}%
- \providecaptionname{german}\pagename{Seite}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\yourrefname{Ihr Zeichen}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\yourmailname{Ihr Schreiben vom}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\myrefname{Unser Zeichen}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\customername{Kundennummer}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\invoicename{Rechnungsnummer}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\subjectname{Betrifft}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\ccname{Kopien an}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\enclname{Anlage}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\headtoname{An}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\headfromname{Von}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\datename{Datum}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\pagename{Seite}%
\providecaptionname{german}\phonename{Telephon}%
+ \providecaptionname{ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\phonename{Telefon}%
\providecaptionname{german}\mobilephonename{Mobiltelephon}%
- \providecaptionname{german}\faxname{Fax}%
- \providecaptionname{german}\emailname{E-Mail}%
- \providecaptionname{german}\wwwname{URL}%
- \providecaptionname{german}\bankname{Bankverbindung}%
+ \providecaptionname{ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\mobilephonename{Mobiltelefon}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\faxname{Fax}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\emailname{E-Mail}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\wwwname{URL}%
+ \providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}\bankname{Bankverbindung}%
\g@addnumerical@date{german}{\number\day.\,\number\month.\,\number\year}%
- \providecaptionname{ngerman}\yourrefname{Ihr Zeichen}%
- \providecaptionname{ngerman}\yourmailname{Ihr Schreiben vom}%
- \providecaptionname{ngerman}\myrefname{Unser Zeichen}%
- \providecaptionname{ngerman}\customername{Kundennummer}%
- \providecaptionname{ngerman}\invoicename{Rechnungsnummer}%
- \providecaptionname{ngerman}\subjectname{Betrifft}%
- \providecaptionname{ngerman}\ccname{Kopien an}%
- \providecaptionname{ngerman}\enclname{Anlagen}%
- \providecaptionname{ngerman}\headtoname{An}%
- \providecaptionname{ngerman}\headfromname{Von}%
- \providecaptionname{ngerman}\datename{Datum}%
- \providecaptionname{ngerman}\pagename{Seite}%
- \providecaptionname{ngerman}\phonename{Telefon}%
- \providecaptionname{ngerman}\mobilephonename{Handy}%
- \providecaptionname{ngerman}\faxname{Fax}%
- \providecaptionname{ngerman}\emailname{E-Mail}%
- \providecaptionname{ngerman}\wwwname{URL}%
- \providecaptionname{ngerman}\bankname{Bankverbindung}%
\g@addnumerical@date{ngerman}{\number\day.\,\number\month.\,\number\year}%
- \providecaptionname{austrian}\yourrefname{Ihr Zeichen}%
- \providecaptionname{austrian}\yourmailname{Ihr Schreiben vom}%
- \providecaptionname{austrian}\myrefname{Unser Zeichen}%
- \providecaptionname{austrian}\customername{Kundennummer}%
- \providecaptionname{austrian}\invoicename{Rechnungsnummer}%
- \providecaptionname{austrian}\subjectname{Betrifft}%
- \providecaptionname{austrian}\ccname{Kopien an}%
- \providecaptionname{austrian}\enclname{Anlagen}%
- \providecaptionname{austrian}\headtoname{An}%
- \providecaptionname{austrian}\headfromname{Von}%
- \providecaptionname{austrian}\datename{Datum}%
- \providecaptionname{austrian}\pagename{Seite}%
- \providecaptionname{austrian}\phonename{Telefon}%
- \providecaptionname{austrian}\mobilephonename{Mobiltelefon}%
- \providecaptionname{austrian}\faxname{Fax}%
- \providecaptionname{austrian}\emailname{E-Mail}%
- \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}\phonename{Handy}%
- \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}%
- \providecaptionname{french}\customername{Num\'ero de client}%
- \providecaptionname{french}\invoicename{Num\'ero de facture}%
- \providecaptionname{french}\subjectname{Concernant}%
- \providecaptionname{french}\ccname{Copie \`a}%
- \providecaptionname{french}\enclname{Annexes}%
- \providecaptionname{french}\headtoname{A}%
- \providecaptionname{french}\headfromname{De}%
- \providecaptionname{french}\datename{Date}%
- \providecaptionname{french}\pagename{Page}%
- \providecaptionname{french}\phonename{T\'el\'ephone}%
- \providecaptionname{french}\mobilephonename{Portable}%
- \providecaptionname{french}\faxname{T\'el\'efax}%
- \providecaptionname{french}\emailname{E-mail}%
- \providecaptionname{french}\wwwname{URL}%
- \providecaptionname{french}\bankname{Compte en banque}%
+ \g@addnumerical@date{swissgerman}{\number\day.\,\number\month.\,\number\year}%
+ \g@addnumerical@date{nswissgerman}{%
+ \number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\yourrefname{Vos r\'ef\'erences}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\yourmailname{Votre lettre du}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\myrefname{Nos r\'ef\'erences}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\customername{Num\'ero de client}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\invoicename{Num\'ero de facture}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\subjectname{Concernant}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\ccname{Copie \`a}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\enclname{Annexes}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\headtoname{A}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\headfromname{De}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\datename{Date}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\pagename{Page}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\phonename{T\'el\'ephone}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\mobilephonename{Portable}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\faxname{T\'el\'efax}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\emailname{E-mail}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\wwwname{URL}%
+ \providecaptionname{%
+ acadian,canadien,francais,french}\bankname{Compte en banque}%
+ \g@addnumerical@date{acadian}{\number\day.\,\number\month.\,\number\year}%
+ \g@addnumerical@date{canadien}{\number\year/\number\month/\number\day}%
+ \g@addnumerical@date{francais}{\number\day.\,\number\month.\,\number\year}%
\g@addnumerical@date{french}{\number\day.\,\number\month.\,\number\year}%
\providecaptionname{italian}\yourrefname{Vs./Rif.}% or Vostro Riferimento
\providecaptionname{italian}\yourmailname{Vs.~lettera del}% or Vostra
@@ -1959,12 +1931,68 @@
\providecaptionname{swedish}\wwwname{Hemsida}%
\providecaptionname{swedish}\bankname{Bankgiro}% PlusGiro
\g@addnumerical@date{swedish}{\number\day/\number\month~\number\year}%
+ \providecaptionname{polish}\yourrefname{Wasz znak}%
+ \providecaptionname{polish}\yourmailname{Wasze pismo z dnia}%
+ \providecaptionname{polish}\myrefname{Nasz znak}%
+ \providecaptionname{polish}\customername{Numer klienta}%
+ \providecaptionname{polish}\invoicename{Numer rachunku}%
+ \providecaptionname{polish}\subjectname{Dotyczy}%
+ \providecaptionname{polish}\ccname{Rozdzielnik}%
+ \providecaptionname{polish}\enclname{Za\l\aob{}czniki}%
+ \providecaptionname{polish}\headtoname{Do}%
+ \providecaptionname{polish}\headfromname{Od}%
+ \providecaptionname{polish}\datename{Data}%
+ \providecaptionname{polish}\pagename{Strona}%
+ \providecaptionname{polish}\phonename{Telefon}%
+ \providecaptionname{polish}\mobilephonename{Numer mobilny}%
+ \providecaptionname{polish}\faxname{Fax}%
+ \providecaptionname{polish}\emailname{E-mail}%
+ \providecaptionname{polish}\wwwname{URL}%
+ \providecaptionname{polish}\bankname{Konto}%
+ \g@addnumerical@date{polish}{\number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{czech}\yourrefname{Va\v{s}e zna\v{c}ka}%
+ \providecaptionname{czech}\yourmailname{V\'{a}\v{s} dopis ze dne}%
+ \providecaptionname{czech}\myrefname{Na\v{s}e zna\v{c}ka}%
+ \providecaptionname{czech}\customername{Z\'akaznick\'e \v{c}\'{\i}slo}%
+ \providecaptionname{czech}\invoicename{Fakura\v{c}n\'{\i} \v{c}\'{\i}slo}%
+ \providecaptionname{czech}\subjectname{Pr\v{e}dm\v{e}t}%
+ \providecaptionname{czech}\ccname{Kopie}%
+ \providecaptionname{czech}\enclname{P\v{r}\'{\i}loha}%
+ \providecaptionname{czech}\headtoname{Komu}%
+ \providecaptionname{czech}\headfromname{Od}%
+ \providecaptionname{czech}\datename{Datum}%
+ \providecaptionname{czech}\pagename{Strana}%
+ \providecaptionname{czech}\phonename{Telefon}%
+ \providecaptionname{czech}\mobilephonename{Mobil}%
+ \providecaptionname{czech}\faxname{Fax}%
+ \providecaptionname{czech}\emailname{E-Mail}%
+ \providecaptionname{czech}\wwwname{URL}%
+ \providecaptionname{czech}\bankname{Bankovn\'{\i} spojen\'{\i}}%
+ \g@addnumerical@date{czech}{\number\day.\,\number\month.\,\number\year}%
+ \providecaptionname{slovak}\yourrefname{Va\v{s}a zna\v{c}ka}%
+ \providecaptionname{slovak}\yourmailname{V\'{a}\v{s} list zo d\v{n}a}%
+ \providecaptionname{slovak}\myrefname{Na\v{s}a zna\v{c}ka}%
+ \providecaptionname{slovak}\customername{Z\'akazn\'{\i}cke \v{c}\'{\i}slo}%
+ \providecaptionname{slovak}\invoicename{\'{C}\'{\i}slo fakt\'ury}%
+ \providecaptionname{slovak}\subjectname{Predmet}%
+ \providecaptionname{slovak}\ccname{K\'{o}pia pre koho}%
+ \providecaptionname{slovak}\enclname{Pr\'{\i}loha}%
+ \providecaptionname{slovak}\headtoname{Komu}%
+ \providecaptionname{slovak}\headfromname{Od}%
+ \providecaptionname{slovak}\datename{D\'{a}tum}%
+ \providecaptionname{slovak}\pagename{Strana}%
+ \providecaptionname{slovak}\phonename{Telef\'{o}n}%
+ \providecaptionname{slovak}\mobilephonename{Mobil}%
+ \providecaptionname{slovak}\faxname{Fax}%
+ \providecaptionname{slovak}\emailname{E-Mail}%
+ \providecaptionname{slovak}\wwwname{URL}%
+ \providecaptionname{slovak}\bankname{Bankov\'{e} spojenie}%
+ \g@addnumerical@date{slovak}{\number\day.\,\number\month.\,\number\year}%
\captionsenglish
\dateenglish
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname date\languagename\endcsname\relax
- \ClassWarningNoLine{%
- scrlttr2%
+ \ClassWarningNoLine{scrlttr2%
}{%
\string\language\space is \the\language, \string\languagename\space is
`\languagename'\MessageBreak
@@ -1976,7 +2004,8 @@
\let\languagename=\undefined
\fi
\ifx\languagename\undefined
- \ClassWarningNoLine{scrlttr2}{\string\languagename\space not
+ \ClassWarningNoLine{scrlttr2%
+ }{\string\languagename\space not
defined, using \string\language.\MessageBreak
This may result in use of wrong language!\MessageBreak
You should use a compatible language
@@ -1986,10 +2015,22 @@
\captionsamerican
\dateamerican
\fi\fi
+ \ifx\l@australian\undefined\else\ifnum\language=\l@australian
+ \captionsaustralian
+ \dateaustralian
+ \fi\fi
\ifx\l@british\undefined\else\ifnum\language=\l@british
\captionsbritish
\datebritish
\fi\fi
+ \ifx\l@canadian\undefined\else\ifnum\language=\l@canadian
+ \captionscanadian
+ \datecanadian
+ \fi\fi
+ \ifx\l@newzealand\undefined\else\ifnum\language=\l@newzealand
+ \captionsnewzealand
+ \datenewzealand
+ \fi\fi
\ifx\l@UKenglish\undefined\else\ifnum\language=\l@UKenglish
\captionsUKenglish
\dateUKenglish
@@ -2014,6 +2055,26 @@
\captionsngerman
\datengerman
\fi\fi
+ \ifx\l@swissgerman\undefined\else\ifnum\language=\l@swissgerman
+ \captionsswissgerman
+ \dateswissgerman
+ \fi\fi
+ \ifx\l@nswissgerman\undefined\else\ifnum\language=\l@nswissgerman
+ \captionsnswissgerman
+ \datenswissgerman
+ \fi\fi
+ \ifx\l@acadian\undefined\else\ifnum\language=\l@acadian
+ \captionsacadian
+ \dateacadian
+ \fi\fi
+ \ifx\l@canadien\undefined\else\ifnum\language=\l@canadien
+ \captionscanadien
+ \datecanadien
+ \fi\fi
+ \ifx\l@francais\undefined\else\ifnum\language=\l@francais
+ \captionsfrancais
+ \datefrancais
+ \fi\fi
\ifx\l@french\undefined\else\ifnum\language=\l@french
\captionsfrench
\datefrench
@@ -2046,11 +2107,22 @@
\captionsswedish
\dateswedish
\fi\fi
+ \ifx\l@polish\undefined\else\ifnum\language=\l@polish
+ \captionspolish
+ \datepolish
+ \fi\fi
+ \ifx\l@czech\undefined\else\ifnum\language=\l@czech
+ \captionsczech
+ \dateczech
+ \fi\fi
+ \ifx\l@slovak\undefined\else\ifnum\language=\l@slovak
+ \captionsslovak
+ \dateslovak
+ \fi\fi
\else
\edef\@tempa{nohyphenation}%
\ifx\languagename\@tempa
- \ClassWarningNoLine{%
- scrlttr2%
+ \ClassWarningNoLine{scrlttr2%
}{%
You've selected language `\languagename'.\MessageBreak
Maybe your LaTeX format contains Babel extension\MessageBreak
@@ -2061,26 +2133,30 @@
will be used%
}%
\else
- \ClassInfo{scrlttr2}{%
+ \ClassInfo{scrlttr2%
+ }{%
trying to activate captions and date\MessageBreak
of language `\languagename'%
}%
\csname date\languagename\endcsname
\csname captions\languagename\endcsname
- \ClassInfo{%
- scrlttr2%
+ \ClassInfo{scrlttr2%
}{%
used language is `\languagename'.\MessageBreak
- Supported languages are `english', `UKenglish',\MessageBreak
- `british', `american', `USenglish',\MessageBreak
+ Supported languages are: `english', `UKenglish',\MessageBreak
+ `british', `american', `USenglish', `australian`,\MessageBreak
+ `canadian', `newzealand',\MessageBreak
`german', `ngerman', `austrian', `naustrian',\MessageBreak
- `dutch', `italian', `spanish',\MessageBreak
- `croatian', `finnish', `norsk', `swedish'%
+ `swissgerman', `nswissgermsn',\MessageBreak
+ `acadian', `canadien', `francais', `french', \MessageBreak
+ `dutch', `italian', `spanish', `polish',\MessageBreak
+ `croatian', `finnish', `norsk', `swedish',\MessageBreak
+ `czech'. `slovak'
}%
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 1389 2013-10-01 16:06:04Z mjk $
+%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\newkomavar}{%
\@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
\newcommand*{\@newkomavar}[2][\relax]{%
@@ -2094,8 +2170,7 @@
\expandafter\let\csname scr@#2@var\endcsname=\@empty
\if@tempswa\addtoreffields{#2}\fi
}{%
- \ClassError{%
- scrlttr2%
+ \ClassError{scrlttr2%
}{%
This should never happen%
}{%
@@ -2106,8 +2181,7 @@
}%
}%
}{%
- \ClassError{%
- scrlttr2%
+ \ClassError{scrlttr2%
}{%
Variable `#2' already defined%
}{%
@@ -2144,8 +2218,7 @@
}%
}
\newcommand*{\@komavar@err}[2]{%
- \ClassError{%
- scrlttr2%
+ \ClassError{scrlttr2%
}{%
KOMA-Script variable not defined%
}{%
@@ -2183,7 +2256,7 @@
\begingroup
\@ifstar {\@tempswatrue\@ifkomavarempty}%
{\@tempswafalse\@ifkomavarempty}%
- }
+}
\newcommand{\@ifkomavarempty}[1]{%
\ifkomavar{#1}{%
\if@tempswa
@@ -2209,12 +2282,13 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1388 2013-10-01 16:03:42Z mjk $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
}{%
- \ClassError{scrlttr2}{%
+ \ClassError{scrlttr2%
+ }{%
pseudo-length \expandafter\string\csname ltr@len@#1\endcsname
already defined%
}{%
@@ -2263,7 +2337,7 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2274,7 +2348,7 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\newcommand*{\scr@selectfont}{}
@@ -2400,7 +2474,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2420,7 +2494,8 @@
Font of page foot will also be changed%
}
\newcommand*{\scr@fnt@pagefoot}{\footfont}
-\newcommand*{\pagemark}{{\usekomafont{pagenumber}{%
+\newcommand*
+ {\pagemark}{{\usekomafont{pagenumber}{%
\pagename\ %
\thepage}}}
\renewcommand*{\ps@plain}{%
@@ -2778,7 +2853,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -2797,6 +2872,7 @@
{\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\
}%
\ifkomavarempty{fromaddress}{}{%
+ \csname scr@default@firsthead@fromaddress@hook\endcsname
\ignorespaces\usekomavar{fromaddress}%
}%
}%
@@ -2973,8 +3049,8 @@
\newkomafont{refvalue}{}
\fi
\newkomafont{placeanddate}{}
-\newkomafont{title}{\normalcolor\sffamily\bfseries}
-\newkomafont{subject}{\normalcolor\bfseries}
+ \newkomafont{title}{\normalcolor\sffamily\bfseries}%
+ \newkomafont{subject}{\normalcolor\bfseries}%
\@newplength{foldmarkhpos}
\@newplength{foldmarkvpos}
\@newplength{tfoldmarkvpos}
@@ -3163,22 +3239,20 @@
\begingroup%
\vbox to #2{#1#3}%
\if@savevbox@warning\@savevbox@warningfalse%
- \setbox0\vbox{#3}%
- \setlength{\@tempdima}{#2}%
- \setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
- \ifdim \@tempdimb>\@tempdima%
- \addtolength{\@tempdimb}{-\@tempdima}%
- \ClassWarning{%
- scrlttr2%
- }{%
- #4 is \the\@tempdimb\space too high.\MessageBreak
- You have to change `\string#5'\MessageBreak
- or you have to define a smaller\MessageBreak
- #4 using \string#6.\MessageBreak
- Because of this too high #4\MessageBreak
- you've got an overfull \string\vbox\space message%
- }%
- \fi%
+ \setbox0\vbox{#3}%
+ \setlength{\@tempdima}{#2}%
+ \setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
+ \ifdim \@tempdimb>\@tempdima%
+ \addtolength{\@tempdimb}{-\@tempdima}%
+ \ClassWarning{scrlttr2}{%
+ #4 is \the\@tempdimb\space too high.\MessageBreak
+ You have to change `\string#5'\MessageBreak
+ or you have to define a smaller\MessageBreak
+ #4 using \string#6.\MessageBreak
+ Because of this too high #4\MessageBreak
+ you've got an overfull \string\vbox\space message%
+ }%
+ \fi%
\fi%
\endgroup%
}
@@ -3751,13 +3825,13 @@
\ifnum \@datepos=1 \@set@reffield{date}\fi%
\setbox0\hbox{\usekomafont{refname}\strutbox}%
\ifdim\ht0>\ht\strutbox
- \ClassWarningNoLine{scrlttr}{%
+ \ClassWarningNoLine{scrlttr2}{%
Font element `refname' should not be larger than
\string\normalsize!}%
\fi
\setbox0\hbox{\usekomafont{refvalue}\strutbox}%
\ifdim\ht0>\ht\strutbox
- \ClassWarningNoLine{scrlttr}{%
+ \ClassWarningNoLine{scrlttr2}{%
Font element `refvalue' should not be larger than
\string\normalsize!}%
\fi
@@ -3775,7 +3849,7 @@
\vskip\useplength{refaftervskip}%
}%
}
-\newcommand*{\@maketitle}{%
+\newcommand*{\@makelettertitle}{%
\ifkomavarempty{title}{%
\typeout{Title: no}%
}{%
@@ -3942,7 +4016,7 @@
\@foldmarks\@firstheadfootfield\@addrfield\@locfield
\ifdim\useplength{subjectvpos}=\z@\else\@subjfield\fi
\@datefield
- \@maketitle
+ \@makelettertitle
\ifdim\useplength{subjectvpos}=\z@\if@subjafter\else\@subjfield\fi\fi
{\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative#1\par}%
{\setlength{\@tempdima}{\baselineskip}%