mbenotes update

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

1 files changed, 52 insertions, 60 deletions

diff --git a/Master/texmf-dist/tex/latex/mbenotes/mbenotes.sty b/Master/texmf-dist/tex/latex/mbenotes/mbenotes.sty
index 927e5f8d6ab..eb6d0fc93c6 100644
--- a/Master/texmf-dist/tex/latex/mbenotes/mbenotes.sty
+++ b/Master/texmf-dist/tex/latex/mbenotes/mbenotes.sty
@@ -12,7 +12,7 @@
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
 %% of this license or (at your option) any later version.
-%% The latest version of this license is in
+%% The lambe version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %% and version 1.2 or later is part of all distributions of LaTeX
 %% version 1999/12/01 or later.
@@ -41,10 +41,6 @@
 %%
 % as the last thing in your document.  (But \thembenotes all
 % by itself will work.)
-%
-
-%
-%
 %       ****************************************
 %       *        mbeNOTE COMMANDS              *
 %       ****************************************
@@ -107,6 +103,7 @@
 %       ****************************************
 %
 
+\RequirePackage{picture}  
 \@definecounter{mbenote}
 \def\thembenote{\@arabic\c@mbenote}
 
@@ -131,6 +128,7 @@
 %  Here begins a section of mbenote code that's really different from
 % the footnote code of LaTeX.
 
+%% begin section to influence the notes file
 \let\@doanmbenote=0
 \let\@endanmbenote=0
 
@@ -157,7 +155,7 @@
         \immediate\write\@mbenotes{\meaning\next}%
      \endgroup
      \immediate\write\@mbenotes{\@endanmbenote}}
-
+%% end section to influence the notes file
 % \addtombenotes works the way the other mbenote macros probably should
 % have, requiring the use of \protect for fragile commands.
 
@@ -278,7 +276,7 @@
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
 %% of this license or (at your option) any later version.
-%% The latest version of this license is in
+%% The lambe version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %% and version 1.2 or later is part of all distributions of LaTeX
 %% version 1999/12/01 or later.
@@ -307,10 +305,6 @@
 %%
 % as the last thing in your document.  (But \thetabnotes all
 % by itself will work.)
-%
-
-%
-%
 %       ****************************************
 %       *        tabNOTE COMMANDS              *
 %       ****************************************
@@ -373,6 +367,7 @@
 %       ****************************************
 %
 
+\RequirePackage{picture}  
 \@definecounter{tabnote}
 \def\thetabnote{\@arabic\c@tabnote}
 
@@ -397,38 +392,39 @@
 %  Here begins a section of tabnote code that's really different from
 % the footnote code of LaTeX.
 
+%% begin section to influence the notes file
 \let\@doantabnote=0
 \let\@endantabnote=0
 
-\newwrite\@tabnotes
-\newif\if@tabnotesopen \global\@tabnotesopenfalse
+\newwrite\@mbenotes
+\newif\if@mbenotesopen \global\@mbenotesopenfalse
 
-\def\@opentabnotes{\immediate\openout\@tabnotes=\jobname.tab\relax
-      \global\@tabnotesopentrue}
+\def\@openmbenotes{\immediate\openout\@mbenotes=\jobname.mbe\relax
+      \global\@mbenotesopentrue}
 
 %  The stuff with \next and \meaning is a trick from the TeXbook, 382,
 % there intended for setting verbatim text, but here used to avoid
 % macro expansion when the footnote text is written.  \next will have
 % the entire text of the footnote as one long line, which might well
 % overflow limits on output line length; the business with \newlinechar
-% makes every space become a newline in the \@tabnotes file, so that all
+% makes every space become a newline in the \@mbenotes file, so that all
 % of the lines wind up being quite short.
 
 \long\def\@tabnotetext#1{%
-     \if@tabnotesopen \else \@opentabnotes \fi
-     \immediate\write\@tabnotes{\@doantabnote{\@thetabmark}}%
+     \if@mbenotesopen \else \@openmbenotes \fi
+     \immediate\write\@mbenotes{\@doantabnote{\@thetabmark}}%
      \begingroup
         \def\next{#1}%
         \newlinechar='40
-        \immediate\write\@tabnotes{\meaning\next}%
+        \immediate\write\@mbenotes{\meaning\next}%
      \endgroup
-     \immediate\write\@tabnotes{\@endantabnote}}
-
+     \immediate\write\@mbenotes{\@endantabnote}}
+%% end section to influence the notes file
 % \addtotabnotes works the way the other tabnote macros probably should
 % have, requiring the use of \protect for fragile commands.
 
 \long\def\addtotabnotes#1{%
-     \if@tabnotesopen \else \@opentabnotes \fi
+     \if@mbenotesopen \else \@openmbenotes \fi
      \begingroup
         \newlinechar='40
         \let\protect\string
@@ -495,7 +491,7 @@
 
 \def\tabnotesize{\footnotesize}
 
-\def\thetabnotes[#1]{\def\tabnotesname{#1}\immediate\closeout\@tabnotes \global\@tabnotesopenfalse
+\def\thetabnotes[#1]{\def\tabnotesname{#1}\immediate\closeout\@mbenotes \global\@mbenotesopenfalse
   \begingroup
     \makeatletter
     %
@@ -526,7 +522,7 @@
     \def\@endantabnote{\par\endgroup}%
      \tabnoteheading 
     \tabnotesize
-    \input{\jobname.tab}%
+    \input{\jobname.mbe}%
     \setcounter{tabnote}{0} \vspace{1.8em} 
   \endgroup}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -544,7 +540,7 @@
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
 %% of this license or (at your option) any later version.
-%% The latest version of this license is in
+%% The lambe version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %% and version 1.2 or later is part of all distributions of LaTeX
 %% version 1999/12/01 or later.
@@ -573,10 +569,6 @@
 %%
 % as the last thing in your document.  (But \theimgnotes all
 % by itself will work.)
-%
-
-%
-%
 %       ****************************************
 %       *        imgNOTE COMMANDS              *
 %       ****************************************
@@ -639,6 +631,7 @@
 %       ****************************************
 %
 
+\RequirePackage{picture}  
 \@definecounter{imgnote}
 \def\theimgnote{\@arabic\c@imgnote}
 
@@ -663,38 +656,39 @@
 %  Here begins a section of imgnote code that's really different from
 % the footnote code of LaTeX.
 
+%% begin section to influence the notes file
 \let\@doanimgnote=0
 \let\@endanimgnote=0
 
-\newwrite\@imgnotes
-\newif\if@imgnotesopen \global\@imgnotesopenfalse
+\newwrite\@mbenotes
+\newif\if@mbenotesopen \global\@mbenotesopenfalse
 
-\def\@openimgnotes{\immediate\openout\@imgnotes=\jobname.img\relax
-      \global\@imgnotesopentrue}
+\def\@openmbenotes{\immediate\openout\@mbenotes=\jobname.mbe\relax
+      \global\@mbenotesopentrue}
 
 %  The stuff with \next and \meaning is a trick from the TeXbook, 382,
 % there intended for setting verbatim text, but here used to avoid
 % macro expansion when the footnote text is written.  \next will have
 % the entire text of the footnote as one long line, which might well
 % overflow limits on output line length; the business with \newlinechar
-% makes every space become a newline in the \@imgnotes file, so that all
+% makes every space become a newline in the \@mbenotes file, so that all
 % of the lines wind up being quite short.
 
 \long\def\@imgnotetext#1{%
-     \if@imgnotesopen \else \@openimgnotes \fi
-     \immediate\write\@imgnotes{\@doanimgnote{\@theimgmark}}%
+     \if@mbenotesopen \else \@openmbenotes \fi
+     \immediate\write\@mbenotes{\@doanimgnote{\@theimgmark}}%
      \begingroup
         \def\next{#1}%
         \newlinechar='40
-        \immediate\write\@imgnotes{\meaning\next}%
+        \immediate\write\@mbenotes{\meaning\next}%
      \endgroup
-     \immediate\write\@imgnotes{\@endanimgnote}}
-
+     \immediate\write\@mbenotes{\@endanimgnote}}
+%% end section to influence the notes file
 % \addtoimgnotes works the way the other imgnote macros probably should
 % have, requiring the use of \protect for fragile commands.
 
 \long\def\addtoimgnotes#1{%
-     \if@imgnotesopen \else \@openimgnotes \fi
+     \if@mbenotesopen \else \@openmbenotes \fi
      \begingroup
         \newlinechar='40
         \let\protect\string
@@ -761,7 +755,7 @@
 
 \def\imgnotesize{\footnotesize}
 
-\def\theimgnotes[#1]{\def\imgnotesname{#1}\immediate\closeout\@imgnotes \global\@imgnotesopenfalse
+\def\theimgnotes[#1]{\def\imgnotesname{#1}\immediate\closeout\@mbenotes \global\@mbenotesopenfalse
   \begingroup
     \makeatletter
     %
@@ -792,7 +786,7 @@
     \def\@endanimgnote{\par\endgroup}%
      \imgnoteheading 
     \imgnotesize
-    \input{\jobname.img}%
+    \input{\jobname.mbe}%
     \setcounter{imgnote}{0} \vspace{1.8em} 
   \endgroup}
  \newlength\imgheight{} \newlength\imgwidth{} \def\imgsize#1#2{\imgwidth=#1 \imgheight#2 }
@@ -837,7 +831,7 @@
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
 %% of this license or (at your option) any later version.
-%% The latest version of this license is in
+%% The lambe version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %% and version 1.2 or later is part of all distributions of LaTeX
 %% version 1999/12/01 or later.
@@ -866,10 +860,6 @@
 %%
 % as the last thing in your document.  (But \themathnotes all
 % by itself will work.)
-%
-
-%
-%
 %       ****************************************
 %       *        mathNOTE COMMANDS              *
 %       ****************************************
@@ -932,6 +922,7 @@
 %       ****************************************
 %
 
+\RequirePackage{picture}  
 \@definecounter{mathnote}
 \def\themathnote{\@arabic\c@mathnote}
 
@@ -956,38 +947,39 @@
 %  Here begins a section of mathnote code that's really different from
 % the footnote code of LaTeX.
 
+%% begin section to influence the notes file
 \let\@doanmathnote=0
 \let\@endanmathnote=0
 
-\newwrite\@mathnotes
-\newif\if@mathnotesopen \global\@mathnotesopenfalse
+\newwrite\@mbenotes
+\newif\if@mbenotesopen \global\@mbenotesopenfalse
 
-\def\@openmathnotes{\immediate\openout\@mathnotes=\jobname.math\relax
-      \global\@mathnotesopentrue}
+\def\@openmbenotes{\immediate\openout\@mbenotes=\jobname.mbe\relax
+      \global\@mbenotesopentrue}
 
 %  The stuff with \next and \meaning is a trick from the TeXbook, 382,
 % there intended for setting verbatim text, but here used to avoid
 % macro expansion when the footnote text is written.  \next will have
 % the entire text of the footnote as one long line, which might well
 % overflow limits on output line length; the business with \newlinechar
-% makes every space become a newline in the \@mathnotes file, so that all
+% makes every space become a newline in the \@mbenotes file, so that all
 % of the lines wind up being quite short.
 
 \long\def\@mathnotetext#1{%
-     \if@mathnotesopen \else \@openmathnotes \fi
-     \immediate\write\@mathnotes{\@doanmathnote{\@themathmark}}%
+     \if@mbenotesopen \else \@openmbenotes \fi
+     \immediate\write\@mbenotes{\@doanmathnote{\@themathmark}}%
      \begingroup
         \def\next{#1}%
         \newlinechar='40
-        \immediate\write\@mathnotes{\meaning\next}%
+        \immediate\write\@mbenotes{\meaning\next}%
      \endgroup
-     \immediate\write\@mathnotes{\@endanmathnote}}
-
+     \immediate\write\@mbenotes{\@endanmathnote}}
+%% end section to influence the notes file
 % \addtomathnotes works the way the other mathnote macros probably should
 % have, requiring the use of \protect for fragile commands.
 
 \long\def\addtomathnotes#1{%
-     \if@mathnotesopen \else \@openmathnotes \fi
+     \if@mbenotesopen \else \@openmbenotes \fi
      \begingroup
         \newlinechar='40
         \let\protect\string
@@ -1054,7 +1046,7 @@
 
 \def\mathnotesize{\footnotesize}
 
-\def\themathnotes[#1]{\def\mathnotesname{#1}\immediate\closeout\@mathnotes \global\@mathnotesopenfalse
+\def\themathnotes[#1]{\def\mathnotesname{#1}\immediate\closeout\@mbenotes \global\@mbenotesopenfalse
   \begingroup
     \makeatletter
     %
@@ -1085,7 +1077,7 @@
     \def\@endanmathnote{\par\endgroup}%
      \mathnoteheading 
     \mathnotesize
-    \input{\jobname.math}%
+    \input{\jobname.mbe}%
     \setcounter{mathnote}{0} \vspace{1.8em} 
   \endgroup}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%