biblatex-ieee (18dec12)

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

4 files changed, 36 insertions, 19 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 0a33df2122d..b833623cd35 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}[2012/12/04 v1.1e biblatex bibliography style]
+\ProvidesFile{ieee-alphabetic.bbx}[2012/12/17 v1.1f 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 19a6b36c05a..85dc0312659 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}[2012/12/04 v1.1e biblatex citation style]
+\ProvidesFile{ieee-alphabetic.cbx}[2012/12/17 v1.1f 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 79eb8196824..997ad34af9e 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}[2012/12/04 v1.1e biblatex bibliography style]
+\ProvidesFile{ieee.bbx}[2012/12/17 v1.1f biblatex bibliography style]
 
 % Load the standard style to avoid copy-pasting unnecessary material
 \RequireBibliographyStyle{numeric-comp}
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
index 55134d78afc..54d3ec1cf4b 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}[2012/12/04 v1.1e biblatex citation style]
+\ProvidesFile{ieee.cbx}[2012/12/17 v1.1f biblatex citation style]
 
 \RequireCitationStyle{numeric-comp}
 
@@ -50,9 +50,9 @@
 	   \ifnumgreater{\value{cbx@tempcntb}}{-1}
 	     {\multicitedelim}
 	     {}%
-	   \printtext[bibhyperref]{%
+	   \printtext[brackets]{\printtext[bibhyperref]{%
 	     \printfield{prefixnumber}%
-	     \printfield[brackets]{labelnumber}}}}}
+	     \printfield{labelnumber}}}}}}
     {\usebibmacro{cite:comp:end}}%
   \setcounter{cbx@tempcntb}{\thefield{labelnumber}}%
   \savefield{prefixnumber}{\cbx@lastprefix}}
@@ -62,27 +62,19 @@
   \ifnumgreater{\value{cbx@tempcntb}}{-1}
     {\multicitedelim}
     {}%
-  \printtext[bibhyperref]{%
+  \printtext[brackets]{\printtext[bibhyperref]{%
     \printfield{prefixnumber}%
-    \printfield[brackets]{labelnumber}}}
+    \printfield{labelnumber}}}}
 
 \renewbibmacro*{cite:comp:inset}{%
   \usebibmacro{cite:dump}%
   \ifnumgreater{\value{cbx@tempcntb}}{-1}
     {\multicitedelim}
     {}%
-  \printtext[bibhyperref]{%
+  \printtext[brackets]{\printtext[bibhyperref]{%
     \printfield{prefixnumber}%
-    \printfield[brackets]{labelnumber}%
-    \printfield{entrysetcount}}%
-  \setcounter{cbx@tempcntb}{-1}}
-
-\renewbibmacro*{cite:comp:shand}{%
-  \usebibmacro{cite:dump}%
-  \ifnumgreater{\value{cbx@tempcntb}}{-1}
-    {\multicitedelim}
-    {}%
-  \printtext[bibhyperref]{\printfield{shorthand}}%
+    \printfield{labelnumber}%
+    \printfield{entrysetcount}}}%
   \setcounter{cbx@tempcntb}{-1}}
 
 \renewbibmacro*{cite:dump}{%
@@ -98,6 +90,31 @@
     {}%
   \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
+     \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}}
 
 %% 
 %% Copyright (C) 2011,2012 by