summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/marginnote
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-21 21:41:25 +0000
committerKarl Berry <karl@freefriends.org>2016-10-21 21:41:25 +0000
commit05bb2899192e4cc6ce500eb5715cb05f19cf1c24 (patch)
treec5a1ef75e251aab19750c68042afb60e2e5d268b /Master/texmf-dist/source/latex/marginnote
parentf6c3650343cdfd279afa58268eecec2f5e3e3593 (diff)
marginnote (21oct16)
git-svn-id: svn://tug.org/texlive/trunk@42321 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/marginnote')
-rw-r--r--Master/texmf-dist/source/latex/marginnote/marginnote.dtx51
1 files changed, 28 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
index ee99d70276a..8e1b58575b6 100644
--- a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
+++ b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{810}
+% \CheckSum{815}
% \iffalse meta-comment
% ======================================================================
% marginnote.dtx
@@ -21,14 +21,14 @@
% derived files README.txt and marginnote.sty.
% ======================================================================
%
-%<package>%%% From File: $Id: marginnote.dtx 5 2016-06-02 09:05:56Z mjk $
+%<package>%%% From File: $Id: marginnote.dtx 9 2016-10-21 06:45:27Z mjk $
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2016-06-02 11:05:56 +0200 (Do, 02. Jun 2016) $
+ \filedate$Date: 2016-10-21 08:45:27 +0200 (Fr, 21 Okt 2016) $
\def\filerevision$#1: #2 ${\gdef\filerevision{#2}}
- \filerevision$Revision: 5 $
+ \filerevision$Revision: 9 $
\endgroup
\ProvidesFile{marginnote.dtx}[\filedate\space\filerevision\space
%</dtx>
@@ -43,7 +43,7 @@
% \iffalse meta-comment
%<*package|README>
% \fi^^A meta-comment
- 2016/06/02 v1.2
+ 2016/10/21 v1.2a
% \iffalse meta-comment
%</package|README>
% \fi^^A meta-comment
@@ -527,7 +527,7 @@
% \changes{v1.1}{2006/10/23}{new (internal)}
% \begin{macro}{\@mn@currxpos}
% \changes{v1.1}{2006/10/23}{new (internal)}
-% \begin{macro}{mn@abspage}
+% \begin{macro}{\mn@abspage}
% Macro \cs{@mn@margintest} does the complete test, which margin to use. The
% result may be found at \cs{if@tempswa}. To avoid changes on the last page
% if there is a new note on the first page, try to count the notes by
@@ -612,29 +612,34 @@
mn@note.\@mn@thispage.\@mn@atthispage\endcsname}%
\edef\@mn@currxpos{\expandafter\@secondoftwo\@mn@currpage}%
% \end{macrocode}
-% \changes{v1.1d}{2009/05/06}{take care of \cs{hoffset}}%
+% \changes{v1.1d}{2009/05/06}{take care of \cs{hoffset}}^^A
% Ulrike Fischer suggested a simple change to take care of \cs{hoffset},
% e.g., using package \textsf{crop}.
-% \changes{v1.1d}{2009/05/06}{take care of \cs{pdfhorigin}}%
+% \changes{v1.1d}{2009/05/06}{take care of \cs{pdfhorigin}}^^A
% We use this occasion to take care of \cs{pdfhorigin}, too.
+% \changes{v1.2a}{2016/10/21}{redefine \cs{@mn@currxpos} only if not empty}^^A
+% If \cs{@mn@currxpos} is not empty here, it should be corrected by
+% \cs{hoffset} and maybe by \cs{pdfhorigin}.
% \begin{macrocode}
- \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\hoffset\relax}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname pdfhorigin\endcsname\relax\else
+ \ifx\@mn@currxpos\@empty\else
+ \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\hoffset\relax}%
\begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname pdfoutput\endcsname\relax
+ \expandafter\ifx\csname pdfhorigin\endcsname\relax\else
\begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname outputmode\endcsname\relax\else
- \ifnum \outputmode=1 %
- \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname outputmode\endcsname\relax\else
+ \ifnum \outputmode=1 %
+ \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin
+ +1in\relax}%
+ \fi
+ \fi
+ \else
+ \ifnum \pdfoutput=1 %
+ \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin
+1in\relax}%
\fi
\fi
- \else
- \ifnum \pdfoutput=1 %
- \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin
- +1in\relax}%
- \fi
\fi
\fi
\edef\@mn@currpage{\expandafter\@firstoftwo\@mn@currpage}%
@@ -739,9 +744,9 @@
\if@tempswa
\rlap{%
% \end{macrocode}
-% If \cs{@mn@currpos} is neither \cs{relax} nor empty it is the real current
-% $x$ position of the last PDF\LaTeX{} run and may be used to calculate the
-% real horizontal offset.
+% If \cs{@mn@currxpos} is neither \cs{relax} nor empty it is the real
+% current $x$ position of the last PDF\LaTeX{} run and may be used to
+% calculate the real horizontal offset.
% \begin{macrocode}
\ifx\@mn@currxpos\relax
\kern\marginnoterightadjust