diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf | bin | 291786 -> 291986 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 | 365310 -> 365541 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex | 5 | ||||
| -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 | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx | 49 |
8 files changed, 41 insertions, 23 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 12cdce346a5..612fa9554f6 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 3233e8fba33..40093121352 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.1e, last revised 2012/12/04.}} -\date{Released 2012/12/04} + \footnote{This file describes v1.1f, last revised 2012/12/17.}} +\date{Released 2012/12/17} \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 811a517af3e..fbb77d1196a 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 37c75fc9dad..c0e94a35f39 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.1e, last revised 2012/12/04.}} -\date{Released 2012/12/04} + \footnote{This file describes v1.1f, last revised 2012/12/17.}} +\date{Released 2012/12/17} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -108,6 +108,7 @@ be sent by e-mail to \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} +\changes{v1.1f}{2012/12/17}{Fix brackets in \cs{textcite}} \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 0a33df2122d..b833623cd35 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/12/04 v1.1e biblatex bibliography style] +\ProvidesFile{ieee-alphabetic.bbx}[2012/12/17 v1.1f 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 19a6b36c05a..85dc0312659 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/12/04 v1.1e biblatex citation style] +\ProvidesFile{ieee-alphabetic.cbx}[2012/12/17 v1.1f 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 79eb8196824..997ad34af9e 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/12/04 v1.1e biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2012/12/17 v1.1f 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 55134d78afc..54d3ec1cf4b 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/12/04 v1.1e biblatex citation style] +\ProvidesFile{ieee.cbx}[2012/12/17 v1.1f biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -50,9 +50,9 @@ \ifnumgreater{\value{cbx@tempcntb}}{-1} {\multicitedelim} {}% - \printtext[bibhyperref]{% + \printtext[brackets]{\printtext[bibhyperref]{% \printfield{prefixnumber}% - \printfield[brackets]{labelnumber}}}}} + \printfield{labelnumber}}}}}} {\usebibmacro{cite:comp:end}}% \setcounter{cbx@tempcntb}{\thefield{labelnumber}}% \savefield{prefixnumber}{\cbx@lastprefix}} @@ -62,27 +62,19 @@ \ifnumgreater{\value{cbx@tempcntb}}{-1} {\multicitedelim} {}% - \printtext[bibhyperref]{% + \printtext[brackets]{\printtext[bibhyperref]{% \printfield{prefixnumber}% - \printfield[brackets]{labelnumber}}} + \printfield{labelnumber}}}} \renewbibmacro*{cite:comp:inset}{% \usebibmacro{cite:dump}% \ifnumgreater{\value{cbx@tempcntb}}{-1} {\multicitedelim} {}% - \printtext[bibhyperref]{% + \printtext[brackets]{\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}}% + \printfield{labelnumber}% + \printfield{entrysetcount}}}% \setcounter{cbx@tempcntb}{-1}} \renewbibmacro*{cite:dump}{% @@ -98,6 +90,31 @@ {}% \setcounter{cbx@tempcnta}{0}% \global\undef\cbx@lastprefix} + +% More fun, this time with \textcite, which has brackets hard-coded in +% the original +\renewbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\usebibmacro{cite:comp}} + {\usebibmacro{cite:dump}\cbx@tempa + \usebibmacro{cite:init}% + \ifnameundef{labelname} + {\printfield[citetitle]{labeltitle}} + {\printnames{labelname}}% + \addspace + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:comp}}% + \savefield{namehash}{\cbx@lasthash}% + \gdef\cbx@tempa{\multicitedelim}} + +\DeclareCiteCommand{\textcite} + {\usebibmacro{cite:init}} + {\usebibmacro{citeindex}% + \usebibmacro{textcite}} + {} + {\usebibmacro{postnote}} %% %% Copyright (C) 2011,2012 by |