From 37aa0ee26efa7d88f12c32ebfcae8b1078dfc9f5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Oct 2012 17:39:29 +0000 Subject: biblatex-ieee git-svn-id: svn://tug.org/texlive/trunk@27972 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-ieee/biblatex-ieee-alphabetic.pdf | Bin 291773 -> 291566 bytes .../biblatex-ieee/biblatex-ieee-alphabetic.tex | 4 +-- .../doc/latex/biblatex-ieee/biblatex-ieee.pdf | Bin 365114 -> 364907 bytes .../doc/latex/biblatex-ieee/biblatex-ieee.tex | 5 +-- .../tex/latex/biblatex-ieee/ieee-alphabetic.bbx | 4 +-- .../tex/latex/biblatex-ieee/ieee-alphabetic.cbx | 39 ++++++++++++++++---- Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx | 2 +- Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx | 40 ++++----------------- 8 files changed, 47 insertions(+), 47 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 index 160ade7d3ac..25d93fe9de5 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 9e1c0fca8ae..dd7d9176088 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.1c, last revised 2012/10/04.}} -\date{Released 2012/10/04} + \footnote{This file describes v1.1d, last revised 2012/10/12.}} +\date{Released 2012/10/12} \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 f59c85915af..76951717f8a 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 f7b981d01c4..4b9788e264c 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.1c, last revised 2012/10/04.}} -\date{Released 2012/10/04} + \footnote{This file describes v1.1d, last revised 2012/10/12.}} +\date{Released 2012/10/12} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -104,6 +104,7 @@ be sent by e-mail to if this occurs at the end of a title} \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} \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 7a24ccb5d28..1d2d1fc2752 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/04 v1.1c biblatex bibliography style] +\ProvidesFile{ieee-alphabetic.bbx}[2012/10/12 v1.1d biblatex bibliography style] \RequireBibliographyStyle{ieee} @@ -76,4 +76,4 @@ %% biblatex-ieee-alphabetic.pdf. %% %% -%% End of file `ieee.bbx'. \ No newline at end of file +%% End of file `ieee-alphabetic.bbx'. \ No newline at end of file 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 14a3ae12065..401cb7264d8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx @@ -8,14 +8,41 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{ieee-alphabetic.cbx}[2012/10/04 v1.1c biblatex citation style] +\ProvidesFile{ieee-alphabetic.cbx}[2012/10/12 v1.1d biblatex citation style] \RequireCitationStyle{alphabetic} -\ExecuteBibliographyOptions{ - maxcitenames = 3, - minnames = 3 -} +\ifcsdef{blx@backend} + {% + \ifnumequal\blx@backend\blx@backend@biber + {% + \ExecuteBibliographyOptions{ + maxalphanames = 4, + maxcitenames = 3, + minalphanames = 3, + minnames = 1 + }% + } + {% + \ExecuteBibliographyOptions{ + maxcitenames = 4, + minnames = 3 + }% + \protected\edef\abx@macro@textcite{% + \defcounter{maxnames}{3}% + \defcounter{minnames}{1}% + \unexpanded\expandafter{\abx@macro@textcite}% + }% + }% + } + {% + \ExecuteBibliographyOptions{ + maxalphanames = 4, + maxcitenames = 3, + minalphanames = 3, + minnames = 1 + }% + } %% %% Copyright (C) 2011,2012 by @@ -41,4 +68,4 @@ %% biblatex-ieee-alphabetic.pdf. %% %% -%% End of file `ieee.cbx'. +%% End of file `ieee-alphabetic.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx index 211ff3d76f0..8abafe14943 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/04 v1.1c biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2012/10/12 v1.1d 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 c05681bc28c..497c7427a15 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx @@ -8,43 +8,15 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{ieee.cbx}[2012/10/04 v1.1c biblatex citation style] +\ProvidesFile{ieee.cbx}[2012/10/12 v1.1d biblatex citation style] \RequireCitationStyle{numeric-comp} -\ExecuteBibliographyOptions{sorting = none} - -\ifcsdef{blx@backend} - {% - \ifnumequal\blx@backend\blx@backend@biber - {% - \ExecuteBibliographyOptions{ - maxcitenames = 4, - minnames = 3 - }% - \protected\edef\abx@macro@textcite{% - \defcounter{maxnames}{3}% - \defcounter{minnames}{1}% - \unexpanded\expandafter{\abx@macro@textcite}% - }% - } - {% - \ExecuteBibliographyOptions{ - maxalphanames = 4, - maxcitenames = 3, - minalphanames = 3, - minnames = 1 - }% - }% - } - {% - \ExecuteBibliographyOptions{ - maxalphanames = 4, - maxcitenames = 3, - minalphanames = 3, - minnames = 1 - }% - } +\ExecuteBibliographyOptions{ + maxcitenames = 3, + minnames = 3, + sorting = none +} %% %% Copyright (C) 2011,2012 by -- cgit v1.2.3