From f367977ac9ac03c7003bf053c3649ead7de266ca Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Mar 2016 21:18:59 +0000 Subject: biblatex-science (13mar16) git-svn-id: svn://tug.org/texlive/trunk@40018 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-science/biblatex-science.pdf | Bin 365789 -> 366296 bytes .../latex/biblatex-science/biblatex-science.tex | 7 +++-- .../tex/latex/biblatex-science/science.bbx | 31 +++++++++++++-------- .../tex/latex/biblatex-science/science.cbx | 2 +- 4 files changed, 25 insertions(+), 15 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.pdf b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.pdf index 46d28262fd1..a5b7b0646c2 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.pdf and b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.tex b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.tex index 65972eb367b..808f218e3c2 100644 --- a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.tex +++ b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.tex @@ -23,8 +23,8 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright@morningstar2.co.uk}}}} \title{The \pkg{science} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1e, last revised 2016/03/10.}} -\date{Released 2016/03/10} + \footnote{This file describes v1.1f, last revised 2016/03/13.}} +\date{Released 2016/03/13} \providecommand*\opt[1]{\texttt{#1}} \providecommand*\pkg[1]{\textsf{#1}} @@ -83,13 +83,14 @@ be sent by e-mail to exactly two authors are given} \changes{v1.1d}{2013/01/27}{Include related entry data} \changes{v1.1e}{2016/03/10}{Track \pkg{biblatex} changes} +\changes{v1.1f}{2016/03/13}{Ensure style works with both backends} \PrintChanges \end{document} %% -%% Copyright (C) 2010-2013,2016,2016 by +%% Copyright (C) 2010-2013,2016 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/biblatex-science/science.bbx b/Master/texmf-dist/tex/latex/biblatex-science/science.bbx index 5901ba851bd..fb183f5e55c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-science/science.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-science/science.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{science.bbx}[2016/03/10 v1.1e biblatex bibliography style] +\ProvidesFile{science.bbx}[2016/03/13 v1.1f biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -29,15 +29,24 @@ } % Modify the name format -\DeclareNameFormat{default}{% - \nameparts{#1}% - \usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefix} - {\namepartsuffix}% - \usebibmacro{name:andothers}% -} +\@ifpackageloaded{biblatex_legacy} + { + \DeclareNameFormat{default}{% + \usebibmacro{name:first-last}{#1}{#4}{#5}{#7}% + \usebibmacro{name:andothers}% + } + } + { + \DeclareNameFormat{default}{% + \nameparts{#1}% + \usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffix}% + \usebibmacro{name:andothers}% + } + } \renewbibmacro*{name:andothers}{% \ifboolexpr{ @@ -574,7 +583,7 @@ } %% -%% Copyright (C) 2010-2013,2016,2016 by +%% Copyright (C) 2010-2013,2016 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/biblatex-science/science.cbx b/Master/texmf-dist/tex/latex/biblatex-science/science.cbx index f9e52d02bac..26896e38df8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-science/science.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-science/science.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{science.cbx}[2016/03/10 v1.1e biblatex citation style] +\ProvidesFile{science.cbx}[2016/03/13 v1.1f biblatex citation style] \RequireCitationStyle{numeric-comp} -- cgit v1.2.3