update notes2bib again

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

3 files changed, 73 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
index d99ab79d7c6..233fb84c5da 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 185fa2f19ce..a342fc4ee82 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{766}
+%\CheckSum{778}
 %
 %\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
@@ -144,20 +144,20 @@
 %  and \opt{sort=tail} implementation}
 %
 %\DoNotIndex{\@auxout,\@empty,\@fileswfalse,\@for,\@ifnextchar}
-%\DoNotIndex{\@ifpackageloaded,\@ifundefined,\@nameuse}
-%\DoNotIndex{\AtBeginDocument,\AtEndDocument,\AtEndPreamble}
-%\DoNotIndex{\AtNextCite,\begingroup,\closeout,\DeclareRobustCommand}
-%\DoNotIndex{\def,\define@boolkey,\define@choicekey,\define@cmdkeys}
-%\DoNotIndex{\do,\edef,\else,\endgroup,\endinput,\expandafter,\fi}
-%\DoNotIndex{\g@addto@macro,\gappto,\gdef,\if@filesw,\iffalse,\ifnum}
-%\DoNotIndex{\ifx,\immediate,\jobname,\let,\long,\MessageBreak}
-%\DoNotIndex{\NeedsTeXFormat,\newcommand,\newcounter,\newif}
-%\DoNotIndex{\newwrite,\nocite,\noexpand,\openout,\PackageError}
-%\DoNotIndex{\PackageInfo,\PackageWarning,\patchcmd}
-%\DoNotIndex{\printbibliography,\ProcessOptionsX,\ProvidesPackage}
-%\DoNotIndex{\relax,\renewcommand,\RequirePackage,\setkeys,\space}
-%\DoNotIndex{\stepcounter,\string,\the,\typeout,\unexpanded,\value}
-%\DoNotIndex{\write,\xdef,\z@}
+%\DoNotIndex{\@ifpackagelater,\@ifpackageloaded,\@ifundefined}
+%\DoNotIndex{\@nameuse,\AtBeginDocument,\AtEndDocument}
+%\DoNotIndex{\AtEndPreamble,\AtNextCite,\begingroup,\closeout}
+%\DoNotIndex{\DeclareRobustCommand,\def,\define@boolkey}
+%\DoNotIndex{\define@choicekey,\define@cmdkeys,\do,\edef,\else}
+%\DoNotIndex{\endgroup,\endinput,\expandafter,\fi,\g@addto@macro}
+%\DoNotIndex{\gappto,\gdef,\if@filesw,\iffalse,\ifnum,\ifx}
+%\DoNotIndex{\immediate,\jobname,\let,\long,\MessageBreak}
+%\DoNotIndex{\NeedsTeXFormat,\newcommand,\newcounter,\newif\newwrite}
+%\DoNotIndex{\nocite,\noexpand,\openout,\PackageError,\PackageInfo}
+%\DoNotIndex{\PackageWarning,\patchcmd,\printbibliography}
+%\DoNotIndex{\ProcessOptionsX,\ProvidesPackage,\relax,\renewcommand}
+%\DoNotIndex{\RequirePackage,\setkeys,\space\stepcounter,\string}
+%\DoNotIndex{\the,\typeout,\unexpanded,\value,\write,\xdef,\z@}
 %
 %\title{\currpkg\ --- Integrating notes into the
 %  bibliography^^A
@@ -408,6 +408,21 @@
 %  \makeatother
 %\end{LaTeXexample}
 %
+%\section{Package requirements}
+% \currpkg has certain requirements to run successfully; if these are
+% not met the package will abort loading.
+%\begin{itemize}
+%  \item \eTeX:  The package uses the \eTeX\ \cs{unexpanded}
+%    primitive, and so the extensions must be available.
+%  \item \pkg{xkeyval}, v2.5 or later: Option handling uses
+%    \pkg{xkeyval}, and the features used here are only available
+%    from v2.5 of that package.
+%  \item \pkg{etoolbox}, v1.3 or later:  Patching the \cs{thanks} macro
+%    to allow the \opt{footnotes} option also uses \pkg{etoolbox}.
+%    Various hooks are set up by \pkg{etoolbox}, which are used here
+%    to make the code clearer; these are only available from v1.3.
+%\end{itemize}
+%
 %\section{Known issues}
 % From v1.1, the method for writing notes to the \BibTeX\ database has
 % been modified.  This means that bibnotes cannot contain verbatim
@@ -507,7 +522,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{notes2bib}
-  [2008/01/08 v1.3 Integrating notes into the bibliography]
+  [2008/01/09 v1.3a Integrating notes into the bibliography]
 %    \end{macrocode}
 % The package requires \eTeX, so before going any further, this is
 % tested.  This code is taken more-or-less verbatim from
@@ -524,9 +539,31 @@
      \endgroup\endinput}
     {\endgroup}
 %    \end{macrocode}
-% The necessary support packages are loaded.
+%\changes{v1.3a}{2008/01/09}{Require at least v2.5 of \pkg{xkeyval}}
+%\changes{v1.3a}{2008/01/09}{Require at least v1.3 of \pkg{etoolbox}}
+% The necessary support packages are loaded.  The method used in
+% \pkg{biblatex} is used to check the date of the packages: \currpkg
+% bails out if the support packages are too old.
 %    \begin{macrocode}
 \RequirePackage{xkeyval,etoolbox}
+\@ifpackagelater{xkeyval}{2005/05/07}
+  {}
+  {\PackageError{notes2bib}
+     {xkeyval >= 2.5 required}
+     {notes2bib requires the `xkeyval' package, version 2.5 or 
+       later.\MessageBreak The version loaded is: 
+       `\@nameuse{ver@etoolbox.sty}'.\MessageBreak
+        This is a fatal error; the package will abort.}%
+   \endinput}
+\@ifpackagelater{etoolbox}{2007/10/08}
+  {}
+  {\PackageError{notes2bib}
+     {etoolbox >= 1.3 required}
+     {notes2bib requires the `etoolbox' package, version 1.3 or
+       later.\MessageBreak The version loaded is:
+       `\@nameuse{ver@etoolbox.sty}'.\MessageBreak
+        This is a fatal error; the package will abort.}%
+   \endinput}
 %    \end{macrocode}
 %\begin{macro}{\niib@tempa}
 %\changes{v1.3}{2008/01/08}{New macro}
diff --git a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
index d132e311795..8a33989a8b1 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}
-  [2008/01/08 v1.3 Integrating notes into the bibliography]
+  [2008/01/09 v1.3a Integrating notes into the bibliography]
 \begingroup
   \@ifundefined{eTeXversion}
     {\PackageError{notes2bib}
@@ -26,6 +26,24 @@
      \endgroup\endinput}
     {\endgroup}
 \RequirePackage{xkeyval,etoolbox}
+\@ifpackagelater{xkeyval}{2005/05/07}
+  {}
+  {\PackageError{notes2bib}
+     {xkeyval >= 2.5 required}
+     {notes2bib requires the `xkeyval' package, version 2.5 or
+       later.\MessageBreak The version loaded is:
+       `\@nameuse{ver@etoolbox.sty}'.\MessageBreak
+        This is a fatal error; the package will abort.}%
+   \endinput}
+\@ifpackagelater{etoolbox}{2007/10/08}
+  {}
+  {\PackageError{notes2bib}
+     {etoolbox >= 1.3 required}
+     {notes2bib requires the `etoolbox' package, version 1.3 or
+       later.\MessageBreak The version loaded is:
+       `\@nameuse{ver@etoolbox.sty}'.\MessageBreak
+        This is a fatal error; the package will abort.}%
+   \endinput}
 \newcommand*{\niib@tempa}{}
 \newcommand*{\niib@tempb}{}
 \newif\ifniib@debug