From 394db27879e3e1a46733cafc5aa3c9612b767fdd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Mar 2016 21:18:36 +0000 Subject: biblatex-chem (13mar16) git-svn-id: svn://tug.org/texlive/trunk@40015 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/biblatex-chem/biblatex-chem-acs.pdf | Bin 311959 -> 312537 bytes .../doc/latex/biblatex-chem/biblatex-chem-acs.tex | 4 +- .../latex/biblatex-chem/biblatex-chem-angew.pdf | Bin 296208 -> 296778 bytes .../latex/biblatex-chem/biblatex-chem-angew.tex | 4 +- .../latex/biblatex-chem/biblatex-chem-biochem.pdf | Bin 296485 -> 297143 bytes .../latex/biblatex-chem/biblatex-chem-biochem.tex | 4 +- .../doc/latex/biblatex-chem/biblatex-chem-rsc.pdf | Bin 293449 -> 293756 bytes .../doc/latex/biblatex-chem/biblatex-chem-rsc.tex | 6 +-- .../doc/latex/biblatex-chem/biblatex-chem.pdf | Bin 381182 -> 381925 bytes .../doc/latex/biblatex-chem/biblatex-chem.tex | 6 ++- .../tex/latex/biblatex-chem/chem-acs.bbx | 50 ++++++++++++++++----- .../tex/latex/biblatex-chem/chem-acs.cbx | 2 +- .../tex/latex/biblatex-chem/chem-angew.bbx | 26 ++++++++--- .../tex/latex/biblatex-chem/chem-angew.cbx | 2 +- .../tex/latex/biblatex-chem/chem-biochem.bbx | 28 +++++++++--- .../tex/latex/biblatex-chem/chem-biochem.cbx | 2 +- .../tex/latex/biblatex-chem/chem-rsc.bbx | 26 ++++++++--- .../tex/latex/biblatex-chem/chem-rsc.cbx | 2 +- 18 files changed, 116 insertions(+), 46 deletions(-) (limited to 'Master/texmf-dist') 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 f5ab8c84042..08df4ae7708 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 9b248635217..f2787138d0d 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,8 +23,8 @@ \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.1n, last revised 2016/02/26.}} -\date{Released 2016/02/26} + \footnote{This file describes v1.1p, last revised 2016/03/13.}} +\date{Released 2016/03/13} \providecommand*{\pkg}[1]{\textsf{#1}} 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 b0a381f6b49..00bb915eb78 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 31ef4be692f..e584c5de129 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,8 +23,8 @@ \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.1n, last revised 2016/02/26.}} -\date{Released 2016/02/26} + \footnote{This file describes v1.1p, last revised 2016/03/13.}} +\date{Released 2016/03/13} \providecommand*{\pkg}[1]{\textsf{#1}} 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 48a61f90e2f..89df330ae18 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 25a899381b8..b12676d3b3b 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,8 +23,8 @@ \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.1n, last revised 2016/02/26.}} -\date{Released 2016/02/26} + \footnote{This file describes v1.1p, last revised 2016/03/13.}} +\date{Released 2016/03/13} \providecommand*{\pkg}[1]{\textsf{#1}} 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 d4b9567725e..06756cc1e7e 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 fafb7d5b3d5..7a94b9689d3 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 @@ -12,7 +12,7 @@ \usepackage{csquotes,lmodern} \usepackage[T1]{fontenc} \usepackage[final]{microtype} -\usepackage[style=chem-rsc]{biblatex} +\usepackage[backend=bibtex,style=chem-rsc]{biblatex} \usepackage{hyperref} \hypersetup{hidelinks} @@ -23,8 +23,8 @@ \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.1n, last revised 2016/02/26.}} -\date{Released 2016/02/26} + \footnote{This file describes v1.1p, last revised 2016/03/13.}} +\date{Released 2016/03/13} \providecommand*{\pkg}[1]{\textsf{#1}} 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 3d4d4bbb8bb..53f4e0a0ec0 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 c8fe95d664c..027077afdf1 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.1n, last revised 2016/02/26.}} -\date{Released 2016/02/26} + \footnote{This file describes v1.1p, last revised 2016/03/13.}} +\date{Released 2016/03/13} \providecommand*{\opt}[1]{\texttt{#1}} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -216,6 +216,8 @@ be sent by e-mail to \changes{v1.1n}{2016/02/26}{Use \cs{mkbibitalic} not \cs{mkbibemph} in styles} \changes{v1.1n}{2016/02/26}{Improved approach to removing commas from journal titles in \emph{Angew. Chem.} style} +\changes{v1.1o}{2016/03/09}{Track \pkg{biblatex} changes} +\changes{v1.1p}{2016/03/13}{Ensure style works with both backends} \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 76c9323f3cf..1508c428350 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}[2016/02/26 v1.1n biblatex bibliography style] +\ProvidesFile{chem-acs.bbx}[2016/03/13 v1.1p biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -46,7 +46,7 @@ { doi = false , eprint = false , - firstinits = true , + giveninits = true , isbn = false , maxnames = 15 , maxcitenames = 2 , @@ -56,17 +56,43 @@ } % Modify the name format -\DeclareNameFormat{default}{% - \renewcommand*{\multinamedelim}{\addsemicolon\addspace}% - \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% - \usebibmacro{name:andothers}% -} +\@ifpackageloaded{biblatex_legacy} + { + \DeclareNameFormat{default}{% + \renewcommand*{\multinamedelim}{\addsemicolon\addspace}% + \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% + \usebibmacro{name:andothers}% + } -\DeclareNameFormat{editor}{% - \renewcommand*{\multinamedelim}{\addcomma\addspace}% - \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% - \usebibmacro{name:andothers}% -} + \DeclareNameFormat{editor}{% + \renewcommand*{\multinamedelim}{\addcomma\addspace}% + \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% + \usebibmacro{name:andothers}% + } + } + { + \DeclareNameFormat{default}{% + \renewcommand*{\multinamedelim}{\addsemicolon\addspace}% + \nameparts{#1}% + \usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffix}% + \usebibmacro{name:andothers}% + } + + \DeclareNameFormat{editor}{% + \renewcommand*{\multinamedelim}{\addcomma\addspace}% + \nameparts{#1}% + \usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffix}% + \usebibmacro{name:andothers}% + } + } % Custom field formats \DeclareFieldFormat[article]{date}{\mkbibbold{#1}} 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 bde1969c777..d25431da124 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}[2016/02/26 v1.1n biblatex citation style] +\ProvidesFile{chem-acs.cbx}[2016/03/13 v1.1p 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 2ea838a15a7..6e6edf06a8c 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}[2016/02/26 v1.1n biblatex bibliography style] +\ProvidesFile{chem-angew.bbx}[2016/03/13 v1.1p biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -46,7 +46,7 @@ { doi = false , eprint = false , - firstinits = true , + giveninits = true , isbn = false , maxnames = 999 , maxcitenames = 2 , @@ -55,10 +55,24 @@ } % Modify the name format -\DeclareNameFormat{default}{% - \usebibmacro{name:first-last}{#1}{#4}{#5}{#7}% - \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}% + } + } % Custom field formats \DeclareFieldFormat[inproceedings]{booktitle}{#1} 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 c9f2e674056..358670eb1e4 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}[2016/02/26 v1.1n biblatex citation style] +\ProvidesFile{chem-angew.cbx}[2016/03/13 v1.1p 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 9198133d88f..5bb8b2d345a 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}[2016/02/26 v1.1n biblatex bibliography style] +\ProvidesFile{chem-biochem.bbx}[2016/03/13 v1.1p biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -47,7 +47,7 @@ articletitle = true , doi = false , eprint = false , - firstinits = true , + giveninits = true , isbn = false , maxnames = 15 , maxcitenames = 2 , @@ -58,10 +58,24 @@ } % Modify the name format -\DeclareNameFormat{default}{% - \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% - \usebibmacro{name:andothers}% -} +\@ifpackageloaded{biblatex_legacy} + { + \DeclareNameFormat{default}{% + \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% + \usebibmacro{name:andothers}% + } + } + { + \DeclareNameFormat{default}{% + \nameparts{#1}% + \usebibmacro{name:family-given} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffix}% + \usebibmacro{name:andothers}% + } + } % Custom field formats \DeclareFieldFormat{doi}{% @@ -166,7 +180,7 @@ \newunit } -\renewbibmacro*{name:last-first}[4]{% +\renewbibmacro*{name:family-given}[4]{% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#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 8bb2d05c56a..e64cc472e0f 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}[2016/02/26 v1.1n biblatex citation style] +\ProvidesFile{chem-biochem.cbx}[2016/03/13 v1.1p 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 857711cca07..d203a5dea0b 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}[2016/02/26 v1.1n biblatex bibliography style] +\ProvidesFile{chem-rsc.bbx}[2016/03/13 v1.1p biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -46,7 +46,7 @@ { doi = false , eprint = false , - firstinits = true , + giveninits = true , isbn = false , maxnames = 999 , maxcitenames = 2 , @@ -55,10 +55,24 @@ } % Modify the name format -\DeclareNameFormat{default}{% - \usebibmacro{name:first-last}{#1}{#4}{#5}{#7}% - \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}% + } + } % Custom field formats \DeclareFieldFormat[inproceedings]{booktitle}{#1} 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 9b14e606453..322d3961c6b 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}[2016/02/26 v1.1n biblatex citation style] +\ProvidesFile{chem-rsc.cbx}[2016/03/13 v1.1p biblatex citation style] \RequireCitationStyle{numeric-comp} -- cgit v1.2.3