biblatex-bath (30aug19)

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

1 files changed, 28 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx b/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx
index 0678e0acea3..c3ceb7ee218 100644
--- a/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx
@@ -437,7 +437,7 @@
 }
 
 \DeclareDelimFormat{nameyeardelim}{\addcomma\space}
-\DeclareDelimFormat[parencite,bib,biblist]{nameyeardelim}{\addcomma\space}
+\DeclareDelimFormat*[parencite,bib,biblist]{nameyeardelim}{\addcomma\space}
 \newcommand{\dononameyeardelim}{%
   \ifentrytype{legislation}{%
     \addspace
@@ -463,7 +463,7 @@
     }{%
       \addcomma\space}}}
 \DeclareDelimFormat{nonameyeardelim}{\dononameyeardelim}
-\DeclareDelimFormat[bib,biblist]{nonameyeardelim}{\dononameyeardelim}
+\DeclareDelimFormat*[bib,biblist]{nonameyeardelim}{\dononameyeardelim}
 \DeclareDelimFormat[parencite]{nonameyeardelim}{%
   \ifboolexpr{
     test {\ifentrytype{jurisdiction}}
@@ -480,7 +480,7 @@
     ) and
     togl {bbx:labelistitle}
   }{\addspace}{\addcomma\space}}
-\DeclareDelimFormat[bib,biblist]{nametitledelim}{%
+\DeclareDelimFormat*[bib,biblist]{nametitledelim}{%
   \ifboolexpr{
     (
       test {\ifentrytype{jurisdiction}}
@@ -502,14 +502,28 @@
 }{%
   '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}}
+
 \DeclareFieldFormat{datelabel}{#1}
 \xpatchcmd{\bbx@opt@mergedate@maximum}{%
   \iffieldundef{labelyear}%
@@ -696,7 +710,7 @@
     \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}}%
@@ -706,7 +720,7 @@
     \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}%
@@ -720,7 +734,7 @@
     \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}}%
@@ -730,7 +744,7 @@
     \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
 
 \DeclareFieldFormat{version}{\mkbibparens{\bibstring{version}#1}}