From 331851c24408f471980c330a0f7a5676f5a62991 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Jan 2021 21:51:15 +0000 Subject: biblatex-oxref git-svn-id: svn://tug.org/texlive/trunk@57513 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/biblatex-oxref/README.md | 2 +- .../doc/latex/biblatex-oxref/oxalph-doc.pdf | Bin 436849 -> 436778 bytes .../doc/latex/biblatex-oxref/oxalph-doc.tex | 15 +- .../doc/latex/biblatex-oxref/oxnotes-doc.pdf | Bin 443126 -> 443291 bytes .../doc/latex/biblatex-oxref/oxnotes-doc.tex | 15 +- .../doc/latex/biblatex-oxref/oxnum-doc.pdf | Bin 437069 -> 439195 bytes .../doc/latex/biblatex-oxref/oxnum-doc.tex | 19 +- .../texmf-dist/doc/latex/biblatex-oxref/oxref.pdf | Bin 533046 -> 535848 bytes .../doc/latex/biblatex-oxref/oxyear-doc.pdf | Bin 440773 -> 440823 bytes .../doc/latex/biblatex-oxref/oxyear-doc.tex | 15 +- .../source/latex/biblatex-oxref/Makefile | 2 +- .../source/latex/biblatex-oxref/oxref.dtx | 569 +++++++++++---------- .../source/latex/biblatex-oxref/oxref.ins | 4 +- .../tex/latex/biblatex-oxref/american-oxref.lbx | 4 +- .../tex/latex/biblatex-oxref/british-oxref.lbx | 4 +- .../tex/latex/biblatex-oxref/english-oxref.lbx | 4 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx | 4 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx | 4 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-ibid.bbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-ibid.cbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-ibid.dbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-inote.bbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-inote.cbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-inote.dbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-note.bbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-note.cbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-note.dbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-trad1.bbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-trad1.cbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-trad1.dbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-trad2.bbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-trad2.cbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-trad2.dbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-trad3.bbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-trad3.cbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes-trad3.dbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes.bbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes.cbx | 4 +- .../tex/latex/biblatex-oxref/oxnotes.dbx | 4 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx | 10 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx | 4 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx | 4 +- .../texmf-dist/tex/latex/biblatex-oxref/oxref.bbx | 531 ++++++++++--------- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx | 10 +- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx | 4 +- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx | 4 +- 47 files changed, 677 insertions(+), 639 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/README.md b/Master/texmf-dist/doc/latex/biblatex-oxref/README.md index ed2a550642e..070e51eb271 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/README.md +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/README.md @@ -140,7 +140,7 @@ first two steps. ## Licence -Copyright 2016–2020 Alex Ball. +Copyright 2016–2021 Alex Ball. This work consists of the documented LaTeX file oxref.dtx and a Makefile. diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf index ce452f4772b..d298a7d4f2b 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex index e0cf1a1ece2..ae85398c355 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \ProvidesFile{oxalph-doc.tex} [\Version\space Alphabetic biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex} @@ -144,7 +144,7 @@ }% } -\hypersetup{pdfborder={0 0 0},pdfencoding=auto} +\hypersetup{pdfborder={0 0 0},pdfencoding=unicode} \usepackage[noabbrev,capitalize,nameinlink]{cleveref} \crefname{page}{page}{pages} @@ -350,6 +350,10 @@ The style has some options additional to the regular \pkg{biblatex} ones: Removes publisher name from all entries. Once set, this option cannot be overridden. \end{docKey} +\begin{docKey}{norelatedin}{=\val{true}|\val{false}}{default \val{true}, initially \val{false}} + Suppresses the printing of the \code{in} localization string in circumstances where it would appear directly following a related string such as \enquote{originally published as}. It can also be set on a per-type and per-entry basis. The effects of this key are not well tested, so do please get in touch (see below) if you encounter problems with it. +\end{docKey} + \begin{docKey}{relationpunct}{=\val{period}|\val{comma}|\val{semicolon}|\val{colon}|\val{space}}{default \val{semicolon}, initially \val{semicolon}} Sets the punctuation that precedes the \code{relatedtype} localization string. An additional space is assumed unless the value is \val{space}. @@ -4715,9 +4719,14 @@ Ritter, R. M. (2001), \enquote{Revised proofs} [email to H. E. Cox], (1 Aug.\@), \end{Verbatim} \end{bibexbox} +\defbibnote{preface}{This document uses the \pkg{biblatex} option \key{backref} +to demonstrate how entries can be marked with the page(s) on which they were +cited. The format of the back references comes from \pkg{biblatex} itself +rather than \pkg[biblatex]{oxref}.} + \printbibliography[notcategory=hidden] \end{document} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxalph-doc.tex'. diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf index d31e38c0b2d..032b19373f9 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex index c80607315a0..a6ed787b530 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \ProvidesFile{oxnotes-doc.tex} [\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex} @@ -144,7 +144,7 @@ }% } -\hypersetup{pdfborder={0 0 0},pdfencoding=auto} +\hypersetup{pdfborder={0 0 0},pdfencoding=unicode} \usepackage[noabbrev,capitalize,nameinlink]{cleveref} \crefname{page}{page}{pages} @@ -342,6 +342,10 @@ The style has some options additional to the regular \pkg{biblatex} ones: Removes publisher name from all entries. Once set, this option cannot be overridden. \end{docKey} +\begin{docKey}{norelatedin}{=\val{true}|\val{false}}{default \val{true}, initially \val{false}} + Suppresses the printing of the \code{in} localization string in circumstances where it would appear directly following a related string such as \enquote{originally published as}. It can also be set on a per-type and per-entry basis. The effects of this key are not well tested, so do please get in touch (see below) if you encounter problems with it. +\end{docKey} + \begin{docKey}{relationpunct}{=\val{period}|\val{comma}|\val{semicolon}|\val{colon}|\val{space}}{default \val{semicolon}, initially \val{semicolon}} Sets the punctuation that precedes the \code{relatedtype} localization string. An additional space is assumed unless the value is \val{space}. @@ -4678,9 +4682,14 @@ R. M. Ritter, \enquote{Revised proofs} [email to H. E. Cox], (1 Aug.\@ 2001), \u \end{Verbatim} \end{bibexbox} +\defbibnote{preface}{This document uses the \pkg{biblatex} option \key{backref} +to demonstrate how entries can be marked with the page(s) on which they were +cited. The format of the back references comes from \pkg{biblatex} itself +rather than \pkg[biblatex]{oxref}.} + \printbibliography[notcategory=hidden] \end{document} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-doc.tex'. diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf index 96f409d6d62..8851a9b4548 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex index b0cdce7e836..fafa03e4819 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex @@ -13,10 +13,10 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \ProvidesFile{oxnum-doc.tex} [\Version\space Numeric biblatex style inspired by the Oxford Guide to Style] -\PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon}{biblatex} +\PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon,backref=true}{biblatex} \documentclass[extrafontsizes,11pt,a4paper,oneside]{memoir} \setlrmarginsandblock{3cm}{3cm}{*} \setulmarginsandblock{2.5cm}{2.5cm}{*} @@ -142,7 +142,7 @@ }% } -\hypersetup{pdfborder={0 0 0},pdfencoding=auto} +\hypersetup{pdfborder={0 0 0},pdfencoding=unicode} \usepackage[noabbrev,capitalize,nameinlink]{cleveref} \crefname{page}{page}{pages} @@ -340,6 +340,10 @@ The style has some options additional to the regular \pkg{biblatex} ones: Removes publisher name from all entries. Once set, this option cannot be overridden. \end{docKey} +\begin{docKey}{norelatedin}{=\val{true}|\val{false}}{default \val{true}, initially \val{false}} + Suppresses the printing of the \code{in} localization string in circumstances where it would appear directly following a related string such as \enquote{originally published as}. It can also be set on a per-type and per-entry basis. The effects of this key are not well tested, so do please get in touch (see below) if you encounter problems with it. +\end{docKey} + \begin{docKey}{relationpunct}{=\val{period}|\val{comma}|\val{semicolon}|\val{colon}|\val{space}}{default \val{semicolon}, initially \val{semicolon}} Sets the punctuation that precedes the \code{relatedtype} localization string. An additional space is assumed unless the value is \val{space}. @@ -4618,9 +4622,14 @@ R. M. Ritter, \enquote{Revised proofs} [email to H. E. Cox], (1 Aug.\@ 2001), \u \end{Verbatim} \end{bibexbox} -\printbibliography[notcategory=hidden] +\defbibnote{preface}{This document uses the \pkg{biblatex} option \key{backref} +to demonstrate how entries can be marked with the page(s) on which they were +cited. The format of the back references comes from \pkg{biblatex} itself +rather than \pkg[biblatex]{oxref}.} + +\printbibliography[notcategory=hidden,prenote=preface] \end{document} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnum-doc.tex'. diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf index f2e38b76aaf..3daf20e3cef 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf index f9a115aab7e..7492f2c4b19 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex index a1d7e527810..bd29204d1a7 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \ProvidesFile{oxyear-doc.tex} [\Version\space Author-year biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex} @@ -144,7 +144,7 @@ }% } -\hypersetup{pdfborder={0 0 0},pdfencoding=auto} +\hypersetup{pdfborder={0 0 0},pdfencoding=unicode} \usepackage[noabbrev,capitalize,nameinlink]{cleveref} \crefname{page}{page}{pages} @@ -350,6 +350,10 @@ The style has some options additional to the regular \pkg{biblatex} ones: Removes publisher name from all entries. Once set, this option cannot be overridden. \end{docKey} +\begin{docKey}{norelatedin}{=\val{true}|\val{false}}{default \val{true}, initially \val{false}} + Suppresses the printing of the \code{in} localization string in circumstances where it would appear directly following a related string such as \enquote{originally published as}. It can also be set on a per-type and per-entry basis. The effects of this key are not well tested, so do please get in touch (see below) if you encounter problems with it. +\end{docKey} + \begin{docKey}{relationpunct}{=\val{period}|\val{comma}|\val{semicolon}|\val{colon}|\val{space}}{default \val{semicolon}, initially \val{semicolon}} Sets the punctuation that precedes the \code{relatedtype} localization string. An additional space is assumed unless the value is \val{space}. @@ -4771,9 +4775,14 @@ Ritter, R. M. (2001), \enquote{Revised proofs} [email to H. E. Cox], (1 Aug.\@), \end{Verbatim} \end{bibexbox} +\defbibnote{preface}{This document uses the \pkg{biblatex} option \key{backref} +to demonstrate how entries can be marked with the page(s) on which they were +cited. The format of the back references comes from \pkg{biblatex} itself +rather than \pkg[biblatex]{oxref}.} + \printbibliography[notcategory=hidden] \end{document} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxyear-doc.tex'. diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile index 527f4146c6f..e58dba0ac65 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile +++ b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile @@ -26,7 +26,7 @@ $(STYS:%=%-doc.pdf): %-doc.pdf : %-doc.tex $(NAME).bbx %.bbx %.cbx british-$(NAM latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $< >/dev/null clean: - for log in *.log; do [ -e "$$log" ] || continue; grep "WARNING: biblatex-oxref" $$log; test $$? -eq 1; done + @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 $(STYS:%=%.doc) {american,british,english}-$(NAME).doc rm -rf _minted-* diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx index 32c12f7cb7a..66eeb6bee5a 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx +++ b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx @@ -1,6 +1,6 @@ % \iffalse %<*internal|bbx|cbx|dbx|lbx|doc> -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} % %<*internal> \iffalse @@ -166,7 +166,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2016–2020 Alex Ball +Copyright (C) 2016–2021 Alex Ball \endpostamble \usedir{tex/latex/\jobname} @@ -229,7 +229,7 @@ Copyright (C) 2016–2020 Alex Ball \PassOptionsToPackage{style=oxnotes}{biblatex} % %\PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex} -%\PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon}{biblatex} +%\PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon,backref=true}{biblatex} %\PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex} %\PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex} %<*driver|doc> @@ -380,7 +380,7 @@ Copyright (C) 2016–2020 Alex Ball } % -\hypersetup{pdfborder={0 0 0},pdfencoding=auto} +\hypersetup{pdfborder={0 0 0},pdfencoding=unicode} \usepackage[noabbrev,capitalize,nameinlink]{cleveref} \crefname{page}{page}{pages} @@ -842,7 +842,7 @@ first two steps. ## Licence -Copyright 2016–2020 Alex Ball. +Copyright 2016–2021 Alex Ball. This work consists of the documented LaTeX file oxref.dtx and a Makefile. @@ -971,6 +971,10 @@ The style has some options additional to the regular \pkg{biblatex} ones: Removes publisher name from all entries. Once set, this option cannot be overridden. \end{docKey} +\begin{docKey}{norelatedin}{=\val{true}|\val{false}}{default \val{true}, initially \val{false}} + Suppresses the printing of the \code{in} localization string in circumstances where it would appear directly following a related string such as \enquote{originally published as}. It can also be set on a per-type and per-entry basis. The effects of this key are not well tested, so do please get in touch (see below) if you encounter problems with it. +\end{docKey} + \begin{docKey}{relationpunct}{=\val{period}|\val{comma}|\val{semicolon}|\val{colon}|\val{space}}{default \val{semicolon}, initially \val{semicolon}} Sets the punctuation that precedes the \code{relatedtype} localization string. An additional space is assumed unless the value is \val{space}. @@ -6918,8 +6922,13 @@ will trigger the use of parentheses. \end{Verbatim} \end{bibexbox} +\defbibnote{preface}{This document uses the \pkg{biblatex} option \key{backref} +to demonstrate how entries can be marked with the page(s) on which they were +cited. The format of the back references comes from \pkg{biblatex} itself +rather than \pkg[biblatex]{oxref}.} -\printbibliography[notcategory=hidden] +%\printbibliography[notcategory=hidden] +%\printbibliography[notcategory=hidden,prenote=preface] % % %<*driver> @@ -7120,11 +7129,7 @@ will trigger the use of parentheses. % % \begin{macrocode} \newtoggle{blx@ox@nametitle}\toggletrue{blx@ox@nametitle}% -\DeclareBibliographyOption{usenametitles}[true]{% - \settoggle{blx@ox@nametitle}{#1}} -\DeclareTypeOption{usenametitles}[true]{% - \settoggle{blx@ox@nametitle}{#1}} -\DeclareEntryOption{usenametitles}[true]{% +\DeclareBiblatexOption{global,type,entry}{usenametitles}[true]{% \settoggle{blx@ox@nametitle}{#1}} % \end{macrocode} % @@ -7903,11 +7908,7 @@ will trigger the use of parentheses. \ifbibstring{#1}{\bibstring{#1}}{#1\isdot}% } \newtoggle{blx@ox@timefirst} -\DeclareBibliographyOption{timefirst}[true]{% - \settoggle{blx@ox@timefirst}{#1}} -\DeclareTypeOption{timefirst}[true]{% - \settoggle{blx@ox@timefirst}{#1}} -\DeclareEntryOption{timefirst}[true]{% +\DeclareBiblatexOption{global,type,entry}{timefirst}[true]{% \settoggle{blx@ox@timefirst}{#1}} \newbibmacro*{date+time}{% \ifboolexpr{ @@ -8213,7 +8214,7 @@ will trigger the use of parentheses. } \newcommand*{\ifabbrev}[3]{% \StrRight{#1}{1}[\blx@ox@lastchar]% - \IfSubStr{\blx@ox@abbrevstring}{\blx@ox@lastchar}{#2}{#3} + \expandafter\IfSubStr*{\blx@ox@abbrevstring}{\blx@ox@lastchar}{#2}{#3}% } % \end{macrocode} % @@ -8245,9 +8246,9 @@ will trigger the use of parentheses. }{}}% \usebibmacro{journal}% \iffieldundef{journalsubtitle}{% - \ifabbrev{\thefield{journaltitle}}{\setunit{\addspace}}{\newunit}% + \ifabbrev{\strfield{journaltitle}}{\setunit{\addspace}}{\newunit}% }{% - \ifabbrev{\thefield{journalsubtitle}}{\setunit{\addspace}}{\newunit}}% + \ifabbrev{\strfield{journalsubtitle}}{\setunit{\addspace}}{\newunit}}% \iffieldundef{series}{}{% \newunit\newblock \printfield{series}% @@ -8270,9 +8271,9 @@ will trigger the use of parentheses. \renewbibmacro*{title+issuetitle}{% \usebibmacro{periodical}% \iffieldundef{subtitle}{% - \ifabbrev{\thefield{title}}{\setunit{\addspace}}{\newunit}% + \ifabbrev{\strfield{title}}{\setunit{\addspace}}{\newunit}% }{% - \ifabbrev{\thefield{subtitle}}{\setunit{\addspace}}{\newunit}}% + \ifabbrev{\strfield{subtitle}}{\setunit{\addspace}}{\newunit}}% \iffieldundef{series}{}{% \newunit\newblock \printfield{series}% @@ -8345,17 +8346,9 @@ will trigger the use of parentheses. % % \begin{macrocode} \newtoggle{blx@ox@varissuedate} -\DeclareBibliographyOption{varissuedate}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption{varissuedate}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption{varissuedate}[true]{% +\DeclareBiblatexOption{global,type,entry}{varissuedate}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareBibliographyOption{issuedate-plain}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption{issuedate-plain}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption{issuedate-plain}[true]{% +\DeclareBiblatexOption{global,type,entry}{issuedate-plain}[true]{% \settoggle{blx@ox@varissuedate}{#1}} \renewbibmacro*{issue+date}{% \ifboolexpr{ @@ -8438,13 +8431,12 @@ will trigger the use of parentheses. \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8469,13 +8461,12 @@ will trigger the use of parentheses. \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8531,13 +8522,12 @@ will trigger the use of parentheses. \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8889,13 +8879,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8953,19 +8942,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8988,9 +8976,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -9003,19 +8991,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9044,9 +9031,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -9057,19 +9044,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9092,9 +9078,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -9107,19 +9093,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9147,19 +9132,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9205,19 +9189,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9242,9 +9225,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \printfield{volumes}% \newunit\newblock @@ -9255,19 +9238,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9296,9 +9278,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \printfield{volumes}% \newunit\newblock% @@ -9307,19 +9289,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9352,19 +9333,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9413,19 +9393,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9450,9 +9429,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \printfield{edition}% \newunit @@ -9469,19 +9448,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9539,9 +9517,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+title}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{event+venue+date}% \newunit\newblock @@ -9560,19 +9538,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9593,9 +9570,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{event+venue+date}% \newunit\newblock @@ -9612,19 +9589,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9835,9 +9811,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+title}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \setunit{\titlebyauthordelim}\newblock \usebibmacro{byauthor}% \newunit\newblock @@ -9848,28 +9824,26 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{series+type+number}% \setunit{\addspace}% \usebibmacro{institution+location+date}% - \iffieldequals{entrysubtype}{\legreport}{% - \setunit{\addspace}\nopunct - }{% - \newunit\newblock}% + \iffieldequals{entrysubtype}{\legreport} + {\setunit{\addspace}\nopunct} + {\newunit\newblock}% \usebibmacro{chapter+pages}% \newunit \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isrn}} - {}% + {\printfield{isrn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9982,13 +9956,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10018,17 +9991,17 @@ reference,mvreference,inreference]{volume}{% }{}% \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock - \ifentrytype{software}{% - \usebibmacro{title+version}% - }{% - \usebibmacro{title}}% + \ifentrytype{software} + {\usebibmacro{title+version}} + {\usebibmacro{title}}% \setunit{\titlebyauthordelim}\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor}% \newunit - \ifentrytype{software}{}{% - \newunit\printfield{version}}% + \ifentrytype{software} + {} + {\newunit\printfield{version}}% \newunit \printfield{note}% \newunit\newblock @@ -10039,19 +10012,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyAlias{standard}{manual} \ExecuteBibliographyOptions[standard]{useeditor=false} @@ -10183,19 +10155,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{post-byeditor+others}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10250,19 +10221,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{post-byeditor+others}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10397,19 +10367,18 @@ reference,mvreference,inreference]{volume}{% \printlist{organization}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyAlias{image}{performance} \DeclareBibliographyAlias{artwork}{performance} @@ -10512,19 +10481,18 @@ reference,mvreference,inreference]{volume}{% \printlist{publisher}% \newunit\newblock \iftoggle{bbx:eprint} - {\usebibmacro{eprint}} - {}% + {\usebibmacro{eprint}} + {}% \newunit\newblock \usebibmacro{url+urldate}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10596,13 +10564,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \newunit\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10626,9 +10593,7 @@ reference,mvreference,inreference]{volume}{% \setboolean{bbx@paryear-essential}{#1}} \newtoggle{blx@ox@nopostnotedelim} \newtoggle{bbx:altcourt} -\DeclareBibliographyOption{court-plain}[true]{% - \settoggle{bbx:altcourt}{#1}} -\DeclareEntryOption{court-plain}[true]{% +\DeclareBiblatexOption{global,type,entry}{court-plain}[true]{% \settoggle{bbx:altcourt}{#1}} \newtoggle{bbx@ecliuse} \newtoggle{bbx@eclionly} @@ -10962,13 +10927,13 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \setunit{\addspace}%\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% \setunit{\addspace}%\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \newtoggle{bbx@juriscitedone} \newbibmacro{juriscitation}{% @@ -11387,7 +11352,8 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{legsupp}}}}% \setunit{\addcomma\space}% \printfield{note}% - \setunit{\addspace}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \newbibmacro*{courtrules}{% \restorefield{prenote}{\postnotesecond}% @@ -11757,11 +11723,12 @@ reference,mvreference,inreference]{volume}{% \iftoggle{bbx:url}{% \usebibmacro{url+urldate}% }{}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related}{% \usebibmacro{related:init}% \usebibmacro{related}% }{}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -11824,13 +11791,12 @@ reference,mvreference,inreference]{volume}{% {}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -11851,81 +11817,128 @@ reference,mvreference,inreference]{volume}{% % \subsection{Related entries} % % We make the punctuation before related items configurable in remaining drivers -% inherited from the standard style. +% inherited from the standard style, and move the |pageref| macro to the end. % % \begin{macrocode} \xpatchbibdriver{booklet}{% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \newunit\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% }{% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% }{}{\wlog{WARNING: biblatex-oxref failed to patch booklet}} +% \end{macrocode} +% \begin{macrocode} \xpatchbibdriver{misc}{% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \newunit\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% }{% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% }{}{\wlog{WARNING: biblatex-oxref failed to patch misc}} % \end{macrocode} % % We provide an option for setting the relatedtype punctuation. % % \begin{macrocode} -\DeclareBibliographyOption[string]{relationpunct}[semicolon]{% - \ifcsdef{add#1}{% - \ifstrequal{#1}{space}{% - \renewcommand*{\relatedtypepunct}{\addspace}% - }{% - \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}% - }{% +\DeclareDelimFormat{begrelateddelimequals}{\addspace} +\DeclareDelimFormat{begrelateddelimin}{\addcomma\space} +\DeclareDelimFormat{begrelateddelimincludes}{\addcomma\space} +\DeclareDelimFormat{begrelateddelimreprintfrom}{\addperiod\space} +\DeclareDelimFormat{begrelateddelimreviewof}{\newunitpunct} +\DeclareDelimFormat{begrelateddelimtranslationof}{\addspace} +\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct} +\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct} +\newtoggle{blx@ox@success} +\DeclareBiblatexOption{global,type}[string]{relationpunct}[semicolon]{% + \bgroup\blx@blxinit + \ifcsdef{add#1}{\global\toggletrue{blx@ox@success}}{% + \global\togglefalse{blx@ox@success}% \PackageError{biblatex-oxref}{% Invalid option 'relationpunct=#1'% }{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak - 'period', 'exclam', 'question', and 'space'.}}} -\DeclareTypeOption[string]{relationpunct}[semicolon]{% - \ifcsdef{add#1}{% - \ifstrequal{#1}{space}{% - \renewcommand*{\relatedtypepunct}{\addspace}% - }{% - \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}% + 'period', 'exclam', 'question', and 'space'.}}% + \egroup + \iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{% + \DeclareDelimFormat{begrelateddelim}{\addspace}% }{% - \PackageError{biblatex-oxref}{% - Invalid option 'relationpunct=#1'% - }{% - Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak - 'period', 'exclam', 'question', and 'space'.}}} -\newtoggle{blx@ox@relpunctset} + \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}}% + }{}} \DeclareEntryOption[string]{relationpunct}[semicolon]{% - \ifcsdef{add#1}{% - \ifstrequal{#1}{space}{% - \renewcommand*{\relatedtypepunct}{\addspace}% - }{% - \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}% - \toggletrue{blx@ox@relpunctset} - }{% + \bgroup\blx@blxinit + \ifcsdef{add#1}{\global\toggletrue{blx@ox@success}}{% + \global\togglefalse{blx@ox@success}% \PackageError{biblatex-oxref}{% Invalid option 'relationpunct=#1'% }{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak - 'period', 'exclam', 'question', and 'space'.}}} + 'period', 'exclam', 'question', and 'space'.}}% + \egroup + \iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{% + \DeclareDelimFormat{begrelateddelim}{\addspace}% + \DeclareDelimFormat{begrelateddelimequals}{\addspace}% + \DeclareDelimFormat{begrelateddelimin}{\addspace}% + \DeclareDelimFormat{begrelateddelimincludes}{\addspace}% + \DeclareDelimFormat{begrelateddelimreprintfrom}{\addspace}% + \DeclareDelimFormat{begrelateddelimreviewof}{\addspace}% + \DeclareDelimFormat{begrelateddelimtranslationof}{\addspace}% + \DeclareDelimFormat{begrelateddelimmultivolume}{\addspace}% + }{% + \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimequals}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimin}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimincludes}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimreprintfrom}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimreviewof}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimtranslationof}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimmultivolume}{\csuse{add#1}\space}}% + }{}} +\ExecuteBibliographyOptions{relationpunct} \newcounter{blx@ox@relitem} \xapptobibmacro{begrelated}{% \setcounter{blx@ox@relitem}{0}% - \iftoggle{blx@ox@relpunctset}{}{% - \iffieldequalstr{relatedtype}{in}{% - \setunit{\addcomma\space}}{}% - \iffieldequalstr{relatedtype}{reprintfrom}{% - \setunit{\addperiod\space}}{}% - \iffieldequalstr{relatedtype}{translationof}{% - \setunit{\addspace}}{}% - \iffieldequalstr{relatedtype}{multivolume}{% - \setunit{\addcomma\space}}{}% -}}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} -\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct} -\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct} +}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} +% \end{macrocode} +% +% We provide an option to prevent a related item beginning with "in". +% +% \begin{macrocode} +\newtoggle{blx@ox@norelin} +\DeclareBiblatexOption{global,type,entry}{norelatedin}[true]{% + \settoggle{blx@ox@norelin}{#1}} +\xapptobibmacro{begrelatedloop}{% + \iftoggle{blx@ox@norelin}{% + \renewbibmacro*{in:}{% + \ifboolexpr{ + test {\ifnameundef{author}} + and + test {\ifnameundef{translator}} + and + test {\iffieldundef{title}} + }{}{% + \bibstring{in}% + \printunit{\intitlepunct}% + }}}{}% +}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelatedloop}} % \end{macrocode} % @@ -12843,8 +12856,8 @@ reference,mvreference,inreference]{volume}{% \defbibenvironment{bibliography} {\list {\printtext[labelnumberwidth]{% - \printfield{labelprefix}% - \printfield{labelnumber}}} + \printfield{labelprefix}% + \printfield{labelnumber}}} {\setlength{\labelwidth}{\labelnumberwidth}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% @@ -12872,7 +12885,7 @@ reference,mvreference,inreference]{volume}{% \entryset {\ifbool{bbx:subentry} {\printfield[bibentrysetcount]{entrysetcount}% - \printunit*{\addnbspace}} + \printunit*{\addnbspace}} {}} {}% \newunit\newblock @@ -12996,11 +13009,7 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \newtoggle{blx@ox@nonodate} -\DeclareBibliographyOption{nonodate}[true]{% - \settoggle{blx@ox@nonodate}{#1}} -\DeclareTypeOption{nonodate}[true]{% - \settoggle{blx@ox@nonodate}{#1}} -\DeclareEntryOption{nonodate}[true]{% +\DeclareBiblatexOption{global,type,entry}{nonodate}[true]{% \settoggle{blx@ox@nonodate}{#1}} \newbibmacro*{labeldate}{% \ifboolexpr{ diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins index 159820d794d..bd53350964c 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins +++ b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins @@ -37,7 +37,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2016–2020 Alex Ball +Copyright (C) 2016–2021 Alex Ball \endpostamble \usedir{tex/latex/\jobname} @@ -83,6 +83,6 @@ Copyright (C) 2016–2020 Alex Ball } \endbatchfile %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxref.ins'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx index 23ef928ebdd..7778f1d282d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{american-oxref.lbx} [\Version\space American English conventions required by the biblatex-oxref styles] @@ -21,6 +21,6 @@ \DeclareBibliographyExtras{\uspunctuation} \InheritBibliographyStrings{english} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `american-oxref.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx index b7010da163a..20c33db2bb1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{british-oxref.lbx} [\Version\space British English conventions required by the biblatex-oxref styles] @@ -40,6 +40,6 @@ pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `british-oxref.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx index 69a3737f897..2f603f70155 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{english-oxref.lbx} [\Version\space Generic English conventions required by the biblatex-oxref styles] @@ -269,6 +269,6 @@ langswedish = {{Swedish}{Swed\adddot}}, } %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `english-oxref.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx index 34414829418..63cfad32125 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.bbx} [\Version\space Alphabetic bibliography style inspired by the Oxford Guide to Style] @@ -98,6 +98,6 @@ } } %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxalph.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx index 64f93bae2a2..ec29e0ab5b9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.cbx} [\Version\space Alphabetic citation style inspired by the Oxford Guide to Style] @@ -41,6 +41,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxalph.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx index 61cea329d7a..2ffeac6a1fc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxalph.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx index 98b26684bae..750d224c131 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx @@ -13,12 +13,12 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] \RequireBibliographyStyle{oxnotes} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-ibid.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx index 107a6b533ff..b437508ebb0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] @@ -44,6 +44,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-ibid.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx index fbc9429294f..1eaecbede3e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-ibid.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx index a806b75c326..07e179a4e5b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx @@ -13,12 +13,12 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] \RequireBibliographyStyle{oxnotes} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-inote.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx index b5dea7f073a..18ac98d7fd7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] @@ -44,6 +44,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-inote.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx index bd5f14a44fc..4cbbb1d5a9d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-inote.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx index b2262fdc932..1743d8476b5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx @@ -13,12 +13,12 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] \RequireBibliographyStyle{oxnotes} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-note.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx index 7a5d27c7a8b..74b54122554 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] @@ -44,6 +44,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-note.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx index c6f69b8a437..fe2b23a398d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-note.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx index 6220fd3b14e..7184ece7bbd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx @@ -13,12 +13,12 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] \RequireBibliographyStyle{oxnotes} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-trad1.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx index 29f4a57bdec..192e14c8ffe 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] @@ -44,6 +44,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-trad1.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx index e79ac5407e1..4f620464389 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-trad1.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx index d00a4b4d19f..1c774de65e9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx @@ -13,12 +13,12 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] \RequireBibliographyStyle{oxnotes} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-trad2.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx index 26d7aa2f817..780ceca0559 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] @@ -44,6 +44,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-trad2.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx index bf9a6706e37..1343d0dd87f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-trad2.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx index fcbf42a10bf..a1d1c678aea 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx @@ -13,12 +13,12 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] \RequireBibliographyStyle{oxnotes} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-trad3.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx index 1cc7d57496d..bccf3b30e85 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] @@ -44,6 +44,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-trad3.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx index 1be3bdad761..fd8ae0edd61 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes-trad3.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx index dd47b567f4e..f2a5a6c44e9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] @@ -54,6 +54,6 @@ }% } %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx index 03dff269a6a..cb211aa95b7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] @@ -44,6 +44,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx index cd114bee8c9..75af021a7db 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnotes.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx index 8971954e55d..137426184ab 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.bbx} [\Version\space Numeric bibliography style inspired by the Oxford Guide to Style] @@ -49,8 +49,8 @@ \defbibenvironment{bibliography} {\list {\printtext[labelnumberwidth]{% -\printfield{labelprefix}% -\printfield{labelnumber}}} + \printfield{labelprefix}% + \printfield{labelnumber}}} {\setlength{\labelwidth}{\labelnumberwidth}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% @@ -78,13 +78,13 @@ \entryset {\ifbool{bbx:subentry} {\printfield[bibentrysetcount]{entrysetcount}% -\printunit*{\addnbspace}} + \printunit*{\addnbspace}} {}} {}% \newunit\newblock \usebibmacro{setpageref}% \finentry} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnum.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx index 0c4e0d57e34..cb8d8ffc0d5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.cbx} [\Version\space Numeric citation style inspired by the Oxford Guide to Style] @@ -41,6 +41,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnum.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx index 237eb4227d1..18b9e064ca2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxnum.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx index 9f1fcb97e98..95540a30da7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxref.bbx} [\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style] @@ -63,11 +63,7 @@ \settoggle{blx@ox@scnames}{#1} } \newtoggle{blx@ox@nametitle}\toggletrue{blx@ox@nametitle}% -\DeclareBibliographyOption{usenametitles}[true]{% - \settoggle{blx@ox@nametitle}{#1}} -\DeclareTypeOption{usenametitles}[true]{% - \settoggle{blx@ox@nametitle}{#1}} -\DeclareEntryOption{usenametitles}[true]{% +\DeclareBiblatexOption{global,type,entry}{usenametitles}[true]{% \settoggle{blx@ox@nametitle}{#1}} \newbibmacro*{name:title-given-family}[5]{% \usebibmacro{name:delim}{#2#3#1}% @@ -621,11 +617,7 @@ \ifbibstring{#1}{\bibstring{#1}}{#1\isdot}% } \newtoggle{blx@ox@timefirst} -\DeclareBibliographyOption{timefirst}[true]{% - \settoggle{blx@ox@timefirst}{#1}} -\DeclareTypeOption{timefirst}[true]{% - \settoggle{blx@ox@timefirst}{#1}} -\DeclareEntryOption{timefirst}[true]{% +\DeclareBiblatexOption{global,type,entry}{timefirst}[true]{% \settoggle{blx@ox@timefirst}{#1}} \newbibmacro*{date+time}{% \ifboolexpr{ @@ -818,7 +810,7 @@ } \newcommand*{\ifabbrev}[3]{% \StrRight{#1}{1}[\blx@ox@lastchar]% - \IfSubStr{\blx@ox@abbrevstring}{\blx@ox@lastchar}{#2}{#3} + \expandafter\IfSubStr*{\blx@ox@abbrevstring}{\blx@ox@lastchar}{#2}{#3}% } \renewbibmacro*{journal+issuetitle}{% \ifboolexpr{ @@ -839,9 +831,9 @@ }{}}% \usebibmacro{journal}% \iffieldundef{journalsubtitle}{% - \ifabbrev{\thefield{journaltitle}}{\setunit{\addspace}}{\newunit}% + \ifabbrev{\strfield{journaltitle}}{\setunit{\addspace}}{\newunit}% }{% - \ifabbrev{\thefield{journalsubtitle}}{\setunit{\addspace}}{\newunit}}% + \ifabbrev{\strfield{journalsubtitle}}{\setunit{\addspace}}{\newunit}}% \iffieldundef{series}{}{% \newunit\newblock \printfield{series}% @@ -856,9 +848,9 @@ \renewbibmacro*{title+issuetitle}{% \usebibmacro{periodical}% \iffieldundef{subtitle}{% - \ifabbrev{\thefield{title}}{\setunit{\addspace}}{\newunit}% + \ifabbrev{\strfield{title}}{\setunit{\addspace}}{\newunit}% }{% - \ifabbrev{\thefield{subtitle}}{\setunit{\addspace}}{\newunit}}% + \ifabbrev{\strfield{subtitle}}{\setunit{\addspace}}{\newunit}}% \iffieldundef{series}{}{% \newunit\newblock \printfield{series}% @@ -909,17 +901,9 @@ } \ExecuteBibliographyOptions{issuestyle=slash} \newtoggle{blx@ox@varissuedate} -\DeclareBibliographyOption{varissuedate}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption{varissuedate}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption{varissuedate}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareBibliographyOption{issuedate-plain}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption{issuedate-plain}[true]{% +\DeclareBiblatexOption{global,type,entry}{varissuedate}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption{issuedate-plain}[true]{% +\DeclareBiblatexOption{global,type,entry}{issuedate-plain}[true]{% \settoggle{blx@ox@varissuedate}{#1}} \renewbibmacro*{issue+date}{% \ifboolexpr{ @@ -991,13 +975,12 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareBibliographyDriver{periodical}{% \usebibmacro{bibindex}% @@ -1017,13 +1000,12 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareFieldFormat[suppperiodical]{title}{% \def\currentfield{title}% @@ -1071,13 +1053,12 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \ExecuteBibliographyOptions[book,mvbook,reference,mvreference]{useeditor=false,usetranslator=false} \DeclareFieldFormat[bookinbook]{title}{% @@ -1308,13 +1289,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareBibliographyDriver{mvbook}{% \usebibmacro{bibindex}% @@ -1355,19 +1335,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyDriver{inbook}{% \usebibmacro{bibindex}% @@ -1384,9 +1363,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -1399,19 +1378,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareFieldFormat[suppbook]{title}{% \def\currentfield{title}% @@ -1434,9 +1412,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -1447,19 +1425,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyDriver{bookinbook}{% \usebibmacro{bibindex}% @@ -1476,9 +1453,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -1491,19 +1468,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyDriver{collection}{% \usebibmacro{bibindex}% @@ -1525,19 +1501,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyDriver{mvcollection}{% \usebibmacro{bibindex}% @@ -1576,19 +1551,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyDriver{incollection}{% \usebibmacro{bibindex}% @@ -1605,9 +1579,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \printfield{volumes}% \newunit\newblock @@ -1618,19 +1592,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareFieldFormat[suppcollection]{title}{% \def\currentfield{title}% @@ -1653,9 +1626,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \printfield{volumes}% \newunit\newblock% @@ -1664,19 +1637,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyDriver{reference}{% \usebibmacro{bibindex}% @@ -1702,19 +1674,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyDriver{mvreference}{% \usebibmacro{bibindex}% @@ -1757,19 +1728,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyDriver{inreference}{% \usebibmacro{bibindex}% @@ -1787,9 +1757,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \printfield{edition}% \newunit @@ -1806,19 +1776,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \ExecuteBibliographyOptions[proceedings,mvproceedings]{useeditor=false,usetranslator=false} \renewbibmacro*{event+venue+date}{% @@ -1838,9 +1807,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+title}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{event+venue+date}% \newunit\newblock @@ -1859,19 +1828,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyDriver{inproceedings}{% \usebibmacro{bibindex}% @@ -1886,9 +1854,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{event+venue+date}% \newunit\newblock @@ -1905,19 +1873,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \newbibmacro*{series+type+number}{% \ifboolexpr{ @@ -2080,9 +2047,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+title}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \setunit{\titlebyauthordelim}\newblock \usebibmacro{byauthor}% \newunit\newblock @@ -2093,28 +2060,26 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{series+type+number}% \setunit{\addspace}% \usebibmacro{institution+location+date}% - \iffieldequals{entrysubtype}{\legreport}{% - \setunit{\addspace}\nopunct - }{% - \newunit\newblock}% + \iffieldequals{entrysubtype}{\legreport} + {\setunit{\addspace}\nopunct} + {\newunit\newblock}% \usebibmacro{chapter+pages}% \newunit \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isrn}} - {}% + {\printfield{isrn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \xpatchbibdriver{thesis}{% \printfield{type}% @@ -2199,13 +2164,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareBibliographyDriver{manual}{% \usebibmacro{bibindex}% @@ -2224,17 +2188,17 @@ reference,mvreference,inreference]{volume}{% }{}% \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock - \ifentrytype{software}{% - \usebibmacro{title+version}% - }{% - \usebibmacro{title}}% + \ifentrytype{software} + {\usebibmacro{title+version}} + {\usebibmacro{title}}% \setunit{\titlebyauthordelim}\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor}% \newunit - \ifentrytype{software}{}{% - \newunit\printfield{version}}% + \ifentrytype{software} + {} + {\newunit\printfield{version}}% \newunit \printfield{note}% \newunit\newblock @@ -2245,19 +2209,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyAlias{standard}{manual} \ExecuteBibliographyOptions[standard]{useeditor=false} @@ -2365,19 +2328,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{post-byeditor+others}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyAlias{music}{audio} \DeclareBibliographyAlias{movie}{audio} @@ -2421,19 +2383,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{post-byeditor+others}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyAlias{inmusic}{inaudio} \DeclareBibliographyAlias{inmovie}{inaudio} @@ -2541,19 +2502,18 @@ reference,mvreference,inreference]{volume}{% \printlist{organization}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyAlias{image}{performance} \DeclareBibliographyAlias{artwork}{performance} @@ -2616,19 +2576,18 @@ reference,mvreference,inreference]{volume}{% \printlist{publisher}% \newunit\newblock \iftoggle{bbx:eprint} - {\usebibmacro{eprint}} - {}% + {\usebibmacro{eprint}} + {}% \newunit\newblock \usebibmacro{url+urldate}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \newbibmacro*{title+version}{% \ifboolexpr{ @@ -2673,13 +2632,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \newunit\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \newtoggle{bbx:scotstyle} \DeclareEntryOption{scottish-style}[true]{% @@ -2692,9 +2650,7 @@ reference,mvreference,inreference]{volume}{% \setboolean{bbx@paryear-essential}{#1}} \newtoggle{blx@ox@nopostnotedelim} \newtoggle{bbx:altcourt} -\DeclareBibliographyOption{court-plain}[true]{% - \settoggle{bbx:altcourt}{#1}} -\DeclareEntryOption{court-plain}[true]{% +\DeclareBiblatexOption{global,type,entry}{court-plain}[true]{% \settoggle{bbx:altcourt}{#1}} \newtoggle{bbx@ecliuse} \newtoggle{bbx@eclionly} @@ -2996,13 +2952,13 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \setunit{\addspace}%\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% \setunit{\addspace}%\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \newtoggle{bbx@juriscitedone} \newbibmacro{juriscitation}{% @@ -3383,7 +3339,8 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{legsupp}}}}% \setunit{\addcomma\space}% \printfield{note}% - \setunit{\addspace}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \newbibmacro*{courtrules}{% \restorefield{prenote}{\postnotesecond}% @@ -3687,11 +3644,12 @@ reference,mvreference,inreference]{volume}{% \iftoggle{bbx:url}{% \usebibmacro{url+urldate}% }{}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related}{% \usebibmacro{related:init}% \usebibmacro{related}% }{}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \newbibmacro*{library+location+series+number}{% \printfield{library}% @@ -3741,13 +3699,12 @@ reference,mvreference,inreference]{volume}{% {}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareBibliographyAlias{letter}{unpublished} \DeclareFieldFormat[letter]{title}{% @@ -3757,72 +3714,112 @@ reference,mvreference,inreference]{volume}{% \DeclareFieldFormat[letter]{date}{% \iffieldundef{url}{#1}{\mkbibparens{#1}}} \xpatchbibdriver{booklet}{% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \newunit\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% }{% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% }{}{\wlog{WARNING: biblatex-oxref failed to patch booklet}} \xpatchbibdriver{misc}{% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \newunit\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% }{% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% }{}{\wlog{WARNING: biblatex-oxref failed to patch misc}} -\DeclareBibliographyOption[string]{relationpunct}[semicolon]{% - \ifcsdef{add#1}{% - \ifstrequal{#1}{space}{% - \renewcommand*{\relatedtypepunct}{\addspace}% - }{% - \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}% - }{% +\DeclareDelimFormat{begrelateddelimequals}{\addspace} +\DeclareDelimFormat{begrelateddelimin}{\addcomma\space} +\DeclareDelimFormat{begrelateddelimincludes}{\addcomma\space} +\DeclareDelimFormat{begrelateddelimreprintfrom}{\addperiod\space} +\DeclareDelimFormat{begrelateddelimreviewof}{\newunitpunct} +\DeclareDelimFormat{begrelateddelimtranslationof}{\addspace} +\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct} +\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct} +\newtoggle{blx@ox@success} +\DeclareBiblatexOption{global,type}[string]{relationpunct}[semicolon]{% + \bgroup\blx@blxinit + \ifcsdef{add#1}{\global\toggletrue{blx@ox@success}}{% + \global\togglefalse{blx@ox@success}% \PackageError{biblatex-oxref}{% Invalid option 'relationpunct=#1'% }{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak - 'period', 'exclam', 'question', and 'space'.}}} -\DeclareTypeOption[string]{relationpunct}[semicolon]{% - \ifcsdef{add#1}{% - \ifstrequal{#1}{space}{% - \renewcommand*{\relatedtypepunct}{\addspace}% - }{% - \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}% + 'period', 'exclam', 'question', and 'space'.}}% + \egroup + \iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{% + \DeclareDelimFormat{begrelateddelim}{\addspace}% }{% - \PackageError{biblatex-oxref}{% - Invalid option 'relationpunct=#1'% - }{% - Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak - 'period', 'exclam', 'question', and 'space'.}}} -\newtoggle{blx@ox@relpunctset} + \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}}% + }{}} \DeclareEntryOption[string]{relationpunct}[semicolon]{% - \ifcsdef{add#1}{% - \ifstrequal{#1}{space}{% - \renewcommand*{\relatedtypepunct}{\addspace}% - }{% - \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}% - \toggletrue{blx@ox@relpunctset} - }{% + \bgroup\blx@blxinit + \ifcsdef{add#1}{\global\toggletrue{blx@ox@success}}{% + \global\togglefalse{blx@ox@success}% \PackageError{biblatex-oxref}{% Invalid option 'relationpunct=#1'% }{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak - 'period', 'exclam', 'question', and 'space'.}}} + 'period', 'exclam', 'question', and 'space'.}}% + \egroup + \iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{% + \DeclareDelimFormat{begrelateddelim}{\addspace}% + \DeclareDelimFormat{begrelateddelimequals}{\addspace}% + \DeclareDelimFormat{begrelateddelimin}{\addspace}% + \DeclareDelimFormat{begrelateddelimincludes}{\addspace}% + \DeclareDelimFormat{begrelateddelimreprintfrom}{\addspace}% + \DeclareDelimFormat{begrelateddelimreviewof}{\addspace}% + \DeclareDelimFormat{begrelateddelimtranslationof}{\addspace}% + \DeclareDelimFormat{begrelateddelimmultivolume}{\addspace}% + }{% + \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimequals}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimin}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimincludes}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimreprintfrom}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimreviewof}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimtranslationof}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimmultivolume}{\csuse{add#1}\space}}% + }{}} +\ExecuteBibliographyOptions{relationpunct} \newcounter{blx@ox@relitem} \xapptobibmacro{begrelated}{% \setcounter{blx@ox@relitem}{0}% - \iftoggle{blx@ox@relpunctset}{}{% - \iffieldequalstr{relatedtype}{in}{% - \setunit{\addcomma\space}}{}% - \iffieldequalstr{relatedtype}{reprintfrom}{% - \setunit{\addperiod\space}}{}% - \iffieldequalstr{relatedtype}{translationof}{% - \setunit{\addspace}}{}% - \iffieldequalstr{relatedtype}{multivolume}{% - \setunit{\addcomma\space}}{}% -}}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} -\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct} -\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct} +}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} +\newtoggle{blx@ox@norelin} +\DeclareBiblatexOption{global,type,entry}{norelatedin}[true]{% + \settoggle{blx@ox@norelin}{#1}} +\xapptobibmacro{begrelatedloop}{% + \iftoggle{blx@ox@norelin}{% + \renewbibmacro*{in:}{% + \ifboolexpr{ + test {\ifnameundef{author}} + and + test {\ifnameundef{translator}} + and + test {\iffieldundef{title}} + }{}{% + \bibstring{in}% + \printunit{\intitlepunct}% + }}}{}% +}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelatedloop}} \newbibmacro*{rellanguage}{% \def\do##1{% @@ -4396,6 +4393,6 @@ reference,mvreference,inreference]{volume}{% [proceedings,report,artwork,audio,image,music,movie,performance,video,% manuscript,unpublished,review]{useeditor=false} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxref.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx index e31b5c57e81..13c5884d948 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.bbx} [\Version\space Author-year bibliography style inspired by the Oxford Guide to Style] @@ -67,11 +67,7 @@ not test {\iffieldundef{labeldatesource}} and test {\iffieldequalstr{labeldatesource}{pubstate}}}} \newtoggle{blx@ox@nonodate} -\DeclareBibliographyOption{nonodate}[true]{% - \settoggle{blx@ox@nonodate}{#1}} -\DeclareTypeOption{nonodate}[true]{% - \settoggle{blx@ox@nonodate}{#1}} -\DeclareEntryOption{nonodate}[true]{% +\DeclareBiblatexOption{global,type,entry}{nonodate}[true]{% \settoggle{blx@ox@nonodate}{#1}} \newbibmacro*{labeldate}{% \ifboolexpr{ @@ -571,6 +567,6 @@ }} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxyear.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx index 4aa722dab98..6c58b1e7f7e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.cbx} [\Version\space Author-year citation style inspired by the Oxford Guide to Style] @@ -73,6 +73,6 @@ }% }{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxyear.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx index 5184abc5e0c..1889408fc43 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.dbx} [\Version\space Data model for the Oxref family of styles] @@ -43,6 +43,6 @@ \DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% parvolume,parpages} %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxyear.dbx'. -- cgit v1.2.3