From c89084e6f1fa14cb197420a7738d1de99d3ebd91 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 31 Oct 2007 18:09:17 +0000 Subject: natbib 81 (30oct07) git-svn-id: svn://tug.org/texlive/trunk@5316 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/natbib/bibentry.sty | 11 +++++---- Master/texmf-dist/tex/latex/natbib/natbib.sty | 30 ++++++++++++------------- 2 files changed, 22 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/latex/natbib') diff --git a/Master/texmf-dist/tex/latex/natbib/bibentry.sty b/Master/texmf-dist/tex/latex/natbib/bibentry.sty index d30533f245d..af90f2237a5 100644 --- a/Master/texmf-dist/tex/latex/natbib/bibentry.sty +++ b/Master/texmf-dist/tex/latex/natbib/bibentry.sty @@ -19,15 +19,15 @@ %% Full documentation can be obtained by LaTeXing that original file. %% Only a few abbreviated comments remain here to describe the usage. %% ============================================= -%% Copyright 1997-1999 Patrick W Daly -%% Max-Planck-Institut f\"ur Aeronomie +%% Copyright 1997-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} \ProvidesPackage{bibentry} - [2000/06/20 1.4 (PWD)] + [2007/10/30 1.5 (PWD)] % Bibliography Entries in Text % % In place of \bibliography{database}, enter \nobibliography{database} @@ -77,6 +77,9 @@ {You have used \string\nobibliography* \MessageBreak without a following \string\bibliography.\MessageBreak You may not be able to run BibTeX}\fi} +\AtBeginDocument{\@ifpackageloaded{url} + {\providecommand{\doi}{doi: \begingroup \urlstyle{rm}\Url}} + {\providecommand{\doi}[1]{doi: #1}}} %% %% <<<<< End of generated file <<<<<< %% diff --git a/Master/texmf-dist/tex/latex/natbib/natbib.sty b/Master/texmf-dist/tex/latex/natbib/natbib.sty index ed4ac59ffb8..173e896c34f 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} - [2007/02/05 8.0 (PWD)] + [2007/10/30 8.1 (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 @@ -341,7 +341,7 @@ \ifnum\NAT@ctype=0\if*#1*\else #1\ \fi\fi\fi \@for\@citeb:=\NAT@cite@list\do - {\edef\@citeb{\expandafter\@firstofone\@citeb}% + {\edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}% \@ifundefined{@cprwrite}{}{\expandafter\@cprwrite\@citeb=}\fi \@ifundefined{b@\@citeb\@extra@b@citeb}{% @@ -372,11 +372,11 @@ \endgroup \ifnum\NAT@nm=\@tempcnta \ifx\NAT@last@yr\relax - \edef\NAT@last@yr{\@citea \mbox{% + \protected@edef\NAT@last@yr{\@citea \mbox{% \noexpand\hyper@natlinkstart{\@citeb\@extra@b@citeb}{% \noexpand\citenumfont{\NAT@num}}\noexpand\hyper@natlinkend}}% \else - \edef\NAT@last@yr{--\penalty\@m\mbox{% + \protected@edef\NAT@last@yr{--\penalty\@m\mbox{% \noexpand\hyper@natlinkstart{\@citeb\@extra@b@citeb}{% \noexpand\citenumfont{\NAT@num}}\noexpand\hyper@natlinkend}}% \fi @@ -437,7 +437,7 @@ \let\@citea\@empty \@cite{\let\NAT@nm\@empty\let\NAT@year\@empty \@for\@citeb:=\NAT@cite@list\do - {\edef\@citeb{\expandafter\@firstofone\@citeb}% + {\edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}% \@ifundefined{@cprwrite}{}{\expandafter\@cprwrite\@citeb=}\fi \@ifundefined{b@\@citeb\@extra@b@citeb}{\@citea% @@ -533,7 +533,7 @@ \let\@tempa\relax\else#1\fi\@tempa} \newcommand\shortcites[1]{% \@bsphack\@for\@citeb:=#1\do - {\edef\@citeb{\expandafter\@firstofone\@citeb}% + {\edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% \global\@namedef{bv@\@citeb\@extra@b@citeb}{}}\@esphack} \newcommand\NAT@biblabel[1]{\hfill} \newcommand\NAT@biblabelnum[1]{\bibnumfmt{#1}} @@ -656,7 +656,7 @@ \NAT@swatrue\def\NAT@ctype{3}\NAT@partrue\NAT@citetp} \renewcommand\nocite[1]{\@bsphack \@for\@citeb:=#1\do{% - \edef\@citeb{\expandafter\@firstofone\@citeb}% + \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi \if*\@citeb\else \@ifundefined{b@\@citeb\@extra@b@citeb}{% @@ -851,26 +851,26 @@ \def\NAT@cite@list{}% \def\NAT@nonsort@list{}% \@for \@citeb:=#1\do{\NAT@make@cite@list}% -\edef\NAT@cite@list{\NAT@cite@list\NAT@nonsort@list}% -\edef\NAT@cite@list{\expandafter\NAT@xcom\NAT@cite@list @@}} +\protected@edef\NAT@cite@list{\NAT@cite@list\NAT@nonsort@list}% +\protected@edef\NAT@cite@list{\expandafter\NAT@xcom\NAT@cite@list @@}} \begingroup \catcode`\_=8 \gdef\NAT@make@cite@list{% - \edef\@citeb{\expandafter\@firstofone\@citeb}% + \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% \@ifundefined{b@\@citeb\@extra@b@citeb}{\def\NAT@num{A}}% {\NAT@parse{\@citeb}}% \ifcat _\ifnum\z@<0\NAT@num _\else A\fi \@tempcnta\NAT@num \relax \ifnum \@tempcnta>\@tempcntb - \edef\NAT@num@list{\NAT@num@list \@celt{\NAT@num}}% - \edef\NAT@cite@list{\NAT@cite@list\@citeb,}% + \protected@edef\NAT@num@list{\NAT@num@list \@celt{\NAT@num}}% + \protected@edef\NAT@cite@list{\NAT@cite@list\@citeb,}% \@tempcntb\@tempcnta \else \let\NAT@@cite@list=\NAT@cite@list \def\NAT@cite@list{}% - \edef\NAT@num@list{\expandafter\NAT@num@celt \NAT@num@list \@gobble @}% + \protected@edef\NAT@num@list{\expandafter\NAT@num@celt \NAT@num@list \@gobble @}% {\let\@celt=\NAT@celt\NAT@num@list}% \fi \else - \edef\NAT@nonsort@list{\NAT@nonsort@list\@citeb,}% + \protected@edef\NAT@nonsort@list{\NAT@nonsort@list\@citeb,}% \fi} \endgroup \def\NAT@celt#1{\ifnum #1<\@tempcnta @@ -890,7 +890,7 @@ \def\NAT@restc#1,#2{#2} \def\NAT@xcom#1,@@{#1} \else - \newcommand\NAT@sort@cites[1]{\edef\NAT@cite@list{#1}}\fi + \newcommand\NAT@sort@cites[1]{\protected@edef\NAT@cite@list{#1}}\fi \InputIfFileExists{natbib.cfg} {\typeout{Local config file natbib.cfg used}}{} %% -- cgit v1.2.3