diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf | bin | 291566 -> 291786 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf | bin | 364907 -> 365310 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx | 83 |
8 files changed, 96 insertions, 9 deletions
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 Binary files differindex 25d93fe9de5..12cdce346a5 100644 --- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf 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 dd7d9176088..3233e8fba33 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 @@ -23,8 +23,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.1d, last revised 2012/10/12.}} -\date{Released 2012/10/12} + \footnote{This file describes v1.1e, last revised 2012/12/04.}} +\date{Released 2012/12/04} \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 Binary files differindex 76951717f8a..811a517af3e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf 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 4b9788e264c..37c75fc9dad 100644 --- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex +++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex @@ -23,8 +23,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.1d, last revised 2012/10/12.}} -\date{Released 2012/10/12} + \footnote{This file describes v1.1e, last revised 2012/12/04.}} +\date{Released 2012/12/04} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -105,6 +105,9 @@ be sent by e-mail to \changes{v1.1b}{2012/07/18}{Fix spacing between bibliography label and entry} \changes{v1.1c}{2012/10/04}{Improve handling of names in \cs{textcite}} \changes{v1.1d}{2012/10/12}{Improve handling of names in \cs{textcite} again} +\changes{v1.1e}{2012/12/04}{Address brackets around citations again, hopefully + correctly this time} +\changes{v1.1e}{2012/12/04}{Use US-style punctuation suppression} \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 1d2d1fc2752..0a33df2122d 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}[2012/10/12 v1.1d biblatex bibliography style] +\ProvidesFile{ieee-alphabetic.bbx}[2012/12/04 v1.1e 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 401cb7264d8..19a6b36c05a 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}[2012/10/12 v1.1d biblatex citation style] +\ProvidesFile{ieee-alphabetic.cbx}[2012/12/04 v1.1e 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 8abafe14943..79eb8196824 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}[2012/10/12 v1.1d biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2012/12/04 v1.1e biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -20,7 +20,7 @@ minnames = 3, sorting = none } -\DeclareQuotePunctuation{.,} +\uspunctuation % Custom field formats \DeclareFieldFormat[patent]{number}{\mkonepagegrouped{#1}} @@ -32,6 +32,9 @@ \DeclareFieldFormat[report]{title}{\mkbibquote{#1\isdot}} \DeclareFieldFormat{url}{\bibstring{url}\addcolon\space\url{#1}} +% Brackets around labels in the bibliography +\DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{#1}} + % Simple modifications to punctuation, etc. \renewcommand*\bibnamedash{\textemdash\textemdash} \renewcommand*\intitlepunct{\addspace} diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx index 497c7427a15..55134d78afc 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}[2012/10/12 v1.1d biblatex citation style] +\ProvidesFile{ieee.cbx}[2012/12/04 v1.1e biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -18,6 +18,87 @@ 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}% + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite:comp}} + {} + {\usebibmacro{cite:dump}% + \usebibmacro{postnote}} + +% 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 +% and labelnumberwidth! So instead we tackle the issue here, but that means +% a bit of copy-paste work. +\renewbibmacro*{cite:comp:comp}{% + \ifboolexpr{ + ( test {\iffieldundef{prefixnumber}} and test {\ifundef\cbx@lastprefix} ) + or + test {\iffieldequals{prefixnumber}{\cbx@lastprefix}} + } + {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}} + {\savefield{entrykey}{\cbx@lastkey}% + \savefield{labelnumber}{\cbx@lastnumber}% + \addtocounter{cbx@tempcnta}{1}} + {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}-1} + {} + {\usebibmacro{cite:dump}% + \ifnumgreater{\value{cbx@tempcntb}}{-1} + {\multicitedelim} + {}% + \printtext[bibhyperref]{% + \printfield{prefixnumber}% + \printfield[brackets]{labelnumber}}}}} + {\usebibmacro{cite:comp:end}}% + \setcounter{cbx@tempcntb}{\thefield{labelnumber}}% + \savefield{prefixnumber}{\cbx@lastprefix}} + +\renewbibmacro*{cite:comp:end}{% + \usebibmacro{cite:dump}% + \ifnumgreater{\value{cbx@tempcntb}}{-1} + {\multicitedelim} + {}% + \printtext[bibhyperref]{% + \printfield{prefixnumber}% + \printfield[brackets]{labelnumber}}} + +\renewbibmacro*{cite:comp:inset}{% + \usebibmacro{cite:dump}% + \ifnumgreater{\value{cbx@tempcntb}}{-1} + {\multicitedelim} + {}% + \printtext[bibhyperref]{% + \printfield{prefixnumber}% + \printfield[brackets]{labelnumber}% + \printfield{entrysetcount}}% + \setcounter{cbx@tempcntb}{-1}} + +\renewbibmacro*{cite:comp:shand}{% + \usebibmacro{cite:dump}% + \ifnumgreater{\value{cbx@tempcntb}}{-1} + {\multicitedelim} + {}% + \printtext[bibhyperref]{\printfield{shorthand}}% + \setcounter{cbx@tempcntb}{-1}} + +\renewbibmacro*{cite:dump}{% + \ifnumgreater{\value{cbx@tempcnta}}{0} + {\ifnumgreater{\value{cbx@tempcnta}}{1} + {\bibrangedash} + {\multicitedelim}% + \bibhyperref[\cbx@lastkey]{% + \ifdef\cbx@lastprefix + {\printtext[prefixnumber]{\cbx@lastprefix}} + {}% + \printtext[brackets]{\cbx@lastnumber}}} + {}% + \setcounter{cbx@tempcnta}{0}% + \global\undef\cbx@lastprefix} + %% %% Copyright (C) 2011,2012 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> |