notes2bib update (2nov07)

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

4 files changed, 28 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/notes2bib/README b/Master/texmf-dist/doc/latex/notes2bib/README
index 95e699b5978..5b8db08ebd9 100644
--- a/Master/texmf-dist/doc/latex/notes2bib/README
+++ b/Master/texmf-dist/doc/latex/notes2bib/README
@@ -1,10 +1,10 @@
-The notes2bib package --- Integrating notes into the bibliography
-
 ----------------------------------------------------------------
+The notes2bib package --- Integrating notes into the
+  bibliography
 Maintained by Joseph Wright
 E-mail: joseph.wright@morningstar2.co.uk
-Released under the GNU General Public License
-See http://www.gnu.org/licenses/gpl.txt
+Released under the LaTeX Project Public License v1.3 or later
+See http://www.latex-project.org/lppl.txt
 ----------------------------------------------------------------
 
 The notes2bib package defines a new type of note, bibnote,
diff --git a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
index 8ec0c4ef7c1..a3598219ac2 100644
--- a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
+++ b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
diff --git a/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx b/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
index 9329e2f86d5..ca9e07bf674 100644
--- a/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
+++ b/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
@@ -108,7 +108,7 @@
 %</driver>
 %\fi
 %
-%\CheckSum{504}
+%\CheckSum{509}
 %
 %\CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -527,7 +527,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{notes2bib}
-  [2007/10/26 v1.2 Integrating notes into the bibliography]
+  [2007/10/31 v1.2a Integrating notes into the bibliography]
 %    \end{macrocode}
 % The package requires e-TeX, so before going any further, this is
 % tested.  This code is taken more-or-less verbatim from |biblatex|.
@@ -640,6 +640,7 @@
 %    \end{macrocode}
 %\end{macro}
 %
+%\changes{v1.2a}{2007/10/31}{Improved messages on loading package}
 % The |head| and |tail| options are mutually exclusive, so a check is
 % made that both have not been selected.  If they have, the package
 % ignores both options after a suitable warning.
@@ -648,15 +649,21 @@
   \ifniib@tail
     \PackageWarning{notes2bib}
       {You've given both ``head'' and ``tail'' as
-        options\MessageBreak  I'm ignoring both!}
+        options\MessageBreak  I'm ignoring both!\MessageBreak
+        bibnotes will be interspersed with other citations}
     \niib@headfalse\niib@tailfalse
   \else
     \PackageInfo{notes2bib}%
-      {bibnotes will ``head'' other citations}
+      {bibnotes will head other citations}
   \fi
 \else
-  \PackageInfo{notes2bib}%
-    {bibnotes will ``tail'' other citations}
+  \ifniib@tail
+    \PackageInfo{notes2bib}%
+      {bibnotes will tail other citations}
+  \else
+    \PackageInfo{notes2bib}%
+      {bibnotes will be interspersed with other citations}
+  \fi
 \fi
 %    \end{macrocode}
 % For the |head| option, the normal citation commands are modified to
diff --git a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
index 4ec2fdfce2a..e19a1ef31a5 100644
--- a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
+++ b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
@@ -15,7 +15,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{notes2bib}
-  [2007/10/26 v1.2 Integrating notes into the bibliography]
+  [2007/10/31 v1.2a Integrating notes into the bibliography]
 \@ifundefined{eTeXversion}
   {\PackageError{notes2bib}
      {Not running under e-TeX}
@@ -73,15 +73,21 @@
   \ifniib@tail
     \PackageWarning{notes2bib}
       {You've given both ``head'' and ``tail'' as
-        options\MessageBreak  I'm ignoring both!}
+        options\MessageBreak  I'm ignoring both!\MessageBreak
+        bibnotes will be interspersed with other citations}
     \niib@headfalse\niib@tailfalse
   \else
     \PackageInfo{notes2bib}%
-      {bibnotes will ``head'' other citations}
+      {bibnotes will head other citations}
   \fi
 \else
-  \PackageInfo{notes2bib}%
-    {bibnotes will ``tail'' other citations}
+  \ifniib@tail
+    \PackageInfo{notes2bib}%
+      {bibnotes will tail other citations}
+  \else
+    \PackageInfo{notes2bib}%
+      {bibnotes will be interspersed with other citations}
+  \fi
 \fi
 \AtBeginDocument{%
   \ifniib@head