summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/natbib/natbib.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-10-31 18:09:17 +0000
committerKarl Berry <karl@freefriends.org>2007-10-31 18:09:17 +0000
commitc89084e6f1fa14cb197420a7738d1de99d3ebd91 (patch)
treeac9d61ffc13279848e4acd4e6d056858f5ecce14 /Master/texmf-dist/source/latex/natbib/natbib.dtx
parentcc49573a0a835ce1cd0b385dbe0fccc3c0270f47 (diff)
natbib 81 (30oct07)
git-svn-id: svn://tug.org/texlive/trunk@5316 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/natbib/natbib.dtx')
-rw-r--r--Master/texmf-dist/source/latex/natbib/natbib.dtx38
1 files changed, 21 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/natbib/natbib.dtx b/Master/texmf-dist/source/latex/natbib/natbib.dtx
index c4112cc378b..794bb080155 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}
- [2007/02/05 8.0 (PWD)]
+ [2007/10/30 8.1 (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
@@ -173,8 +173,9 @@
% \changes{8.0}{2007 Feb 2}{Allow changes in cite style, for chapterbib; remove \texttt{nopreonly} option}
% \changes{8.0}{2007 Feb 5}{Remove 2.09 support}
% \changes{8.0}{2007 Feb 5}{Remove subpackage option (and agu, egs options)}
+% \changes{8.1}{2007 Oct 30}{Replace some \cs{edef}s with \cs{protected@edef}}
%
-% \CheckSum{2376}
+% \CheckSum{2381}
% \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
@@ -400,7 +401,7 @@ End of documentation driver file.
% \DoNotIndex{\@celt,\@cite@list,\@citea,\@citeb,\@compress@cite}
% \DoNotIndex{\@bsphack,\@esphack,\@h@ld,\@make@cite@list,\@ne}
% \DoNotIndex{\@sort@celt,\@tempcnta,\@tempcntb,\delimiter,\endgroup}
-% \DoNotIndex{\ifcat,\m@ne,\number,\kern}
+% \DoNotIndex{\ifcat,\m@ne,\number,\kern,\protected@edef}
% \DoNotIndex{\@markboth,\@mkboth,\nobreak,\SK@,\SK@@citex}
% \DoNotIndex{\SK@@label,\SK@@ref,SK@def,\SK@lbibitem,\bbl@redefine}
% \DoNotIndex{\@safe@activesfalse,\@save@activestrue,\active@prefix}
@@ -2581,6 +2582,7 @@ is read in after the main package file.
%
% The command |\@cprwrite| is defined in the \texttt{citeref} package.
% \changes{7.2}{2006 Jan 12}{Add \texttt{citeref} support}
+% \changes{8.1}{2007 Oct 30}{Add \cs{@empty} after \cs{@citeb}, as now in standard \LaTeX}
% \begin{macrocode}
\providecommand\@firstofone[1]{#1}
\newcommand\NAT@citexnum{}
@@ -2592,7 +2594,7 @@ is read in after the main package file.
\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}{%
@@ -2627,6 +2629,7 @@ is read in after the main package file.
% can be used independently}
% \changes{7.2}{2006 Jan 12}{Add hyperlinks to compressed cites}
% \changes{7.4a}{2006 Sep 06}{Add \cs{noexpand} to \cs{hyper@natlinkend}}
+% \changes{8.1}{2007 Oct 30}{Change \cs{edef} to \cs{protected@edef}}
% \begin{macrocode}
\ifNAT@swa
\ifnum\NAT@ctype>1\relax\@citea
@@ -2644,11 +2647,11 @@ is read in after the main package file.
\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
@@ -2768,6 +2771,7 @@ is read in after the main package file.
%
% The command |\@cprwrite| is defined in the \texttt{citeref} package.
% \changes{7.2}{2006 Jan 12}{Add \texttt{citeref} support}
+% \changes{8.1}{2007 Oct 30}{Add \cs{@empty} after \cs{@citeb}, as now in standard \LaTeX}
% \begin{macrocode}
\newcommand\NAT@citex{}
\def\NAT@citex%
@@ -2776,7 +2780,7 @@ is read in after the main package file.
\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%
@@ -2965,7 +2969,7 @@ is read in after the main package file.
% \begin{macrocode}
\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}
% \end{macrocode}
% \end{macro}
@@ -3474,7 +3478,7 @@ is read in after the main package file.
% \begin{macrocode}
\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}{%
@@ -4365,8 +4369,8 @@ is read in after the main package file.
\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 @@}}
% \end{macrocode}
% \begin{macro}{\NAT@make@cite@list}
% This is essentially Arseneau's coding, with some renaming and the addition
@@ -4377,7 +4381,7 @@ is read in after the main package file.
% \begin{macrocode}
\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
@@ -4386,22 +4390,22 @@ is read in after the main package file.
% If highest number so far, add at the end.
% \begin{macrocode}
\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
% \end{macrocode}
% Else, process the numerical list to insert number and citation key.
% \begin{macrocode}
\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
% \end{macrocode}
% If not a number, add it to |\NAT@nonsort@list|.
% \begin{macrocode}
- \edef\NAT@nonsort@list{\NAT@nonsort@list\@citeb,}%
+ \protected@edef\NAT@nonsort@list{\NAT@nonsort@list\@citeb,}%
\fi}
\endgroup
% \end{macrocode}
@@ -4429,7 +4433,7 @@ is read in after the main package file.
\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
% \end{macrocode}
% \end{macro}
%