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/source/latex/koma-script/scrlayer.dtx | |
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/source/latex/koma-script/scrlayer.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrlayer.dtx | 269 |
1 files changed, 193 insertions, 76 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx index 5dc549a871e..a2884484eb4 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx @@ -1,4 +1,4 @@ -% \CheckSum{3474} +% \CheckSum{3683} % \iffalse^^A meta-comment % ====================================================================== % scrlayer.dtx @@ -57,18 +57,18 @@ % Right brace \} Tilde \~} % % \iffalse^^A meta-comment -%<identify>%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (identify) -%<init>%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (init) -%<options>%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (options) -%<body>%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (body) -%<final>%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (final) +%<identify>%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (identify) +%<init>%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (init) +%<options>%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (options) +%<body>%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (body) +%<final>%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (final) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-01-26 21:11:06 +0100 (Mon, 26 Jan 2015) $ + \filedate$Date: 2015-02-26 09:34:33 +0100 (Thu, 26 Feb 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 1912 $ + \filerevision$Revision: 1962 $ \endgroup \ProvidesFile{scrlayer.dtx}[\filedate\space\filerevision\space %</dtx> @@ -376,16 +376,33 @@ \aftergroup\FamilyKeyStateUnknownValue \fi \endgroup + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@removekey{.scrlayer.sty}{markcase}% + \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}% + \fi %<interface&scrpage>}% } -%<interface>\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @markcase} +%</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax +%</interface&body> % \end{macrocode} % \begin{macro}{\MakeMarkcase} % We use this instead of, e.g., \Macro{MakeUppercase} for every layer! So the % name seams to be wrong, but it is common, so we use it here. % \begin{macrocode} -%<*package> -\providecommand*{\MakeMarkcase}[1]{#1} +%<*package&options> +\@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 % \end{macrocode} % \begin{macro}{\scrlayer@ignoreuppercase} % We span a group and set \Macro{uppercase} and \Macro{MakeUppercase} to @@ -406,8 +423,7 @@ % \begin{macro}{\ifscrlayer@forceignoreuppercase} % \begin{macrocode} \newif\ifscrlayer@forceignoreuppercase -%</package> -%</options> +%</package&options> % \end{macrocode} % \end{macro}^^A \ifscrlayer@forceignoreuppercase % \end{macro}^^A \scrlayer@ignoreuppercase @@ -634,9 +650,21 @@ % single-side layout. % \begin{macrocode} %<*options> +%<*package> \KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue -%<interface>\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autooneside} +\KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside} +%</package> +%<*interface> +\KOMA@key{autooneside}[true]{% + \KOMA@set@ifkey{autooneside}{scrlayer@autooneside}{#1}% + \KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside}% +} +%</interface> %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @autooneside\endcsname\relax +%</interface&body> % \end{macrocode} % \end{macro}^^A \ifscrlayer@autooneside % \end{option}^^A autooneside @@ -663,21 +691,31 @@ \fi }% \FamilyKeyStateProcessed + \KOMA@kav@removekey{.scrlayer.sty}{automark}% + \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% + \KOMA@kav@add{.scrlayer.sty}{automark}{}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @automark} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @automark@default} -%</interface> +%</options> +%<*interface&body> +\expandafter\let\csname KV@KOMA.\@currname.\@currext @automark\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @automark@default\endcsname\relax +%</interface&body> +%<*options> \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}{}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @manualmark} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @manualmark@default} -%</interface> %</options> +%<*interface&body> +\expandafter\let\csname KV@KOMA.\@currname.\@currext @manualmark\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @manualmark@default\endcsname\relax +%</interface&body> % \end{macrocode} % \end{option}^^A manualmark % \end{option}^^A automark @@ -2004,13 +2042,17 @@ \KOMA@key{onpsselect}{% \l@addto@macro{\@ps@initialhook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsselect} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsselect@default} -%</interface> %<package>\newcommand*{\@ps@initialhook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpsselect}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsselect\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsselect@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onselect}{% \expandafter\l@addto@macro @@ -2035,13 +2077,17 @@ \KOMA@key{onpsinit}{% \l@addto@macro{\@ps@hook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsinit} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsinit@default} -%</interface> %<package>\newcommand*{\@ps@hook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpsinit}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsinit\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsinit@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{oninit}{% \expandafter\l@addto@macro @@ -2067,13 +2113,17 @@ \KOMA@key{onpsoneside}{% \l@addto@macro{\@ps@onesidehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoneside} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoneside@default} -%</interface> %<package>\newcommand*{\@ps@onesidehook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpsoneside}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsoneside\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsoneside@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{ononeside}{% \expandafter\l@addto@macro @@ -2099,13 +2149,17 @@ \KOMA@key{onpstwoside}{% \l@addto@macro{\@ps@twosidehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpstwoside} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpstwoside@default} -%</interface> %<package>\newcommand*{\@ps@twosidehook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpstwoside}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpstwoside\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpstwoside@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{ontwoside}{% \expandafter\l@addto@macro @@ -2131,13 +2185,17 @@ \KOMA@key{onpsoddpage}{% \l@addto@macro{\@ps@oddpagehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoddpage} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoddpage@default} -%</interface> %<package>\newcommand*{\@ps@oddpagehook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsoddpage\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsoddpage@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onoddpage}{% \expandafter\l@addto@macro @@ -2163,13 +2221,17 @@ \KOMA@key{onpsevenpage}{% \l@addto@macro{\@ps@evenpagehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsevenpage} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsevenpage@default} -%</interface> %<package>\newcommand*{\@ps@evenpagehook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsevenpage\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsevenpage@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onevenpage}{% \expandafter\l@addto@macro @@ -2193,13 +2255,17 @@ \KOMA@key{onpsfloatpage}{% \l@addto@macro{\@ps@floatpagehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsfloatpage} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsfloatpage@default} -%</interface> %<package>\newcommand*{\@ps@floatpagehook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsfloatpage\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsfloatpage@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onfloatpage}{% \expandafter\l@addto@macro @@ -2223,14 +2289,17 @@ \KOMA@key{onpsnonfloatpage}{% \l@addto@macro{\@ps@nonfloatpagehook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsnonfloatpage} -\scrlayer@AddCsToInterface{% - KV@KOMA.\@currname.\@currext @onpsnonfloatpage@default} -%</interface> %<package>\newcommand*{\@ps@nonfloatpagehook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onnonfloatpage}{% \expandafter\l@addto@macro @@ -2256,14 +2325,17 @@ \KOMA@key{onpsbackground}{% \l@addto@macro{\@ps@backgroundhook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsbackground} -\scrlayer@AddCsToInterface{% - KV@KOMA.\@currname.\@currext @onpsbackground@default} -%</interface> %<package>\newcommand*{\@ps@backgroundhook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpsbackground}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsbackground\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsbackground@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onbackground}{% \expandafter\l@addto@macro @@ -2289,14 +2361,17 @@ \KOMA@key{onpsforeground}{% \l@addto@macro{\@ps@foregroundhook}{#1}% \FamilyKeyStateProcessed + \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}% } -%<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsforeground} -\scrlayer@AddCsToInterface{% - KV@KOMA.\@currname.\@currext @onpsforeground@default} -%</interface> %<package>\newcommand*{\@ps@foregroundhook}{} +%<package>\KOMA@kav@add{.scrlayer.sty}{onpsforeground}{} %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsforeground\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @onpsforeground@default\endcsname\relax +%</interface&body> %<*package&body> \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onforeground}{% \expandafter\l@addto@macro @@ -2519,14 +2594,25 @@ % option too. % \begin{macrocode} %<*options> +%<*package> \KOMA@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers} +%</package> %<*interface> -\scrlayer@AddCsToInterface{% - KV@KOMA.\@currname.\@currext @deactivatepagestylelayers} -\scrlayer@AddCsToInterface{% - KV@KOMA.\@currname.\@currext @deactivatepagestylelayers@default} +\KOMA@key{deactivatepagestylelayers}[true]{% + \KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}% + \KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers} + {scrlayer@deactivate@layers}% +} %</interface> %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers\endcsname + \relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers@default\endcsname + \relax +%</interface&body> % \end{macrocode} % \end{macro}^^A \ifscrlayer@deactivate@layers % \end{option}^^A deactivatepagestylelayers @@ -2659,12 +2745,22 @@ % contents and one time with contents \Macro{layercontentsmeasure}. % \begin{macrocode} %<*options> +%<*package> \KOMA@ifkey{draft}{scrlayer@draft} +%</package> %<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @draft} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @draft@default} +\KOMA@key{draft}[true]{% + \KOMA@set@ifkey{draft}{scrlayer@draft}{#1}% + \KOMA@kav@replacebool{.scrlayer.sty}{draft}{scrlayer@draft}% +} %</interface> %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @draft\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @draft@default\endcsname\relax +%</interface&body> % \end{macrocode} % \end{macro}^^A \ifscrlayer@draft % \end{option}^^A draft @@ -3615,12 +3711,22 @@ % \end{description} % \begin{macrocode} %<*options> +%<*package> \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} +%</package> %<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @forceoverwrite} -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @forceoverwrite@default} +\KOMA@key{forceoverwrite}[true]{% + \KOMA@set@ifkey{forceoverwrite}{scrlayer@forceoverwrite}{#1}% + \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}% +} %</interface> %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @forceoverwrite\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @forceoverwrite@default\endcsname\relax +%</interface&body> % \end{macrocode} % \end{macro}^^A \ifscrlayer@forceoverwrite % \end{option}^^A forceoverwrite @@ -3633,13 +3739,24 @@ % \end{description} % \begin{macrocode} %<*options> +%<*package> \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} +%</package> %<*interface> -\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoremoveinterfaces} -\scrlayer@AddCsToInterface{% - KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default} +\KOMA@key{autoremoveinterfaces}[true]{% + \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}% + \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} + {scrlayer@autoremoveinterfaces}% +} %</interface> %</options> +%<*interface&body> +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces\endcsname\relax +\expandafter\let + \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname + \relax +%</interface&body> % \end{macrocode} % \end{macro}^^A \ifscrlayer@autoremoveinterfaces % \end{option}^^A autoremoveinterfaces |