From af2de149eca62a74d8259003972a89e2f0418b33 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 9 Feb 2013 23:25:03 +0000 Subject: biblatex-ieee (9feb13) git-svn-id: svn://tug.org/texlive/trunk@29068 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 | 4 +-- Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx | 32 ++++++++++++++-------- 4 files changed, 25 insertions(+), 15 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 7f81026f894..90601aef0bd 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}[2013/01/27 v1.1g biblatex bibliography style] +\ProvidesFile{ieee-alphabetic.bbx}[2013/02/08 v1.1h 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 239a30be778..b0f34834d45 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}[2013/01/27 v1.1g biblatex citation style] +\ProvidesFile{ieee-alphabetic.cbx}[2013/02/08 v1.1h 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 849ab346d7b..4d596ed304a 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}[2013/01/27 v1.1g biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2013/02/08 v1.1h biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -33,7 +33,7 @@ \DeclareFieldFormat{url}{\bibstring{url}\addcolon\space\url{#1}} % Brackets around labels in the bibliography -\DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{#1}} +%\DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{#1}} % Simple modifications to punctuation, etc. \renewcommand*\bibnamedash{\textemdash\textemdash} diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx index 976dbf7eab4..7e13f6c2b83 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}[2013/01/27 v1.1g biblatex citation style] +\ProvidesFile{ieee.cbx}[2013/02/08 v1.1h biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -23,12 +23,15 @@ % redeclaring here. \DeclareCiteCommand{\cite}% {\usebibmacro{cite:init}% + \bibopenbracket \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite:comp}} {} {\usebibmacro{cite:dump}% - \usebibmacro{postnote}} + \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 @@ -48,9 +51,9 @@ {} {\usebibmacro{cite:dump}% \ifnumgreater{\value{cbx@tempcntb}}{-1} - {\multicitedelim} + {\bibclosebracket\multicitedelim\bibopenbracket} {}% - \printtext[brackets]{\printtext[bibhyperref]{% + \printtext{\printtext[bibhyperref]{% \printfield{prefixnumber}% \printfield{labelnumber}}}}}} {\usebibmacro{cite:comp:end}}% @@ -60,18 +63,18 @@ \renewbibmacro*{cite:comp:end}{% \usebibmacro{cite:dump}% \ifnumgreater{\value{cbx@tempcntb}}{-1} - {\multicitedelim} + {\bibclosebracket\multicitedelim\bibopenbracket} {}% - \printtext[brackets]{\printtext[bibhyperref]{% + \printtext{\printtext[bibhyperref]{% \printfield{prefixnumber}% \printfield{labelnumber}}}} \renewbibmacro*{cite:comp:inset}{% \usebibmacro{cite:dump}% \ifnumgreater{\value{cbx@tempcntb}}{-1} - {\multicitedelim} + {\bibclosebracket\multicitedelim\bibopenbracket} {}% - \printtext[brackets]{\printtext[bibhyperref]{% + \printtext{\printtext[bibhyperref]{% \printfield{prefixnumber}% \printfield{labelnumber}% \printfield{entrysetcount}}}% @@ -79,14 +82,17 @@ \renewbibmacro*{cite:dump}{% \ifnumgreater{\value{cbx@tempcnta}}{0} - {\ifnumgreater{\value{cbx@tempcnta}}{1} + {% + \bibclosebracket + \ifnumgreater{\value{cbx@tempcnta}}{1} {\bibrangedash} {\multicitedelim}% + \bibopenbracket \bibhyperref[\cbx@lastkey]{% \ifdef\cbx@lastprefix {\printtext[prefixnumber]{\cbx@lastprefix}} {}% - \printtext[brackets]{\cbx@lastnumber}}} + \printtext{\cbx@lastnumber}}} {}% \setcounter{cbx@tempcnta}{0}% \global\undef\cbx@lastprefix} @@ -102,6 +108,7 @@ {\printfield[citetitle]{labeltitle}} {\printnames{labelname}}% \addspace + \bibopenbracket \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -114,7 +121,10 @@ {\usebibmacro{citeindex}% \usebibmacro{textcite}} {} - {\usebibmacro{postnote}} + {% + \usebibmacro{postnote}% + \bibclosebracket + } %% %% Copyright (C) 2011-2103 by -- cgit v1.2.3