summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-13 22:06:52 +0000
committerKarl Berry <karl@freefriends.org>2017-09-13 22:06:52 +0000
commitd4d66453da7ea3fd6fc443a113b45031e79b0e30 (patch)
tree04a1486ad845a02e1ba67849cb2176831e1e6258 /Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
parentc15b52b518c7d48d1a35d11dd2ba8c34ca8ee373 (diff)
koma-script (14sep17)
git-svn-id: svn://tug.org/texlive/trunk@45292 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx65
1 files changed, 50 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
index 1bd204e57a3..9a2061791b2 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{1661}
+% \CheckSum{1715}
% \iffalse^^A meta-comment
% ======================================================================
% scrlayer-notecolumn.dtx
-% Copyright (c) Markus Kohm, 2013-2016
+% Copyright (c) Markus Kohm, 2013-2017
%
% This file is part of the LaTeX2e KOMA-Script bundle.
%
@@ -20,7 +20,7 @@
% This work consists of all files listed in manifest.txt.
% ----------------------------------------------------------------------
% scrlayer-notecolumn.dtx
-% Copyright (c) Markus Kohm, 2013-2016
+% Copyright (c) Markus Kohm, 2013-2017
%
% Diese Datei ist Teil der LaTeX2e KOMA-Script-Sammlung.
%
@@ -57,19 +57,26 @@
% Right brace \} Tilde \~}
%
% \iffalse^^A meta-comment
-%<identify>%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (identify)
-%<init>%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (init)
-%<options>%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (options)
-%<body>%%% 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 $
+%<identify>%%% (run: identify)
+%<init>%%% (run: init)
+%<options>%%% (run: options)
+%<body>%%% (run: body)
+%<final>%%% (run: 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: 2017-02-08 20:39:06 +0100 (Wed, 08 Feb 2017) $
+ \filedate$Date: 2017-08-11 11:31:30 +0200 (Fri, 11 Aug 2017) $
\def\filerevision$#1: #2 ${\gdef\filerevision{v0.1.#2}}
- \filerevision$Revision: 2583 $
-\endgroup
-\ProvidesFile{scrlayer-notecolumn.dtx}[\filedate\space\filerevision\space
+ \filerevision$Revision: 2670 $
+ \edef\reserved@a{%
+ \noexpand\endgroup
+ \noexpand\ProvidesFile{scrlayer-notecolumn.dtx}%
+ [\filedate\space\filerevision\space
+ KOMA-Script package source
+ }%
+\reserved@a
%</dtx>
%<*identify|doc>
%<interface>\NeedsTeXFormat{LaTeX2e}[1995/12/01]
@@ -115,8 +122,6 @@
\let\endbatchfile\relax
\fi
\endbatchfile
-%</dtx>
-%<*driver>
\documentclass{scrdoc}
\addtolength{\textwidth}{-1em}
\addtolength{\marginparwidth}{2em}
@@ -193,7 +198,7 @@
\PrintChanges
\PrintIndex
\end{document}
-%</driver>
+%</dtx>
% \fi^^A meta-comment
%
% \selectlanguage{english}
@@ -860,7 +865,9 @@
}%
\long\def\slnc@note##1##2##3##4{%
\let\PackageInfo\PackageWarning
+%<trace> \typeout{TRACE (slnc): ##2<=\theslncpage?}%
\ifnum ##2>\value{slncpage}\relax
+%<trace> \typeout{TRACE (slnc): no: unprocess note}%
\expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{%
\slnc@note{##1}{##2}{##3}{##4}%
}%
@@ -1241,6 +1248,19 @@
\edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}%
\edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}%
}%
+%<*trace>
+ \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}%
+%</trace>
+ \ifvmode\ifdim \pagetotal<\topskip
+% \end{macrocode}
+% \Macro{clearpage} wouldn't result in a new page, so we do not have to output
+% the notes of this page but only until the previous.
+% \begin{macrocode}
+ \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}%
+%<trace> \typeout{TRACE (slnc): until page=\slnc@cmp@value}%
+ \fi\fi
\ifnum \reserved@a=\z@
% \end{macrocode}
% Next we read all notes until the end of the current page, but only
@@ -1284,6 +1304,7 @@
\@tempswatrue
\fi
\@whilesw\if@tempswa\fi{%
+%<trace> \typeout{TRACE (slnc): add \string\clearpage}%
% \end{macrocode}
% Yes, we have (maybe again)!
% \begin{macrocode}
@@ -1405,7 +1426,20 @@
\edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}%
\edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}%
}%
- \ifcase \reserved@a\relax
+%<*trace>
+ \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label},
+ abspage=\theslncpage, until page=\slnc@cmp@value,
+ process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}%
+%</trace>
+ \ifvmode\ifdim \pagetotal<\topskip
+% \end{macrocode}
+% \Macro{clearpage} wouldn't result in a new page, so we do not have to output
+% the notes of this page but only until the previous.
+% \begin{macrocode}
+ \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}%
+%<trace> \typeout{TRACE (slnc): until page=\slnc@cmp@value}%
+ \fi\fi
+ \ifnum \reserved@a=\z@
% \end{macrocode}
% Next we read all notes until the end of the current page, but only
% if a \Macro{clearpage} wouldn't result in a new page.
@@ -1449,6 +1483,7 @@
\@tempswatrue
\fi
\@whilesw\if@tempswa\fi{%
+%<trace> \typeout{TRACE (slnc): add \string\clearpage}%
% \end{macrocode}
% Yes, we have (maybe again)!
% \begin{macrocode}