diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx | 63 |
1 files changed, 54 insertions, 9 deletions
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}{% |