diff options
44 files changed, 109 insertions, 121 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 3318c0adc96..ce064fec3b9 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 bb0d45b3ecf..a89492eaf3e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxalph-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 4d116444379..c56613e8eba 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 7a06c67c09d..578184206b0 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnotes-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \ProvidesFile{oxnotes-doc.tex} [\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style] \PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex} @@ -723,7 +723,7 @@ This is only supposed to to printed in the bibliography, not in notes. If the contribution of the translators or revisers is so great they could be joint authors, Oxford style is to print them immediately after the actual author. The motivation comes from textbooks like this one: \begin{egcite*}{} -\cite{kuehner.blass1890ef} +\textcite{kuehner.blass1890ef} \end{egcite*} \begin{bibexbox} 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 c9fb5f9fea3..058f95e0255 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 f56c54c7170..370e76aa38d 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxnum-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 65562befd06..67692fcb5c8 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 423360b5822..66d715cb921 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 d60d9db3f3f..b8793e5dfcb 100644 --- a/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex +++ b/Master/texmf-dist/doc/latex/biblatex-oxref/oxyear-doc.tex @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 b762e178c25..2db1e18a32d 100644 --- a/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx +++ b/Master/texmf-dist/source/latex/biblatex-oxref/oxref.dtx @@ -1,6 +1,6 @@ % \iffalse %<*internal|bbx|cbx|dbx|lbx|doc> -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} %</internal|bbx|cbx|dbx|lbx|doc> %<*internal> \iffalse @@ -1533,7 +1533,7 @@ If the contribution of the translators or revisers is so great they could be joi %<*n> \begin{egcite*}{} -\cite{kuehner.blass1890ef} +\textcite{kuehner.blass1890ef} \end{egcite*} %</n> %<*m|a> @@ -7112,7 +7112,7 @@ will trigger the use of parentheses. % % \begin{macrocode} \newtoggle{blx@ox@scnames} -\DeclareBibliographyOption[boolean]{scnames}[true]{% +\DeclareBibliographyOption{scnames}[true]{% \settoggle{blx@ox@scnames}{#1} } % \end{macrocode} @@ -7124,11 +7124,11 @@ will trigger the use of parentheses. % % \begin{macrocode} \newtoggle{blx@ox@nametitle}\toggletrue{blx@ox@nametitle}% -\DeclareBibliographyOption[boolean]{usenametitles}[true]{% +\DeclareBibliographyOption{usenametitles}[true]{% \settoggle{blx@ox@nametitle}{#1}} -\DeclareTypeOption[boolean]{usenametitles}[true]{% +\DeclareTypeOption{usenametitles}[true]{% \settoggle{blx@ox@nametitle}{#1}} -\DeclareEntryOption[boolean]{usenametitles}[true]{% +\DeclareEntryOption{usenametitles}[true]{% \settoggle{blx@ox@nametitle}{#1}} % \end{macrocode} % @@ -7715,7 +7715,8 @@ will trigger the use of parentheses. {}{\wlog{WARNING: biblatex-oxref failed to patch translatorstrg}}% \xpatchbibmacro{translator+othersstrg}% {\bibstring}% - {\bibstring[\mkbibparens]}{}{}% + {\bibstring[\mkbibparens]}% +{}{\wlog{WARNING: biblatex-oxref failed to patch translator+othersstrg}}% % \end{macrocode} % % When referencing one work from a collection by the same author, @@ -7875,28 +7876,28 @@ will trigger the use of parentheses. \iffieldundef{#2endmonth}% {\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangefull}} \patchcmd{\mkdaterangefullextra}{% \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% }{% \iffieldundef{#2endmonth}% {\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% -}{}{} -\patchcmd{\mkdaterangetrunc}{% +}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangefullextra}} +\patchcmd{\mkdaterangetrunc@i}{% \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% }{% \iffieldundef{#2endmonth}% {\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% -}{}{} -\patchcmd{\mkdaterangetruncextra}{% +}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangetrunc@i}} +\patchcmd{\mkdaterangetruncextra@i}{% \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% }{% \iffieldundef{#2endmonth}% {\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangetruncextra@i}} % \end{macrocode} % % We provide a way of prefacing dates (and times) with a type. This is mainly @@ -8297,7 +8298,7 @@ will trigger the use of parentheses. % by |issue+date| instead (see below). % % \begin{macrocode} -\DeclareBibliographyOption{issuestyle}[slash]{% +\DeclareBibliographyOption[string]{issuestyle}[slash]{% \ifcsdef{blx@ox@issuestyle@#1}{% \csuse{blx@ox@issuestyle@#1}% }{% @@ -8349,17 +8350,17 @@ will trigger the use of parentheses. % % \begin{macrocode} \newtoggle{blx@ox@varissuedate} -\DeclareBibliographyOption[boolean]{varissuedate}[true]{% +\DeclareBibliographyOption{varissuedate}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption[boolean]{varissuedate}[true]{% +\DeclareTypeOption{varissuedate}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption[boolean]{varissuedate}[true]{% +\DeclareEntryOption{varissuedate}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareBibliographyOption[boolean]{issuedate-plain}[true]{% +\DeclareBibliographyOption{issuedate-plain}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption[boolean]{issuedate-plain}[true]{% +\DeclareTypeOption{issuedate-plain}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption[boolean]{issuedate-plain}[true]{% +\DeclareEntryOption{issuedate-plain}[true]{% \settoggle{blx@ox@varissuedate}{#1}} \renewbibmacro*{issue+date}{% \ifboolexpr{ @@ -9710,7 +9711,7 @@ reference,mvreference,inreference]{volume}{% \newtoggle{blx@ox@plainthesis} \DeclareFieldAlias{thesis:publication}{publication} \DeclareFieldFormat{plain}{#1} -\DeclareBibliographyOption[boolean]{altthesis}[true]{% +\DeclareBibliographyOption{altthesis}[true]{% \settoggle{blx@ox@altthesis}{#1} } \DeclareBibliographyOption[string]{thesis}[out]{% @@ -10133,7 +10134,7 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \newtoggle{blx@ox@endeditor} -\DeclareEntryOption[boolean]{endeditor}[true]{% +\DeclareEntryOption{endeditor}[true]{% \settoggle{blx@ox@endeditor}{#1}} \newbibmacro*{pre-byeditor+others}{% \iftoggle{blx@ox@endeditor}{}{% @@ -10601,7 +10602,7 @@ reference,mvreference,inreference]{volume}{% \settoggle{bbx:altcourt}{#1}} \newtoggle{bbx@ecliuse} \newtoggle{bbx@eclionly} -\DeclareBibliographyOption{ecli}[yes]{% +\DeclareBibliographyOption[string]{ecli}[yes]{% \ifstrequal{#1}{no}{% \global\togglefalse{bbx@ecliuse}% \global\togglefalse{bbx@eclionly}% @@ -11842,7 +11843,7 @@ reference,mvreference,inreference]{volume}{% % We provide an option for setting the relatedtype punctuation. % % \begin{macrocode} -\DeclareBibliographyOption{relationpunct}[semicolon]{% +\DeclareBibliographyOption[string]{relationpunct}[semicolon]{% \ifcsdef{add#1}{% \ifstrequal{#1}{space}{% \renewcommand*{\relatedtypepunct}{\addspace}% @@ -11854,7 +11855,7 @@ reference,mvreference,inreference]{volume}{% }{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak 'period', 'exclam', 'question', and 'space'.}}} -\DeclareTypeOption{relationpunct}[semicolon]{% +\DeclareTypeOption[string]{relationpunct}[semicolon]{% \ifcsdef{add#1}{% \ifstrequal{#1}{space}{% \renewcommand*{\relatedtypepunct}{\addspace}% @@ -11867,7 +11868,7 @@ reference,mvreference,inreference]{volume}{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak 'period', 'exclam', 'question', and 'space'.}}} \newtoggle{blx@ox@relpunctset} -\DeclareEntryOption{relationpunct}[semicolon]{% +\DeclareEntryOption[string]{relationpunct}[semicolon]{% \ifcsdef{add#1}{% \ifstrequal{#1}{space}{% \renewcommand*{\relatedtypepunct}{\addspace}% @@ -12760,7 +12761,7 @@ reference,mvreference,inreference]{volume}{% \providebool{bbx:subentry} -\DeclareBibliographyOption[boolean]{subentry}[true]{% +\DeclareBibliographyOption{subentry}[true]{% \setbool{bbx:subentry}{#1}} \DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}} @@ -12844,14 +12845,7 @@ reference,mvreference,inreference]{volume}{% % this is implemented as the |year| value. % % \begin{macrocode} -\DeclareBibliographyOption{mergedate}[true]{% - \ifcsdef{bbx@opt@mergedate@#1} - {\csuse{bbx@opt@mergedate@#1}} - {\PackageError{biblatex-oxref} - {Invalid option 'mergedate=#1'} - {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak - 'year', 'true' (=year), and 'false'.}}} -\DeclareTypeOption{mergedate}[true]{% +\DeclareBiblatexOption{global,type,entry}{mergedate}[true]{% \ifcsdef{bbx@opt@mergedate@#1} {\csuse{bbx@opt@mergedate@#1}} {\PackageError{biblatex-oxref} @@ -12930,11 +12924,11 @@ reference,mvreference,inreference]{volume}{% % % \begin{macrocode} \newtoggle{blx@ox@nonodate} -\DeclareBibliographyOption[boolean]{nonodate}[true]{% +\DeclareBibliographyOption{nonodate}[true]{% \settoggle{blx@ox@nonodate}{#1}} -\DeclareTypeOption[boolean]{nonodate}[true]{% +\DeclareTypeOption{nonodate}[true]{% \settoggle{blx@ox@nonodate}{#1}} -\DeclareEntryOption[boolean]{nonodate}[true]{% +\DeclareEntryOption{nonodate}[true]{% \settoggle{blx@ox@nonodate}{#1}} \newbibmacro*{labeldate}{% \ifboolexpr{ @@ -13200,21 +13194,21 @@ reference,mvreference,inreference]{volume}{% }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% }{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefull}} -\xpatchcmd{\mkdaterangetrunc}{% +\xpatchcmd{\mkdaterangetrunc@i}{% \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc}} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc@i}} \xpatchcmd{\mkdaterangefullextra}{% \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% }{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefullextra}} -\xpatchcmd{\mkdaterangetruncextra}{% +\xpatchcmd{\mkdaterangetruncextra@i}{% \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra}} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra@i}} % \end{macrocode} % 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 87e9a3c2006..12e13ccbac0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 64ea7bdb7a3..f405622d475 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 2576d94b388..f1ef50cf7be 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 833d995eb6e..855601028d5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 00f58d92f46..f92e8f99431 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 e8a4931d7c0..f2e7464a6d9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx index 1994645949b..a0d1a103680 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx index f6cb79ce1d0..6af70687473 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx index 75cafb0eb97..780ca630c58 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx index e767f01c4b3..08444a166e2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx index 2185adbb98d..3d67c1907e5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx index 47755b21efd..ef7957f9686 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx index 591eca3532a..420aab5099d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx index fe389b8a2b0..f032fff70d7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx index bc3d60ac469..334201ebcfe 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx index df84e66851b..9d9ba2f55fb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx index 15563029b5c..4c7701c99af 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx index 3bdc4a2435a..7f4c1237f12 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx index 50adbb884d3..9ebf7738a30 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx index 8908c982edf..a507e5ebbc1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx index d706a526f8a..e1515af5841 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx index 711d247f64c..cafcd1395f2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx index e25f8dd5bdc..d2cc27d23a6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx index 2f3094d903a..5fa08dbe7df 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx index 69a74949379..66e91b47de3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 ea7fc8ce88e..e1c1f1e4e86 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 e15a82772e5..b20f0610ada 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 597219dae44..c37d5839cf8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.bbx} [\Version\space Numeric bibliography style inspired by the Oxford Guide to Style] @@ -35,7 +35,7 @@ \providebool{bbx:subentry} -\DeclareBibliographyOption[boolean]{subentry}[true]{% +\DeclareBibliographyOption{subentry}[true]{% \setbool{bbx:subentry}{#1}} \DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}} diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx index b8751b37895..49d9a4b00b5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 005016e3fe1..6b1ead470b8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 b1a43dc325e..204c04ad9d1 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/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxref.bbx} [\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style] @@ -59,15 +59,15 @@ \DeclareNameAlias{bookauthor}{default} \DeclareNameAlias{bookeditor}{default} \newtoggle{blx@ox@scnames} -\DeclareBibliographyOption[boolean]{scnames}[true]{% +\DeclareBibliographyOption{scnames}[true]{% \settoggle{blx@ox@scnames}{#1} } \newtoggle{blx@ox@nametitle}\toggletrue{blx@ox@nametitle}% -\DeclareBibliographyOption[boolean]{usenametitles}[true]{% +\DeclareBibliographyOption{usenametitles}[true]{% \settoggle{blx@ox@nametitle}{#1}} -\DeclareTypeOption[boolean]{usenametitles}[true]{% +\DeclareTypeOption{usenametitles}[true]{% \settoggle{blx@ox@nametitle}{#1}} -\DeclareEntryOption[boolean]{usenametitles}[true]{% +\DeclareEntryOption{usenametitles}[true]{% \settoggle{blx@ox@nametitle}{#1}} \newbibmacro*{name:title-given-family}[5]{% \usebibmacro{name:delim}{#2#3#1}% @@ -507,7 +507,8 @@ {}{\wlog{WARNING: biblatex-oxref failed to patch translatorstrg}}% \xpatchbibmacro{translator+othersstrg}% {\bibstring}% - {\bibstring[\mkbibparens]}{}{}% + {\bibstring[\mkbibparens]}% +{}{\wlog{WARNING: biblatex-oxref failed to patch translator+othersstrg}}% \renewbibmacro*{bybookauthor}{% \ifnamesequal{author}{bookauthor}% {\bibstring{idem\thefield{gender}}}% @@ -595,28 +596,28 @@ \iffieldundef{#2endmonth}% {\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangefull}} \patchcmd{\mkdaterangefullextra}{% \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% }{% \iffieldundef{#2endmonth}% {\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% -}{}{} -\patchcmd{\mkdaterangetrunc}{% +}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangefullextra}} +\patchcmd{\mkdaterangetrunc@i}{% \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% }{% \iffieldundef{#2endmonth}% {\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% -}{}{} -\patchcmd{\mkdaterangetruncextra}{% +}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangetrunc@i}} +\patchcmd{\mkdaterangetruncextra@i}{% \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% }{% \iffieldundef{#2endmonth}% {\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% -}{}{} +}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangetruncextra@i}} \DeclareFieldFormat{datetype}{% \ifbibstring{#1}{\bibstring{#1}}{#1\isdot}% } @@ -870,7 +871,7 @@ \setunit{\addspace}% \usebibmacro{issue+date}% \newunit} -\DeclareBibliographyOption{issuestyle}[slash]{% +\DeclareBibliographyOption[string]{issuestyle}[slash]{% \ifcsdef{blx@ox@issuestyle@#1}{% \csuse{blx@ox@issuestyle@#1}% }{% @@ -909,17 +910,17 @@ } \ExecuteBibliographyOptions{issuestyle=slash} \newtoggle{blx@ox@varissuedate} -\DeclareBibliographyOption[boolean]{varissuedate}[true]{% +\DeclareBibliographyOption{varissuedate}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption[boolean]{varissuedate}[true]{% +\DeclareTypeOption{varissuedate}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption[boolean]{varissuedate}[true]{% +\DeclareEntryOption{varissuedate}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareBibliographyOption[boolean]{issuedate-plain}[true]{% +\DeclareBibliographyOption{issuedate-plain}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareTypeOption[boolean]{issuedate-plain}[true]{% +\DeclareTypeOption{issuedate-plain}[true]{% \settoggle{blx@ox@varissuedate}{#1}} -\DeclareEntryOption[boolean]{issuedate-plain}[true]{% +\DeclareEntryOption{issuedate-plain}[true]{% \settoggle{blx@ox@varissuedate}{#1}} \renewbibmacro*{issue+date}{% \ifboolexpr{ @@ -1978,7 +1979,7 @@ reference,mvreference,inreference]{volume}{% \newtoggle{blx@ox@plainthesis} \DeclareFieldAlias{thesis:publication}{publication} \DeclareFieldFormat{plain}{#1} -\DeclareBibliographyOption[boolean]{altthesis}[true]{% +\DeclareBibliographyOption{altthesis}[true]{% \settoggle{blx@ox@altthesis}{#1} } \DeclareBibliographyOption[string]{thesis}[out]{% @@ -2319,7 +2320,7 @@ reference,mvreference,inreference]{volume}{% \setunit{\addcomma\space}% \usebibmacro{date+time}}}} \newtoggle{blx@ox@endeditor} -\DeclareEntryOption[boolean]{endeditor}[true]{% +\DeclareEntryOption{endeditor}[true]{% \settoggle{blx@ox@endeditor}{#1}} \newbibmacro*{pre-byeditor+others}{% \iftoggle{blx@ox@endeditor}{}{% @@ -2667,7 +2668,7 @@ reference,mvreference,inreference]{volume}{% \settoggle{bbx:altcourt}{#1}} \newtoggle{bbx@ecliuse} \newtoggle{bbx@eclionly} -\DeclareBibliographyOption{ecli}[yes]{% +\DeclareBibliographyOption[string]{ecli}[yes]{% \ifstrequal{#1}{no}{% \global\togglefalse{bbx@ecliuse}% \global\togglefalse{bbx@eclionly}% @@ -3739,7 +3740,7 @@ reference,mvreference,inreference]{volume}{% \setunit{\relatedtypepunct}\newblock \iftoggle{bbx:related} }{}{\wlog{WARNING: biblatex-oxref failed to patch misc}} -\DeclareBibliographyOption{relationpunct}[semicolon]{% +\DeclareBibliographyOption[string]{relationpunct}[semicolon]{% \ifcsdef{add#1}{% \ifstrequal{#1}{space}{% \renewcommand*{\relatedtypepunct}{\addspace}% @@ -3751,7 +3752,7 @@ reference,mvreference,inreference]{volume}{% }{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak 'period', 'exclam', 'question', and 'space'.}}} -\DeclareTypeOption{relationpunct}[semicolon]{% +\DeclareTypeOption[string]{relationpunct}[semicolon]{% \ifcsdef{add#1}{% \ifstrequal{#1}{space}{% \renewcommand*{\relatedtypepunct}{\addspace}% @@ -3764,7 +3765,7 @@ reference,mvreference,inreference]{volume}{% Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak 'period', 'exclam', 'question', and 'space'.}}} \newtoggle{blx@ox@relpunctset} -\DeclareEntryOption{relationpunct}[semicolon]{% +\DeclareEntryOption[string]{relationpunct}[semicolon]{% \ifcsdef{add#1}{% \ifstrequal{#1}{space}{% \renewcommand*{\relatedtypepunct}{\addspace}% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx index 6bef2cba858..5cbff0fa3ba 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx @@ -13,20 +13,13 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.bbx} [\Version\space Author-year bibliography style inspired by the Oxford Guide to Style] \RequireBibliographyStyle{oxref} \ExecuteBibliographyOptions{giveninits,labeldateparts,sorting=nyt,pagetracker,maxcitenames=2} -\DeclareBibliographyOption{mergedate}[true]{% - \ifcsdef{bbx@opt@mergedate@#1} - {\csuse{bbx@opt@mergedate@#1}} - {\PackageError{biblatex-oxref} - {Invalid option 'mergedate=#1'} - {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak - 'year', 'true' (=year), and 'false'.}}} -\DeclareTypeOption{mergedate}[true]{% +\DeclareBiblatexOption{global,type,entry}{mergedate}[true]{% \ifcsdef{bbx@opt@mergedate@#1} {\csuse{bbx@opt@mergedate@#1}} {\PackageError{biblatex-oxref} @@ -74,11 +67,11 @@ not test {\iffieldundef{labeldatesource}} and test {\iffieldequalstr{labeldatesource}{pubstate}}}} \newtoggle{blx@ox@nonodate} -\DeclareBibliographyOption[boolean]{nonodate}[true]{% +\DeclareBibliographyOption{nonodate}[true]{% \settoggle{blx@ox@nonodate}{#1}} -\DeclareTypeOption[boolean]{nonodate}[true]{% +\DeclareTypeOption{nonodate}[true]{% \settoggle{blx@ox@nonodate}{#1}} -\DeclareEntryOption[boolean]{nonodate}[true]{% +\DeclareEntryOption{nonodate}[true]{% \settoggle{blx@ox@nonodate}{#1}} \newbibmacro*{labeldate}{% \ifboolexpr{ @@ -241,21 +234,21 @@ }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% }{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefull}} -\xpatchcmd{\mkdaterangetrunc}{% +\xpatchcmd{\mkdaterangetrunc@i}{% \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc}} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc@i}} \xpatchcmd{\mkdaterangefullextra}{% \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}% }{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefullextra}} -\xpatchcmd{\mkdaterangetruncextra}{% +\xpatchcmd{\mkdaterangetruncextra@i}{% \iffieldundef{#2year} {\blx@nounit}% }{% \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}% -}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra}} +}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra@i}} \DeclareFieldFormat{shorthandwidth}{#1} \xpretonameformat{family-given}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx index 1b687ca5ceb..172020de0e8 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{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \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 0d9d8bca0a7..4c5648ca9ef 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2019/02/19 v1.1} +\def\Version{2019/09/02 v1.2} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.dbx} [\Version\space Data model for the Oxref family of styles] |