6 files changed, 72 insertions, 48 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-science/README.md b/Master/texmf-dist/doc/latex/biblatex-science/README.md
index 53a94188721..01351c8c09b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-science/README.md
+++ b/Master/texmf-dist/doc/latex/biblatex-science/README.md
@@ -3,7 +3,7 @@ biblatex-science - A biblatex implementation of the Science bibliography style
 
 The `biblatex-science` package provides an implementation of
 the bibliography style of the journal Science for `biblatex`. This
-implementation follows standard` biblatex` conventions, and can
+implementation follows standard `biblatex` conventions, and can
 be used simply by loading `biblatex` with the appropriate option
 
     \usepackage[style=science]{biblatex}
@@ -11,5 +11,3 @@ be used simply by loading `biblatex` with the appropriate option
 A demonstration database is provided to show how to format
 input for the style. 
 
-The `biblatex-science` style requires `biblatex` 1.2 or later,
-and works with both BibTeX and Biber as the database back-end.
diff --git a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.bib b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.bib
index 7989b13c690..1093934c831 100644
--- a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.bib
@@ -387,7 +387,7 @@
 }
 
 %% 
-%% Copyright (C) 2010-2013,2016 by
+%% Copyright (C) 2010-2013,2016,2018 by
 %%   Joseph Wright <joseph.wright at morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.pdf b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.pdf
index c9b10fc27f3..13a65c5f8f9 100644
--- a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.tex b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.tex
index 3e58373fdba..3cc9b97710f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.tex
@@ -23,8 +23,8 @@
   \href{mailto:joseph.wright@morningstar2.co.uk}
   {\texttt{joseph.wright@morningstar2.co.uk}}}}
 \title{The \pkg{science} bibliography style for \pkg{biblatex}%
-  \footnote{This file describes v1.1g, last revised 2016/09/13.}}
-\date{Released 2016/09/13}
+  \footnote{This file describes v1.2, last revised 2018/10/18.}}
+\date{Released 2018/10/18}
 
 \providecommand*\opt[1]{\texttt{#1}}
 \providecommand*\pkg[1]{\textsf{#1}}
@@ -51,14 +51,14 @@ of example citations.
 The style introduces one new bibliography string, \texttt{presentedat}:
 the text \enquote{presented at the} when printing conference papers.
 This may be localized in the usual way. The style also introduces one
-new Boolean load-time option, \texttt{article-title}. When this is
+new Boolean load-time option, \texttt{articletitle}. When this is
 set \texttt{true}, the titles of journal articles are printed: the
 journal \emph{Science} does this for the on-line edition but not in
 print.
 
 Suggestions for improvement and bug reports can be logged in the package
 issue database, found at
-\url{https://bitbucket.org/josephwright/biblatex-science/issues}, or can
+\url{https://github.com/josephwright/biblatex-science/issues}, or can
 be sent by e-mail to 
 \href{mailto:joseph.wright@morningstar2.co.uk}
   {\texttt{joseph.wright@morningstar2.co.uk}}.
@@ -85,13 +85,16 @@ be sent by e-mail to
 \changes{v1.1e}{2016/03/10}{Track \pkg{biblatex} changes}
 \changes{v1.1f}{2016/03/13}{Ensure style works with both backends}
 \changes{v1.1g}{2016/09/13}{Work properly with \texttt{urldate} option}
+\changes{v1.2}{2018/10/18}{Rename \texttt{article-title} to \texttt{articletitle}}
+\changes{v1.2}{2018/10/18}{Better \texttt{doi} support}
+\changes{v1.2}{2018/10/18}{Better \texttt{related} support}
 
 \PrintChanges
 
 \end{document}
 
 %% 
-%% Copyright (C) 2010-2013,2016 by
+%% Copyright (C) 2010-2013,2016,2018 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/biblatex-science/science.bbx b/Master/texmf-dist/tex/latex/biblatex-science/science.bbx
index a182dab7262..0c553087866 100644
--- a/Master/texmf-dist/tex/latex/biblatex-science/science.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-science/science.bbx
@@ -8,20 +8,21 @@
 %% ---------------------------------------------------------------
 %% 
 
-\ProvidesFile{science.bbx}[2016/09/13 v1.1g biblatex bibliography style]
+\ProvidesFile{science.bbx}[2018/10/18 v1.2 biblatex bibliography style]
 
 % Load the standard style to avoid copy-pasting unnecessary material
 \RequireBibliographyStyle{numeric-comp}
 
 % Additional options
-\newtoggle{bbx:article-title}
-\DeclareBibliographyOption{article-title}[true]{%
-  \settoggle{bbx:article-title}{#1}%
+\newtoggle{bbx:articletitle}
+\DeclareBibliographyOption{articletitle}[true]{%
+  \settoggle{bbx:articletitle}{#1}%
 }
 
 % Alter settings that carry through from biblatex
 \ExecuteBibliographyOptions{
-  article-title = false ,
+  articletitle  = false ,
+  doi           = false ,
   giveninits            ,
   maxnames      = 5     ,
   maxcitenames  = 2     ,
@@ -30,24 +31,15 @@
 }
 
 % Modify the name format
-\@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}%
-    }
-  }
+\DeclareNameFormat{default}{%
+  \nameparts{#1}%
+  \usebibmacro{name:given-family}
+    {\namepartfamily}
+    {\namepartgiveni}
+    {\namepartprefix}
+    {\namepartsuffix}%
+  \usebibmacro{name:andothers}%
+}
 
 \renewbibmacro*{name:andothers}{%
   \ifboolexpr{
@@ -75,6 +67,12 @@
     {#1}%
 }
 \DeclareFieldFormat[inproceedings]{booktitle}{#1}
+\DeclareFieldFormat{doi}{%
+  DOI\space
+  \ifhyperref
+    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+    {\nolinkurl{#1}}%
+}
 \DeclareFieldFormat[article]{pages}{#1}
 \DeclareFieldFormat[proceedings]{title}{#1}
 \DeclareFieldFormat[article]{title}{#1\adddot\space\nopunct}
@@ -217,7 +215,7 @@
   \usebibmacro{begentry}%
   \usebibmacro{author/translator+others}%
   \setunit{\labelnamepunct}\newblock
-  \iftoggle{bbx:article-title}
+  \iftoggle{bbx:articletitle}
     {\usebibmacro{title}}
     {}%
   \newunit
@@ -239,9 +237,7 @@
     {\printfield{issn}}
     {}%
   \newunit\newblock
-  \iffieldundef{pages}
-    {\usebibmacro{doi+eprint+url}}
-    {}%
+  \usebibmacro{doi+eprint+url}%
   \setunit{\addspace}\newblock
   \iffieldundef{year}
     {\printfield{howpublished}}
@@ -251,7 +247,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}%
 }
 
@@ -291,7 +290,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}%
 }
 
@@ -328,7 +330,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}%
 }
 
@@ -368,7 +373,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}%
 }
 
@@ -406,7 +414,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}%
 }
 
@@ -447,7 +458,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}%
 }
 
@@ -513,7 +527,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}%
 }
 
@@ -553,7 +570,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}%
 }
 
@@ -584,12 +604,15 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}%
 }
 
 %% 
-%% Copyright (C) 2010-2013,2016 by
+%% Copyright (C) 2010-2013,2016,2018 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/biblatex-science/science.cbx b/Master/texmf-dist/tex/latex/biblatex-science/science.cbx
index ea5f0d4f50f..128f68dd2ad 100644
--- a/Master/texmf-dist/tex/latex/biblatex-science/science.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-science/science.cbx
@@ -8,7 +8,7 @@
 %% ---------------------------------------------------------------
 %% 
 
-\ProvidesFile{science.cbx}[2016/09/13 v1.1g biblatex citation style]
+\ProvidesFile{science.cbx}[2018/10/18 v1.2 biblatex citation style]
 
 \RequireCitationStyle{numeric-comp}
 
@@ -25,7 +25,7 @@
 }
 
 %% 
-%% Copyright (C) 2010-2013,2016 by
+%% Copyright (C) 2010-2013,2016,2018 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of