mbenotes (22sep12)

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

1 files changed, 28 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/latex/mbenotes/mbenotes.sty b/Master/texmf-dist/tex/latex/mbenotes/mbenotes.sty
index fe12b01219f..781059d8523 100644
--- a/Master/texmf-dist/tex/latex/mbenotes/mbenotes.sty
+++ b/Master/texmf-dist/tex/latex/mbenotes/mbenotes.sty
@@ -4,7 +4,7 @@
 %       *              mbeNOTES  
 %       ****************************************
 %
-%  Date of this version: 2011-10-17
+%  Date of this version: 2012-9-21
 %  Matthias Borck-Elsner
 %
 %% Based on endnotes.sty Copyright 2002 John Lavagnino
@@ -104,10 +104,10 @@
 %%       ****************************************
 %%
 %%
-\@definecounter{mbenote}
+\ProvidesPackage{mbenotes}[2012/09/21 (Version 2) Notes for Text,tables,images and equations ]\RequirePackage{graphicx,xcolor}\@definecounter{mbenote}
 \def\thembenote{\@arabic\c@mbenote}
 
-\def\@makembemark{\hbox{\@textsuperscript{{\tiny{\@thembemark}}}}}
+\def\@makembemark{\hbox{\@textsuperscript{{\tiny\@thembemark}}}}
 \def\makembemark{\@makembemark}
 
 \def\thembemark{\@thembemark}
@@ -159,7 +159,7 @@
 %% have, requiring the use of \protect for fragile commands.
 
 \long\def\addtombenotes#1{%
-     \if@mbeenotesopen \else \@openmbenotes \fi
+     \if@mbenotesopen \else \@openmbenotes \fi
      \begingroup
         \newlinechar='40
         \let\protect\string
@@ -267,7 +267,7 @@
 %       *              tabNOTES  
 %       ****************************************
 %
-%  Date of this version: 2011-10-17
+%  Date of this version: 2012-9-21
 %  Matthias Borck-Elsner
 %
 %% Based on endnotes.sty Copyright 2002 John Lavagnino
@@ -367,10 +367,10 @@
 %%       ****************************************
 %%
 %%
-\@definecounter{tabnote}
+\ProvidesPackage{mbenotes}[2012/09/21 (Version 2) Notes for Text,tables,images and equations ]\RequirePackage{graphicx,xcolor}\@definecounter{tabnote}
 \def\thetabnote{\@arabic\c@tabnote}
 
-\def\@maketabmark{\hbox{\@textsuperscript{{\tiny{\@thetabmark}}}}}
+\def\@maketabmark{\hbox{\@textsuperscript{{\tiny\@thetabmark}}}}
 \def\maketabmark{\@maketabmark}
 
 \def\thetabmark{\@thetabmark}
@@ -422,7 +422,7 @@
 %% have, requiring the use of \protect for fragile commands.
 
 \long\def\addtotabnotes#1{%
-     \if@tabenotesopen \else \@opentabnotes \fi
+     \if@tabnotesopen \else \@opentabnotes \fi
      \begingroup
         \newlinechar='40
         \let\protect\string
@@ -530,7 +530,7 @@
 %       *              imgNOTES  
 %       ****************************************
 %
-%  Date of this version: 2011-10-17
+%  Date of this version: 2012-9-21
 %  Matthias Borck-Elsner
 %
 %% Based on endnotes.sty Copyright 2002 John Lavagnino
@@ -630,10 +630,10 @@
 %%       ****************************************
 %%
 %%
-\@definecounter{imgnote}
+\ProvidesPackage{mbenotes}[2012/09/21 (Version 2) Notes for Text,tables,images and equations ]\RequirePackage{graphicx,xcolor}\@definecounter{imgnote}
 \def\theimgnote{\@arabic\c@imgnote}
 
-\def\@makeimgmark{\hbox{\@textsuperscript{{\tiny{\@theimgmark}}}}}
+\def\@makeimgmark{\hbox{\@textsuperscript{{\tiny\@theimgmark}}}}
 \def\makeimgmark{\@makeimgmark}
 
 \def\theimgmark{\@theimgmark}
@@ -685,7 +685,7 @@
 %% have, requiring the use of \protect for fragile commands.
 
 \long\def\addtoimgnotes#1{%
-     \if@imgenotesopen \else \@openimgnotes \fi
+     \if@imgnotesopen \else \@openimgnotes \fi
      \begingroup
         \newlinechar='40
         \let\protect\string
@@ -820,7 +820,7 @@
 %       *              mathNOTES  
 %       ****************************************
 %
-%  Date of this version: 2011-10-17
+%  Date of this version: 2012-9-21
 %  Matthias Borck-Elsner
 %
 %% Based on endnotes.sty Copyright 2002 John Lavagnino
@@ -920,10 +920,10 @@
 %%       ****************************************
 %%
 %%
-\@definecounter{mathnote}
+\ProvidesPackage{mbenotes}[2012/09/21 (Version 2) Notes for Text,tables,images and equations ]\RequirePackage{graphicx,xcolor}\@definecounter{mathnote}
 \def\themathnote{\@arabic\c@mathnote}
 
-\def\@makemathmark{\hbox{\@textsuperscript{\textcolor{red}{\tiny{\@themathmark}}}}}
+\def\@makemathmark{\hbox{\@textsuperscript{ \textcolor{red}{\tiny(\@themathmark)}}}}
 \def\makemathmark{\@makemathmark}
 
 \def\themathmark{\@themathmark}
@@ -962,20 +962,18 @@
 %% of the lines wind up being quite short.
 %%
 \long\def\@mathnotetext#1{%
-     \if@mathnotesopen \else \@openmathnotes \fi
-     \immediate\write\@mathnotes{\@doanmathnote{\@themathmark}}%
-     \begingroup
-        \def\next{#1}%
-        \newlinechar='40
-        \immediate\write\@mathnotes{\meaning\next}%
-     \endgroup
-     \immediate\write\@mathnotes{\@endanmathnote}}
-
-%% \addtomathnotes works the way the other mathnote macros probably should
+  \ifmeasuring@%
+  \else%
+\if@mathnotesopen \else \@openmathnotes \fi%
+    \immediate\write\@mathnotes{\@doanmathnote{\@themathmark}}%
+ \begingroup \def\next{#1}%
+\newlinechar='40 \immediate\write\@mathnotes{\meaning\next}%
+    \endgroup \immediate\write\@mathnotes{\@endanmathnote}%
+  \fi}%% \addtomathnotes works the way the other mathnote macros probably should
 %% have, requiring the use of \protect for fragile commands.
 
 \long\def\addtomathnotes#1{%
-     \if@mathenotesopen \else \@openmathnotes \fi
+     \if@mathnotesopen \else \@openmathnotes \fi
      \begingroup
         \newlinechar='40
         \let\protect\string
@@ -1083,7 +1081,7 @@
 %       *              bibNOTES  
 %       ****************************************
 %
-%  Date of this version: 2011-10-17
+%  Date of this version: 2012-9-21
 %  Matthias Borck-Elsner
 %
 %% Based on endnotes.sty Copyright 2002 John Lavagnino
@@ -1183,10 +1181,10 @@
 %%       ****************************************
 %%
 %%
-\@definecounter{bibnote}
+\ProvidesPackage{mbenotes}[2012/09/21 (Version 2) Notes for Text,tables,images and equations ]\RequirePackage{graphicx,xcolor}\@definecounter{bibnote}
 \def\thebibnote{\@arabic\c@bibnote}
 
-\def\@makebibmark{\lbrack\hbox{\@textsuperscript{{\tiny{\@thebibmark}}}}\rbrack}
+\def\@makebibmark{\hbox{\@textsuperscript{{\tiny\@thebibmark}}}}
 \def\makebibmark{\@makebibmark}
 
 \def\thebibmark{\@thebibmark}
@@ -1238,7 +1236,7 @@
 %% have, requiring the use of \protect for fragile commands.
 
 \long\def\addtobibnotes#1{%
-     \if@bibenotesopen \else \@openbibnotes \fi
+     \if@bibnotesopen \else \@openbibnotes \fi
      \begingroup
         \newlinechar='40
         \let\protect\string