diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-29 22:32:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-29 22:32:58 +0000 |
commit | e02235dda0e68d2131b9cf111af5448fa125ad58 (patch) | |
tree | 37ea12425820b8b346764911b170eefcc0a68b44 /Master/texmf-dist/source/latex/koma-script/scrlayer.dtx | |
parent | 687ffbc778abf7b367ab1c6ed91c016e8138c2ad (diff) |
koma-script (29jan17)
git-svn-id: svn://tug.org/texlive/trunk@43084 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 | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx index d91b561ac72..a86027ff43d 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{3896} +% \CheckSum{3902} % \iffalse^^A meta-comment % ====================================================================== % scrlayer.dtx @@ -57,18 +57,18 @@ % Right brace \} Tilde \~} % % \iffalse^^A meta-comment -%<identify>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify) -%<init>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init) -%<options>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options) -%<body>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (body) -%<final>%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (final) +%<identify>%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (identify) +%<init>%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init) +%<options>%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options) +%<body>%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (body) +%<final>%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z 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: 2016-04-12 14:10:19 +0200 (Tue, 12 Apr 2016) $ + \filedate$Date: 2016-12-07 10:15:31 +0100 (Wed, 07 Dec 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 2429 $ + \filerevision$Revision: 2562 $ \endgroup \ProvidesFile{scrlayer.dtx}[\filedate\space\filerevision\space %</dtx> @@ -676,18 +676,33 @@ % same they do at \Package{scrpage2}. The difference is, that single-side or % two-side doesn't matter here (but it does inside of the definitions of the % marks itself). +% % ToDo: Maybe \Option{manualmark} should become deprecated and % \Option{automark} should have simple values or a new option, that also % handles \Option{autooneside}? +% \changes{v3.22}{2016/12/07}{prepared for classes without \cs{section} or +% \cs{subsection}}^^A % \begin{macrocode} %<*options> \KOMA@key{automark}[]{% \scrlayer@testunexpectedarg{automark}{#1}% \scrlayer@AtEndOfPackage{% \if@chapter - \automark[section]{chapter}% + \scr@ifundefinedorrelax{section}{% + \automark{chapter}% + }{% + \automark[section]{chapter}% + }% \else - \automark[subsection]{section}% + \scr@ifundefinedorrelax{section}{% + \automark{}% + }{% + \scr@ifundefinedorrelax{subsection}{% + \automark{section}% + }{% + \automark[subsection]{section}% + } + }% \fi }% \FamilyKeyStateProcessed @@ -1323,13 +1338,13 @@ % \end{macrocode} % \item[\Option{everypage}:] remove all odd-, even-, float-, and % nonfloat-restrictions. -% \changes{v3.18}{2015/05/14}{new layer feature \texttt{everypage}} +% \changes{v3.18}{2015/05/14}{new layer feature \texttt{everypage}}^^A +% \changes{v3.22}{2016/09/24}{foreground and background condition +% removed}^^A % \begin{macrocode} \DefineFamilyKey[.definelayer]{KOMAarg}{everypage}[\relax]{% \FamilyKeyStateProcessed \scrlayer@testunexpectedarg{everypage}{#1}% - \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname - \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname \csname @scr@l@\scr@current@layer @oddtrue\endcsname \csname @scr@l@\scr@current@layer @eventrue\endcsname \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname @@ -1367,14 +1382,19 @@ } % \end{macrocode} % \item[\Option{unrestricted}:] remove all restrictions -% \changes{v3.18}{2015/05/14}{new layer feature \texttt{unrestricted}} +% \changes{v3.18}{2015/05/14}{new layer feature \texttt{unrestricted}}^^A +% \changes{v3.22}{2016/09/24}{missing background and foreground +% condition}^^A +% \changes{v3.22}{2016/09/24}{nonfloatpage condition fixed}^^A % \begin{macrocode} \DefineFamilyKey[.definelayer]{KOMAarg}{unrestricted}[\relax]{% \FamilyKeyStateProcessed \scrlayer@testunexpectedarg{unrestricted}{#1}% \csname @scr@l@\scr@current@layer @oddtrue\endcsname \csname @scr@l@\scr@current@layer @eventrue\endcsname - \csname @scr@l@\scr@current@layer @nonfloatpagefalse\endcsname + \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname + \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname + \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname \csname @scr@l@\scr@current@layer @floatpagetrue\endcsname \csname @scr@l@\scr@current@layer @twosidetrue\endcsname \csname @scr@l@\scr@current@layer @onesidetrue\endcsname |