diff options
author | Karl Berry <karl@freefriends.org> | 2015-04-24 23:19:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-04-24 23:19:31 +0000 |
commit | 0a00b3b492fd27dc12cddae602b2c43206a17d74 (patch) | |
tree | 40a09bf2208cc13bcd727626e1ee058e2caa68b1 /Master/texmf-dist/tex/latex/koma-script/scrlayer.sty | |
parent | 77b150bbd42aa48ba71627e09763785b26adfcfd (diff) |
koma-script (24apr15)
git-svn-id: svn://tug.org/texlive/trunk@37036 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrlayer.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrlayer.sty | 54 |
1 files changed, 47 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 34ba0cffb1b..58118f0cb1a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,13 +43,13 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (identify) +%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2015/02/07 v3.16 KOMA-Script + 2015/04/23 v3.17 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (init) \RequirePackage{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -113,7 +113,7 @@ \setlength{\footheight}{\baselineskip} \fi } -%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -143,8 +143,21 @@ \aftergroup\FamilyKeyStateUnknownValue \fi \endgroup + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@removekey{.scrlayer.sty}{markcase}% + \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}% + \fi } -\providecommand*{\MakeMarkcase}[1]{#1} +\@ifundefined{MakeMarkcase}{\let\MakeMarkcase\@firstofone}{} +\ifx\MakeMarkcase\@firstofone + \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{used}% +\else\ifx\MakeMarkcase\MakeUppercase + \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{upper}% + \else\ifx\MakeMarkcase\MakeLowercase + \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{lower}% + \else\ifx\MakeMarkcase\scr@ignoreuppercase + \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{ignoreuppercase}% +\fi\fi\fi\fi \DeclareRobustCommand*{\scrlayer@ignoreuppercase}[1]{% \begingroup \let\uppercase\@firstofone @@ -155,6 +168,7 @@ } \newif\ifscrlayer@forceignoreuppercase \KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue +\KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside} \KOMA@key{automark}[]{% \scrlayer@testunexpectedarg{automark}{#1}% \scrlayer@AtEndOfPackage{% @@ -165,67 +179,93 @@ \fi }% \FamilyKeyStateProcessed + \KOMA@kav@removekey{.scrlayer.sty}{automark}% + \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% + \KOMA@kav@add{.scrlayer.sty}{automark}{}% } \KOMA@key{manualmark}[]{% \scrlayer@testunexpectedarg{manualmark}{#1}% \scrlayer@AtEndOfPackage{\manualmark}% \FamilyKeyStateProcessed + \KOMA@kav@removekey{.scrlayer.sty}{automark}% + \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% + \KOMA@kav@add{.scrlayer.sty}{manualmark}{}% } \KOMA@key{onpsselect}{% \l@addto@macro{\@ps@initialhook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}% } \newcommand*{\@ps@initialhook}{} +\KOMA@kav@add{.scrlayer.sty}{onpsselect}{} \KOMA@key{onpsinit}{% \l@addto@macro{\@ps@hook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}% } \newcommand*{\@ps@hook}{} +\KOMA@kav@add{.scrlayer.sty}{onpsinit}{} \KOMA@key{onpsoneside}{% \l@addto@macro{\@ps@onesidehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}% } \newcommand*{\@ps@onesidehook}{} +\KOMA@kav@add{.scrlayer.sty}{onpsoneside}{} \KOMA@key{onpstwoside}{% \l@addto@macro{\@ps@twosidehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}% } \newcommand*{\@ps@twosidehook}{} +\KOMA@kav@add{.scrlayer.sty}{onpstwoside}{} \KOMA@key{onpsoddpage}{% \l@addto@macro{\@ps@oddpagehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}% } \newcommand*{\@ps@oddpagehook}{} +\KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{} \KOMA@key{onpsevenpage}{% \l@addto@macro{\@ps@evenpagehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}% } \newcommand*{\@ps@evenpagehook}{} +\KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{} \KOMA@key{onpsfloatpage}{% \l@addto@macro{\@ps@floatpagehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}% } \newcommand*{\@ps@floatpagehook}{} +\KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{} \KOMA@key{onpsnonfloatpage}{% \l@addto@macro{\@ps@nonfloatpagehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}% } \newcommand*{\@ps@nonfloatpagehook}{} +\KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{} \KOMA@key{onpsbackground}{% \l@addto@macro{\@ps@backgroundhook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}% } \newcommand*{\@ps@backgroundhook}{} +\KOMA@kav@add{.scrlayer.sty}{onpsbackground}{} \KOMA@key{onpsforeground}{% \l@addto@macro{\@ps@foregroundhook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}% } \newcommand*{\@ps@foregroundhook}{} +\KOMA@kav@add{.scrlayer.sty}{onpsforeground}{} \KOMA@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers} \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} \newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty} @@ -1978,7 +2018,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (final) +%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ |