summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-24 23:19:31 +0000
committerKarl Berry <karl@freefriends.org>2015-04-24 23:19:31 +0000
commit0a00b3b492fd27dc12cddae602b2c43206a17d74 (patch)
tree40a09bf2208cc13bcd727626e1ee058e2caa68b1 /Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
parent77b150bbd42aa48ba71627e09763785b26adfcfd (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-notecolumn.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty162
1 files changed, 114 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
index c6b1a2365d4..bae97046942 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -52,7 +52,7 @@
2014/06/03 v0.1.1760 KOMA-Script
package
(end user interface for scrlayer)]
-%%% 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{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -83,7 +83,7 @@
}%
\batchmode\csname @@end\endcsname\end
\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}{%
@@ -113,10 +113,15 @@
\aftergroup\FamilyKeyStateUnknownValue
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer.sty}{markcase}%
+ \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}%
+ \fi
+}
+\KOMA@key{autooneside}[true]{%
+ \KOMA@set@ifkey{autooneside}{scrlayer@autooneside}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @markcase}
-\KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autooneside}
\KOMA@key{automark}[]{%
\scrlayer@testunexpectedarg{automark}{#1}%
\scrlayer@AtEndOfPackage{%
@@ -127,100 +132,161 @@
\fi
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer.sty}{automark}%
+ \KOMA@kav@removekey{.scrlayer.sty}{manualmark}%
+ \KOMA@kav@add{.scrlayer.sty}{automark}{}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @automark}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @automark@default}
\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}{}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @manualmark}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @manualmark@default}
\KOMA@key{onpsselect}{%
\l@addto@macro{\@ps@initialhook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsselect}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsselect@default}
\KOMA@key{onpsinit}{%
\l@addto@macro{\@ps@hook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsinit}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsinit@default}
\KOMA@key{onpsoneside}{%
\l@addto@macro{\@ps@onesidehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoneside}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoneside@default}
\KOMA@key{onpstwoside}{%
\l@addto@macro{\@ps@twosidehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpstwoside}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpstwoside@default}
\KOMA@key{onpsoddpage}{%
\l@addto@macro{\@ps@oddpagehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoddpage}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoddpage@default}
\KOMA@key{onpsevenpage}{%
\l@addto@macro{\@ps@evenpagehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsevenpage}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsevenpage@default}
\KOMA@key{onpsfloatpage}{%
\l@addto@macro{\@ps@floatpagehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsfloatpage}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsfloatpage@default}
\KOMA@key{onpsnonfloatpage}{%
\l@addto@macro{\@ps@nonfloatpagehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsnonfloatpage}
-\scrlayer@AddCsToInterface{%
- KV@KOMA.\@currname.\@currext @onpsnonfloatpage@default}
\KOMA@key{onpsbackground}{%
\l@addto@macro{\@ps@backgroundhook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsbackground}
-\scrlayer@AddCsToInterface{%
- KV@KOMA.\@currname.\@currext @onpsbackground@default}
\KOMA@key{onpsforeground}{%
\l@addto@macro{\@ps@foregroundhook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}%
+}
+\KOMA@key{deactivatepagestylelayers}[true]{%
+ \KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers}
+ {scrlayer@deactivate@layers}%
+}
+\KOMA@key{draft}[true]{%
+ \KOMA@set@ifkey{draft}{scrlayer@draft}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{draft}{scrlayer@draft}%
+}
+\KOMA@key{forceoverwrite}[true]{%
+ \KOMA@set@ifkey{forceoverwrite}{scrlayer@forceoverwrite}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}%
+}
+\KOMA@key{autoremoveinterfaces}[true]{%
+ \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
+ {scrlayer@autoremoveinterfaces}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsforeground}
-\scrlayer@AddCsToInterface{%
- KV@KOMA.\@currname.\@currext @onpsforeground@default}
-\KOMA@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}
-\scrlayer@AddCsToInterface{%
- KV@KOMA.\@currname.\@currext @deactivatepagestylelayers}
-\scrlayer@AddCsToInterface{%
- KV@KOMA.\@currname.\@currext @deactivatepagestylelayers@default}
-\KOMA@ifkey{draft}{scrlayer@draft}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @draft}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @draft@default}
-\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @forceoverwrite}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @forceoverwrite@default}
-\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoremoveinterfaces}
-\scrlayer@AddCsToInterface{%
- KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default}
%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (options)
\KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns}
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default}
-%%% 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
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @autooneside\endcsname\relax
+\expandafter\let\csname KV@KOMA.\@currname.\@currext @automark\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @automark@default\endcsname\relax
+\expandafter\let\csname KV@KOMA.\@currname.\@currext @manualmark\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @manualmark@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsselect\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsselect@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsinit\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsinit@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoneside\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoneside@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpstwoside\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpstwoside@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoddpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoddpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsevenpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsevenpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsfloatpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsfloatpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsbackground\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsbackground@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsforeground\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsforeground@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers\endcsname
+ \relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers@default\endcsname
+ \relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @draft\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @draft@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @forceoverwrite\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @forceoverwrite@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
+ \relax
%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%