summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/natbib
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/source/latex/natbib
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/source/latex/natbib')
-rw-r--r--Master/texmf-dist/source/latex/natbib/natbib.dtx29
1 files changed, 23 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/latex/natbib/natbib.dtx b/Master/texmf-dist/source/latex/natbib/natbib.dtx
index 42873f76d27..6de4ea910b7 100644
--- a/Master/texmf-dist/source/latex/natbib/natbib.dtx
+++ b/Master/texmf-dist/source/latex/natbib/natbib.dtx
@@ -55,7 +55,7 @@
% *** The DATE, VERSION, and other INFO
%\fi
%\ProvidesFile{natbib}
- [2009/07/16 8.31 (PWD, AO)]
+ [2009/11/07 8.31a (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
@@ -216,6 +216,7 @@
% even for numerical (previously only for author--year)}
% \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}
%
% \CheckSum{2858}
% \CharacterTable
@@ -2142,6 +2143,8 @@ is read in after the main package file.
%
% \begin{macro}{\@ifxundefined}
% \begin{macro}{\@ifnum}
+% \begin{macro}{\@ifx}
+% \begin{macro}{\appdef}
% \changes{8.2}{2008 Jul 02}{(AO) Add \cs{@ifxundefined}, a tool for testing a
% \cs{TeX} macro, and \cs{@ifnum}, a tool for testing numbers, like \cs{ifnum}.}
% The test |\@ifxundefined| is similar syntactically to |\@ifundefined|, but
@@ -2154,6 +2157,8 @@ is read in after the main package file.
%
% We also provide |\@ifnum|, a vehicle for |\ifnum| tests, but using the same
% Boolean algebra as, e.g., |\@ifundefined|, with its attendant advantages.
+% Likewise, |\@ifx| is the analog to |\ifx|.
+%
% \begin{macrocode}
\providecommand\@ifxundefined[1]{%
\ifx#1\@undefined\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
@@ -2171,6 +2176,8 @@ is read in after the main package file.
% \end{macrocode}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\end{macro}
%
% \subsection{Test for Specific Journals}
% This package should not be loaded with the specific journal packages that
@@ -4465,6 +4472,7 @@ is read in after the main package file.
% The other procedures are hooks,
% \cs{NAT@bibitem@init} executed if we are calling \cs{item},
% and \cs{NAT@bibitem@cont} if we are not.
+% \changes{8.31a}{2009 Nov 07}{(AO) Fix punctuation bugs in merge code}
% \begin{macrocode}
\def\bibitem@fin{%
\@ifxundefined\@bibstop{}{\csname bibitem@\@bibstop\endcsname}%
@@ -4473,7 +4481,7 @@ is read in after the main package file.
\let\@bibstop\@undefined
}%
\def\NAT@bibitem@cont{%
- \let\bibitem@Stop\bibitemStop
+ \let\bibitem@Stop\bibitemContinue
\let\bibitem@NoStop\bibitemContinue
}%
% \end{macrocode}
@@ -4499,19 +4507,27 @@ is read in after the main package file.
% and the alternative \cs{bibitemContinue} if we are continuing the previous item.
% The latter two also assign the \cs{spacefactor} explicitly: we are at the end of
% a sentence.
+% \changes{8.31a}{2009 Nov 07}{(AO) Fix punctuation bugs in merge code}
% \begin{macrocode}
\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}%
@@ -4520,6 +4536,7 @@ is read in after the main package file.
\textsc{Key:}\ #2\\\textsc{Annotation:}\ \@tempa
\end{quotation}%
}%
+ \ignorespaces
}%
\providecommand{\bibAnnoteFile}[2]{%
\IfFileExists{#2}{%