diff options
Diffstat (limited to 'macros/latex')
106 files changed, 1161 insertions, 353 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile index e58dba0ac6..4235b7b579 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/Makefile @@ -25,9 +25,22 @@ $(NAME).pdf: $(NAME).dtx $(NAME).bbx $(STY1).bbx $(STY1).cbx british-$(NAME).lbx $(STYS:%=%-doc.pdf): %-doc.pdf : %-doc.tex $(NAME).bbx %.bbx %.cbx british-$(NAME).lbx english-$(NAME).lbx latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $< >/dev/null +test-oxalph.tex : test-template.tex + sed 's/style=oxref/style=oxalph/' $< > $@ +test-oxnotes.tex : test-template.tex + sed 's/style=oxref/style=oxnotes,scnames/' $< > $@ +test-oxnum.tex : test-template.tex + sed 's/style=oxref/style=oxnum,scnames,backref=true/' $< > $@ +test-oxyear.tex : test-template.tex + sed 's/style=oxref/style=oxyear/' $< > $@ +$(STYS:%=test-%.pdf): test-%.pdf : test-%.tex $(NAME).bbx %.bbx %.cbx british-$(NAME).lbx english-$(NAME).lbx + latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $< >/dev/null +$(STYS:%=%.bbi): %.bbi : test-%.pdf + pdftotext $< $@ + clean: @for log in *.log; do [ -e "$$log" ] || continue; grep "WARNING: biblatex-oxref" $$log; test $$? -eq 1; done - rm -f $(NAME).{$(AUX)} $(STYS:%=%-doc.{$(AUX)}) + rm -f $(NAME).{$(AUX)} $(STYS:%=%-doc.{$(AUX)}) $(STYS:%=test-%.{tex,pdf}) $(STYS:%=test-%.{$(AUX)}) rm -f $(STYS:%=%.doc) {american,british,english}-$(NAME).doc rm -rf _minted-* rm -f $(NAME).markdown.in diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md index 070e51eb27..8d5c13f87a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/README.md @@ -140,7 +140,7 @@ first two steps. ## Licence -Copyright 2016–2021 Alex Ball. +Copyright 2016–2023 Alex Ball. This work consists of the documented LaTeX file oxref.dtx and a Makefile. diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf Binary files differindex d298a7d4f2..a0d43bbfef 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxalph-doc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf Binary files differindex 032b19373f..f43b5fa6bf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnotes-doc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf Binary files differindex 8851a9b454..e7d2cae73f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxnum-doc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx index 66eeb6bee5..6ce62d568e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.dtx @@ -1,6 +1,6 @@ % \iffalse %<*internal|bbx|cbx|dbx|lbx|doc> -\def\Version{2021/01/18 v2.2} +\def\Version{2023/02/01 v3.0} %</internal|bbx|cbx|dbx|lbx|doc> %<*internal> \iffalse @@ -133,6 +133,16 @@ stipulations and examples provided by the 2014 *New Hart's Rules* and the 2002 edition = {2}, publisher = {Oxford University Press}, location = {Oxford, UK}} +@book{law.oxford2012oscola, + author = {{Faculty of Law, University of Oxford}}, + editor = {Donal Nolan and Sandra Meredith}, + title = {{OSCOLA}}, + subtitle = {The {Oxford} {University} Standard for Citation of Legal Authorities}, + date = {2012}, + edition = {4}, + publisher = {Hart}, + location = {Oxford, UK}, + url = {https://www.law.ox.ac.uk/oscola}} %</bib> %<*internal> \fi @@ -166,7 +176,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2016–2021 Alex Ball +Copyright (C) 2016–2023 Alex Ball \endpostamble \usedir{tex/latex/\jobname} @@ -380,6 +390,13 @@ Copyright (C) 2016–2021 Alex Ball } %</doc> +%<*!doc> +\usepackage[tightLists=false]{markdown} +\markdownSetup{rendererPrototypes={% + link = {\href{#3}{#1}},% +}} + +%</!doc> \hypersetup{pdfborder={0 0 0},pdfencoding=unicode} \usepackage[noabbrev,capitalize,nameinlink]{cleveref} \crefname{page}{page}{pages} @@ -476,10 +493,6 @@ Copyright (C) 2016–2021 Alex Ball \GetFileInfo{\jobname.tex} %</doc> %<*driver> -\usepackage[tightLists=false]{markdown} -\markdownSetup{rendererPrototypes={% - link = {\href{#3}{#1}}% -}} % For typesetting the implementation \makeatletter @@ -842,7 +855,7 @@ first two steps. ## Licence -Copyright 2016–2021 Alex Ball. +Copyright 2016–2023 Alex Ball. This work consists of the documented LaTeX file oxref.dtx and a Makefile. @@ -1066,6 +1079,9 @@ Where a source is provided, it refers to a section from one of the reference wor \item[NHR] \fullcite{waddingham2014nhr} + +\item[OSCOLA] +\fullcite{law.oxford2012oscola} \end{description} Where the source is starred (*), this indicates the example is not quite how it appears in the book, @@ -1238,7 +1254,7 @@ Up to two author names are given, after which \enquote{et al.} is used. brady.etal1994hehsa} \end{egcite} -If different authors have the same surname, they are distiguished by their initial. +If different authors have the same surname, they are distinguished by their initial. %</y> %</n|m|a|y> @@ -1368,8 +1384,8 @@ to put \enquote{(Ps.-)} after the name in the bibliography. %<n|m><OGS \S15.2.1> %<a|y><OGS \S15.2.1\textdagger> {boethius1976dds} -%<n|m>\textsc{Boethius (Ps.-)}, \emph{De disciplina scolarium: Édition critique, introduction et notes}, ed. Olga Weijers (Leiden, 1976). -%<a|y>Boethius (Ps.-) (1976), \emph{De disciplina scolarium: Édition critique, introduction et notes}, ed. O.\ Weijers (Leiden). +%<n|m>\textsc{Boethius} (\textsc{Ps.-}), \emph{De disciplina scolarium: Édition critique, introduction et notes}, ed. Olga Weijers (Leiden, 1976). +%<a|y>Boethius (Ps.-) (1976), \emph{De disciplina scolarium: Édition critique, introduction et notes}, ed.\@ O. Weijers (Leiden). \toggletrue{blx@bibliography} \tcblower \begin{Verbatim} @@ -1399,9 +1415,9 @@ Oxford style is to give the attribution in square brackets. \begin{bibexbox} %<n|m><OGS \S15.2.1> %<a|y><OGS \S15.2.1\textdagger> -{balfour1768pe} -%<n|m>{[James Balfour]}, \emph{Philosophical Essays} (Edinburgh, 1768). -%<a|y>{[Balfour, J.]} (1768), \emph{Philosophical Essays} (Edinburgh). +{balfour1768pe}[] +%<n|m>[James Balfour], \emph{Philosophical Essays} (Edinburgh, 1768). +%<a|y>[Balfour, J.] (1768), \emph{Philosophical Essays} (Edinburgh). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -1509,7 +1525,7 @@ In cases where an author changes the name under which they publish (e.g.\ due to %<n|m><OGS \S15.17.4> %<a|y><OGS \S15.17.4\textdagger> {joukovsky1967gdd} -%<n|m>\textsc{Joukovsky, F.} (= \textsc{Joukovsky-Micha, F.}), \enquote{La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} siècle (1500–1585)}, \emph{Bibliothèque d'Humanisme et Renaissance}, 29 (1967), 55–92. +%<n|m>\textsc{Joukovsky}, \textsc{F.} (= \textsc{Joukovsky-Micha}, \textsc{F.}), \enquote{La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} siècle (1500–1585)}, \emph{Bibliothèque d'Humanisme et Renaissance}, 29 (1967), 55–92. %<a|y>Joukovsky, F. (= Joukovsky-Micha, F.) (1967), \enquote{La Guerre des dieux et des géants chez les poètes francais du XVI\textsuperscript{e} siècle (1500–1585)}, \emph{Bibliothèque d'Humanisme et Renaissance}, 29: 55–92. \toggletrue{blx@bibliography} \tcblower @@ -1553,8 +1569,8 @@ If the contribution of the translators or revisers is so great they could be joi \begin{bibexbox} {kuehner.blass1890ef} -%<n|m>\textsc{Kühner, Raphael}, rev. \textsc{Blass, Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890–2). -%<a|y>Kühner, R., rev. Blass, F. (1890–2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung). +%<n|m>\textsc{Kühner}, \textsc{Raphael}, rev. \textsc{Blass}, \textsc{Friedrich}, \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung, 1890–2). +%<a|y>Kühner, R., rev. Blass, F. (1890–2), \emph{Ausführliche grammatik der griechischen sprache}, i: \emph{Elementar- und Formenlehre} (Hannover: Hahnsche Buchhandlung). \toggletrue{blx@bibliography} \tcblower \begin{Verbatim} @@ -1803,7 +1819,7 @@ The \emph{Oxford Guide to Style} consistently prefers volume and part numbers to %<*n|m> \begin{bibexbox}<OGS \S15.4.1> {goldblatt1973dmm} -Robert Goldblatt, \enquote{Diodorean Modality in Minkowski Space-Time}, \emph{Studia Logica}, 39/3 (1973), 219--36. +Robert Goldblatt, \enquote{Diodorean Modality in Minkowski Space-Time}, \emph{Studia Logica}, 39/3 (1973), 219–36. \tcblower \begin{Verbatim} %</n|m> @@ -1848,7 +1864,7 @@ Hollingsworth, T. H. (1957), \enquote{A Demographic Study of the British Ducal F % Internal quotes, subtitle, no number \begin{bibexbox}<OGS \S15.4.1> {inalcik1992csm} -Halil Inalcik, \enquote{Comments on \enquote{Sultanism}: Max Weber's Typification of the Ottoman Polity}, \emph{Princeton Papers in Near Eastern Studies}, 1 (1992), 49--72. +Halil Inalcik, \enquote{Comments on \enquote{Sultanism}: Max Weber's Typification of the Ottoman Polity}, \emph{Princeton Papers in Near Eastern Studies}, 1 (1992), 49–72. \tcblower \begin{Verbatim} %</n|m> @@ -1897,8 +1913,8 @@ Unwin, T. (1994), \enquote{Structural Change in Estonian Agriculture: From Comma %<n|m><OGS \S15.2.1> %<a|y><OGS \S15.2.1\textdagger> {vaucouleurs1975nmn} -%<n|m>Gerald de Vaucouleurs et al., \enquote{The New Martian Nomenclature of the International Astronomical Union}, \emph{Icarus}, 26 (1975), 85--98. -%<a|y>Vaucouleurs, G. de, et al. (1975), \enquote{The New Martian Nomenclature of the International Astronomical Union}, \emph{Icarus}, 26: 85--98. +%<n|m>Gerald de Vaucouleurs et al., \enquote{The New Martian Nomenclature of the International Astronomical Union}, \emph{Icarus}, 26 (1975), 85–98. +%<a|y>Vaucouleurs, G. de, et al. (1975), \enquote{The New Martian Nomenclature of the International Astronomical Union}, \emph{Icarus}, 26: 85–98. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -1919,8 +1935,8 @@ Unwin, T. (1994), \enquote{Structural Change in Estonian Agriculture: From Comma %<n|m><NHR \S18.8.5> %<a|y><NHR \S18.8.5\textdagger> {druin2002rcd} -%<n|m>A. Druin, \enquote{The Role of Children in the Design of New Technology}, \emph{Behaviour \& Information Technology}, 21/1 (2002), 1–25. doi: \path{10.1080/01449290110108659} -%<a|y>Druin, A. (2002), \enquote{The Role of Children in the Design of New Technology}, \emph{Behaviour \& Information Technology}, 21/1: 1–25. doi: \path{10.1080/01449290110108659} +%<n|m>A. Druin, \enquote{The Role of Children in the Design of New Technology}, \emph{Behaviour \& Information Technology}, 21/1 (2002), 1–25. doi: \nolinkurl{10.1080/01449290110108659} +%<a|y>Druin, A. (2002), \enquote{The Role of Children in the Design of New Technology}, \emph{Behaviour \& Information Technology}, 21/1: 1–25. doi: \nolinkurl{10.1080/01449290110108659} \tcblower \begin{Verbatim} %</n|m|a|y> @@ -1942,8 +1958,8 @@ Unwin, T. (1994), \enquote{Structural Change in Estonian Agriculture: From Comma %<n|m><NHR \S18.8.5*> %<a|y><NHR \S18.8.5*\textdagger> {li.etal2013flh} -%<n|m>Shu Li et al., \enquote{Forever Love: The Hitherto Earliest Record of Copulating Insects from the Middle Jurassic of China}, \emph{PLoS ONE}, 8/11 (2013), e78188. doi: \path{10.1371/journal.pone.0078188} -%<a|y>Li, S. et al. (2013), \enquote{Forever Love: The Hitherto Earliest Record of Copulating Insects from the Middle Jurassic of China}, \emph{PLoS ONE}, 8/11, e78188. doi: \path{10.1371/journal.pone.0078188} +%<n|m>Shu Li et al., \enquote{Forever Love: The Hitherto Earliest Record of Copulating Insects from the Middle Jurassic of China}, \emph{PLoS ONE}, 8/11 (2013), e78188. doi: \nolinkurl{10.1371/journal.pone.0078188} +%<a|y>Li, S., et al. (2013), \enquote{Forever Love: The Hitherto Earliest Record of Copulating Insects from the Middle Jurassic of China}, \emph{PLoS ONE}, 8/11, e78188. doi: \nolinkurl{10.1371/journal.pone.0078188} \tcblower \begin{Verbatim} %</n|m|a|y> @@ -1967,7 +1983,7 @@ Unwin, T. (1994), \enquote{Structural Change in Estonian Agriculture: From Comma %<*n|m> \begin{bibexbox}<OGS \S15.4.1> {lindars1965eir} -B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965), 452--67. +B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965), 452–67. \tcblower \begin{Verbatim} %</n|m> @@ -2017,8 +2033,8 @@ B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965 %<n|m><NHR \S18.3.3> %<a|y><NHR \S18.3.3\textdagger> {moody1953mdb} -%<n|m>T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53–76. -%<a|y>Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882--1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53–76. +%<n|m>T. W. Moody, \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3 (1953), 53–76. +%<a|y>Moody, T. W. (1953), \enquote{Michael Davitt and the British Labour Movement, 1882–1906}, \emph{Transactions of the Royal Historical Society}, 5th ser., 3: 53–76. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2041,7 +2057,7 @@ B. Lindars, \enquote{Ezechiel and Individual Responsibility}, \emph{VT} 15 (1965 %<*n|m> \begin{bibexbox}<OGS \S15.4.3> {barnes1971has} -J. Barnes, \enquote{Homonymy in Aristotle and Speusippus}, \emph{Classical Quarterly}, \textsc{ns} 21 (1971), 65--80. +J. Barnes, \enquote{Homonymy in Aristotle and Speusippus}, \emph{Classical Quarterly}, \textsc{ns} 21 (1971), 65–80. \tcblower \begin{Verbatim} %</n|m> @@ -2094,7 +2110,7 @@ Hankinson, R. J. (1989), \enquote{Galen and the Best of All Possible Worlds}, \e % No author \begin{bibexbox}<OGS \S15.4.1> {bw1984wen} -\enquote{Who's Excellent Now?}, \emph{Business Week}, 5 Nov. 1984, 76--86. +\enquote{Who's Excellent Now?}, \emph{Business Week}, 5 Nov. 1984, 76–86. \tcblower \begin{Verbatim} %</n|m> @@ -2153,7 +2169,7 @@ Marx, K. (1842), \enquote{Der Kommunismus und die Augsburger \enquote{Allgemeine % No pages \begin{bibexbox}<OGS \S15.19.2> {who1983nsb} -WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0--4 Years}, \emph{Weekly Epidemiologial Record}, 20 May. +WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritional Status of Children 0–4 Years}, \emph{Weekly Epidemiologial Record}, 20 May. \tcblower \begin{Verbatim} %</a|y> @@ -2178,8 +2194,8 @@ WHO (World Health Organization) (1983), \enquote{Nutrition: Sex Bias of Nutritio %<n|m><OGS \S15.3> %<a|y><OGS \S15.3\textdagger> {boyce1957pgi} -%<n|m>M. Boyce, \enquote{The Parthian \emph{Gsn} and Iranian Minstrel Tradition}, \emph{Journal of the Royal Asiatic Society}, 1957, 10--45. -%<a|y>Boyce, M. (1957), \enquote{The Parthian \emph{Gsn} and Iranian Minstrel Tradition}, \emph{Journal of the Royal Asiatic Society}: 10--45. +%<n|m>M. Boyce, \enquote{The Parthian \emph{Gsn} and Iranian Minstrel Tradition}, \emph{Journal of the Royal Asiatic Society}, 1957, 10–45. +%<a|y>Boyce, M. (1957), \enquote{The Parthian \emph{Gsn} and Iranian Minstrel Tradition}, \emph{Journal of the Royal Asiatic Society}: 10–45. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2209,8 +2225,8 @@ or add the book details to a periodical entry. %<n|m><OGS \S15.4.1> %<a|y><OGS \S15.4.1\textdagger> {bec1976isc} -%<n|m>C. Bec (ed.), \emph{Italie 1500--1550: Une situation de crise?} = \emph{Annales de l'Université Jean Moulin}, 1975/2 (Langues étrangères, 2; Lyon, 1976), 99--109. -%<a|y>Bec, C. (1976) (ed.), \emph{Italie 1500--1550: Une situation de crise?} = \emph{Annales de l'Université Jean Moulin}, 1975/2 (Langues étrangères, 2; Lyon), 99--109. +%<n|m>C. Bec (ed.), \emph{Italie 1500–1550: Une situation de crise?} = \emph{Annales de l'Université Jean Moulin}, 1975/2 (Langues étrangères, 2; Lyon, 1976), 99–109. +%<a|y>Bec, C. (1976) (ed.), \emph{Italie 1500–1550: Une situation de crise?} = \emph{Annales de l'Université Jean Moulin}, 1975/2 (Langues étrangères, 2; Lyon), 99–109. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2242,8 +2258,8 @@ or add the book details to a periodical entry. %<n|m><OGS \S15.4.1> %<a|y><OGS \S15.4.1\textdagger> {trisoglio1973gnq} -%<n|m>F. Trisoglio, \emph{Gregorio di Nazianzo in un quarentennio di recherche (1925--1965)} = \emph{Rivista Iasalliana}, 40 (1973). -%<a|y>Trisoglio, F. (1973), \emph{Gregorio di Nazianzo in un quarentennio di recherche (1925--1965)} = \emph{Rivista Iasalliana}, 40. +%<n|m>F. Trisoglio, \emph{Gregorio di Nazianzo in un quarentennio di recherche (1925–1965)} = \emph{Rivista Iasalliana}, 40 (1973). +%<a|y>Trisoglio, F. (1973), \emph{Gregorio di Nazianzo in un quarentennio di recherche (1925–1965)} = \emph{Rivista Iasalliana}, 40. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2271,8 +2287,8 @@ or add the book details to a periodical entry. %<n|m><OGS \S15.4.1> %<a|y><OGS \S15.4.1\textdagger> {zhentao.etal1989ars} -%<n|m>X. Zhentao, K. K. C. Yau, and F. R. Stephenson, \enquote{Astronomical Records on the Shang Dynasty Oracle Bones}, \emph{Archaeoastronomy}, 14 (1989); Supplement to \emph{Journal for the History of Astronomy}, 20, pp. S61--S72. -%<a|y>Zhentao, X., Yau, K. K. C., and Stephenson, F. R. (1989) \enquote{Astronomical Records on the Shang Dynasty Oracle Bones}, \emph{Archaeoastronomy}, 14; Supplement to \emph{Journal for the History of Astronomy}, 20, pp. S61--S72. +%<n|m>X. Zhentao, K. K. C. Yau, and F. R. Stephenson, \enquote{Astronomical Records on the Shang Dynasty Oracle Bones}, \emph{Archaeoastronomy}, 14 (1989); Supplement to \emph{Journal for the History of Astronomy}, 20, pp. S61–S72. +%<a|y>Zhentao, X., Yau, K. K. C., and Stephenson, F. R. (1989), \enquote{Astronomical Records on the Shang Dynasty Oracle Bones}, \emph{Archaeoastronomy}, 14; Supplement to \emph{Journal for the History of Astronomy}, 20: pp. S61–S72. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2411,8 +2427,8 @@ in a periodical, this is a descriptor rather than a title. %<n|m><OGS \S15.4.4> %<a|y><OGS \S15.4.4\textdagger> {dean1995rpb} -%<n|m>J. Dean, review of Philippe Basiron, \emph{My Early Life} (Bourges, 1994), in \emph{Res facta}, 17 (1995), 56--9. -%<a|y>Dean, J. (1995), review of P. Basiron (1994), \emph{My Early Life} (Bourges), in \emph{Res facta}, 17: 56--9. +%<n|m>J. Dean, review of Philippe Basiron, \emph{My Early Life} (Bourges, 1994), in \emph{Res facta}, 17 (1995), 56–9. +%<a|y>Dean, J. (1995), review of P. Basiron (1994), \emph{My Early Life} (Bourges), in \emph{Res facta}, 17: 56–9. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2437,8 +2453,8 @@ in a periodical, this is a descriptor rather than a title. %<n|m><OGS \S15.4.4> %<a|y><OGS \S15.4.4\textdagger> {jocelyn1989pav} -%<n|m>H. D. Jocelyn, \enquote{Probus and Virgil}, review of Maria Luisa Delvigo, \emph{Testo virgiliano e tradizione indiretta} (Pisa, 1987), in \emph{CR}, \textsc{ns} 39 (1989), 27--8. -%<a|y>Jocelyn, H. D. (1989), \enquote{Probus and Virgil}, review of M. L. Delvigo (1987), \emph{Testo virgiliano e tradizione indiretta} (Pisa), in \emph{CR}, \textsc{ns} 39: 27--8. +%<n|m>H. D. Jocelyn, \enquote{Probus and Virgil}, review of Maria Luisa Delvigo, \emph{Testo virgiliano e tradizione indiretta} (Pisa, 1987), in \emph{CR}, \textsc{ns} 39 (1989), 27–8. +%<a|y>Jocelyn, H. D. (1989), \enquote{Probus and Virgil}, review of M. L. Delvigo (1987), \emph{Testo virgiliano e tradizione indiretta} (Pisa), in \emph{CR}, \textsc{ns} 39: 27–8. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2635,7 +2651,7 @@ Smith, T. (1988), \emph{Famine and Gender} (New Haven, Conn.). %<a|y><OGS \S15.2.1\textdagger> {boas.botschuyver1952dc} %<n|m>\emph{Distichia Catonis}, ed. Marcus Boas and Henricus Johannes Botschuyver (Amsterdam, 1952). -%<a|y>\emph{Distichia Catonis} (1952), ed. M.\ Boas and H.\ J.\ Botschuyver (Amsterdam). +%<a|y>\emph{Distichia Catonis} (1952), ed. M. Boas and H. J. Botschuyver (Amsterdam). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2768,7 +2784,7 @@ Where all volumes were published consistently, the following form is used: %<a|y>\spec{Author (Year), \emph{Title}, n \lit{vols.} (Location: Publisher), VolNo. Pages.} %<*n> -\begin{egcite}{\dots(Brussels, 1867--88), ii. 367--8} +\begin{egcite}{\dots(Brussels, 1867–88), ii. 367–8} \cite[ii.~\mkcomprange{367-368}]% {straeten1867lmp} \end{egcite} @@ -2784,8 +2800,8 @@ Where all volumes were published consistently, the following form is used: %<n|m><OGS \S15.2.6> %<a|y><OGS \S15.2.6\textdagger> {straeten1867lmp}% -%<n|m>Edmond Vander Straeten, \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, 8 vols. (Brussels, 1867--88). -%<a|y>Vander Straeten, E. (1867--88), \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, 8 vols. (Brussels). +%<n|m>Edmond Vander Straeten, \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, 8 vols. (Brussels, 1867–88). +%<a|y>Vander Straeten, E. (1867–88), \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, 8 vols. (Brussels). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2808,8 +2824,8 @@ Where the publisher changed between volumes, the following form is used: %<n|m><OGS \S15.2.6*> %<a|y><OGS \S15.2.6*\textdagger> {ritter1838hap} -%<n|m>Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols. (Oxford: Talboys and London: Bohn, 1838--46). -%<a|y>Ritter, H. (1838--46), \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols. (Oxford: Talboys and London: Bohn). +%<n|m>Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols. (Oxford: Talboys and London: Bohn, 1838–46). +%<a|y>Ritter, H. (1838–46), \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols. (Oxford: Talboys and London: Bohn). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2840,7 +2856,7 @@ Where the publisher changed between volumes, the following form is used: %<a|y><OGS \S15.2.6*\textdagger> {ritter1838hap:mv} %<n|m>Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). -%<a|y>Ritter, H (1838-46). \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). +%<a|y>Ritter, H. (1838–46), \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -2877,20 +2893,20 @@ Where the volumes are merely numbered, the following form is used: %</n|m|a|y> %<*n> -\begin{egcite}{\dots ii (Brussels, 1867--88), 367--8} -\cite[367--368]{straeten1867lmp.ii} +\begin{egcite}{\dots ii (Brussels, 1867–88), 367–8} +\cite[367–368]{straeten1867lmp.ii} \end{egcite} %</n> %<*m> \begin{egcite}{} -\cite[367--368]{straeten1867lmp.ii} +\cite[367–368]{straeten1867lmp.ii} \end{egcite} %</m> %<*n|m> \begin{bibexbox}<OGS \S15.2.6> {straeten1867lmp.ii} -Edmond Vander Straeten, \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, ii (Brussels, 1867--88). +Edmond Vander Straeten, \emph{La Musique aux Pays-Bas avant le XIX\textsuperscript{e} siècle}, ii (Brussels, 1867–88). \tcblower \begin{Verbatim} %</n|m> @@ -2940,14 +2956,14 @@ the following form is used: %<n|m><OGS \S15.2.2> %<a|y><OGS \S15.2.2\textdagger> {brady.etal1994hehsa} -%<n|m>Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994). -%<a|y>Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400--1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill). +%<n|m>Thomas A. Brady, Jr., Heiko A. Oberman, and James D. Tracy (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill, 1994). +%<a|y>Brady, Jr., T. A., Oberman, H. A., and Tracy, J. D. (1994) (eds.), \emph{Handbook of European History, 1400–1600: Late Middle Ages, Renaissance and Reformation}, i: \emph{Structures and Assertions} (Leiden: E. J. Brill). \tcblower \begin{Verbatim} %</n|m|a|y> @mvcollection{brady.etal1994hehsa, editor = {Brady, Jr., Thomas A. and Heiko A. Oberman and James D. Tracy}, - maintitle = {Handbook of European History, 1400--1600}, + maintitle = {Handbook of European History, 1400–1600}, mainsubtitle = {{Late} {Middle} {Ages,} {Renaissance} and {Reformation}}, volume = {1}, title = {Structures and Assertions}, @@ -2959,7 +2975,7 @@ the following form is used: \end{bibexbox} %<*n> -\begin{egcite}{\dots (Cambridge: CUP, 1932), 42--56} +\begin{egcite}{\dots (Cambridge: CUP, 1932), 42–56} \cite[42-56]{ward.waller1932che} \end{egcite} %</n> @@ -3004,14 +3020,14 @@ the following form is used: %<n|m><NHR \S18.2.7> %<a|y><NHR \S18.2.7\textdagger> {fischer1989asf} -%<n|m>David Hackett Fischer, \emph{Albion’s Seed: Four British Folkways in America}, [vol.\ i of \emph{America: A Cultural History}] (New York: Oxford University Press, 1989). -%<a|y>Fischer, D. H. (1989), \emph{Albion’s Seed: Four British Folkways in America}, [vol.\ i of \emph{America: A Cultural History}] (New York: Oxford University Press). +%<n|m>David Hackett Fischer, \emph{Albion's Seed: Four British Folkways in America}, [vol.\@ i of \emph{America: A Cultural History}] (New York: Oxford University Press, 1989). +%<a|y>Fischer, D. H. (1989), \emph{Albion's Seed: Four British Folkways in America}, [vol.\@ i of \emph{America: A Cultural History}] (New York: Oxford University Press). \tcblower \begin{Verbatim} %</n|m|a|y> @book{fischer1989asf, author = {David Hackett Fischer}, - title = {Albion’s Seed}, + title = {Albion's Seed}, subtitle = {Four British Folkways in America}, volume = {1}, maintitle = {America}, @@ -3025,7 +3041,7 @@ the following form is used: \section{Additions, translations, and revisions} -Where works have significant introductions, forewords, afterwords, illustrations, etc.\ this may be noted as follows: +Where works have significant introductions, forewords, afterwords, illustrations, etc.\@ this may be noted as follows: %<n|m>\spec{Author, \emph{Title}, \lit{with an} Addition \lit{by} Contributor (Location: Publisher, Year).} %<a|y>\spec{Author (Year), \emph{Title}, \lit{with an} Addition \lit{by} Contributor (Location: Publisher).} @@ -3059,8 +3075,8 @@ Translators are credited as follows: %<n|m><NHR \S18.2.14> %<a|y><NHR \S18.2.14\textdagger> {bischoff1990lpa} -%<n|m>Bernhard Bischoff, \emph{Latin Palaeography: Antiquity and the Middle Ages}, trans. Dáibhi Ó Cróinín and David Ganz (Cambridge, 1990). -%<a|y>Bischoff, B. (1990), \emph{Latin Palaeography: Antiquity and the Middle Ages}, trans. D. Ó Cróinín and D. Ganz (Cambridge). +%<n|m>Bernhard Bischoff, \emph{Latin Palaeography: Antiquity and the Middle Ages}, trans. Dáibhi Ó~Cróinín and David Ganz (Cambridge, 1990). +%<a|y>Bischoff, B. (1990), \emph{Latin Palaeography: Antiquity and the Middle Ages}, trans. D. Ó~Cróinín and D. Ganz (Cambridge). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -3068,15 +3084,15 @@ Translators are credited as follows: author = {Bernhard Bischoff}, title = {Latin Palaeography}, subtitle = {Antiquity and the Middle Ages}, - translator = {Dáibhi Ó Cróinín and David Ganz}, + translator = {Dáibhi Ó~Cróinín and David Ganz}, location = {Cambridge}, date = {1990}} %<*n|m|a|y> \end{Verbatim} \end{bibexbox} -%<n|m>\spec{Author, \emph{Title}, \lit{trans.\ with} Addition Translator(s) (Location: Publisher, Year).} -%<a|y>\spec{Author (Year), \emph{Title}, \lit{trans.\ with} Addition Translator(s) (Location: Publisher).} +%<n|m>\spec{Author, \emph{Title}, \lit{trans.\@ with} Addition Translator(s) (Location: Publisher, Year).} +%<a|y>\spec{Author (Year), \emph{Title}, \lit{trans.\@ with} Addition Translator(s) (Location: Publisher).} \begin{bibexbox} %<n|m><NHR \S18.2.14> @@ -3112,7 +3128,7 @@ Where the author\slash editor is common to both, the following form is used: %</n|m|a|y> %<*n> -\begin{egcite}{\dots (3rd edn., 1990), 419--21} +\begin{egcite}{\dots (3rd edn., 1990), 419–21} \cite[419-421]{baker1990iel} \end{egcite} %</n> @@ -3139,7 +3155,7 @@ J. H. Baker, \emph{An Introduction to English Legal History} (3rd edn., 1990). %<*a|y> \begin{bibexbox}<NHR \S17.3.2*> {maitland2001mvr} -Maitland, G. (2001), \emph{Maitland's Vertebral Manipulation} (6th edn., Oxford: Butterworth--Heinemann). +Maitland, G. (2001), \emph{Maitland's Vertebral Manipulation} (6th edn., Oxford: Butterworth–Heinemann). \tcblower \begin{Verbatim} %</a|y> @@ -3236,9 +3252,9 @@ J. D. Denniston, \emph{The Greek Particles} (1934; 2nd edn., Oxford, 1954). \tip{Use the localization key \code{revised} as the edition to get \enquote{revised edition}. Use the localization key \code{revisedenlarged} as the edition to get \enquote{revised and enlarged edition}} -\begin{bibexbox}<OGS \S15.2.1*> -{gibbon1686dfs} -{[John Gibbon]}, \emph{Day-Fatality: Or Some Observations on Days Lucky and Unlucky}, (London, 1678; rev.~edn., 1686). +\begin{bibexbox}<OGS \S15.2.1> +{gibbon1686dfs}[] +[John Gibbon], \emph{Day-Fatality: Or Some Observations on Days Lucky and Unlucky} (London, 1678; rev.~edn., 1686). \tcblower \begin{Verbatim} %</n|m> @@ -3288,21 +3304,27 @@ Marx, K. (1867), \emph{Capital: A Critique of Political Economy}, i, trans. B. F If the publication has not been revised, but has been re-typeset by a different publisher, the \emph{Oxford Guide to Style} suggests putting the original date in a note at the end, -rather than within the publication block% +after rather than within the publication block% %<n|m>. %<a|y>, but this does not affect the author–date style since the original date is at the head of the reference anyway. %<n|m>\spec{Author, \emph{Title} (Location: Publisher, Year) (\lit{originally pub.} Year).} %<a|y>\spec{Author (OrigYear), \emph{Title} (Location: Publisher).} -%<n|m>\tip{This format is triggered if you specify an original date but do not specify the original publisher or location, nor the edition of the later publication.} -%<n|m>\info{In the following example, you will see the style uses \enquote{originally published} instead of \enquote{first published}. This is because \enquote{originally} is more common among the available examples.} +%<*n|m> +\tip{This format is triggered if you specify an original date but do not specify the original publisher or location, nor the edition of the later publication.} +\info{In the \emph{Oxford Guide to Style}, the following example has the string \enquote{first pub.\@} in place of the more common \enquote{originally pub.\@}; +to use this phrase in all entries, use the regular \pkg{biblatex} command to reset the string:} +\begin{tcblisting}{listing only,left skip=2em} +\DefineBibliographyStrings{english}{origpubin={first pub\adddot}} +\end{tcblisting} +%</n|m> \begin{bibexbox} -%<n|m><OGS \S15.2.3> +%<n|m><OGS \S15.2.3*> %<a|y><OGS \S15.2.3\textdagger> {bettelheim1976uem} -%<n|m>Bruno Bettelheim, \emph{The Uses of Enchantment: The Meaning and Importance of Fairy Tales} (Harmondsworth: Penguin Books, 1988) (first pub. 1976). +%<n|m>Bruno Bettelheim, \emph{The Uses of Enchantment: The Meaning and Importance of Fairy Tales} (Harmondsworth: Penguin Books, 1988) (originally pub. 1976). %<a|y>Bettelheim, B. (1976), \emph{The Uses of Enchantment: The Meaning and Importance of Fairy Tales} (Harmondsworth: Penguin Books, 1988). \tcblower \begin{Verbatim} @@ -3330,8 +3352,8 @@ rather than within the publication block% %<n|m><OGS \S15.2.4> %<a|y><OGS \S15.2.4\textdagger> {adam.tannery1897odd} -%<n|m>C. Adam and D. Tannery (eds.), \emph{Œuvres de Descartes} (Paris: Cerf, 1897--1913; repr. Paris: J. Vrin, CNRS, 1964--76). -%<a|y>Adam, C. and Tannery, D. (1897--1913) (eds.), \emph{Œuvres de Descartes} (Paris: Cerf; repr. Paris: J. Vrin, CNRS, 1964--76). +%<n|m>C. Adam and D. Tannery (eds.), \emph{Œuvres de Descartes} (Paris: Cerf, 1897–1913; repr. Paris: J. Vrin, CNRS, 1964–76). +%<a|y>Adam, C., and Tannery, D. (1897–1913) (eds.), \emph{Œuvres de Descartes} (Paris: Cerf; repr. Paris: J. Vrin, CNRS, 1964–76). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -3545,8 +3567,8 @@ provide both to make it easier to locate. %<n|m><OGS \S15.2.5> %<a|y><OGS \S15.2.5\textdagger> {salinger1953ns} -%<n|m>J. D. Salinger, \emph{Nine Stories} (Boston: Little, Brown, 1953), published in the UK as \emph{For Esmé---With Love and Squalor, and Other Stories} (London: Hamish Hamilton, 1953). -%<a|y>Salinger, J. D. (1953), \emph{Nine Stories} (Boston: Little, Brown), published in the UK as \emph{For Esmé---With Love and Squalor, and Other Stories} (London: Hamish Hamilton, 1953). +%<n|m>J. D. Salinger, \emph{Nine Stories} (Boston: Little, Brown, 1953), published in the UK as \emph{For Esmé—With Love and Squalor, and Other Stories} (London: Hamish Hamilton, 1953). +%<a|y>Salinger, J. D. (1953), \emph{Nine Stories} (Boston: Little, Brown), published in the UK as \emph{For Esmé—With Love and Squalor, and Other Stories} (London: Hamish Hamilton, 1953). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -3580,7 +3602,7 @@ provide both to make it easier to locate. %<*n|m> \begin{bibexbox}<OGS \S15.2.7> {garlandia1972dmm} -Johannes de Garlandia, \emph{De mensurabili musica}, ed. Erich Reimer, 2 vols. (Beihefte zum Archiv für Musikwissenschaft, 10--11; Wiesbaden, 1972). +Johannes de Garlandia, \emph{De mensurabili musica}, ed. Erich Reimer, 2 vols. (Beihefte zum Archiv für Musikwissenschaft, 10–11; Wiesbaden, 1972). \tcblower \begin{Verbatim} %</n|m> @@ -3726,7 +3748,7 @@ The \code{incollection} entry type is intended for citing one of a collection of %<*n|m> \begin{bibexbox}<OGS \S15.3> {shearman1993vsf} -John Shearman, \enquote{The Vatican Stanze: Functions and Decoration}, in George Holmes (ed.), \emph{Art and Politics in Renaissance Italy: British Academy Lectures} (Oxford: Clarendon Press, 1993), 185--240. +John Shearman, \enquote{The Vatican Stanze: Functions and Decoration}, in George Holmes (ed.), \emph{Art and Politics in Renaissance Italy: British Academy Lectures} (Oxford: Clarendon Press, 1993), 185–240. \tcblower \begin{Verbatim} %</n|m> @@ -3770,9 +3792,9 @@ Magarey, M. E. (1988), \enquote{Examination of the Cervical and Thoracic Spine}, \end{Verbatim} \end{bibexbox} -\begin{bibexbox}<NHR \S17.3.2> +\begin{bibexbox}<NHR \S17.3.2*> {jessop1997gcc} -Jessop, B. (1997), \enquote{The Governance of Complexity and Complexity of Governance}, in A. Amin and J. Hausner (eds.), \emph{Beyond Markets and Hierarchy}, (Aldershot: Edward Elgar). +Jessop, B. (1997), \enquote{The Governance of Complexity and Complexity of Governance}, in A. Amin and J. Hausner (eds.), \emph{Beyond Markets and Hierarchy} (Aldershot: Edward Elgar). \tcblower \begin{Verbatim} %</a|y> @@ -3834,11 +3856,11 @@ Biblatex provides the \code{bookinbook} entry type for citing a part of an antho \tip{Use \code{origdate} to give the date of original publication.} \begin{bibexbox} -%<n|m><OGS \S15.3> -%<a|y><OGS \S15.3\textdagger> +%<n|m><OGS \S15.3*> +%<a|y><OGS \S15.3*\textdagger> {frege1892osr} -%<n|m>G. Frege, \enquote{On Sense and Reference}, in id., \emph{Philosophical Writings}, trans. and ed. P. T. Geach and M. Black (Oxford: Blackwell, 1952) (originally pub. 1892). -%<a|y>Frege, G. (1892), \enquote{On Sense and Reference}, in id., \emph{Philosophical Writings}, trans. and ed. P. T. Geach and M. Black (Oxford: Blackwell, 1952). +%<n|m>G. Frege, \enquote{On Sense and Reference}, in id., \emph{Philosophical Writings}, ed. and trans. P. T. Geach and M. Black (Oxford: Blackwell, 1952) (originally pub. 1892). +%<a|y>Frege, G. (1892), \enquote{On Sense and Reference}, in id., \emph{Philosophical Writings}, ed. and trans. P. T. Geach and M. Black (Oxford: Blackwell, 1952). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -3858,6 +3880,12 @@ Biblatex provides the \code{bookinbook} entry type for citing a part of an antho \end{Verbatim} \end{bibexbox} +\info{In the \emph{Oxford Guide to Style}, the above example has the string \enquote{trans.\@ and ed.\@} in place of \enquote{ed.\@ and trans.\@}; +to use this phrase in all entries, use the regular \pkg{biblatex} command to reset the string:} +\begin{tcblisting}{listing only,left skip=2em} +\DefineBibliographyStrings{english}{byeditortr={trans\adddotspace and ed\adddot}} +\end{tcblisting} + \subsection{Both versions equally accessible} \tip{Put the key of the original work in \code{related}, and in \code{relatedtype} use the keyword \code{reprintfrom}.} @@ -3866,8 +3894,8 @@ Biblatex provides the \code{bookinbook} entry type for citing a part of an antho %<n|m><OGS \S15.3> %<a|y><OGS \S15.3\textdagger> {owen1986pi} -%<n|m>G. E. L. Owen, \enquote{Philosophical Invective}, in id., \emph{Logic, Science and Dialectic}, ed. M. Nussbaum (Ithaca, NY: Cornell University Press, 1986), 347--64. From \emph{Oxford Studies in Ancient Philosophy}, 1 (1983), 1--25. -%<a|y>Owen, G. E. L. (1986) \enquote{Philosophical Invective}, in id., \emph{Logic, Science and Dialectic}, ed. M. Nussbaum (Ithaca, NY: Cornell University Press), 347--64. From \emph{Oxford Studies in Ancient Philosophy}, 1 (1983): 1--25. +%<n|m>G. E. L. Owen, \enquote{Philosophical Invective}, in id., \emph{Logic, Science and Dialectic}, ed. M. Nussbaum (Ithaca, NY: Cornell University Press, 1986), 347–64. From \emph{Oxford Studies in Ancient Philosophy}, 1 (1983), 1–25. +%<a|y>Owen, G. E. L. (1986), \enquote{Philosophical Invective}, in id., \emph{Logic, Science and Dialectic}, ed. M. Nussbaum (Ithaca, NY: Cornell University Press), 347–64. From \emph{Oxford Studies in Ancient Philosophy}, 1 (1983): 1–25. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -4001,8 +4029,8 @@ The \code{proceedings} entry type is intended for a set of conference papers tha %<n|m><OGS \S15.2.12> %<a|y><OGS \S15.2.12\textdagger> {icp1975pic} -%<n|m>\emph{Proceedings of the XIV International Congress of Papyrologists: Oxford, 24--31 July 1974} (London, 1975). -%<a|y>\emph{Proceedings of the XIV International Congress of Papyrologists: Oxford, 24--31 July 1974} (1975) (London). +%<n|m>\emph{Proceedings of the XIV International Congress of Papyrologists: Oxford, 24–31 July 1974} (London, 1975). +%<a|y>\emph{Proceedings of the XIV International Congress of Papyrologists: Oxford, 24–31 July 1974} (1975) (London). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -4037,8 +4065,8 @@ The \code{proceedings} entry type is intended for a set of conference papers tha %<n|m><OGS \S15.2.13> %<a|y><OGS \S15.2.13\textdagger> {iau1922tia} -%<n|m>International Astronomical Union, \emph{Transactions of the International Astronomical Union, Rome}, 12--20 May 1922 (London: Imperial College Bookstall, 1922). -%<a|y>International Astronomical Union (1922), \emph{Transactions of the International Astronomical Union, Rome}, 12--20 May 1922 (London: Imperial College Bookstall). +%<n|m>International Astronomical Union, \emph{Transactions of the International Astronomical Union, Rome}, 12–20 May 1922 (London: Imperial College Bookstall, 1922). +%<a|y>International Astronomical Union (1922), \emph{Transactions of the International Astronomical Union, Rome}, 12–20 May 1922 (London: Imperial College Bookstall). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -4235,7 +4263,7 @@ The \code{inproceedings} entry type is intended for a conference paper published %<*n|m> \begin{bibexbox}<OGS \S15.6> {holfordstrevens1999hlm} -Leofranc Holford-Strevens, \enquote{Humanism and the Language of Music Theory Treatises}, paper given at the 65th Annual Meeting of the American Musicological Society, Kansas City, MO, 4--7 Nov. 1999. +Leofranc Holford-Strevens, \enquote{Humanism and the Language of Music Theory Treatises}, paper given at the 65th Annual Meeting of the American Musicological Society, Kansas City, MO, 4–7 Nov. 1999. \tcblower \begin{Verbatim} %</n|m> @@ -4282,7 +4310,7 @@ Mason, J. B., Habicht, J. P., and Tabatabai, H. (1984), \enquote{Notes on Nutrit %<*a|y> \begin{bibexbox}<OGS \S15.19.2> {pritchard.pritchard1990ard} -Pritchard, E., and Pritchard, J. (1990), \enquote{A Reply to Drèze}, unpub.\ paper. +Pritchard, E., and Pritchard, J. (1990), \enquote{A Reply to Drèze}, unpub.\@ paper. \tcblower \begin{Verbatim} %</a|y> @@ -4291,7 +4319,7 @@ Pritchard, E., and Pritchard, J. (1990), \enquote{A Reply to Drèze}, unpub.\ pa author = {E. Pritchard and J. Pritchard}, date = {1990}, title = {A Reply to Drèze}, - howpublished = {unpub.\ paper}} + howpublished = {unpub.\@ paper}} %</a|y|bib> %<*a|y> \end{Verbatim} @@ -4395,9 +4423,9 @@ WHO (World Health Organization) (1986), \emph{Nutrition and Development in East \end{Verbatim} \end{bibexbox} -\begin{bibexbox}<NHR \S17.3.2> +\begin{bibexbox}<NHR \S17.3.2*> {cnnr2008tut} -CNNR/GMH (Comisión Nacional de Reparación y Reconciliación y Grupo de Memoria Historica) (2008), \emph{Trujilla: Una Tragedia que no Cesa [Trujilla: A Tragedy Without End]}, (Bogotá, Columbia: CNRR). +CNNR/GMH (Comisión Nacional de Reparación y Reconciliación y Grupo de Memoria Historica) (2008), \emph{Trujilla: Una Tragedia que no Cesa} [\emph{Trujilla: A Tragedy Without End}] (Bogotá, Columbia: CNRR). \tcblower \begin{Verbatim} %</a|y> @@ -4434,7 +4462,9 @@ CNNR/GMH (Comisión Nacional de Reparación y Reconciliación y Grupo de Memoria %<*a|y> \begin{bibexbox}<OGS \S15.19.2> {opcs1979amt} -Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, Series DS, No.~3 (London) +%<a>Office of Population Censuses and Surveys (1979), +%<y>Office of Population Censuses and Surveys (1979\emph{a}), +\emph{Area Mortality Tables: The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, Series DS, No.~3 (London) \tcblower \begin{Verbatim} %</a|y> @@ -4443,7 +4473,7 @@ Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: author = {{Office of Population Censuses and Surveys}}, date = {1979}, title = {Area Mortality Tables}, - subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969--1973}, + subtitle = {The Registrar-General's Decennial Supplement for England and Wales 1969–1973}, series = {Series DS}, number = {3}, location = {London}} @@ -4454,7 +4484,9 @@ Office of Population Censuses and Surveys (1979a), \emph{Area Mortality Tables: \begin{bibexbox}<OGS \S15.19.2> {opcs1979pnc} -Office of Population Censuses and Surveys (1979b), \emph{Projections of the New Commonwealth and Pakistani Population}, OPCS Monitor PP2 79/1 (London) +%<a>Office of Population Censuses and Surveys (1979), +%<y>Office of Population Censuses and Surveys (1979\emph{b}), +\emph{Projections of the New Commonwealth and Pakistani Population}, OPCS Monitor PP2 79/1 (London) \tcblower \begin{Verbatim} %</a|y> @@ -4870,7 +4902,7 @@ The \emph{Oxford Guide to Style} offers several ways of expressing the recording %</n|m|a|y> @music{pageNDmn, title = {The Mirror of Narcissus}, - subtitle = {Songs by Guillaume do Machaut}, + subtitle = {Songs by Guillaume de Machaut}, editor = {{Gothic Voices}}, editortype = {performer}, editora = {Christopher Page}, @@ -4980,7 +5012,7 @@ Sometimes publishers will put several works on a single release without giving i %<a|y><NHR \S18.7.2*\textdagger> {davis1997sw} %<n|m>Miles Davis et al., \enquote{So What}, in \emph{Kind of Blue}, rec. 1959 (Columbia CK 64935, 1997) [CD]. -%<a|y>Davis, M. et al. (1959), \enquote{So What}, in \emph{Kind of Blue} (Columbia CK 64935, 1997) [CD]. +%<a|y>Davis, M., et al. (1959), \enquote{So What}, in \emph{Kind of Blue} (Columbia CK 64935, 1997) [CD]. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -5034,8 +5066,8 @@ Sometimes publishers will put several works on a single release without giving i %<n|m><OGS \S15.14.2> %<a|y><OGS \S15.14.2\textdagger> {britt1986pho} -%<n|m>\enquote{Percy and Harold and Other Stories}, \emph{Thomas the Tank Engine and Friends} series (Britt Allcroft 5-014861-100224, 1986). -%<a|y>\enquote{Percy and Harold and Other Stories} (1986), \emph{Thomas the Tank Engine and Friends} series (Britt Allcroft 5-014861-100224). +%<n|m>\enquote{Percy and Harold and Other Stories}, \emph{Thomas the Tank Engine and Friends \textup{series}} (Britt Allcroft 5-014861-100224, 1986). +%<a|y>\enquote{Percy and Harold and Other Stories} (1986), \emph{Thomas the Tank Engine and Friends \textup{series}} (Britt Allcroft 5-014861-100224). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -5083,8 +5115,8 @@ Sometimes publishers will put several works on a single release without giving i %<n|m><OGS \S15.14.2> %<a|y><OGS \S15.14.2\textdagger> {reiner1983tst} -%<n|m>\emph{This is Spinal Tap: A Rockumentary by Marti Di Bergi}, dir.\ Rob Reiner (Embassy Pictures, 1983). -%<a|y>\emph{This is Spinal Tap: A Rockumentary by Marti Di Bergi} (1983), dir.\ R. Reiner (Embassy Pictures). +%<n|m>\emph{This is Spinal Tap: A Rockumentary by Marti Di Bergi}, dir.\@ Rob Reiner (Embassy Pictures, 1983). +%<a|y>\emph{This is Spinal Tap: A Rockumentary by Marti Di Bergi} (1983), dir.\@ R. Reiner (Embassy Pictures). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -5108,11 +5140,11 @@ Sometimes publishers will put several works on a single release without giving i \begin{bibexbox} -%<n|m><OGS \S15.14.2> -%<a|y><OGS \S15.14.2\textdagger> +%<n|m><OGS \S15.14.2*> +%<a|y><OGS \S15.14.2*\textdagger> {kaurismaki1989lcg} -%<n|m>\emph{Leningrad Cowboys Go America} (Villealfa Filmproductions, 1989), dir.\@ and screenplay by Aki Kaurismäki, story by Sakke Järvenpää, Aki Kaurismäki, Mato Valtonen. -%<a|y>\emph{Leningrad Cowboys Go America} (1989) (Villealfa Filmproductions), dir.\@ and screenplay by A. Kaurismäki, story by S. Järvenpää, A. Kaurismäki, M. Valtonen. +%<n|m>\emph{Leningrad Cowboys Go America} (Villealfa Filmproductions, 1989), dir.\@ and screenplay by Aki Kaurismäki, story by Sakke Järvenpää, Aki Kaurismäki, and Mato Valtonen. +%<a|y>\emph{Leningrad Cowboys Go America} (1989) (Villealfa Filmproductions), dir.\@ and screenplay by A. Kaurismäki, story by S. Järvenpää, A. Kaurismäki, and M. Valtonen. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -5120,7 +5152,7 @@ Sometimes publishers will put several works on a single release without giving i title = {Leningrad Cowboys Go America}, publisher = {Villealfa Filmproductions}, date = {1989}, - editortype = {dir.\ and screenplay by}, + editortype = {dir.\@ and screenplay by}, editor = {Aki Kaurismäki}, editoratype = {story by}, editora = {Sakke Järvenpää and Aki Kaurismäki and Mato Valtonen}, @@ -5263,7 +5295,7 @@ The \emph{Oxford Guide to Style} prints all information about the transmission, %<n|m><NHR \S18.8.5*> %<a|y><NHR \S18.8.5*\textdagger> {perry2013ifm} -%<n|m>Grayson Perry, \enquote{I Found Myself in the Art World} [podcast], Reith Lecture, BBC Radio 4 (5 Nov. 2013), \url{http://downloads.bbc.co.uk/podcasts/radio4/reith/reith_20131105-0940b.mp3}, accessed 5 Nov. 2013. +%<n|m>Grayson Perry, \enquote{I Found Myself in the Art World} [podcast], Reith Lecture, BBC Radio 4 (5 Nov. 2013), \url{http://downloads.bbc.co.uk/podcasts/radio4/reith/reith_20131105-0940b.mp3}, accessed 5 Nov. 2013. %<a|y>Perry, G. (2013), \enquote{I Found Myself in the Art World} [podcast], Reith Lecture, BBC Radio 4 (5 Nov.), \url{http://downloads.bbc.co.uk/podcasts/radio4/reith/reith_20131105-0940b.mp3}, accessed 5 Nov. 2013. \tcblower \begin{Verbatim} @@ -5318,7 +5350,7 @@ The \emph{Oxford Guide to Style} prints all information about the transmission, %<a|y><NHR \S18.8.5*\textdagger> {yousafzai2013mwa} %<n|m>Malala Yousafzai, \enquote{Making a Wish for Action on Global Education: Malala Yousafzai Addresses Youth Assembly at UN on her 16th Birthday, 12 July 2013} [webcast], UN Web TV (12 July 2013), \url{http://webtv.un.org/search/malala-yousafzai-un-youth-assembly/2542094251001?term=malala}, accessed 15 Feb. 2015. -%<a|y>Yousafzai, M. (2013), \enquote{Making a Wish for Action on Global Education: Malala Yousafzai Addresses Youth Assembly at UN on her 16th Birthday, 12 July 2013} [webcast], UN Web TV, (12 July), \url{http://webtv.un.org/search/malala-yousafzai-un-youth-assembly/2542094251001?term=malala}, accessed 15 Feb. 2015. +%<a|y>Yousafzai, M. (2013), \enquote{Making a Wish for Action on Global Education: Malala Yousafzai Addresses Youth Assembly at UN on her 16th Birthday, 12 July 2013} [webcast], UN Web TV (12 July), \url{http://webtv.un.org/search/malala-yousafzai-un-youth-assembly/2542094251001?term=malala}, accessed 15 Feb. 2015. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -5551,7 +5583,7 @@ Standard \textsf{biblatex} only provides for one title for online resources, whi %<a|y><NHR \S18.8.5\textdagger> {hooper2013lfs} %<n|m>Richard Hooper, \enquote{Lebanon's Forgotten Space Programme}, BBC News Magazine (14 Nov. 2013), \url{http://www.bbc.co.uk/news/magazine-24735423}, accessed 14 Nov. 2013. -%<a|y>Hooper, R. (2013), \enquote{Lebanon's Forgotten Space Programme}, BBC News Magazine (14 Nov.) \url{http://www.bbc.co.uk/news/magazine-24735423}, accessed 14 Nov. 2013. +%<a|y>Hooper, R. (2013), \enquote{Lebanon's Forgotten Space Programme}, BBC News Magazine (14 Nov.), \url{http://www.bbc.co.uk/news/magazine-24735423}, accessed 14 Nov. 2013. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -5838,7 +5870,14 @@ Standard \textsf{biblatex} only provides for one title for online resources, whi \pkg[biblatex]{Oxref} provides only a basic level of support for legal references, in case you need to use some in a mainly non-legal text. For a more thorough and robust treatment, intended for a specialist readership, I recommend you use the \pkg{oscola} style instead. -Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} and the \emph{Oxford Standard for the Citation of Legal Authorities}, \pkg[biblatex]{oxref} largely mimics \pkg{oscola} and its data model, though there are some small formatting differences. What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, or anything special regarding the handling of postnotes. +Since there is a family resemblence between the \emph{Oxford Guide to Style\slash New Hart's Rules} +and the \emph{Oxford Standard for the Citation of Legal Authorities}, +\pkg[biblatex]{oxref} largely mimics \pkg{oscola} and its data model, though there are some small formatting differences. +What you should \emph{not} expect from \pkg[biblatex]{oxref} are facilities for compiling specialist indices of sources, +or anything special regarding the handling of postnotes. + +\pkg[biblatex]{Oxref} follows \pkg{oscola} in stripping out abbreviation dots from most fields using regular expressions, +but if you want to retain a dot that it strips, you can do so by writing it \verb|{.}|, \cs{adddot} or \cs{addotspace}. %<y>Since legal references are usually cited using footnotes, how \textsf{oxyear} should behave is not well defined. As a result, I have not configured it to do anything fancy: the full reference will be formatted just the same as with \textsf{oxnotes}, and citations will typically be title–year using parentheses in the usual way. I am open to suggestions for how to handle things better. @@ -5848,7 +5887,7 @@ Since there is a family resemblence between the \emph{Oxford Guide to Style\slas Use the \code{jurisdiction} entry type for citing cases. -\tip{Use the \code{keyword} field to specify the jurisdiction. The following are recognized: +\tip{Use the \code{keywords} field to specify the jurisdiction. The following are recognized: \begin{itemize} \item\val{gb} United Kingdom @@ -5972,6 +6011,26 @@ Use the \code{jurisdiction} entry type for citing cases. \tip{Use the (non-standard) \code{neutralcite} or \code{number} field for the neutral citation or case number.} \begin{bibexbox} +<OSCOLA \S2.1.1> +{corr08} +\emph{Corr v IBC Vehicles Ltd} [2008] UKHL 13, [2008] 1 AC 884 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{corr08, + title = {Corr v. I.B.C. Vehicles Ltd.}, + keywords = {gb}, + date = {2008}, + neutralcite = {[2008] UKHL 13}, + journaltitle = {A.C.}, + volume = {1}, + pages = {884}, + options = {year-essential}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} <NHR \S13.4.1> {rvg2004} \emph{R v G} [2003] UKHL 50, [2004] 1 AC 1034 @@ -6088,23 +6147,40 @@ Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} are inconsiste \end{bibexbox} \begin{bibexbox} -<NHR \S13.4.1> -{michael1976} -\emph{Michael v Johnson}, 426 US 346 (1976) +<OSCOLA \S2.2*> +{hislop42} +\emph{Hislop v Durham} (1842) 4 D 1168 \tcblower \begin{Verbatim} %</n|m|a|y> -@jurisdiction{michael1976, - title = {Michael v. Johnson}, - volume = {426}, - reporter = {U.S.}, - pages = {346}, - date = {1976}, - keywords = {us}} +@jurisdiction{hislop42, + title = {Hislop v. Durham}, + date = {1842}, + volume = {4}, + reporter = {D}, + pages = {1168}, + keywords = {sc}} %<*n|m|a|y> \end{Verbatim} \end{bibexbox} +\begin{bibexbox} +<OSCOLA \S2.2*> +{crofters02} +\emph{Crofters Commission v Scottish Ministers}, 2002 SLT (Land Ct) 19 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{crofters02, + title = {Crofters Commission v. Scottish Ministers}, + date = {2002}, + reporter = {SLT}, + series = {(Land Ct)}, + pages = {19}, + keywords = {sc}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} \subsection{Unreported cases} @@ -6141,6 +6217,23 @@ Both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules} are inconsiste \end{Verbatim} \end{bibexbox} +\tip{Unreported cases with a \code{neutralcite} or \code{number} do not show the date after the \code{institution}.} + +\begin{bibexbox} +<OSCOLA \S2.1.4> +{calvert02} +\emph{Calvert v Gardiner} [2002] EWHC 1394 (QB) +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{calvert02, + title = {Calvert v. Gardiner}, + neutralcite = {[2002] EWHC 1394}, + institution = {QB}, + date = {2002-01-01}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} \subsection{European cases} @@ -6176,7 +6269,35 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E \end{Verbatim} \end{bibexbox} -\tip{Indicate Commission Decisions by putting \code{Commission} in the \code{institution} field. If a decision has a formal decision number, put this in the \code{number} field, and put the case number in the (non-standard) \code{casenumber} field or (\pkg{oscola}-supported) \code{userb} field. If wider portability is an issue, you can put the case number, including the word \enquote{Case} if needed, in the \code{titleaddon} field instead.} +\begin{bibexbox} +<OSCOLA \S2.6.2> +{C430/93} +Joined Cases C-430/93–C-431/93 \emph{Jereon van Schijndel v Stichting Pensioenfonds voor Fysiotherapeuten} [1998] ECR I–4705 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{C430/93, + keywords = {eu}, + title = {Jereon van Schijndel v Stichting Pensioenfonds voor Fysiotherapeuten}, + shorttitle = {van Schijndel}, + number = {C-430/93--C-431/93}, + institution = {ECJ}, + journaltitle = {ECR}, + volume = {I}, + date = {1998}, + pages = {4705}, + hyphenation = {dutch}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\tip{Indicate Commission Decisions by putting \code{Commission} in the \code{institution} field. + If a decision has a formal decision number, put this in the \code{number} field, + and put the case number in the (non-standard) \code{casenumber} field; + the \enquote{Case} prefix is added automatically in this case. + Alternatively, you can put the case number (including the word \enquote{Case} if needed) + in the \code{userb} field for compatibility with \pkg{oscola}, + or in the \code{titleaddon} field for wider portability.} \begin{bibexbox} <OGS \S13.2.6> @@ -6204,7 +6325,30 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E \end{Verbatim} \end{bibexbox} -\tip{For ECHR cases, put the application number in the \code{number} field.} +\begin{bibexbox} +<OSCOLA \S2.6.3> +{verkehrsorgani} +\emph{Georg Verkehrsorgani v Ferrovie dello Stato} (Case COMP/37.685) Commission Decision 2004/33/EC [2004] OJ L11/17 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{verkehrsorgani, + keywords = {eu}, + title = {Georg Verkehrsorgani v Ferrovie dello Stato}, + userb = {Case COMP\slash 37.685}, + number = {2004\slash 33\slash EC}, + institution = {commission}, + year = {2004}, + journaltitle = {OJ}, + series = {L}, + issue = {11}, + pages = {17}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\tip{For ECHR cases, put the application number in the \code{number} field; +unlike \emph{OSCOLA}, \emph{New Hart's Rules} puts parentheses around it.} \begin{bibexbox} <NHR \S13.4.5> @@ -6225,6 +6369,23 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E \end{Verbatim} \end{bibexbox} +\begin{bibexbox} +<OSCOLA \S2.7.1> +{balogh04} +\emph{Balogh v Hungary} (App no 47940/99) (ECtHR, 20 July 2004) +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{balogh04, + title = {Balogh v. Hungary}, + number = {47940/99}, + date = {2004-07-20}, + institution = {ECtHR}, + keywords = {echr}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + \tip{Special formatting is triggered if you specify \code{Series A} or \code{ECHR} as the \code{journaltitle} or \code{reporter}.} \begin{bibexbox} @@ -6265,6 +6426,313 @@ Case C–118/07 \emph{Commission of the European Communities v Finland} [2002] E \end{Verbatim} \end{bibexbox} +\tip{For the older European Commission of Human Rights, the \code{institution} +should be set to \code{Commission} but the information is effectively discarded +if you give the \code{journltitle} as \code{CD} or \code{DR}.} + +\begin{bibexbox} +<OSCOLA \S2.7.2> +{x71} +\emph{X v Netherlands} (1971) 38 CD 9 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{x71, + title = {X v. Netherlands}, + date = {1971}, + volume = {38}, + journaltitle = {CD}, + pages = {9}, + institution = {Commission}, + keywords = {echr}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +<OSCOLA \S2.7.2> +{ccsu87} +\emph{Council of Civil Service Unions v UK} (1987) 10 EHRR 269 (Commission Decision) +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{ccsu87, + title = {Council of Civil Service Unions v. UK}, + date = {1987}, + volume = {10}, + journaltitle = {EHRR}, + pages = {269}, + institution = {Commission}, + keywords = {echr}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +<OSCOLA \S2.7.2> +{simpson86} +\emph{Simpson v UK} (1989) 64 DR 188 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{simpson86, + title = {Simpson v. UK}, + date = {1989}, + volume = {64}, + journaltitle = {DR}, + pages = {188}, + institution = {Commission}, + keywords = {echr}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +<OSCOLA \S2.7.2*> +{p.uk88} +\emph{P v UK} (App no 13473/87) (Commission Decision, 11 July 1988) +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{p.uk88, + title = {P v. UK}, + date = {1988-07-11}, + number = {13473/87}, + institution = {Commission}, + keywords = {echr}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\subsection{Cases from other jurisdictions} + +The \emph{Oxford Guide to Style}, \emph{New Hart's Rules}, and \emph{OSCOLA} +provide only limited information on citing cases from other jurisdictions, +deferring to other authorities I can't effectively support in +\pkg[biblatex]{oxref}. The examples in this section demonstrate a few +formats that can nevertheless be achieved. + +\subsubsection{Australia} + +\begin{bibexbox} +<OSCOLA \S2.8.1> +{waltons88} +\emph{Waltons Stores (Interstate) Ltd v Maher} (1988) 164 CLR 387 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{waltons88, + title = {Waltons Stores (Interstate) Ltd v Maher}, + date = {1988}, + volume = {164}, + reporter = {C.L.R.}, + pages = {387}, + keywords = {au}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +{bakker} +\emph{Bakker v Stewart} [1980] VR 17 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{bakker, + title = {Bakker v. Stewart}, + date = {1980}, + reporter = {V.R.}, + pages = {17}, + keywords = {au}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\subsubsection{Canada} + +\info{\emph{New Hart's Rules} prefers to put commas between case titles and bare +numbers, but you can suppress this for Canadian cases with the following command:} +\begin{tcblisting}{listing only,left skip=2em} +\renewcommand*{\cacasetitlepunct}{\addspace} +\end{tcblisting} + +\begin{bibexbox} +{clearbrook} +\emph{Clearbrook Ironworks Ltd v Letorneau}, 2006 FCA 42, 46 CPR (4th) 241 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{clearbrook, + title = {Clearbrook Ironworks Ltd. v. Letorneau}, + number = {2006 FCA 42}, + volume = {46}, + reporter = {C.P.R.}, + series = {4th}, + pages = {241}, + date = {2006}, + pagination = {paragraph}, + keywords = {ca}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\subsubsection{United States of America} + +\info{\emph{New Hart's Rules} prefers to put commas between case titles and bare +numbers, but you can suppress this for American cases with the following command:} +\begin{tcblisting}{listing only,left skip=2em} +\renewcommand*{\uscasetitlepunct}{\addspace} +\end{tcblisting} + +\begin{bibexbox} +<NHR \S13.4.1> +{michael1976} +\emph{Michael v Johnson}, 426 US 346 (1976) +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{michael1976, + title = {Michael v. Johnson}, + volume = {426}, + reporter = {U.S.}, + pages = {346}, + date = {1976}, + keywords = {us}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +<OSCOLA \S2.8.1*> +{henningsen60} +\emph{Henningsen v Bloomfield Motors Inc}, 161 A 2d 69 (NJ 1960) +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{henningsen60, + title = {Henningsen v. Bloomfield Motors Inc.}, + volume = {161}, + reporter = {A.}, + series = {2}, + pages = {69}, + location = {NJ}, + date = {1960}, + keywords = {us}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +<OSCOLA \S2.8.1*> +{roe73} +\emph{Roe v Wade}, 410 US 113, 163–64 (1973) +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{roe73, + title = {Roe v. Wade}, + volume = {410}, + reporter = {U.S.}, + pages = {113, 163--64}, + date = {1973}, + keywords = {us}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +{operadora09} +\emph{Re Operadora DB Mexico SA}, 6:09-cv-383-Orl 022GJK, 2009 WL 2423138 (MD Fla 2009) +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{operadora09, + title = {Re Operadora D.B. Mexico S.A.}, + number = {6:09-cv-383-Orl 022GJK}, + eprint = {2009 WL 2423138}, + court = {M.D. Fla.}, + date = {2009}, + keywords = {us}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\subsubsection{International} + +\begin{bibexbox} +{corfu} +\emph{Corfu Channel Case (UK v Albania)} (Merits) [1949] ICJ Rep 4 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{corfu, + title = {Corfu Channel Case}, + subtitle = {UK v Albania}, + titleaddon = {Merits}, + date = {1949}, + journaltitle = {ICJ Rep}, + pages = {4}, + keywords = {int}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +{nicaragua} +\emph{Land, Island and Maritime Frontier Case (El Salvador/Honduras, Nicaragua intervening)} (Application for Intervention) [1994] ICJ Rep 92 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{nicaragua, + title = {Land, Island and Maritime Frontier Case}, + subtitle = {El Salvador\slash Hon\-duras, Nicaragua intervening}, + titleaddon = {Application for Intervention}, + date = {1994}, + journaltitle = {ICJ Rep}, + pages = {92}, + keywords = {int}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +{wall} +\emph{Legal Consequences of the Construction of a Wall} (Advisory Opinion) (2004), \url{http://www.icj-cij.org/icjwww/imwp/imwpframe.htm}, accessed 21 July 2005 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{wall, + title = {Legal Consequences of the Construction of a Wall}, + titleaddon = {Advisory Opinion}, + date = {2004}, + url = {http://www.icj-cij.org/icjwww/imwp/imwpframe.htm}, + urldate = {2005-07-21}, + pagination = {[]}, + keywords = {int}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +{chorzow} +\emph{Case Concerning the Factory at Chorzów (Germany v Poland)} (Merits) [1928] PCIJ Rep Series A No 17 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@jurisdiction{chorzow, + title = {Case Concerning the Factory at Chorzów}, + indextitle = {Chorzów Factory Case}, + subtitle = {Germany v Poland}, + titleaddon = {Merits}, + journaltitle = {PCIJ Rep}, + series = {A}, + pages = {17}, + date = {1928}, + keywords = {int}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + \section{Legislation} Use the \code{legislation} entry type for citing Acts, Bills, Orders, Measures, and the like. @@ -6293,6 +6761,78 @@ Factory and Workshop Act 1891 \end{Verbatim} \end{bibexbox} +\begin{bibexbox} +<OSCOLA \S2.4.6> +{learner08} +Learner Travel (Wales) Measure 2008 (nawm 2) +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@legislation{learner08, + title = {Learner Travel (Wales) Measure}, + date = {2008}, + number = {nawm 2}, + keywords = {cy}, + entrysubtype = {primary}, + pagination = {section}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +<OSCOLA \S2.4.5> +{confund} + Consolidated Fund HC Bill (2008–09) [5] +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@legislation{confund, + title = {Consolidated Fund Bill}, + date = {2008/2009}, + institution = {HC}, + number = {5}, + keywords = {gb, draft}, + entrysubtype = {primary}, + pagination = {clause}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +<OSCOLA \S2.4.5> +{academies} +Academies HL Bill (2010–11) 1 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@legislation{academies, + title = {Academies Bill}, + date = {2010/2011}, + institution = {HL}, + number = {1}, + keywords = {gb, draft}, + entrysubtype = {primary}, + pagination = {clause}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + +\begin{bibexbox} +<OSCOLA \S2.4.4> +{charitiesnotes} +Explanatory Notes on the Charities Act 2006 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@legal{charitiesnotes, + title = {Explanatory Notes on the Charities Act 2006}, + indextitle = {Charities Act 2006, Explanatory Note}, + pagination = {paragraph}, + entrysubtype = {explanatory note}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + \tip{Specify an \code{entrysubtype} of \code{secondary} for secondary legislation. The number is then printed as well.} @@ -6314,22 +6854,38 @@ Local Authority Precepts Order 1897, SR~\&~O 1897/201 \end{bibexbox} \begin{bibexbox} -<NHR \S13.5.1> -{ccsga1987} -Community Charge Support Grant (Abolition) Order 1987, SI 1987/466 +<OSCOLA \S2.5.3> +{eggs} +Eggs and Chicks (England) Regulations 2009, SI 2009/2163 \tcblower \begin{Verbatim} %</n|m|a|y> -@legislation{ccsga1987, +@legislation{eggs, entrysubtype = {secondary}, - title = {Community Charge Support Grant (Abolition) Order}, - date = {1987}, - number = {SI 1987\slash 466}, + title = {Eggs and Chicks (England) Regulations}, + date = {2009}, + number = {SI 2009\slash 2163}, pagination = {regulation}} %<*n|m|a|y> \end{Verbatim} \end{bibexbox} +%<*n> +\begin{egcite}{\emph{Eggs and Chicks (England) Regulations}, reg.~7(3)} +\cite[\pno~7(3)]{eggs} +\end{egcite} +%</n> +%<*m|a> +\begin{egcite}{} +\textcite[\pno~7(3)]{eggs} +\end{egcite} +%</m|a> +%<*y> +\begin{egcite}{} +\parencite[\pno~7(3)]{eggs} +\end{egcite} +%</y> + \subsection{European legislation} As with European cases, European legislation should be given the \val{eu} keyword. @@ -6339,7 +6895,7 @@ According to both the \emph{Oxford Guide to Style} and \emph{New Hart's Rules}, you can provide an even sparser reference for primary European legislation. %<*n> -\begin{egcite}{EC Treaty (Treaty of Rome, as amended), art.\@ 3b} +\begin{egcite}{EC Treaty (Treaty of Rome, as amended), art.~3b} \cite[\pno~3b]{ECT:Rome} \end{egcite} %</n> @@ -6375,6 +6931,28 @@ EC Treaty If this seems scandalously short, you may prefer to provide a full reference (including the relevant entry in the OJ or OJ Spec Ed) for the bibliography and use, say, \cs{citetitle} for citations. +\begin{bibexbox} +<OSCOLA \S2.6.1> +{teu} +Consolidated Version of the Treaty on European Union [2008] OJ C115/13 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@legislation{teu, + entrysubtype = {eu-treaty}, + title = {Consolidated Version of the Treaty on European Union}, + indextitle = {Treaty on European Union}, + date = {2008}, + journaltitle = {OJ}, + series = {C}, + volume = {115}, + pages = {13}, + pagination = {article}, + keywords = {eu}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + Secondary legislation should always have a full reference. \begin{bibexbox} @@ -6473,6 +7051,33 @@ Convention Relating to the Status of Refugees (adopted 28 July 1951, entered int %</y> +\begin{bibexbox} +{echr:treaty} +Convention for the Protection of Human Rights and Fundamental Freedoms (opened for signature 4 Nov.\@ 1950, entered into force 3 Sept.\@ 1953) 213 UNTS 221, as amended by Protocol No 14bis to the Convention for the Protection of Human Rights and Fundamental Freedoms (opened for signature 27 May 2009, entered into force 1 Sept.\@ 2009) CETS No. 204 +\tcblower +\begin{Verbatim} +%</n|m|a|y> +@legal{echr:treaty, + entrysubtype = {piltreaty}, + title = {Convention for the Protection of Human Rights and Fundamental Freedoms}, + execution = {opened=1950-11-04 and inforce=1953-09-03}, + volume = {213}, + reporter = {UNTS}, + pages = {221}, + shorthand = {ECHR}, + related = {echr:protocol}, + relatedtype = {amendedby}} +@legal{echr:protocol, + entrysubtype = {piltreaty}, + title = {Protocol No 14bis to the Convention for the Protection of Human Rights + and Fundamental Freedoms}, + execution = {opened=2009-05-27 and inforce=2009-09-01}, + series = {CETS}, + number = {204}} +%<*n|m|a|y> +\end{Verbatim} +\end{bibexbox} + \section{Hansard} References to Hansard use the \code{legal} entry type, with \code{parliamentary} as the \code{entrysubtype}. @@ -6511,7 +7116,7 @@ Parl.\@ Deb.\@ (series 4) vol.\@ 24, col.\@ 234 (24 Mar.\@ 1895) %</n|m|a|y> @legal{pd4/24, entrysubtype = {parliamentary}, - title = {Parl. Deb.}, + title = {Parl\adddotspace Deb\adddot}, series = {4}, volume = {24}, pages = {234}, @@ -6571,8 +7176,8 @@ it provides the \code{commentary} entry type simply as an alias for \code{book}. %<n|m><OGS \S15.8> %<a|y><OGS \S15.8\textdagger> {auden1990era} -%<n|m>W. H. Auden, \enquote{Es regnet auf mir in den Schottische Lände} [\emph{sic}], in \enquote{The German Auden: Six Early Poems}, trans. David Constantine, in Katherine Bucknell and Nicholas Jenkins (eds.), \emph{W. H. Auden, \enquote{The Map of All my Youth}: Early Works, Friends, and Influences} (Auden Studies, 1; Oxford, 1990), 1--15 at 6. -%<a|y>Auden, W. H. (n.d.), \enquote{Es regnet auf mir in den Schottische Lände} [\emph{sic}], in \enquote{The German Auden: Six Early Poems}, trans. D. Constantine, in K. Bucknell and N. Jenkins (eds.), \emph{W. H. Auden, \enquote{The Map of All my Youth}: Early Works, Friends, and Influences} (Auden Studies, 1; Oxford, 1990), 1--15 at 6. +%<n|m>W. H. Auden, \enquote{Es regnet auf mir in den Schottische Lände} [\emph{sic}], in \enquote{The German Auden: Six Early Poems}, trans. David Constantine, in Katherine Bucknell and Nicholas Jenkins (eds.), \emph{W. H. Auden, \enquote{The Map of All my Youth}: Early Works, Friends, and Influences} (Auden Studies, 1; Oxford, 1990), 1–15 at 6. +%<a|y>Auden, W. H. (n.d.), \enquote{Es regnet auf mir in den Schottische Lände} [\emph{sic}], in \enquote{The German Auden: Six Early Poems}, trans. D. Constantine, in K. Bucknell and N. Jenkins (eds.), \emph{W. H. Auden, \enquote{The Map of All my Youth}: Early Works, Friends, and Influences} (Auden Studies, 1; Oxford, 1990), 1–15 at 6. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -6606,8 +7211,8 @@ it provides the \code{commentary} entry type simply as an alias for \code{book}. %<n|m><OGS \S15.8> %<a|y><OGS \S15.8\textdagger> {blois1993qff} -%<n|m>William of Blois, \enquote{The Quarrel of the Flea and the Fly} (\emph{Pulicis et musce iurgia}), trans. in Jan M. Ziolkowski, \emph{Talking Animals: Medieval Latin Beast Poetry, 750-1150} (Middle Ages Series, ed. Edward Peters; Philadelphia: University of Pennsylvania Press, 1993), 274--8. -%<a|y>William of Blois (n.d.), \enquote{The Quarrel of the Flea and the Fly} (\emph{Pulicis et musce iurgia}), trans. in Ziolkowski, J. M., \emph{Talking Animals: Medieval Latin Beast Poetry, 750-1150} (Middle Ages Series, ed. E. Peters; Philadelphia: University of Pennsylvania Press, 1993), 274--8. +%<n|m>William of Blois, \enquote{The Quarrel of the Flea and the Fly} (\emph{Pulicis et musce iurgia}), trans. in Jan M. Ziolkowski, \emph{Talking Animals: Medieval Latin Beast Poetry, 750-1150} (Middle Ages Series, ed. Edward Peters; Philadelphia: University of Pennsylvania Press, 1993), 274–8. +%<a|y>William of Blois (n.d.), \enquote{The Quarrel of the Flea and the Fly} (\emph{Pulicis et musce iurgia}), trans. in Ziolkowski, J. M., \emph{Talking Animals: Medieval Latin Beast Poetry, 750-1150} (Middle Ages Series, ed. E. Peters; Philadelphia: University of Pennsylvania Press, 1993), 274–8. \tcblower \begin{Verbatim} %</n|m|a|y> @@ -6663,8 +7268,8 @@ If a poem is divided into cantos, the title is set in italics rather than quoted %<n|m><OGS \S15.8*> %<a|y><OGS \S15.8*\textdagger> {spenser1965fq}% -%<n|m>Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6) (originally pub. 1590–6). -%<a|y>Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443--4; London: Dent, 1965–6). +%<n|m>Edmund Spenser, \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6) (originally pub. 1590–6). +%<a|y>Spenser, E. (1590–6), \emph{The Faerie Queene} (Everyman's Library, 443–4; London: Dent, 1965–6). \tcblower \begin{Verbatim} %</n|m|a|y> @@ -6757,7 +7362,7 @@ The second uses the dedicated \code{manuscript} entry type from \textsf{biblatex \tip{You can specify the layer of a palimpsest in the \code{layer} field. Use \code{inf} for the inferior layer and \code{sup} for the superior layer.} -\tip{You can specify the writing support material in the \code{support} field. Three special keys – \code{papyrus}, \code{paper}, and \code{pergament} – are recognized and (potentially) translated, but other values will be printed as-is.} +\tip{You can specify the writing support material in the \code{support} field. Three special keys – \code{papyrus}, \code{paper}, and \code{parchment} – are recognized and (potentially) translated, but other values will be printed as-is.} \begin{bibexbox} %<n|m><NHR 18.6.2> @@ -6846,7 +7451,7 @@ The second uses the dedicated \code{manuscript} entry type from \textsf{biblatex location = {Cambridge}, collection = {Add. Greek MS}, shelfmark = {4489}, - support = {pergament}, + support = {parchment}, dating = {8th--9th c.}, pagetotal = {16}, columns = {1}, @@ -7004,7 +7609,7 @@ rather than \pkg[biblatex]{oxref}.} % \end{itemize} % % \begin{macrocode} - facsimile, revised, revisedenlarged, revisedreprint, suppto, equals, original, + facsimile, revised, revisedenlarged, revisedreprint, suppto, equals, original, amendedby, % \end{macrocode} % % \begin{itemize} @@ -7065,12 +7670,22 @@ rather than \pkg[biblatex]{oxref}.} % \end{itemize} % % \begin{macrocode} - 1column, 2column, inflayer, suplayer, paper, papyrus, pergament, + 1column, 2column, inflayer, suplayer, paper, papyrus, parchment, eucase, eujoinedcases, commissiondecision, application, order, bill, draft, opened, signed, adopted, inforce, } % \end{macrocode} % +% The \cs{blx@ox@langbibstring} utility is used to prefix a bibstring with one +% or more language names, but since this only works in certain languages, by +% default it discards the language names (first argument) and just prints the +% bibstring (second argument). This is overridden in |english-oxref.lbx| and +% friends. +% +% \begin{macrocode} +\def\blx@ox@langbibstring#1#2{\bibstring{#2}} +% \end{macrocode} +% % We base our styles on the standard on the principle of least surprise % (and to aid with maintenance in the face of new \pkg{biblatex} versions). % We set some defaults different to the standard ones, but the author can @@ -7081,9 +7696,10 @@ rather than \pkg[biblatex]{oxref}.} \ExecuteBibliographyOptions{urldate=comp,pagetracker,timezeros=false,time=12h,isbn=false} % \end{macrocode} % -% Here are the new default punctuation conventions. The new \cs{relatedtypepunct} -% is for before the |relatedtype| localization string, while \cs{recordseriespunct} -% is used for audiovisual resources. +% Here are the new default punctuation conventions. The new \cs{recordseriespunct} +% is used for audiovisual resources, while \cs{cacasetitlepunct} and +% \cs{uscasetitlepunct} are for punctuation following the case title in Canadian and +% American cases respectively. % % \begin{macrocode} \renewcommand*{\labelnamepunct}{\addcomma\space} @@ -7092,7 +7708,8 @@ rather than \pkg[biblatex]{oxref}.} \renewcommand*{\intitlepunct}{\nopunct\space} \renewcommand*{\bibnamedash}{\resizebox{2em}{\height}{\textemdash}\addthinspace} \newcommand*{\recordseriespunct}{\addcomma\space} -\newcommand*{\relatedtypepunct}{\addsemicolon\space} +\newcommand*{\cacasetitlepunct}{\addcomma\space} +\newcommand*{\uscasetitlepunct}{\addcomma\space} \renewcommand*{\relateddelim}{\addsemicolon\space} \DeclareDelimFormat{revsdnamedelim}{\addcomma} \DeclareDelimFormat{authortypedelim}{\addspace} @@ -7171,14 +7788,14 @@ rather than \pkg[biblatex]{oxref}.} and test {\ifdefvoid{#2}}% }{}{% - \revsdnamepunct}% + \printdelim{revsdnamedelim}}% \ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}% \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% }{% \usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% \mkbibnamefamily{#1}\isdot - \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}% + \ifdefvoid{#4}{}{\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}\isdot}% \ifboolexpe{% (test {\ifdefvoid{#5}} or not togl {blx@ox@nametitle}) and @@ -7186,7 +7803,7 @@ rather than \pkg[biblatex]{oxref}.} and test {\ifdefvoid{#3}}% }{}{% - \revsdnamepunct}% + \printdelim{revsdnamedelim}}% \ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}% \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}} @@ -7195,7 +7812,7 @@ rather than \pkg[biblatex]{oxref}.} % Oxford style (for the humanities) is to write author names surname first in % the bibliography, but in natural order in citations. We implement this, along % with the case changing option, in the following name format. We also add a -% second hash for checking if names (e.g.\ |author| and |authoraddon|) are the +% second hash for checking if names (e.g.\@ |author| and |authoraddon|) are the % same. % % \begin{macrocode} @@ -7242,6 +7859,14 @@ rather than \pkg[biblatex]{oxref}.} \renewcommand*{\mkbibnamesuffix}[1]{##1}% \renewcommand*{\mkbibnametitle}[1]{##1}% }{}% + \ifboolexpe{% + test {\ifnumgreater{\value{listcount}}{1}} + or ( + test {\ifdefvoid\namepartgiven} + and + test {\ifdefvoid\namepartprefix} + ) + }{}{\usebibmacro{name:revsdelim}}% }{% \ifgiveninits{% \usebibmacro{name:title-given-family}% @@ -7328,6 +7953,14 @@ rather than \pkg[biblatex]{oxref}.} \global\settoggle{blx@ox@variantname}{true}% }{% \global\settoggle{blx@ox@variantname}{false}}% + \ifboolexpe{% + test {\ifnumgreater{\value{listcount}}{1}} + or ( + test {\ifdefvoid\namepartgiven} + and + test {\ifdefvoid\namepartprefix} + ) + }{}{\usebibmacro{name:revsdelim}}% \usebibmacro{name:andothers}} % \end{macrocode} % @@ -7658,7 +8291,7 @@ rather than \pkg[biblatex]{oxref}.} % We make the punctuation between a title and \enquote{by [author]} configurable. % % \begin{macrocode} -\newcommand{\titlebyauthordelim}{\addspace} +\newcommand{\titlebyauthordelim}{\addcomma\space} % \end{macrocode} % % Following |authortitle| and |authoryear|, we redefine the |editor| and @@ -7807,7 +8440,7 @@ rather than \pkg[biblatex]{oxref}.} % native language translation of a foreign work, the original title is given % in parentheses. If the cited work is foreign translation of a native language % work, the original title is printed in square brackets, preceded by the name -% of the foreign language and \enquote{translation of}. +% of the foreign language (if appropriate) and \enquote{translation of}. % % \begin{macrocode} \DeclareFieldFormat{origtitle}{\mkbibemph{#1}} @@ -7817,8 +8450,7 @@ rather than \pkg[biblatex]{oxref}.} \printtext[parens]{\printfield{origtitle}}% }{% \printtext[brackets]{% - \printlist{language}\space - \bibstring{translationof}\space + \blx@ox@langbibstring{\printlist{language}}{translationof}\addspace \printfield{origtitle}}}}} % \end{macrocode} % @@ -7858,6 +8490,20 @@ rather than \pkg[biblatex]{oxref}.} \fi % \end{macrocode} % +% In legal references, the truncated year is at least two digits. +% +% \begin{macrocode} + \ifboolexpr{ + ( + test {\ifentrytype{jurisdiction}} + or + test {\ifentrytype{legislation}} + ) + and + test {\IfStrEq{\Result}{4}} + }{\def\Result{3}}{}% +% \end{macrocode} +% % Since \cs{Result} is the number of digits to trim from the left hand side of % the year, plus one, we provide an extra sacrificial zero before trimming. % @@ -7914,7 +8560,7 @@ rather than \pkg[biblatex]{oxref}.} \ifboolexpr{ test {\iffieldundef{year}} and - test {\iffieldundef{season}} + test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} and @@ -7944,7 +8590,7 @@ rather than \pkg[biblatex]{oxref}.} \ifboolexpr{ test {\iffieldundef{origyear}} and - test {\iffieldundef{origseason}} + test {\iffieldundef{origyeardivision}} and test {\iffieldundef{origmonth}} and @@ -8340,7 +8986,7 @@ rather than \pkg[biblatex]{oxref}.} % approach. % % We provide an option for switching between the two approaches. If active -% and an issue has no volume or issue numbers (first block), the season +% and an issue has no volume or issue numbers (first block), the year division % and date are printed bare. Otherwise (second block) they are printed % in parentheses just as in the standard version of the macro. % @@ -8356,7 +9002,7 @@ rather than \pkg[biblatex]{oxref}.} and test {\iffieldundef{year}} and - test {\iffieldundef{season}} + test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} }{}{% @@ -8608,7 +9254,8 @@ reference,mvreference,inreference]{volume}{% % \begin{macrocode} \renewbibmacro*{in:}{% \iffieldequalstr{entrysubtype}{yearbook}{}{% - \printtext{\bibstring{in}\intitlepunct}}} + \bibstring{in}% + \printunit{\intitlepunct}}} % \end{macrocode} % % Oxford style signifies formal publication by putting the relevant @@ -8743,7 +9390,7 @@ reference,mvreference,inreference]{volume}{% and test {\iffieldundef{year}} and - test {\iffieldundef{season}} + test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} }{}{% @@ -8780,7 +9427,7 @@ reference,mvreference,inreference]{volume}{% and test {\iffieldundef{year}} and - test {\iffieldundef{season}} + test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} }{}{% @@ -9651,7 +10298,7 @@ reference,mvreference,inreference]{volume}{% and test {\iffieldundef{year}} and - test {\iffieldundef{season}} + test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} }{}{% @@ -9714,7 +10361,7 @@ reference,mvreference,inreference]{volume}{% and test {\iffieldundef{year}} and - test {\iffieldundef{season}} + test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} }{}{% @@ -9762,7 +10409,7 @@ reference,mvreference,inreference]{volume}{% and test {\iffieldundef{year}} and - test {\iffieldundef{season}} + test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} }{}{% @@ -9824,10 +10471,16 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{series+type+number}% \setunit{\addspace}% \usebibmacro{institution+location+date}% - \iffieldequals{entrysubtype}{\legreport} - {\setunit{\addspace}\nopunct} - {\newunit\newblock}% - \usebibmacro{chapter+pages}% + \iffieldequals{entrysubtype}{\legreport}{% + \setunit{\addspace}\nopunct + \let\origadddot\adddot + \def\adddot{}% + \usebibmacro{chapter+pages}% + \let\adddot\origadddot + }{% + \newunit\newblock + \usebibmacro{chapter+pages}% + }% \newunit \printfield{pagetotal}% \newunit\newblock @@ -10059,13 +10712,13 @@ reference,mvreference,inreference]{volume}{% and test {\iffieldundef{year}} and - test {\iffieldundef{season}} + test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} and test {\iffieldundef{origyear}} and - test {\iffieldundef{origseason}} + test {\iffieldundef{origyeardivision}} and test {\iffieldundef{origmonth}} and @@ -10617,6 +11270,15 @@ reference,mvreference,inreference]{volume}{% \DeclareFieldFormat[jurisdiction]{titleaddon}{\mkbibparens{#1}} \DeclareFieldFormat{romanvol}{\RN{#1}} \DeclareListFormat[jurisdiction]{listb}{} +\protected\def\mkusbibordinal#1{% + \begingroup + \@tempcnta0#1\relax\number\@tempcnta + \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}% + \ifnum\@tempcnta>20 + \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}% + \fi + \ifcase\@tempcnta th\or st\or d\or d\else th\fi + \endgroup}% \DeclareFieldFormat{usseries}{\ifinteger{#1}{\mkusbibordinal{#1}}{#1}} \DeclareFieldFormat{verba}{#1} @@ -10866,9 +11528,13 @@ reference,mvreference,inreference]{volume}{% {\printfield{note}% \toggletrue{blx@ox@nopostnotedelim}}} \newbibmacro*{jurisdictionpages}{% + \let\origadddot\adddot + \def\adddot{}% \iffieldequals{entrysubtype}{\subtypenewsp}{}{% \setunit{\addspace}% - \printfield{pages}}} + \printfield{pages}}% + \let\adddot\origadddot +} \newbibmacro{pcitenote}{% \iffieldundef{parreporter}{}{% \setunit{\addcomma\space}% @@ -10908,6 +11574,8 @@ reference,mvreference,inreference]{volume}{% test {\iffieldundef{journaltitle}}% and test {\iffieldundef{number}}% + and + test {\iffieldundef{neutralcite}}% }{% \setunit{\addcomma\space}% \usebibmacro{date}% @@ -11006,8 +11674,6 @@ reference,mvreference,inreference]{volume}{% \printfield{number}}}% }{% \printtext[parens]{% - \usebibmacro{eucasetype}% - \setunit{\addnbspace}% \printfield{userb}}% \setunit{\addspace}% \iffieldundef{number}{}{% @@ -11161,6 +11827,8 @@ reference,mvreference,inreference]{volume}{% \printfield{titleaddon}% } \newbibmacro*{int:jurisdictionpages}{% + \let\origaddot\adddot + \def\adddot{}% \iffieldequals{journaltitle}{\pcijrep}{% \printtext{\bibcpstring{number}\addspace}% \iffieldundef{pages}{% @@ -11168,16 +11836,18 @@ reference,mvreference,inreference]{volume}{% }{% \printfield{pages}}% }{% - \printfield{pages}}} + \printfield{pages}}% + \let\addot\origadddot +} % \end{macrocode} % % Here is the format for Canadian cases. % % \begin{macrocode} -\newbibmacro{canjuriscitation}{% +\newbibmacro{cajuriscitation}{% \usebibmacro{title}% - \setunit{\addspace}\newblock + \setunit{\cacasetitlepunct}\newblock \printfield{number}% \setunit{\addcomma\space}% \iffieldundef{journaltitle}{}{% @@ -11225,7 +11895,7 @@ reference,mvreference,inreference]{volume}{% % \begin{macrocode} \newbibmacro{usjuriscitation}{% \usebibmacro{title}% - \setunit{\addcomma\space}\newblock% + \setunit{\uscasetitlepunct}\newblock% \iffieldundef{journaltitle}{% \printfield{number}% \setunit{\addcomma\space}% @@ -11282,6 +11952,8 @@ reference,mvreference,inreference]{volume}{% \newbibmacro{enjuriscitation}{% \usebibmacro{title}% \setunit{\addspace}\newblock + \printfield{neutralcite}% + \setunit*{\addcomma\space}% \printfield{number}% \setunit*{\addcomma\space}% \iffieldundef{journaltitle}{}{% @@ -11483,6 +12155,10 @@ reference,mvreference,inreference]{volume}{% \setunit{\addcomma\space}\newblock \printfield[default]{note} \setunit{\addspace}\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}% \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -11533,10 +12209,20 @@ reference,mvreference,inreference]{volume}{% \setunit{\addspace}% \printfield{journaltitle}% \setunit*{\addspace}% - \iffieldundef{series}{}{% - \setunit{\addspace}% + \iffieldundef{series}{% + \printfield{type}% + \setunit*{\addspace}% + }{% \printfield{series}% - \setunit{\addspace}}% + \iffieldundef{type}{% + \setunit{\addspace}% + \bibcpstring{number} + \setunit{\addspace}% + }{% + \setunit{\addcomma\space}% + }} + \printfield{number} + \setunit*{\addspace}% \printfield{pages}}}% \newbibmacro*{treaty:date}{% \ifboolexpr{ @@ -11805,7 +12491,45 @@ reference,mvreference,inreference]{volume}{% % The driver for letters is similar to the one for other unpublished materials. % % \begin{macrocode} -\DeclareBibliographyAlias{letter}{unpublished} +\DeclareBibliographyDriver{letter}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \iffieldundef{library}{\togglefalse{blx@ox@ms}}{\toggletrue{blx@ox@ms}}% + \usebibmacro{author}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \setunit{\titlebyauthordelim}\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \printfield{note}% + \iffieldundef{howpublished}{}{\nopunct\printfield{howpublished}}% + \newunit\newblock + \iftoggle{blx@ox@ms}{% + \usebibmacro{manuscript:date}% + \newunit\newblock + \usebibmacro{library+location+series+number}% + \newunit + \printfield{support}% + \newunit + \usebibmacro{dating}% + \setunit{\datingpagespunct} + \usebibmacro{manuscript:pages} + }{% + \usebibmacro{location+date}% + }% + \newunit\newblock + \iftoggle{bbx:url} + {\usebibmacro{url+urldate}} + {}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} \DeclareFieldFormat[letter]{title}{% \def\currentfield{title}% \iffieldannotation{descriptor}{#1}{\mkbibquote{#1\isdot}}% @@ -11859,6 +12583,7 @@ reference,mvreference,inreference]{volume}{% % We provide an option for setting the relatedtype punctuation. % % \begin{macrocode} +\DeclareDelimFormat{begrelateddelimamendedby}{\addcomma\space} \DeclareDelimFormat{begrelateddelimequals}{\addspace} \DeclareDelimFormat{begrelateddelimin}{\addcomma\space} \DeclareDelimFormat{begrelateddelimincludes}{\addcomma\space} @@ -11895,6 +12620,7 @@ reference,mvreference,inreference]{volume}{% \egroup \iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{% \DeclareDelimFormat{begrelateddelim}{\addspace}% + \DeclareDelimFormat{begrelateddelimamendedby}{\addspace} \DeclareDelimFormat{begrelateddelimequals}{\addspace}% \DeclareDelimFormat{begrelateddelimin}{\addspace}% \DeclareDelimFormat{begrelateddelimincludes}{\addspace}% @@ -11904,6 +12630,7 @@ reference,mvreference,inreference]{volume}{% \DeclareDelimFormat{begrelateddelimmultivolume}{\addspace}% }{% \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimamendedby}{\csuse{add#1}\space} \DeclareDelimFormat{begrelateddelimequals}{\csuse{add#1}\space}% \DeclareDelimFormat{begrelateddelimin}{\csuse{add#1}\space}% \DeclareDelimFormat{begrelateddelimincludes}{\csuse{add#1}\space}% @@ -11929,12 +12656,14 @@ reference,mvreference,inreference]{volume}{% \iftoggle{blx@ox@norelin}{% \renewbibmacro*{in:}{% \ifboolexpr{ - test {\ifnameundef{author}} - and - test {\ifnameundef{translator}} - and - test {\iffieldundef{title}} - }{}{% + test {\iffieldequalstr{entrysubtype}{yearbook}} + or ( + test {\ifnameundef{author}} + and + test {\ifnameundef{translator}} + and + test {\iffieldundef{title}} + )}{}{% \bibstring{in}% \printunit{\intitlepunct}% }}}{}% @@ -11944,8 +12673,8 @@ reference,mvreference,inreference]{volume}{% % % \subsubsection{Translations} % -% Where related item is the translation, the related string is prefaced with the -% language. +% Where the related item is the translation, the related string is (by default, +% in English at least) prefaced with the language. % % \begin{macrocode} \newbibmacro*{rellanguage}{% @@ -11955,8 +12684,11 @@ reference,mvreference,inreference]{volume}{% \docsvfield{related}% } \DeclareFieldFormat{relatedstring:translationof}{% - \usebibmacro{rellanguage}\space - \bibstring{original}\addcomma\space} + \iffieldundef{relatedstring}{% + \blx@ox@langbibstring{\usebibmacro{rellanguage}}{original}% + \printunit{\addcomma\space} + }{% + \thefield{relatedstring}\printunit{\relatedpunct}}} \DeclareFieldFormat{related:translationof}{% \mkbibbrackets{#1}} @@ -12442,10 +13174,10 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] \step[fieldsource=title, - match=\regexp{\.(\D)}, + match=\regexp{(?:\A|[^{])\K\.([^\d}])}, replace=\regexp{$1}] \step [fieldsource=title, - match=\regexp{(\D)\.}, + match=\regexp{([^\d{])\.(?![}])}, replace=\regexp{$1}] \step[fieldsource=shorttitle, match=\regexp{(\d)\.(\d)}, @@ -12454,10 +13186,10 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] \step[fieldsource=shorttitle, - match=\regexp{\.(\D)}, + match=\regexp{(?:\A|[^{])\K\.([^\d}])}, replace=\regexp{$1}] \step [fieldsource=shorttitle, - match=\regexp{(\D)\.}, + match=\regexp{([^\d{])\.(?![}])}, replace=\regexp{$1}] \step[fieldsource=parreporter, match=\regexp{(\d)\.(\d)}, @@ -12466,10 +13198,10 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] \step[fieldsource=parreporter, - match=\regexp{\.(\D)}, + match=\regexp{(?:\A|[^{])\K\.([^\d}])}, replace=\regexp{$1}] \step [fieldsource=parreporter, - match=\regexp{(\D)\.}, + match=\regexp{([^\d{])\.(?![}])}, replace=\regexp{$1}] \step[fieldsource=journaltitle, match=\regexp{(\d)\.(\d)}, @@ -12478,10 +13210,10 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] \step[fieldsource=journaltitle, - match=\regexp{\.(\D)}, + match=\regexp{(?:\A|[^{])\K\.([^\d}])}, replace=\regexp{$1}] \step [fieldsource=journaltitle, - match=\regexp{(\D)\.}, + match=\regexp{([^\d{])\.(?![}])}, replace=\regexp{$1}] \step[fieldsource=institution, match=\regexp{(\d)\.(\d)}, @@ -12490,10 +13222,10 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] \step[fieldsource=institution, - match=\regexp{\.(\D)}, + match=\regexp{(?:\A|[^{])\K\.([^\d}])}, replace=\regexp{$1}] \step[fieldsource=institution, - match=\regexp{(\D)\.}, + match=\regexp{([^\d{])\.(?![}])}, replace=\regexp{$1}] \step[fieldsource=publisher, match=\regexp{(\d)\.(\d)}, @@ -12502,10 +13234,10 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] \step[fieldsource=publisher, - match=\regexp{\.(\D)}, + match=\regexp{(?:\A|[^{])\K\.([^\d}])}, replace=\regexp{$1}] \step [fieldsource=publisher, - match=\regexp{(\D)\.}, + match=\regexp{([^\d{])\.(?![}])}, replace=\regexp{$1}] \step[fieldsource=location, match=\regexp{(\d)\.(\d)}, @@ -12514,10 +13246,10 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] \step[fieldsource=location, - match=\regexp{\.(\D)}, + match=\regexp{(?:\A|[^{])\K\.([^\d}])}, replace=\regexp{$1}] \step [fieldsource=location, - match=\regexp{(\D)\.}, + match=\regexp{([^\d{])\.(?![}])}, replace=\regexp{$1}] \step[fieldsource=series, match=\regexp{(\d)\.(\d)}, @@ -12526,10 +13258,10 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] \step[fieldsource=series, - match=\regexp{\.(\D)}, + match=\regexp{(?:\A|[^{])\K\.([^\d}])}, replace=\regexp{$1}] \step [fieldsource=series, - match=\regexp{(\D)\.}, + match=\regexp{([^\d{])\.(?![}])}, replace=\regexp{$1}] \step[fieldsource=indextitle, match=\regexp{(\d)\.(\d)}, @@ -12538,10 +13270,10 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] \step[fieldsource=indextitle, - match=\regexp{\.(\D)}, + match=\regexp{(?:\A|[^{])\K\.([^\d}])}, replace=\regexp{$1}] \step [fieldsource=indextitle, - match=\regexp{(\D)\.}, + match=\regexp{([^\d{])\.(?![}])}, replace=\regexp{$1}] } % \end{macrocode} @@ -12563,7 +13295,8 @@ reference,mvreference,inreference]{volume}{% % \subsection{Sorting schemes} % % We adjust the sort order to take into account some other fields that might -% end up at the front (library, collection, series). +% end up at the front (library, collection, series). The `|nty|` scheme is used +% by \textsf{oxnotes}. % % \begin{macrocode} \DeclareSortingTemplate{nty}{ @@ -12602,7 +13335,11 @@ reference,mvreference,inreference]{volume}{% \field{series} } } - +% \end{macrocode} +% +% The `|nyt|` scheme is used by \textsf{oxyear}. +% +% \begin{macrocode} \DeclareSortingTemplate{nyt}{ \sort{ \field{presort} @@ -12621,6 +13358,7 @@ reference,mvreference,inreference]{volume}{% } \sort{ \field{sortyear} + \field{labelyear} \field{year} } \sort{ @@ -12639,7 +13377,11 @@ reference,mvreference,inreference]{volume}{% \field{series} } } - +% \end{macrocode} +% +% The `|anyt|` scheme is used by \textsf{oxalph}. +% +% \begin{macrocode} \DeclareSortingTemplate{anyt}{ \sort{ \field{presort} @@ -12661,6 +13403,7 @@ reference,mvreference,inreference]{volume}{% } \sort{ \field{sortyear} + \field{labelyear} \field{year} } \sort{ @@ -13052,13 +13795,13 @@ reference,mvreference,inreference]{volume}{% \printfield{issue}\clearfield{issue}% \setunit*{\addspace}% \printdateextra}% - \clearfield{year}\clearfield{season}\clearfield{month}\clearfield{day}% + \clearfield{year}\clearfield{yeardivision}\clearfield{month}\clearfield{day}% }{% \iflabeldateisanydate{% \printtext[datelabel]{% \csuse{print\thefield{labeldatesource}dateextra}}% \clearfield{\thefield{labeldatesource}year}% - \clearfield{\thefield{labeldatesource}season}% + \clearfield{\thefield{labeldatesource}yeardivision}% \clearfield{\thefield{labeldatesource}month}% \clearfield{\thefield{labeldatesource}day}% }{% @@ -13078,13 +13821,13 @@ reference,mvreference,inreference]{volume}{% \iffieldundef{labelyear}{}{% \iflabeldateisdate{% \printtext[datelabel]{\printdateextra}% - \clearfield{year}\clearfield{season}\clearfield{month}\clearfield{day}% + \clearfield{year}\clearfield{yeardivision}\clearfield{month}\clearfield{day}% }{% \iflabeldateisanydate{% \printtext[datelabel]{% \csuse{print\thefield{labeldatesource}dateextra}}% \clearfield{\thefield{labeldatesource}year}% - \clearfield{\thefield{labeldatesource}season}% + \clearfield{\thefield{labeldatesource}yeardivision}% \clearfield{\thefield{labeldatesource}month}% \clearfield{\thefield{labeldatesource}day}% }{% @@ -13206,26 +13949,26 @@ reference,mvreference,inreference]{volume}{% % \begin{macrocode} \newrobustcmd*{\mknoyeardaterangefull}[2]{% \iffieldundef{#2month}{}{% - \datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season}{% - \csuse{mkbibdate#1}{}{#2month}{#2day}% - \blx@printtime{#2}{}% - }{% - \csuse{mkbibseasondate#1}{}{#2season}}% - \dateuncertainprint - \iffieldundef{#2endmonth}{}{% - \iffieldequalstr{#2endmonth}{}{% - \mbox{\bibdaterangesep}% + \printtext[{#2date}]{% + \datecircaprint + \iffieldundef{#2yeardivision}{% + \csuse{mkbibdate#1}{}{#2month}{#2day}% + \blx@printtime{#2}{}% }{% - \bibdaterangesep - \enddatecircaprint - \iffieldundef{#2season}{% - \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}% - \blx@printtime{#2}{end}% + \csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}}% + \dateuncertainprint + \iffieldundef{#2endmonth}{}{% + \iffieldequalstr{#2endmonth}{}{% + \mbox{\bibdaterangesep}% }{% - \csuse{mkbibseasondate#1}{}{#2endseason}}% - \enddateuncertainprint}}}}} + \bibdaterangesep + \enddatecircaprint + \iffieldundef{#2yeardivision}{% + \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}% + \blx@printtime{#2}{end}% + }{% + \csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}}% + \enddateuncertainprint}}}}} % \end{macrocode} % % There is a potential problem for \cs{mknoyeardaterangetrunc}, in that if @@ -13237,11 +13980,11 @@ reference,mvreference,inreference]{volume}{% % \begin{macrocode} \newrobustcmd*{\mknoyeardaterangetrunc}[2]{% \iffieldundef{#2month}{}{% - \datecircaprint - \printtext[#2date]{% - \iffieldundef{#2season}{% + \printtext[{#2date}]{% + \datecircaprint + \iffieldundef{#2yeardivision}{% \ifboolexpr{ - test {\iffieldsequal{labelyear}{labelendyear}} + test {\ifdateyearsequal{label}{labelend}} and test {\iffieldsequal{#2month}{#2endmonth}} }{% @@ -13249,7 +13992,7 @@ reference,mvreference,inreference]{volume}{% }{% \csuse{mkbibdate#1}{}{#2month}{#2day}}% }{% - \csuse{mkbibseasondate#1}{}{#2season}}% + \csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}}% \dateuncertainprint \iffieldundef{#2endmonth}{}{% \iffieldequalstr{#2endmonth}{}{% @@ -13257,10 +14000,10 @@ reference,mvreference,inreference]{volume}{% }{% \bibdaterangesep \enddatecircaprint - \iffieldundef{#2season}{% + \iffieldundef{#2yeardivision}{% \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}% }{% - \csuse{mkbibseasondate#1}{}{#2endseason}}% + \csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}}% \enddateuncertainprint}}}}} % \end{macrocode} % @@ -13560,7 +14303,7 @@ reference,mvreference,inreference]{volume}{% \iffieldundef{year}% }{% \ifboolexpr{ - test {\iffieldundef{season}} + test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} }% @@ -14220,11 +14963,12 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=literal]{% + parreporter,parseries,neutralcite} \DeclareDatamodelFields[type=field,datatype=integer]{parvolume} \DeclareDatamodelFields[type=field,datatype=range]{parpages} -\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% - parvolume,parpages} +\DeclareDatamodelEntryfields[jurisdiction]{neutralcite,pardate,% + parreporter,parseries,parvolume,parpages} % \end{macrocode} % % \iffalse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14243,20 +14987,17 @@ reference,mvreference,inreference]{volume}{% % \setcounter{FancyVerbLine}{19} % % Here we set some language-specific punctuation and date formatting. +% In particular, we set \cs{blx@ox@langbibstring} to use its first +% argument. % % \begin{macrocode} \InheritBibliographyExtras{english} \DeclareBibliographyExtras{% \def\finalandcomma{\addcomma}% - \protected\def\mkusbibordinal#1{% - \begingroup - \@tempcnta0#1\relax\number\@tempcnta - \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}% - \ifnum\@tempcnta>20 - \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}% - \fi - \ifcase\@tempcnta th\or st\or d\or d\else th\fi - \endgroup}% + \def\blx@ox@langbibstring#1#2{#1\addspace\bibstring{#2}}% +} +\UndeclareBibliographyExtras{% + \def\blx@ox@langbibstring#1#2{\bibstring{#2}}% } % \end{macrocode} % @@ -14317,6 +15058,7 @@ reference,mvreference,inreference]{volume}{% suppto = {{Supplement to}{Supplement to}}, equals = {{=}{=}}, original = {{original}{orig\adddot}}, + amendedby = {{as amended by}{as amended by}}, % \end{macrocode} % % \begin{itemize} @@ -14431,7 +15173,7 @@ reference,mvreference,inreference]{volume}{% suplayer = {{superior layer}{sup\adddotspace lay\adddot}}, paper = {{paper}{pap\adddot}}, papyrus = {{papyrus}{papy\adddot}}, - pergament = {{pergament}{perg\adddot}}, + parchment = {{parchment}{parch\adddot}}, eucase = {{Case}{Case}}, eujoinedcases = {{Joined Cases}{Joined Cases}}, commissiondecision = {{Commission Decision}{Commission Decision}}, @@ -14655,11 +15397,16 @@ reference,mvreference,inreference]{volume}{% % \end{macrocode} % % As you'd expect from an Oxford style, we use the Oxford comma, and use a -% period as the time separator. +% period as the time separator. The redefinition of \cs{blx@ox@langbibstring} +% is given here as well. % % \begin{macrocode} \def\finalandcomma{\addcomma}% \def\bibtimesep{\addperiod}% + \def\blx@ox@langbibstring#1#2{#1\addspace\bibstring{#2}}% +} +\UndeclareBibliographyExtras{% + \def\blx@ox@langbibstring#1#2{\bibstring{#2}}% } % \end{macrocode} % diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf Binary files differindex 3daf20e3ce..64d0e7f5de 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxref.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf Binary files differindex 7492f2c4b1..a03712a1aa 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-oxref/oxyear-doc.pdf diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md index e4bea1dc23..8add0a64e9 100644 --- a/macros/latex/contrib/l3kernel/CHANGELOG.md +++ b/macros/latex/contrib/l3kernel/CHANGELOG.md @@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-02-01] + +### Fixed +- Allow for expressions within color `RGB`/`HSB` input + ## [2023-01-24] ### Added @@ -1274,7 +1279,8 @@ this project uses date-based 'snapshot' version identifiers. - Step functions have been added for dim variables, e.g. `\dim_step_inline:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2023-01-24...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2023-02-01...HEAD +[2023-02-01]: https://github.com/latex3/latex3/compare/2023-01-24...2023-02-01 [2023-01-24]: https://github.com/latex3/latex3/compare/2023-01-16...2023-01-24 [2023-01-16]: https://github.com/latex3/latex3/compare/2022-12-17...2023-01-16 [2022-12-17]: https://github.com/latex3/latex3/compare/2022-11-02...2022-12-17 diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md index e5354b3721..5b6a75e4b2 100644 --- a/macros/latex/contrib/l3kernel/README.md +++ b/macros/latex/contrib/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2023-01-24 +Release 2023-02-01 Overview -------- diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx index 20477df6ab..8a6c15f8d8 100644 --- a/macros/latex/contrib/l3kernel/expl3.dtx +++ b/macros/latex/contrib/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> %</driver|generic|package|2ekernel> -\def\ExplFileDate{2023-01-24}% +\def\ExplFileDate{2023-02-01}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf Binary files differindex fbd84e6cbc..94df632a7b 100644 --- a/macros/latex/contrib/l3kernel/expl3.pdf +++ b/macros/latex/contrib/l3kernel/expl3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf Binary files differindex 4036c88f84..7d61546402 100644 --- a/macros/latex/contrib/l3kernel/interface3.pdf +++ b/macros/latex/contrib/l3kernel/interface3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex index 7608abd885..b035749e48 100644 --- a/macros/latex/contrib/l3kernel/interface3.tex +++ b/macros/latex/contrib/l3kernel/interface3.tex @@ -54,7 +54,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2023-01-24} +\date{Released 2023-02-01} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx index a67333c13e..2cac0454f9 100644 --- a/macros/latex/contrib/l3kernel/l3basics.dtx +++ b/macros/latex/contrib/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index d0a82dd956..9aa9616eac 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx index 64e7dfc921..ab7d9eb05a 100644 --- a/macros/latex/contrib/l3kernel/l3box.dtx +++ b/macros/latex/contrib/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx index 691215f2ec..922f70f9e0 100644 --- a/macros/latex/contrib/l3kernel/l3candidates.dtx +++ b/macros/latex/contrib/l3kernel/l3candidates.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx index 7fb9f6baa5..8849bb89f2 100644 --- a/macros/latex/contrib/l3kernel/l3cctab.dtx +++ b/macros/latex/contrib/l3kernel/l3cctab.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx index 9cbe851c27..89333e2e12 100644 --- a/macros/latex/contrib/l3kernel/l3clist.dtx +++ b/macros/latex/contrib/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx index c14f49b957..95776f1c2c 100644 --- a/macros/latex/contrib/l3kernel/l3coffins.dtx +++ b/macros/latex/contrib/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3color.dtx b/macros/latex/contrib/l3kernel/l3color.dtx index 6cda94918c..cbc0016786 100644 --- a/macros/latex/contrib/l3kernel/l3color.dtx +++ b/macros/latex/contrib/l3kernel/l3color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % @@ -1150,7 +1150,7 @@ { rgb } { \exp_args:Ne \@@_parse_model_hsb_aux:nnn - { \fp_eval:n { 6 * #1 } } {#2} {#3} + { \fp_eval:n { 6 * (#1) } } {#2} {#3} } } \cs_new:Npn \@@_parse_model_hsb_aux:nnn #1#2#3 @@ -1183,9 +1183,9 @@ \cs_new:Npn \@@_parse_model_HSB:w #1 , #2 , #3 , #4 \s_@@_stop { \exp_args:Neee \@@_parse_model_hsb:nnn - { \fp_eval:n {#1 / 240} } - { \fp_eval:n {#2 / 240} } - { \fp_eval:n {#3 / 240} } + { \fp_eval:n { round((#1) / 240,5) } } + { \fp_eval:n { round((#2) / 240,5) } } + { \fp_eval:n { round((#3) / 240,5) } } } \cs_new:Npn \@@_parse_model_HTML:w #1 , #2 \s_@@_stop { \@@_parse_model_HTML_aux:w #1 0 0 0 0 0 0 \s_@@_stop } @@ -1202,9 +1202,9 @@ { { rgb } { - \fp_eval:n { round(#1 / 255,5) } ~ - \fp_eval:n { round(#2 / 255,5) } ~ - \fp_eval:n { round(#3 / 255,5) } + \fp_eval:n { round((#1) / 255,5) } ~ + \fp_eval:n { round((#2) / 255,5) } ~ + \fp_eval:n { round((#3) / 255,5) } } } % \end{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx index 7064010a76..cb9f0eaef8 100644 --- a/macros/latex/contrib/l3kernel/l3debug.dtx +++ b/macros/latex/contrib/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index b2383fc2d6..4897c82ffd 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx index fb79aabdab..92242c8ad0 100644 --- a/macros/latex/contrib/l3kernel/l3doc.dtx +++ b/macros/latex/contrib/l3kernel/l3doc.dtx @@ -85,7 +85,7 @@ and all files in that bundle must be distributed together. % require you to do updates, if the class changes.}} % % \author{\Team} -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % \maketitle % \tableofcontents % diff --git a/macros/latex/contrib/l3kernel/l3doc.pdf b/macros/latex/contrib/l3kernel/l3doc.pdf Binary files differindex 7f0751f545..1add24cba3 100644 --- a/macros/latex/contrib/l3kernel/l3doc.pdf +++ b/macros/latex/contrib/l3kernel/l3doc.pdf diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx index 162cafb650..f4b5db81d1 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.dtx +++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf Binary files differindex 1de7fd29c2..3943532829 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.pdf +++ b/macros/latex/contrib/l3kernel/l3docstrip.pdf diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx index cb01da408f..7a770bf4de 100644 --- a/macros/latex/contrib/l3kernel/l3expan.dtx +++ b/macros/latex/contrib/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx index de1af91fa6..0c7a282d66 100644 --- a/macros/latex/contrib/l3kernel/l3file.dtx +++ b/macros/latex/contrib/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx index 8dde6fe7a6..b7df2c8f76 100644 --- a/macros/latex/contrib/l3kernel/l3flag.dtx +++ b/macros/latex/contrib/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx index 11326e5852..9bcd05e4b9 100644 --- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx index d9bca921ce..ce42026c3c 100644 --- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx index d6d6985101..b364be6203 100644 --- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx index 2e7482ca85..d914f3dc1c 100644 --- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx index 91959a5766..8fe86e7038 100644 --- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx index 009edc62a8..a7a9b8da47 100644 --- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx index c6908c53e1..897d7c3bbf 100644 --- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx index 86396c9d68..2913584e13 100644 --- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx index 2c6a9bfa8c..8a954d4d02 100644 --- a/macros/latex/contrib/l3kernel/l3fp-random.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx index 8eae112b79..9a4b5405e7 100644 --- a/macros/latex/contrib/l3kernel/l3fp-round.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx index 34a9a4afbf..c4c785f422 100644 --- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx index bc0d7aa98c..1957dd6778 100644 --- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx index a8b506aa0a..c619c0cd6a 100644 --- a/macros/latex/contrib/l3kernel/l3fp.dtx +++ b/macros/latex/contrib/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx index db4697d6e6..a7e62de3c8 100644 --- a/macros/latex/contrib/l3kernel/l3fparray.dtx +++ b/macros/latex/contrib/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx index b208fc179d..319905e221 100644 --- a/macros/latex/contrib/l3kernel/l3int.dtx +++ b/macros/latex/contrib/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx index 51124f232b..fcbd4f505f 100644 --- a/macros/latex/contrib/l3kernel/l3intarray.dtx +++ b/macros/latex/contrib/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx index 3dbb07e618..aa543dc8ed 100644 --- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx index f4fbb8a73b..91c043c6b6 100644 --- a/macros/latex/contrib/l3kernel/l3keys.dtx +++ b/macros/latex/contrib/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx index 02f5f0b84b..20c3706ede 100644 --- a/macros/latex/contrib/l3kernel/l3legacy.dtx +++ b/macros/latex/contrib/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx index 433d2a2573..5970ee2354 100644 --- a/macros/latex/contrib/l3kernel/l3luatex.dtx +++ b/macros/latex/contrib/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx index a8020d025d..28d0e56972 100644 --- a/macros/latex/contrib/l3kernel/l3msg.dtx +++ b/macros/latex/contrib/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx index b3a30158f4..fca2466a9f 100644 --- a/macros/latex/contrib/l3kernel/l3names.dtx +++ b/macros/latex/contrib/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf Binary files differindex d34f4618a4..2c0fceb45e 100644 --- a/macros/latex/contrib/l3kernel/l3news.pdf +++ b/macros/latex/contrib/l3kernel/l3news.pdf diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf Binary files differindex 8b51ee3664..d4a38db1e9 100644 --- a/macros/latex/contrib/l3kernel/l3news01.pdf +++ b/macros/latex/contrib/l3kernel/l3news01.pdf diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf Binary files differindex 64f0bf8154..575ff85229 100644 --- a/macros/latex/contrib/l3kernel/l3news02.pdf +++ b/macros/latex/contrib/l3kernel/l3news02.pdf diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf Binary files differindex f58f57ab86..d898cf453e 100644 --- a/macros/latex/contrib/l3kernel/l3news03.pdf +++ b/macros/latex/contrib/l3kernel/l3news03.pdf diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf Binary files differindex 91f36ea7a5..74923e5b0e 100644 --- a/macros/latex/contrib/l3kernel/l3news04.pdf +++ b/macros/latex/contrib/l3kernel/l3news04.pdf diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf Binary files differindex adda3bf11c..71725e6e97 100644 --- a/macros/latex/contrib/l3kernel/l3news05.pdf +++ b/macros/latex/contrib/l3kernel/l3news05.pdf diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf Binary files differindex fe7fa91ee9..ee37c0638b 100644 --- a/macros/latex/contrib/l3kernel/l3news06.pdf +++ b/macros/latex/contrib/l3kernel/l3news06.pdf diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf Binary files differindex 9619cb2c04..65b1ae9db7 100644 --- a/macros/latex/contrib/l3kernel/l3news07.pdf +++ b/macros/latex/contrib/l3kernel/l3news07.pdf diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf Binary files differindex 113a54209c..dc806a6d8a 100644 --- a/macros/latex/contrib/l3kernel/l3news08.pdf +++ b/macros/latex/contrib/l3kernel/l3news08.pdf diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf Binary files differindex a1f79e3f88..ff2aa73d49 100644 --- a/macros/latex/contrib/l3kernel/l3news09.pdf +++ b/macros/latex/contrib/l3kernel/l3news09.pdf diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf Binary files differindex 347446613e..b5701d7e8f 100644 --- a/macros/latex/contrib/l3kernel/l3news10.pdf +++ b/macros/latex/contrib/l3kernel/l3news10.pdf diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf Binary files differindex 5f6993d5f5..67aed46a9d 100644 --- a/macros/latex/contrib/l3kernel/l3news11.pdf +++ b/macros/latex/contrib/l3kernel/l3news11.pdf diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf Binary files differindex b2d4c4d58f..15ea7573ea 100644 --- a/macros/latex/contrib/l3kernel/l3news12.pdf +++ b/macros/latex/contrib/l3kernel/l3news12.pdf diff --git a/macros/latex/contrib/l3kernel/l3pdf.dtx b/macros/latex/contrib/l3kernel/l3pdf.dtx index be7c366ef5..f4261f3f39 100644 --- a/macros/latex/contrib/l3kernel/l3pdf.dtx +++ b/macros/latex/contrib/l3kernel/l3pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf Binary files differindex 6528db5c18..737736e8a8 100644 --- a/macros/latex/contrib/l3kernel/l3prefixes.pdf +++ b/macros/latex/contrib/l3kernel/l3prefixes.pdf diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx index 752f1d8a34..67d853b49a 100644 --- a/macros/latex/contrib/l3kernel/l3prg.dtx +++ b/macros/latex/contrib/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx index d672f16049..f46714ad13 100644 --- a/macros/latex/contrib/l3kernel/l3prop.dtx +++ b/macros/latex/contrib/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx index 1179f0d0c4..e3c0f577b9 100644 --- a/macros/latex/contrib/l3kernel/l3quark.dtx +++ b/macros/latex/contrib/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx index 15cacbe65c..f162557a98 100644 --- a/macros/latex/contrib/l3kernel/l3regex.dtx +++ b/macros/latex/contrib/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx index c5c3762183..c987f18d26 100644 --- a/macros/latex/contrib/l3kernel/l3seq.dtx +++ b/macros/latex/contrib/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx index ec8e13958d..84516eb0b7 100644 --- a/macros/latex/contrib/l3kernel/l3skip.dtx +++ b/macros/latex/contrib/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx index 218355f679..74f16614dd 100644 --- a/macros/latex/contrib/l3kernel/l3sort.dtx +++ b/macros/latex/contrib/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx index 2ae9043517..1ee624ee62 100644 --- a/macros/latex/contrib/l3kernel/l3str-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx index 8fd858e5ef..02f6d65df6 100644 --- a/macros/latex/contrib/l3kernel/l3str.dtx +++ b/macros/latex/contrib/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf Binary files differindex 88b1d321aa..792a2418eb 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.pdf +++ b/macros/latex/contrib/l3kernel/l3styleguide.pdf diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex index b1eeda0c9e..21ff9971a5 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.tex +++ b/macros/latex/contrib/l3kernel/l3styleguide.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2023-01-24} +\date{Released 2023-02-01} \begin{document} diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf Binary files differindex d35865020d..be67eb0302 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex index d72444c0a9..ddf696a1d5 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2023-01-24} +\date{Released 2023-02-01} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx index 4820317747..3baec0bd4d 100644 --- a/macros/latex/contrib/l3kernel/l3sys.dtx +++ b/macros/latex/contrib/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf Binary files differindex af5414dd9b..8df79c02d6 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.pdf +++ b/macros/latex/contrib/l3kernel/l3term-glossary.pdf diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex index 26bdd5ddda..222b808d93 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.tex +++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2023-01-24} +\date{Released 2023-02-01} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx index b405100b79..27e8395224 100644 --- a/macros/latex/contrib/l3kernel/l3text-case.dtx +++ b/macros/latex/contrib/l3kernel/l3text-case.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % @@ -1368,7 +1368,6 @@ } \cs_new:Npn \@@_change_case_boundary_upper_el:nnnN #1#2#3#4 { - \MARJ \bool_lazy_or:nnTF { \token_if_letter_p:N #4 } { diff --git a/macros/latex/contrib/l3kernel/l3text-map.dtx b/macros/latex/contrib/l3kernel/l3text-map.dtx index 1d2c3a47e0..9f015a43cd 100644 --- a/macros/latex/contrib/l3kernel/l3text-map.dtx +++ b/macros/latex/contrib/l3kernel/l3text-map.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx index 9c6e391bf8..89c5022af5 100644 --- a/macros/latex/contrib/l3kernel/l3text-purify.dtx +++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx index adaf98274c..a5a50d569b 100644 --- a/macros/latex/contrib/l3kernel/l3text.dtx +++ b/macros/latex/contrib/l3kernel/l3text.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx index 2bc1938072..c5ef954995 100644 --- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx index 5bf059a678..c4e34f91e5 100644 --- a/macros/latex/contrib/l3kernel/l3tl.dtx +++ b/macros/latex/contrib/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx index 8a1ca75599..654cf2d8f8 100644 --- a/macros/latex/contrib/l3kernel/l3token.dtx +++ b/macros/latex/contrib/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx index 27bf195fc6..3cc7f2d22e 100644 --- a/macros/latex/contrib/l3kernel/l3unicode.dtx +++ b/macros/latex/contrib/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-01-24} +% \date{Released 2023-02-01} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf Binary files differindex e1e7603896..4574dd866e 100644 --- a/macros/latex/contrib/l3kernel/source3.pdf +++ b/macros/latex/contrib/l3kernel/source3.pdf diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex index 02c9a23511..042157365b 100644 --- a/macros/latex/contrib/l3kernel/source3.tex +++ b/macros/latex/contrib/l3kernel/source3.tex @@ -53,7 +53,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2023-01-24} +\date{Released 2023-02-01} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3packages/CHANGELOG.md b/macros/latex/contrib/l3packages/CHANGELOG.md index 6ad508a7f3..6af289ef1e 100644 --- a/macros/latex/contrib/l3packages/CHANGELOG.md +++ b/macros/latex/contrib/l3packages/CHANGELOG.md @@ -7,6 +7,14 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-02-01] + +### Added +- `\DeclareInstanceCopy` + +### Changes +- Set only known keys in `\SetTemplateKeys` + ## [2023-01-16] ### Fixed @@ -214,7 +222,8 @@ this project uses date-based 'snapshot' version identifiers. - Switch to ISO date format - Improve cross-module use of internal functions -[Unreleased]: https://github.com/latex3/latex3/compare/2023-01-16...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2023-02-01...HEAD +[2023-02-01]: https://github.com/latex3/latex3/compare/2023-01-16...2023-02-01 [2023-01-16]: https://github.com/latex3/latex3/compare/2022-12-17...2023-01-16 [2022-12-17]: https://github.com/latex3/latex3/compare/2022-06-22...2022-12-17 [2022-06-22]: https://github.com/latex3/latex3/compare/2022-06-16...2022-06-22 diff --git a/macros/latex/contrib/l3packages/README.md b/macros/latex/contrib/l3packages/README.md index bd73e2a0be..95e8deca21 100644 --- a/macros/latex/contrib/l3packages/README.md +++ b/macros/latex/contrib/l3packages/README.md @@ -1,7 +1,7 @@ LaTeX3 High-Level Concepts ========================== -Release 2023-01-16 +Release 2023-02-01 Overview -------- diff --git a/macros/latex/contrib/l3packages/l3keys2e.dtx b/macros/latex/contrib/l3packages/l3keys2e.dtx index e72854c2f1..599f68f54f 100644 --- a/macros/latex/contrib/l3packages/l3keys2e.dtx +++ b/macros/latex/contrib/l3packages/l3keys2e.dtx @@ -62,7 +62,7 @@ % }^^A % } % -% \date{Released 2023-01-16} +% \date{Released 2023-02-01} % % \maketitle % @@ -154,7 +154,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3keys2e}{2023-01-16}{} +\ProvidesExplPackage{l3keys2e}{2023-02-01}{} {LaTeX2e option processing using LaTeX3 keys} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/l3keys2e.pdf b/macros/latex/contrib/l3packages/l3keys2e.pdf Binary files differindex 9455410190..2b68217a40 100644 --- a/macros/latex/contrib/l3packages/l3keys2e.pdf +++ b/macros/latex/contrib/l3packages/l3keys2e.pdf diff --git a/macros/latex/contrib/l3packages/xfp.dtx b/macros/latex/contrib/l3packages/xfp.dtx index 836c5e3b55..16c975e049 100644 --- a/macros/latex/contrib/l3packages/xfp.dtx +++ b/macros/latex/contrib/l3packages/xfp.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2023-01-16} +% \date{Released 2023-02-01} % % \maketitle % @@ -171,7 +171,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfp}{2023-01-16}{} +\ProvidesExplPackage{xfp}{2023-02-01}{} {L3 Floating point unit} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/xfp.pdf b/macros/latex/contrib/l3packages/xfp.pdf Binary files differindex f33457d2d9..7c90dbe0a8 100644 --- a/macros/latex/contrib/l3packages/xfp.pdf +++ b/macros/latex/contrib/l3packages/xfp.pdf diff --git a/macros/latex/contrib/l3packages/xfrac.dtx b/macros/latex/contrib/l3packages/xfrac.dtx index 596d639f4c..f09029f9ef 100644 --- a/macros/latex/contrib/l3packages/xfrac.dtx +++ b/macros/latex/contrib/l3packages/xfrac.dtx @@ -65,7 +65,7 @@ % }^^A % } % -% \date{Released 2023-01-16} +% \date{Released 2023-02-01} % % \maketitle % @@ -535,7 +535,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfrac}{2023-01-16}{} +\ProvidesExplPackage{xfrac}{2023-02-01}{} {L3 Experimental split-level fractions} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/xfrac.pdf b/macros/latex/contrib/l3packages/xfrac.pdf Binary files differindex b61304d37e..d1995a4d6a 100644 --- a/macros/latex/contrib/l3packages/xfrac.pdf +++ b/macros/latex/contrib/l3packages/xfrac.pdf diff --git a/macros/latex/contrib/l3packages/xparse.dtx b/macros/latex/contrib/l3packages/xparse.dtx index 97dd2f8fd9..15981e5210 100644 --- a/macros/latex/contrib/l3packages/xparse.dtx +++ b/macros/latex/contrib/l3packages/xparse.dtx @@ -67,7 +67,7 @@ % }^^A % } % -% \date{Released 2023-01-16} +% \date{Released 2023-02-01} % % \maketitle % @@ -1064,7 +1064,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xparse}{2023-01-16}{} +\ProvidesExplPackage{xparse}{2023-02-01}{} {L3 Experimental document command parser} % \end{macrocode} % diff --git a/macros/latex/contrib/l3packages/xparse.pdf b/macros/latex/contrib/l3packages/xparse.pdf Binary files differindex f0cf92604c..16140647f9 100644 --- a/macros/latex/contrib/l3packages/xparse.pdf +++ b/macros/latex/contrib/l3packages/xparse.pdf diff --git a/macros/latex/contrib/l3packages/xtemplate.dtx b/macros/latex/contrib/l3packages/xtemplate.dtx index eb9ae86e94..42d00c8657 100644 --- a/macros/latex/contrib/l3packages/xtemplate.dtx +++ b/macros/latex/contrib/l3packages/xtemplate.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2023-01-16} +% \date{Released 2023-02-01} % % \maketitle % @@ -475,6 +475,15 @@ % then inserts the appropriate code into the input stream. % \end{function} % +% \begin{function}{\DeclareInstanceCopy} +% \begin{syntax} +% \cs{DeclareInstanceCopy} +% ~~\Arg{object type} \Arg{instance1} \Arg{instance2} +% \end{syntax} +% Copies the \meta{values} for \meta{instance1} for an +% \meta{object type} to \meta{instance2}. +% \end{function} +% % \section{Document interface} % % After the instances have been chosen, document commands must be @@ -702,7 +711,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xtemplate}{2023-01-16}{} +\ProvidesExplPackage{xtemplate}{2023-02-01}{} {L3 Experimental prototype document functions} % \end{macrocode} % @@ -1987,6 +1996,27 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\@@_copy_instance:nnnn} +% Copy--paste an instance +% \begin{macrocode} +\cs_new_protected:Npn \@@_copy_instance:nnnn #1#2#3#4 + { + \@@_if_instance_exist:nnnTF {#1} {#2} {#3} + { + \@@_recover_values:n { #1 / #2 / #3 } + \@@_store_values:n { #1 / #2 / #4 } + \cs_set_eq:cc { \c_@@_instances_root_tl #1 / #2 / #4 } + { \c_@@_instances_root_tl #1 / #2 / #3 } + } + { + \msg_error:nnxx { xtemplate } { unknown-instance } + {#1} {#3} + } + } +% \end{macrocode} +% \end{macro} +% +% % \begin{macro}{\@@_edit_instance:nnnn} % \begin{macro}{\@@_edit_instance_aux:nnnnn} % \begin{macro}{\@@_edit_instance_aux:nonnn} @@ -1994,7 +2024,7 @@ % variation is the source of the values to use. When editing, they are % recovered from the previous instance run. % \begin{macrocode} -\cs_new_protected:Npn \@@_edit_instance:nnnn #1#2#3 +\cs_new_protected:Npn \@@_edit_instance:nnnn #1#2#3#4 { \@@_if_instance_exist:nnnTF {#1} {#2} {#3} { @@ -2002,7 +2032,7 @@ \prop_get:NnN \l_@@_values_prop { from~template } \l_@@_tmp_tl \@@_edit_instance_aux:nonnn {#1} \l_@@_tmp_tl - {#2} {#3} + {#2} {#3} {#4} } { \msg_error:nnxx { xtemplate } { unknown-instance } @@ -2783,6 +2813,7 @@ % \begin{macro}{\EditTemplateDefaults} % \begin{macro}{\DeclareInstance} % \begin{macro}{\DeclareCollectionInstance} +% \begin{macro}{\DeclareInstanceCopy} % \begin{macro}{\EditInstance} % \begin{macro}{\EditCollectionInstance} % \begin{macro}{\UseTemplate} @@ -2803,6 +2834,8 @@ { \@@_declare_instance:nnnnn {#1} {#3} { } {#2} {#4} } \cs_new_protected:Npn \DeclareCollectionInstance #1#2#3#4#5 { \@@_declare_instance:nnnnn {#2} {#4} {#1} {#3} {#5} } +\cs_new_protected:Npn \DeclareInstanceCopy #1#2#3 + { \@@_copy_instance:nnnn {#1} { } {#2} {#3} } \cs_new_protected:Npn \EditTemplateDefaults #1#2#3 { \@@_edit_defaults:nnn {#1} {#2} {#3} } \cs_new_protected:Npn \EditInstance #1#2#3 @@ -2828,6 +2861,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\ShowTemplateCode} % \begin{macro}{\ShowTemplateDefaults} @@ -2888,7 +2922,7 @@ % A friendly wrapper % \begin{macrocode} \cs_new_protected:Npn \SetTemplateKeys #1#2#3 - { \keys_set:nn { template / #1 / #2 } {#3} } + { \keys_set_known:nnN { template / #1 / #2 } {#3} \l_@@_tmp_clist } % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/l3packages/xtemplate.pdf b/macros/latex/contrib/l3packages/xtemplate.pdf Binary files differindex ce2f8a6227..eee7287443 100644 --- a/macros/latex/contrib/l3packages/xtemplate.pdf +++ b/macros/latex/contrib/l3packages/xtemplate.pdf |