From 38be0a44ee9d2d9158e4fbc11cf492dbe2f68abe Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 18 Feb 2019 23:00:12 +0000 Subject: biblatex-oxref (19feb19) git-svn-id: svn://tug.org/texlive/trunk@50053 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-oxref/american-oxref.lbx | 8 +- .../tex/latex/biblatex-oxref/british-oxref.lbx | 10 +- .../tex/latex/biblatex-oxref/english-oxref.lbx | 4 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx | 20 +-- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx | 6 +- .../texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx | 10 +- .../tex/latex/biblatex-oxref/oxnotes.bbx | 6 +- .../tex/latex/biblatex-oxref/oxnotes.cbx | 6 +- .../tex/latex/biblatex-oxref/oxnotes.dbx | 10 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx | 6 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx | 6 +- .../texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx | 10 +- .../texmf-dist/tex/latex/biblatex-oxref/oxref.bbx | 170 ++++++++++++--------- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx | 54 +++---- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx | 8 +- .../texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx | 10 +- 16 files changed, 193 insertions(+), 151 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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 2d5b7073fd7..a565ffc592a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx @@ -13,14 +13,14 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{american-oxref.lbx} [\Version\space American English conventions required by the biblatex-oxref styles] -\InheritBibliographyExtras{english-oxref} +\InheritBibliographyExtras{english} \DeclareBibliographyExtras{\uspunctuation} -\InheritBibliographyStrings{english-oxref} +\InheritBibliographyStrings{english} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `american-oxref.lbx'. 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 3bbb4ff5003..e97b6dfca54 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{british-oxref.lbx} [\Version\space British English conventions required by the biblatex-oxref styles] @@ -28,16 +28,18 @@ {} {\mkbibmonth{\thefield{#2}}% \iffieldundef{#1}{}{\space}}% - \stripzeros{\thefield{#1}}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}% \def\finalandcomma{\addcomma}% \def\bibtimesep{\addperiod}% } \DeclareBibliographyStrings{% - inherit = {english-oxref}, + inherit = {english}, am = {{a\adddot m\adddot}{a\adddot m\adddot}}, pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, } %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `british-oxref.lbx'. 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 b7d66667c75..b727e58e9c9 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{english-oxref.lbx} [\Version\space Generic English conventions required by the biblatex-oxref styles] @@ -269,6 +269,6 @@ langswedish = {{Swedish}{Swed\adddot}}, } %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `english-oxref.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx index 7c5a7f8abce..de9438edf65 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.bbx} [\Version\space Alphabetic bibliography style inspired by the Oxford Guide to Style] @@ -22,22 +22,22 @@ \printdateextra }{% \printdate -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch bbx@opt@mergedate@maximum (print)}} \xpatchcmd{\bbx@opt@mergedate@maximum}{% - \csuse{print\thefield{labeldatesource}dateextra} + \csuse{print\thefield{labeldatesource}dateextra}% }{% - \csuse{print\thefield{labeldatesource}date} -}{}{} + \csuse{print\thefield{labeldatesource}date}% +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch bbx@opt@mergedate@maximum (label)}} \xpatchcmd{\bbx@opt@mergedate@compact}{% - \csuse{print\thefield{labeldatesource}dateextra} + \csuse{print\thefield{labeldatesource}dateextra}% }{% - \csuse{print\thefield{labeldatesource}date} -}{}{} + \csuse{print\thefield{labeldatesource}date}% +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch bbx@opt@mergedate@compact}} \xpatchbibmacro{labeldate}{% \printlabeldateextra }{% \printlabeldate -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxalph) failed to patch labeldate}} \ExecuteBibliographyOptions{mergedate} \ExecuteBibliographyOptions{labelalpha,sorting=anyt} @@ -98,6 +98,6 @@ } } %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxalph.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx index 72864e74f02..cb1fe0a35aa 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.cbx} [\Version\space Alphabetic citation style inspired by the Oxford Guide to Style] @@ -35,8 +35,8 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxalph.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx index f62f22d2af1..755ea260ed1 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.dbx} [\Version\space Data model for the Oxref family of styles] @@ -36,8 +36,12 @@ shortcollection,columns,languages,collection,usualtitle,shelfmark,% sortshelfmark,support,columns,origin,scribe,owner} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelEntryfields[jurisdiction]{pardate} +\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=integer]{parvolume} +\DeclareDatamodelFields[type=field,datatype=range]{parpages} +\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% + parvolume,parpages} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxalph.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx index 9b4b607cf20..846bb78a317 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] @@ -30,7 +30,7 @@ }{% \iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxnotes) failed to patch author}} \renewbibmacro*{postnote}{% \iffieldundef{postnote}{}{% \iffieldundef{pages}{% @@ -58,6 +58,6 @@ }% } %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnotes.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx index e525ac8db3f..5e4e1c1a644 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] @@ -32,8 +32,8 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnotes.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx index a1b9e8b83b2..cb56d6af769 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.dbx} [\Version\space Data model for the Oxref family of styles] @@ -36,8 +36,12 @@ shortcollection,columns,languages,collection,usualtitle,shelfmark,% sortshelfmark,support,columns,origin,scribe,owner} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelEntryfields[jurisdiction]{pardate} +\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=integer]{parvolume} +\DeclareDatamodelFields[type=field,datatype=range]{parpages} +\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% + parvolume,parpages} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnotes.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx index 66330d82aab..cf60a17bcdd 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.bbx} [\Version\space Numeric bibliography style inspired by the Oxford Guide to Style] @@ -30,7 +30,7 @@ }{% \iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxnum) failed to patch author}} \ExecuteBibliographyOptions{labelnumber} \providebool{bbx:subentry} @@ -81,6 +81,6 @@ \usebibmacro{setpageref}% \finentry} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnum.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx index 02dafba84ea..ea044eaa82f 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.cbx} [\Version\space Numeric citation style inspired by the Oxford Guide to Style] @@ -35,8 +35,8 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnum.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx index c6aa1fb296c..595605f83fd 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.dbx} [\Version\space Data model for the Oxref family of styles] @@ -36,8 +36,12 @@ shortcollection,columns,languages,collection,usualtitle,shelfmark,% sortshelfmark,support,columns,origin,scribe,owner} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelEntryfields[jurisdiction]{pardate} +\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=integer]{parvolume} +\DeclareDatamodelFields[type=field,datatype=range]{parpages} +\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% + parvolume,parpages} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxnum.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx index acfede01a6d..9e1bb4ab6e0 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxref.bbx} [\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style] @@ -235,10 +235,12 @@ \usebibmacro{name:andothers}} \xpatchbibmacro{name:given-family}% {\bibnamedelimd\mkbibnamesuffix{#4}}% - {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}{}{} + {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch name:given-family}} \xpatchbibmacro{name:family-given}% {\bibnamedelimd\mkbibnamesuffix{#4}}% - {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}{}{} + {\ifnumeral{#4}{}{\addcomma}\bibnamedelimd\mkbibnamesuffix{#4}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch name:family-given}} \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1}} \DeclareFieldFormat{namevariant}{\mkbibparens{\bibstring{equals}\space #1}} \newcounter{namepairs} @@ -500,7 +502,8 @@ {\global\undef\bbx@lasthash}} \xpatchbibmacro{translatorstrg}% {\bibstring}% - {\bibstring[\mkbibparens]}{}{}% + {\bibstring[\mkbibparens]}% +{}{\wlog{WARNING: biblatex-oxref failed to patch translatorstrg}}% \xpatchbibmacro{translator+othersstrg}% {\bibstring}% {\bibstring[\mkbibparens]}{}{}% @@ -574,14 +577,17 @@ \def\num@two{#2}% \StrLen{\num@one}[\num@one@len]% \StrLen{\num@two}[\num@two@len]% - \IfEq{\num@one@len}{\num@two@len}% - {\StrCompare{\num@one}{\num@two}[\Result]% + \ifboolexpr{ + test {\ifnumequal{\num@one@len}{\num@two@len}} + and + test {\ifnumless{\num@one}{\num@two}} + }{% + \StrCompare{\num@one}{\num@two}[\Result]% \ifnum\num@two@len>3% - \IfStrEq{\Result}{2}{\def\Result{1}}{}% + \IfStrEq{\Result}{2}{\def\Result{1}}{}% \fi - \StrGobbleLeft{0\num@two}{\Result}}% - {\num@two}% -} + \StrGobbleLeft{0\num@two}{\Result}% + }{\num@two}} \patchcmd{\mkdaterangefull}{% \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% }{% @@ -676,11 +682,10 @@ \def\currentfield{eventdate}% \iffieldannotation{inferred}{\mkbibbrackets{#1}}{#1}% \undef\currentfield} -\xpatchfieldformat{edition}{% - #1\isdot -}{% - \ifbibstring{#1}{\bibstring{#1}}{#1\isdot}% -}{}{} +\xpatchfieldformat{edition}% + {#1\isdot}% + {\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch edition}} \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {\mkcomprange{#1}}% @@ -774,13 +779,16 @@ \DeclareFieldFormat{urldate}{\bibstring{urlseen}\space#1} \xpatchbibmacro{url+urldate}% {\setunit*{\addspace}}% - {\setunit*{\addcomma\addspace}}{}{} + {\setunit*{\addcomma\addspace}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch url+urldate}} \xpatchfieldformat{doi}% {\mkbibacro{DOI}}% - {\printtext{doi}}{}{} + {\printtext{doi}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch doi}} \xpatchbibmacro{doi+eprint+url}% {\printfield{doi}}% - {\setunit{\addperiod\space}\printfield{doi}}{}{} + {\setunit{\addperiod\space}\printfield{doi}}% +{}{\wlog{WARNING: biblatex-oxref failed to patch doi+eprint+url}} \renewbibmacro*{addendum+pubstate}{% \ifboolexpr{ @@ -1931,11 +1939,12 @@ reference,mvreference,inreference]{volume}{% \printfield{number}}} \renewbibmacro*{institution+location+date}{% \ifboolexpr{ - test {\iffieldundef{type}} - and - test {\iffieldundef{series}} - and - test {\iffieldundef{number}} + ( test {\iffieldundef{number}} + or + not test {\iffieldundef{type}} + or + not test {\iffieldundef{series}} + ) and test {\iflistundef{institution}} and @@ -1984,7 +1993,7 @@ reference,mvreference,inreference]{volume}{% }{% \togglefalse{blx@ox@altthesis}% \ifstrequal{#1}{out}{}{% - \PackageError{oxref} + \PackageError{biblatex-oxref} {Invalid option 'bookseries=#1'} {Valid values are 'in', 'out', and 'plain'.}}}}} \newbibmacro*{type+institution+location+date}{% @@ -2112,7 +2121,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{institution+location+date}% }{% \usebibmacro{type+institution+location+date}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch thesis}} \DeclareFieldFormat[booklet]{title}{% \def\currentfield{title}% \iffieldannotation{descriptor}{#1}{% @@ -2547,7 +2556,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{finentry}} \DeclareBibliographyAlias{image}{performance} \DeclareBibliographyAlias{artwork}{performance} -\renewbibmacro*{event+venue+location+date}{% +\newbibmacro*{event+venue+location+date}{% \printfield{eventtitle}% \newunit \printfield{eventtitleaddon}% @@ -2905,7 +2914,7 @@ reference,mvreference,inreference]{volume}{% \setunit{\addspace}% \printfield{pages}}} \newbibmacro{pcitenote}{% - \iffieldundef{userc}{}{% parreporter + \iffieldundef{parreporter}{}{% \setunit{\addcomma\space}% \iffieldundef{postnote}{}{% \printfield{postnote}% @@ -2974,22 +2983,32 @@ reference,mvreference,inreference]{volume}{% \docsvlist{eu,echr,int,ca,us}% \iftoggle{bbx@juriscitedone}{}{\usebibmacro{enjuriscitation}}% } +\newtoggle{bbx@commissiondecision} \newbibmacro*{eujuriscitation}{% - \iflistcontains{institution}{\commission}{}{% + \ifboolexpr{ + test {\iflistcontains{institution}{\commission}} + or + test {\iflistcontains{institution}{\Commission}} + }{% + \toggletrue{bbx@commissiondecision}% + }{% + \togglefalse{bbx@commissiondecision}}% + \iftoggle{bbx@commissiondecision}{}{% \usebibmacro{eucasenumber}}% \usebibmacro{title}% \setunit{\addspace}% - \iflistcontains{institution}{\commission}{% + \iftoggle{bbx@commissiondecision}{% \usebibmacro{eucommissiondecision}}{}% \setunit{\addspace}% \usebibmacro{eu:reportinfo}% - \iflistcontains{institution}{\commission}{% + \iftoggle{bbx@commissiondecision}{% \setunit{\addcomma\space}% }{% \setunit{\addspace}}% + \usebibmacro{altreportdetails}% \usebibmacro{court-note}% } -\newbibmacro{eucasenumber}{% +\newbibmacro{eucasetype}{% \iffieldundef{type}{% \ifboolexpr{ test {\IfSubStr{\thefield{number}}{,}} @@ -3003,19 +3022,33 @@ reference,mvreference,inreference]{volume}{% \bibstring{eucase}}% }{% \printfield{type}}% +} +\newbibmacro{eucasenumber}{% + \usebibmacro{eucasetype}% \setunit{\addnbspace}% \printfield{number}% \setunit{\addspace}} \newbibmacro{eucommissiondecision}{% - \iffieldundef{userb}{}{% - \printfield[parens]{userb}}% - \setunit{\addspace}% - \iffieldundef{number}{}{% - \iffieldundef{type}{% - \setunit{\addspace\bibstring{commissiondecision}\addspace}% - }{% - \setunit{\addspace\printfield{type}\addspace}}% - \printfield{number}}} + \iffieldundef{userb}{% + \iffieldundef{number}{}{% + \printtext[parens]{% + \usebibmacro{eucasetype}% + \setunit{\addnbspace}% + \printfield{number}}}% + }{% + \printtext[parens]{% + \usebibmacro{eucasetype}% + \setunit{\addnbspace}% + \printfield{userb}}% + \setunit{\addspace}% + \iffieldundef{number}{}{% + \iffieldundef{type}{% + \setunit{\addspace\bibstring{commissiondecision}\addspace}% + }{% + \setunit{\addspace\printfield{type}\addspace}}% + \printfield{number}}% + }% +} \newbibmacro*{eu:reportinfo}{% \iftoggle{bbx@eclionly}{% \iffieldundef{verba}{% @@ -3269,7 +3302,7 @@ reference,mvreference,inreference]{volume}{% \usebibmacro{court-note}} \newbibmacro{altreportdetails}{% \restorefield{prenote}{\postnotesecond}% - \iffieldundef{userc}{}{% parreporter + \iffieldundef{parreporter}{}{% \usebibmacro{journaldate}[par]% \setunit{\addspace}\newblock \usebibmacro{altreportvolume}% @@ -3283,26 +3316,17 @@ reference,mvreference,inreference]{volume}{% \setunit{\addcomma\space}% \printfield[postnote]{prenote}}}} \newbibmacro*{altreportvolume}{% - \iffieldundef{userb}{% parvolume - \printfield{volume}% - }{% - \printfield{userb}}} + \iffieldundef{parvolume}{}{% + \printfield{parvolume}}} \newbibmacro*{altjournaltitle}{% - \iffieldundef{userc}{% parreporter - \printfield{journaltitle}% - \setunit{\addspace}% - }{ - \printfield{userc}}} + \iffieldundef{parreporter}{}{ + \printfield{parreporter}}} \newbibmacro*{altseries}{% - \iffieldundef{userd}{% parseries - \printfield{series}% - }{% - \printfield{userd}}} + \iffieldundef{parseries}{}{% + \printfield{parseries}}} \newbibmacro*{altjurisdictionpages}{% - \iffieldundef{usere}{% parpages - \usebibmacro{jurisdictionpages}% - }{% - \printfield{usere}}}% + \iffieldundef{parpages}{}{% + \printfield{parpages}}}% \newcommand*{\subtypecourtrules}{procedure-rule} \DeclareBibliographyDriver{legislation}{% @@ -3705,14 +3729,14 @@ reference,mvreference,inreference]{volume}{% }{% \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch booklet}} \xpatchbibdriver{misc}{% \newunit\newblock \iftoggle{bbx:related} }{% \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch misc}} \DeclareBibliographyOption{relationpunct}[semicolon]{% \ifcsdef{add#1}{% \ifstrequal{#1}{space}{% @@ -3763,7 +3787,7 @@ reference,mvreference,inreference]{volume}{% \setunit{\addspace}}{}% \iffieldequalstr{relatedtype}{multivolume}{% \setunit{\addcomma\space}}{}% - }}{}{} +}}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}} \newbibmacro*{rellanguage}{% \def\do##1{% @@ -4071,14 +4095,6 @@ reference,mvreference,inreference]{volume}{% \pertype{jurisdiction} \step[fieldsource=reporter, fieldtarget=journaltitle] - \step[fieldsource=parvolume, - fieldtarget=userb] - \step[fieldsource=parreporter, - fieldtarget=userc] - \step[fieldsource=parseries, - fieldtarget=userd] - \step[fieldsource=parpages, - fieldtarget=usere] \step[fieldsource=court, fieldtarget=institution] \step[fieldsource=additionalreports, @@ -4126,16 +4142,16 @@ reference,mvreference,inreference]{volume}{% \step [fieldsource=shorttitle, match=\regexp{(\D)\.}, replace=\regexp{$1}] - \step[fieldsource=userc, + \step[fieldsource=parreporter, match=\regexp{(\d)\.(\d)}, replace=\regexp{$1.$2}] - \step[fieldsource=userc, + \step[fieldsource=parreporter, match=\regexp{(\D)\.(\d)}, replace=\regexp{$1 $2}] - \step[fieldsource=userc, + \step[fieldsource=parreporter, match=\regexp{\.(\D)}, replace=\regexp{$1}] - \step [fieldsource=userc, + \step [fieldsource=parreporter, match=\regexp{(\D)\.}, replace=\regexp{$1}] \step[fieldsource=journaltitle, @@ -4211,8 +4227,14 @@ reference,mvreference,inreference]{volume}{% match=\regexp{(\D)\.}, replace=\regexp{$1}] } + \map[overwrite=false]{ + \step[fieldsource=casenumber, final] + \step[notfield=number, fieldsource=casenumber, fieldtarget=number] + \step[fieldsource=casenumber, fieldtarget=userb] + } }% } + \DeclareSortingTemplate{nty}{ \sort{ \field{presort} @@ -4330,6 +4352,6 @@ reference,mvreference,inreference]{volume}{% [proceedings,report,artwork,audio,image,music,movie,performance,video,% manuscript,unpublished,review]{useeditor=false} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxref.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx index 63af99d76be..0993633927a 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.bbx} [\Version\space Author-year bibliography style inspired by the Oxford Guide to Style] @@ -237,31 +237,31 @@ \csuse{mkbibseasondate#1}{}{#2endseason}}% \enddateuncertainprint}}}}} \xpatchcmd{\mkdaterangefull}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefull}} \xpatchcmd{\mkdaterangetrunc}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc}} \xpatchcmd{\mkdaterangefullextra}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefullextra}} \xpatchcmd{\mkdaterangetruncextra}{% - \iffieldundef{#2year} {}% + \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra}} \DeclareFieldFormat{shorthandwidth}{#1} \xpretonameformat{family-given}{% \iffieldannotation{inferred}{\ifnumequal{\value{listcount}}{1}{\bibopenbracket}{}}{}% \ifitemannotation{inferred}{\bibopenbracket}{}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to prepend to family-given}} \xpatchnameformat{family-given}{% \usebibmacro{name:andothers}% }{% @@ -281,7 +281,7 @@ test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}} ) }{\bibclosebracket}{}% }{}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch family-given}} \DeclareNameAlias{shortauthor}{family-given} \DeclareNameAlias{shorteditor}{family-given} \DeclareNameAlias{sortname}{family-given} @@ -311,16 +311,18 @@ {\item} \InitializeBibliographyStyle{\global\undef\bbx@lasthash} \xapptobibmacro{begrelated}{% - \booltrue{bbx@inset}}{}{} + \booltrue{bbx@inset}}% +{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to append to begrelated}} \xapptobibmacro{endrelated}{% - \usebibmacro*{bbx:savehash}}{}{} + \usebibmacro*{bbx:savehash}}% +{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to append to endrelated}} \xpatchbibmacro{author}{% \iffieldundef{authortype}% }{% \usebibmacro{date+extradate}% \setunit*{\addspace}% \iffieldundef{authortype}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author (authortype)}}% \xpatchbibmacro{author}{% \global\undef\bbx@lasthash }{% @@ -328,12 +330,12 @@ \usebibmacro{labeltitle}% \setunit*{\addspace}% \usebibmacro{date+extradate}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author (lasthash)}}% \xpatchbibmacro{namepairs}{% \printnames[by#1]% }{% \printnames[#1]% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch namepairs}} \xpatchbibmacro{author+altauthor}{% \printnames{author}% }{% @@ -346,14 +348,14 @@ }{% \printnames{author}% }% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author+altauthor}}% \xpatchbibmacro{bbx:editor}{% \usebibmacro{#1}% }{% \usebibmacro{date+extradate}% \setunit*{\addspace}% \usebibmacro{#1}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:editor}}% \xpatchbibmacro{bbx:editor}{% \global\undef\bbx@lasthash }{% @@ -361,12 +363,12 @@ \usebibmacro{labeltitle}% \setunit*{\addspace}% \usebibmacro{date+extradate}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:editor (lasthash)}}% \xpatchbibmacro{editor+alteditor}{% \printnames[byeditor]% }{% \printnames[editor]% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch editor+alteditor}} \xpatchbibmacro{editor+alteditor}{% \printnames{editor}% }{% @@ -379,7 +381,7 @@ }{% \printnames{editor}% }% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch editor+alteditor (shorteditor)}}% \xpatchbibmacro{bbx:translator}{% \global\undef\bbx@lasthash }{% @@ -387,14 +389,14 @@ \usebibmacro{labeltitle}% \setunit*{\addspace}% \usebibmacro{date+extradate}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:translator (lasthash)}}% \xpatchbibmacro{bbx:translator}{% \usebibmacro{#1}% }{% \usebibmacro{date+extradate}% \setunit*{\addspace}% \usebibmacro{#1}% -}{}{}% +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch bbx:translator}}% \newtoggle{blx@ox@clearedtitle} \newbibmacro*{labeltitle}{% \iffieldundef{label}{% @@ -429,7 +431,7 @@ \clearfield{maintitle}% \clearfield{volume}% }{}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to prepend to maintitle+title}} \DeclareFieldFormat[mvbook,mvcollection,mvreference,proceedings,mvproceedings]{maintitle+volume}{#1} \xpatchbibdriver{online}{% \iffieldundef{year}% @@ -439,7 +441,7 @@ and test {\iffieldundef{month}} }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch online}} \DeclareFieldFormat[bookinbook]{citetitle}{% \ifboolexpr{ test {\iffieldequalstr{entrysubtype}{poem}} @@ -568,6 +570,6 @@ }} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxyear.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx index 047dbed9316..0c8d18faf3c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.cbx} [\Version\space Author-year citation style inspired by the Oxford Guide to Style] @@ -41,7 +41,7 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch cite}} \DeclareDelimFormat{nameyeardelim}{% \iflabeldateisanydate {\addspace}% @@ -67,8 +67,8 @@ }{% \printnames{labelname}% }% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxyear.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx index 3cc2c63eed0..506962c0ab7 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{2018/03/03 v0.12} +\def\Version{2019/02/15 v1.0} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.dbx} [\Version\space Data model for the Oxref family of styles] @@ -36,8 +36,12 @@ shortcollection,columns,languages,collection,usualtitle,shelfmark,% sortshelfmark,support,columns,origin,scribe,owner} \DeclareDatamodelFields[type=field,datatype=date]{pardate} -\DeclareDatamodelEntryfields[jurisdiction]{pardate} +\DeclareDatamodelFields[type=field,datatype=literal]{parreporter,parseries} +\DeclareDatamodelFields[type=field,datatype=integer]{parvolume} +\DeclareDatamodelFields[type=field,datatype=range]{parpages} +\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,% + parvolume,parpages} %% -%% Copyright (C) 2016–2018 Alex Ball +%% Copyright (C) 2016–2019 Alex Ball %% %% End of file `oxyear.dbx'. -- cgit v1.2.3