biblatex-ieee (26oct13)

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

4 files changed, 35 insertions, 45 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
index e52705f0f4b..bdd32285962 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
@@ -8,7 +8,7 @@
 %% ---------------------------------------------------------------
 %% 
 
-\ProvidesFile{ieee-alphabetic.bbx}[2013/06/18 v1.1i biblatex bibliography style]
+\ProvidesFile{ieee-alphabetic.bbx}[2013/10/25 v1.1j biblatex bibliography style]
 
 \RequireBibliographyStyle{ieee}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
index 780320c9c56..85349022b20 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
@@ -8,7 +8,7 @@
 %% ---------------------------------------------------------------
 %% 
 
-\ProvidesFile{ieee-alphabetic.cbx}[2013/06/18 v1.1i biblatex citation style]
+\ProvidesFile{ieee-alphabetic.cbx}[2013/10/25 v1.1j biblatex citation style]
 
 \RequireCitationStyle{alphabetic}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
index b6d4f3a5599..afa37ae46b6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
@@ -8,7 +8,7 @@
 %% ---------------------------------------------------------------
 %% 
 
-\ProvidesFile{ieee.bbx}[2013/06/18 v1.1i biblatex bibliography style]
+\ProvidesFile{ieee.bbx}[2013/10/25 v1.1j biblatex bibliography style]
 
 % Load the standard style to avoid copy-pasting unnecessary material
 \RequireBibliographyStyle{numeric-comp}
@@ -370,22 +370,22 @@
 
 % Specialised functions for manipulating data, where the biblatex
 % kernel does not provide a suitable function.
-\newcommand*\mkpagegrouped[1]{%
+\newcommand*{\mkpagegrouped}[1]{%
   \mkpagegrouped@aux#1\bibrangedash&%
 }
 
-\newcommand*\mkpagegrouped@aux{}
-\long\def\mkpagegrouped@aux#1\bibrangedash#2&{%
+\newcommand*{\mkpagegrouped@aux}{}
+\def\mkpagegrouped@aux#1\bibrangedash#2&{%
   \mkonepagegrouped{#1}%
   \ifblank{#2}
     {}
     {%
       \bibrangedash
-      \mkpagegrouped@second#2%
+      \mkpagegrouped@second#2&%
     }%
 }
 
-\newcommand*\mkonepagegrouped[1]{%
+\newcommand*{\mkonepagegrouped}[1]{%
   \ifinteger{#1}
     {%
       \mkpagegrouped@ifmorethanfour{#1}
@@ -395,15 +395,33 @@
      {#1}%
 }
 
-\newcommand*\mkpagegrouped@second{}
-\def\mkpagegrouped@second#1\bibrangedash{\mkonepagegrouped{#1}}
+\newcommand*{\mkpagegrouped@second}{}
+\def\mkpagegrouped@second#1\bibrangedash&{%
+  \mkpagegrouped@second@auxi#1\bibrangessep&%
+}
+
+\newcommand*{\mkpagegrouped@second@auxi}{}
+\def\mkpagegrouped@second@auxi#1\bibrangessep#2&{%
+   \mkonepagegrouped{#1}%
+   \ifblank{#2}
+     {}
+     {%
+       \bibrangessep
+       \mkpagegrouped@second@auxii#2&%
+     }% 
+}
+
+\newcommand*{\mkpagegrouped@second@auxii}{}
+\def\mkpagegrouped@second@auxii#1\bibrangessep&{%
+  \mkpagegrouped{#1}%
+}
 
-\newcommand*\mkpagegrouped@ifmorethanfour[1]{%
+\newcommand*{\mkpagegrouped@ifmorethanfour}[1]{%
   \mkpagegrouped@ifmorethanfour@aux#1\@empty\@empty\@empty\@empty
     \@empty\@nil
 }
 
-\newcommand*\mkpagegrouped@ifmorethanfour@aux{}
+\newcommand*{\mkpagegrouped@ifmorethanfour@aux}{}
 \def\mkpagegrouped@ifmorethanfour@aux#1#2#3#4#5\@nil{%
  \ifx\@empty#5\@empty
    \expandafter\@secondoftwo
@@ -412,7 +430,7 @@
   \fi
 }
 
-\newcommand*\mkpagegrouped@separate[4]{%
+\newcommand*{\mkpagegrouped@separate}[4]{%
   \ifx\@empty#2\@empty
     \mkpagegrouped@print#1\relax
   \else
@@ -428,12 +446,12 @@
   \fi
 }
 
-\newcommand*\bbx@digits@separate@aux{}
+\newcommand*{\bbx@digits@separate@aux}{}
 \def\mkpagegrouped@separate@aux#1\fi\fi\fi{%
   \fi\fi\fi\mkpagegrouped@separate{#1}%
 }
 
-\newcommand*\mkpagegrouped@print[4]{%
+\newcommand*{\mkpagegrouped@print}[4]{%
   \ifblank{#1}{}{#1}%
   #2#3%
   \ifx#4\relax
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
index d02003b9c72..748d157efd8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
@@ -8,7 +8,7 @@
 %% ---------------------------------------------------------------
 %% 
 
-\ProvidesFile{ieee.cbx}[2013/06/18 v1.1i biblatex citation style]
+\ProvidesFile{ieee.cbx}[2013/10/25 v1.1j biblatex citation style]
 
 \RequireCitationStyle{numeric-comp}
 
@@ -96,35 +96,7 @@
     {}%
   \setcounter{cbx@tempcnta}{0}%
   \global\undef\cbx@lastprefix}
-  
-% More fun, this time with \textcite, which has brackets hard-coded in
-% the original
-\renewbibmacro*{textcite}{%
-  \iffieldequals{namehash}{\cbx@lasthash}
-    {\usebibmacro{cite:comp}}
-    {\usebibmacro{cite:dump}\cbx@tempa
-     \usebibmacro{cite:init}%
-     \ifnameundef{labelname}
-       {\printfield[citetitle]{labeltitle}}
-       {\printnames{labelname}}%
-     \addspace
-     \bibopenbracket
-     \ifnumequal{\value{citecount}}{1}
-       {\usebibmacro{prenote}}
-       {}%
-     \usebibmacro{cite:comp}}%
-  \savefield{namehash}{\cbx@lasthash}%
-  \gdef\cbx@tempa{\multicitedelim}}
-  
-\DeclareCiteCommand{\textcite}
-  {\usebibmacro{cite:init}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{textcite}}
-  {}
-  {%
-    \usebibmacro{postnote}%
-    \bibclosebracket
-  }
+
 
 % More bracket removal required
 \DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}