summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
diff options
context:
space:
mode:
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.sty48
1 files changed, 30 insertions, 18 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 4d1496aaf06..fd90da4263d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -46,13 +46,13 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (identify)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-notecolumn}[%
- 2016/03/25 v0.1.2398 KOMA-Script
+ 2016/06/28 v0.1.2483 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -63,7 +63,7 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (init)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (init)
\@tempswatrue
\scr@ifundefinedorrelax{pdfsavepos}{%
\scr@ifundefinedorrelax{savepos}{%
@@ -73,16 +73,16 @@
}%
}{%
\let\scr@savepos\pdfsavepos
- \scr@ifundefinedorrelax{pdflastypos}{%
- \scr@ifundefinedorrelax{lastypos}{%
- \expandafter\@tempswafalse
- }{%
- \let\scr@lastypos\lastypos
- }%
+}
+\scr@ifundefinedorrelax{pdflastypos}{%
+ \scr@ifundefinedorrelax{lastypos}{%
+ \expandafter\@tempswafalse
}{%
- \let\scr@lastypos\pdflastypos
+ \let\scr@lastypos\lastypos
}%
-}
+}{%
+ \let\scr@lastypos\pdflastypos
+}%
\if@tempswa\else
\PackageError{scrlayer-notecolumn}{missing pdfTeX/luaTeX features}{%
This package needs \string\pdfsavepos\space or \string\savepos\space
@@ -95,7 +95,7 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -138,9 +138,21 @@
\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
@@ -224,11 +236,11 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (options)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z 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 2429 2016-04-12 12:10:19Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (body)
\KOMAProcessOptions\relax
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax
@@ -299,7 +311,7 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (body)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%
\@ifundefined{slnc@#2@box}{%