From a4a3a191b0cc667752061c47cde6747c019f94a9 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 22 Jul 2009 22:57:34 +0000
Subject: natbib 8.31 (22jul09)

git-svn-id: svn://tug.org/texlive/trunk@14376 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/natbib/natbib.dtx | 36 ++++++++++++++++--------
 1 file changed, 24 insertions(+), 12 deletions(-)

(limited to 'Master/texmf-dist/source/latex/natbib/natbib.dtx')

diff --git a/Master/texmf-dist/source/latex/natbib/natbib.dtx b/Master/texmf-dist/source/latex/natbib/natbib.dtx
index 3fd60e9fee0..42873f76d27 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/02/02 8.3 (PWD, AO)]
+        [2009/07/16 8.31 (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
@@ -215,8 +215,9 @@
 % \changes{8.3}{2008 Dec 8}{Put all comments inside braces with \cs{citet},
 %    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}
 %
-% \CheckSum{2848}
+% \CheckSum{2858}
 % \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
@@ -5279,6 +5280,8 @@ is read in after the main package file.
 % \begin{macro}{\NAT@star@cite@pre}
 % \begin{macro}{\NAT@star@cite@post}
 % \changes{8.2}{2008 Jan 10}{(AO)Various changes to \texttt{NAT@sort@cites} and friends}
+% \begin{macro}{\NAT@star@cite@noextension}
+% \changes{8.31}{2009 Jul 16}{Add macro for backward compatibility}
 %
 % With package option |merge| in effect,
 % the |\NAT@star@cite| procedure determines if the optional * character
@@ -5322,21 +5325,24 @@ is read in after the main package file.
 % you must enclose the optional argument in braces (\verb+{}+) if a comma is present in the
 % argument (that goes for brackets, too, of course).
 %
-% The five procedures defined here are solely for the purpose of parsing the star (*) and
+% The six procedures defined here are solely for the purpose of parsing the star (*) and
 % the two optional arguments, followed by the usual cite key.
+%
+% The |NAT@star@cite@noextension| is used when no merging is wanted; this ensures
+% that the old syntax for citations is followed, ie ensures backward compatibility.
 %    \begin{macrocode}
 \def\NAT@star@cite{%
- \let\NAT@star@sw\@secondoftwo
- \@ifnum{\NAT@merge>\z@}{%
-  \@ifnextchar*{%
-   \let\NAT@star@sw\@firstoftwo
-   \NAT@star@cite@star
+  \let\NAT@star@sw\@secondoftwo
+  \@ifnum{\NAT@merge>\z@}{%
+   \@ifnextchar*{%
+    \let\NAT@star@sw\@firstoftwo
+    \NAT@star@cite@star
+   }{%
+    \NAT@star@cite@nostar
+   }%
   }{%
-   \NAT@star@cite@nostar
+   \NAT@star@cite@noextension
   }%
- }{%
-  \NAT@star@cite@nostar
- }%
 }%
 \def\NAT@star@cite@star*{%
  \NAT@star@cite@nostar
@@ -5355,12 +5361,18 @@ is read in after the main package file.
  \NAT@star@sw{\expandafter\global\expandafter\let\csname NAT@b*@#2\endcsname\@empty}{}%
  \NAT@cite@list@append{#2}%
 }%
+\def\NAT@star@cite@noextension#1\@@{%
+  \let\nat@keyopt@open\@empty
+  \let\nat@keyopt@shut\@empty
+  \NAT@cite@list@append{#1}%
+}%
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\NAT@cite@list@append}
 % |\NAT@cite@list@append{bar}|
-- 
cgit v1.2.3

