notes2bib 2.0h (9sep11)

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

3 files changed, 22 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
index 18260a92a2d..0e340123c06 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 26a4aafbcf6..2f56fad6e8b 100644
--- a/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
+++ b/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
@@ -628,7 +628,7 @@ This work consists of the file  notes2bib.dtx
 % Version data to start with.
 %    \begin{macrocode}
 \ProvidesExplPackage
-  {notes2bib} {2011/06/30} {2.0g}
+  {notes2bib} {2011/09/09} {2.0h}
   {Integrating notes into the bibliography}
 \RequirePackage{l3keys2e}
 %    \end{macrocode} 
@@ -1236,6 +1236,8 @@ This work consists of the file  notes2bib.dtx
 %  \pkg{biblatex} v1.1a or later}
 %\changes{v2.0f}{2011/02/23}{Use new \cs{addglobalbib} function with
 %  \pkg{biblatex} v1.2 or later}
+%\changes{v2.0h}{2011/09/09}{Use \cs{addglobalbib} function irrespective
+%  of load order}
 %\begin{macro}{\bibliography}
 %\begin{macro}{\niib_bibliography:n}
 % Getting the database created here to be scanned by \BibTeX\ is
@@ -1282,9 +1284,16 @@ This work consists of the file  notes2bib.dtx
 \@ifpackageloaded { biblatex } 
   {
     \@ifpackagelater { biblatex } { 2011/01/08 }
-      { \exp_args:NNV \bibliography * \g_niib_filename_tl }
+      { 
+        \@ifpackagelater { biblatex } { 2011/02/12 }
+          { 
+            
+            \exp_args:No \addglobalbib 
+              { \g_niib_filename_tl .bib }
+          }
+          { \exp_args:NNV \bibliography * \g_niib_filename_tl }
+      }
       { \exp_args:NV \bibliography \g_niib_filename_tl }
-    \cs_gundefine:N \niib_attach_bibliography:
   }
   { \AtBeginDocument { \niib_attach_bibliography: } }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
index e9a9b8d1def..cae545130c0 100644
--- a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
+++ b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
@@ -15,7 +15,7 @@
 %% 
 \RequirePackage{xparse}
 \ProvidesExplPackage
-  {notes2bib} {2011/06/30} {2.0g}
+  {notes2bib} {2011/09/09} {2.0h}
   {Integrating notes into the bibliography}
 \RequirePackage{l3keys2e}
 \tl_new:N \c_niib_file_message_tl
@@ -347,9 +347,16 @@
 \@ifpackageloaded { biblatex }
   {
     \@ifpackagelater { biblatex } { 2011/01/08 }
-      { \exp_args:NNV \bibliography * \g_niib_filename_tl }
+      {
+        \@ifpackagelater { biblatex } { 2011/02/12 }
+          {
+
+            \exp_args:No \addglobalbib
+              { \g_niib_filename_tl .bib }
+          }
+          { \exp_args:NNV \bibliography * \g_niib_filename_tl }
+      }
       { \exp_args:NV \bibliography \g_niib_filename_tl }
-    \cs_gundefine:N \niib_attach_bibliography:
   }
   { \AtBeginDocument { \niib_attach_bibliography: } }
 \AtBeginDocument {