texlive[51995] Master/texmf-dist: biblatex-bath (30aug19)
commits+karl at tug.org
commits+karl at tug.org
Fri Aug 30 23:10:00 CEST 2019
Revision: 51995
http://tug.org/svn/texlive?view=revision&revision=51995
Author: karl
Date: 2019-08-30 23:10:00 +0200 (Fri, 30 Aug 2019)
Log Message:
-----------
biblatex-bath (30aug19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-bath/README.md
trunk/Master/texmf-dist/doc/latex/biblatex-bath/biblatex-bath.pdf
trunk/Master/texmf-dist/source/latex/biblatex-bath/biblatex-bath.dtx
trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-bath/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-bath/README.md 2019-08-30 21:09:43 UTC (rev 51994)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-bath/README.md 2019-08-30 21:10:00 UTC (rev 51995)
@@ -96,7 +96,7 @@
## Licence
-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.
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-bath/biblatex-bath.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/biblatex-bath/biblatex-bath.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/biblatex-bath/biblatex-bath.dtx 2019-08-30 21:09:43 UTC (rev 51994)
+++ trunk/Master/texmf-dist/source/latex/biblatex-bath/biblatex-bath.dtx 2019-08-30 21:10:00 UTC (rev 51995)
@@ -63,7 +63,7 @@
%</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 @@
\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 @@
%<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 @@
%
% \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 @@
}{%
\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 @@
) and
togl {bbx:labelistitle}
}{\addspace}{\addcomma\space}}
-\DeclareDelimFormat[bib,biblist]{nametitledelim}{%
+\DeclareDelimFormat*[bib,biblist]{nametitledelim}{%
\ifboolexpr{
(
test {\ifentrytype{jurisdiction}}
@@ -2707,14 +2709,28 @@
}{%
'year', 'true' (=year)%
}{}{\wlog{WARNING: biblatex-bath failed to patch KV at blx@opt at pre@datemerge}}
-\DeclareTypeOption[boolean]{mergedate}[true]{%
- \ifcsdef{bbx at opt@mergedate@#1}{%
- \csuse{bbx at opt@mergedate@#1}%
+\ifdefined\KV at blx@opt at typ@mergedate
+ \xpatchcmd{\KV at blx@opt at 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 at blx@opt at typ@datemerge}}
+\else
+ \DeclareTypeOption[boolean]{mergedate}[true]{%
+ \ifcsdef{bbx at opt@mergedate@#1}{%
+ \csuse{bbx at 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 at blx@opt at ent@mergedate}{%
+ 'true' (=compact)%
+}{%
+ 'year', 'true' (=year)%
+}{}{\wlog{WARNING: biblatex-bath failed to patch KV at blx@opt at ent@datemerge}}
+
% \end{macrocode}
%
% We define a configurable field format for date labels to replace the
@@ -2949,7 +2965,7 @@
\iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
}{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangefull}}%
\fi
-\xpatchcmd{\mkdaterangetrunc}{%
+\xpatchcmd{\mkdaterangetrunc at i}{%
\iffieldundef{#2year} {\blx at nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
@@ -2959,7 +2975,7 @@
\iffieldundef{#2year} {}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
- }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetrunc}}%
+ }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetrunc at i}}%
\fi
\xpatchcmd{\mkdaterangefullextra}{%
\iffieldundef{#2year} {\blx at nounit}%
@@ -2973,7 +2989,7 @@
\iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
}{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangefullextra}}%
\fi
-\xpatchcmd{\mkdaterangetruncextra}{%
+\xpatchcmd{\mkdaterangetruncextra at i}{%
\iffieldundef{#2year} {\blx at nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
@@ -2983,7 +2999,7 @@
\iffieldundef{#2year} {}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
- }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetruncextra}}%
+ }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetruncextra at i}}%
\fi
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx 2019-08-30 21:09:43 UTC (rev 51994)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx 2019-08-30 21:10:00 UTC (rev 51995)
@@ -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 at blx@opt at pre@datemerge}}
-\DeclareTypeOption[boolean]{mergedate}[true]{%
- \ifcsdef{bbx at opt@mergedate@#1}{%
- \csuse{bbx at opt@mergedate@#1}%
+\ifdefined\KV at blx@opt at typ@mergedate
+ \xpatchcmd{\KV at blx@opt at 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 at blx@opt at typ@datemerge}}
+\else
+ \DeclareTypeOption[boolean]{mergedate}[true]{%
+ \ifcsdef{bbx at opt@mergedate@#1}{%
+ \csuse{bbx at 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 at blx@opt at ent@mergedate}{%
+ 'true' (=compact)%
+}{%
+ 'year', 'true' (=year)%
+}{}{\wlog{WARNING: biblatex-bath failed to patch KV at blx@opt at ent@datemerge}}
+
\DeclareFieldFormat{datelabel}{#1}
\xpatchcmd{\bbx at opt@mergedate at 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 at i}{%
\iffieldundef{#2year} {\blx at 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 at i}}%
\fi
\xpatchcmd{\mkdaterangefullextra}{%
\iffieldundef{#2year} {\blx at nounit}%
@@ -720,7 +734,7 @@
\iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
}{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangefullextra}}%
\fi
-\xpatchcmd{\mkdaterangetruncextra}{%
+\xpatchcmd{\mkdaterangetruncextra at i}{%
\iffieldundef{#2year} {\blx at 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 at i}}%
\fi
\DeclareFieldFormat{version}{\mkbibparens{\bibstring{version}#1}}
More information about the tex-live-commits
mailing list