1 files changed, 38 insertions, 50 deletions
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}%
 }