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 --- .../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 +- 8 files changed, 330 insertions(+), 31 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 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