diff options
Diffstat (limited to 'Master')
26 files changed, 117 insertions, 87 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 Binary files differindex baa0a58df41..979f914bcd1 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.pdf 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 a6a64dfc644..dfe2e6e7415 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{2018/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \ProvidesFile{oxalph-doc.tex} [\Version\space Alphabetic biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex} diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf Binary files differindex 284df76fcde..94396bbf435 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.pdf 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 c80eef7e567..ac593a5e19a 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{2018/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \ProvidesFile{oxnotes-doc.tex} [\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex} diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf Binary files differindex f45d484d668..efbe8ed1412 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.pdf 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 cfe7e664b3e..e91ad8319f9 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{2018/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \ProvidesFile{oxnum-doc.tex} [\Version\space Numeric biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon}{biblatex} diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf Binary files differindex fe5f0f0b109..29a73c62ca3 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxref.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf Binary files differindex 02b9ea70b68..0a4b5f8deac 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.pdf 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 6be72c4a419..b8b75106a52 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{2018/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \ProvidesFile{oxyear-doc.tex} [\Version\space Author-year biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex} diff --git a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx index 1ca48f8aa19..137530df88a 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{2018/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} %</internal|bbx|cbx|dbx|lbx|doc> %<*internal> \iffalse @@ -11881,7 +11881,7 @@ reference,mvreference,inreference]{volume}{% }{% \printlabeldateextra \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}}}}% + }}}}}} % \end{macrocode} % % \begin{itemize} @@ -11895,16 +11895,20 @@ reference,mvreference,inreference]{volume}{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear}{}{% \printtext[datelabel]{% - \iflabeldateisanydate{% - \csuse{print\thefield{labeldatesource}dateextra}% - \clearfield{\thefield{labeldatesource}year}% - \clearfield{\thefield{labeldatesource}season}% - \clearfield{\thefield{labeldatesource}month}% - \clearfield{\thefield{labeldatesource}day}% + \iflabeldateisdate{% + \printdateextra + \clearfield{year}\clearfield{season}\clearfield{month}\clearfield{day}% }{% - \printlabeldateextra - \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}}}% + \iflabeldateisanydate{% + \csuse{print\thefield{labeldatesource}dateextra}% + \clearfield{\thefield{labeldatesource}year}% + \clearfield{\thefield{labeldatesource}season}% + \clearfield{\thefield{labeldatesource}month}% + \clearfield{\thefield{labeldatesource}day}% + }{% + \printlabeldateextra + \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% + }}}}}} % \end{macrocode} % % \begin{itemize} @@ -11919,11 +11923,14 @@ reference,mvreference,inreference]{volume}{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear}{}{% \printtext[datelabel]{\printlabeldateextra}% - \iflabeldateisanydate{% - \clearfield{\thefield{labeldatesource}year}% + \iflabeldateisdate{% + \clearfield{year} }{% - \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}}% + \iflabeldateisanydate{% + \clearfield{\thefield{labeldatesource}year}% + }{% + \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% + }}}}} % \end{macrocode} % % \begin{itemize} @@ -11938,17 +11945,20 @@ reference,mvreference,inreference]{volume}{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear}{}{% \printtext[datelabel]{\printlabeldateextra}% - \iflabeldateisanydate{% - \ifdateshavedifferentprecision{label}{\thefield{labeldatesource}}{}{% - \ifboolexpr{ - test {\iffieldequalstr{labeldatesource}{}} - and - not test {\iffieldundef{issue}} - }{}{% - \clearfield{\thefield{labeldatesource}year}}}% + \iflabeldateisdate{% + \ifboolexpr{ + test {\ifdateshavedifferentprecision{label}{}} + or + not test {\iffieldundef{issue}} + }{}{% + \clearfield{year}}% }{% - \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}} + \iflabeldateisanydate{% + \ifdateshavedifferentprecision{label}{\thefield{labeldatesource}}{}{% + \clearfield{\thefield{labeldatesource}year}}% + }{% + \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% + }}}}} % \end{macrocode} % % \begin{itemize} @@ -11963,21 +11973,26 @@ reference,mvreference,inreference]{volume}{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear}{}{% \printtext[datelabel]{\printlabeldateextra}% - \iflabeldateisanydate{% + \iflabeldateisdate{% \ifboolexpr{ - test {\ifdateshavedifferentprecision{label}{\thefield{labeldatesource}}} + test {\ifdateshavedifferentprecision{label}{}} or not test {\iffieldundef{extradate}} + or + not test {\iffieldundef{issue}} }{}{% + \clearfield{year}}% + }{% + \iflabeldateisanydate{% \ifboolexpr{ - test {\iffieldequalstr{labeldatesource}{}} - and - not test {\iffieldundef{issue}} + test {\ifdateshavedifferentprecision{label}{\thefield{labeldatesource}}} + or + not test {\iffieldundef{extradate}} }{}{% - \clearfield{\thefield{labeldatesource}year}}}% - }{% - \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}} + \clearfield{\thefield{labeldatesource}year}}% + }{% + \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% + }}}}} % \end{macrocode} % % \begin{itemize} 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 7bdf73e7cec..b676a135588 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{2018/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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 cf43552b704..916bcab9ed0 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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 32415a59e35..7bcc4501a7d 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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 3e1feddc396..34ee93433ae 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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 29bb01a37f3..b185a9b56ca 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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 b8ae5364f86..0dd8da08fa1 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx index df37ead52ce..94e0778d790 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.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.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx index 263cbcdf983..384ee890fa2 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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 4ca833abb31..101d00fc48f 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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 2d2e3c0d4b9..efb102d0b53 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.bbx} [\Version\space Numeric bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx index c7738a1ac7a..4fa5e4ab329 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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 04cfbec464c..488296fc80b 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \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 4a4a2d6e3ce..ce8086d62e7 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxref.bbx} [\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx index 072df72a7df..d569b2b7532 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.bbx} [\Version\space Author-year bibliography style inspired by the Oxford Guide to Style] @@ -77,64 +77,79 @@ }{% \printlabeldateextra \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}}}}% + }}}}}} \def\bbx@opt@mergedate@compact{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear}{}{% \printtext[datelabel]{% - \iflabeldateisanydate{% - \csuse{print\thefield{labeldatesource}dateextra}% - \clearfield{\thefield{labeldatesource}year}% - \clearfield{\thefield{labeldatesource}season}% - \clearfield{\thefield{labeldatesource}month}% - \clearfield{\thefield{labeldatesource}day}% + \iflabeldateisdate{% + \printdateextra + \clearfield{year}\clearfield{season}\clearfield{month}\clearfield{day}% }{% - \printlabeldateextra - \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}}}% + \iflabeldateisanydate{% + \csuse{print\thefield{labeldatesource}dateextra}% + \clearfield{\thefield{labeldatesource}year}% + \clearfield{\thefield{labeldatesource}season}% + \clearfield{\thefield{labeldatesource}month}% + \clearfield{\thefield{labeldatesource}day}% + }{% + \printlabeldateextra + \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% + }}}}}} \def\bbx@opt@mergedate@year{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear}{}{% \printtext[datelabel]{\printlabeldateextra}% - \iflabeldateisanydate{% - \clearfield{\thefield{labeldatesource}year}% + \iflabeldateisdate{% + \clearfield{year} }{% - \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}}% + \iflabeldateisanydate{% + \clearfield{\thefield{labeldatesource}year}% + }{% + \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% + }}}}} \def\bbx@opt@mergedate@basic{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear}{}{% \printtext[datelabel]{\printlabeldateextra}% - \iflabeldateisanydate{% - \ifdateshavedifferentprecision{label}{\thefield{labeldatesource}}{}{% - \ifboolexpr{ - test {\iffieldequalstr{labeldatesource}{}} - and - not test {\iffieldundef{issue}} - }{}{% - \clearfield{\thefield{labeldatesource}year}}}% + \iflabeldateisdate{% + \ifboolexpr{ + test {\ifdateshavedifferentprecision{label}{}} + or + not test {\iffieldundef{issue}} + }{}{% + \clearfield{year}}% }{% - \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}} + \iflabeldateisanydate{% + \ifdateshavedifferentprecision{label}{\thefield{labeldatesource}}{}{% + \clearfield{\thefield{labeldatesource}year}}% + }{% + \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% + }}}}} \def\bbx@opt@mergedate@minimum{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear}{}{% \printtext[datelabel]{\printlabeldateextra}% - \iflabeldateisanydate{% + \iflabeldateisdate{% \ifboolexpr{ - test {\ifdateshavedifferentprecision{label}{\thefield{labeldatesource}}} + test {\ifdateshavedifferentprecision{label}{}} or not test {\iffieldundef{extradate}} + or + not test {\iffieldundef{issue}} }{}{% + \clearfield{year}}% + }{% + \iflabeldateisanydate{% \ifboolexpr{ - test {\iffieldequalstr{labeldatesource}{}} - and - not test {\iffieldundef{issue}} + test {\ifdateshavedifferentprecision{label}{\thefield{labeldatesource}}} + or + not test {\iffieldundef{extradate}} }{}{% - \clearfield{\thefield{labeldatesource}year}}}% - }{% - \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% - }}}} + \clearfield{\thefield{labeldatesource}year}}% + }{% + \iflabeldateispubstate{}{\clearfield{\thefield{labeldatesource}}}% + }}}}} \def\bbx@opt@mergedate@false{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear}{}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx index f2b150c8763..2f807628edb 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.cbx} [\Version\space Author-year citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx index de72d9b12b3..26cef3f2849 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/01/31 v0.11.2} +\def\Version{2018/02/09 v0.11.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.dbx} [\Version\space Data model for the Oxref family of styles] |