diff options
author | Karl Berry <karl@freefriends.org> | 2008-11-12 00:44:32 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-11-12 00:44:32 +0000 |
commit | e0fa36719ae8b943d0c515ccc2a4f1e2670cc614 (patch) | |
tree | cfd7d451101897cf222cd885a36573ccacd922c4 /Master/texmf-dist/source/latex/koma-script/scrpage.dtx | |
parent | 6d06dddb5a2041f7c07b6502a3bfa973f0d86635 (diff) |
koma-script update (11nov08)
git-svn-id: svn://tug.org/texlive/trunk@11262 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrpage.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrpage.dtx | 66 |
1 files changed, 52 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrpage.dtx b/Master/texmf-dist/source/latex/koma-script/scrpage.dtx index 45c5ee7fde1..f7da3b44bbc 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrpage.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrpage.dtx @@ -1,8 +1,8 @@ -% \CheckSum{2553} +% \CheckSum{2568} % \iffalse % ====================================================================== % scrpage.dtx -% Copyright (c) Markus Kohm, 1995-2007 +% Copyright (c) Markus Kohm, 1995-2008 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrpage.dtx -% Copyright (c) Markus Kohm, 1995-2007 +% Copyright (c) Markus Kohm, 1995-2008 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3b, verteilt und/oder veraendert werden. @@ -62,10 +62,10 @@ %<scrpage>\NeedsTeXFormat{LaTeX2e}[1995/06/01] %<driver> \ProvidesFile{scrpage.drv} %<*scrpage> -%<v1>\ProvidesPackage{scrpage}[2006/03/29 v1.3d KOMA-Script +%<v1>\ProvidesPackage{scrpage}[2008/02/29 v1.3e KOMA-Script %<v2>\ProvidesPackage{scrpage2} %<*!v1> - [2007/07/23 v2.2e LaTeX2e KOMA-Script + [2008/02/14 v2.2f LaTeX2e KOMA-Script %</!v1> %<scrpage> package] %<*driver> @@ -129,10 +129,17 @@ % % \DescribeMacro % \headfont\\ -% This font is used to write pageheads and -foots. You may change it using +% This font is used to write page heads and foots. You may change it using % |\renewcommand|, e.g. |\renewcommand\headfont{\normalfont\slshape}|. % % \DescribeMacro +% \footfont\\ +% This font is used to write page foots different from page heads. You may +% change it using |\renewcommand|, +% e.g. |\renewcommand\footfont{\normalfont\slshape}|. Only availabe at +% \texttt{scrpage2}. +% +% \DescribeMacro % \headmark\\ % Using \texttt{twoside}-option this is |\leftmark| at left/even pages and % |\rightmark| at right/odd pages. Using \texttt{oneside}-option there are @@ -716,6 +723,7 @@ % chapter- and sectionmark} % \changes{v1.0b}{1995/05/25}{Use CJK at \cs{chaptermark}, % \cs{sectionmark} and \cs{subsectionmark}} +% \changes{v1.3e}{2008/02/29}{usage of \cs{if@mainmatter} fixed} % \changes{v2.0}{2001/04/20}{Version 2 uses \cs{automark} and % \cs{manualmark}, so star and non-star version are same} % \changes{v2.1a}{2002/10/30}{Use \cs{if@automark}} @@ -744,7 +752,7 @@ \markboth {\ifnum \c@secnumdepth >\z@% \if@mainmatter\sectionmarkformat\fi\fi ####1}{% \ifnum \c@secnumdepth >\z@% - \ifmainmatter\sectionmarkformat\fi\fi ####1}}% + \if@mainmatter\sectionmarkformat\fi\fi ####1}}% \def\subsectionmark####1{% \markright {\ifnum \c@secnumdepth >\@ne% \subsectionmarkformat\fi ####1}}% @@ -900,11 +908,14 @@ % \end{macro} % \end{macro} % \begin{macro}{\def@twosidefoot} -% \changes{v1.3}{2001/03/30}{Use of \cmd\@footwidth instead of -% \cmd\textwidth} % \changes{v2.0}{2001/04/20}{Thickness and length of the lines are % optional} +% \changes{v1.3}{2001/03/30}{Use of \cmd\@footwidth instead of +% \cmd\textwidth} +% \begin{macro}{\def@@twosidefoot} +% \begin{macro}{\def@@@twosidefoot} % \changes{v2.0j}{2001/08/18}{Use of \cs{scr@nouppercase}} +% \changes{v2.2f}{2008/02/14}{Use of \cs{footfont}} % And last twosided and onesided foot: % \begin{macrocode} %<*v2> @@ -926,17 +937,19 @@ \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{% %<v2> \scr@nouppercase - \headfont\strut #3}}% + \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{{% %<v2> \scr@nouppercase - \headfont\strut #4}}% + \headfont\footfont\strut #4}}% \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}% } % \end{macrocode} % \end{macro} +% \end{macro} +% \end{macro} % \begin{macro}{\def@onesidefoot} % \changes{v1.3}{2001/03/30}{Use of \cmd\@footwidth instead of % \cmd\textwidth} @@ -946,6 +959,7 @@ % \begin{macro}{\def@@onesidefoot} % \begin{macro}{\def@@@onesidefoot} % \changes{v2.0l}{2001/09/30}{\cs{vbox} bereits nach der Linie beendet} +% \changes{v2.2f}{2008/02/14}{Use of \cs{footfont}} % \begin{macrocode} %<*v2> \def\def@onesidefoot{% @@ -967,7 +981,7 @@ \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{% %<v2> \scr@nouppercase - \headfont\strut #5}} + \headfont\footfont\strut #5}} \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}% } % \end{macrocode} @@ -1705,7 +1719,7 @@ % of this macro may already be defined by a \textsf{KOMA}-script-class, we % have to do this, using |\providecommand| % \begin{macrocode} -\providecommand\pnumfont{\normalfont} +\providecommand*{\pnumfont}{\normalfont} % \end{macrocode} % \end{macro} % @@ -1713,12 +1727,36 @@ % There is also a macro used by |\@evenhead|, |\@oddhead| and |\@evenfoot|, % |\@oddfoot|: % \begin{macrocode} -\providecommand\headfont{\normalfont% +\providecommand*{\headfont}{\normalfont% %<v2> \slshape% } +%<*v2> +\def\scr@fnt@wrn@pagehead#1{% + `pagehead' is only an alias of `pageheadfoot'.\MessageBreak + Font of page foot may also be changed% +} +%</v2> % \end{macrocode} % \end{macro} % +% \begin{macro}{\footfont} +% \changes{v2.2f}{2008/02/14}{New} +% \begin{macro}{\scr@fnt@pagefoot} +% \changes{v2.2f}{2008/02/14}{New (internal)} +% \begin{macro}{\scr@fnt@wrn@pagefoot} +% \changes{v2.2f}{2008/02/14}{deactivated} +% There is also a macro used by |\@evenfoot|, |\@oddfoot| after |\headfont|: +% \begin{macrocode} +%<*v2> +\providecommand*{\footfont}{\normalfont} +\providecommand*{\scr@fnt@pagefoot}{\footfont} +\let\scr@fnt@wrn@pagefoot\relax +%</v2> +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % % \subsection{Length and thickness of lines at head and foot} % \begin{macro}{\setheadtopline} |