From a0dae79da4d3a6fc4760702f913cffe11d738b0a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 23 Oct 2016 22:05:11 +0000 Subject: biblatex-nature (23oct16) git-svn-id: svn://tug.org/texlive/trunk@42338 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-nature/nature.bbx | 37 ++++++++++++++++------ .../tex/latex/biblatex-nature/nature.cbx | 2 +- 2 files changed, 29 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-nature') diff --git a/Master/texmf-dist/tex/latex/biblatex-nature/nature.bbx b/Master/texmf-dist/tex/latex/biblatex-nature/nature.bbx index 91b79eaf7cf..20b347fa7fd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-nature/nature.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-nature/nature.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{nature.bbx}[2016/09/13 v1.2h biblatex bibliography style] +\ProvidesFile{nature.bbx}[2016/10/23 v1.3 biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -18,8 +18,11 @@ \DeclareBibliographyOption{articletitle}[true]{% \settoggle{bbx:articletitle}{#1}% } +\newtoggle{bbx:intitle} +\DeclareBibliographyOption{intitle}[false]{% + \settoggle{bbx:intitle}{#1}% +} -% Alter settings that carry through from biblatex \ExecuteBibliographyOptions{ articletitle , giveninits , @@ -30,14 +33,12 @@ useprefix , } +\@ifpackagelater{biblatex}{2016/03/27} + {\ExecuteBibliographyOptions{giveninits}} + {\ExecuteBibliographyOptions{firstinits}} + % Modify the name format -\@ifpackageloaded{biblatex_legacy} - { - \DeclareNameFormat{default}{% - \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% - \usebibmacro{name:andothers}% - } - } +\@ifpackagelater{biblatex}{2016/03/27} { \DeclareNameFormat{default}{% \nameparts{#1}% @@ -49,6 +50,12 @@ \usebibmacro{name:andothers}% } } + { + \DeclareNameFormat{default}{% + \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% + \usebibmacro{name:andothers}% + } + } % Field formats for the bibliography environment \DeclareFieldFormat{labelnumberwidth}{#1\adddot} @@ -413,6 +420,12 @@ \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock + \iftoggle{bbx:intitle} + {% + \usebibmacro{title}% + \newblock + } + {}% \usebibmacro{in:}% \usebibmacro{bybookauthor}% \setunit*{\newunitpunct}\newblock @@ -455,6 +468,12 @@ \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock + \iftoggle{bbx:intitle} + {% + \usebibmacro{title}% + \newblock + } + {}% \usebibmacro{in:}% \usebibmacro{maintitle+booktitle}% \newunit\newblock diff --git a/Master/texmf-dist/tex/latex/biblatex-nature/nature.cbx b/Master/texmf-dist/tex/latex/biblatex-nature/nature.cbx index 1355993d42c..8fe9493cbbe 100644 --- a/Master/texmf-dist/tex/latex/biblatex-nature/nature.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-nature/nature.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{nature.cbx}[2016/09/13 v1.2h biblatex citation style] +\ProvidesFile{nature.cbx}[2016/10/23 v1.3 biblatex citation style] \RequireCitationStyle{numeric-comp} -- cgit v1.2.3