From 24c79eb8c2a06ff6b9b40ff4f6236f59b43ba414 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 20 Sep 2019 21:33:28 +0000 Subject: biblatex-oxref (20sep19) git-svn-id: svn://tug.org/texlive/trunk@52135 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/biblatex-oxref/oxalph-doc.pdf | Bin 438613 -> 440064 bytes .../doc/latex/biblatex-oxref/oxalph-doc.tex | 32 ++++- .../doc/latex/biblatex-oxref/oxnotes-doc.pdf | Bin 444450 -> 443920 bytes .../doc/latex/biblatex-oxref/oxnotes-doc.tex | 24 ++-- .../doc/latex/biblatex-oxref/oxnum-doc.pdf | Bin 438858 -> 438208 bytes .../doc/latex/biblatex-oxref/oxnum-doc.tex | 24 ++-- .../texmf-dist/doc/latex/biblatex-oxref/oxref.bib | 16 +-- .../texmf-dist/doc/latex/biblatex-oxref/oxref.pdf | Bin 525894 -> 533468 bytes .../doc/latex/biblatex-oxref/oxyear-doc.pdf | Bin 442212 -> 443921 bytes .../doc/latex/biblatex-oxref/oxyear-doc.tex | 32 ++++- .../source/latex/biblatex-oxref/oxref.dtx | 157 ++++++++++++++++----- .../tex/latex/biblatex-oxref/american-oxref.lbx | 2 +- .../tex/latex/biblatex-oxref/british-oxref.lbx | 2 +- .../tex/latex/biblatex-oxref/english-oxref.lbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-ibid.bbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-ibid.cbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-ibid.dbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-inote.bbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-inote.cbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-inote.dbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-note.bbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-note.cbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-note.dbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-trad1.bbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-trad1.cbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-trad1.dbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-trad2.bbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-trad2.cbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-trad2.dbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-trad3.bbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-trad3.cbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes-trad3.dbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes.bbx | 6 +- .../tex/latex/biblatex-oxref/oxnotes.cbx | 2 +- .../tex/latex/biblatex-oxref/oxnotes.dbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx | 6 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx | 2 +- .../texmf-dist/tex/latex/biblatex-oxref/oxref.bbx | 63 +++++++-- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx | 10 +- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx | 4 +- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx | 2 +- 45 files changed, 320 insertions(+), 112 deletions(-) diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf index ce064fec3b9..9fe3522df54 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex index a89492eaf3e..a5d510ccd74 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \ProvidesFile{oxalph-doc.tex} [\Version\space Alphabetic biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex} @@ -1550,6 +1550,36 @@ Ritter, H. (1838--46), \emph{The History of Ancient Philosophy}, trans. A. J. W. all in \S13.11.1). I am therefore choosing to ignore this unnecessary complication.} +\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. +} + +\begin{bibexbox} + +{ritter1838hap:mv} +Ritter, H (1838-46). \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). +\tcblower +\begin{Verbatim} +@mvbook{ritter1838hap:mv, + author = {Heinrich Ritter}, + title = {The History of Ancient Philosophy}, + translator = {Alexander J. W. Morrison}, + volumes = {4}, + date = {1838/1846}, + related = {ritter1838hap1-3,ritter1838hap4}, + relatedtype = {multivolume}} +@book{ritter1838hap1-3, + volume = {1-3}, + location = {Oxford}, + publisher = {Talboys}, + date = {1838/1839}} +@book{ritter1838hap4, + volume = {4}, + location = {London}, + publisher = {Bohn}, + date = {1846}} +\end{Verbatim} +\end{bibexbox} + \subsection{One volume from several} Where the volumes are merely numbered, the following form is used: diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf index c56613e8eba..c96c75b863a 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex index 578184206b0..bf0abddb955 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \ProvidesFile{oxnotes-doc.tex} [\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex} @@ -1543,30 +1543,30 @@ Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W all in \S13.11.1). I am therefore choosing to ignore this unnecessary complication.} -\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. Note that this construction is not portable to \textsf{oxyear}\slash\textsf{oxalph}.} +\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. +Note that when you do so, the overall date is removed, so be sure that individual volume dates are provided. +} \begin{bibexbox} -{ritter1838hap1-3} +{ritter1838hap:mv} Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). \tcblower \begin{Verbatim} -@mvbook{ritter1838hap1-3, +@mvbook{ritter1838hap:mv, author = {Heinrich Ritter}, title = {The History of Ancient Philosophy}, translator = {Alexander J. W. Morrison}, volumes = {4}, + date = {1838/1846}, + related = {ritter1838hap1-3,ritter1838hap4}, + relatedtype = {multivolume}} +@book{ritter1838hap1-3, volume = {1-3}, location = {Oxford}, publisher = {Talboys}, - date = {1838/1839}, - related = {ritter1838hap4}, - relatedtype = {multivolume}} -@mvbook{ritter1838hap4, - author = {Heinrich Ritter}, - title = {The History of Ancient Philosophy}, - translator = {Alexander J. W. Morrison}, - volumes = {4}, + date = {1838/1839}} +@book{ritter1838hap4, volume = {4}, location = {London}, publisher = {Bohn}, diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf index 058f95e0255..f03686a6803 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex index 370e76aa38d..0fd686fb2da 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \ProvidesFile{oxnum-doc.tex} [\Version\space Numeric biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon}{biblatex} @@ -1518,30 +1518,30 @@ Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W all in \S13.11.1). I am therefore choosing to ignore this unnecessary complication.} -\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. Note that this construction is not portable to \textsf{oxyear}\slash\textsf{oxalph}.} +\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. +Note that when you do so, the overall date is removed, so be sure that individual volume dates are provided. +} \begin{bibexbox} -{ritter1838hap1-3} +{ritter1838hap:mv} Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). \tcblower \begin{Verbatim} -@mvbook{ritter1838hap1-3, +@mvbook{ritter1838hap:mv, author = {Heinrich Ritter}, title = {The History of Ancient Philosophy}, translator = {Alexander J. W. Morrison}, volumes = {4}, + date = {1838/1846}, + related = {ritter1838hap1-3,ritter1838hap4}, + relatedtype = {multivolume}} +@book{ritter1838hap1-3, volume = {1-3}, location = {Oxford}, publisher = {Talboys}, - date = {1838/1839}, - related = {ritter1838hap4}, - relatedtype = {multivolume}} -@mvbook{ritter1838hap4, - author = {Heinrich Ritter}, - title = {The History of Ancient Philosophy}, - translator = {Alexander J. W. Morrison}, - volumes = {4}, + date = {1838/1839}} +@book{ritter1838hap4, volume = {4}, location = {London}, publisher = {Bohn}, diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib index ed0d2c8373d..2b1fa5414ae 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib @@ -476,22 +476,20 @@ location = {Oxford and London}, publisher = {Talboys and Bohn}, date = {1838/1846}} -@mvbook{ritter1838hap1-3, +@mvbook{ritter1838hap:mv, author = {Heinrich Ritter}, title = {The History of Ancient Philosophy}, translator = {Alexander J. W. Morrison}, volumes = {4}, + date = {1838/1846}, + related = {ritter1838hap1-3,ritter1838hap4}, + relatedtype = {multivolume}} +@book{ritter1838hap1-3, volume = {1-3}, location = {Oxford}, publisher = {Talboys}, - date = {1838/1839}, - related = {ritter1838hap4}, - relatedtype = {multivolume}} -@mvbook{ritter1838hap4, - author = {Heinrich Ritter}, - title = {The History of Ancient Philosophy}, - translator = {Alexander J. W. Morrison}, - volumes = {4}, + date = {1838/1839}} +@book{ritter1838hap4, volume = {4}, location = {London}, publisher = {Bohn}, diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf index 67692fcb5c8..c11d4bcf469 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf index 66d715cb921..50b1d7d856b 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf and b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex index b8793e5dfcb..11e8069671d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \ProvidesFile{oxyear-doc.tex} [\Version\space Author-year biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex} @@ -1582,6 +1582,36 @@ Ritter, H. (1838--46), \emph{The History of Ancient Philosophy}, trans. A. J. W. all in \S13.11.1). I am therefore choosing to ignore this unnecessary complication.} +\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. +} + +\begin{bibexbox} + +{ritter1838hap:mv} +Ritter, H (1838-46). \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). +\tcblower +\begin{Verbatim} +@mvbook{ritter1838hap:mv, + author = {Heinrich Ritter}, + title = {The History of Ancient Philosophy}, + translator = {Alexander J. W. Morrison}, + volumes = {4}, + date = {1838/1846}, + related = {ritter1838hap1-3,ritter1838hap4}, + relatedtype = {multivolume}} +@book{ritter1838hap1-3, + volume = {1-3}, + location = {Oxford}, + publisher = {Talboys}, + date = {1838/1839}} +@book{ritter1838hap4, + volume = {4}, + location = {London}, + publisher = {Bohn}, + date = {1846}} +\end{Verbatim} +\end{bibexbox} + \subsection{One volume from several} Where the volumes are merely numbered, the following form is used: diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx index 2db1e18a32d..780f797327b 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{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} % %<*internal> \iffalse @@ -2827,45 +2827,41 @@ Where the publisher changed between volumes, the following form is used: all in \S13.11.1). I am therefore choosing to ignore this unnecessary complication.} -% -%<*n|m> -\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. Note that this construction is not portable to \textsf{oxyear}\slash\textsf{oxalph}.} +\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. +%Note that when you do so, the overall date is removed, so be sure that individual volume dates are provided. +} \begin{bibexbox} - -{ritter1838hap1-3} -Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). +% +% +{ritter1838hap:mv} +%Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). +%Ritter, H (1838-46). \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols., i–iii (Oxford: Talboys, 1838–9), iv (London: Bohn, 1846). \tcblower \begin{Verbatim} -% -%<*n|m|bib> -@mvbook{ritter1838hap1-3, +% +@mvbook{ritter1838hap:mv, author = {Heinrich Ritter}, title = {The History of Ancient Philosophy}, translator = {Alexander J. W. Morrison}, volumes = {4}, + date = {1838/1846}, + related = {ritter1838hap1-3,ritter1838hap4}, + relatedtype = {multivolume}} +@book{ritter1838hap1-3, volume = {1-3}, location = {Oxford}, publisher = {Talboys}, - date = {1838/1839}, - related = {ritter1838hap4}, - relatedtype = {multivolume}} -@mvbook{ritter1838hap4, - author = {Heinrich Ritter}, - title = {The History of Ancient Philosophy}, - translator = {Alexander J. W. Morrison}, - volumes = {4}, + date = {1838/1839}} +@book{ritter1838hap4, volume = {4}, location = {London}, publisher = {Bohn}, date = {1846}} -% -%<*n|m> +%<*n|m|a|y> \end{Verbatim} \end{bibexbox} -% -%<*n|m|a|y> \subsection{One volume from several} Where the volumes are merely numbered, the following form is used: @@ -7737,7 +7733,6 @@ will trigger the use of parentheses. % % \begin{macrocode} \newbibmacro*{bookeditor}{% - \global\undef\bbx@lasthash \ifboolexpr{ test \ifuseeditor and @@ -8579,7 +8574,9 @@ will trigger the use of parentheses. % \end{macrocode} % % Volume numbers in monograph-style entries are formatted as roman -% numerals. +% numerals (if they are indeed numbers). We take some care here to support +% simple ranges (e.g.\@ 1-3, 4--9). Support for more complex ranges may be +% considered on request. % % \begin{macrocode} \DeclareFieldFormat[book,mvbook,bookinbook,inbook,suppbook,% @@ -8589,11 +8586,11 @@ reference,mvreference,inreference]{volume}{% \IfSubStr{#1}{-}{% \StrCount{#1}{-}[\blx@ox@dashnum]% \StrBefore{#1}{-}[\blx@ox@volnum]% - \Rn{\blx@ox@volnum}\bibrangedash + \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash \StrBehind[\blx@ox@dashnum]{#1}{-}[\blx@ox@volnum]% - \Rn{\blx@ox@volnum}% + \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}% }{% - \Rn{#1}}} + \ifinteger{#1}{\Rn{#1}}{#1}}} % \end{macrocode} % % Where a multi-volume work is more like a series, the volume number and @@ -9996,7 +9993,7 @@ reference,mvreference,inreference]{volume}{% % \end{macrocode} % % Direct use of the |manual| entry type is not encouraged, but it serves as a -% basis for other entry types, notably standards, datasets, and software. +% basis for other entry types, notably standards, and software. % The main change to the |manual| driver compared to the standard style is % that |type|, |series|, |number|, |edition| and |organization| are moved into % the publication information block with |publisher|, |location| and |date|. @@ -10570,10 +10567,43 @@ reference,mvreference,inreference]{volume}{% % % \subsubsection{Datasets} % -% Datasets are currently treated like manuals +% The main change to the |dataset| driver compared to the standard style is +% that |type|, |series|, |number|, |edition| and |organization| are moved into +% the publication information block with |publisher|, |location| and |date|. % % \begin{macrocode} -\DeclareBibliographyAlias{dataset}{manual} +\DeclareBibliographyDriver{dataset}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor+others/translator+others}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit + \printlist{language}% + \setunit{\titlebyauthordelim}\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \printfield{type}% + \newunit + \printfield{version}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{type+series+number+edition+organization+publisher+location+date}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{finentry}} % \end{macrocode} % % \subsection{Legal references} @@ -11894,7 +11924,8 @@ reference,mvreference,inreference]{volume}{% \iffieldequalstr{relatedtype}{multivolume}{% \setunit{\addcomma\space}}{}% }}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} -\renewcommand*{\begrelateddelimmultivolume}{\newunitpunct} +\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct} +\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct} % \end{macrocode} % @@ -12088,9 +12119,23 @@ reference,mvreference,inreference]{volume}{% \entrydata*{#1}{% \printtext{% \printfield{volume}% - \printfield{part}}% + \printfield{part}% + \iffieldsequal{savedtitle}{title}{}{% + \setunit{\addcolon\space}% + \usebibmacro{title}}% + }% \setunit*{\addspace}% - \usebibmacro{series+number+edition+publisher+location+date}}} + \iffieldsequal{savedseries}{series}{\clearfield{series}}{}% + \iffieldsequal{savednumber}{number}{\clearfield{number}}{}% + \iffieldsequal{savededition}{edition}{\clearfield{edition}}{}% + \ifboolexpr{ + test {\iflistsequal{savedpublisher}{publisher}} + and + test {\iflistsequal{savedlocation}{location}} + }{\clearlist{publisher}\clearlist{location}}{}% + \iffieldsequal{saveddate}{date}{\clearfield{date}}{}% + \usebibmacro{series+number+edition+publisher+location+date}% + }} % \end{macrocode} % @@ -12652,6 +12697,8 @@ reference,mvreference,inreference]{volume}{% \RequireBibliographyStyle{oxref} % \end{macrocode} % +% \subsection{Names} +% % We apply our special name format to names likely to appear at the start of % an entry. % @@ -12676,6 +12723,19 @@ reference,mvreference,inreference]{volume}{% }{}{\wlog{WARNING: biblatex-oxref (oxnotes) failed to patch author}} % \end{macrocode} % +% \subsection{Multivolume dates} +% +% For the very particular use case of breaking down multivolume works into +% their constituent volumes, we remove the overall date, assuming that the +% individual volume dates will be used instead. +% +% \begin{macrocode} +\xpretobibmacro{series+number+edition+publisher+location+date}{% + \iffieldequalstr{relatedtype}{multivolume}{% + \clearfield{year}\clearfield{month}\clearfield{day}% + }{}}{}{} +% \end{macrocode} +% % \subsection{Source maps} % % \begin{macrocode} @@ -12728,6 +12788,8 @@ reference,mvreference,inreference]{volume}{% \RequireBibliographyStyle{oxref} % \end{macrocode} % +% \subsection{Names} +% % We apply our special name format to names likely to appear at the start of % an entry. % @@ -12752,6 +12814,19 @@ reference,mvreference,inreference]{volume}{% }{}{\wlog{WARNING: biblatex-oxref (oxnum) failed to patch author}} % \end{macrocode} % +% \subsection{Multivolume dates} +% +% For the very particular use case of breaking down multivolume works into +% their constituent volumes, we remove the overall date, assuming that the +% individual volume dates will be used instead. +% +% \begin{macrocode} +\xpretobibmacro{series+number+edition+publisher+location+date}{% + \iffieldequalstr{relatedtype}{multivolume}{% + \clearfield{year}\clearfield{month}\clearfield{day}% + }{}}{}{} +% \end{macrocode} +% % \subsection{Label numbers} % % This next code is extracted from the standard |numeric| style. @@ -13602,6 +13677,20 @@ reference,mvreference,inreference]{volume}{% % % \subsection{Manuscripts} % +% Since we clear the title, we need a more sophisticated test for whether to +% suppress the date. +% +% \begin{macrocode} +\renewbibmacro{manuscript:date}{% + \ifboolexpr{ + test {\ifnameundef{author}} + and + not togl {blx@ox@clearedtitle} + and + test {\iffieldundef{label}} + }{}{\usebibmacro{date}}} +% \end{macrocode} +% % We include the |library| field as a fallback title. % % \begin{macrocode} @@ -13915,7 +14004,7 @@ reference,mvreference,inreference]{volume}{% % option. % % \begin{macrocode} -\newbibmacro*{cite:labeldate+extradate}{% +\renewbibmacro*{cite:labeldate+extradate}{% \ifboolexpr{ test {\iffieldundef{labelyear}} or diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx index 12e13ccbac0..8d20ec627e1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{american-oxref.lbx} [\Version\space American English conventions required by the biblatex-oxref styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx index f405622d475..1f96e3dd501 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{british-oxref.lbx} [\Version\space British English conventions required by the biblatex-oxref styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx index f1ef50cf7be..32646ce3267 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{english-oxref.lbx} [\Version\space Generic English conventions required by the biblatex-oxref styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx index 855601028d5..fe3fba36c9d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.bbx} [\Version\space Alphabetic bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx index f92e8f99431..d10caba1780 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.cbx} [\Version\space Alphabetic citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx index f2e7464a6d9..bc47eb6f600 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx index a0d1a103680..10cd28519ba 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx index 6af70687473..42cf545fcc8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx index 780ca630c58..46e3f37cb9b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx index 08444a166e2..3700b5191f3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx index 3d67c1907e5..0c6a8140c7d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx index ef7957f9686..54215113edf 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx index 420aab5099d..90676742a9b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx index f032fff70d7..d02e7cf3f05 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx index 334201ebcfe..5296c891c89 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx index 9d9ba2f55fb..69aebc37f78 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx index 4c7701c99af..9b1bf7a9329 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx index 7f4c1237f12..abf69b6f67c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx index 9ebf7738a30..e42581fbda3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx index a507e5ebbc1..2900cf988f7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx index e1515af5841..d73eeb99e28 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx index cafcd1395f2..41973bf797e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx index d2cc27d23a6..981ecc42c5d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx index 5fa08dbe7df..4fba1097ade 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx index 66e91b47de3..cd547ab7d4f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] @@ -31,6 +31,10 @@ \iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}% }% }{}{\wlog{WARNING: biblatex-oxref (oxnotes) failed to patch author}} +\xpretobibmacro{series+number+edition+publisher+location+date}{% + \iffieldequalstr{relatedtype}{multivolume}{% + \clearfield{year}\clearfield{month}\clearfield{day}% + }{}}{}{} \DeclareStyleSourcemap{% \maps[datatype=bibtex]{% \map{ diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx index e1c1f1e4e86..f5bb30f7dd0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx index b20f0610ada..945429c6785 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx index c37d5839cf8..8c969be565d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.bbx} [\Version\space Numeric bibliography style inspired by the Oxford Guide to Style] @@ -31,6 +31,10 @@ \iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}% }% }{}{\wlog{WARNING: biblatex-oxref (oxnum) failed to patch author}} +\xpretobibmacro{series+number+edition+publisher+location+date}{% + \iffieldequalstr{relatedtype}{multivolume}{% + \clearfield{year}\clearfield{month}\clearfield{day}% + }{}}{}{} \ExecuteBibliographyOptions{labelnumber} \providebool{bbx:subentry} diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx index 49d9a4b00b5..caa0a6d7de3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.cbx} [\Version\space Numeric citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx index 6b1ead470b8..750a97a0b50 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx index 204c04ad9d1..dd76ef3b9ac 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{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxref.bbx} [\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style] @@ -514,7 +514,6 @@ {\bibstring{idem\thefield{gender}}}% {\printnames{bookauthor}}} \newbibmacro*{bookeditor}{% - \global\undef\bbx@lasthash \ifboolexpr{ test \ifuseeditor and @@ -1098,11 +1097,11 @@ reference,mvreference,inreference]{volume}{% \IfSubStr{#1}{-}{% \StrCount{#1}{-}[\blx@ox@dashnum]% \StrBefore{#1}{-}[\blx@ox@volnum]% - \Rn{\blx@ox@volnum}\bibrangedash + \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash \StrBehind[\blx@ox@dashnum]{#1}{-}[\blx@ox@volnum]% - \Rn{\blx@ox@volnum}% + \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}% }{% - \Rn{#1}}} + \ifinteger{#1}{\Rn{#1}}{#1}}} \newbibmacro*{maintitle+volume}{% \ifboolexpr{ test {\iffieldundef{maintitle}} @@ -2650,7 +2649,38 @@ reference,mvreference,inreference]{volume}{% \DeclareFieldFormat[software]{version}{\mkbibparens{\bibstring{version}~#1}} \DeclareFieldFormat[software]{urldate}{\bibstring{urldown}\space#1} \DeclareBibliographyAlias{software}{manual} -\DeclareBibliographyAlias{dataset}{manual} +\DeclareBibliographyDriver{dataset}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor+others/translator+others}% + \setunit{\printdelim{nametitledelim}}\newblock + \usebibmacro{title}% + \newunit + \printlist{language}% + \setunit{\titlebyauthordelim}\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{byeditor+others}% + \newunit\newblock + \printfield{type}% + \newunit + \printfield{version}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{type+series+number+edition+organization+publisher+location+date}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{finentry}} \newtoggle{bbx:scotstyle} \DeclareEntryOption{scottish-style}[true]{% \settoggle{bbx:scotstyle}{#1}} @@ -3791,7 +3821,8 @@ reference,mvreference,inreference]{volume}{% \iffieldequalstr{relatedtype}{multivolume}{% \setunit{\addcomma\space}}{}% }}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} -\renewcommand*{\begrelateddelimmultivolume}{\newunitpunct} +\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct} +\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct} \newbibmacro*{rellanguage}{% \def\do##1{% @@ -3919,9 +3950,23 @@ reference,mvreference,inreference]{volume}{% \entrydata*{#1}{% \printtext{% \printfield{volume}% - \printfield{part}}% + \printfield{part}% + \iffieldsequal{savedtitle}{title}{}{% + \setunit{\addcolon\space}% + \usebibmacro{title}}% + }% \setunit*{\addspace}% - \usebibmacro{series+number+edition+publisher+location+date}}} + \iffieldsequal{savedseries}{series}{\clearfield{series}}{}% + \iffieldsequal{savednumber}{number}{\clearfield{number}}{}% + \iffieldsequal{savededition}{edition}{\clearfield{edition}}{}% + \ifboolexpr{ + test {\iflistsequal{savedpublisher}{publisher}} + and + test {\iflistsequal{savedlocation}{location}} + }{\clearlist{publisher}\clearlist{location}}{}% + \iffieldsequal{saveddate}{date}{\clearfield{date}}{}% + \usebibmacro{series+number+edition+publisher+location+date}% + }} \newbibmacro*{related:editedas}[1]{% \entrydata{#1}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx index 5cbff0fa3ba..e5a773d0bb5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.bbx} [\Version\space Author-year bibliography style inspired by the Oxford Guide to Style] @@ -536,6 +536,14 @@ \addcomma\space }% } +\renewbibmacro{manuscript:date}{% + \ifboolexpr{ + test {\ifnameundef{author}} + and + not togl {blx@ox@clearedtitle} + and + test {\iffieldundef{label}} + }{}{\usebibmacro{date}}} \DeclareLabeltitle{% \field{shorttitle} \field{title} diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx index 172020de0e8..c91f7e2bba8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx @@ -13,13 +13,13 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.cbx} [\Version\space Author-year citation style inspired by the Oxford Guide to Style] \RequireCitationStyle{authoryear-comp} \ExecuteBibliographyOptions{uniquename=init} -\newbibmacro*{cite:labeldate+extradate}{% +\renewbibmacro*{cite:labeldate+extradate}{% \ifboolexpr{ test {\iffieldundef{labelyear}} or diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx index 4c5648ca9ef..e092dc12249 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/09/02 v1.2} +\def\Version{2019/09/20 v2.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.dbx} [\Version\space Data model for the Oxref family of styles] -- cgit v1.2.3