summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-09-13 22:09:45 +0000
committerKarl Berry <karl@freefriends.org>2013-09-13 22:09:45 +0000
commit12261e6bc8fc01f331c9ff221ce0417d4ee2fe78 (patch)
treed3b8bf1de3e324942ac50513077ca4a427d7146b /Master
parent4361f8dd30f8ebf9b50151255b970b909c02a319 (diff)
mciteplus (13sep13)
git-svn-id: svn://tug.org/texlive/trunk@31648 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/README12
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/changelog.txt12
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt4
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.pdfbin486493 -> 438691 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.tex53
-rw-r--r--Master/texmf-dist/tex/latex/mciteplus/mciteplus.sty24
6 files changed, 58 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/latex/mciteplus/README b/Master/texmf-dist/doc/latex/mciteplus/README
index 76355d75434..7618ccbd14a 100644
--- a/Master/texmf-dist/doc/latex/mciteplus/README
+++ b/Master/texmf-dist/doc/latex/mciteplus/README
@@ -1,6 +1,6 @@
-September 30, 2008
+September 13, 2013
The mciteplus LaTeX package is an enhanced reimplementation of
Thorsten Ohl's mcite package:
@@ -62,13 +62,13 @@ Michael Shell
*******
-Version 1.1 (2008/09/30) changes:
+Version 1.2 (2013/09/13) changes:
- 1. Corrected error message when a tail is declared again under a different
- head.
-
- 2. Updated IEEEtranM.bst and IEEEtranMN.bst to IEEEtran.bst v1.13 code base.
+ 1) Add support for \citenum of natbib version 8.0 and later.
+ Thanks to Joseph Wright for reporting this.
+ 2) Corrected bug with cross-referenced entries with backref.sty.
+ Thanks to Martin Böttcher for reporting this problem.
********************************** Files **********************************
diff --git a/Master/texmf-dist/doc/latex/mciteplus/changelog.txt b/Master/texmf-dist/doc/latex/mciteplus/changelog.txt
index 2859fc0b4c2..53a6ef6e8e7 100644
--- a/Master/texmf-dist/doc/latex/mciteplus/changelog.txt
+++ b/Master/texmf-dist/doc/latex/mciteplus/changelog.txt
@@ -1,6 +1,6 @@
Changelog history of the mciteplus package
- 2008/09/30
+ 2013/09/13
by Michael Shell
http://www.michaelshell.org/
@@ -18,3 +18,13 @@ Changelog history of the mciteplus package
2) Updated IEEEtranM.bst and IEEEtranMN.bst to IEEEtran.bst v1.13 code base.
+*******
+ 2013/09/13 V1.2 changes:
+
+
+ 1) Add support for \citenum of natbib version 8.0 and later.
+ Thanks to Joseph Wright for reporting this.
+
+ 2) Corrected bug with cross-referenced entries with backref.sty.
+ Thanks to Martin Böttcher for reporting this problem.
+
diff --git a/Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt b/Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt
index ce8f36608cd..6f8207fbdb6 100644
--- a/Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt
+++ b/Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt
@@ -1,8 +1,8 @@
Bst modification and other code listings for the mciteplus package
-Version 1.1, 2008/09/30
+Version 1.2, 2013/09/13
-Copyright (c) 2008 Michael Shell
+Copyright (c) 2008-2013 Michael Shell
Support site:
http://www.michaelshell.org/tex/mciteplus/
diff --git a/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.pdf b/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.pdf
index 3c2b25fecf5..4a50e4f3437 100644
--- a/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.pdf
+++ b/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.tex b/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.tex
index f6269e78f64..eca5be36c8e 100644
--- a/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.tex
+++ b/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.tex
@@ -1,6 +1,6 @@
%% mciteplus_doc.tex
-%% V1.1
-%% 2008/09/30
+%% V1.2
+%% 2013/09/13
%% Copyright (c) 2008 by Michael Shell
%% See:
%% http://www.michaelshell.org/
@@ -141,7 +141,7 @@
\newcommand\MYhyperrefoptions{hypertexnames=false,bookmarks=true,
bookmarksnumbered=true, pdfpagemode={UseOutlines},plainpages=false,
pdfpagelabels=true,colorlinks=true,linkcolor={darkred},
-citecolor={darkgreen},pagecolor={black},urlcolor={darkblue},
+citecolor={darkgreen},urlcolor={darkblue},
pdftitle={Mciteplus: Enhanced Multicitations},
pdfsubject={Typesetting},
pdfauthor={Michael D. Shell},
@@ -491,7 +491,7 @@ mciteplus, multicitations, physics journals, references, typesetting}}
\title{Mciteplus: Enhanced Multicitations}
\author{Michael Shell\thanks{See \url{http://www.michaelshell.org/} for
current contact information.\hfil\break
-\indent\ Manuscript originally created on January 15, 2008; revised September 30, 2008.
+\indent\ Manuscript originally created on January 15, 2008; revised September 13, 2013.
The latest version of this package can be obtained at \mbox{CTAN} \cite{ctan:mciteplus}.
This work is distributed under the \LaTeX\ Project Public License (LPPL)
( \url{http://www.latex-project.org/} )
@@ -501,7 +501,7 @@ The opinions expressed here are entirely that of the author. No warranty is expr
or implied. User assumes all risk.}\\
{\small\hfill\textit{with special thanks to Joseph Wright}\hfill\mbox{}}}
-\date{Version 1.1, September 30, 2008\\[0.5\baselineskip]
+\date{Version 1.2, September 13, 2013\\[0.5\baselineskip]
{\normalfont\normalsize\url{http://www.michaelshell.org/tex/mciteplus/}}}
@@ -2037,7 +2037,8 @@ variants even though the original multibib only supported
Mciteplus is fully compatible with Patrick W. Daly's natbib package
\cite{ctan:natbib} as long as the bibstyle supports both.
All of natbib's \MYshortcmd\cite|end\ variants are supported
-including:
+including:
+\MYshortcmd\citenum|end,
\MYshortcmd\citep|end, \MYshortcmd\Citep|end, \MYshortcmd\citet|end,
\MYshortcmd\Citet|end, \MYshortcmd\citealp|end, \MYshortcmd\Citealp|end,
\MYshortcmd\citealt|end, \MYshortcmd\Citealt|end, \MYshortcmd\citeauthor|end,
@@ -2130,6 +2131,7 @@ bibliography) as originally implemented in mcite.sty.
%\bibliographystyle{IEEEtran}
%\bibliography{mciteplus_doc}
+
% Generated by IEEEtran.bst, version: 1.13 (2008/09/30)
\begin{thebibliography}{10}
\providecommand{\url}[1]{#1}
@@ -2156,7 +2158,7 @@ bibliography) as originally implemented in mcite.sty.
\bibitem{ctan:mciteplus}
\BIBentryALTinterwordspacing
-M.~Shell. (2008, Sep.) The mciteplus.sty package. [Online]. Available:
+M.~Shell. (2013, Sep.) The mciteplus.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/mciteplus/}
\BIBentrySTDinterwordspacing
@@ -2168,7 +2170,7 @@ T.~Ohl. (1996, Jan.) The mcite.sty package. [Online]. Available:
\bibitem{ctan:revtex}
\BIBentryALTinterwordspacing
-A.~Ogawa and D.~Carlisle. (2001, Aug.) The {REV\TeX} package. [Online].
+A.~Ogawa and D.~Carlisle. (2010, Aug.) The {REV\TeX} package. [Online].
Available: \url{http://www.ctan.org/tex-archive/macros/latex/contrib/revtex/}
\BIBentrySTDinterwordspacing
@@ -2180,40 +2182,40 @@ M.~Shell. (2008, Sep.) The {IEEE}tran {{\BibTeX}} style. [Online]. Available:
\bibitem{ctan:hyperref}
\BIBentryALTinterwordspacing
-S.~Rahtz and H.~Oberdiek. (2008, Sep.) The hyperref.sty package. [Online].
+S.~Rahtz and H.~Oberdiek. (2012, Nov.) The hyperref.sty package. [Online].
Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/hyperref/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:chapterbib}
\BIBentryALTinterwordspacing
-D.~Arseneau. (2004, Mar.) The chapterbib.sty package. [Online]. Available:
+D.~Arseneau. (2010, Sep.) The chapterbib.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/cite/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:eqparbox}
\BIBentryALTinterwordspacing
-S.~Pakin. (2004, Aug.) The eqparbox.sty package. [Online]. Available:
+S.~Pakin. (2013, Mar.) The eqparbox.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/eqparbox/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:alphabst}
\BIBentryALTinterwordspacing
-O.~Patashnik. (1988, Feb.) The alpha.bst bibstyle. [Online]. Available:
- \url{http://www.ctan.org/tex-archive/biblio/bibtex/distribs/styles/}
+O.~Patashnik. (2010, Dec.) The alpha.bst bibstyle. [Online]. Available:
+ \url{http://www.ctan.org/tex-archive/biblio/bibtex/base/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:amsrefs}
\BIBentryALTinterwordspacing
-M.~Downes and D.~M. Jones. (2007, Oct.) The amsrefs package. [Online].
+M.~Downes and D.~M. Jones. (2013, Mar.) The amsrefs package. [Online].
Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/amsrefs/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:biblatex}
\BIBentryALTinterwordspacing
-P.~Lehman. (2008, Apr.) The biblatex package. [Online]. Available:
- \url{http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex/}
+P.~Lehman and P.~Kime. (2013, Jul.) The biblatex package. [Online]. Available:
+ \url{http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex}
\BIBentrySTDinterwordspacing
\bibitem{ctan:bibunits}
@@ -2224,7 +2226,7 @@ T.~Hansen. (2004, May) The bibunits.sty package. [Online]. Available:
\bibitem{ctan:citesty}
\BIBentryALTinterwordspacing
-D.~Arseneau. (2006, Sep.) The cite.sty package. [Online]. Available:
+D.~Arseneau. (2010, Sep.) The cite.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/cite/}
\BIBentrySTDinterwordspacing
@@ -2232,13 +2234,12 @@ D.~Arseneau. (2006, Sep.) The cite.sty package. [Online]. Available:
\BIBentryALTinterwordspacing
B.~Briel and U.~Oldenburg. (1999, May) The citeref.sty package. [Online].
Available:
- \url{http://www.ctan.org/tex-archive/macros/latex/contrib/citeref/citeref.st%
-y}
+ \url{http://www.ctan.org/tex-archive/macros/latex/contrib/citeref/citeref.sty}
\BIBentrySTDinterwordspacing
\bibitem{ctan:drftcite}
\BIBentryALTinterwordspacing
-D.~Arseneau. (2007, Dec.) The drftcite.sty package. [Online]. Available:
+D.~Arseneau. (2010, Sep.) The drftcite.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/cite/}
\BIBentrySTDinterwordspacing
@@ -2250,31 +2251,31 @@ A.~Syropoulos. (2004, Jul.) The multibbl.sty package. [Online]. Available:
\bibitem{ctan:multibib}
\BIBentryALTinterwordspacing
-T.~Hansen. (2004, Jan.) The multibib.sty package. [Online]. Available:
+T.~Hansen. (2008, Dec.) The multibib.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/multibib/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:natbib}
\BIBentryALTinterwordspacing
-P.~W. Daly. (2007, Oct.) The natbib.sty package. [Online]. Available:
+P.~W. Daly. (2010, Sep.) The natbib.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/natbib/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:notes2bib}
\BIBentryALTinterwordspacing
-J.~Wright. (2008, Sep.) The notes2bib.sty package. [Online]. Available:
+J.~Wright. (2013, Jul.) The notes2bib.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/notes2bib/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:footbib}
\BIBentryALTinterwordspacing
-E.~Domenjoud. (2005, May) The footbib.sty package. [Online]. Available:
+E.~Domenjoud. (2010, Feb.) The footbib.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/footbib/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:apacite}
\BIBentryALTinterwordspacing
-E.~Meijer. (2007, Sep.) The apacite package. [Online]. Available:
+E.~Meijer. (2013, Jul.) The apacite package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/biblio/bibtex/contrib/apacite/}
\BIBentrySTDinterwordspacing
@@ -2315,6 +2316,4 @@ N.~Markey. (2005, Dec.) The splitbib.sty package. [Online]. Available:
-
-
\end{document}
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}