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/tex/latex/natbib/natbib.sty | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/natbib/natbib.sty')

diff --git a/Master/texmf-dist/tex/latex/natbib/natbib.sty b/Master/texmf-dist/tex/latex/natbib/natbib.sty
index eec93eb6e7f..ff0d0b91b6e 100644
--- a/Master/texmf-dist/tex/latex/natbib/natbib.sty
+++ b/Master/texmf-dist/tex/latex/natbib/natbib.sty
@@ -27,7 +27,7 @@
 %% E-mail: daly@mps.mpg.de
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{natbib}
-        [2009/02/02 8.3 (PWD, AO)]
+        [2009/07/16 8.31 (PWD, AO)]
 
  % This package reimplements the LaTeX \cite command to be used for various
  % citation styles, both author-year and numerical. It accepts BibTeX
@@ -1121,17 +1121,17 @@
   }{}%
 }%
 \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
@@ -1150,6 +1150,11 @@
  \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}%
+}%
 \def\NAT@cite@list@append#1{%
   \edef\@citeb{\@firstofone#1\@empty}%
   \if@filesw\@ifxundefined\@cprwrite{}{\expandafter\@cprwrite\@citeb=}\fi
-- 
cgit v1.2.3

