diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx | 69 |
1 files changed, 38 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx index 971e40dd4dd..61fc0680f1a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx @@ -25,8 +25,9 @@ %% This work has the LPPL maintenance status "author-maintained". %% \ProvidesFile{philosophy-classic.bbx} -[2020/05/24 v1.9.8b A set of styles for biblatex] -\RequireBibliographyStyle{authoryear} +[2020/09/30 v1.9.8c A set of styles for biblatex] + +\RequireBibliographyStyle{authoryear-comp} \RequireBibliographyStyle{philosophy-standard} \newtoggle{bbx:square} @@ -36,8 +37,8 @@ \settoggle{bbx:square}{#1}} \DeclareBibliographyOption{nodate}[true]{% \settoggle{bbx:nodate}{#1}} -\define@key{blx@bib1}{nodate}[]{}% -\define@key{blx@bib2}{nodate}[true]{% +\blx@kv@defkey{blx@bib1}{nodate}[]{}% +\blx@kv@defkey{blx@bib2}{nodate}[true]{% \ifstrequal{#1}{false}{\togglefalse{bbx:nodate}}{}}% \def\bbx@opt@mergedate@maximum{% \renewbibmacro*{date+extradate}{% @@ -49,13 +50,14 @@ \setunit*{\addspace}% \printdateextra} {\printlabeldateextra}}}}% + \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}% \renewbibmacro*{date}{% \iflabeldateisdate {} {\printdate}}% \renewbibmacro*{issue+date}{% - \iflabeldateisdate - {} + \usebibmacro{bbx:ifmergeddate} + {} {\ifdefstring{\bbx@volnumformat}{parens}% {\printtext{% \printfield{issue}% @@ -65,7 +67,6 @@ \printfield{issue}% \setunit*{\addspace}% \printdate}}}}} - \def\bbx@opt@mergedate@compact{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear} @@ -74,6 +75,7 @@ \iflabeldateisdate {\printdateextra} {\printlabeldateextra}}}}% + \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}% \renewbibmacro*{date}{% \iflabeldateisdate {} @@ -85,26 +87,31 @@ {\printtext{% \printfield{issue}% \setunit*{\addspace}% - \iflabeldateisdate + \usebibmacro{bbx:ifmergeddate} {} {\printdate}% }}% {\printtext[pureparens]{% \printfield{issue}% \setunit*{\addspace}% - \iflabeldateisdate + \usebibmacro{bbx:ifmergeddate} {} {\printdate}% }}} {}% \newunit}} - - \def\bbx@opt@mergedate@basic{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear} {\usebibmacro{bbx:nodate}} {\postsepyear{\printlabeldateextra}}}% + \renewbibmacro*{bbx:ifmergeddate}{% + \ifboolexpr{ + test {\iflabeldateisdate} + and + not test {\ifdateshavedifferentprecision{label}{}} + }% +}% \renewbibmacro*{date}{% \ifboolexpr{ test {\iflabeldateisdate} @@ -115,13 +122,11 @@ {\printdate}}% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} - and - test {\iffieldundef{issue}} - } - {} + test {\usebibmacro{bbx:ifmergeddate}} + and + test {\iffieldundef{issue}} +} +{} {\ifdefstring{\bbx@volnumformat}{parens}% {\printtext{% \printfield{issue}% @@ -132,13 +137,20 @@ \setunit*{\addspace}% \printdate}}}% \newunit}} - - \def\bbx@opt@mergedate@minimum{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear} {\usebibmacro{bbx:nodate}} {\postsepyear{\printlabeldateextra}}}% + \renewbibmacro*{bbx:ifmergeddate}{% + \ifboolexpr{ + test {\iflabeldateisdate} + and + not test {\ifdateshavedifferentprecision{label}{}} + and + test {\iffieldundef{extradate}} + }% +}% \renewbibmacro*{date}{% \ifboolexpr{ test {\iflabeldateisdate} @@ -151,15 +163,11 @@ {\printdate}}% \renewbibmacro*{issue+date}{% \ifboolexpr{ - test {\iflabeldateisdate} - and - not test {\ifdateshavedifferentprecision{label}{}} - and - test {\iffieldundef{extradate}} - and - test {\iffieldundef{issue}} - } - {} + test {\usebibmacro{bbx:ifmergeddate}} + and + test {\iffieldundef{issue}} +} +{} {\ifdefstring{\bbx@volnumformat}{parens}% {\printtext{% \printfield{issue}% @@ -170,13 +178,12 @@ \setunit*{\addspace}% \printdate}}}% \newunit}} - - \def\bbx@opt@mergedate@false{% \renewbibmacro*{date+extradate}{% \iffieldundef{labelyear} {\usebibmacro{bbx:nodate}} {\postsepyear{\printlabeldateextra}}}% + \renewbibmacro*{bbx:ifmergeddate}{\@secondoftwo}% \renewbibmacro*{date}{\printdate}% \renewbibmacro*{issue+date}{% \ifdefstring{\bbx@volnumformat}{parens}% |