diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrpage2.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrpage2.sty | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index b3216cfe07e..710d4a9daa0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty @@ -1,14 +1,13 @@ %% %% This is file `scrpage2.sty', -%% generated with the docstrip utility. +%% generated with the docstrip utility, extended by scrdocstrip. %% %% The original source files were: %% %% scrpage.dtx (with options: `scrpage,v2') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2012 -%% Markus Kohm and any individual authors listed elsewhere in this file. +%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -40,11 +39,11 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: scrpage.dtx +%%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] -\ProvidesPackage{scrpage2} - [2010/04/22 v2.5 LaTeX2e KOMA-Script - package] +\ProvidesPackage{scrpage2}[% + 2013/12/19 v3.12 KOMA-Script + package (page head and foot)] \newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{% \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}% \ifin@ @@ -145,8 +144,7 @@ \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\relax}{}} \DeclareOption{standardstyle}{\def\scrheadings@style{standard} \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\MakeUppercase}{}} -\ExecuteOptions{% -} +\ExecuteOptions{} \ProcessOptions\relax \newif\if@chapter \begingroup\expandafter\expandafter\expandafter\endgroup @@ -186,7 +184,6 @@ \def@foot#4 }% } - \def\def@head{% \@ifnextchar(%) {\def@@head}% @@ -256,14 +253,12 @@ \newcommand\topfoot@rule[2]{% \@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip \advance\@tempdima by -#2 - \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}% - {footabove}% + \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}{footabove}% \vskip-\@tempdima} \newcommand\botfoot@rule[2]{% \@tempdima-\baselineskip\advance\@tempdima by .3\normalbaselineskip \advance\@tempdima by #2 - \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}% - {footbelow}% + \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}{footbelow}% } \newcommand*{\hf@rule}[4]{% \setlength{\@tempdimb}{#1} @@ -649,9 +644,7 @@ } \fi \providecommand*{\pnumfont}{\normalfont} -\providecommand*{\headfont}{\normalfont% - \slshape% -} +\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% @@ -988,7 +981,7 @@ \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}% @@ -1036,10 +1029,22 @@ \ifx\csname sectionmark\endcsname\relax \ifx\@mkboth\markboth\@automarktrue\fi \else - \ifx\sectionmark\@gobble\else\@automarktrue\fi + \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 \InputIfFileExists{scrpage.cfg} {\typeout{*************************************^^J% @@ -1068,7 +1073,7 @@ into the preamble of your document.\MessageBreak A better solution would be to use typearea package}% \fi\fi} -%%% From File: scrlogo.dtx +%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} |