summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/combine/combnat.sty
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-05-26 17:41:55 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-05-26 17:41:55 +0000
commite7e6d544bac1225c4bf36f70687fb6e12c4641ba (patch)
tree89c25f4ca39743bd73ca040c1197685b96b1cc7d /Master/texmf-dist/tex/latex/combine/combnat.sty
parentd233d3b8f65e431989a1c4fda4b0a828a6fc22d6 (diff)
combine update to v0.64a 2004/05/07 entering tlpkg-ctan-check
git-svn-id: svn://tug.org/texlive/trunk@8357 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/combine/combnat.sty')
-rw-r--r--Master/texmf-dist/tex/latex/combine/combnat.sty224
1 files changed, 87 insertions, 137 deletions
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