texlive[52135] Master/texmf-dist: biblatex-oxref (20sep19)
commits+karl at tug.org
commits+karl at tug.org
Fri Sep 20 23:33:28 CEST 2019
Revision: 52135
http://tug.org/svn/texlive?view=revision&revision=52135
Author: karl
Date: 2019-09-20 23:33:28 +0200 (Fri, 20 Sep 2019)
Log Message:
-----------
biblatex-oxref (20sep19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex
trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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 @@
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}
+<OGS \S15.2.6*\textdagger>
+{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}
+ at 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}}
+ at book{ritter1838hap1-3,
+ volume = {1-3},
+ location = {Oxford},
+ publisher = {Talboys},
+ date = {1838/1839}}
+ at 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:
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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 @@
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}
<OGS \S15.2.6*>
-{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}
- at mvbook{ritter1838hap1-3,
+ at 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}}
+ at book{ritter1838hap1-3,
volume = {1-3},
location = {Oxford},
publisher = {Talboys},
- date = {1838/1839},
- related = {ritter1838hap4},
- relatedtype = {multivolume}}
- at mvbook{ritter1838hap4,
- author = {Heinrich Ritter},
- title = {The History of Ancient Philosophy},
- translator = {Alexander J. W. Morrison},
- volumes = {4},
+ date = {1838/1839}}
+ at book{ritter1838hap4,
volume = {4},
location = {London},
publisher = {Bohn},
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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 @@
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}
<OGS \S15.2.6*>
-{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}
- at mvbook{ritter1838hap1-3,
+ at 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}}
+ at book{ritter1838hap1-3,
volume = {1-3},
location = {Oxford},
publisher = {Talboys},
- date = {1838/1839},
- related = {ritter1838hap4},
- relatedtype = {multivolume}}
- at mvbook{ritter1838hap4,
- author = {Heinrich Ritter},
- title = {The History of Ancient Philosophy},
- translator = {Alexander J. W. Morrison},
- volumes = {4},
+ date = {1838/1839}}
+ at book{ritter1838hap4,
volume = {4},
location = {London},
publisher = {Bohn},
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.bib 2019-09-20 21:33:28 UTC (rev 52135)
@@ -476,22 +476,20 @@
location = {Oxford and London},
publisher = {Talboys and Bohn},
date = {1838/1846}}
- at mvbook{ritter1838hap1-3,
+ at 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}}
+ at book{ritter1838hap1-3,
volume = {1-3},
location = {Oxford},
publisher = {Talboys},
- date = {1838/1839},
- related = {ritter1838hap4},
- relatedtype = {multivolume}}
- at mvbook{ritter1838hap4,
- author = {Heinrich Ritter},
- title = {The History of Ancient Philosophy},
- translator = {Alexander J. W. Morrison},
- volumes = {4},
+ date = {1838/1839}}
+ at book{ritter1838hap4,
volume = {4},
location = {London},
publisher = {Bohn},
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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 @@
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}
+<OGS \S15.2.6*\textdagger>
+{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}
+ at 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}}
+ at book{ritter1838hap1-3,
+ volume = {1-3},
+ location = {Oxford},
+ publisher = {Talboys},
+ date = {1838/1839}}
+ at 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:
Modified: trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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|bbx|cbx|dbx|lbx|doc>
%<*internal>
\iffalse
@@ -2827,45 +2827,41 @@
all in \S13.11.1). I am therefore choosing to ignore this unnecessary
complication.}
-%</n|m|a|y>
-%<*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}.
+%<n|m>Note that when you do so, the overall date is removed, so be sure that individual volume dates are provided.
+}
\begin{bibexbox}
-<OGS \S15.2.6*>
-{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).
+%<n|m><OGS \S15.2.6*>
+%<a|y><OGS \S15.2.6*\textdagger>
+{ritter1838hap:mv}
+%<n|m>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).
+%<a|y>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>
-%<*n|m|bib>
- at mvbook{ritter1838hap1-3,
+%</n|m|a|y>
+ at 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}}
+ at book{ritter1838hap1-3,
volume = {1-3},
location = {Oxford},
publisher = {Talboys},
- date = {1838/1839},
- related = {ritter1838hap4},
- relatedtype = {multivolume}}
- at mvbook{ritter1838hap4,
- author = {Heinrich Ritter},
- title = {The History of Ancient Philosophy},
- translator = {Alexander J. W. Morrison},
- volumes = {4},
+ date = {1838/1839}}
+ at book{ritter1838hap4,
volume = {4},
location = {London},
publisher = {Bohn},
date = {1846}}
-%</n|m|bib>
-%<*n|m>
+%<*n|m|a|y>
\end{Verbatim}
\end{bibexbox}
-%</n|m>
-%<*n|m|a|y>
\subsection{One volume from several}
Where the volumes are merely numbered, the following form is used:
@@ -7737,7 +7733,6 @@
%
% \begin{macrocode}
\newbibmacro*{bookeditor}{%
- \global\undef\bbx at lasthash
\ifboolexpr{
test \ifuseeditor
and
@@ -8579,7 +8574,9 @@
% \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 @@
\IfSubStr{#1}{-}{%
\StrCount{#1}{-}[\blx at ox@dashnum]%
\StrBefore{#1}{-}[\blx at ox@volnum]%
- \Rn{\blx at ox@volnum}\bibrangedash
+ \expandafter\ifinteger\blx at ox@volnum{\Rn{\blx at ox@volnum}}{\blx at ox@volnum}\bibrangedash
\StrBehind[\blx at ox@dashnum]{#1}{-}[\blx at ox@volnum]%
- \Rn{\blx at ox@volnum}%
+ \expandafter\ifinteger\blx at ox@volnum{\Rn{\blx at ox@volnum}}{\blx at 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 @@
% \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 @@
%
% \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 @@
\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 @@
\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 @@
\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 @@
}{}{\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 @@
\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 @@
}{}{\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 @@
%
% \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 at 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 @@
% option.
%
% \begin{macrocode}
-\newbibmacro*{cite:labeldate+extradate}{%
+\renewbibmacro*{cite:labeldate+extradate}{%
\ifboolexpr{
test {\iffieldundef{labelyear}}
or
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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 at 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{
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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 at 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}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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 at lasthash
\ifboolexpr{
test \ifuseeditor
and
@@ -1098,11 +1097,11 @@
\IfSubStr{#1}{-}{%
\StrCount{#1}{-}[\blx at ox@dashnum]%
\StrBefore{#1}{-}[\blx at ox@volnum]%
- \Rn{\blx at ox@volnum}\bibrangedash
+ \expandafter\ifinteger\blx at ox@volnum{\Rn{\blx at ox@volnum}}{\blx at ox@volnum}\bibrangedash
\StrBehind[\blx at ox@dashnum]{#1}{-}[\blx at ox@volnum]%
- \Rn{\blx at ox@volnum}%
+ \expandafter\ifinteger\blx at ox@volnum{\Rn{\blx at ox@volnum}}{\blx at ox@volnum}%
}{%
- \Rn{#1}}}
+ \ifinteger{#1}{\Rn{#1}}{#1}}}
\newbibmacro*{maintitle+volume}{%
\ifboolexpr{
test {\iffieldundef{maintitle}}
@@ -2650,7 +2649,38 @@
\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 @@
\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 @@
\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}{%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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 at ox@clearedtitle}
+ and
+ test {\iffieldundef{label}}
+ }{}{\usebibmacro{date}}}
\DeclareLabeltitle{%
\field{shorttitle}
\field{title}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx 2019-09-20 21:33:07 UTC (rev 52134)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx 2019-09-20 21:33:28 UTC (rev 52135)
@@ -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]
More information about the tex-live-commits
mailing list