natbib 74 (19aug06)

git-svn-id: svn://tug.org/texlive/trunk@1988 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 21 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/natbib/README.v73 b/Master/texmf-dist/doc/latex/natbib/README.v74
index 7a9b3228e0e..729f2c17d97 100644
--- a/Master/texmf-dist/doc/latex/natbib/README.v73
+++ b/Master/texmf-dist/doc/latex/natbib/README.v74
@@ -1,10 +1,8 @@
                                 NATBIB Package
-Version 7.3  Revised user's manual.
+             (See list of changes below)
+Version 7.4  Minor fix
 
-Version 7.2  (See list of changes below) 
-              Allow numerical cite compression without sorting
-              Hyperref package does not suppress compression
-              Compatibility with citeref package
+Version 7.3  Revised user's manual.
 
 This is the natbib package for handling both author-year and numerical
 BibTeX styles. It contains the following files:
@@ -124,6 +122,8 @@ For full details, print out the documentation in natbib.dtx by LaTeXing it.
 
 -------------------------------------------------------------------------
 List of changes
+  v7.4  Fix so nonamebreak option works with numerical citations too.
+  
   v7.3  Go over the manual documentation and update it for 2006 rather than 1993.
         No changes to code.
         
diff --git a/Master/texmf-dist/doc/latex/natbib/natbib.pdf b/Master/texmf-dist/doc/latex/natbib/natbib.pdf
index abefe38c5b0..60bb01bc957 100644
--- a/Master/texmf-dist/doc/latex/natbib/natbib.pdf
+++ b/Master/texmf-dist/doc/latex/natbib/natbib.pdf
diff --git a/Master/texmf-dist/doc/latex/natbib/natnotes.tex b/Master/texmf-dist/doc/latex/natbib/natnotes.tex
index 76ee1b099d4..99e5c5da718 100644
--- a/Master/texmf-dist/doc/latex/natbib/natnotes.tex
+++ b/Master/texmf-dist/doc/latex/natbib/natnotes.tex
@@ -31,7 +31,7 @@
 \def\DescribesFile#1 [#2 #3 #4]
   {\def\filename{#1}\def\filedate{#2}\def\fileversion{#3}}
 \DescribesFile{natbib}
-        [2006/03/22 7.3 (PWD)]
+        [2006/08/18 7.4 (PWD)]
 \documentclass{article}
 
 \setlength{\parindent}{0pt}
diff --git a/Master/texmf-dist/source/latex/natbib/natbib.drv b/Master/texmf-dist/source/latex/natbib/natbib.drv
index f6fb11e578f..7366d65206d 100644
--- a/Master/texmf-dist/source/latex/natbib/natbib.drv
+++ b/Master/texmf-dist/source/latex/natbib/natbib.drv
@@ -19,7 +19,7 @@
 %% E-mail: daly@linmpi.mpg.de
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{natbib.drv}
-        [2006/03/22 7.3 (PWD)]
+        [2006/08/18 7.4 (PWD)]
 \documentclass{ltxdoc}
 %\documentclass[twoside]{ltxdoc}
 %\documentclass[a4paper]{ltxdoc}
diff --git a/Master/texmf-dist/source/latex/natbib/natbib.dtx b/Master/texmf-dist/source/latex/natbib/natbib.dtx
index df12988d3b5..d5c0a2f6d8b 100644
--- a/Master/texmf-dist/source/latex/natbib/natbib.dtx
+++ b/Master/texmf-dist/source/latex/natbib/natbib.dtx
@@ -68,7 +68,7 @@
 %  *** The DATE, VERSION, and other INFO
 %\fi
 %\ProvidesFile{natbib}
-        [2006/03/22 7.3 (PWD)]
+        [2006/08/18 7.4 (PWD)]
 % \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
@@ -178,8 +178,9 @@
 % \changes{7.2}{2006 Jan 12}{Add compression without sorting}
 % \changes{7.2}{2006 Jan 12}{Add compatibility with \texttt{citeref} package}
 % \changes{7.3}{2006 Mar 22}{Revise and update the manual documentation}
+% \changes{7.4}{2006 Aug 18}{Add \cs{NAT@nmfmt} to names in \cs{NAT@test}}
 %
-% \CheckSum{2420}
+% \CheckSum{2421}
 % \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
@@ -2704,12 +2705,13 @@ is read in after the main package file.
 %
 % \begin{macro}{\NAT@test}
 % \changes{6.6}{1997 May 29}{Add macro}
+% \changes{7.4}{2006 Aug 18}{Fix bug by adding \cs{NAT@nmfmt}}
 % For numerical mode, need to test if there really is a name or date; if a
 % numerical \texttt{.bst} file is being used, there will not be any names or
 % dates. This macro tests and writes |\NAT@nm| or |\NAT@date| according to
 % its argument being 1 or 2.
 %    \begin{macrocode}
-\newcommand\NAT@test[1]{\ifnum#1=1 \ifx\NAT@nm\NAT@noname
+\newcommand\NAT@test[1]{\ifnum#1=1 \ifx\NAT@nmfmt{\NAT@nm}\NAT@noname
 %<209>  {\reset@font\bf(author?)}\@warning
 %<!209>  {\reset@font\bfseries(author?)}\PackageWarning{natbib}
   {Author undefined for citation`\@citeb'
diff --git a/Master/texmf-dist/tex/latex/natbib/natbib.sty b/Master/texmf-dist/tex/latex/natbib/natbib.sty
index 3a355adf7fe..e934abaaf78 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@linmpi.mpg.de
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{natbib}
-        [2006/03/22 7.3 (PWD)]
+        [2006/08/18 7.4 (PWD)]
  % This package reimplements the LaTeX \cite command to be used for various
  % citation styles, both author-year and numerical. It accepts BibTeX
  % output intended for many other packages, and therefore acts as a
@@ -361,7 +361,7 @@
       \ifnum\NAT@cmprs>0\relax\NAT@last@yr\fi
       \ifNAT@swa\else\ifnum\NAT@ctype=0\if*#2*\else
       \NAT@cmt#2\fi \NAT@@close\fi\fi}{#1}{#2}}
-\newcommand\NAT@test[1]{\ifnum#1=1 \ifx\NAT@nm\NAT@noname
+\newcommand\NAT@test[1]{\ifnum#1=1 \ifx\NAT@nmfmt{\NAT@nm}\NAT@noname
   {\reset@font\bfseries(author?)}\PackageWarning{natbib}
   {Author undefined for citation`\@citeb'
    \MessageBreak
diff --git a/Master/texmf-dist/tpm/natbib.tpm b/Master/texmf-dist/tpm/natbib.tpm
index 1196effd1d2..5aa767496e3 100644
--- a/Master/texmf-dist/tpm/natbib.tpm
+++ b/Master/texmf-dist/tpm/natbib.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/natbib.zip">
     <TPM:Name>natbib</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/07/15 20:53:14</TPM:Date>
+    <TPM:Date>2006/08/19 23:36:02</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Flexible bibliography support.</TPM:Title>
@@ -17,9 +17,9 @@ designed from the start to be compatible with natbib.
 [description copied from TeX Catalogue]
     </TPM:Description>
     <TPM:Author>Patrick W. Daly</TPM:Author>
-    <TPM:Size>380771</TPM:Size>
+    <TPM:Size>571360</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="118984">
+    <TPM:RunFiles size="119036">
 texmf-dist/bibtex/bst/natbib/abbrvnat.bst
 texmf-dist/bibtex/bst/natbib/plainnat.bst
 texmf-dist/bibtex/bst/natbib/unsrtnat.bst
@@ -27,13 +27,13 @@ texmf-dist/tex/latex/natbib/bibentry.sty
 texmf-dist/tex/latex/natbib/natbib.sty
 texmf-dist/tpm/natbib.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="218301">
+    <TPM:DocFiles size="215295">
 texmf-dist/doc/latex/natbib/README.1st
-texmf-dist/doc/latex/natbib/README.v73
+texmf-dist/doc/latex/natbib/README.v74
 texmf-dist/doc/latex/natbib/natbib.pdf
 texmf-dist/doc/latex/natbib/natnotes.tex
     </TPM:DocFiles>
-    <TPM:SourceFiles size="234075">
+    <TPM:SourceFiles size="234225">
 texmf-dist/source/latex/natbib/bibentry.drv
 texmf-dist/source/latex/natbib/bibentry.dtx
 texmf-dist/source/latex/natbib/bibentry.ins
diff --git a/Master/texmf/lists/natbib b/Master/texmf/lists/natbib
index 8d1ae200542..661bd27d7b4 100644
--- a/Master/texmf/lists/natbib
+++ b/Master/texmf/lists/natbib
@@ -1,5 +1,5 @@
 texmf-dist/doc/latex/natbib/README.1st
-texmf-dist/doc/latex/natbib/README.v73
+texmf-dist/doc/latex/natbib/README.v74
 texmf-dist/doc/latex/natbib/natbib.pdf
 texmf-dist/doc/latex/natbib/natnotes.tex
 texmf-dist/source/latex/natbib/bibentry.drv