summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-21 22:05:20 +0000
committerKarl Berry <karl@freefriends.org>2017-03-21 22:05:20 +0000
commita5ec2bc0778f41c07111f6dece696bcf6947ca26 (patch)
tree3181eb26807ea654f714a43e59e7625fb7aa759b /Master
parentb42263b83b7eba7a3c1bf2b0cdeedc868dce59c1 (diff)
biblatex-philosophy (21mar17)
git-svn-id: svn://tug.org/texlive/trunk@43569 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdfbin795986 -> 808756 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zipbin11442 -> 11442 bytes
-rw-r--r--Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx599
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx138
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx66
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx110
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx139
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx2
13 files changed, 785 insertions, 299 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
index 866ff3733ac..6a2de98747a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
index 5aa343692d7..86bcbb92118 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
Binary files differ
diff --git a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
index 8b0fed14b56..f1006408bc9 100644
--- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
+++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
@@ -98,7 +98,7 @@ This work has the LPPL maintenance status "author-maintained".
%<english-lbx>\ProvidesFile{english-philosophy.lbx}
%<spanish-lbx>\ProvidesFile{spanish-philosophy.lbx}
%<*standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-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]
%</standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx>
%<*driver>
\documentclass[10pt]{ltxdoc}
@@ -261,7 +261,7 @@ This work has the LPPL maintenance status "author-maintained".
%</driver>
% \fi
%
-% \CheckSum{3847}
+% \CheckSum{4317}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -279,6 +279,7 @@ This work has the LPPL maintenance status "author-maintained".
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+% \changes{v1.9.4}{2017/03/21}{Fixed some bugs in modern style.}
% \changes{v1.9.3}{2017/03/17}{Maintenance release. Reset \file{philosophy-verbose.cbx} to version 1.9. Moved \texttt{labelname} format from \file{philosophy-standard.bbx} to \file{philosophy-classic.cbx}.}
% \changes{v1.9.2}{2017/03/14}{Support for \texttt{multivolume} related type. The \texttt{origed} string is substituted with \texttt{origpubas} (redefined for Italiana and Spanish). New string \texttt{opcited}. Deleted \texttt{cited} string. New multi-value option \opt{scauthors} substitutes \opt{scauthorcite} and \opt{scauthorbib} options. Updated documentation.}
% \changes{v1.9.1}{2017/02/16}{Redefined macros for the eechanism. Support for the \bibtype{set} entries. Support for the \opt{origpubin} and \opt{origpubas} default related types. Improved \texttt{.lbx} files. Updated documentation.}
@@ -1258,8 +1259,8 @@ This work has the LPPL maintenance status "author-maintained".
% \subsubsection{Initial settings}
%
% Biber is the default bibliography processor for \sty{biblatex} since version.
-% The \sty{philosophy} styles could work without Biber but it is required because
-% it offers many intersting functionalities. The \opt{backend=bibtex} or \opt{backend=bibtex8}
+% The \sty{philosophy} styles could work without Biber (excluding the experimental \bibtype{jurisprudence} driver)
+% but it is required because it offers many useful functionalities. The \opt{backend=bibtex} or \opt{backend=bibtex8}
% produce an error message.
% \begin{macrocode}
\RequireBiber[3]
@@ -1285,9 +1286,8 @@ This work has the LPPL maintenance status "author-maintained".
\DeclareLanguageMapping{english}{english-philosophy}
\DeclareLanguageMapping{spanish}{spanish-philosophy}
% \end{macrocode}
-% \paragraph{Boolean options}
-% The boolean options can have two value: true or false.
-% Giving the options without the value is just like giving
+% The boolean options can have two values: true or false. The boolean options are to true by default.
+% This means that giving the options without the value is just like giving
% \opt{<option>=true.}
% \begin{macrocode}
\newtoggle{bbx:annotation}
@@ -1309,12 +1309,11 @@ This work has the LPPL maintenance status "author-maintained".
\DeclareBibliographyOption{shorthandintro}[true]{%
\settoggle{cbx:shorthandintro}{#1}}
% \end{macrocode}
-% \paragraph{Multi-value options}
-% Also the multi-value options have a default value, which is declare
-% in the optional argumento of the commands below, between brackets.
+% Also the multi-value options have a default value, which is declared
+% in the optional bracketed argument of the \cmd{DeclareBibliographyOption} commands below.
% For example, the new \opt{scauthors} option is now multi-value and defaults to \opt{all}.
% So \opt{scauthors=all} is the same of \opt{scauthors}. In this way this option
-% works exactly like the old \opt{scauthors} boolean option that has been erased.
+% works exactly like the old \opt{scauthors} boolean option that for this reason has been erased.
% \begin{macrocode}
\newcommand{\bbx@publocformat}{}
\newcommand{\bbx@volnumformat}{}
@@ -1355,12 +1354,6 @@ This work has the LPPL maintenance status "author-maintained".
% At the moment I do no why.
% \begin{macrocode}
\ExecuteBibliographyOptions{%
-% lowscauthors = false,
-% annotation = false,
-% scauthorsbib = false,
-% scauthorscite = false,
-% inbeforejournal = false,
-% classical = false,
publocformat = publocyear,
origfieldsformat = semicolon,
volnumformat = plain,
@@ -1407,23 +1400,12 @@ This work has the LPPL maintenance status "author-maintained".
\toggletrue{cbx:scauthorscite}%
}%
{}%
-\iftoggle{bbx:lowscauthors}%
- {\newrobustcmd*{\mkbibsc}[1]{\textsc{\MakeLowercase{#1}}}}%
- {\newrobustcmd*{\mkbibsc}[1]{\textsc{#1}}}%
-%\iftoggle{bbx:scauthors}{%
-% \toggletrue{bbx:scauthorsbib}%
-% \toggletrue{cbx:scauthorscite}}%
-%{}
}
% \end{macrocode}
% With the \opt{scauthors=cite} option all the citations are printed in small caps.
% Anyway we do not like small caps inside the bibliography so we deactivate this option at the beginning of the bibliography.
% \begin{macrocode}
\AtBeginBibliography{\togglefalse{cbx:scauthorscite}}%
-% \renewcommand*{\mkbibnamefamily}[1]{\iftoggle{bbx:scauthorsbib}{\mkbibsc{#1}}{#1}}%
-% \renewcommand*{\mkbibnamegiven}[1]{\iftoggle{bbx:scauthorsbib}{\mkbibsc{#1}}{#1}}%
-% \renewcommand*{\mkbibnameprefix}[1]{\iftoggle{bbx:scauthorsbib}{\mkbibsc{#1}}{#1}}%
-% \renewcommand*{\mkbibnamesuffix}[1]{\iftoggle{bbx:scauthorsbib}{\mkbibsc{#1}}{#1}}%
% \end{macrocode}
%
% \subsubsection{New commands}
@@ -1469,20 +1451,29 @@ This work has the LPPL maintenance status "author-maintained".
\expandafter\editionfont%
\expandafter{\romannumeral#1}%
\endgroup}
+\newrobustcmd*{\mkbibsc}[1]{%
+ \iftoggle{bbx:lowscauthors}{%
+ \textsc{\MakeLowercase{#1}}}%
+ {\textsc{#1}}}
% \end{macrocode}
%
% \subsubsection{Names format}
%
-% The font switching is declared inside \texttt{sortname}
-% because the \opt{scauthors=bib} option has to be active only for the
-% names at the beginning of the entry.
+% First we define a macro to be used in the \cmd{DeclareNameFormat} specifications. The macro simply maps the \cmd{mkbibname*} commands the new \cmd{mkbibsc} command defined above.
+% \begin{macrocode}
+\newbibmacro*{scswitch}{%
+ \let\mkbibnamefamily\mkbibsc%
+ \let\mkbibnamegiven\mkbibsc%
+ \let\mkbibnameprefix\mkbibsc%
+ \let\mkbibnamesuffix\mkbibsc}
+% \end{macrocode}
+% Note that the font switching is declared inside \texttt{sortname}
+% because the \opt{scauthors=bib} option has to be active
+% only for the names at the beginning of the entry.
% \begin{macrocode}
\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
@@ -1906,7 +1897,6 @@ This work has the LPPL maintenance status "author-maintained".
{}%
{}%
\renewbibmacro*{related:default}[1]{%
-% \togglefalse{cbx:scauthorscite}%
\togglefalse{bbx:annotation}%
\ifboolexpr{
test {\iffieldundef{relatedtype}}
@@ -1935,6 +1925,68 @@ This work has the LPPL maintenance status "author-maintained".
\usebibmacro{related:init}%
\usebibmacro{related}}{}}
% \end{macrocode}
+% The macros below will be used in the \bibtype{inbook}, \bibtype{incollection} and \bibtype{inproceedings} entries.
+% First of all we reset the order name/surname in the inbook:full entries
+% \begin{macrocode}
+\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}}
+% \end{macrocode}
% \paragraph{Backward compatibility}
% The \opt{orig*} macros are deprecated. The same feature is now
% supported using the \opt{related} field.
@@ -2222,7 +2274,6 @@ This work has the LPPL maintenance status "author-maintained".
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inbook}{%
-%\togglefalse{cbx:scauthorscite}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator+others}%
@@ -2281,7 +2332,6 @@ This work has the LPPL maintenance status "author-maintained".
\usebibmacro{finentry}}
\DeclareBibliographyDriver{incollection}{%
-%\togglefalse{cbx:scauthorscite}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator+others}%
@@ -2338,7 +2388,6 @@ This work has the LPPL maintenance status "author-maintained".
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inproceedings}{%
-%\togglefalse{cbx:scauthorscite}%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator+others}%
@@ -2720,76 +2769,10 @@ This work has the LPPL maintenance status "author-maintained".
\restorefield{annotation}{\@phil@nnote}%
\usebibmacro{pageref}%
\usebibmacro{finentry}}
-
-% reset order name/surname in the inbook:full entries
-\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}}
% \end{macrocode}
% \paragraph{Experimental drivers for jurisprudence}
% This feature is available for now only for Italian documents.
% \begin{macrocode}
-%\DeclareFieldFormat[jurisprudence]{title}{#1}
-%\DeclareFieldFormat[jurisprudence]{pages}{#1}
-%\ExecuteBibliographyOptions[jurisprudence]{skipbib=true}%
\DeclareFieldFormat[jurisdiction]{volume}{\RN{#1}}
\DeclareFieldFormat[jurisdiction]{number}{\bibsstring{number}~{#1}}
\DeclareFieldFormat[jurisdiction]{nameaddon}{%
@@ -3069,7 +3052,6 @@ This work has the LPPL maintenance status "author-maintained".
\AtEveryBibitem{%
\iffieldequalstr{entrysubtype}{classic}{%
\togglefalse{bbx:nodate}}}%
-
% \end{macrocode}
% \subsubsection{New macros}
%
@@ -3163,6 +3145,70 @@ This work has the LPPL maintenance status "author-maintained".
\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}}%
+% \end{macrocode}
+% Experimental in version 1.9.4. The \texttt{translatorstrg} and \texttt{translator+othersstrg} macros do not use the
+% \texttt{editortype} format so we add it for consistency with \texttt{editorstrg} and \texttt{editor+othersstrg}
+% from \file{biblatex.def}. The idea behind this feature is that in this way you can change the format of the editor, translator, etc.
+% following the year label simply with \cmd{DeclareFieldFormat}. See the documentation for details.
+% \begin{macrocode}
+\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}}}
% \end{macrocode}
% \subsubsection{Crossreferences}
% \begin{macrocode}
@@ -3178,7 +3224,6 @@ This work has the LPPL maintenance status "author-maintained".
\usebibmacro{date+extrayear}}%
{}%
{}%
-
\DeclareCiteCommand{\bbx@crossref@incollection}%
{}%
{\usebibmacro{citeindex}%
@@ -3200,9 +3245,7 @@ This work has the LPPL maintenance status "author-maintained".
\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}}{}}%
% \end{macrocode}
% \iffalse
%</classic-bbx>
@@ -3238,13 +3281,20 @@ This work has the LPPL maintenance status "author-maintained".
\iftoggle{bbx:yearleft}{%
\setlength{\yeartitle}{\fill}}%
{}}
-
+% \end{macrocode}
+% The \cmd{postsep} command is the ``core'' of the modern style.
+% It simply creates a new line after author (or editor, label or title)
+% and add a vertical space set by \cmd{postnamesep}.
+% \begin{macrocode}
\newcommand{\postsep}{\par\nobreak\vskip\postnamesep%
\hskip-\bibhang\ignorespaces}
\renewcommand{\labelnamepunct}{}
-
+% \end{macrocode}
+% In the list of shorthands we restore the classic style
+% resetting \cmd{postsep} and \cmd{labelnamepunct}.
+% \begin{macrocode}
\AtBeginShorthands{%
-\renewcommand{\postsep}{\addspace}%
+\renewcommand{\postsep}{}%\addspace in version 1.9.3
\renewcommand{\labelnamepunct}{\newunitpunct}}
% \end{macrocode}
% \subsubsection{New macros}
@@ -3264,15 +3314,18 @@ This work has the LPPL maintenance status "author-maintained".
\midsentence\bibstring{nodate}}}{}}%
{\printtext{\printdateextra}}%
\hskip\yeartitle}}%
+% \end{macrocode}
+% After the date we want no punctuation. This is useful for entries without
+% an author or an editor such as \bibtype{periodical} or \bibtype{online}.
+% \begin{macrocode}
+ \nopunct%
\endgroup}%
-
-\renewbibmacro*{labeltitle}{%
- \iffieldundef{label}%
- {\iffieldundef{shorttitle}%
- {\printfield{title}\clearfield{title}}%
- {\printfield[title]{shorttitle}}}%
- {\printtext{\printfield{label}}%
-\postsep}}
+%\renewbibmacro*{labeltitle}{%no more needed from v.1.9.4?
+% \iffieldundef{label}%
+% {\iffieldundef{shorttitle}%
+% {\printfield{title}\clearfield{title}}%
+% {\printfield[title]{shorttitle}}}%
+% {\printtext{\printfield{label}}}}
% \end{macrocode}
% \paragraph{Authors and editors}
% \begin{macrocode}
@@ -3296,31 +3349,101 @@ This work has the LPPL maintenance status "author-maintained".
\postsep}}%
{\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
+ \postsep%
\setunit*{\addspace}}%
- \usebibmacro{date+extrayear}}%
-
+ \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}%
+% \postsep%ADD
+% \usebibmacro{bbx:savehash}}}%
+% {\global\undef\bbx@lasthash%
+% \usebibmacro{labeltitle}%
+% \postsep%
+% }%
+% \usebibmacro{date+extrayear}%
+% \iffieldundef{label}%
+% {\usebibmacro{#1}%
+% \clearname{editor}%
+% \printtext{\addcomma\space}}{}}%
\renewbibmacro*{bbx:editor}[1]{%
- \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{date+extrayear}%
- \iffieldundef{label}%
- {\usebibmacro{#1}%
- \clearname{editor}%
- \printtext{\addcomma\space}}{}}%
+ \ifboolexpr{%
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }%
+ {\usebibmacro{bbx:dashcheck}%
+ {}%
+ {\printnames{editor}%
+ \postsep%ADD
+ \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}}}%
+% {\global\undef\bbx@lasthash%
+% \usebibmacro{labeltitle}%
+% \postsep%
+% }%
+% \usebibmacro{date+extrayear}%
+% \iffieldundef{label}%
+% {\usebibmacro{#1}%
+% \clearname{translator}%
+% \printtext{\addcomma\space}}{}}%
+\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}%
+ \usebibmacro{#1}%
+ \clearname{translator}%
+ \printtext{\addcomma\space}%
+ }%
+ {\global\undef\bbx@lasthash%
+ \usebibmacro{labeltitle}%
+ \postsep%
+ \usebibmacro{date+extrayear}%
+ }%
+}%
% \end{macrocode}
% \subsubsection{Crossreferences}
% \begin{macrocode}
@@ -3336,7 +3459,6 @@ This work has the LPPL maintenance status "author-maintained".
\usebibmacro{classic:date+extrayear}}%
{}%
{}%
-
\DeclareCiteCommand{\bbx@crossref@incollection}%
{}%
{\usebibmacro{citeindex}%
@@ -3349,7 +3471,6 @@ This work has the LPPL maintenance status "author-maintained".
\usebibmacro{classic:date+extrayear}}%
{}%
{}%
-
\newbibmacro*{classic:date+extrayear}{%
\begingroup%
\clearfield{month}%
@@ -3405,7 +3526,7 @@ This work has the LPPL maintenance status "author-maintained".
\iffieldundef{authortype}%
{}%
{\usebibmacro{authorstrg}%
-\setunit{\addspace}}}%
+ \setunit{\addspace}}}%
{\global\undef\bbx@lasthash%
\usebibmacro{labeltitle}%
\setunit*{\addspace}}%
@@ -3432,13 +3553,35 @@ This work has the LPPL maintenance status "author-maintained".
\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}}%
+%\renewbibmacro*{labeltitle}{%
+% \iffieldundef{label}%
+% {\iffieldundef{shorttitle}%
+% {\printfield{title}%
+% \clearfield{title}}%
+% {\printfield[title]{shorttitle}}}%
+% {\printfield{label}}}%
}{}}%
% \end{macrocode}
% \iffalse
@@ -3466,7 +3609,7 @@ This work has the LPPL maintenance status "author-maintained".
% In the list of shorthands we always use the shorthand
% for the cross-referenced entries:
% \begin{macrocode}
- \DeclareCiteCommand{\bbx@crossref@inbook}%
+\DeclareCiteCommand{\bbx@crossref@inbook}%
{}%
{\iffieldundef{shorthand}%
{\usebibmacro{inbook:full}}%
@@ -3509,11 +3652,10 @@ This work has the LPPL maintenance status "author-maintained".
\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}{%
@@ -3994,10 +4136,7 @@ This work has the LPPL maintenance status "author-maintained".
\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}%
@@ -4030,11 +4169,7 @@ This work has the LPPL maintenance status "author-maintained".
% The \texttt{scdefauld} name format is used in the \texttt{cite:full} macro below to controll the small caps in the first citation of an antry (full citation).
% \begin{macrocode}
\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}%
@@ -4570,6 +4705,142 @@ This work has the LPPL maintenance status "author-maintained".
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}},
%byreviser = {{rivisto da}{riv\adddotspace da}},% FIXME: missing: UNSURE
byreviewer = {{recensito da}{rec\adddotspace da}},% FIXME: missing: UNSURE
byfounder = {{fondato da}{fond\adddotspace da}},% FIXME: missing
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]