summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-01-09 01:06:30 +0000
committerKarl Berry <karl@freefriends.org>2010-01-09 01:06:30 +0000
commit43f08b017db5addf1e5620f5cddc262d21bfc43c (patch)
tree1c00caac6f92c8a45d7dbfa53c76db46a122d24b /Master/texmf-dist/tex/latex
parent6c0e20211966e2ad4943b5765cfab85123d882c3 (diff)
natbib 8.31a (8jan10)
git-svn-id: svn://tug.org/texlive/trunk@16643 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/natbib/natbib.sty20
1 files changed, 14 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/natbib/natbib.sty b/Master/texmf-dist/tex/latex/natbib/natbib.sty
index ff0d0b91b6e..d2c07283b3b 100644
--- a/Master/texmf-dist/tex/latex/natbib/natbib.sty
+++ b/Master/texmf-dist/tex/latex/natbib/natbib.sty
@@ -27,7 +27,7 @@
%% E-mail: daly@mps.mpg.de
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{natbib}
- [2009/07/16 8.31 (PWD, AO)]
+ [2009/11/07 8.31a (PWD, AO)]
% This package reimplements the LaTeX \cite command to be used for various
% citation styles, both author-year and numerical. It accepts BibTeX
@@ -884,21 +884,28 @@
\let\@bibstop\@undefined
}%
\def\NAT@bibitem@cont{%
- \let\bibitem@Stop\bibitemStop
+ \let\bibitem@Stop\bibitemContinue
\let\bibitem@NoStop\bibitemContinue
}%
\def\BibitemOpen{%
\bibitemOpen
}%
\def\BibitemShut#1{%
- \bibitemShut
\def\@bibstop{#1}%
\let\bibitem@Stop\bibitemStop
\let\bibitem@NoStop\bibitemNoStop
+ \@ifx{\bibitemShut\relax}{\let\@bibitemShut\@empty}{%
+ \expandafter\def\expandafter\@bibitemShut\expandafter{\bibitemShut}%
+ }%
+}%
+\def\@bibitemShut{}%
+\def\bibitemStop{\@bibitemShut}%
+\def\bibitemNoStop{%
+ \@ifx{\@empty\@bibitemShut}{.\spacefactor\@mmm\space}{\@bibitemShut}%
+}%
+\def\bibitemContinue{%
+ \@ifx{\@empty\@bibitemShut}{;\spacefactor\@mmm\space}{\@bibitemShut}%
}%
-\def\bibitemStop{}%
-\def\bibitemNoStop{.\spacefactor\@mmm\space}%
-\def\bibitemContinue{\spacefactor\@mmm\space}%
\mathchardef\@mmm=3000 %
\providecommand{\bibAnnote}[3]{%
\BibitemShut{#1}%
@@ -907,6 +914,7 @@
\textsc{Key:}\ #2\\\textsc{Annotation:}\ \@tempa
\end{quotation}%
}%
+ \ignorespaces
}%
\providecommand{\bibAnnoteFile}[2]{%
\IfFileExists{#2}{%