From 28a0bbfbe907dd5adda9a37a83b8bda9eabd7f03 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Feb 2011 00:20:51 +0000 Subject: biblatex-ieee (15feb11) git-svn-id: svn://tug.org/texlive/trunk@21453 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx | 76 +++++----------------- Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx | 2 +- 2 files changed, 18 insertions(+), 60 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-ieee') diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx index b0a9659cd31..4d306a099d0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx @@ -8,18 +8,20 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{ieee.bbx}[2011/02/12 v0.9 biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2011/02/15 v0.9a biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} % Alter settings that carry through from biblatex -\ExecuteBibliographyOptions{firstinits, maxbibnames = 999} +\ExecuteBibliographyOptions{firstinits,maxnames = 999,maxcitenames = 2} \DeclareQuotePunctuation{.,} -% Custom field formats \mkpagegrouped@ii -\DeclareFieldFormat[patent]{number}{\mkpagegrouped@ii{#1}} -\DeclareFieldFormat{pages}{\mkpagegrouped[bookpagination]{#1}} +% Custom field formats +\DeclareFieldFormat[patent]{number}{\mkonepagegrouped{#1}} +\DeclareFieldFormat{pages}{% + \mkpageprefix[bookpagination][\mkpagegrouped]{#1}% +} \DeclareFieldFormat{sentencecase}{\MakeSentenceCase{#1}} \DeclareFieldFormat[online]{title}{#1\isdot} \DeclareFieldFormat[report]{title}{\mkbibquote{#1\isdot}} @@ -137,7 +139,7 @@ \midsentence } -\newbibmacro*{journal+issuetitle}{% +\renewbibmacro*{journal+issuetitle}{% \usebibmacro{journal}% \newunit \iffieldundef{series} @@ -315,66 +317,22 @@ % Specialised functions for manipulating data, where the biblatex % kernel does not provide a suitable function. -\newrobustcmd*\mkpagegrouped[1][pagination]{% - \iffieldequalstr{#1}{none} - {\mkpagegrouped@aux@ii} - {% - \begingroup - \def\blx@tempa{page}% - \iffieldundef{#1} - {} - {% - \iffieldbibstring{#1} - {\edef\blx@tempa{\thefield{#1}}} - {% - \blx@warning@entry{% - Unknown pagination type '\thefield{#1}'}% - }% - }% - \expandafter\endgroup - \expandafter\mkpagegrouped@aux@i\expandafter{\blx@tempa}% - }% -} - -\newcommand*\mkpagegrouped@aux@i[2]{% - \ifnumeral{#2} - {% - \bibstring{#1}% - \ppspace - \mkpagegrouped@aux@ii{#2}% - } - {\ifnumerals{#2} - {% - \bibstring{#1s}% - \ppspace - \mkpagegrouped@aux@ii{#2}% - } - {% - \begingroup - \def\pno{\bibstring{#1}}% - \def\ppno{\bibstring{#1s}}% - #2% - \endgroup - }% - }% -} - -\newcommand*\mkpagegrouped@aux@ii[1]{% - \mkpagegrouped@i#1\bibrangedash&% +\newcommand*\mkpagegrouped[1]{% + \mkpagegrouped@aux#1\bibrangedash&% } -\newcommand*\mkpagegrouped@i{} -\long\def\mkpagegrouped@i#1\bibrangedash#2&{% - \mkpagegrouped@ii{#1}% +\newcommand*\mkpagegrouped@aux{} +\long\def\mkpagegrouped@aux#1\bibrangedash#2&{% + \mkonepagegrouped{#1}% \ifblank{#2} {} {% \bibrangedash - \mkpagegrouped@iii#2% + \mkpagegrouped@second#2% }% } -\newcommand*\mkpagegrouped@ii[1]{% +\newcommand*\mkonepagegrouped[1]{% \ifinteger{#1} {% \mkpagegrouped@ifmorethanfour{#1} @@ -384,8 +342,8 @@ {#1}% } -\newcommand*\mkpagegrouped@iii{} -\def\mkpagegrouped@iii#1\bibrangedash{\mkpagegrouped@ii{#1}} +\newcommand*\mkpagegrouped@second{} +\def\mkpagegrouped@second#1\bibrangedash{\mkonepagegrouped{#1}} \newcommand*\mkpagegrouped@ifmorethanfour[1]{% \mkpagegrouped@ifmorethanfour@aux#1\@empty\@empty\@empty\@empty diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx index de4fce0394a..bd34d565d68 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}[2011/02/12 v0.9 biblatex citation style] +\ProvidesFile{ieee.cbx}[2011/02/15 v0.9a biblatex citation style] \RequireCitationStyle{numeric-comp} -- cgit v1.2.3