diff options
Diffstat (limited to 'Master/texmf-dist')
14 files changed, 164 insertions, 207 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 Binary files differindex a9389876638..88884eba862 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-acs.pdf 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 Binary files differindex f761e131d32..0c6eb225f51 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-angew.pdf 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 Binary files differindex 755acdb8404..f3c75e4e270 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf 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 Binary files differindex 1c9494cd933..41a0a093a9e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.pdf b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.pdf Binary files differindex 0e019a190db..493d2b941a4 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-chem/biblatex-chem.pdf 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 771ec38c7e3..f1cdea5dee5 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.1v, last revised 2018/09/06.}} -\date{Released 2018/09/06} + \footnote{This file describes v1.1w, last revised 2018/10/18.}} +\date{Released 2018/10/18} \providecommand*{\opt}[1]{\texttt{#1}} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -227,6 +227,8 @@ be sent by e-mail to \changes{v1.1t}{2017/08/09}{Update some internals} \changes{v1.1u}{2018/01/24}{Update some aspects of name formatting} \changes{v1.1v}{2018/09/06}{Documentation tweaks} +\changes{v1.1w}{2018/10/18}{Bring \texttt{related} support in line with + \pkg{biblatex} core} \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 dc0499f8868..19f06a667cb 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}[2018/09/06 v1.1v biblatex bibliography style] +\ProvidesFile{chem-acs.bbx}[2018/10/18 v1.1w biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -114,6 +114,7 @@ \DeclareFieldFormat[article]{volume}{\mkbibitalic{#1}} % Simple modifications to punctuation, etc. +\renewcommand*{\begrelateddelim}{\addsemicolon\space}% \renewcommand*{\finalnamedelim}{% \ifcurrentname{labelname} {% @@ -239,46 +240,6 @@ \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}% @@ -389,7 +350,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -424,7 +388,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -464,7 +431,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -510,7 +480,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -554,7 +527,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } \DeclareBibliographyDriver{inproceedings}{% @@ -591,7 +567,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -634,7 +613,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -665,7 +647,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -700,7 +685,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -737,7 +725,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } 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 f8fc3902683..7ec8b82f239 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}[2018/09/06 v1.1v biblatex citation style] +\ProvidesFile{chem-acs.cbx}[2018/10/18 v1.1w 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 203f7a3aea0..dc01b7a254c 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}[2018/09/06 v1.1v biblatex bibliography style] +\ProvidesFile{chem-angew.bbx}[2018/10/18 v1.1w biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -104,6 +104,7 @@ \DeclareFieldFormat[article]{volume}{\mkbibitalic{#1}} % Simple modifications to punctuation, etc. +\renewcommand*{\begrelateddelim}{\addsemicolon\space}% \renewcommand*{\finalnamedelim}{% \ifcurrentname{labelname} {% @@ -309,46 +310,6 @@ \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}% @@ -419,7 +380,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -455,7 +419,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -486,7 +453,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -528,7 +498,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -568,7 +541,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -606,7 +582,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -647,7 +626,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -679,7 +661,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -710,7 +695,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } 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 7b3dae991b1..b2d4408ab7b 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}[2018/09/06 v1.1v biblatex citation style] +\ProvidesFile{chem-angew.cbx}[2018/10/18 v1.1w 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 0663e2bd718..6d895cef907 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}[2018/09/06 v1.1v biblatex bibliography style] +\ProvidesFile{chem-biochem.bbx}[2018/10/18 v1.1w biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -95,6 +95,7 @@ \DeclareFieldFormat[article]{volume}{\mkbibitalic{#1}} % Simple modifications to punctuation, etc. +\renewcommand*{\begrelateddelim}{\addsemicolon\space}% \renewcommand*{\finalnamedelim}{% \finalandcomma \addspace @@ -245,46 +246,6 @@ \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}% @@ -401,7 +362,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -436,7 +400,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -476,7 +443,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -522,7 +492,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -566,7 +539,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } \DeclareBibliographyDriver{inproceedings}{% @@ -603,7 +579,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -646,7 +625,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -677,7 +659,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -712,7 +697,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } 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 ca0df0a96b7..6ca057d4fa4 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}[2018/09/06 v1.1v biblatex citation style] +\ProvidesFile{chem-biochem.cbx}[2018/10/18 v1.1w 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 8aa3e8a3b8c..fab9b7df2aa 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}[2018/09/06 v1.1v biblatex bibliography style] +\ProvidesFile{chem-rsc.bbx}[2018/10/18 v1.1w biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -99,6 +99,7 @@ \DeclareFieldFormat[article]{volume}{\mkbibbold{#1}} % Simple modifications to punctuation, etc. +\renewcommand*{\begrelateddelim}{\addsemicolon\space}% \renewcommand*{\intitlepunct}{\addspace} \renewcommand*{\mkbibnamesuffix}[1]{\addcomma\space#1} \renewcommand*{\newunitpunct}{\addcomma\addspace} @@ -212,46 +213,6 @@ \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}% @@ -360,7 +321,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -395,7 +359,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -426,7 +393,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -466,7 +436,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -504,7 +477,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -539,7 +515,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -580,7 +559,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -612,7 +594,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } @@ -643,7 +628,10 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \newunit\newblock - \usebibmacro{related}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \usebibmacro{finentry}% } 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 ced7ee1c6cd..a0e9de9543a 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}[2018/09/06 v1.1v biblatex citation style] +\ProvidesFile{chem-rsc.cbx}[2018/10/18 v1.1w biblatex citation style] \RequireCitationStyle{numeric-comp} |