From adc5ac972bc69b621e9d91ffa2ee650b9b95b669 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 31 Aug 2020 21:18:15 +0000 Subject: biblatex-ieee (31aug20) git-svn-id: svn://tug.org/texlive/trunk@56222 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 | 71 +++++++++++++++++----- 4 files changed, 60 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex') 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 c305a2686a8..b2654804e2f 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}[2020/02/26 v1.3b biblatex bibliography style] +\ProvidesFile{ieee-alphabetic.bbx}[2020/08/31 v1.3c 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 ea8ab904889..be1fc4136a7 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}[2020/02/26 v1.3b biblatex citation style] +\ProvidesFile{ieee-alphabetic.cbx}[2020/08/31 v1.3c 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 f3a6169de0f..faeae9a5971 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}[2020/02/26 v1.3b biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2020/08/31 v1.3c 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 16ac2f44d4f..e4f422b494c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx @@ -1,14 +1,14 @@ %% --------------------------------------------------------------- -%% biblatex-ieee --- A biblatex implementation of the IEEE +%% biblatex-ieee --- A biblatex implementation of the IEEE %% bibliography style %% Maintained by Joseph Wright %% E-mail: joseph.wright@morningstar2.co.uk %% Released under the LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- -%% +%% -\ProvidesFile{ieee.cbx}[2020/02/26 v1.3b biblatex citation style] +\ProvidesFile{ieee.cbx}[2020/08/31 v1.3c biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -33,7 +33,9 @@ \bibclosebracket } -% The second step is to replace \multicitedelim with a version wrapped in + +% The second step is to replace \multicitedelim and +% \multicitesubentrydelim with a version wrapped in % the appropriate delimiter. \renewcommand*{\do}[1]{% \expandafter\patchcmd\expandafter @@ -45,35 +47,76 @@ \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc }% } -\docsvlist{cite:comp:comp,cite:comp:end,cite:comp:inset,cite:dump} +\docsvlist{cite:comp:end,cite:comp:inset,cite:comp:shand,cite:dump} + +\renewcommand*{\do}[1]{% + \expandafter\patchcmd\expandafter + {\csname abx@macro@\detokenize{#1}\endcsname}% + {\multicitesubentrydelim} + {\bibclosebracket\multicitesubentrydelim\bibopenbracket} + {} + {% + \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc + }% + } +\docsvlist{cite:comp:inset,cite:dump:inset} -% There's also one \bibrangedash to alter. + +% There's also one \multiciterangedelim and one +% \multicitesubentryrangedelimto alter. \expandafter\patchcmd\expandafter {\csname abx@macro@\detokenize{cite:dump}\endcsname}% - {\bibrangedash} - {\bibclosebracket\bibrangedash\bibopenbracket} + {\multiciterangedelim} + {\bibclosebracket\multiciterangedelim\bibopenbracket} {} {% \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc }% +\expandafter\patchcmd\expandafter + {\csname abx@macro@\detokenize{cite:dump:inset}\endcsname}% + {\multicitesubentryrangedelim} + {\bibclosebracket\multicitesubentryrangedelim\bibopenbracket} + {} + {% + \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc + }% + + % More bracket removal required \DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim} -%% +% print labelnumber for compressed set entries +\renewbibmacro*{cite:print:subentry:comp}{% + \printtext[bibhyperref]{% + \printfield{labelprefix}% + \printfield{labelnumber}% + \printfield{entrysetcount}}} + +\renewbibmacro*{cite:print:last:subentry:comp}{% + \printtext[bibhyperref:lastkey]{% + \ifdef\cbx@lastprefix + {\printtext[labelprefix]{\cbx@lastprefix}} + {}% + \printtext[labelnumber]{\cbx@lastnumber}% + \ifdef\cbx@lastentrysetcount + {\printtext[entrysetcount]{\cbx@lastentrysetcount}} + {}}} + +%% %% Copyright (C) 2011-2013,2015-2020 by %% Joseph Wright -%% +%% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of %% this license or (at your option) any later version. The latest %% version of this license is in the file: -%% +%% %% http://www.latex-project.org/lppl.txt -%% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Joseph Wright. -%% +%% %% This work consists of the files biblatex-ieee.bib, %% biblatex-ieee.tex, %% ieee.bbx, @@ -83,6 +126,6 @@ %% magyar-ieee.lbx, %% and the derived files biblatex-ieee.pdf and %% biblatex-ieee-alphabetic.pdf. -%% +%% %% %% End of file `ieee.cbx'. -- cgit v1.2.3