biblatex-science

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

5 files changed, 23 insertions, 15 deletions

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 338328b17f9..7989b13c690 100644
--- a/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-science/biblatex-science.bib
@@ -78,9 +78,10 @@
 }
 
 @Online{Corina2006,
-  title = {CORINA: Generation of 3D coordinates},
-  url   = {http://www.molecular-networks.com/software/corina/index.html},
-  year  = {2006}
+  title   = {CORINA: Generation of 3D coordinates},
+  url     = {http://www.molecular-networks.com/software/corina/index.html},
+  year    = {2006},
+  urlyear = {2006}
 }
 
 @Book{Coghill2006,
@@ -263,7 +264,7 @@
   title    = {Alkylation of boron trifluoride with 
     pentafluorophenyl Grignard reagent},
   year     = {2003},
-  urlyear  = {2008-10-08},
+  urldate  = {2008-10-08},
   url      = {http://www.syntheticpages.org/pages/215}
 }
 
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 a5b7b0646c2..c9b10fc27f3 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 808f218e3c2..3e58373fdba 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.1f, last revised 2016/03/13.}}
-\date{Released 2016/03/13}
+  \footnote{This file describes v1.1g, last revised 2016/09/13.}}
+\date{Released 2016/09/13}
 
 \providecommand*\opt[1]{\texttt{#1}}
 \providecommand*\pkg[1]{\textsf{#1}}
@@ -84,6 +84,7 @@ be sent by e-mail to
 \changes{v1.1d}{2013/01/27}{Include related entry data}
 \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}
 
 \PrintChanges
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-science/science.bbx b/Master/texmf-dist/tex/latex/biblatex-science/science.bbx
index fb183f5e55c..a182dab7262 100644
--- a/Master/texmf-dist/tex/latex/biblatex-science/science.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-science/science.bbx
@@ -8,7 +8,7 @@
 %% ---------------------------------------------------------------
 %% 
 
-\ProvidesFile{science.bbx}[2016/03/13 v1.1f biblatex bibliography style]
+\ProvidesFile{science.bbx}[2016/09/13 v1.1g biblatex bibliography style]
 
 % Load the standard style to avoid copy-pasting unnecessary material
 \RequireBibliographyStyle{numeric-comp}
@@ -25,6 +25,7 @@
   giveninits            ,
   maxnames      = 5     ,
   maxcitenames  = 2     ,
+  urldate       = year  ,
   useprefix             ,
 }
 
@@ -79,6 +80,7 @@
 \DeclareFieldFormat[article]{title}{#1\adddot\space\nopunct}
 \DeclareFieldFormat[report]{title}{\mkbibquote{#1}}
 \DeclareFieldFormat{url}{\url{#1}}
+\DeclareFieldFormat{urldate}{#1}
 \DeclareFieldFormat[article,periodical]{volume}{\mkbibbold{#1}}
 
 % Simple modifications to punctuation, etc.
@@ -198,6 +200,16 @@
     }%
 }
 
+\renewbibmacro*{url+urldate}{%
+  \iffieldundef{url}
+    {}
+    {%
+      \printtext[parens]{%
+        \usebibmacro{urldate}%
+        \setunit*{\addsemicolon\space}%
+         \usebibmacro{url}%
+     }}}
+
 % New bibliography drivers, using the required order of fields. These
 % are mainly copied from standard.bbx then modified.
 \DeclareBibliographyDriver{article}{%
@@ -462,13 +474,7 @@
     {\usebibmacro{eprint}}
     {}%
   \nopunct
-  \printtext[parens]{%
-    \iffieldundef{year}
-      {\printfield{urlyear}}
-      {\usebibmacro{date}}%
-    \setunit*{\addsemicolon\space}%
-    \printfield{url}%
-  }%
+  \usebibmacro{url+urldate}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
   \setunit{\bibpagerefpunct}\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex-science/science.cbx b/Master/texmf-dist/tex/latex/biblatex-science/science.cbx
index 26896e38df8..ea5f0d4f50f 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/03/13 v1.1f biblatex citation style]
+\ProvidesFile{science.cbx}[2016/09/13 v1.1g biblatex citation style]
 
 \RequireCitationStyle{numeric-comp}