From 05bb2899192e4cc6ce500eb5715cb05f19cf1c24 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 21 Oct 2016 21:41:25 +0000 Subject: marginnote (21oct16) git-svn-id: svn://tug.org/texlive/trunk@42321 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/marginnote/marginnote.sty | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/latex/marginnote') diff --git a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty index 2ea2b24b315..e1ab2621581 100644 --- a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty +++ b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty @@ -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@currpage{\csname mn@note.\@mn@thispage.\@mn@atthispage\endcsname}% \edef\@mn@currxpos{\expandafter\@secondoftwo\@mn@currpage}% - \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 % + \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}% -- cgit v1.2.3