footbib 2.0.7 (20feb10)

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

1 files changed, 25 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/footbib/footbib.sty b/Master/texmf-dist/tex/latex/footbib/footbib.sty
index 739f984a06e..f24084a9618 100644
--- a/Master/texmf-dist/tex/latex/footbib/footbib.sty
+++ b/Master/texmf-dist/tex/latex/footbib/footbib.sty
@@ -21,19 +21,19 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %%
-%% File: footbib.dtx Copyright (C) 1997-2005 Eric Domenjoud
+%% File: footbib.dtx Copyright (C) 1997-2010 Eric Domenjoud
 %%
 %% Eric Domenjoud,
-%% CRIN/CNRS & INRIA Lorraine
+%% LORIA/CNRS
 %% E-mail: Eric.Domenjoud@loria.fr
 %%
 
-\def\fileversion{2.0.4}
-\def\filedate{2004/06/04}
+\def\fileversion{2.0.7}
+\def\filedate{2007/02/20}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{footbib}[\filedate\space v\fileversion\space(E.Domenjoud)]
 \@makeother\`
-\edef\@tempa{\catcode\string`\string`=\the\catcode\string``\relax}
+\edef\@tempa{\catcode\string`\string`\string=\the\catcode\string``\relax}
 \def\@tempb#1{\catcode`\noexpand#1\string=\the\catcode`#1\relax}
 \edef\@tempa{\@tempa
   \@tempb\:\@tempb\?\@tempb\=\@tempb\<\@tempb\>\@tempb\+\@tempb\-%
@@ -72,7 +72,7 @@
   \vbox{}\clearpage\fi\fi\else\setbox\@cclv\vbox{\box\@cclv\vfil}\@makecol
   \@opcol\clearpage\fi}
 \@tempa\@makecol{\ifvoid\footins\setbox\@outputbox\box\@cclv\else\setbox
-  \@outputbox\vbox{\boxmaxdepth\@maxdepth\@tempdima\dp\@cclv\unvbox\@cclv
+  \@outputbox\vbox{\boxmaxdepth\@maxdepth\unvbox\@cclv
   \vskip\skip\footins\color@begingroup\normalcolor\footnoterule\unvbox
   \footins\color@endgroup}\fi\let\@elt\relax\xdef\@freelist{\@freelist
   \@midlist}\global\let\@midlist\@empty\@combinefloats\ifvbox\@kludgeins
@@ -206,7 +206,8 @@
   \begingroup
     \let\do\fb@doactive \dospecials
     \edef\@tempa{\endgroup\def\noexpand#1{#2}}%
-  \@tempa}
+  \@tempa
+  \edef#1{\expandafter\strip@prefix\meaning#1}}
 \newcommand*\fb@namexdef[1]{\expandafter\xdef\csname#1\endcsname}
 \newwrite\fb@auxout
 \newcommand*\fb@writeaux[2]{%
@@ -291,7 +292,7 @@
 \newcommand\footbibliography{\fb@writeaux\bibdata}
 \newcommand\footbibliographystyle{\fb@writeaux\bibstyle}
 \newcommand*\fb@refnotfound[1]{%
-  {?}{*** ERROR: citation `{\normalfont\bfseries#1}' undefined ***}}
+  {?}{*** ERROR: citation `{\normalfont\ttfamily\bfseries#1}' undefined ***}}
 \newif\iffb@lbl
 \newif\iffb@txt
 \DeclareRobustCommand\footcite{%
@@ -328,7 +329,7 @@
   \footcite*[#1]{#2}%
   \iffb@xcrossrefs
     \fb@vedef\fb@keys{#2}%
-    \xdef\fb@deferredcite{\fb@keys,\fb@deferredcite}%
+    \xdef\fb@deferredcite{\fb@deferredcite\fb@keys,}%
   \fi}
 \let\fb@deferredcite\@empty
 \def\fb@xnocite#1,#2\@nil{%
@@ -390,23 +391,23 @@
   \fi}
 \newcommand\fb@citefn{%
   \insert\fb@ins{%
+    \reset@font\footrefstyle
+    \interlinepenalty\iffb@nosplit\@M\else\interfootnotelinepenalty\fi
+    \splittopskip 1.2\ht\strutbox
+    \splitmaxdepth \dp\strutbox
+    \floatingpenalty \@MM
+    \hsize\columnwidth
+    \@parboxrestore
+    \ifx\newblock\@undefined\let\newblock\relax\fi
+    \iffb@crossrefs\let\cite\fb@xfootcite\fi
+    \@tempdima\fb@lblwidth
+    \advance\@tempdima\labelsep
+    \leftskip\@tempdima
     \color@begingroup
-      \reset@font\footrefstyle
-      \interlinepenalty\iffb@nosplit\@M\else\interfootnotelinepenalty\fi
-      \splittopskip 1.2\ht\strutbox
-      \splitmaxdepth \dp\strutbox
-      \floatingpenalty \@MM
-      \hsize\columnwidth
-      \@parboxrestore
-      \ifx\newblock\@undefined\let\newblock\relax\fi
-      \iffb@crossrefs\let\cite\fb@xfootcite\fi
-      \@tempdima\fb@lblwidth
-      \advance\@tempdima\labelsep
-      \leftskip\@tempdima
       \setbox\@tempboxa\hbox{\footreflabel{\the\fb@lbl}}%
       \hskip-\@tempdima
       \ifdim\wd\@tempboxa<\fb@lblwidth
-        \hbox to\fb@lblwidth{\unhbox\@tempboxa\hfil}%
+        \hb@xt@\fb@lblwidth{\unhbox\@tempboxa\hfil}%
       \else
         \box\@tempboxa
       \fi
@@ -575,7 +576,8 @@
       \let\citation\@gobble \let\bibstyle\@gobble \let\bibdata\@gobble
       \def\bibcite#1#2#3#4#5{%
         \advance\fb@citecount\@ne
-        \fb@vedef\@tempa{{#1}{#2}{#3}{#4}{#5}}%
+        \fb@vedef\@tempa{#1}%
+        \edef\@tempa{{\@tempa}{#2}{#3}{#4}{#5}}%
         \expandafter\ifx\csname fb@c.\the\fb@citecount\endcsname
           \@tempa\else\@tempswatrue\fi}%
       \fb@citecount\z@
@@ -686,9 +688,7 @@
   \else
     \setbox\@outputbox \vbox {%
       \boxmaxdepth \@maxdepth
-      \@tempdima\dp\@cclv
       \unvbox \@cclv
-      \vskip-\@tempdima
       \ifvoid\footins \else
         \vskip \skip\footins
         \color@begingroup