summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx531
1 files changed, 264 insertions, 267 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
index 9f1fcb97e98..95540a30da7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2020/10/19 v2.1}
+\def\Version{2021/01/18 v2.2}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxref.bbx}
[\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style]
@@ -63,11 +63,7 @@
\settoggle{blx@ox@scnames}{#1}
}
\newtoggle{blx@ox@nametitle}\toggletrue{blx@ox@nametitle}%
-\DeclareBibliographyOption{usenametitles}[true]{%
- \settoggle{blx@ox@nametitle}{#1}}
-\DeclareTypeOption{usenametitles}[true]{%
- \settoggle{blx@ox@nametitle}{#1}}
-\DeclareEntryOption{usenametitles}[true]{%
+\DeclareBiblatexOption{global,type,entry}{usenametitles}[true]{%
\settoggle{blx@ox@nametitle}{#1}}
\newbibmacro*{name:title-given-family}[5]{%
\usebibmacro{name:delim}{#2#3#1}%
@@ -621,11 +617,7 @@
\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}%
}
\newtoggle{blx@ox@timefirst}
-\DeclareBibliographyOption{timefirst}[true]{%
- \settoggle{blx@ox@timefirst}{#1}}
-\DeclareTypeOption{timefirst}[true]{%
- \settoggle{blx@ox@timefirst}{#1}}
-\DeclareEntryOption{timefirst}[true]{%
+\DeclareBiblatexOption{global,type,entry}{timefirst}[true]{%
\settoggle{blx@ox@timefirst}{#1}}
\newbibmacro*{date+time}{%
\ifboolexpr{
@@ -818,7 +810,7 @@
}
\newcommand*{\ifabbrev}[3]{%
\StrRight{#1}{1}[\blx@ox@lastchar]%
- \IfSubStr{\blx@ox@abbrevstring}{\blx@ox@lastchar}{#2}{#3}
+ \expandafter\IfSubStr*{\blx@ox@abbrevstring}{\blx@ox@lastchar}{#2}{#3}%
}
\renewbibmacro*{journal+issuetitle}{%
\ifboolexpr{
@@ -839,9 +831,9 @@
}{}}%
\usebibmacro{journal}%
\iffieldundef{journalsubtitle}{%
- \ifabbrev{\thefield{journaltitle}}{\setunit{\addspace}}{\newunit}%
+ \ifabbrev{\strfield{journaltitle}}{\setunit{\addspace}}{\newunit}%
}{%
- \ifabbrev{\thefield{journalsubtitle}}{\setunit{\addspace}}{\newunit}}%
+ \ifabbrev{\strfield{journalsubtitle}}{\setunit{\addspace}}{\newunit}}%
\iffieldundef{series}{}{%
\newunit\newblock
\printfield{series}%
@@ -856,9 +848,9 @@
\renewbibmacro*{title+issuetitle}{%
\usebibmacro{periodical}%
\iffieldundef{subtitle}{%
- \ifabbrev{\thefield{title}}{\setunit{\addspace}}{\newunit}%
+ \ifabbrev{\strfield{title}}{\setunit{\addspace}}{\newunit}%
}{%
- \ifabbrev{\thefield{subtitle}}{\setunit{\addspace}}{\newunit}}%
+ \ifabbrev{\strfield{subtitle}}{\setunit{\addspace}}{\newunit}}%
\iffieldundef{series}{}{%
\newunit\newblock
\printfield{series}%
@@ -909,17 +901,9 @@
}
\ExecuteBibliographyOptions{issuestyle=slash}
\newtoggle{blx@ox@varissuedate}
-\DeclareBibliographyOption{varissuedate}[true]{%
- \settoggle{blx@ox@varissuedate}{#1}}
-\DeclareTypeOption{varissuedate}[true]{%
- \settoggle{blx@ox@varissuedate}{#1}}
-\DeclareEntryOption{varissuedate}[true]{%
- \settoggle{blx@ox@varissuedate}{#1}}
-\DeclareBibliographyOption{issuedate-plain}[true]{%
- \settoggle{blx@ox@varissuedate}{#1}}
-\DeclareTypeOption{issuedate-plain}[true]{%
+\DeclareBiblatexOption{global,type,entry}{varissuedate}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareEntryOption{issuedate-plain}[true]{%
+\DeclareBiblatexOption{global,type,entry}{issuedate-plain}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
\renewbibmacro*{issue+date}{%
\ifboolexpr{
@@ -991,13 +975,12 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{periodical}{%
\usebibmacro{bibindex}%
@@ -1017,13 +1000,12 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\DeclareFieldFormat[suppperiodical]{title}{%
\def\currentfield{title}%
@@ -1071,13 +1053,12 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\ExecuteBibliographyOptions[book,mvbook,reference,mvreference]{useeditor=false,usetranslator=false}
\DeclareFieldFormat[bookinbook]{title}{%
@@ -1308,13 +1289,12 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{mvbook}{%
\usebibmacro{bibindex}%
@@ -1355,19 +1335,18 @@ reference,mvreference,inreference]{volume}{%
\printfield{pagetotal}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inbook}{%
\usebibmacro{bibindex}%
@@ -1384,9 +1363,9 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
@@ -1399,19 +1378,18 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareFieldFormat[suppbook]{title}{%
\def\currentfield{title}%
@@ -1434,9 +1412,9 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
@@ -1447,19 +1425,18 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{bookinbook}{%
\usebibmacro{bibindex}%
@@ -1476,9 +1453,9 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
@@ -1491,19 +1468,18 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{collection}{%
\usebibmacro{bibindex}%
@@ -1525,19 +1501,18 @@ reference,mvreference,inreference]{volume}{%
\printfield{pagetotal}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{mvcollection}{%
\usebibmacro{bibindex}%
@@ -1576,19 +1551,18 @@ reference,mvreference,inreference]{volume}{%
\printfield{pagetotal}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
@@ -1605,9 +1579,9 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\printfield{volumes}%
\newunit\newblock
@@ -1618,19 +1592,18 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareFieldFormat[suppcollection]{title}{%
\def\currentfield{title}%
@@ -1653,9 +1626,9 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\printfield{volumes}%
\newunit\newblock%
@@ -1664,19 +1637,18 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{reference}{%
\usebibmacro{bibindex}%
@@ -1702,19 +1674,18 @@ reference,mvreference,inreference]{volume}{%
\printfield{pagetotal}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{mvreference}{%
\usebibmacro{bibindex}%
@@ -1757,19 +1728,18 @@ reference,mvreference,inreference]{volume}{%
\printfield{pagetotal}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inreference}{%
\usebibmacro{bibindex}%
@@ -1787,9 +1757,9 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\printfield{edition}%
\newunit
@@ -1806,19 +1776,18 @@ reference,mvreference,inreference]{volume}{%
\printfield{pagetotal}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\ExecuteBibliographyOptions[proceedings,mvproceedings]{useeditor=false,usetranslator=false}
\renewbibmacro*{event+venue+date}{%
@@ -1838,9 +1807,9 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{maintitle+title}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\usebibmacro{event+venue+date}%
\newunit\newblock
@@ -1859,19 +1828,18 @@ reference,mvreference,inreference]{volume}{%
\printfield{pagetotal}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inproceedings}{%
\usebibmacro{bibindex}%
@@ -1886,9 +1854,9 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{maintitle+booktitle}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\newunit\newblock
\usebibmacro{event+venue+date}%
\newunit\newblock
@@ -1905,19 +1873,18 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{chapter+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\newbibmacro*{series+type+number}{%
\ifboolexpr{
@@ -2080,9 +2047,9 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{maintitle+title}%
\newunit
\iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
+ {\printfield{volume}%
+ \printfield{part}}
+ {}%
\setunit{\titlebyauthordelim}\newblock
\usebibmacro{byauthor}%
\newunit\newblock
@@ -2093,28 +2060,26 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{series+type+number}%
\setunit{\addspace}%
\usebibmacro{institution+location+date}%
- \iffieldequals{entrysubtype}{\legreport}{%
- \setunit{\addspace}\nopunct
- }{%
- \newunit\newblock}%
+ \iffieldequals{entrysubtype}{\legreport}
+ {\setunit{\addspace}\nopunct}
+ {\newunit\newblock}%
\usebibmacro{chapter+pages}%
\newunit
\printfield{pagetotal}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isrn}}
- {}%
+ {\printfield{isrn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\xpatchbibdriver{thesis}{%
\printfield{type}%
@@ -2199,13 +2164,12 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{manual}{%
\usebibmacro{bibindex}%
@@ -2224,17 +2188,17 @@ reference,mvreference,inreference]{volume}{%
}{}%
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
- \ifentrytype{software}{%
- \usebibmacro{title+version}%
- }{%
- \usebibmacro{title}}%
+ \ifentrytype{software}
+ {\usebibmacro{title+version}}
+ {\usebibmacro{title}}%
\setunit{\titlebyauthordelim}\newblock
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{byeditor}%
\newunit
- \ifentrytype{software}{}{%
- \newunit\printfield{version}}%
+ \ifentrytype{software}
+ {}
+ {\newunit\printfield{version}}%
\newunit
\printfield{note}%
\newunit\newblock
@@ -2245,19 +2209,18 @@ reference,mvreference,inreference]{volume}{%
\printfield{pagetotal}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyAlias{standard}{manual}
\ExecuteBibliographyOptions[standard]{useeditor=false}
@@ -2365,19 +2328,18 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{post-byeditor+others}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyAlias{music}{audio}
\DeclareBibliographyAlias{movie}{audio}
@@ -2421,19 +2383,18 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{post-byeditor+others}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyAlias{inmusic}{inaudio}
\DeclareBibliographyAlias{inmovie}{inaudio}
@@ -2541,19 +2502,18 @@ reference,mvreference,inreference]{volume}{%
\printlist{organization}%
\newunit\newblock
\iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
+ {\printfield{isbn}}
+ {}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\DeclareBibliographyAlias{image}{performance}
\DeclareBibliographyAlias{artwork}{performance}
@@ -2616,19 +2576,18 @@ reference,mvreference,inreference]{volume}{%
\printlist{publisher}%
\newunit\newblock
\iftoggle{bbx:eprint}
- {\usebibmacro{eprint}}
- {}%
+ {\usebibmacro{eprint}}
+ {}%
\newunit\newblock
\usebibmacro{url+urldate}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
\usebibmacro{finentry}}
\newbibmacro*{title+version}{%
\ifboolexpr{
@@ -2673,13 +2632,12 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \newunit\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\newtoggle{bbx:scotstyle}
\DeclareEntryOption{scottish-style}[true]{%
@@ -2692,9 +2650,7 @@ reference,mvreference,inreference]{volume}{%
\setboolean{bbx@paryear-essential}{#1}}
\newtoggle{blx@ox@nopostnotedelim}
\newtoggle{bbx:altcourt}
-\DeclareBibliographyOption{court-plain}[true]{%
- \settoggle{bbx:altcourt}{#1}}
-\DeclareEntryOption{court-plain}[true]{%
+\DeclareBiblatexOption{global,type,entry}{court-plain}[true]{%
\settoggle{bbx:altcourt}{#1}}
\newtoggle{bbx@ecliuse}
\newtoggle{bbx@eclionly}
@@ -2996,13 +2952,13 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{doi+eprint+url}%
\setunit{\addspace}%\newblock
\usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
\setunit{\addspace}%\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\newtoggle{bbx@juriscitedone}
\newbibmacro{juriscitation}{%
@@ -3383,7 +3339,8 @@ reference,mvreference,inreference]{volume}{%
\usebibmacro{legsupp}}}}%
\setunit{\addcomma\space}%
\printfield{note}%
- \setunit{\addspace}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\newbibmacro*{courtrules}{%
\restorefield{prenote}{\postnotesecond}%
@@ -3687,11 +3644,12 @@ reference,mvreference,inreference]{volume}{%
\iftoggle{bbx:url}{%
\usebibmacro{url+urldate}%
}{}%
- \setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}{%
\usebibmacro{related:init}%
\usebibmacro{related}%
}{}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\newbibmacro*{library+location+series+number}{%
\printfield{library}%
@@ -3741,13 +3699,12 @@ reference,mvreference,inreference]{volume}{%
{}%
\newunit\newblock
\usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\usebibmacro{finentry}}
\DeclareBibliographyAlias{letter}{unpublished}
\DeclareFieldFormat[letter]{title}{%
@@ -3757,72 +3714,112 @@ reference,mvreference,inreference]{volume}{%
\DeclareFieldFormat[letter]{date}{%
\iffieldundef{url}{#1}{\mkbibparens{#1}}}
\xpatchbibdriver{booklet}{%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\newunit\newblock
\iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
}{%
- \setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch booklet}}
\xpatchbibdriver{misc}{%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
\newunit\newblock
\iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
}{%
- \setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch misc}}
-\DeclareBibliographyOption[string]{relationpunct}[semicolon]{%
- \ifcsdef{add#1}{%
- \ifstrequal{#1}{space}{%
- \renewcommand*{\relatedtypepunct}{\addspace}%
- }{%
- \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}%
- }{%
+\DeclareDelimFormat{begrelateddelimequals}{\addspace}
+\DeclareDelimFormat{begrelateddelimin}{\addcomma\space}
+\DeclareDelimFormat{begrelateddelimincludes}{\addcomma\space}
+\DeclareDelimFormat{begrelateddelimreprintfrom}{\addperiod\space}
+\DeclareDelimFormat{begrelateddelimreviewof}{\newunitpunct}
+\DeclareDelimFormat{begrelateddelimtranslationof}{\addspace}
+\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct}
+\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct}
+\newtoggle{blx@ox@success}
+\DeclareBiblatexOption{global,type}[string]{relationpunct}[semicolon]{%
+ \bgroup\blx@blxinit
+ \ifcsdef{add#1}{\global\toggletrue{blx@ox@success}}{%
+ \global\togglefalse{blx@ox@success}%
\PackageError{biblatex-oxref}{%
Invalid option 'relationpunct=#1'%
}{%
Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
- 'period', 'exclam', 'question', and 'space'.}}}
-\DeclareTypeOption[string]{relationpunct}[semicolon]{%
- \ifcsdef{add#1}{%
- \ifstrequal{#1}{space}{%
- \renewcommand*{\relatedtypepunct}{\addspace}%
- }{%
- \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}%
+ 'period', 'exclam', 'question', and 'space'.}}%
+ \egroup
+ \iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{%
+ \DeclareDelimFormat{begrelateddelim}{\addspace}%
}{%
- \PackageError{biblatex-oxref}{%
- Invalid option 'relationpunct=#1'%
- }{%
- Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
- 'period', 'exclam', 'question', and 'space'.}}}
-\newtoggle{blx@ox@relpunctset}
+ \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}}%
+ }{}}
\DeclareEntryOption[string]{relationpunct}[semicolon]{%
- \ifcsdef{add#1}{%
- \ifstrequal{#1}{space}{%
- \renewcommand*{\relatedtypepunct}{\addspace}%
- }{%
- \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}%
- \toggletrue{blx@ox@relpunctset}
- }{%
+ \bgroup\blx@blxinit
+ \ifcsdef{add#1}{\global\toggletrue{blx@ox@success}}{%
+ \global\togglefalse{blx@ox@success}%
\PackageError{biblatex-oxref}{%
Invalid option 'relationpunct=#1'%
}{%
Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
- 'period', 'exclam', 'question', and 'space'.}}}
+ 'period', 'exclam', 'question', and 'space'.}}%
+ \egroup
+ \iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{%
+ \DeclareDelimFormat{begrelateddelim}{\addspace}%
+ \DeclareDelimFormat{begrelateddelimequals}{\addspace}%
+ \DeclareDelimFormat{begrelateddelimin}{\addspace}%
+ \DeclareDelimFormat{begrelateddelimincludes}{\addspace}%
+ \DeclareDelimFormat{begrelateddelimreprintfrom}{\addspace}%
+ \DeclareDelimFormat{begrelateddelimreviewof}{\addspace}%
+ \DeclareDelimFormat{begrelateddelimtranslationof}{\addspace}%
+ \DeclareDelimFormat{begrelateddelimmultivolume}{\addspace}%
+ }{%
+ \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}%
+ \DeclareDelimFormat{begrelateddelimequals}{\csuse{add#1}\space}%
+ \DeclareDelimFormat{begrelateddelimin}{\csuse{add#1}\space}%
+ \DeclareDelimFormat{begrelateddelimincludes}{\csuse{add#1}\space}%
+ \DeclareDelimFormat{begrelateddelimreprintfrom}{\csuse{add#1}\space}%
+ \DeclareDelimFormat{begrelateddelimreviewof}{\csuse{add#1}\space}%
+ \DeclareDelimFormat{begrelateddelimtranslationof}{\csuse{add#1}\space}%
+ \DeclareDelimFormat{begrelateddelimmultivolume}{\csuse{add#1}\space}}%
+ }{}}
+\ExecuteBibliographyOptions{relationpunct}
\newcounter{blx@ox@relitem}
\xapptobibmacro{begrelated}{%
\setcounter{blx@ox@relitem}{0}%
- \iftoggle{blx@ox@relpunctset}{}{%
- \iffieldequalstr{relatedtype}{in}{%
- \setunit{\addcomma\space}}{}%
- \iffieldequalstr{relatedtype}{reprintfrom}{%
- \setunit{\addperiod\space}}{}%
- \iffieldequalstr{relatedtype}{translationof}{%
- \setunit{\addspace}}{}%
- \iffieldequalstr{relatedtype}{multivolume}{%
- \setunit{\addcomma\space}}{}%
-}}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}}
-\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct}
-\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct}
+}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}}
+\newtoggle{blx@ox@norelin}
+\DeclareBiblatexOption{global,type,entry}{norelatedin}[true]{%
+ \settoggle{blx@ox@norelin}{#1}}
+\xapptobibmacro{begrelatedloop}{%
+ \iftoggle{blx@ox@norelin}{%
+ \renewbibmacro*{in:}{%
+ \ifboolexpr{
+ test {\ifnameundef{author}}
+ and
+ test {\ifnameundef{translator}}
+ and
+ test {\iffieldundef{title}}
+ }{}{%
+ \bibstring{in}%
+ \printunit{\intitlepunct}%
+ }}}{}%
+}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelatedloop}}
\newbibmacro*{rellanguage}{%
\def\do##1{%
@@ -4396,6 +4393,6 @@ reference,mvreference,inreference]{volume}{%
[proceedings,report,artwork,audio,image,music,movie,performance,video,%
manuscript,unpublished,review]{useeditor=false}
%%
-%% Copyright (C) 2016–2020 Alex Ball
+%% Copyright (C) 2016–2021 Alex Ball
%%
%% End of file `oxref.bbx'.