biblatex-science (19oct18)

git-svn-id: svn://tug.org/texlive/trunk@48945 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 62 insertions, 39 deletions

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