texlive[42321] Master/texmf-dist: marginnote (21oct16)
commits+karl at tug.org
commits+karl at tug.org
Fri Oct 21 23:41:25 CEST 2016
Revision: 42321
http://tug.org/svn/texlive?view=revision&revision=42321
Author: karl
Date: 2016-10-21 23:41:25 +0200 (Fri, 21 Oct 2016)
Log Message:
-----------
marginnote (21oct16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/marginnote/README.txt
trunk/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf
trunk/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
Modified: trunk/Master/texmf-dist/doc/latex/marginnote/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/marginnote/README.txt 2016-10-21 21:41:00 UTC (rev 42320)
+++ trunk/Master/texmf-dist/doc/latex/marginnote/README.txt 2016-10-21 21:41:25 UTC (rev 42321)
@@ -2,7 +2,7 @@
Copyright (c) Markus Kohmm, 2005-2016
-------------------------------------------------------------------
Version:
- 2016/06/02 v1.2
+ 2016/10/21 v1.2a
Licence:
This work may be distributed and/or modified under the conditions
of the LaTeX Project Public License, version 1.3c of the license.
Modified: trunk/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/marginnote/marginnote.dtx 2016-10-21 21:41:00 UTC (rev 42320)
+++ trunk/Master/texmf-dist/source/latex/marginnote/marginnote.dtx 2016-10-21 21:41:25 UTC (rev 42321)
@@ -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 at currxpos}
% \changes{v1.1}{2006/10/23}{new (internal)}
-% \begin{macro}{mn at abspage}
+% \begin{macro}{\mn at abspage}
% Macro \cs{@mn at margintest} does the complete test, which margin to use. The
% result may be found at \cs{if at 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 at note.\@mn at thispage.\@mn at atthispage\endcsname}%
\edef\@mn at currxpos{\expandafter\@secondoftwo\@mn at 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 at currxpos} only if not empty}^^A
+% If \cs{@mn at currxpos} is not empty here, it should be corrected by
+% \cs{hoffset} and maybe by \cs{pdfhorigin}.
% \begin{macrocode}
- \edef\@mn at currxpos{\the\dimexpr \@mn at currxpos -\hoffset\relax}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname pdfhorigin\endcsname\relax\else
+ \ifx\@mn at currxpos\@empty\else
+ \edef\@mn at currxpos{\the\dimexpr \@mn at 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 at currxpos{\the\dimexpr \@mn at 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 at currxpos{\the\dimexpr \@mn at currxpos -\pdfhorigin
+ +1in\relax}%
+ \fi
+ \fi
+ \else
+ \ifnum \pdfoutput=1 %
+ \edef\@mn at currxpos{\the\dimexpr \@mn at currxpos -\pdfhorigin
+1in\relax}%
\fi
\fi
- \else
- \ifnum \pdfoutput=1 %
- \edef\@mn at currxpos{\the\dimexpr \@mn at currxpos -\pdfhorigin
- +1in\relax}%
- \fi
\fi
\fi
\edef\@mn at currpage{\expandafter\@firstoftwo\@mn at currpage}%
@@ -739,9 +744,9 @@
\if at tempswa
\rlap{%
% \end{macrocode}
-% If \cs{@mn at 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 at 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 at currxpos\relax
\kern\marginnoterightadjust
Modified: trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty 2016-10-21 21:41:00 UTC (rev 42320)
+++ trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty 2016-10-21 21:41:25 UTC (rev 42321)
@@ -20,10 +20,10 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-%%% From File: $Id: marginnote.dtx 5 2016-06-02 09:05:56Z mjk $
+%%% From File: $Id: marginnote.dtx 9 2016-10-21 06:45:27Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{marginnote}[%
- 2016/06/02 v1.2
+ 2016/10/21 v1.2a
non floating margin notes for LaTeX]
\begingroup
\def\@tempb{}%
@@ -212,23 +212,25 @@
\edef\@mn at currpage{\csname
mn at note.\@mn at thispage.\@mn at atthispage\endcsname}%
\edef\@mn at currxpos{\expandafter\@secondoftwo\@mn at currpage}%
- \edef\@mn at currxpos{\the\dimexpr \@mn at currxpos -\hoffset\relax}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname pdfhorigin\endcsname\relax\else
+ \ifx\@mn at currxpos\@empty\else
+ \edef\@mn at currxpos{\the\dimexpr \@mn at 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 %
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname outputmode\endcsname\relax\else
+ \ifnum \outputmode=1 %
+ \edef\@mn at currxpos{\the\dimexpr \@mn at currxpos -\pdfhorigin
+ +1in\relax}%
+ \fi
+ \fi
+ \else
+ \ifnum \pdfoutput=1 %
\edef\@mn at currxpos{\the\dimexpr \@mn at currxpos -\pdfhorigin
+1in\relax}%
\fi
\fi
- \else
- \ifnum \pdfoutput=1 %
- \edef\@mn at currxpos{\the\dimexpr \@mn at currxpos -\pdfhorigin
- +1in\relax}%
- \fi
\fi
\fi
\edef\@mn at currpage{\expandafter\@firstoftwo\@mn at currpage}%
More information about the tex-live-commits
mailing list