From ec7cad7f3e821eb0412584362b3d28bf95e3699a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 20 Jul 2016 21:36:39 +0000 Subject: biblatex-ieee (20jul16) git-svn-id: svn://tug.org/texlive/trunk@41741 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-ieee/ieee-alphabetic.bbx | 2 +- .../tex/latex/biblatex-ieee/ieee-alphabetic.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx | 2 +- Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx | 50 ++++++++++++++++------ 4 files changed, 41 insertions(+), 15 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 283bc4c93c0..d47f35dcac1 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/06/27 v1.1o biblatex bibliography style] +\ProvidesFile{ieee-alphabetic.bbx}[2016/07/20 v1.1p 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 4a32f156999..ea5b811a86d 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/06/27 v1.1o biblatex citation style] +\ProvidesFile{ieee-alphabetic.cbx}[2016/07/20 v1.1p 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 0c67f7ae171..aefec809695 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/06/27 v1.1o biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2016/07/20 v1.1p 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 527e7b482e1..dfb50c713d6 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/06/27 v1.1o biblatex citation style] +\ProvidesFile{ieee.cbx}[2016/07/20 v1.1p biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -18,18 +18,44 @@ 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}% - {}% % precode - {\bibopenbracket% % loopcode - \usebibmacro{prenote}% - \usebibmacro{cite:init}% - \usebibmacro{citeindex}% - \usebibmacro{cite:comp}% - \usebibmacro{cite:dump}% - \usebibmacro{postnote}% - \bibclosebracket}% - {\multicitedelim}% % sepcode - {}% % postcode + {\usebibmacro{cite:init}% + \bibopenbracket + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite:comp}} + {} + {\usebibmacro{cite:dump}% + \usebibmacro{postnote}% + \bibclosebracket + } + +% The second step is to replace \multicitedelim with a version wrapped in +% the appropriate delimiter. +\renewcommand*{\do}[1]{% + \expandafter\patchcmd\expandafter + {\csname abx@macro@\detokenize{#1}\endcsname}% + {\multicitedelim} + {\bibclosebracket\multicitedelim\bibopenbracket} + {} + {% + \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc + }% + } +\docsvlist{cite:comp:comp,cite:comp:end,cite:comp:inset,cite:dump} + +% There's also one \bibrangedash to alter. +\expandafter\patchcmd\expandafter + {\csname abx@macro@\detokenize{cite:dump}\endcsname}% + {\bibrangedash} + {\bibclosebracket\bibrangedash\bibopenbracket} + {} + {% + \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc + }% % More bracket removal required \DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim} -- cgit v1.2.3