marginnote update (9may09)

git-svn-id: svn://tug.org/texlive/trunk@13031 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 36 insertions, 1 deletions

diff --git a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
index 7dbbe9a420d..c03e5406bd6 100644
--- a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
+++ b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
@@ -35,7 +35,31 @@
 %%   the Work (see ``Important Recommendations'' at lppl.txt).
 %%
 \ProvidesPackage{marginnote}[%
-  2009/02/26 v1.1c non floating margin notes for LaTeX]
+  2009/05/06 v1.1d non floating margin notes for LaTeX]
+\begingroup
+  \def\@tempb{}%
+  \def\@tempa{%
+    \PackageError{marginnote}{seems you are not running e-TeX\@tempb}{%
+      Since 2004 the LaTeX team recommends to use e-TeX.\MessageBreak
+      marginnote since version 1.1d uses e-TeX features.\MessageBreak
+      At actual systems `latex' should already use e-TeX.\MessageBreak
+      At deprecated systems it may be called `elatex'.\MessageBreak
+      Use either unsupported marginnote up to version 1.1c or\MessageBreak
+      ask you administrator for LaTeX using e-TeX\@tempb.\MessageBreak
+      Not using e-TeX\@tempb\space is a fatal error!\MessageBreak
+      Processing cannot be continued!}%
+    \endgroup
+    \batchmode \errmessage{}\csname @@end\endcsname\end\relax
+    \csname endinput\endcsname
+  }%
+  \expandafter\ifx\csname eTeXversion\endcsname\relax\else
+    \ifnum\eTeXversion <2
+      \def\@tempb{ V 2}%
+    \else
+      \let\@tempa\endgroup
+    \fi
+  \fi
+\@tempa
 \newif\if@mn@verbose\@mn@verbosetrue
 \DeclareOption{verbose}{\@mn@verbosetrue}
 \DeclareOption{quiet}{\@mn@verbosefalse}
@@ -141,6 +165,17 @@
     \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
+      \begingroup\expandafter\expandafter\expandafter\endgroup
+      \expandafter\ifx\csname pdfoutput\endcsname\relax\else
+        \ifnum \pdfoutput=1 %
+          \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin
+            +1in\relax}%
+        \fi
+      \fi
+    \fi
     \edef\@mn@currpage{\expandafter\@firstoftwo\@mn@currpage}%
     \if@mn@verbose
       \PackageInfo{marginnote}{Margin note \@mn@thispage.\@mn@atthispage\space