diff options
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/footbib/README | 16 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/footbib/footbib.pdf | bin | 261220 -> 225455 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/footbib/footbib.dtx | 129 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/footbib/footbib.sty | 50 |
4 files changed, 113 insertions, 82 deletions
diff --git a/Master/texmf-dist/doc/latex/footbib/README b/Master/texmf-dist/doc/latex/footbib/README new file mode 100644 index 00000000000..6b6332dcdb4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/footbib/README @@ -0,0 +1,16 @@ +To create the style file footbib.sty, proceed as follows: + +1) unpack the archive in a directory +2) in this directory, process the file footbib.ins through the command + + tex footbib.ins + +3) copy the file footbib.sty to a place where LaTeX searches for style files + +To create the documentation of the package, process the file footbib.dtx through the +command + + latex footbib.dtx +or + pdflatex footbib.dtx + diff --git a/Master/texmf-dist/doc/latex/footbib/footbib.pdf b/Master/texmf-dist/doc/latex/footbib/footbib.pdf Binary files differindex 7edbc299e78..c89c52e1b14 100644 --- a/Master/texmf-dist/doc/latex/footbib/footbib.pdf +++ b/Master/texmf-dist/doc/latex/footbib/footbib.pdf diff --git a/Master/texmf-dist/source/latex/footbib/footbib.dtx b/Master/texmf-dist/source/latex/footbib/footbib.dtx index dfe812c8255..b68a1694e58 100644 --- a/Master/texmf-dist/source/latex/footbib/footbib.dtx +++ b/Master/texmf-dist/source/latex/footbib/footbib.dtx @@ -1,9 +1,9 @@ % \iffalse %% -%% 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 %% % This program may be distributed and/or modified under the @@ -16,9 +16,8 @@ % % This program consists of the files footbib.dtx and footbib.ins - -\def\fileversion{2.0.4} -\def\filedate{2004/06/04} +\def\fileversion{2.0.7} +\def\filedate{2007/02/20} %<*driver> %% %% To produce the documentation, do the following: @@ -52,7 +51,7 @@ %</driver> % \fi % -% \CheckSum{2068} +% \CheckSum{2069} % % \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 @@ -176,7 +175,7 @@ % used to produce the standard bibliography. % % The foot bibliography uses its own style and bibliographic -% database which may be specified independently of the standard one. +% database which are specified independently of the standard ones. % Any standard bibliography style may be used. If the style does not provide % explicit labels (e.g.~|plain|), the references are numbered. % The default is to number the references in the order in which they @@ -196,9 +195,9 @@ % the unit. % % The mechanism used to put a reference only once in each citation -% 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 +% 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} % |Package footbib Warning: Bibliography not yet stable. Rerun LaTeX.| % \end{center} @@ -231,7 +230,7 @@ % |\documentclass| command. See the \LaTeXe\ documentation for more % details about this environment. % -% \section{The user interface} +% \section{User interface} % % \subsection{Package options} % @@ -401,13 +400,16 @@ % |\footcite*{|\meta{key}|}\footnocite{|\meta{key}|}|. % \end{description} % -% \subsection{customisation}\label{sec:custom} +% \subsection{Customisation}\label{sec:custom} % % \begin{list}{}{\leftmargin=0pt \labelsep=0pt} % \item[] \DescribeMacro{\footbibliographyname} % The basename of the |.aux| and |.bbl| files used for the % foot bibliography may be redefined by -% |\footbibliographyname{|\meta{name}|}|. The default value is +% +% \qquad |\footbibliographyname{|\meta{name}|}| +% +% The default value is % |\jobname.fb|\footnote{\texttt{\string\jobname} is a % primitive \TeX\ command which holds the name of the main % document.} which causes |footbib| to read the bibliography @@ -422,7 +424,7 @@ % 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. +% the reference must be inserted after each citation. % The way \LATEX\ handles insertions makes % them vanish if they occur in a box. Hence if the command % which formats the list of citations puts them in a box, @@ -486,7 +488,7 @@ % \item[example 2:]ditto but the list may not be cut\par % \leavevmode\quad\vdots %\begin{verbatim*} -%\footcitelistformat[,{\penalty10000\ }] +%\footcitelistformat[,{\nobreak\ }] %\end{verbatim*} % \item[example 3:] the list is raised and the labels are % separated only by commas, without any space: @@ -517,15 +519,15 @@ % The foot bibliography is % separated from the rest of the page by a vertical skip of % length |\footbibskip| in which a horizontal line is -% drawn by the command |\footbibrule|. The length of the +% drawn by the command |\footbibrule|. The height of the % skip and the horizontal % line may be redefined in the preamble by\par\medskip % {\leftskip=\leftmargini\parskip=0pt % |\setlength\footbibskip{|\dots|}|\par % |\renewcommand\footbibrule{|\dots|}|\par} -% \textbf{CAUTION:} |\footbibrule| must take zero vertical space. +% \textbf{CAUTION}~~|\footbibrule| must take zero vertical space. % \item[] \DescribeMacro{\footreflabel}^^A -% The label of the foot reference is formated by the macro +% The label of the reference is formated by the macro % |\footreflabel| which takes the label as argument. It % may be redefined by |\renewcommand*\footreflabel[1]{|\ldots|}|. % \item[] \DescribeMacro{\footrefstyle} @@ -542,41 +544,52 @@ % cross-reference is generated by the command |\footxref| which takes % two arguments: (1)~the label and (2)~the page of the last full % citation. |\footxref| may be redefined in the preamble by -% |\renewcommand*\footxref[2]{|\dots|}|. +% +% \qquad |\renewcommand*\footxref[2]{|\dots|}|. % % \end{list} % % \section{Known and potential problems} % % \begin{list}{$\bullet$}{\settowidth\leftmargin{$\bullet$\hskip\labelsep}} +% \item At present, the convergence is not proved. There is no guarantee +% that the references eventually find their place. However, +% |footbib| was used in large documents (several +% hundreds pages) and such a problem never occured. +% % \item The foot bibliography is not sorted. The references appear at the % bottom of the page in the order in which they are cited on the page. +% +% \item A |\footcite| command may not appear in a floating environment +% like |figure| or |table|. +% % \item If a float is inserted at the bottom of the page, the foot % bibliography is put \emph{above} it, like footnotes. +% % \item The result is not very nice in |twocolumn| mode. % The references should be balanced between the two columns of the % page (if there are two) or put in the right column like the % package |ftnright|\SpecialPackageIndex{ftnright} of Frank % Mittelbach does for footnotes. +% % \item |footbib| does not work with most packages which % modify the output routine of \LaTeX: % |multicol|\SpecialPackageIndex{multicol}, % |ftnright|\SpecialPackageIndex{ftnright}, % |floatflt|\SpecialPackageIndex{floatflt}, % |wrapfig|\SpecialPackageIndex{wrapfig}, etc. -% \item At present, the convergence is not proved. There is no guarantee -% that the references eventually find their place. However, -% |footbib| was used in large documents (several -% hundreds pages) and such a problem never occured. +% % \item The references must not contain any % |verbatim|\SpecialEnvIndex{verbatim} environment. But % |\verb|\SpecialUsageIndex{\verb} is allowed since it is sometime used % to typeset filenames, \textsc{url}'s, etc. +% % \item The braces must be balanced in the references, excepted the ones % that might occur inside the argument of a |\verb| % command\SpecialUsageIndex{\verb}. This implies that a reference % may not contain say |\hbox\bgroup|\dots|}| which is otherwise correct % in \LATEX. +% % \item When references are numbered, the space between the label and % the reference itself may be too large because the % longest label is determined from the argument of @@ -585,7 +598,7 @@ % have small numbers and the bibliography contains many references % (say more than 100), % this length is not reliable. The longest label should be deduced -% from the maximal number of foot references on a page, +% from the maximal number of references on a page, % but this may not be known at the beginning of the document, at % least at the first run. At the second run, the % information could be deduces from what was written into the |.aux| file, @@ -616,7 +629,7 @@ % restored at the end of the package. % \begin{macrocode} \@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\-% @@ -669,7 +682,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 @@ -943,7 +956,7 @@ % \end{macro} % \end{macro} % -% \subsubsection{Appearance of the foot bibliography} +% \subsubsection{Style of the foot bibliography} % % \begin{macro}{\footbibskip} % \begin{macro}{\footbibrule} @@ -993,8 +1006,10 @@ % not allow them to contain commands like in |\foocite{\mylistofcitations}| % The method used here consists in redefining the active characters % 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 +% 12 (other). Then an expansion of the key yields an almost +% \emph{verbatim} copy of it. Only then, |\meaning| is used to \emph{remove} +% the category code of any special character which might remain in the key +% like |$| or |_|. This mechanism allows the list of keys % 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 @@ -1019,7 +1034,8 @@ \begingroup \let\do\fb@doactive \dospecials \edef\@tempa{\endgroup\def\noexpand#1{#2}}% - \@tempa} + \@tempa + \edef#1{\expandafter\strip@prefix\meaning#1}} % \end{macrocode} % \end{macro} % \end{macro} @@ -1136,11 +1152,11 @@ % holds the number of the last shiped out page. If the number % of the current page is not |\fb@prevpage|${}+1$, it means that % either the user has manually changed the page counter or the page numbering -% has changed. In both case, we consider the current page as a left page. If +% has changed. In both cases, we consider the current page as a left page. If % the current page is a right page, we do nothing. Otherwise, it may start a -% new unit\footnote{In fact, a right page may also start a new unit if the -% user used for instance the -% |firstcite(chapter)|\SpecialOptionIndex{firstcite} option and the current +% new unit\footnote{A right page may actually also start a new unit if for +% instance the |firstcite(chapter)|\SpecialOptionIndex{firstcite} +% option is in effect and the current % page starts a new chapter. But in this case, the units are updated by the % |\string\chapter| command.} and we update the unit counters. % \begin{macrocode} @@ -1212,7 +1228,7 @@ % \end{macrocode} % \end{macro} % -% \section{Commands to handle the references} +% \subsection{Commands to handle the references} % % \begin{macro}{\fb@refcount} % The counter |\fb@refcount| holds the number of the last numbered reference. @@ -1270,7 +1286,7 @@ % |\fb@getlbl| but update the text of the reference instead of the label. % When |\fb@settxt| is called, the label must have been expanded just % before so that it has been updated if necessary. Then |\fb@lbl| -% has either the form |{|\meta{static label}|}|\Index{static}{label} +% has either the form |{|\meta{static label}|}|\Index{static}{label} or % the form |\fb@getlbl{|\meta{current numunit}|}{|\meta{dynamic % label}|}|\Index{dynamic}{label}. % In the later case, the test at the beginning of |\fb@getlbl| must @@ -1318,7 +1334,7 @@ % default label and the default text. % \begin{macrocode} \newcommand*\fb@refnotfound[1]{% - {?}{*** ERROR: citation `{\normalfont\bfseries#1}' undefined ***}} + {?}{*** ERROR: citation `{\normalfont\ttfamily\bfseries#1}' undefined ***}} % \end{macrocode} % \end{macro} % @@ -1422,7 +1438,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 % \end{macrocode} @@ -1550,30 +1566,30 @@ % \end{macro} % % \begin{macro}{\fb@citefn} -% |\fb@citefn| inserts the text of the foot reference. It is called +% |\fb@citefn| inserts the text of the reference. It is called % only if the reference was not already cited in the same citation % unit or a |citeonce*|\SpecialOptionIndex{citeonce*} option was used. % The code is mainly borrowed from the footnotes handling in \LaTeX. % \begin{macrocode} \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 @@ -1631,7 +1647,7 @@ % \end{macrocode} % \begin{macro}{\bibcite} % \VerbSetup{\begin{macro}{\fb@c.\noexpand~{num}}} -% Then read the auxiliary file and record the parameters of each citation +% Then read the auxiliary file and record the parameters of each citation. % \begin{macrocode} \fb@citecount\z@ \begingroup @@ -1739,7 +1755,7 @@ % \end{macro} % \end{macro} % \begin{macro}{\@actlet} -% |\@actlet\|\meta{char}\meta{cmd} makes \meta{char} active and let it +% |\@actlet\|\meta{char}\meta{cmd} makes \meta{char} active and lets it % equal to \meta{cmd}. % \begin{macrocode} \def\@actlet##1{% @@ -2011,7 +2027,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 % \end{macrocode} % \FbIndex{\fb@c.\noexpand~{num}}^^A @@ -2175,9 +2192,7 @@ \else \setbox\@outputbox \vbox {% \boxmaxdepth \@maxdepth - \@tempdima\dp\@cclv \unvbox \@cclv - \vskip-\@tempdima % \end{macrocode} % \begin{FbPatch}{addition} % \begin{macrocode} 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 |