diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/combine/combcite.sty | 109 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/combine/combine.cls | 31 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/combine/combinet.sty | 32 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/combine/combnat.sty | 224 |
4 files changed, 236 insertions, 160 deletions
diff --git a/Master/texmf-dist/tex/latex/combine/combcite.sty b/Master/texmf-dist/tex/latex/combine/combcite.sty new file mode 100644 index 00000000000..12e4800d5c9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/combine/combcite.sty @@ -0,0 +1,109 @@ +%% +%% This is file `combcite.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% combine.dtx (with options: `citepack') +%% +%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com +%% (or at: pandgwilson at earthlink dot net) +%% Copyright 2000, 2001, 2002, 2003 Peter R. Wilson +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any +%% later version. +%% The latest version of the license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2003/06/01 or later. +%% +%% This work has the LPPL maintenance status "author-maintained". +%% +%% This work consists of the files listed in the README file. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{combcite}[2003/11/09 v1.0 combine version of cite package] +\@ifclassloaded{combine}{}{% + \PackageError{combcite}{The `combine' class is expected}{\@ehc}} + +\newif\ifc@lbsuperopt + \c@lbsuperoptfalse +\DeclareOption{super}{\ExecuteOptions{superscript}} +\DeclareOption{superscript}{\c@lbsuperopttrue + \PassOptionsToClass{superscript}{cite}} +\ProcessOptions +\RequirePackageWithOptions{cite}[2003/11/04] + +\DeclareRobustCommand\c@lbciten[1]{% + \begingroup + \let\@safe@activesfalse\@empty +%% \c@lb@nocite{#1}% ignores spaces, writes to .aux file, returns #1 in \@no@sparg + \@nocite{#1}% ignores spaces, writes to .aux file, returns #1 in \@no@sparg + \@tempcntb\m@ne % \@tempcntb tracks highest number + \let\@h@ld\@empty % nothing held from list yet + \let\@citea\@empty % no punctuation preceding first + \let\@celt\delimiter % an unexpandable, but identifiable, token + \def\@cite@list{}% % empty list to start + \@for \@citeb:=\@no@sparg\do{\c@lb@make@cite@list}% make a sorted list of numbers + % After sorted citelist is made, execute it to compress citation ranges. + \@tempcnta\m@ne % no previous number + \let\@celt\@compress@cite \@cite@list % output number list with compression + \@h@ld % output anything held over + \endgroup + \@restore@auxhandle + } + +\def\c@lb@make@cite@list{% + \expandafter\let \expandafter\@B@citeB + \csname B?\jobname?@\@citeb\@extra@b@citeb \endcsname + \ifx\@B@citeB\relax % undefined: output ? and warning + \@citea {\bfseries ?}\let\@citea\citepunct \G@refundefinedtrue + \@warning {Citation `\@citeb' on page \thepage\space undefined}% + \oc@verbo \global\@namedef{B?\jobname?@\@citeb\@extra@b@citeb}{?}% + \else % defined % remove previous line to repeat warnings + \ifcat _\ifnum\z@<0\@B@citeB _\else A\fi % a positive number, put in list + \@addto@cite@list + \else % citation is not a number, output immediately + \@citea \citeform{\@B@citeB}\let\@citea\citepunct + \fi\fi} + +\ifc@lbsuperopt + \DeclareRobustCommand{\c@lbcite}{% + \@ifnextchar[{\@tempswatrue\c@lb@citex}{\@tempswafalse\c@lb@citew}} +\else + \DeclareRobustCommand{\c@lbcite}{% + \@ifnextchar[{\@tempswatrue\c@lb@citex}{\@tempswafalse\c@lb@citex[]}} +\fi + +\def\c@lb@citex[#1]#2{\@cite{\c@lbciten{#2}}{#1}} + +\def\c@lb@citew#1{\begingroup \leavevmode + \@if@fillglue \lastskip \relax \unskip + \def\@tempa{\@tempcnta\spacefactor + \/% this allows the last word to be hyphenated, and it looks better. + \@citess{\c@lbciten{#1}}\spacefactor\@tempcnta + \endgroup \@restore@auxhandle}% + \oc@movep\relax}% check for following punctuation (depending on options) + +\DeclareRobustCommand\c@lbnocite[1]{% + \@bsphack \@nocite{#1}% + \@for \@citeb:=\@no@sparg\do{\@ifundefined{B?\jobname?@\@citeb\@extra@b@citeb}% + {\G@refundefinedtrue\@warning{Citation `\@citeb' undefined}% + \oc@verbo \global\@namedef{B?\jobname?@\@citeb\@extra@b@citeb}{?}}{}}% + \@esphack} + +\def\@nocite#1{\begingroup\let\protect\string% normalize active chars + \xdef\@no@sparg{\expandafter\@ignsp#1 \: }\endgroup% and remove ALL spaces + \if@filesw \immediate\write\@newciteauxhandle % = \@auxout, except with multibib + {\string\citation {\@no@sparg}}\fi + } + +\g@addto@macro{\setuppapers}{\let\cite\c@lbcite} +\g@addto@macro{\setuppapers}{\let\citenum\c@lbciten} +\g@addto@macro{\setuppapers}{\let\citeonline\c@lbciten} + +\endinput +%% +%% End of file `combcite.sty'. diff --git a/Master/texmf-dist/tex/latex/combine/combine.cls b/Master/texmf-dist/tex/latex/combine/combine.cls index d1326874566..b8f2e8ae033 100644 --- a/Master/texmf-dist/tex/latex/combine/combine.cls +++ b/Master/texmf-dist/tex/latex/combine/combine.cls @@ -6,17 +6,25 @@ %% %% combine.dtx (with options: `usc') %% -%% Copyright 2000 Peter R. Wilson +%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com +%% (or at: pandgwilson at earthlink dot net) +%% Copyright 2000, 2001, 2002, 2003 Peter R. Wilson %% -%% This program is provided under the terms of the -%% LaTeX Project Public License distributed from CTAN -%% archives in directory macros/latex/base/lppl.txt. +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any +%% later version. +%% The latest version of the license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2003/06/01 or later. %% -%% Author: Peter Wilson (CUA) -%% now at: peter.r.wilson@boeing.com +%% This work has the LPPL maintenance status "author-maintained". +%% +%% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{combine}[2002/08/24 v0.5 collection of documents] +\ProvidesClass{combine}[2003/11/09 v0.52 collection of documents] \RequirePackage{keyval} \newcommand{\c@lclass}{article} @@ -78,6 +86,7 @@ \DeclareOption{book}{\def\c@lclass{book}} \DeclareOption{report}{\def\c@lclass{report}} \DeclareOption{letter}{\def\c@lclass{letter}} +\DeclareOption{memoir}{\def\c@lclass{memoir}} \DeclareOption{classes}{\c@lclassestrue} \DeclareOption{packages}{\c@lpackagestrue} \DeclareOption{layouts}{\c@llayoutstrue} @@ -161,12 +170,12 @@ \c@lnamethm{#1}{#2}{#3}}}} } -\newcommand{\providelength}[1]{% +\providecommand{\providelength}[1]{% \ifx #1\undefined \newlength{#1} \fi } -\newcommand{\providecounter}[1]{% +\providecommand{\providecounter}[1]{% \expandafter\ifx \csname c@#1\endcsname \undefined {\@definecounter{#1}}% \@ifnextchar[{\@newctr{#1}}{} @@ -958,7 +967,7 @@ \let\newlabel\c@lbnewlabel \let\ref\c@lbref \let\pageref\c@lbpageref -\renewcommand{\bibliographystyle}[1]{} +%%% \renewcommand{\bibliographystyle}[1]{} \ifc@lcombib \else \ifc@lonebib @@ -987,6 +996,8 @@ \newcommand{\takedownpapers}{% } +\newcommand{\emptyAtBeginDocument}{\let\@begindocumenthook\@empty} + \let\document\c@ladocument \let\enddocument\c@laenddocument %%\let\maketitle\c@lamaketitle diff --git a/Master/texmf-dist/tex/latex/combine/combinet.sty b/Master/texmf-dist/tex/latex/combine/combinet.sty index a08eeeca46e..5b1858b9cb2 100644 --- a/Master/texmf-dist/tex/latex/combine/combinet.sty +++ b/Master/texmf-dist/tex/latex/combine/combinet.sty @@ -6,17 +6,25 @@ %% %% combine.dtx (with options: `pck') %% -%% Copyright 2000 Peter R. Wilson +%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com +%% (or at: pandgwilson at earthlink dot net) +%% Copyright 2000, 2001, 2002, 2003 Peter R. Wilson %% -%% This program is provided under the terms of the -%% LaTeX Project Public License distributed from CTAN -%% archives in directory macros/latex/base/lppl.txt. +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any +%% later version. +%% The latest version of the license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2003/06/01 or later. %% -%% Author: Peter Wilson (CUA) -%% now at: peter.r.wilson@boeing.com +%% This work has the LPPL maintenance status "author-maintained". +%% +%% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{combinet}[2001/09/05 v0.2 document titles in ToC] +\ProvidesPackage{combinet}[2004/03/06 v0.2a document titles in ToC] \@ifclassloaded{combine}{}{% \PackageError{combinet}{The `combine' class is expected}{\@ehc}% } @@ -87,13 +95,11 @@ \ifc@lnomtitle\else \ifx\@title\@empty\else \ifc@lnothanks - \c@laaddtocontents{toc}% - {\protect\contentsline{coltoctitle}% - {\protect\numberline{}\c@l@title}{\thecolpage}} + \c@laaddcontentsline{toc}% + {coltoctitle}{\protect\numberline{}\c@l@title}% \else - \c@laaddtocontents{toc}% - {\protect\contentsline{coltoctitle}% - {\protect\numberline{}\@title}{\thecolpage}} + \c@laaddcontentsline{toc}% + {coltoctitle}{\protect\numberline{}\@title}% \fi \fi \fi diff --git a/Master/texmf-dist/tex/latex/combine/combnat.sty b/Master/texmf-dist/tex/latex/combine/combnat.sty index d0b28e65812..53ef889cdfa 100644 --- a/Master/texmf-dist/tex/latex/combine/combnat.sty +++ b/Master/texmf-dist/tex/latex/combine/combnat.sty @@ -6,17 +6,25 @@ %% %% combine.dtx (with options: `natpack') %% -%% Copyright 2000 Peter R. Wilson +%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com +%% (or at: pandgwilson at earthlink dot net) +%% Copyright 2000, 2001, 2002, 2003 Peter R. Wilson %% -%% This program is provided under the terms of the -%% LaTeX Project Public License distributed from CTAN -%% archives in directory macros/latex/base/lppl.txt. +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any +%% later version. +%% The latest version of the license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2003/06/01 or later. %% -%% Author: Peter Wilson (CUA) -%% now at: peter.r.wilson@boeing.com +%% This work has the LPPL maintenance status "author-maintained". +%% +%% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{combnat}[2002/08/24 v0.2 combined natbib package] +\ProvidesPackage{combnat}[2003/05/22 v0.21 combined natbib package] \@ifclassloaded{combine}{}{% \PackageError{combnat}{The `combine' class is expected}{\@ehc}} \RequirePackageWithOptions{natbib} @@ -52,23 +60,18 @@ \def\NAT@date{}}} \newcommand{\c@lNAT@citexnum@swatrue}{% - \ifnum\NAT@ctype>1\relax - \@citea + \ifnum\NAT@ctype>1\relax\@citea \hyper@natlinkstart{\@citeb\@extra@b@citeb}% - \ifnum\NAT@ctype=2\relax - \NAT@test{\NAT@ctype}% - \else - \NAT@alias - \fi - \hyper@natlinkend - \else + \ifnum\NAT@ctype=2\relax\NAT@test{\NAT@ctype}% + \else\NAT@alias + \fi\hyper@natlinkend\else \ifnum\NAT@sort>1\relax \begingroup\catcode`\_=8 \ifcat _\ifnum\z@<0\NAT@num _\else A\fi - \global\let\NAT@nm=\NAT@num \else \gdef\NAT@nm{-2}\fi + \global\let\NAT@nm=\NAT@num \else \gdef\NAT@nm{-2}\fi \ifcat _\ifnum\z@<0\NAT@last@num _\else A\fi - \global\@tempcnta=\NAT@last@num \global\advance\@tempcnta by\@ne - \else \global\@tempcnta\m@ne\fi + \global\@tempcnta=\NAT@last@num \global\advance\@tempcnta by\@ne + \else \global\@tempcnta\m@ne\fi \endgroup \ifnum\NAT@nm=\@tempcnta \ifx\NAT@last@yr\relax @@ -82,7 +85,7 @@ \fi \else \@citea \mbox{\hyper@natlinkstart{\@citeb\@extra@b@citeb}% - {\citenumfont\NAT@num}\hyper@natlinkend}% + {\citenumfont\NAT@num}\hyper@natlinkend}% \fi \fi \def\@citea{\NAT@sep\penalty\@m\NAT@space}% @@ -97,85 +100,68 @@ \c@lNATwritemainbib %%% change here {\let\NAT@last@num\NAT@num\let\NAT@last@nm\NAT@nm \NAT@parse{\@citeb}% - \ifNAT@longnames - \@ifundefined{bv@\@citeb\@extra@b@citeb}{% + \ifNAT@longnames\@ifundefined{bv@\@citeb\@extra@b@citeb}{% \let\NAT@name=\NAT@all@names \global\@namedef{bv@\@citeb\@extra@b@citeb}{}}{}% \fi - \ifNAT@full - \let\NAT@nm\NAT@all@names - \else + \ifNAT@full\let\NAT@nm\NAT@all@names\else \let\NAT@nm\NAT@name \fi \ifNAT@swa \c@lNAT@citexnum@swatrue \else \ifcase\NAT@ctype\relax - \ifx\NAT@last@nm\NAT@nm - \NAT@yrsep\penalty\@m\NAT@space - \else - \@citea \NAT@test{1}\ \NAT@@open - \if*#1*\else#1\ \fi - \fi - \NAT@mbox{% - \hyper@natlinkstart{\@citeb\@extra@b@citeb}% - {\citenumfont\NAT@num}\hyper@natlinkend}% - \def\@citea{\NAT@@close\NAT@sep\penalty\@m\ }% + \ifx\NAT@last@nm\NAT@nm \NAT@yrsep\penalty\@m\NAT@space\else + \@citea \NAT@test{1}\ \NAT@@open + \if*#1*\else#1\ \fi\fi \NAT@mbox{% + \hyper@natlinkstart{\@citeb\@extra@b@citeb}% + {\citenumfont\NAT@num}\hyper@natlinkend}% + \def\@citea{\NAT@@close\NAT@sep\penalty\@m\ }% \or\@citea \hyper@natlinkstart{\@citeb\@extra@b@citeb}% - \NAT@test{\NAT@ctype}\hyper@natlinkend + \NAT@test{\NAT@ctype}\hyper@natlinkend \def\@citea{\NAT@sep\penalty\@m\ }% \or\@citea \hyper@natlinkstart{\@citeb\@extra@b@citeb}% - \NAT@test{\NAT@ctype}\hyper@natlinkend + \NAT@test{\NAT@ctype}\hyper@natlinkend \def\@citea{\NAT@sep\penalty\@m\ }% \or\@citea \hyper@natlinkstart{\@citeb\@extra@b@citeb}% - \NAT@alias\hyper@natlinkend + \NAT@alias\hyper@natlinkend \def\@citea{\NAT@sep\penalty\@m\ }% \fi \fi }}% - \ifnum\NAT@sort>1\relax - \NAT@last@yr - \fi + \ifnum\NAT@sort>1\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}} \def\c@lbNAT@citexnum[#1][#2]#3{% - \ifc@lcombib \c@laNATnocite{#3} \fi %%% change here + \ifc@lcombib\c@laNATnocite{#3}\fi %%% change here \NAT@sort@cites{#3}% \let\@citea\@empty \@cite{\def\NAT@num{-1}\let\NAT@last@yr\relax\let\NAT@nm\@empty \@for\@citeb:=\NAT@cite@list\do - {\edef\@citeb{\expandafter\@firstofone\@citeb}% - \c@lNATwritelocalbib %%% change here - {\let\NAT@last@num\NAT@num\let\NAT@last@nm\NAT@nm - \NAT@parse{\@citeb}% - \ifNAT@longnames - \@ifundefined{bv@\@citeb\@extra@b@citeb}{% - \let\NAT@name=\NAT@all@names - \global\@namedef{bv@\@citeb\@extra@b@citeb}{}}{}% - \fi - \ifNAT@full - \let\NAT@nm\NAT@all@names - \else - \let\NAT@nm\NAT@name - \fi + {\edef\@citeb{\expandafter\@firstofone\@citeb}% + \c@lNATwritelocalbib %%% change here + {\let\NAT@last@num\NAT@num\let\NAT@last@nm\NAT@nm + \NAT@parse{\@citeb}% + \ifNAT@longnames\@ifundefined{bv@\@citeb\@extra@b@citeb}{% + \let\NAT@name=\NAT@all@names + \global\@namedef{bv@\@citeb\@extra@b@citeb}{}}{}% + \fi + \ifNAT@full\let\NAT@nm\NAT@all@names\else + \let\NAT@nm\NAT@name\fi \ifNAT@swa \c@lNAT@citexnum@swatrue \else \ifcase\NAT@ctype\relax - \ifx\NAT@last@nm\NAT@nm - \NAT@yrsep\penalty\@m\NAT@space - \else - \@citea \NAT@test{1}\ \NAT@@open - \if*#1*\else#1\ \fi - \fi - \NAT@mbox{% - \hyper@natlinkstart{\@citeb\@extra@b@citeb}% - {\citenumfont\NAT@num}\hyper@natlinkend}% - \def\@citea{\NAT@@close\NAT@sep\penalty\@m\ }% + \ifx\NAT@last@nm\NAT@nm \NAT@yrsep\penalty\@m\NAT@space\else + \@citea \NAT@test{1}\ \NAT@@open + \if*#1*\else#1\ \fi\fi \NAT@mbox{% + \hyper@natlinkstart{\@citeb\@extra@b@citeb}% + {\citenumfont\NAT@num}\hyper@natlinkend}% + \def\@citea{\NAT@@close\NAT@sep\penalty\@m\ }% \or\@citea \hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@test{\NAT@ctype}\hyper@natlinkend @@ -188,8 +174,7 @@ \hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@alias\hyper@natlinkend \def\@citea{\NAT@sep\penalty\@m\ }% - \fi - \fi + \fi\fi }}% \ifnum\NAT@sort>1\relax\NAT@last@yr\fi \ifNAT@swa\else\ifnum\NAT@ctype=0\if*#2*\else @@ -210,8 +195,7 @@ \hyper@natlinkstart{\@citeb\@extra@b@citeb}\NAT@date \hyper@natlinkend \fi - \else - \@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% + \else\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@nmfmt{\NAT@nm}% \hyper@natlinkbreak{\NAT@aysep\ }{\@citeb\@extra@b@citeb}% \NAT@date\hyper@natlinkend @@ -223,11 +207,11 @@ \NAT@date\hyper@natlinkend \or\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@alias\hyper@natlinkend - \fi - \def\@citea{\NAT@sep\ }% + \fi \def\@citea{\NAT@sep\ }% } -\def\NAT@citex[#1][#2]#3{% +\def\NAT@citex% + [#1][#2]#3{% \NAT@sort@cites{#3}% \let\@citea\@empty \@cite{\let\NAT@nm\@empty\let\NAT@year\@empty @@ -236,16 +220,12 @@ \c@lNATwritemainbibdate %%%% change here {\let\NAT@last@nm=\NAT@nm\let\NAT@last@yr=\NAT@year \NAT@parse{\@citeb}% - \ifNAT@longnames - \@ifundefined{bv@\@citeb\@extra@b@citeb}{% + \ifNAT@longnames\@ifundefined{bv@\@citeb\@extra@b@citeb}{% \let\NAT@name=\NAT@all@names \global\@namedef{bv@\@citeb\@extra@b@citeb}{}}{}% \fi - \ifNAT@full - \let\NAT@nm\NAT@all@names - \else - \let\NAT@nm\NAT@name - \fi + \ifNAT@full\let\NAT@nm\NAT@all@names\else + \let\NAT@nm\NAT@name\fi \ifNAT@swa \c@lNAT@citex@swatrue \else @@ -265,25 +245,19 @@ \else\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@nmfmt{\NAT@nm}% \hyper@natlinkbreak{\ \NAT@@open\if*#1*\else#1\ \fi}% - {\@citeb\@extra@b@citeb}% - \NAT@date\hyper@natlinkend - \fi - \fi + {\@citeb\@extra@b@citeb}% + \NAT@date\hyper@natlinkend\fi + \fi \or\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@nmfmt{\NAT@nm}\hyper@natlinkend \or\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@date\hyper@natlinkend \or\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@alias\hyper@natlinkend - \fi - \if\relax\NAT@date\relax\def\@citea{\NAT@sep\ }% - \else - \def\@citea{\NAT@@close\NAT@sep\ } - \fi + \fi \if\relax\NAT@date\relax\def\@citea{\NAT@sep\ }% + \else\def\@citea{\NAT@@close\NAT@sep\ }\fi \fi - }% - }% - \ifNAT@swa\else\if*#2*\else\NAT@cmt#2\fi + }}\ifNAT@swa\else\if*#2*\else\NAT@cmt#2\fi \if\relax\NAT@date\relax\else\NAT@@close\fi\fi}{#1}{#2}} \def\c@lbNAT@citex[#1][#2]#3{% @@ -296,16 +270,12 @@ \c@lNATwritelocalbibdate %%%% change here {\let\NAT@last@nm=\NAT@nm\let\NAT@last@yr=\NAT@year \NAT@parse{\@citeb}% - \ifNAT@longnames - \@ifundefined{bv@\@citeb\@extra@b@citeb}{% + \ifNAT@longnames\@ifundefined{bv@\@citeb\@extra@b@citeb}{% \let\NAT@name=\NAT@all@names \global\@namedef{bv@\@citeb\@extra@b@citeb}{}}{}% \fi - \ifNAT@full - \let\NAT@nm\NAT@all@names - \else - \let\NAT@nm\NAT@name - \fi + \ifNAT@full\let\NAT@nm\NAT@all@names\else + \let\NAT@nm\NAT@name\fi \ifNAT@swa \c@lNAT@citex@swatrue \else @@ -325,25 +295,19 @@ \else\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@nmfmt{\NAT@nm}% \hyper@natlinkbreak{\ \NAT@@open\if*#1*\else#1\ \fi}% - {\@citeb\@extra@b@citeb}% - \NAT@date\hyper@natlinkend - \fi - \fi + {\@citeb\@extra@b@citeb}% + \NAT@date\hyper@natlinkend\fi + \fi \or\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@nmfmt{\NAT@nm}\hyper@natlinkend \or\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@date\hyper@natlinkend \or\@citea\hyper@natlinkstart{\@citeb\@extra@b@citeb}% \NAT@alias\hyper@natlinkend - \fi - \if\relax\NAT@date\relax\def\@citea{\NAT@sep\ }% - \else - \def\@citea{\NAT@@close\NAT@sep\ } - \fi + \fi \if\relax\NAT@date\relax\def\@citea{\NAT@sep\ }% + \else\def\@citea{\NAT@@close\NAT@sep\ }\fi \fi - }% - }% - \ifNAT@swa\else\if*#2*\else\NAT@cmt#2\fi + }}\ifNAT@swa\else\if*#2*\else\NAT@cmt#2\fi \if\relax\NAT@date\relax\else\NAT@@close\fi\fi}{#1}{#2}} \newcommand\c@laNATnocite[1]{\@bsphack @@ -454,8 +418,8 @@ \gdef\c@laNAT@make@cite@list{% \edef\@citeb{\expandafter\@firstofone\@citeb}% \@ifundefined{b@\@citeb\@extra@b@citeb}{\def\NAT@num{A}}% - {\NAT@parse{\@citeb}}% - \ifcat _\ifnum\z@<0\NAT@num _\else A\fi + {\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}}% @@ -500,22 +464,15 @@ \AtEndDocument{\NAT@swatrue\let\bibcite\NAT@testdef} -\newcommand{\c@laNAT@set@cites}{% - \ifNAT@numbers - \ifNAT@super - \let\@cite\NAT@citesuper +\newcommand{\c@laNAT@set@cites}{\ifNAT@numbers + \ifNAT@super \let\@cite\NAT@citesuper \def\NAT@mbox##1{\unskip\nobreak\hspace{1\p@}\textsuperscript{##1}}% \let\citeyearpar=\citeyear - \let\NAT@space\relax - \else + \let\NAT@space\relax\else \let\NAT@mbox=\mbox - \let\@cite\NAT@citenum - \def\NAT@space{ }% - \fi + \let\@cite\NAT@citenum \def\NAT@space{ }\fi \let\@citex\NAT@citexnum - \ifx\@biblabel\@empty - \let\@biblabel\NAT@biblabelnum - \fi + \ifx\@biblabel\@empty\let\@biblabel\NAT@biblabelnum\fi \let\@bibsetup\NAT@bibsetnum \def\natexlab##1{}% \else @@ -526,22 +483,15 @@ \def\natexlab##1{##1}% \fi} -\newcommand{\c@lbNAT@set@cites}{% - \ifNAT@numbers - \ifNAT@super - \let\@cite\NAT@citesuper +\newcommand{\c@lbNAT@set@cites}{\ifNAT@numbers + \ifNAT@super \let\@cite\NAT@citesuper \def\NAT@mbox##1{\unskip\nobreak\hspace{1\p@}\textsuperscript{##1}}% \let\citeyearpar=\citeyear - \let\NAT@space\relax - \else + \let\NAT@space\relax\else \let\NAT@mbox=\mbox - \let\@cite\NAT@citenum - \def\NAT@space{ }% - \fi + \let\@cite\NAT@citenum \def\NAT@space{ }\fi \let\@citex\NAT@citexnum - \ifx\@biblabel\@empty - \let\@biblabel\NAT@biblabelnum - \fi + \ifx\@biblabel\@empty\let\@biblabel\NAT@biblabelnum\fi \let\@bibsetup\NAT@bibsetnum \def\natexlab##1{}% \else |