biblatex-philosophy (14apr17)

git-svn-id: svn://tug.org/texlive/trunk@43860 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 2857 insertions, 3477 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 6a2de98747a..d725649b7b4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/biblatex-philosophy.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
index 86bcbb92118..c317ad5f5ce 100644
--- a/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
+++ b/Master/texmf-dist/doc/latex/biblatex-philosophy/examples.zip
diff --git a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.bib b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.bib
index f4b7c82d87a..58596c578fc 100644
--- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.bib
+++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.bib
@@ -15,102 +15,30 @@
 
 
 
-
-@INCOLLECTION{Degani:2009,
-  author = {Marta Degani and Elisabetta Adami and Anna Belladelli},
-  title = {The Use of Modal Verbs in Interpersonal Contexts: From Semantics
-  to Pragmatics},
-  pages = {13-54},
-  crossref = {Facchinetti:2009},
-  date-added = {2009-12-15 16:50:20 +0100},
-  date-modified = {2009-12-18 18:10:12 +0100},
-  keywords = {esempio}
-}
-
-@INCOLLECTION{Facchinetti:2009a,
-  author = {Roberta Facchinetti},
-  title = {Subjectivity, (non-)subjectivity and intersubjectivity},
-  volume = {3},
-  pages = {35-44},
-  note = {Note},
-  crossref = {Facchinetti:2009},
-  date-added = {2009-12-15 16:47:44 +0100},
-  date-modified = {2012-04-15 17:05:04 +0200},
-  keywords = {esempio}
-}
-
-@INCOLLECTION{Rossitto:1977,
-  author = {Cristina Rossitto},
-  title = {Opposizione e non contraddizione nella \emph{Metafisica} di Aristotele},
-  pages = {43-69},
-  annote = {Note that the \texttt{@collection} data (inherited from the \texttt{crossref}
-  field) are printed inside the \texttt{@incollection} entry because
-  this is the the only \texttt{@incollection} cited from that \texttt{@collection}},
-  crossref = {Berti:1977},
-  date-added = {2009-09-29 11:29:32 +0200},
-  date-modified = {2013-03-15 16:49:38 +0100},
-  hyphenation = {italian},
-  keywords = {esempio}
-}
-
 @INCOLLECTION{Termini:2007,
   author = {Settimo Termini},
   title = {Vita morte e miracoli di Alan Mathison Turing},
   crossref = {Bartocci:2007},
   date-added = {2009-10-22 14:36:21 +0200},
   date-modified = {2013-03-15 16:53:58 +0100},
+  keywords= {esempio},
   hyphenation = {italian},
-  keywords = {esempio}
-}
-
-@INBOOK{Spencer:1891b,
-  pages = {74-144},
-  title = {The Classification of the Sciences},
-  volume = {2},
-  booktitle = {Scientific, Political, \& Speculative},
-  crossref = {Spencer:1891vol2}
+  annotation = {This entry includes all the informations of the parent \texttt{collection} linked through the \texttt{crossref} field}
 }
 
-@BOOK{aristotle:physics,
-  title = {Physics},
-  publisher = {G. P. Putnam},
+@BOOK{aristotle:ethics,
+  title = {Nichomachean Ethics},
+  publisher = {J. Hall \& Son},
   author = {Aristotle},
-  annotation = {A \texttt{book} entry with a \texttt{translator} field},
-  booktitle = {Physics},
-  date = {1929},
-  date-added = {2013-03-15 14:22:45 +0100},
-  date-modified = {2013-03-15 15:26:26 +0100},
+  annotation = {A \texttt{book} entry with a \texttt{translator} field. Note also the \texttt{entrysubtype} field which is set to \texttt{classic}},
+  booktitle = {Nichomachean Ethics},
+  date = {1872},
   entrysubtype = {classic},
   hyphenation = {american},
-  keywords = {primary,esempio},
-  location = {New York},
-  shorttitle = {Physics},
-  translator = {Wicksteed, P. H. and Cornford, F. M.}
-}
-
-@INCOLLECTION{berto:sep-impossible-worlds,
-  author = {Berto, Francesco},
-  title = {Impossible Worlds},
-  booktitle = {The Stanford Encyclopedia of Philosophy},
-  editor = {Edward N. Zalta},
-  edition = {Fall 2009},
-  annote = {An article published in a online ecnyclopedia},
-  date = {2009},
-  date-modified = {2013-03-15 16:29:59 +0100},
   keywords = {esempio},
-  url = {http://plato.stanford.edu/archives/fall2009/entries/impossible-worlds/}
-}
-
-@BOOK{Bringhurst:1992,
-  title = {The Elements of Typographic Style},
-  publisher = {Hartley \& Marks Publisher Inc.},
-  author = {Robert Bringhurst},
-  booktitle = {The Elements of Typographic Style},
-  date = {1991},
-  date-added = {2012-04-19 20:54:38 +0200},
-  date-modified = {2013-03-13 23:30:27 +0100},
-  keywords = {esempio},
-  location = {Vancouver, Canada}
+  location = {London},
+  shorttitle = {Nich\adddotspace Ethics},
+  translator = {F. A. Paley, F. M.}
 }
 
 @ONLINE{clawson:mla,
@@ -133,65 +61,6 @@
   version = {0.95}
 }
 
-@BOOKINBOOK{descartes:discours,
-  annote = {A book published in a multivolume critical edition},
-  author = {René Descartes},
-  date = {1897/1913},
-  date-added = {2010-03-06 00:26:39 +0100},
-  date-modified = {2013-03-15 16:36:37 +0100},
-  editor = {Charles Adam and Paul Tannery},
-  keywords = {esempio},
-  location = {Paris},
-  maintitle = {Ouvres de Descartes},
-  pages = {1-78},
-  title = {Discours de la méthode},
-  volume = {6},
-  volumes = {12}
-}
-
-@mvbook{descartes:oeuvres,
-  annote = {A critical multivolume edition},
-  author = {René Descartes},
-  date = {1897/},
-  date-added = {2013-02-25 22:44:19 +0100},
-  date-modified = {2013-03-15 16:36:58 +0100},
-  editor = {Charles Adam and Paul Tannery},
-  hyphenation = {french},
-  keywords = {esempio},
-  location = {Paris},
-  title = {Oeuvres complètes},
-  volumes = {13}
-}
-
-@BOOK{eco:2004,
-  title = {La ricerca della lingua perfetta nella cultura europea},
-  publisher = {Laterza},
-  author = {Umberto Eco},
-  edition = {4},
-  booktitle = {La ricerca della lingua perfetta nella cultura europea},
-  date = {2004},
-  date-added = {2012-04-17 23:58:31 +0200},
-  date-modified = {2012-04-21 16:58:15 +0200},
-  hyphenation = {italian},
-  keywords = {primaria},
-  location = {Roma-Bari},
-  shorttitle = {La ricerca della lingua perfetta}
-}
-
-@BOOK{Frege,
-  title = {Die Grundlagen der Arithmetik},
-  publisher = {Meiner},
-  author = {Frege, Gottlob},
-  address = {Hamburg},
-  annote = {Note the \texttt{pagination} field, used to change the string preceding
-  the \texttt{postnote} argument of the citation commands},
-  date = {1988},
-  date-modified = {2013-03-15 16:40:09 +0100},
-  keywords = {esempio},
-  pagination = {line},
-  subtitle = {Eine logisch mathematische Untersuchung über den Begriff der Zahl}
-}
-
 @ONLINE{glibof:historian,
   annote = {The files \texttt{historian.bbx}, \texttt{historian.cbx}, and \texttt{historian.lbx} im-
     plement a bibliography and citation style for use with Philipp Lehman’s
@@ -248,52 +117,6 @@
   location = {Tübingen}
 }
 
-@BOOKINBOOK{kant:kpv,
-  annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is
-  an \texttt{inbook} entry which explicitly refers to the \emph{Critique
-  of Practical Reason} only, not to the entire fifth volume. Note the
-  \texttt{author} and \texttt{bookauthor} fields in the database file.
-  By default, the \texttt{bookauthor} is omitted if the values of the
-  \texttt{author} and \texttt{bookauthor} fields are identical},
-  author = {Kant, Immanuel},
-  bookauthor = {Kant, Immanuel},
-  booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
-  date = {1968},
-  date-added = {2013-02-28 09:42:31 +0100},
-  date-modified = {2013-03-13 22:56:41 +0100},
-  hyphenation = {german},
-  keywords = {esempio},
-  location = {Berlin},
-  maintitle = {Kants Werke. Akademie Textausgabe},
-  pages = {1-163},
-  publisher = {Walter de Gruyter},
-  shorthand = {KpV},
-  shorttitle = {Kritik der praktischen Vernunft},
-  title = {Kritik der praktischen Vernunft},
-  volume = {5}
-}
-
-@BOOKINBOOK{kant:ku,
-  annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is
-  an \texttt{inbook} entry which explicitly refers to the \emph{Critique
-  of Judgment} only, not to the entire fifth volume},
-  author = {Kant, Immanuel},
-  bookauthor = {Kant, Immanuel},
-  booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
-  date = {1968},
-  date-added = {2013-02-25 22:44:19 +0100},
-  date-modified = {2013-03-13 22:57:07 +0100},
-  hyphenation = {german},
-  keywords = {esempio},
-  location = {Berlin},
-  maintitle = {Kants Werke. Akademie Textausgabe},
-  pages = {165-485},
-  publisher = {Walter de Gruyter},
-  shorthand = {KU},
-  title = {Kritik der Urtheilskraft},
-  volume = {5}
-}
-
 @BOOKINBOOK{kant:kpv:xref,
   author = {Kant, Immanuel},
   date = {1968},
@@ -301,10 +124,12 @@
   date-modified = {2013-03-15 19:27:33 +0100},
   keywords = {esempio},
   pages = {1-163},
+  shorthand = {KpV},
   shorttitle = {Kritik der praktischen Vernunft},
   title = {Kritik der praktischen Vernunft},
   volume = {5},
-  xref = {kant:werke}
+  xref = {kant:werke},
+  annotation = {A single volume from the critical edition of Kant's (\emph{Kants Werke}). Note the \texttt{xref} field.}
 }
 
 @BOOKINBOOK{kant:ku:xref,
@@ -317,7 +142,8 @@
   pages = {165-485},
   title = {Kritik der Urtheilskraft},
   volume = {5},
-  xref = {kant:werke}
+  xref = {kant:werke},
+  annotation = {A single volume from the critical edition of Kant's (\emph{Kants Werke}). Note the \texttt{xref} field.}
 }
 
 @mvbook{kant:werke,
@@ -327,7 +153,7 @@
   date-added = {2010-03-06 00:26:39 +0100},
   date-modified = {2013-03-15 14:01:45 +0100},
   hyphenation = {german},
-  keywords = {esempio, modern},
+  keywords = {esempio},
   location = {Berlin},
   maintitle = {Kants Werke. Akademie Textausgabe},
   publisher = {Walter de Gruyter},
@@ -336,121 +162,6 @@
   volumes = {9}
 }
 
-@mvbook{knuth:ct,
-  annotation = {A five-volume book cited as a whole. This is a \texttt{book} entry,
-  note the \texttt{volumes} field},
-  author = {Knuth, Donald E.},
-  date = {1984/1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  indexsorttitle = {Computers & Typesetting},
-  location = {Reading, Mass.},
-  publisher = {Addison-Wesley},
-  sorttitle = {Computers & Typesetting},
-  sortyear = {1984-0},
-  title = {Computers \& Typesetting},
-  volumes = {5}
-}
-
-@BOOKINBOOK{knuth:ct:a,
-  annotation = {The first volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields. We want this volume to be listed after
-  the entry referring to the entire five-volume set. Also note the
-  \texttt{indextitle} and \texttt{indexsorttitle} fields. Indexing
-  packages that don't generate robust index entries require some control
-  sequences to be protected from expansion},
-  author = {Knuth, Donald E.},
-  date = {1984},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  indexsorttitle = {The TeXbook},
-  indextitle = {\protect\TeX book, The},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  shorttitle = {\TeX book},
-  sorttitle = {Computers & Typesetting A},
-  sortyear = {1984-1},
-  title = {The \TeX book},
-  volume = {A}
-}
-
-@BOOKINBOOK{knuth:ct:b,
-  annotation = {The second volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields. Also note the \texttt{indexsorttitle}
-  field},
-  author = {Knuth, Donald E.},
-  date = {1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  indexsorttitle = {TeX: The Program},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  shorttitle = {\TeX},
-  sorttitle = {Computers & Typesetting B},
-  sortyear = {1986-1},
-  title = {\TeX: The Program},
-  volume = {B}
-}
-
-@BOOKINBOOK{knuth:ct:c,
-  annotation = {The third volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields as well as the \texttt{indextitle} field},
-  author = {Knuth, Donald E.},
-  date = {1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  indextitle = {METAFONTbook, The},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  shorttitle = {METAFONTbook},
-  sorttitle = {Computers & Typesetting C},
-  sortyear = {1986-2},
-  title = {The METAFONTbook},
-  volume = {C}
-}
-
-@BOOKINBOOK{knuth:ct:d,
-  annotation = {The fourth volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields},
-  author = {Knuth, Donald E.},
-  date = {1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  shorttitle = {METAFONT},
-  sorttitle = {Computers & Typesetting D},
-  sortyear = {1986-3},
-  title = {METAFONT: The Program},
-  volume = {D}
-}
-
-@BOOKINBOOK{knuth:ct:e,
-  annotation = {The fifth volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields},
-  author = {Knuth, Donald E.},
-  date = {1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  sorttitle = {Computers & Typesetting E},
-  sortyear = {1986-4},
-  title = {Computer Modern Typefaces},
-  volume = {E}
-}
-
 @mvbook{comenio:oo,
   annote = {This author is known with his Latin name, given in the \texttt{nameaddon}
   field},
@@ -461,7 +172,7 @@
   date-modified = {2013-03-15 16:32:24 +0100},
   keywords = {esempio},
   location = {Praga},
-  nameaddon = {Comenio},
+  nameaddon = {Comenius},
   title = {Opera Omnia}
 }
 
@@ -535,7 +246,7 @@
 }
 
 @ONLINE{polyglossia,
-  annote = {Polyglossia is a package for facilitating multilingual typesetting with \XeLaTeX{} and
+  annote = {Polyglossia is a package for facilitating multilingual typesetting with Xe\LaTeX{} and
     (at an early stage) Lua\LaTeX. Basically, it can be used as an alternative to babel
     for performing the following tasks automatically:
     1. Loading the appropriate hyphenation patterns.
@@ -558,7 +269,7 @@
   date = {2015-03-25},
   hyphenation = {english},
   keywords = {primaria},
-  title = {Polyglossia: An Alternative to Babel for \XeLaTeX{} and Lua\LaTeX},
+  title = {Polyglossia: An Alternative to Babel for Xe\LaTeX{} and Lua\LaTeX},
   url = {http://mirrors.ctan.org/macros/latex/contrib/babel/babel.pdf},
   version = {1.42.4}
 }
@@ -582,45 +293,6 @@
   version = {5.2a}
 }
 
-@ARTICLE{Moore:1903:ORIGFIELDS,
-  author = {George Edward Moore},
-  title = {The refutation of idealism},
-  pages = {433-453},
-  number = {12},
-  month = {5},
-  annote = {An entry typeset using the depreciated \texttt{orig-} fields mechanism},
-  date = {1903},
-  date-added = {2010-03-06 00:26:39 +0100},
-  date-modified = {2013-03-15 16:43:29 +0100},
-  hyphenation = {english},
-  journaltitle = {Mind},
-  keywords = {esempio},
-  origdate = {1969},
-  origlocation = {Torino},
-  origpublisher = {UTET},
-  origtitle = {La confutazione dell'idealismo},
-  series = {N.S.},
-  usera = {Il Neoempirismo},
-  userb = {a cura di Alberto Pasquinelli},
-  userc = {35-61}
-}
-
-@ARTICLE{Mori:2008,
-  author = {Lapo F. Mori},
-  title = {Gestire la bibliografia con \LaTeX},
-  pages = {37-51},
-  number = {6},
-  month = {10},
-  annote = {An article entry},
-  booktitle = {Gestire la bibliografia con \LaTeX},
-  date = {2008},
-  date-added = {2009-10-13 13:50:34 +0200},
-  date-modified = {2013-03-15 16:43:37 +0100},
-  hyphenation = {italian},
-  journaltitle = {ArsTeXnica},
-  keywords = {primaria}
-}
-
 @BOOK{pantieri:artelatex,
   title = {L'arte di scrivere con \LaTeX},
   author = {Lorenzo Pantieri and Tommaso Gordini},
@@ -690,7 +362,7 @@
   date = {1959},
   date-added = {2013-03-01 17:55:40 +0100},
   date-modified = {2013-03-15 16:48:11 +0100},
-  keywords = {primaria,popper},
+  keywords = {esempio,popper},
   location = {London},
   related = {popper-logik:ita},
   relatedstring={it. trans.},
@@ -706,53 +378,11 @@
   date-added = {2013-03-01 17:50:46 +0100},
   date-modified = {2013-03-15 16:48:21 +0100},
   hyphenation = {italian},
-  keywords = {primaria,popper},
+  keywords = {esempio,popper},
   location = {Torino},
   timestamp = {2012.04.25}
 }
 
-@BOOKINBOOK{Reale1987,
-  address = {Milano},
-  annote = {A book published in a multivolume work. Note the \texttt{titleaddon}
-  field, used for the details about the chapter title},
-  author = {Giovanni Reale},
-  date = {1987},
-  date-modified = {2013-03-15 16:48:31 +0100},
-  edition = {5},
-  hyphenation = {italian},
-  keywords = {esempio},
-  maintitle = {Storia della filosofia antica},
-  pages = {458-493},
-  publisher = {Vita e Pensiero},
-  title = {Dalle origini a Socrate},
-  titleaddon = {Appendice seconda: ``Precisazioni sulle caratteristiche fondamentali
-  del concetto greco di filosofia''},
-  volume = {1}
-}
-
-@mvbook{Spencer:1891,
-  annote = {A multivolume work},
-  author = {Herbert Spencer},
-  date = {1891},
-  date-modified = {2013-03-15 16:53:06 +0100},
-  keywords = {esempio},
-  location = {Edinburgh},
-  publisher = {Williams {and} Norgate},
-  title = {Essays},
-  volumes = {3}
-}
-
-@book{Spencer:1891vol2,
-  author = {Herbert Spencer},
-  date = {1891},
-  keywords = {esempio},
-  location = {Edinburgh},
-  maintitle = {Essays},
-  publisher = {Williams {and} Norgate},
-  title = {Scientific, Political, \& Speculative},
-  volume = {2}
-}
-
 @INCOLLECTION{Valbusa:2007,
   author = {Ivan Valbusa},
   title = {Psicologia e sistema in Alsted e in Wolff},
@@ -788,45 +418,14 @@
   booksubtitle = {Protagonisti del '900 da Hilbert a Wiles},
   booktitle = {Vite matematiche},
   date = {2007},
-  date-added = {2009-10-20 17:17:52 +0200},
-  date-modified = {2013-03-15 16:29:20 +0100},
   editor = {Claudio Bartocci and Renato Betti and Angelo Guerraggio and Roberto
   Lucchetti},
   hyphenation = {italian},
-  keywords = {esempio},
   location = {Milano},
   publisher = {Springer-Verlag Italia},
   title = {Vite matematiche}
 }
 
-@COLLECTION{mate_einaudi:2007,
-  booktitle = {La matematica},
-  date = {2007/2011},
-  date-added = {2012-04-15 17:10:54 +0200},
-  date-modified = {2013-03-13 23:30:00 +0100},
-  editor = {Claudio Bartocci and Piergiorgio Odifreddi},
-  hyphenation = {italian},
-  keywords = {esempio},
-  location = {Torino},
-  publisher = {Einaudi},
-  title = {La matematica},
-  volumes = {4}
-}
-
-@COLLECTION{Berti:1977,
-  annote = {A collection with one author},
-  booktitle = {La contraddizione},
-  date = {1977},
-  date-added = {2009-09-30 19:34:48 +0200},
-  date-modified = {2013-03-15 16:29:45 +0100},
-  editor = {Enrico Berti},
-  hyphenation = {italian},
-  keywords = {esempio},
-  location = {Roma},
-  publisher = {Città Nuova},
-  title = {La contraddizione}
-}
-
 @COLLECTION{Filmed:2009,
   annote = {A collection with four editors. The list is automatically truncated
   in the citations},
@@ -874,77 +473,13 @@
   keywords = {esempio}
 }
 
-@COLLECTION{Pasquinelli:1969,
-  booktitle = {Il Neoempirismo},
-  date = {1969},
-  date-added = {2009-09-27 01:21:58 +0200},
-  date-modified = {2013-03-15 16:44:07 +0100},
-  editor = {Alberto Pasquinelli},
-  hyphenation = {italian},
-  keywords = {esempio},
-  location = {Torino},
-  publisher = {UTET},
-  title = {Il Neoempirismo}
-}
-
-@MVREFERENCE{britannica,
-  annote = {A multivolume encyclopedia. Note the \texttt{useeditor=false} option
-  and \texttt{indextitle} field},
-  booktitle = {The New Encyclopædia Britannica},
-  date = {2003},
-  date-added = {2010-03-10 17:46:47 +0100},
-  date-modified = {2013-03-15 16:31:11 +0100},
-  edition = {15},
-  editor = {Preece, Warren E.},
-  hyphenation = {british},
-  indextitle = {Encyclopædia Britannica, The New},
-  keywords = {esempio},
-  label = {EB},
-  location = {Chicago, Ill.},
-  options = {useeditor=false},
-  publisher = {Encyclopædia Britannica},
-  shorttitle = {Encyclopædia Britannica},
-  sorttitle = {Encyclopædia Britannica},
-  title = {The New Encyclopædia Britannica},
-  volumes = {32}
-}
-
-@COLLECTION{Facchinetti:2009,
-  booktitle = {Studies on English Modality},
-  date = {2009},
-  date-added = {2009-12-15 16:13:17 +0100},
-  date-modified = {2012-04-15 17:02:57 +0200},
-  editor = {Anastasios Tsangalidis and Roberta Facchinetti},
-  keywords = {esempio},
-  location = {Bern},
-  publisher = {Peter Lang},
-  title = {Studies on English Modality}
-}
-
-@REFERENCE{SEP,
-  bdsk-url-1 = {http://plato.stanford.edu/},
-  booktitle = {The Stanford Encyclopedia of Philosophy},
-  date = {2009},
-  date-added = {2010-04-12 14:15:35 +0200},
-  date-modified = {2010-04-12 16:35:03 +0200},
-  editor = {Zalta, Edward N.},
-  keywords = {esempio},
-  label = {SEP},
-  options = {useeditor=false},
-  sorttitle = {Stanford Encyclopedia of Philosophy},
-  title = {The Stanford Encyclopedia of Philosophy},
-  url = {http://plato.stanford.edu/}
-}
-
 @ONLINE{ctan,
-  annote = {Note the \texttt{urldate} field and the \texttt{label} field, used
-  for the citations.},
   bdsk-url-1 = {http://www.ctan.org},
   date = {2006},
   date-added = {2011-06-02 17:33:32 +0200},
   date-modified = {2013-03-15 16:35:26 +0100},
   hyphenation = {american},
-  keywords = {esempio, web},
+  keywords = {web},
   label = {CTAN},
   subtitle = {The Comprehensive TeX Archive Network},
   title = {CTAN},
@@ -953,13 +488,12 @@
 }
 
 @ONLINE{guit:sito,
-  annote = {A Web site},
   bdsk-url-1 = {http://www.guitex.org},
   date = {2012},
   date-added = {2012-04-21 16:52:51 +0200},
   date-modified = {2013-03-15 16:40:18 +0100},
   hyphenation = {italian},
-  keywords = {esempio, web},
+  keywords = {web},
   title = {GuIT. Gruppo degli Utilizzatori Italiani di \TeX},
   url = {http://www.guitex.org},
   urldate = {2012-01-15}
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 f1006408bc9..8f2f310b771 100644
--- a/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
+++ b/Master/texmf-dist/source/latex/biblatex-philosophy/biblatex-philosophy.dtx
@@ -40,6 +40,7 @@ This work has the LPPL maintenance status "author-maintained".
   \file{italian-philosophy.lbx}{\from{biblatex-philosophy.dtx}{italian-lbx}}
   \file{english-philosophy.lbx}{\from{biblatex-philosophy.dtx}{english-lbx}}
   \file{spanish-philosophy.lbx}{\from{biblatex-philosophy.dtx}{spanish-lbx}}
+  \file{french-philosophy.lbx}{\from{biblatex-philosophy.dtx}{french-lbx}}
   \file{biblatex-philosophy.bib}{\from{biblatex-philosophy.dtx}{bib}}
 }
 
@@ -58,6 +59,7 @@ This work has the LPPL maintenance status "author-maintained".
 \Msg{* \space\space italian-philosophy.lbx}
 \Msg{* \space\space english-philosophy.lbx}
 \Msg{* \space\space spanish-philosophy.lbx}
+\Msg{* \space\space french-philosophy.lbx}
 \Msg{*}
 \Msg{*}
 \Msg{* To produce the documentation run}
@@ -97,9 +99,10 @@ This work has the LPPL maintenance status "author-maintained".
 %<italian-lbx>\ProvidesFile{italian-philosophy.lbx}
 %<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/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>
+%<french-lbx>\ProvidesFile{french-philosophy.lbx}
+%<*standard-bbx|classic-bbx|modern-bbx|verbose-bbx|classic-cbx|modern-cbx|verbose-cbx|italian-lbx|english-lbx|spanish-lbx|french-lbx>
+[2017/04/13 v1.9.5 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|french-lbx>
 %<*driver>
 \documentclass[10pt]{ltxdoc}
 \usepackage[T1]{fontenc}
@@ -123,6 +126,9 @@ This work has the LPPL maintenance status "author-maintained".
 \usepackage[style=philosophy-modern,annotation=true]{biblatex}
 \addbibresource{biblatex-philosophy.bib}
 \addbibresource{biblatex-examples.bib}
+\DeclareBibliographyCategory{biblatex}
+\addtocategory{biblatex}{set,stdmodel,matuz:doody,vizedom:related,britannica,gaonkar,jaffe,westfahl:frontier,cms,ctan,jcg,yoon,worman,wilde,westfahl:space,weinberg,wassenberg,vazques-de-parga,springer,spiegelberg,sorace,sigfridsson,shore,sarfraz,salam,reese,pines,piccato,padhye,nussbaum,nietzsche:ksa,nietzsche:ksa1,nietzsche:historie,moraux,moore,moore:related,massa,maron,markey,malinowski,loh,laufenberg,kullback,kullback:reprint,kullback:related,kowalik,knuth:ct,knuth:ct:a,knuth:ct:b,knuth:ct:c,knuth:ct:d,knuth:ct:e,knuth:ct:related,kastenholz,kant:kpv,kant:ku,itzhaki,hyman,murray,iliad,herrmann,hammond,companion,gonzalez,glashow,gillies,gerhardt,vangennep,vangennep:trans,vangennep:related,geer,gaonkar:in,doody,cotton,coleridge,cicero,chiu,brandt,bertram,baez/article,baez/online,averroes/bland,averroes/hannes,averroes/hercz,augustine,aristotle:anima,aristotle:physics,aristotle:poetics,aristotle:rhetoric,angenendt,almendro,aksin}
+
 % layout
 \setcounter{tocdepth}{3}
 \usepackage{geometry}
@@ -130,16 +136,16 @@ This work has the LPPL maintenance status "author-maintained".
 \usepackage{sectsty}
 \allsectionsfont{\sffamily}
 \usepackage{fancyhdr}
-\fancyhf{}
-\fancyhead[L]{© 2009--\the\year\quad Ivan Valbusa}
-\fancyfoot[L]{\textsf{biblatex-philosophy} 
-  \fileversion{} -- \filedate}
-\renewcommand{\footrulewidth}{0.4pt}
-\fancyhead[R]{\thepage}
-\pagestyle{fancy}
+  \fancyhf{}
+  \fancyhead[L]{© 2009--\the\year\quad Ivan Valbusa}
+  \fancyfoot[L]{\textsf{biblatex-philosophy} 
+    \fileversion{} -- \filedate}
+  \renewcommand{\footrulewidth}{0.4pt}
+  \fancyhead[R]{\thepage}
+  \pagestyle{fancy}
 \usepackage[framemethod=TikZ]{mdframed}
-\mdfsetup{roundcorner=3pt,linecolor=olive}
-\usetikzlibrary{shadows}
+  \mdfsetup{roundcorner=3pt,linecolor=olive}
+  \usetikzlibrary{shadows}
 % New commands
 \def\suftesi{\textsf{suftesi}}
 \newcommand{\argstyle}{\itshape}
@@ -164,9 +170,10 @@ This work has the LPPL maintenance status "author-maintained".
 {\begin{mdframed}[backgroundcolor=philA!10,linecolor=white]}
   {\end{mdframed}}
 \newenvironment{bibexamplelist}
-{\begin{mdframed}[backgroundcolor=philA!10,linecolor=white]
-		\list{}{\setlength{\itemindent}{-.5cm}\setlength{\leftmargin}{.5cm}\setlength{\itemsep}{0pt}}}
-	{\endlist\end{mdframed}}
+{\begin{NoHyper}\begin{mdframed}[backgroundcolor=philA!10,linecolor=white]
+    \list{}{\setlength{\itemindent}{-.5cm}\setlength{\leftmargin}{.5cm}\setlength{\itemsep}{0pt}}}
+  {\endlist\end{mdframed}\end{NoHyper}
+}
 
 \makeatletter
 \renewenvironment*{optionlist}
@@ -261,7 +268,7 @@ This work has the LPPL maintenance status "author-maintained".
 %</driver>
 % \fi
 %
-% \CheckSum{4317}
+% \CheckSum{4309}
 %
 % \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,10 +286,11 @@ 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.5}{2017/04/13}{Styles completely revised. Provided support for the \opt{mergedate} default option. \opt{latinemph} option defined globally. New values for \opt{scauthors} option. Support for the \bibtype{set} entries for \sty{modern} style. \opt{classical} option removed for Spanish. Provided experimental French localization module. Improved \opt{annotation} option. Updated documentation.}
+% \changes{v1.9.4}{2017/03/21}{Maintenance release. 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.}
+% \changes{v1.9.1}{2017/02/16}{Redefined macros for the eechanism. Support for the \bibtype{set} entries for \sty{classic} style. Support for the \opt{origpubin} and  \opt{origpubas} default related types. Improved  \texttt{.lbx} files.  Updated documentation.}
 % \changes{v1.9}{2016/11/26}{Redefined \opt{ibidem} and \opt{loccit} strings in file \file{english-philosophy.lbx} according to the Chicago Manual of Style.}
 % \changes{v1.8}{2016/06/16}{Maintenance release. Corrected an incompatibility with \opt{scauthors} option.}
 % \changes{v1.7}{2016/06/10}{Maintenance release. Updated documentation.}
@@ -402,6 +410,7 @@ This work has the LPPL maintenance status "author-maintained".
 %\section*{A brief history}
 %
 %The firs step toward the creation of the \sty{philosophy-modern} style  was the request of Lorenzo Pantieri in the \GuIT{} Forum: \url{http://www.guit.sssup.it/phpbb/viewtopic.php?t=6472} (See the discussion on \url{http://www.guit.sssup.it/phpbb/viewtopic.php?t=6717.}) Now this is the bibliography style of \citetitle{pantieri:artelatex}, the most popular Italian guide to \LaTeX{} \parencite{pantieri:artelatex}. 
+%\nocite{ctan,guit:sito}
 %
 % \smallskip
 %
@@ -418,7 +427,7 @@ This work has the LPPL maintenance status "author-maintained".
 %\cmd{usepackage}\oar{style=philosophy-\meta{style}}\ar{biblatex}\\
 %\mbox{}\quad \cmd{addbibresource}\ar{\meta{bibfile}.bib}
 %\end{ttquote}
-%To uniform the style of quotation marks in multilingual bibliographies typeset using the \opt{babel=other} package option, you can use the \cmd{DeclareQuoteAlias} command. For example:
+%To uniform the style of quotation marks in multilingual bibliographies typeset using the \opt{autolang=other} package option, you can use the \cmd{DeclareQuoteAlias} command. For example:
 %\begin{ttquote}
 %\cmd{DeclareQuoteAlias}\ar{italian}\ar{german}
 %\end{ttquote}
@@ -427,7 +436,7 @@ This work has the LPPL maintenance status "author-maintained".
 %\section{The styles}\label{sec:introduction}
 % This package provides three different styles: a verbose style and two author-year styles. The first simple and trivial characteristic of these style is that they use commas instead of dots to separate the parts of the entry, according to the most common Italian tradition. But they do much more, of course. The other features, some of which are style-dependent, are described in the next sections and can be easily examined looking at the examples at the end of this documentation or typesetting the example files in the \texttt{texmf-dist/doc/latex/biblatex-philosophy/examples.zip} \TeX Live folder. 
 %
-% Note that the multi-authors (editors) entries adopt a very rational criterion for the ordering of the list. Only for the first author (editor) the surname precedes the name while the other authors (editors) are typeset in the form ``Name Surname'' (e.g. ``Eco, Umberto and Gianni Vattimo''). The Italian (academic) writers often see this feature like a sort of inconsistency. Actually it is inconsistent to typeset all the authors in the form ``Surname, Name'' when this is useless.
+% Note that \sty{biblatex} adopts by default a very rational criterion for the ordering of the list of namens in multi-authors/editors entries. Only for the first author/editor the surname precedes the name while the other authors/editors are typeset in the form ``Name Surname'' (e.g. ``Eco, Umberto and Gianni Vattimo''). The Italian (academic) writers often see this feature like a sort of inconsistency. Actually it is inconsistent to typeset all the authors in the form ``Surname, Name'' when this is useless.
 % 
 %\subsection[\sty{philosophy-classic}]{The \sty{philosophy-classic} style}
 %
@@ -435,7 +444,7 @@ This work has the LPPL maintenance status "author-maintained".
 %\begin{bibexample}
 %Knuth (1984, 1986a,b,c,d)
 %\end{bibexample}
-% A \sty{classic} bibliography is shown below. You can change indentation, horizontal and vertical space between entries and  between blocks or groups of entries. The dash can be replaced by the author's label via the \opt{dashed=false} option and you can have brackets in place of parentheses. See the \sty{biblatex} documentation  and section \ref{sec:lengths}.
+% A \sty{classic} bibliography is shown below. You can change indentation, horizontal and vertical space between entries and  between blocks or groups of entries. The dash can be replaced by the author's label via the \opt{dashed=false} option and you can have brackets in place of parentheses as well. See the \sty{biblatex} documentation  and section \ref{sec:lengths}.
 %\begin{bibexamplelist}
 %\item Donald E. Knuth (1984-1986),  \emph{Computers \& Typesetting}, 5 vols., Addison-Wesley.
 %\item ---
@@ -460,7 +469,7 @@ This work has the LPPL maintenance status "author-maintained".
 %    \setlength{\leftmargin}{2cm}
 %    \setlength{\itemsep}{0em}
 %  }
-%  \item \hskip-2cm Donald E. Knuth
+%  \item \hskip-2cm Knuth, Donald E. 
 %  \item[1984/1986]
 %    \emph{Computers \& Typesetting}, 5 vols., Addison-Wesley.
 %  \item[1984]
@@ -471,6 +480,25 @@ This work has the LPPL maintenance status "author-maintained".
 %    \emph{Computers \& Typesetting}, vol. C: \emph{The METAFONTbook}, Addison-Wesley.
 %    \item[1986c]
 %    \emph{Computers \& Typesetting}, vol. D: \emph{METAFONT: The Program}, Addison-Wesley.
+%\item \hskip-2cm Nietzsche, Friedrich
+% \item[1988a] \emph{Sämtliche Werke. Kritische Studienausgabe}, ed. by Giorgio Colli and Mazzino Montinari,
+%2nd ed., 15 vols., Deutscher Taschenbuch-Verlag and Walter de Gruyter, München,
+%Berlin, and New York.
+%\item[1988b] \emph{Sämtliche Werke. Kritische Studienausgabe}, vol. 1: \emph{Die Geburt der Tragödie. Unzeitgemäße
+%Betrachtungen I–IV. Nachgelassene Schriften 1870–1973}, ed. by Giorgio Colli and Mazzino
+%Montinari, 2nd ed., Deutscher Taschenbuch-Verlag and Walter de Gruyter, München,
+%Berlin, and New York.
+%\item[1988c] ``Unzeitgemässe Betrachtungen. Zweites Stück. Vom Nutzen und Nachtheil der Historie
+%für das Leben'', in \emph{Sämtliche Werke. Kritische Studienausgabe}, vol. 1: \emph{Die Geburt der
+%Tragödie. Unzeitgemäße Betrachtungen I–IV. Nachgelassene Schriften 1870–1973}, ed. by
+%Giorgio Colli and Mazzino Montinari, Deutscher Taschenbuch-Verlag and Walter de
+%Gruyter, München, Berlin, and New York, pp. 243-334.
+%\item \hskip-2cm Van Gennep, Arnold
+%\item[1909a] \emph{Les rites de passage}, Nourry, Paris.
+%\item[1909b] \emph{Les rites de passage}, Nourry, Paris; trans. by Monika B. Vizedom and 
+% Gabrielle L. Caffee as \emph{The Rites of Passage} (University of Chicago Press, 1960).
+%\item[1960] The Rites of Passage, trans. from the French by Monika B. Vizedom and Gabrielle 
+% L. Caffee, University of Chicago Press.
 %\endlist
 %    \end{bibexample}
 %  
@@ -478,24 +506,32 @@ This work has the LPPL maintenance status "author-maintained".
 %\subsection[\sty{philosophy-verbose}]{The \sty{philosophy-verbose} style}\label{sec:verbose}
 %
 %This style is aimed for citations given in the footnotes and follows the most popular scheme used in the Italian humanities. It prints a full citation similar to a bibliography entry when an item is cited for the first time, and a short citation afterwards, using the title (possibly shortened in the \bibfield{shorttitle} field), followed by the string ``cit.''.
-%Citing the same entry two times, in the second one the string ``Ivi'' is used; citing the same place of the previous citation you will have ``Ibidem'':
+%Citing the same entry two times, in the second one the string ``Ivi'' (``Ibid.'' for English documents) is used; citing the same place of the previous citation you will have ``Ibidem'' (``Ibid.'' for English documents):
+%\smallskip
+%
+% \textbf{Italian}
 %    \begin{bibexample}
-%        \textsuperscript{1} Cfr. Cartesio, \emph{Discorso sul metodo}, trad. e 
-%        introd. di Lucia Urbani Ulivi, 1\textsuperscript{a} ed., testo francese a fronte, Bompiani, 
-%        Milano 2002, p. 43.\\
+%        \textsuperscript{1} \fullcite{Valbusa:2007}, p. 43\\
 %        \textsuperscript{2} \emph{Ivi}, p. 26. \\
 %        \textsuperscript{3} \emph{Ibidem}. \\
-%        \textsuperscript{4} Settimo Termini, «Vita morte e miracoli di Alan 
-%        Mathison Turing», in \emph{Vite matematiche. Protagonisti del '900 da 
-%        Hilbert a Wiles}, a cura di Claudio Bartocci \emph{et al.}, Springer-Verlag Italia, 
-%        Milano 2007, pp. 59-61.
-%        \textsuperscript{5} Cartesio, \emph{Discorso sul metodo} cit., p. 35.
+%        \textsuperscript{4} \fullcite{heidegger:sz}.\\
+%        \textsuperscript{5} Valbusa, \emph{Psicologia e sistema} cit., p. 35.
+%    \end{bibexample}
+%\smallskip
+%
+% \textbf{English}
+%    \begin{bibexample}
+%        \textsuperscript{1} \fullcite{Poincare:1968-ORIG}, p. 43\\
+%        \textsuperscript{2} \emph{Ibid.}, p. 26. \\
+%        \textsuperscript{3} \emph{Ibid.}. \\
+%        \textsuperscript{4} \fullcite{heidegger:sz}.\\
+%        \textsuperscript{5} Poincaré, \emph{La science et l’hypothèse} cit., p. 35.
 %    \end{bibexample}
 %
 %When there is only one entry for the same author, with the \opt{singletitle=true} option 
 %the string ``op. cit.'' is used instead of the (short) title followed by ``cit.'':%
 %\begin{bibexample}
-%\textsuperscript{6} Cartesio, op. cit., p. 35.
+%\textsuperscript{6} Descartes, op. cit., p. 35.
 %\end{bibexample}
 %
 %All the scholarly abbreviations (\emph{latinitates}) but ``cit.'' are printed by default in normal font. With the \opt{latinemph} option (section \ref{sec:options-verbose}) you can get them in italic shape.
@@ -519,10 +555,10 @@ This work has the LPPL maintenance status "author-maintained".
 %
 %\subsection{Related entries}\label{sec:related}
 %
-%The \sty{philosophy} styles use the mechanism provided by the \bibfield{related} field to typeset complex entries comprising both the original publication data and the translation data \parencite[see][]{Poincare:1968-ORIG}. The related entry is preceded by the \texttt{translationas} string which defaults to ``trad.~it.'' for Italian documents, ``trans.~as'' for English documents and ``trad.~es.'' for Spanish documents. If you want to change it, use the \bibfield{relatedstring} field, like in \textcite{popper-logik} which shows, among others, an entry with cascading relations. 
+%The \sty{philosophy} styles use the mechanism provided by the \bibfield{related} field to typeset complex entries comprising both the original publication data and the translation data \parencite[see][]{Poincare:1968-ORIG}. The related entry is preceded by the \texttt{translationas} string which defaults to ``trad.~it.'', ``trans.~as'', ``trad.~es.'', ``trad.'' for Italian, English, Spanish and French documents, respectively. If you want to change it, use the \bibfield{relatedstring} field, like in \textcite{popper-logik} which shows, among others, an entry with cascading relations. 
 %
 %  \begin{bibexamplelist}
-%\item Jules-Henri Poincaré (1968), \emph{La science et l'hypothèse}, Flammarion, Paris; trans. as \emph{La scienza e l'ipotesi}, ed. by Corrado Sinigaglia, Bompiani, Milano 2003.
+%\item \fullcite{Poincare:1968-ORIG}.
 %  \end{bibexamplelist}
 %
 %\begin{latexcode}
@@ -545,9 +581,7 @@ This work has the LPPL maintenance status "author-maintained".
 %
 %  \end{latexcode}
 %\begin{bibexamplelist}
-%\item Popper, Karl R.(1934), \emph{Logik der Forschung}, Springer, Wien; trans. \emph{The Logic of Scientific Discovery}, 3rd ed.,
-%Hutchinson, London 1959; it. trans. \emph{Logica della scoperta scientifica}, 3rd ed., Einaudi,
-%Torino 1998.
+%\item \fullcite{popper-logik}.
 %\end{bibexamplelist}
 %\begin{latexcode}
 %\begin{verbatim}
@@ -567,7 +601,7 @@ This work has the LPPL maintenance status "author-maintained".
 %  date = {1959},
 %  location = {London},
 %  related = {popper-logik:ita},
-%  relatedstring={it. trans.}}
+%  relatedstring={it\adddotspace trans\adddot}}
 %
 %@book{popper-logik:ita,
 %  title = {Logica della scoperta scientifica},
@@ -584,7 +618,7 @@ This work has the LPPL maintenance status "author-maintained".
 %
 %
 %The \sty{philosophy} styles allow you to manage 
-%entries referring to other entries through the \bibfield{crossref} fields. This is very useful when you have to cite two or more \bibtype{incollection} of the same \bibtype{collection} \parencite[see][]{corrocher:2009,federspil:2009}. In this way the \bibtype{collection} is printed in the bibliography and is cross-referenced inside the \bibtype{incollection}, using the corresponding author-year label (the mechanism is the same for \bibtype{inbook} items).
+%entries referring to other entries via the \bibfield{crossref} fields. This is very useful when you have to cite two or more \bibtype{incollection} of the same \bibtype{collection} \parencite[see][]{corrocher:2009,federspil:2009}. In this way the \bibtype{collection} is printed in the bibliography and is cross-referenced inside the \bibtype{incollection}, using the corresponding author-year label (the mechanism is the same for \bibtype{inbook} items).
 %\begin{bibexamplelist}
 %\item Corrocher, Roberto (2009) “Riflessioni sull’uomo di fronte a nuove sfide”, in Giaretta et al. (2009), pp. 27-42.
 %\item Federspil, Giovanni and Roberto Vettor (2009), “Medicina: un unico metodo e una sola argomentazione?”, in Giaretta et al. (2009), pp. 43-74.
@@ -623,7 +657,7 @@ This work has the LPPL maintenance status "author-maintained".
 % \noindent 1. use the \bibfield{crossref} field  \parencite[see][]{Termini:2007}. In this case all the  \bibtype{collection} data are automatically printed inside 
 % the \bibtype{incollection} entry:
 %\begin{bibexamplelist}
-%\item Termini, Settimo (2007), “Vita morte e miracoli di Alan Mathison Turing”, in \emph{Vite matematiche. Protagonisti del ’900 da Hilbert a Wiles}, ed. by Claudio Bartocci, Renato Betti, Angelo Guerraggio, and Roberto Lucchetti, Springer-Verlag Italia, Milano.
+%\item \fullcite{Termini:2007}
 %\end{bibexamplelist}
 %\begin{latexcode}
 %\begin{verbatim}
@@ -645,7 +679,7 @@ This work has the LPPL maintenance status "author-maintained".
 %\end{latexcode}
 %  2.  put the \bibtype{collection} data in the fields of the \bibtype{incollection} entry \parencite[see][]{Valbusa:2007}. In this case the \bibtype{incollection} is self-contained:
 % \begin{bibexamplelist}
-%\item Valbusa, Ivan (2007), “Psicologia e sistema in Alsted e in Wolff”, in \emph{Christian Wolff tra psicologia empirica e psicologia razionale}, ed. by Ferdinando Luigi Marcolungo, Georg Olms Verlag, Hildesheim, Zürich, and London.
+%\item \fullcite{Valbusa:2007}
 % \end{bibexamplelist}  
 %\begin{latexcode}
 %\begin{verbatim}
@@ -660,11 +694,11 @@ This work has the LPPL maintenance status "author-maintained".
 %  date = {2007}}
 %\end{verbatim}
 %\end{latexcode}
-%  3. put the \bibtype{collection} data in the fields of the \bibtype{incollection} entry and put the \bibtype{collection} label in the \bibfield{xref} field of the \bibtype{incollection} \parencite[see][]{kant:kpv:xref,kant:ku:xref}:
+%  3. put the \bibtype{collection} data in the fields of the \bibtype{incollection} entry and put the \bibtype{collection} label in the \bibfield{xref} field of the \bibtype{incollection} \parencite[see][]{kant:kpv:xref,kant:ku:xref}\label{kant}:
 % \begin{bibexamplelist}
-%\item Kant, Immanuel (1968a), \emph{Kants Werke. Akademie Textausgabe}, 9 vols., Walter de Gruyter, Berlin.
-%\item --- (1968b), \emph{Kritik der praktischen Vernunft}, in Kant (1968a), vol. 5, pp. 1-163.
-%\item --- (1968d), \emph{Kritik der Urtheilskraft}, in Kant (1968a), vol. 5, pp. 165-485.
+% \item Immanuel Kant (1968a), \emph{Kants Werke. Akademie Textausgabe}, 9 vols., Walter de Gruyter, Berlin
+% \item --- (1968b), \emph{Kritik der praktischen Vernunft}, in Kant (1968a), vol. 5, pp. 1-163
+% \item --- (1968c), \emph{Kritik der Urtheilskraft}, in Kant (1968a), vol. 5, pp. 165-485
 % \end{bibexamplelist}  
 %\begin{latexcode}
 %\begin{verbatim}
@@ -705,8 +739,8 @@ This work has the LPPL maintenance status "author-maintained".
 %
 % The treatment of the classical works and other writings with uncertain or omitted date is not particularly difficult if you use the \sty{verbose} style, but with the \sty{classic} and \sty{modern} styles some difficulties inevitably impose clear choices.
 %
-%If a critical edition exists you should cite it directly, such as  \textcite{heidegger:sz}. If you do not like this anachronistic label you may use the \bibfield{shorthand} field, such as \textcite{kant:kpv}. 
-% Note that a ``shorthand intro'' is automatically printed when the entry is cited for the first time and omitted afterwards.  To turn off this feature load the  option \opt{shorthandintro=false}. Of course in this case you will need a list of shorthands (\cmd{printshorthands} command). If you do not like these solutions you can use the \bibfield{entrysubtype} or the  \cmd{sdcite} command in order to get an author-title citation, such as \cite{aristotle:physics} (see sections \ref{sec:newfields} and \ref{sec:commands:citations}). 
+%If a critical edition exists you should cite it directly, such as  \textcite{heidegger:sz}. If you do not like this anachronistic label you may use the \bibfield{shorthand} field, such as \cite{kant:kpv:xref}. 
+% Note that a ``shorthand intro'' is automatically printed when the entry is cited for the first time (see p. \pageref{kant}) and omitted afterwards.  To turn off this feature load the  option \opt{shorthandintro=false}. Of course in this case you will need a list of shorthands. If you do not like these solutions you can use the \bibfield{entrysubtype} or the  \cmd{sdcite} command in order to get an author-title citation, such as \cite{aristotle:ethics} (see sections \ref{sec:newfields} and \ref{sec:commands:citations}). 
 %
 %\section{New fields}\label{sec:newfields}
 %
@@ -717,14 +751,14 @@ This work has the LPPL maintenance status "author-maintained".
 %An addon to be printed immediately after the author name in the bibliography. 
 %It is useful for those author known with alias, Latinized names, etc. For example \textcite{comenio:oo}:
 %\begin{bibexamplelist}%
-%\item Komensky, Jan Amos \emphasize{[Comenio]} 
+%\item Komensky, Jan Amos \emphasize{[Comenius]} 
 % (1969), \emph{Opera Omnia}, Praga.
 %\end{bibexamplelist}
 %\begin{latexcode}
 %\begin{verbatim}
 %@mvbook{comenio:oo,
 %  author = {Jan Amos Komensky},
-%  nameaddon = {Comenio},
+%  nameaddon = {Comenius},
 %  title = {Opera Omnia}
 %  location = {Praga},
 %  date = {1969}}
@@ -733,13 +767,13 @@ This work has the LPPL maintenance status "author-maintained".
 %
 % \fielditem{entrysubtype}{literal\makebox[0pt][l]{\hspace*{2cm}[\sty{philosophy-classic} and \sty{philosophy-modern} only]}}
 % With the \opt{classic} value the citation commands will produce an 
-% author-title label. This is useful for citing works from classical antiquity, such as \cite{aristotle:physics}.
+% author-title label. This is useful for citing works from classical antiquity, such as \cite{aristotle:ethics}.
 %\begin{latexcode}
 %\begin{verbatim}
-%@book{aristotle:physics,
+%@book{aristotle:ethics,
 %  entrysubtype = {classic},
 %  author       = {Aristotle},
-%  title        = {Physics},
+%  title        = {Nichomachean Ethics},
 %  ...
 % }
 %\end{verbatim}
@@ -770,9 +804,9 @@ This work has the LPPL maintenance status "author-maintained".
 %
 %\fielditem{annotation/annote}{literal} 
 %
-%This field is printed in a new paragraph at the very end of the entry. It requires the \opt{annotation} package option. The default font can be changed  redefining the \cmd{annotationfont} command (section \ref{sec:customization}):
+%This field is printed in a new paragraph at the very end of the entry. It requires the \opt{annotation} option. The default font can be changed  redefining the \cmd{annotationfont} command (section \ref{sec:customization}):
 %\begin{bibexamplelist}
-%\item Lehman, Philipp (2011), \emph{The biblatex package. Programmable Bibliographies and Citations}, version 1.7.\\[.5ex]
+%\item \fullcite{lehman:biblatex}.\\[.5ex]
 %{\footnotesize \emphasize{This package provides advanced bibliographic facilities 
 %  for use with \LaTeX. The package is a complete 
 %  reimplementation of the bibliographic facilities provided 
@@ -926,15 +960,17 @@ This work has the LPPL maintenance status "author-maintained".
 %              \ldots \emph{Book Title}, Publisher, Location 2010\textsuperscript{3}. 
 %          \end{valuelist}
 %
-%\optitem[false]{scauthors}{\opt{cite}, \opt{bib}, \opt{all}, \opt{false}}
-% Prints the names (author, editor, etc.) at the beginning of the entry in small caps shape.
+%\optitem[false]{scauthors}{\opt{bib}, \opt{cite}, \opt{bibcite}, \opt{citefn}, \opt{bibcitefn}, \opt{all}}
+% Prints some (or all) names in small caps shape.
 % If you want \emph{all} the names (translator, commentator, etc.) in small caps, 
 % you have to redefine the \cmd{mkbibname*} commands (see \sty{biblatex} documentation for details).
 %        \begin{valuelist}
-%        \item[all] Small caps both in citations and in bibliography.
-%        \item[bib] Small caps only for the bibliography.
-%        \item[cite] Small caps only for the citations.
-%        \item[false] No small caps.
+%        \item[bib] Small caps only for the names at the beginning of the entry in the bibliography.
+%        \item[cite] Small caps only for the names at the beginning of the entry in the citations.
+%        \item[bibcite] Small caps only for the names at the beginning of the entry both in bibliography and citations.
+%        \item[citefn] Small caps only for the names at the beginning of the entry in the citations inside footnotes.
+%        \item[bibcitefn] Small caps only for the names at the beginning of the entry both in bibliography and citations inside footnotes.
+%        \item[all] Small caps for \emph{all} the names both in bibliography and citations.
 %        \end{valuelist}
 %
 %\boolitem[false]{lowscauthors}
@@ -943,7 +979,7 @@ This work has the LPPL maintenance status "author-maintained".
 %
 %\boolitem[true]{shorthandintro}
 %
-%Prints a language-specific expression such as ``hence-forth cited as \meta{shorthand}'' to introduce shorthands on the first citation. 
+%Prints a language-specific expression such as ``henceforth cited as \meta{shorthand}'' to introduce shorthands on the first citation. 
 %      \begin{bibexample}
 %      Kant (1968a \emphasize{[henceforth cited as KpV]})
 %      \end{bibexample}
@@ -955,16 +991,22 @@ This work has the LPPL maintenance status "author-maintained".
 %Prints the string ``in'' before the \bibfield{journaltitle} in the  \bibtype{article} entries.
 %
 %\boolitem[false]{annotation}
-%Shows the \bibfield{annotation} field, only in the bibliography% (see also section \ref{sec:newfields}). 
+% Shows the \bibfield{annotation} field, only in the bibliography% (see also section \ref{sec:newfields}). 
+% This option can be given globally or on a per-bibliography basis:
+%\begin{latexcode}
+%\begin{verbatim}
+%\printbibliography[annotation=true]
+%\end{verbatim}
+%\end{latexcode}
 %
 %\boolitem[true]{library}
 %Shows the \bibfield{library} field, both in the bibliography and in the citations% (see also section \ref{sec:newfields}). 
 %
 %\boolitem[false]{classical}
 %
-% [only for Italian and Spanish documents] It requires \sty{babel} or \sty{polyglossia}.
-%
+% [Only for Italian documents] It requires \sty{babel} or \sty{polyglossia}.
 % If \opt{true} it doubles the last consonant of the abbreviations such as ``p.'', ``vol.'', ``col.'' etc. when used in the plural form. For example you will have ``p.'' for ``page'' and ``pp.'' for ``pages''. This habit is very common in Italian writings even if it remains useless. 
+%^^A A similar setting is adopted for the default English and Spanish localization modules which, for example, use ``cols.'' for ``columns'' and ``pp'' for ``pages''. 
 % 
 % \end{optionlist}
 %
@@ -979,11 +1021,17 @@ This work has the LPPL maintenance status "author-maintained".
 %
 %
 % \begin{optionlist}
+%
+%\boolitem[false]{latinemph}
+%Prints the \emph{latinitas} ``et al.'' (\emph{et alii}) in italic shape.
+%
+%
 %\boolitem[false]{square}
 %
 %Uses brackets instead of parentheses in the citations and in the author-year label used in the bibliography.
 %
-%\boolitem[true]{nodate} Prints the \texttt{nodate} string when \bibfield{year} or \bibfield{date} is missing.
+%\boolitem[true]{nodate} Prints the \texttt{nodate} string when \bibfield{year} or \bibfield{date} is missing. Yo can set this option globally in the package options or in the optional argument of \cmd{printbibliography}.
+%
 %
 %\boolitem[false]{yearleft}
 %
@@ -991,26 +1039,27 @@ This work has the LPPL maintenance status "author-maintained".
 %
 %Prints the  date flushed left in the bibliography.
 %
+%
 %\boolitem[true]{restoreclassic}
 %
-% [\sty{philosophy-modern} only]
+% [\sty{philosophy-modern}  and \sty{philosophy-classic} only]
 %
-%This option can be given as an optional argument of \cmd{printbibliography}:
+%This option can be given in the optional argument of \cmd{printbibliography}.
+%It restores the \sty{classic} style in a document typeset using  the  \sty{modern} style. It is useful to compose a ``Web List'' like that at the end of this document. For example:
 %\begin{latexcode}
 %\begin{verbatim}
-%\printbibliography[restoreclassic]
+%\printbibliography[restoreclassic,type=online]
 %\end{verbatim}
 %\end{latexcode}
-%It restores the \sty{classic} style in a document typeset using  the  \sty{modern} style. It is useful to compose a ``Web List'' like that at the end of this document (active only for    \sty{philosophy-modern}). 
 %
 % \end{optionlist}
 %
-%\subsubsection[Options for \sty{verbose}]{Options for \sty{philosophy-verbose}}\label{sec:options-verbose}
+%\subsubsection[For \sty{verbose}]{Options for \sty{philosophy-verbose}}\label{sec:options-verbose}
 %
 % \begin{optionlist}
-%\boolitem[false]{latinemph}
-%Prints the \emph{latinitates} ``{ivi}'' and ``{ibidem}'' in italic shape.
 %
+%\boolitem[false]{latinemph}
+%Prints the \emph{latinitates} ``{ivi}'', ``{ibidem}'' and ``et al.'' in italic shape.
 %
 %\boolitem[false]{commacit}
 %Adds a comma at the end of the \bibfield{shorttitle} field when this is followed by the string \emph{cit.}: 
@@ -1024,7 +1073,7 @@ This work has the LPPL maintenance status "author-maintained".
 % Here we introduce the new commands and lenghts provided by \sty{biblatex-philosophy}. The \sty{biblatex} package offers other commands, lenghts and options to modify many aspects of citations and bibliography. See the \sty{biblatex} documentation for details.
 %\subsection{Fonts and punctuation}
 %\begin{ltxsyntax}
-%\cmditem{annotationfont}{code}\hfill default: \cmd{footnotesize}
+%\cmditem{annotationfont} \hfill default: \cmd{footnotesize}
 %
 %The font of the \bibfield{annotation} field. It can be redefined with:
 %\begin{latexcode}
@@ -1033,7 +1082,7 @@ This work has the LPPL maintenance status "author-maintained".
 %\end{verbatim}
 %\end{latexcode}
 %
-%\cmditem{libraryfont}{code}\hfill default: \cmd{normalfont}
+%\cmditem{libraryfont} \hfill default: \cmd{normalfont}
 %
 %The font of the \bibfield{library} field. It can be redefined with:
 %
@@ -1045,7 +1094,7 @@ This work has the LPPL maintenance status "author-maintained".
 %\end{ltxsyntax}
 %
 %\begin{ltxsyntax}
-%\cmditem{volnumpunct}{code}\hfill default: \cmd{addcomma}\cmd{space}
+%\cmditem{volnumpunct} \hfill default: \cmd{addcomma}\cmd{space}
 % 
 %The separator between \bibfield{volume} and \bibfield{number} in \bibtype{article} entries.
 %It can be redefined with:
@@ -1062,8 +1111,18 @@ This work has the LPPL maintenance status "author-maintained".
 %  \ldots\ \emph{Journal Title} (5/8), \ldots \\
 %  \ldots\ \emph{Journal Title} (\textsc{V}/8), \ldots
 %  \end{bibexample}
-%\end{ltxsyntax}
 %
+%\cmditem{editorstrgdelim} \hfill default: \cmd{addspace}
+%
+% The separator to be printed after the \texttt{editorstrg}, \texttt{authorstrg} and \texttt{translatorstrg} strings, 
+% which are enclosed in parentheses by default. If you want omit the parentheses you should also change it as follows:
+%\begin{latexcode}
+%\begin{verbatim}
+%\renewcommand*{\editorstrgdelim}{\addcomma\space}
+%\DeclareFieldFormat{editortype}{#1}% no parentheses
+%\end{verbatim}
+%\end{latexcode}
+%\end{ltxsyntax}
 %
 %\subsection{Lengths}\label{sec:lengths}
 %
@@ -1102,38 +1161,49 @@ This work has the LPPL maintenance status "author-maintained".
 %\end{latexcode}
 %  
 %
+% \subsection{Date and page ranges}
+%
+% These style redefines the \cmd{bibrangedash} and \cmd{bibdaterangesep} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code:
+%\begin{latexcode}
+%\begin{verbatim}
+%\DefineBibliographyExtras{<language>}{%
+%  \protected\def\bibrangedash{%
+%    \textendash\penalty\hyphenpenalty}%
+%  \protected\def\bibdaterangesep{\bibrangedash}}%
+%\end{verbatim}
+%\end{latexcode}
+% For a consistent result you probably have to do this for all the languages loaded by \sty{babel} or \sty{polyglossia}.
+%
 %\subsection[Languages]{Using the styles with other languages}\label{sec:languages}
 %
-% The languages currently supported by this package  are Italian, English and Spanish. In order to use the styles with different languages, you have first of all to declare the new \opt{opcited} string introduced by \sty{biblatex-philosophy}. You can then test the styles and if the default strings provided in the localization module does not match your needs you can re-define them. 
+% The languages currently supported by this package  are Italian, English, Spanish and French. In order to use the styles with different languages, you have first of all to declare the new \opt{opcited} string introduced by \sty{biblatex-philosophy}. You can then test the styles and if the default strings provided in the localization module does not match your needs you can re-define them. 
 %
-%Here is a sample code for using the styles in German documents. Note that we first declare the new string \opt{opcited}, then we define it and inherit the German default strings from \file{german.lbx}. The other strings (\opt{translationas}, \opt{ibidem}, \opt{loccit}, \dots) may be re-defined if the default ones are not satisfying. For example you may prefer ``deut. \"Ubers'' to the default ``\"Ubers unter dem Titel''.
+%Here is a sample code for using the styles in German documents. Note that we first declare the new string \opt{opcited}, then we define it and inherit the German default strings from \file{german.lbx}. The other strings (\opt{translationas}, \opt{ibidem}, \opt{loccit}, \dots) may be re-defined if the default ones are not satisfying. For example you may prefer ``deut. \"Ubers'' to the default ``\"Ubers unter dem Titel''. % Another approach is to use the \cmd{DeclareLanguageMapping} command. See the documentation of the \sty{biblatex} package for details \parencite{lehman:biblatex}.
 %\begin{latexcode}
 %\begin{verbatim}
 %\NewBibliographyString{opcited}
 %\DefineBibliographyStrings{german}{%
 %  inherit       = {german},
 %  opcited       = {op\adddotspace cit\adddot},
-%  translationas = {deut\adddotspace \"Ubers\adddot},% re-defined string
+%  translationas = {deut\adddotspace \"Ubers\adddot},
 %  ...other strings...
 %}
 %\end{verbatim}
 %\end{latexcode}
-% Another approach is to use the \cmd{DeclareLanguageMapping} command. See the documentation of the \sty{biblatex} package for details \parencite{lehman:biblatex}.
 %
-% \subsection{Date and page ranges}
-%
-% These style redefines the \cmd{bibrangedash} and \cmd{bibdatedash} commands in order to get a simple hyphen (-) instead of an en dash (--) in the page and date ranges. If you prefer the en dash use the following code:
+% The French default localization module redefines, among others, the \cmd{mkbibnamefamily} command in order to get the family name in small caps shape. We do not like this approach because an author could use a localization module without adhering to the typographical standards which should be indipendent from the linguistic standards. For this reason we have reset it to the default definition.  If you prefer the \file{french.lbx} choice use this code:
 %\begin{latexcode}
 %\begin{verbatim}
-%\DefineBibliographyExtras{<language>}{%
+%\DefineBibliographyExtras{french}{%
+%  \protected\def\mkbibnamefamily#1{%
+%    \textsc{\textnohyphenation{#1}}}%
 %  \protected\def\bibrangedash{%
-%    \textendash\penalty\hyphenpenalty}%
-%  \protected\def\bibdatedash{\bibrangedash}}%
+%    \textendash\penalty\hyphenpenalty}}%
 %\end{verbatim}
 %\end{latexcode}
-% For a consistent result you probably have to do this for all the languages loaded by \sty{babel} or \sty{polyglossia}.
+%
+%
 % 
-
 %\section{Backward compatibility}
 %
 %Previous versions of the styles provided a different mechanism to manage entries comprising both the original publication data and the translation data. This feature is now deprecated and it is still supported only for backward compatibility. This mechanism uses some special fields and provides specific options.
@@ -1169,8 +1239,8 @@ This work has the LPPL maintenance status "author-maintained".
 %^^ARobert Bringhurst (1992), \emph{The Elements of Typographic Style}, Hartley \& Marks Publisher Inc., Vancouver, Canada; trad. it. \emphasize{\emph{Gli elementi dello stile tipografico}, Sylvestre Bonnard, Milano 2009.}
 %^^A\end{bibexample}
 %
-%^^A \fielditem{reprinttitle}{literal (Bib\TeX only) -- Deprecated --} 
-%
+%\fielditem{reprinttitle}{literal} 
+% The title of a reprint of the work.
 %\fielditem{usera}{literal}\mbox{}\\[-9ex] 
 %\fielditem{origbooktitle}{literal}\mbox{}\\[-9ex]
 %\fielditem{transbooktitle}{literal} 
@@ -1230,20 +1300,43 @@ This work has the LPPL maintenance status "author-maintained".
 %Same as \opt{scauthors=bib}
 %\boolitem[false]{scauthorscite}
 %Same as \opt{scauthors=cite}
+%\boolitem[false]{scauthors}
+%Same as \opt{scauthors=bibcite}
 %\end{optionlist}
 %
+%^^A\section{Known issues}
+%^^A
+%^^A The \cmd{textcite} command has an unexpected behaviour in managing entries with a shorthand defined. Note that \cmd{cite} and \cmd{parencite} prints correctly the shorthand, while \cmd{textcite} prints the name plus the shorthand. Anyway this is a bug (or a feature) of \file{authoryear-comp.cbx}.
+%^^A \begin{description}
+%^^A\item[\cmd{cite}\ar{kant:kpv}] \cite{kant:kpv}
+%^^A\item[\cmd{parecite}\ar{kant:kpv}] \parencite{kant:kpv}
+%^^A\item[\cmd{texcite}\ar{kant:kpv}] \textcite{kant:kpv}
+%^^A\end{description}
+%^^A\smallskip
+%^^A
+%^^A Some spurious spaces could come out in entries without author/editor label such as \cite{jcv}. Note the space preceding ``35''.
+%^^A 
+%
+% \defbibnote{restoreclassic}{\sffamily\small This is the primary bibliography of this document and is typeset in \sty{classic} style (through the \opt{restoreclassic} option) even if the bibliography style of the document is \sty{philosophy-modern}. This is particularly useful for typesetting bibliographies in which there are only one entry for an author, such as the Web lists, as shown below.}
+%
+% \defbibnote{weblist}{\sffamily\small Here we have a list of Web sites typeset in the \sty{classic} style through the \opt{restoreclassic} option. Only the \bibtype{online} entries are printed.}
+%
+%\defbibnote{biblatex-examples}{\sffamily\small The source of this bibliography, typeset in the \sty{modern} style, is the \file{biblatex-examples.bib} database, distributed with the \sty{biblatex} package. It is provided for checking all the standard features. This list could highlight some bugs.}
+%
+%\defbibnote{philosophy-examples}{\sffamily\small The source of this bibliography, typeset in the \sty{modern} style, is the \file{biblatex-philosophy.bib} database, distributed with the \sty{biblatex-philosophy} package. It is provided for checking all the style-specific features. This list should not highlight any bugs.}
+%
 %
-%\defbibnote{notaesempio-english}{\small\sffamily See also \file{philosophy-examples.bib} in the
-%``\texttt{texm-dist/doc/latex/biblatex-philosophy}'' directory 
-%of your \TeX Live installation.}
-% \defbibnote{restoreclassic}{\sffamily\small The bibliography style of the document is  \sty{philosophy-modern}, but in this list of references we use  \sty{philosophy-classic} through the \opt{restoreclassic} option. This is particularly useful for typesetting Web lists which.}
-% \defbibnote{weblist}{\sffamily\small Here we have a list of Web sites typeset in the \sty{classic} style through the \opt{restoreclassic} option.}
-%\defbibnote{examples}{\sffamily\small This bibliography is typeset in the \sty{modern} style. Note that the previous and the following lists of references are typeset in the \sty{classic} style throught the \opt{restoreclassic} option}
 %\printbibliography[heading=bibintoc,keyword=primaria,restoreclassic,prenote=restoreclassic]
-%\printbibliography[heading=subbibintoc,title=Examples,nottype=online,prenote=examples]
 %
-%\nocite{ctan,guit:sito}
-%\printbibliography[heading=subbibintoc,title=Web List,keyword=web,type=online,restoreclassic,prenote=weblist]
+%\printbibheading[heading=bibintoc,title=Examples]
+%
+%\printbibliography[heading=subbibliography,title=A Web List,keyword=web,restoreclassic,prenote=weblist]
+%
+%\printbibliography[heading=subbibliography,title=Philosophy examples,prenote=philosophy-examples,keyword=esempio]
+%
+%\nocite{set,stdmodel,matuz:doody,vizedom:related,britannica,gaonkar,jaffe,westfahl:frontier,cms,ctan,jcg,yoon,worman,wilde,westfahl:space,weinberg,wassenberg,vazques-de-parga,springer,spiegelberg,sorace,sigfridsson,shore,sarfraz,salam,reese,pines,piccato,padhye,nussbaum,nietzsche:ksa,nietzsche:ksa1,nietzsche:historie,moraux,moore,moore:related,massa,maron,markey,malinowski,loh,laufenberg,kullback,kullback:reprint,kullback:related,kowalik,knuth:ct,knuth:ct:a,knuth:ct:b,knuth:ct:c,knuth:ct:d,knuth:ct:e,knuth:ct:related,kastenholz,kant:kpv,kant:ku,itzhaki,hyman,murray,iliad,herrmann,hammond,companion,gonzalez,glashow,gillies,gerhardt,vangennep,vangennep:trans,vangennep:related,geer,gaonkar:in,doody,cotton,coleridge,cicero,chiu,brandt,bertram,baez/article,baez/online,averroes/bland,averroes/hannes,averroes/hercz,augustine,aristotle:anima,aristotle:physics,aristotle:poetics,aristotle:rhetoric,angenendt,almendro,aksin}
+%
+%\printbibliography[heading=subbibliography,title=Biblatex examples,prenote=biblatex-examples,category=biblatex]
 %
 %
 % \StopEventually{\PrintChanges\PrintIndex}
@@ -1258,9 +1351,9 @@ This work has the LPPL maintenance status "author-maintained".
 % \subsection{\file{philosophy-standard.bbx}}
 % \subsubsection{Initial settings}
 %
-% Biber is the default bibliography processor for \sty{biblatex} since version.
+% Biber is the default bibliography processor for \sty{biblatex}.
 % 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}
+% but it is required because it offers many useful functionalities. The \opt{backend=bibtex} or \opt{backend=bibtex8} options 
 % produce an error message.
 %    \begin{macrocode}
 \RequireBiber[3]
@@ -1278,17 +1371,17 @@ This work has the LPPL maintenance status "author-maintained".
   {\MessageBreak**** Unknown value for '#1' option}}
 %    \end{macrocode}
 % The \sty{philosophy} styles
-% redefine some localized strings in special \file{.lbx} files
-% called localization modules. So we first declare and map them 
-% to the associated languages.
+% redefine some localized strings for Italian, English, Spanish and French in specific 
+% localization modules. So we declare and map them to the associated languages.
 %    \begin{macrocode}
 \DeclareLanguageMapping{italian}{italian-philosophy}
 \DeclareLanguageMapping{english}{english-philosophy}
 \DeclareLanguageMapping{spanish}{spanish-philosophy}
+\DeclareLanguageMapping{french}{french-philosophy}
 %    \end{macrocode}
-% The boolean options can have two values: true or false. The boolean options are to true by default.
+% The default value for the boolean options is |true|.
 % This means that giving the options without the value is just like giving
-% \opt{<option>=true.}
+% \opt{option=true.}
 %    \begin{macrocode}
 \newtoggle{bbx:annotation}
 \newtoggle{bbx:library}
@@ -1296,6 +1389,11 @@ This work has the LPPL maintenance status "author-maintained".
 \newtoggle{bbx:classical}
 \newtoggle{bbx:lowscauthors}
 \newtoggle{cbx:shorthandintro}
+\newtoggle{cbx:scauthorscite}
+\newtoggle{bbx:scauthorsbib}
+\newtoggle{cbx:scauthorscitefn}
+\newtoggle{cbx:latinemph}
+
 \DeclareBibliographyOption{annotation}[true]{%
   \settoggle{bbx:annotation}{#1}}
 \DeclareBibliographyOption{library}[true]{%
@@ -1308,6 +1406,8 @@ This work has the LPPL maintenance status "author-maintained".
   \settoggle{bbx:lowscauthors}{#1}}
 \DeclareBibliographyOption{shorthandintro}[true]{%
   \settoggle{cbx:shorthandintro}{#1}}
+\DeclareBibliographyOption{latinemph}[true]{%
+  \settoggle{cbx:latinemph}{#1}}
 %    \end{macrocode}
 % Also the multi-value options have a default value, which is declared
 % in the optional bracketed argument of the \cmd{DeclareBibliographyOption} commands below. 
@@ -1338,29 +1438,42 @@ This work has the LPPL maintenance status "author-maintained".
 \DeclareBibliographyOption{scauthors}[all]{%
   \renewcommand{\bbx@scauthors}{#1}}
 %    \end{macrocode}
-% These options are defined for backwards compatibility. The \opt{origed} is now useless and it is substituted by the `related' mechanism. The \opt{scauthorscite} and \opt{scauthorsbib} are substituted by \opt{scauthors=cite} and \opt{scauthors=bib}.
+% These options are defined for backwards compatibility. The \opt{origed} is now useless and it is substituted by the `related' mechanism. The \opt{scauthorscite} and \opt{scauthorsbib} are substituted by \opt{scauthors=cite} and \opt{scauthors=bib}, respectively.
 %    \begin{macrocode}
 \newcommand{\bbx@origfields}{}
 \DeclareEntryOption{origed}[true]{%
   \renewcommand{\bbx@origfields}{origed}}
-\newtoggle{cbx:scauthorscite}
-\newtoggle{bbx:scauthorsbib}
 \DeclareBibliographyOption{scauthorsbib}[true]{%
   \settoggle{bbx:scauthorsbib}{#1}}
 \DeclareBibliographyOption{scauthorscite}[true]{%
   \settoggle{cbx:scauthorscite}{#1}}
 %    \end{macrocode}
-% Execute default options. Some options do not need to be executed.
-% At the moment I do no why.
+% And now one option to be used in the \cmd{printbibliography} and \cmd{printbiblist} commands. 
+%    \begin{macrocode}
+\define@key{blx@bib1}{annotation}[]{}
+\define@key{blx@bib2}{annotation}[true]{\settoggle{bbx:annotation}{#1}}
+\define@key{blx@biblist1}{annotation}[]{}
+\define@key{blx@biblist2}{annotation}[true]{\settoggle{bbx:annotation}{#1}}
+%    \end{macrocode}
+% Now we can execute the default options.
 %    \begin{macrocode}
 \ExecuteBibliographyOptions{%
   publocformat     = publocyear,  
-  origfieldsformat = semicolon,
   volnumformat     = plain,
+  origfieldsformat = semicolon,
+  relatedformat    = semicolon,
+  editionformat    = arabic,
+  volumeformat     = arabic,
+  scauthors        = false,
   editionformat    = arabic,
   volumeformat     = arabic,
   shorthandintro   = true,
   library          = true,
+  annotation       = false,
+  latinemph        = false,
+  classical        = false,
+  inbeforejournal  = false,
+  lowscauthors     = false,
   useprefix        = true,
   maxcitenames     = 2,
   mincitenames     = 1,
@@ -1368,23 +1481,23 @@ This work has the LPPL maintenance status "author-maintained".
   minbibnames      = 999}
 %    \end{macrocode}
 % Changing the penalty of the urls will prevent 
-% many overfull boxes. 
+% many overfull boxes:
 %    \begin{macrocode}
 \setcounter{biburlnumpenalty}{9000}
 \setcounter{biburlucpenalty}{9000}
 \setcounter{biburllcpenalty}{9000}
 %    \end{macrocode}
 % These counters control the list of names
-% of cross-referenced entries:
+% in the cross-referenced entries:
 %    \begin{macrocode}
 \newcounter{maxnamesincross}
 \newcounter{minnamesincross}
 %    \end{macrocode}
-% The \opt{scauthors} and \opt{lowscauthors} options need to be executed
-% at the beginning of the document. 
+% The \opt{scauthors} and \opt{lowscauthors} options are based on tests that require to be executed inside a command,
+% a macro or \cmd{AtBeginDocument} and similar hooks. Otherwise they would produce an error message.
 %    \begin{macrocode}
 \AtBeginDocument{%
-\ifdefstring{\bbx@scauthors}{all}
+\ifdefstring{\bbx@scauthors}{bibcite}
 {%
   \toggletrue{bbx:scauthorsbib}%
   \toggletrue{cbx:scauthorscite}%
@@ -1400,43 +1513,85 @@ This work has the LPPL maintenance status "author-maintained".
   \toggletrue{cbx:scauthorscite}%
 }%
 {}%
+\ifdefstring{\bbx@scauthors}{citefn}
+{%
+  \toggletrue{cbx:scauthorscitefn}%
+}%
+{}%
+\ifdefstring{\bbx@scauthors}{bibcitefn}
+{%
+  \toggletrue{bbx:scauthorsbib}%
+  \toggletrue{cbx:scauthorscitefn}%
+}%
+{}%
+\ifdefstring{\bbx@scauthors}{all}
+{%
+  \usebibmacro{scswitch}
+}%
+{}%
 }
 %    \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.
+% Anyway we do not like small caps in the citations inside the bibliography so we deactivate this option at the beginning of the bibliography.
 %    \begin{macrocode}
-\AtBeginBibliography{\togglefalse{cbx:scauthorscite}}%
+\AtBeginBibliography{%
+  \togglefalse{cbx:scauthorscite}%
+  \togglefalse{cbx:shorthandintro}%
+}
+%    \end{macrocode}
+% The \bibfield{annotation} field and the shorthand intro are omitted in the list of shorthands.
+%    \begin{macrocode}
+\AtBeginShorthands{%
+  \togglefalse{bbx:annotation}%
+  \togglefalse{cbx:shorthandintro}%
+}
+%    \end{macrocode}
+% The \bibfield{annotation} field is omitted in every citations.
+%    \begin{macrocode}
+\AtEveryCite{%
+  \togglefalse{bbx:annotation}%
+}
 %    \end{macrocode}
 %
 % \subsubsection{New commands}
 %
-% We redefine some internal commands. The new \cmd{volnumpunct} command is provided 
+% The \cmd{mkibid} command is provided for formatting the \emph{latinitates} ``et al.'', ``ivi'', ``ibidem''.
+% Actually the command is introduce for formatting ``et al.'' considering that it is already defined by \sty{verbose-trad2.cbx}
+% which uses it for ``ivi'' and ``ibidem''.
+%    \begin{macrocode}
+\providecommand*{\mkibid}[1]{\iftoggle{cbx:latinemph}{\emph{#1}}{#1}}
+%    \end{macrocode}
+% We (re)define some internal commands for the punctuation. The new \cmd{volnumpunct} command is provided 
 % to separate volume and number in \bibtype{article} entries. 
 %    \begin{macrocode}
+\newcommand*{\volnumpunct}{\addcomma\space}
 \renewcommand*{\newunitpunct}{\addcomma\space}
 \renewcommand*{\subtitlepunct}{\addperiod\space}
 \renewcommand*{\intitlepunct}{\nopunct\addspace}
 \renewcommand*{\relatedpunct}{\addsemicolon\space}
-\newcommand*{\volnumpunct}{\addcomma\space}
 %    \end{macrocode}
-% We define a new internal command
-% in order to get pure parenthese for some specific fields
-% when using the \opt{square} option:
+% The \cmd{editorstrgdelim} is introduced to customize the
+% delimiter to be printed before the  |editorstrg|, |authorstrg| and |translatorstrg| strings. These strings are enclosed in parentheses by default: (eds.), (trans.), etc. Redefining the delimiter we can omit the parentheses end reset to the default authoryear style: eds., trans., etc. This requires to change the \bibfield{editortype} field format too.
+%    \begin{macrocode}
+\DeclareDelimFormat{editorstrgdelim}{\addspace}
+%    \end{macrocode}
+% New internal commands assure pure parentheses/brackets for some specific fields
+% when using the \opt{square} option.
 %    \begin{macrocode}
 \newrobustcmd*{\mkpureparens}[1]{%
   \begingroup
     \blx@blxinit
     \blx@setsfcodes
-    \blx@postpunct(#1\blx@postpunct)\midsentence%
+    \bibleftparen#1\bibrightparen%
   \endgroup}
 \newrobustcmd*{\mkpurebrackets}[1]{%
   \begingroup
     \blx@blxinit
     \blx@setsfcodes
-    \blx@postpunct[#1\blx@postpunct]\midsentence%
+    \bibleftbracket#1\bibrightbracket%
   \endgroup}
 %    \end{macrocode}
-% The font of the \bibfield{annotation}, \bibfield{library} and \bibfield{edition} fields.
+% Some commands for changing the font of the \bibfield{annotation}, \bibfield{library} and \bibfield{edition} fields.
 %    \begin{macrocode}
 \newcommand*{\annotationfont}{\footnotesize}
 \newcommand*{\libraryfont}{}
@@ -1444,13 +1599,16 @@ This work has the LPPL maintenance status "author-maintained".
   \ifdefstring{\bbx@editionformat}{Roman}
     {\uppercase}%
     {\ifdefstring{\bbx@editionformat}{romansc}
-    {\scshape}%
-    {\relax}}}%
+      {\scshape}%
+      {\relax}}}%
 \newrobustcmd*{\edfnt}[1]{%
   \begingroup
   \expandafter\editionfont%
   \expandafter{\romannumeral#1}%
   \endgroup}
+%    \end{macrocode}
+% A command to select lowercase small caps.
+%    \begin{macrocode}
 \newrobustcmd*{\mkbibsc}[1]{%
   \iftoggle{bbx:lowscauthors}{%
     \textsc{\MakeLowercase{#1}}}%
@@ -1459,21 +1617,20 @@ This work has the LPPL maintenance status "author-maintained".
 %
 % \subsubsection{Names format}
 %
-% 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. 
+% First we define a macro to be used in the \cmd{DeclareNameFormat} specifications. The macro simply maps the \cmd{mkbibname*} commands to the new \cmd{mkbibsc} command defined above. 
 %    \begin{macrocode}
 \newbibmacro*{scswitch}{%
-	\let\mkbibnamefamily\mkbibsc%
-	\let\mkbibnamegiven\mkbibsc%
-	\let\mkbibnameprefix\mkbibsc%
-	\let\mkbibnamesuffix\mkbibsc}
+  \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.
+% In the following codes note that the font switching is declared inside \texttt{sortname} or \texttt{labelname}
+% because the \opt{scauthors=bib} or \opt{scauthors=cite} option must be active 
+% only for the names at the beginning of the entry which are formatted by |sortname| or |labelname|.
 %    \begin{macrocode}
 \DeclareNameFormat{sortname}{%
-  \iftoggle{bbx:scauthorsbib}{%
-  \usebibmacro{scswitch}}{}%
+  \iftoggle{bbx:scauthorsbib}{\usebibmacro{scswitch}}{}%
   \nameparts{#1}%
   \ifnumequal{\value{listcount}}{1}
   {\ifgiveninits
@@ -1505,6 +1662,69 @@ This work has the LPPL maintenance status "author-maintained".
       {\namepartprefix}
       {\namepartsuffix}}}%
   \usebibmacro{name:andothers}}%
+\DeclareNameFormat{labelname}{%
+  \iftoggle{cbx:scauthorscite}{\usebibmacro{scswitch}}{}%  
+  \iftoggle{cbx:scauthorscitefn}{\iffootnote{\usebibmacro{scswitch}}{}}{}%
+  \bibhyperref{\nameparts{#1}%
+  \ifcase\value{uniquename}%
+    \usebibmacro{name:family}%
+      {\namepartfamily}%
+      {\namepartgiven}%
+      {\namepartprefix}%
+      {\namepartsuffix}%
+  \or
+    \ifuseprefix
+      {\usebibmacro{name:given-family}%
+        {\namepartfamily}%
+        {\namepartgiveni}%
+        {\namepartprefix}%
+        {\namepartsuffixi}}%
+      {\usebibmacro{name:given-family}%
+        {\namepartfamily}%
+        {\namepartgiveni}%
+        {\namepartprefixi}%
+        {\namepartsuffixi}}%
+  \or
+    \usebibmacro{name:given-family}%
+      {\namepartfamily}%
+      {\namepartgiven}%
+      {\namepartprefix}%
+      {\namepartsuffix}%
+  \fi
+  \usebibmacro{name:andothers}}}%
+%    \end{macrocode}
+% 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 (that is a full citation).
+%    \begin{macrocode}
+\DeclareNameFormat{scdefault}{%
+\usebibmacro{scswitch}%
+  \nameparts{#1}%
+  \ifgiveninits
+    {\usebibmacro{name:given-family}%
+      {\namepartfamily}%
+      {\namepartgiveni}%
+      {\namepartprefix}%
+      {\namepartsuffix}}%
+    {\usebibmacro{name:given-family}%
+      {\namepartfamily}%
+      {\namepartgiven}%
+      {\namepartprefix}%
+      {\namepartsuffix}}%
+  \usebibmacro{name:andothers}}%
+%    \end{macrocode}
+% The \cmd{fullcite} command employs the bibliography driver to print the entry
+% so it has to be redefined in order to use the |scdefault| name format
+% with \opt{scauthor=cite} or \opt{scauthor=full} options.
+%    \begin{macrocode}
+\DeclareCiteCommand{\fullcite}
+  {\usebibmacro{prenote}}
+  {\setkeys{blx@bib2}{restoreclassic}%
+  \usedriver
+    {\iftoggle{cbx:scauthorscite}%
+      {\DeclareNameAlias{sortname}{scdefault}}%
+      {\DeclareNameAlias{sortname}{default}}}%
+  {\thefield{entrytype}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
 %    \end{macrocode}
 % \subsubsection{Fields format}
 %    \begin{macrocode}
@@ -1524,6 +1744,7 @@ This work has the LPPL maintenance status "author-maintained".
 \DeclareFieldFormat{library}{\libraryfont #1}
 \DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
 \DeclareFieldFormat{editortype}{\mkpureparens{#1}}
+\DeclareFieldAlias{authortype}{editortype}
 \DeclareFieldFormat{backrefparens}{\mkpureparens{#1}}
 \DeclareFieldFormat*{number}{%
   \ifdefstring{\bbx@volnumformat}{strings}{%
@@ -1535,19 +1756,16 @@ This work has the LPPL maintenance status "author-maintained".
 \DeclareFieldFormat{edition}{%
   \ifinteger{#1}{%
     \ifdefstring{\bbx@editionformat}{arabic}
-      {\mkbibordedition{#1}~\bibstring{edition}}
-      {\ifdefstring{\bbx@editionformat}{Roman}%
-        {\RN{#1}~\bibstring{edition}}%
-        {\ifdefstring{\bbx@editionformat}{romansc}%
-          {\textsc{\Rn{#1}}~\bibstring{edition}}%
-          {\ifdefstring{\bbx@editionformat}{roman}%
-            {\Rn{#1}~\bibstring{edition}}
-            {\ifdefstring{\bbx@editionformat}{superscript}%
-            {\ClassError{biblatex-philosophy}
-    {\MessageBreak**** Option 'editionformat=superscript' 
-    available only for philosophy-verbose style}
-    {\MessageBreak**** Option 'editionformat=superscript' 
-    available only for philosophy-verbose style}}{}}}}}}{#1}}%\isdot??
+    {\mkbibordedition{#1}~\bibstring{edition}}
+    {\ifdefstring{\bbx@editionformat}{Roman}%
+      {\RN{#1}~\bibstring{edition}}%
+      {\ifdefstring{\bbx@editionformat}{romansc}%
+        {\textsc{\Rn{#1}}~\bibstring{edition}}%
+        {\ifdefstring{\bbx@editionformat}{roman}%
+          {\Rn{#1}~\bibstring{edition}}
+          {\ifdefstring{\bbx@editionformat}{superscript}%
+            {\mkbibsuperscript{#1}}%
+            {\optionerror{editionformat}}}}}}}{#1}}%\isdot??  
 \DeclareFieldFormat{volume}{%
   \bibstring{volume}~%
     \ifinteger{#1}{%
@@ -1584,76 +1802,149 @@ This work has the LPPL maintenance status "author-maintained".
         {\optionerror{relatedformat}}}}}%
 \DeclareFieldAlias{related:origpubin}{related}
 \DeclareFieldAlias{related:origpubas}{related}
-\DeclareFieldFormat{relatedstring:default}{#1\addspace}
+\DeclareFieldFormat{relatedstring:default}{#1\addspace}%\addspace needed
 %    \end{macrocode}
 % \subsubsection{New macros}
+% 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}.
+%    \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}
+% The default macros for indexing include the \bibfield{indextitle} field (which defaults to \bibfield{title}).
+% This involves getting an index with names and titles together. So we redefine the following two macros in order to get a simple index of names.
 %    \begin{macrocode}
 \renewbibmacro*{citeindex}{%
-  \ifciteindex{\indexnames{labelname}}{}}%
+  \ifciteindex
+    {\indexnames{labelname}}
+    {}}
 \renewbibmacro*{bibindex}{%
-  \ifbibindex{\indexnames{author}%
-    \indexnames{editor}%
-    \indexnames{editora}%
-    \indexnames{editorb}%
-    \indexnames{editorc}}%
-  {}}%
-  
-\renewbibmacro*{addendum+pubstate}{%
-  \printfield{addendum}%
-  \newunit\newblock
-  \printfield{pubstate}%
-  \ifdefstring{\bbx@origfields}{none}{}{%
-   \newunit\newblock
-  \usebibmacro{origdata:book}}%
-  \newunit\newblock
-  \usebibmacro{library}}
-
-\newbibmacro*{addendum+pubstate:article-inbook-incoll}{%
-  \printfield{addendum}%
-  \newunit\newblock
-  \printfield{pubstate}%
-  \ifdefstring{\bbx@origfields}{none}{}{%
-   \newunit\newblock
-  \usebibmacro{origdata:article-inbook}}%
-  \newunit\newblock
-  \usebibmacro{library}}
-
+  \ifbibindex
+    {\indexnames{labelname}}
+    {}}
+%    \end{macrocode}
+% Here we (re)define different macros used to print various fields.
+%    \begin{macrocode}
 \newbibmacro*{volnumdefault}{%
-\printfield{volume}%
-  \setunit*{\volnumpunct}%
-  \printfield{number}}
+  \printfield{volume}%
+    \setunit*{\volnumpunct}%
+    \printfield{number}}
 
 \newbibmacro*{volnumparens}{%
-\nopunct%
-\printtext[pureparens]{%
-\printfield{volume}%
-  \setunit*{\volnumpunct}%
-  \printfield{number}}}
+  \nopunct%
+  \printtext[pureparens]{%
+    \printfield{volume}%
+      \setunit*{\volnumpunct}%
+    \printfield{number}}}
 
 \newbibmacro*{volnumstrings}{%
   \iffieldundef{volume}{}{%
     \printfield{volume}\setunit*{\volnumpunct}}%
- \iffieldundef{number}{}{%
+  \iffieldundef{number}{}{%
    \printfield{number}}}
 
+\renewbibmacro*{volume+number+eid}{%
+     \ifdefstring{\bbx@volnumformat}{strings}
+      {\usebibmacro{volnumstrings}}%
+      {\ifdefstring{\bbx@volnumformat}{parens}
+        {\usebibmacro{volnumparens}}%
+        {\ifdefstring{\bbx@volnumformat}{plain}
+          {\usebibmacro{volnumdefault}}%
+          {\optionerror{volnumformat}}}}%
+  \setunit{\addcomma\space}%
+  \printfield{eid}}
+
+% TO be removed if implemented in biblatex.def.
+% Code proposed by @moewew
 \renewbibmacro*{journal}{%
-  \iffieldundef{journaltitle}
+  \ifboolexpr{
+    test {\iffieldundef{journaltitle}}
+    and
+    test {\iffieldundef{journalsubtitle}}
+  }
     {}
     {\printtext[journaltitle]{%
        \printfield[titlecase]{journaltitle}%
-       \midsentence%
        \setunit{\subtitlepunct}%
        \printfield[titlecase]{journalsubtitle}}}}
 
 \renewbibmacro*{periodical}{%
-  \iffieldundef{title}
-    {}%
+  \ifboolexpr{
+    test {\iffieldundef{title}}
+    and
+    test {\iffieldundef{subtitle}}
+  }
+    {}
     {\printtext[title]{%
        \printfield[titlecase]{title}%
-       \midsentence%
        \setunit{\subtitlepunct}%
        \printfield[titlecase]{subtitle}}}}
 
+\renewbibmacro*{issue}{%
+  \ifboolexpr{
+    test {\iffieldundef{issuetitle}}
+    and
+    test {\iffieldundef{issuesubtitle}}
+  }
+    {}
+    {\printtext[issuetitle]{%
+       \printfield[titlecase]{issuetitle}%
+       \setunit{\subtitlepunct}%
+\printfield[titlecase]{issuesubtitle}}}}
+
+%\renewbibmacro*{journal}{%
+%  \iffieldundef{journaltitle}
+%    {}%
+%    {\printtext[journaltitle]{%
+%       \printfield[titlecase]{journaltitle}%
+%       \midsentence%
+%       \setunit{\subtitlepunct}%
+%       \printfield[titlecase]{journalsubtitle}}}}
+%
+%\renewbibmacro*{periodical}{%
+%  \iffieldundef{title}
+%    {}%
+%    {\printtext[title]{%
+%       \printfield[titlecase]{title}%
+%       \midsentence%
+%       \setunit{\subtitlepunct}%
+%       \printfield[titlecase]{subtitle}}}}
+
 \renewbibmacro*{journal+issuetitle}{%
   \usebibmacro{journal}%
   \setunit*{\addspace}%
@@ -1677,26 +1968,18 @@ This work has the LPPL maintenance status "author-maintained".
     {\newunit
      \printfield{series}%
      \setunit{\addspace}\midsentence}%
-  \newunit
   \usebibmacro{volume+number+eid}%
-  \setunit{\addcomma\space}%
-  \printfield{eid}%
   \setunit{\addspace}%
   \usebibmacro{issue+date}%
   \setunit{\addcolon\space}%
   \usebibmacro{issue}%
   \newunit}
 
-\renewbibmacro*{volume+number+eid}{%
-     \ifdefstring{\bbx@volnumformat}{strings}
-      {\usebibmacro{volnumstrings}}%
-      {\ifdefstring{\bbx@volnumformat}{parens}
-      {\usebibmacro{volnumparens}}%
-      {\ifdefstring{\bbx@volnumformat}{plain}
-      {\usebibmacro{volnumdefault}}%
-      {\optionerror{volnumformat}}}}%
-  \setunit{\addcomma\space}%
-  \printfield{eid}}
+\renewbibmacro*{series+number}{%
+  \printfield{series}%
+ \setunit*{\addcomma\space}%
+  \printfield{number}%
+  \newunit}
   
 \renewbibmacro*{issue+date}{%
   \printtext[pureparens]{%
@@ -1714,7 +1997,7 @@ This work has the LPPL maintenance status "author-maintained".
     and
     test {\iffieldundef{eventyear}}
   }%
-    {}
+    {}%
     {\setunit*{\addspace}%
      \printtext{%
        \printfield{venue}%
@@ -1722,12 +2005,6 @@ This work has the LPPL maintenance status "author-maintained".
        \printeventdate}}%
   \newunit}
  
-\renewbibmacro*{series+number}{%
-  \printfield{series}%
- \setunit*{\addcomma\space}%
-  \printfield{number}%
-  \newunit}
-
 \renewbibmacro*{publisher+location+date}{%
 \ifdefstring{\bbx@publocformat}{loccolonpub}
   {\usebibmacro{loccolonpub}}
@@ -1752,35 +2029,6 @@ This work has the LPPL maintenance status "author-maintained".
       {\ifdefstring{\bbx@publocformat}{publocyear}%
       {\usebibmacro{orgpublocyear}}{\optionerror{publocformat}}}}}
 
-\newbibmacro*{library}{%
-\iftoggle{bbx:library}{%
-  \iffieldundef{library}%
-  {}%
-    {\setunit{\addperiod\space}%
-      {\printfield{library}}}}%
-    {}}
-%    \end{macrocode}
-% In this macro the \cmd{nopunct} command is needed
-% to avoid the dot after the parentheses.
-%    \begin{macrocode}
-\renewbibmacro*{pageref}{%
-  \iflistundef{pageref}
-    {}%
-    {\setunit{\addperiod\space}%
-    \printtext[backrefparens]{%
-       \ifnumgreater{\value{pageref}}{1}
-         {\bibcpstring{backrefpages}\ppspace}%
- {\bibcpstring{backrefpage}\ppspace}%
-       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}}%
-
-\renewbibmacro*{finentry}{%
-  \iftoggle{bbx:annotation}%
-    {\iffieldundef{annotation}%
-      {\finentry}%
-      {\setunit{\addperiod\par\nobreak\vspace*{.5ex}}%
-      \printtext[annotation]{\printfield{annotation}\finentry\par}}}%
- {\finentry}}
-
 \newbibmacro*{publocyear}{%
   \iflistundef{publisher}%
    {}%
@@ -1861,6 +2109,52 @@ This work has the LPPL maintenance status "author-maintained".
   \printlist{organization}%
   \usebibmacro{commarelateddate}%
   \newunit}
+
+\renewbibmacro*{addendum+pubstate}{%
+  \printfield{addendum}%
+  \newunit\newblock
+  \printfield{pubstate}%
+  \ifdefstring{\bbx@origfields}{none}{}{%
+   \newunit\newblock
+  \usebibmacro{origdata:book}}%
+  \newunit\newblock
+  \usebibmacro{library}}
+
+\newbibmacro*{addendum+pubstate:article-inbook-incoll}{%
+  \printfield{addendum}%
+  \newunit\newblock
+  \printfield{pubstate}%
+  \ifdefstring{\bbx@origfields}{none}{}{%
+   \newunit\newblock
+  \usebibmacro{origdata:article-inbook}}%
+  \newunit\newblock
+  \usebibmacro{library}}
+
+\newbibmacro*{library}{%
+  \iftoggle{bbx:library}{%
+    \iffieldundef{library}%
+      {}%
+      {\setunit{\addperiod\space}%
+      {\printfield{library}}}}%
+    {}}
+
+\renewbibmacro*{pageref}{%
+  \iflistundef{pageref}
+    {}%
+    {\setunit{\addperiod\space}%
+     \printtext[backrefparens]{%
+       \ifnumgreater{\value{pageref}}{1}
+         {\bibcpstring{backrefpages}\ppspace}%
+         {\bibcpstring{backrefpage}\ppspace}%
+     \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}}%
+
+\renewbibmacro*{finentry}{%
+  \iftoggle{bbx:annotation}%
+    {\iffieldundef{annotation}%
+      {\finentry}%
+      {\setunit{\addperiod\par\nobreak\vspace*{.5ex}}%
+      \printtext[annotation]{\printfield{annotation}\finentry\par}}}%
+    {\finentry}}
 %    \end{macrocode}
 % \subsubsection{Related entries}
 %    \begin{macrocode}
@@ -1876,8 +2170,7 @@ This work has the LPPL maintenance status "author-maintained".
 %    \begin{macrocode}
 \newbibmacro*{related:clearauthors}{%
   \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}%
-  \renewbibmacro*{author/editor+others/translator+others}{%
-    \usebibmacro{bbx:savehash}}%
+  \renewbibmacro*{author/editor+others/translator+others}{\usebibmacro{bbx:savehash}}%
   \renewbibmacro*{editor+others}{\usebibmacro{bbx:savehash}}%
   \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}%
   \renewbibmacro*{author/editor}{\usebibmacro{bbx:savehash}}%
@@ -1904,8 +2197,8 @@ This work has the LPPL maintenance status "author-maintained".
       test {\iffieldundef{relatedstring}}
   }
   {\printtext{\bibstring{translationas}}}{}%
-    \printtext{\addspace}%
-    \relatedcite{\thefield{related}}}
+   \printtext{\addspace}%    
+   \relatedcite{\thefield{related}}}
 %    \end{macrocode}
 % We redefine the \texttt{begrelatedloop} macro to avoid nested parentheses in cascading related entries:
 %    \begin{macrocode}               
@@ -1913,7 +2206,7 @@ This work has the LPPL maintenance status "author-maintained".
   \renewrobustcmd*{\mkpureparens}{\relatedpunct}%
   \renewrobustcmd*{\mkpurebrackets}{\relatedpunct}}
 %    \end{macrocode}
-% This macro tests the value of the \opt{relatedformat} option. If it sets to \opt{semicolon} the macro adds \cmd{relatedpunct} (i.e. a semicolon plus a space). Otherwise it adds a simple space.
+% This macro tests the value of the \opt{relatedformat} option. If it sets to \opt{semicolon} the macro adds \cmd{relatedpunct} (i.e. a semicolon plus a space), otherwise it adds a simple space.
 %    \begin{macrocode}
 \newbibmacro*{phil:related}{%
   \iftoggle{bbx:related}
@@ -1925,67 +2218,66 @@ 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
+% The below macros will be used in the \bibtype{inbook}, \bibtype{incollection} and \bibtype{inproceedings} drivers.
 %    \begin{macrocode}
 \renewbibmacro*{bybookauthor}{%
-	\ifnamesequal{author}{bookauthor}%
-	{}%
-	{\printnames[default]{bookauthor}}}
+  \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}}
+  \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}}
+  \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 
@@ -2760,11 +3052,15 @@ This work has the LPPL maintenance status "author-maintained".
   \newunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
-  
+%    \end{macrocode}
+% In the \bibtype{set} entry type we restore the \sty{classic} style
+% from the second entry onward, using the |entrysetcount| counter.
+%    \begin{macrocode}
 \DeclareBibliographyDriver{set}{%
   \savefield{annotation}{\@phil@nnote}%
   \clearfield{annotation}%
-  \entryset{}{}%
+  \entryset{\ifnumgreater{\thefield{entrysetcount}}{1}%
+    {\setkeys{blx@bib2}{restoreclassic}}{}}{}%
   \newunit\newblock
   \restorefield{annotation}{\@phil@nnote}%
   \usebibmacro{pageref}%
@@ -2904,690 +3200,11 @@ This work has the LPPL maintenance status "author-maintained".
 \DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm}
 \DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section}
 \DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court}
-
 %    \end{macrocode}
 % \iffalse
 %</standard-bbx>
 % \fi
 %
-% \subsection{\file{philosophy-classic.bbx}}
-%
-% \iffalse
-%<*classic-bbx>
-% \fi
-% \subsubsection{Initial settings}
-%    \begin{macrocode}
-\RequireBibliographyStyle{authoryear}
-\RequireBibliographyStyle{philosophy-standard}
-
-\newtoggle{bbx:square}
-\newtoggle{bbx:nodate}
-
-\DeclareBibliographyOption{square}[true]{%
-  \settoggle{bbx:square}{#1}}
-\DeclareBibliographyOption{nodate}[true]{%
-  \settoggle{bbx:nodate}{#1}}
-
-\ExecuteBibliographyOptions{%
-  nodate      = true,
-  uniquename  = false,
-  pagetracker = true,
-  singletitle = false,
-  square      = false,
-  mergedate   = basic,  
-  dashed      = true,
-}
-%    \end{macrocode}
-% The \opt{classic} and \opt{modern} styles 
-% redefine the \texttt{relateddate} and \texttt{commarelateddate} macros
-% because the date have to be printed after the name of the author/editor.
-% In the list of shorthands we need a standard entry,
-% with the date at the end and no date after the name of the author/editor
-% so we overwrite these macros locally:
-%    \begin{macrocode}
-\AtBeginShorthands{%
-\togglefalse{bbx:annotation}%
-\renewcommand{\labelnamepunct}{\addcomma\space}%
-\renewbibmacro*{relateddate}{%
-  \setunit*{\addspace}%
-  \printdate}%
-\renewbibmacro*{commarelateddate}{%
-  \setunit*{\addcomma\space}%
-  \printdate}%
-\DeclareCiteCommand{\bbx@crossref@inbook}
-  {}%
-  {\iffieldundef{shorthand}{%
-  \usebibmacro{citeindex}%
-  \ifuseeditor{%
-    \ifthenelse{\value{listtotal}=2}%
-      {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}}%
-     {\usebibmacro{labeltitle}}%
-    \setunit*{\addspace}%
-    \usebibmacro{date+extrayear:crossref}}%
-    {\usebibmacro{cite:shorthand}}}%
-  {}%
-  {}%
-\DeclareCiteCommand{\bbx@crossref@incollection}%
-  {}%
-  {\iffieldundef{shorthand}{%
-  \usebibmacro{citeindex}%
-  \ifuseeditor{%
-    \ifthenelse{\value{listtotal}=2}%
-      {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}}%
-     {\usebibmacro{labeltitle}}%
-    \setunit*{\addspace}%
-    \usebibmacro{date+extrayear:crossref}}%
-    {\usebibmacro{cite:shorthand}}}%
-  {}%
-  {}%
-\newbibmacro*{date+extrayear:crossref}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-      {\iftoggle{bbx:nodate}{\printtext[parens]{%
-        \midsentence\bibstring{nodate}}}{}}%
-      {\printtext[parens]{\printdateextra}}%
-       \endgroup}%
-\newbibmacro*{date+extrayear}{}%
-% for article entries:
-\renewbibmacro*{date}{\printdate}%
-\renewbibmacro*{issue+date}{%
-  \printtext[pureparens]{%
-    \iffieldundef{issue}
-      {\usebibmacro{date}}
-      {\printfield{issue}%
-       \setunit*{\addspace}%
-       \usebibmacro{date}}}%
-  \newunit}
-  }%
-
-\AtBeginDocument{%
-  \iftoggle{bbx:square}
-    {\renewcommand{\bibopenparen}{\bibopenbracket}%
-    \renewcommand{\bibcloseparen}{\bibclosebracket}}%
-    {}%
-  \setcounter{maxnamesincross}{\value{maxnames}}%
-  \setcounter{minnamesincross}{\value{minnames}}%
-}%
-%    \end{macrocode}
-% The \texttt{labelname} format is redefined in order to have also the name hyperlinked
-% through the \cmd{bibhyperref} command.
-%    \begin{macrocode}
-\DeclareNameFormat{labelname}{%
-	\nameparts{#1}%
-	\bibhyperref{\ifcase\value{uniquename}%
-		\usebibmacro{name:family}
-		{\namepartfamily}
-		{\namepartgiven}
-		{\namepartprefix}
-		{\namepartsuffix}%
-		\or
-		\ifuseprefix
-		{\usebibmacro{name:given-family}
-			{\namepartfamily}
-			{\namepartgiveni}
-			{\namepartprefix}
-			{\namepartsuffixi}}
-		{\usebibmacro{name:given-family}
-			{\namepartfamily}
-			{\namepartgiveni}
-			{\namepartprefixi}
-			{\namepartsuffixi}}%
-		\or
-		\usebibmacro{name:given-family}
-		{\namepartfamily}
-		{\namepartgiven}
-		{\namepartprefix}
-		{\namepartsuffix}%
-		\fi
-		\usebibmacro{name:andothers}}}
-
-\AtEveryBibitem{%
-\iffieldequalstr{entrysubtype}{classic}{%
-  \togglefalse{bbx:nodate}}}%
-%    \end{macrocode}
-% \subsubsection{New macros}
-%
-% Renew the bibliography macro 'relateddate'
-% to delete the date at the end of the entry:
-%    \begin{macrocode}
-\renewbibmacro*{relateddate}{}
-\renewbibmacro*{commarelateddate}{}
-%    \end{macrocode}
-% \paragraph{Dates}
-%    \begin{macrocode}
-  \renewbibmacro*{issue+date}{%
-    \ifboolexpr{%
-      test {\iffieldundef{issue}}
-      and
-      test {\iffieldundef{month}}
-    }%
-      {}%
-      {\ifdefstring{\bbx@volnumformat}{parens}%
-      {\printtext{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}%
-      {\printtext[pureparens]{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}}%
-    \newunit}%
-%    \end{macrocode}
-% Delete ``month'' from \cmd{printdateextra} 
-% to print open ranges such as: ``1968-'':
-%    \begin{macrocode}
-\renewbibmacro*{date+extrayear}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-      {\iftoggle{bbx:nodate}{\printtext[parens]{%
-        \midsentence\bibstring{nodate}}}{}}%
-      {\printtext[parens]{\printdateextra}}%
-       \endgroup}%
-%    \end{macrocode}
-% \paragraph{New macros}
-%    \begin{macrocode}
-\renewbibmacro*{author}{%
-  \ifboolexpr{%
-    test \ifuseauthor
-    and
-    not test {\ifnameundef{author}}
-  }%
-    {\usebibmacro{bbx:dashcheck}%
-       {\bibnamedash}%
-       {\usebibmacro{bbx:savehash}%
-        \printnames{author}%
-        \iffieldundef{nameaddon}{}%
-        {\setunit{\addspace}%
-        \printtext[brackets]{\printfield{nameaddon}}}%
-\iffieldundef{authortype}%
-  {\setunit{\addspace}}%
-  {\setunit{\addcomma\space}}}%
-     \iffieldundef{authortype}%
-       {}%
-       {\usebibmacro{authorstrg}%
-\setunit{\addspace}}}%
-    {\global\undef\bbx@lasthash%
-     \usebibmacro{labeltitle}%
-     \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}%
-       {\bibnamedash}%
-       {\printnames{editor}%
-\setunit{\addspace}%
-\usebibmacro{bbx:savehash}}%
-     \usebibmacro{#1}%
-     \clearname{editor}%
-     \setunit{\addspace}}%
-    {\global\undef\bbx@lasthash%
-     \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}
-\DeclareCiteCommand{\bbx@crossref@inbook}%
-  {}%
-  {\usebibmacro{citeindex}%
-  \ifuseeditor{%
-    \ifthenelse{\value{listtotal}=2}%
-      {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}}%
-     {\usebibmacro{labeltitle}}%
-    \setunit*{\addspace}%
-    \usebibmacro{date+extrayear}}%
-  {}%
-  {}%
-\DeclareCiteCommand{\bbx@crossref@incollection}%
-  {}%
-  {\usebibmacro{citeindex}%
-  \ifuseeditor{%
-    \ifthenelse{\value{listtotal}=2}%
-      {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}}%
-     {\usebibmacro{labeltitle}}%
-    \setunit*{\addspace}%
-    \usebibmacro{date+extrayear}}%
-  {}%
-  {}%
-%    \end{macrocode}
-% The \opt{restoreclassic} option is redundant for the 
-% philosophy-classic style. Anyway it is defined to avoid 
-% error messages:
-%    \begin{macrocode}
-\define@key{blx@bib1}{restoreclassic}[]{}
-\define@key{blx@bib2}{restoreclassic}[true]{}
-\define@key{blx@bib1}{nodate}[]{}%
-\define@key{blx@bib2}{nodate}[true]{%
-  \ifstrequal{#1}{false}{\togglefalse{bbx:nodate}}{}}%
-%    \end{macrocode}
-% \iffalse
-%</classic-bbx>
-% \fi
-%
-% \subsection{\file{philosophy-modern.bbx}}
-%
-% \iffalse
-%<*modern-bbx>
-% \fi
-% \subsubsection{Initial settings}
-%    \begin{macrocode}
-\RequireBibliographyStyle{philosophy-classic}
-%    \end{macrocode}
-% The \sty{modern} style has only one specific option
-% which is turned off by default:
-%    \begin{macrocode}
-\newtoggle{bbx:yearleft}
-\DeclareBibliographyOption{yearleft}[true]{%
-  \settoggle{bbx:yearleft}{#1}}
-\ExecuteBibliographyOptions{%
-  yearleft=false}
-
-\newlength{\yeartitle}
-\newlength{\postnamesep}
-\setlength{\yeartitle}{0.8em}
-\setlength{\postnamesep}{0.5ex plus 2pt minus 1pt}
-\setlength{\bibitemsep}{\postnamesep}
-\setlength{\bibnamesep}{1.5ex plus 2pt minus 1pt}
-\setlength{\bibhang}{4\parindent}
-
-\AtBeginBibliography{%
-\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 in version 1.9.3
-\renewcommand{\labelnamepunct}{\newunitpunct}}
-%    \end{macrocode}
-% \subsubsection{New macros}
-% \paragraph{Dates}
-%    \begin{macrocode}
-\renewbibmacro*{date+extrayear}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-  \makebox[\bibhang][r]{\printtext{%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-    {\iftoggle{bbx:nodate}{\printtext{%
-      \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}{%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}
-\renewbibmacro*{author}{%
-  \ifboolexpr{%
-    test \ifuseauthor
-    and
-    not test {\ifnameundef{author}}
-  }%
-    {\usebibmacro{bbx:dashcheck}%
-       {}%
-       {\usebibmacro{bbx:savehash}%
-        \printnames{author}%
-        \iffieldundef{nameaddon}{}%
-        {\setunit{\addspace}%
-        \printtext[brackets]{\printfield{nameaddon}}}%
-         \iffieldundef{authortype}%
-         {}%
-         {\setunit{\addcomma\space}}%
-        \usebibmacro{authorstrg}%
-    \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}%
-%     \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}}%
-	  \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}
-\DeclareCiteCommand{\bbx@crossref@inbook}%
-  {}%
-  {\usebibmacro{citeindex}%
-  \ifuseeditor{%
-    \ifthenelse{\value{listtotal}=2}%
-      {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}}%
-     {\usebibmacro{labeltitle}}%
-    \setunit*{\addspace}%
-    \usebibmacro{classic:date+extrayear}}%
-  {}%
-  {}%
-\DeclareCiteCommand{\bbx@crossref@incollection}%
-  {}%
-  {\usebibmacro{citeindex}%
-  \ifuseeditor{%
-    \ifthenelse{\value{listtotal}=2}%
-      {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}}%
-     {\usebibmacro{labeltitle}}%
-    \setunit*{\addspace}%
-    \usebibmacro{classic:date+extrayear}}%
-  {}%
-  {}%
-\newbibmacro*{classic:date+extrayear}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-      {\iftoggle{bbx:nodate}{\printtext[parens]{%
-        \midsentence\bibstring{nodate}}}{}}%
-      {\printtext[parens]{%
-   \printfield{labelyear}%
-   \printfield{extrayear}}}%
-       \endgroup}%
-%    \end{macrocode}
-% \subsubsection{The \opt{restoreclassic} option}
-%    \begin{macrocode}
-\define@key{blx@bib1}{restoreclassic}[]{}
-\define@key{blx@bib2}{restoreclassic}[true]{%
-  \ifstrequal{#1}{true}{%
-  \setlength{\bibhang}{\parindent}%
-  \renewcommand{\labelnamepunct}{\newunitpunct}%
-\renewbibmacro*{date+extrayear}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-      {\iftoggle{bbx:nodate}{\printtext[parens]{%
-        \midsentence\bibstring{nodate}}}{}}%
-      {\printtext[parens]{\printdateextra}}%
-       \endgroup}%
-\renewbibmacro*{author}{%
-  \ifboolexpr{%
-    test \ifuseauthor
-    and
-    not test {\ifnameundef{author}}
-  }%
-    {\usebibmacro{bbx:dashcheck}%
-       {\bibnamedash}%
-       {\usebibmacro{bbx:savehash}%
-        \printnames{author}%
-        \iffieldundef{nameaddon}{}%
-        {\setunit{\addspace}%
-        \printtext[brackets]{\printfield{nameaddon}}}%
-\iffieldundef{authortype}%
-  {\setunit{\addspace}}%
-  {\setunit{\addcomma\space}}}%
-     \iffieldundef{authortype}%
-       {}%
-       {\usebibmacro{authorstrg}%
-       	\setunit{\addspace}}}%
-    {\global\undef\bbx@lasthash%
-     \usebibmacro{labeltitle}%
-     \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}%
-       {\bibnamedash}%
-       {\printnames{editor}%
-\setunit{\addspace}%
-\usebibmacro{bbx:savehash}}%
-     \usebibmacro{#1}%
-     \clearname{editor}%
-     \setunit{\addspace}}%
-    {\global\undef\bbx@lasthash%
-     \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*{labeltitle}{%
-%  \iffieldundef{label}%
-%    {\iffieldundef{shorttitle}%
-%       {\printfield{title}%
-%        \clearfield{title}}%
-%       {\printfield[title]{shorttitle}}}%
-%    {\printfield{label}}}%
-  }{}}%
-%    \end{macrocode}
-% \iffalse
-%</modern-bbx>
-% \fi
-%
 % \subsection{\file{philosophy-verbose.bbx}}
 %
 % \iffalse
@@ -3599,16 +3216,11 @@ This work has the LPPL maintenance status "author-maintained".
 %    \begin{macrocode}
 \RequireBibliographyStyle{authortitle}
 \RequireBibliographyStyle{philosophy-standard}
-
-\AtBeginShorthands{%
-%    \end{macrocode}
-% The annotation field is omitted in the list of shorthands:
-%    \begin{macrocode}
-  \togglefalse{bbx:annotation}%
 %    \end{macrocode}
 % In the list of shorthands we always use the shorthand
 % for the cross-referenced entries: 
 %    \begin{macrocode}
+\AtBeginShorthands{%
 \DeclareCiteCommand{\bbx@crossref@inbook}%
   {}%
   {\iffieldundef{shorthand}%
@@ -3624,21 +3236,8 @@ This work has the LPPL maintenance status "author-maintained".
   {}%
   {}%
 }
-\DeclareFieldFormat{edition}{%
-  \ifinteger{#1}{%
-    \ifdefstring{\bbx@editionformat}{arabic}
-    {\mkbibordedition{#1}~\bibstring{edition}}
-    {\ifdefstring{\bbx@editionformat}{Roman}%
-      {\RN{#1}~\bibstring{edition}}%
-      {\ifdefstring{\bbx@editionformat}{romansc}%
-        {\textsc{\Rn{#1}}~\bibstring{edition}}%
-        {\ifdefstring{\bbx@editionformat}{roman}%
-          {\Rn{#1}~\bibstring{edition}}
-          {\ifdefstring{\bbx@editionformat}{superscript}%
-            {\mkbibsuperscript{#1}}%
-            {\optionerror{editionformat}}}}}}}{#1}}%\isdot??  
 %    \end{macrocode}
-% \subsubsection{New macros}
+% \subsubsection{Authors and editors}
 %    \begin{macrocode}
 \renewbibmacro*{author}{%
   \ifboolexpr{%
@@ -3651,15 +3250,12 @@ This work has the LPPL maintenance status "author-maintained".
        {\printnames{author}%
         \iffieldundef{nameaddon}{}%
         {\setunit{\addspace}%
-        \printtext[brackets]{\printfield{nameaddon}}}%
-        \setunit{\addcomma\space}%
+        \printtext[brackets]{\printfield{nameaddon}}}%MOD
+        \setunit{\printdelim{editorstrgdelim}}%
         \usebibmacro{bbx:savehash}}%
         \usebibmacro{authorstrg}}%
     {\global\undef\bbx@lasthash}}%
-\renewbibmacro*{editor}{%
-  \usebibmacro{bbx:editor}{editorstrg}}%
-\renewbibmacro*{editor+others}{%
-  \usebibmacro{bbx:editor}{editor+othersstrg}}%
+
 \renewbibmacro*{bbx:editor}[1]{%
   \ifboolexpr{%
     test \ifuseeditor
@@ -3669,14 +3265,27 @@ This work has the LPPL maintenance status "author-maintained".
     {\usebibmacro{bbx:dashcheck}%
        {\bibnamedash}%
        {\printnames{editor}%
-\setunit{\addspace}%
+\setunit{\printdelim{editorstrgdelim}}%MOD
         \usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{editor}}%
     {\global\undef\bbx@lasthash}}%
-%    \end{macrocode}
-% \subsubsection{Crossreferences}
-%    \begin{macrocode}
+
+\renewbibmacro*{bbx:translator}[1]{%
+  \ifboolexpr{%
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }%
+    {\usebibmacro{bbx:dashcheck}%
+       {\bibnamedash}%
+       {\printnames{translator}%
+\setunit{\printdelim{editorstrgdelim}}%MOD
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{#1}%
+     \clearname{translator}}%
+    {\global\undef\bbx@lasthash}}%
+
 \newbibmacro*{nodash:author}{%
   \ifboolexpr{%
     test \ifuseauthor
@@ -3722,10 +3331,47 @@ This work has the LPPL maintenance status "author-maintained".
 
 \renewbibmacro*{relateddate}{%
   \setunit*{\addspace}%
-  \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}}
+  \printdate\ifdefstring{\bbx@editionformat}{superscript}%
+    {\printfield{edition}}{}}
 \renewbibmacro*{commarelateddate}{%
   \setunit*{\addcomma\space}%
-  \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}}
+  \printdate\ifdefstring{\bbx@editionformat}{superscript}%
+    {\printfield{edition}}{}}
+%    \end{macrocode}
+% \subsubsection{Crossreferences}
+%    \begin{macrocode}
+\DeclareCiteCommand{\bbx@crossref@inbook}%
+  {}%
+  {\ifciteseen{%
+   \ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}%
+  \setunit*{\addcomma\space}\printtext{%
+    \printfield[citetitle]{labeltitle}%
+      \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+   {\setunit{\addspace\midsentence}}%
+       \bibstring{opcit}}}%
+    {\DeclareNameAlias{sortname}{default}%
+    \usebibmacro{usedriver:book}}}%
+  {}%
+  {}%
+\DeclareCiteCommand{\bbx@crossref@incollection}%
+  {}%
+  {\ifciteseen{%
+\ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}%
+      \setunit{\addspace}%
+      \usebibmacro{editorstrg}%
+  \setunit*{\addcomma\space}\printtext{%
+    \printfield[citetitle]{labeltitle}%
+       \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+    {\setunit{\addspace\midsentence}}%
+        \bibstring{opcit}}}%
+    {\DeclareNameAlias{sortname}{default}%
+    \usebibmacro{usedriver:collection}}}%
+  {}%
+  {}%
 %    \end{macrocode}
 % \subsubsection{Bibliography drivers}
 %    \begin{macrocode}    
@@ -4026,41 +3672,640 @@ This work has the LPPL maintenance status "author-maintained".
   \newunit\newblock
   \usebibmacro{pageref}%
   }
+%    \end{macrocode}
+% \iffalse
+%</verbose-bbx>
+% \fi
+%
+% \subsection{\file{philosophy-classic.bbx}}
+%
+% \iffalse
+%<*classic-bbx>
+% \fi
+% \subsubsection{Initial settings}
+%    \begin{macrocode}
+\RequireBibliographyStyle{authoryear}
+\RequireBibliographyStyle{philosophy-standard}
+
+\newtoggle{bbx:square}
+\newtoggle{bbx:nodate}
+
+\DeclareBibliographyOption{square}[true]{%
+  \settoggle{bbx:square}{#1}}
+\DeclareBibliographyOption{nodate}[true]{%
+  \settoggle{bbx:nodate}{#1}}
+%    \end{macrocode}
+% We define the \opt{nodate} option also to be used in the
+% optional argument of \cmd{printbibliography}:
+%    \begin{macrocode}
+\define@key{blx@bib1}{nodate}[]{}%
+\define@key{blx@bib2}{nodate}[true]{%
+  \ifstrequal{#1}{false}{\togglefalse{bbx:nodate}}{}}%
+%    \end{macrocode}
+% The \opt{mergedate} option from \file{authoryear.bbx} must be completely redefined.
+% We actually revise only the \texttt{date+extrayear} macro and all the \texttt{issue+date} macros 
+% except for that one in the \cmd{bbx@opt@mergedate@maximum}.
+% The test \cmd{ifboolexpr} is required to make \texttt{bbx:nodate} macro work properly and 
+% the \cmd{postsepyear} command is used to surround the date label with a box of fixed width.
+%    \begin{macrocode}
+\def\bbx@opt@mergedate@maximum{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+          \printfield{issue}%
+           \setunit*{\addspace}%
+            \iffieldsequal{year}{labelyear}
+             {\printlabeldateextra}%
+             {\printfield{labelyear}%
+             \printfield{extrayear}}%
+          }}}%
+  \renewbibmacro*{date}{}%
+  \renewbibmacro*{issue+date}{}}
+
+% merge date with date label
+\def\bbx@opt@mergedate@compact{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+           \iffieldsequal{year}{labelyear}
+           {\printlabeldateextra}%
+           {\printfield{labelyear}%
+            \printfield{extrayear}}%
+           }}}%
+  \renewbibmacro*{date}{}%
+  \renewbibmacro*{issue+date}{%
+    \iffieldundef{issue}
+    {}
+      {\ifdefstring{\bbx@volnumformat}{parens}%
+      {\printtext{%
+        \printfield{issue}%
+        \printdate}}%
+      {\printtext[pureparens]{%
+        \printfield{issue}}}}%
+      \newunit}}
+
+% merge year-only date with date label
+\def\bbx@opt@mergedate@basic{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+         \printfield{labelyear}%
+         \printfield{extrayear}%
+        }}}%
+  \renewbibmacro*{date}{%
+    \iffieldundef{month}
+    {}
+    {\printdate}}%
+  \renewbibmacro*{issue+date}{%
+    \ifboolexpr{
+      test {\iffieldundef{issue}}
+      and
+      test {\iffieldundef{month}}
+    }
+    {}
+      {\ifdefstring{\bbx@volnumformat}{parens}%
+      {\printtext{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}%
+      {\printtext[pureparens]{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}}%
+    \newunit}}
+
+% merge year-only date with year-only date label
+\def\bbx@opt@mergedate@minimum{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+         \printfield{labelyear}%
+         \printfield{extrayear}%
+        }}}%
+  \renewbibmacro*{date}{%
+    \ifboolexpr{
+      test {\iffieldundef{month}}
+      and
+      test {\iffieldundef{extrayear}}
+    }
+    {}
+    {\printdate}}%
+  \renewbibmacro*{issue+date}{%
+    \ifboolexpr{
+      test {\iffieldundef{issue}}
+      and
+      test {\iffieldundef{month}}
+      and
+      test {\iffieldundef{extrayear}}
+    }
+    {}
+      {\ifdefstring{\bbx@volnumformat}{parens}%
+      {\printtext{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}%
+      {\printtext[pureparens]{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}}%
+    \newunit}}
+
+% don't merge date/issue with date label
+\def\bbx@opt@mergedate@false{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+                \printfield{labelyear}%
+                \printfield{extrayear}%
+            }}}%
+  \renewbibmacro*{date}{\printdate}%
+  \renewbibmacro*{issue+date}{%
+      {\ifdefstring{\bbx@volnumformat}{parens}%
+      {\printtext{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}%
+      {\printtext[pureparens]{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}}}}
+%    \end{macrocode}
+% Now we can execute all the style-specific options previously defined.
+% We also define other default options according to the style features.
+%    \begin{macrocode}
+\ExecuteBibliographyOptions{%
+  nodate      = true,
+  mergedate   = basic,    
+  uniquename  = false,
+  pagetracker = true,
+  singletitle = false,
+  square      = false,
+  dashed      = true,
+}
+%    \end{macrocode}
+% The \cmd{postsepyear} is introduced here for convenience.
+% It will be significantly redefined in \sty{philosophy-modern.bbx} below.
+%    \begin{macrocode}
+\newcommand*{\postsepyear}[1]{%
+  \printtext[parens]{#1}}
+\newbibmacro*{bbx:nodate}{%
+    \iftoggle{bbx:nodate}{%
+      \postsepyear{\midsentence\bibstring{nodate}}{}}}
+%    \end{macrocode}
+% The \opt{classic} and \opt{modern} styles 
+% redefine the \texttt{relateddate} and \texttt{commarelateddate} macros
+% because the date has to be printed after the name of the author/editor.
+% In the list of shorthands we need a standard entry,
+% with the date at the end and no date after the name of the author/editor.
+% So we overwrite these macros locally.
+%    \begin{macrocode}
+\AtBeginShorthands{%
+\renewcommand{\labelnamepunct}{\addcomma\space}%
+\renewbibmacro*{relateddate}{%
+  \setunit*{\addspace}%
+  \printdate}%
+\renewbibmacro*{commarelateddate}{%
+  \setunit*{\addcomma\space}%
+  \printdate}%
+%    \end{macrocode}
+% In the list of shorthands the author-date format is useless
+% but the cross-referenced entries still require this format.
+% So we first save the \texttt{date+extrayear} then we redefine it 
+% so that it print nothing and finally we restore it in the definition of \cmd{bbx@crossref@inbook}
+% command. The redefinition of \cmd{postsepyear} is also required here because the next codes are inherited
+% by the \sty{modern} style which globally define \cmd{postsepyear}.
+%    \begin{macrocode}
+\savebibmacro{date+extrayear}
+\renewbibmacro*{date+extrayear}{}
+\DeclareCiteCommand{\bbx@crossref@inbook}
+  {\renewcommand*{\postsepyear}{\printtext[parens]}%
+   \restorebibmacro{date+extrayear}}%
+  {\iffieldundef{shorthand}{%
+  \usebibmacro{citeindex}%
+  \ifuseeditor{%
+    \ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}}%
+     {\usebibmacro{labeltitle}}%
+    \setunit*{\addspace}%
+    \usebibmacro{date+extrayear}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+\DeclareCiteCommand{\bbx@crossref@incollection}%
+  {\renewcommand*{\postsepyear}{\printtext[parens]}%
+   \restorebibmacro{date+extrayear}}%
+  {\iffieldundef{shorthand}{%
+  \usebibmacro{citeindex}%
+  \ifuseeditor{%
+    \ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}}%
+     {\usebibmacro{labeltitle}}%
+    \setunit*{\addspace}%
+    \usebibmacro{date+extrayear}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+  }%
+%    \end{macrocode}
+% The \opt{editionformat=superscript} is not available for \sty{classic} and \sty{modern} styles
+% so if used it produces an error message. 
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \ifdefstring{\bbx@editionformat}{superscript}%
+   {\ClassError{biblatex-philosophy}
+   {\MessageBreak**** Option 'editionformat=superscript' 
+    available only for philosophy-verbose style}
+   {\MessageBreak**** Option 'editionformat=superscript' 
+    available only for philosophy-verbose style}}{}
+  \iftoggle{bbx:square}
+    {\renewcommand{\bibopenparen}{\bibopenbracket}%
+     \renewcommand{\bibcloseparen}{\bibclosebracket}}%
+    {}%
+  \setcounter{maxnamesincross}{\value{maxnames}}%
+  \setcounter{minnamesincross}{\value{minnames}}%
+}%
+\AtEveryBibitem{%
+  \iffieldequalstr{entrysubtype}{classic}{%
+    \togglefalse{bbx:nodate}}%
+}%
+%    \end{macrocode}
+% \subsubsection{New macros}
+% We redefine the \texttt{relateddate} bibliography macro
+% to delete the date at the end of the entry.
+%    \begin{macrocode}
+\renewbibmacro*{relateddate}{}
+\renewbibmacro*{commarelateddate}{}
+%    \end{macrocode}
+% \subsubsection{Authors and editors} In the |author| macro add the \bibfield{nameaddon} test which
+% prints the \bibfield{nameaddon} field (if defined) inside brackets. Moreover we use the new |editorstrgdelim| delimiter
+% previously defined in \file{philosophy-standard.bbx} which defaults to \cmd{addspace}. In the |editor| macro we modify only the line which uses the |editorstrgdelim| delimiter. In the |translator| macro we modify also the line with |#1| (this is missing in the code provided by \file{authoryear.bbx}).
+%    \begin{macrocode}
+\renewbibmacro*{author}{%
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\usebibmacro{bbx:savehash}%
+        \printnames{author}%
+        \iffieldundef{nameaddon}{}%
+        {\setunit{\addspace}%
+        \printtext[brackets]{\printfield{nameaddon}}}%*
+        \iffieldundef{authortype}
+          {\setunit{\printdelim{nameyeardelim}}}
+          {\setunit{\printdelim{editorstrgdelim}}}}%*
+     \iffieldundef{authortype}
+       {}
+       {\usebibmacro{authorstrg}%
+        \setunit{\printdelim{nameyeardelim}}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}
+
+\renewbibmacro*{bbx:editor}[1]{%
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\printnames{editor}%
+        \setunit{\printdelim{editorstrgdelim}}%MOD
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{#1}%
+     \clearname{editor}%
+     \setunit{\printdelim{nameyeardelim}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}
+
+\renewbibmacro*{bbx:translator}[1]{%
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\printnames{translator}%
+        \setunit{\printdelim{editorstrgdelim}}%MOD
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{#1}%MOD
+     \clearname{translator}%
+     \setunit{\printdelim{nameyeardelim}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}
+%    \end{macrocode}
+% When the \bibtype{incollection}s entries have no author, editor or translator the title is used in place of the label. As the title is printed inside quotes by default, the closing quotes end on a new line when using the \sty{modern} style. This is strange and, at least for me, unexpected. To avoid it we add \cmd{blx@postpunct}.
+%    \begin{macrocode}
+\renewbibmacro*{labeltitle}{%
+  \iffieldundef{label}
+    {\iffieldundef{shorttitle}
+       {\printfield{title}%
+        \clearfield{title}}
+       {\printfield[title]{shorttitle}}\blx@postpunct}
+    {\printfield{label}}}
+%    \end{macrocode}
+% \subsubsection{Crossreferences}
+%    \begin{macrocode}
 \DeclareCiteCommand{\bbx@crossref@inbook}%
   {}%
-  {\ifciteseen{%
-   \ifthenelse{\value{listtotal}=2}%
+  {\usebibmacro{citeindex}%
+  \ifuseeditor{%
+    \ifthenelse{\value{listtotal}=2}%
       {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}%
-  \setunit*{\addcomma\space}\printtext{%
-    \printfield[citetitle]{labeltitle}%
-      \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
-   {\setunit{\addspace\midsentence}}%
-       \bibstring{opcit}}}%
-    {\DeclareNameAlias{sortname}{default}%
-    \usebibmacro{usedriver:book}}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}}%
+     {\usebibmacro{labeltitle}}%
+    \setunit*{\addspace}%
+    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
   {}%
   {}%
 \DeclareCiteCommand{\bbx@crossref@incollection}%
   {}%
-  {\ifciteseen{%
-\ifthenelse{\value{listtotal}=2}%
+  {\usebibmacro{citeindex}%
+  \ifuseeditor{%
+    \ifthenelse{\value{listtotal}=2}%
       {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}%
-      \setunit{\addspace}%
-      \usebibmacro{editorstrg}%
-  \setunit*{\addcomma\space}\printtext{%
-    \printfield[citetitle]{labeltitle}%
-       \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
-    {\setunit{\addspace\midsentence}}%
-        \bibstring{opcit}}}%
-    {\DeclareNameAlias{sortname}{default}%
-    \usebibmacro{usedriver:collection}}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}}%
+     {\usebibmacro{labeltitle}}%
+    \setunit*{\addspace}%
+    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
   {}%
   {}%
 %    \end{macrocode}
 % \iffalse
-%</verbose-bbx>
+%</classic-bbx>
+% \fi
+%
+% \subsection{\file{philosophy-modern.bbx}}
+%
+% \iffalse
+%<*modern-bbx>
+% \fi
+% \subsubsection{Initial settings}
+%    \begin{macrocode}
+\RequireBibliographyStyle{philosophy-classic}
+%    \end{macrocode}
+% The \sty{modern} style has only one specific option (\opt{yearleft})
+% which is turned off by default. The other compatible option is \opt{nodate} and is inherited from
+% \sty{philosophy-classic.bbx}. 
+%    \begin{macrocode}
+\newtoggle{bbx:yearleft}
+\DeclareBibliographyOption{yearleft}[true]{%
+  \settoggle{bbx:yearleft}{#1}}
+%    \end{macrocode}
+% We define here the \opt{restoreclassic} option for the \cmd{printbibliography} and  \cmd{printbiblist} commands.
+%    \begin{macrocode}
+\define@key{blx@biblist1}{restoreclassic}[]{}
+\define@key{blx@biblist2}{restoreclassic}[true]{\setkeys{blx@bib2}{restoreclassic}}%
+\define@key{blx@bib1}{restoreclassic}[]{}
+\define@key{blx@bib2}{restoreclassic}[true]{%
+\ifstrequal{#1}{true}{%
+\setlength{\bibhang}{\parindent}%
+\renewcommand{\labelnamepunct}{\newunitpunct}%
+\renewcommand*{\postsepyear}[1]{\printtext[parens]{##1}}%
+\renewbibmacro*{author}{%
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}%
+       {\usebibmacro{bbx:savehash}%
+        \printnames{author}%
+        \iffieldundef{nameaddon}{}%
+        {\setunit{\addspace}%
+        \printtext[brackets]{\printfield{nameaddon}}}%*
+        \iffieldundef{authortype}
+          {\setunit{\printdelim{nameyeardelim}}}%
+          {\setunit{\printdelim{editorstrgdelim}}}}%*
+     \iffieldundef{authortype}
+       {}%
+       {\usebibmacro{authorstrg}%
+        \setunit{\printdelim{nameyeardelim}}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}%
+\renewbibmacro*{bbx:editor}[1]{%
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}%
+       {\printnames{editor}%
+        \setunit{\printdelim{editorstrgdelim}}%
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{##1}%
+     \clearname{editor}%
+     \setunit{\printdelim{nameyeardelim}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}%
+\renewbibmacro*{bbx:translator}[1]{%
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}%
+       {\printnames{translator}%
+        \setunit{\printdelim{editorstrgdelim}}%
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{##1}%
+     \clearname{translator}%
+     \setunit{\printdelim{nameyeardelim}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}%
+}{}}%
+%    \end{macrocode}
+% Execute default options.
+%    \begin{macrocode}
+\ExecuteBibliographyOptions{yearleft=false}
+%    \end{macrocode}
+% The separator to be printed after the name is omitted in the \sty{modern} style.
+%    \begin{macrocode}
+\renewcommand{\labelnamepunct}{}
+%    \end{macrocode}
+% We declare and set two new lengths: \cmd{yeartitle} and \cmd{postnamesep}.
+%    \begin{macrocode}
+\newlength{\yeartitle}
+\newlength{\postnamesep}
+\setlength{\yeartitle}{0.8em}
+\setlength{\postnamesep}{0.5ex plus 2pt minus 1pt}
+%    \end{macrocode}
+% These three standard lengths are redefined according to the desired characteristics.
+%    \begin{macrocode}
+\setlength{\bibitemsep}{\postnamesep}
+\setlength{\bibnamesep}{1.5ex plus 2pt minus 1pt}
+\setlength{\bibhang}{4\parindent}
+%    \end{macrocode}
+% In the list of shorthands we in fact restore the classic style
+% resetting \cmd{postsep} and \cmd{labelnamepunct}.
+%    \begin{macrocode}
+\AtBeginShorthands{%
+  \renewcommand{\postsep}{\addspace}%
+  \renewcommand{\labelnamepunct}{\newunitpunct}}
+\AtBeginBibliography{%
+  \iftoggle{bbx:yearleft}{%
+    \setlength{\yeartitle}{\fill}}{}}
+%    \end{macrocode}
+% The next two codes are the core of the \sty{modern} style. 
+% \cmd{postsep} is the space to be printed after the name (author/editor\dots)
+% and \cmd{postsepyear} sets the box that encloses the date label. \cmd{nopunct}
+% is required to remove the potential punctuation in the field to be printed after the date label.
+% This is useful for entries without an author or an editor such 
+% as \bibtype{periodical} or \bibtype{online}.
+%    \begin{macrocode}
+\newcommand{\postsep}{%
+  \null\par\nobreak\vskip\postnamesep%
+    \hskip-\bibhang\ignorespaces}
+\renewcommand*{\postsepyear}[1]{%
+  \printtext{\makebox[\bibhang][r]{%
+    #1\hskip\yeartitle}}\nopunct}
+\renewbibmacro*{bbx:nodate}{%
+  \postsepyear{%
+    \iftoggle{bbx:nodate}{%
+      \midsentence\bibstring{nodate}}{}}}
+%    \end{macrocode}
+% \subsubsection{Authors and editors}
+%    \begin{macrocode}
+\renewbibmacro*{author}{%
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {}%
+       {\usebibmacro{bbx:savehash}%
+        \printnames{author}%
+        \iffieldundef{nameaddon}{}%
+        {\setunit{\addspace}%
+        \printtext[brackets]{\printfield{nameaddon}}}%*
+        \postsep}%
+     \usebibmacro{date+extrayear}%
+       \iffieldundef{authortype}
+         {}%
+         {\usebibmacro{authorstrg}%
+         \printtext{\addcomma\space}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+       \postsep%
+     \usebibmacro{date+extrayear}%
+     }%
+  }
+
+\renewbibmacro*{bbx:editor}[1]{%
+  \ifboolexpr{%
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }%
+  {\usebibmacro{bbx:dashcheck}%
+    {}%
+    {\printnames{editor}%
+          \postsep%
+    \usebibmacro{bbx:savehash}}%
+    \usebibmacro{date+extrayear}%
+    \usebibmacro{#1}%
+    \clearname{editor}%
+    \printtext{\addcomma\space}%
+  }%
+  {\global\undef\bbx@lasthash%
+    \usebibmacro{labeltitle}%
+      \postsep%
+    \usebibmacro{date+extrayear}%
+  }%
+}%
+
+\renewbibmacro*{bbx:translator}[1]{%
+  \ifboolexpr{%
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }%
+  {\usebibmacro{bbx:dashcheck}%
+    {}%
+    {\printnames{translator}%
+          \postsep%
+    \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}
+\DeclareCiteCommand{\bbx@crossref@inbook}%
+  {\renewcommand*{\postsepyear}{\printtext[parens]}}%
+  {\usebibmacro{citeindex}%
+  \ifuseeditor{%
+    \ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}}%
+     {\usebibmacro{labeltitle}}%
+    \setunit*{\addspace}%
+    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
+  {}%
+  {}%
+\DeclareCiteCommand{\bbx@crossref@incollection}%
+  {\renewcommand*{\postsepyear}{\printtext[parens]}}%
+  {\usebibmacro{citeindex}%
+  \ifuseeditor{%
+    \ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}}%
+     {\usebibmacro{labeltitle}}%
+    \setunit*{\addspace}%
+    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%   
+  {}%
+  {}%
+%    \end{macrocode}
+% \iffalse
+%</modern-bbx>
 % \fi
 %
 %
@@ -4074,117 +4319,22 @@ This work has the LPPL maintenance status "author-maintained".
 %    \begin{macrocode}
 \RequireCitationStyle{verbose-trad2}
 
-\newtoggle{cbx:latinemph}
 \newtoggle{cbx:commacit}
 
-\DeclareBibliographyOption{latinemph}[true]{%
-  \settoggle{cbx:latinemph}{#1}}
 \DeclareBibliographyOption{commacit}[true]{%
   \settoggle{cbx:commacit}{#1}}
 
 \ExecuteBibliographyOptions{%
   idemtracker=false,
   loccittracker=strict,
-  latinemph=false,
   commacit=false}
 %    \end{macrocode}
-% Redefine \cmd{mkibid} for every citations when using
-% the \opt{latinemph} option:
-%    \begin{macrocode}
-\renewcommand*{\mkibid}{\iftoggle{cbx:latinemph}{\emph}{}}
-%    \end{macrocode}
-% The \bibfield{annotation} field is omitted in every citations:
-%    \begin{macrocode}
-\AtEveryCite{%
-  \togglefalse{bbx:annotation}%
-%    \end{macrocode}
-% \paragraph{Name formats}
+% The \bibfield{annotation} field is omitted in every citation:
 %    \begin{macrocode}
-%  \renewcommand*{\mkbibnamefamily}[1]{%
-%    \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
-%  \renewcommand*{\mkbibnamegiven}[1]{%
-%    \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
-%  \renewcommand*{\mkbibnameprefix}[1]{%
-%    \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
-%  \renewcommand*{\mkbibnamesuffix}[1]{%
-%    \iffootnote{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}{#1}}%
-  \renewbibmacro*{name:andothers}{%
-    \ifboolexpr{%
-      test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
-      and
-      test \ifmorenames
-    }%
-    {\ifnumgreater{\value{liststop}}{1}%
-      {\finalandcomma}%
-      {}%
-      \andothersdelim\bibstring[\mkibid]{andothers}}%
-    {}}%
-  \renewbibmacro*{list:andothers}{%
-    \ifboolexpr{%
-      test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
-      and
-      test \ifmoreitems
-    }%
-    {\ifnumgreater{\value{liststop}}{1}%
-      {\finalandcomma}%
-      {}%
-      \andmoredelim\bibstring[\mkibid]{andmore}}%
-    {}}%
-%    \end{macrocode}
-% The \texttt{labelname} format is redefined only if \opt{scauthors=cite} or \opt{scauthors=all} is given.
-%    \begin{macrocode}
-\DeclareNameFormat{labelname}{%
-\iftoggle{cbx:scauthorscite}{%
-  \iffootnote{%
-  \usebibmacro{scswitch}}{}}{}%
-  \nameparts{#1}%
-  \bibhyperref{\ifcase\value{uniquename}%
-    \usebibmacro{name:family}%
-      {\namepartfamily}%
-      {\namepartgiven}%
-      {\namepartprefix}%
-      {\namepartsuffix}%
-  \or
-    \ifuseprefix
-      {\usebibmacro{name:given-family}%
-        {\namepartfamily}%
-        {\namepartgiveni}%
-        {\namepartprefix}%
-        {\namepartsuffixi}}%
-      {\usebibmacro{name:given-family}%
-        {\namepartfamily}%
-        {\namepartgiveni}%
-        {\namepartprefixi}%
-        {\namepartsuffixi}}%
-  \or
-    \usebibmacro{name:given-family}%
-      {\namepartfamily}%
-      {\namepartgiven}%
-      {\namepartprefix}%
-      {\namepartsuffix}%
-  \fi
-  \usebibmacro{name:andothers}}}%
-}%
-%    \end{macrocode}
-% 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{\usebibmacro{scswitch}}{}%
-  \nameparts{#1}%
-  \ifgiveninits
-    {\usebibmacro{name:given-family}%
-      {\namepartfamily}%
-      {\namepartgiveni}%
-      {\namepartprefix}%
-      {\namepartsuffix}}%
-    {\usebibmacro{name:given-family}%
-      {\namepartfamily}%
-      {\namepartgiven}%
-      {\namepartprefix}%
-      {\namepartsuffix}}%
-  \usebibmacro{name:andothers}}%
+\AtEveryCite{\togglefalse{bbx:annotation}}
 %    \end{macrocode}
 % \subsubsection{New macros}
+% These two macros come from \file{verbose-trad1.cbx} without any changes:
 %    \begin{macrocode}
 \newbibmacro*{cite:opcit}{%
   \printtext[bibhyperlink]{\bibstring[\mkibid]{opcited}}}
@@ -4194,7 +4344,9 @@ This work has the LPPL maintenance status "author-maintained".
     \bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
       \bibstring[\mkibid]{loccit}}}%
   \global\toggletrue{cbx:loccit}}
-
+%    \end{macrocode}
+% The following macros come from \file{verbose-trad2.cbx} and has been redefined according to the desired features.
+%    \begin{macrocode}
 \renewbibmacro*{cite:ibid}{%
   \ifloccit
   {\usebibmacro{cite:loccit}}{%
@@ -4209,9 +4361,14 @@ This work has the LPPL maintenance status "author-maintained".
       \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
       {\setunit{\addspace\midsentence}}}%
     \bibstring{opcit}}}
-
-\renewbibmacro*{cite:full}{%
-  \iftoggle{cbx:shorthandintro}{%
+%    \end{macrocode}
+% \subsubsection{Citation commands}
+% The |cite:full| macro employs the bibliography driver to print the entry
+% so it has to be redefined in order to use the |scdefault| name format
+% when \opt{scauthor=cite} or \opt{scauthor=full} options are active. The test
+% for the \opt{shorthandintro} option allows for shorthand also in the first citation of an entry.
+%    \begin{macrocode}       
+\newbibmacro{cite:full:noshorthand}{%
     \usebibmacro{cite:full:citepages}%
     \global\toggletrue{cbx:fullcite}%
     \printtext[bibhypertarget]{%
@@ -4219,16 +4376,24 @@ This work has the LPPL maintenance status "author-maintained".
       {\iftoggle{cbx:scauthorscite}{%
       \DeclareNameAlias{sortname}{scdefault}}%
       {\DeclareNameAlias{sortname}{default}}}%
-      {\thefield{entrytype}}}%
-    \usebibmacro{shorthandintro}}%
-  {\usebibmacro{cite:shorthand}}}
+      {\thefield{entrytype}}}}
+
+\renewbibmacro*{cite:full}{%
+\iffieldundef{shorthand}
+  {\usebibmacro{cite:full:noshorthand}}
+  {\iftoggle{cbx:shorthandintro}
+    {\usebibmacro{cite:full:noshorthand}%
+     \usebibmacro{shorthandintro}}%
+    {\usebibmacro{cite:shorthand}}}}
 
 \renewbibmacro*{cite:idem}{%
   \iftoggle{cbx:scauthorscite}{%
     \bibstring[\mkbibsc]{idem\thefield{gender}}}{%
     \bibstring[\mkibid]{idem\thefield{gender}}}%
   \setunit{\nametitledelim}}
-
+%    \end{macrocode}
+% A new macro to be used in the new \cmd{ccite} command defined below.
+%    \begin{macrocode}       
 \newbibmacro*{ccite:cite}{%
   \usebibmacro{related:clearauthors}%
   \usebibmacro{cite:citepages}%
@@ -4244,22 +4409,14 @@ This work has the LPPL maintenance status "author-maintained".
       \usebibmacro{cite:save}}}}
 %    \end{macrocode}
 % \subsubsection{Citation commands}
+% This is the only new citation command introduced by the \sty{verbose} style. It is similar to \cmd{cite} but omits the author.
 %    \begin{macrocode}       
 \DeclareCiteCommand{\ccite}
-{\usebibmacro{prenote}}%
-{\usebibmacro{citeindex}%
-  \usebibmacro{ccite:cite}}
-{\multicitedelim}
-{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\fullcite}
-{\usebibmacro{prenote}}
-{\usedriver
-     {\iftoggle{cbx:scauthorscite}%
-       {\DeclareNameAlias{sortname}{scdefault}}%
-       {\DeclareNameAlias{sortname}{default}}}%
-  {\thefield{entrytype}}}
-{\multicitedelim}
-{\usebibmacro{postnote}}
+  {\usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+    \usebibmacro{ccite:cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
 %    \end{macrocode}
 %
 % \iffalse
@@ -4277,32 +4434,27 @@ This work has the LPPL maintenance status "author-maintained".
 %    \begin{macrocode}
 \RequireCitationStyle{authoryear-comp}
 
-\ExecuteBibliographyOptions{%
-  citetracker = true,
-}
+\ExecuteBibliographyOptions{citetracker}
 
-%\AtEveryCite{%
-%\renewcommand*{\mkbibnamefamily}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
-%\renewcommand*{\mkbibnamegiven}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
-%\renewcommand*{\mkbibnameprefix}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%
-%\renewcommand*{\mkbibnamesuffix}[1]{\iftoggle{cbx:scauthorscite}{\mkbibsc{#1}}{#1}}%  
-%}
-\AtEveryCite{%
-  \iftoggle{cbx:scauthorscite}%
-   {\let\mkbibnamefamily\mkbibsc%
-    \let\mkbibnamegiven\mkbibsc%
-    \let\mkbibnameprefix\mkbibsc%
-   \let\mkbibnamesuffix\mkbibsc}%
-   {}}%
-
-\newcommand{\switchclass}[2]{%
+\newcommand{\switchATAY}[2]{%
   \iffieldequalstr{entrysubtype}{classic}%
     {\usebibmacro{#1}}%
     {\usebibmacro{#2}}}
 %    \end{macrocode}
 % \subsubsection{New macros}
+% The |cbx:testshorthand| macro provide a test for the
+% \opt{shorthandintro} option. This is the same for both author-title and author-year styles. The shorthand intro is printed only if the \opt{shorthandintro} option is active and the entry has not been previously cited. Note that this macro is used only when the shorthand exists (see below).
+%    \begin{macrocode} 
+\newbibmacro*{cbx:testshorthand}[1]{%
+\ifboolexpr{
+  not test {\iftoggle{cbx:shorthandintro}}
+    or
+  test \ifciteseen}
+  {\usebibmacro{cite:shorthand}}{\usebibmacro{#1}%
+   \usebibmacro{shorthandintro}}}
+%    \end{macrocode}
 % \paragraph{Author-title macros}
-% Import the \texttt{:AT} macros from the \file{authortitle-comp.cbx} file.
+% Import from \file{authortitle-comp.cbx} all the macros but |cite:shorthand| that has been loaded above.
 %    \begin{macrocode}
 \newbibmacro*{cite:init:AT}{%
   \ifnumless{\value{multicitecount}}{2}
@@ -4315,24 +4467,27 @@ This work has the LPPL maintenance status "author-maintained".
 \newbibmacro*{cite:reinit:AT}{%
   \global\undef\cbx@lasthash}
 
-\newbibmacro*{cite:AT}{%
-  \iffieldundef{shorthand}
-    {\iffieldequals{namehash}{\cbx@lasthash}
-       {\setunit{\compcitedelim}}%
+\newbibmacro*{cite:AT:noshorthand}{%
+\iffieldequals{namehash}{\cbx@lasthash}
+       {\setunit{\compcitedelim}}
        {\ifnameundef{labelname}
           {}%
           {\printnames{labelname}%
-           \setunit{\nametitledelim}}%
+           \setunit{\printdelim{nametitledelim}}}%
         \savefield{namehash}{\cbx@lasthash}}%
      \usebibmacro{cite:title:AT}}
-    {\usebibmacro{cite:shorthand}%
+
+\newbibmacro*{cite:AT}{%
+  \iffieldundef{shorthand}
+    {\usebibmacro{cite:AT:noshorthand}}
+    {\usebibmacro{cbx:testshorthand}{cite:AT:noshorthand}%
      \usebibmacro{cite:reinit:AT}}%
   \setunit{\multicitedelim}}
 
 \newbibmacro*{citetitle:AT}{%
   \iffieldundef{shorthand}
     {\usebibmacro{cite:title:AT}}%
-    {\usebibmacro{cite:shorthand}}%
+    {\usebibmacro{cbx:testshorthand}{cite:title:AT}}%
   \setunit{\multicitedelim}}
 
 \newbibmacro*{textcite:AT}{%
@@ -4342,24 +4497,21 @@ This work has the LPPL maintenance status "author-maintained".
        {}%
        {\printnames{labelname}%
         \setunit{%
-    \global\booltrue{cbx:parens}%
-    \addspace\bibopenparen}}%
+          \global\booltrue{cbx:parens}%
+          \printdelim{nametitledelim}\bibopenparen}}%
+     \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
   \iffieldundef{shorthand}
     {\usebibmacro{cite:title:AT}}%
-    {\iftoggle{cbx:shorthandintro}{%
-      \ifciteseen{%
-       \usebibmacro{cite:shorthand}}%
-       {\usebibmacro{shorthandintro}}}%
-     {\usebibmacro{cite:shorthand}}}%
+    {\usebibmacro{cbx:testshorthand}{cite:title:AT}}%
   \setunit{%
     \ifbool{cbx:parens}
       {\bibcloseparen\global\boolfalse{cbx:parens}}
       {}%
-    \multicitedelim}}
+    \textcitedelim}}
 
 \newbibmacro*{cite:title:AT}{%
   \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
@@ -4368,22 +4520,23 @@ This work has the LPPL maintenance status "author-maintained".
   \ifnameundef{labelname}
     {\setunit{%
        \global\booltrue{cbx:parens}%
-       \addspace\bibopenparen}}
+       \extpostnotedelim\bibopenparen}}
     {\setunit{\postnotedelim}}%
   \printfield{postnote}%
   \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-   {\bibcloseparen\global\boolfalse{cbx:parens}}
-   {}}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-   {\bibcloseparen\global\boolfalse{cbx:parens}}
-   {}%
-       \multicitedelim}}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}%
+       \textcitedelim}}}
 %    \end{macrocode}
 % \paragraph{Author-year macros}
+% Import from \file{authoryear-comp.cbx} all the common macros with \file{authortitle-comp}.
 %    \begin{macrocode}
 \newbibmacro*{cite:init:AY}{%
   \ifnumless{\value{multicitecount}}{2}
@@ -4393,98 +4546,117 @@ This work has the LPPL maintenance status "author-maintained".
     {\iffieldundef{prenote}
        {}
        {\global\undef\cbx@lasthash
-  \global\undef\cbx@lastyear}}}
+        \global\undef\cbx@lastyear}}}
 
 \newbibmacro*{cite:reinit:AY}{%
   \global\undef\cbx@lasthash
   \global\undef\cbx@lastyear}
 
+\newbibmacro*{cite:AY:noshorthand}{%
+\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+       {\usebibmacro{cite:label}%
+        \setunit{\printdelim{nonameyeardelim}}%
+        \usebibmacro{cite:labelyear+extrayear}%
+        \usebibmacro{cite:reinit}}
+       {\iffieldequals{namehash}{\cbx@lasthash}
+          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+             {\setunit{\addcomma}%
+              \usebibmacro{cite:extrayear}}
+             {\setunit{\compcitedelim}%
+              \usebibmacro{cite:labelyear+extrayear}%
+              \savefield{labelyear}{\cbx@lastyear}}}
+          {\printnames{labelname}%
+           \setunit{\printdelim{nameyeardelim}}%
+           \usebibmacro{cite:labelyear+extrayear}%
+           \savefield{namehash}{\cbx@lasthash}%
+           \savefield{labelyear}{\cbx@lastyear}}}}
+
 \newbibmacro*{cite:AY}{%
-  \iffieldundef{shorthand}%
-    {\usebibmacro{cite:noshorthand}}%
-    {\iftoggle{cbx:shorthandintro}%
-    {\ifciteseen{\usebibmacro{cite:shorthand}}%
-     {\usebibmacro{cite:noshorthand}%
-     \usebibmacro{shorthandintro}}}%
-     {\usebibmacro{cite:shorthand}}%
-     \usebibmacro{cite:reinit:AY}}%
+  \iffieldundef{shorthand}
+    {\usebibmacro{cite:AY:noshorthand}}%
+    {\usebibmacro{cbx:testshorthand}{cite:AY:noshorthand}%
+     \usebibmacro{cite:reinit}}%
   \setunit{\multicitedelim}}
-    
-\newbibmacro*{textcite:AY}{%
-  \iffieldequals{namehash}{\cbx@lasthash}%
-    {\iffieldundef{shorthand}%noshorthand
-       {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
-          {\setunit{\addcomma}%
-           \usebibmacro{cite:extrayear}}%
-          {\setunit{\compcitedelim}%
-           \usebibmacro{cite:labelyear+extrayear}%
-           \savefield{labelyear}{\cbx@lastyear}}}%
-       {\setunit{\compcitedelim}%shorthand
-       \iftoggle{cbx:shorthandintro}%
-        {\ifciteseen
-        {\usebibmacro{cite:shorthand}}%
-        {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
+
+\newbibmacro*{textcite:AY:noshorthand:A}{%
+\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
           {\setunit{\addcomma}%
-           \usebibmacro{cite:extrayear}}%
+           \usebibmacro{cite:extrayear}}
           {\setunit{\compcitedelim}%
            \usebibmacro{cite:labelyear+extrayear}%
-           \savefield{labelyear}{\cbx@lastyear}}%
-           \usebibmacro{shorthandintro}}}%
-           {\usebibmacro{cite:shorthand}}%
-        \global\undef\cbx@lastyear}}%
+           \savefield{labelyear}{\cbx@lastyear}}}
+
+\newbibmacro*{textcite:AY:noshorthand:B}{%
+\usebibmacro{cite:label}%
+           \setunit{%
+             \global\booltrue{cbx:parens}%
+             \printdelim{nonameyeardelim}\bibopenparen}%
+           \ifnumequal{\value{citecount}}{1}
+             {\usebibmacro{prenote}}
+             {}%
+           \usebibmacro{cite:labelyear+extrayear}}
+
+\newbibmacro*{textcite:AY:noshorthand:C}{%
+\iffieldundef{labelyear}
+             {\usebibmacro{cite:label}}
+             {\usebibmacro{cite:labelyear+extrayear}}%
+           \savefield{labelyear}{\cbx@lastyear}}
+% EXPERIMENTAL. 
+%\newbibmacro*{test:shorthand}{%
+%  \ifboolexpr{
+%    (
+%        test {\ifnumgreater{\value{citetotal}}{1}}
+%        or
+%        test {\iffieldundef{shorthand}}
+%    )
+%    or
+%    (
+%        test {\ifnumequal{\value{citetotal}}{1}}
+%        and
+%        not test {\iffieldundef{shorthand}}
+%        and
+%        not test \ifciteseen
+%        and 
+%        test {\iftoggle{cbx:shorthandintro}}%phil
+%    )
+%   }{\printnames{labelname}%
+%        \setunit{%
+%          \global\booltrue{cbx:parens}%
+%          \printdelim{nameyeardelim}\bibopenparen}}
+%{}%
+%}
+
+\newbibmacro*{textcite:AY}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+    {\iffieldundef{shorthand}
+       {\usebibmacro{textcite:AY:noshorthand:A}}
+       {\setunit{\compcitedelim}%
+\usebibmacro{cbx:testshorthand}{textcite:AY:noshorthand:A}%
+        \global\undef\cbx@lastyear}}
     {\ifnameundef{labelname}%
-       {\iffieldundef{shorthand}%shorthand
-          {\usebibmacro{cite:label}%
-   \setunit{%
-     \global\booltrue{cbx:parens}%
-     \addspace\bibopenparen}%
-   \ifnumequal{\value{citecount}}{1}%
-     {\usebibmacro{prenote}}%
-     {\usebibmacro{cite:shorthand}}%
-   \usebibmacro{cite:labelyear+extrayear}}%
-          {\iftoggle{cbx:shorthandintro}%
-          {\ifciteseen%shorthand
-          {\usebibmacro{cite:shorthand}}%
-          {\usebibmacro{cite:label}%
-   \setunit{%
-     \global\booltrue{cbx:parens}%
-     \addspace\bibopenparen}%
-   \ifnumequal{\value{citecount}}{1}%
-     {\usebibmacro{prenote}}%
-     {\usebibmacro{cite:shorthand}}%
-   \usebibmacro{cite:labelyear+extrayear}%
-   \usebibmacro{shorthandintro}}}}%
-   {\usebibmacro{cite:shorthand}}}%
+       {\iffieldundef{shorthand}
+          {\usebibmacro{textcite:AY:noshorthand:B}}
+          {\usebibmacro{cbx:testshorthand}{textcite:AY:noshorthand:B}}}
        {\printnames{labelname}%
-\setunit{%
-  \global\booltrue{cbx:parens}%
-  \addspace\bibopenparen}%
-\ifnumequal{\value{citecount}}{1}%
-  {\usebibmacro{prenote}}%
-  {}%
-        \iffieldundef{shorthand}%noshorthand
-          {\iffieldundef{labelyear}%
-             {\usebibmacro{cite:label}}%
-             {\usebibmacro{cite:labelyear+extrayear}}%
-           \savefield{labelyear}{\cbx@lastyear}}%
-          {\iftoggle{cbx:shorthandintro}%
-          {\ifciteseen%
-                    {\usebibmacro{cite:shorthand}}%
-                    {\iffieldundef{labelyear}%
-             {\usebibmacro{cite:label}}%
-             {\usebibmacro{cite:labelyear+extrayear}}%
-           \savefield{labelyear}{\cbx@lastyear}%
-           \usebibmacro{shorthandintro}}%
-           \global\undef\cbx@lastyear}%
-           {\usebibmacro{cite:shorthand}}}%
-        \savefield{namehash}{\cbx@lasthash}}}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \printdelim{nameyeardelim}\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
+        \iffieldundef{shorthand}
+          {\usebibmacro{textcite:AY:noshorthand:C}}%
+          {\usebibmacro{cbx:testshorthand}{textcite:AY:noshorthand:C}%
+           \global\undef\cbx@lastyear}}%
+     \stepcounter{textcitecount}%
+     \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
-    \ifbool{cbx:parens}%
-      {\bibcloseparen\global\boolfalse{cbx:parens}}%
+    \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
       {}%
-    \multicitedelim}}%
+    \textcitedelim}}
 
 \newbibmacro*{textcite:postnote:AY}{%
   \usebibmacro{postnote}%
@@ -4500,54 +4672,28 @@ This work has the LPPL maintenance status "author-maintained".
    {}%
        \multicitedelim}}}
 %    \end{macrocode}
-% The \texttt{cite:shorthand} is the same for both
-% author-title and author-year styles:
-%    \begin{macrocode}
-\renewbibmacro*{cite:shorthand}{%
-  \printtext[bibhyperref]{\printfield{shorthand}}}
-%    \end{macrocode}
 % If the field \bibfield{entrysubtype} equals to \texttt{classic}
-% the citation commands will use the author-title macros:
+% the citation commands will use the author-title macros. In this way it is as if you were using the citation commands of the \sty{authortitle-comp} style.
 %    \begin{macrocode}
 \renewbibmacro*{cite:init}{%
-  \switchclass{cite:init:AT}{cite:init:AY}}
+   \switchATAY{cite:init:AT}{cite:init:AY}}
 \renewbibmacro*{cite:reinit}{%
-  \switchclass{cite:reinit:AT}{cite:reinit:AY}}
+   \switchATAY{cite:reinit:AT}{cite:reinit:AY}}
 \renewbibmacro*{cite}{%
-  \switchclass{cite:AT}{cite:AY}}
+   \switchATAY{cite:AT}{cite:AY}}
 \renewbibmacro*{textcite}{%
-  \switchclass{textcite:AT}{textcite:AY}}
+   \switchATAY{textcite:AT}{textcite:AY}}
 \renewbibmacro*{textcite:postnote}{%
-  \switchclass{textcite:postnote:AT}{textcite:postnote:AY}}
-
-\newbibmacro*{cite:noshorthand}{%
-\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}%
-       {\usebibmacro{cite:label}%
-\setunit{\addspace}%
-\usebibmacro{cite:labelyear+extrayear}%
-        \usebibmacro{cite:reinit}}%
-       {\iffieldequals{namehash}{\cbx@lasthash}%
-          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
-             {\setunit{\addcomma}%
-              \usebibmacro{cite:extrayear}}%
-             {\setunit{\compcitedelim}%
-              \usebibmacro{cite:labelyear+extrayear}%
-              \savefield{labelyear}{\cbx@lastyear}}}%
-          {\printnames{labelname}%
-      \setunit{\nameyeardelim}%
-           \usebibmacro{cite:labelyear+extrayear}%
-           \savefield{namehash}{\cbx@lasthash}%
-           \iffieldundef{postnote}%
-              {\savefield{labelyear}{\cbx@lastyear}}{}}}}
+   \switchATAY{textcite:postnote:AT}{textcite:postnote:AY}}
 %    \end{macrocode}
 % \subsubsection{Citation commands}
+% These are two common commands for \sty{authortitle-comp} and \sty{authoryear-comp} that require the \cmd{switchATAY} to be executed internally.
 %    \begin{macrocode}
 \DeclareCiteCommand*{\cite}
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \switchclass{citetitle:AT}{citeyear}}%
+    \switchATAY{citetitle:AT}{citeyear}}%
   {}
   {\usebibmacro{postnote}}
 
@@ -4555,16 +4701,20 @@ This work has the LPPL maintenance status "author-maintained".
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \switchclass{citetitle:AT}{citeyear}}
+    \switchATAY{citetitle:AT}{citeyear}}
   {}
   {\usebibmacro{postnote}}
-
+%    \end{macrocode}
+% These citation commands are from \file{biblatex.def}. Maybe they should not be redefined. Do we really need years and titles hyperrefered?
+%    \begin{macrocode}
 \DeclareCiteCommand{\citetitle}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
-  {\indexfield{indextitle}%
-    \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
+  {\ifciteindex
+     {\indexfield{indextitle}}
+     {}%
+   \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
@@ -4572,8 +4722,10 @@ This work has the LPPL maintenance status "author-maintained".
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
-  {\indexfield{indextitle}%
-    \printtext[bibhyperref]{\printfield[citetitle]{title}}}
+  {\ifciteindex
+     {\indexfield{indextitle}}
+     {}%
+   \printtext[bibhyperref]{\printfield[citetitle]{title}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
@@ -4585,6 +4737,32 @@ This work has the LPPL maintenance status "author-maintained".
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
+\DeclareCiteCommand*{\citeyear}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\printtext[bibhyperref]{\printfield{year}\printfield{extrayear}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\citedate}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\printtext[bibhyperref]{\printdate}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\citedate}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\printtext[bibhyperref]{\printdateextra}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+%    \end{macrocode}
+% This is the only new command provided by the style:
+%    \begin{macrocode}
 \DeclareCiteCommand{\footcitet}[\mkbibfootnote]
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
@@ -4592,8 +4770,7 @@ This work has the LPPL maintenance status "author-maintained".
   {}%
   {\usebibmacro{textcite:postnote}}
 %    \end{macrocode}
-% This command is now deprecated because it is substituted by
-% the \bibfield{entrysubtype=classic} mechanism:
+% This next command is now deprecated because it is substituted by the \bibfield{entrysubtype=classic} mechanism.
 %    \begin{macrocode}
 \DeclareCiteCommand{\sdcite}
   {\boolfalse{citetracker}%
@@ -4621,20 +4798,6 @@ This work has the LPPL maintenance status "author-maintained".
 %    \begin{macrocode}
 \RequireCitationStyle{philosophy-classic}
 %    \end{macrocode}
-% The \cmd{fullcite} command simply prints the bibliography entry
-% supplied by the style used. So we have to redefine this command
-% in order to get the same output as that produced in 
-% the \sty{philosophy-classic} style:
-%    \begin{macrocode}
-\DeclareCiteCommand{\fullcite}%
-  {\usebibmacro{prenote}}%
-  {\setkeys{blx@bib2}{restoreclassic}% 
-  \usedriver%
-     {\DeclareNameAlias{sortname}{default}}%
-     {\thefield{entrytype}}}%
-  {\multicitedelim}%
-  {\usebibmacro{postnote}}%
-%    \end{macrocode}
 %
 % \iffalse
 %</modern-cbx>
@@ -4653,9 +4816,12 @@ This work has the LPPL maintenance status "author-maintained".
 \InheritBibliographyExtras{italian}
 
 \DeclareBibliographyExtras{%
-\protected\def\bibrangedash{%
-    -\penalty\hyphenpenalty}%
-  \protected\def\bibdatedash{\textendash}}%
+%    \end{macrocode}
+% We prefer the hyphen dash (-) to the en dash (--) for page and date ranges. 
+%    \begin{macrocode}  
+  \protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+  \protected\def\bibdaterangesep{\bibrangedash}%
+}%
 %    \end{macrocode}
 % The \texttt{opcit} string used by the \sty{verbose-trad2} style works like the Italian `cit.' and it is already defined in the \file{italian.lbx} file with ``cit.'. The string ``cit.' is added to a truncated entry (usually after the short title) to mark that it has been previously cited. Additionally in the Italian bibliographies there is also the special string ``op. cit.'' which stands for ``the only entry'' of an author. For example, if ``Eco, \emph{Il nome della rosa}'' is the only entry of Eco cited in the paper, from the second occurence it will be abbreviated with ``Eco, \emph{op. cit.}''. So we need a new string, \texttt{opcited}, in order to get ``op. cit.'' for these cases:
 %    \begin{macrocode}  
@@ -4664,41 +4830,49 @@ This work has the LPPL maintenance status "author-maintained".
 % First of all we inherit the italian localization module and then we define the new string \texttt{opcited} and the other strings as well.
 %    \begin{macrocode}       
 \DeclareBibliographyStrings{%   
-  inherit            =  {italian},
-  opcited            =  {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+  inherit            = {italian},
+  opcited            = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
 %    \end{macrocode}
 % Redefined strings:
 %    \begin{macrocode}       
-  ibidem             =  {{ivi}{ivi}},
-  loccit             =  {{ibidem}{ibidem}},
-  editor             =  {{a cura di}{a cura di}},
-  editors            =  {{a cura di}{a cura di}},
-  backrefpage        =  {{citato a pagina}{citato a \bibsstring{page}\adddot}},
-  backrefpages       =  {{citato alle pagine}{citato alle \bibsstring{pages}\adddot}},  
-  nodate             =  {{senza data}{s\adddot d\adddot}},
-  volumes            =  {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol\adddot}}},
-  pages              =  {{pagine}{\iftoggle{bbx:classical}{pp\adddot}{p\adddot}}},
-  columns            =  {{colonne}{\iftoggle{bbx:classical}{coll\adddot}{col\adddot}}},
-  lines              =  {{righe}{\iftoggle{bbx:classical}{rr\adddot}{r\adddot}}},
-  verses             =  {{versi}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}}, 
-  paragraphs         =  {{paragrafi}{\iftoggle{bbx:classical}{parr\adddot}{par\adddot}}},
-  section            =  {{sezione}{sez\adddot}},
-  sections           =  {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}},
-  withcommentator    =  {{commenti di}{commenti di}},
-  withannotator      =  {{annotazioni di}{annotazioni di}},
-  withintroduction   =  {{introduzione di}{introduzione di}},
-  withforeword       =  {{prefazione di}{prefazione di}},
-  withafterword      =  {{postfazione di}{postfazione di}},
+  ibidem             = {{ivi}{ivi}},
+  loccit             = {{ibidem}{ibidem}},
+  editor             = {{a cura di}{a cura di}},
+  editors            = {{a cura di}{a cura di}},
+  backrefpage        = {{citato a pagina}{citato a \bibsstring{page}\adddot}},
+  backrefpages       = {{citato alle pagine}{citato alle \bibsstring{pages}\adddot}},  
+  nodate             = {{senza data}{s\adddot d\adddot}},
+  volumes            = {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol\adddot}}},
+  pages              = {{pagine}{\iftoggle{bbx:classical}{pp\adddot}{p\adddot}}},
+  columns            = {{colonne}{\iftoggle{bbx:classical}{coll\adddot}{col\adddot}}},
+  lines              = {{righe}{\iftoggle{bbx:classical}{rr\adddot}{r\adddot}}},
+  verses             = {{versi}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}}, 
+  paragraphs         = {{paragrafi}{\iftoggle{bbx:classical}{parr\adddot}{par\adddot}}},
+  byreviser          = {{revisione di}{rev\adddotspace di}},
+  translationof      = {{traduzione di}{trad\adddotspace di}},
+  translationas      = {{traduzione italiana}{trad\adddotspace it\adddot}},
+  reviewof           = {{recensione di}{rec\adddotspace di}},
+  origpubas          = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
+  astitle            = {{come}{come}}, 
+  bypublisher        = {{\addcomma\space}{\addcomma\space}},
+  section            = {{sezione}{sez\adddot}},
+  sections           = {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}},
+  withcommentator    = {{commenti di}{commenti di}},
+  withannotator      = {{annotazioni di}{annotazioni di}},
+  withintroduction   = {{introduzione di}{introduzione di}},
+  withforeword       = {{prefazione di}{prefazione di}},
+  withafterword      = {{postfazione di}{postfazione di}},
+%    \end{macrocode}
+% The |endothers| and |andmore| strings must be printed in italic shape
+% when using the \opt{latinemph} option so we add \cmd{mkibid}. Adding it to the wrapper
+% of the \cmd{bibstring} command in the |name:andothers| and |list:andothers| macros
+% is a wrong choice because some languages (for example German) uses non Latin expressions for those strings.
+%    \begin{macrocode}
+  andothers          = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+  andmore            = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
 %    \end{macrocode}
 % The followings strings are not yet defined in \file{italian.lbx} file:
 %    \begin{macrocode}       
- origpubas          =  {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
- bypublisher        =  {{\addcomma\space}{\addcomma\space}},
- astitle            =  {{come}{come}}, 
- reviewof           =  {{recensione di}{rec\adddotspace di}},
- byreviser          =  {{revisione di}{rev\adddotspace di}},
- translationof      =  {{traduzione di}{trad\adddotspace di}},
- translationas      =  {{traduzione italiana}{trad\adddotspace it\adddot}}
  reviser            = {{revisore}{rev\adddot}},% FIXME: missing
  revisers           = {{revisori}{rev\adddot}},% FIXME: missing
  founder            = {{fondatore}{fond\adddot}},% FIXME: missing
@@ -4706,141 +4880,141 @@ This work has the LPPL maintenance status "author-maintained".
  continuator        = {{continuatore}{cont\adddot}},% FIXME: missing
  continuators       = {{continuatori}{cont\adddot}},% FIXME: missing
   editortr         = {{curatore e traduttore}% FIXME: missing
-  	{cur\adddotspace e trad\adddot}},
+    {cur\adddotspace e trad\adddot}},
   editorstr        = {{curatori e traduttori}% FIXME: missing
-  	{cur\adddotspace e trad\adddot}},
+    {cur\adddotspace e trad\adddot}},
   editorco         = {{curatore e commentatore}% FIXME: missing
-  	{cur\adddotspace e comm\adddot}},
+    {cur\adddotspace e comm\adddot}},
   editorsco        = {{curatori e commentatori}% FIXME: missing
-  	{cur\adddotspace e comm\adddot}},
+    {cur\adddotspace e comm\adddot}},
   editoran         = {{curatore e annotatore}% FIXME: missing
-  	{cur\adddotspace e annot\adddot}},
+    {cur\adddotspace e annot\adddot}},
   editorsan        = {{curatori e annotatori}% FIXME: missing
-  	{cur\adddotspace e annot\adddot}},
+    {cur\adddotspace e annot\adddot}},
   editorin         = {{curatore e introduzione}% FIXME: missing
-  	{cur\adddotspace e introd\adddot}},
+    {cur\adddotspace e introd\adddot}},
   editorsin        = {{curatori e introduzione}% FIXME: missing
-  	{cur\adddotspace e introd\adddot}},
+    {cur\adddotspace e introd\adddot}},
   editorfo         = {{curatore e prefazione}% FIXME: missing
-  	{cur\adddotspace e pref\adddot}},
+    {cur\adddotspace e pref\adddot}},
   editorsfo        = {{curatori e prefazione}% FIXME: missing
-  	{cur\adddotspace e pref\adddot}},
+    {cur\adddotspace e pref\adddot}},
   editoraf         = {{curatore e postfazione}% FIXME: missing
-  	{cur\adddotspace e postf\adddot}},
+    {cur\adddotspace e postf\adddot}},
   editorsaf        = {{curatori e postfazione}% FIXME: missing
-  	{cur\adddotspace e postf\adddot}},
+    {cur\adddotspace e postf\adddot}},
   editortrco       = {{curatore, traduttore\finalandcomma\ e commentatore}% FIXME: missing
-  	{ed.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
   editorstrco      = {{curatori, traduttori\finalandcomma\ e commentatori}% FIXME: missing
-  	{eds.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
   editortran       = {{curatore, traduttore\finalandcomma\ e annotatore}% FIXME: missing
-  	{ed.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
   editorstran      = {{curatori, traduttori\finalandcomma\ e annotatori}% FIXME: missing
-  	{eds.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
   editortrin       = {{curatore, traduttore\finalandcomma\ e introduzione}% FIXME: missing
-  	{ed.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
   editorstrin      = {{curatori, traduttori\finalandcomma\ e introduzione}% FIXME: missing
-  	{eds.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
   editortrfo       = {{curatore, traduttore\finalandcomma\ e prefazione}% FIXME: missing
-  	{ed.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
   editorstrfo      = {{curatori, traduttori\finalandcomma\ e prefazione}% FIXME: missing
-  	{eds.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
   editortraf       = {{curatore, traduttore\finalandcomma\ e postfazione}% FIXME: missing
-  	{ed.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
   editorstraf      = {{curatori, traduttori\finalandcomma\ e postfazione}% FIXME: missing
-  	{eds.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
   editorcoin       = {{curatore, commentatore\finalandcomma\ e introduzione}% FIXME: missing
-  	{ed.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
+    {ed.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
   editorscoin      = {{curatori, commentatori\finalandcomma\ e introduzione}% FIXME: missing
-  	{eds.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
+    {eds.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
   editorcofo       = {{curatore, commentatore\finalandcomma\ e prefazione}% FIXME: missing
-  	{ed.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
+    {ed.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
   editorscofo      = {{curatori, commentatori\finalandcomma\ e prefazione}% FIXME: missing
-  	{eds.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
+    {eds.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
   editorcoaf       = {{curatore, commentatore\finalandcomma\ e postfazione}% FIXME: missing
-  	{ed.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
+    {ed.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
   editorscoaf      = {{curatori, commentatori\finalandcomma\ e postfazione}% FIXME: missing
-  	{eds.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
+    {eds.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
   editoranin       = {{curatore, annotatore\finalandcomma\ e introduzione}% FIXME: missing
-  	{ed.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
+    {ed.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
   editorsanin      = {{curatori, annotatori\finalandcomma\ e introduzione}% FIXME: missing
-  	{eds.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
+    {eds.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
   editoranfo       = {{curatore, annotatore\finalandcomma\ e prefazione}% FIXME: missing
-  	{ed.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
+    {ed.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
   editorsanfo      = {{curatori, annotatori\finalandcomma\ e prefazione}% FIXME: missing
-  	{eds.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
+    {eds.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
   editoranaf       = {{curatore, annotatore\finalandcomma\ e postfazione}% FIXME: missing
-  	{ed.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
+    {ed.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
   editorsanaf      = {{curatori, annotatori\finalandcomma\ e postfazione}% FIXME: missing
-  	{eds.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e postf\adddot}},
   translatorco     = {{traduttore e commentatore}% FIXME: missing
-  	{trad\adddot\ e comm\adddot}},
+    {trad\adddot\ e comm\adddot}},
   translatorsco    = {{traduttori e commentatori}% FIXME: missing
-  	{trad\adddot\ e comm\adddot}},
+    {trad\adddot\ e comm\adddot}},
   translatoran     = {{traduttore e annotatore}% FIXME: missing
-  	{trad\adddot\ e annot\adddot}},
+    {trad\adddot\ e annot\adddot}},
   translatorsan    = {{traduttori e annotatori}% FIXME: missing
-  	{trad\adddot\ e annot\adddot}},
+    {trad\adddot\ e annot\adddot}},
   translatorin     = {{traduzione e introduzione}% FIXME: missing
-  	{trad\adddot\ e introd\adddot}},
+    {trad\adddot\ e introd\adddot}},
   translatorsin    = {{traduzione e introduzione}% FIXME: missing
-  	{trad\adddot\ e introd\adddot}},
+    {trad\adddot\ e introd\adddot}},
   translatorfo     = {{traduzione e prefazione}% FIXME: missing
-  	{trad\adddot\ e pref\adddot}},
+    {trad\adddot\ e pref\adddot}},
   translatorsfo    = {{traduzione e prefazione}% FIXME: missing
-  	{trad\adddot\ e pref\adddot}},
+    {trad\adddot\ e pref\adddot}},
   translatoraf     = {{traduzione e postfazione}% FIXME: missing
-  	{trad\adddot\ e postf\adddot}},
+    {trad\adddot\ e postf\adddot}},
   translatorsaf    = {{traduzione e postfazione}% FIXME: missing
-  	{trad\adddot\ e postf\adddot}},
+    {trad\adddot\ e postf\adddot}},
   translatorcoin   = {{traduzione, commenti\finalandcomma\ e introduzione}% FIXME: missing
-  	{trans., comm\adddot\finalandcomma\ e introd\adddot}},
+    {trans., comm\adddot\finalandcomma\ e introd\adddot}},
   translatorscoin  = {{traduzione, commenti\finalandcomma\ e introduzione}% FIXME: missing
-  	{trans., comm\adddot\finalandcomma\ e introd\adddot}},
+    {trans., comm\adddot\finalandcomma\ e introd\adddot}},
   translatorcofo   = {{traduzione, commenti\finalandcomma\ e prefazione}% FIXME: missing
-  	{trans., comm\adddot\finalandcomma\ e pref\adddot}},
+    {trans., comm\adddot\finalandcomma\ e pref\adddot}},
   translatorscofo  = {{traduzione, commenti\finalandcomma\ e prefazione}% FIXME: missing
-  	{trans., comm\adddot\finalandcomma\ e pref\adddot}},
+    {trans., comm\adddot\finalandcomma\ e pref\adddot}},
   translatorcoaf   = {{traduzione, commenti\finalandcomma\ e postfazione}% FIXME: missing
-  	{trans., comm\adddot\finalandcomma\ e postf\adddot}},
+    {trans., comm\adddot\finalandcomma\ e postf\adddot}},
   translatorscoaf  = {{traduzione, commenti\finalandcomma\ e postfazione}% FIXME: missing
-  	{trans., comm\adddot\finalandcomma\ e postf\adddot}},
+    {trans., comm\adddot\finalandcomma\ e postf\adddot}},
   translatoranin   = {{traduzione, annotazioni\finalandcomma\ e introduzione}% FIXME: missing
-  	{trans., annot\adddot\finalandcomma\ e introd\adddot}},
+    {trans., annot\adddot\finalandcomma\ e introd\adddot}},
   translatorsanin  = {{traduzione, annotazioni\finalandcomma\ e introduzione}% FIXME: missing
-  	{trans., annot\adddot\finalandcomma\ e introd\adddot}},
+    {trans., annot\adddot\finalandcomma\ e introd\adddot}},
   translatoranfo   = {{traduzione, annotazioni\finalandcomma\ e prefazione}% FIXME: missing
-  	{trans., annot\adddot\finalandcomma\ e pref\adddot}},
+    {trans., annot\adddot\finalandcomma\ e pref\adddot}},
   translatorsanfo  = {{traduzione, annotazioni\finalandcomma\ e prefazione}% FIXME: missing
-  	{trans., annot\adddot\finalandcomma\ e pref\adddot}},
+    {trans., annot\adddot\finalandcomma\ e pref\adddot}},
   translatoranaf   = {{traduzione, annotazioni\finalandcomma\ e postfazione}% FIXME: missing
-  	{trans., annot\adddot\finalandcomma\ e postf\adddot}},
+    {trans., annot\adddot\finalandcomma\ e postf\adddot}},
   translatorsanaf  = {{traduzione, annotazioni\finalandcomma\ e postfazione}% FIXME: missing
-  	{trans., annot\adddot\finalandcomma\ e postf\adddot}},
+    {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
@@ -4907,30 +5081,35 @@ This work has the LPPL maintenance status "author-maintained".
 \InheritBibliographyExtras{english}
 
 \DeclareBibliographyExtras{%
-\protected\def\bibrangedash{%
-    -\penalty\hyphenpenalty}%
-  \protected\def\bibdatedash{\textendash}}%
+\protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+\protected\def\bibdaterangesep{\bibrangedash}%
+}%
 
 \NewBibliographyString{opcited}
 
 \DeclareBibliographyStrings{%
-  inherit            =  {english},
+  inherit            = {english},
 %    \end{macrocode}
 % New string:
 %    \begin{macrocode}     
-  opcited             =  {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+  opcited             = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
 %    \end{macrocode}
 % Redefined strings:
 %    \begin{macrocode}     
-  opcit              =  {{cit\adddot}{cit\adddot}},
-  ibidem             =  {{ibid\adddot}{ibid\adddot}},
-  loccit             =  {{ibid\adddot}{ibid\adddot}},
-  translationas      =  {{trans\adddot}{trans\adddot}},
-  withcommentator    =  {{commentary by}{comment\adddot\ by}},
-  withannotator      =  {{annotations by}{annots\adddot\ by}},
-  withintroduction   =  {{introduction by}{intro\adddot\ by}},
-  withforeword       =  {{foreword by}{forew\adddot\ by}},
-  withafterword      =  {{afterword by}{afterw\adddot\ by}}
+  opcit              = {{cit\adddot}{cit\adddot}},
+  ibidem             = {{ibid\adddot}{ibid\adddot}},
+  loccit             = {{ibid\adddot}{ibid\adddot}},
+  translationas      = {{trans\adddot}{trans\adddot}},
+  withcommentator    = {{commentary by}{comment\adddot\ by}},
+  withannotator      = {{annotations by}{annots\adddot\ by}},
+  withintroduction   = {{introduction by}{intro\adddot\ by}},
+  withforeword       = {{foreword by}{forew\adddot\ by}},
+  withafterword      = {{afterword by}{afterw\adddot\ by}}
+%    \end{macrocode}
+% See the note for the Italian localization module.
+%    \begin{macrocode}
+  andothers          = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+  andmore            = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
   }
 %    \end{macrocode}
 % \iffalse
@@ -4948,14 +5127,14 @@ This work has the LPPL maintenance status "author-maintained".
 \InheritBibliographyExtras{spanish}
 
 \DeclareBibliographyExtras{%
-\protected\def\bibrangedash{%
-    -\penalty\hyphenpenalty}%
-  \protected\def\bibdatedash{\textendash}}%
+\protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+\protected\def\bibdaterangesep{\bibrangedash}%
+}%
 
 \NewBibliographyString{opcited}
 
 \DeclareBibliographyStrings{%
-  inherit            =  {spanish},
+  inherit            = {spanish},
 %    \end{macrocode}
 % New string:
 %    \begin{macrocode}     
@@ -4963,75 +5142,87 @@ This work has the LPPL maintenance status "author-maintained".
 %    \end{macrocode}
 % Redefined strings:
 %    \begin{macrocode}    
-  opcit              =  {{cit\adddot}{cit\adddot}},
-  ibidem             =  {{ivi}{ivi}},
-  loccit             =  {{ibidem}{ibidem}},
-  langspanish        =  {{espa\~{n}ol}{es\adddot}}, 
-  editor             =  {{ed\adddot}{ed\adddot}},
-  editors            =  {{ed\adddot}{eds\adddot}},
-  byreviser          =  {{revisi\'{o}n de}{rev\adddotspace de}},
-  reviewof           =  {{rese\~{n}a de}{rese\~{n}a de}},%%FIXME
-  backrefpage        =  {{citado en la p\'{a}gina}{citado en la \bibsstring{page}\adddot}},%%FIXME
-  backrefpages       =  {{citado en las p\'{a}ginas}{citado en las \bibsstring{pages}\adddot}},%%FIXME
-  pages              =  {{p\'aginas}{\iftoggle{bbx:classical}{p\'ags\adddot}{p\'ag\adddot}}}, 
-  columns            =  {{columnas}{\iftoggle{bbx:classical}{cols\adddot}{col\adddot}}},
-  lines              =  {{l\'ineas}{\iftoggle{bbx:classical}{ll\adddot}{l\adddot}}},
-  verses             =  {{versos}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}},
-  volumes            =  {{vol\'uumenes}{\iftoggle{bbx:classical}{vols\adddot}{vol\adddot}}},
-  withcommentator    =  {{comentarios de}{com\adddotspace de}},
-  withannotator      =  {{notas de}{notas de}},
-  withintroduction   =  {{introducci\'{o}n de}{intr\adddotspace de}},
-  withforeword       =  {{prefacio de}{pref\adddotspace de}},
-  withafterword      =  {{postfacio de}{postfacio de}},
-  translationof      =  {{traducci\'{o}n al espa\~{n}ol de}{trad\adddotspace de}},
-  translationas      =  {{traducido al espa\~{n}ol como}{trad\adddotspace es\adddot}},
-  origpubas          =  {{edici\'{o}n original}{ed\adddot orig\adddot}},  
-  section            =  {{secci\'{o}n}{sec\adddot}},
-  sections           =  {{secciones}{\iftoggle{bbx:classical}{secs\adddot}{sec\adddot}}}
+  opcit              = {{cit\adddot}{cit\adddot}},
+  ibidem             = {{ivi}{ivi}},
+  loccit             = {{ibidem}{ibidem}},
+  langspanish        = {{espa\~{n}ol}{es\adddot}}, 
+  editor             = {{ed\adddot}{ed\adddot}},
+  editors            = {{ed\adddot}{eds\adddot}},
+  byreviser          = {{revisi\'{o}n de}{rev\adddotspace de}},
+  reviewof           = {{rese\~{n}a de}{rese\~{n}a de}},%%FIXME
+  backrefpage        = {{citado en la p\'{a}gina}{citado en la \bibsstring{page}\adddot}},%%FIXME
+  backrefpages       = {{citado en las p\'{a}ginas}{citado en las p\'ags\adddot}},%%FIXME
+  withcommentator    = {{comentarios de}{com\adddotspace de}},
+  withannotator      = {{notas de}{notas de}},
+  withintroduction   = {{introducci\'{o}n de}{intr\adddotspace de}},
+  withforeword       = {{prefacio de}{pref\adddotspace de}},
+  withafterword      = {{postfacio de}{postfacio de}},
+  translationof      = {{traducci\'{o}n al espa\~{n}ol de}{trad\adddotspace de}},
+  translationas      = {{traducido al espa\~{n}ol como}{trad\adddotspace es\adddot}},
+  origpubas          = {{edici\'{o}n original}{ed\adddot orig\adddot}},  
+  section            = {{secci\'{o}n}{sec\adddot}},
+  sections           = {{secciones}{\iftoggle{bbx:classical}{secs\adddot}{sec\adddot}}}
+%    \end{macrocode}
+% Here we redefine only the |andmore| string because the |andothers| string is 
+% a non Latin expression in \file{spanish.lbx} (``y col.'').
+%    \begin{macrocode}
+  andmore            = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
 }
 %    \end{macrocode}
 % \iffalse
 %</spanish-lbx>
 % \fi
+%
+% \subsection{\file{french-philosophy.lbx}}
+% !EXEPRIMENTAL! This file needs a revision!
 % \iffalse
-%<*bib>
+%<*french-lbx>
+% \fi
+%    \begin{macrocode}
+\InheritBibliographyExtras{french}
 
-@INCOLLECTION{Degani:2009,
-  author = {Marta Degani and Elisabetta Adami and Anna Belladelli},
-  title = {The Use of Modal Verbs in Interpersonal Contexts: From Semantics
-  to Pragmatics},
-  pages = {13-54},
-  crossref = {Facchinetti:2009},
-  date-added = {2009-12-15 16:50:20 +0100},
-  date-modified = {2009-12-18 18:10:12 +0100},
-  keywords = {esempio}
-}
+\DeclareBibliographyExtras{%
+%    \end{macrocode}
+% The \file{french.lbx} localization module redefines \cmd{mkbibnamefamily} in order to get the family name in small caps shape. We do not like this approach because an author could use a localization module without adhering to the typographical standards which should be indipendent from the linguistic standards. For this reason we prefer to reset it to the default definition.
+%    \begin{macrocode}     
+\protected\def\mkbibnamefamily#1{#1}%
+\protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+\protected\def\bibdaterangesep{\bibrangedash}%
+}%
 
-@INCOLLECTION{Facchinetti:2009a,
-  author = {Roberta Facchinetti},
-  title = {Subjectivity, (non-)subjectivity and intersubjectivity},
-  volume = {3},
-  pages = {35-44},
-  note = {Note},
-  crossref = {Facchinetti:2009},
-  date-added = {2009-12-15 16:47:44 +0100},
-  date-modified = {2012-04-15 17:05:04 +0200},
-  keywords = {esempio}
-}
+\NewBibliographyString{opcited}
 
-@INCOLLECTION{Rossitto:1977,
-  author = {Cristina Rossitto},
-  title = {Opposizione e non contraddizione nella \emph{Metafisica} di Aristotele},
-  pages = {43-69},
-  annote = {Note that the \texttt{@collection} data (inherited from the \texttt{crossref}
-  field) are printed inside the \texttt{@incollection} entry because
-  this is the the only \texttt{@incollection} cited from that \texttt{@collection}},
-  crossref = {Berti:1977},
-  date-added = {2009-09-29 11:29:32 +0200},
-  date-modified = {2013-03-15 16:49:38 +0100},
-  hyphenation = {italian},
-  keywords = {esempio}
-}
+\DeclareBibliographyStrings{%
+  inherit            = {french},
+%    \end{macrocode}
+% New string:
+%    \begin{macrocode}     
+  opcited             = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+%    \end{macrocode}
+% Redefined strings:
+%    \begin{macrocode}     
+  opcit              = {{cit\adddot}{cit\adddot}},%%FIXME
+  ibidem             = {{ibid\adddot}{ibid\adddot}},%%FIXME
+  loccit             = {{ibid\adddot}{ibid\adddot}},%%FIXME
+  translationas      = {{trad\adddot}{trad\adddot}},%%FIXME
+  withcommentator    = {{commentaires \smartof}{comment\adddotspace\smartof}},%%FIXME
+  withannotator      = {{annotations \smartof}{annot\adddotspace\smartof}},%%FIXME
+  withintroduction   = {{introduction \smartof}{introd\adddotspace\smartof}},%%FIXME
+  withforeword       = {{pr\'eface \smartof}{pr\'ef\adddotspace\smartof}},%%FIXME
+  withafterword      = {{postface \smartof}{postf\adddotspace\smartof}}%%FIXME
+%    \end{macrocode}
+% See the note for the Italian localization module.
+%    \begin{macrocode}
+  andothers          = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+  andmore            = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+  }
+%    \end{macrocode}
+% \iffalse
+%</french-lbx>
+% \fi
+%
+% \iffalse
+%<*bib>
 
 @INCOLLECTION{Termini:2007,
   author = {Settimo Termini},
@@ -5039,58 +5230,24 @@ This work has the LPPL maintenance status "author-maintained".
   crossref = {Bartocci:2007},
   date-added = {2009-10-22 14:36:21 +0200},
   date-modified = {2013-03-15 16:53:58 +0100},
+  keywords= {esempio},
   hyphenation = {italian},
-  keywords = {esempio}
+  annotation = {This entry includes all the informations of the parent \texttt{collection} linked through the \texttt{crossref} field}
 }
 
-@INBOOK{Spencer:1891b,
-  pages = {74-144},
-  title = {The Classification of the Sciences},
-  volume = {2},
-  booktitle = {Scientific, Political, \& Speculative},
-  crossref = {Spencer:1891vol2}
-}
-
-@BOOK{aristotle:physics,
-  title = {Physics},
-  publisher = {G. P. Putnam},
+@BOOK{aristotle:ethics,
+  title = {Nichomachean Ethics},
+  publisher = {J. Hall \& Son},
   author = {Aristotle},
-  annotation = {A \texttt{book} entry with a \texttt{translator} field},
-  booktitle = {Physics},
-  date = {1929},
-  date-added = {2013-03-15 14:22:45 +0100},
-  date-modified = {2013-03-15 15:26:26 +0100},
+  annotation = {A \texttt{book} entry with a \texttt{translator} field. Note also the \texttt{entrysubtype} field which is set to \texttt{classic}},
+  booktitle = {Nichomachean Ethics},
+  date = {1872},
   entrysubtype = {classic},
   hyphenation = {american},
-  keywords = {primary,esempio},
-  location = {New York},
-  shorttitle = {Physics},
-  translator = {Wicksteed, P. H. and Cornford, F. M.}
-}
-
-@INCOLLECTION{berto:sep-impossible-worlds,
-  author = {Berto, Francesco},
-  title = {Impossible Worlds},
-  booktitle = {The Stanford Encyclopedia of Philosophy},
-  editor = {Edward N. Zalta},
-  edition = {Fall 2009},
-  annote = {An article published in a online ecnyclopedia},
-  date = {2009},
-  date-modified = {2013-03-15 16:29:59 +0100},
-  keywords = {esempio},
-  url = {http://plato.stanford.edu/archives/fall2009/entries/impossible-worlds/}
-}
-
-@BOOK{Bringhurst:1992,
-  title = {The Elements of Typographic Style},
-  publisher = {Hartley \& Marks Publisher Inc.},
-  author = {Robert Bringhurst},
-  booktitle = {The Elements of Typographic Style},
-  date = {1991},
-  date-added = {2012-04-19 20:54:38 +0200},
-  date-modified = {2013-03-13 23:30:27 +0100},
   keywords = {esempio},
-  location = {Vancouver, Canada}
+  location = {London},
+  shorttitle = {Nich\adddotspace Ethics},
+  translator = {F. A. Paley, F. M.}
 }
 
 @ONLINE{clawson:mla,
@@ -5113,65 +5270,6 @@ This work has the LPPL maintenance status "author-maintained".
   version = {0.95}
 }
 
-@BOOKINBOOK{descartes:discours,
-  annote = {A book published in a multivolume critical edition},
-  author = {René Descartes},
-  date = {1897/1913},
-  date-added = {2010-03-06 00:26:39 +0100},
-  date-modified = {2013-03-15 16:36:37 +0100},
-  editor = {Charles Adam and Paul Tannery},
-  keywords = {esempio},
-  location = {Paris},
-  maintitle = {Ouvres de Descartes},
-  pages = {1-78},
-  title = {Discours de la méthode},
-  volume = {6},
-  volumes = {12}
-}
-
-@mvbook{descartes:oeuvres,
-  annote = {A critical multivolume edition},
-  author = {René Descartes},
-  date = {1897/},
-  date-added = {2013-02-25 22:44:19 +0100},
-  date-modified = {2013-03-15 16:36:58 +0100},
-  editor = {Charles Adam and Paul Tannery},
-  hyphenation = {french},
-  keywords = {esempio},
-  location = {Paris},
-  title = {Oeuvres complètes},
-  volumes = {13}
-}
-
-@BOOK{eco:2004,
-  title = {La ricerca della lingua perfetta nella cultura europea},
-  publisher = {Laterza},
-  author = {Umberto Eco},
-  edition = {4},
-  booktitle = {La ricerca della lingua perfetta nella cultura europea},
-  date = {2004},
-  date-added = {2012-04-17 23:58:31 +0200},
-  date-modified = {2012-04-21 16:58:15 +0200},
-  hyphenation = {italian},
-  keywords = {primaria},
-  location = {Roma-Bari},
-  shorttitle = {La ricerca della lingua perfetta}
-}
-
-@BOOK{Frege,
-  title = {Die Grundlagen der Arithmetik},
-  publisher = {Meiner},
-  author = {Frege, Gottlob},
-  address = {Hamburg},
-  annote = {Note the \texttt{pagination} field, used to change the string preceding
-  the \texttt{postnote} argument of the citation commands},
-  date = {1988},
-  date-modified = {2013-03-15 16:40:09 +0100},
-  keywords = {esempio},
-  pagination = {line},
-  subtitle = {Eine logisch mathematische Untersuchung über den Begriff der Zahl}
-}
-
 @ONLINE{glibof:historian,
   annote = {The files \texttt{historian.bbx}, \texttt{historian.cbx}, and \texttt{historian.lbx} im-
     plement a bibliography and citation style for use with Philipp Lehman’s
@@ -5228,52 +5326,6 @@ This work has the LPPL maintenance status "author-maintained".
   location = {Tübingen}
 }
 
-@BOOKINBOOK{kant:kpv,
-  annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is
-  an \texttt{inbook} entry which explicitly refers to the \emph{Critique
-  of Practical Reason} only, not to the entire fifth volume. Note the
-  \texttt{author} and \texttt{bookauthor} fields in the database file.
-  By default, the \texttt{bookauthor} is omitted if the values of the
-  \texttt{author} and \texttt{bookauthor} fields are identical},
-  author = {Kant, Immanuel},
-  bookauthor = {Kant, Immanuel},
-  booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
-  date = {1968},
-  date-added = {2013-02-28 09:42:31 +0100},
-  date-modified = {2013-03-13 22:56:41 +0100},
-  hyphenation = {german},
-  keywords = {esempio},
-  location = {Berlin},
-  maintitle = {Kants Werke. Akademie Textausgabe},
-  pages = {1-163},
-  publisher = {Walter de Gruyter},
-  shorthand = {KpV},
-  shorttitle = {Kritik der praktischen Vernunft},
-  title = {Kritik der praktischen Vernunft},
-  volume = {5}
-}
-
-@BOOKINBOOK{kant:ku,
-  annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is
-  an \texttt{inbook} entry which explicitly refers to the \emph{Critique
-  of Judgment} only, not to the entire fifth volume},
-  author = {Kant, Immanuel},
-  bookauthor = {Kant, Immanuel},
-  booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
-  date = {1968},
-  date-added = {2013-02-25 22:44:19 +0100},
-  date-modified = {2013-03-13 22:57:07 +0100},
-  hyphenation = {german},
-  keywords = {esempio},
-  location = {Berlin},
-  maintitle = {Kants Werke. Akademie Textausgabe},
-  pages = {165-485},
-  publisher = {Walter de Gruyter},
-  shorthand = {KU},
-  title = {Kritik der Urtheilskraft},
-  volume = {5}
-}
-
 @BOOKINBOOK{kant:kpv:xref,
   author = {Kant, Immanuel},
   date = {1968},
@@ -5281,10 +5333,12 @@ This work has the LPPL maintenance status "author-maintained".
   date-modified = {2013-03-15 19:27:33 +0100},
   keywords = {esempio},
   pages = {1-163},
+  shorthand = {KpV},
   shorttitle = {Kritik der praktischen Vernunft},
   title = {Kritik der praktischen Vernunft},
   volume = {5},
-  xref = {kant:werke}
+  xref = {kant:werke},
+  annotation = {A single volume from the critical edition of Kant's (\emph{Kants Werke}). Note the \texttt{xref} field.}
 }
 
 @BOOKINBOOK{kant:ku:xref,
@@ -5297,7 +5351,8 @@ This work has the LPPL maintenance status "author-maintained".
   pages = {165-485},
   title = {Kritik der Urtheilskraft},
   volume = {5},
-  xref = {kant:werke}
+  xref = {kant:werke},
+  annotation = {A single volume from the critical edition of Kant's (\emph{Kants Werke}). Note the \texttt{xref} field.}
 }
 
 @mvbook{kant:werke,
@@ -5307,7 +5362,7 @@ This work has the LPPL maintenance status "author-maintained".
   date-added = {2010-03-06 00:26:39 +0100},
   date-modified = {2013-03-15 14:01:45 +0100},
   hyphenation = {german},
-  keywords = {esempio, modern},
+  keywords = {esempio},
   location = {Berlin},
   maintitle = {Kants Werke. Akademie Textausgabe},
   publisher = {Walter de Gruyter},
@@ -5316,121 +5371,6 @@ This work has the LPPL maintenance status "author-maintained".
   volumes = {9}
 }
 
-@mvbook{knuth:ct,
-  annotation = {A five-volume book cited as a whole. This is a \texttt{book} entry,
-  note the \texttt{volumes} field},
-  author = {Knuth, Donald E.},
-  date = {1984/1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  indexsorttitle = {Computers & Typesetting},
-  location = {Reading, Mass.},
-  publisher = {Addison-Wesley},
-  sorttitle = {Computers & Typesetting},
-  sortyear = {1984-0},
-  title = {Computers \& Typesetting},
-  volumes = {5}
-}
-
-@BOOKINBOOK{knuth:ct:a,
-  annotation = {The first volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields. We want this volume to be listed after
-  the entry referring to the entire five-volume set. Also note the
-  \texttt{indextitle} and \texttt{indexsorttitle} fields. Indexing
-  packages that don't generate robust index entries require some control
-  sequences to be protected from expansion},
-  author = {Knuth, Donald E.},
-  date = {1984},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  indexsorttitle = {The TeXbook},
-  indextitle = {\protect\TeX book, The},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  shorttitle = {\TeX book},
-  sorttitle = {Computers & Typesetting A},
-  sortyear = {1984-1},
-  title = {The \TeX book},
-  volume = {A}
-}
-
-@BOOKINBOOK{knuth:ct:b,
-  annotation = {The second volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields. Also note the \texttt{indexsorttitle}
-  field},
-  author = {Knuth, Donald E.},
-  date = {1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  indexsorttitle = {TeX: The Program},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  shorttitle = {\TeX},
-  sorttitle = {Computers & Typesetting B},
-  sortyear = {1986-1},
-  title = {\TeX: The Program},
-  volume = {B}
-}
-
-@BOOKINBOOK{knuth:ct:c,
-  annotation = {The third volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields as well as the \texttt{indextitle} field},
-  author = {Knuth, Donald E.},
-  date = {1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  indextitle = {METAFONTbook, The},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  shorttitle = {METAFONTbook},
-  sorttitle = {Computers & Typesetting C},
-  sortyear = {1986-2},
-  title = {The METAFONTbook},
-  volume = {C}
-}
-
-@BOOKINBOOK{knuth:ct:d,
-  annotation = {The fourth volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields},
-  author = {Knuth, Donald E.},
-  date = {1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  shorttitle = {METAFONT},
-  sorttitle = {Computers & Typesetting D},
-  sortyear = {1986-3},
-  title = {METAFONT: The Program},
-  volume = {D}
-}
-
-@BOOKINBOOK{knuth:ct:e,
-  annotation = {The fifth volume of a five-volume book. Note the \texttt{sorttitle}
-  and \texttt{sortyear} fields},
-  author = {Knuth, Donald E.},
-  date = {1986},
-  date-added = {2013-03-14 10:05:39 +0100},
-  date-modified = {2013-03-14 10:05:39 +0100},
-  hyphenation = {american},
-  location = {Reading, Mass.},
-  maintitle = {Computers \& Typesetting},
-  publisher = {Addison-Wesley},
-  sorttitle = {Computers & Typesetting E},
-  sortyear = {1986-4},
-  title = {Computer Modern Typefaces},
-  volume = {E}
-}
-
 @mvbook{comenio:oo,
   annote = {This author is known with his Latin name, given in the \texttt{nameaddon}
   field},
@@ -5441,7 +5381,7 @@ This work has the LPPL maintenance status "author-maintained".
   date-modified = {2013-03-15 16:32:24 +0100},
   keywords = {esempio},
   location = {Praga},
-  nameaddon = {Comenio},
+  nameaddon = {Comenius},
   title = {Opera Omnia}
 }
 
@@ -5515,7 +5455,7 @@ This work has the LPPL maintenance status "author-maintained".
 }
 
 @ONLINE{polyglossia,
-  annote = {Polyglossia is a package for facilitating multilingual typesetting with \XeLaTeX{} and
+  annote = {Polyglossia is a package for facilitating multilingual typesetting with Xe\LaTeX{} and
     (at an early stage) Lua\LaTeX. Basically, it can be used as an alternative to babel
     for performing the following tasks automatically:
     1. Loading the appropriate hyphenation patterns.
@@ -5538,7 +5478,7 @@ This work has the LPPL maintenance status "author-maintained".
   date = {2015-03-25},
   hyphenation = {english},
   keywords = {primaria},
-  title = {Polyglossia: An Alternative to Babel for \XeLaTeX{} and Lua\LaTeX},
+  title = {Polyglossia: An Alternative to Babel for Xe\LaTeX{} and Lua\LaTeX},
   url = {http://mirrors.ctan.org/macros/latex/contrib/babel/babel.pdf},
   version = {1.42.4}
 }
@@ -5562,45 +5502,6 @@ This work has the LPPL maintenance status "author-maintained".
   version = {5.2a}
 }
 
-@ARTICLE{Moore:1903:ORIGFIELDS,
-  author = {George Edward Moore},
-  title = {The refutation of idealism},
-  pages = {433-453},
-  number = {12},
-  month = {5},
-  annote = {An entry typeset using the depreciated \texttt{orig-} fields mechanism},
-  date = {1903},
-  date-added = {2010-03-06 00:26:39 +0100},
-  date-modified = {2013-03-15 16:43:29 +0100},
-  hyphenation = {english},
-  journaltitle = {Mind},
-  keywords = {esempio},
-  origdate = {1969},
-  origlocation = {Torino},
-  origpublisher = {UTET},
-  origtitle = {La confutazione dell'idealismo},
-  series = {N.S.},
-  usera = {Il Neoempirismo},
-  userb = {a cura di Alberto Pasquinelli},
-  userc = {35-61}
-}
-
-@ARTICLE{Mori:2008,
-  author = {Lapo F. Mori},
-  title = {Gestire la bibliografia con \LaTeX},
-  pages = {37-51},
-  number = {6},
-  month = {10},
-  annote = {An article entry},
-  booktitle = {Gestire la bibliografia con \LaTeX},
-  date = {2008},
-  date-added = {2009-10-13 13:50:34 +0200},
-  date-modified = {2013-03-15 16:43:37 +0100},
-  hyphenation = {italian},
-  journaltitle = {ArsTeXnica},
-  keywords = {primaria}
-}
-
 @BOOK{pantieri:artelatex,
   title = {L'arte di scrivere con \LaTeX},
   author = {Lorenzo Pantieri and Tommaso Gordini},
@@ -5670,7 +5571,7 @@ This work has the LPPL maintenance status "author-maintained".
   date = {1959},
   date-added = {2013-03-01 17:55:40 +0100},
   date-modified = {2013-03-15 16:48:11 +0100},
-  keywords = {primaria,popper},
+  keywords = {esempio,popper},
   location = {London},
   related = {popper-logik:ita},
   relatedstring={it. trans.},
@@ -5686,53 +5587,11 @@ This work has the LPPL maintenance status "author-maintained".
   date-added = {2013-03-01 17:50:46 +0100},
   date-modified = {2013-03-15 16:48:21 +0100},
   hyphenation = {italian},
-  keywords = {primaria,popper},
+  keywords = {esempio,popper},
   location = {Torino},
   timestamp = {2012.04.25}
 }
 
-@BOOKINBOOK{Reale1987,
-  address = {Milano},
-  annote = {A book published in a multivolume work. Note the \texttt{titleaddon}
-  field, used for the details about the chapter title},
-  author = {Giovanni Reale},
-  date = {1987},
-  date-modified = {2013-03-15 16:48:31 +0100},
-  edition = {5},
-  hyphenation = {italian},
-  keywords = {esempio},
-  maintitle = {Storia della filosofia antica},
-  pages = {458-493},
-  publisher = {Vita e Pensiero},
-  title = {Dalle origini a Socrate},
-  titleaddon = {Appendice seconda: ``Precisazioni sulle caratteristiche fondamentali
-  del concetto greco di filosofia''},
-  volume = {1}
-}
-
-@mvbook{Spencer:1891,
-  annote = {A multivolume work},
-  author = {Herbert Spencer},
-  date = {1891},
-  date-modified = {2013-03-15 16:53:06 +0100},
-  keywords = {esempio},
-  location = {Edinburgh},
-  publisher = {Williams {and} Norgate},
-  title = {Essays},
-  volumes = {3}
-}
-
-@book{Spencer:1891vol2,
-  author = {Herbert Spencer},
-  date = {1891},
-  keywords = {esempio},
-  location = {Edinburgh},
-  maintitle = {Essays},
-  publisher = {Williams {and} Norgate},
-  title = {Scientific, Political, \& Speculative},
-  volume = {2}
-}
-
 @INCOLLECTION{Valbusa:2007,
   author = {Ivan Valbusa},
   title = {Psicologia e sistema in Alsted e in Wolff},
@@ -5768,44 +5627,14 @@ This work has the LPPL maintenance status "author-maintained".
   booksubtitle = {Protagonisti del '900 da Hilbert a Wiles},
   booktitle = {Vite matematiche},
   date = {2007},
-  date-added = {2009-10-20 17:17:52 +0200},
-  date-modified = {2013-03-15 16:29:20 +0100},
   editor = {Claudio Bartocci and Renato Betti and Angelo Guerraggio and Roberto
   Lucchetti},
   hyphenation = {italian},
-  keywords = {esempio},
   location = {Milano},
   publisher = {Springer-Verlag Italia},
   title = {Vite matematiche}
 }
 
-@COLLECTION{mate_einaudi:2007,
-  booktitle = {La matematica},
-  date = {2007/2011},
-  date-added = {2012-04-15 17:10:54 +0200},
-  date-modified = {2013-03-13 23:30:00 +0100},
-  editor = {Claudio Bartocci and Piergiorgio Odifreddi},
-  hyphenation = {italian},
-  keywords = {esempio},
-  location = {Torino},
-  publisher = {Einaudi},
-  title = {La matematica},
-  volumes = {4}
-}
-
-@COLLECTION{Berti:1977,
-  annote = {A collection with one author},
-  booktitle = {La contraddizione},
-  date = {1977},
-  date-added = {2009-09-30 19:34:48 +0200},
-  date-modified = {2013-03-15 16:29:45 +0100},
-  editor = {Enrico Berti},
-  hyphenation = {italian},
-  keywords = {esempio},
-  location = {Roma},
-  publisher = {Città Nuova},
-  title = {La contraddizione}
-}
 
 @COLLECTION{Filmed:2009,
   annote = {A collection with four editors. The list is automatically truncated
@@ -5854,77 +5683,13 @@ This work has the LPPL maintenance status "author-maintained".
   keywords = {esempio}
 }
 
-@COLLECTION{Pasquinelli:1969,
-  booktitle = {Il Neoempirismo},
-  date = {1969},
-  date-added = {2009-09-27 01:21:58 +0200},
-  date-modified = {2013-03-15 16:44:07 +0100},
-  editor = {Alberto Pasquinelli},
-  hyphenation = {italian},
-  keywords = {esempio},
-  location = {Torino},
-  publisher = {UTET},
-  title = {Il Neoempirismo}
-}
-
-@MVREFERENCE{britannica,
-  annote = {A multivolume encyclopedia. Note the \texttt{useeditor=false} option
-  and \texttt{indextitle} field},
-  booktitle = {The New Encyclopædia Britannica},
-  date = {2003},
-  date-added = {2010-03-10 17:46:47 +0100},
-  date-modified = {2013-03-15 16:31:11 +0100},
-  edition = {15},
-  editor = {Preece, Warren E.},
-  hyphenation = {british},
-  indextitle = {Encyclopædia Britannica, The New},
-  keywords = {esempio},
-  label = {EB},
-  location = {Chicago, Ill.},
-  options = {useeditor=false},
-  publisher = {Encyclopædia Britannica},
-  shorttitle = {Encyclopædia Britannica},
-  sorttitle = {Encyclopædia Britannica},
-  title = {The New Encyclopædia Britannica},
-  volumes = {32}
-}
-
-@COLLECTION{Facchinetti:2009,
-  booktitle = {Studies on English Modality},
-  date = {2009},
-  date-added = {2009-12-15 16:13:17 +0100},
-  date-modified = {2012-04-15 17:02:57 +0200},
-  editor = {Anastasios Tsangalidis and Roberta Facchinetti},
-  keywords = {esempio},
-  location = {Bern},
-  publisher = {Peter Lang},
-  title = {Studies on English Modality}
-}
-
-@REFERENCE{SEP,
-  bdsk-url-1 = {http://plato.stanford.edu/},
-  booktitle = {The Stanford Encyclopedia of Philosophy},
-  date = {2009},
-  date-added = {2010-04-12 14:15:35 +0200},
-  date-modified = {2010-04-12 16:35:03 +0200},
-  editor = {Zalta, Edward N.},
-  keywords = {esempio},
-  label = {SEP},
-  options = {useeditor=false},
-  sorttitle = {Stanford Encyclopedia of Philosophy},
-  title = {The Stanford Encyclopedia of Philosophy},
-  url = {http://plato.stanford.edu/}
-}
-
 @ONLINE{ctan,
-  annote = {Note the \texttt{urldate} field and the \texttt{label} field, used
-  for the citations.},
   bdsk-url-1 = {http://www.ctan.org},
   date = {2006},
   date-added = {2011-06-02 17:33:32 +0200},
   date-modified = {2013-03-15 16:35:26 +0100},
   hyphenation = {american},
-  keywords = {esempio, web},
+  keywords = {web},
   label = {CTAN},
   subtitle = {The Comprehensive TeX Archive Network},
   title = {CTAN},
@@ -5933,17 +5698,17 @@ This work has the LPPL maintenance status "author-maintained".
 }
 
 @ONLINE{guit:sito,
-  annote = {A Web site},
   bdsk-url-1 = {http://www.guitex.org},
   date = {2012},
   date-added = {2012-04-21 16:52:51 +0200},
   date-modified = {2013-03-15 16:40:18 +0100},
   hyphenation = {italian},
-  keywords = {esempio, web},
+  keywords = {web},
   title = {GuIT. Gruppo degli Utilizzatori Italiani di \TeX},
   url = {http://www.guitex.org},
   urldate = {2012-01-15}
 }
 %</bib>
 % \fi
+% \clearpage
 % \Finale
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 e92e571d153..dcf52ebc806 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -13,31 +13,32 @@
 %% License information appended
 %% 
 \ProvidesFile{english-philosophy.lbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \InheritBibliographyExtras{english}
 
 \DeclareBibliographyExtras{%
-\protected\def\bibrangedash{%
-    -\penalty\hyphenpenalty}%
-  \protected\def\bibdatedash{\textendash}}%
+\protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+\protected\def\bibdaterangesep{\bibrangedash}%
+}%
 
 \NewBibliographyString{opcited}
 
 \DeclareBibliographyStrings{%
-  inherit            =  {english},
-  opcited             =  {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
-  opcit              =  {{cit\adddot}{cit\adddot}},
-  ibidem             =  {{ibid\adddot}{ibid\adddot}},
-  loccit             =  {{ibid\adddot}{ibid\adddot}},
-  translationas      =  {{trans\adddot}{trans\adddot}},
-  withcommentator    =  {{commentary by}{comment\adddot\ by}},
-  withannotator      =  {{annotations by}{annots\adddot\ by}},
-  withintroduction   =  {{introduction by}{intro\adddot\ by}},
-  withforeword       =  {{foreword by}{forew\adddot\ by}},
-  withafterword      =  {{afterword by}{afterw\adddot\ by}}
+  inherit            = {english},
+  opcited             = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+  opcit              = {{cit\adddot}{cit\adddot}},
+  ibidem             = {{ibid\adddot}{ibid\adddot}},
+  loccit             = {{ibid\adddot}{ibid\adddot}},
+  translationas      = {{trans\adddot}{trans\adddot}},
+  withcommentator    = {{commentary by}{comment\adddot\ by}},
+  withannotator      = {{annotations by}{annots\adddot\ by}},
+  withintroduction   = {{introduction by}{intro\adddot\ by}},
+  withforeword       = {{foreword by}{forew\adddot\ by}},
+  withafterword      = {{afterword by}{afterw\adddot\ by}}
+  andothers          = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+  andmore            = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
   }
 %% 
 %% Copyright 2009-2017 by Ivan Valbusa
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx
new file mode 100644
index 00000000000..25a7a72da55
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/french-philosophy.lbx
@@ -0,0 +1,57 @@
+%%
+%% This is file `french-philosophy.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `french-lbx')
+%% ______________________________________________________
+%% The biblatex-philosophy package
+%% Copyright (C) 2009-2017 Ivan Valbusa
+%% All rights reserved
+%% 
+%% License information appended
+%% 
+\ProvidesFile{french-philosophy.lbx}
+[2017/04/13 v1.9.5 A set of styles for biblatex]
+
+
+\InheritBibliographyExtras{french}
+
+\DeclareBibliographyExtras{%
+\protected\def\mkbibnamefamily#1{#1}%
+\protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+\protected\def\bibdaterangesep{\bibrangedash}%
+}%
+
+\NewBibliographyString{opcited}
+
+\DeclareBibliographyStrings{%
+  inherit            = {french},
+  opcited             = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+  opcit              = {{cit\adddot}{cit\adddot}},%%FIXME
+  ibidem             = {{ibid\adddot}{ibid\adddot}},%%FIXME
+  loccit             = {{ibid\adddot}{ibid\adddot}},%%FIXME
+  translationas      = {{trad\adddot}{trad\adddot}},%%FIXME
+  withcommentator    = {{commentaires \smartof}{comment\adddotspace\smartof}},%%FIXME
+  withannotator      = {{annotations \smartof}{annot\adddotspace\smartof}},%%FIXME
+  withintroduction   = {{introduction \smartof}{introd\adddotspace\smartof}},%%FIXME
+  withforeword       = {{pr\'eface \smartof}{pr\'ef\adddotspace\smartof}},%%FIXME
+  withafterword      = {{postface \smartof}{postf\adddotspace\smartof}}%%FIXME
+  andothers          = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+  andmore            = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+  }
+%% 
+%% Copyright 2009-2017 by Ivan Valbusa
+%% 
+%% This program is provided under the terms of the
+%% LaTeX Project Public License distributed from CTAN
+%% archives in directory macros/latex/base/lppl.txt.
+%% 
+%% Author: Ivan Valbusa
+%% ivan dot valbusa at univr dot it
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
+%% 
+%%
+%% End of file `french-philosophy.lbx'.
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 58edc25fb44..32f5c27a36e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -13,47 +13,48 @@
 %% License information appended
 %% 
 \ProvidesFile{italian-philosophy.lbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \InheritBibliographyExtras{italian}
 
 \DeclareBibliographyExtras{%
-\protected\def\bibrangedash{%
-    -\penalty\hyphenpenalty}%
-  \protected\def\bibdatedash{\textendash}}%
+  \protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+  \protected\def\bibdaterangesep{\bibrangedash}%
+}%
 \NewBibliographyString{opcited}
 \DeclareBibliographyStrings{%
-  inherit            =  {italian},
-  opcited            =  {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
-  ibidem             =  {{ivi}{ivi}},
-  loccit             =  {{ibidem}{ibidem}},
-  editor             =  {{a cura di}{a cura di}},
-  editors            =  {{a cura di}{a cura di}},
-  backrefpage        =  {{citato a pagina}{citato a \bibsstring{page}\adddot}},
-  backrefpages       =  {{citato alle pagine}{citato alle \bibsstring{pages}\adddot}},
-  nodate             =  {{senza data}{s\adddot d\adddot}},
-  volumes            =  {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol\adddot}}},
-  pages              =  {{pagine}{\iftoggle{bbx:classical}{pp\adddot}{p\adddot}}},
-  columns            =  {{colonne}{\iftoggle{bbx:classical}{coll\adddot}{col\adddot}}},
-  lines              =  {{righe}{\iftoggle{bbx:classical}{rr\adddot}{r\adddot}}},
-  verses             =  {{versi}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}},
-  paragraphs         =  {{paragrafi}{\iftoggle{bbx:classical}{parr\adddot}{par\adddot}}},
-  section            =  {{sezione}{sez\adddot}},
-  sections           =  {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}},
-  withcommentator    =  {{commenti di}{commenti di}},
-  withannotator      =  {{annotazioni di}{annotazioni di}},
-  withintroduction   =  {{introduzione di}{introduzione di}},
-  withforeword       =  {{prefazione di}{prefazione di}},
-  withafterword      =  {{postfazione di}{postfazione di}},
- origpubas          =  {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
- bypublisher        =  {{\addcomma\space}{\addcomma\space}},
- astitle            =  {{come}{come}},
- reviewof           =  {{recensione di}{rec\adddotspace di}},
- byreviser          =  {{revisione di}{rev\adddotspace di}},
- translationof      =  {{traduzione di}{trad\adddotspace di}},
- translationas      =  {{traduzione italiana}{trad\adddotspace it\adddot}}
+  inherit            = {italian},
+  opcited            = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+  ibidem             = {{ivi}{ivi}},
+  loccit             = {{ibidem}{ibidem}},
+  editor             = {{a cura di}{a cura di}},
+  editors            = {{a cura di}{a cura di}},
+  backrefpage        = {{citato a pagina}{citato a \bibsstring{page}\adddot}},
+  backrefpages       = {{citato alle pagine}{citato alle \bibsstring{pages}\adddot}},
+  nodate             = {{senza data}{s\adddot d\adddot}},
+  volumes            = {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol\adddot}}},
+  pages              = {{pagine}{\iftoggle{bbx:classical}{pp\adddot}{p\adddot}}},
+  columns            = {{colonne}{\iftoggle{bbx:classical}{coll\adddot}{col\adddot}}},
+  lines              = {{righe}{\iftoggle{bbx:classical}{rr\adddot}{r\adddot}}},
+  verses             = {{versi}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}},
+  paragraphs         = {{paragrafi}{\iftoggle{bbx:classical}{parr\adddot}{par\adddot}}},
+  byreviser          = {{revisione di}{rev\adddotspace di}},
+  translationof      = {{traduzione di}{trad\adddotspace di}},
+  translationas      = {{traduzione italiana}{trad\adddotspace it\adddot}},
+  reviewof           = {{recensione di}{rec\adddotspace di}},
+  origpubas          = {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
+  astitle            = {{come}{come}},
+  bypublisher        = {{\addcomma\space}{\addcomma\space}},
+  section            = {{sezione}{sez\adddot}},
+  sections           = {{sezioni}{\iftoggle{bbx:classical}{sezz\adddot}{sez\adddot}}},
+  withcommentator    = {{commenti di}{commenti di}},
+  withannotator      = {{annotazioni di}{annotazioni di}},
+  withintroduction   = {{introduzione di}{introduzione di}},
+  withforeword       = {{prefazione di}{prefazione di}},
+  withafterword      = {{postfazione di}{postfazione di}},
+  andothers          = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
+  andmore            = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
  reviser            = {{revisore}{rev\adddot}},% FIXME: missing
  revisers           = {{revisori}{rev\adddot}},% FIXME: missing
  founder            = {{fondatore}{fond\adddot}},% FIXME: missing
@@ -61,141 +62,141 @@
  continuator        = {{continuatore}{cont\adddot}},% FIXME: missing
  continuators       = {{continuatori}{cont\adddot}},% FIXME: missing
   editortr         = {{curatore e traduttore}% FIXME: missing
-   {cur\adddotspace e trad\adddot}},
+    {cur\adddotspace e trad\adddot}},
   editorstr        = {{curatori e traduttori}% FIXME: missing
-   {cur\adddotspace e trad\adddot}},
+    {cur\adddotspace e trad\adddot}},
   editorco         = {{curatore e commentatore}% FIXME: missing
-   {cur\adddotspace e comm\adddot}},
+    {cur\adddotspace e comm\adddot}},
   editorsco        = {{curatori e commentatori}% FIXME: missing
-   {cur\adddotspace e comm\adddot}},
+    {cur\adddotspace e comm\adddot}},
   editoran         = {{curatore e annotatore}% FIXME: missing
-   {cur\adddotspace e annot\adddot}},
+    {cur\adddotspace e annot\adddot}},
   editorsan        = {{curatori e annotatori}% FIXME: missing
-   {cur\adddotspace e annot\adddot}},
+    {cur\adddotspace e annot\adddot}},
   editorin         = {{curatore e introduzione}% FIXME: missing
-   {cur\adddotspace e introd\adddot}},
+    {cur\adddotspace e introd\adddot}},
   editorsin        = {{curatori e introduzione}% FIXME: missing
-   {cur\adddotspace e introd\adddot}},
+    {cur\adddotspace e introd\adddot}},
   editorfo         = {{curatore e prefazione}% FIXME: missing
-   {cur\adddotspace e pref\adddot}},
+    {cur\adddotspace e pref\adddot}},
   editorsfo        = {{curatori e prefazione}% FIXME: missing
-   {cur\adddotspace e pref\adddot}},
+    {cur\adddotspace e pref\adddot}},
   editoraf         = {{curatore e postfazione}% FIXME: missing
-   {cur\adddotspace e postf\adddot}},
+    {cur\adddotspace e postf\adddot}},
   editorsaf        = {{curatori e postfazione}% FIXME: missing
-   {cur\adddotspace e postf\adddot}},
+    {cur\adddotspace e postf\adddot}},
   editortrco       = {{curatore, traduttore\finalandcomma\ e commentatore}% FIXME: missing
-   {ed.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
   editorstrco      = {{curatori, traduttori\finalandcomma\ e commentatori}% FIXME: missing
-   {eds.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e comm\adddot}},
   editortran       = {{curatore, traduttore\finalandcomma\ e annotatore}% FIXME: missing
-   {ed.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
   editorstran      = {{curatori, traduttori\finalandcomma\ e annotatori}% FIXME: missing
-   {eds.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e annot\adddot}},
   editortrin       = {{curatore, traduttore\finalandcomma\ e introduzione}% FIXME: missing
-   {ed.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
   editorstrin      = {{curatori, traduttori\finalandcomma\ e introduzione}% FIXME: missing
-   {eds.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e introd\adddot}},
   editortrfo       = {{curatore, traduttore\finalandcomma\ e prefazione}% FIXME: missing
-   {ed.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
   editorstrfo      = {{curatori, traduttori\finalandcomma\ e prefazione}% FIXME: missing
-   {eds.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e pref\adddot}},
   editortraf       = {{curatore, traduttore\finalandcomma\ e postfazione}% FIXME: missing
-   {ed.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
+    {ed.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
   editorstraf      = {{curatori, traduttori\finalandcomma\ e postfazione}% FIXME: missing
-   {eds.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
+    {eds.,\addabbrvspace trad\adddot\finalandcomma\ e postf\adddot}},
   editorcoin       = {{curatore, commentatore\finalandcomma\ e introduzione}% FIXME: missing
-   {ed.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
+    {ed.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
   editorscoin      = {{curatori, commentatori\finalandcomma\ e introduzione}% FIXME: missing
-   {eds.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
+    {eds.,\addabbrvspace comm\adddot\finalandcomma\ e introd\adddot}},
   editorcofo       = {{curatore, commentatore\finalandcomma\ e prefazione}% FIXME: missing
-   {ed.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
+    {ed.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
   editorscofo      = {{curatori, commentatori\finalandcomma\ e prefazione}% FIXME: missing
-   {eds.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
+    {eds.,\addabbrvspace comm\adddot\finalandcomma\ e pref\adddot}},
   editorcoaf       = {{curatore, commentatore\finalandcomma\ e postfazione}% FIXME: missing
-   {ed.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
+    {ed.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
   editorscoaf      = {{curatori, commentatori\finalandcomma\ e postfazione}% FIXME: missing
-   {eds.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
+    {eds.,\addabbrvspace comm\adddot\finalandcomma\ e postf\adddot}},
   editoranin       = {{curatore, annotatore\finalandcomma\ e introduzione}% FIXME: missing
-   {ed.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
+    {ed.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
   editorsanin      = {{curatori, annotatori\finalandcomma\ e introduzione}% FIXME: missing
-   {eds.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
+    {eds.,\addabbrvspace annot\adddot\finalandcomma\ e introd\adddot}},
   editoranfo       = {{curatore, annotatore\finalandcomma\ e prefazione}% FIXME: missing
-   {ed.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
+    {ed.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
   editorsanfo      = {{curatori, annotatori\finalandcomma\ e prefazione}% FIXME: missing
-   {eds.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
+    {eds.,\addabbrvspace annot\adddot\finalandcomma\ e pref\adddot}},
   editoranaf       = {{curatore, annotatore\finalandcomma\ e postfazione}% FIXME: missing
-   {ed.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
+    {ed.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
   editorsanaf      = {{curatori, annotatori\finalandcomma\ e postfazione}% FIXME: missing
-   {eds.,\addabbrvspace annot\adddot\finalandcomma\ e postf\adddot}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {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}},
+    {cur.,\addabbrvspace trad., annot\adddot\finalandcomma\ e postf\adddot}},
   translatorco     = {{traduttore e commentatore}% FIXME: missing
-   {trad\adddot\ e comm\adddot}},
+    {trad\adddot\ e comm\adddot}},
   translatorsco    = {{traduttori e commentatori}% FIXME: missing
-   {trad\adddot\ e comm\adddot}},
+    {trad\adddot\ e comm\adddot}},
   translatoran     = {{traduttore e annotatore}% FIXME: missing
-   {trad\adddot\ e annot\adddot}},
+    {trad\adddot\ e annot\adddot}},
   translatorsan    = {{traduttori e annotatori}% FIXME: missing
-   {trad\adddot\ e annot\adddot}},
+    {trad\adddot\ e annot\adddot}},
   translatorin     = {{traduzione e introduzione}% FIXME: missing
-   {trad\adddot\ e introd\adddot}},
+    {trad\adddot\ e introd\adddot}},
   translatorsin    = {{traduzione e introduzione}% FIXME: missing
-   {trad\adddot\ e introd\adddot}},
+    {trad\adddot\ e introd\adddot}},
   translatorfo     = {{traduzione e prefazione}% FIXME: missing
-   {trad\adddot\ e pref\adddot}},
+    {trad\adddot\ e pref\adddot}},
   translatorsfo    = {{traduzione e prefazione}% FIXME: missing
-   {trad\adddot\ e pref\adddot}},
+    {trad\adddot\ e pref\adddot}},
   translatoraf     = {{traduzione e postfazione}% FIXME: missing
-   {trad\adddot\ e postf\adddot}},
+    {trad\adddot\ e postf\adddot}},
   translatorsaf    = {{traduzione e postfazione}% FIXME: missing
-   {trad\adddot\ e postf\adddot}},
+    {trad\adddot\ e postf\adddot}},
   translatorcoin   = {{traduzione, commenti\finalandcomma\ e introduzione}% FIXME: missing
-   {trans., comm\adddot\finalandcomma\ e introd\adddot}},
+    {trans., comm\adddot\finalandcomma\ e introd\adddot}},
   translatorscoin  = {{traduzione, commenti\finalandcomma\ e introduzione}% FIXME: missing
-   {trans., comm\adddot\finalandcomma\ e introd\adddot}},
+    {trans., comm\adddot\finalandcomma\ e introd\adddot}},
   translatorcofo   = {{traduzione, commenti\finalandcomma\ e prefazione}% FIXME: missing
-   {trans., comm\adddot\finalandcomma\ e pref\adddot}},
+    {trans., comm\adddot\finalandcomma\ e pref\adddot}},
   translatorscofo  = {{traduzione, commenti\finalandcomma\ e prefazione}% FIXME: missing
-   {trans., comm\adddot\finalandcomma\ e pref\adddot}},
+    {trans., comm\adddot\finalandcomma\ e pref\adddot}},
   translatorcoaf   = {{traduzione, commenti\finalandcomma\ e postfazione}% FIXME: missing
-   {trans., comm\adddot\finalandcomma\ e postf\adddot}},
+    {trans., comm\adddot\finalandcomma\ e postf\adddot}},
   translatorscoaf  = {{traduzione, commenti\finalandcomma\ e postfazione}% FIXME: missing
-   {trans., comm\adddot\finalandcomma\ e postf\adddot}},
+    {trans., comm\adddot\finalandcomma\ e postf\adddot}},
   translatoranin   = {{traduzione, annotazioni\finalandcomma\ e introduzione}% FIXME: missing
-   {trans., annot\adddot\finalandcomma\ e introd\adddot}},
+    {trans., annot\adddot\finalandcomma\ e introd\adddot}},
   translatorsanin  = {{traduzione, annotazioni\finalandcomma\ e introduzione}% FIXME: missing
-   {trans., annot\adddot\finalandcomma\ e introd\adddot}},
+    {trans., annot\adddot\finalandcomma\ e introd\adddot}},
   translatoranfo   = {{traduzione, annotazioni\finalandcomma\ e prefazione}% FIXME: missing
-   {trans., annot\adddot\finalandcomma\ e pref\adddot}},
+    {trans., annot\adddot\finalandcomma\ e pref\adddot}},
   translatorsanfo  = {{traduzione, annotazioni\finalandcomma\ e prefazione}% FIXME: missing
-   {trans., annot\adddot\finalandcomma\ e pref\adddot}},
+    {trans., annot\adddot\finalandcomma\ e pref\adddot}},
   translatoranaf   = {{traduzione, annotazioni\finalandcomma\ e postfazione}% FIXME: missing
-   {trans., annot\adddot\finalandcomma\ e postf\adddot}},
+    {trans., annot\adddot\finalandcomma\ e postf\adddot}},
   translatorsanaf  = {{traduzione, annotazioni\finalandcomma\ e postfazione}% FIXME: missing
-   {trans., annot\adddot\finalandcomma\ e postf\adddot}},
+    {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 9c96745039f..8bf0089640b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -13,8 +13,7 @@
 %% License information appended
 %% 
 \ProvidesFile{philosophy-classic.bbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \RequireBibliographyStyle{authoryear}
@@ -27,18 +26,160 @@
   \settoggle{bbx:square}{#1}}
 \DeclareBibliographyOption{nodate}[true]{%
   \settoggle{bbx:nodate}{#1}}
+\define@key{blx@bib1}{nodate}[]{}%
+\define@key{blx@bib2}{nodate}[true]{%
+  \ifstrequal{#1}{false}{\togglefalse{bbx:nodate}}{}}%
+\def\bbx@opt@mergedate@maximum{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+          \printfield{issue}%
+           \setunit*{\addspace}%
+            \iffieldsequal{year}{labelyear}
+             {\printlabeldateextra}%
+             {\printfield{labelyear}%
+             \printfield{extrayear}}%
+          }}}%
+  \renewbibmacro*{date}{}%
+  \renewbibmacro*{issue+date}{}}
+
+\def\bbx@opt@mergedate@compact{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+           \iffieldsequal{year}{labelyear}
+           {\printlabeldateextra}%
+           {\printfield{labelyear}%
+            \printfield{extrayear}}%
+           }}}%
+  \renewbibmacro*{date}{}%
+  \renewbibmacro*{issue+date}{%
+    \iffieldundef{issue}
+    {}
+      {\ifdefstring{\bbx@volnumformat}{parens}%
+      {\printtext{%
+        \printfield{issue}%
+        \printdate}}%
+      {\printtext[pureparens]{%
+        \printfield{issue}}}}%
+      \newunit}}
+
+\def\bbx@opt@mergedate@basic{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+         \printfield{labelyear}%
+         \printfield{extrayear}%
+        }}}%
+  \renewbibmacro*{date}{%
+    \iffieldundef{month}
+    {}
+    {\printdate}}%
+  \renewbibmacro*{issue+date}{%
+    \ifboolexpr{
+      test {\iffieldundef{issue}}
+      and
+      test {\iffieldundef{month}}
+    }
+    {}
+      {\ifdefstring{\bbx@volnumformat}{parens}%
+      {\printtext{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}%
+      {\printtext[pureparens]{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}}%
+    \newunit}}
+
+\def\bbx@opt@mergedate@minimum{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+         \printfield{labelyear}%
+         \printfield{extrayear}%
+        }}}%
+  \renewbibmacro*{date}{%
+    \ifboolexpr{
+      test {\iffieldundef{month}}
+      and
+      test {\iffieldundef{extrayear}}
+    }
+    {}
+    {\printdate}}%
+  \renewbibmacro*{issue+date}{%
+    \ifboolexpr{
+      test {\iffieldundef{issue}}
+      and
+      test {\iffieldundef{month}}
+      and
+      test {\iffieldundef{extrayear}}
+    }
+    {}
+      {\ifdefstring{\bbx@volnumformat}{parens}%
+      {\printtext{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}%
+      {\printtext[pureparens]{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}}%
+    \newunit}}
 
+\def\bbx@opt@mergedate@false{%
+  \renewbibmacro*{date+extrayear}{%
+    \ifboolexpr{%
+      test {\iffieldundef{date}}
+      and
+      test {\iffieldundef{year}}
+    }%
+    {\usebibmacro{bbx:nodate}}
+    {\postsepyear{%
+                \printfield{labelyear}%
+                \printfield{extrayear}%
+            }}}%
+  \renewbibmacro*{date}{\printdate}%
+  \renewbibmacro*{issue+date}{%
+      {\ifdefstring{\bbx@volnumformat}{parens}%
+      {\printtext{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}%
+      {\printtext[pureparens]{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}}}}
 \ExecuteBibliographyOptions{%
   nodate      = true,
+  mergedate   = basic,
   uniquename  = false,
   pagetracker = true,
   singletitle = false,
   square      = false,
-  mergedate   = basic,
   dashed      = true,
 }
+\newcommand*{\postsepyear}[1]{%
+  \printtext[parens]{#1}}
+\newbibmacro*{bbx:nodate}{%
+    \iftoggle{bbx:nodate}{%
+      \postsepyear{\midsentence\bibstring{nodate}}{}}}
 \AtBeginShorthands{%
-\togglefalse{bbx:annotation}%
 \renewcommand{\labelnamepunct}{\addcomma\space}%
 \renewbibmacro*{relateddate}{%
   \setunit*{\addspace}%
@@ -46,8 +187,11 @@
 \renewbibmacro*{commarelateddate}{%
   \setunit*{\addcomma\space}%
   \printdate}%
+\savebibmacro{date+extrayear}
+\renewbibmacro*{date+extrayear}{}
 \DeclareCiteCommand{\bbx@crossref@inbook}
-  {}%
+  {\renewcommand*{\postsepyear}{\printtext[parens]}%
+   \restorebibmacro{date+extrayear}}%
   {\iffieldundef{shorthand}{%
   \usebibmacro{citeindex}%
   \ifuseeditor{%
@@ -56,12 +200,13 @@
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \usebibmacro{date+extrayear:crossref}}%
+    \usebibmacro{date+extrayear}}%
     {\usebibmacro{cite:shorthand}}}%
   {}%
   {}%
 \DeclareCiteCommand{\bbx@crossref@incollection}%
-  {}%
+  {\renewcommand*{\postsepyear}{\printtext[parens]}%
+   \restorebibmacro{date+extrayear}}%
   {\iffieldundef{shorthand}{%
   \usebibmacro{citeindex}%
   \ifuseeditor{%
@@ -70,210 +215,100 @@
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \usebibmacro{date+extrayear:crossref}}%
+    \usebibmacro{date+extrayear}}%
     {\usebibmacro{cite:shorthand}}}%
   {}%
   {}%
-\newbibmacro*{date+extrayear:crossref}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-      {\iftoggle{bbx:nodate}{\printtext[parens]{%
-        \midsentence\bibstring{nodate}}}{}}%
-      {\printtext[parens]{\printdateextra}}%
-       \endgroup}%
-\newbibmacro*{date+extrayear}{}%
-\renewbibmacro*{date}{\printdate}%
-\renewbibmacro*{issue+date}{%
-  \printtext[pureparens]{%
-    \iffieldundef{issue}
-      {\usebibmacro{date}}
-      {\printfield{issue}%
-       \setunit*{\addspace}%
-       \usebibmacro{date}}}%
-  \newunit}
   }%
-
 \AtBeginDocument{%
+  \ifdefstring{\bbx@editionformat}{superscript}%
+   {\ClassError{biblatex-philosophy}
+   {\MessageBreak**** Option 'editionformat=superscript'
+    available only for philosophy-verbose style}
+   {\MessageBreak**** Option 'editionformat=superscript'
+    available only for philosophy-verbose style}}{}
   \iftoggle{bbx:square}
     {\renewcommand{\bibopenparen}{\bibopenbracket}%
-    \renewcommand{\bibcloseparen}{\bibclosebracket}}%
+     \renewcommand{\bibcloseparen}{\bibclosebracket}}%
     {}%
   \setcounter{maxnamesincross}{\value{maxnames}}%
   \setcounter{minnamesincross}{\value{minnames}}%
 }%
-\DeclareNameFormat{labelname}{%
-\nameparts{#1}%
-\bibhyperref{\ifcase\value{uniquename}%
-\usebibmacro{name:family}
-{\namepartfamily}
-{\namepartgiven}
-{\namepartprefix}
-{\namepartsuffix}%
-\or
-\ifuseprefix
-{\usebibmacro{name:given-family}
-{\namepartfamily}
-{\namepartgiveni}
-{\namepartprefix}
-{\namepartsuffixi}}
-{\usebibmacro{name:given-family}
-{\namepartfamily}
-{\namepartgiveni}
-{\namepartprefixi}
-{\namepartsuffixi}}%
-\or
-\usebibmacro{name:given-family}
-{\namepartfamily}
-{\namepartgiven}
-{\namepartprefix}
-{\namepartsuffix}%
-\fi
-\usebibmacro{name:andothers}}}
-
 \AtEveryBibitem{%
-\iffieldequalstr{entrysubtype}{classic}{%
-  \togglefalse{bbx:nodate}}}%
+  \iffieldequalstr{entrysubtype}{classic}{%
+    \togglefalse{bbx:nodate}}%
+}%
 \renewbibmacro*{relateddate}{}
 \renewbibmacro*{commarelateddate}{}
-  \renewbibmacro*{issue+date}{%
-    \ifboolexpr{%
-      test {\iffieldundef{issue}}
-      and
-      test {\iffieldundef{month}}
-    }%
-      {}%
-      {\ifdefstring{\bbx@volnumformat}{parens}%
-      {\printtext{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}%
-      {\printtext[pureparens]{%
-        \printfield{issue}\setunit*{\addspace}%
-        \printdate}}}%
-    \newunit}%
-\renewbibmacro*{date+extrayear}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-      {\iftoggle{bbx:nodate}{\printtext[parens]{%
-        \midsentence\bibstring{nodate}}}{}}%
-      {\printtext[parens]{\printdateextra}}%
-       \endgroup}%
 \renewbibmacro*{author}{%
-  \ifboolexpr{%
+  \ifboolexpr{
     test \ifuseauthor
     and
     not test {\ifnameundef{author}}
-  }%
-    {\usebibmacro{bbx:dashcheck}%
-       {\bibnamedash}%
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
        {\usebibmacro{bbx:savehash}%
         \printnames{author}%
         \iffieldundef{nameaddon}{}%
         {\setunit{\addspace}%
-        \printtext[brackets]{\printfield{nameaddon}}}%
-\iffieldundef{authortype}%
-  {\setunit{\addspace}}%
-  {\setunit{\addcomma\space}}}%
-     \iffieldundef{authortype}%
-       {}%
+        \printtext[brackets]{\printfield{nameaddon}}}%*
+        \iffieldundef{authortype}
+          {\setunit{\printdelim{nameyeardelim}}}
+          {\setunit{\printdelim{editorstrgdelim}}}}%*
+     \iffieldundef{authortype}
+       {}
        {\usebibmacro{authorstrg}%
-\setunit{\addspace}}}%
-    {\global\undef\bbx@lasthash%
+        \setunit{\printdelim{nameyeardelim}}}}%
+    {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
-     \setunit*{\addspace}}%
-  \usebibmacro{date+extrayear}}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}
 
-\renewbibmacro*{editor}{%
-  \usebibmacro{bbx:editor}{editorstrg}}%
-\renewbibmacro*{editor+others}{%
-  \usebibmacro{bbx:editor}{editor+othersstrg}}%
 \renewbibmacro*{bbx:editor}[1]{%
-  \ifboolexpr{%
+  \ifboolexpr{
     test \ifuseeditor
     and
     not test {\ifnameundef{editor}}
-  }%
-    {\usebibmacro{bbx:dashcheck}%
-       {\bibnamedash}%
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
        {\printnames{editor}%
-\setunit{\addspace}%
-\usebibmacro{bbx:savehash}}%
+        \setunit{\printdelim{editorstrgdelim}}%MOD
+        \usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{editor}%
-     \setunit{\addspace}}%
-    {\global\undef\bbx@lasthash%
+     \setunit{\printdelim{nameyeardelim}}}%
+    {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
-     \setunit*{\addspace}}%
-  \usebibmacro{date+extrayear}}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \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}}}
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\printnames{translator}%
+        \setunit{\printdelim{editorstrgdelim}}%MOD
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{#1}%MOD
+     \clearname{translator}%
+     \setunit{\printdelim{nameyeardelim}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}
+\renewbibmacro*{labeltitle}{%
+  \iffieldundef{label}
+    {\iffieldundef{shorttitle}
+       {\printfield{title}%
+        \clearfield{title}}
+       {\printfield[title]{shorttitle}}\blx@postpunct}
+    {\printfield{label}}}
 \DeclareCiteCommand{\bbx@crossref@inbook}%
   {}%
   {\usebibmacro{citeindex}%
@@ -283,7 +318,7 @@ test {\ifandothers{translator}}
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \usebibmacro{date+extrayear}}%
+    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
   {}%
   {}%
 \DeclareCiteCommand{\bbx@crossref@incollection}%
@@ -295,14 +330,9 @@ test {\ifandothers{translator}}
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \usebibmacro{date+extrayear}}%
+    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
   {}%
   {}%
-\define@key{blx@bib1}{restoreclassic}[]{}
-\define@key{blx@bib2}{restoreclassic}[true]{}
-\define@key{blx@bib1}{nodate}[]{}%
-\define@key{blx@bib2}{nodate}[true]{%
-  \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 5cd071de7f6..6d339f95292 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -13,28 +13,24 @@
 %% License information appended
 %% 
 \ProvidesFile{philosophy-classic.cbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \RequireCitationStyle{authoryear-comp}
 
-\ExecuteBibliographyOptions{%
-  citetracker = true,
-}
-
-\AtEveryCite{%
-  \iftoggle{cbx:scauthorscite}%
-   {\let\mkbibnamefamily\mkbibsc%
-    \let\mkbibnamegiven\mkbibsc%
-    \let\mkbibnameprefix\mkbibsc%
-   \let\mkbibnamesuffix\mkbibsc}%
-   {}}%
+\ExecuteBibliographyOptions{citetracker}
 
-\newcommand{\switchclass}[2]{%
+\newcommand{\switchATAY}[2]{%
   \iffieldequalstr{entrysubtype}{classic}%
     {\usebibmacro{#1}}%
     {\usebibmacro{#2}}}
+\newbibmacro*{cbx:testshorthand}[1]{%
+\ifboolexpr{
+  not test {\iftoggle{cbx:shorthandintro}}
+    or
+  test \ifciteseen}
+  {\usebibmacro{cite:shorthand}}{\usebibmacro{#1}%
+   \usebibmacro{shorthandintro}}}
 \newbibmacro*{cite:init:AT}{%
   \ifnumless{\value{multicitecount}}{2}
     {\global\boolfalse{cbx:parens}%
@@ -46,24 +42,27 @@
 \newbibmacro*{cite:reinit:AT}{%
   \global\undef\cbx@lasthash}
 
-\newbibmacro*{cite:AT}{%
-  \iffieldundef{shorthand}
-    {\iffieldequals{namehash}{\cbx@lasthash}
-       {\setunit{\compcitedelim}}%
+\newbibmacro*{cite:AT:noshorthand}{%
+\iffieldequals{namehash}{\cbx@lasthash}
+       {\setunit{\compcitedelim}}
        {\ifnameundef{labelname}
           {}%
           {\printnames{labelname}%
-           \setunit{\nametitledelim}}%
+           \setunit{\printdelim{nametitledelim}}}%
         \savefield{namehash}{\cbx@lasthash}}%
      \usebibmacro{cite:title:AT}}
-    {\usebibmacro{cite:shorthand}%
+
+\newbibmacro*{cite:AT}{%
+  \iffieldundef{shorthand}
+    {\usebibmacro{cite:AT:noshorthand}}
+    {\usebibmacro{cbx:testshorthand}{cite:AT:noshorthand}%
      \usebibmacro{cite:reinit:AT}}%
   \setunit{\multicitedelim}}
 
 \newbibmacro*{citetitle:AT}{%
   \iffieldundef{shorthand}
     {\usebibmacro{cite:title:AT}}%
-    {\usebibmacro{cite:shorthand}}%
+    {\usebibmacro{cbx:testshorthand}{cite:title:AT}}%
   \setunit{\multicitedelim}}
 
 \newbibmacro*{textcite:AT}{%
@@ -73,24 +72,21 @@
        {}%
        {\printnames{labelname}%
         \setunit{%
-    \global\booltrue{cbx:parens}%
-    \addspace\bibopenparen}}%
+          \global\booltrue{cbx:parens}%
+          \printdelim{nametitledelim}\bibopenparen}}%
+     \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
   \iffieldundef{shorthand}
     {\usebibmacro{cite:title:AT}}%
-    {\iftoggle{cbx:shorthandintro}{%
-      \ifciteseen{%
-       \usebibmacro{cite:shorthand}}%
-       {\usebibmacro{shorthandintro}}}%
-     {\usebibmacro{cite:shorthand}}}%
+    {\usebibmacro{cbx:testshorthand}{cite:title:AT}}%
   \setunit{%
     \ifbool{cbx:parens}
       {\bibcloseparen\global\boolfalse{cbx:parens}}
       {}%
-    \multicitedelim}}
+    \textcitedelim}}
 
 \newbibmacro*{cite:title:AT}{%
   \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
@@ -99,20 +95,20 @@
   \ifnameundef{labelname}
     {\setunit{%
        \global\booltrue{cbx:parens}%
-       \addspace\bibopenparen}}
+       \extpostnotedelim\bibopenparen}}
     {\setunit{\postnotedelim}}%
   \printfield{postnote}%
   \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-   {\bibcloseparen\global\boolfalse{cbx:parens}}
-   {}}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-   {\bibcloseparen\global\boolfalse{cbx:parens}}
-   {}%
-       \multicitedelim}}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}%
+       \textcitedelim}}}
 \newbibmacro*{cite:init:AY}{%
   \ifnumless{\value{multicitecount}}{2}
     {\global\boolfalse{cbx:parens}%
@@ -121,98 +117,93 @@
     {\iffieldundef{prenote}
        {}
        {\global\undef\cbx@lasthash
-  \global\undef\cbx@lastyear}}}
+        \global\undef\cbx@lastyear}}}
 
 \newbibmacro*{cite:reinit:AY}{%
   \global\undef\cbx@lasthash
   \global\undef\cbx@lastyear}
 
+\newbibmacro*{cite:AY:noshorthand}{%
+\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
+       {\usebibmacro{cite:label}%
+        \setunit{\printdelim{nonameyeardelim}}%
+        \usebibmacro{cite:labelyear+extrayear}%
+        \usebibmacro{cite:reinit}}
+       {\iffieldequals{namehash}{\cbx@lasthash}
+          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+             {\setunit{\addcomma}%
+              \usebibmacro{cite:extrayear}}
+             {\setunit{\compcitedelim}%
+              \usebibmacro{cite:labelyear+extrayear}%
+              \savefield{labelyear}{\cbx@lastyear}}}
+          {\printnames{labelname}%
+           \setunit{\printdelim{nameyeardelim}}%
+           \usebibmacro{cite:labelyear+extrayear}%
+           \savefield{namehash}{\cbx@lasthash}%
+           \savefield{labelyear}{\cbx@lastyear}}}}
+
 \newbibmacro*{cite:AY}{%
-  \iffieldundef{shorthand}%
-    {\usebibmacro{cite:noshorthand}}%
-    {\iftoggle{cbx:shorthandintro}%
-    {\ifciteseen{\usebibmacro{cite:shorthand}}%
-     {\usebibmacro{cite:noshorthand}%
-     \usebibmacro{shorthandintro}}}%
-     {\usebibmacro{cite:shorthand}}%
-     \usebibmacro{cite:reinit:AY}}%
+  \iffieldundef{shorthand}
+    {\usebibmacro{cite:AY:noshorthand}}%
+    {\usebibmacro{cbx:testshorthand}{cite:AY:noshorthand}%
+     \usebibmacro{cite:reinit}}%
   \setunit{\multicitedelim}}
 
-\newbibmacro*{textcite:AY}{%
-  \iffieldequals{namehash}{\cbx@lasthash}%
-    {\iffieldundef{shorthand}%noshorthand
-       {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
-          {\setunit{\addcomma}%
-           \usebibmacro{cite:extrayear}}%
-          {\setunit{\compcitedelim}%
-           \usebibmacro{cite:labelyear+extrayear}%
-           \savefield{labelyear}{\cbx@lastyear}}}%
-       {\setunit{\compcitedelim}%shorthand
-       \iftoggle{cbx:shorthandintro}%
-        {\ifciteseen
-        {\usebibmacro{cite:shorthand}}%
-        {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
+\newbibmacro*{textcite:AY:noshorthand:A}{%
+\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
+                    \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
           {\setunit{\addcomma}%
-           \usebibmacro{cite:extrayear}}%
+           \usebibmacro{cite:extrayear}}
           {\setunit{\compcitedelim}%
            \usebibmacro{cite:labelyear+extrayear}%
-           \savefield{labelyear}{\cbx@lastyear}}%
-           \usebibmacro{shorthandintro}}}%
-           {\usebibmacro{cite:shorthand}}%
-        \global\undef\cbx@lastyear}}%
+           \savefield{labelyear}{\cbx@lastyear}}}
+
+\newbibmacro*{textcite:AY:noshorthand:B}{%
+\usebibmacro{cite:label}%
+           \setunit{%
+             \global\booltrue{cbx:parens}%
+             \printdelim{nonameyeardelim}\bibopenparen}%
+           \ifnumequal{\value{citecount}}{1}
+             {\usebibmacro{prenote}}
+             {}%
+           \usebibmacro{cite:labelyear+extrayear}}
+
+\newbibmacro*{textcite:AY:noshorthand:C}{%
+\iffieldundef{labelyear}
+             {\usebibmacro{cite:label}}
+             {\usebibmacro{cite:labelyear+extrayear}}%
+           \savefield{labelyear}{\cbx@lastyear}}
+
+\newbibmacro*{textcite:AY}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+    {\iffieldundef{shorthand}
+       {\usebibmacro{textcite:AY:noshorthand:A}}
+       {\setunit{\compcitedelim}%
+\usebibmacro{cbx:testshorthand}{textcite:AY:noshorthand:A}%
+        \global\undef\cbx@lastyear}}
     {\ifnameundef{labelname}%
-       {\iffieldundef{shorthand}%shorthand
-          {\usebibmacro{cite:label}%
-   \setunit{%
-     \global\booltrue{cbx:parens}%
-     \addspace\bibopenparen}%
-   \ifnumequal{\value{citecount}}{1}%
-     {\usebibmacro{prenote}}%
-     {\usebibmacro{cite:shorthand}}%
-   \usebibmacro{cite:labelyear+extrayear}}%
-          {\iftoggle{cbx:shorthandintro}%
-          {\ifciteseen%shorthand
-          {\usebibmacro{cite:shorthand}}%
-          {\usebibmacro{cite:label}%
-   \setunit{%
-     \global\booltrue{cbx:parens}%
-     \addspace\bibopenparen}%
-   \ifnumequal{\value{citecount}}{1}%
-     {\usebibmacro{prenote}}%
-     {\usebibmacro{cite:shorthand}}%
-   \usebibmacro{cite:labelyear+extrayear}%
-   \usebibmacro{shorthandintro}}}}%
-   {\usebibmacro{cite:shorthand}}}%
+       {\iffieldundef{shorthand}
+          {\usebibmacro{textcite:AY:noshorthand:B}}
+          {\usebibmacro{cbx:testshorthand}{textcite:AY:noshorthand:B}}}
        {\printnames{labelname}%
-\setunit{%
-  \global\booltrue{cbx:parens}%
-  \addspace\bibopenparen}%
-\ifnumequal{\value{citecount}}{1}%
-  {\usebibmacro{prenote}}%
-  {}%
-        \iffieldundef{shorthand}%noshorthand
-          {\iffieldundef{labelyear}%
-             {\usebibmacro{cite:label}}%
-             {\usebibmacro{cite:labelyear+extrayear}}%
-           \savefield{labelyear}{\cbx@lastyear}}%
-          {\iftoggle{cbx:shorthandintro}%
-          {\ifciteseen%
-                    {\usebibmacro{cite:shorthand}}%
-                    {\iffieldundef{labelyear}%
-             {\usebibmacro{cite:label}}%
-             {\usebibmacro{cite:labelyear+extrayear}}%
-           \savefield{labelyear}{\cbx@lastyear}%
-           \usebibmacro{shorthandintro}}%
-           \global\undef\cbx@lastyear}%
-           {\usebibmacro{cite:shorthand}}}%
-        \savefield{namehash}{\cbx@lasthash}}}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \printdelim{nameyeardelim}\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
+        \iffieldundef{shorthand}
+          {\usebibmacro{textcite:AY:noshorthand:C}}%
+          {\usebibmacro{cbx:testshorthand}{textcite:AY:noshorthand:C}%
+           \global\undef\cbx@lastyear}}%
+     \stepcounter{textcitecount}%
+     \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
-    \ifbool{cbx:parens}%
-      {\bibcloseparen\global\boolfalse{cbx:parens}}%
+    \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
       {}%
-    \multicitedelim}}%
+    \textcitedelim}}
 
 \newbibmacro*{textcite:postnote:AY}{%
   \usebibmacro{postnote}%
@@ -227,44 +218,21 @@
    {\bibcloseparen\global\boolfalse{cbx:parens}}
    {}%
        \multicitedelim}}}
-\renewbibmacro*{cite:shorthand}{%
-  \printtext[bibhyperref]{\printfield{shorthand}}}
 \renewbibmacro*{cite:init}{%
-  \switchclass{cite:init:AT}{cite:init:AY}}
+   \switchATAY{cite:init:AT}{cite:init:AY}}
 \renewbibmacro*{cite:reinit}{%
-  \switchclass{cite:reinit:AT}{cite:reinit:AY}}
+   \switchATAY{cite:reinit:AT}{cite:reinit:AY}}
 \renewbibmacro*{cite}{%
-  \switchclass{cite:AT}{cite:AY}}
+   \switchATAY{cite:AT}{cite:AY}}
 \renewbibmacro*{textcite}{%
-  \switchclass{textcite:AT}{textcite:AY}}
+   \switchATAY{textcite:AT}{textcite:AY}}
 \renewbibmacro*{textcite:postnote}{%
-  \switchclass{textcite:postnote:AT}{textcite:postnote:AY}}
-
-\newbibmacro*{cite:noshorthand}{%
-\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}%
-       {\usebibmacro{cite:label}%
-\setunit{\addspace}%
-\usebibmacro{cite:labelyear+extrayear}%
-        \usebibmacro{cite:reinit}}%
-       {\iffieldequals{namehash}{\cbx@lasthash}%
-          {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                       \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}%
-             {\setunit{\addcomma}%
-              \usebibmacro{cite:extrayear}}%
-             {\setunit{\compcitedelim}%
-              \usebibmacro{cite:labelyear+extrayear}%
-              \savefield{labelyear}{\cbx@lastyear}}}%
-          {\printnames{labelname}%
-      \setunit{\nameyeardelim}%
-           \usebibmacro{cite:labelyear+extrayear}%
-           \savefield{namehash}{\cbx@lasthash}%
-           \iffieldundef{postnote}%
-              {\savefield{labelyear}{\cbx@lastyear}}{}}}}
+   \switchATAY{textcite:postnote:AT}{textcite:postnote:AY}}
 \DeclareCiteCommand*{\cite}
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \switchclass{citetitle:AT}{citeyear}}%
+    \switchATAY{citetitle:AT}{citeyear}}%
   {}
   {\usebibmacro{postnote}}
 
@@ -272,16 +240,17 @@
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \switchclass{citetitle:AT}{citeyear}}
+    \switchATAY{citetitle:AT}{citeyear}}
   {}
   {\usebibmacro{postnote}}
-
 \DeclareCiteCommand{\citetitle}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
-  {\indexfield{indextitle}%
-    \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
+  {\ifciteindex
+     {\indexfield{indextitle}}
+     {}%
+   \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
@@ -289,8 +258,10 @@
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
-  {\indexfield{indextitle}%
-    \printtext[bibhyperref]{\printfield[citetitle]{title}}}
+  {\ifciteindex
+     {\indexfield{indextitle}}
+     {}%
+   \printtext[bibhyperref]{\printfield[citetitle]{title}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
@@ -302,6 +273,29 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
+\DeclareCiteCommand*{\citeyear}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\printtext[bibhyperref]{\printfield{year}\printfield{extrayear}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\citedate}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\printtext[bibhyperref]{\printdate}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\citedate}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\printtext[bibhyperref]{\printdateextra}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
 \DeclareCiteCommand{\footcitet}[\mkbibfootnote]
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
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 ebef2925fc8..03b1c1bc8d1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
@@ -13,17 +13,84 @@
 %% License information appended
 %% 
 \ProvidesFile{philosophy-modern.bbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \RequireBibliographyStyle{philosophy-classic}
 \newtoggle{bbx:yearleft}
 \DeclareBibliographyOption{yearleft}[true]{%
   \settoggle{bbx:yearleft}{#1}}
-\ExecuteBibliographyOptions{%
-  yearleft=false}
-
+\define@key{blx@biblist1}{restoreclassic}[]{}
+\define@key{blx@biblist2}{restoreclassic}[true]{\setkeys{blx@bib2}{restoreclassic}}%
+\define@key{blx@bib1}{restoreclassic}[]{}
+\define@key{blx@bib2}{restoreclassic}[true]{%
+\ifstrequal{#1}{true}{%
+\setlength{\bibhang}{\parindent}%
+\renewcommand{\labelnamepunct}{\newunitpunct}%
+\renewcommand*{\postsepyear}[1]{\printtext[parens]{##1}}%
+\renewbibmacro*{author}{%
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}%
+       {\usebibmacro{bbx:savehash}%
+        \printnames{author}%
+        \iffieldundef{nameaddon}{}%
+        {\setunit{\addspace}%
+        \printtext[brackets]{\printfield{nameaddon}}}%*
+        \iffieldundef{authortype}
+          {\setunit{\printdelim{nameyeardelim}}}%
+          {\setunit{\printdelim{editorstrgdelim}}}}%*
+     \iffieldundef{authortype}
+       {}%
+       {\usebibmacro{authorstrg}%
+        \setunit{\printdelim{nameyeardelim}}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}%
+\renewbibmacro*{bbx:editor}[1]{%
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}%
+       {\printnames{editor}%
+        \setunit{\printdelim{editorstrgdelim}}%
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{##1}%
+     \clearname{editor}%
+     \setunit{\printdelim{nameyeardelim}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}%
+\renewbibmacro*{bbx:translator}[1]{%
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}%
+       {\printnames{translator}%
+        \setunit{\printdelim{editorstrgdelim}}%
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{##1}%
+     \clearname{translator}%
+     \setunit{\printdelim{nameyeardelim}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+     \setunit*{\printdelim{nonameyeardelim}}}%
+  \usebibmacro{date+extrayear}}%
+}{}}%
+\ExecuteBibliographyOptions{yearleft=false}
+\renewcommand{\labelnamepunct}{}
 \newlength{\yeartitle}
 \newlength{\postnamesep}
 \setlength{\yeartitle}{0.8em}
@@ -31,110 +98,95 @@
 \setlength{\bibitemsep}{\postnamesep}
 \setlength{\bibnamesep}{1.5ex plus 2pt minus 1pt}
 \setlength{\bibhang}{4\parindent}
-
-\AtBeginBibliography{%
-\iftoggle{bbx:yearleft}{%
-\setlength{\yeartitle}{\fill}}%
-{}}
-\newcommand{\postsep}{\par\nobreak\vskip\postnamesep%
-  \hskip-\bibhang\ignorespaces}
-\renewcommand{\labelnamepunct}{}
 \AtBeginShorthands{%
-\renewcommand{\postsep}{}%\addspace in version 1.9.3
-\renewcommand{\labelnamepunct}{\newunitpunct}}
-\renewbibmacro*{date+extrayear}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-  \makebox[\bibhang][r]{\printtext{%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-    {\iftoggle{bbx:nodate}{\printtext{%
-      \midsentence\bibstring{nodate}}}{}}%
-    {\printtext{\printdateextra}}%
-    \hskip\yeartitle}}%
-    \nopunct%
-       \endgroup}%
+  \renewcommand{\postsep}{\addspace}%
+  \renewcommand{\labelnamepunct}{\newunitpunct}}
+\AtBeginBibliography{%
+  \iftoggle{bbx:yearleft}{%
+    \setlength{\yeartitle}{\fill}}{}}
+\newcommand{\postsep}{%
+  \null\par\nobreak\vskip\postnamesep%
+    \hskip-\bibhang\ignorespaces}
+\renewcommand*{\postsepyear}[1]{%
+  \printtext{\makebox[\bibhang][r]{%
+    #1\hskip\yeartitle}}\nopunct}
+\renewbibmacro*{bbx:nodate}{%
+  \postsepyear{%
+    \iftoggle{bbx:nodate}{%
+      \midsentence\bibstring{nodate}}{}}}
 \renewbibmacro*{author}{%
-  \ifboolexpr{%
+  \ifboolexpr{
     test \ifuseauthor
     and
     not test {\ifnameundef{author}}
-  }%
-    {\usebibmacro{bbx:dashcheck}%
+  }
+    {\usebibmacro{bbx:dashcheck}
        {}%
        {\usebibmacro{bbx:savehash}%
         \printnames{author}%
         \iffieldundef{nameaddon}{}%
         {\setunit{\addspace}%
-        \printtext[brackets]{\printfield{nameaddon}}}%
-         \iffieldundef{authortype}%
+        \printtext[brackets]{\printfield{nameaddon}}}%*
+        \postsep}%
+     \usebibmacro{date+extrayear}%
+       \iffieldundef{authortype}
          {}%
-         {\setunit{\addcomma\space}}%
-        \usebibmacro{authorstrg}%
-    \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}}%
+         {\usebibmacro{authorstrg}%
+         \printtext{\addcomma\space}}}%
+    {\global\undef\bbx@lasthash
+     \usebibmacro{labeltitle}%
+       \postsep%
+     \usebibmacro{date+extrayear}%
+     }%
+  }
+
 \renewbibmacro*{bbx:editor}[1]{%
-\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}%
-}%
+  \ifboolexpr{%
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }%
+  {\usebibmacro{bbx:dashcheck}%
+    {}%
+    {\printnames{editor}%
+          \postsep%
+    \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}%
-  \usebibmacro{#1}%
-  \clearname{translator}%
-  \printtext{\addcomma\space}%
-}%
-{\global\undef\bbx@lasthash%
-  \usebibmacro{labeltitle}%
-   \postsep%
-  \usebibmacro{date+extrayear}%
-}%
+  \ifboolexpr{%
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }%
+  {\usebibmacro{bbx:dashcheck}%
+    {}%
+    {\printnames{translator}%
+          \postsep%
+    \usebibmacro{bbx:savehash}}%
+    \usebibmacro{date+extrayear}%
+    \usebibmacro{#1}%
+    \clearname{translator}%
+    \printtext{\addcomma\space}%
+  }%
+  {\global\undef\bbx@lasthash%
+    \usebibmacro{labeltitle}%
+      \postsep%
+    \usebibmacro{date+extrayear}%
+  }%
 }%
 \DeclareCiteCommand{\bbx@crossref@inbook}%
-  {}%
+  {\renewcommand*{\postsepyear}{\printtext[parens]}}%
   {\usebibmacro{citeindex}%
   \ifuseeditor{%
     \ifthenelse{\value{listtotal}=2}%
@@ -142,11 +194,11 @@ not test {\ifnameundef{translator}}
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \usebibmacro{classic:date+extrayear}}%
+    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
   {}%
   {}%
 \DeclareCiteCommand{\bbx@crossref@incollection}%
-  {}%
+  {\renewcommand*{\postsepyear}{\printtext[parens]}}%
   {\usebibmacro{citeindex}%
   \ifuseeditor{%
     \ifthenelse{\value{listtotal}=2}%
@@ -154,111 +206,9 @@ not test {\ifnameundef{translator}}
       {\printnames[][-\value{minnamesincross}]{labelname}}}%
      {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \usebibmacro{classic:date+extrayear}}%
+    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}%
   {}%
   {}%
-\newbibmacro*{classic:date+extrayear}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-      {\iftoggle{bbx:nodate}{\printtext[parens]{%
-        \midsentence\bibstring{nodate}}}{}}%
-      {\printtext[parens]{%
-   \printfield{labelyear}%
-   \printfield{extrayear}}}%
-       \endgroup}%
-\define@key{blx@bib1}{restoreclassic}[]{}
-\define@key{blx@bib2}{restoreclassic}[true]{%
-  \ifstrequal{#1}{true}{%
-  \setlength{\bibhang}{\parindent}%
-  \renewcommand{\labelnamepunct}{\newunitpunct}%
-\renewbibmacro*{date+extrayear}{%
-      \begingroup%
-        \clearfield{month}%
-        \clearfield{day}%
-    \ifboolexpr{%
-      test {\iffieldundef{date}}
-      and
-      test {\iffieldundef{year}}
-    }%
-      {\iftoggle{bbx:nodate}{\printtext[parens]{%
-        \midsentence\bibstring{nodate}}}{}}%
-      {\printtext[parens]{\printdateextra}}%
-       \endgroup}%
-\renewbibmacro*{author}{%
-  \ifboolexpr{%
-    test \ifuseauthor
-    and
-    not test {\ifnameundef{author}}
-  }%
-    {\usebibmacro{bbx:dashcheck}%
-       {\bibnamedash}%
-       {\usebibmacro{bbx:savehash}%
-        \printnames{author}%
-        \iffieldundef{nameaddon}{}%
-        {\setunit{\addspace}%
-        \printtext[brackets]{\printfield{nameaddon}}}%
-\iffieldundef{authortype}%
-  {\setunit{\addspace}}%
-  {\setunit{\addcomma\space}}}%
-     \iffieldundef{authortype}%
-       {}%
-       {\usebibmacro{authorstrg}%
-        \setunit{\addspace}}}%
-    {\global\undef\bbx@lasthash%
-     \usebibmacro{labeltitle}%
-     \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}%
-       {\bibnamedash}%
-       {\printnames{editor}%
-\setunit{\addspace}%
-\usebibmacro{bbx:savehash}}%
-     \usebibmacro{#1}%
-     \clearname{editor}%
-     \setunit{\addspace}}%
-    {\global\undef\bbx@lasthash%
-     \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}}%
-  }{}}%
 %% 
 %% 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 a75314dd082..d14da742054 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
@@ -13,19 +13,10 @@
 %% License information appended
 %% 
 \ProvidesFile{philosophy-modern.cbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \RequireCitationStyle{philosophy-classic}
-\DeclareCiteCommand{\fullcite}%
-  {\usebibmacro{prenote}}%
-  {\setkeys{blx@bib2}{restoreclassic}%
-  \usedriver%
-     {\DeclareNameAlias{sortname}{default}}%
-     {\thefield{entrytype}}}%
-  {\multicitedelim}%
-  {\usebibmacro{postnote}}%
 %% 
 %% Copyright 2009-2017 by Ivan Valbusa
 %% 
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 3f31d086d44..97b5324528b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -13,8 +13,7 @@
 %% License information appended
 %% 
 \ProvidesFile{philosophy-standard.bbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \RequireBiber[3]
@@ -26,12 +25,18 @@
 \DeclareLanguageMapping{italian}{italian-philosophy}
 \DeclareLanguageMapping{english}{english-philosophy}
 \DeclareLanguageMapping{spanish}{spanish-philosophy}
+\DeclareLanguageMapping{french}{french-philosophy}
 \newtoggle{bbx:annotation}
 \newtoggle{bbx:library}
 \newtoggle{bbx:inbeforejournal}
 \newtoggle{bbx:classical}
 \newtoggle{bbx:lowscauthors}
 \newtoggle{cbx:shorthandintro}
+\newtoggle{cbx:scauthorscite}
+\newtoggle{bbx:scauthorsbib}
+\newtoggle{cbx:scauthorscitefn}
+\newtoggle{cbx:latinemph}
+
 \DeclareBibliographyOption{annotation}[true]{%
   \settoggle{bbx:annotation}{#1}}
 \DeclareBibliographyOption{library}[true]{%
@@ -44,6 +49,8 @@
   \settoggle{bbx:lowscauthors}{#1}}
 \DeclareBibliographyOption{shorthandintro}[true]{%
   \settoggle{cbx:shorthandintro}{#1}}
+\DeclareBibliographyOption{latinemph}[true]{%
+  \settoggle{cbx:latinemph}{#1}}
 \newcommand{\bbx@publocformat}{}
 \newcommand{\bbx@volnumformat}{}
 \newcommand{\bbx@relatedformat}{}
@@ -69,20 +76,31 @@
 \newcommand{\bbx@origfields}{}
 \DeclareEntryOption{origed}[true]{%
   \renewcommand{\bbx@origfields}{origed}}
-\newtoggle{cbx:scauthorscite}
-\newtoggle{bbx:scauthorsbib}
 \DeclareBibliographyOption{scauthorsbib}[true]{%
   \settoggle{bbx:scauthorsbib}{#1}}
 \DeclareBibliographyOption{scauthorscite}[true]{%
   \settoggle{cbx:scauthorscite}{#1}}
+\define@key{blx@bib1}{annotation}[]{}
+\define@key{blx@bib2}{annotation}[true]{\settoggle{bbx:annotation}{#1}}
+\define@key{blx@biblist1}{annotation}[]{}
+\define@key{blx@biblist2}{annotation}[true]{\settoggle{bbx:annotation}{#1}}
 \ExecuteBibliographyOptions{%
   publocformat     = publocyear,
-  origfieldsformat = semicolon,
   volnumformat     = plain,
+  origfieldsformat = semicolon,
+  relatedformat    = semicolon,
+  editionformat    = arabic,
+  volumeformat     = arabic,
+  scauthors        = false,
   editionformat    = arabic,
   volumeformat     = arabic,
   shorthandintro   = true,
   library          = true,
+  annotation       = false,
+  latinemph        = false,
+  classical        = false,
+  inbeforejournal  = false,
+  lowscauthors     = false,
   useprefix        = true,
   maxcitenames     = 2,
   mincitenames     = 1,
@@ -94,7 +112,7 @@
 \newcounter{maxnamesincross}
 \newcounter{minnamesincross}
 \AtBeginDocument{%
-\ifdefstring{\bbx@scauthors}{all}
+\ifdefstring{\bbx@scauthors}{bibcite}
 {%
   \toggletrue{bbx:scauthorsbib}%
   \toggletrue{cbx:scauthorscite}%
@@ -110,24 +128,52 @@
   \toggletrue{cbx:scauthorscite}%
 }%
 {}%
+\ifdefstring{\bbx@scauthors}{citefn}
+{%
+  \toggletrue{cbx:scauthorscitefn}%
+}%
+{}%
+\ifdefstring{\bbx@scauthors}{bibcitefn}
+{%
+  \toggletrue{bbx:scauthorsbib}%
+  \toggletrue{cbx:scauthorscitefn}%
+}%
+{}%
+\ifdefstring{\bbx@scauthors}{all}
+{%
+  \usebibmacro{scswitch}
+}%
+{}%
+}
+\AtBeginBibliography{%
+  \togglefalse{cbx:scauthorscite}%
+  \togglefalse{cbx:shorthandintro}%
 }
-\AtBeginBibliography{\togglefalse{cbx:scauthorscite}}%
+\AtBeginShorthands{%
+  \togglefalse{bbx:annotation}%
+  \togglefalse{cbx:shorthandintro}%
+}
+\AtEveryCite{%
+  \togglefalse{bbx:annotation}%
+}
+\providecommand*{\mkibid}[1]{\iftoggle{cbx:latinemph}{\emph{#1}}{#1}}
+\newcommand*{\volnumpunct}{\addcomma\space}
 \renewcommand*{\newunitpunct}{\addcomma\space}
 \renewcommand*{\subtitlepunct}{\addperiod\space}
 \renewcommand*{\intitlepunct}{\nopunct\addspace}
 \renewcommand*{\relatedpunct}{\addsemicolon\space}
-\newcommand*{\volnumpunct}{\addcomma\space}
+\DeclareDelimFormat{editorstrgdelim}{\addspace}
 \newrobustcmd*{\mkpureparens}[1]{%
   \begingroup
     \blx@blxinit
     \blx@setsfcodes
-    \blx@postpunct(#1\blx@postpunct)\midsentence%
+    \bibleftparen#1\bibrightparen%
   \endgroup}
 \newrobustcmd*{\mkpurebrackets}[1]{%
   \begingroup
     \blx@blxinit
     \blx@setsfcodes
-    \blx@postpunct[#1\blx@postpunct]\midsentence%
+    \bibleftbracket#1\bibrightbracket%
   \endgroup}
 \newcommand*{\annotationfont}{\footnotesize}
 \newcommand*{\libraryfont}{}
@@ -135,8 +181,8 @@
   \ifdefstring{\bbx@editionformat}{Roman}
     {\uppercase}%
     {\ifdefstring{\bbx@editionformat}{romansc}
-    {\scshape}%
-    {\relax}}}%
+      {\scshape}%
+      {\relax}}}%
 \newrobustcmd*{\edfnt}[1]{%
   \begingroup
   \expandafter\editionfont%
@@ -147,13 +193,12 @@
     \textsc{\MakeLowercase{#1}}}%
     {\textsc{#1}}}
 \newbibmacro*{scswitch}{%
-\let\mkbibnamefamily\mkbibsc%
-\let\mkbibnamegiven\mkbibsc%
-\let\mkbibnameprefix\mkbibsc%
-\let\mkbibnamesuffix\mkbibsc}
+  \let\mkbibnamefamily\mkbibsc%
+  \let\mkbibnamegiven\mkbibsc%
+  \let\mkbibnameprefix\mkbibsc%
+  \let\mkbibnamesuffix\mkbibsc}
 \DeclareNameFormat{sortname}{%
-  \iftoggle{bbx:scauthorsbib}{%
-  \usebibmacro{scswitch}}{}%
+  \iftoggle{bbx:scauthorsbib}{\usebibmacro{scswitch}}{}%
   \nameparts{#1}%
   \ifnumequal{\value{listcount}}{1}
   {\ifgiveninits
@@ -185,6 +230,61 @@
       {\namepartprefix}
       {\namepartsuffix}}}%
   \usebibmacro{name:andothers}}%
+\DeclareNameFormat{labelname}{%
+  \iftoggle{cbx:scauthorscite}{\usebibmacro{scswitch}}{}%
+  \iftoggle{cbx:scauthorscitefn}{\iffootnote{\usebibmacro{scswitch}}{}}{}%
+  \bibhyperref{\nameparts{#1}%
+  \ifcase\value{uniquename}%
+    \usebibmacro{name:family}%
+      {\namepartfamily}%
+      {\namepartgiven}%
+      {\namepartprefix}%
+      {\namepartsuffix}%
+  \or
+    \ifuseprefix
+      {\usebibmacro{name:given-family}%
+        {\namepartfamily}%
+        {\namepartgiveni}%
+        {\namepartprefix}%
+        {\namepartsuffixi}}%
+      {\usebibmacro{name:given-family}%
+        {\namepartfamily}%
+        {\namepartgiveni}%
+        {\namepartprefixi}%
+        {\namepartsuffixi}}%
+  \or
+    \usebibmacro{name:given-family}%
+      {\namepartfamily}%
+      {\namepartgiven}%
+      {\namepartprefix}%
+      {\namepartsuffix}%
+  \fi
+  \usebibmacro{name:andothers}}}%
+\DeclareNameFormat{scdefault}{%
+\usebibmacro{scswitch}%
+  \nameparts{#1}%
+  \ifgiveninits
+    {\usebibmacro{name:given-family}%
+      {\namepartfamily}%
+      {\namepartgiveni}%
+      {\namepartprefix}%
+      {\namepartsuffix}}%
+    {\usebibmacro{name:given-family}%
+      {\namepartfamily}%
+      {\namepartgiven}%
+      {\namepartprefix}%
+      {\namepartsuffix}}%
+  \usebibmacro{name:andothers}}%
+\DeclareCiteCommand{\fullcite}
+  {\usebibmacro{prenote}}
+  {\setkeys{blx@bib2}{restoreclassic}%
+  \usedriver
+    {\iftoggle{cbx:scauthorscite}%
+      {\DeclareNameAlias{sortname}{scdefault}}%
+      {\DeclareNameAlias{sortname}{default}}}%
+  {\thefield{entrytype}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
 \DeclareFieldFormat[bookinbook,thesis]{title}{\mkbibemph{#1}}
 \DeclareFieldFormat[review]{title}{\bibcplstring{reviewof}\addspace#1}
 \DeclareFieldFormat[review]{citetitle}{\bibcplstring{reviewof}\addspace#1}
@@ -201,6 +301,7 @@
 \DeclareFieldFormat{library}{\libraryfont #1}
 \DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
 \DeclareFieldFormat{editortype}{\mkpureparens{#1}}
+\DeclareFieldAlias{authortype}{editortype}
 \DeclareFieldFormat{backrefparens}{\mkpureparens{#1}}
 \DeclareFieldFormat*{number}{%
   \ifdefstring{\bbx@volnumformat}{strings}{%
@@ -212,19 +313,16 @@
 \DeclareFieldFormat{edition}{%
   \ifinteger{#1}{%
     \ifdefstring{\bbx@editionformat}{arabic}
-      {\mkbibordedition{#1}~\bibstring{edition}}
-      {\ifdefstring{\bbx@editionformat}{Roman}%
-        {\RN{#1}~\bibstring{edition}}%
-        {\ifdefstring{\bbx@editionformat}{romansc}%
-          {\textsc{\Rn{#1}}~\bibstring{edition}}%
-          {\ifdefstring{\bbx@editionformat}{roman}%
-            {\Rn{#1}~\bibstring{edition}}
-            {\ifdefstring{\bbx@editionformat}{superscript}%
-            {\ClassError{biblatex-philosophy}
-    {\MessageBreak**** Option 'editionformat=superscript'
-    available only for philosophy-verbose style}
-    {\MessageBreak**** Option 'editionformat=superscript'
-    available only for philosophy-verbose style}}{}}}}}}{#1}}%\isdot??
+    {\mkbibordedition{#1}~\bibstring{edition}}
+    {\ifdefstring{\bbx@editionformat}{Roman}%
+      {\RN{#1}~\bibstring{edition}}%
+      {\ifdefstring{\bbx@editionformat}{romansc}%
+        {\textsc{\Rn{#1}}~\bibstring{edition}}%
+        {\ifdefstring{\bbx@editionformat}{roman}%
+          {\Rn{#1}~\bibstring{edition}}
+          {\ifdefstring{\bbx@editionformat}{superscript}%
+            {\mkbibsuperscript{#1}}%
+            {\optionerror{editionformat}}}}}}}{#1}}%\isdot??
 \DeclareFieldFormat{volume}{%
   \bibstring{volume}~%
     \ifinteger{#1}{%
@@ -261,73 +359,116 @@
         {\optionerror{relatedformat}}}}}%
 \DeclareFieldAlias{related:origpubin}{related}
 \DeclareFieldAlias{related:origpubas}{related}
-\DeclareFieldFormat{relatedstring:default}{#1\addspace}
+\DeclareFieldFormat{relatedstring:default}{#1\addspace}%\addspace needed
+\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}}}
 \renewbibmacro*{citeindex}{%
-  \ifciteindex{\indexnames{labelname}}{}}%
+  \ifciteindex
+    {\indexnames{labelname}}
+    {}}
 \renewbibmacro*{bibindex}{%
-  \ifbibindex{\indexnames{author}%
-    \indexnames{editor}%
-    \indexnames{editora}%
-    \indexnames{editorb}%
-    \indexnames{editorc}}%
-  {}}%
-
-\renewbibmacro*{addendum+pubstate}{%
-  \printfield{addendum}%
-  \newunit\newblock
-  \printfield{pubstate}%
-  \ifdefstring{\bbx@origfields}{none}{}{%
-   \newunit\newblock
-  \usebibmacro{origdata:book}}%
-  \newunit\newblock
-  \usebibmacro{library}}
-
-\newbibmacro*{addendum+pubstate:article-inbook-incoll}{%
-  \printfield{addendum}%
-  \newunit\newblock
-  \printfield{pubstate}%
-  \ifdefstring{\bbx@origfields}{none}{}{%
-   \newunit\newblock
-  \usebibmacro{origdata:article-inbook}}%
-  \newunit\newblock
-  \usebibmacro{library}}
-
+  \ifbibindex
+    {\indexnames{labelname}}
+    {}}
 \newbibmacro*{volnumdefault}{%
-\printfield{volume}%
-  \setunit*{\volnumpunct}%
-  \printfield{number}}
+  \printfield{volume}%
+    \setunit*{\volnumpunct}%
+    \printfield{number}}
 
 \newbibmacro*{volnumparens}{%
-\nopunct%
-\printtext[pureparens]{%
-\printfield{volume}%
-  \setunit*{\volnumpunct}%
-  \printfield{number}}}
+  \nopunct%
+  \printtext[pureparens]{%
+    \printfield{volume}%
+      \setunit*{\volnumpunct}%
+    \printfield{number}}}
 
 \newbibmacro*{volnumstrings}{%
   \iffieldundef{volume}{}{%
     \printfield{volume}\setunit*{\volnumpunct}}%
- \iffieldundef{number}{}{%
+  \iffieldundef{number}{}{%
    \printfield{number}}}
 
+\renewbibmacro*{volume+number+eid}{%
+     \ifdefstring{\bbx@volnumformat}{strings}
+      {\usebibmacro{volnumstrings}}%
+      {\ifdefstring{\bbx@volnumformat}{parens}
+        {\usebibmacro{volnumparens}}%
+        {\ifdefstring{\bbx@volnumformat}{plain}
+          {\usebibmacro{volnumdefault}}%
+          {\optionerror{volnumformat}}}}%
+  \setunit{\addcomma\space}%
+  \printfield{eid}}
+
 \renewbibmacro*{journal}{%
-  \iffieldundef{journaltitle}
+  \ifboolexpr{
+    test {\iffieldundef{journaltitle}}
+    and
+    test {\iffieldundef{journalsubtitle}}
+  }
     {}
     {\printtext[journaltitle]{%
        \printfield[titlecase]{journaltitle}%
-       \midsentence%
        \setunit{\subtitlepunct}%
        \printfield[titlecase]{journalsubtitle}}}}
 
 \renewbibmacro*{periodical}{%
-  \iffieldundef{title}
-    {}%
+  \ifboolexpr{
+    test {\iffieldundef{title}}
+    and
+    test {\iffieldundef{subtitle}}
+  }
+    {}
     {\printtext[title]{%
        \printfield[titlecase]{title}%
-       \midsentence%
        \setunit{\subtitlepunct}%
        \printfield[titlecase]{subtitle}}}}
 
+\renewbibmacro*{issue}{%
+  \ifboolexpr{
+    test {\iffieldundef{issuetitle}}
+    and
+    test {\iffieldundef{issuesubtitle}}
+  }
+    {}
+    {\printtext[issuetitle]{%
+       \printfield[titlecase]{issuetitle}%
+       \setunit{\subtitlepunct}%
+\printfield[titlecase]{issuesubtitle}}}}
+
+
 \renewbibmacro*{journal+issuetitle}{%
   \usebibmacro{journal}%
   \setunit*{\addspace}%
@@ -351,26 +492,18 @@
     {\newunit
      \printfield{series}%
      \setunit{\addspace}\midsentence}%
-  \newunit
   \usebibmacro{volume+number+eid}%
-  \setunit{\addcomma\space}%
-  \printfield{eid}%
   \setunit{\addspace}%
   \usebibmacro{issue+date}%
   \setunit{\addcolon\space}%
   \usebibmacro{issue}%
   \newunit}
 
-\renewbibmacro*{volume+number+eid}{%
-     \ifdefstring{\bbx@volnumformat}{strings}
-      {\usebibmacro{volnumstrings}}%
-      {\ifdefstring{\bbx@volnumformat}{parens}
-      {\usebibmacro{volnumparens}}%
-      {\ifdefstring{\bbx@volnumformat}{plain}
-      {\usebibmacro{volnumdefault}}%
-      {\optionerror{volnumformat}}}}%
-  \setunit{\addcomma\space}%
-  \printfield{eid}}
+\renewbibmacro*{series+number}{%
+  \printfield{series}%
+ \setunit*{\addcomma\space}%
+  \printfield{number}%
+  \newunit}
 
 \renewbibmacro*{issue+date}{%
   \printtext[pureparens]{%
@@ -388,7 +521,7 @@
     and
     test {\iffieldundef{eventyear}}
   }%
-    {}
+    {}%
     {\setunit*{\addspace}%
      \printtext{%
        \printfield{venue}%
@@ -396,12 +529,6 @@
        \printeventdate}}%
   \newunit}
 
-\renewbibmacro*{series+number}{%
-  \printfield{series}%
- \setunit*{\addcomma\space}%
-  \printfield{number}%
-  \newunit}
-
 \renewbibmacro*{publisher+location+date}{%
 \ifdefstring{\bbx@publocformat}{loccolonpub}
   {\usebibmacro{loccolonpub}}
@@ -426,31 +553,6 @@
       {\ifdefstring{\bbx@publocformat}{publocyear}%
       {\usebibmacro{orgpublocyear}}{\optionerror{publocformat}}}}}
 
-\newbibmacro*{library}{%
-\iftoggle{bbx:library}{%
-  \iffieldundef{library}%
-  {}%
-    {\setunit{\addperiod\space}%
-      {\printfield{library}}}}%
-    {}}
-\renewbibmacro*{pageref}{%
-  \iflistundef{pageref}
-    {}%
-    {\setunit{\addperiod\space}%
-    \printtext[backrefparens]{%
-       \ifnumgreater{\value{pageref}}{1}
-         {\bibcpstring{backrefpages}\ppspace}%
- {\bibcpstring{backrefpage}\ppspace}%
-       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}}%
-
-\renewbibmacro*{finentry}{%
-  \iftoggle{bbx:annotation}%
-    {\iffieldundef{annotation}%
-      {\finentry}%
-      {\setunit{\addperiod\par\nobreak\vspace*{.5ex}}%
-      \printtext[annotation]{\printfield{annotation}\finentry\par}}}%
- {\finentry}}
-
 \newbibmacro*{publocyear}{%
   \iflistundef{publisher}%
    {}%
@@ -531,6 +633,52 @@
   \printlist{organization}%
   \usebibmacro{commarelateddate}%
   \newunit}
+
+\renewbibmacro*{addendum+pubstate}{%
+  \printfield{addendum}%
+  \newunit\newblock
+  \printfield{pubstate}%
+  \ifdefstring{\bbx@origfields}{none}{}{%
+   \newunit\newblock
+  \usebibmacro{origdata:book}}%
+  \newunit\newblock
+  \usebibmacro{library}}
+
+\newbibmacro*{addendum+pubstate:article-inbook-incoll}{%
+  \printfield{addendum}%
+  \newunit\newblock
+  \printfield{pubstate}%
+  \ifdefstring{\bbx@origfields}{none}{}{%
+   \newunit\newblock
+  \usebibmacro{origdata:article-inbook}}%
+  \newunit\newblock
+  \usebibmacro{library}}
+
+\newbibmacro*{library}{%
+  \iftoggle{bbx:library}{%
+    \iffieldundef{library}%
+      {}%
+      {\setunit{\addperiod\space}%
+      {\printfield{library}}}}%
+    {}}
+
+\renewbibmacro*{pageref}{%
+  \iflistundef{pageref}
+    {}%
+    {\setunit{\addperiod\space}%
+     \printtext[backrefparens]{%
+       \ifnumgreater{\value{pageref}}{1}
+         {\bibcpstring{backrefpages}\ppspace}%
+         {\bibcpstring{backrefpage}\ppspace}%
+     \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}}%
+
+\renewbibmacro*{finentry}{%
+  \iftoggle{bbx:annotation}%
+    {\iffieldundef{annotation}%
+      {\finentry}%
+      {\setunit{\addperiod\par\nobreak\vspace*{.5ex}}%
+      \printtext[annotation]{\printfield{annotation}\finentry\par}}}%
+    {\finentry}}
 \newbibmacro*{relateddate}{%
   \setunit*{\addspace}%
   \printdate}
@@ -539,8 +687,7 @@
   \printdate}
 \newbibmacro*{related:clearauthors}{%
   \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}%
-  \renewbibmacro*{author/editor+others/translator+others}{%
-    \usebibmacro{bbx:savehash}}%
+  \renewbibmacro*{author/editor+others/translator+others}{\usebibmacro{bbx:savehash}}%
   \renewbibmacro*{editor+others}{\usebibmacro{bbx:savehash}}%
   \renewbibmacro*{author/translator+others}{\usebibmacro{bbx:savehash}}%
   \renewbibmacro*{author/editor}{\usebibmacro{bbx:savehash}}%
@@ -567,8 +714,8 @@
       test {\iffieldundef{relatedstring}}
   }
   {\printtext{\bibstring{translationas}}}{}%
-    \printtext{\addspace}%
-    \relatedcite{\thefield{related}}}
+   \printtext{\addspace}%
+   \relatedcite{\thefield{related}}}
 \renewbibmacro*{begrelatedloop}{%
   \renewrobustcmd*{\mkpureparens}{\relatedpunct}%
   \renewrobustcmd*{\mkpurebrackets}{\relatedpunct}}
@@ -582,63 +729,63 @@
     \usebibmacro{related:init}%
     \usebibmacro{related}}{}}
 \renewbibmacro*{bybookauthor}{%
-\ifnamesequal{author}{bookauthor}%
-{}%
-{\printnames[default]{bookauthor}}}
+  \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}}
+  \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}}
+  \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}%
@@ -1405,11 +1552,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
-
 \DeclareBibliographyDriver{set}{%
   \savefield{annotation}{\@phil@nnote}%
   \clearfield{annotation}%
-  \entryset{}{}%
+  \entryset{\ifnumgreater{\thefield{entrysetcount}}{1}%
+    {\setkeys{blx@bib2}{restoreclassic}}{}}{}%
   \newunit\newblock
   \restorefield{annotation}{\@phil@nnote}%
   \usebibmacro{pageref}%
@@ -1535,7 +1682,6 @@
 \DeclareFieldAlias[jurisdiction]{usera}[jurisdiction]{notacomm}
 \DeclareFieldAlias[jurisdiction]{nameadddon}[jurisdiction]{section}
 \DeclareFieldAlias[jurisdiction]{author}[jurisdiction]{court}
-
 %% 
 %% Copyright 2009-2017 by Ivan Valbusa
 %% 
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 07e86deea4c..4bd07a9e026 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -13,15 +13,12 @@
 %% License information appended
 %% 
 \ProvidesFile{philosophy-verbose.bbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \RequireBibliographyStyle{authortitle}
 \RequireBibliographyStyle{philosophy-standard}
-
 \AtBeginShorthands{%
-  \togglefalse{bbx:annotation}%
 \DeclareCiteCommand{\bbx@crossref@inbook}%
   {}%
   {\iffieldundef{shorthand}%
@@ -37,19 +34,6 @@
   {}%
   {}%
 }
-\DeclareFieldFormat{edition}{%
-  \ifinteger{#1}{%
-    \ifdefstring{\bbx@editionformat}{arabic}
-    {\mkbibordedition{#1}~\bibstring{edition}}
-    {\ifdefstring{\bbx@editionformat}{Roman}%
-      {\RN{#1}~\bibstring{edition}}%
-      {\ifdefstring{\bbx@editionformat}{romansc}%
-        {\textsc{\Rn{#1}}~\bibstring{edition}}%
-        {\ifdefstring{\bbx@editionformat}{roman}%
-          {\Rn{#1}~\bibstring{edition}}
-          {\ifdefstring{\bbx@editionformat}{superscript}%
-            {\mkbibsuperscript{#1}}%
-            {\optionerror{editionformat}}}}}}}{#1}}%\isdot??
 \renewbibmacro*{author}{%
   \ifboolexpr{%
     test \ifuseauthor
@@ -61,15 +45,12 @@
        {\printnames{author}%
         \iffieldundef{nameaddon}{}%
         {\setunit{\addspace}%
-        \printtext[brackets]{\printfield{nameaddon}}}%
-        \setunit{\addcomma\space}%
+        \printtext[brackets]{\printfield{nameaddon}}}%MOD
+        \setunit{\printdelim{editorstrgdelim}}%
         \usebibmacro{bbx:savehash}}%
         \usebibmacro{authorstrg}}%
     {\global\undef\bbx@lasthash}}%
-\renewbibmacro*{editor}{%
-  \usebibmacro{bbx:editor}{editorstrg}}%
-\renewbibmacro*{editor+others}{%
-  \usebibmacro{bbx:editor}{editor+othersstrg}}%
+
 \renewbibmacro*{bbx:editor}[1]{%
   \ifboolexpr{%
     test \ifuseeditor
@@ -79,11 +60,27 @@
     {\usebibmacro{bbx:dashcheck}%
        {\bibnamedash}%
        {\printnames{editor}%
-\setunit{\addspace}%
+\setunit{\printdelim{editorstrgdelim}}%MOD
         \usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{editor}}%
     {\global\undef\bbx@lasthash}}%
+
+\renewbibmacro*{bbx:translator}[1]{%
+  \ifboolexpr{%
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }%
+    {\usebibmacro{bbx:dashcheck}%
+       {\bibnamedash}%
+       {\printnames{translator}%
+\setunit{\printdelim{editorstrgdelim}}%MOD
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{#1}%
+     \clearname{translator}}%
+    {\global\undef\bbx@lasthash}}%
+
 \newbibmacro*{nodash:author}{%
   \ifboolexpr{%
     test \ifuseauthor
@@ -129,10 +126,44 @@
 
 \renewbibmacro*{relateddate}{%
   \setunit*{\addspace}%
-  \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}}
+  \printdate\ifdefstring{\bbx@editionformat}{superscript}%
+    {\printfield{edition}}{}}
 \renewbibmacro*{commarelateddate}{%
   \setunit*{\addcomma\space}%
-  \printdate\ifdefstring{\bbx@editionformat}{superscript}{\printfield{edition}}{}}
+  \printdate\ifdefstring{\bbx@editionformat}{superscript}%
+    {\printfield{edition}}{}}
+\DeclareCiteCommand{\bbx@crossref@inbook}%
+  {}%
+  {\ifciteseen{%
+   \ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}%
+  \setunit*{\addcomma\space}\printtext{%
+    \printfield[citetitle]{labeltitle}%
+      \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+   {\setunit{\addspace\midsentence}}%
+       \bibstring{opcit}}}%
+    {\DeclareNameAlias{sortname}{default}%
+    \usebibmacro{usedriver:book}}}%
+  {}%
+  {}%
+\DeclareCiteCommand{\bbx@crossref@incollection}%
+  {}%
+  {\ifciteseen{%
+\ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}%
+      \setunit{\addspace}%
+      \usebibmacro{editorstrg}%
+  \setunit*{\addcomma\space}\printtext{%
+    \printfield[citetitle]{labeltitle}%
+       \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+    {\setunit{\addspace\midsentence}}%
+        \bibstring{opcit}}}%
+    {\DeclareNameAlias{sortname}{default}%
+    \usebibmacro{usedriver:collection}}}%
+  {}%
+  {}%
 \DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -430,38 +461,6 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   }
-\DeclareCiteCommand{\bbx@crossref@inbook}%
-  {}%
-  {\ifciteseen{%
-   \ifthenelse{\value{listtotal}=2}%
-      {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}%
-  \setunit*{\addcomma\space}\printtext{%
-    \printfield[citetitle]{labeltitle}%
-      \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
-   {\setunit{\addspace\midsentence}}%
-       \bibstring{opcit}}}%
-    {\DeclareNameAlias{sortname}{default}%
-    \usebibmacro{usedriver:book}}}%
-  {}%
-  {}%
-\DeclareCiteCommand{\bbx@crossref@incollection}%
-  {}%
-  {\ifciteseen{%
-\ifthenelse{\value{listtotal}=2}%
-      {\printnames[][-\value{maxnamesincross}]{labelname}}%
-      {\printnames[][-\value{minnamesincross}]{labelname}}%
-      \setunit{\addspace}%
-      \usebibmacro{editorstrg}%
-  \setunit*{\addcomma\space}\printtext{%
-    \printfield[citetitle]{labeltitle}%
-       \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
-    {\setunit{\addspace\midsentence}}%
-        \bibstring{opcit}}}%
-    {\DeclareNameAlias{sortname}{default}%
-    \usebibmacro{usedriver:collection}}}%
-  {}%
-  {}%
 %% 
 %% Copyright 2009-2017 by Ivan Valbusa
 %% 
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 ad20510bbc7..c1c46b87a3f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -13,97 +13,21 @@
 %% License information appended
 %% 
 \ProvidesFile{philosophy-verbose.cbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \RequireCitationStyle{verbose-trad2}
 
-\newtoggle{cbx:latinemph}
 \newtoggle{cbx:commacit}
 
-\DeclareBibliographyOption{latinemph}[true]{%
-  \settoggle{cbx:latinemph}{#1}}
 \DeclareBibliographyOption{commacit}[true]{%
   \settoggle{cbx:commacit}{#1}}
 
 \ExecuteBibliographyOptions{%
   idemtracker=false,
   loccittracker=strict,
-  latinemph=false,
   commacit=false}
-\renewcommand*{\mkibid}{\iftoggle{cbx:latinemph}{\emph}{}}
-\AtEveryCite{%
-  \togglefalse{bbx:annotation}%
-  \renewbibmacro*{name:andothers}{%
-    \ifboolexpr{%
-      test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
-      and
-      test \ifmorenames
-    }%
-    {\ifnumgreater{\value{liststop}}{1}%
-      {\finalandcomma}%
-      {}%
-      \andothersdelim\bibstring[\mkibid]{andothers}}%
-    {}}%
-  \renewbibmacro*{list:andothers}{%
-    \ifboolexpr{%
-      test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
-      and
-      test \ifmoreitems
-    }%
-    {\ifnumgreater{\value{liststop}}{1}%
-      {\finalandcomma}%
-      {}%
-      \andmoredelim\bibstring[\mkibid]{andmore}}%
-    {}}%
-\DeclareNameFormat{labelname}{%
-\iftoggle{cbx:scauthorscite}{%
-  \iffootnote{%
-  \usebibmacro{scswitch}}{}}{}%
-  \nameparts{#1}%
-  \bibhyperref{\ifcase\value{uniquename}%
-    \usebibmacro{name:family}%
-      {\namepartfamily}%
-      {\namepartgiven}%
-      {\namepartprefix}%
-      {\namepartsuffix}%
-  \or
-    \ifuseprefix
-      {\usebibmacro{name:given-family}%
-        {\namepartfamily}%
-        {\namepartgiveni}%
-        {\namepartprefix}%
-        {\namepartsuffixi}}%
-      {\usebibmacro{name:given-family}%
-        {\namepartfamily}%
-        {\namepartgiveni}%
-        {\namepartprefixi}%
-        {\namepartsuffixi}}%
-  \or
-    \usebibmacro{name:given-family}%
-      {\namepartfamily}%
-      {\namepartgiven}%
-      {\namepartprefix}%
-      {\namepartsuffix}%
-  \fi
-  \usebibmacro{name:andothers}}}%
-}%
-\DeclareNameFormat{scdefault}{%
-\iffootnote{\usebibmacro{scswitch}}{}%
-  \nameparts{#1}%
-  \ifgiveninits
-    {\usebibmacro{name:given-family}%
-      {\namepartfamily}%
-      {\namepartgiveni}%
-      {\namepartprefix}%
-      {\namepartsuffix}}%
-    {\usebibmacro{name:given-family}%
-      {\namepartfamily}%
-      {\namepartgiven}%
-      {\namepartprefix}%
-      {\namepartsuffix}}%
-  \usebibmacro{name:andothers}}%
+\AtEveryCite{\togglefalse{bbx:annotation}}
 \newbibmacro*{cite:opcit}{%
   \printtext[bibhyperlink]{\bibstring[\mkibid]{opcited}}}
 
@@ -112,7 +36,6 @@
     \bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
       \bibstring[\mkibid]{loccit}}}%
   \global\toggletrue{cbx:loccit}}
-
 \renewbibmacro*{cite:ibid}{%
   \ifloccit
   {\usebibmacro{cite:loccit}}{%
@@ -127,9 +50,7 @@
       \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
       {\setunit{\addspace\midsentence}}}%
     \bibstring{opcit}}}
-
-\renewbibmacro*{cite:full}{%
-  \iftoggle{cbx:shorthandintro}{%
+\newbibmacro{cite:full:noshorthand}{%
     \usebibmacro{cite:full:citepages}%
     \global\toggletrue{cbx:fullcite}%
     \printtext[bibhypertarget]{%
@@ -137,16 +58,21 @@
       {\iftoggle{cbx:scauthorscite}{%
       \DeclareNameAlias{sortname}{scdefault}}%
       {\DeclareNameAlias{sortname}{default}}}%
-      {\thefield{entrytype}}}%
-    \usebibmacro{shorthandintro}}%
-  {\usebibmacro{cite:shorthand}}}
+      {\thefield{entrytype}}}}
+
+\renewbibmacro*{cite:full}{%
+\iffieldundef{shorthand}
+  {\usebibmacro{cite:full:noshorthand}}
+  {\iftoggle{cbx:shorthandintro}
+    {\usebibmacro{cite:full:noshorthand}%
+     \usebibmacro{shorthandintro}}%
+    {\usebibmacro{cite:shorthand}}}}
 
 \renewbibmacro*{cite:idem}{%
   \iftoggle{cbx:scauthorscite}{%
     \bibstring[\mkbibsc]{idem\thefield{gender}}}{%
     \bibstring[\mkibid]{idem\thefield{gender}}}%
   \setunit{\nametitledelim}}
-
 \newbibmacro*{ccite:cite}{%
   \usebibmacro{related:clearauthors}%
   \usebibmacro{cite:citepages}%
@@ -161,20 +87,11 @@
     {\usebibmacro{cite:full}%
       \usebibmacro{cite:save}}}}
 \DeclareCiteCommand{\ccite}
-{\usebibmacro{prenote}}%
-{\usebibmacro{citeindex}%
-  \usebibmacro{ccite:cite}}
-{\multicitedelim}
-{\usebibmacro{cite:postnote}}
-\DeclareCiteCommand{\fullcite}
-{\usebibmacro{prenote}}
-{\usedriver
-     {\iftoggle{cbx:scauthorscite}%
-       {\DeclareNameAlias{sortname}{scdefault}}%
-       {\DeclareNameAlias{sortname}{default}}}%
-  {\thefield{entrytype}}}
-{\multicitedelim}
-{\usebibmacro{postnote}}
+  {\usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+    \usebibmacro{ccite:cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
 %% 
 %% Copyright 2009-2017 by Ivan Valbusa
 %% 
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 6b91a7064e6..7c3eb5b760b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/spanish-philosophy.lbx
@@ -13,47 +13,42 @@
 %% License information appended
 %% 
 \ProvidesFile{spanish-philosophy.lbx}
-[2017/03/21 v1.9.4 A set of styles for biblatex]
-
+[2017/04/13 v1.9.5 A set of styles for biblatex]
 
 
 \InheritBibliographyExtras{spanish}
 
 \DeclareBibliographyExtras{%
-\protected\def\bibrangedash{%
-    -\penalty\hyphenpenalty}%
-  \protected\def\bibdatedash{\textendash}}%
+\protected\def\bibrangedash{-\penalty\hyphenpenalty}%
+\protected\def\bibdaterangesep{\bibrangedash}%
+}%
 
 \NewBibliographyString{opcited}
 
 \DeclareBibliographyStrings{%
-  inherit            =  {spanish},
+  inherit            = {spanish},
   opcited            = {{\'{o}p\adddotspace cit\adddot}{\'{o}p\adddot cit\adddot}},
-  opcit              =  {{cit\adddot}{cit\adddot}},
-  ibidem             =  {{ivi}{ivi}},
-  loccit             =  {{ibidem}{ibidem}},
-  langspanish        =  {{espa\~{n}ol}{es\adddot}},
-  editor             =  {{ed\adddot}{ed\adddot}},
-  editors            =  {{ed\adddot}{eds\adddot}},
-  byreviser          =  {{revisi\'{o}n de}{rev\adddotspace de}},
-  reviewof           =  {{rese\~{n}a de}{rese\~{n}a de}},%%FIXME
-  backrefpage        =  {{citado en la p\'{a}gina}{citado en la \bibsstring{page}\adddot}},%%FIXME
-  backrefpages       =  {{citado en las p\'{a}ginas}{citado en las \bibsstring{pages}\adddot}},%%FIXME
-  pages              =  {{p\'aginas}{\iftoggle{bbx:classical}{p\'ags\adddot}{p\'ag\adddot}}},
-  columns            =  {{columnas}{\iftoggle{bbx:classical}{cols\adddot}{col\adddot}}},
-  lines              =  {{l\'ineas}{\iftoggle{bbx:classical}{ll\adddot}{l\adddot}}},
-  verses             =  {{versos}{\iftoggle{bbx:classical}{vv\adddot}{v\adddot}}},
-  volumes            =  {{vol\'uumenes}{\iftoggle{bbx:classical}{vols\adddot}{vol\adddot}}},
-  withcommentator    =  {{comentarios de}{com\adddotspace de}},
-  withannotator      =  {{notas de}{notas de}},
-  withintroduction   =  {{introducci\'{o}n de}{intr\adddotspace de}},
-  withforeword       =  {{prefacio de}{pref\adddotspace de}},
-  withafterword      =  {{postfacio de}{postfacio de}},
-  translationof      =  {{traducci\'{o}n al espa\~{n}ol de}{trad\adddotspace de}},
-  translationas      =  {{traducido al espa\~{n}ol como}{trad\adddotspace es\adddot}},
-  origpubas          =  {{edici\'{o}n original}{ed\adddot orig\adddot}},
-  section            =  {{secci\'{o}n}{sec\adddot}},
-  sections           =  {{secciones}{\iftoggle{bbx:classical}{secs\adddot}{sec\adddot}}}
+  opcit              = {{cit\adddot}{cit\adddot}},
+  ibidem             = {{ivi}{ivi}},
+  loccit             = {{ibidem}{ibidem}},
+  langspanish        = {{espa\~{n}ol}{es\adddot}},
+  editor             = {{ed\adddot}{ed\adddot}},
+  editors            = {{ed\adddot}{eds\adddot}},
+  byreviser          = {{revisi\'{o}n de}{rev\adddotspace de}},
+  reviewof           = {{rese\~{n}a de}{rese\~{n}a de}},%%FIXME
+  backrefpage        = {{citado en la p\'{a}gina}{citado en la \bibsstring{page}\adddot}},%%FIXME
+  backrefpages       = {{citado en las p\'{a}ginas}{citado en las p\'ags\adddot}},%%FIXME
+  withcommentator    = {{comentarios de}{com\adddotspace de}},
+  withannotator      = {{notas de}{notas de}},
+  withintroduction   = {{introducci\'{o}n de}{intr\adddotspace de}},
+  withforeword       = {{prefacio de}{pref\adddotspace de}},
+  withafterword      = {{postfacio de}{postfacio de}},
+  translationof      = {{traducci\'{o}n al espa\~{n}ol de}{trad\adddotspace de}},
+  translationas      = {{traducido al espa\~{n}ol como}{trad\adddotspace es\adddot}},
+  origpubas          = {{edici\'{o}n original}{ed\adddot orig\adddot}},
+  section            = {{secci\'{o}n}{sec\adddot}},
+  sections           = {{secciones}{\iftoggle{bbx:classical}{secs\adddot}{sec\adddot}}}
+  andmore            = {{\mkibid{et\addabbrvspace al\adddot}}{\mkibid{et\addabbrvspace al\adddot}}},
 }
 %% 
 %% Copyright 2009-2017 by Ivan Valbusa