summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-18 00:16:31 +0000
committerKarl Berry <karl@freefriends.org>2010-06-18 00:16:31 +0000
commitd9bd4cc7bc00bbe2637957dc1a44d9c949a6dbdc (patch)
tree0c8c9198b304f16b1b46962eef236c6bd290815a /Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
parent643866a0f27297875ee40ee641aa090114b87e51 (diff)
koma-script update (17jun10)
git-svn-id: svn://tug.org/texlive/trunk@19027 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrpage2.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty157
1 files changed, 53 insertions, 104 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index 793b8999d96..cbb80421476 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -43,7 +43,7 @@
%%% From File: scrpage.dtx
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}
- [2009/11/11 v2.4 LaTeX2e KOMA-Script
+ [2010/04/22 v2.5 LaTeX2e KOMA-Script
package]
\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{%
\@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
@@ -179,129 +179,78 @@
\@ifstar
{\@defpagestyle[-]}%
{\@defpagestyle[+]}}
-\if@twoside
- \def\@defpagestyle[#1]#2#3#4{%
- \expandafter\def\csname ps@#2\endcsname{%
- \if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
- \def@twosidehead#3
- \def@twosidefoot#4
- }
- }
-\else
- \def\@defpagestyle[#1]#2#3#4{%
- \expandafter\def\csname ps@#2\endcsname{%
- \if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
- \def@onesidehead#3
- \def@onesidefoot#4
- }
- }
-\fi
-\def\def@twosidehead{%
- \@ifnextchar(%)
- {\def@@twosidehead}%
- {\def@@twosidehead(\scr@headabove@linelength,%
- \scr@headabove@linethickness)}}
-\def\def@@twosidehead(#1,#2)#3#4#5{%
- \@ifnextchar(%)
- {\def@@@twosidehead({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@twosidehead({#1},{#2}){#3}{#4}{#5}%
- (\scr@headbelow@linelength,%
- \scr@headbelow@linethickness)}}
-\def\def@@@twosidehead(#1,#2)#3#4#5(#6,#7){%
- \def\@evenhead{\let\headmark\leftmark%
- \hss\hskip\@evenheadshift\vbox{\hsize=\@headwidth\relax%
- \hf@rule{#1}{#2}{\@headwidth}%
- {headabove}%
- \vskip#2
- \vskip\baselineskip
- \hb@xt@\@headwidth{{%
- \scr@nouppercase
- \headfont\strut #3}}%
- \hf@rule{#6}{#7}{\@headwidth}%
- {headbelow}%
- }\hskip\@oddheadshift\hss}%
- \def\@oddhead{\let\headmark\rightmark
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
- \hf@rule{#1}{#2}{\@headwidth}%
- {headabove}%
- \vskip#2%
- \vskip\baselineskip
- \hb@xt@\@headwidth{{%
- \scr@nouppercase
- \headfont\strut #4}}%
- \hf@rule{#6}{#7}{\@headwidth}%
- {headbelow}%
- }\hskip\@evenheadshift\hss}%
+\def\@defpagestyle[#1]#2#3#4{%
+ \expandafter\def\csname ps@#2\endcsname{%
+ \if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi
+ \def@head#3
+ \def@foot#4
+ }%
}
-\def\def@onesidehead{%
+
+\def\def@head{%
\@ifnextchar(%)
- {\def@@onesidehead}%
- {\def@@onesidehead(\scr@headabove@linelength,%
- \scr@headabove@linethickness)}}
-\def\def@@onesidehead(#1,#2)#3#4#5{%
+ {\def@@head}%
+ {\def@@head(\scr@headabove@linelength,%
+ \scr@headabove@linethickness)}}
+\def\def@@head(#1,#2)#3#4#5{%
\@ifnextchar(%)
- {\def@@@onesidehead({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@onesidehead({#1},{#2}){#3}{#4}{#5}%
- (\scr@headbelow@linelength,%
- \scr@headbelow@linethickness)}}
-\def\def@@@onesidehead(#1,#2)#3#4#5(#6,#7){%
- \def\@evenhead{}%
+ {\def@@@head({#1},{#2}){#3}{#4}{#5}}%
+ {\def@@@head({#1},{#2}){#3}{#4}{#5}%
+ (\scr@headbelow@linelength,%
+ \scr@headbelow@linethickness)}}
+\def\def@@@head(#1,#2)#3#4#5(#6,#7){%
+ \def\@evenhead{%
+ \if@twoside
+ \let\headmark\leftmark%
+ \hss\hskip\@evenheadshift\vbox{\hsize=\@headwidth\relax%
+ \hf@rule{#1}{#2}{\@headwidth}{headabove}%
+ \vskip#2
+ \vskip\baselineskip
+ \hb@xt@\@headwidth{{%
+ \scr@nouppercase
+ \headfont\strut #3}}%
+ \hf@rule{#6}{#7}{\@headwidth}{headbelow}%
+ }\hskip\@oddheadshift\hss
+ \fi
+ }%
\def\@oddhead{\let\headmark\rightmark
\hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
- \hf@rule{#1}{#2}{\@headwidth}%
- {headabove}%
+ \hf@rule{#1}{#2}{\@headwidth}{headabove}%
\vskip#2%
\vskip\baselineskip
\hb@xt@\@headwidth{{%
\scr@nouppercase
- \headfont\strut #5}}%
- \hf@rule{#6}{#7}{\@headwidth}%
- {headbelow}%
+ \headfont\strut \if@twoside #4\else #5\fi}}%
+ \hf@rule{#6}{#7}{\@headwidth}{headbelow}%
}\hskip\@evenheadshift\hss}%
}
-\def\def@twosidefoot{%
- \@ifnextchar(%)
- {\def@@twosidefoot}
- {\def@@twosidefoot(\scr@footabove@linelength,%
- \scr@footabove@linethickness)}}
-\def\def@@twosidefoot(#1,#2)#3#4#5{%
- \@ifnextchar(%)
- {\def@@@twosidefoot({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@twosidefoot({#1},{#2}){#3}{#4}{#5}%
- (\scr@footbelow@linelength,%
- \scr@footbelow@linethickness)}}
-\def\def@@@twosidefoot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{\let\headmark\leftmark
- \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \scr@nouppercase
- \headfont\footfont\strut #3}}%
- \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss}%
- \def\@oddfoot{\let\headmark\rightmark
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \scr@nouppercase
- \headfont\footfont\strut #4}}%
- \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
-}
-\def\def@onesidefoot{%
+\def\def@foot{%
\@ifnextchar(%)
- {\def@@onesidefoot}%
- {\def@@onesidefoot(\scr@footabove@linelength,%
+ {\def@@foot}
+ {\def@@foot(\scr@footabove@linelength,%
\scr@footabove@linethickness)}}
-\def\def@@onesidefoot(#1,#2)#3#4#5{%
+\def\def@@foot(#1,#2)#3#4#5{%
\@ifnextchar(%)
- {\def@@@onesidefoot({#1},{#2}){#3}{#4}{#5}}%
- {\def@@@onesidefoot({#1},{#2}){#3}{#4}{#5}%
+ {\def@@@foot({#1},{#2}){#3}{#4}{#5}}%
+ {\def@@@foot({#1},{#2}){#3}{#4}{#5}%
(\scr@footbelow@linelength,%
\scr@footbelow@linethickness)}}
-\def\def@@@onesidefoot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{}%
+\def\def@@@foot(#1,#2)#3#4#5(#6,#7){%
+ \def\@evenfoot{%
+ \if@twoside
+ \let\headmark\leftmark
+ \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax
+ \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
+ \scr@nouppercase
+ \headfont\footfont\strut #3}}%
+ \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss
+ \fi
+ }%
\def\@oddfoot{\let\headmark\rightmark
\hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
\topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
\scr@nouppercase
- \headfont\footfont\strut #5}}
+ \headfont\footfont\strut \if@twoside #4\else #5\fi}}%
\botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
}
\newcommand\topfoot@rule[2]{%