diff options
author | Karl Berry <karl@freefriends.org> | 2010-02-17 01:13:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-02-17 01:13:08 +0000 |
commit | fc452419467f73cbbe9e7748ac266442487b75c4 (patch) | |
tree | 9f2cc4858705479715feb886723ffd6361cbfc29 /Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls | |
parent | 5323eaeeb7b140b77a69f88dba6a5ef38f12f60e (diff) |
koma-script update (16feb10)
git-svn-id: svn://tug.org/texlive/trunk@17067 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.cls | 52 |
1 files changed, 43 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 0bebc90f6dc..06a044d4221 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-2009 +%% Copyright (c) 1994-2010 %% 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{2009/07/24 v3.04a KOMA-Script}% + \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -2098,9 +2098,9 @@ Font of page foot will also be changed% } \newcommand*{\scr@fnt@pagefoot}{\footfont} -\newcommand*{\pagemark}{{\usekomafont{pagenumber}% +\newcommand*{\pagemark}{{\usekomafont{pagenumber}{% \pagename\ % - \thepage}} + \thepage}}} \renewcommand*{\ps@plain}{% \renewcommand*{\@oddhead}{% \vbox{\vbox{\hsize=\textwidth\hbox to\textwidth{% @@ -2588,8 +2588,12 @@ \@newplength{sigindent} \@newplength{firstfootvpos} \@newplength{firstfootwidth} +\@newplength{firstfoothpos} +\@setplength{firstfoothpos}{\maxdimen} \@newplength{firstheadvpos} \@newplength{firstheadwidth} +\@newplength{firstheadhpos} +\@setplength{firstheadhpos}{\maxdimen} \@newplength{fromrulewidth} \@setplength{fromrulewidth}{0pt} \@newplength{fromrulethickness} @@ -2748,8 +2752,23 @@ \move@topt\vskip\useplength{firstheadvpos}% \vb@t@z{% \rlap{\move@topl - \setlength\@tempskipa{.5\paperwidth}% - \addtolengthplength[-.5]{\@tempskipa}{firstheadwidth}% + \ifdim\useplength{firstheadhpos}<\paperwidth + \ifdim \useplength{firstheadhpos}>-\paperwidth + \ifdim \useplength{firstheadhpos}<\z@ + \setlength\@tempskipa{\paperwidth}% + \addtolengthplength{\@tempskipa}{firstheadhpos}% + \addtolengthplength[-]{\@tempskipa}{firstheadwidth}% + \else + \setlength{\@tempskipa}{\useplength{firstheadhpos}}% + \fi + \else + \setlength\@tempskipa{\oddsidemargin}% + \addtolength\@tempskipa{1in}% + \fi + \else + \setlength\@tempskipa{.5\paperwidth}% + \addtolengthplength[-.5]{\@tempskipa}{firstheadwidth}% + \fi \hskip\@tempskipa \vbox{\hsize\useplength{firstheadwidth}% \setlength{\@tempskipa}{\useplength{toaddrvpos}}% @@ -2771,9 +2790,24 @@ \typeout{Foot of first page}% \vb@t@z{% \rlap{\move@topl - \setlength\@tempskipa{.5\paperwidth}% - \addtolengthplength[-.5]{\@tempskipa}{firstfootwidth}% - \hskip\@tempskipa% + \ifdim\useplength{firstfoothpos}<\paperwidth + \ifdim \useplength{firstfoothpos}>-\paperwidth + \ifdim \useplength{firstfoothpos}<\z@ + \setlength\@tempskipa{\paperwidth}% + \addtolengthplength{\@tempskipa}{firstfoothpos}% + \addtolengthplength[-]{\@tempskipa}{firstfootwidth}% + \else + \setlength{\@tempskipa}{\useplength{firstfoothpos}}% + \fi + \else + \setlength\@tempskipa{\oddsidemargin}% + \addtolength\@tempskipa{1in}% + \fi + \else + \setlength\@tempskipa{.5\paperwidth}% + \addtolengthplength[-.5]{\@tempskipa}{firstfootwidth}% + \fi + \hskip\@tempskipa \vbox{\hsize\useplength{firstfootwidth}% \vskip\useplength{firstfootvpos}% \setlength{\textwidth}{\useplength{firstfootwidth}}% |