marginnote update (3mar09)

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

4 files changed, 54 insertions, 37 deletions

diff --git a/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf b/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf
index b6ce72b7968..62ec3aaa7f8 100644
--- a/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf
+++ b/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf
diff --git a/Master/texmf-dist/source/latex/marginnote/README b/Master/texmf-dist/source/latex/marginnote/README
index 47ede31b9b9..e209a81b8fb 100644
--- a/Master/texmf-dist/source/latex/marginnote/README
+++ b/Master/texmf-dist/source/latex/marginnote/README
@@ -2,7 +2,7 @@
 Package marginnote
 Copyright (c) Markus Kohm  2005-2009
 Licence: LPPL
-Version: 2009/02/16 v1.1b
+Version: 2009/02/26 v1.1c
 ----------------------------------------------------------------------------
 This package provides the command \marginnote that may be used instead of
 \marginpar at almost every place, where \marginpar cannot be used, e.g. 
diff --git a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
index e823e8f4c28..b5c6ee69ccc 100644
--- a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
+++ b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{565}
+% \CheckSum{578}
 % \iffalse meta-comment
 %
 % marginnote.dtx
@@ -31,10 +31,13 @@
 %</driver>
 %<package>\ProvidesPackage{marginnote}[%
 %<*driver|package>
-  2009/02/16 v1.1b non floating margin notes for LaTeX]
+  2009/02/26 v1.1c non floating margin notes for LaTeX]
 %</driver|package>
 %<*driver>
 \documentclass{ltxdoc}
+\usepackage{graphicx}% needed for \reflectbox
+\providecommand*{\XeTeX}{%
+  X\kern-.1em\lower.5ex\hbox{\reflectbox{E}}\kern-.15em\TeX}
 \begin{document}
 \RecordChanges
 \DocInput{marginnote.dtx}
@@ -104,9 +107,9 @@
 % only, if the correct horizontal position cannot be determined using
 % PDF\TeX{} features (\cs{pdfsavepos} and \cs{pdflastxpos}). So if you are
 % using PDF\LaTeX{} with PDF output or PDF\LaTeX{} with PDF\TeX-version since
-% 1.40 you will not need to use the example code above, but you will need at
-% least two PDF\LaTeX{} runs to get the correct horizontal positions of the
-% margin notes.
+% 1.40 or \XeTeX{} you will not need to use the example code above, but you
+% will need at least two \LaTeX{} runs to get the correct horizontal positions
+% of the margin notes.
 %
 % \DescribeMacro{\marginnotetextwidth}
 % Package \textsl{marginnote} needs to know the real width of the type area to
@@ -194,8 +197,8 @@
 % With math \cs{marginnote} may work or may not depending on the math
 % environment.
 %
-% If you are using PDF\LaTeX{} since version~1.40 or PDF\LaTeX{} before
-% version~1.40 with PDF output and the horizontal position of
+% If you are using \XeTeX{}, PDF\LaTeX{} since version~1.40 or PDF\LaTeX{}
+% before version~1.40 with PDF output and the horizontal position of
 % a margin note is wrong, do one more PDF\LaTeX{} run.
 %
 % Sometimes lines are stretched vertically using \cs{marginnote}, e.g.\ if
@@ -246,6 +249,8 @@
 %   \changes{v1.1a}{2008/11/10}{PDF\TeX\ since 1.40 allows \cs{pdfsavepos} in
 %     DVI mode too}%
 %   \changes{v1.1b}{2009/02/16}{if level fixed}%
+%   \changes{v1.1c}{2009/02/26}{\protect\XeTeX has working \cs{pdflastxpos}
+%     but no \cs{pdftexversion}}%
 % We need to know, wether or not PDF\TeX{} and which version of PDF\TeX{} is
 % used. With PDF\TeX{} the horizontal output position may be detected using
 % \cs{pdfsavepos} and \cs{pdflastxpos}. So the relative position of the margin
@@ -256,24 +261,30 @@
 \newif\if@mn@pdfmode\@mn@pdfmodefalse
 \AtBeginDocument{%
   \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname pdflastxpos\endcsname\relax\else% bg or 1
+  \expandafter\ifx\csname pdflastxpos\endcsname\relax\else % bg or 1
     \begingroup\expandafter\expandafter\expandafter\endgroup
-    \expandafter\ifx\csname pdftexversion\endcsname\relax% bg 2
+    \expandafter\ifx\csname pdftexversion\endcsname\relax % bg 2
       \begingroup\expandafter\expandafter\expandafter\endgroup
-      \expandafter\ifx\csname pdfoutput\endcsname\relax\else% bg or 3
-        \ifcase\pdfoutput\else\@mn@pdfmodetrue\fi% bg ed 4
-      \fi% ed 3
-    \else% or 2
-      \ifnum \pdftexversion<140% bg 3
+      \expandafter\ifx\csname pdfoutput\endcsname\relax % bg 3
         \begingroup\expandafter\expandafter\expandafter\endgroup
-        \expandafter\ifx\csname pdfoutput\endcsname\relax\else% bg or 4
-          \ifcase\pdfoutput\else\@mn@pdfmodetrue\fi% bg ed 5
-        \fi% ed 4
-      \else% or 3
+        \expandafter\ifx\csname XeTeXrevision\endcsname\relax\else % bg 4
+          \@mn@pdfmodetrue
+        \fi % ed 4
+      \else % or 3
+        \ifcase\pdfoutput\else\@mn@pdfmodetrue\fi % bg ed 4
+      \fi % ed 3
+    \else % or 2
+      \ifnum \pdftexversion<140 % bg 3
+        \begingroup\expandafter\expandafter\expandafter\endgroup
+        \expandafter\ifx\csname pdfoutput\endcsname\relax % bg 4
+        \else % or 4
+          \ifcase\pdfoutput\else\@mn@pdfmodetrue\fi % bg ed 5
+        \fi % ed 4
+      \else % or 3
         \@mn@pdfmodetrue
-      \fi% ed 3
-    \fi% ed 2
-  \fi% ed 1
+      \fi % ed 3
+    \fi % ed 2
+  \fi % ed 1
   \if@mn@verbose
     \if@mn@pdfmode
       \PackageInfo{marginnote}{%
diff --git a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
index cdab2dba136..7dbbe9a420d 100644
--- a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
+++ b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
@@ -35,7 +35,7 @@
 %%   the Work (see ``Important Recommendations'' at lppl.txt).
 %%
 \ProvidesPackage{marginnote}[%
-  2009/02/16 v1.1b non floating margin notes for LaTeX]
+  2009/02/26 v1.1c non floating margin notes for LaTeX]
 \newif\if@mn@verbose\@mn@verbosetrue
 \DeclareOption{verbose}{\@mn@verbosetrue}
 \DeclareOption{quiet}{\@mn@verbosefalse}
@@ -45,24 +45,30 @@
 \newif\if@mn@pdfmode\@mn@pdfmodefalse
 \AtBeginDocument{%
   \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname pdflastxpos\endcsname\relax\else% bg or 1
+  \expandafter\ifx\csname pdflastxpos\endcsname\relax\else % bg or 1
     \begingroup\expandafter\expandafter\expandafter\endgroup
-    \expandafter\ifx\csname pdftexversion\endcsname\relax% bg 2
+    \expandafter\ifx\csname pdftexversion\endcsname\relax % bg 2
       \begingroup\expandafter\expandafter\expandafter\endgroup
-      \expandafter\ifx\csname pdfoutput\endcsname\relax\else% bg or 3
-        \ifcase\pdfoutput\else\@mn@pdfmodetrue\fi% bg ed 4
-      \fi% ed 3
-    \else% or 2
-      \ifnum \pdftexversion<140% bg 3
+      \expandafter\ifx\csname pdfoutput\endcsname\relax % bg 3
         \begingroup\expandafter\expandafter\expandafter\endgroup
-        \expandafter\ifx\csname pdfoutput\endcsname\relax\else% bg or 4
-          \ifcase\pdfoutput\else\@mn@pdfmodetrue\fi% bg ed 5
-        \fi% ed 4
-      \else% or 3
+        \expandafter\ifx\csname XeTeXrevision\endcsname\relax\else % bg 4
+          \@mn@pdfmodetrue
+        \fi % ed 4
+      \else % or 3
+        \ifcase\pdfoutput\else\@mn@pdfmodetrue\fi % bg ed 4
+      \fi % ed 3
+    \else % or 2
+      \ifnum \pdftexversion<140 % bg 3
+        \begingroup\expandafter\expandafter\expandafter\endgroup
+        \expandafter\ifx\csname pdfoutput\endcsname\relax % bg 4
+        \else % or 4
+          \ifcase\pdfoutput\else\@mn@pdfmodetrue\fi % bg ed 5
+        \fi % ed 4
+      \else % or 3
         \@mn@pdfmodetrue
-      \fi% ed 3
-    \fi% ed 2
-  \fi% ed 1
+      \fi % ed 3
+    \fi % ed 2
+  \fi % ed 1
   \if@mn@verbose
     \if@mn@pdfmode
       \PackageInfo{marginnote}{%