summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-16 21:19:37 +0000
committerKarl Berry <karl@freefriends.org>2016-04-16 21:19:37 +0000
commitb29522c784253f2accc14ea305130c99ea082f97 (patch)
tree7d0bfc06c140729e4a6bb10d108a93bc2e70a2a9 /Master/texmf-dist/tex
parent84a3f37ad781869940729ca913cdcb272497061c (diff)
biblatex-ieee (16apr16)
git-svn-id: svn://tug.org/texlive/trunk@40558 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx93
4 files changed, 25 insertions, 92 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 dff2af68458..7947685f548 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}[2015/03/12 v1.1k biblatex bibliography style]
+\ProvidesFile{ieee-alphabetic.bbx}[2016/04/16 v1.1m biblatex bibliography style]
\RequireBibliographyStyle{ieee}
@@ -53,7 +53,7 @@
{\item}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -76,4 +76,4 @@
%% biblatex-ieee-alphabetic.pdf.
%%
%%
-%% End of file `ieee-alphabetic.bbx'. \ No newline at end of file
+%% End of file `ieee-alphabetic.bbx'.
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 23d35f3cc8d..5194faa5718 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}[2015/03/12 v1.1k biblatex citation style]
+\ProvidesFile{ieee-alphabetic.cbx}[2016/04/16 v1.1m biblatex citation style]
\RequireCitationStyle{alphabetic}
@@ -45,7 +45,7 @@
}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
index 2494dc05c9b..e0e3092c47d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
@@ -8,14 +8,14 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee.bbx}[2015/03/12 v1.1k biblatex bibliography style]
+\ProvidesFile{ieee.bbx}[2016/04/16 v1.1m biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
% Alter settings that carry through from biblatex
\ExecuteBibliographyOptions{
- firstinits,
+ giveninits,
maxnames = 999,
minnames = 3,
sorting = none
@@ -464,15 +464,15 @@
% {<process>} {<text>}
\newcommand*{\bbx@colon@search}[2]{%
- \bbx@colon@search@aux#1#2: \stop
+ \bbx@colon@search@aux#1\empty#2: \stop
}
\long\def\bbx@colon@search@aux#1#2: #3\stop{%
- #1{#2}%
+ \expandafter#1\expandafter{#2}%
\ifblank{#3}
{}
{%
: %
- \bbx@colon@search@aux#1#3\stop
+ \bbx@colon@search@aux#1\empty#3\stop
}%
}
@@ -806,7 +806,7 @@
}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -829,4 +829,4 @@
%% biblatex-ieee-alphabetic.pdf.
%%
%%
-%% End of file `ieee.bbx'. \ No newline at end of file
+%% End of file `ieee.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
index a06fcdab0f0..9849a2469fc 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}[2015/03/12 v1.1k biblatex citation style]
+\ProvidesFile{ieee.cbx}[2016/04/16 v1.1m biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -18,91 +18,24 @@
sorting = none
}
-% Putting brackets around each citation number is a two-part
-% operation. First, remove them from around the whole citation by
-% redeclaring here.
\DeclareCiteCommand{\cite}%
- {\usebibmacro{cite:init}%
- \bibopenbracket
- \usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{cite:comp}}
- {}
- {\usebibmacro{cite:dump}%
- \usebibmacro{postnote}%
- \bibclosebracket
- }
-
-% The second part if more awkward. To add brackets, we cannot use labelnumber
-% as the biblatex kernel does not do a great job on the difference between it
-% and labelnumberwidth! So instead we tackle the issue here, but that means
-% a bit of copy-paste work.
-\renewbibmacro*{cite:comp:comp}{%
- \ifboolexpr{
- ( test {\iffieldundef{prefixnumber}} and test {\ifundef\cbx@lastprefix} )
- or
- test {\iffieldequals{prefixnumber}{\cbx@lastprefix}}
- }
- {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}}
- {\savefield{entrykey}{\cbx@lastkey}%
- \savefield{labelnumber}{\cbx@lastnumber}%
- \addtocounter{cbx@tempcnta}{1}}
- {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}-1}
- {}
- {\usebibmacro{cite:dump}%
- \ifnumgreater{\value{cbx@tempcntb}}{-1}
- {\bibclosebracket\multicitedelim\bibopenbracket}
- {}%
- \printtext{\printtext[bibhyperref]{%
- \printfield{prefixnumber}%
- \printfield{labelnumber}}}}}}
- {\usebibmacro{cite:comp:end}}%
- \setcounter{cbx@tempcntb}{\thefield{labelnumber}}%
- \savefield{prefixnumber}{\cbx@lastprefix}}
-
-\renewbibmacro*{cite:comp:end}{%
- \usebibmacro{cite:dump}%
- \ifnumgreater{\value{cbx@tempcntb}}{-1}
- {\bibclosebracket\multicitedelim\bibopenbracket}
- {}%
- \printtext{\printtext[bibhyperref]{%
- \printfield{prefixnumber}%
- \printfield{labelnumber}}}}
-
-\renewbibmacro*{cite:comp:inset}{%
- \usebibmacro{cite:dump}%
- \ifnumgreater{\value{cbx@tempcntb}}{-1}
- {\bibclosebracket\multicitedelim\bibopenbracket}
- {}%
- \printtext{\printtext[bibhyperref]{%
- \printfield{prefixnumber}%
- \printfield{labelnumber}%
- \printfield{entrysetcount}}}%
- \setcounter{cbx@tempcntb}{-1}}
-
-\renewbibmacro*{cite:dump}{%
- \ifnumgreater{\value{cbx@tempcnta}}{0}
- {%
- \bibclosebracket
- \ifnumgreater{\value{cbx@tempcnta}}{1}
- {\bibrangedash}
- {\multicitedelim}%
- \bibopenbracket
- \bibhyperref[\cbx@lastkey]{%
- \ifdef\cbx@lastprefix
- {\printtext[prefixnumber]{\cbx@lastprefix}}
- {}%
- \printtext{\cbx@lastnumber}}}
- {}%
- \setcounter{cbx@tempcnta}{0}%
- \global\undef\cbx@lastprefix}
-
+ {}% % precode
+ {\bibopenbracket% % loopcode
+ \usebibmacro{prenote}%
+ \usebibmacro{cite:init}%
+ \usebibmacro{citeindex}%
+ \usebibmacro{cite:comp}%
+ \usebibmacro{cite:dump}%
+ \usebibmacro{postnote}%
+ \bibclosebracket}%
+ {\multicitedelim}% % sepcode
+ {}% % postcode
% More bracket removal required
\DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of