summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/natbib
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-12-07 01:39:19 +0000
committerKarl Berry <karl@freefriends.org>2010-12-07 01:39:19 +0000
commit562d0a965754c9ab135854e343d710216a903f7b (patch)
tree04ca8589401a81624e233a7ba35e03966a18eaad /Master/texmf-dist/tex/latex/natbib
parentce2b3fd531cc9ecad8e2aa08a2883f4b3042dc5f (diff)
natbib 831b (6dec10)
git-svn-id: svn://tug.org/texlive/trunk@20668 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/natbib')
-rw-r--r--Master/texmf-dist/tex/latex/natbib/natbib.sty10
1 files changed, 6 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/natbib/natbib.sty b/Master/texmf-dist/tex/latex/natbib/natbib.sty
index d2c07283b3b..8207972ae42 100644
--- a/Master/texmf-dist/tex/latex/natbib/natbib.sty
+++ b/Master/texmf-dist/tex/latex/natbib/natbib.sty
@@ -19,7 +19,7 @@
%% Full documentation can be obtained by LaTeXing that original file.
%% Only a few abbreviated comments remain here to describe the usage.
%% =============================================
-%% Copyright 1993-2009 Patrick W Daly
+%% Copyright 1993-2010 Patrick W Daly
%% Max-Planck-Institut f\"ur Sonnensystemforschung
%% Max-Planck-Str. 2
%% D-37191 Katlenburg-Lindau
@@ -27,7 +27,7 @@
%% E-mail: daly@mps.mpg.de
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{natbib}
- [2009/11/07 8.31a (PWD, AO)]
+ [2010/09/13 8.31b (PWD, AO)]
% This package reimplements the LaTeX \cite command to be used for various
% citation styles, both author-year and numerical. It accepts BibTeX
@@ -907,6 +907,9 @@
\@ifx{\@empty\@bibitemShut}{;\spacefactor\@mmm\space}{\@bibitemShut}%
}%
\mathchardef\@mmm=3000 %
+\let\bibitemOpen\relax
+\let\bibitemShut\relax
+\@ifnum{\NAT@merge>\@ne}{%
\providecommand{\bibAnnote}[3]{%
\BibitemShut{#1}%
\def\@tempa{#3}\@ifx{\@tempa\@empty}{}{%
@@ -923,8 +926,7 @@
\bibAnnote{#1}{#2}{}%
}%
}%
-\let\bibitemOpen\relax
-\let\bibitemShut\relax
+}{}%
\def\bibfield{\@ifnum{\NAT@merge>\tw@}{\@bibfield}{\@secondoftwo}}%
\def\@bibfield#1#2{%
\begingroup