summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranM.bst41
-rw-r--r--Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranMN.bst41
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/README12
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/changelog.txt20
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt2
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.pdfbin486432 -> 486493 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.tex29
-rw-r--r--Master/texmf-dist/tex/latex/mciteplus/mciteplus.sty30
8 files changed, 116 insertions, 59 deletions
diff --git a/Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranM.bst b/Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranM.bst
index 7dacadcb2e8..4470ade57ec 100644
--- a/Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranM.bst
+++ b/Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranM.bst
@@ -3,7 +3,7 @@
%% BibTeX Bibliography Style file
%% mciteplus compatible version
%% *** Not for normal IEEE work ***
-%% Version 1.12 (2008/01/15)
+%% Version 1.13 (2008/09/30)
%%
%% Copyright (c) 2003-2008 Michael Shell
%%
@@ -49,7 +49,10 @@
% Changelog:
%
% 1.12 (2008/01/15) initial release
-
+%
+% 1.13 (2008/09/30)
+% 1. Fixed bug with edition number to ordinal conversion. Thanks to
+% Michael Roland for reporting this and correcting the algorithm.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -151,8 +154,8 @@ FUNCTION {is.print.banners.to.terminal} { #1 }
%% FILE VERSION AND BANNER %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-FUNCTION{bst.file.version} { "1.12" }
-FUNCTION{bst.file.date} { "2008/01/15" }
+FUNCTION{bst.file.version} { "1.13" }
+FUNCTION{bst.file.date} { "2008/09/30" }
FUNCTION{bst.file.website} { "http://www.michaelshell.org/tex/ieeetran/bibtex/" }
FUNCTION {banner.message}
@@ -946,20 +949,24 @@ FUNCTION {name.or.dash}
% Converts the number string on the top of the stack to
% "numerical ordinal form" (e.g., "7" to "7th"). There is
% no artificial limit to the upper bound of the numbers as the
-% least significant digit always determines the ordinal form.
+% two least significant digits determine the ordinal form.
FUNCTION {num.to.ordinal}
-{ duplicate$ #-1 #1 substring$ "1" =
- { bbl.st * }
- { duplicate$ #-1 #1 substring$ "2" =
- { bbl.nd * }
- { duplicate$ #-1 #1 substring$ "3" =
- { bbl.rd * }
- { bbl.th * }
- if$
- }
- if$
- }
- if$
+{ duplicate$ #-2 #1 substring$ "1" =
+ { bbl.th * }
+ { duplicate$ #-1 #1 substring$ "1" =
+ { bbl.st * }
+ { duplicate$ #-1 #1 substring$ "2" =
+ { bbl.nd * }
+ { duplicate$ #-1 #1 substring$ "3" =
+ { bbl.rd * }
+ { bbl.th * }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
}
% If the string on the top of the stack begins with a number,
diff --git a/Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranMN.bst b/Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranMN.bst
index 8be434d6889..25543569179 100644
--- a/Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranMN.bst
+++ b/Master/texmf-dist/bibtex/bst/mciteplus/IEEEtranMN.bst
@@ -3,7 +3,7 @@
%% BibTeX Bibliography Style file
%% mciteplus compatible natbib version of IEEEtran.bst
%% *** Not for normal IEEE work ***
-%% Version 1.12 (2008/01/15)
+%% Version 1.13 (2008/09/30)
%%
%% Copyright (c) 2003-2008 Michael Shell
%%
@@ -52,7 +52,10 @@
% Changelog:
%
% 1.12 (2008/01/15) initial release
-
+%
+% 1.13 (2008/09/30)
+% 1. Fixed bug with edition number to ordinal conversion. Thanks to
+% Michael Roland for reporting this and correcting the algorithm.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -154,8 +157,8 @@ FUNCTION {is.print.banners.to.terminal} { #1 }
%% FILE VERSION AND BANNER %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-FUNCTION{bst.file.version} { "1.12" }
-FUNCTION{bst.file.date} { "2008/01/15" }
+FUNCTION{bst.file.version} { "1.13" }
+FUNCTION{bst.file.date} { "2008/09/30" }
FUNCTION{bst.file.website} { "http://www.michaelshell.org/tex/ieeetran/bibtex/" }
FUNCTION {banner.message}
@@ -949,20 +952,24 @@ FUNCTION {name.or.dash}
% Converts the number string on the top of the stack to
% "numerical ordinal form" (e.g., "7" to "7th"). There is
% no artificial limit to the upper bound of the numbers as the
-% least significant digit always determines the ordinal form.
+% two least significant digits determine the ordinal form.
FUNCTION {num.to.ordinal}
-{ duplicate$ #-1 #1 substring$ "1" =
- { bbl.st * }
- { duplicate$ #-1 #1 substring$ "2" =
- { bbl.nd * }
- { duplicate$ #-1 #1 substring$ "3" =
- { bbl.rd * }
- { bbl.th * }
- if$
- }
- if$
- }
- if$
+{ duplicate$ #-2 #1 substring$ "1" =
+ { bbl.th * }
+ { duplicate$ #-1 #1 substring$ "1" =
+ { bbl.st * }
+ { duplicate$ #-1 #1 substring$ "2" =
+ { bbl.nd * }
+ { duplicate$ #-1 #1 substring$ "3" =
+ { bbl.rd * }
+ { bbl.th * }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
}
% If the string on the top of the stack begins with a number,
diff --git a/Master/texmf-dist/doc/latex/mciteplus/README b/Master/texmf-dist/doc/latex/mciteplus/README
index d4f5fd652cf..76355d75434 100644
--- a/Master/texmf-dist/doc/latex/mciteplus/README
+++ b/Master/texmf-dist/doc/latex/mciteplus/README
@@ -1,6 +1,6 @@
-January 15, 2008
+September 30, 2008
The mciteplus LaTeX package is an enhanced reimplementation of
Thorsten Ohl's mcite package:
@@ -62,12 +62,20 @@ Michael Shell
*******
-Version 1.0 (2008/01/15) initial release
+Version 1.1 (2008/09/30) 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.
+
********************************** Files **********************************
README - This file.
+changelog.txt - Version history.
+
mciteplus.sty - The mciteplus LaTeX package.
mciteplus_doc.pdf - The mciteplus user manual.
diff --git a/Master/texmf-dist/doc/latex/mciteplus/changelog.txt b/Master/texmf-dist/doc/latex/mciteplus/changelog.txt
new file mode 100644
index 00000000000..2859fc0b4c2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mciteplus/changelog.txt
@@ -0,0 +1,20 @@
+
+Changelog history of the mciteplus package
+ 2008/09/30
+ by Michael Shell
+ http://www.michaelshell.org/
+
+
+*******
+ 2008/01/15 V1.0 initial release
+
+
+*******
+ 2008/09/30 V1.1 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.
+
+
diff --git a/Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt b/Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt
index 5ecf2455b29..ce8f36608cd 100644
--- a/Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt
+++ b/Master/texmf-dist/doc/latex/mciteplus/mciteplus_code.txt
@@ -1,6 +1,6 @@
Bst modification and other code listings for the mciteplus package
-Version 1.0, 2008/01/15
+Version 1.1, 2008/09/30
Copyright (c) 2008 Michael Shell
Support site:
diff --git a/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.pdf b/Master/texmf-dist/doc/latex/mciteplus/mciteplus_doc.pdf
index 5ee97e7a78f..3c2b25fecf5 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 2f042834c2d..f6269e78f64 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.0
-%% 2008/01/15
+%% V1.1
+%% 2008/09/30
%% Copyright (c) 2008 by Michael Shell
%% See:
%% http://www.michaelshell.org/
@@ -491,17 +491,17 @@ 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. 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/} )
+\indent\ Manuscript originally created on January 15, 2008; revised September 30, 2008.
+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/} )
version 1.3. A copy of the LPPL, version 1.3, is included in the base \LaTeX\
documentation of all distributions of \LaTeX\ released 2003/12/01 or later.
The opinions expressed here are entirely that of the author. No warranty is expressed
or implied. User assumes all risk.}\\
{\small\hfill\textit{with special thanks to Joseph Wright}\hfill\mbox{}}}
-\date{Version 1.0, January 15, 2008\\[0.5\baselineskip]
+\date{Version 1.1, September 30, 2008\\[0.5\baselineskip]
{\normalfont\normalsize\url{http://www.michaelshell.org/tex/mciteplus/}}}
@@ -2130,8 +2130,7 @@ bibliography) as originally implemented in mcite.sty.
%\bibliographystyle{IEEEtran}
%\bibliography{mciteplus_doc}
-
-% Generated by IEEEtran.bst, version: 1.12 (2007/01/11)
+% Generated by IEEEtran.bst, version: 1.13 (2008/09/30)
\begin{thebibliography}{10}
\providecommand{\url}[1]{#1}
\csname url@samestyle\endcsname
@@ -2157,7 +2156,7 @@ bibliography) as originally implemented in mcite.sty.
\bibitem{ctan:mciteplus}
\BIBentryALTinterwordspacing
-M.~Shell. (2007, Dec.) The mciteplus.sty package. [Online]. Available:
+M.~Shell. (2008, Sep.) The mciteplus.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/mciteplus/}
\BIBentrySTDinterwordspacing
@@ -2175,13 +2174,13 @@ A.~Ogawa and D.~Carlisle. (2001, Aug.) The {REV\TeX} package. [Online].
\bibitem{ctan:ieeetranbst}
\BIBentryALTinterwordspacing
-M.~Shell. (2007, Jan.) The {IEEE}tran {{\BibTeX}} style. [Online]. Available:
+M.~Shell. (2008, Sep.) The {IEEE}tran {{\BibTeX}} style. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/IEEEtran/bibtex/}
\BIBentrySTDinterwordspacing
\bibitem{ctan:hyperref}
\BIBentryALTinterwordspacing
-S.~Rahtz and H.~Oberdiek. (2008, Jan.) The hyperref.sty package. [Online].
+S.~Rahtz and H.~Oberdiek. (2008, Sep.) The hyperref.sty package. [Online].
Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/hyperref/}
\BIBentrySTDinterwordspacing
@@ -2213,7 +2212,7 @@ M.~Downes and D.~M. Jones. (2007, Oct.) The amsrefs package. [Online].
\bibitem{ctan:biblatex}
\BIBentryALTinterwordspacing
-P.~Lehman. (2007, Dec.) The biblatex package. [Online]. Available:
+P.~Lehman. (2008, Apr.) The biblatex package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex/}
\BIBentrySTDinterwordspacing
@@ -2263,7 +2262,7 @@ P.~W. Daly. (2007, Oct.) The natbib.sty package. [Online]. Available:
\bibitem{ctan:notes2bib}
\BIBentryALTinterwordspacing
-J.~Wright. (2008, Jan.) The notes2bib.sty package. [Online]. Available:
+J.~Wright. (2008, Sep.) The notes2bib.sty package. [Online]. Available:
\url{http://www.ctan.org/tex-archive/macros/latex/contrib/notes2bib/}
\BIBentrySTDinterwordspacing
@@ -2316,4 +2315,6 @@ 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 445070818f1..8d2f1761198 100644
--- a/Master/texmf-dist/tex/latex/mciteplus/mciteplus.sty
+++ b/Master/texmf-dist/tex/latex/mciteplus/mciteplus.sty
@@ -1,6 +1,6 @@
%% mciteplus.sty
%% enhanced mcite
-%% Version 1.0, 2008/01/15
+%% Version 1.1, 2008/09/30
%%
%% Copyright (c) 2008 Michael Shell
%% Support site:
@@ -33,7 +33,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mciteplus}[2008/01/15 v1.0 enhanced mcite]
+\ProvidesPackage{mciteplus}[2008/09/30 v1.1 enhanced mcite]
% package option conditionals
\newif\if@OPTIONmcitenohooks\@OPTIONmcitenohooksfalse
@@ -651,10 +651,14 @@ Unknown\or Tail\or Head\or Head\else Invalid (#1)\fi}
definition of group of head `\@mcitecurhead'}{You cannot define a group,
then reissue the head and add new tail citations.}\relax
\fi
- \ifnum\@mcitecurstatus=1\relax % OK to respecify tails as long as they already belong to this group, this allows for overall (global) bibliographies
+ \ifnum\@mcitecurstatus=1\relax % OK to respecify tails as long as they already belong to this group,
+ % this allows for overall (global) bibliographies
\@mciteGetHeadofTail{\@mcitecurtrackID}{\@mcitecurkey}{\@mciteheadofcurkey}\relax
\ifx\@mciteheadofcurkey\@mcitecurhead
+ % Note: We don't/can't catch the case of repeated tail declarations under a redeclared head.
+ % Not a mandatory error anyway.
\else
+ % tail cannot have been declared in definition of another group
\PackageError{mciteplus}{Tail citation `\@mcitecurkey' is not allowed in group of head
`\@mcitecurhead' as this tail has already been declared in group
of head `\@mciteheadofcurkey'}{You cannot have a tail citation
@@ -662,11 +666,21 @@ Unknown\or Tail\or Head\or Head\else Invalid (#1)\fi}
\fi
\fi
\else % head not redeclared
- \ifnum\@mcitecurstatus=1\relax % cannot be declared twice as a tail in initial definition, this is an optional error
- \PackageError{mciteplus}{Tail citation `\@mcitecurkey' has been declared more than once in
- definition of group for head `\@mcitecurhead'}{Each tail
- citation can only be specified once in the definition
- of a group.}\relax
+ \ifnum\@mcitecurstatus=1\relax % the current head has not been declared before, so neither should any of its tails
+ \@mciteGetHeadofTail{\@mcitecurtrackID}{\@mcitecurkey}{\@mciteheadofcurkey}\relax
+ \ifx\@mciteheadofcurkey\@mcitecurhead
+ % tail cannot be declared twice in initial definition, this is an optional error
+ \PackageError{mciteplus}{Tail citation `\@mcitecurkey' has been declared more than once in
+ definition of group for head `\@mcitecurhead'}{Each tail
+ citation can only be specified once in the definition
+ of a group.}\relax
+ \else
+ % tail cannot have been declared in definition of another group
+ \PackageError{mciteplus}{Tail citation `\@mcitecurkey' is not allowed in group of head
+ `\@mcitecurhead' as this tail has already been declared in group
+ of head `\@mciteheadofcurkey'}{You cannot have a tail citation
+ that appears in more than one citation group.}\relax
+ \fi
\fi
\fi% end if head redeclared
% if not declared before, process as a valid tail
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 15:34:47 +0000