The Krakow-Vienna train ride update

package updates:
	ccaption cdpbundl chem-journal clefval coordsys dingbat dramatist
	egplot filecontents lcd maybemath metaobj metaplot mwcls pdfscreen
	pst-bar rsc dpfloat footbib jurabib

added to ctan-tpm-check (and re-indented the long list)
 no changes between CTAN and depot, only added to the WorkingTPM list
	acmtrans bibunits bitfield blindtext bophook cherokee citeref
	cmdtrack colorinfo compactbib courier-scaled courseoutline coursepaper
	crop custom-bib cvsty dancers dashbox dcpic decimal digiconfigs
	dinat directory eCards eemeir ellipsis engrec envbig epiolmec epsf
	eqparbox eskd ethiop-t1 euro eurosans exam examplep expressg
	extarrows extsizes fp fribrief functan gatech-thesis ginpenc greenpoint
	hands hitec hvfloat hyperxmp inlinebib invoice isorot isotope jpsj
	kalender kerkis keystroke labels layouts lcg leaflet leawood lgreek
	limap lipsum listliketab logpap ltablex ltxindex mailing makebox
	makecirc makeglos maple mceinleger menu metatex mftinc mhs multicap
	mwrite nath nature ntgclass numline ofs ogham oldstyle papercdcase 
	paresse parrun permute phaistos pittetd plates preprint prettyref 
	program pseudocode pspicture pst-fr3d pst-math qcm rccol rcsinfo 
	resume robustindex sae sauerj
 updates with changed files, but no added/removed files:
	ccaption cdpbundl chem-journal clefval coordsys dingbat dramatist
	egplot filecontents lcd maybemath metaobj metaplot mwcls pdfscreen
	pst-bar rsc
 updates with changes and added/removed files:
 	dpfloat footbib jurabib


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

2 files changed, 67 insertions, 26 deletions

diff --git a/Master/texmf-dist/source/latex/footbib/footbib.dtx b/Master/texmf-dist/source/latex/footbib/footbib.dtx
index 6b5cc08abe1..dfe812c8255 100644
--- a/Master/texmf-dist/source/latex/footbib/footbib.dtx
+++ b/Master/texmf-dist/source/latex/footbib/footbib.dtx
@@ -1,12 +1,24 @@
 % \iffalse
-%% File: footbib.dtx Copyright (C) 1997 Eric Domenjoud
+%%
+%% File: footbib.dtx Copyright (C) 1997-2005 Eric Domenjoud
 %%
 %% Eric Domenjoud,
 %% CRIN/CNRS & INRIA Lorraine
 %% E-mail: Eric.Domenjoud@loria.fr
 %%
-\def\fileversion{2.0.1}
-\def\filedate{1999/05/06}
+% This program may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.2
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.2 or later is part of all distributions of LaTeX 
+% version 1999/12/01 or later.
+%
+% This program consists of the files footbib.dtx and footbib.ins
+
+
+\def\fileversion{2.0.4}
+\def\filedate{2004/06/04}
 %<*driver>
 %%
 %%  To produce the documentation, do the following:
@@ -40,7 +52,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{2050}
+% \CheckSum{2068}
 %
 % \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
@@ -102,7 +114,7 @@
 %   \index{#1s:\levelchar{\protect\ttfamily#2}\encapchar usage}\@esphack}
 % \newcommand\SpecialMainNonMacroIndex[2]{^^A
 %   \@bsphack\special@index{#2\actualchar{\string\ttfamily\space#2}
-% 		  (#1)\encapchar main}^^A
+%                 (#1)\encapchar main}^^A
 %   \index{#1s:\levelchar{\protect\ttfamily#2}\encapchar main}\@esphack} 
 % \newcommand*\NonM@cro@[1]{\m@cro@\iffalse{#1}^^A
 %   \let\SpecialMainEnvIndex\fb@tmp\ignorespaces}
@@ -138,14 +150,14 @@
 % \newcommand\FbIndex{\Fb@Index\SpecialIndex}
 % \newcommand\FbMainIndex{\Fb@Index\SpecialMainIndex}
 % \newenvironment{FbPatch}[1]
-%   {\vskip-\MacrocodeTopsep$\m@th \setbox\z@\hbox{$\braceld$}^^A
+%   {\vskip-\MacrocodeTopsep$\setbox\z@\hbox{$\braceld\m@th$}^^A
 %    \braceld\leaders\vrule \@height\ht\z@ \@depth\z@\hfill
 %    \lower.5ex\hbox{\kern1em{\tt footbib} #1\kern1em}^^A
-%    \leaders\vrule\@height\ht\z@\@depth\z@\hfill\bracerd$^^A
-%    \vskip-\MacrocodeTopsep}
-%   {\vskip-\MacrocodeTopsep$\m@th \setbox\z@\hbox{$\braceld$}^^A
-%    \bracelu\leaders\vrule\@height\ht\z@\@depth\z@\hfill\braceru$^^A
-%    \vskip-\MacrocodeTopsep}
+%    \leaders\vrule\@height\ht\z@\@depth\z@\hfill\bracerd\m@th$^^A
+%    \nobreak\vskip-\MacrocodeTopsep\nobreak}
+%   {\nobreak\vskip-\MacrocodeTopsep$\setbox\z@\hbox{$\braceld\m@th$}^^A
+%    \bracelu\leaders\vrule\@height\ht\z@\@depth\z@\hfill\braceru\m@th$^^A
+%    \nobreak\vskip-\MacrocodeTopsep}
 %\makeatother
 %
 % \newcommand\LATEX{({\let\TeX\relax\LaTeX})\TeX}
@@ -184,7 +196,7 @@
 % the unit. 
 %
 % The mechanism used to put a reference only once in each citation
-% unit may require several runs of \LaTeX\ before the references find
+% unit may require several runs of \LaTeX\ (usually at least two) before the references find
 % their exact place. If necessary, \LaTeX\ will issue, near the end
 % of the document, a warning saying 
 % \begin{center}
@@ -194,10 +206,17 @@
 %   Using |footbib| in a document \meta{doc}|.tex| produces a file
 % \meta{doc}|.fb.aux|. One must pass the argument \meta{doc}|.fb| to \BibTeX\ 
 % to produce the bibliography which will be put in the file
-% \meta{doc}|.fb.bbl|. 
+% \meta{doc}|.fb.bbl|. The exact sequence of commands is
+% \begin{trivlist}\leftskip=\leftmargini\parindent=0pt\item[]
+%   |latex|~\meta{doc}\\
+%   |bibtex|~\meta{doc}|.fb|\\
+%   |latex|~\meta{doc}\\
+%   |latex|~\meta{doc}\\
+%   \dots
+% \end{trivlist}
 %
 % \begin{description}
-% \item[Note:] This name might cause some
+% \item[Note:] The name \meta{doc}|.fb.aux| might cause some
 %      problem on systems which do not allow a double extension in
 %      a file name or put a limit on the length of file names.
 %      A user command is provided to change it (see section~\ref{sec:custom}).
@@ -400,7 +419,7 @@
 % \item[]  \DescribeMacro{\footcitelabel}^^A
 %          \DescribeMacro{\putfootcitelabel}^^A
 %          \DescribeMacro{\footcitelistformat}^^A
-%          The list of citations in the text may not be typeseted in
+%          The list of citations in the text may not be typeset in
 %          one step as done by the |\cite| command of \LaTeX. 
 %          The reason is that the command which creates the text of
 %          the foot reference must be inserted after each citation.
@@ -445,7 +464,7 @@
 %   |\putfootcitelabel{\footcitelabel{|label $n$|}}|\\
 %   \meta{insertion of the text of reference $n$}\\
 %   |\putfootcitelabel{|\meta{end of list}|}|
-%   \end{trivlist}
+% \end{trivlist}
 %
 % Each component of the list may be redefined as follows:
 % \begin{trivlist}\leftskip=\leftmargini\parindent=0pt\item[]
@@ -511,7 +530,7 @@
 %          may be redefined by |\renewcommand*\footreflabel[1]{|\ldots|}|.
 % \item[]  \DescribeMacro{\footrefstyle}
 %          The label and the text of the reference at the bottom of
-%          the page are typeseted in the style defined by the command
+%          the page are typeset in the style defined by the command
 %          |\footrefstyle| which may be redefined in the preamble by
 %          |\renewcommad\footrefstyle{|\dots|}|. The default definition
 %          is |\normalfont\footnotesize|.
@@ -636,7 +655,8 @@
   \@addtocurcol\else\@reinserts\@addmarginpar\fi}\@latexbug\ifnum
   \outputpenalty<\z@\if@nobreak\nobreak\else\addpenalty\interlinepenalty
   \fi\fi\fi\fi}
-\@tempa\@doclearpage{\ifvoid\footins\setbox\@tempboxa\vsplit\@cclv to\z@
+\@tempa\@doclearpage{\ifvoid\footins\ifvbox\@kludgeins{\setbox\@tempboxa
+  \box\@kludgeins}\fi\setbox\@tempboxa\vsplit\@cclv to\z@
   \unvbox\@tempboxa\setbox\@tempboxa\box\@cclv\xdef\@deferlist{\@toplist
   \@botlist\@deferlist}\global\let\@toplist\@empty\global\let\@botlist
   \@empty\global\@colroom\@colht\ifx\@currlist\@empty\else\@latexerr
@@ -650,14 +670,14 @@
   \@opcol\clearpage\fi}
 \@tempa\@makecol{\ifvoid\footins\setbox\@outputbox\box\@cclv\else\setbox
   \@outputbox\vbox{\boxmaxdepth\@maxdepth\@tempdima\dp\@cclv\unvbox\@cclv
-  \vskip-\@tempdima\vskip\skip\footins\color@begingroup\normalcolor
-  \footnoterule\unvbox\footins\color@endgroup}\fi\xdef\@freelist{\@freelist
+  \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
   \@makespecialcolbox\else\setbox\@outputbox\vbox to\@colht{\@texttop\dimen@
   \dp\@outputbox\unvbox\@outputbox\vskip-\dimen@\@textbottom}\fi\global
-  \maxdepth\@maxdepth}\@tempa\@reinserts{\ifvoid\footins\else\insert\footins
-  {\unvbox\footins}\fi\ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins
-  }\fi}
+  \maxdepth\@maxdepth}
+\@tempa\@reinserts{\ifvoid\footins\else\insert\footins{\unvbox\footins}\fi
+  \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi}
 \fi
 \if@tempswa
   \PackageError{footbib}{the output routine of LaTeX changed}
@@ -741,8 +761,10 @@
 % \end{macro}
 %
 % \subsubsection{Declaration and processing of options}
+% {\MacroFont
 % \begin{option}{oneside}
 % \begin{option}{twoside}
+% \leavevmode\vspace{-1.2\baselineskip}
 %    \begin{macrocode}
 \DeclareOption{oneside}{\fb@twosidefalse}
 \DeclareOption{twoside}{\fb@twosidetrue}
@@ -750,6 +772,7 @@
 % \end{option}
 % \end{option}
 % \begin{option}{firstcite}
+% \leavevmode\vspace{-1.2\baselineskip}
 %    \begin{macrocode}
 \DeclareOption{firstcite}{\fb@firstcitetrue}
 \DeclareOption{firstcite(page)}{\fb@firstcitetrue\fb@pagenumtrue}
@@ -762,6 +785,7 @@
 % \end{option}
 % \begin{option}{citeonce}
 % \begin{option}{citeonce*}
+% \leavevmode\vspace{-1.2\baselineskip}
 %    \begin{macrocode}
 \DeclareOption{citeonce}{\fb@citeoncetrue}
 \DeclareOption{citeonce(page)}{\fb@pagecitetrue}
@@ -782,6 +806,7 @@
 % \begin{option}{crossrefs}
 % \begin{option}{crossrefs*}
 % \begin{option}{nocrossrefs}
+% \leavevmode\vspace{-1.2\baselineskip}
 %    \begin{macrocode}
 \DeclareOption{crossrefs}{\fb@crossrefstrue\fb@xcrossrefstrue}
 \DeclareOption{crossrefs*}{\fb@crossrefstrue\fb@xcrossrefsfalse}
@@ -793,6 +818,7 @@
 %
 % \begin{option}{split}
 % \begin{option}{nosplit}
+% \leavevmode\vspace{-1.2\baselineskip}
 %    \begin{macrocode}
 \DeclareOption{split}{\fb@nosplitfalse}
 \DeclareOption{nosplit}{\fb@nosplittrue}
@@ -815,6 +841,7 @@
 \let\fb@nosplittrue\@undefined    \let\fb@nosplitfalse\@undefined
 \let\fb@checksec\@undefined
 %    \end{macrocode}
+% }
 %
 % \begin{macro}{\chapter}
 % \begin{macro}{\part}
@@ -968,7 +995,7 @@
 % so that their expansion produces the same character with a catcode
 % 12 (other). Then an expansion of the key yields a
 % \emph{verbatim} copy of it. This mechanism allows the list of keys
-% to contain itself commands which expands in the normal way. 
+% to contain itself commands which expand in the normal way. 
 % All characters which may both be active in the document and appear in the
 % key of a reference must be treated in this way. Since \BibTeX\ allows almost
 % any character in a key, it is safer to consider all 
@@ -1010,7 +1037,7 @@
 % citations and as input to \BibTeX.
 % The commands |\footbibliographystyle| and |\footbibliography| do an
 % immediate |\write| to this file. However, since these commands may
-% be used in the preamble, it may happen that this file is not yet open for
+% be used in the preamble, this file might not yet be open for
 % writing at the time they are used. We must wait until the end of the
 % preamble before opening the auxiliary file to give the user a chance to
 % define its name with |\footbibliographyname|. Therefore, we define the
@@ -2088,6 +2115,9 @@
 %    \end{macrocode}
 % \end{FbPatch}
 %    \begin{macrocode}
+    \ifvbox\@kludgeins
+      {\setbox \@tempboxa \box \@kludgeins}%
+    \fi
     \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa
     \setbox\@tempboxa\box\@cclv
     \xdef\@deferlist{\@toplist\@botlist\@deferlist}%
@@ -2178,6 +2208,7 @@
 %    \begin{macrocode}
       }%
   \fi
+  \let\@elt\relax
   \xdef\@freelist{\@freelist\@midlist}%
   \global \let \@midlist \@empty
   \@combinefloats
diff --git a/Master/texmf-dist/source/latex/footbib/footbib.ins b/Master/texmf-dist/source/latex/footbib/footbib.ins
index 6f5d166ff7a..b8a775220e4 100644
--- a/Master/texmf-dist/source/latex/footbib/footbib.ins
+++ b/Master/texmf-dist/source/latex/footbib/footbib.ins
@@ -1,9 +1,19 @@
-%% File: footbib.ins Copyright (C) 1997 Eric Domenjoud
+%% File: footbib.ins Copyright (C) 1997-2003 Eric Domenjoud
 %%
 %% Eric Domenjoud,
 %% CRIN/CNRS & INRIA Lorraine
 %% E-mail: Eric.Domenjoud@loria.fr
 %%
+%% This program may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.2
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.2 or later is part of all distributions of LaTeX 
+%% version 1999/12/01 or later.
+%%
+%% This program consists of the files footbib.dtx and footbib.ins
+%%
 %% To produce the LaTeX package `footbib.sty' process this file with TeX
 
 \def\batchfile{footbib.ins}