texlive[74864] Master/texmf-dist: biblatex-bath (6apr25)
commits+karl at tug.org
commits+karl at tug.org
Sun Apr 6 23:16:00 CEST 2025
Revision: 74864
https://tug.org/svn/texlive?view=revision&revision=74864
Author: karl
Date: 2025-04-06 23:16:00 +0200 (Sun, 06 Apr 2025)
Log Message:
-----------
biblatex-bath (6apr25)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-bath/README.md
trunk/Master/texmf-dist/doc/latex/biblatex-bath/biblatex-bath.bib
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
trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-bath/british-bath.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-bath/english-bath.lbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-bath/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-bath/README.md 2025-04-06 21:13:01 UTC (rev 74863)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-bath/README.md 2025-04-06 21:16:00 UTC (rev 74864)
@@ -92,11 +92,12 @@
[Biber]: http://ctan.org/pkg/biber
[luatexja]: http://ctan.org/pkg/luatexja
[adobemapping]: http://ctan.org/pkg/adobemapping
+[ipaex]: http://ctan.org/pkg/ipaex
[haranoaji]: http://ctan.org/pkg/haranoaji
## Licence
-Copyright 2016-2022 University of Bath.
+Copyright 2016-2025 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.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-bath/biblatex-bath.bib 2025-04-06 21:13:01 UTC (rev 74863)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-bath/biblatex-bath.bib 2025-04-06 21:16:00 UTC (rev 74864)
@@ -54,7 +54,8 @@
booktitle = {{British National Formulary}},
edition = {79},
address = {London},
- publisher = {Pharmaceutical Press}}
+ publisher = {Pharmaceutical Press},
+ pages = {280-281}}
@inreference{aspirin2019bnf,
title = {Aspirin},
year = {2019},
@@ -102,7 +103,7 @@
author = {Newman, R.},
year = {2010},
title = {Malaria control beyond 2010},
- journal = {{Brit.\@ Med.\@ J.\isdot}},
+ journal = {{British} Medical Journal},
volume = {341},
number = {7765},
pages = {157-208}}
@@ -121,7 +122,7 @@
year = {2021},
title = {Identifying Prognostic Pairwise Relationships Among Bacterial
Species in Microbiome Studies},
- journal = {{PLOS Computational Biology}},
+ journal = {{PLOS} Computational Biology},
volume = {17},
number = {11},
url = {https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1009501},
@@ -331,7 +332,7 @@
author = {Moran, C.},
year = {2016},
title = {Save Our Libraries},
- url = {https://www.youtube.com/watch?v=gKTfCz4JtVE&feature=youtu.be},
+ url = {https://youtu.be/gKTfCz4JtVE},
urldate = {2016-04-29}}
@audio{chakrabarti2016hac,
author = {Chakrabarti, V.},
@@ -385,6 +386,14 @@
title = {Vernacular Architecture},
url = {https://www.buildinghistory.org/style/vernacular.shtml},
urldate = {2020-02-20}}
+ at online{chatgpt2023wcr,
+ author = {{ChatGPT}},
+ year = {2023},
+ title = {Why is Citing and Referencing Your Sources Important?},
+ address = {San Francisco, Calif.},
+ organization = {OpenAI},
+ url = {https://chat.openai.com/share/782cb099-a0dc-45b1-8da4-0e99713f2d45},
+ urldate = {2023-09-04}}
@online{gaiman2021fbp,
author = {Gaiman, N.},
date = {2021-04-21},
@@ -544,6 +553,16 @@
publisher = {HMSO},
url = {http://www.legislation.gov.uk/uksi/2012/1916/pdfs/uksi_20121916_en.pdf},
urldate = {2016-04-17}}
+ at legal{gb.hc2024rpc,
+ entrysubtype = {parliamentary},
+ author = {{Great Britain. Parliament. House of Commons}},
+ year = {2024},
+ title = {{Rwanda Plan Cost and Asylum System}},
+ journal = {Hansard},
+ volume = {744},
+ eventdate = {2024-01-09},
+ url = {https://hansard.parliament.uk/Commons/2024-01-09/debates/57105D77-72DE-4246-9F6E-ED87FCB9A088/RwandaPlanCostAndAsylumSystem},
+ urldate = {2024-12-12}}
@report{ec2015gra,
author = {{European Commission}},
year = {2015},
@@ -559,11 +578,6 @@
journal = {OJ},
series = {L},
volume = {295}}
- at jurisdiction{seldon-v-c.w.j2012,
- title = {Seldon v.~{Clarkson} {Wright} \& {Jakes}},
- year = {2012},
- journal = {UKSC},
- pages = {16}}
@jurisdiction{srl.etal-v-comm2005,
title = {Alessandrini {Srl} and others v. {Commission}},
number = {C-295/03 P},
@@ -571,6 +585,27 @@
journal = {ECR},
volume = {I},
pages = {5700}}
+ at jurisdiction{seldon-v-c.w.j2009,
+ title = {Seldon v~{Clarkson} {Wright} \& {Jakes}},
+ year = {2009},
+ institution = {{England and Wales Court of Appeal (Civil Division)}},
+ number = {889},
+ journal = {Bailii},
+ url = {http://www.bailii.org/ew/cases/EWCA/Civ/2009/889.html},
+ urldate = {2024-04-23}}
+ at jurisdiction{braceurself-v-nhs.england2013,
+ title = {{Braceurself} {Ltd} v~{NHS} {England}},
+ year = {2013},
+ institution = {{England and Wales Court of Appeal (Civil Division)}},
+ number = {39},
+ journal = {Construction law reports},
+ volume = {212},
+ pages = {95-135}}
+ at jurisdiction{seldon-v-c.w.j2012,
+ title = {Seldon v~{Clarkson} {Wright} \& {Jakes}},
+ year = {2012},
+ journal = {UKSC},
+ pages = {16}}
@book{adams2009tc1,
author = {Adams, Gomez},
year = {2009},
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 2025-04-06 21:13:01 UTC (rev 74863)
+++ trunk/Master/texmf-dist/source/latex/biblatex-bath/biblatex-bath.dtx 2025-04-06 21:16:00 UTC (rev 74864)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%<*internal|bbx|cbx|dbx|lbx|lbx-gb>
-\def\Version{2022/05/25 v6.0}
+\def\Version{2025/04/01 v7.0}
%</internal|bbx|cbx|dbx|lbx|lbx-gb>
%<*internal>
\iffalse
@@ -63,7 +63,7 @@
\endpreamble
\postamble
-Copyright (C) 2016-2022 by University of Bath
+Copyright (C) 2016-2025 by University of Bath
\endpostamble
\usedir{tex/latex/\jobname}
@@ -128,7 +128,7 @@
{Verbatim}{Verbatim}
{commentchar=\%}
-\usepackage[tightLists=false]{markdown}
+\usepackage[tightLists=false,texComments=true]{markdown}
\markdownSetup{rendererPrototypes={%
link = {\href{#3}{#1}}%
}}
@@ -321,7 +321,7 @@
\section{Introduction}
-\begin{markdown*}{hybrid=true}
+\begin{markdown}
%</driver>
%<*driver|readme>
@@ -417,10 +417,11 @@
[Biber]: http://ctan.org/pkg/biber
[luatexja]: http://ctan.org/pkg/luatexja
[adobemapping]: http://ctan.org/pkg/adobemapping
+[ipaex]: http://ctan.org/pkg/ipaex
[haranoaji]: http://ctan.org/pkg/haranoaji
%</driver|readme>
%<*driver>
-\end{markdown*}
+\end{markdown}
\section{Using the style}
@@ -728,7 +729,7 @@
\end{bibexbox}
\begin{bibexbox}<RX>{aspirin2020bnf}
- British National Formulary, 2020. 79th ed. \emph{Aspirin}. London: Pharmaceutical Press.
+ British National Formulary, 2020. 79th ed. \emph{Aspirin}. London: Pharmaceutical Press, pp.280--281.
\tcblower
\begin{Verbatim}
%</driver>
@@ -739,7 +740,8 @@
booktitle = {{British National Formulary}},
edition = {79},
address = {London},
- publisher = {Pharmaceutical Press}}
+ publisher = {Pharmaceutical Press},
+ pages = {280-281}}
%</driver|bib>
%<*driver>
\end{Verbatim}
@@ -859,7 +861,7 @@
\end{bibexbox}
\begin{bibexbox}<RX>{newman2010mcb}
- Newman, R., 2010. Malaria control beyond 2010. \emph{Brit. Med. J.}, 341(7765), pp.157--208.
+ Newman, R., 2010. Malaria control beyond 2010. \emph{British medical journal}, 341(7765), pp.157--208.
\tcblower
\begin{Verbatim}
%</driver>
@@ -868,7 +870,7 @@
author = {Newman, R.},
year = {2010},
title = {Malaria control beyond 2010},
- journal = {{Brit.\@ Med.\@ J.\isdot}},
+ journal = {{British} Medical Journal},
volume = {341},
number = {7765},
pages = {157-208}}
@@ -902,7 +904,7 @@
\subsubsection*{Electronic journal article}
\begin{bibexbox}<RX>{devlin.etal2021ipp}
- Devlin, S.M., Martin, A. and Ostrovnaya, I., 2021. Identifying prognostic pairwise relationships among bacterial species in microbiome studies. \emph{PLOS Computational Biology} [Online], 17(11). Available from: \url{https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1009501} [Accessed 9 December 2021].
+ Devlin, S.M., Martin, A. and Ostrovnaya, I., 2021. Identifying prognostic pairwise relationships among bacterial species in microbiome studies. \emph{PLOS computational biology} [Online], 17(11). Available from: \url{https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1009501} [Accessed 9 December 2021].
\tcblower
\begin{Verbatim}
%</driver>
@@ -912,7 +914,7 @@
year = {2021},
title = {Identifying Prognostic Pairwise Relationships Among Bacterial
Species in Microbiome Studies},
- journal = {{PLOS Computational Biology}},
+ journal = {{PLOS} Computational Biology},
volume = {17},
number = {11},
url = {https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1009501},
@@ -1545,7 +1547,7 @@
\subsubsection*{Online video\slash audio}
\begin{bibexbox}<RX>{moran2016sol}
- Moran, C., 2016. \emph{Save our libraries} [Online]. Available from: \url{https://www.youtube.com/watch?v=gKTfCz4JtVE&feature=youtu.be} [Accessed 29 April 2016].
+ Moran, C., 2016. \emph{Save our libraries} [Online]. Available from: \url{https://youtu.be/gKTfCz4JtVE} [Accessed 29 April 2016].
\tcblower
\begin{Verbatim}
%</driver>
@@ -1554,7 +1556,7 @@
author = {Moran, C.},
year = {2016},
title = {Save Our Libraries},
- url = {https://www.youtube.com/watch?v=gKTfCz4JtVE&feature=youtu.be},
+ url = {https://youtu.be/gKTfCz4JtVE},
urldate = {2016-04-29}}
%</driver|bib>
%<*driver>
@@ -1723,7 +1725,28 @@
\end{Verbatim}
\end{bibexbox}
+This template is also used for retrievable Generative AI content.
+\begin{bibexbox}<RX>{chatgpt2023wcr}
+ ChatGPT, 2023. \emph{Why is citing and referencing your sources important?} [Online]. San Francisco, Calif.: OpenAI. Available from: \url{https://chat.openai.com/share/782cb099-a0dc-45b1-8da4-0e99713f2d45} [Accessed 4 September 2023].
+ \tcblower
+\begin{Verbatim}
+%</driver>
+%<*driver|bib>
+ at online{chatgpt2023wcr,
+ author = {{ChatGPT}},
+ year = {2023},
+ title = {Why is Citing and Referencing Your Sources Important?},
+ address = {San Francisco, Calif.},
+ organization = {OpenAI},
+ url = {https://chat.openai.com/share/782cb099-a0dc-45b1-8da4-0e99713f2d45},
+ urldate = {2023-09-04}}
+%</driver|bib>
+%<*driver>
+\end{Verbatim}
+\end{bibexbox}
+
+
\subsubsection*{Social media}
\begin{bibexbox}<RX>{gaiman2021fbp}
@@ -2044,7 +2067,7 @@
\end{bibexbox}
-\subsection{Legal or government document: UK parliamentary reports\slash legislation}
+\subsection{Government and parliamentary document}
% Parliamentary reports
@@ -2235,12 +2258,47 @@
\end{tips}
-\subsection{Legal or government document: EU reports\slash legislation}
+% UK parliamentary debates
+\subsubsection*{Parliamentary debate}
+
+\begin{bibexbox}<RX>{gb.hc2024rpc}
+ Great Britain. Parliament. House of Commons, 2024. Rwanda Plan Cost and Asylum System. \emph{Hansard} [Online], 744, 9 January 2024. Available from: \url{https://hansard.parliament.uk/Commons/2024-01-09/debates/57105D77-72DE-4246-9F6E-ED87FCB9A088/RwandaPlanCostAndAsylumSystem} [Accessed 12 December 2024].
+ \tcblower
+\begin{Verbatim}
+%</driver>
+%<*driver|bib>
+ at legal{gb.hc2024rpc,
+ entrysubtype = {parliamentary},
+ author = {{Great Britain. Parliament. House of Commons}},
+ year = {2024},
+ title = {{Rwanda Plan Cost and Asylum System}},
+ journal = {Hansard},
+ volume = {744},
+ eventdate = {2024-01-09},
+ url = {https://hansard.parliament.uk/Commons/2024-01-09/debates/57105D77-72DE-4246-9F6E-ED87FCB9A088/RwandaPlanCostAndAsylumSystem},
+ urldate = {2024-12-12}}
+%</driver|bib>
+%<*driver>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{tips}\item
+Use the \texttt{legal} entry type.
+As that entry type is defined loosely by \textsf{biblatex},
+use the \texttt{entrysubtype} `parliamentary' to protect the entry
+against possible formatting changes in future versions of the style.
+\end{tips}
+
+
+\subsection{Legal document: EU reports\slash legislation}
+
% European reports
\subsubsection*{EU publication}
+The following example has been removed.
+
\begin{bibexbox}<RX>{ec2015gra}
European Commission, 2015. \emph{General report on the activities of the European Union 2014}. Luxembourg: Publications Office of the European Union.
\tcblower
@@ -2288,18 +2346,94 @@
\end{info}
-\subsection{Legal or government document: case reports}
+\subsection{Legal document: case reports}
+\subsubsection*{Judgment of the European Court of Justice}
+
+\begin{bibexbox}<RX>{srl.etal-v-comm2005}
+ \emph{Alessandrini Srl and others v.~Commission} (C-295/03 P) [2005] ECR I--5700.
+ \tcblower
+\begin{Verbatim}
+%</driver>
+%<*driver|bib>
+ at jurisdiction{srl.etal-v-comm2005,
+ title = {Alessandrini {Srl} and others v. {Commission}},
+ number = {C-295/03 P},
+ year = {2005},
+ journal = {ECR},
+ volume = {I},
+ pages = {5700}}
+%</driver|bib>
+%<*driver>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{tips}\item
+Use the \texttt{number} field (or the non-standard \texttt{casenmuber} field)
+for the case number. For Commission Decisions, use the (non-standard)
+\texttt{casenumber} or (\textsf{biblatex-oscola}) \texttt{userb} field for the
+Commission case number, \texttt{number} for the formal decision number, and give
+`Commission' as the \texttt{institution}.
+\end{tips}
+
+
\subsubsection*{Legal case study}
+\begin{bibexbox}<RX>{seldon-v-c.w.j2009}
+ \emph{Seldon v Clarkson Wright \& Jakes}, 2009. England and Wales Court of Appeal (Civil Division), 889. \emph{Bailii} [Online]. Available from: \url{http://www.bailii.org/ew/cases/EWCA/Civ/2009/889.html} [Accessed 23 April 2024].
+ \tcblower
+\begin{Verbatim}
+%</driver>
+%<*driver|bib>
+ at jurisdiction{seldon-v-c.w.j2009,
+ title = {Seldon v~{Clarkson} {Wright} \& {Jakes}},
+ year = {2009},
+ institution = {{England and Wales Court of Appeal (Civil Division)}},
+ number = {889},
+ journal = {Bailii},
+ url = {http://www.bailii.org/ew/cases/EWCA/Civ/2009/889.html},
+ urldate = {2024-04-23}}
+%</driver|bib>
+%<*driver>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{bibexbox}<RX>{braceurself-v-nhs.england2013}
+ \emph{Braceurself Ltd v~NHS England}, 2013. England and Wales Court of Appeal (Civil Division), 39. \emph{Construction law reports}, 212, pp.95--135.
+ \tcblower
+\begin{Verbatim}
+%</driver>
+%<*driver|bib>
+ at jurisdiction{braceurself-v-nhs.england2013,
+ title = {{Braceurself} {Ltd} v~{NHS} {England}},
+ year = {2013},
+ institution = {{England and Wales Court of Appeal (Civil Division)}},
+ number = {39},
+ journal = {Construction law reports},
+ volume = {212},
+ pages = {95-135}}
+%</driver|bib>
+%<*driver>
+\end{Verbatim}
+\end{bibexbox}
+
+\begin{tips}\item
+ Give the court as the \texttt{institution} and the case number as \texttt{number}
+ (or \texttt{casenumber}).
+\end{tips}
+
+It is also possible to achieve a more traditional or
+\href{http://www.bailii.org/bailii/citation.html}{neutral citation} format,
+similar to Harvard (Bath)'s pre-2024 format:
+
\begin{bibexbox}<RX>{seldon-v-c.w.j2012}
- \emph{Seldon v.~Clarkson Wright \& Jakes}. [2012]. UKSC 16.
+ \emph{Seldon v~Clarkson Wright \& Jakes} [2012] UKSC 16.
\tcblower
\begin{Verbatim}
%</driver>
%<*driver|bib>
@jurisdiction{seldon-v-c.w.j2012,
- title = {Seldon v.~{Clarkson} {Wright} \& {Jakes}},
+ title = {Seldon v~{Clarkson} {Wright} \& {Jakes}},
year = {2012},
journal = {UKSC},
pages = {16}}
@@ -2308,10 +2442,11 @@
\end{Verbatim}
\end{bibexbox}
+
\begin{info}\item
-Generally speaking, the year should be in square brackets if it is essential to the citation
-(unless it is a Scottish case, in which case it is printed bare), and in parentheses if it is
-not.
+Generally speaking, in a neutral citation the year should be in square brackets
+if it is essential to the citation (unless it is a Scottish case, in which case
+it is printed bare), and in parentheses if it is not.
\end{info}
\begin{tips}\item
By default, the style assumes the year is essential if and only if a volume number is
@@ -2355,46 +2490,18 @@
, fontupper = \footnotesize
]
\begin{Verbatim}
- title = {Seldon v.~{Clarkson} {Wright} \& {Jakes}},
- sortyear = {2012},
- note = {[2012]. UKSC 16}
+ title = {Seldon v~{Clarkson} {Wright} \& {Jakes}},
+ sortyear = {2009},
+ note = {[2009] EWCA Civ 889}
\end{Verbatim}
\end{tcolorbox}
\end{hacks}
-\subsubsection*{Judgment of the European Court of Justice}
-
-\begin{bibexbox}<RX>{srl.etal-v-comm2005}
- \emph{Alessandrini Srl and others v.~Commission} (C-295/03 P) [2005] ECR I--5700.
- \tcblower
-\begin{Verbatim}
-%</driver>
-%<*driver|bib>
- at jurisdiction{srl.etal-v-comm2005,
- title = {Alessandrini {Srl} and others v. {Commission}},
- number = {C-295/03 P},
- year = {2005},
- journal = {ECR},
- volume = {I},
- pages = {5700}}
-%</driver|bib>
-%<*driver>
-\end{Verbatim}
-\end{bibexbox}
-
-\begin{tips}\item
-Use the \texttt{number} field (or the non-standard \texttt{casenmuber} field)
-for the case number. For Commission Decisions, use the (non-standard)
-\texttt{casenumber} or (\textsf{biblatex-oscola}) \texttt{userb} field for the
-Commission case number, \texttt{number} for the formal decision number, and give
-`Commission' as the \texttt{institution}.
-\end{tips}
-
-
\newrefcontext[sorting=nyt]
\printbibliography[heading=bibnumbered]
+
\section{Licence}
\begin{markdown*}{hybrid=true}
@@ -2403,7 +2510,7 @@
%<readme>## Licence
%<readme>
%<*driver|readme>
-Copyright 2016-2022 University of Bath.
+Copyright 2016-2025 University of Bath.
This work consists of the documented LaTeX file biblatex-bath.dtx and a Makefile.
@@ -2890,17 +2997,15 @@
\usebibmacro{author/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{bytranslator+others}%
+ \newunit
+ \usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{journal+issuetitle}%
\newunit
- \usebibmacro{byeditor+others}%
- \newunit
\usebibmacro{note+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -2925,8 +3030,6 @@
\usebibmacro{editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title+issuetitle}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byeditor}%
\newunit\newblock
@@ -2938,7 +3041,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -2963,8 +3066,6 @@
\usebibmacro{author/editor+others/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{maintitle+title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -2986,9 +3087,9 @@
\usebibmacro{publisher+location+date}%
\newunit\newblock
\usebibmacro{chapter+pages}%
-% \newunit
-% \printfield{pagetotal}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -2995,7 +3096,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3011,8 +3112,6 @@
\usebibmacro{editor+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{maintitle+title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
@@ -3032,9 +3131,9 @@
\usebibmacro{publisher+location+date}%
\newunit\newblock
\usebibmacro{chapter+pages}%
-% \newunit
-% \printfield{pagetotal}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -3041,7 +3140,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3057,11 +3156,7 @@
\usebibmacro{editor+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{maintitle+title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
- \usebibmacro{event+venue+date}%
- \newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
\iffieldundef{maintitle}
@@ -3073,6 +3168,8 @@
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
\newunit\newblock
+ \usebibmacro{event+venue+date}%
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\printlist{organization}%
@@ -3080,9 +3177,9 @@
\usebibmacro{publisher+location+date}%
\newunit\newblock
\usebibmacro{chapter+pages}%
-% \newunit
-% \printfield{pagetotal}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -3089,7 +3186,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3113,8 +3210,6 @@
\usebibmacro{author/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3142,6 +3237,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -3148,7 +3245,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3164,8 +3261,6 @@
\usebibmacro{author/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3192,6 +3287,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -3198,7 +3295,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3214,8 +3311,6 @@
\usebibmacro{author/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3224,8 +3319,6 @@
\newunit\newblock
\usebibmacro{maintitle+booktitle}%
\usebibmacro{byeditor+others}%
- \newunit
- \usebibmacro{event+venue+date}%
\newunit\newblock
\iffieldundef{maintitle}
{\printfield{volume}%
@@ -3236,6 +3329,8 @@
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
\newunit\newblock
+ \usebibmacro{event+venue+date}%
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\printlist{organization}%
@@ -3244,6 +3339,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -3250,7 +3347,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3273,9 +3370,7 @@
\usebibmacro{author/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\ifnameundef{author}{}{%
- \usebibmacro{title}%
- \newunit}%
- \printlist{language}%
+ \usebibmacro{title}}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3309,6 +3404,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -3315,7 +3412,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3338,8 +3435,6 @@
\usebibmacro{author/editor+others/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3357,9 +3452,11 @@
\newunit\newblock
\usebibmacro{organization+location+date}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3385,8 +3482,6 @@
\usebibmacro{title}%
\setunit{\addspace}
\printfield{type}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3398,9 +3493,11 @@
\newunit\newblock
\usebibmacro{organization+location+date}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3427,8 +3524,6 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3442,9 +3537,9 @@
\usebibmacro{organization+location+date}%
\newunit\newblock
\usebibmacro{chapter+pages}%
-% \newunit
-% \printfield{pagetotal}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -3451,7 +3546,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3472,8 +3567,6 @@
\usebibmacro{author}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3494,7 +3587,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3519,8 +3612,6 @@
\usebibmacro{author/editor+others/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3532,9 +3623,11 @@
\newunit\newblock
\usebibmacro{organization+location+date}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3560,8 +3653,6 @@
\usebibmacro{author}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3572,9 +3663,9 @@
\usebibmacro{institution+location+date}%
\newunit\newblock
\usebibmacro{chapter+pages}%
-% \newunit
-% \printfield{pagetotal}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isrn}}
{}%
@@ -3583,7 +3674,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3604,8 +3695,6 @@
\usebibmacro{author}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3616,9 +3705,9 @@
\usebibmacro{institution+location+date}%
\newunit\newblock
\usebibmacro{chapter+pages}%
-% \newunit
-% \printfield{pagetotal}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -3625,7 +3714,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3657,8 +3746,6 @@
}{%
\setunit{\addspace}%
\usebibmacro{isonline}}{}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\printfield{type}%
\newunit\newblock
@@ -3672,9 +3759,11 @@
\newunit\newblock
\usebibmacro{publisher+location+date}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3698,8 +3787,6 @@
\usebibmacro{author/editor+others/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3715,9 +3802,11 @@
\newunit\newblock
\usebibmacro{organization+location+date+library}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3744,8 +3833,6 @@
\usebibmacro{author}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3752,11 +3839,7 @@
\printfield{note}%
\setunit{\addspace}%
\usebibmacro{reporter}%
-% \newunit
-% \printfield{pagetotal}%
\newunit\newblock
- \printfield{institution}%
- \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isrn}}
{}%
@@ -3763,7 +3846,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3786,8 +3869,6 @@
\usebibmacro{author}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3797,7 +3878,7 @@
\newunit\newblock
\usebibmacro{institution+location+date}%
\newunit\newblock
- \printfield{pagetotal}%
+ \printfield{pubstate}%
\newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isrn}}
@@ -3805,7 +3886,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3814,6 +3895,53 @@
\usebibmacro{related}}
{}%
\usebibmacro{finentry}}
+% \end{macrocode}
+%
+% \subsubsection{Parliamentary debates}
+%
+% This entry type is currently only used for parliamentary debates, but will be
+% used for treaties and explanatory notes on legislation should these ever be
+% included in the Harvard (Bath) specification, with treaties being the default
+% (since that's what upstream \textsf{biblatex} gives as an example). The test
+% for subtype is therefore future-proofing.
+%
+% \begin{macrocode}
+\newcommand*{\explanatorynote}{explanatory note}
+\newcommand*{\parliamentarytype}{parliamentary}
+\DeclareBibliographyDriver{legal}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \iffieldequals{entrysubtype}{\explanatorynote}{%
+ \printfield[default]{title}%
+ \setunit{\addspace}\newblock
+ }{%
+ \usebibmacro{legal:parliamentary}%
+ \setunit{\addcomma\space}\newblock
+ }%
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ \printfield[default]{note}%
+ \setunit{\addspace}\newblock
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \printfield{addendum}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
+\newbibmacro{legal:parliamentary}{%
+ \usebibmacro{author}%
+ \setunit{\printdelim{nametitledelim}}\newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{journal+issuetitle}%
+ \setunit{\addcomma\space}%
+ \printeventdate}
% \end{macrocode}
%
@@ -3826,8 +3954,6 @@
\usebibmacro{author/editor+others/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3843,12 +3969,12 @@
\usebibmacro{organization+location+date+library}%
\newunit\newblock
\usebibmacro{chapter+pages}%
-% \newunit
-% \printfield{pagetotal}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3871,8 +3997,6 @@
\usebibmacro{author/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3888,9 +4012,11 @@
\newunit\newblock
\usebibmacro{organization+location+date+library}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3906,8 +4032,6 @@
\usebibmacro{author/editor+others/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3923,9 +4047,11 @@
\newunit\newblock
\usebibmacro{organization+location+date+library}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -3950,8 +4076,6 @@
\usebibmacro{author}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
-% \newunit
-% \printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3975,9 +4099,11 @@
\newunit\newblock
\usebibmacro{isunpublished}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -4452,8 +4578,8 @@
%
% The punctuation before the label year is controlled by the following
% commands, and should be a comma. The exceptions to this are |legislation|
-% entries, where there should just be a space, and English/Welsh legal case
-% reports, where there should be a period.
+% entries and English/Welsh legal case reports (traditional style), where
+% there should just be a space.
%
% \begin{macrocode}
\DeclareDelimFormat{nameyeardelim}{\addcomma\space}
@@ -4476,10 +4602,12 @@
test {\ifkeyword{sc}}
or
togl {bbx:scotstyle}
+ or
+ not test {\iflistundef{institution}}
}{%
\addcomma\space
}{%
- \addperiod\space}}%
+ \addspace}}%
}{%
\addcomma\space}}}
\DeclareDelimFormat{nonameyeardelim}{\dononameyeardelim}
@@ -4703,7 +4831,7 @@
\DeclareFieldFormat{midsentencecase}{\MakeSentenceCase*{{}#1}}
\DeclareFieldFormat{title}{\mkbibemph{#1}}
\DeclareFieldFormat
- [article,inbook,incollection,inproceedings]%
+ [article,inbook,incollection,inproceedings,legal]%
{title}{#1}
\DeclareFieldFormat
[reference,mvreference]%
@@ -4794,8 +4922,6 @@
\usebibmacro{volume+number+eid}%
\setunit{\addspace}%
\usebibmacro{issue+date}%
- \setunit{\addcolon\space}%
- \usebibmacro{issue}%
\newunit}
% \end{macrocode}
@@ -4831,11 +4957,12 @@
\printfield{version}\clearfield{version}%
\ifboolexpr{
test {\iffieldundef{entrysubtype}}
- or (
- test {\ifentrytype{legislation}}
- or
- test {\ifentrytype{jurisdiction}}
- )
+ or
+ test {\ifentrytype{legal}}
+ or
+ test {\ifentrytype{legislation}}
+ or
+ test {\ifentrytype{jurisdiction}}
}{%
\ifboolexpr{
test {\iffieldundef{journaltitle}}
@@ -5083,8 +5210,6 @@
\usebibmacro{volume+number+eid}%
\setunit{\addspace}%
\usebibmacro{issue+date}%
- \setunit{\addcolon\space}%
- \usebibmacro{issue}%
\setunit{\addcomma\space}%
\printfield{pubstate}%
\newunit}
@@ -5159,7 +5284,9 @@
% \end{macrocode}
%
-% We also supply a version that incorporates the |type| field.
+% We also supply a version that incorporates the |type| field. The format
+% for when all three elements are provided is for compatibility with previous
+% versions and may change in future.
%
% \begin{macrocode}
\newbibmacro{manual:series+type+number}{%
@@ -5381,16 +5508,6 @@
% \end{macrocode}
%
-% \subsection{Addenda}
-%
-% \begin{macrocode}
-\newbibmacro*{addendum+pubstate}{%
- \printfield{addendum}%
- \newunit\newblock
- \printfield{pubstate}}
-
-% \end{macrocode}
-%
% \subsection{Access and URLs}
%
% URLs are prefaced by a `from' statement, and the URL date is enclosed in
@@ -5483,11 +5600,14 @@
% \end{macrocode}
%
-% The year is printed in square brackets, unless the case is Scottish, in which
-% case the year is printed bare, or a volume number is present, in which case the
-% year is printed in parentheses. With ECR and OJ cases, however, the year is
-% always printed in square brackets despite the presence of a volume number.
-% We provide a \key{year-essential} option for forcing the brackets/parentheses
+% In the 2024 style, the year is printed as normal.
+%
+% In the European and neutral citation style, the year is printed in square
+% brackets, unless the case is Scottish, in which case the year is printed bare,
+% or a volume number is present, in which case the year is printed in
+% parentheses. With ECR and OJ cases, however, the year is always printed in
+% square brackets despite the presence of a volume number. We provide a
+% \key{year-essential} option for forcing the brackets/parentheses
% choice, and \key{scottish-style} for activating Scottish style.
%
% \begin{macrocode}
@@ -5499,34 +5619,44 @@
\settoggle{bbx:year-essential}{#1}}
\DeclareFieldFormat[jurisdiction]{datelabel}{%
\ifboolexpr{
- test {\iffieldundef{volume}}
+ test {\iflistundef{institution}}
or
- togl {bbx:year-essential}
- or
- togl {bbx:eu-oj}
- or
- test {\iffieldequalstr{journaltitle}{ECR}}
+ test {\iffieldundef{number}}
}{%
\ifboolexpr{
- test {\ifkeyword{sc}}
+ test {\iffieldundef{volume}}
or
- togl {bbx:scotstyle}
+ togl {bbx:year-essential}
+ or
+ togl {bbx:eu-oj}
+ or
+ test {\iffieldequalstr{journaltitle}{ECR}}
}{%
- #1%
+ \ifboolexpr{
+ test {\ifkeyword{sc}}
+ or
+ togl {bbx:scotstyle}
+ }{%
+ #1%
+ }{%
+ \mkbibbrackets{#1}}%
}{%
- \mkbibbrackets{#1}}%
- }{%
- \mkbibparens{#1}}}
-
+ \mkbibparens{#1}}%
+ }{#1}%
+}
% \end{macrocode}
%
-% A case number should normally go after the title and before the year, but
-% Version 1 of this style used |number| with |type| at the end of the reference.
-% (It relied on the case number being given in the |issue| field.)
-% To maintain backwards compatibility, we rely on a `trick' that case numbers
-% are usually only present in EU cases where a page number is always provided.
-% (And we support the \textsf{oscola} semantics for numbering European
-% Commission cases.) We have to be a bit careful to ensure the last print
+% We define a |casenumber| macro for printing the case number just before the
+% year. This is for use with EU cases specifically, since in other circumstances
+% the case number goes after the court name (with or without punctuation).
+%
+% This macro is triggered specifically by the use of |issue| for the case number
+% (from Version 1 of the style, deprecated); or the use of |number| (case
+% number) alongside |pages| (always used in EU case citations) but without
+% |institution| (court).
+%
+% For now, we support the \textsf{oscola} semantics for numbering European
+% Commission cases. We have to be a bit careful to ensure the last print
% command prints something otherwise |(no)nameyeardelim| will not be triggered.
%
% \begin{macrocode}
@@ -5537,6 +5667,8 @@
test {\iffieldundef{pages}}
or
test {\iffieldundef{number}}
+ or
+ not test {\iflistundef{institution}}
}{}{%
\iffieldundef{userb}{%
\printfield[parens]{number}%
@@ -5553,15 +5685,16 @@
% \end{macrocode}
%
% For ease, if `Commission' is given as the |institution|, this is deleted but
-% the |type| is set to `Commission Decision'.
+% the |type| is set to `Commission Decision'.The |casenumber| is moved to
+% |number| if this is empty, and to |userb| otherwise.
%
% \begin{macrocode}
\DeclareStyleSourcemap{
\maps[datatype=bibtex]{
\map[overwrite=false]{
- \step[match=\regexp{Commission}, fieldsource=institution, final]
- \step[fieldset=type, fieldvalue={Commission Decision}]
- \step[fieldset=institution, null]
+ \step[match=\regexp{Commission}, fieldsource=institution, final]
+ \step[fieldset=type, fieldvalue={Commission Decision}]
+ \step[fieldset=institution, null]
}
\map[overwrite=false]{
\step[fieldsource=casenumber, final]
@@ -5575,8 +5708,8 @@
%
% Law reports have a special way of printing journals, volume and page numbers.
% Here are several macros implementing this: a deprecated one using
-% |type|/|number| and three proper ones using |journaltitle|, for UK journals,
-% ECR and OJ respectively. The |reporter| macro chooses between them (again,
+% |type|/|number| and proper ones using |journaltitle|, for UK journals,
+% ECR and OJ. The |reporter| macro chooses between them (again,
% this is a little messy for backwards compatibility).
%
% \begin{macrocode}
@@ -5594,12 +5727,40 @@
\setunit*{\addspace}%
\printfield{number}}}
\DeclareFieldFormat[jurisdiction]{journaltitle}{%
- \iftoggle{bbx:eu-oj}{\mkbibemph{#1}}{#1}}
-\DeclareFieldFormat[jurisdiction,legislation]{volume}{#1}
-\DeclareFieldFormat[jurisdiction,legislation]{pages}{#1}
+ \ifboolexpr{
+ test {\iflistundef{institution}}
+ and
+ not togl {bbx:eu-oj}
+ }{#1}{\mkbibemph{#1}}}
+\DeclareFieldFormat[jurisdiction,legislation,legal]{volume}{#1}
+\DeclareFieldFormat[jurisdiction,legislation]{pages}{%
+ \iflistundef{institution}{#1}{\mkpageprefix[bookpagination]{#1}}}
+\newbibmacro{institution+number+journal+issuetitle}{%
+ \setunit{\addperiod\space}%
+ \printlist{institution}%
+ \setunit{\addcomma\space}%
+ \printfield{number}%
+ \newunit\newblock
+ \usebibmacro{journal}%
+ \setunit*{\addspace}%
+ \usebibmacro{isonline}%
+ \setunit*{\addcomma\space}%
+ \iffieldundef{series}
+ {}
+ {\newunit
+ \printfield{series}%
+ \setunit{\addcomma\space}}%
+ \printfield{volume}%
+ \setunit{\bibpagespunct}%
+ \printfield{eid}%
+ \setunit{\bibpagespunct}%
+ \printfield{pages}%
+ \setunit{\bibpagespunct}%
+ \printfield{pubstate}%
+ \newunit}
\newbibmacro{journal+volume+pages}{%
\printfield{volume}%
- \setunit{\addperiod\space}%
+ \setunit{\addspace}%
\printfield{journaltitle}%
\setunit*{\addspace}%
\printfield{pages}%
@@ -5621,32 +5782,26 @@
\printfield{pages}%
}
\newbibmacro{reporter}{%
- \iffieldundef{journaltitle}{%
- \usebibmacro{jurisdiction:type+number}%
- }{%
- \iffieldequalstr{journaltitle}{ECR}{%
- \usebibmacro{eu:journal+volume+pages}%
+ \iflistundef{institution}{%
+ \iffieldundef{journaltitle}{%
+ \usebibmacro{jurisdiction:type+number}%
}{%
- \iffieldequalstr{journaltitle}{OJ}{%
- \iffieldundef{series}{%
- \usebibmacro{jurisdiction:type+number}%
+ \iffieldequalstr{journaltitle}{ECR}{%
+ \usebibmacro{eu:journal+volume+pages}%
+ }{%
+ \iffieldequalstr{journaltitle}{OJ}{%
+ \iffieldundef{series}{%
+ \usebibmacro{jurisdiction:type+number}%
+ }{%
+ \usebibmacro{eu:journal+series+volume+pages}%
+ }%
}{%
- \usebibmacro{eu:journal+series+volume+pages}%
- }%
- }{%
- \usebibmacro{journal+volume+pages}%
- }}}}
+ \usebibmacro{journal+volume+pages}%
+ }}}%
+ }{\usebibmacro{institution+number+journal+issuetitle}}}
% \end{macrocode}
%
-% It's not a feature of Harvard (Bath), but OSCOLA puts the institution in
-% parentheses at the end.
-%
-% \begin{macrocode}
-\DeclareFieldFormat[jurisdiction]{institution}{\mkbibparens{#1}}
-
-% \end{macrocode}
-%
% \subsection{Legislation}
%
% Legislation is mostly formatted like a report, except there is no
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx 2025-04-06 21:13:01 UTC (rev 74863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.bbx 2025-04-06 21:16:00 UTC (rev 74864)
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2022/05/25 v6.0}
+\def\Version{2025/04/01 v7.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{bath.bbx}
[\Version\space Biblography style as recommended by the University of Bath Library]
@@ -308,11 +308,11 @@
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{bytranslator+others}%
+ \newunit
+ \usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{journal+issuetitle}%
\newunit
- \usebibmacro{byeditor+others}%
- \newunit
\usebibmacro{note+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -348,7 +348,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -386,6 +386,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -392,7 +394,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -428,6 +430,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -434,7 +438,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -451,8 +455,6 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{maintitle+title}%
\newunit\newblock
- \usebibmacro{event+venue+date}%
- \newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
\iffieldundef{maintitle}
@@ -464,6 +466,8 @@
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
\newunit\newblock
+ \usebibmacro{event+venue+date}%
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\printlist{organization}%
@@ -472,6 +476,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -478,7 +484,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -521,6 +527,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -527,7 +535,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -569,6 +577,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -575,7 +585,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -599,8 +609,6 @@
\newunit\newblock
\usebibmacro{maintitle+booktitle}%
\usebibmacro{byeditor+others}%
- \newunit
- \usebibmacro{event+venue+date}%
\newunit\newblock
\iffieldundef{maintitle}
{\printfield{volume}%
@@ -611,6 +619,8 @@
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
\newunit\newblock
+ \usebibmacro{event+venue+date}%
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\printlist{organization}%
@@ -619,6 +629,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -625,7 +637,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -641,9 +653,7 @@
\usebibmacro{author/translator+others}%
\setunit{\printdelim{nametitledelim}}\newblock
\ifnameundef{author}{}{%
- \usebibmacro{title}%
- \newunit}%
- \printlist{language}%
+ \usebibmacro{title}}%
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -677,6 +687,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -683,7 +695,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -716,9 +728,11 @@
\newunit\newblock
\usebibmacro{organization+location+date}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -747,9 +761,11 @@
\newunit\newblock
\usebibmacro{organization+location+date}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -779,6 +795,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -785,7 +803,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -821,7 +839,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -848,9 +866,11 @@
\newunit\newblock
\usebibmacro{organization+location+date}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -877,6 +897,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isrn}}
{}%
@@ -885,7 +907,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -912,6 +934,8 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isbn}}
{}%
@@ -918,7 +942,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -956,9 +980,11 @@
\newunit\newblock
\usebibmacro{publisher+location+date}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -989,9 +1015,11 @@
\newunit\newblock
\usebibmacro{organization+location+date+library}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -1020,8 +1048,6 @@
\setunit{\addspace}%
\usebibmacro{reporter}%
\newunit\newblock
- \printfield{institution}%
- \newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isrn}}
{}%
@@ -1028,7 +1054,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -1055,7 +1081,7 @@
\newunit\newblock
\usebibmacro{institution+location+date}%
\newunit\newblock
- \printfield{pagetotal}%
+ \printfield{pubstate}%
\newunit\newblock
\iftoggle{bbx:isbn}
{\printfield{isrn}}
@@ -1063,7 +1089,7 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -1072,6 +1098,42 @@
\usebibmacro{related}}
{}%
\usebibmacro{finentry}}
+\newcommand*{\explanatorynote}{explanatory note}
+\newcommand*{\parliamentarytype}{parliamentary}
+\DeclareBibliographyDriver{legal}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \iffieldequals{entrysubtype}{\explanatorynote}{%
+ \printfield[default]{title}%
+ \setunit{\addspace}\newblock
+ }{%
+ \usebibmacro{legal:parliamentary}%
+ \setunit{\addcomma\space}\newblock
+ }%
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ \printfield[default]{note}%
+ \setunit{\addspace}\newblock
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \printfield{addendum}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
+\newbibmacro{legal:parliamentary}{%
+ \usebibmacro{author}%
+ \setunit{\printdelim{nametitledelim}}\newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{journal+issuetitle}%
+ \setunit{\addcomma\space}%
+ \printeventdate}
\DeclareBibliographyDriver{booklet}{%
\usebibmacro{bibindex}%
@@ -1095,9 +1157,11 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -1128,9 +1192,11 @@
\newunit\newblock
\usebibmacro{organization+location+date+library}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -1161,9 +1227,11 @@
\newunit\newblock
\usebibmacro{organization+location+date+library}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -1202,9 +1270,11 @@
\newunit\newblock
\usebibmacro{isunpublished}%
\newunit\newblock
+ \printfield{pubstate}%
+ \newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
- \usebibmacro{addendum+pubstate}%
+ \printfield{addendum}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
@@ -1599,10 +1669,12 @@
test {\ifkeyword{sc}}
or
togl {bbx:scotstyle}
+ or
+ not test {\iflistundef{institution}}
}{%
\addcomma\space
}{%
- \addperiod\space}}%
+ \addspace}}%
}{%
\addcomma\space}}}
\DeclareDelimFormat{nonameyeardelim}{\dononameyeardelim}
@@ -1779,7 +1851,7 @@
\DeclareFieldFormat{midsentencecase}{\MakeSentenceCase*{{}#1}}
\DeclareFieldFormat{title}{\mkbibemph{#1}}
\DeclareFieldFormat
- [article,inbook,incollection,inproceedings]%
+ [article,inbook,incollection,inproceedings,legal]%
{title}{#1}
\DeclareFieldFormat
[reference,mvreference]%
@@ -1847,8 +1919,6 @@
\usebibmacro{volume+number+eid}%
\setunit{\addspace}%
\usebibmacro{issue+date}%
- \setunit{\addcolon\space}%
- \usebibmacro{issue}%
\newunit}
\renewbibmacro*{title}{%
@@ -1876,11 +1946,12 @@
\printfield{version}\clearfield{version}%
\ifboolexpr{
test {\iffieldundef{entrysubtype}}
- or (
- test {\ifentrytype{legislation}}
- or
- test {\ifentrytype{jurisdiction}}
- )
+ or
+ test {\ifentrytype{legal}}
+ or
+ test {\ifentrytype{legislation}}
+ or
+ test {\ifentrytype{jurisdiction}}
}{%
\ifboolexpr{
test {\iffieldundef{journaltitle}}
@@ -2087,8 +2158,6 @@
\usebibmacro{volume+number+eid}%
\setunit{\addspace}%
\usebibmacro{issue+date}%
- \setunit{\addcolon\space}%
- \usebibmacro{issue}%
\setunit{\addcomma\space}%
\printfield{pubstate}%
\newunit}
@@ -2299,11 +2368,6 @@
\printfield{pages}%
\newunit}
-\newbibmacro*{addendum+pubstate}{%
- \printfield{addendum}%
- \newunit\newblock
- \printfield{pubstate}}
-
\DeclareFieldFormat{url}{\bibsentence\bibstring{urlfrom}\addcolon\space\url{#1}}
\DeclareFieldFormat{doi}{\bibsentence\bibstring{urlfrom}\addcolon\space\url{https://doi.org/#1}}
\DeclareFieldFormat{pseudourl}{\bibsentence\bibstring{urlfrom}\addcolon\space#1}
@@ -2367,25 +2431,31 @@
\settoggle{bbx:year-essential}{#1}}
\DeclareFieldFormat[jurisdiction]{datelabel}{%
\ifboolexpr{
- test {\iffieldundef{volume}}
+ test {\iflistundef{institution}}
or
- togl {bbx:year-essential}
- or
- togl {bbx:eu-oj}
- or
- test {\iffieldequalstr{journaltitle}{ECR}}
+ test {\iffieldundef{number}}
}{%
\ifboolexpr{
- test {\ifkeyword{sc}}
+ test {\iffieldundef{volume}}
or
- togl {bbx:scotstyle}
+ togl {bbx:year-essential}
+ or
+ togl {bbx:eu-oj}
+ or
+ test {\iffieldequalstr{journaltitle}{ECR}}
}{%
- #1%
+ \ifboolexpr{
+ test {\ifkeyword{sc}}
+ or
+ togl {bbx:scotstyle}
+ }{%
+ #1%
+ }{%
+ \mkbibbrackets{#1}}%
}{%
- \mkbibbrackets{#1}}%
- }{%
- \mkbibparens{#1}}}
-
+ \mkbibparens{#1}}%
+ }{#1}%
+}
\DeclareFieldFormat[jurisdiction]{issue}{\mkbibparens{#1}}
\newbibmacro*{casenumber}{%
\iffieldundef{issue}{%
@@ -2393,6 +2463,8 @@
test {\iffieldundef{pages}}
or
test {\iffieldundef{number}}
+ or
+ not test {\iflistundef{institution}}
}{}{%
\iffieldundef{userb}{%
\printfield[parens]{number}%
@@ -2409,9 +2481,9 @@
\DeclareStyleSourcemap{
\maps[datatype=bibtex]{
\map[overwrite=false]{
- \step[match=\regexp{Commission}, fieldsource=institution, final]
- \step[fieldset=type, fieldvalue={Commission Decision}]
- \step[fieldset=institution, null]
+ \step[match=\regexp{Commission}, fieldsource=institution, final]
+ \step[fieldset=type, fieldvalue={Commission Decision}]
+ \step[fieldset=institution, null]
}
\map[overwrite=false]{
\step[fieldsource=casenumber, final]
@@ -2435,12 +2507,40 @@
\setunit*{\addspace}%
\printfield{number}}}
\DeclareFieldFormat[jurisdiction]{journaltitle}{%
- \iftoggle{bbx:eu-oj}{\mkbibemph{#1}}{#1}}
-\DeclareFieldFormat[jurisdiction,legislation]{volume}{#1}
-\DeclareFieldFormat[jurisdiction,legislation]{pages}{#1}
+ \ifboolexpr{
+ test {\iflistundef{institution}}
+ and
+ not togl {bbx:eu-oj}
+ }{#1}{\mkbibemph{#1}}}
+\DeclareFieldFormat[jurisdiction,legislation,legal]{volume}{#1}
+\DeclareFieldFormat[jurisdiction,legislation]{pages}{%
+ \iflistundef{institution}{#1}{\mkpageprefix[bookpagination]{#1}}}
+\newbibmacro{institution+number+journal+issuetitle}{%
+ \setunit{\addperiod\space}%
+ \printlist{institution}%
+ \setunit{\addcomma\space}%
+ \printfield{number}%
+ \newunit\newblock
+ \usebibmacro{journal}%
+ \setunit*{\addspace}%
+ \usebibmacro{isonline}%
+ \setunit*{\addcomma\space}%
+ \iffieldundef{series}
+ {}
+ {\newunit
+ \printfield{series}%
+ \setunit{\addcomma\space}}%
+ \printfield{volume}%
+ \setunit{\bibpagespunct}%
+ \printfield{eid}%
+ \setunit{\bibpagespunct}%
+ \printfield{pages}%
+ \setunit{\bibpagespunct}%
+ \printfield{pubstate}%
+ \newunit}
\newbibmacro{journal+volume+pages}{%
\printfield{volume}%
- \setunit{\addperiod\space}%
+ \setunit{\addspace}%
\printfield{journaltitle}%
\setunit*{\addspace}%
\printfield{pages}%
@@ -2462,24 +2562,24 @@
\printfield{pages}%
}
\newbibmacro{reporter}{%
- \iffieldundef{journaltitle}{%
- \usebibmacro{jurisdiction:type+number}%
- }{%
- \iffieldequalstr{journaltitle}{ECR}{%
- \usebibmacro{eu:journal+volume+pages}%
+ \iflistundef{institution}{%
+ \iffieldundef{journaltitle}{%
+ \usebibmacro{jurisdiction:type+number}%
}{%
- \iffieldequalstr{journaltitle}{OJ}{%
- \iffieldundef{series}{%
- \usebibmacro{jurisdiction:type+number}%
+ \iffieldequalstr{journaltitle}{ECR}{%
+ \usebibmacro{eu:journal+volume+pages}%
+ }{%
+ \iffieldequalstr{journaltitle}{OJ}{%
+ \iffieldundef{series}{%
+ \usebibmacro{jurisdiction:type+number}%
+ }{%
+ \usebibmacro{eu:journal+series+volume+pages}%
+ }%
}{%
- \usebibmacro{eu:journal+series+volume+pages}%
- }%
- }{%
- \usebibmacro{journal+volume+pages}%
- }}}}
+ \usebibmacro{journal+volume+pages}%
+ }}}%
+ }{\usebibmacro{institution+number+journal+issuetitle}}}
-\DeclareFieldFormat[jurisdiction]{institution}{\mkbibparens{#1}}
-
\DeclareFieldFormat[legislation]{datelabel}{%
\iftoggle{bbx:eu-oj}{%
\mkbibbrackets{#1}%
@@ -2650,6 +2750,6 @@
}%
%%
-%% Copyright (C) 2016-2022 by University of Bath
+%% Copyright (C) 2016-2025 by University of Bath
%%
%% End of file `bath.bbx'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.cbx 2025-04-06 21:13:01 UTC (rev 74863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.cbx 2025-04-06 21:16:00 UTC (rev 74864)
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2022/05/25 v6.0}
+\def\Version{2025/04/01 v7.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{bath.cbx}
[\Version\space Citation style as recommended by the University of Bath Library]
@@ -37,6 +37,6 @@
}{}{\wlog{WARNING: biblatex-bath failed to patch cite:label}}
%%
-%% Copyright (C) 2016-2022 by University of Bath
+%% Copyright (C) 2016-2025 by University of Bath
%%
%% End of file `bath.cbx'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.dbx 2025-04-06 21:13:01 UTC (rev 74863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-bath/bath.dbx 2025-04-06 21:16:00 UTC (rev 74864)
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2022/05/25 v6.0}
+\def\Version{2025/04/01 v7.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{bath.dbx}
[\Version\space Data model required by the biblatex-bath style]
@@ -22,6 +22,6 @@
\DeclareDatamodelEntryfields[booklet,image,map,unpublished]{collection,shelfmark}
%%
-%% Copyright (C) 2016-2022 by University of Bath
+%% Copyright (C) 2016-2025 by University of Bath
%%
%% End of file `bath.dbx'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-bath/british-bath.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-bath/british-bath.lbx 2025-04-06 21:13:01 UTC (rev 74863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-bath/british-bath.lbx 2025-04-06 21:16:00 UTC (rev 74864)
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2022/05/25 v6.0}
+\def\Version{2025/04/01 v7.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{british-bath.lbx}
[\Version\space British English conventions required by the biblatex-bath style]
@@ -40,6 +40,6 @@
}
%%
-%% Copyright (C) 2016-2022 by University of Bath
+%% Copyright (C) 2016-2025 by University of Bath
%%
%% End of file `british-bath.lbx'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-bath/english-bath.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-bath/english-bath.lbx 2025-04-06 21:13:01 UTC (rev 74863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-bath/english-bath.lbx 2025-04-06 21:16:00 UTC (rev 74864)
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2022/05/25 v6.0}
+\def\Version{2025/04/01 v7.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{english-bath.lbx}
[\Version\space Generic English conventions required by the biblatex-bath style]
@@ -63,6 +63,6 @@
}
%%
-%% Copyright (C) 2016-2022 by University of Bath
+%% Copyright (C) 2016-2025 by University of Bath
%%
%% End of file `english-bath.lbx'.
More information about the tex-live-commits
mailing list.