summaryrefslogtreecommitdiff
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
parentce2b3fd531cc9ecad8e2aa08a2883f4b3042dc5f (diff)
natbib 831b (6dec10)
git-svn-id: svn://tug.org/texlive/trunk@20668 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/natbib/README.v831b (renamed from Master/texmf-dist/doc/latex/natbib/README.v831a)8
-rw-r--r--Master/texmf-dist/doc/latex/natbib/natbib.ltx4
-rw-r--r--Master/texmf-dist/doc/latex/natbib/natbib.pdfbin187267 -> 292843 bytes
-rw-r--r--Master/texmf-dist/doc/latex/natbib/natnotes.pdfbin88670 -> 156615 bytes
-rw-r--r--Master/texmf-dist/doc/latex/natbib/natnotes.tex4
-rw-r--r--Master/texmf-dist/source/latex/natbib/natbib.dtx34
-rw-r--r--Master/texmf-dist/tex/latex/natbib/natbib.sty10
7 files changed, 38 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/natbib/README.v831a b/Master/texmf-dist/doc/latex/natbib/README.v831b
index ff33b500875..ce9a73af2eb 100644
--- a/Master/texmf-dist/doc/latex/natbib/README.v831a
+++ b/Master/texmf-dist/doc/latex/natbib/README.v831b
@@ -1,5 +1,5 @@
NATBIB Package
-Current Version: 8.31a from 2009/11/07
+Current Version: 8.31b from 2010/09/13
See list of changes below
@@ -120,6 +120,10 @@ For full details, print out the documentation in natbib.dtx by LaTeXing it.
-------------------------------------------------------------------------
List of changes
+ v8.31b Another compatibility fix: \bibAnnote and \bibAnnoteFile are provided only
+ with merging, so they do not conflict with alternative definitions that are
+ sometimes found in certain BibTeX styles.
+
v8.31a Bug fixes by Arthur Ogawa, so that the new eliding and merging features
do not cause problems with non-REVTeX classes.
@@ -494,7 +498,7 @@ Changes from previous (4.x) versions:
Under LaTeX2e, punctuation can be selected with options in \usepackage
-------------------------------------------------------------------------
-2009 Jul 17
+2010 Sep 13
Patrick W. Daly
Max-Planck-Institut f\"ur Sonnensystemforschung
(Max Planck Institute for Solar System Research)
diff --git a/Master/texmf-dist/doc/latex/natbib/natbib.ltx b/Master/texmf-dist/doc/latex/natbib/natbib.ltx
index 08124902bb9..87e42e838a1 100644
--- a/Master/texmf-dist/doc/latex/natbib/natbib.ltx
+++ b/Master/texmf-dist/doc/latex/natbib/natbib.ltx
@@ -11,7 +11,7 @@
%%
%% Make changes to it as needed. (Never change the file natbib.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
@@ -19,7 +19,7 @@
%% E-mail: daly@mps.mpg.de
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{natbib.ltx}
- [2009/11/07 8.31a (PWD, AO)]
+ [2010/09/13 8.31b (PWD, AO)]
\documentclass{ltxdoc}
%\documentclass[twoside]{ltxdoc}
%\documentclass[a4paper]{ltxdoc}
diff --git a/Master/texmf-dist/doc/latex/natbib/natbib.pdf b/Master/texmf-dist/doc/latex/natbib/natbib.pdf
index ae468138961..b23b0ad3b87 100644
--- a/Master/texmf-dist/doc/latex/natbib/natbib.pdf
+++ b/Master/texmf-dist/doc/latex/natbib/natbib.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/natbib/natnotes.pdf b/Master/texmf-dist/doc/latex/natbib/natnotes.pdf
index f5b40227781..ad36e110590 100644
--- a/Master/texmf-dist/doc/latex/natbib/natnotes.pdf
+++ b/Master/texmf-dist/doc/latex/natbib/natnotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/natbib/natnotes.tex b/Master/texmf-dist/doc/latex/natbib/natnotes.tex
index 753d28d4e05..239d2cc7203 100644
--- a/Master/texmf-dist/doc/latex/natbib/natnotes.tex
+++ b/Master/texmf-dist/doc/latex/natbib/natnotes.tex
@@ -21,7 +21,7 @@
%%
%% For more details, LaTeX the source natbib.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
@@ -31,7 +31,7 @@
\def\DescribesFile#1 [#2 #3 #4]
{\def\filename{#1}\def\filedate{#2}\def\fileversion{#3}}
\DescribesFile{natbib}
- [2009/11/07 8.31a (PWD, AO)]
+ [2010/09/13 8.31b (PWD, AO)]
\documentclass{article}
\setlength{\parindent}{0pt}
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}
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