summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/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/source/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/source/latex/natbib')
-rw-r--r--Master/texmf-dist/source/latex/natbib/natbib.dtx34
1 files changed, 22 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/latex/natbib/natbib.dtx b/Master/texmf-dist/source/latex/natbib/natbib.dtx
index 6de4ea910b7..54978e1f36a 100644
--- a/Master/texmf-dist/source/latex/natbib/natbib.dtx
+++ b/Master/texmf-dist/source/latex/natbib/natbib.dtx
@@ -5,7 +5,7 @@
{NATBIB.DTX}
%========================================================================
%</dtx>
-%% 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
@@ -55,7 +55,7 @@
% *** The DATE, VERSION, and other INFO
%\fi
%\ProvidesFile{natbib}
- [2009/11/07 8.31a (PWD, AO)]
+ [2010/09/13 8.31b (PWD, AO)]
% \changes{4.0}{1993 Aug 19}{First documented release}
% \changes{4.1}{1993 Oct 4}{Simplification of \cs{@citeapalk}}
% \changes{4.1a}{1993 Oct 14}{Add \texttt{rev} option for reversed comments
@@ -217,8 +217,9 @@
% \changes{8.3}{2009 Feb 2}{Include AO's last delta corrections}
% \changes{8.31}{2009 Jul 16}{Fix so when merge is 0, old syntax valid; backward compatibility}
% \changes{8.31a}{2009 Nov 07}{(AO) Fix punctuation bugs in merge code}
+% \changes{8.31b}{2010 Sep 13}{Remove definitions of \cs{bibAnnote} and \cs{bibAnnoteFile} when merging not selected}
%
-% \CheckSum{2858}
+% \CheckSum{2884}
% \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
% Lower-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
@@ -4494,8 +4495,6 @@ is read in after the main package file.
% \begin{macro}{\bibitemStop}
% \begin{macro}{\bibitemNoStop}
% \begin{macro}{\bibitemContinue}
-% \begin{macro}{\bibAnnote}
-% \begin{macro}{\bibAnnoteFile}
% The markup that the special .bst puts into the .bbl file delimits each entry with
% \cs{BibitemOpen} and \cs{BibitemShut}, thereby giving us the means
% to insert text at the beginning and end of the entry.
@@ -4529,6 +4528,23 @@ is read in after the main package file.
\@ifx{\@empty\@bibitemShut}{;\spacefactor\@mmm\space}{\@bibitemShut}%
}%
\mathchardef\@mmm=3000 %
+\let\bibitemOpen\relax
+\let\bibitemShut\relax
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\bibAnnote}
+% \changes{8.31b}{2010 Sep 13}{Activate macro only with merging}
+% \begin{macro}{\bibAnnoteFile}
+% \changes{8.31b}{2010 Sep 13}{Activate macro only with merging}
+% To avoid conflicts with other definitions of these macros, they are ``provided''
+% only when merging is selected.
+% \begin{macrocode}
+\@ifnum{\NAT@merge>\@ne}{%
\providecommand{\bibAnnote}[3]{%
\BibitemShut{#1}%
\def\@tempa{#3}\@ifx{\@tempa\@empty}{}{%
@@ -4545,16 +4561,10 @@ is read in after the main package file.
\bibAnnote{#1}{#2}{}%
}%
}%
-\let\bibitemOpen\relax
-\let\bibitemShut\relax
+}{}%
% \end{macrocode}
% \end{macro}
% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
%
% \begin{macro}{\bibfield}
% \begin{macro}{\@bibfield}