diff options
author | Karl Berry <karl@freefriends.org> | 2021-01-24 21:51:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-01-24 21:51:15 +0000 |
commit | 331851c24408f471980c330a0f7a5676f5a62991 (patch) | |
tree | f1972a91e4df0da0ff50f442c9d7609c7709a65b /Master/texmf-dist/source | |
parent | afbd672b7dbc10eee813646e1be78280020e1602 (diff) |
biblatex-oxref
git-svn-id: svn://tug.org/texlive/trunk@57513 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
3 files changed, 292 insertions, 283 deletions
diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile index 527f4146c6f..e58dba0ac65 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/Makefile +++ b/Master/texmf-dist/source/latex/biblatex-oxref/Makefile @@ -26,7 +26,7 @@ $(STYS:%=%-doc.pdf): %-doc.pdf : %-doc.tex $(NAME).bbx %.bbx %.cbx british-$(NAM latexmk -silent -lualatex -shell-escape -interaction=nonstopmode $< >/dev/null clean: - for log in *.log; do [ -e "$$log" ] || continue; grep "WARNING: biblatex-oxref" $$log; test $$? -eq 1; done + @for log in *.log; do [ -e "$$log" ] || continue; grep "WARNING: biblatex-oxref" $$log; test $$? -eq 1; done rm -f $(NAME).{$(AUX)} $(STYS:%=%-doc.{$(AUX)}) rm -f $(STYS:%=%.doc) {american,british,english}-$(NAME).doc rm -rf _minted-* diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx index 32c12f7cb7a..66eeb6bee5a 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx +++ b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx @@ -1,6 +1,6 @@ % \iffalse %<*internal|bbx|cbx|dbx|lbx|doc> -\def\Version{2020/10/19 v2.1} +\def\Version{2021/01/18 v2.2} %</internal|bbx|cbx|dbx|lbx|doc> %<*internal> \iffalse @@ -166,7 +166,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2016–2020 Alex Ball +Copyright (C) 2016–2021 Alex Ball \endpostamble \usedir{tex/latex/\jobname} @@ -229,7 +229,7 @@ Copyright (C) 2016–2020 Alex Ball \PassOptionsToPackage{style=oxnotes}{biblatex} %</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 @@ Copyright (C) 2016–2020 Alex Ball } %</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 @@ first two steps. ## Licence -Copyright 2016–2020 Alex Ball. +Copyright 2016–2021 Alex Ball. This work consists of the documented LaTeX file oxref.dtx and a Makefile. @@ -971,6 +971,10 @@ The style has some options additional to the regular \pkg{biblatex} ones: Removes publisher name from all entries. Once set, this option cannot be overridden. \end{docKey} +\begin{docKey}{norelatedin}{=\val{true}|\val{false}}{default \val{true}, initially \val{false}} + Suppresses the printing of the \code{in} localization string in circumstances where it would appear directly following a related string such as \enquote{originally published as}. It can also be set on a per-type and per-entry basis. The effects of this key are not well tested, so do please get in touch (see below) if you encounter problems with it. +\end{docKey} + \begin{docKey}{relationpunct}{=\val{period}|\val{comma}|\val{semicolon}|\val{colon}|\val{space}}{default \val{semicolon}, initially \val{semicolon}} Sets the punctuation that precedes the \code{relatedtype} localization string. An additional space is assumed unless the value is \val{space}. @@ -6918,8 +6922,13 @@ will trigger the use of parentheses. \end{Verbatim} \end{bibexbox} +\defbibnote{preface}{This document uses the \pkg{biblatex} option \key{backref} +to demonstrate how entries can be marked with the page(s) on which they were +cited. The format of the back references comes from \pkg{biblatex} itself +rather than \pkg[biblatex]{oxref}.} -\printbibliography[notcategory=hidden] +%<n|a|y>\printbibliography[notcategory=hidden] +%<m>\printbibliography[notcategory=hidden,prenote=preface] %</n|m|a|y> %</doc|bib> %<*driver> @@ -7120,11 +7129,7 @@ will trigger the use of parentheses. % % \begin{macrocode} \newtoggle{blx@ox@nametitle}\toggletrue{blx@ox@nametitle}% -\DeclareBibliographyOption{usenametitles}[true]{% - \settoggle{blx@ox@nametitle}{#1}} -\DeclareTypeOption{usenametitles}[true]{% - \settoggle{blx@ox@nametitle}{#1}} -\DeclareEntryOption{usenametitles}[true]{% +\DeclareBiblatexOption{global,type,entry}{usenametitles}[true]{% \settoggle{blx@ox@nametitle}{#1}} % \end{macrocode} % @@ -7903,11 +7908,7 @@ will trigger the use of parentheses. \ifbibstring{#1}{\bibstring{#1}}{#1\isdot}% } \newtoggle{blx@ox@timefirst} -\DeclareBibliographyOption{timefirst}[true]{% - \settoggle{blx@ox@timefirst}{#1}} -\DeclareTypeOption{timefirst}[true]{% - \settoggle{blx@ox@timefirst}{#1}} -\DeclareEntryOption{timefirst}[true]{% +\DeclareBiblatexOption{global,type,entry}{timefirst}[true]{% \settoggle{blx@ox@timefirst}{#1}} \newbibmacro*{date+time}{% \ifboolexpr{ @@ -8213,7 +8214,7 @@ will trigger the use of parentheses. } \newcommand*{\ifabbrev}[3]{% \StrRight{#1}{1}[\blx@ox@lastchar]% - \IfSubStr{\blx@ox@abbrevstring}{\blx@ox@lastchar}{#2}{#3} + \expandafter\IfSubStr*{\blx@ox@abbrevstring}{\blx@ox@lastchar}{#2}{#3}% } % \end{macrocode} % @@ -8245,9 +8246,9 @@ will trigger the use of parentheses. }{}}% \usebibmacro{journal}% \iffieldundef{journalsubtitle}{% - \ifabbrev{\thefield{journaltitle}}{\setunit{\addspace}}{\newunit}% + \ifabbrev{\strfield{journaltitle}}{\setunit{\addspace}}{\newunit}% }{% - \ifabbrev{\thefield{journalsubtitle}}{\setunit{\addspace}}{\newunit}}% + \ifabbrev{\strfield{journalsubtitle}}{\setunit{\addspace}}{\newunit}}% \iffieldundef{series}{}{% \newunit\newblock \printfield{series}% @@ -8270,9 +8271,9 @@ will trigger the use of parentheses. \renewbibmacro*{title+issuetitle}{% \usebibmacro{periodical}% \iffieldundef{subtitle}{% - \ifabbrev{\thefield{title}}{\setunit{\addspace}}{\newunit}% + \ifabbrev{\strfield{title}}{\setunit{\addspace}}{\newunit}% }{% - \ifabbrev{\thefield{subtitle}}{\setunit{\addspace}}{\newunit}}% + \ifabbrev{\strfield{subtitle}}{\setunit{\addspace}}{\newunit}}% \iffieldundef{series}{}{% \newunit\newblock \printfield{series}% @@ -8345,17 +8346,9 @@ will trigger the use of parentheses. % % \begin{macrocode} \newtoggle{blx@ox@varissuedate} -\DeclareBibliographyOption{varissuedate}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption{varissuedate}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption{varissuedate}[true]{% +\DeclareBiblatexOption{global,type,entry}{varissuedate}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareBibliographyOption{issuedate-plain}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption{issuedate-plain}[true]{% - \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption{issuedate-plain}[true]{% +\DeclareBiblatexOption{global,type,entry}{issuedate-plain}[true]{% \settoggle{blx@ox@varissuedate}{#1}} \renewbibmacro*{issue+date}{% \ifboolexpr{ @@ -8438,13 +8431,12 @@ will trigger the use of parentheses. \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8469,13 +8461,12 @@ will trigger the use of parentheses. \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8531,13 +8522,12 @@ will trigger the use of parentheses. \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8889,13 +8879,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8953,19 +8942,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -8988,9 +8976,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -9003,19 +8991,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9044,9 +9031,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -9057,19 +9044,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9092,9 +9078,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -9107,19 +9093,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9147,19 +9132,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9205,19 +9189,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9242,9 +9225,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \printfield{volumes}% \newunit\newblock @@ -9255,19 +9238,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9296,9 +9278,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \printfield{volumes}% \newunit\newblock% @@ -9307,19 +9289,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9352,19 +9333,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9413,19 +9393,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9450,9 +9429,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \printfield{edition}% \newunit @@ -9469,19 +9448,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9539,9 +9517,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+title}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{event+venue+date}% \newunit\newblock @@ -9560,19 +9538,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9593,9 +9570,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+booktitle}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \newunit\newblock \usebibmacro{event+venue+date}% \newunit\newblock @@ -9612,19 +9589,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9835,9 +9811,9 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{maintitle+title}% \newunit \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% + {\printfield{volume}% + \printfield{part}} + {}% \setunit{\titlebyauthordelim}\newblock \usebibmacro{byauthor}% \newunit\newblock @@ -9848,28 +9824,26 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{series+type+number}% \setunit{\addspace}% \usebibmacro{institution+location+date}% - \iffieldequals{entrysubtype}{\legreport}{% - \setunit{\addspace}\nopunct - }{% - \newunit\newblock}% + \iffieldequals{entrysubtype}{\legreport} + {\setunit{\addspace}\nopunct} + {\newunit\newblock}% \usebibmacro{chapter+pages}% \newunit \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isrn}} - {}% + {\printfield{isrn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -9982,13 +9956,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10018,17 +9991,17 @@ reference,mvreference,inreference]{volume}{% }{}% \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock - \ifentrytype{software}{% - \usebibmacro{title+version}% - }{% - \usebibmacro{title}}% + \ifentrytype{software} + {\usebibmacro{title+version}} + {\usebibmacro{title}}% \setunit{\titlebyauthordelim}\newblock \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor}% \newunit - \ifentrytype{software}{}{% - \newunit\printfield{version}}% + \ifentrytype{software} + {} + {\newunit\printfield{version}}% \newunit \printfield{note}% \newunit\newblock @@ -10039,19 +10012,18 @@ reference,mvreference,inreference]{volume}{% \printfield{pagetotal}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyAlias{standard}{manual} \ExecuteBibliographyOptions[standard]{useeditor=false} @@ -10183,19 +10155,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{post-byeditor+others}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10250,19 +10221,18 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{post-byeditor+others}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10397,19 +10367,18 @@ reference,mvreference,inreference]{volume}{% \printlist{organization}% \newunit\newblock \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% + {\printfield{isbn}} + {}% \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} \DeclareBibliographyAlias{image}{performance} \DeclareBibliographyAlias{artwork}{performance} @@ -10512,19 +10481,18 @@ reference,mvreference,inreference]{volume}{% \printlist{publisher}% \newunit\newblock \iftoggle{bbx:eprint} - {\usebibmacro{eprint}} - {}% + {\usebibmacro{eprint}} + {}% \newunit\newblock \usebibmacro{url+urldate}% \newunit\newblock \usebibmacro{addendum+pubstate}% + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock - \iftoggle{bbx:related} - {\usebibmacro{related:init}% - \usebibmacro{related}} - {}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10596,13 +10564,12 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \newunit\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -10626,9 +10593,7 @@ reference,mvreference,inreference]{volume}{% \setboolean{bbx@paryear-essential}{#1}} \newtoggle{blx@ox@nopostnotedelim} \newtoggle{bbx:altcourt} -\DeclareBibliographyOption{court-plain}[true]{% - \settoggle{bbx:altcourt}{#1}} -\DeclareEntryOption{court-plain}[true]{% +\DeclareBiblatexOption{global,type,entry}{court-plain}[true]{% \settoggle{bbx:altcourt}{#1}} \newtoggle{bbx@ecliuse} \newtoggle{bbx@eclionly} @@ -10962,13 +10927,13 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{doi+eprint+url}% \setunit{\addspace}%\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% \setunit{\addspace}%\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \newtoggle{bbx@juriscitedone} \newbibmacro{juriscitation}{% @@ -11387,7 +11352,8 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{legsupp}}}}% \setunit{\addcomma\space}% \printfield{note}% - \setunit{\addspace}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} \newbibmacro*{courtrules}{% \restorefield{prenote}{\postnotesecond}% @@ -11757,11 +11723,12 @@ reference,mvreference,inreference]{volume}{% \iftoggle{bbx:url}{% \usebibmacro{url+urldate}% }{}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related}{% \usebibmacro{related:init}% \usebibmacro{related}% }{}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -11824,13 +11791,12 @@ reference,mvreference,inreference]{volume}{% {}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \usebibmacro{finentry}} % \end{macrocode} % @@ -11851,81 +11817,128 @@ reference,mvreference,inreference]{volume}{% % \subsection{Related entries} % % We make the punctuation before related items configurable in remaining drivers -% inherited from the standard style. +% inherited from the standard style, and move the |pageref| macro to the end. % % \begin{macrocode} \xpatchbibdriver{booklet}{% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \newunit\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% }{% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% }{}{\wlog{WARNING: biblatex-oxref failed to patch booklet}} +% \end{macrocode} +% \begin{macrocode} \xpatchbibdriver{misc}{% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \newunit\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% }{% - \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% }{}{\wlog{WARNING: biblatex-oxref failed to patch misc}} % \end{macrocode} % % We provide an option for setting the relatedtype punctuation. % % \begin{macrocode} -\DeclareBibliographyOption[string]{relationpunct}[semicolon]{% - \ifcsdef{add#1}{% - \ifstrequal{#1}{space}{% - \renewcommand*{\relatedtypepunct}{\addspace}% - }{% - \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}% - }{% +\DeclareDelimFormat{begrelateddelimequals}{\addspace} +\DeclareDelimFormat{begrelateddelimin}{\addcomma\space} +\DeclareDelimFormat{begrelateddelimincludes}{\addcomma\space} +\DeclareDelimFormat{begrelateddelimreprintfrom}{\addperiod\space} +\DeclareDelimFormat{begrelateddelimreviewof}{\newunitpunct} +\DeclareDelimFormat{begrelateddelimtranslationof}{\addspace} +\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct} +\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct} +\newtoggle{blx@ox@success} +\DeclareBiblatexOption{global,type}[string]{relationpunct}[semicolon]{% + \bgroup\blx@blxinit + \ifcsdef{add#1}{\global\toggletrue{blx@ox@success}}{% + \global\togglefalse{blx@ox@success}% \PackageError{biblatex-oxref}{% Invalid option 'relationpunct=#1'% }{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak - 'period', 'exclam', 'question', and 'space'.}}} -\DeclareTypeOption[string]{relationpunct}[semicolon]{% - \ifcsdef{add#1}{% - \ifstrequal{#1}{space}{% - \renewcommand*{\relatedtypepunct}{\addspace}% - }{% - \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}% + 'period', 'exclam', 'question', and 'space'.}}% + \egroup + \iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{% + \DeclareDelimFormat{begrelateddelim}{\addspace}% }{% - \PackageError{biblatex-oxref}{% - Invalid option 'relationpunct=#1'% - }{% - Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak - 'period', 'exclam', 'question', and 'space'.}}} -\newtoggle{blx@ox@relpunctset} + \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}}% + }{}} \DeclareEntryOption[string]{relationpunct}[semicolon]{% - \ifcsdef{add#1}{% - \ifstrequal{#1}{space}{% - \renewcommand*{\relatedtypepunct}{\addspace}% - }{% - \renewcommand*{\relatedtypepunct}{\csuse{add#1}\space}}% - \toggletrue{blx@ox@relpunctset} - }{% + \bgroup\blx@blxinit + \ifcsdef{add#1}{\global\toggletrue{blx@ox@success}}{% + \global\togglefalse{blx@ox@success}% \PackageError{biblatex-oxref}{% Invalid option 'relationpunct=#1'% }{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak - 'period', 'exclam', 'question', and 'space'.}}} + 'period', 'exclam', 'question', and 'space'.}}% + \egroup + \iftoggle{blx@ox@success}{\ifstrequal{#1}{space}{% + \DeclareDelimFormat{begrelateddelim}{\addspace}% + \DeclareDelimFormat{begrelateddelimequals}{\addspace}% + \DeclareDelimFormat{begrelateddelimin}{\addspace}% + \DeclareDelimFormat{begrelateddelimincludes}{\addspace}% + \DeclareDelimFormat{begrelateddelimreprintfrom}{\addspace}% + \DeclareDelimFormat{begrelateddelimreviewof}{\addspace}% + \DeclareDelimFormat{begrelateddelimtranslationof}{\addspace}% + \DeclareDelimFormat{begrelateddelimmultivolume}{\addspace}% + }{% + \DeclareDelimFormat{begrelateddelim}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimequals}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimin}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimincludes}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimreprintfrom}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimreviewof}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimtranslationof}{\csuse{add#1}\space}% + \DeclareDelimFormat{begrelateddelimmultivolume}{\csuse{add#1}\space}}% + }{}} +\ExecuteBibliographyOptions{relationpunct} \newcounter{blx@ox@relitem} \xapptobibmacro{begrelated}{% \setcounter{blx@ox@relitem}{0}% - \iftoggle{blx@ox@relpunctset}{}{% - \iffieldequalstr{relatedtype}{in}{% - \setunit{\addcomma\space}}{}% - \iffieldequalstr{relatedtype}{reprintfrom}{% - \setunit{\addperiod\space}}{}% - \iffieldequalstr{relatedtype}{translationof}{% - \setunit{\addspace}}{}% - \iffieldequalstr{relatedtype}{multivolume}{% - \setunit{\addcomma\space}}{}% -}}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} -\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct} -\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct} +}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} +% \end{macrocode} +% +% We provide an option to prevent a related item beginning with "in". +% +% \begin{macrocode} +\newtoggle{blx@ox@norelin} +\DeclareBiblatexOption{global,type,entry}{norelatedin}[true]{% + \settoggle{blx@ox@norelin}{#1}} +\xapptobibmacro{begrelatedloop}{% + \iftoggle{blx@ox@norelin}{% + \renewbibmacro*{in:}{% + \ifboolexpr{ + test {\ifnameundef{author}} + and + test {\ifnameundef{translator}} + and + test {\iffieldundef{title}} + }{}{% + \bibstring{in}% + \printunit{\intitlepunct}% + }}}{}% +}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelatedloop}} % \end{macrocode} % @@ -12843,8 +12856,8 @@ reference,mvreference,inreference]{volume}{% \defbibenvironment{bibliography} {\list {\printtext[labelnumberwidth]{% - \printfield{labelprefix}% - \printfield{labelnumber}}} + \printfield{labelprefix}% + \printfield{labelnumber}}} {\setlength{\labelwidth}{\labelnumberwidth}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% @@ -12872,7 +12885,7 @@ reference,mvreference,inreference]{volume}{% \entryset {\ifbool{bbx:subentry} {\printfield[bibentrysetcount]{entrysetcount}% - \printunit*{\addnbspace}} + \printunit*{\addnbspace}} {}} {}% \newunit\newblock @@ -12996,11 +13009,7 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \newtoggle{blx@ox@nonodate} -\DeclareBibliographyOption{nonodate}[true]{% - \settoggle{blx@ox@nonodate}{#1}} -\DeclareTypeOption{nonodate}[true]{% - \settoggle{blx@ox@nonodate}{#1}} -\DeclareEntryOption{nonodate}[true]{% +\DeclareBiblatexOption{global,type,entry}{nonodate}[true]{% \settoggle{blx@ox@nonodate}{#1}} \newbibmacro*{labeldate}{% \ifboolexpr{ diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins index 159820d794d..bd53350964c 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins +++ b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.ins @@ -37,7 +37,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2016–2020 Alex Ball +Copyright (C) 2016–2021 Alex Ball \endpostamble \usedir{tex/latex/\jobname} @@ -83,6 +83,6 @@ Copyright (C) 2016–2020 Alex Ball } \endbatchfile %% -%% Copyright (C) 2016–2020 Alex Ball +%% Copyright (C) 2016–2021 Alex Ball %% %% End of file `oxref.ins'. |