mciteplus (13sep13)

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

1 files changed, 13 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/mciteplus/mciteplus.sty b/Master/texmf-dist/tex/latex/mciteplus/mciteplus.sty
index 8d2f1761198..e02af407570 100644
--- a/Master/texmf-dist/tex/latex/mciteplus/mciteplus.sty
+++ b/Master/texmf-dist/tex/latex/mciteplus/mciteplus.sty
@@ -1,8 +1,10 @@
 %% mciteplus.sty
 %% enhanced mcite
-%% Version 1.1, 2008/09/30
+%% Version 1.2, 2013/09/13
 %%
-%% Copyright (c) 2008 Michael Shell
+%% Development beta test version, not for public release.
+%%
+%% Copyright (c) 2008-2013 Michael Shell
 %% Support site:
 %% http://www.michaelshell.org/tex/mciteplus/
 %%
@@ -33,7 +35,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mciteplus}[2008/09/30 v1.1 enhanced mcite]
+\ProvidesPackage{mciteplus}[2013/09/13 v1.2 enhanced mcite]
 
 % package option conditionals
 \newif\if@OPTIONmcitenohooks\@OPTIONmcitenohooksfalse
@@ -783,7 +785,7 @@ Unknown\or Tail\or Head\or Head\else Invalid (#1)\fi}
 
 
 % for debug, head of tail lookup
-\def\@mcitecurheadlookup{}
+\def\@mcitecurbibheadlookup{}
 
 
 
@@ -819,8 +821,8 @@ Unknown\or Tail\or Head\or Head\else Invalid (#1)\fi}
 % debug report
 \if@OPTIONmcitedebug
   \ifnum\@mcitecurstatus=1\relax
-    \@mciteGetHeadofTail{\@mcitecurtrackID}{\mciteBibitemArgI}{\@mcitecurheadlookup}\relax
-    \edef\@mcitedebugheadoftail{Head of this tail: `\@mcitecurheadlookup' (from citation),  `\@mcitecurhead' (in bibliography)}\relax
+    \@mciteGetHeadofTail{\@mcitecurtrackID}{\mciteBibitemArgI}{\@mcitecurbibheadlookup}\relax
+    \edef\@mcitedebugheadoftail{Head of this tail: `\@mcitecurbibheadlookup' (from citation),  `\@mcitecurbibhead' (in bibliography)}\relax
   \else
     \edef\@mcitedebugheadoftail{}\relax
   \fi
@@ -856,8 +858,8 @@ Unknown\or Tail\or Head\or Head\else Invalid (#1)\fi}
      \global\@mcitesublistopenfalse
    \fi
    \relax\mciteEndOfBibGroupPostsubcloseHook\relax
-   % record current head key and argument info
-   \xdef\@mcitecurhead{#2}\relax
+   % record current bib head key and argument info
+   \xdef\@mcitecurbibhead{#2}\relax
    \gdef\mciteCurheadBibitemArgI{#2}\relax
    \gdef\mciteCurheadBibitemOptArgI{#1}\relax
    \ifmciteBibitemOptArgI\global\mciteCurheadBibitemOptArgItrue\else\global\mciteCurheadBibitemOptArgIfalse\fi
@@ -1053,7 +1055,7 @@ Unknown\or Tail\or Head\or Head\else Invalid (#1)\fi}
 
 
 % natbib command names
-\def\@mciteNatbibCiteCmdList{citep,Citep,citet,Citet,citealp,Citealp,citealt,Citealt,citeauthor,Citeauthor,citeyear,citeyearpar,citepalias,citetalias}
+\def\@mciteNatbibCiteCmdList{citenum,citep,Citep,citet,Citet,citealp,Citealp,citealt,Citealt,citeauthor,Citeauthor,citeyear,citeyearpar,citepalias,citetalias}
 
 % if natbib loaded, save originals at start
 \expandafter\ifx\csname ver@natbib.sty\endcsname\relax\else
@@ -1290,7 +1292,7 @@ Unknown\or Tail\or Head\or Head\else Invalid (#1)\fi}
 \edef\mcitethebibliographyHook{\the\@mcitetmptoksA}
 %\def\BR@bibitem{\BRorg@bibitem}
 % and install our own
-\def\mciteBACKREFform{{}\ \BR@backref{\@mcitecurhead}}
+\def\mciteBACKREFform{{}\ \BR@backref{\@mcitecurbibhead}}
 \expandafter\@mcitetmptoksA\expandafter=\expandafter{\mciteEndOfBibGroupPresubcloseHook}
 \addto@hook\@mcitetmptoksA{\mciteBACKREFform}
 \edef\mciteEndOfBibGroupPresubcloseHook{\the\@mcitetmptoksA}
@@ -1307,7 +1309,7 @@ Unknown\or Tail\or Head\or Head\else Invalid (#1)\fi}
 %\def\@@lbibitem{\@lbibitem}
 %\def\@@bibitem{\@bibitem}
 % and install our own
-\def\mciteCITEREFform{\bibitempages{\@citerefpages{\@mcitecurhead}}}
+\def\mciteCITEREFform{\bibitempages{\@citerefpages{\@mcitecurbibhead}}}
 \expandafter\@mcitetmptoksA\expandafter=\expandafter{\mciteEndOfBibGroupPresubcloseHook}
 \addto@hook\@mcitetmptoksA{\mciteCITEREFform}
 \edef\mciteEndOfBibGroupPresubcloseHook{\the\@mcitetmptoksA}