bath-bst (16jan20)

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

9 files changed, 69 insertions, 30 deletions

diff --git a/Master/texmf-dist/bibtex/bst/bath-bst/bath.bst b/Master/texmf-dist/bibtex/bst/bath-bst/bath.bst
index e42be4ff86a..f3aea4b2043 100644
--- a/Master/texmf-dist/bibtex/bst/bath-bst/bath.bst
+++ b/Master/texmf-dist/bibtex/bst/bath-bst/bath.bst
@@ -240,7 +240,7 @@ FUNCTION {either.or.check}
 FUNCTION {is.online}
 { type$ "software" =
     { #0 }
-    { url empty$
+    { url empty$ doi empty$ and
         { type$ "online" =
             { #1 }
             { #0 }
@@ -852,7 +852,12 @@ FUNCTION {format.thesis.type}
 FUNCTION {format.booklet.type}
 { type duplicate$ empty$
     { pop$ "" }
-    { "type" bibinfo.check}
+    { "type" bibinfo.check
+      is.online author empty$ and editor empty$ and
+        { " " * bbl.online * }
+        'skip$
+      if$
+    }
   if$
 }
 FUNCTION {add.cmd.number}
@@ -2420,6 +2425,6 @@ FUNCTION {end.bib}
 }
 EXECUTE {end.bib}
 %% 
-%% Copyright (C) 2019 by University of Bath
+%% Copyright (C) 2020 by University of Bath
 %%
 %% End of file `bath.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/bath-bst/bathx.bst b/Master/texmf-dist/bibtex/bst/bath-bst/bathx.bst
index 61da24f5ecb..e7f61277456 100644
--- a/Master/texmf-dist/bibtex/bst/bath-bst/bathx.bst
+++ b/Master/texmf-dist/bibtex/bst/bath-bst/bathx.bst
@@ -240,7 +240,7 @@ FUNCTION {either.or.check}
 FUNCTION {is.online}
 { type$ "software" =
     { #0 }
-    { url empty$
+    { url empty$ doi empty$ and
         { type$ "online" =
             { #1 }
             { #0 }
@@ -668,6 +668,18 @@ FUNCTION {get.title.addenda}
   and
   journal empty$
   and
+  type empty$
+    type$ "booklet" = not
+    type$ "audio" = not
+    and
+    type$ "video" = not
+    and
+    type$ "music" = not
+    and
+    type$ "movie" = not
+    and
+    or
+  and
     { bbl.online output }
     'skip$
   if$
@@ -872,7 +884,12 @@ FUNCTION {format.thesis.type}
 FUNCTION {format.booklet.type}
 { type duplicate$ empty$
     { pop$ "" }
-    { "type" bibinfo.check}
+    { "type" bibinfo.check
+      is.online author empty$ and editor empty$ and
+        { " " * bbl.online * }
+        'skip$
+      if$
+    }
   if$
 }
 FUNCTION {add.cmd.number}
@@ -2458,6 +2475,6 @@ FUNCTION {end.bib}
 }
 EXECUTE {end.bib}
 %% 
-%% Copyright (C) 2019 by University of Bath
+%% Copyright (C) 2020 by University of Bath
 %%
 %% End of file `bathx.bst'.
diff --git a/Master/texmf-dist/doc/bibtex/bath-bst/README.md b/Master/texmf-dist/doc/bibtex/bath-bst/README.md
index cd073944a38..6aa0ea1e747 100644
--- a/Master/texmf-dist/doc/bibtex/bath-bst/README.md
+++ b/Master/texmf-dist/doc/bibtex/bath-bst/README.md
@@ -96,7 +96,7 @@ documentation.
 
 ## Licence
 
-Copyright 2016-2018 University of Bath.
+Copyright 2016-2020 University of Bath.
 
 This work consists of the documented LaTeX file bath-bst.dtx and a Makefile.
 
diff --git a/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst-v1.pdf b/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst-v1.pdf
index ce82e8fbfc9..3e748e4f7d6 100644
--- a/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst-v1.pdf
+++ b/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst-v1.pdf
diff --git a/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst-v1.tex b/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst-v1.tex
index 64d007d8265..e010b70d718 100644
--- a/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst-v1.tex
+++ b/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst-v1.tex
@@ -14,7 +14,7 @@
 %% ----------------------------------------------------------------
 %% 
 \ProvidesFile{bath-bst-v1.tex}
-    [2019/07/10 v3.0 Harvard referencing style as recommended by the University of Bath Library]
+    [2020/01/16 v3.2 Harvard referencing style as recommended by the University of Bath Library]
 
 \documentclass[10pt,a4paper]{article}
 \usepackage[british]{babel}
@@ -1434,6 +1434,6 @@ not.
 \bibliography{bath-bst-v1}
 \end{document}
 %% 
-%% Copyright (C) 2019 by University of Bath
+%% Copyright (C) 2020 by University of Bath
 %%
 %% End of file `bath-bst-v1.tex'.
diff --git a/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst.bib b/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst.bib
index e378bbeb9f2..06c27ed2fab 100644
--- a/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst.bib
+++ b/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst.bib
@@ -252,8 +252,7 @@
   year = {2006},
   title = {Rick {Stein's} {French} Odyssey: Episode 5},
   type = {TV},
-  note = {BBC2, 23 August. 20.30 hrs}
-}
+  note = {BBC2, 23 August. 20.30 hrs}}
 @audio{archers20060823,
   year = {2006},
   title = {The {Archers}},
@@ -280,21 +279,21 @@
   journal = {Lis-link},
   url = {lis-link@jiscmail.ac.uk},
   urlyear = {30 July 2004}}
-@online{bvd2008bt,
+@dataset{bvd2008bt,
   author = {{Bureau van Dijk}},
   year = {2008},
   title = {{BT} {Group} PLC Company Report},
   library = {FAME},
   address = {London},
-  organization = {Bureau van Dijk},
+  publisher = {Bureau van Dijk},
   url = {http://www.portal.euromonitor.com},
   urlyear = {6 November 2014}}
-@online{wilson2013rgc,
+@dataset{wilson2013rgc,
   author = {Wilson, D.},
   year = {2013},
   title = {Real Geometry and Connectedness via Triangular Description: {CAD} Example Bank},
   address = {Bath},
-  organization = {University of Bath},
+  publisher = {University of Bath},
   doi = {10.15125/BATH-00069},
   urlyear = {20 April 2016}}
 @software{screencasto,
diff --git a/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst.pdf b/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst.pdf
index 37b1b312d32..7290d79e447 100644
--- a/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst.pdf
+++ b/Master/texmf-dist/doc/bibtex/bath-bst/bath-bst.pdf
diff --git a/Master/texmf-dist/source/bibtex/bath-bst/bath-bst.dtx b/Master/texmf-dist/source/bibtex/bath-bst/bath-bst.dtx
index 1c1560d0088..18e1beb4f69 100644
--- a/Master/texmf-dist/source/bibtex/bath-bst/bath-bst.dtx
+++ b/Master/texmf-dist/source/bibtex/bath-bst/bath-bst.dtx
@@ -39,7 +39,7 @@ See:     http://www.latex-project.org/lppl.txt
 \endpreamble
 \postamble
 
-Copyright (C) 2019 by University of Bath
+Copyright (C) 2020 by University of Bath
 \endpostamble
 
 \usedir{bibtex/bst/\jobname}
@@ -74,7 +74,7 @@ Copyright (C) 2019 by University of Bath
 \ProvidesFile{bath-bst.dtx}
 %</driver>
 %<*driver|tex1>
-    [2019/07/10 v3.0 Harvard referencing style as recommended by the University of Bath Library]
+    [2020/01/16 v3.2 Harvard referencing style as recommended by the University of Bath Library]
 
 \documentclass[10pt,a4paper]{article}
 \usepackage[british]{babel}
@@ -1716,8 +1716,7 @@ but the \texttt{organization} field if the location relates to the archive.
   year = {2006},
   title = {Rick {Stein's} {French} Odyssey: Episode 5},
   type = {TV},
-  note = {BBC2, 23 August. 20.30 hrs}
-}
+  note = {BBC2, 23 August. 20.30 hrs}}
 %</driver|bib>
 %<*driver>
 \end{Verbatim}
@@ -1900,13 +1899,13 @@ unfortunately this means you have to put in extra work to show only the year in
 \begin{Verbatim}
 %</driver|tex1>
 %<*driver|bib>
-@online{bvd2008bt,
+@dataset{bvd2008bt,
   author = {{Bureau van Dijk}},
   year = {2008},
   title = {{BT} {Group} PLC Company Report},
   library = {FAME},
   address = {London},
-  organization = {Bureau van Dijk},
+  publisher = {Bureau van Dijk},
   url = {http://www.portal.euromonitor.com},
   urlyear = {6 November 2014}}
 %</driver|bib>
@@ -1941,12 +1940,12 @@ unfortunately this means you have to put in extra work to show only the year in
 \begin{Verbatim}
 %</driver|tex1>
 %<*driver|bib>
-@online{wilson2013rgc,
+@dataset{wilson2013rgc,
   author = {Wilson, D.},
   year = {2013},
   title = {Real Geometry and Connectedness via Triangular Description: {CAD} Example Bank},
   address = {Bath},
-  organization = {University of Bath},
+  publisher = {University of Bath},
   doi = {10.15125/BATH-00069},
   urlyear = {20 April 2016}}
 %</driver|bib>
@@ -2781,7 +2780,7 @@ Commission case number, \texttt{number} for the formal decision number, and give
 %<readme>## Licence
 %<readme>
 %<*driver|readme>
-Copyright 2016-2018 University of Bath.
+Copyright 2016-2020 University of Bath.
 
 This work consists of the documented LaTeX file bath-bst.dtx and a Makefile.
 
@@ -3213,7 +3212,7 @@ FUNCTION {either.or.check}
 FUNCTION {is.online}
 { type$ "software" =
     { #0 }
-    { url empty$
+    { url empty$ doi empty$ and
         { type$ "online" =
             { #1 }
             { #0 }
@@ -3783,6 +3782,18 @@ FUNCTION {get.title.addenda}
   and
   journal empty$
   and
+  type empty$
+    type$ "booklet" = not
+    type$ "audio" = not
+    and
+    type$ "video" = not
+    and
+    type$ "music" = not
+    and
+    type$ "movie" = not
+    and
+    or
+  and
     { bbl.online output }
     'skip$
   if$
@@ -4087,14 +4098,21 @@ FUNCTION {format.thesis.type}
 }
 %    \end{macrocode}
 %
-% If the type is provided, |format.booklet.type| simply writes the type field
-% with an initial capital. Otherwise it returns an empty string.
+% If the type is provided, |format.booklet.type| writes the type field
+% with an initial capital. Then, if this is an online work with no author/editor,
+% the online label is added. If the type is not provided, it
+% returns an empty string.
 %
 %    \begin{macrocode}
 FUNCTION {format.booklet.type}
 { type duplicate$ empty$
     { pop$ "" }
-    { "type" bibinfo.check}
+    { "type" bibinfo.check
+      is.online author empty$ and editor empty$ and
+        { " " * bbl.online * }
+        'skip$
+      if$
+    }
   if$
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/bibtex/bath-bst/bath-bst.ins b/Master/texmf-dist/source/bibtex/bath-bst/bath-bst.ins
index 01d6719a434..6aa443b30a2 100644
--- a/Master/texmf-dist/source/bibtex/bath-bst/bath-bst.ins
+++ b/Master/texmf-dist/source/bibtex/bath-bst/bath-bst.ins
@@ -37,7 +37,7 @@ See:     http://www.latex-project.org/lppl.txt
 \endpreamble
 \postamble
 
-Copyright (C) 2019 by University of Bath
+Copyright (C) 2020 by University of Bath
 \endpostamble
 
 \usedir{bibtex/bst/\jobname}
@@ -47,6 +47,6 @@ Copyright (C) 2019 by University of Bath
 }
 \endbatchfile
 %% 
-%% Copyright (C) 2019 by University of Bath
+%% Copyright (C) 2020 by University of Bath
 %%
 %% End of file `bath-bst.ins'.