notes2bib update (3sep07)

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

1 files changed, 18 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
index 6046f97398f..8e73720bd46 100644
--- a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
+++ b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{notes2bib}
-  [2007/08/30 v1.0 Integrating notes into the bibliography]
+  [2007/09/03 v1.0a Integrating notes into the bibliography]
 \RequirePackage{xspace}
 \newif\ifniib@fn\niib@fnfalse
 \DeclareOption{footnotes}{%
@@ -156,7 +156,7 @@
   \fi%
 }
 \newcommand*\delaycite[1]{%
-  \expandafter\ifx\csname niib@orig@#1\endcsname\@undefined%
+  \@ifundefined{niib@orig@#1}{%
     \expandafter\expandafter\expandafter\let\expandafter%
       \csname niib@orig@#1\expandafter\endcsname\csname #1\endcsname%
     \expandafter\renewcommand\csname #1\endcsname[2][\relax]{%
@@ -179,11 +179,25 @@
         \fi%
       \fi%
     }%
-  \else%
+  }{%
     \PackageInfo{notes2bib}%
       {Citation type ``#1'' already delayed}%
-  \fi%
+  }
 }
+\ifniib@tail
+  \newcommand*\citenote[2][\relax]{%
+    \begingroup%
+      \@fileswfalse%
+      \ifx#1\relax
+        \niibcite{#2}%
+      \else
+        \niibcite[#1]{#2}
+      \fi
+    \endgroup%
+  }
+\else
+  \newcommand*\citenote{\niibcite}
+\fi
 \newcommand*{\Percent}{\%\xspace}
 \@ifpackageloaded{biblatex}
   {\def\niib@keyname{keysort}}