mciteplus 1.1 (30sep08)

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

1 files changed, 22 insertions, 8 deletions

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