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 --- .../biblatex-ieee/biblatex-ieee-alphabetic.pdf | Bin 293327 -> 293378 bytes .../biblatex-ieee/biblatex-ieee-alphabetic.tex | 4 +- .../doc/latex/biblatex-ieee/biblatex-ieee.pdf | Bin 381595 -> 381716 bytes .../doc/latex/biblatex-ieee/biblatex-ieee.tex | 10 ++--- .../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 ++++++++++++++++----- 8 files changed, 48 insertions(+), 22 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf index 77106f45a9f..01b448e9155 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf and b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex index d8637162bec..0a3e12c809c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex +++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex @@ -24,8 +24,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright@morningstar2.co.uk}}}} \title{The \pkg{ieee-alphabetic} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1o, last revised 2016/06/27.}} -\date{Released 2016/06/27} + \footnote{This file describes v1.1p, last revised 2016/07/20.}} +\date{Released 2016/07/20} \providecommand*{\pkg}[1]{\textsf{#1}} diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf index d564cda4aa0..8115e06a40d 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf and b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex index 2ddaf6aa2ce..e9979735760 100644 --- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex +++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex @@ -24,8 +24,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright@morningstar2.co.uk}}}} \title{The \pkg{ieee} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1o last revised 2016/06/27.}} -\date{Released 2016/06/27} + \footnote{This file describes v1.1p last revised 2016/07/20.}} +\date{Released 2016/07/20} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -38,7 +38,7 @@ This package provides a style for \pkg{biblatex} which follows the guidelines of the \textsc{ieee}. The citation style is numeric and unsorted. The bibliography style follows the pattern of the official \pkg{IEEEtran} -package (\url{http://www.ieee.org/documents/stylemanual.pdf}). The style +package (\url{http://www.ieee.org/documents/style_manual.pdf}). The style should be loaded in the usual way \begin{verbatim} \usepackage[style=ieee]{biblatex} @@ -84,8 +84,6 @@ be sent by e-mail to {\texttt{joseph.wright@morningstar2.co.uk}}. \nocite{*} -\cite{IEEEexample:incollectionwithseries,IEEEexample:bookwitheditor} - \printbibliography \changes{v1.0}{2011/02/27}{First stable release} @@ -124,6 +122,8 @@ be sent by e-mail to \changes{v1.1n}{2016/05/08}{Fix printing of titles when braced in database} \changes{v1.1o}{2016/06/27}{Fix capitalisation of journal titles} +\changes{v1.1p}{2016/07/20}{Revert changes in internal code for citation + handling} \PrintChanges 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