diff options
author | Karl Berry <karl@freefriends.org> | 2014-12-06 23:18:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-12-06 23:18:10 +0000 |
commit | 4832d732052d6e2b43b5e3ff45aa31bfbc0cbdc2 (patch) | |
tree | 968a3b4cdf4631c0272fc725330ea28a554c8471 /Master/texmf-dist/tex/latex/koma-script/scrlayer.sty | |
parent | 59d9a998c6236de39603cb2ea077c5371e06b842 (diff) |
koma-script (6dec14)
git-svn-id: svn://tug.org/texlive/trunk@35754 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 | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index a11742cf8b2..3867be8f5d3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -11,7 +11,7 @@ %% scrlayer.dtx (with options: `package,trace,scrlayer,final') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 2012-2013 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2012-2014 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -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 1480 2013-10-31 10:00:02Z mjk $ (identify) +%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 31/10/2013 v0.9.1480 + 2014/10/28 v3.14 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (init) +%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z 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 1480 2013-10-31 10:00:02Z mjk $ (options) +%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -225,7 +225,7 @@ \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (body) +%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (body) \KOMAProcessOptions\relax \@ifundefined{headmark}{}{% \PackageWarningNoLine{scrlayer}{% @@ -558,7 +558,7 @@ \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayer]{KOMAarg}{contents}{% - \@namedef{scr@l@\scr@current@layer @contents}{#1}% + \long\@namedef{scr@l@\scr@current@layer @contents}{#1}% \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayer]{KOMAarg}{background}[\relax]{% @@ -797,7 +797,7 @@ \expandafter\let\csname if@scr@l@#1@#3\expandafter\endcsname \csname if@scr@l@#2@#3\expandafter\endcsname } -\newcommand*{\DeclareLayer}[2][]{% +\newcommand{\DeclareLayer}[2][]{% \def\scr@current@layer{#2}% \@namedef{scr@l@#2@x}{\z@}% \@namedef{scr@l@#2@y}{\z@}% @@ -822,6 +822,7 @@ \expandafter\newif\csname if@scr@l@#2@nonfloatpage\endcsname \csname @scr@l@#2@nonfloatpagetrue\endcsname \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% + \let\scr@current@layer\@empty } \newcommand*{\scr@current@layer}{} \newcommand*{\IfLayerExists}[1]{% @@ -831,7 +832,7 @@ \expandafter\@firstoftwo }% } -\newcommand*{\DeclareNewLayer}[2][]{% +\newcommand{\DeclareNewLayer}[2][]{% \IfLayerExists{#2}{% \PackageError{scrlayer}{layer `#2' already defined}{% You may declare only layer, that haven't been declared previously @@ -842,13 +843,13 @@ If you'll continue, declaration will be ignored.}% }{\DeclareLayer[{#1}]{#2}}% } -\newcommand*{\ProvideLayer}[2][]{% +\newcommand{\ProvideLayer}[2][]{% \IfLayerExists{#2}{% \PackageInfo{scrlayer}{\string\ProvideLayer{#2} ignored,\MessageBreak because of already defined layer}% }{\DeclareNewLayer[{#1}]{#2}}% } -\newcommand*{\RedeclareLayer}[2][]{% +\newcommand{\RedeclareLayer}[2][]{% \IfLayerExists{#2}{}{% \PackageError{scrlayer}{layer `#2' not yet defined}{% You may declare only already declared layers using @@ -859,9 +860,11 @@ }% \DeclareLayer[{#1}]{#2}% } -\newcommand*{\ModifyLayer}[2][]{% +\newcommand{\ModifyLayer}[2][]{% \IfLayerExists{#2}{% + \def\scr@current@layer{#2}% \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% + \let\scr@current@layer\@empty }{% \PackageError{scrlayer}{layer `#2' not yet defined}{% You may modify only already declared layers using @@ -1400,7 +1403,7 @@ \newcommand*{\remove@layer@from@page@style}[2]{% \begingroup \expandafter\let\expandafter\reserved@a\csname @ps@#2@layers\endcsname - \@namedef{@ps@#2@layers}{}% + \expandafter\global\expandafter\let\csname @ps@#2@layers\endcsname\@empty \def\@elt##1{% \ifstr{#1}{##1}{}{% \expandafter\@cons\csname @ps@#2@layers\endcsname{{##1}}% @@ -1919,7 +1922,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (final) +%%% From File: $Id: scrlayer.dtx 1810 2014-10-20 07:35:25Z kohm $ (final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ |