From 8c0fb35bffe9c80d9ffcaf436a751909eef9c7d5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 17 Aug 2012 22:48:31 +0000 Subject: biblatex-chem (17aug12) git-svn-id: svn://tug.org/texlive/trunk@27440 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.bbx | 15 +++++++++++++-- Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.bbx | 15 +++++++++++++-- Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-chem/chem-biochem.bbx | 15 +++++++++++++-- .../texmf-dist/tex/latex/biblatex-chem/chem-biochem.cbx | 2 +- Master/texmf-dist/tex/latex/biblatex-chem/chem-rsc.bbx | 2 +- Master/texmf-dist/tex/latex/biblatex-chem/chem-rsc.cbx | 2 +- 8 files changed, 44 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-chem') diff --git a/Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.bbx b/Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.bbx index d8b45ca5f5c..3e8bb1adb17 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-acs.bbx}[2012/05/18 v1.1g biblatex bibliography style] +\ProvidesFile{chem-acs.bbx}[2012/08/16 v1.1h biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -86,7 +86,18 @@ \DeclareFieldFormat[article]{volume}{\mkbibemph{#1}} % Simple modifications to punctuation, etc. -\renewcommand*\finalnamedelim{\multinamedelim} +\renewcommand*{\finalnamedelim}{% + \ifcurrentname{labelname} + {% + \ifnumgreater{\value{liststop}}{2} + {\finalandcomma} + {}% + \addspace + \bibstring{and}% + \space + } + {\multinamedelim}% +} \renewcommand*\intitlepunct{\addspace} \renewcommand*\labelnamepunct{\addspace} \renewcommand*\newunitpunct{\addcomma\addspace} diff --git a/Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.cbx b/Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.cbx index 33b6aa0e9a0..0c97da1b9f6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chem/chem-acs.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-acs.cbx}[2012/05/18 v1.1g biblatex citation style] +\ProvidesFile{chem-acs.cbx}[2012/08/16 v1.1h biblatex citation style] \RequireCitationStyle{numeric-comp} diff --git a/Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.bbx b/Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.bbx index ca5c5c0645e..3e12b5844cc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-angew.bbx}[2012/05/18 v1.1g biblatex bibliography style] +\ProvidesFile{chem-angew.bbx}[2012/08/16 v1.1h biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -89,7 +89,18 @@ \DeclareFieldFormat[article]{volume}{\mkbibemph{#1}} % Simple modifications to punctuation, etc. -\renewcommand*\finalnamedelim{\multinamedelim} +\renewcommand*{\finalnamedelim}{% + \ifcurrentname{labelname} + {% + \ifnumgreater{\value{liststop}}{2} + {\finalandcomma} + {}% + \addspace + \bibstring{and}% + \space + } + {\multinamedelim}% +} \renewcommand*\intitlepunct{\addspace} \renewcommand*\mkbibnameaffix[1]{\addcomma\space#1} \renewcommand*\newunitpunct{\addcomma\addspace} diff --git a/Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.cbx b/Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.cbx index f744c8ac1d5..290a939ea42 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chem/chem-angew.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-angew.cbx}[2012/05/18 v1.1g biblatex citation style] +\ProvidesFile{chem-angew.cbx}[2012/08/16 v1.1h biblatex citation style] \RequireCitationStyle{numeric-comp} diff --git a/Master/texmf-dist/tex/latex/biblatex-chem/chem-biochem.bbx b/Master/texmf-dist/tex/latex/biblatex-chem/chem-biochem.bbx index a4c914ca1da..da9b78de45d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chem/chem-biochem.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chem/chem-biochem.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-biochem.bbx}[2012/05/18 v1.1g biblatex bibliography style] +\ProvidesFile{chem-biochem.bbx}[2012/08/16 v1.1h biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -80,7 +80,18 @@ \DeclareFieldFormat[article]{volume}{\mkbibemph{#1}} % Simple modifications to punctuation, etc. -\renewcommand*\finalnamedelim{\multinamedelim} +\renewcommand*{\finalnamedelim}{% + \ifcurrentname{labelname} + {% + \ifnumgreater{\value{liststop}}{2} + {\finalandcomma} + {}% + \addspace + \bibstring{and}% + \space + } + {\multinamedelim}% +} \renewcommand*\intitlepunct{\addspace} \renewcommand*\labelnamepunct{\addspace} \renewcommand*\mkbibnameaffix[1]{\addcomma\addspace#1} diff --git a/Master/texmf-dist/tex/latex/biblatex-chem/chem-biochem.cbx b/Master/texmf-dist/tex/latex/biblatex-chem/chem-biochem.cbx index 2d86b6061c5..d69f5a9b964 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chem/chem-biochem.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chem/chem-biochem.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-biochem.cbx}[2012/05/18 v1.1g biblatex citation style] +\ProvidesFile{chem-biochem.cbx}[2012/08/16 v1.1h biblatex citation style] \RequireCitationStyle{numeric-comp} diff --git a/Master/texmf-dist/tex/latex/biblatex-chem/chem-rsc.bbx b/Master/texmf-dist/tex/latex/biblatex-chem/chem-rsc.bbx index e4f91f4db3a..5f09f959353 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chem/chem-rsc.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chem/chem-rsc.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-rsc.bbx}[2012/05/18 v1.1g biblatex bibliography style] +\ProvidesFile{chem-rsc.bbx}[2012/08/16 v1.1h 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-chem/chem-rsc.cbx b/Master/texmf-dist/tex/latex/biblatex-chem/chem-rsc.cbx index 8c67c9d6a73..aa9d06f04dc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chem/chem-rsc.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chem/chem-rsc.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-rsc.cbx}[2012/05/18 v1.1g biblatex citation style] +\ProvidesFile{chem-rsc.cbx}[2012/08/16 v1.1h biblatex citation style] \RequireCitationStyle{numeric-comp} -- cgit v1.2.3