From a5ec2bc0778f41c07111f6dece696bcf6947ca26 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 Mar 2017 22:05:20 +0000 Subject: biblatex-philosophy (21mar17) git-svn-id: svn://tug.org/texlive/trunk@43569 c570f23f-e606-0410-a88d-b1316a301751 --- .../biblatex-philosophy/english-philosophy.lbx | 2 +- .../biblatex-philosophy/italian-philosophy.lbx | 138 +++++++++++++++++++- .../biblatex-philosophy/philosophy-classic.bbx | 66 +++++++++- .../biblatex-philosophy/philosophy-classic.cbx | 2 +- .../biblatex-philosophy/philosophy-modern.bbx | 110 ++++++++++------ .../biblatex-philosophy/philosophy-modern.cbx | 2 +- .../biblatex-philosophy/philosophy-standard.bbx | 139 ++++++++++----------- .../biblatex-philosophy/philosophy-verbose.bbx | 11 +- .../biblatex-philosophy/philosophy-verbose.cbx | 13 +- .../biblatex-philosophy/spanish-philosophy.lbx | 2 +- 10 files changed, 350 insertions(+), 135 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy') diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx index 8aa221f3a38..e92e571d153 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{english-philosophy.lbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx index 9ba6c7c1a25..58edc25fb44 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{italian-philosophy.lbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] @@ -60,6 +60,142 @@ founders = {{fondatori}{fond\adddot}},% FIXME: missing continuator = {{continuatore}{cont\adddot}},% FIXME: missing continuators = {{continuatori}{cont\adddot}},% FIXME: missing + editortr = {{curatore e traduttore}% FIXME: missing + {cur\adddotspace e trad\adddot}}, + editorstr = {{curatori e traduttori}% FIXME: missing + {cur\adddotspace e trad\adddot}}, + editorco = {{curatore e commentatore}% FIXME: missing + {cur\adddotspace e comm\adddot}}, + editorsco = {{curatori e commentatori}% FIXME: missing + {cur\adddotspace e comm\adddot}}, + editoran = {{curatore e annotatore}% FIXME: missing + {cur\adddotspace e annot\adddot}}, + editorsan = {{curatori e annotatori}% FIXME: missing + {cur\adddotspace e annot\adddot}}, + editorin = {{curatore e introduzione}% FIXME: missing + {cur\adddotspace e introd\adddot}}, + editorsin = {{curatori e introduzione}% FIXME: missing + {cur\adddotspace e introd\adddot}}, + editorfo = {{curatore e prefazione}% FIXME: missing + {cur\adddotspace e pref\adddot}}, + editorsfo = {{curatori e prefazione}% FIXME: missing + {cur\adddotspace e pref\adddot}}, + editoraf = {{curatore e postfazione}% FIXME: missing + {cur\adddotspace e postf\adddot}}, + editorsaf = {{curatori e postfazione}% FIXME: missing + {cur\adddotspace e postf\adddot}}, + editortrco = {{curatore, traduttore\finalandcomma\ e commentatore}% FIXME: missing + {ed.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}}, + editorstrco = {{curatori, traduttori\finalandcomma\ e commentatori}% FIXME: missing + {eds.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}}, + editortran = {{curatore, traduttore\finalandcomma\ e annotatore}% FIXME: missing + {ed.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}}, + editorstran = {{curatori, traduttori\finalandcomma\ e annotatori}% FIXME: missing + {eds.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}}, + editortrin = {{curatore, traduttore\finalandcomma\ e introduzione}% FIXME: missing + {ed.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}}, + editorstrin = {{curatori, traduttori\finalandcomma\ e introduzione}% FIXME: missing + {eds.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}}, + editortrfo = {{curatore, traduttore\finalandcomma\ e prefazione}% FIXME: missing + {ed.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}}, + editorstrfo = {{curatori, traduttori\finalandcomma\ e prefazione}% FIXME: missing + {eds.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}}, + editortraf = {{curatore, traduttore\finalandcomma\ e postfazione}% FIXME: missing + {ed.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}}, + editorstraf = {{curatori, traduttori\finalandcomma\ e postfazione}% FIXME: missing + {eds.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}}, + editorcoin = {{curatore, commentatore\finalandcomma\ e introduzione}% FIXME: missing + {ed.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}}, + editorscoin = {{curatori, commentatori\finalandcomma\ e introduzione}% FIXME: missing + {eds.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}}, + editorcofo = {{curatore, commentatore\finalandcomma\ e prefazione}% FIXME: missing + {ed.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}}, + editorscofo = {{curatori, commentatori\finalandcomma\ e prefazione}% FIXME: missing + {eds.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}}, + editorcoaf = {{curatore, commentatore\finalandcomma\ e postfazione}% FIXME: missing + {ed.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}}, + editorscoaf = {{curatori, commentatori\finalandcomma\ e postfazione}% FIXME: missing + {eds.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}}, + editoranin = {{curatore, annotatore\finalandcomma\ e introduzione}% FIXME: missing + {ed.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}}, + editorsanin = {{curatori, annotatori\finalandcomma\ e introduzione}% FIXME: missing + {eds.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}}, + editoranfo = {{curatore, annotatore\finalandcomma\ e prefazione}% FIXME: missing + {ed.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}}, + editorsanfo = {{curatori, annotatori\finalandcomma\ e prefazione}% FIXME: missing + {eds.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}}, + editoranaf = {{curatore, annotatore\finalandcomma\ e postfazione}% FIXME: missing + {ed.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}}, + editorsanaf = {{curatori, annotatori\finalandcomma\ e postfazione}% FIXME: missing + {eds.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}}, + editortrcoin = {{curatore, traduttore, commentatore\finalandcomma\ e introduzione}% FIXME: missing + {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e introd\adddot}}, + editorstrcoin = {{curatori, traduttori, commentatori\finalandcomma\ e introduzione}% FIXME: missing + {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e introd\adddot}}, + editortrcofo = {{curatore, traduttore, commentatore\finalandcomma\ e prefazione}% FIXME: missing + {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e pref\adddot}}, + editorstrcofo = {{curatori, traduttori, commentatori\finalandcomma\ e prefazione}% FIXME: missing + {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e pref\adddot}}, + editortrcoaf = {{curatore, traduttore, commentatore\finalandcomma\ e postfazione}% FIXME: missing + {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e postf\adddot}}, + editorstrcoaf = {{curatori, traduttori, commentatori\finalandcomma\ e postfazione}% FIXME: missing + {cur.,\addabbrvspace trad., comm\adddot\finalandcomma\ e postf\adddot}}, + editortranin = {{curatore, traduttore, annotatore\finalandcomma\ e introduzione}% FIXME: missing + {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e introd\adddot}}, + editorstranin = {{curatori, traduttori, annotatori\finalandcomma\ e introduzione}% FIXME: missing + {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e introd\adddot}}, + editortranfo = {{curatore, traduttore, annotatore\finalandcomma\ e prefazione}% FIXME: missing + {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e pref\adddot}}, + editorstranfo = {{curatori, traduttori, annotatori\finalandcomma\ e prefazione}% FIXME: missing + {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e pref\adddot}}, + editortranaf = {{curatore, traduttore, annotatore\finalandcomma\ e postfazione}% FIXME: missing + {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e postf\adddot}}, + editorstranaf = {{curatori, traduttori, annotatori\finalandcomma\ e postfazione}% FIXME: missing + {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e postf\adddot}}, + translatorco = {{traduttore e commentatore}% FIXME: missing + {trad\adddot\ e comm\adddot}}, + translatorsco = {{traduttori e commentatori}% FIXME: missing + {trad\adddot\ e comm\adddot}}, + translatoran = {{traduttore e annotatore}% FIXME: missing + {trad\adddot\ e annot\adddot}}, + translatorsan = {{traduttori e annotatori}% FIXME: missing + {trad\adddot\ e annot\adddot}}, + translatorin = {{traduzione e introduzione}% FIXME: missing + {trad\adddot\ e introd\adddot}}, + translatorsin = {{traduzione e introduzione}% FIXME: missing + {trad\adddot\ e introd\adddot}}, + translatorfo = {{traduzione e prefazione}% FIXME: missing + {trad\adddot\ e pref\adddot}}, + translatorsfo = {{traduzione e prefazione}% FIXME: missing + {trad\adddot\ e pref\adddot}}, + translatoraf = {{traduzione e postfazione}% FIXME: missing + {trad\adddot\ e postf\adddot}}, + translatorsaf = {{traduzione e postfazione}% FIXME: missing + {trad\adddot\ e postf\adddot}}, + translatorcoin = {{traduzione, commenti\finalandcomma\ e introduzione}% FIXME: missing + {trans., comm\adddot\finalandcomma\ e introd\adddot}}, + translatorscoin = {{traduzione, commenti\finalandcomma\ e introduzione}% FIXME: missing + {trans., comm\adddot\finalandcomma\ e introd\adddot}}, + translatorcofo = {{traduzione, commenti\finalandcomma\ e prefazione}% FIXME: missing + {trans., comm\adddot\finalandcomma\ e pref\adddot}}, + translatorscofo = {{traduzione, commenti\finalandcomma\ e prefazione}% FIXME: missing + {trans., comm\adddot\finalandcomma\ e pref\adddot}}, + translatorcoaf = {{traduzione, commenti\finalandcomma\ e postfazione}% FIXME: missing + {trans., comm\adddot\finalandcomma\ e postf\adddot}}, + translatorscoaf = {{traduzione, commenti\finalandcomma\ e postfazione}% FIXME: missing + {trans., comm\adddot\finalandcomma\ e postf\adddot}}, + translatoranin = {{traduzione, annotazioni\finalandcomma\ e introduzione}% FIXME: missing + {trans., annot\adddot\finalandcomma\ e introd\adddot}}, + translatorsanin = {{traduzione, annotazioni\finalandcomma\ e introduzione}% FIXME: missing + {trans., annot\adddot\finalandcomma\ e introd\adddot}}, + translatoranfo = {{traduzione, annotazioni\finalandcomma\ e prefazione}% FIXME: missing + {trans., annot\adddot\finalandcomma\ e pref\adddot}}, + translatorsanfo = {{traduzione, annotazioni\finalandcomma\ e prefazione}% FIXME: missing + {trans., annot\adddot\finalandcomma\ e pref\adddot}}, + translatoranaf = {{traduzione, annotazioni\finalandcomma\ e postfazione}% FIXME: missing + {trans., annot\adddot\finalandcomma\ e postf\adddot}}, + translatorsanaf = {{traduzione, annotazioni\finalandcomma\ e postfazione}% FIXME: missing + {trans., annot\adddot\finalandcomma\ e postf\adddot}}, byreviewer = {{recensito da}{rec\adddotspace da}},% FIXME: missing: UNSURE byfounder = {{fondato da}{fond\adddotspace da}},% FIXME: missing bycontinuator = {{continuato da}{cont\adddotspace da}},% FIXME: missing: UNSURE 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 6d9a7f58922..9c96745039f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.bbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] @@ -139,7 +139,6 @@ \AtEveryBibitem{% \iffieldequalstr{entrysubtype}{classic}{% \togglefalse{bbx:nodate}}}% - \renewbibmacro*{relateddate}{} \renewbibmacro*{commarelateddate}{} \renewbibmacro*{issue+date}{% @@ -217,6 +216,64 @@ \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% + +\renewbibmacro*{translator}{% +\usebibmacro{bbx:translator}{translatorstrg}}% +\renewbibmacro*{translator+others}{% +\usebibmacro{bbx:translator}{translator+othersstrg}}% +\renewbibmacro*{bbx:translator}[1]{% +\ifboolexpr{% +test \ifusetranslator +and +not test {\ifnameundef{translator}} +}% +{\usebibmacro{bbx:dashcheck}% +{\bibnamedash}% +{\printnames{translator}% +\setunit{\addspace}% +\usebibmacro{bbx:savehash}}% +\usebibmacro{#1}% +\clearname{translator}% +\setunit{\addspace}}% +{\global\undef\bbx@lasthash% +\usebibmacro{labeltitle}% +\setunit*{\addspace}}% +\usebibmacro{date+extrayear}}% +\renewbibmacro*{translatorstrg}{% +\printtext[editortype]{% +\ifboolexpr{ +test {\ifnumgreater{\value{translator}}{1}} +or +test {\ifandothers{translator}} +} +{\bibstring{translators}} +{\bibstring{translator}}}} +\renewbibmacro*{translator+othersstrg}{% +\ifboolexpr{ +test {\ifnumgreater{\value{translator}}{1}} +or +test {\ifandothers{translator}} +} +{\def\abx@tempa{translators}} +{\def\abx@tempa{translator}}% +\ifnamesequal{translator}{commentator} +{\appto\abx@tempa{co}% +\clearname{commentator}} +{\ifnamesequal{translator}{annotator} +{\appto\abx@tempa{an}% +\clearname{annotator}} +{}}% +\ifnamesequal{translator}{introduction} +{\appto\abx@tempa{in}% +\clearname{introduction}} +{\ifnamesequal{translator}{foreword} +{\appto\abx@tempa{fo}% +\clearname{foreword}} +{\ifnamesequal{translator}{afterword} +{\appto\abx@tempa{af}% +\clearname{afterword}} +{}}}% +\printtext[editortype]{\bibstring{\abx@tempa}}} \DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\usebibmacro{citeindex}% @@ -229,7 +286,6 @@ \usebibmacro{date+extrayear}}% {}% {}% - \DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\usebibmacro{citeindex}% @@ -246,9 +302,7 @@ \define@key{blx@bib2}{restoreclassic}[true]{} \define@key{blx@bib1}{nodate}[]{}% \define@key{blx@bib2}{nodate}[true]{% - \ifstrequal{#1}{false}{% - \togglefalse{bbx:nodate}% -}{}}% + \ifstrequal{#1}{false}{\togglefalse{bbx:nodate}}{}}% %% %% Copyright 2009-2017 by Ivan Valbusa %% diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx index 75009eec87a..5cd071de7f6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-classic.cbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx index f7a53316ea6..ebef2925fc8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.bbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] @@ -36,13 +36,11 @@ \iftoggle{bbx:yearleft}{% \setlength{\yeartitle}{\fill}}% {}} - \newcommand{\postsep}{\par\nobreak\vskip\postnamesep% \hskip-\bibhang\ignorespaces} \renewcommand{\labelnamepunct}{} - \AtBeginShorthands{% -\renewcommand{\postsep}{\addspace}% +\renewcommand{\postsep}{}%\addspace in version 1.9.3 \renewcommand{\labelnamepunct}{\newunitpunct}} \renewbibmacro*{date+extrayear}{% \begingroup% @@ -58,15 +56,8 @@ \midsentence\bibstring{nodate}}}{}}% {\printtext{\printdateextra}}% \hskip\yeartitle}}% + \nopunct% \endgroup}% - -\renewbibmacro*{labeltitle}{% - \iffieldundef{label}% - {\iffieldundef{shorttitle}% - {\printfield{title}\clearfield{title}}% - {\printfield[title]{shorttitle}}}% - {\printtext{\printfield{label}}% -\postsep}} \renewbibmacro*{author}{% \ifboolexpr{% test \ifuseauthor @@ -87,31 +78,61 @@ \postsep}}% {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% + \postsep% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% - \renewbibmacro*{editor}{% \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% \usebibmacro{bbx:editor}{editor+othersstrg}}% \renewbibmacro*{bbx:editor}[1]{% - \ifboolexpr{% - test \ifuseeditor - and - not test {\ifnameundef{editor}} - }% - {\usebibmacro{bbx:dashcheck}% - {}% - {\printnames{editor}% +\ifboolexpr{% +test \ifuseeditor +and +not test {\ifnameundef{editor}} +}% +{\usebibmacro{bbx:dashcheck}% + {}% + {\printnames{editor}% \postsep%ADD - \usebibmacro{bbx:savehash}}}% - {\global\undef\bbx@lasthash% - \usebibmacro{labeltitle}}% + \usebibmacro{bbx:savehash}}% + \usebibmacro{date+extrayear}% + \usebibmacro{#1}% + \clearname{editor}% + \printtext{\addcomma\space}% +}% +{\global\undef\bbx@lasthash% + \usebibmacro{labeltitle}% + \postsep% + \usebibmacro{date+extrayear}% +}% +}% +\renewbibmacro*{translator}{% +\usebibmacro{bbx:translator}{translatorstrg}} +\renewbibmacro*{translator+others}{% +\usebibmacro{bbx:translator}{translator+othersstrg}} +\renewbibmacro*{bbx:translator}[1]{% +\ifboolexpr{% +test \ifusetranslator +and +not test {\ifnameundef{translator}} +}% +{\usebibmacro{bbx:dashcheck}% + {}% + {\printnames{translator}% +\postsep%ADD + \usebibmacro{bbx:savehash}}% \usebibmacro{date+extrayear}% - \iffieldundef{label}% - {\usebibmacro{#1}% - \clearname{editor}% - \printtext{\addcomma\space}}{}}% + \usebibmacro{#1}% + \clearname{translator}% + \printtext{\addcomma\space}% +}% +{\global\undef\bbx@lasthash% + \usebibmacro{labeltitle}% + \postsep% + \usebibmacro{date+extrayear}% +}% +}% \DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\usebibmacro{citeindex}% @@ -124,7 +145,6 @@ \usebibmacro{classic:date+extrayear}}% {}% {}% - \DeclareCiteCommand{\bbx@crossref@incollection}% {}% {\usebibmacro{citeindex}% @@ -137,7 +157,6 @@ \usebibmacro{classic:date+extrayear}}% {}% {}% - \newbibmacro*{classic:date+extrayear}{% \begingroup% \clearfield{month}% @@ -190,7 +209,7 @@ \iffieldundef{authortype}% {}% {\usebibmacro{authorstrg}% -\setunit{\addspace}}}% + \setunit{\addspace}}}% {\global\undef\bbx@lasthash% \usebibmacro{labeltitle}% \setunit*{\addspace}}% @@ -217,13 +236,28 @@ \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}}% -\renewbibmacro*{labeltitle}{% - \iffieldundef{label}% - {\iffieldundef{shorttitle}% - {\printfield{title}% - \clearfield{title}}% - {\printfield[title]{shorttitle}}}% - {\printfield{label}}}% +\renewbibmacro*{translator}{% +\usebibmacro{bbx:translator}{translatorstrg}}% +\renewbibmacro*{translator+others}{% +\usebibmacro{bbx:translator}{translator+othersstrg}}% +\renewbibmacro*{bbx:translator}[1]{% +\ifboolexpr{% +test \ifusetranslator +and +not test {\ifnameundef{translator}} +}% +{\usebibmacro{bbx:dashcheck}% +{\bibnamedash}% +{\printnames{translator}% +\setunit{\addspace}% +\usebibmacro{bbx:savehash}}% +\usebibmacro{#1}% +\clearname{translator}% +\setunit{\addspace}}% +{\global\undef\bbx@lasthash% +\usebibmacro{labeltitle}% +\setunit*{\addspace}}% +\usebibmacro{date+extrayear}}% }{}}% %% %% Copyright 2009-2017 by Ivan Valbusa diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx index 612d3cb548e..a75314dd082 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-modern.cbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx index d5efb9e8d09..3f31d086d44 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-standard.bbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] @@ -110,9 +110,6 @@ \toggletrue{cbx:scauthorscite}% }% {}% -\iftoggle{bbx:lowscauthors}% - {\newrobustcmd*{\mkbibsc}[1]{\textsc{\MakeLowercase{#1}}}}% - {\newrobustcmd*{\mkbibsc}[1]{\textsc{#1}}}% } \AtBeginBibliography{\togglefalse{cbx:scauthorscite}}% \renewcommand*{\newunitpunct}{\addcomma\space} @@ -145,12 +142,18 @@ \expandafter\editionfont% \expandafter{\romannumeral#1}% \endgroup} +\newrobustcmd*{\mkbibsc}[1]{% + \iftoggle{bbx:lowscauthors}{% + \textsc{\MakeLowercase{#1}}}% + {\textsc{#1}}} +\newbibmacro*{scswitch}{% +\let\mkbibnamefamily\mkbibsc% +\let\mkbibnamegiven\mkbibsc% +\let\mkbibnameprefix\mkbibsc% +\let\mkbibnamesuffix\mkbibsc} \DeclareNameFormat{sortname}{% \iftoggle{bbx:scauthorsbib}{% - \let\mkbibnamefamily\mkbibsc% - \let\mkbibnamegiven\mkbibsc% - \let\mkbibnameprefix\mkbibsc% - \let\mkbibnamesuffix\mkbibsc}{}% + \usebibmacro{scswitch}}{}% \nameparts{#1}% \ifnumequal{\value{listcount}}{1} {\ifgiveninits @@ -578,6 +581,64 @@ {\setunit{\addspace}}}% \usebibmacro{related:init}% \usebibmacro{related}}{}} +\renewbibmacro*{bybookauthor}{% +\ifnamesequal{author}{bookauthor}% +{}% +{\printnames[default]{bookauthor}}} + +\newbibmacro*{xrefdata}{% +\iffieldundef{volume} +{}% +{\printfield{volume}% +\printfield{part}% +\setunit{\addcolon\space}% +\printfield{booktitle}}% +\newunit\newblock +\usebibmacro{byeditor+others}% +\newunit\newblock +\printfield{edition}% +\newunit +\printfield{volumes}% +\newunit\newblock +\usebibmacro{series+number}% +\newunit\newblock +\printfield{note}% +\newunit\newblock +\usebibmacro{publisher+location+date}% +\newunit\newblock +\usebibmacro{chapter+pages}% +\newunit\newblock +\iftoggle{bbx:isbn} +{\printfield{isbn}} +{}% +\newunit\newblock +\usebibmacro{doi+eprint+url}% +\newunit\newblock +\usebibmacro{addendum+pubstate:article-inbook-incoll}% +\newblock +\usebibmacro{phil:related}% +\newunit\newblock +\usebibmacro{pageref}% +\usebibmacro{finentry}} + +\newbibmacro*{crossrefdata}{% +\iffieldundef{maintitle} +{\printfield{volume}% +\printfield{part}} +{}% +\newunit\newblock +\usebibmacro{chapter+pages}% +\newunit\newblock +\iftoggle{bbx:isbn} +{\printfield{isbn}} +{}% +\newunit\newblock +\usebibmacro{doi+eprint+url}% +\newblock +\usebibmacro{phil:related}% +\newunit\newblock +\usebibmacro{pageref}% +\usebibmacro{finentry}} \newbibmacro*{origpublisher+origlocation+origdate}{% \ifdefstring{\bbx@publocformat}{loccolonpub} {\usebibmacro{origloccolonpub}\setunit{\bibpagespunct}% @@ -1353,68 +1414,6 @@ \restorefield{annotation}{\@phil@nnote}% \usebibmacro{pageref}% \usebibmacro{finentry}} - -\renewbibmacro*{bybookauthor}{% - \ifnamesequal{author}{bookauthor}% - {}% - {\printnames[default]{bookauthor}}} - -\newbibmacro*{cross:maintitle+booktitle}{% - \iffieldundef{volume} - {}% - {\printfield{volume}% - \printfield{part}% - \setunit{\addcolon\space}% - \printfield{booktitle}}}% - -\newbibmacro*{xrefdata}{% - \usebibmacro{cross:maintitle+booktitle}% - \newunit\newblock - \usebibmacro{byeditor+others}% - \newunit\newblock - \printfield{edition}% - \newunit - \printfield{volumes}% - \newunit\newblock - \usebibmacro{series+number}% - \newunit\newblock - \printfield{note}% - \newunit\newblock - \usebibmacro{publisher+location+date}% - \newunit\newblock - \usebibmacro{chapter+pages}% - \newunit\newblock - \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% - \newunit\newblock - \usebibmacro{doi+eprint+url}% - \newunit\newblock - \usebibmacro{addendum+pubstate:article-inbook-incoll}% - \newblock - \usebibmacro{phil:related}% - \newunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} - -\newbibmacro*{crossrefdata}{% - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newunit\newblock - \usebibmacro{chapter+pages}% - \newunit\newblock - \iftoggle{bbx:isbn} - {\printfield{isbn}} - {}% - \newunit\newblock - \usebibmacro{doi+eprint+url}% - \newblock - \usebibmacro{phil:related}% - \newunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} \DeclareFieldFormat[jurisdiction]{volume}{\RN{#1}} \DeclareFieldFormat[jurisdiction]{number}{\bibsstring{number}~{#1}} \DeclareFieldFormat[jurisdiction]{nameaddon}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx index 7ace25d7f70..07e86deea4c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.bbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] @@ -22,7 +22,7 @@ \AtBeginShorthands{% \togglefalse{bbx:annotation}% - \DeclareCiteCommand{\bbx@crossref@inbook}% +\DeclareCiteCommand{\bbx@crossref@inbook}% {}% {\iffieldundef{shorthand}% {\usebibmacro{inbook:full}}% @@ -62,11 +62,10 @@ \iffieldundef{nameaddon}{}% {\setunit{\addspace}% \printtext[brackets]{\printfield{nameaddon}}}% -\setunit{\addcomma\space}% -\usebibmacro{bbx:savehash}}% - \usebibmacro{authorstrg}}% + \setunit{\addcomma\space}% + \usebibmacro{bbx:savehash}}% + \usebibmacro{authorstrg}}% {\global\undef\bbx@lasthash}}% - \renewbibmacro*{editor}{% \usebibmacro{bbx:editor}{editorstrg}}% \renewbibmacro*{editor+others}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx index 8613af82194..ad20510bbc7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{philosophy-verbose.cbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] @@ -60,10 +60,7 @@ \DeclareNameFormat{labelname}{% \iftoggle{cbx:scauthorscite}{% \iffootnote{% - \let\mkbibnamefamily\mkbibsc% - \let\mkbibnamegiven\mkbibsc% - \let\mkbibnameprefix\mkbibsc% - \let\mkbibnamesuffix\mkbibsc}{}}{}% + \usebibmacro{scswitch}}{}}{}% \nameparts{#1}% \bibhyperref{\ifcase\value{uniquename}% \usebibmacro{name:family}% @@ -93,11 +90,7 @@ \usebibmacro{name:andothers}}}% }% \DeclareNameFormat{scdefault}{% -\iffootnote{% - \let\mkbibnamefamily\mkbibsc% - \let\mkbibnamegiven\mkbibsc% - \let\mkbibnameprefix\mkbibsc% - \let\mkbibnamesuffix\mkbibsc}{}% +\iffootnote{\usebibmacro{scswitch}}{}% \nameparts{#1}% \ifgiveninits {\usebibmacro{name:given-family}% diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx index 0b1afef96fc..6b91a7064e6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx @@ -13,7 +13,7 @@ %% License information appended %% \ProvidesFile{spanish-philosophy.lbx} -[2017/03/17 v1.9.3 A set of styles for biblatex] +[2017/03/21 v1.9.4 A set of styles for biblatex] -- cgit v1.2.3