summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls58
1 files changed, 42 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 515a3e9f1ae..124ff301da3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -91,7 +91,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -149,6 +149,7 @@
\@namedef{scr@v@2.98b}{6}
\@namedef{scr@v@2.98c}{7}
\@namedef{scr@v@3.00}{8}
+\@namedef{scr@v@3.01}{8}
\@namedef{scr@v@last}{8}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -3020,23 +3021,46 @@
\typeout{Subject: no}%
}{%
\ifx\raggedsubject\@empty
- \if@subjafter%
- \typeout{Subject: after opening}%
- \let\raggedsubject\centering%
- \else%
- \typeout{Subject: before opening}%
+ \ifdim\useplength{subjectvpos}=\z@
+ \if@subjafter%
+ \typeout{Subject: after opening}%
+ \let\raggedsubject\centering%
+ \else
+ \typeout{Subject: before opening}%
+ \def\raggedsubject{\noindent\@hangfrom}%
+ \fi
+ \else
+ \typeout{Subject: at absolute vertical position}%
\def\raggedsubject{\noindent\@hangfrom}%
- \fi%
+ \fi
+ \fi
+ \ifdim\useplength{subjectvpos}=\z@
+ \vskip\useplength{subjectbeforevskip}%
+ \begingroup
+ \else
+ \move@topt\vskip\useplength{subjectvpos}%
+ \expandafter\vb@t@z\expandafter{%
+ \fi
+ \usekomafont{subject}%
+ \raggedsubject{\if@subj \subject@format{\strut\ignorespaces
+ \usekomavar*{subject}}\fi}%
+ \subject@format{\strut\ignorespaces\usekomavar{subject}}\par
+ \ifdim\useplength{subjectvpos}=\z@
+ \endgroup
+ \vskip\useplength{subjectaftervskip}%
+ \else
+ }%
+ \vskip-\useplength{subjectvpos}\move@frompt
\fi
- {%
- \usekomafont{subject}%
- \raggedsubject{\if@subj \subject@format{\strut\ignorespaces
- \usekomavar*{subject}}\fi}%
- \subject@format{\strut\ignorespaces\usekomavar{subject}}\par
- }\vskip2\baselineskip%
}%
}%
}
+\@newplength{subjectvpos}
+\@setplength{subjectvpos}{0pt}
+\@newplength{subjectaftervskip}
+\@setplength{subjectaftervskip}{2\baselineskip}
+\@newplength{subjectbeforevskip}
+\@setplength{subjectbeforevskip}{0pt}
\newcommand*{\@nexthead}{%
\rlap{\parbox[c]{\textwidth}{\raggedright\strut
\ifnum\@pageat=0\pagemark\else\leftmark\fi\strut}}%
@@ -3117,14 +3141,16 @@
\@gen@firsthead
\@mkboth{\scr@fromname@var}{\scr@subject@var}%
\thispagestyle{empty}\noindent
- \@foldmarks\@firstheadfootfield\@addrfield\@locfield\@datefield
+ \@foldmarks\@firstheadfootfield\@addrfield\@locfield
+ \ifdim\useplength{subjectvpos}=\z@\else\@subjfield\fi
+ \@datefield
\@maketitle
- \if@subjafter\else\@subjfield\fi
+ \ifdim\useplength{subjectvpos}=\z@\if@subjafter\else\@subjfield\fi\fi
{\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative#1\par}%
{\setlength{\@tempdima}{\baselineskip}%
\addtolength{\@tempdima}{-\parskip}%
\ifdim \@tempdima>\z@\vskip\@tempdima\fi}%
- \if@subjafter\@subjfield\fi%
+ \ifdim\useplength{subjectvpos}=\z@\if@subjafter\@subjfield\fi\fi
\@afterindentfalse\@afterheading
}
\newcommand*{\@xtrimtempa}{%