summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-11 21:26:48 +0000
committerKarl Berry <karl@freefriends.org>2016-05-11 21:26:48 +0000
commit39c10427f8eee057dc28928380060a585e1e017b (patch)
tree6750074338d5e6b808cfca3671e2ab9763c328ae /Master/texmf-dist/source/latex/koma-script/scrlayer-notecolumn.dtx
parenta49931ca8756327265b8929a7a147045bf2b3506 (diff)
koma-script (11may16)
git-svn-id: svn://tug.org/texlive/trunk@41038 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.dtx90
1 files changed, 64 insertions, 26 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 217a6be58c1..fb2ab3e0836 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{1578}
+% \CheckSum{1607}
% \iffalse^^A meta-comment
% ======================================================================
% scrlayer-notecolumn.dtx
-% Copyright (c) Markus Kohm, 2013-2014
+% Copyright (c) Markus Kohm, 2013-2016
%
% 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-2014
+% Copyright (c) Markus Kohm, 2013-2016
%
% Diese Datei ist Teil der LaTeX2e KOMA-Script-Sammlung.
%
@@ -57,17 +57,17 @@
% Right brace \} Tilde \~}
%
% \iffalse^^A meta-comment
-%<identify>%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (identify)
-%<init>%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (init)
-%<options>%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (options)
-%<body>%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (body)
+%<identify>%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (identify)
+%<init>%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (init)
+%<options>%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (options)
+%<body>%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2014-06-03 10:28:36 +0200 (Tue, 03 Jun 2014) $
+ \filedate$Date: 2016-03-25 11:22:23 +0100 (Fri, 25 Mar 2016) $
\def\filerevision$#1: #2 ${\gdef\filerevision{v0.1.#2}}
- \filerevision$Revision: 1760 $
+ \filerevision$Revision: 2398 $
\endgroup
\ProvidesFile{scrlayer-notecolumn.dtx}[\filedate\space\filerevision\space
%</dtx>
@@ -223,19 +223,33 @@
% \File{scrlayer.dtx}).
%
% Here we test the used pdf\TeX{} primitives.
+% \changes{v0.1}{2015/10/07}{ready for renaming \cs{pdfsavepos} and
+% \cs{pdflastypos} in luaTeX}^^A
% \begin{macrocode}
\@tempswatrue
\scr@ifundefinedorrelax{pdfsavepos}{%
- \expandafter\@tempswafalse
+ \scr@ifundefinedorrelax{savepos}{%
+ \expandafter\@tempswafalse
+ }{%
+ \let\scr@savepos\savepos
+ }%
}{%
+ \let\scr@savepos\pdfsavepos
\scr@ifundefinedorrelax{pdflastypos}{%
- \expandafter\@tempswafalse
- }{}%
+ \scr@ifundefinedorrelax{lastypos}{%
+ \expandafter\@tempswafalse
+ }{%
+ \let\scr@lastypos\lastypos
+ }%
+ }{%
+ \let\scr@lastypos\pdflastypos
+ }%
}
\if@tempswa\else
- \PackageError{scrlayer-notecolumn}{missing pdfTeX features}{%
- This package needs \string\pdfsavepos\space and
- \string\pdflastypos.\MessageBreak
+ \PackageError{scrlayer-notecolumn}{missing pdfTeX/luaTeX features}{%
+ This package needs \string\pdfsavepos\space or \string\savepos\space
+ and\MessageBreak
+ \string\pdflastypos\space or \string\lastypos.\MessageBreak
This error is fatal, because usage of the package without these
features\MessageBreak
cannot work!\MessageBreak
@@ -666,6 +680,8 @@
% to put contents into the note columns and to output the note columns.
%
% \begin{macro}{\tf@slnc}
+% \changes{v0.1.2395}{2016/03/25}{write to \texttt{aux}-file with
+% \cs{if@filesw}}^^A
% \begin{macro}{\slnc@initwrite}
% \begin{macro}{\slnc@openwrite}
% First of all we need a file to write the notes to. We use the
@@ -678,9 +694,11 @@
\scrlayerAddToInterface\tf@slnc{%
\newwrite\tf@slnc
\AtBeginDocument{%
- \immediate\write\@auxout{%
- \noexpand\csname slnc@initwrite\noexpand\endcsname
- }%
+ \if@filesw
+ \immediate\write\@auxout{%
+ \noexpand\csname slnc@initwrite\noexpand\endcsname
+ }%
+ \fi
}%
\AtEndDocument{\let\slnc@initwrite\slnc@openwrite}%
}
@@ -753,11 +771,11 @@
\scrlayerAddToInterface\makenote{%
\newcommand{\makenote}[2][marginpar]{%
\@bsphack
- \pdfsavepos
+ \scr@savepos
\addtocontents{slnc}{%
\string\slnc@note{#1}%
{\noexpand\number\value{slncpage}}%
- {\noexpand\number\pdflastypos}%
+ {\noexpand\number\scr@lastypos}%
{#2}%
}%
\@esphack
@@ -848,8 +866,18 @@
\kern\dimexpr\topskip-\baselineskip\relax
}%
\fi
+% \end{macrocode}
+% \changes{v0.1}{2015/10/07}{ready for renaming \cs{pdfpageheight} in
+% luaTeX}^^A
+% From lua\TeX~0.80.1 \cs{pdfpageheight} will be renamed into
+% \cs{pageheight}. So we have to do an extra test for the new primitive.
+% \begin{macrocode}
\scr@ifundefinedorrelax{pdfpageheight}{%
- \@tempdima=\paperheight
+ \scr@ifundefinedorrelax{pageheight}{%
+ \@tempdima=\paperheight
+ }{%
+ \@tempdima=\pageheight
+ }%
}{%
\@tempdima=\pdfpageheight
}%
@@ -910,11 +938,11 @@
\if@filesw
\expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
\expandafter\unvbox\csname slnc@#1@box\endcsname
- \pdfsavepos
+ \scr@savepos
\protected@write\@auxout{}{%
\string\newlabel{notecolumn.##1.##3.syncnote.label}{%
{%
- \noexpand\number\pdflastypos
+ \noexpand\number\scr@lastypos
}{\thepage}%
}%
}%
@@ -1475,12 +1503,12 @@
\fi
{%
\if@filesw
- \pdfsavepos
+ \scr@savepos
\protected@write\@auxout{}{%
\string\newlabel{notecolumn.\theslnc@syncpoint.synctext.label}{%
{%
\noexpand\number
- \numexpr \pdflastypos\slnc@voffset\relax
+ \numexpr \scr@lastypos\slnc@voffset\relax
}{\thepage}%
}%
}%
@@ -1536,8 +1564,18 @@
\newpage\null\vskip-\dimexpr \baselineskip+\parskip\relax
\edef\slnc@textpage{\the\numexpr\slnc@textpage+1\relax}%
}%
+% \end{macrocode}
+% \changes{v0.1}{2015/10/07}{ready for renaming \cs{pdfpageheight} in
+% luaTeX}^^A
+% From lua\TeX~0.80.1 \cs{pdfpageheight} will be renamed into
+% \cs{pageheight}. So we have to do an extra test for the new primitive.
+% \begin{macrocode}
\scr@ifundefinedorrelax{pdfpageheight}{%
- \@tempdima=\paperheight
+ \scr@ifundefinedorrelax{pageheight}{%
+ \@tempdima=\paperheight
+ }{%
+ \@tempdima=\pageheight
+ }%
}{%
\@tempdima=\pdfpageheight
}%