From 5f9cb6594c5c491b7fdf82b3111f93dd7c866f78 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Mar 2017 22:02:09 +0000 Subject: biblatex-ieee (2mar17) git-svn-id: svn://tug.org/texlive/trunk@43381 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-ieee/ieee-alphabetic.bbx | 6 +- .../tex/latex/biblatex-ieee/ieee-alphabetic.cbx | 4 +- Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx | 71 ++++------------------ Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx | 4 +- 4 files changed, 19 insertions(+), 66 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-ieee') 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 373693c67f4..f17c05f9e78 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}[2016/12/30 vvv1.2 biblatex bibliography style] +\ProvidesFile{ieee-alphabetic.bbx}[2017/03/02 v1.2a biblatex bibliography style] \RequireBibliographyStyle{ieee} @@ -26,7 +26,7 @@ \defbibenvironment{bibliography} {\list {\printtext[labelalphawidth]{% - \printfield{prefixnumber}% + \printfield{labelprefix}% \printfield{labelalpha}% \printfield{extraalpha}}} {\setlength{\labelwidth}{\labelalphawidth}% @@ -53,7 +53,7 @@ {\item} %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 dc0d17334db..f570db3a577 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}[2016/12/30 vvv1.2 biblatex citation style] +\ProvidesFile{ieee-alphabetic.cbx}[2017/03/02 v1.2a biblatex citation style] \RequireCitationStyle{alphabetic} @@ -45,7 +45,7 @@ } %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright %% %% 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 27d7ced6bb3..99eb6216193 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}[2016/12/30 vvv1.2 biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2017/03/02 v1.2a biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -30,17 +30,19 @@ \uspunctuation % Custom field formats +\DeclareFieldFormat[article]{number}{\bibstring{number}\addnbspace#1} \DeclareFieldFormat[patent]{number}{\mkonepagegrouped{#1}} \DeclareFieldFormat{pages}{% \mkpageprefix[bookpagination][\mkpagegrouped]{#1}% } \DeclareFieldFormat{sentencecase}{\bbx@colon@search{\MakeSentenceCase*}{#1}} +\DeclareFieldFormat[book,inbook,incollection,inproceedings]{series} + {\bibstring{jourser}\addnbspace#1} \DeclareFieldFormat[online]{title}{#1\isdot} \DeclareFieldFormat[report]{title}{\mkbibquote{#1\isdot}} \DeclareFieldFormat{url}{\bibstring{url}\addcolon\space\url{#1}} - -% Brackets around labels in the bibliography -%\DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{#1}} +\DeclareFieldFormat{volume} + {\bibstring{volume}\addnbspace#1} % Simple modifications to punctuation, etc. \renewcommand*\bibnamedash{\textemdash\textemdash} @@ -272,19 +274,6 @@ \printfield{pages}% } -\renewbibmacro*{series+number}{% - \iffieldundef{series} - {} - {% - \bibstring{jourser}% - \addspace - \printfield{series}% - \setunit*{\addspace}% - }% - \printfield{number}% - \newunit -} - \renewbibmacro*{title}{% \ifboolexpr{ test {\iffieldundef{title}} @@ -312,55 +301,19 @@ {} {% \printtext[title]{% - \printfield[sentencecase]{title}% + \printfield[titlecase]{title}% \setunit{\subtitlepunct}% - \printfield[sentencecase]{subtitle}% + \printfield[titlecase]{subtitle}% }% \newunit }% \printfield{titleaddon}% } - -\renewbibmacro*{title+issuetitle}{% - \usebibmacro{periodical}% - \newunit - \printfield{series} - \newunit - \iffieldundef{volume}% - {} - {% - \bibstring{volume}% - \addspace - \printfield{volume}% - \newunit - } - \printfield{number}% - \newunit - \printfield{eid}% - \newunit - \usebibmacro{issue+date}% - \newunit - \usebibmacro{issue}% - \newunit -} \renewbibmacro*{volume+number+eid}{% - \iffieldundef{volume} - {} - {% - \bibstring{volume}% - \addspace - \printfield{volume}% - \newunit - }% - \iffieldundef{number} - {} - {% - \bibstring{number}% - \addspace - \printfield{number}% - \newunit - }% + \printfield{volume}% + \newunit + \bibstring{number}% \newunit \printfield{eid}% } @@ -813,7 +766,7 @@ } %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx index 4fa063e6428..1880a93cea0 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}[2016/12/30 vvv1.2 biblatex citation style] +\ProvidesFile{ieee.cbx}[2017/03/02 v1.2a biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -61,7 +61,7 @@ \DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim} %% -%% Copyright (C) 2011-2013,2015,2016 by +%% Copyright (C) 2011-2013,2015-2017 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of -- cgit v1.2.3