natbib 8.0 since a mac user noticed already

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

4 files changed, 72 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/natbib/README.v74a b/Master/texmf-dist/doc/latex/natbib/README.v80
index 031aa07805e..2a171d7bde2 100644
--- a/Master/texmf-dist/doc/latex/natbib/README.v74a
+++ b/Master/texmf-dist/doc/latex/natbib/README.v80
@@ -1,5 +1,5 @@
                                 NATBIB Package
-Current Version: 7.4a from 2006/09/06
+Current Version: 8.0 from 2007/02/05
 
 See list of changes below
 
@@ -121,6 +121,40 @@ For full details, print out the documentation in natbib.dtx by LaTeXing it.
 
 -------------------------------------------------------------------------
 List of changes
+  v8.0  Add \setcitestyle to simplify changing citation punctuation; is to replace 
+        \bibpunct, which is retained for compatibility.
+        
+        Citation style commands (\setcitestyle, \citestyle, \bibpunct) are no longer 
+        limited to the preamble; in particular they may be issued in different chapters
+        with the chapterbib package; even the author--year or numerical mode can
+        be switched and the bibliography is adjusted accordingly. (This has long
+        been requested by several users.) The docstrip option 'nopreonly' is therefore
+        removed, since it is now always active.
+        
+        Support for LaTeX 2.09 is removed; I no longer can test it and it only
+        complicates the source file.
+        
+        Package option 'colon' always meant putting a semi-colon between multiple
+        citations. This seems odd to me, but I probably thought 'semicolon' was
+        too long. I now have 'semicolon' to be explicit, but 'colon' is still
+        retained (as semi-colon).
+        
+  v7.5  (Never released, it is the preliminary 8.0)
+        Superscript citations: if braces specified, they are also superscripted
+        in both in-text and parenthetical citations. Any optional notes are
+        printed before and after as regular text.
+        
+        Add \citenum{key} to print the number, even in author-year mode. And 
+        without superscripting and without parentheses. This is so 
+        superscripted citations can be referred to in-text as regular numbers.
+         
+        In-text numerical citations with notes: the notes are now outside the parentheses
+        as this appears more logical. For parenthetical citations, notes are still
+        inside.
+        
+        The indexing of citations now has the default format Author [num]  in numerical mode.
+        Previously it was  Author [date]  in both.
+
   v7.4a Fix bug in the compression option that occurs with hyperref and dvips.
   
   v7.4  Fix so nonamebreak option works with numerical citations too.
diff --git a/Master/texmf-dist/doc/latex/natbib/natbib.pdf b/Master/texmf-dist/doc/latex/natbib/natbib.pdf
index 60bb01bc957..2141249751f 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.pdf b/Master/texmf-dist/doc/latex/natbib/natnotes.pdf
new file mode 100644
index 00000000000..2dcd957d10a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/natbib/natnotes.pdf
diff --git a/Master/texmf-dist/doc/latex/natbib/natnotes.tex b/Master/texmf-dist/doc/latex/natbib/natnotes.tex
index 7c789ecfb43..7c1830cf507 100644
--- a/Master/texmf-dist/doc/latex/natbib/natnotes.tex
+++ b/Master/texmf-dist/doc/latex/natbib/natnotes.tex
@@ -21,17 +21,17 @@
 %% 
 %% For more details, LaTeX the source natbib.dtx.
 %% ==============================================
-%% Copyright 1993-2006 Patrick W Daly
+%% Copyright 1993-2007 Patrick W Daly
 %% Max-Planck-Institut f\"ur Sonnensystemforschung
 %% Max-Planck-Str. 2
 %% D-37191 Katlenburg-Lindau
 %% Germany
-%% E-mail: daly@linmpi.mpg.de
+%% E-mail: daly@mps.mpg.de
 \NeedsTeXFormat{LaTeX2e}
 \def\DescribesFile#1 [#2 #3 #4]
   {\def\filename{#1}\def\filedate{#2}\def\fileversion{#3}}
 \DescribesFile{natbib}
-        [2006/09/06 7.4a (PWD)]
+        [2007/02/05 8.0 (PWD)]
 \documentclass{article}
 
 \setlength{\parindent}{0pt}
@@ -138,8 +138,12 @@ results are different.
 \head{Suppressed parentheses}
 As an alternative form of citation, |\citealt| is the same as |\citet| but
 \emph{without parentheses}. Similarly, |\citealp| is |\citep| without
-parentheses. Multiple references, notes, and the starred variants
-also exist.
+parentheses.
+
+The |\citenum| command prints the citation number, without parentheses, even
+in author--year mode, and without raising it in superscript mode. This is
+intended to be able to refer to citation numbers without superscripting them.
+
 \begin{quote}
 \begin{tabular}{l@{\quad$\Rightarrow$\quad}l}
   |\citealt{jon90}| & Jones et al.\ 1990\\
@@ -148,6 +152,7 @@ also exist.
   |\citealp*{jon90}| & Jones, Baker, and Williams, 1990\\
   |\citealp{jon90,jam91}| & Jones et al., 1990; James et al., 1991\\
   |\citealp[pg.~32]{jon90}| & Jones et al., 1990, pg.~32\\
+  |\citenum{jon90}| & 11\\
   |\citetext{priv.\ comm.}| & (priv.\ comm.)
 \end{tabular}
 \end{quote}
@@ -198,30 +203,27 @@ These citation commands function much like |\citet| and |\citep|: they may
 take multiple keys in the argument, may contain notes, and are marked as
 hyperlinks.
 \head{Selecting citation style and punctuation}
-Use the command |\bibpunct| with one optional and 6 mandatory arguments:
-\begin{enumerate}
-\item the opening bracket symbol, default = (
-\item the closing bracket symbol, default = )
-\item the punctuation between multiple citations, default = ;
-\item the letter `n' for numerical style, or `s' for numerical superscript
-      style, any other letter for
-      author--year, default = author--year;
-\item the punctuation that comes between the author names and the year
-\item the punctuation that comes between years or numbers when common author
-      lists are suppressed (default = ,);
-\end{enumerate}
-
-The optional argument is the character preceding a post-note, default is a
-comma plus space. In redefining this character, one must include a space if
-one is wanted.
-
-Example~1, |\bibpunct{[}{]}{,}{a}{}{;}| changes the output of
+Use the command |\setcitestyle| with a list of comma-separated
+keywords (without spaces) as argument.
+\begin{quote}
+  Citation mode: |authoryear| or |numbers| or |super|\\
+  Braces: |round| or |square| or |open={|\emph{char}|},close={|\emph{char}|}|\\
+  Between citations: |semicolon| or |comma| or |citesep={|\emph{char}|}|\\
+  Between author and year: |aysep={|\emph{char}|}|\\
+  Between years with common author: |yysep={|\emph{char}|}|\\
+  Text before post-note: |notesep={|\emph{text}|}|
+\end{quote}
+Defaults are |authoryear|, |round|, |comma|, |aysep={;}|, |yysep={,}|,
+|notesep={, }|
+
+Example~1, |\setcitestyle{square,aysep={},yysep={;}}| changes the author--year
+output of
 \begin{quote}
   |\citep{jon90,jon91,jam92}|
 \end{quote}
 into [Jones et al. 1990; 1991, James et al. 1992].
 
-Example~2, |\bibpunct[; ]{(}{)}{,}{a}{}{;}| changes the output of
+Example~2, |\setcitestyle{notesep={; },round,aysep={},yysep={;}}| changes the output of
 \begin{quote}
   |\citep[and references therein]{jon90}|
 \end{quote}
@@ -277,8 +279,12 @@ Every |\include|d file must contain its own
 |\bibliography| command where the bibliography is to appear. The database
 files listed as arguments to this command can be different in each file,
 of course. However, what is not so obvious, is that each file must also
-contain a |\bibliographystyle| command, \emph{preferably with the same
-style  argument}.
+contain a |\bibliographystyle| command, with possibly differing arguments.
+
+As of version~8.0, the citation style, including mode (author--year or
+numerical) may also differ between chapters. The |\setcitestyle| command
+can be issued at any point in the document, in particular in different
+chapters.
 \head{Sorting and compressing citations}
 Do not use the \texttt{cite} package with \thestyle; rather use one of the
 options \texttt{sort}, \texttt{compress}, or \texttt{sort\&compress}.
@@ -303,9 +309,11 @@ is read in after the main package file.
 \item[\ttfamily square] for square brackets;
 \item[\ttfamily curly] for curly braces;
 \item[\ttfamily angle] for angle brackets;
-\item[\ttfamily colon] (default) to separate multiple citations with
-     colons;
-\item[\ttfamily comma] to use commas as separaters;
+\item[\ttfamily semicolon] (default) to separate multiple citations with
+     semi-colons;
+\item[\ttfamily colon] the same as \texttt{semicolon}, an earlier mistake in
+     terminology;
+\item[\ttfamily comma] to use commas as separators;
 \item[\ttfamily authoryear] (default) for author--year citations;
 \item[\ttfamily numbers] for numerical citations;
 \item[\ttfamily super] for superscripted numerical citations, as in