diff options
author | Karl Berry <karl@freefriends.org> | 2008-11-19 02:08:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-11-19 02:08:50 +0000 |
commit | d169595175488e9e35570df5f4b22214627896e0 (patch) | |
tree | 7c972ee007fdc28424facd99165f9db6845f3bf2 /Master/texmf-dist/source/latex/koma-script/scrknpap.dtx | |
parent | 6b554ff2c8bc10e886bb75e7db3c1abbc2731019 (diff) |
koma-script update
git-svn-id: svn://tug.org/texlive/trunk@11355 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrknpap.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrknpap.dtx | 85 |
1 files changed, 68 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrknpap.dtx b/Master/texmf-dist/source/latex/koma-script/scrknpap.dtx index 7106f1d8f44..980e8992f6b 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrknpap.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrknpap.dtx @@ -1,4 +1,4 @@ -% \CheckSum{2339} +% \CheckSum{2393} % \iffalse meta-comment % ====================================================================== % scrknpap.dtx @@ -58,7 +58,7 @@ %%% From File: scrknpap.dtx %<*driver> % \fi -\ProvidesFile{scrknpap.dtx}[2008/06/06 v3.00 KOMA-Script (note-paper)] +\ProvidesFile{scrknpap.dtx}[2008/11/03 v3.01 KOMA-Script (note-paper)] % \iffalse \documentclass{scrdoc} \usepackage[english,ngerman]{babel} @@ -2227,6 +2227,8 @@ % \changes{v2.8q}{2001/11/13}{\cs{@parskipfalse}\cs{@parskip@indent}} % \changes{v2.8q}{2002/01/31}{wird mit hängendem Einzug gesetzt} % \changes{v2.95}{2006/03/23}{Absatzeinzug mit cs{setparsizes} einstellen} +% \changes{v3.01}{2008/11/03}{Verwendung der neuen Pseudolängen +% \texttt{subjectbeforevskip} und \texttt{subjectaftervskip}} % Der eigentliche Titel wir mit |\@maketitle| gesetzt. Dies sollte jedoch % ebenso wie beim Betreff (|\@subjfield|) \emph{nicht} manuell geschehen. % \begin{macrocode} @@ -2246,24 +2248,71 @@ \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% }% }% } % \end{macrocode} +% \begin{macro}{\ltr@len@subjectvpos} +% \changes{v3.01}{2008/11/03}{Neue Pseudolänge \texttt{subjectvpos}} +% Manchmal ist es günstiger, wenn man den Betreff absolut positionieren +% kann. Das geschieht über diese Pseudolänge, wenn sie \emph{nicht} 0 ist. +% \begin{macrocode} +\@newplength{subjectvpos} +\@setplength{subjectvpos}{0pt} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ltr@len@subjectaftervskip} +% \changes{v3.01}{2008/11/03}{Neue Pseudolänge \texttt{subjectaftervskip}} +% Abstand nach dem Betreff. Dieser Abstand wird aus Gründen der +% Kompatibilität zu früheren Versionen mit 2\cs{baselineskip} +% voreingestellt. +% \begin{macrocode} +\@newplength{subjectaftervskip} +\@setplength{subjectaftervskip}{2\baselineskip} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ltr@len@subjectbeforevskip} +% \changes{v3.01}{2008/11/03}{Neue Pseudolänge \texttt{subjectbeforevskip}} +% Abstand zusätzlich vor dem Betreff. Dieser Abstand wird aus Gründen der +% Kompatibilität zu früheren Versionen mit \cs{baselineskip} +% voreingestellt. Es sei darauf hingewiesen, dass hier bereits ein Abstand +% beispielsweise vom Titel existieren kann! +% \begin{macrocode} +\@newplength{subjectbeforevskip} +\@setplength{subjectbeforevskip}{0pt} +% \end{macrocode} +% \end{macro} % \end{macro} % \end{macro} % @@ -2478,14 +2527,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 } % \end{macrocode} |