mbenotes update

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

4 files changed, 54 insertions, 62 deletions

diff --git a/Master/texmf-dist/doc/latex/mbenotes/README b/Master/texmf-dist/doc/latex/mbenotes/README
index 70e5ef4a92c..dedeb6bfd06 100644
--- a/Master/texmf-dist/doc/latex/mbenotes/README
+++ b/Master/texmf-dist/doc/latex/mbenotes/README
@@ -2,7 +2,7 @@
  Version 2 2011-5-20 
  Author's name: Matthias Borck-Elsner 
  Author's email: matthias at kleinesnetzwerk.net 
- Location on CTAN: http://mirror.ctan.org/macros/latex/contrib/tablenotes/mbenotes.sty 
+ Location on CTAN: http://mirror.ctan.org/macros/latex/contrib/mbenotes/mbenotes.sty 
  Summary description: Flexible notes in texts,tables,equations and images. 
  License type: lppl 
  Announcement text: sty file to place notes into text,tables, equations and images and list them.
diff --git a/Master/texmf-dist/doc/latex/mbenotes/mbenotes.pdf b/Master/texmf-dist/doc/latex/mbenotes/mbenotes.pdf
index 67ed95c1979..76d92a8b9ee 100644
--- a/Master/texmf-dist/doc/latex/mbenotes/mbenotes.pdf
+++ b/Master/texmf-dist/doc/latex/mbenotes/mbenotes.pdf
diff --git a/Master/texmf-dist/doc/latex/mbenotes/mbenotes.tex b/Master/texmf-dist/doc/latex/mbenotes/mbenotes.tex
index 512d5b99a49..10221d0a94a 100644
--- a/Master/texmf-dist/doc/latex/mbenotes/mbenotes.tex
+++ b/Master/texmf-dist/doc/latex/mbenotes/mbenotes.tex
@@ -1 +1 @@
-\documentclass[a4paper,10pt]{article}\usepackage{array,mbenotes,endnotes,longtable,color,graphicx,picture,amsmath}\usepackage[utf8]{inputenc}\title{mbenotes}\author{Matthias Borck-Elsner}\begin{document} \maketitle \begin{tabular}{ll}Name of contribution:& mbenotes \\ Version & 2 2011-5-13 \\ Author's name:& Matthias Borck-Elsner \\ Author's email:& matthias at kleinesnetzwerk.net \\ Location on CTAN:& http://mirror.ctan.org/macros/latex/contrib/tablenotes/mbenotes.sty \\ Summary description:& Flexible notes in texts,tables and images, like footnotes and endnotes. \\ License type:& lppl \\ Announcement text:& sty file to place notes into text, tables, equations and images and list them. \\ & For every purpose a -note-command is defined: mbenote, tab.., math., img... \\ & New commands are defined: \textbackslash ruler \textbackslash imgwidth and \textbackslash imgheight\\ & The endnotes still work! \\ &mbenotes is based on endnotes.sty Copyright 2002 John Lavagnino. \\ \end{tabular} \\ \section{mbenotes}The mbenotes are similar to endnotes, you put a \textbackslash mbenote\{textofmbenote\} \mbenote{textofmbenote} into your text, a mark is displayed and by calling \textbackslash thembenotes[mbenotes] the notes are listed. All notes up to this point will be listed \mbenote{textof2mbenote} \thembenotes[mbenotes] Next call will list the following notes up to the second call, if no new note is set, the last known note will be repeated.\mbenote{textof3mbenote} As you can see, the name of the notes is optional \mbenote{, you may leave it empty} and formatted as a subsubsection \thembenotes[optional]. \section{tabnotes}\begin{longtable}{p{5cm}p{5cm}} \caption{newtable} \\ \textbackslash tabnote\{tabnotetext\} is used in the same way, they can be set into tables \tabnote{This is a longtable} and texts and are called by \textbackslash thetabnotes[tabnotes] \thetabnotes[column1]& The difference\tabnote{difference} is, that \textbackslash thetabnotes\lbrack \rbrack, if called inside the table, displays the notes up to that point, if you do not call the notes in columns or the table, you might call them at the end of the table, under the table or at end document. \thetabnotes[column2]\end{longtable} \begin{longtable}{|p{5cm}|p{5cm}|} \caption{outside} \\ \hline \newline In this example, the notes are called after the table and outside \tabnote{outside}& \newline of the environment.  If you like, you may  \tabnote{put your notes under the table} and impress someone.\\ \hline \end{longtable}\thetabnotes[outside]  \section{images} You might want to put notes into images  with some help of a ruler... \\ \\ \imgsize{3cm}{3cm} \includegraphics[width=\imgwidth,height=\imgheight]{test}  \ruler{-0}{0} \putimgnote{-0.50}{0.5}{Hot air balloon} \putimgnote{-1}{1}{There's something special \dots}\theimgnotes[imgnotes] Use \textbackslash putimgnote\{-1\}\{+1\}\{There's something special \dots\} or any value you take from the ruler. The ruler takes its values from \textbackslash imgsize, therefore it has to be called right after the image. If not called, the ruler will not be displayed \section{mathnote}You might even put notes into equations\dots notes in equations are colored red . \\\begin{equation}{\frac{1000\mathnote{people in village}}{500}} + \frac{1}{uec\mathnote{unknown constant}} + \sqrt{mc\textsuperscript{2}}= 42 \mathnote{the answer, for now}\end{equation} \themathnotes[] \section{Why this was called "tablenotes" at first}When I first was involved, the question was, how to set notes into tables \textbf{and} to display them as tables. \begin{longtable} {|p{4cm}|p{4cm}|} \caption{tablenotes} \\ This is a mbenote \mbenote{This is a mbenote} & This is a tabnote\tabnote{This is a tabnote} \\ \thembenotes[]&\thetabnotes[] \\ \end{longtable}\endnote{Thanks to John Lavagnino \dots  to be continued \dots}  \theendnotes\end{document}
\ No newline at end of file
+\documentclass[a4paper,10pt]{article}\usepackage{array,mbenotes,endnotes,longtable,color,graphicx,picture,amsmath}\usepackage[utf8]{inputenc}\title{mbenotes}\author{Matthias Borck-Elsner}\begin{document} \maketitle \begin{tabular}{ll}Name of contribution:& mbenotes \\ Version & 2 2011-5-13 \\ Author's name:& Matthias Borck-Elsner \\ Author's email:& matthias at kleinesnetzwerk.net \\ Location on CTAN:& http://mirror.ctan.org/macros/latex/contrib/mbenotes/mbenotes.sty \\ Summary description:& Flexible notes in texts,tables and images, like footnotes and endnotes. \\ License type:& lppl \\ Announcement text:& sty file to place notes into text, tables, equations and images and list them. \\ & For every purpose a -note-command is defined: mbenote, tab.., math., img... \\ & New commands are defined: \textbackslash ruler \textbackslash imgwidth and \textbackslash imgheight\\ & The endnotes still work! \\ &mbenotes is based on endnotes.sty Copyright 2002 John Lavagnino. \\ \end{tabular} \\ \section{mbenotes}The mbenotes are similar to endnotes, you put a \textbackslash mbenote\{textofmbenote\} \mbenote{textofmbenote} into your text, a mark is displayed and by calling \textbackslash thembenotes[mbenotes] the notes are listed. All notes up to this point will be listed \mbenote{textof2mbenote} \thembenotes[mbenotes] Next call will list the following notes up to the second call, if no new note is set, the last known note will be repeated.\mbenote{textof3mbenote} As you can see, the name of the notes is optional \mbenote{you may leave it empty} and formatted as a subsubsection \thembenotes[optional] \section{tabnotes}\begin{longtable}{p{5cm}p{5cm}} \caption{newtable} \\ \textbackslash tabnote\{tabnotetext\} is used in the same way, they can be set into tables \tabnote{This is a longtable} and texts and are called by \textbackslash thetabnotes[tabnotes] \thetabnotes[column1]& The difference\tabnote{difference} is, that \textbackslash thetabnotes\lbrack \rbrack, if called inside the table, displays the notes up to that point, if you do not call the notes in columns or the table, you might call them at the end of the table, under the table or at end document. \thetabnotes[column2]\end{longtable} \begin{longtable}{|p{5cm}|p{5cm}|} \caption{outside} \\ \hline \newline In this example, the notes are called after the table and outside \tabnote{outside}& \newline of the environment.  If you like, you may  \tabnote{put your notes under the table} and impress someone.\\ \hline \end{longtable}\thetabnotes[outside]  \section{imgnotes} You might want to put notes into images with some help of a ruler... it would be wise to put the image and the notes into a picture environment, because the put-command is used. \par  \imgsize{3cm}{3cm} \begin{picture}(\imgwidth,\imgheight)\includegraphics[width=\imgwidth,height=\imgheight]{mbe}  \ruler{-0}{0} \putimgnote{-0.50}{0.5}{Hot air balloon} \putimgnote{-1}{0.5}{There's something special \dots}\end{picture}\theimgnotes[imgnotes] Use \textbackslash putimgnote\{-1\}\{+1\}\{There's something special \dots\}  or any value you take from the ruler. The ruler takes its values from \textbackslash imgsize, therefore it has to be called right after the image. If not called, the ruler will not be displayed. \section{mathnote}You might even put notes into equations\dots notes in equations are colored red . \\\begin{equation}42\mathnote{The answer,for now}=\sqrt{mc\textsuperscript{2}} \end{equation} \themathnotes[] \section{Why this was called "tablenotes" at first}When I first was involved, the question was, how to set notes into tables \textbf{and} to display them as tables. \begin{longtable} {|p{4cm}|p{4cm}|} \caption{tablenotes} \\ This is a tabnote \tabnote{This is a tabnote} \thetabnotes[]& This is a tabnote\tabnote{This is a tabnote} \thetabnotes[] \\ \end{longtable} The namings and functions collided with the threeparttable package, so I decided to rename my package "mbenotes"\endnote{Thanks to John Lavagnino \dots  to be continued \dots}  \theendnotes\end{document}
\ No newline at end of file
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}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%