1 files changed, 32 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/latex/biblatex-bath/biblatex-bath.dtx b/Master/texmf-dist/source/latex/biblatex-bath/biblatex-bath.dtx
index 0b34937e24a..bca43bc895c 100644
--- a/Master/texmf-dist/source/latex/biblatex-bath/biblatex-bath.dtx
+++ b/Master/texmf-dist/source/latex/biblatex-bath/biblatex-bath.dtx
@@ -63,7 +63,7 @@ Copyright (C) 2019 by University of Bath
 %</internal>
 %<*driver>
 \ProvidesFile{biblatex-bath.dtx}
-    [2019/07/10 v3.0 Harvard referencing style as recommended by the University of Bath Library]
+    [2019/08/29 v3.1 Harvard referencing style as recommended by the University of Bath Library]
 
 \documentclass[10pt,a4paper]{article}
 \usepackage[british]{babel}
@@ -397,6 +397,8 @@ documentation.
 
 \section{Using the style}
 
+This style has been tested with \textsf{biblatex} versions 3.7 and 3.13.
+
 To use the style, specify it when you load \textsf{biblatex}. To get the sorting
 order of your \emph{citations} right, specify the \texttt{ynt} sorting scheme.
 To avoid possible inconsistencies (e.g.\@ in how disambiguation letters are
@@ -1995,7 +1997,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-2019 University of Bath.
 
 This work consists of the documented LaTeX file biblatex-bath.dtx and a Makefile.
 
@@ -2618,7 +2620,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me].
 %
 %    \begin{macrocode}
 \DeclareDelimFormat{nameyeardelim}{\addcomma\space}
-\DeclareDelimFormat[parencite,bib,biblist]{nameyeardelim}{\addcomma\space}
+\DeclareDelimFormat*[parencite,bib,biblist]{nameyeardelim}{\addcomma\space}
 \newcommand{\dononameyeardelim}{%
   \ifentrytype{legislation}{%
     \addspace
@@ -2644,7 +2646,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me].
     }{%
       \addcomma\space}}}
 \DeclareDelimFormat{nonameyeardelim}{\dononameyeardelim}
-\DeclareDelimFormat[bib,biblist]{nonameyeardelim}{\dononameyeardelim}
+\DeclareDelimFormat*[bib,biblist]{nonameyeardelim}{\dononameyeardelim}
 \DeclareDelimFormat[parencite]{nonameyeardelim}{%
   \ifboolexpr{
     test {\ifentrytype{jurisdiction}}
@@ -2669,7 +2671,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me].
     ) and
     togl {bbx:labelistitle}
   }{\addspace}{\addcomma\space}}
-\DeclareDelimFormat[bib,biblist]{nametitledelim}{%
+\DeclareDelimFormat*[bib,biblist]{nametitledelim}{%
   \ifboolexpr{
     (
       test {\ifentrytype{jurisdiction}}
@@ -2707,14 +2709,28 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me].
 }{%
   'year', 'true' (=year)%
 }{}{\wlog{WARNING: biblatex-bath failed to patch KV@blx@opt@pre@datemerge}}
-\DeclareTypeOption[boolean]{mergedate}[true]{%
-  \ifcsdef{bbx@opt@mergedate@#1}{%
-    \csuse{bbx@opt@mergedate@#1}%
+\ifdefined\KV@blx@opt@typ@mergedate
+  \xpatchcmd{\KV@blx@opt@typ@mergedate}{%
+    'true' (=compact)%
   }{%
-    \PackageError{biblatex}
-       {Invalid option 'mergedate=#1'}
-       {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
-        'year', 'true' (=year), and 'false'.}}}
+    'year', 'true' (=year)%
+  }{}{\wlog{WARNING: biblatex-bath failed to patch KV@blx@opt@typ@datemerge}}
+\else
+  \DeclareTypeOption[boolean]{mergedate}[true]{%
+    \ifcsdef{bbx@opt@mergedate@#1}{%
+      \csuse{bbx@opt@mergedate@#1}%
+    }{%
+      \PackageError{biblatex}
+        {Invalid option 'mergedate=#1'}
+        {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
+          'year', 'true' (=year), and 'false'.}}}
+\fi
+\xpatchcmd{\KV@blx@opt@ent@mergedate}{%
+  'true' (=compact)%
+}{%
+  'year', 'true' (=year)%
+}{}{\wlog{WARNING: biblatex-bath failed to patch KV@blx@opt@ent@datemerge}}
+
 %    \end{macrocode}
 %
 % We define a configurable field format for date labels to replace the
@@ -2949,7 +2965,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me].
     \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
   }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangefull}}%
 \fi
-\xpatchcmd{\mkdaterangetrunc}{%
+\xpatchcmd{\mkdaterangetrunc@i}{%
   \iffieldundef{#2year} {\blx@nounit}%
 }{%
   \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
@@ -2959,7 +2975,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me].
     \iffieldundef{#2year} {}%
   }{%
     \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
-  }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetrunc}}%
+  }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetrunc@i}}%
 \fi
 \xpatchcmd{\mkdaterangefullextra}{%
   \iffieldundef{#2year} {\blx@nounit}%
@@ -2973,7 +2989,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me].
     \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
   }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangefullextra}}%
 \fi
-\xpatchcmd{\mkdaterangetruncextra}{%
+\xpatchcmd{\mkdaterangetruncextra@i}{%
   \iffieldundef{#2year} {\blx@nounit}%
 }{%
   \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
@@ -2983,7 +2999,7 @@ This work is `maintained' (as per LPPL maintenance status) by [Alex Ball][me].
     \iffieldundef{#2year} {}%
   }{%
     \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
-  }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetruncextra}}%
+  }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetruncextra@i}}%
 \fi
 
 %    \end{macrocode}