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 --- .../doc/latex/biblatex-chem/biblatex-chem-acs.pdf | Bin 312438 -> 311969 bytes .../doc/latex/biblatex-chem/biblatex-chem-acs.tex | 6 +++--- .../latex/biblatex-chem/biblatex-chem-angew.pdf | Bin 296602 -> 296145 bytes .../latex/biblatex-chem/biblatex-chem-angew.tex | 6 +++--- .../latex/biblatex-chem/biblatex-chem-biochem.pdf | Bin 297058 -> 296585 bytes .../latex/biblatex-chem/biblatex-chem-biochem.tex | 6 +++--- .../doc/latex/biblatex-chem/biblatex-chem-rsc.pdf | Bin 293853 -> 293399 bytes .../doc/latex/biblatex-chem/biblatex-chem-rsc.tex | 6 +++--- .../doc/latex/biblatex-chem/biblatex-chem.bib | 6 +++--- .../doc/latex/biblatex-chem/biblatex-chem.pdf | Bin 378062 -> 377703 bytes .../doc/latex/biblatex-chem/biblatex-chem.tex | 6 ++++-- .../tex/latex/biblatex-chem/chem-acs.bbx | 15 +++++++++++++-- .../tex/latex/biblatex-chem/chem-acs.cbx | 2 +- .../tex/latex/biblatex-chem/chem-angew.bbx | 15 +++++++++++++-- .../tex/latex/biblatex-chem/chem-angew.cbx | 2 +- .../tex/latex/biblatex-chem/chem-biochem.bbx | 15 +++++++++++++-- .../tex/latex/biblatex-chem/chem-biochem.cbx | 2 +- .../tex/latex/biblatex-chem/chem-rsc.bbx | 2 +- .../tex/latex/biblatex-chem/chem-rsc.cbx | 2 +- 19 files changed, 63 insertions(+), 28 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.pdf b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.pdf index 969ff145787..d03e8f7aa10 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.pdf and b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.tex b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.tex index 2964e4f53f5..4ce0ba09143 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.tex @@ -23,10 +23,10 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright@morningstar2.co.uk}}}} \title{The \pkg{chem-acs} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1g, last revised 2012/05/18.}} -\date{Released 2012/05/18} + \footnote{This file describes v1.1h, last revised 2012/08/16.}} +\date{Released 2012/08/16} -\providecommand*\pkg[1]{\textsf{#1}} +\providecommand*{\pkg}[1]{\textsf{#1}} \begin{document} diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.pdf b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.pdf index 45751da6c5a..c53b12ceb4f 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.pdf and b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.tex b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.tex index 25d07cc7a74..cb6bfa2cf5f 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.tex @@ -23,10 +23,10 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright@morningstar2.co.uk}}}} \title{The \pkg{chem-angew} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1g, last revised 2012/05/18.}} -\date{Released 2012/05/18} + \footnote{This file describes v1.1h, last revised 2012/08/16.}} +\date{Released 2012/08/16} -\providecommand*\pkg[1]{\textsf{#1}} +\providecommand*{\pkg}[1]{\textsf{#1}} \begin{document} diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf index a3fc6edfbe3..ff182dc5a2b 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf and b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.tex b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.tex index 958e7220f5d..9b088934deb 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.tex @@ -23,10 +23,10 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright@morningstar2.co.uk}}}} \title{The \pkg{chem-biochem} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1g, last revised 2012/05/18.}} -\date{Released 2012/05/18} + \footnote{This file describes v1.1h, last revised 2012/08/16.}} +\date{Released 2012/08/16} -\providecommand*\pkg[1]{\textsf{#1}} +\providecommand*{\pkg}[1]{\textsf{#1}} \begin{document} diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf index 9c9a563bd8e..cc61f2ff738 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf and b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.tex b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.tex index c92f405004c..f38cf302c6d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.tex @@ -23,10 +23,10 @@ \href{mailto:joseph.wright@morningstar2.co.uk} {\texttt{joseph.wright@morningstar2.co.uk}}}} \title{The \pkg{chem-rsc} bibliography style for \pkg{biblatex}% - \footnote{This file describes v1.1g, last revised 2012/05/18.}} -\date{Released 2012/05/18} + \footnote{This file describes v1.1h, last revised 2012/08/16.}} +\date{Released 2012/08/16} -\providecommand*\pkg[1]{\textsf{#1}} +\providecommand*{\pkg}[1]{\textsf{#1}} \begin{document} diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.bib b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.bib index 0050418f13a..3af2bba3544 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.bib +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.bib @@ -25,7 +25,7 @@ author = {Arduengo, III, Anthony J. and Harlow, Richard L. and Kline, Michael}, title = {A stable crystalline carbene}, - journal = {J.~Am. Chem. Soc.}, + journaltitle= {J.~Am. Chem. Soc.}, year = {1991}, volume = {113}, pages = {361--363}, @@ -107,7 +107,7 @@ publisher = {Oxford University Press, Inc. and The American Chemical Society}, year = {2006}, - editor = {Coghill, Anne M. and Garson, LorrinR.}, + editor = {Coghill, Anne M. and Garson, Lorrin R.}, location = {New York}, edition = {3} } @@ -136,7 +136,7 @@ title = {`Pincer' pyridine dicarbene iridium complexes: facile C--H activations and unexpected $\eta^2$-imidazol-2-ylidene coordination}, - journal = {Angew. Chem. Int. Ed.}, + journaltitle = {Angew. Chem. Int. Ed.}, note = {in press} } diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.pdf b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.pdf index 96579a99584..30aed9ac74b 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.pdf and b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.tex b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.tex index 94c873298bf..8647f5bd201 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.tex @@ -21,8 +21,8 @@ {\texttt{joseph.wright@morningstar2.co.uk}}}} \title{\pkg{biblatex-chem} -- A set of \pkg{biblatex} implementations of chemistry-related bibliography styles% - \footnote{This file describes v1.1g, last revised 2012/05/18.}} -\date{Released 2012/05/18} + \footnote{This file describes v1.1h, last revised 2012/08/16.}} +\date{Released 2012/08/16} \providecommand*{\opt}[1]{\texttt{#1}} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -192,6 +192,8 @@ be sent by e-mail to \pkg{chem-acs} style} \changes{v1.1g}{2012/05/18}{Fix issue with \texttt{inbook} entries which lack distinct \texttt{author} and \texttt{bookauthor}} +\changes{v1.1h}{2012/08/16}{Fix appearance of author names in text when + exactly two authors are given} \PrintChanges 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