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.sty52
1 files changed, 40 insertions, 12 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 341c33f9d38..b703bc78cb3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -14,7 +14,7 @@
%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2013-2016 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2013-2017 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,15 +44,17 @@
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
%% standard classes created by The LaTeX3 Project 1994-1996. You may
%% find a complete unmodified copy of LaTeX2e at
-%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (identify)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-notecolumn}[%
- 2017/02/08 v0.1.2583 KOMA-Script
+ 2017/08/11 v0.1.2670 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -63,7 +65,8 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (init)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: init)
\@tempswatrue
\scr@ifundefinedorrelax{pdfsavepos}{%
\scr@ifundefinedorrelax{savepos}{%
@@ -95,7 +98,8 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -218,6 +222,7 @@
\FamilyKeyStateProcessed
\KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}%
}
+\KOMA@ifkey{singlespacing}{@ps@singlespacing}
\KOMA@key{deactivatepagestylelayers}[true]{%
\KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}%
\KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers}
@@ -236,11 +241,13 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (options)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: 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 2562 2016-12-07 09:15:31Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 2645 2017-05-22 19:04:42Z kohm $
+%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax
@@ -311,7 +318,8 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (body)
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%
\@ifundefined{slnc@#2@box}{%
@@ -659,7 +667,9 @@
}%
\long\def\slnc@note##1##2##3##4{%
\let\PackageInfo\PackageWarning
+ \typeout{TRACE (slnc): ##2<=\theslncpage?}%
\ifnum ##2>\value{slncpage}\relax
+ \typeout{TRACE (slnc): no: unprocess note}%
\expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{%
\slnc@note{##1}{##2}{##3}{##4}%
}%
@@ -932,6 +942,13 @@
\edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}%
\edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}%
}%
+ \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label},
+ abspage=\the\value{slncpage}, until page=\slnc@cmp@value,
+ process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}%
+ \ifvmode\ifdim \pagetotal<\topskip
+ \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}%
+ \typeout{TRACE (slnc): until page=\slnc@cmp@value}%
+ \fi\fi
\ifnum \reserved@a=\z@
\ifvmode
\ifdim \pagetotal<\topskip
@@ -968,6 +985,7 @@
\@tempswatrue
\fi
\@whilesw\if@tempswa\fi{%
+ \typeout{TRACE (slnc): add \string\clearpage}%
\clearpage
\expandafter\ifcase \slnc@voidtest{#1}%
\begingroup
@@ -1045,7 +1063,14 @@
\edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}%
\edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}%
}%
- \ifcase \reserved@a\relax
+ \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label},
+ abspage=\theslncpage, until page=\slnc@cmp@value,
+ process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}%
+ \ifvmode\ifdim \pagetotal<\topskip
+ \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}%
+ \typeout{TRACE (slnc): until page=\slnc@cmp@value}%
+ \fi\fi
+ \ifnum \reserved@a=\z@
\ifvmode
\ifdim \pagetotal<\topskip
\else
@@ -1082,6 +1107,7 @@
\@tempswatrue
\fi
\@whilesw\if@tempswa\fi{%
+ \typeout{TRACE (slnc): add \string\clearpage}%
\clearpage
\begingroup
\def\@elt##1{+\slnc@voidtest{##1}}%
@@ -1264,13 +1290,15 @@
\@esphack
}%
}
+%%% From File: $Id: scrlayer-notecolumn.dtx 2670 2017-08-11 09:31:30Z kohm $
+%%% (run: final)
\DeclareNoteColumn{marginpar}
\let\reserved@a\clearpage
\def\clearpage{%
\ifslnc@autoclearnotecolumns\clearnotecolumns\relax\fi
}%
\expandafter\g@addto@macro\expandafter\clearpage\expandafter{\reserved@a}
-%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}