From 9db8593705387d67df5da134385828474c0874d8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 27 Jan 2013 22:56:34 +0000 Subject: biblatex-chem 1.1j (27jan13) git-svn-id: svn://tug.org/texlive/trunk@28960 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/biblatex-chem/biblatex-chem-acs.pdf | Bin 311969 -> 312074 bytes .../doc/latex/biblatex-chem/biblatex-chem-acs.tex | 6 +- .../latex/biblatex-chem/biblatex-chem-angew.pdf | Bin 296145 -> 296247 bytes .../latex/biblatex-chem/biblatex-chem-angew.tex | 6 +- .../latex/biblatex-chem/biblatex-chem-biochem.pdf | Bin 296585 -> 296695 bytes .../latex/biblatex-chem/biblatex-chem-biochem.tex | 6 +- .../doc/latex/biblatex-chem/biblatex-chem-rsc.pdf | Bin 293399 -> 293508 bytes .../doc/latex/biblatex-chem/biblatex-chem-rsc.tex | 6 +- .../doc/latex/biblatex-chem/biblatex-chem.bib | 4 +- .../doc/latex/biblatex-chem/biblatex-chem.pdf | Bin 377703 -> 380525 bytes .../doc/latex/biblatex-chem/biblatex-chem.tex | 19 ++++- .../tex/latex/biblatex-chem/chem-acs.bbx | 91 +++++++++++++++++++-- .../tex/latex/biblatex-chem/chem-acs.cbx | 4 +- .../tex/latex/biblatex-chem/chem-angew.bbx | 84 +++++++++++++++++-- .../tex/latex/biblatex-chem/chem-angew.cbx | 4 +- .../tex/latex/biblatex-chem/chem-biochem.bbx | 86 +++++++++++++++++-- .../tex/latex/biblatex-chem/chem-biochem.cbx | 4 +- .../tex/latex/biblatex-chem/chem-rsc.bbx | 84 +++++++++++++++++-- .../tex/latex/biblatex-chem/chem-rsc.cbx | 4 +- 19 files changed, 361 insertions(+), 47 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 d03e8f7aa10..9a222432585 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 4ce0ba09143..25b79b913ac 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.1h, last revised 2012/08/16.}} -\date{Released 2012/08/16} + \footnote{This file describes v1.1j, last revised 2013/01/27.}} +\date{Released 2013/01/27} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -52,7 +52,7 @@ of example records. \end{document} %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 c53b12ceb4f..3eddd9d5fb4 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 cb6bfa2cf5f..ac4f0fec2c9 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.1h, last revised 2012/08/16.}} -\date{Released 2012/08/16} + \footnote{This file describes v1.1j, last revised 2013/01/27.}} +\date{Released 2013/01/27} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -51,7 +51,7 @@ of example records. \end{document} %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 ff182dc5a2b..fa6ae5dd107 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 9b088934deb..bd17518496b 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.1h, last revised 2012/08/16.}} -\date{Released 2012/08/16} + \footnote{This file describes v1.1j, last revised 2013/01/27.}} +\date{Released 2013/01/27} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -52,7 +52,7 @@ of example records. \end{document} %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 cc61f2ff738..c6d98bb7cbb 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 f38cf302c6d..05114a07a9a 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,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.1h, last revised 2012/08/16.}} -\date{Released 2012/08/16} + \footnote{This file describes v1.1j, last revised 2013/01/27.}} +\date{Released 2013/01/27} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -51,7 +51,7 @@ of example records. \end{document} %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 3af2bba3544..289ffd39847 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.bib +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.bib @@ -151,6 +151,8 @@ pages = {451--464}, number = {5}, doi = {10.1002/ange.19810930506}, + related = {Dehnicke1981a}, + relatedtype = {translatedas}, annotation = {A journal article published in two languages, which has to handled manually} } @@ -472,7 +474,7 @@ } %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 30aed9ac74b..4ed317c5f44 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 8647f5bd201..aab0c6bcb95 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.1h, last revised 2012/08/16.}} -\date{Released 2012/08/16} + \footnote{This file describes v1.1j, last revised 2013/01/27.}} +\date{Released 2013/01/27} \providecommand*{\opt}[1]{\texttt{#1}} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -145,6 +145,15 @@ is available to turn on and off printing of full page ranges, thus allowing printing of only the first page even when the database contains the full page range. This option is set \opt{true} as standard. +\section{Related entries} + +References to related literature can be handled automatically by the Biber +back-end. This is particularly useful for references to \emph{Angewandte +Chemie}, which should be given both to the German and English editions of +the journal. The example database shows this in action, with a paper in the +German version linked to one in the English edition (see the entry +\texttt{Dehnicke1981}). + \section{New styles} The current set of styles here is intended to form a strong base for chemists. @@ -194,13 +203,17 @@ be sent by e-mail to 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} +\changes{v1.1i}{2012/10/14}{Correct treatment of prefixes with \texttt{acs} + style} +\changes{v1.1j}{2013/01/27}{Update styles to use \texttt{related} information + if available} \PrintChanges \end{document} %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 3e8bb1adb17..8fd5a081d4b 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/08/16 v1.1h biblatex bibliography style] +\ProvidesFile{chem-acs.bbx}[2013/01/27 v1.1j biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -51,7 +51,8 @@ maxnames = 15 , maxcitenames = 2 , pageranges = true , - url = false + url = false , + useprefix = true } % Modify the name format @@ -98,9 +99,9 @@ } {\multinamedelim}% } -\renewcommand*\intitlepunct{\addspace} -\renewcommand*\labelnamepunct{\addspace} -\renewcommand*\newunitpunct{\addcomma\addspace} +\renewcommand*{\intitlepunct}{\addspace} +\renewcommand*{\labelnamepunct}{\addspace} +\renewcommand*{\newunitpunct}{\addcomma\addspace} % Bibliography strings \DefineBibliographyStrings{english}{% @@ -198,7 +199,7 @@ {} {\clearfield{doi}}% }% -} +} \renewbibmacro*{publisher+location+date}{% \printlist{publisher}% @@ -211,6 +212,62 @@ \newunit } +\renewbibmacro*{related}{% + \ifboolexpr{ + not test {\iftoggle{bbx:related}} + or + test {\iffieldundef{related}} + } + {} + {% + \setunit{\addsemicolon\space}% + \setcounter{bbx:relatedcount}{0}% + \setcounter{bbx:relatedtotal}{0}% + \def\do##1{\stepcounter{bbx:relatedtotal}}% + \docsvfield{related}% + \def\do{% + \stepcounter{bbx:relatedcount}% + \ifnumgreater{\value{bbx:relatedcount}}{1} + {\printtext{\relateddelim}} + {}}% + \ifbibmacroundef{related:\strfield{relatedtype}} + {\appto{\do}{\usebibmacro{related:default}}} + {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}% + \iffieldformatundef{related:\strfield{relatedtype}} + {\def\bbx@tempa{related}} + {\def\bbx@tempa{related:\strfield{relatedtype}}}% + \printtext[\bbx@tempa]{% + \iffieldundef{relatedstring} + {\ifboolexpr{ + test {\ifnumgreater{\value{bbx:relatedtotal}}{1}} + and + test {\ifbibxstring{\thefield{relatedtype}s}} + } + {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}} + {\iffieldbibstring{relatedtype} + {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} + {}}} + {\iffieldbibstring{relatedstring} + {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}} + {\printtext{\printfield{relatedstring}\relatedpunct}}}% + \docsvfield{related}}}} + +\newbibmacro*{related:translatedas}[1]{% + \entrydata{#1}{% + \usebibmacro{journal+issuetitle}% + \newunit + \usebibmacro{byeditor+others}% + \newunit + \usebibmacro{note+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{issn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + }% +} + \renewbibmacro*{series+number}{% \printfield{series}% \setunit*{\addspace}% @@ -308,6 +365,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -343,6 +402,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -381,6 +442,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -427,6 +490,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -471,6 +536,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } \DeclareBibliographyDriver{inproceedings}{% @@ -508,6 +575,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -551,6 +620,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -582,6 +653,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -617,6 +690,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -654,11 +729,13 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 0c97da1b9f6..d56bcf13b2f 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/08/16 v1.1h biblatex citation style] +\ProvidesFile{chem-acs.cbx}[2013/01/27 v1.1j biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -20,7 +20,7 @@ } %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 3e12b5844cc..73762885b4b 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/08/16 v1.1h biblatex bibliography style] +\ProvidesFile{chem-angew.bbx}[2013/01/27 v1.1j biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -101,9 +101,9 @@ } {\multinamedelim}% } -\renewcommand*\intitlepunct{\addspace} -\renewcommand*\mkbibnameaffix[1]{\addcomma\space#1} -\renewcommand*\newunitpunct{\addcomma\addspace} +\renewcommand*{\intitlepunct}{\addspace} +\renewcommand*{\mkbibnameaffix}[1]{\addcomma\space#1} +\renewcommand*{\newunitpunct}{\addcomma\addspace} % Bibliography strings \DefineBibliographyStrings{english}{% @@ -291,6 +291,62 @@ \newunit } +\renewbibmacro*{related}{% + \ifboolexpr{ + not test {\iftoggle{bbx:related}} + or + test {\iffieldundef{related}} + } + {} + {% + \setunit{\addsemicolon\space}% + \setcounter{bbx:relatedcount}{0}% + \setcounter{bbx:relatedtotal}{0}% + \def\do##1{\stepcounter{bbx:relatedtotal}}% + \docsvfield{related}% + \def\do{% + \stepcounter{bbx:relatedcount}% + \ifnumgreater{\value{bbx:relatedcount}}{1} + {\printtext{\relateddelim}} + {}}% + \ifbibmacroundef{related:\strfield{relatedtype}} + {\appto{\do}{\usebibmacro{related:default}}} + {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}% + \iffieldformatundef{related:\strfield{relatedtype}} + {\def\bbx@tempa{related}} + {\def\bbx@tempa{related:\strfield{relatedtype}}}% + \printtext[\bbx@tempa]{% + \iffieldundef{relatedstring} + {\ifboolexpr{ + test {\ifnumgreater{\value{bbx:relatedtotal}}{1}} + and + test {\ifbibxstring{\thefield{relatedtype}s}} + } + {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}} + {\iffieldbibstring{relatedtype} + {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} + {}}} + {\iffieldbibstring{relatedstring} + {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}} + {\printtext{\printfield{relatedstring}\relatedpunct}}}% + \docsvfield{related}}}} + +\newbibmacro*{related:translatedas}[1]{% + \entrydata{#1}{% + \usebibmacro{journal+issuetitle}% + \newunit + \usebibmacro{byeditor+others}% + \newunit + \usebibmacro{note+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{issn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + }% +} + % Specialised functions for manipulating data, where the biblatex % kernel does not provide a suitable function. \newcommand*\mkbibnocomma[1]{% @@ -336,6 +392,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -372,6 +430,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -403,6 +463,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -445,6 +507,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -485,6 +549,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -523,6 +589,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -564,6 +632,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -596,6 +666,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -627,11 +699,13 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 290a939ea42..c4c0eca4228 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/08/16 v1.1h biblatex citation style] +\ProvidesFile{chem-angew.cbx}[2013/01/27 v1.1j biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -38,7 +38,7 @@ {\usebibmacro{cite:dump}} %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 da9b78de45d..ce7029f12f3 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/08/16 v1.1h biblatex bibliography style] +\ProvidesFile{chem-biochem.bbx}[2013/01/27 v1.1j biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -92,10 +92,10 @@ } {\multinamedelim}% } -\renewcommand*\intitlepunct{\addspace} -\renewcommand*\labelnamepunct{\addspace} -\renewcommand*\mkbibnameaffix[1]{\addcomma\addspace#1} -\renewcommand*\newunitpunct{\addcomma\addspace} +\renewcommand*{\intitlepunct}{\addspace} +\renewcommand*{\labelnamepunct}{\addspace} +\renewcommand*{\mkbibnameaffix}[1]{\addcomma\addspace#1} +\renewcommand*{\newunitpunct}{\addcomma\addspace} % Bibliography strings \DefineBibliographyStrings{english}{% @@ -228,6 +228,62 @@ \newunit } +\renewbibmacro*{related}{% + \ifboolexpr{ + not test {\iftoggle{bbx:related}} + or + test {\iffieldundef{related}} + } + {} + {% + \setunit{\addsemicolon\space}% + \setcounter{bbx:relatedcount}{0}% + \setcounter{bbx:relatedtotal}{0}% + \def\do##1{\stepcounter{bbx:relatedtotal}}% + \docsvfield{related}% + \def\do{% + \stepcounter{bbx:relatedcount}% + \ifnumgreater{\value{bbx:relatedcount}}{1} + {\printtext{\relateddelim}} + {}}% + \ifbibmacroundef{related:\strfield{relatedtype}} + {\appto{\do}{\usebibmacro{related:default}}} + {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}% + \iffieldformatundef{related:\strfield{relatedtype}} + {\def\bbx@tempa{related}} + {\def\bbx@tempa{related:\strfield{relatedtype}}}% + \printtext[\bbx@tempa]{% + \iffieldundef{relatedstring} + {\ifboolexpr{ + test {\ifnumgreater{\value{bbx:relatedtotal}}{1}} + and + test {\ifbibxstring{\thefield{relatedtype}s}} + } + {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}} + {\iffieldbibstring{relatedtype} + {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} + {}}} + {\iffieldbibstring{relatedstring} + {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}} + {\printtext{\printfield{relatedstring}\relatedpunct}}}% + \docsvfield{related}}}} + +\newbibmacro*{related:translatedas}[1]{% + \entrydata{#1}{% + \usebibmacro{journal+issuetitle}% + \newunit + \usebibmacro{byeditor+others}% + \newunit + \usebibmacro{note+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{issn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + }% +} + \renewbibmacro*{series+number}{% \printfield{series}% \setunit*{\addspace}% @@ -331,6 +387,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -366,6 +424,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -404,6 +464,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -450,6 +512,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -494,6 +558,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } \DeclareBibliographyDriver{inproceedings}{% @@ -531,6 +597,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -574,6 +642,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -605,6 +675,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -640,11 +712,13 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 d69f5a9b964..9539e1c282b 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/08/16 v1.1h biblatex citation style] +\ProvidesFile{chem-biochem.cbx}[2013/01/27 v1.1j biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -19,7 +19,7 @@ \renewcommand*\bibrightbracket{)\midsentence} %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 5f09f959353..781a8c73290 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/08/16 v1.1h biblatex bibliography style] +\ProvidesFile{chem-rsc.bbx}[2013/01/27 v1.1j biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -84,9 +84,9 @@ \DeclareFieldFormat[article]{volume}{\mkbibbold{#1}} % Simple modifications to punctuation, etc. -\renewcommand*\intitlepunct{\addspace} -\renewcommand*\mkbibnameaffix[1]{\addcomma\space#1} -\renewcommand*\newunitpunct{\addcomma\addspace} +\renewcommand*{\intitlepunct}{\addspace} +\renewcommand*{\mkbibnameaffix}[1]{\addcomma\space#1} +\renewcommand*{\newunitpunct}{\addcomma\addspace} % Bibliography strings \DefineBibliographyStrings{english}{% @@ -193,6 +193,62 @@ \newunit } +\renewbibmacro*{related}{% + \ifboolexpr{ + not test {\iftoggle{bbx:related}} + or + test {\iffieldundef{related}} + } + {} + {% + \setunit{\addsemicolon\space}% + \setcounter{bbx:relatedcount}{0}% + \setcounter{bbx:relatedtotal}{0}% + \def\do##1{\stepcounter{bbx:relatedtotal}}% + \docsvfield{related}% + \def\do{% + \stepcounter{bbx:relatedcount}% + \ifnumgreater{\value{bbx:relatedcount}}{1} + {\printtext{\relateddelim}} + {}}% + \ifbibmacroundef{related:\strfield{relatedtype}} + {\appto{\do}{\usebibmacro{related:default}}} + {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}% + \iffieldformatundef{related:\strfield{relatedtype}} + {\def\bbx@tempa{related}} + {\def\bbx@tempa{related:\strfield{relatedtype}}}% + \printtext[\bbx@tempa]{% + \iffieldundef{relatedstring} + {\ifboolexpr{ + test {\ifnumgreater{\value{bbx:relatedtotal}}{1}} + and + test {\ifbibxstring{\thefield{relatedtype}s}} + } + {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}} + {\iffieldbibstring{relatedtype} + {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}} + {}}} + {\iffieldbibstring{relatedstring} + {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}} + {\printtext{\printfield{relatedstring}\relatedpunct}}}% + \docsvfield{related}}}} + +\newbibmacro*{related:translatedas}[1]{% + \entrydata{#1}{% + \usebibmacro{journal+issuetitle}% + \newunit + \usebibmacro{byeditor+others}% + \newunit + \usebibmacro{note+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{issn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + }% +} + % Specialised functions for manipulating data, where the biblatex % kernel does not provide a suitable function. \newcommand*\mkgroupeddigits[1]{% @@ -286,6 +342,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -321,6 +379,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -352,6 +412,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -392,6 +454,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -430,6 +494,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -465,6 +531,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -506,6 +574,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -538,6 +608,8 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } @@ -569,11 +641,13 @@ \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{related}% \usebibmacro{finentry}% } %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 aa9d06f04dc..5a2da6ff71a 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/08/16 v1.1h biblatex citation style] +\ProvidesFile{chem-rsc.cbx}[2013/01/27 v1.1j biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -20,7 +20,7 @@ } %% -%% Copyright (C) 2010-2012 by +%% Copyright (C) 2010-2013 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of -- cgit v1.2.3