texlive[57513] Master/texmf-dist: biblatex-oxref
commits+karl at tug.org
commits+karl at tug.org
Sun Jan 24 22:51:15 CET 2021
Revision: 57513
http://tug.org/svn/texlive?view=revision&revision=57513
Author: karl
Date: 2021-01-24 22:51:15 +0100 (Sun, 24 Jan 2021)
Log Message:
-----------
biblatex-oxref
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/README.md
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex
trunk/Master/texmf-dist/source/latex/biblatex-oxref/Makefile
trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx
trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/README.md 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/README.md 2021-01-24 21:51:15 UTC (rev 57513)
@@ -140,7 +140,7 @@
## Licence
-Copyright 2016–2020 Alex Ball.
+Copyright 2016–2021 Alex Ball.
This work consists of the documented LaTeX file oxref.dtx and a Makefile.
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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 @@
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 @@
\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'.
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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 @@
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 @@
\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'.
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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 @@
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 @@
\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'.
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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 @@
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 @@
\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'.
Modified: trunk/Master/texmf-dist/source/latex/biblatex-oxref/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/biblatex-oxref/Makefile 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/source/latex/biblatex-oxref/Makefile 2021-01-24 21:51:15 UTC (rev 57513)
@@ -26,7 +26,7 @@
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-*
Modified: trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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|bbx|cbx|dbx|lbx|doc>
%<*internal>
\iffalse
@@ -166,7 +166,7 @@
\endpreamble
\postamble
-Copyright (C) 2016–2020 Alex Ball
+Copyright (C) 2016–2021 Alex Ball
\endpostamble
\usedir{tex/latex/\jobname}
@@ -229,7 +229,7 @@
\PassOptionsToPackage{style=oxnotes}{biblatex}
%</driver>
%<doc&n>\PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex}
-%<doc&m>\PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon}{biblatex}
+%<doc&m>\PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon,backref=true}{biblatex}
%<doc&a>\PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex}
%<doc&y>\PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex}
%<*driver|doc>
@@ -380,7 +380,7 @@
}
%</doc>
-\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 @@
## 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 @@
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 @@
\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]
+%<n|a|y>\printbibliography[notcategory=hidden]
+%<m>\printbibliography[notcategory=hidden,prenote=preface]
%</n|m|a|y>
%</doc|bib>
%<*driver>
@@ -7120,12 +7129,8 @@
%
% \begin{macrocode}
\newtoggle{blx at ox@nametitle}\toggletrue{blx at ox@nametitle}%
-\DeclareBibliographyOption{usenametitles}[true]{%
+\DeclareBiblatexOption{global,type,entry}{usenametitles}[true]{%
\settoggle{blx at ox@nametitle}{#1}}
-\DeclareTypeOption{usenametitles}[true]{%
- \settoggle{blx at ox@nametitle}{#1}}
-\DeclareEntryOption{usenametitles}[true]{%
- \settoggle{blx at ox@nametitle}{#1}}
% \end{macrocode}
%
% We provide some additional macros for formatting names with titles.
@@ -7903,12 +7908,8 @@
\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}%
}
\newtoggle{blx at ox@timefirst}
-\DeclareBibliographyOption{timefirst}[true]{%
+\DeclareBiblatexOption{global,type,entry}{timefirst}[true]{%
\settoggle{blx at ox@timefirst}{#1}}
-\DeclareTypeOption{timefirst}[true]{%
- \settoggle{blx at ox@timefirst}{#1}}
-\DeclareEntryOption{timefirst}[true]{%
- \settoggle{blx at ox@timefirst}{#1}}
\newbibmacro*{date+time}{%
\ifboolexpr{
test {\iffieldundef{year}}
@@ -8213,7 +8214,7 @@
}
\newcommand*{\ifabbrev}[3]{%
\StrRight{#1}{1}[\blx at ox@lastchar]%
- \IfSubStr{\blx at ox@abbrevstring}{\blx at ox@lastchar}{#2}{#3}
+ \expandafter\IfSubStr*{\blx at ox@abbrevstring}{\blx at ox@lastchar}{#2}{#3}%
}
% \end{macrocode}
%
@@ -8245,9 +8246,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}%
@@ -8270,9 +8271,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}%
@@ -8345,18 +8346,10 @@
%
% \begin{macrocode}
\newtoggle{blx at ox@varissuedate}
-\DeclareBibliographyOption{varissuedate}[true]{%
+\DeclareBiblatexOption{global,type,entry}{varissuedate}[true]{%
\settoggle{blx at ox@varissuedate}{#1}}
-\DeclareTypeOption{varissuedate}[true]{%
+\DeclareBiblatexOption{global,type,entry}{issuedate-plain}[true]{%
\settoggle{blx at ox@varissuedate}{#1}}
-\DeclareEntryOption{varissuedate}[true]{%
- \settoggle{blx at ox@varissuedate}{#1}}
-\DeclareBibliographyOption{issuedate-plain}[true]{%
- \settoggle{blx at ox@varissuedate}{#1}}
-\DeclareTypeOption{issuedate-plain}[true]{%
- \settoggle{blx at ox@varissuedate}{#1}}
-\DeclareEntryOption{issuedate-plain}[true]{%
- \settoggle{blx at ox@varissuedate}{#1}}
\renewbibmacro*{issue+date}{%
\ifboolexpr{
test {\iffieldundef{issue}}
@@ -8438,13 +8431,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}}
% \end{macrocode}
%
@@ -8469,13 +8461,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}}
% \end{macrocode}
%
@@ -8531,13 +8522,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}}
% \end{macrocode}
%
@@ -8889,13 +8879,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}}
% \end{macrocode}
%
@@ -8953,19 +8942,18 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\printfield{volumes}%
\newunit\newblock
@@ -9255,19 +9238,18 @@
\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 @@
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\printfield{volumes}%
\newunit\newblock%
@@ -9307,19 +9289,18 @@
\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 @@
\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 @@
\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 @@
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\printfield{edition}%
\newunit
@@ -9469,19 +9448,18 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
}{}%
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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,10 +10593,8 @@
\setboolean{bbx at paryear-essential}{#1}}
\newtoggle{blx at ox@nopostnotedelim}
\newtoggle{bbx:altcourt}
-\DeclareBibliographyOption{court-plain}[true]{%
+\DeclareBiblatexOption{global,type,entry}{court-plain}[true]{%
\settoggle{bbx:altcourt}{#1}}
-\DeclareEntryOption{court-plain}[true]{%
- \settoggle{bbx:altcourt}{#1}}
\newtoggle{bbx at ecliuse}
\newtoggle{bbx at eclionly}
\DeclareBibliographyOption[string]{ecli}[yes]{%
@@ -10962,13 +10927,13 @@
\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 at juriscitedone}
\newbibmacro{juriscitation}{%
@@ -11387,7 +11352,8 @@
\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 @@
\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 @@
{}%
\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,22 +11817,42 @@
% \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}
%
@@ -11873,59 +11859,86 @@
% 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 at ox@success}
+\DeclareBiblatexOption{global,type}[string]{relationpunct}[semicolon]{%
+ \bgroup\blx at blxinit
+ \ifcsdef{add#1}{\global\toggletrue{blx at ox@success}}{%
+ \global\togglefalse{blx at 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 at ox@success}{\ifstrequal{#1}{space}{%
+ \DeclareDelimFormat{begrelateddelim}{\addspace}%
}{%
+ \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}}%
+ }{}}
+\DeclareEntryOption[string]{relationpunct}[semicolon]{%
+ \bgroup\blx at blxinit
+ \ifcsdef{add#1}{\global\toggletrue{blx at ox@success}}{%
+ \global\togglefalse{blx at ox@success}%
\PackageError{biblatex-oxref}{%
Invalid option 'relationpunct=#1'%
}{%
Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
- 'period', 'exclam', 'question', and 'space'.}}}
-\newtoggle{blx at ox@relpunctset}
-\DeclareEntryOption[string]{relationpunct}[semicolon]{%
- \ifcsdef{add#1}{%
- \ifstrequal{#1}{space}{%
- \renewcommand*{\relatedtypepunct}{\addspace}%
- }{%
- \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}%
- \toggletrue{blx at ox@relpunctset}
+ 'period', 'exclam', 'question', and 'space'.}}%
+ \egroup
+ \iftoggle{blx at 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}%
}{%
- \PackageError{biblatex-oxref}{%
- Invalid option 'relationpunct=#1'%
- }{%
- Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
- 'period', 'exclam', 'question', and 'space'.}}}
+ \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 at ox@relitem}
\xapptobibmacro{begrelated}{%
\setcounter{blx at ox@relitem}{0}%
- \iftoggle{blx at 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 at ox@norelin}
+\DeclareBiblatexOption{global,type,entry}{norelatedin}[true]{%
+ \settoggle{blx at ox@norelin}{#1}}
+\xapptobibmacro{begrelatedloop}{%
+ \iftoggle{blx at 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 @@
\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 @@
\entryset
{\ifbool{bbx:subentry}
{\printfield[bibentrysetcount]{entrysetcount}%
- \printunit*{\addnbspace}}
+ \printunit*{\addnbspace}}
{}}
{}%
\newunit\newblock
@@ -12996,12 +13009,8 @@
%
% \begin{macrocode}
\newtoggle{blx at ox@nonodate}
-\DeclareBibliographyOption{nonodate}[true]{%
+\DeclareBiblatexOption{global,type,entry}{nonodate}[true]{%
\settoggle{blx at ox@nonodate}{#1}}
-\DeclareTypeOption{nonodate}[true]{%
- \settoggle{blx at ox@nonodate}{#1}}
-\DeclareEntryOption{nonodate}[true]{%
- \settoggle{blx at ox@nonodate}{#1}}
\newbibmacro*{labeldate}{%
\ifboolexpr{
test {\iffieldequalstr{labeldatesource}{nodate}}
Modified: trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins 2021-01-24 21:51:15 UTC (rev 57513)
@@ -37,7 +37,7 @@
\endpreamble
\postamble
-Copyright (C) 2016–2020 Alex Ball
+Copyright (C) 2016–2021 Alex Ball
\endpostamble
\usedir{tex/latex/\jobname}
@@ -83,6 +83,6 @@
}
\endbatchfile
%%
-%% Copyright (C) 2016–2020 Alex Ball
+%% Copyright (C) 2016–2021 Alex Ball
%%
%% End of file `oxref.ins'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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,7 +78,7 @@
\entryset
{\ifbool{bbx:subentry}
{\printfield[bibentrysetcount]{entrysetcount}%
-\printunit*{\addnbspace}}
+ \printunit*{\addnbspace}}
{}}
{}%
\newunit\newblock
@@ -85,6 +85,6 @@
\usebibmacro{setpageref}%
\finentry}
%%
-%% Copyright (C) 2016–2020 Alex Ball
+%% Copyright (C) 2016–2021 Alex Ball
%%
%% End of file `oxnum.bbx'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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,12 +63,8 @@
\settoggle{blx at ox@scnames}{#1}
}
\newtoggle{blx at ox@nametitle}\toggletrue{blx at ox@nametitle}%
-\DeclareBibliographyOption{usenametitles}[true]{%
+\DeclareBiblatexOption{global,type,entry}{usenametitles}[true]{%
\settoggle{blx at ox@nametitle}{#1}}
-\DeclareTypeOption{usenametitles}[true]{%
- \settoggle{blx at ox@nametitle}{#1}}
-\DeclareEntryOption{usenametitles}[true]{%
- \settoggle{blx at ox@nametitle}{#1}}
\newbibmacro*{name:title-given-family}[5]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
@@ -621,12 +617,8 @@
\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}%
}
\newtoggle{blx at ox@timefirst}
-\DeclareBibliographyOption{timefirst}[true]{%
+\DeclareBiblatexOption{global,type,entry}{timefirst}[true]{%
\settoggle{blx at ox@timefirst}{#1}}
-\DeclareTypeOption{timefirst}[true]{%
- \settoggle{blx at ox@timefirst}{#1}}
-\DeclareEntryOption{timefirst}[true]{%
- \settoggle{blx at ox@timefirst}{#1}}
\newbibmacro*{date+time}{%
\ifboolexpr{
test {\iffieldundef{year}}
@@ -818,7 +810,7 @@
}
\newcommand*{\ifabbrev}[3]{%
\StrRight{#1}{1}[\blx at ox@lastchar]%
- \IfSubStr{\blx at ox@abbrevstring}{\blx at ox@lastchar}{#2}{#3}
+ \expandafter\IfSubStr*{\blx at ox@abbrevstring}{\blx at 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,18 +901,10 @@
}
\ExecuteBibliographyOptions{issuestyle=slash}
\newtoggle{blx at ox@varissuedate}
-\DeclareBibliographyOption{varissuedate}[true]{%
+\DeclareBiblatexOption{global,type,entry}{varissuedate}[true]{%
\settoggle{blx at ox@varissuedate}{#1}}
-\DeclareTypeOption{varissuedate}[true]{%
+\DeclareBiblatexOption{global,type,entry}{issuedate-plain}[true]{%
\settoggle{blx at ox@varissuedate}{#1}}
-\DeclareEntryOption{varissuedate}[true]{%
- \settoggle{blx at ox@varissuedate}{#1}}
-\DeclareBibliographyOption{issuedate-plain}[true]{%
- \settoggle{blx at ox@varissuedate}{#1}}
-\DeclareTypeOption{issuedate-plain}[true]{%
- \settoggle{blx at ox@varissuedate}{#1}}
-\DeclareEntryOption{issuedate-plain}[true]{%
- \settoggle{blx at ox@varissuedate}{#1}}
\renewbibmacro*{issue+date}{%
\ifboolexpr{
test {\iffieldundef{issue}}
@@ -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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\printfield{volumes}%
\newunit\newblock
@@ -1618,19 +1592,18 @@
\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 @@
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\printfield{volumes}%
\newunit\newblock%
@@ -1664,19 +1637,18 @@
\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 @@
\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 @@
\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 @@
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\printfield{edition}%
\newunit
@@ -1806,19 +1776,18 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
}{}%
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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 @@
\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,10 +2650,8 @@
\setboolean{bbx at paryear-essential}{#1}}
\newtoggle{blx at ox@nopostnotedelim}
\newtoggle{bbx:altcourt}
-\DeclareBibliographyOption{court-plain}[true]{%
+\DeclareBiblatexOption{global,type,entry}{court-plain}[true]{%
\settoggle{bbx:altcourt}{#1}}
-\DeclareEntryOption{court-plain}[true]{%
- \settoggle{bbx:altcourt}{#1}}
\newtoggle{bbx at ecliuse}
\newtoggle{bbx at eclionly}
\DeclareBibliographyOption[string]{ecli}[yes]{%
@@ -2996,13 +2952,13 @@
\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 at juriscitedone}
\newbibmacro{juriscitation}{%
@@ -3383,7 +3339,8 @@
\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 @@
\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 @@
{}%
\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 @@
\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 at ox@success}
+\DeclareBiblatexOption{global,type}[string]{relationpunct}[semicolon]{%
+ \bgroup\blx at blxinit
+ \ifcsdef{add#1}{\global\toggletrue{blx at ox@success}}{%
+ \global\togglefalse{blx at 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 at ox@success}{\ifstrequal{#1}{space}{%
+ \DeclareDelimFormat{begrelateddelim}{\addspace}%
}{%
+ \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}}%
+ }{}}
+\DeclareEntryOption[string]{relationpunct}[semicolon]{%
+ \bgroup\blx at blxinit
+ \ifcsdef{add#1}{\global\toggletrue{blx at ox@success}}{%
+ \global\togglefalse{blx at ox@success}%
\PackageError{biblatex-oxref}{%
Invalid option 'relationpunct=#1'%
}{%
Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
- 'period', 'exclam', 'question', and 'space'.}}}
-\newtoggle{blx at ox@relpunctset}
-\DeclareEntryOption[string]{relationpunct}[semicolon]{%
- \ifcsdef{add#1}{%
- \ifstrequal{#1}{space}{%
- \renewcommand*{\relatedtypepunct}{\addspace}%
- }{%
- \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}%
- \toggletrue{blx at ox@relpunctset}
+ 'period', 'exclam', 'question', and 'space'.}}%
+ \egroup
+ \iftoggle{blx at 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}%
}{%
- \PackageError{biblatex-oxref}{%
- Invalid option 'relationpunct=#1'%
- }{%
- Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
- 'period', 'exclam', 'question', and 'space'.}}}
+ \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 at ox@relitem}
\xapptobibmacro{begrelated}{%
\setcounter{blx at ox@relitem}{0}%
- \iftoggle{blx at 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 at ox@norelin}
+\DeclareBiblatexOption{global,type,entry}{norelatedin}[true]{%
+ \settoggle{blx at ox@norelin}{#1}}
+\xapptobibmacro{begrelatedloop}{%
+ \iftoggle{blx at 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 @@
[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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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,12 +67,8 @@
not test {\iffieldundef{labeldatesource}}
and test {\iffieldequalstr{labeldatesource}{pubstate}}}}
\newtoggle{blx at ox@nonodate}
-\DeclareBibliographyOption{nonodate}[true]{%
+\DeclareBiblatexOption{global,type,entry}{nonodate}[true]{%
\settoggle{blx at ox@nonodate}{#1}}
-\DeclareTypeOption{nonodate}[true]{%
- \settoggle{blx at ox@nonodate}{#1}}
-\DeclareEntryOption{nonodate}[true]{%
- \settoggle{blx at ox@nonodate}{#1}}
\newbibmacro*{labeldate}{%
\ifboolexpr{
test {\iffieldequalstr{labeldatesource}{nodate}}
@@ -571,6 +567,6 @@
}}
%%
-%% Copyright (C) 2016–2020 Alex Ball
+%% Copyright (C) 2016–2021 Alex Ball
%%
%% End of file `oxyear.bbx'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx 2021-01-24 17:49:14 UTC (rev 57512)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx 2021-01-24 21:51:15 UTC (rev 57513)
@@ -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'.
More information about the tex-live-commits
mailing list.