From 13f72ad9babb05ef7faaf9118d42cb6e3a26f067 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 30 Aug 2019 21:10:00 +0000 Subject: biblatex-bath (30aug19) git-svn-id: svn://tug.org/texlive/trunk@51995 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/biblatex-bath/README.md | 2 +- .../doc/latex/biblatex-bath/biblatex-bath.pdf | Bin 443145 -> 445184 bytes .../source/latex/biblatex-bath/biblatex-bath.dtx | 48 ++++++++++++++------- Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx | 42 ++++++++++++------ 4 files changed, 61 insertions(+), 31 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-bath/README.md b/Master/texmf-dist/doc/latex/biblatex-bath/README.md index a6419b1512b..82ef9ef2a04 100644 --- a/Master/texmf-dist/doc/latex/biblatex-bath/README.md +++ b/Master/texmf-dist/doc/latex/biblatex-bath/README.md @@ -96,7 +96,7 @@ documentation. ## 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. diff --git a/Master/texmf-dist/doc/latex/biblatex-bath/biblatex-bath.pdf b/Master/texmf-dist/doc/latex/biblatex-bath/biblatex-bath.pdf index d99232f5d88..1a4d4254eee 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-bath/biblatex-bath.pdf and b/Master/texmf-dist/doc/latex/biblatex-bath/biblatex-bath.pdf differ 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 % %<*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 %## Licence % %<*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} 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}} -- cgit v1.2.3