diff options
author | Karl Berry <karl@freefriends.org> | 2013-12-26 23:18:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-12-26 23:18:36 +0000 |
commit | 9b219d1b664067729034647a4b37626cf2bf5e26 (patch) | |
tree | 00708467b44f90736dc32ed1bebb95e9c4710139 /Master/texmf-dist/source/latex/koma-script/scrpage.dtx | |
parent | c00c8298eb6913b74270a36c1f1018f1e9946f7b (diff) |
koma-script (26dec13)
git-svn-id: svn://tug.org/texlive/trunk@32489 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 | 1543 |
1 files changed, 547 insertions, 996 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrpage.dtx b/Master/texmf-dist/source/latex/koma-script/scrpage.dtx index 29bff3feefd..c74023d6c8b 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{2695} +% \CheckSum{2384} % \iffalse % ====================================================================== % scrpage.dtx -% Copyright (c) Markus Kohm, 1995-2012 +% Copyright (c) Markus Kohm, 1995-2013 % % 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-2012 +% Copyright (c) Markus Kohm, 1995-2013 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,281 +55,70 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: scrpage.dtx +%%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $ +%<scrpage>\NeedsTeXFormat{LaTeX2e}[1995/06/01] +%<*driver> +\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi +\ProvidesFile{scrpage.dtx}[% +%</driver> +%<*driver|scrpage> +%<scrpage>\ProvidesPackage{scrpage2}[% +%!KOMAScriptVersion + package (page head and foot)] +%</driver|scrpage> %<*dtx> -\ProvidesFile{scrpage.dtx} +\ifx\documentclass\undefined + \input scrdocstrip.tex + \@@input scrkernel-version.dtx + \@@input scrstrip.inc + \KOMAdefVariable{COPYRIGHFROM}{1995} + \generate{\usepreamble\defaultpreamble + \file{scrpage2.sty}{% + \from{scrpage.dtx}{scrpage,v2}% + \from{scrlogo.dtx}{logo}% + }% + } + \@@input scrstrop.inc +\else + \let\endbatchfile\relax +\fi +\endbatchfile %</dtx> -%<scrpage>\NeedsTeXFormat{LaTeX2e}[1995/06/01] -%<driver> \ProvidesFile{scrpage.drv} -%<*scrpage> -%<v1>\ProvidesPackage{scrpage}[2008/02/29 v1.3e KOMA-Script -%<v2>\ProvidesPackage{scrpage2} -%<*!v1> - [2010/04/22 v2.5 LaTeX2e KOMA-Script -%</!v1> -%<scrpage> package] %<*driver> - driver] \documentclass{scrdoc} -\usepackage{scrpage2} \usepackage[german,english]{babel} \usepackage[latin1]{inputenc} \CodelineIndex \RecordChanges \GetFileInfo{scrpage.dtx} -\title{The \textsf{KOMA}-pagestyle-package\thanks{This file has +\title{\KOMAScript{} \partname\ \texttt{\filename}\thanks{This file has version number \fileversion, last revised \filedate.}} -\renewpagestyle{headings}{(\textwidth,1pt)% - {\headmark\hfill}{\hfill\headmark}{\hfill\headmark\hfill}% - (\textwidth,.4pt)}% -{(\textwidth,.4pt)% - {\pagemark\hfill% - Copyright \copyright\ Markus Kohm, 1994--2002}% - {Package \texttt{scrpage}\hfill\pagemark}% - {\rlap{Package \texttt{scrpage}}\hfill% - Copyright \copyright\ Markus Kohm, 1994--2002\hfill% - \llap\pagemark}% - (\textwidth,1pt)} -\renewpagestyle{plain}{(\textwidth,1pt)% - {\hfill}{\hfill}{\hfill}% - (\textwidth,.4pt)}% -{(\textwidth,.4pt)% - {\pagemark\hfill}% - {\hfill\pagemark}% - {\hfill\pagemark\hfill}% - (\textwidth,1pt)} -\pagestyle{headings} +\date{\filedate} +\author{Markus Kohm} \begin{document} \maketitle - \begin{abstract} - This is \texttt{scrpage.sty}. This obsolete package is part of the - \textsf{KOMA}-script-bundle. It defines a new user-interface for - pagestyle-definition. It's something like \texttt{fancyheadings} but not - the same. You may use \texttt{scrpage} or \texttt{fancyhdr}. You may - use \texttt{scrpage} with standard classes, too. Note: Package - \texttt{scrpage} was replaced by package \texttt{scrpage2}. The manual for - package \texttt{scrpage2} is part of the \KOMAScript{} guide. - \end{abstract} \tableofcontents - \DocInput{scrpage.dtx} + \DocInput{\filename} \end{document} %</driver> % \fi % -% \section{Introduction} -% -% There is a simple user-interface and a expert-interface. Using the -% user-interface you can define a lot of different pagestyles. But there are -% combinations, you cannot define. Using the expert-interface you can do -% allmost all you may ever want. To do more, you should learn more about -% defining macros yourself. -% -% -% \subsection{Interface for all users} -% -% \DescribeMacro -% \headfont\\ -% 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 -% only right pages, so it is |\rightmark|. -% -% \DescribeMacro -% \pnumfont\\ -% This font is used to write pagenumbers at |\pagemark|. You may change it -% using |\renewcommand| (see |\headfont|). -% -% \DescribeMacro -% \pagemark\\ -% This is the number of the actual page written with |\pnumfont|. -% -% \DescribeMacro\deftripstyle -% \DescribeMacro\deftripstyle* -% The command \cs{deftripstyle}\marg{name}\oarg{olw}\oarg{ilw}% -% \marg{headleft}\marg{headmiddle}\marg{headright}% -% \marg{footleft}\marg{footmiddle}\marg{footright} -% defines a new pagestyle. You can activate this pagestyle using -% |\pagestyle| or |\thispagestyle|. Without optional argument this defines a -% page like this: -% \begin{center}\unitlength1mm\begin{picture}(120,82) -% \put(0,0){\dashbox{2}(58,82){\nobreakspace}} -% \put(1,78){\makebox(0,0)[l]{\emph{headright}}} -% \put(29,78){\makebox(0,0){\emph{headmiddle}}} -% \put(57,78){\makebox(0,0)[r]{\emph{headleft}}} -% \put(29,41){\makebox(0,0){left page}} -% \put(1,3){\makebox(0,0)[l]{\emph{footright}}} -% \put(29,3){\makebox(0,0){\emph{footmiddle}}} -% \put(57,3){\makebox(0,0)[r]{\emph{footleft}}} -% \put(60,0){\dashbox{2}(58,82){\nobreakspace}} -% \put(61,78){\makebox(0,0)[l]{\emph{headleft}}} -% \put(89,78){\makebox(0,0){\emph{headmiddle}}} -% \put(117,78){\makebox(0,0)[r]{\emph{headright}}} -% \put(89,41){\makebox(0,0){right page}} -% \put(61,3){\makebox(0,0)[l]{\emph{footleft}}} -% \put(89,3){\makebox(0,0){\emph{footmiddle}}} -% \put(117,3){\makebox(0,0)[r]{\emph{footright}}} -% \end{picture}\end{center} -% Using one optional argument \oarg{ilw} (means \emph{i}nner \emph{l}ine -% \emph{w}idth) you get a separationline between head and text and between -% text and foot like this (\emph{ilw}=0.5pt): -% \begin{center}\unitlength1mm\begin{picture}(120,82) -% \put(0,0){\dashbox{2}(58,82){\nobreakspace}} -% \put(1,78){\makebox(0,0)[l]{\emph{headright}}} -% \put(29,78){\makebox(0,0){\emph{headmiddle}}} -% \put(57,78){\makebox(0,0)[r]{\emph{headleft}}} -% \put(1,76){\rule{56\unitlength}{0.5pt}} -% \put(29,41){\makebox(0,0){left page}} -% \put(1,5){\rule{56\unitlength}{0.5pt}} -% \put(1,3){\makebox(0,0)[l]{\emph{footright}}} -% \put(29,3){\makebox(0,0){\emph{footmiddle}}} -% \put(57,3){\makebox(0,0)[r]{\emph{footleft}}} -% \put(60,0){\dashbox{2}(58,82){\nobreakspace}} -% \put(61,78){\makebox(0,0)[l]{\emph{headleft}}} -% \put(89,78){\makebox(0,0){\emph{headmiddle}}} -% \put(117,78){\makebox(0,0)[r]{\emph{headright}}} -% \put(61,76){\rule{56\unitlength}{0.5pt}} -% \put(89,41){\makebox(0,0){right page}} -% \put(61,5){\rule{56\unitlength}{0.5pt}} -% \put(61,3){\makebox(0,0)[l]{\emph{footleft}}} -% \put(89,3){\makebox(0,0){\emph{footmiddle}}} -% \put(117,3){\makebox(0,0)[r]{\emph{footright}}} -% \end{picture}\end{center} -% Using both optional arguments \oarg{olw} (means \emph{o}uter \emph{l}ine -% \emph{w}idth) and \oarg{ilw} you get a separationline between head and -% text and between text and foot and a line above head and below foot like -% this (\emph{olw}=2pt, \emph{ilw}=0.5pt): -% \begin{center}\unitlength1mm\begin{picture}(120,82) -% \put(0,0){\dashbox{2}(58,82){\nobreakspace}} -% \put(1,80){\rule{56\unitlength}{2pt}} -% \put(1,78){\makebox(0,0)[l]{\emph{headright}}} -% \put(29,78){\makebox(0,0){\emph{headmiddle}}} -% \put(57,78){\makebox(0,0)[r]{\emph{headleft}}} -% \put(1,76){\rule{56\unitlength}{0.5pt}} -% \put(29,41){\makebox(0,0){left page}} -% \put(1,5){\rule{56\unitlength}{0.5pt}} -% \put(1,3){\makebox(0,0)[l]{\emph{footright}}} -% \put(29,3){\makebox(0,0){\emph{footmiddle}}} -% \put(57,3){\makebox(0,0)[r]{\emph{footleft}}} -% \put(1,1){\rule{56\unitlength}{2pt}} -% \put(60,0){\dashbox{2}(58,82){\nobreakspace}} -% \put(61,80){\rule{56\unitlength}{2pt}} -% \put(61,78){\makebox(0,0)[l]{\emph{headleft}}} -% \put(89,78){\makebox(0,0){\emph{headmiddle}}} -% \put(117,78){\makebox(0,0)[r]{\emph{headright}}} -% \put(61,76){\rule{56\unitlength}{0.5pt}} -% \put(89,41){\makebox(0,0){right page}} -% \put(61,5){\rule{56\unitlength}{0.5pt}} -% \put(61,3){\makebox(0,0)[l]{\emph{footleft}}} -% \put(89,3){\makebox(0,0){\emph{footmiddle}}} -% \put(117,3){\makebox(0,0)[r]{\emph{footright}}} -% \put(61,1){\rule{56\unitlength}{2pt}} -% \end{picture}\end{center} -% -% You can define new pagestyles and you can redefine existing pagestyles. If -% you redefine an active pagestyle, this doesn't change the actual shown -% pagestyle. To activate you have to use always a |\pagestyle|- or -% |\thispagestyle|-command. -% -% You can change the standard pagestyle \texttt{headings} to. If you want to -% change pagestyle \texttt{myheadings}, you should use the star-version of -% the command:\\ -% \cs{deftripstyle*}\marg{name}\oarg{olw}\oarg{ilw}% -% \marg{headleft}\marg{headmiddle}\marg{headright}% -% \marg{footleft}\marg{footmiddle}\marg{footright} -% this defines a my-version pagestyle. This means, section- and -% chapter-commands or perhaps |\tableofcontents| don't change the -% marks. Only |\markboth| and |\markright| change them. But if you don't -% use |\headmark|, |\leftmark| or |\rightmark|, star- and starless version -% of |\deftripstyle| are almost the same. -% -% -% \subsection{Interface for experts} -% -% \DescribeMacro\defpagestyle -% Command -% \cs{defpagestyle}\marg{name}\marg{head-definition}\marg{foot-definition} -% defines a new pagestyle \emph{name}. \emph{head-definition} defines the head -% at the new pagestyle. It contains five parts: -% \begin{flushleft} -% (\emph{toplinelength},\emph{toplinewidth})\\% -% \marg{evenpagehead}\marg{oddpagehead}\marg{onesidepagehead}\\% -% (\emph{headseplinelength},\emph{headseplinewidth})\\ -% \end{flushleft} -% These five parts have to be \textbf{one} argument! So you should put them -% together in group-braces (``|{|'' and ``|}|''). -% -% \emph{foot-definition} analogous defines the foot at the new pagestyle. -% -% \DescribeMacro\newpagestyle -% Command -% \cs{newpagestyle}\marg{name}\marg{head-definition}\marg{foot-definition} -% defines a real new pagestyle. If there's already a pagestyle named -% \emph{name}, you'll get an error. Otherwise it's the same like -% |\defpagestyle|. -% -% \DescribeMacro\renewpagestyle -% Command -% \cs{renewpagestyle}\marg{name}\marg{head-definition}\marg{foot-definition} -% redefines a old pagestyle. If there isn't a pagestyle named \emph{name}, -% you'll get an error. Otherwise it's the same like |\defpagestyle|. -% -% \DescribeMacro\providepagestyle -% Command -% \cs{providepagestyle}\marg{name}\marg{head-definition}\marg{foot-definition} -% defines a new pagestyle, if it is realy new. If there is already a pagestyle -% named \emph{name}, it does nothing (but writing an info to the log -% file). Otherwise it's the same like |\defpagestyle|. -% -% You may use the user-interface-macros |\pagemark| and |\headmark|, too. -% -% -% \subsection{Configuration file} -% There's a configuration file \texttt{scrpage.cfg}, included at the end -% of \texttt{scrpage.sty}, if it exists. There you can define your own -% default pagestyles using all the commands above. -% -% -% \subsection{Example} -% The pagestyles of this documentation was defined using: -% \begin{verbatim} -% \renewpagestyle{headings}{(\textwidth,1pt)% -% {\headmark\hfill}{\hfill\headmark}{\hfill\headmark\hfill}% -% (\textwidth,.4pt)}% -% {(\textwidth,.4pt)% -% {\pagemark\hfill% -% Copyright \copyright\ Markus Kohm, 1994--2002}% -% {Package \texttt{scrpage}\hfill\pagemark}% -% {\rlap{Package \texttt{scrpage}}\hfill% -% Copyright \copyright\ Markus Kohm, 1994--2002\hfill% -% \llap\pagemark}% -% (\textwidth,1pt)} -% \renewpagestyle{plain}{(\textwidth,1pt)% -% {\hfill}{\hfill}{\hfill}% -% (\textwidth,.4pt)}% -% {(\textwidth,.4pt)% -% {\pagemark\hfill}% -% {\hfill\pagemark}% -% {\hfill\pagemark\hfill}% -% (\textwidth,1pt)} -% \pagestyle{headings} % activate new version -% \end{verbatim} +% \section{Page Layout Package} % +% This is the \KOMAScript{} package \textsf{scrpage2}. You may find the user +% documentation of this package in the English \KOMAScript{} guide, +% \texttt{scrguien.pdf}, and in the German \KOMAScript{} guide, +% \texttt{scrguide.pdf}. % % \StopEventually{\PrintIndex\PrintChanges} % % \section{Implementation} % +% Currently this package doesn't share any code but the \KOMAScript{} logo +% with other packages. So all the code of this package but the implementation +% of the \KOMAScript{} logo is at this file and their is nor more code at this +% file. +% % \begin{macrocode} %<*scrpage> % \end{macrocode} @@ -338,19 +127,17 @@ % % \subsection{Options} % \begin{option}{headinclude} -% \changes{v2.3}{2008/12/08}{obsolete} +% \changes{v2.3}{2008/12/08}{obsolete}% % \begin{option}{headexclude} -% \changes{v2.3}{2008/12/08}{obsolete} +% \changes{v2.3}{2008/12/08}{obsolete}% % \begin{option}{footinclude} -% \changes{v2.3}{2008/12/08}{obsolete} +% \changes{v2.3}{2008/12/08}{obsolete}% % \begin{option}{footexclude} -% \changes{v2.3}{2008/12/08}{obsolete} -% \texttt{scrpage} knows some options. They are similar to the -% \textsf{KOMA}-script-classes. To work with and without -% the \textsf{KOMA}-script-classes their definitions are not quite simple. -% +% \changes{v2.3}{2008/12/08}{obsolete}% +% \texttt{scrpage} has known some options. They are similar to the +% old \KOMAScript{} classes. To work with and without the \KOMAScript{} +% classes their definitions are not quite simple. % \begin{macrocode} -%<*v2> \newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{% \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}% \ifin@ @@ -369,22 +156,17 @@ \fi \fi } -%</v2> \DeclareOption{headinclude}{% -%<v1> \PassOptionsToPackage{headinclude}{typearea}% -%<v2> \@Pass@Obsolete@Option@To@Typearea{headinclude}% + \@Pass@Obsolete@Option@To@Typearea{headinclude}% } \DeclareOption{headexclude}{% -%<v1> \PassOptionsToPackage{headexclude}{typearea}% -%<v2> \@Pass@Obsolete@Option@To@Typearea{headinclude=false}% + \@Pass@Obsolete@Option@To@Typearea{headinclude=false}% } \DeclareOption{footinclude}{% -%<v1> \PassOptionsToPackage{footinclude}{typearea}% -%<v2> \@Pass@Obsolete@Option@To@Typearea{footinclude}% + \@Pass@Obsolete@Option@To@Typearea{footinclude}% } \DeclareOption{footexclude}{% -%<v1> \PassOptionsToPackage{footexclude}{typearea}% -%<v2> \@Pass@Obsolete@Option@To@Typearea{footinclude=false}% + \@Pass@Obsolete@Option@To@Typearea{footinclude=false}% } % \end{macrocode} % We do so, because we want so set |headinclude|, |footinclude| by @@ -394,45 +176,41 @@ % \end{option} % \end{option} % -% At version 2 we have additonal options designed for the additional -% interface. -% \begin{macrocode} -%<*v2> -% \end{macrocode} -% \begin{option}{mpinclude} -% \changes{v2.8q}{2002/03/28}{New option} -% \begin{option}{mpexclude} -% \changes{v2.8q}{2002/03/28}{New option} +% We have additional options designed for the additional interface. +% \begin{option}{mpinclude} +% \changes{v2.8q}{2002/03/28}{New option} +% \begin{option}{mpexclude} +% \changes{v2.8q}{2002/03/28}{New option} % There are documents where the head and foot should span not only the % text but also the marginpar. We have an option to do this at % initialization. This option corresponds with the option of package % \texttt{typearea} and the classes. -% \begin{macro}{\if@mincl} -% \begin{macro}{\@mincltrue} -% \begin{macro}{\@minclfalse} -% \changes{v2.2g}{2008/11/19}{Test fixed} +% \begin{macro}{\if@mincl} +% \begin{macro}{\@mincltrue} +% \begin{macro}{\@minclfalse} +% \changes{v2.2g}{2008/11/19}{Test fixed} % \begin{macrocode} \@ifundefined{@mincltrue}{\newif\if@mincl}{} % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % \begin{macrocode} \DeclareOption{mpinclude}{\@mincltrue} \DeclareOption{mpexclude}{\@minclfalse} % \end{macrocode} -% \end{option} -% \end{option} +% \end{option} +% \end{option} % % Other new options redefine macros, so we have to define them first. -% \begin{macro}{\scr@headabove@linethickness} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\scr@headbelow@linethickness} -% \changes{v2.0}{2001/03/30}{New} -% \begin{macro}{\scr@footabove@linethickness} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\scr@footbelow@linethickness} -% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scr@headabove@linethickness} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scr@headbelow@linethickness} +% \changes{v2.0}{2001/03/30}{New} +% \begin{macro}{\scr@footabove@linethickness} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scr@footbelow@linethickness} +% \changes{v2.0}{2001/04/20}{New} % These macros define the thickness of the line above and below the head % and the foot. % \begin{macrocode} @@ -441,22 +219,22 @@ \newcommand*{\scr@footabove@linethickness}{0pt} \newcommand*{\scr@footbelow@linethickness}{0pt} % \end{macrocode} -% \begin{macro}{\scr@headabove@linelength} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\scr@headbelow@linelength} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\scr@footabove@linelength} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\scr@footbelow@linelength} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\scrplain@headabove@linelength} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\scrplain@headbelow@linelength} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\scrplain@footabove@linelength} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\scrplain@footbelow@linelength} -% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scr@headabove@linelength} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scr@headbelow@linelength} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scr@footabove@linelength} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scr@footbelow@linelength} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scrplain@headabove@linelength} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scrplain@headbelow@linelength} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scrplain@footabove@linelength} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\scrplain@footbelow@linelength} +% \changes{v2.0}{2001/04/20}{New} % Because we want to have the ``line definitions'' at one place, we % also define the length of the lines here. We have own length at to % be used at pagestyle \texttt{scrplain}. @@ -470,27 +248,27 @@ \newcommand*{\scrplain@footabove@linelength}{0pt} \newcommand*{\scrplain@footbelow@linelength}{0pt} % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% -% \begin{option}{headtopline} -% \changes{v2.0}{2001/04/20}{New option} -% \begin{option}{headsepline} -% \changes{v2.0}{2001/04/20}{New option} -% \begin{option}{footsepline} -% \changes{v2.0}{2001/04/20}{New option} -% \begin{option}{footbotline} -% \changes{v2.0}{2001/04/20}{New option} -% \begin{option}{plainheadtopline} -% \changes{v2.0}{2001/04/20}{New option} -% \begin{option}{plainheadsepline} -% \changes{v2.0}{2001/04/20}{New option} -% \begin{option}{plainfootsepline} -% \changes{v2.0}{2001/04/20}{New option} -% \begin{option}{plainfootbotline} -% \changes{v2.0}{2001/04/20}{New option} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{option}{headtopline} +% \changes{v2.0}{2001/04/20}{New option} +% \begin{option}{headsepline} +% \changes{v2.0}{2001/04/20}{New option} +% \begin{option}{footsepline} +% \changes{v2.0}{2001/04/20}{New option} +% \begin{option}{footbotline} +% \changes{v2.0}{2001/04/20}{New option} +% \begin{option}{plainheadtopline} +% \changes{v2.0}{2001/04/20}{New option} +% \begin{option}{plainheadsepline} +% \changes{v2.0}{2001/04/20}{New option} +% \begin{option}{plainfootsepline} +% \changes{v2.0}{2001/04/20}{New option} +% \begin{option}{plainfootbotline} +% \changes{v2.0}{2001/04/20}{New option} % The thickness can be set by four simple options: % \begin{macrocode} \DeclareOption{headtopline}{% @@ -518,31 +296,31 @@ \renewcommand*{\scrplain@footbelow@linelength}{\scr@footbelow@linelength} \PassOptionsToPackage{footinclude}{typearea}} % \end{macrocode} -% \end{option} -% \end{option} -% \end{option} -% \end{option} -% \end{option} -% \end{option} -% \end{option} -% \end{option} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{option} +% \end{option} +% \end{option} +% \end{option} +% \end{option} +% \end{option} +% \end{option} +% \end{option} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % \begin{macro}{\hfline@adjust} -% \changes{v2.0f}{2001/06/23}{New} +% \changes{v2.0f}{2001/06/23}{New} % \begin{option}{ilines} -% \changes{v2.0f}{2001/06/23}{New} +% \changes{v2.0f}{2001/06/23}{New} % \begin{option}{clines} -% \changes{v2.0f}{2001/06/23}{New} +% \changes{v2.0f}{2001/06/23}{New} % \begin{option}{olines} -% \changes{v2.0f}{2001/06/23}{New} +% \changes{v2.0f}{2001/06/23}{New} % At Version 2 lines may be inner adjusted (0), centered (1) or outer % adjusted (2): % \begin{macrocode} @@ -556,13 +334,13 @@ % \end{option} % \end{macro} % -% \begin{option}{automark} -% \changes{v2.0b}{2001/05/31}{use \cs{AtEndOfPackage} to run not yet -% defined macro} -% \begin{option}{manualmark} -% \changes{v2.0b}{2001/05/31}{use \cs{AtEndOfPackage} to run not yet -% defined macro} -% \changes{v2.0i}{2001/08/17}{don't ignore oneside any longer} +% \begin{option}{automark} +% \changes{v2.0b}{2001/05/31}{use \cs{AtEndOfPackage} to run not yet +% defined macro} +% \begin{option}{manualmark} +% \changes{v2.0b}{2001/05/31}{use \cs{AtEndOfPackage} to run not yet +% defined macro} +% \changes{v2.0i}{2001/08/17}{don't ignore oneside any longer} % At version 2 we want to distinguish between running headline and % static headline not only using different pagestyles. We do this with % options and commands. But here only the options are defined. @@ -576,26 +354,26 @@ \fi}} \DeclareOption{manualmark}{\AtEndOfPackage{\manualmark}} % \end{macrocode} -% \end{option} -% \end{option} +% \end{option} +% \end{option} % -% \begin{option}{autoonesize} -% \changes{v2.0i}{2001/08/17}{New} -% \begin{macro}{if@autooneside} -% \changes{v2.0i}{2001/08/17}{New} +% \begin{option}{autoonesize} +% \changes{v2.0i}{2001/08/17}{New} +% \begin{macro}{\if@autooneside} +% \changes{v2.0i}{2001/08/17}{New} % If the optional argument of \cs{automark} should be irgnored at % onside mode, use this option: % \begin{macrocode} \newif\if@autooneside\@autoonesidefalse \DeclareOption{autooneside}{\@autoonesidetrue} % \end{macrocode} -% \end{macro} -% \end{option} +% \end{macro} +% \end{option} % -% \begin{option}{markuppercase} -% \changes{v2.0c}{2001/06/07}{New} -% \begin{option}{markusedcase} -% \changes{v2.0c}{2001/06/07}{New} +% \begin{option}{markuppercase} +% \changes{v2.0c}{2001/06/07}{New} +% \begin{option}{markusedcase} +% \changes{v2.0c}{2001/06/07}{New} % For use of running headlines there are also options to say ``class % uses upper case at the automatic marks'' or ``class use same case at % the automatic marks like used writing the heading''. @@ -603,13 +381,13 @@ \DeclareOption{markuppercase}{\let\MakeMarkcase\MakeUppercase} \DeclareOption{markusedcase}{\let\MakeMarkcase\@empty} % \end{macrocode} -% \end{option} -% \end{option} +% \end{option} +% \end{option} % -% \begin{macro}{\scr@nouppercase} -% \changes{v2.0j}{2001/08/18}{New} -% \begin{option}{nouppercase} -% \changes{v2.0j}{2001/08/18}{New} +% \begin{macro}{\scr@nouppercase} +% \changes{v2.0j}{2001/08/18}{New} +% \begin{option}{nouppercase} +% \changes{v2.0j}{2001/08/18}{New} % Sometimes scrpage may be used with a class, which uses % \cs{uppercase} or \cs{MakeUppercase} at \cs{markboth} or % \cs{markright}. But the author does not want upper case at the @@ -629,8 +407,8 @@ \let\MakeMarkcase\@empty \fi} % \end{macrocode} -% \end{option} -% \end{macro} +% \end{option} +% \end{macro} % % \begin{option}{komastyle} % \begin{option}{standardstyle} @@ -648,15 +426,9 @@ % \end{option} % % +% We don't need default options. % \begin{macrocode} -%</v2> -% \end{macrocode} -% -% Set the default options. -% \begin{macrocode} -\ExecuteOptions{% -%<!v2>headinclude,footinclude% -} +\ExecuteOptions{} % \end{macrocode} % But you may set other Options: % \begin{macrocode} @@ -669,8 +441,8 @@ % For easier handling of the differences between article-, report- and % book-classes we define some more switches. % -% \begin{macro}{\if@chapter} -% \changes{v2.1b}{2003/05/31}{more save test} +% \begin{macro}{\if@chapter} +% \changes{v2.1b}{2003/05/31}{more save test} % First distinguish between article and others. % \begin{macrocode} \newif\if@chapter @@ -681,21 +453,20 @@ \@chaptertrue \fi % \end{macrocode} -% \end{macro} +% \end{macro} % -% \begin{macro}{\if@mainmatter} -% \changes{v1.2}{1995/07/08}{Definition changed} -% \changes{v2.1b}{2003/05/31}{more save test} -% \changes{v2.2d}{2007/03/13}{additional \cs{if@mainmatter} test} -% \changes{v2.2g}{2008/11/19}{usage of \cs{if@mainmatter} at message -% removed} +% \begin{macro}{\if@mainmatter} +% \changes{v1.2}{1995/07/08}{Definition changed} +% \changes{v2.1b}{2003/05/31}{more save test} +% \changes{v2.2d}{2007/03/13}{additional \cs{if@mainmatter} test} +% \changes{v2.2g}{2008/11/19}{usage of \cs{if@mainmatter} at message +% removed} % Next distinguish between matter- and nomatter-classes. % \begin{macrocode} \def\@tempa{\newif\if@mainmatter\@mainmattertrue} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname mainmatter\endcsname\relax \else -%<*v2> \@ifundefined{@mainmattertrue}{% \PackageWarningNoLine{scrpage2}{% \string\mainmatter\space defined without @@ -705,32 +476,31 @@ back matter and will be defined now% }% }{% -%</v2> \let\@tempa\relax -%<v2> }% + }% \fi \@tempa % \end{macrocode} -% \end{macro} +% \end{macro} % % % \subsection{Predefinitions} % There are some commands, you can use at pagestyle-definition. % -% \begin{macro}{\headmark} +% \begin{macro}{\headmark} % This macro is |\rightmark| or |\leftmark|. But outside % pagestyle-definition it's nothing. % \begin{macrocode} \let\headmark\relax % \end{macrocode} -% \end{macro} +% \end{macro} % -% \begin{macro}{\pagemark} +% \begin{macro}{\pagemark} % This macro is the number of the page at the pagenumberfont: % \begin{macrocode} \DeclareRobustCommand\pagemark{{\pnumfont\thepage}} % \end{macrocode} -% \end{macro} +% \end{macro} % % % \subsection{Expert-Pagestyle-Definition-Interface} @@ -738,18 +508,18 @@ % simple interface we'll define later. But it's more flexible. We'll % later use it to define the pagestyle-definition-interface for users. % -% \begin{macro}{\if@automark} -% \changes{v2.1}{2002/10/30}{New switch} -% \begin{macro}{\@automarktrue} -% \begin{macro}{\@automarkfalse} +% \begin{macro}{\if@automark} +% \changes{v2.1}{2002/10/30}{New switch} +% \begin{macro}{\@automarktrue} +% \begin{macro}{\@automarkfalse} % We need this switch to decide to switch on or off \cs{@mkboth} at the % pagestyles. % \begin{macrocode} -%<!v1>\newif\if@automark\@automarkfalse +\newif\if@automark\@automarkfalse % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % \begin{macro}{\defpagestyle} % First we define the simple definition-interface. There's no test, if @@ -767,102 +537,26 @@ % \end{macrocode} % \begin{macro}{\@defpagestyle} % Now the we can define the head and the foot. -% \changes{v1.0b}{1995/05/25}{Dot deleted after number at -% 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}} -% \changes{v2.2d}{2007/06/14}{Support of article-classes with -% \cs{if@mainmatter}} -% \changes{v2.5}{2010/04/22}{moved \cs{if@twoside} inside of definition} +% \changes{v1.0b}{1995/05/25}{Dot deleted after number at +% 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}} +% \changes{v2.2d}{2007/06/14}{Support of article-classes with +% \cs{if@mainmatter}} +% \changes{v2.5}{2010/04/22}{moved \cs{if@twoside} inside of definition} % Before version 2.5 we have distinguished one- and two-side definitions while % loading the package and have had all the definitions of \cs{@mkboth}, % \cs{chaptermark}, \cs{sectionmark}, and \cs{subsectionmark} at the -% definition of the page style. This was a lot of code: -% \begin{macrocode} -%<*v1> -\if@twoside - \def\@defpagestyle[#1]#2#3#4{% - \expandafter\def\csname ps@#2\endcsname{% - \def\@tempa{+}% - \def\@tempb{#1}% - \ifx\@tempa\@tempb - \let\@mkboth\markboth - \if@chapter - \def\chaptermark####1{% - \markboth {\ifnum \c@secnumdepth >\m@ne% - \if@mainmatter\chaptermarkformat\fi\fi ####1}{% - \ifnum \c@secnumdepth >\m@ne% - \if@mainmatter\chaptermarkformat\fi\fi ####1}}% - \def\sectionmark####1{% - \markright {\ifnum \c@secnumdepth >\z@% - \sectionmarkformat\fi ####1}}% - \else - \def\sectionmark####1{% - \markboth {\ifnum \c@secnumdepth >\z@% - \if@mainmatter\sectionmarkformat\fi\fi ####1}{% - \ifnum \c@secnumdepth >\z@% - \if@mainmatter\sectionmarkformat\fi\fi ####1}}% - \def\subsectionmark####1{% - \markright {\ifnum \c@secnumdepth >\@ne% - \subsectionmarkformat\fi ####1}}% - \fi - \else - \let\@mkboth\@gobbletwo - \if@chapter - \def\chaptermark####1{}% - \else - \def\subsectionmark####1{}% - \fi - \def\sectionmark####1{}% - \fi - \def@twosidehead#3 - \def@twosidefoot#4 - } - } -\else - \def\@defpagestyle[#1]#2#3#4{% - \expandafter\def\csname ps@#2\endcsname{% - \def\@tempa{+}% - \def\@tempb{#1}% - \ifx\@tempa\@tempb - \let\@mkboth\markboth - \if@chapter - \def\chaptermark####1{% - \markright {\ifnum \c@secnumdepth >\m@ne% - \if@mainmatter\chaptermarkformat\fi\fi ####1}}% - \def\sectionmark####1{}% - \else - \def\sectionmark####1{% - \markright{\ifnum \c@secnumdepth >\z@% - \if@mainmatter\sectionmarkformat\fi\fi ####1}}% - \def\subsectionmark####1{}% - \fi - \else - \let\@mkboth\@gobbletwo - \if@chapter - \def\chaptermark####1{}% - \else - \def\subsectionmark####1{}% - \fi - \def\sectionmark####1{}% - \fi - \def@onesidehead#3 - \def@onesidefoot#4 - } - } -\fi -%</v1> -% \end{macrocode} +% definition of the page style. % Since version~2.5 the difference of one- and two-side is made at the % definition of the heads and foots themself and \cs{chaptermark}, % \cs{sectionmark}, and \cs{subsectionmark} are defined by \cs{automark} and % \cs{manualmark}. So the code is much easier. % \begin{macrocode} -%<*v2> \def\@defpagestyle[#1]#2#3#4{% \expandafter\def\csname ps@#2\endcsname{% \if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi @@ -870,119 +564,8 @@ \def@foot#4 }% } -%</v2> -% \end{macrocode} -% \begin{macro}{\def@twosidehead} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@head}} -% \begin{macro}{\def@@twosidehead} -% \changes{v1.3}{2001/03/30}{Use of \cs{@headwidth} instead of -% \cs{textwidth}} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@@head}} -% \begin{macrocode} -%<*v1> -\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}% - \vskip#2 - \vskip\baselineskip - \hb@xt@\@headwidth{{% - \headfont\strut #3}}% - \hf@rule{#6}{#7}{\@headwidth}% - }\hskip\@oddheadshift\hss}% - \def\@oddhead{\let\headmark\rightmark - \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax - \hf@rule{#1}{#2}{\@headwidth}% - \vskip#2% - \vskip\baselineskip - \hb@xt@\@headwidth{{% - \headfont\strut #4}}% - \hf@rule{#6}{#7}{\@headwidth}% - }\hskip\@evenheadshift\hss}% -} -%</v1> -% \end{macro} -% \end{macro} -% \begin{macro}{\def@onesidehead} -% \changes{v1.3}{2001/03/30}{Use of \cmd\@headwidth instead of -% \cs{textwidth}} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@head}} -% \begin{macro}{\def@@onesidehead} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@@head}} -% \begin{macro}{\def@@@onesidehead} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@@@head}} -% Next the onesided head: -% \begin{macrocode} -%<*v1> -\def\def@onesidehead(#1,#2)#3#4#5(#6,#7){% - \def\@evenhead{}% - \def\@oddhead{\let\headmark\rightmark - \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax - \hf@rule{#1}{#2}{\@headwidth}% - \vskip#2% - \vskip\baselineskip - \hb@xt@\@headwidth{{% - \headfont\strut #5}}% - \hf@rule{#6}{#7}{\@headwidth}% - }\hskip\@evenheadshift\hss}% -} -%</v1> -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \begin{macro}{\def@twosidefoot} -% \changes{v1.3}{2001/03/30}{Use of \cmd\@footwidth instead of -% \cs{textwidth}} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@foot}} -% \begin{macro}{\def@@twosidefoot} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@@foot}} -% \begin{macro}{\def@@@twosidefoot} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@@@foot}} -% Next the twosided foot: -% \begin{macrocode} -%<*v1> -\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{{% - \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{{% - \headfont\footfont\strut #4}}% - \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}% -} -%</v1> -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \begin{macro}{\def@onesidefoot} -% \changes{v1.3}{2001/03/30}{Use of \cmd\@footwidth instead of -% \cs{textwidth}} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@foot}} -% \begin{macro}{\def@@onesidefoot} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@@foot}} -% \begin{macro}{\def@@@onesidefoot} -% \changes{v2.5}{2010/04/22}{replaced by \cs{\def@@@foot}} -% \begin{macrocode} -%<*v1> -\def\def@onesidefoot(#1,#2)#3#4#5(#6,#7){% - \def\@evenfoot{}% - \def\@oddfoot{\let\headmark\rightmark - \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax - \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{% - \headfont\footfont\strut #5}} - \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}% -} -%</v1> % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} - +% % \begin{macro}{\def@head} % \changes{v2.5}{2010/04/22}{new (internal)} % \begin{macro}{\def@@head} @@ -993,7 +576,6 @@ % This was real simple, but we already have to do the real definition % of the heads and foots. First the head: % \begin{macrocode} -%<*v2> \def\def@head{% \@ifnextchar(%) {\def@@head}% @@ -1031,7 +613,6 @@ \hf@rule{#6}{#7}{\@headwidth}{headbelow}% }\hskip\@evenheadshift\hss}% } -%</v2> % \end{macrocode} % \end{macro} % \end{macro} @@ -1049,7 +630,6 @@ % \changes{v2.5}{2010/04/22}{new (internal)} % And last twosided and onesided foot: % \begin{macrocode} -%<*v2> \def\def@foot{% \@ifnextchar(%) {\def@@foot} @@ -1079,7 +659,6 @@ \headfont\footfont\strut \if@twoside #4\else #5\fi}}% \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}% } -%</v2> % \end{macrocode} % \end{macro} % \end{macro} @@ -1087,40 +666,36 @@ % \end{macro} % % We now define the rules used at head and foot. -% \begin{macro}{\topfoot@rule} +% \begin{macro}{\topfoot@rule} % \begin{macrocode} \newcommand\topfoot@rule[2]{% \@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip \advance\@tempdima by -#2 - \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}% -%<v2> {footabove}% + \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}{footabove}% \vskip-\@tempdima} % \end{macrocode} -% \end{macro} -% \begin{macro}{\botfoot@rule} +% \end{macro} +% \begin{macro}{\botfoot@rule} % \begin{macrocode} \newcommand\botfoot@rule[2]{% \@tempdima-\baselineskip\advance\@tempdima by .3\normalbaselineskip \advance\@tempdima by #2 - \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}% -%<v2> {footbelow}% + \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}{footbelow}% } % \end{macrocode} -% \end{macro} -% \begin{macro}{\hf@rule} -% \changes{v1.3}{2001/03/30}{New, third parameter ``boxwidth''} -% \changes{v2.0f}{2001/06/23}{Rule can be adjusted at inner margine, -% centered or adjusted at outer margine} -% \changes{v2.2}{2004/07/05}{Last parameter of the rule tells, if it is a -% headabove, headbelow, footabove or footbelow rule} -% \changes{v2.2}{2005/07/05}{Precommands before the rules are allowed} -% \changes{v2.2}{2005/07/05}{Macro is not longer long} -% \changes{v2.2b}{2005/08/31}{No even alignment at oneside} -% \begin{macrocode} -%<!v2>\newcommand\hf@rule[3]{% -%<v2>\newcommand*{\hf@rule}[4]{% +% \end{macro} +% \begin{macro}{\hf@rule} +% \changes{v1.3}{2001/03/30}{New, third parameter ``boxwidth''} +% \changes{v2.0f}{2001/06/23}{Rule can be adjusted at inner margine, +% centered or adjusted at outer margine} +% \changes{v2.2}{2004/07/05}{Last parameter of the rule tells, if it is a +% headabove, headbelow, footabove or footbelow rule} +% \changes{v2.2}{2005/07/05}{Precommands before the rules are allowed} +% \changes{v2.2}{2005/07/05}{Macro is not longer long} +% \changes{v2.2b}{2005/08/31}{No even alignment at oneside} +% \begin{macrocode} +\newcommand*{\hf@rule}[4]{% \setlength{\@tempdimb}{#1} -%<*v2> \begingroup \csname scr@pre@#4@line\endcsname \if@twoside @@ -1134,42 +709,40 @@ \edef\@tempa{\hfline@adjust}% \fi \ifnum\@tempa=1 -%</v2> \setlength{\@tempdimb}{.5\@tempdimb}% -%<v2> \fi + \fi \hb@xt@#3{% -%<v2> \ifnum\@tempa>0 + \ifnum\@tempa>0 \hfill% \llap{\vrule\@depth#2\@height\z@\@width\@tempdimb}% -%<v2> \fi -%<v2> \ifnum\@tempa<2 + \fi + \ifnum\@tempa<2 \rlap{\vrule\@depth#2\@height\z@\@width\@tempdimb}% \hfill% -%<v2> \fi + \fi }% -%<v2> \endgroup + \endgroup } % \end{macrocode} -% \begin{macro}{\scr@pre@headabove@line} -% \changes{v2.2}{2004/07/05}{New internal} -% \begin{macro}{\scr@fnt@headtopline} -% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} -% \begin{macro}{\scr@pre@headbelow@line} -% \changes{v2.2}{2004/07/05}{New internal} -% \begin{macro}{\scr@fnt@headsepline} -% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} -% \begin{macro}{\scr@pre@footabove@line} -% \changes{v2.2}{2004/07/05}{New internal} -% \begin{macro}{\scr@fnt@footsepline} -% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} -% \begin{macro}{\scr@pre@footbelow@line} -% \changes{v2.2}{2004/07/05}{New internal} -% \begin{macro}{\scr@fnt@footbottomrule} -% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} -% \begin{macro}{\scr@fnt@instead@footbotline} -% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} -% \begin{macrocode} -%<*v2> +% \begin{macro}{\scr@pre@headabove@line} +% \changes{v2.2}{2004/07/05}{New internal} +% \begin{macro}{\scr@fnt@headtopline} +% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} +% \begin{macro}{\scr@pre@headbelow@line} +% \changes{v2.2}{2004/07/05}{New internal} +% \begin{macro}{\scr@fnt@headsepline} +% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} +% \begin{macro}{\scr@pre@footabove@line} +% \changes{v2.2}{2004/07/05}{New internal} +% \begin{macro}{\scr@fnt@footsepline} +% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} +% \begin{macro}{\scr@pre@footbelow@line} +% \changes{v2.2}{2004/07/05}{New internal} +% \begin{macro}{\scr@fnt@footbottomrule} +% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} +% \begin{macro}{\scr@fnt@instead@footbotline} +% \changes{v2.2}{2004/07/05}{New KOMA-Script font command} +% \begin{macrocode} \newcommand*{\scr@pre@headabove@line}{} \newcommand*{\scr@fnt@headtopline}{\scr@pre@headabove@line} \newcommand*{\scr@pre@headbelow@line}{} @@ -1179,22 +752,22 @@ \newcommand*{\scr@pre@footbelow@line}{} \newcommand*{\scr@fnt@footbottomline}{\scr@pre@footbelow@line} \newcommand*{\scr@fnt@instead@footbotline}{footbottomline} -%</v2> -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % Using these definitions, we can define the testing macros. % -% \begin{macro}{\newpagestyle} +% \begin{macro}{\newpagestyle} % First the simple star/starless-selection: % \begin{macrocode} \def\newpagestyle{% @@ -1205,7 +778,7 @@ {\@newpagestyle[-]}% {\@newpagestyle[+]}} % \end{macrocode} -% \begin{macro}{\@newpagestyle} +% \begin{macro}{\@newpagestyle} % There we have to distinguish, whether the pagestyle is already % defined or not. % \begin{macrocode} @@ -1217,8 +790,7 @@ \@defpagestyle[#1]{#2}{#3}{#4}% \else \PackageError -%<v1> {scrpage}% -%<v2> {scrpage2}% + {scrpage2}% {Your command was ignored}% {There is already a pagestyle named ``#1''.\MessageBreak% Use \protect\defpagestyle\space, \protect\renewpagestyle or @@ -1226,10 +798,10 @@ \fi } % \end{macrocode} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} % -% \begin{macro}{\renewpagestyle} +% \begin{macro}{\renewpagestyle} % First the simple star/starless-selection: % \begin{macrocode} \def\renewpagestyle{% @@ -1240,9 +812,9 @@ {\@renewpagestyle[-]}% {\@renewpagestyle[+]}} % \end{macrocode} -% \begin{macro}{\@renewpagestyle} -% \changes{v1.2a}{1996/12/07}{Avoid to define pagestyle as \cs{relax} -% if it wasn't defined (Thanks to Bernd).} +% \begin{macro}{\@renewpagestyle} +% \changes{v1.2a}{1996/12/07}{Avoid to define pagestyle as \cs{relax} +% if it wasn't defined (Thanks to Bernd).} % There we have to distinguish, whether the pagestyle is already % defined or not. % \begin{macrocode} @@ -1250,8 +822,7 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ps@#2\endcsname\relax \PackageError -%<v1> {scrpage}% -%<v2> {scrpage2}% + {scrpage2}% {Your command was ignored}% {There is no pagestyle named ``#1''.\MessageBreak% Use \protect\defpagestyle, \protect\newpagestyle or @@ -1264,10 +835,10 @@ \fi } % \end{macrocode} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} % -% \begin{macro}{\providepagestyle} +% \begin{macro}{\providepagestyle} % First the simple star/starless-selection: % \begin{macrocode} \def\providepagestyle{% @@ -1278,7 +849,7 @@ {\@providepagestyle[-]}% {\@providepagestyle[+]}} % \end{macrocode} -% \begin{macro}{\@providepagestyle} +% \begin{macro}{\@providepagestyle} % There we have to distinguish, whether the pagestyle is already % defined or not. % \begin{macrocode} @@ -1290,21 +861,20 @@ \@defpagestyle[#1]{#2}{#3}{#4}% \else \PackageInfo -%<v1> {scrpage}% -%<v2> {scrpage2}% + {scrpage2}% {\protect\providepagestyle\protect{#1\protect} ignored.}% \fi } % \end{macrocode} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} % % % \subsection{User-Pagestyle-Definition-Interface} % The pagestyle-definition-interface for users is much easier than the % expert-version. Using the expert-macros, the definition is easy, too. % -% \begin{macro}{\deftripstyle} +% \begin{macro}{\deftripstyle} % \begin{macrocode} % \end{macrocode} % At version 1 we define the selection of star- or starless-version first: @@ -1314,18 +884,18 @@ {\@deftripstyle[-]}% {\@deftripstyle[+]}} % \end{macrocode} -% \end{macro} +% \end{macro} % Next we check, if there is an optional argument: -% \begin{macro}{\@deftripstyle} +% \begin{macro}{\@deftripstyle} % \begin{macrocode} \def\@deftripstyle[#1]#2{% \@ifnextchar[%] {\@@deftripstyle[#1]{#2}}% {\@@deftripstyle[#1]{#2}[\z@]}} % \end{macrocode} -% \end{macro} +% \end{macro} % or perhaps two optional arguments: -% \begin{macro}{\@@deftripstyle} +% \begin{macro}{\@@deftripstyle} % \begin{macrocode} \def\@@deftripstyle[#1]#2[#3]{% % \end{macrocode} @@ -1337,9 +907,9 @@ {\@@@deftripstyle#2[#3]}% {\@@@deftripstyle#2[\z@][#3]}} % \end{macrocode} -% \end{macro} +% \end{macro} % Now the main-definition: -% \begin{macro}{\@@@deftripstyle} +% \begin{macro}{\@@@deftripstyle} % \begin{macrocode} \def\@@@deftripstyle#1[#2][#3]#4#5#6#7#8#9{% \def\@tempb{+}% @@ -1370,32 +940,29 @@ \fi } % \end{macrocode} -% \end{macro} +% \end{macro} % % % \subsection{Automark or not} -% This is only valid at version 2. -% \begin{macrocode} -%<*v2> -% \end{macrocode} -% \begin{macro}{\automark} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0c}{2001/06/07}{Use of \cs{MakeMarkcase}} -% \changes{v2.0g}{2001/06/25}{Use of \cs{manualmark}} -% \changes{v2.0i}{2001/08/17}{Warning, if arguments are mixed up} -% \changes{v2.0i}{2001/08/17}{\cs{markboth} behavior fixed} -% \changes{v2.0i}{2001/08/17}{Use of \cs{if@autooneside}} -% \changes{v2.1a}{2002/10/30}{Switch on \cs{if@automark}} +% This is new since version 2. +% \begin{macro}{\automark} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0c}{2001/06/07}{Use of \cs{MakeMarkcase}} +% \changes{v2.0g}{2001/06/25}{Use of \cs{manualmark}} +% \changes{v2.0i}{2001/08/17}{Warning, if arguments are mixed up} +% \changes{v2.0i}{2001/08/17}{\cs{markboth} behavior fixed} +% \changes{v2.0i}{2001/08/17}{Use of \cs{if@autooneside}} +% \changes{v2.1a}{2002/10/30}{Switch on \cs{if@automark}} % This macro activates automatic mark. Is has two arguments. The % first, optional argument is the sectioning level name of the mark at % left pages, the second, not optional argument is the same at right % pages. At oneside mode all pages are right. -% \begin{macro}{\@iflevelok} -% \changes{v2.0i}{2001/08/17}{New} -% \begin{macro}{\markleft} -% \changes{v2.0i}{2001/08/17}{New} -% \begin{macro}{\@markleft} -% \changes{v2.0i}{2001/08/17}{New} +% \begin{macro}{\@iflevelok} +% \changes{v2.0i}{2001/08/17}{New} +% \begin{macro}{\markleft} +% \changes{v2.0i}{2001/08/17}{New} +% \begin{macro}{\@markleft} +% \changes{v2.0i}{2001/08/17}{New} % To define \cs{automark} we also need these three makros. The first % one decides, if level of second parameter is less than level of % first parameter and does then third or fourth parameter. @@ -1423,11 +990,11 @@ \providecommand{\@markleft}[3]{\@temptokena {#2}% \unrestored@protected@xdef\@themark{{#3}{\the\@temptokena}}} % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \changes{v2.2a}{2004/09/05}{all changes of helper macros and switches are -% local to fix e.g.\ twocolumn problem with \cs{part}} +% \end{macro} +% \end{macro} +% \end{macro} +% \changes{v2.2a}{2004/09/05}{all changes of helper macros and switches are +% local to fix e.g.\ twocolumn problem with \cs{part}} % \begin{macrocode} \newcommand*{\automark}[2][\@empty]{% \manualmark @@ -1510,12 +1077,12 @@ \let\@mkboth\markboth } % \end{macrocode} -% \end{macro} +% \end{macro} % -% \begin{macro}{\manualmark} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0g}{2001/06/25}{also deactivating \cs{...mark}} -% \changes{v2.1a}{2002/10/30}{Switch off \cs{if@automark}} +% \begin{macro}{\manualmark} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0g}{2001/06/25}{also deactivating \cs{...mark}} +% \changes{v2.1a}{2002/10/30}{Switch off \cs{if@automark}} % This macro switchs to the manual set of marks (using \cs{markboth} % and \cs{markright}. This is very simple, we only have to deaktivate % the mark macros. @@ -1531,23 +1098,23 @@ \@automarkfalse } % \end{macrocode} -% \end{macro} -% -% \begin{macro}{\partlevel} -% \changes{v2.2}{2004/07/05}{New} -% \changes{v2.4}{2009/11/11}{part level is always -1} -% \begin{macro}{\chapterlevel} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\sectionlevel} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\subsectionlevel} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\subsubsectionlevel} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\paragraphlevel} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\subparagraphlevel} -% \changes{v2.0}{2001/04/20}{New} +% \end{macro} +% +% \begin{macro}{\partlevel} +% \changes{v2.2}{2004/07/05}{New} +% \changes{v2.4}{2009/11/11}{part level is always -1} +% \begin{macro}{\chapterlevel} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\sectionlevel} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\subsectionlevel} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\subsubsectionlevel} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\paragraphlevel} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\subparagraphlevel} +% \changes{v2.0}{2001/04/20}{New} % At \cs{automark} we use some macros to get the numeric level of a % sectioning name. We simply define these: % \begin{macrocode} @@ -1559,16 +1126,16 @@ \newcommand*{\paragraphlevel}{4} \newcommand*{\subparagraphlevel}{5} % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % -% \begin{macro}{\MakeMarkcase} -% \changes{v2.0m}{2002/02/05}{Klasse \texttt{scrlttr2} ist bekannt} +% \begin{macro}{\MakeMarkcase} +% \changes{v2.0m}{2002/02/05}{\texttt{scrlttr2} is a known class} % At \cs{automark} we use a new macro to enable usability of % \cs{MakeUppercase} at the head-marks. We set this macro to % \cs{MakeUppercase} if one of the standard-classes was loaded: @@ -1588,12 +1155,11 @@ are lower case without use of scrpage2}}}}% \let\MakeMarkcase\MakeUppercase}}}}}{} % \end{macrocode} -% \end{macro} +% \end{macro} % -% \begin{macro}{\scrheadings@style} -% \changes{v2.0g}{2001/06/25}{New} -% \changes{v2.0m}{2002/02/05}{Klasse \texttt{scrlttr2} wird -% ber"ucksichtigt } +% \begin{macro}{\scrheadings@style} +% \changes{v2.0g}{2001/06/25}{New} +% \changes{v2.0m}{2002/02/05}{Take care of class \texttt{scrlttr2}} % This macro defines, which style for scrheadings should be used. If % it is not defined, we have to define it in a propper way. % \begin{macrocode} @@ -1604,35 +1170,31 @@ \@ifclassloaded{scrlttr2}{\def\scrheadings@style{koma}}{% \def\scrheadings@style{standard}}}}}}{} % \end{macrocode} -% \end{macro} -% -% \begin{macrocode} -%</v2> -% \end{macrocode} +% \end{macro} % % % \subsection{Width of head and foot} -% \begin{macro}{\setheadwidth} -% \changes{v1.3}{2001/03/30}{New} -% \begin{macro}{\setfootwidth} -% \changes{v1.3}{2001/03/30}{New} -% \begin{macro}{\set@hf@width} -% \changes{v1.3}{2001/03/30}{New} -% \changes{v1.3a}{2001/05/31}{symbolic values ``paper'', ``text'', -% ``textwidthmarginpar''} -% \changes{v2.0b}{2001/05/31}{symbolic values ``paper'', ``text'', -% ``textwidthmarginpar''} -% \changes{v2.0c}{2001/06/07}{error fix at warning} -% \begin{macro}{\settowidthof} -% \changes{v2.0e}{2001/06/22}{New} -% \begin{macro}{\deftowidthof} -% \changes{v2.0e}{2001/06/22}{New} -% \changes{v2.0f}{2001/06/23}{new symbolic values ``autohead'' and -% ``autofoot''} -% \changes{v2.0i}{2001/08/17}{new symbolic value ``page''} -% \changes{v2.0k}{2001/09/28}{\cs{pagewidth} korrigiert} -% \changes{v2.1b}{2003/05/31}{more save existance test} -% \changes{v2.2}{2004/07/05}{value ``foot'' fixed} +% \begin{macro}{\setheadwidth} +% \changes{v1.3}{2001/03/30}{New} +% \begin{macro}{\setfootwidth} +% \changes{v1.3}{2001/03/30}{New} +% \begin{macro}{\set@hf@width} +% \changes{v1.3}{2001/03/30}{New} +% \changes{v1.3a}{2001/05/31}{symbolic values ``paper'', ``text'', +% ``textwidthmarginpar''} +% \changes{v2.0b}{2001/05/31}{symbolic values ``paper'', ``text'', +% ``textwidthmarginpar''} +% \changes{v2.0c}{2001/06/07}{error fix at warning} +% \begin{macro}{\settowidthof} +% \changes{v2.0e}{2001/06/22}{New} +% \begin{macro}{\deftowidthof} +% \changes{v2.0e}{2001/06/22}{New} +% \changes{v2.0f}{2001/06/23}{new symbolic values ``autohead'' and +% ``autofoot''} +% \changes{v2.0i}{2001/08/17}{new symbolic value ``page''} +% \changes{v2.0k}{2001/09/28}{\cs{pagewidth} korrigiert} +% \changes{v2.1b}{2003/05/31}{more save existance test} +% \changes{v2.2}{2004/07/05}{value ``foot'' fixed} % Until version 1.3, head and foot of a page had same width like the % text block. Since version 1.3 this was changed. Now the head and % foot have their own width and an optional shift relative to the text @@ -1706,8 +1268,7 @@ \settowidthof{\@tempdima}{#3}% \ifdim\@tempdima>\paperwidth \PackageWarning -%<v1> {scrpage}% -%<v2> {scrpage2}% + {scrpage2}% {You've set width of #1 to a value\MessageBreak greater than width of page!\MessageBreak% I`ll reduce width of #1 to width of page}% @@ -1715,8 +1276,7 @@ \else \ifdim\@tempdima<\z@ \PackageWarning -%<v1> {scrpage}% -%<v2> {scrpage2}% + {scrpage2}% {You've set width of #1 to negative value!\MessageBreak% I'll set it to 0pt}% \setlength{\@tempdima}{\z@}% @@ -1750,26 +1310,26 @@ \fi } % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\@headwidth} -% \changes{v1.3}{2001/03/30}{New} -% \changes{v2.1}{2002/03/28}{use of option \texttt{mpinclude}} -% \begin{macro}{\@footwidth} -% \changes{v1.3}{2001/03/30}{New} -% \changes{v2.1}{2002/03/28}{use of option \texttt{mpinclude}} -% \begin{macro}{\@oddheadshift} -% \changes{v1.3}{2001/03/30}{New} -% \begin{macro}{\@evenheadshift} -% \changes{v1.3}{2001/03/30}{New} -% \begin{macro}{\@oddfootshift} -% \changes{v1.3}{2001/03/30}{New} -% \begin{macro}{\@evenfootshift} -% \changes{v1.3}{2001/03/30}{New} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\@headwidth} +% \changes{v1.3}{2001/03/30}{New} +% \changes{v2.1}{2002/03/28}{use of option \texttt{mpinclude}} +% \begin{macro}{\@footwidth} +% \changes{v1.3}{2001/03/30}{New} +% \changes{v2.1}{2002/03/28}{use of option \texttt{mpinclude}} +% \begin{macro}{\@oddheadshift} +% \changes{v1.3}{2001/03/30}{New} +% \begin{macro}{\@evenheadshift} +% \changes{v1.3}{2001/03/30}{New} +% \begin{macro}{\@oddfootshift} +% \changes{v1.3}{2001/03/30}{New} +% \begin{macro}{\@evenfootshift} +% \changes{v1.3}{2001/03/30}{New} % The values of width and shift of head and foot are saved at internal % macros. % \begin{macrocode} @@ -1783,7 +1343,6 @@ % If option \texttt{mpinclude} was used, we use a special trick to set % width of head and foot but only if the user doesn't: % \begin{macrocode} -%<*v2> \if@mincl \renewcommand*{\@headwidth}{}% \renewcommand*{\@footwidth}{}% @@ -1796,86 +1355,76 @@ \fi } \fi -%</v2> % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % % \subsection{Fonts} -% \begin{macro}{\pnumfont} +% \begin{macro}{\pnumfont} % We have to define a macro defining the font, used by |\pagemark|. Because % 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} % \end{macrocode} -% \end{macro} +% \end{macro} % -% \begin{macro}{\headfont} +% \begin{macro}{\headfont} % There is also a macro used by |\@evenhead|, |\@oddhead| and |\@evenfoot|, % |\@oddfoot|: % \begin{macrocode} -\providecommand*{\headfont}{\normalfont% -%<v2> \slshape% -} -%<*v2> +\providecommand*{\headfont}{\normalfont\slshape} \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} +% \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} +% \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} +% \end{macro} +% \end{macro} +% \end{macro} % % % \subsection{Length and thickness of lines at head and foot} -% \begin{macro}{\setheadtopline} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0d}{2001/06/19}{\texttt{headtop} changed into -% \texttt{headabove}} -% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''} -% \begin{macro}{\setheadsepline} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0d}{2001/06/19}{\texttt{headbot} changed into -% \texttt{headbelow}} -% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''} -% \begin{macro}{\setfootsepline} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0d}{2001/06/19}{\texttt{foottop} changed into -% \texttt{footabove}} -% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''} -% \begin{macro}{\setfootbotline} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0d}{2001/06/19}{\texttt{footbot} changed into -% \texttt{footbelow}} -% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''} -% \begin{macrocode} -%<*v2> -% \end{macrocode} -% Only at version 2 there are new macros to set the length and +% \begin{macro}{\setheadtopline} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0d}{2001/06/19}{\texttt{headtop} changed into +% \texttt{headabove}} +% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''} +% \begin{macro}{\setheadsepline} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0d}{2001/06/19}{\texttt{headbot} changed into +% \texttt{headbelow}} +% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''} +% \begin{macro}{\setfootsepline} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0d}{2001/06/19}{\texttt{foottop} changed into +% \texttt{footabove}} +% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''} +% \begin{macro}{\setfootbotline} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0d}{2001/06/19}{\texttt{footbot} changed into +% \texttt{footbelow}} +% \changes{v2.0f}{2001/06/23}{new symbolic value ``auto''} +% Since version 2 there are new macros to set the length and % thickness of the lines at head and foot. Wie use macros not % dimensions, because the amount of dimensions is very small at \TeX. % \begin{macrocode} @@ -1884,13 +1433,13 @@ \newcommand*{\setfootsepline}{\scr@setline{foot}{above}} \newcommand*{\setfootbotline}{\scr@setline{foot}{below}} % \end{macrocode} -% \begin{macro}{\scr@setline} -% \begin{macro}{\@scr@setline} -% \changes{v2.0d}{2001/06/19}{symbolic values implemented} -% \begin{macro}{\@@scr@setline} -% \changes{v2.0d}{2001/06/18}{macro name fixed} -% \begin{macro}{\@scr@set@pre@line} -% \changes{v2.2}{2004/07/05}{New internal} +% \begin{macro}{\scr@setline} +% \begin{macro}{\@scr@setline} +% \changes{v2.0d}{2001/06/19}{symbolic values implemented} +% \begin{macro}{\@@scr@setline} +% \changes{v2.0d}{2001/06/18}{macro name fixed} +% \begin{macro}{\@scr@set@pre@line} +% \changes{v2.2}{2004/07/05}{New internal} % The real change of the lines is done with the macros % \cs{scr@setline}, \cs{@scr@setline} and \cs{@@scr@setline}: % \begin{macrocode} @@ -1920,38 +1469,35 @@ \expandafter\def\csname scr@pre@#1@line\endcsname{#2}% } % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \begin{macrocode} -%</v2> -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % % \subsection{Extended multilanguage formats} -% \begin{macro}{\partmarkformat} -% \changes{v2.2}{2004/07/05}{New} -% \begin{macro}{\chaptermarkformat} -% \changes{v1.1}{1995/06/27}{Space after chapternumber increased.} -% \begin{macro}{\sectionmarkformat} -% \changes{v1.1}{1995/06/27}{Space after sectionnumber increased.} -% \begin{macro}{\subsectionmarkformat} -% \changes{v1.1}{1995/06/27}{Space after subsectionnumber increased.} -% \begin{macro}{\subsubsectionmarkformat} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\paragraphmarkformat} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\subparagraphmarkformat} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\@seccntmarkformat} -% \changes{v2.0}{2001/04/20}{New} -% \begin{macro}{\@seccntformat} -% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\partmarkformat} +% \changes{v2.2}{2004/07/05}{New} +% \begin{macro}{\chaptermarkformat} +% \changes{v1.1}{1995/06/27}{Space after chapternumber increased.} +% \begin{macro}{\sectionmarkformat} +% \changes{v1.1}{1995/06/27}{Space after sectionnumber increased.} +% \begin{macro}{\subsectionmarkformat} +% \changes{v1.1}{1995/06/27}{Space after subsectionnumber increased.} +% \begin{macro}{\subsubsectionmarkformat} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\paragraphmarkformat} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\subparagraphmarkformat} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\@seccntmarkformat} +% \changes{v2.0}{2001/04/20}{New} +% \begin{macro}{\@seccntformat} +% \changes{v2.0}{2001/04/20}{New} % There are some macros to handle languages like Chinese, Japanese or Korean. % These macros were defined first by Werner Lemberg at his CJK-bundle. See % |scrclass.dtx| for further information. @@ -1960,38 +1506,33 @@ \if@chapter \providecommand{\chaptermarkformat} {\@chapapp\ \thechapter. \ } \providecommand{\sectionmarkformat} {\thesection. \ } -%<v2> \providecommand{\subsectionmarkformat} {\@seccntmarkformat{subsection}} + \providecommand{\subsectionmarkformat} {\@seccntmarkformat{subsection}} \else \providecommand{\sectionmarkformat} {\thesection\quad} \providecommand{\subsectionmarkformat} {\thesubsection\quad} \fi -%<*v2> \providecommand{\subsubsectionmarkformat}{\@seccntmarkformat{subsubsection}} \providecommand{\paragraphmarkformat} {\@seccntmarkformat{paragraph}} \providecommand{\subparagraphmarkformat} {\@seccntmarkformat{subparagraph}} \providecommand{\@seccntmarkformat}[1] {\@seccntformat{#1}} -%</v2> % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % % \subsection{Definition of default pagestyles} % -% \begin{macrocode} -%<*v2> -% \end{macrocode} % \begin{macro}{\ps@save@plain} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0b}{2001/05/31}{use this instread of -% \cs{ps@standardplain}} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0b}{2001/05/31}{use this instead of +% \cs{ps@standardplain}} % We define two default pagestyles, which can be used instead of the % standard pagestyles. The two pagestyles are something like a % family. A pagestyle for \emph{normal} pages with head and foot and a @@ -2008,17 +1549,17 @@ \let\ps@plain\ps@use@plain % \end{macrocode} % \begin{macro}{\ps@save@headings} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0b}{2001/05/31}{use this instread of -% \cs{ps@standardheadings}} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0b}{2001/05/31}{use this instead of +% \cs{ps@standardheadings}} % \begin{macro}{\ps@save@myheadings} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0b}{2001/05/31}{use this instread of -% \cs{ps@standardmyheadings}} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0b}{2001/05/31}{use this instead of +% \cs{ps@standardmyheadings}} % \begin{macro}{\ps@headings} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\ps@myheadings} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % If standard pagestyle \texttt{headings} or \texttt{myheadings} is % used, also standard pagestyle \texttt{use@plain} should be % used. So we also define new names for the other old pagestyles and @@ -2090,34 +1631,34 @@ % % % \begin{macro}{\ps@scrplain} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0a}{2001/04/24}{\cs{strut} inserted} -% \changes{v2.0f}{2001/06/23}{\cs{strut} inserted} -% \changes{v2.1c}{2004/02/07}{thickness of footbelow line fixed} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0a}{2001/04/24}{\cs{strut} inserted} +% \changes{v2.0f}{2001/06/23}{\cs{strut} inserted} +% \changes{v2.1c}{2004/02/07}{thickness of footbelow line fixed} % \begin{macro}{\scrplain@even@left@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@even@middle@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@even@right@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@odd@left@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@odd@middle@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@odd@right@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@even@left@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@even@middle@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@even@right@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@odd@left@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@odd@middle@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrplain@odd@right@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % After this, we can define the new pagestyles, first a new plain % one. It sould be variable and so we use macros to define the parts. % \begin{macrocode} @@ -2211,34 +1752,33 @@ % \end{macro} % \end{macro} % \begin{macro}{\ps@scrheadings} -% \changes{v2.0}{2001/04/20}{New} -% \changes{v2.0a}{2001/04/24}{\cs{strut} inserted} -% \changes{v2.0f}{2001/06/23}{\cs{strut} inserted} +% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0a}{2001/04/24}{\cs{strut} inserted} +% \changes{v2.0f}{2001/06/23}{\cs{strut} inserted} % \begin{macro}{\scrheadings@even@left@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@even@middle@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@even@right@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@odd@left@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@odd@middle@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@odd@right@head} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@even@left@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@even@middle@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@even@right@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@odd@left@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@odd@middle@foot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\scrheadings@odd@right@foot} -% \changes{v2.0}{2001/04/20}{New} -% +% \changes{v2.0}{2001/04/20}{New} % We also define define a new headings one. It sould be variable and % so we use macros to define the parts. But we need an \emph{also % action}, so we first define a inner pagestyle and then use this at a @@ -2333,41 +1873,41 @@ % % % \begin{macro}{\ihead} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\ohead} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\chead} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\lehead} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\lohead} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\rehead} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\rohead} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\cehead} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\cohead} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\ifoot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\ofoot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\cfoot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\lefoot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\lofoot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\refoot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\rofoot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\cefoot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % \begin{macro}{\cofoot} -% \changes{v2.0}{2001/04/20}{New} +% \changes{v2.0}{2001/04/20}{New} % We also need macros to define the contents of the three part head % and foot. Each macro defines one of the part of head or foot of the % scrheadings pagestyle and optional of the scrplain pagestyle. @@ -2471,11 +2011,11 @@ % \end{macro} % % \begin{macro}{\clearscrheadings} -% \changes{v2.0j}{2001/08/18}{New} +% \changes{v2.0j}{2001/08/18}{New} % \begin{macro}{\clearscrheadfoot} -% \changes{v2.0j}{2001/08/18}{New} +% \changes{v2.0j}{2001/08/18}{New} % \begin{macro}{\clearscrpain} -% \changes{v2.0j}{2001/08/18}{New} +% \changes{v2.0j}{2001/08/18}{New} % Maybe you want to clear the currently defined head and foot. First % let's clear only scrheadings pagestyle but not scrplain pagestyle. % We do this simply using the already known command: @@ -2513,15 +2053,16 @@ % % % Let's do the default setting: -% \changes{v2.0m}{2002/02/05}{Neue Briefklasse \texttt{scrlttr2} -% wird aktiv unterst"utzt} +% \changes{v2.0m}{2002/02/05}{Active support for new letter class +% \texttt{scrlttr2}} +% \changes{v3.12}{2013/12/14}{fix \cs{rohead} if page number left at head} % \begin{macrocode} \def\@tempa{koma}\ifx\scrheadings@style\@tempa \@ifclassloaded{scrlttr2}{% \ifcase\@pageat \lehead[\pagemark]{\pagemark}\lohead[\pagemark]{\pagemark}% \chead{\rightmark}% - \rehead{\leftmark}\lohead{\leftmark}% + \rehead{\leftmark}\rohead{\leftmark}% \or \lehead{\leftmark}\lohead{\leftmark}% \chead[\pagemark]{\pagemark}% @@ -2568,18 +2109,30 @@ \begingroup\expandafter\expandafter\expandafter\endgroup\expandafter \ifx\csname sectionmark\endcsname\relax \ifx\@mkboth\markboth\@automarktrue\fi - \else - \ifx\sectionmark\@gobble\else\@automarktrue\fi + \else +% \end{macrocode} +% \changes{v2.5a}{2012/11/02}{\cs{@gobble} is long, but \cs{sectionmark} and +% \cs{chaptermark} may be short} +% \begin{macrocode} + \ifx\sectionmark\@gobble\else + \begingroup + \def\@gobble#1{}\ifx\sectionmark\@gobble\else + \aftergroup\@automarktrue + \fi + \endgroup + \fi \fi \else - \ifx\chaptermark\@gobble\else\@automarktrue\fi + \ifx\chaptermark\@gobble\else + \begingroup + \def\@gobble#1{}\ifx\chaptermark\@gobble\else + \aftergroup\@automarktrue + \fi + \endgroup + \fi \fi % \end{macrocode} % -% \begin{macrocode} -%</v2> -% \end{macrocode} -% % % \subsection{Configurationfile} % Not last and not least we include the local configuration-file @@ -2599,7 +2152,6 @@ % the moment. And the one is a check, if the \cs{headheight} should be % increased. % \begin{macrocode} -%<*v2> \AtBeginDocument{% \ifdim\headheight=12pt \PackageWarningNoLine{scrpage2}% @@ -2622,7 +2174,6 @@ into the preamble of your document.\MessageBreak A better solution would be to use typearea package}% \fi\fi} -%</v2> % \end{macrocode} % % \subsection{End} |