biblatex-philosophy

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

9 files changed, 1965 insertions, 1316 deletions

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 edc5bfdb229..f56e0b02c19 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/english-philosophy.lbx
@@ -1,31 +1,55 @@
-% $Id: english-philosophy.lbx,v 0.8b 2012/05/06 Valbusa$
-%	Copyright 2009-2012 Ivan Valbusa. This package is author-maintained. 
-%	Permission is granted to copy, distribute and/or modify this software under the 
-%	terms of the LaTeX Project Public License, version 1.3c 
-%	http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-
-\ProvidesFile{english-philosophy.lbx}[v 0.8b 2012/05/06 biblatex localization file for biblatex-philosophy]
+%%
+%% This is file `english-philosophy.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `english-lbx')
+%%   ______________________________________________________
+%%   The biblatex-philosophy package
+%%   Copyright (C) 2009-2013 Ivan Valbusa
+%%   All rights reserved
+%% 
+%%   License information appended
+%% 
+\ProvidesFile{english-philosophy.lbx}
+    [2013/03/15 v0.8c valbusa beta]
 
 \InheritBibliographyExtras{english}
 
+\DeclareBibliographyExtras{%
+\protected\def\bibrangedash{%
+    -\penalty\hyphenpenalty}% breakable dash
+  \protected\def\bibdatedash{\textendash}}%
+
 \NewBibliographyString{transtolang,cited,reviewof,origed,nodate}
 
 \DeclareBibliographyStrings{%
-	inherit				=	{english},
-	nodate				=	{{no date}{n\adddot d\adddot}},
-	cited						=	{{cit\adddot}{cit\adddot}},
-	ibidem				= 	{{ivi}{ivi}},
-	loccit					= 	{{ibidem}{ibidem}},
-	origed				=	{{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}},
-	transtolang		=	{{trans\adddot}{trans\adddot}},
-	editor	  			=	{{\mkpureparens{ed\adddot}}{\mkpureparens{ed\adddot}}},
-	editors	  			=	{{\mkpureparens{eds\adddot}}{\mkpureparens{eds\adddot}}},
-	andothers	  		=	{{\mkbibemph{et\addabbrvspace al\adddot}}%
-								{\mkbibemph{et\addabbrvspace al\adddot}}},
-	reviewof	  		=	{{Review of}{Review of}},
-	backrefpage		= 	{{cited on  page\adddot}{cited on  p\adddot}},
-	backrefpages 	= 	{{cited on  pages\adddot}{cited on  pp\adddot}}
-}
-
-
-\endinput
+  inherit            =  {english},
+  nodate             =  {{no date}{n\adddot d\adddot}},
+  cited              =  {{cit\adddot}{cit\adddot}},
+  ibidem             =  {{ivi}{ivi}},
+  loccit             =  {{ibidem}{ibidem}},
+  origed             =  {{orig\adddotspace ed\adddot}{orig\adddotspace ed\adddot}},
+  transtolang        =  {{trans\adddot}{trans\adddot}},
+  editor             =  {{\mkpureparens{ed\adddot}}{\mkpureparens{ed\adddot}}},
+  editors            =  {{\mkpureparens{eds\adddot}}{\mkpureparens{eds\adddot}}},
+  andothers          =  {{\mkbibemph{et\addabbrvspace al\adddot}}
+                        {\mkbibemph{et\addabbrvspace al\adddot}}},
+  reviewof           =  {{Review of}{Review of}},
+  backrefpage        =  {{cited on  page}{cited on  p\adddot}},
+  backrefpages       =  {{cited on  pages}{cited on  pp\adddot}}}
+%% 
+%%  Copyright 2009-2013 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 `english-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 a07186af4b0..6321e49ccf3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/italian-philosophy.lbx
@@ -1,48 +1,71 @@
-% $Id: italian-philosophy.lbx,v 0.8b 2012/05/06 Valbusa$
-%	Copyright 2009-2012 Ivan Valbusa. This package is author-maintained. 
-%	Permission is granted to copy, distribute and/or modify this software under the 
-%	terms of the LaTeX Project Public License, version 1.3c 
-%	http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-
-\ProvidesFile{italian-philosophy.lbx}[v 0.8b 2012/05/06 biblatex localization file for biblatex-philosophy]
+%%
+%% This is file `italian-philosophy.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `italian-lbx')
+%%   ______________________________________________________
+%%   The biblatex-philosophy package
+%%   Copyright (C) 2009-2013 Ivan Valbusa
+%%   All rights reserved
+%% 
+%%   License information appended
+%% 
+\ProvidesFile{italian-philosophy.lbx}
+    [2013/03/15 v0.8c valbusa beta]
 
 \InheritBibliographyExtras{italian}
 \DeclareBibliographyExtras{%
-  \protected\def\bibrangedash{%
+\protected\def\bibrangedash{%
     -\penalty\hyphenpenalty}% breakable dash
-}
+  \protected\def\bibdatedash{\textendash}}%
 
+\NewBibliographyString{transtolang,origed,cited,reviewof,nodate,section}
 
-\NewBibliographyString{transtolang,origed,cited,reviewof,nodate}
 \DeclareBibliographyStrings{%
-	inherit					=	{italian},
-	nodate					=	{{senza data}{s\adddotspace d\adddot}},
-	cited						= 	{{cit\adddot}{cit\adddot}},
-	opcit            			=  {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
-	ibidem					= 	{{ivi}{ivi}},
-	loccit						= 	{{ibidem}{ibidem}},
-	origed	  				=	{{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
-	langitalian				=	{{italiano}{it\adddot}},
-	transtolang			=	{{traduzione\addspace italiana}	
-									{\bibsstring{translator}\adddotspace \bibsstring{langitalian}}},
-	editor	  				=	{{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}},
-	editors	  				=	{{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}},
-	andothers	  			=  {{\mkbibemph{et\addabbrvspace al\adddot}}%
-									{\mkbibemph{et\addabbrvspace al\adddot}}},
-	reviewof	  			=	{{Recensione di}{Recensione di}},
-  	backrefpage 		= 	{{Citato a pagina}{Citato a \bibstring{page}\adddot}},
-	backrefpages 		= 	{{Citato alle pagine}{Citato alle \bibstring{pages}\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}}},	
-	volumes          		= 	{{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol.\adddot}}},
-	withcommentator	= 	{{con commenti di}{con comm\adddot\addabbrvspace di}},
-	withannotator    	= 	{{annotazioni di}{annotazioni di}},
-	withintroduction 	= 	{{introduzione di}{introduzione di}},
-	withforeword     	= 	{{prefazione di}{prefazione di}},
-	withafterword    	= 	{{postfazione di}{postfazione di}}
-	}
-
-
-\endinput
+  inherit            =  {italian},
+  nodate             =  {{senza data}{s\adddotspace d\adddot}},
+  cited              =  {{cit\adddot}{cit\adddot}},
+  opcit              =  {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+  ibidem             =  {{ivi}{ivi}},
+  loccit             =  {{ibidem}{ibidem}},
+  origed             =  {{ed\adddotspace orig\adddot}{ed\adddotspace orig\adddot}},
+  langitalian        =  {{italiano}{it\adddot}},
+  transtolang        =  {{traduzione\addspace italiana}
+                        {\bibsstring{translator}\adddotspace \bibsstring{langitalian}}},
+  editor             =  {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}},
+  editors            =  {{\mkpureparens{a cura di}}{\mkpureparens{a cura di}}},
+  andothers          =  {{\mkbibemph{et\addabbrvspace al\adddot}}
+                        {\mkbibemph{et\addabbrvspace al\adddot}}},
+  reviewof           =  {{Recensione di}{Recensione di}},
+  backrefpage        =  {{Citato a pagina}{Citato a \bibstring{page}\adddot}},
+  backrefpages       =  {{Citato alle pagine}{Citato alle \bibstring{pages}\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}}},
+  volumes            =  {{volumi}{\iftoggle{bbx:classical}{voll\adddot}{vol\adddot}}},
+  withcommentator    =  {{con commenti di}{con comm\adddot\addabbrvspace di}},
+  withannotator      =  {{annotazioni di}{annotazioni di}},
+  withintroduction   =  {{introduzione di}{introduzione di}},
+  withforeword       =  {{prefazione di}{prefazione di}},
+  withafterword      =  {{postfazione di}{postfazione di}},
+  reprintas          =  {{ristampato}{rist\adddot}},
+  translationof       =  {{traduzione di}{trad\adddotspace di}},
+  translationas       =  {{traduzione italiana}{trad\adddotspace it\adddot}},
+section              =  {{sezione}{sez\adddot}}}
+%% 
+%%  Copyright 2009-2013 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 `italian-philosophy.lbx'.
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 e73a0c88271..20b53123e53 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -1,83 +1,58 @@
-% $Id: philosophy-classic.bbx,v 0.8b 2012/05/06 Valbusa$
-%	Copyright 2009-2012 Ivan Valbusa. This package is author-maintained. 
-%	Permission is granted to copy, distribute and/or modify this software under the 
-%	terms of the LaTeX Project Public License, version 1.3c 
-%	http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-
-
-\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.8b 2012/05/06 valbusa beta$]
+%%
+%% This is file `philosophy-classic.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `classic-bbx')
+%%   ______________________________________________________
+%%   The biblatex-philosophy package
+%%   Copyright (C) 2009-2013 Ivan Valbusa
+%%   All rights reserved
+%% 
+%%   License information appended
+%% 
+\ProvidesFile{philosophy-classic.bbx}
+    [2013/03/15 v0.8c valbusa beta]
 
 \RequireBibliographyStyle{authoryear}
 \RequireBibliographyStyle{philosophy-standard}
 
-
-% DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS
-%*********************************************************************
 \newtoggle{bbx:square}
+
 \DeclareBibliographyOption{square}[true]{%
-  \settoggle{bbx:square}{#1}}  
-  
+  \settoggle{bbx:square}{#1}}
+
 \ExecuteBibliographyOptions{%
-uniquename	=false,
-pagetracker	=true,
-singletitle		=false,
-square			=false,
-mergedate	=basic,
-dashed=false,
+  uniquename  = false,
+  pagetracker = true,
+  singletitle = false,
+  square      = false,
+  mergedate   = basic,
+  dashed      = true,
 }
-
-%$$$$$$
-\newcounter{maxnamesincross}
-\newcounter{minnamesincross}
-
-
-% 	AT BEGIN SHORTHANDS
-%*****************************************
 \AtBeginShorthands{%
 \togglefalse{bbx:annotation}%
 \renewcommand{\labelnamepunct}{\addcomma\space}%
-\renewbibmacro*{publocyear}{%
-	\iflistundef{publisher}{}%
-	{\printlist{publisher}}%
-	\setunit*{\addcomma\space}%
-	\printlist{location}%
-	\setunit*{\space}%
-	\printtext{\printfield{labelyear}}%
-	\newunit}%
-\renewbibmacro*{loccolonpub}{%
-	\printlist{location}%
-	\iflistundef{publisher}%
-	{\setunit*{\addspace}}%
-	{\setunit*{\addcolon\space}}%
-	\printlist{publisher}%
-	\setunit*{\addcomma\space}%
-	\printtext{\printfield{labelyear}}%
-	\newunit}%
-\renewbibmacro*{locpubyear}{%
-	\printlist{location}%
-	\iflistundef{publisher}%
-	{\setunit*{\addspace}}%
-	{\setunit*{\addcomma\space}}%
-	\printlist{publisher}%
-	\setunit*{\addcomma\space}%
-	\printtext{\printfield{labelyear}}%
-	\newunit}%
-	\renewbibmacro*{date+extrayear}{}}
-	
-% 	AT BEGIN DOCUMENT
-%**************************************************
+\renewbibmacro*{relateddate}{%
+  \setunit*{\addspace}%
+  \printdate}
+\renewbibmacro*{commarelateddate}{%
+  \setunit*{\addcomma\space}%
+  \printdate}
+\renewbibmacro*{date+extrayear}{}%
+}
+
 \AtBeginDocument{%
-  \setcounter{maxnamesincross}{\value{maxnames}}
-  \setcounter{minnamesincross}{\value{minnames}}
-	
   \iftoggle{bbx:square}
-	{\renewcommand{\bibopenparen}{\bibopenbracket}%
-	 \renewcommand{\bibcloseparen}{\bibclosebracket}}
-	{}}
-
-%*********************************************************************
-%			NUOVE MACRO
-%*********************************************************************
+    {\renewcommand{\bibopenparen}{\bibopenbracket}%
+    \renewcommand{\bibcloseparen}{\bibclosebracket}}%
+    {}
+  \setcounter{maxnamesincross}{\value{maxnames}}%
+  \setcounter{minnamesincross}{\value{minnames}}%
+}
+\renewbibmacro*{relateddate}{}
+\renewbibmacro*{commarelateddate}{}
   \renewbibmacro*{issue+date}{%
     \ifboolexpr{
       test {\iffieldundef{issue}}
@@ -85,17 +60,21 @@ dashed=false,
       test {\iffieldundef{month}}
     }
       {}%
-      {\ifdefstring{\bbx@volnumformat}{volnumparens}
+      {\ifdefstring{\bbx@volnumformat}{parens}
       {\printtext{%
-	 \printfield{issue}% \setunit*{\addspace}%
-	 \printdate
-	 }}{\printtext[parens]{%
-	 \printfield{issue}% \setunit*{\addspace}%
-	 \printdate
-	 }}}%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}%
+      {\printtext[pureparens]{%
+        \printfield{issue}\setunit*{\addspace}%
+        \printdate}}}%
     \newunit}%
-  
-% changed
+\renewbibmacro*{date+extrayear}{%
+      \begingroup%
+        \clearfield{month}%
+    \iffieldundef{labelyear}
+      {\printtext[parens]{\midsentence\bibstring{nodate}}}
+      {\printtext[parens]{\printdateextra}}%
+       \endgroup}%
 \renewbibmacro*{author}{%
   \ifboolexpr{
     test \ifuseauthor
@@ -109,21 +88,22 @@ dashed=false,
         \iffieldundef{nameaddon}{}%
         {\setunit{\addspace}%
         \printtext[brackets]{\printfield{nameaddon}}}%
-	\iffieldundef{authortype}
-	  {\setunit{\addspace}}
-	  {\setunit{\addcomma\space}}}%
+\iffieldundef{authortype}
+  {\setunit{\addspace}}
+  {\setunit{\addcomma\space}}}%
      \iffieldundef{authortype}
        {}%
        {\usebibmacro{authorstrg}%
-	\setunit{\addspace}}}%
+\setunit{\addspace}}}%
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\addspace}}%
-  \usebibmacro{date+extrayear}} 
+  \usebibmacro{date+extrayear}}%
 
-\renewbibmacro*{editor+others}{%
+\renewbibmacro*{editor}{%
   \usebibmacro{bbx:editor}{editorstrg}}
-
+\renewbibmacro*{editor+others}{%
+  \usebibmacro{bbx:editor}{editor+othersstrg}}
 \renewbibmacro*{bbx:editor}[1]{%
   \ifboolexpr{
     test \ifuseeditor
@@ -133,183 +113,53 @@ dashed=false,
     {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{editor}%
-	\setunit{\addspace}%
-	\usebibmacro{bbx:savehash}}%
+\setunit{\addspace}%
+\usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{editor}%
      \setunit{\addspace}}%
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\addspace}}%
-  \usebibmacro{date+extrayear}}
-   
-%**************************************************************
-%``Publisher, Location Year''.
-%****************************************************************
-\newbibmacro*{publocyear}{%
-	  \iflistundef{publisher}%
-	  	{}%
-		{\printlist{publisher}}
-	  \setunit*{\addcomma\space}%
-	  \printlist{location}%
-	\newunit}
-\newbibmacro*{inpublocyear}{%
-	  \iflistundef{institution}%
-	  	{}%
-		{\printlist{institution}}
-	  \setunit*{\addcomma\space}%
-	  \printlist{location}%
-	\newunit}	
-\newbibmacro*{orgpublocyear}{%
-	  \iflistundef{organization}%
-	  	{}%
-		{\printlist{organization}}
-	  \setunit*{\addcomma\space}%
-	  \printlist{location}%
-	\newunit}
-%**************************************************************
-%``Location: Publisher, Year'' 
-%****************************************************************
-\newbibmacro*{loccolonpub}{%
-	  \printlist{location}%
-	  \iflistundef{publisher}%
-	  	{\setunit*{\addspace}}
-	    	{\setunit*{\addcolon\space}}%
-	  \printlist{publisher}%
-	\newunit}
-\newbibmacro*{inloccolonpub}{%
-	  \printlist{location}%
-	  \iflistundef{institution}%
-	  	{\setunit*{\addspace}}
-	    	{\setunit*{\addcolon\space}}%
-	  \printlist{institution}%
-	\newunit}
-\newbibmacro*{orgloccolonpub}{%
-	  \printlist{location}%
-	  \iflistundef{organization}%
-	  	{\setunit*{\addspace}}
-	    	{\setunit*{\addcolon\space}}%
-	  \printlist{organization}%
-	\newunit}    
-%**************************************************************
-%``Location, Publisher, Year'' 
-%**************************************************************
-\newbibmacro*{locpubyear}{%
-	  \printlist{location}%
-	  \iflistundef{publisher}%
-	  	{\setunit*{\addspace}}
-	    	{\setunit*{\addcomma\space}}%
-	  \printlist{publisher}%
-	\newunit}
-\newbibmacro*{inlocpubyear}{%
-	  \printlist{location}%
-	  \iflistundef{institution}%
-	  	{\setunit*{\addspace}}
-	    	{\setunit*{\addcomma\space}}%
-	  \printlist{institution}%
-	\newunit}
-\newbibmacro*{orglocpubyear}{%
-	  \printlist{location}%
-	  \iflistundef{organization}%
-	  	{\setunit*{\addspace}}
-	    	{\setunit*{\addcomma\space}}%
-	  \printlist{organization}%
-	\newunit}
-
-\newbibmacro*{crossdate+extrayear}{%
-	\iffieldundef{year}%
-    	{}%
-    	{\printtext[parens]{\printdateextra}}}
-
-\DeclareCiteCommand{\bbx@crossref}
+  \usebibmacro{date+extrayear}}%
+\DeclareCiteCommand{\bbx@crossref@inbook}
   {}%
-  {\ifuseeditor{\ifthenelse{\value{listtotal}=2}%
-    	{\printnames[][-\value{maxnamesincross}]{labelname}}%
-    	{\printnames[][-\value{minnamesincross}]{labelname}}}%
-	{\usebibmacro{labeltitle}}
+  {\usebibmacro{citeindex}%
+  \ifuseeditor{%
+    \ifthenelse{\value{listtotal}=2}%
+      {\printnames[][-\value{maxnamesincross}]{labelname}}%
+      {\printnames[][-\value{minnamesincross}]{labelname}}}%
+     {\usebibmacro{labeltitle}}%
     \setunit*{\addspace}%
-    \printtext{\usebibmacro{crossdate+extrayear}}}%
+    \usebibmacro{date+extrayear}}%
   {}%
   {}%
 
-%-----------------------------------------------------------------
-%	
-%								DRIVERS
-%										
-%-----------------------------------------------------------------
-
-\DeclareBibliographyDriver{incollection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/translator+others}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{in:}%
-  \iffieldundef{crossref}%
-  	{\usebibmacro{incollection:full}}%
-	{\bbx@crossref{\thefield{crossref}}%
-%		\newunit\newblock
-%		\printfield{userd}%
-%		\newunit\newblock
-  \newunit\newblock
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-		\usebibmacro{chapter+pages}%
-  \newunit\newblock
-  \iftoggle{bbx:isbn}
-    {\printfield{isbn}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{doi+eprint+url}%
-  \newunit\newblock
-	  \usebibmacro{addendum+pubstate:article-book-incoll}%
-		\newunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}}
-  
-\DeclareBibliographyDriver{inbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/translator+others}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{in:}%
-    \iffieldundef{crossref}%
-  	{\usebibmacro{inbook:full}}%
-	{\bbx@crossref{\thefield{crossref}}%
-%		\newunit\newblock
-%		\printfield{userd}%
-%		\newunit\newblock
-  \newunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-		\usebibmacro{chapter+pages}%
-  \newunit\newblock
-  \iftoggle{bbx:isbn}
-    {\printfield{isbn}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{doi+eprint+url}%
-  \newunit\newblock
-	  \usebibmacro{addendum+pubstate:article-book-incoll}%
-		\newunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}}
-
-\endinput
\ No newline at end of file
+\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}}%
+  {}%
+  {}%
+\define@key{blx@bib1}{restoreclassic}[]{}
+\define@key{blx@bib2}{restoreclassic}[true]{}
+%% 
+%%  Copyright 2009-2013 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 `philosophy-classic.bbx'.
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 a2ce4572079..5a64962dae1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx
@@ -1,11 +1,19 @@
-% $Id: philosophy-classic.cbx,v 0.8b 2012/05/06 Valbusa$
-%	Copyright 2009-2012 Ivan Valbusa. This package is author-maintained. 
-%	Permission is granted to copy, distribute and/or modify this software under the 
-%	terms of the LaTeX Project Public License, version 1.3c 
-%	http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-
-
-\ProvidesFile{philosophy-classic.cbx}[philosophy-classic.cbx,v 0.8b 2012/05/06 valbusa beta$]
+%%
+%% This is file `philosophy-classic.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `classic-cbx')
+%%   ______________________________________________________
+%%   The biblatex-philosophy package
+%%   Copyright (C) 2009-2013 Ivan Valbusa
+%%   All rights reserved
+%% 
+%%   License information appended
+%% 
+\ProvidesFile{philosophy-classic.cbx}
+    [2013/03/15 v0.8c valbusa beta]
 
 \RequireCitationStyle{authoryear-comp}
 
@@ -17,23 +25,17 @@
   \settoggle{cbx:shorthandintro}{#1}}
 
 \ExecuteBibliographyOptions{%
-scauthorscite	=	false,
-citetracker		=	true,
-shorthandintro	=	true}
+  scauthorscite = false,
+  citetracker = true,
+  shorthandintro = true
+}
 
-% 	AT EVERY CITE
-%*************************************************************
 \AtEveryCite{%
   \iftoggle{cbx:scauthorscite}%
-  	{\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}%
-	\renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}%
-	\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}%
-	{}%
-}
-
-%******************************
-% hyperlink for names
-%*****************************
+   {\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}%
+\renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}%
+\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}%
+{}}
 \DeclareNameFormat{labelname}{%
 \bibhyperref{%
   \ifcase\value{uniquename}%
@@ -46,33 +48,107 @@ shorthandintro	=	true}
     \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
   \fi
   \usebibmacro{name:andothers}}}
+%%%%
 
-% ''shorthand intro'' implementation
-%---------------------
+\newcommand{\switchclass}[2]{%
+  \iffieldequalstr{entrysubtype}{classical}%
+    {\usebibmacro{#1}}%
+    {\usebibmacro{#2}}}
+\newbibmacro*{cite:init:AT}{%
+  \ifnumless{\value{multicitecount}}{2}
+    {\global\boolfalse{cbx:parens}%
+     \global\undef\cbx@lasthash}
+    {\iffieldundef{prenote}
+       {}
+       {\global\undef\cbx@lasthash}}}
 
-\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}}}
+\newbibmacro*{cite:reinit:AT}{%
+  \global\undef\cbx@lasthash}
+
+\newbibmacro*{cite:AT}{%
+  \iffieldundef{shorthand}
+    {\iffieldequals{namehash}{\cbx@lasthash}
+       {\setunit{\compcitedelim}}
+       {\ifnameundef{labelname}
+          {}
           {\printnames{labelname}%
-  	   \setunit{\nameyeardelim}%
-           \usebibmacro{cite:labelyear+extrayear}%
-           \savefield{namehash}{\cbx@lasthash}%
-           \savefield{labelyear}{\cbx@lastyear}}}}
-           
-\renewbibmacro*{cite}{%
+           \setunit{\nametitledelim}}%
+        \savefield{namehash}{\cbx@lasthash}}%
+     \usebibmacro{cite:title:AT}}
+    {\usebibmacro{cite:shorthand}%
+     \usebibmacro{cite:reinit:AT}}%
+  \setunit{\multicitedelim}}
+
+\newbibmacro*{citetitle:AT}{%
   \iffieldundef{shorthand}
-    {\usebibmacro{cite:noshorthand}}
+    {\usebibmacro{cite:title:AT}}
+    {\usebibmacro{cite:shorthand}}%
+  \setunit{\multicitedelim}}
+
+\newbibmacro*{textcite:AT}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+    {\setunit{\compcitedelim}}
+    {\ifnameundef{labelname}
+       {}
+       {\printnames{labelname}%
+        \setunit{%
+  \global\booltrue{cbx:parens}%
+  \addspace\bibopenparen}}%
+     \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}}}%
+  \setunit{%
+    \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {}%
+    \multicitedelim}}
+
+\newbibmacro*{cite:title:AT}{%
+  \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
+
+\newbibmacro*{textcite:postnote:AT}{%
+  \ifnameundef{labelname}
+    {\setunit{%
+       \global\booltrue{cbx:parens}%
+       \addspace\bibopenparen}}
+    {\setunit{\postnotedelim}}%
+  \printfield{postnote}%
+  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+    {\setunit{}%
+     \printtext{%
+       \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
+    {\setunit{%
+       \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+       \multicitedelim}}}
+\newbibmacro*{cite:init:AY}{%
+  \ifnumless{\value{multicitecount}}{2}
+    {\global\boolfalse{cbx:parens}%
+     \global\undef\cbx@lasthash
+     \global\undef\cbx@lastyear}
+    {\iffieldundef{prenote}
+       {}
+       {\global\undef\cbx@lasthash
+\global\undef\cbx@lastyear}}}
+
+\newbibmacro*{cite:reinit:AY}{%
+  \global\undef\cbx@lasthash
+  \global\undef\cbx@lastyear}
+
+\newbibmacro*{cite:AY}{%
+  \iffieldundef{shorthand}%
+    {\usebibmacro{cite:noshorthand}}%
     {\iftoggle{cbx:shorthandintro}%
     {%
     \ifciteseen{\usebibmacro{cite:shorthand}}%
@@ -80,10 +156,10 @@ shorthandintro	=	true}
      \usebibmacro{shorthandintro}}%
      }%
      {\usebibmacro{cite:shorthand}}%
-     \usebibmacro{cite:reinit}}%
+     \usebibmacro{cite:reinit:AY}}%
   \setunit{\multicitedelim}}
 
-\renewbibmacro*{textcite}{%
+\newbibmacro*{textcite:AY}{%
   \iffieldequals{namehash}{\cbx@lasthash}%
     {\iffieldundef{shorthand}%noshorthand
        {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
@@ -110,33 +186,33 @@ shorthandintro	=	true}
     {\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}}%
+   \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}}}%
+   \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}}}%
        {\printnames{labelname}%
-	\setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \addspace\bibopenparen}%
-	\ifnumequal{\value{citecount}}{1}%
-	  {\usebibmacro{prenote}}%
-	  {}%
+\setunit{%
+  \global\booltrue{cbx:parens}%
+  \addspace\bibopenparen}%
+\ifnumequal{\value{citecount}}{1}%
+  {\usebibmacro{prenote}}%
+  {}%
         \iffieldundef{shorthand}%noshorthand
           {\iffieldundef{labelyear}%
              {\usebibmacro{cite:label}}%
@@ -159,12 +235,67 @@ shorthandintro	=	true}
       {}%
     \multicitedelim}}%
 
+\newbibmacro*{textcite:postnote:AY}{%
+  \usebibmacro{postnote}%
+  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
+    {\setunit{}%
+     \printtext{%
+       \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
+    {\setunit{%
+       \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+       \multicitedelim}}}
 \renewbibmacro*{cite:shorthand}{%
   \printtext[bibhyperref]{\printfield{shorthand}}}
+\renewbibmacro*{cite:init}{%
+  \switchclass{cite:init:AT}{cite:init:AY}}
+\renewbibmacro*{cite:reinit}{%
+  \switchclass{cite:reinit:AT}{cite:reinit:AY}}
+\renewbibmacro*{cite}{%
+  \switchclass{cite:AT}{cite:AY}}
+\renewbibmacro*{textcite}{%
+  \switchclass{textcite:AT}{textcite:AY}}
+\renewbibmacro*{textcite:postnote}{%
+  \switchclass{textcite:postnote:AT}{textcite:postnote:AY}}
 
-%********************************************************************
-% hyperlinks for \citetitle and \citeyear commands
-%*******************************************************************
+\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}%
+           \savefield{labelyear}{\cbx@lastyear}}}}
+\DeclareCiteCommand*{\cite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \switchclass{citetitle:AT}{citeyear}}%
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \switchclass{citetitle:AT}{citeyear}}
+  {}
+  {\usebibmacro{postnote}}
 
 \DeclareCiteCommand{\citetitle}
   {\boolfalse{citetracker}%
@@ -182,34 +313,44 @@ shorthandintro	=	true}
   {\indexfield{indextitle}%
     \printtext[bibhyperref]{\printfield[citetitle]{title}}}
   {\multicitedelim}
-  {\usebibmacro{postnote}}  
-  
-\DeclareCiteCommand{\citeyear} 
-  {\boolfalse{citetracker}% 
-   \boolfalse{pagetracker}% 
-   \usebibmacro{prenote}} 
-  {\printtext[bibhyperref]{\printfield{year}}} 
-  {\multicitedelim} 
-  {\usebibmacro{postnote}} 
+  {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\sdcite}
+\DeclareCiteCommand{\citeyear}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
-  {\indexnames{labelname}%
-   \printtext[bibhyperref]{\printnames{labelname}}%
-   \setunit{\addcomma\space}%
-   \indexfield{indextitle}%
-   \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
+  {\printtext[bibhyperref]{\printfield{year}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\footcitet}[\mkbibfootnote] 
+\DeclareCiteCommand{\footcitet}[\mkbibfootnote]
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
    \usebibmacro{textcite}}
   {}%
   {\usebibmacro{textcite:postnote}}
-
-
-\endinput
+\DeclareCiteCommand{\sdcite}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\indexnames{labelname}%
+   \printtext[bibhyperref]{\printnames{labelname}}%
+   \setunit{\addcomma\space}%
+   \indexfield{indextitle}%
+   \printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+%% 
+%%  Copyright 2009-2013 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 `philosophy-classic.cbx'.
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 907555b7dd8..bf678627f0c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx
@@ -1,71 +1,62 @@
-% $Id: philosophy-modern.bbx,v 0.8b 2012/05/06 Valbusa$
-%	Copyright 2009-2012 Ivan Valbusa. This package is author-maintained. 
-%	Permission is granted to copy, distribute and/or modify this software under the 
-%	terms of the LaTeX Project Public License, version 1.3c 
-%	http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-
-
-\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.8b 2012/05/06 valbusa beta$]
+%%
+%% This is file `philosophy-modern.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `modern-bbx')
+%%   ______________________________________________________
+%%   The biblatex-philosophy package
+%%   Copyright (C) 2009-2013 Ivan Valbusa
+%%   All rights reserved
+%% 
+%%   License information appended
+%% 
+\ProvidesFile{philosophy-modern.bbx}
+    [2013/03/15 v0.8c valbusa beta]
 
 \RequireBibliographyStyle{philosophy-classic}
-
 \newtoggle{bbx:yearleft}
 \DeclareBibliographyOption{yearleft}[true]{%
   \settoggle{bbx:yearleft}{#1}}
-
 \ExecuteBibliographyOptions{%
-dashed=true,
-yearleft=false}  
-  
-%% 	new lengths
-%%---------------------------------------------------------------------------------------------
-\newlength{\yeartitle}		
+  yearleft=false}
+\newlength{\yeartitle}
 \newlength{\postnamesep}
-\setlength{\yeartitle}{0.8em}%		
+\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}
 
-%% 	new commands
-%%---------------------------------------------------------------------------------------------
-\newcommand{\postsep}{\par\nobreak\vskip\postnamesep\hskip-\bibhang\ignorespaces}
-\renewcommand{\labelnamepunct}{\unspace}
-
 \AtBeginBibliography{
-	\iftoggle{bbx:yearleft}{%
-		\setlength{\yeartitle}{\fill}}
-		{}%
-		}
-\AtBeginShorthands{%
-	\renewcommand{\postsep}{}%
-	\renewcommand{\labelnamepunct}{\addcomma\space}}
-
-%%---------------------------------------------------------------------------------------------    
-%%		MACROS  
-%%---------------------------------------------------------------------------------------------    
+\iftoggle{bbx:yearleft}{%
+\setlength{\yeartitle}{\fill}}
+{}}
+\newcommand{\postsep}{\par\nobreak\vskip\postnamesep%
+  \hskip-\bibhang\ignorespaces}
+\renewcommand{\labelnamepunct}{}
 
+\AtBeginShorthands{%
+\renewcommand{\postsep}{}%
+\renewcommand{\labelnamepunct}{\newunitpunct}}
 \renewbibmacro*{date+extrayear}{%
-	\makebox[\bibhang][r]{%
-		\printtext{%
-		\iffieldundef{year}%
-		{}%
-		{\printfield{labelyear}\printfield{extrayear}}%
-		\hskip\yeartitle}}}
+      \begingroup%
+        \clearfield{month}%
+  \makebox[\bibhang][r]{\printtext{%
+    \iffieldundef{labelyear}%
+    {\printtext{\midsentence\bibstring{nodate}}}%
+    {\printtext{\printdateextra}}%
+    \hskip\yeartitle}}%
+       \endgroup}%
 
-%		label for entries without 'editor' and 'author'
-%%-------------------------------------------------------------
 \renewbibmacro*{labeltitle}{%
   \iffieldundef{label}%
-	{\iffieldundef{shorttitle}
-     		{\printfield{title}%
-       		\clearfield{title}}%
-        		{\printfield[title]{shorttitle}}}%
-	{\printtext{\printfield{label}}%
-	\postsep}}
-	
-%	 		 macro 'author' 
-%%---------------------------------------------------
+    {\iffieldundef{shorttitle}
+    {\printfield{title}\clearfield{title}}%
+    {\printfield[title]{shorttitle}}}%
+  {\printtext{\printfield{label}}%
+\postsep}}
 \renewbibmacro*{author}{%
   \ifboolexpr{
     test \ifuseauthor
@@ -73,59 +64,91 @@ yearleft=false}
     not test {\ifnameundef{author}}
   }
     {\usebibmacro{bbx:dashcheck}
-       {}%MOD
+       {}%
        {\usebibmacro{bbx:savehash}%
         \printnames{author}%
         \iffieldundef{nameaddon}{}%
         {\setunit{\addspace}%
         \printtext[brackets]{\printfield{nameaddon}}}%
-        	\iffieldundef{authortype}
-	  {}%
-	  {\setunit{\addcomma\space}}%
+         \iffieldundef{authortype}
+         {}%
+         {\setunit{\addcomma\space}}%
         \usebibmacro{authorstrg}%
-%	\setunit{\addspace}% ?
-	\postsep%ADD
-	}}%
-    {\global\undef\bbx@lasthash
-     \usebibmacro{labeltitle}%
-          \setunit*{\addspace}}%
-  \usebibmacro{date+extrayear}}
- 
+    \postsep}}%
+      {\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}
-           {}% removed \bibnamedash
+    {\usebibmacro{bbx:dashcheck}%
+       {}%
        {\printnames{editor}%
-	\postsep%ADD
-	\usebibmacro{bbx:savehash}}%
-	\clearname{editor}}%
-    {\global\undef\bbx@lasthash
+     \postsep%ADD
+   \usebibmacro{bbx:savehash}}}%
+     {\global\undef\bbx@lasthash%
      \usebibmacro{labeltitle}}%
   \usebibmacro{date+extrayear}%
-      \iffieldundef{label}
-      {\usebibmacro{#1}\setunit{\addcomma\space}}{}%
-  }
+    \iffieldundef{label}%
+    {\usebibmacro{#1}%
+    \clearname{editor}%
+    \printtext{\addcomma\space}}{}}%
+\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}}%
+  {}%
+  {}%
 
- 
- % restoreclassic
-%%---------------------------------------------------
-\define@key{blx@bib}{restoreclassic}[true]{%
-  \ifstrequal{#1}{true}
-    {
-\setlength{\bibhang}{\parindent}
-\renewcommand{\labelnamepunct}{\addcomma\space}
+\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}}%
+  {}%
+  {}%
 
-  \renewbibmacro*{date+extrayear}{%mergedate=basic
+\newbibmacro*{classic:date+extrayear}{%
+      \begingroup%
+        \clearfield{month}%
     \iffieldundef{labelyear}
-      {}
+      {\printtext[parens]{\midsentence\bibstring{nodate}}}%
       {\printtext[parens]{%
-	 \printfield{labelyear}%
-	 \printfield{extrayear}}}}%
-
+ \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}%
+    \iffieldundef{labelyear}
+      {\printtext[parens]{\midsentence\bibstring{nodate}}}%
+      {\printtext[parens]{\printdateextra}}%
+       \endgroup}%
 \renewbibmacro*{author}{%
   \ifboolexpr{
     test \ifuseauthor
@@ -139,18 +162,22 @@ yearleft=false}
         \iffieldundef{nameaddon}{}%
         {\setunit{\addspace}%
         \printtext[brackets]{\printfield{nameaddon}}}%
-	\iffieldundef{authortype}
-	  {\setunit{\addspace}}
-	  {\setunit{\addcomma\space}}}%
+\iffieldundef{authortype}
+  {\setunit{\addspace}}
+  {\setunit{\addcomma\space}}}%
      \iffieldundef{authortype}
        {}%
        {\usebibmacro{authorstrg}%
-	\setunit{\addspace}}}%
+\setunit{\addspace}}}%
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\addspace}}%
-  \usebibmacro{date+extrayear}} 
+  \usebibmacro{date+extrayear}}%
 
+\renewbibmacro*{editor}{%
+  \usebibmacro{bbx:editor}{editorstrg}}
+\renewbibmacro*{editor+others}{%
+  \usebibmacro{bbx:editor}{editor+othersstrg}}
 \renewbibmacro*{bbx:editor}[1]{%
   \ifboolexpr{
     test \ifuseeditor
@@ -160,118 +187,35 @@ yearleft=false}
     {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{editor}%
-	\setunit{\addspace}%
-	\usebibmacro{bbx:savehash}}%
+\setunit{\addspace}%
+\usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{editor}%
      \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}}}
-}
-       {}}
+  \usebibmacro{date+extrayear}}%
 
-      
-%%---------------------------------------------------------------------------------------------    
-%					BIBLIOGRAPHY DRIVERS  
-%%---------------------------------------------------------------------------------------------
-\newbibmacro*{crosslabeltitle}{%
+\renewbibmacro*{labeltitle}{%
   \iffieldundef{label}%
-	{\iffieldundef{shorttitle}
-     		{\printfield{title}%
-       		\clearfield{title}}%
-        		{\printfield[title]{shorttitle}}}%
-	{\printtext{\printfield{label}}}}
-
-\DeclareCiteCommand{\bbx@crossref}
-  {}%
-  {\ifuseeditor{\ifthenelse{\value{listtotal}=2}
-    	{\printnames[][-\value{maxnamesincross}]{labelname}}
-    	{\printnames[][-\value{minnamesincross}]{labelname}}}
-	{\usebibmacro{crosslabeltitle}}
-    \setunit*{\addspace}%
-    \printtext{\usebibmacro{crossdate+extrayear}}}%
-  {}%
-  {}%
-
-\DeclareBibliographyDriver{periodical}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{editor}%
-    \ifuseeditor{% trick for entry with ``label'' field
-  \setunit{\addcomma\space}}
-  {}\newblock
-  %\setunit{\labelnamepunct}\newblock
-  \usebibmacro{title+issuetitle}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byeditor}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \iftoggle{bbx:isbn}
-    {\printfield{issn}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{doi+eprint+url}%
-  \newunit\newblock
-  \usebibmacro{addendum+pubstate}%
-  \setunit{\bibpagerefpunct}\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-  
-\DeclareBibliographyDriver{collection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{editor+others}%
-  \ifuseeditor{% trick for entry with ``label'' field
-  \setunit{\addcomma\space}}
-  {}\newblock
-  \usebibmacro{maintitle+title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{edition}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{series+number}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publisher+location+date}%
-  \newunit\newblock
-  \usebibmacro{chapter+pages}%
-  \newunit
-  \printfield{pagetotal}%
-  \newunit\newblock
-  \iftoggle{bbx:isbn}
-    {\printfield{isbn}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{doi+eprint+url}%
-  \newunit\newblock
-  \usebibmacro{addendum+pubstate}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-
-\endinput
\ No newline at end of file
+    {\iffieldundef{shorttitle}%
+       {\printfield{title}%
+        \clearfield{title}}%
+       {\printfield[title]{shorttitle}}}%
+    {\printfield{label}}}%
+  }{}}%
+%% 
+%%  Copyright 2009-2013 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 `philosophy-modern.bbx'.
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 ccac27098ac..00b8dc52d9e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.cbx
@@ -1,12 +1,32 @@
-% $Id: philosophy-modern.cbx,v 0.8b 2012/05/06 Valbusa$
-%	Copyright 2009-2012 Ivan Valbusa. This package is author-maintained. 
-%	Permission is granted to copy, distribute and/or modify this software under the 
-%	terms of the LaTeX Project Public License, version 1.3c 
-%	http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-
-\ProvidesFile{philosophy-modern.cbx}[philosophy-modern.cbx,v 0.8b 2012/05/06 valbusa beta$]
+%%
+%% This is file `philosophy-modern.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `modern-cbx')
+%%   ______________________________________________________
+%%   The biblatex-philosophy package
+%%   Copyright (C) 2009-2013 Ivan Valbusa
+%%   All rights reserved
+%% 
+%%   License information appended
+%% 
+\ProvidesFile{philosophy-modern.cbx}
+    [2013/03/15 v0.8c valbusa beta]
 
 \RequireCitationStyle{philosophy-classic}
-
-
-\endinput
+%% 
+%%  Copyright 2009-2013 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 `philosophy-modern.cbx'.
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 df1ffb96318..7214d5a1d06 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-standard.bbx
@@ -1,26 +1,28 @@
-% $Id: philosophy-standard.bbx,v 0.8b 2012/05/06 Valbusa$
-%	Copyright 2009-2012 Ivan Valbusa. This package is author-maintained. 
-%	Permission is granted to copy, distribute and/or modify this software under the 
-%	terms of the LaTeX Project Public License, version 1.3c 
-%	http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-
-\ProvidesFile{philosophy-standard.bbx}[$Id: philosophy-standard.bbx,v 0.8b 2012/05/06 valbsua beta $]
+%%
+%% This is file `philosophy-standard.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `standard-bbx')
+%%   ______________________________________________________
+%%   The biblatex-philosophy package
+%%   Copyright (C) 2009-2013 Ivan Valbusa
+%%   All rights reserved
+%% 
+%%   License information appended
+%% 
+\ProvidesFile{philosophy-standard.bbx}
+    [2013/03/15 v0.8c valbusa beta]
 
 \RequireBibliographyStyle{standard}
-
 \DeclareLanguageMapping{italian}{italian-philosophy}
 \DeclareLanguageMapping{english}{english-philosophy}
-
-% boolean options
-
 \newtoggle{bbx:annotation}
 \newtoggle{bbx:library}
 \newtoggle{bbx:scauthors}
 \newtoggle{bbx:scauthorsbib}
-\newtoggle{bbx:origparens}
-\newtoggle{bbx:origbrackets}
 \newtoggle{bbx:inbeforejournal}
-\newtoggle{bbx:romanvol}
 \newtoggle{bbx:classical}
 
 \DeclareBibliographyOption{annotation}[true]{%
@@ -31,20 +33,14 @@
   \settoggle{bbx:scauthors}{#1}}
 \DeclareBibliographyOption{scauthorsbib}[true]{%
   \settoggle{bbx:scauthorsbib}{#1}}
-\DeclareBibliographyOption{origparens}[true]{%
-  \settoggle{bbx:origparens}{#1}}  
-\DeclareBibliographyOption{origbrackets}[true]{%
-  \settoggle{bbx:origbrackets}{#1}}  
 \DeclareBibliographyOption{inbeforejournal}[true]{%
-  \settoggle{bbx:inbeforejournal}{#1}}  
+  \settoggle{bbx:inbeforejournal}{#1}}
 \DeclareBibliographyOption{classical}[true]{%
-  \settoggle{bbx:classical}{#1}}  
-
-% multi value options
+  \settoggle{bbx:classical}{#1}}
 
 \newcommand{\bbx@publocformat}{}
 \newcommand{\bbx@volnumformat}{}
-\newcommand{\bbx@origfieldsformat}{}
+\newcommand{\bbx@relatedformat}{}
 \newcommand{\bbx@origfields}{}
 \newcommand{\bbx@editionformat}{}
 \newcommand{\bbx@volumeformat}{}
@@ -54,7 +50,9 @@
 \DeclareBibliographyOption{volnumformat}[plain]{%
   \renewcommand{\bbx@volnumformat}{#1}}
 \DeclareBibliographyOption{origfieldsformat}[semicolon]{%
-  \renewcommand{\bbx@origfieldsformat}{#1}}
+  \renewcommand{\bbx@relatedformat}{#1}}
+\DeclareBibliographyOption{relatedformat}[semicolon]{%
+  \renewcommand{\bbx@relatedformat}{#1}}
 \DeclareBibliographyOption{origfields}[true]{%
   \renewcommand{\bbx@origfields}{#1}}
 \DeclareBibliographyOption{editionformat}[arabic]{%
@@ -65,507 +63,567 @@
 \DeclareEntryOption{origed}[true]{%
   \renewcommand{\bbx@origfields}{origed}}
 
-% Execute options
-
 \ExecuteBibliographyOptions{%
-	publocformat	=	publocyear,
-	annotation		=	false,
-	library				=	true,
-	scauthors			=	false,
-	scauthorsbib		=	false,
-	origfieldsformat=	semicolon,
-	inbeforejournal	=	false,
-	volnumformat	=	plain,
-	editionformat	=	arabic,
-	volumeformat	=	arabic,
-	maxcitenames =  2,
-	mincitenames  =  1,
-	maxbibnames	=	999,
-	minbibnames	=	999,
-	classical			=	false,
-	}
-% 	AT BEGIN SHORTHANDS
-%****************************************
-\AtBeginShorthands{\togglefalse{bbx:annotation}}
-% 	AT BEGIN BILIOGRAPHY
-%****************************************
+  publocformat     = publocyear,
+  annotation       = false,
+  library          = true,
+  scauthors        = false,
+  scauthorsbib     = false,
+  origfieldsformat = semicolon,
+  inbeforejournal  = false,
+  volnumformat     = plain,
+  editionformat    = arabic,
+  volumeformat     = arabic,
+  classical        = false,
+  useprefix        = true,
+  maxcitenames     = 2,
+  mincitenames     = 1,
+  maxbibnames      = 999,
+  minbibnames      = 999}
+\newcounter{maxnamesincross}
+\newcounter{minnamesincross}
+
+\AtBeginShorthands{
+  \togglefalse{bbx:annotation}
+  \DeclareCiteCommand{\bbx@crossref@inbook}
+  {}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{inbook:full}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+\DeclareCiteCommand{\bbx@crossref@incollection}
+  {}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{incollection:full}}%
+    {\usebibmacro{cite:shorthand}}}%
+  {}%
+  {}%
+}
 \AtBeginBibliography{%
-% SMALL CAPS AUTHORS NAME
 \iftoggle{bbx:scauthorsbib}{%
 \DeclareNameFormat{sortname}{%
   \ifnumequal{\value{listcount}}{1}
     {\iffirstinits
-       {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}}%MOD
-       {\ifblank{#3}{\usebibmacro{name:last-first}{\textsc{#1}\nopunct}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}{\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}%
+       {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}%
+           {\textsc{#7}}}%MOD
+       {\ifblank{#3}{\usebibmacro{name:last-first}{\textsc{#1}\nopunct}%
+           {\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}
+       {\usebibmacro{name:last-first}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}%
+           {\textsc{#7}}}}%
      \ifblank{#3#5}
        {}
        {\usebibmacro{name:revsdelim}}}
     {\iffirstinits
-       {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}}
-       {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}%
-  \usebibmacro{name:andothers}}
-}{}%
-}
-% 	AT BEGIN DOCUMENT
-%****************************************
-\AtBeginDocument{%
-\iftoggle{bbx:origbrackets}{\toggletrue{bbx:origparens}
-\renewcommand{\origleftparen}{\bibleftbracket}
-\renewcommand{\origrightparen}{\bibrightbracket}}%
-{}%
- \iftoggle{bbx:scauthors}
-	{\toggletrue{bbx:scauthorsbib}\toggletrue{cbx:scauthorscite}}%
-	{}%	
-}
-
-%	FIELDS FORMAT
-%*****************************************
-
-%			new commands
-%---------------------------------------------
-\newcommand*{\pureopenparen}{\blx@postpunct(}
-\newcommand*{\purecloseparen}{\blx@postpunct)\midsentence}
+       {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}%
+           {\textsc{#7}}}
+       {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}%
+           {\textsc{#7}}}}%
+  \usebibmacro{name:andothers}}}%
+{}}%
 
+\AtBeginDocument{%
+\iftoggle{bbx:scauthors}{%
+  \toggletrue{bbx:scauthorsbib}%
+  \toggletrue{cbx:scauthorscite}}%
+{}}
+\renewcommand*{\newunitpunct}{\addcomma\space}
+\renewcommand*{\subtitlepunct}{\addperiod\space}
+\renewcommand*{\intitlepunct}{\nopunct\addspace}
+\newcommand*{\volnumpunct}{\addcomma\space}
 \newrobustcmd{\mkpureparens}[1]{%
   \begingroup
   \blx@blxinit
   \blx@setsfcodes
-  \pureopenparen#1\purecloseparen
+  \blx@postpunct(#1\blx@postpunct)\midsentence%
   \endgroup}
-
-% Definisco ora alcuni comandi che servono per il formato dei campi.
-\newcommand{\annotationfont}{\footnotesize}
-\newcommand{\libraryfont}{}
-
-% Nuovi comandi per avere la traduzione tra parentesi
-\newcommand{\origleftparen}{\pureopenparen}
-\newcommand{\origrightparen}{\purecloseparen}
-\newcommand{\origleftbracket}{\bibleftbracket}
-\newcommand{\origrightbracket}{\bibrightbracket}
-\newcommand{\backrefleftparen}{\pureopenparen}
-\newcommand{\backrefrightparen}{\purecloseparen}
-\newcommand{\backrefparens}[1]{\backrefleftparen#1\backrefrightparen}
-
-\renewcommand*{\newunitpunct}{\addcomma\space}
-\renewcommand*{\subtitlepunct}{\addperiod\space}
-\renewcommand*{\intitlepunct}{\nopunct\addspace}
-\newcommand*{\volnumpunct}{\addcomma\space}
-
-\newcommand*{\volumfont}{%
-   \ifdefstring{\bbx@volumeformat}{romanupp}
-      {\uppercase}%
-      {\ifdefstring{\bbx@volumeformat}{romansc}
-      {\scshape}%
-      {}}% roman lowercase
-}
-
+\renewbibmacro*{citeindex}{%
+\ifciteindex{\indexnames{labelname}}{}}
+\renewbibmacro*{bibindex}{%
+\ifbibindex{\indexnames{author}%
+\indexnames{editor}%
+\indexnames{editora}%
+\indexnames{editorb}%
+\indexnames{editorc}}%
+{}}%
+\newcommand*{\annotationfont}{\footnotesize}
+\newcommand*{\libraryfont}{}
 \newcommand*{\editionfont}{%
     \ifdefstring{\bbx@editionformat}{romanupp}
       {\uppercase}%
       {\ifdefstring{\bbx@editionformat}{romansc}
       {\scshape}%
-      {}}% roman lowercase
+      {\relax}}%
       }%
-
-% font for volume
-\newrobustcmd*{\volfnt}[1]{%
-  \begingroup
-  \expandafter\volumfont
-  \expandafter{\romannumeral#1}%
-  \endgroup}
-  
-% font for edition number
 \newrobustcmd*{\edfnt}[1]{%
   \begingroup
   \expandafter\editionfont
   \expandafter{\romannumeral#1}%
   \endgroup}
-
-  
-%			fields format
-%----------------------------------------------
-% TITLE
-\DeclareFieldFormat[bookinbook]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[review]{title}{\bibstring{reviewof}\addspace{#1}}
-\DeclareFieldFormat[review]{volume}{% 
-  \ifdefstring{\bbx@volnumformat}{strings}{% 
- \bibstring{volume}\addnbspace\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}{\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}}
-\DeclareFieldFormat[inreference]{title}{\mkbibquote{#1}}
-% CITETITLE
-\DeclareFieldFormat[bookinbook]{citetitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[thesis]{citetitle}{\mkbibemph{#1}}
-% ORIGTITLE
+\DeclareFieldFormat[bookinbook,thesis]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[review]{title}{\bibstring{reviewof}\addspace#1}
+\DeclareFieldFormat[inreference,article]{title}{\mkbibquote{#1}}
+\DeclareFieldFormat[bookinbook,thesis]{citetitle}{\mkbibemph{#1}}
 \DeclareFieldFormat{origtitle}{\mkbibemph{#1}}
 \DeclareFieldFormat[article]{origtitle}{\mkbibquote{#1}}
-% USERA
 \DeclareFieldFormat{usera}{\mkbibemph{#1}}
-%\DeclareFieldFormat[article]{usera}{\mkbibquote{#1}}
-\DeclareFieldFormat[bookinbook]{usera}{\mkbibemph{#1}}
-\DeclareFieldFormat[inbook]{usera}{\mkbibemph{#1}}
+\DeclareFieldFormat[bookinbook,inbook]{usera}{\mkbibemph{#1}}
 \DeclareFieldFormat[incollection]{usera}{\mkbibquote{#1}}
-% USERC
-\DeclareFieldFormat{userc}{\mkpageprefix[bookpagination]{#1}} 
-% URL
+\DeclareFieldFormat{userc}{\mkpageprefix[bookpagination]{#1}}
 \DeclareFieldFormat{url}{\url{#1}}
-% EDITION
-\DeclareFieldFormat{edition}{%
-  \ifinteger{#1}
-    {\ifdefstring{\bbx@editionformat}{arabic}
-    {\mkbibordedition{#1}~\bibstring{edition}}
-    {\edfnt{#1}~\bibstring{edition}}}%
-    {#1\isdot}}
-% ANNOTATION LIBRARY
 \DeclareFieldFormat{annotation}{\annotationfont #1}
 \DeclareFieldFormat{library}{\libraryfont #1}
-% PARENS
 \DeclareFieldFormat{backrefparens}{\mkpureparens{#1}}
 \DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
-% NUMBER
+\DeclareFieldFormat{volume}{%
+  \bibstring{volume}~%
+  \ifinteger{#1}{%
+  \ifdefstring{\bbx@volumeformat}{arabic}%
+    {#1}%
+    {\ifdefstring{\bbx@volumeformat}{romanupp}%
+       {\RN{#1}}%
+       {\ifdefstring{\bbx@volumeformat}{romansc}%
+         {\textsc{\Rn{#1}}}%
+         {#1}}}}{#1}}
 \DeclareFieldFormat{number}{%
   \ifdefstring{\bbx@volnumformat}{strings}{%
-    \bibstring{number}\adddotspace #1}{#1}}% number in a series
-\DeclareFieldFormat[article]{number}{%
-  \ifdefstring{\bbx@volnumformat}{strings}{%
-    \bibstring{number}\adddotspace #1}{#1}}% number in a series
-% VOLUME
-\DeclareFieldFormat{volume}{\bibstring{volume}~\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}% volume of a book
-\DeclareFieldFormat[article]{volume}{%
-  \ifdefstring{\bbx@volnumformat}{strings}{%
-    \bibstring{volume}\addnbspace\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}{\ifdefstring{\bbx@volumeformat}{arabic}{#1}{\volfnt{#1}}}}
-% SERIES
+    \bibstring{number}~#1}{#1}}
 \DeclareFieldFormat{series}{%
   \ifinteger{#1}
     {\mkbibordseries{#1}~\bibstring{jourser}}
     {\ifbibstring{#1}{\bibstring{#1}}{#1}}}
-
-% 	NEW MACROS
-%***********************************************
-\renewbibmacro*{citeindex}{% 
-\ifciteindex{\indexnames{labelname}}{}}
-\renewbibmacro*{bibindex}{%
-\ifbibindex{\indexnames{author}%
-\indexnames{editor}%
-\indexnames{editora}%
-\indexnames{editorb}%
-\indexnames{editorc}}%
-{}}%
-
-\renewbibmacro*{pageref}{%
-  \iflistundef{pageref}
-    {}
-    {\setunit{\addperiod\space}%
-    \printtext[backrefparens]{%
-       \ifnumgreater{\value{pageref}}{1}
-         {\bibstring{backrefpages}\ppspace}
-	 {\bibstring{backrefpage}\ppspace}%
-       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct}}
-
-
-\renewbibmacro*{publisher+location+date}{%
-\ifdefstring{\bbx@publocformat}{loccolonpub}	
-{\usebibmacro{loccolonpub}}{\ifdefstring{\bbx@publocformat}{locpubyear}
-	{\usebibmacro{locpubyear}}
-	{\usebibmacro{publocyear}}}}
-
-\renewbibmacro*{institution+location+date}{%
-\ifdefstring{\bbx@publocformat}{loccolonpub}	
-{\usebibmacro{inloccolonpub}}{\ifdefstring{\bbx@publocformat}{locpubyear}
-	{\usebibmacro{inlocpubyear}}
-	{\usebibmacro{inpublocyear}}}}
-
-\renewbibmacro*{organization+location+date}{%
-\ifdefstring{\bbx@publocformat}{loccolonpub}	
-{\usebibmacro{orgloccolonpub}}{\ifdefstring{\bbx@publocformat}{locpubyear}
-	{\usebibmacro{orglocpubyear}}
-	{\usebibmacro{orgpublocyear}}}}
-
-
-\renewbibmacro*{annotation}{%
-\iftoggle{bbx:library}{%
-\setunit{\addperiod\space}%
-  \iffieldundef{library}%
-    {\printfield[library]{\bibannotationprefix\thefield{entrykey}.tex}}
-    {\printfield{library}}}%
-    {}}%
-
-
-\renewbibmacro*{finentry}{%
-	\iftoggle{bbx:annotation}%
-		{\iffieldundef{annotation}%
-			{\finentry}%
-			{\setunit{\addperiod\par\nobreak\vspace*{.5ex}}%
-			\printtext[annotation]{\printfield{annotation}\finentry\par}}}%
-			{\finentry}}
-			
-
-
-% ORIGFIELDS
-
-
-% origpublisher+origlocation+origdate
-
+\DeclareFieldFormat{edition}{%
+  \ifinteger{#1}{%
+    \ifdefstring{\bbx@editionformat}{arabic}
+      {\mkbibordedition{#1}~\bibstring{edition}}
+      {\ifdefstring{\bbx@editionformat}{romanupp}%
+        {\RN{#1}~\bibstring{edition}}%
+        {\ifdefstring{\bbx@editionformat}{romansc}%
+          {\textsc{\Rn{#1}}~\bibstring{edition}}%
+          {\mkbibordedition{#1}~\bibstring{edition}}}}}
+    {#1}}%\isdot??
+\DeclareFieldFormat{related:translatedas}{%
+  \ifdefstring{\bbx@relatedformat}{parens}%
+  {\mkpureparens{#1}}%
+  {\ifdefstring{\bbx@relatedformat}{brackets}%
+  {\mkbibbrackets{#1}}%
+  {\printtext{\addsemicolon\space}#1}}}%
 \newbibmacro*{origpublisher+origlocation+origdate}{%
-	\ifdefstring{\bbx@publocformat}{loccolonpub}	
-	{\usebibmacro{origloccolonpub}\setunit{\bibpagespunct}%
-	    		\printfield{userc}}{\ifdefstring{\bbx@publocformat}{locpubyear}
-		{\usebibmacro{origlocpubyear}\setunit{\bibpagespunct}%
-	    		\printfield{userc}}
-		{\usebibmacro{origpublocyear}\setunit{\bibpagespunct}%
-	    		\printfield{userc}}}}
-\newbibmacro*{origpublocyear}{%% ``Publisher, Location Year''
-			\iflistundef{origpublisher}%
-				{\printlist{origlocation}%
-				\setunit*{\addspace}%
-			  	\printorigdate}%
-				{\printlist{origpublisher}%
-			    	\setunit*{\addcomma\space}%
-				\printlist{origlocation}%
-				\setunit*{\addspace}%
-			  	\printorigdate}%
-			  \newunit}
-\newbibmacro*{origloccolonpub}{%% ``Location: Publisher, Year''
-			\iflistundef{origlocation}{}%
-			  {\printlist{origlocation}}%
-			  \iflistundef{origpublisher}%
-			    	{\setunit*{\addspace}%
-				\printorigdate}%
-			    	{\setunit*{\addcolon\space}%
-			  \printlist{origpublisher}%
-			  \setunit*{\addcomma\space}%
-			  \printorigdate}%
-			  \newunit}  
-\newbibmacro*{origlocpubyear}{%% ``Location, Publisher, Year''
-			\iflistundef{origlocation}{}%
-			  {\printlist{origlocation}}%
-			  \iflistundef{origpublisher}%
-			    	{\setunit*{\addspace}%
-				\printorigdate}%
-			    	{\setunit*{\addcomma\space}%
-			  \printlist{origpublisher}%
-			  \setunit*{\addcomma\space}%
-			  \printorigdate}%
-			  \newunit}
-
-% reprinttitle
+\ifdefstring{\bbx@publocformat}{loccolonpub}
+{\usebibmacro{origloccolonpub}\setunit{\bibpagespunct}%
+     \printfield{userc}}{\ifdefstring{\bbx@publocformat}{locpubyear}
+{\usebibmacro{origlocpubyear}\setunit{\bibpagespunct}%
+     \printfield{userc}}
+{\usebibmacro{origpublocyear}\setunit{\bibpagespunct}%
+     \printfield{userc}}}}
+
+\newbibmacro*{origpublocyear}{%
+\iflistundef{origpublisher}%
+{\printlist{origlocation}%
+\setunit*{\addspace}%
+   \printorigdate}%
+{\printlist{origpublisher}%
+     \setunit*{\addcomma\space}%
+\printlist{origlocation}%
+\setunit*{\addspace}%
+   \printorigdate}%
+  \newunit}
+
+\newbibmacro*{origloccolonpub}{%
+\iflistundef{origlocation}{}%
+  {\printlist{origlocation}}%
+  \iflistundef{origpublisher}%
+     {\setunit*{\addspace}%
+\printorigdate}%
+     {\setunit*{\addcolon\space}%
+  \printlist{origpublisher}%
+  \setunit*{\addcomma\space}%
+  \printorigdate}%
+  \newunit}
+
+\newbibmacro*{origlocpubyear}{%
+\iflistundef{origlocation}{}%
+  {\printlist{origlocation}}%
+  \iflistundef{origpublisher}%
+     {\setunit*{\addspace}%
+\printorigdate}%
+     {\setunit*{\addcomma\space}%
+  \printlist{origpublisher}%
+  \setunit*{\addcomma\space}%
+  \printorigdate}%
+  \newunit}
 
 \newbibmacro*{reprinttitle}{%
-			  \iffieldundef{reprinttitle}{}{%
-			  	\iffieldsequal{reprinttitle}{title}{}{%
-			       	\printfield[title]{reprinttitle}%
-			     	\setunit{\addcomma\space}}}%
-				\iffieldundef{userb}{}{%
-			       	\printfield{userb}}}%
-
-% transorigstring
+  \iffieldundef{reprinttitle}{}{%
+   \iffieldsequal{reprinttitle}{title}{}{%
+        \printfield[title]{reprinttitle}%
+      \setunit{\addcomma\space}}}%
+\iffieldundef{userb}{}{%
+        \printfield{userb}}}%
 
 \newbibmacro*{transorigstring}{%
-		\iffieldundef{reprinttitle}%
-			{\printtext{\ifdefstring{\bbx@origfields}{origed}
-												{\bibstring{origed}}%
-												{\bibstring{transtolang}}}\nopunct}%
-			{\printtext{\bibstring{reprint}}}\nopunct}
-			%nopunct
-			%serve se si ha solo ``origlocation + origdate''
-
-% origtitle:book
+\iffieldundef{reprinttitle}%
+{\printtext{\ifdefstring{\bbx@origfields}{origed}
+{\bibstring{origed}}%
+{\bibstring{transtolang}}}\nopunct}%
+{\printtext{\bibstring{reprint}}}\nopunct}
 
 \newbibmacro*{origtitle:book}{%
   \iffieldundef{origtitle}{}{
-       	\printfield[origtitle]{origtitle}%
-     	\setunit{\addcomma\space}}
-	\iffieldundef{userb}{}{%
-       	\printfield{userb}}}%
-
-% origtitledata:book
-
-\newbibmacro*{origtitledata:book}{%			
-				\usebibmacro{transorigstring}%
-				\iffieldundef{reprinttitle}%
-					{\usebibmacro{origtitle:book}}%
-					{\usebibmacro{reprinttitle}}%
-					\newunit\newblock
-	  			\usebibmacro{origpublisher+origlocation+origdate}}		
-
-% origdata:book
+        \printfield[origtitle]{origtitle}%
+      \setunit{\addcomma\space}}
+\iffieldundef{userb}{}{%
+        \printfield{userb}}}%
+
+\newbibmacro*{origtitledata:book}{%
+\usebibmacro{transorigstring}%
+\iffieldundef{reprinttitle}%
+{\usebibmacro{origtitle:book}}%
+{\usebibmacro{reprinttitle}}%
+\newunit\newblock
+   \usebibmacro{origpublisher+origlocation+origdate}}
 
 \newbibmacro*{origdata:book}{%
-	\iffieldundef{origyear}%
-	  	{}%
-	  	{\ifdefstring{\bbx@origfieldsformat}{parens}
-		    {\printtext[pureparens]{\usebibmacro{origtitledata:book}}}
-		    {\ifdefstring{\bbx@origfieldsformat}{brackets}
-		        {\printtext[brackets]{\usebibmacro{origtitledata:book}}}
-		        {\setunit{\addsemicolon\space}%
-		            \printtext{\usebibmacro{origtitledata:book}}}}}}
-
-% origtitle:article-inbook-incoll
+  \ifboolexpr{
+    test {\iffieldundef{origtitle}}
+    and
+    test {\iffieldundef{origlocation}}
+    and
+    test {\iffieldundef{origpublisher}}
+    and
+    test {\iffieldundef{origyear}}
+  }%
+  {}%
+      {\ifdefstring{\bbx@relatedformat}{parens}
+    {\nopunct\printtext[pureparens]{\usebibmacro{origtitledata:book}}}
+    {\ifdefstring{\bbx@relatedformat}{brackets}
+        {\nopunct\printtext[brackets]{\usebibmacro{origtitledata:book}}}
+        {\setunit{\addsemicolon\space}%
+            \printtext{\usebibmacro{origtitledata:book}}}}}}
 
 \newbibmacro*{origtitle:article-inbook-incoll}{%
- 	\iffieldundef{origtitle}{}{%
-       	\printfield[origtitle]{origtitle}%
-	\setunit{\addcomma\space}}	
+  \iffieldundef{origtitle}{}{%
+        \printfield[origtitle]{origtitle}%
+\setunit{\addcomma\space}}
 \iffieldundef{usera}{}{%
-	\usebibmacro{in:}%
-		\printfield{usera}%
-            	\setunit{\addcomma\space}}%
-	\iffieldundef{userb}{}{%
-       	\printfield{userb}%
-      	\newunit}}
-
-% origtitledata:article-inbook-incoll	            	
+\usebibmacro{in:}%
+\printfield{usera}%
+             \setunit{\addcomma\space}}%
+\iffieldundef{userb}{}{%
+        \printfield{userb}%
+       \newunit}}
 
 \newbibmacro*{origtitledata:article-inbook-incoll}{%
-	        \usebibmacro{transorigstring}%
-	        \setunit{\addspace}%
-	        \usebibmacro{origtitle:article-inbook-incoll}%
-	        \usebibmacro{origpublisher+origlocation+origdate}}
-
-% origdata:article-inbook
+        \usebibmacro{transorigstring}%
+        \setunit{\addspace}%
+        \usebibmacro{origtitle:article-inbook-incoll}%
+        \usebibmacro{origpublisher+origlocation+origdate}}
 
 \newbibmacro*{origdata:article-inbook}{%
     \iflistundef{origlocation}{}{%
-        \ifdefstring{\bbx@origfieldsformat}{parens}
-            {\printtext[pureparens]{\usebibmacro{origtitledata:article-inbook-incoll}}}
-                {\ifdefstring{\bbx@origfieldsformat}{brackets}
-                    {\printtext[brackets]{\usebibmacro{origtitledata:article-inbook-incoll}}}
-                       {\setunit{\addsemicolon\space}%
-                           \printtext{\usebibmacro{origtitledata:article-inbook-incoll}}}}}}
-
-% addendum+pubstate
-
+        \ifdefstring{\bbx@relatedformat}{parens}
+          {\nopunct\printtext[pureparens]{%
+          \usebibmacro{origtitledata:article-inbook-incoll}}}%
+             {\ifdefstring{\bbx@relatedformat}{brackets}
+                {\nopunct\printtext[brackets]{%
+            \usebibmacro{origtitledata:article-inbook-incoll}}}%
+        {\setunit{\addsemicolon\space}%
+     \printtext{%
+  \usebibmacro{origtitledata:article-inbook-incoll}}}}}}
 \renewbibmacro*{addendum+pubstate}{%
-			  \printfield{addendum}%
-			  \newunit\newblock
-			  \printfield{pubstate}%
-			  \ifdefstring{\bbx@origfields}{none}{}{%
-			   \newunit\newblock
-			  \usebibmacro{origdata:book}}
-			  \newunit\newblock
-			  \usebibmacro{annotation}}
-
-\newbibmacro*{addendum+pubstate:article-book-incoll}{%
-			  \printfield{addendum}%
-			  \newunit\newblock
-			  \printfield{pubstate}%
-			  \ifdefstring{\bbx@origfields}{none}{}{%
-			   \newunit\newblock
-			  \usebibmacro{origdata:article-inbook}}%
-			  \newunit\newblock
-			  \usebibmacro{annotation}}	
+  \printfield{addendum}%
+  \newunit\newblock
+  \printfield{pubstate}%
+  \ifdefstring{\bbx@origfields}{none}{}{%
+   \newunit\newblock
+  \usebibmacro{origdata:book}}%
+  \newunit\newblock
+  \usebibmacro{library}}
 
-\renewbibmacro*{series+number}{%
-			  \printfield{series}%
-			 \setunit*{\addcomma\space}%
-			  \printfield{number}%
-			  \newunit}
-  
-% volnum option
-
-\newbibmacro*{volnumdefault}{%  
-			\printfield{volume}%
-			  \setunit*{\volnumpunct}%
-			  \printfield{number}}
+\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*{volnumdefault}{%
+\printfield{volume}%
+  \setunit*{\volnumpunct}%
+  \printfield{number}}
 
 \newbibmacro*{volnumparens}{%
-			\nopunct% 
-			\printtext[pureparens]{% 
-			\printfield{volume}%
-			  \setunit*{\volnumpunct}%
-			  \printfield{number}}\addcomma\space}
+\nopunct%
+\printtext[pureparens]{%
+\printfield{volume}%
+  \setunit*{\volnumpunct}%
+  \printfield{number}}\addcomma\space}
 
 \newbibmacro*{volnumstrings}{%
-			\iffieldundef{volume}{}{%
-			\printfield{volume}%
-			\setunit*{\volnumpunct}}%
-			\iffieldundef{number}{}{%
-			\printfield{number}}}
+  \iffieldundef{volume}{}{%
+    \printfield{volume}\setunit*{\volnumpunct}}%
+ \iffieldundef{number}{}{%
+   \printfield{number}}}
 
 \renewbibmacro*{journal}{%
-		  \iffieldundef{journaltitle}
-		    {}
-		    {\printtext[journaltitle]{%
-		       \printfield[titlecase]{journaltitle}%
-		       \midsentence%MOD############
-		       \setunit{\subtitlepunct}%
-		       \printfield[titlecase]{journalsubtitle}}}}
+  \iffieldundef{journaltitle}
+    {}
+    {\printtext[journaltitle]{%
+       \printfield[titlecase]{journaltitle}%
+       \midsentence%MOD############
+       \setunit{\subtitlepunct}%
+       \printfield[titlecase]{journalsubtitle}}}}
 
 \renewbibmacro*{periodical}{%
-		  \iffieldundef{title}
-		    {}
-		    {\printtext[title]{%
-		       \printfield[titlecase]{title}%
-		       \midsentence%MOD#############
-		       \setunit{\subtitlepunct}%
-		       \printfield[titlecase]{subtitle}}}}
-  
+  \iffieldundef{title}
+    {}
+    {\printtext[title]{%
+       \printfield[titlecase]{title}%
+       \midsentence%MOD#############
+       \setunit{\subtitlepunct}%
+       \printfield[titlecase]{subtitle}}}}
+
 \renewbibmacro*{journal+issuetitle}{%
-			  \usebibmacro{journal}%
-			  \setunit*{\addspace}%
-			  \iffieldundef{series}
-			    {}
-			    {\newunit
-			     \printfield{series}%
-			     \setunit{\addspace}\midsentence}%
-			     \newunit%
-			     \ifdefstring{\bbx@volnumformat}{strings}
-			     		{\usebibmacro{volnumstrings}}%
-			     		{\ifdefstring{\bbx@volnumformat}{parens}
-			     				{\usebibmacro{volnumparens}}%
-			     				{\usebibmacro{volnumdefault}}}%
-			  \setunit{\addcomma\space}%
-			  \printfield{eid}%
-			  \setunit{\addspace}%
-			  \usebibmacro{issue+date}%
-			  \setunit{\addcolon\space}%
-			  \usebibmacro{issue}%
-			  \newunit}
-  
+  \usebibmacro{journal}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}
+    {}
+    {\newunit%
+     \printfield{series}\setunit{\addspace}\midsentence}%
+     \newunit%
+  \usebibmacro{volume+number+eid}%
+  \setunit{\addspace}%
+  \usebibmacro{issue+date}%
+  \setunit{\addcolon\space}%
+  \usebibmacro{issue}%
+  \newunit}
+
 \renewbibmacro*{title+issuetitle}{%
-			  \usebibmacro{periodical}%
-			  \setunit*{\addspace}%
-			  \iffieldundef{series}
-			    {}
-			    {\newunit
-			     \printfield{series}%
-			     \setunit{\addspace}\midsentence}%
-			  \newunit
-			     \ifdefstring{\bbx@volnumformat}{strings}%
-			     		{\usebibmacro{volnumstrings}}%
-			     		{\ifdefstring{\bbx@volnumformat}{parens}%
-			     				{\usebibmacro{volnumparens}}%
-			     				{\usebibmacro{volnumdefault}}}%
-			  \setunit{\addcomma\space}%
-			  \printfield{eid}%
-			  \setunit{\addspace}%
-			  \usebibmacro{issue+date}%
-			  \setunit{\addcolon\space}%
-			  \usebibmacro{issue}%
-			  \newunit}
+  \usebibmacro{periodical}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}
+    {}
+    {\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}}%
+      {\usebibmacro{volnumdefault}}}%
+  \setunit{\addcomma\space}%
+  \printfield{eid}}
+
+\renewbibmacro*{issue+date}{%
+  \printtext[pureparens]{%
+    \iffieldundef{issue}
+      {\usebibmacro{date}}
+      {\printfield{issue}%
+       \setunit*{\addspace}%
+       \usebibmacro{date}}}%
+  \newunit}
 
 \renewbibmacro*{event+venue+date}{%v0.8
-			  \printfield{eventtitle}%
-			  \ifboolexpr{
-			    test {\iffieldundef{venue}}
-			    and
-			    test {\iffieldundef{eventyear}}
-			  }
-			    {}
-			    {\setunit*{\addspace}%
-			     \printtext{%\printtext[parens]{%IVAN
-			       \printfield{venue}%
-			       \setunit*{\addcomma\space}%
-			       \printeventdate}}%
-			  \newunit}
-
-
-%-----------------------------------------------------------------
-%	
-%								DRIVERS
-%										
-%-----------------------------------------------------------------
-
-\DeclareBibliographyDriver{article}{%
+  \printfield{eventtitle}%
+  \ifboolexpr{
+    test {\iffieldundef{venue}}
+    and
+    test {\iffieldundef{eventyear}}
+  }
+    {}
+    {\setunit*{\addspace}%
+     \printtext{%
+       \printfield{venue}%
+       \setunit*{\addcomma\space}%
+       \printeventdate}}%
+  \newunit}
+
+\renewbibmacro*{series+number}{%
+  \printfield{series}%
+ \setunit*{\addcomma\space}%
+  \printfield{number}%
+  \newunit}
+
+\renewbibmacro*{publisher+location+date}{%
+\ifdefstring{\bbx@publocformat}{loccolonpub}
+  {\usebibmacro{loccolonpub}}
+    {\ifdefstring{\bbx@publocformat}{locpubyear}
+    {\usebibmacro{locpubyear}}
+    {\usebibmacro{publocyear}}}}
+
+\renewbibmacro*{institution+location+date}{%
+\ifdefstring{\bbx@publocformat}{loccolonpub}
+  {\usebibmacro{inloccolonpub}}
+    {\ifdefstring{\bbx@publocformat}{locpubyear}
+    {\usebibmacro{inlocpubyear}}
+    {\usebibmacro{inpublocyear}}}}
+
+\renewbibmacro*{organization+location+date}{%
+\ifdefstring{\bbx@publocformat}{loccolonpub}
+  {\usebibmacro{orgloccolonpub}}
+    {\ifdefstring{\bbx@publocformat}{locpubyear}
+    {\usebibmacro{orglocpubyear}}
+    {\usebibmacro{orgpublocyear}}}}
+
+\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}
+         {\bibstring{backrefpages}\ppspace}%
+ {\bibstring{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}%
+   {}%
+{\printlist{publisher}}
+  \setunit*{\addcomma\space}%
+  \printlist{location}%
+  \usebibmacro{relateddate}%
+\newunit}
+
+\newbibmacro*{inpublocyear}{%
+  \iflistundef{institution}%
+   {}%
+{\printlist{institution}}
+  \setunit*{\addcomma\space}%
+  \printlist{location}%
+  \usebibmacro{relateddate}%
+\newunit}
+
+\newbibmacro*{orgpublocyear}{%
+  \iflistundef{organization}%
+   {}%
+{\printlist{organization}}
+  \setunit*{\addcomma\space}%
+  \printlist{location}%
+  \usebibmacro{relateddate}%
+\newunit}
+
+\newbibmacro*{loccolonpub}{%
+  \printlist{location}%
+  \iflistundef{publisher}%
+   {\setunit*{\addspace}}
+     {\setunit*{\addcolon\space}}%
+  \printlist{publisher}%
+  \usebibmacro{commarelateddate}%
+\newunit}
+
+\newbibmacro*{inloccolonpub}{%
+  \printlist{location}%
+  \iflistundef{institution}
+    {\setunit*{\addspace}}
+    {\setunit*{\addcolon\space}}%
+  \printlist{institution}%
+  \usebibmacro{commarelateddate}%
+  \newunit}
+
+\newbibmacro*{orgloccolonpub}{%
+  \printlist{location}%
+  \iflistundef{organization}
+    {\setunit*{\addspace}}
+    {\setunit*{\addcolon\space}}%
+  \printlist{organization}%
+  \usebibmacro{commarelateddate}%
+  \newunit}
+
+\newbibmacro*{locpubyear}{%
+  \printlist{location}%
+  \iflistundef{publisher}%
+   {\setunit*{\addspace}}
+     {\setunit*{\addcomma\space}}%
+  \printlist{publisher}%
+  \usebibmacro{commarelateddate}%
+\newunit}
+
+\newbibmacro*{inlocpubyear}{%
+  \printlist{location}%
+  \iflistundef{institution}
+    {\setunit*{\addspace}}
+    {\setunit*{\addcomma\space}}%
+  \printlist{institution}%
+  \usebibmacro{commarelateddate}%
+  \newunit}
+
+\newbibmacro*{orglocpubyear}{%
+  \printlist{location}%
+  \iflistundef{organization}
+    {\setunit*{\addspace}}
+    {\setunit*{\addcomma\space}}%
+  \printlist{organization}%
+  \usebibmacro{commarelateddate}%
+  \newunit}
+\newbibmacro*{relateddate}{%
+  \setunit*{\addspace}%
+  \printdate}
+\newbibmacro*{commarelateddate}{%
+  \setunit*{\addcomma\space}%
+  \printdate}
+
+\DeclareCiteCommand{\relatedcite}
+  {}%
+  {\usedriver
+     {\DeclareNameAlias{sortname}{default}%
+     % trucco per modificare due righe in ogni driver
+     % e togliere l'autore/curatore nelle voci 'related'
+  \renewbibmacro*{author/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}}%
+  \renewbibmacro*{author}{\usebibmacro{bbx:savehash}}%
+  \renewbibmacro*{editor}{\usebibmacro{bbx:savehash}}%
+  \renewcommand*{\labelnamepunct}{}%
+  \renewbibmacro*{relateddate}{%
+    \setunit*{\addspace}\printdate}%
+  \renewbibmacro*{commarelateddate}{%
+    \setunit*{\addcomma\space}\printdate}}%
+     {\thefield{entrytype}}}%
+  {}%
+  {}%
+
+\newbibmacro*{related:translatedas}[1]{%
+  \togglefalse{cbx:scauthorscite}%
+  \togglefalse{bbx:annotation}%
+\iffieldundef{relatedstring}%
+  {\bibstring{translationas}\space}%
+  {\setunit{\bibstring{translationas}\space}}%
+  \relatedcite{\thefield{related}}}
+
+\renewbibmacro*{related:default}{%
+  \usebibmacro{related:translatedas}}
+ \DeclareBibliographyDriver{article}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/translator+others}%
@@ -580,7 +638,7 @@
   \newunit\newblock
   \printfield{version}%
   \newunit\newblock
-    \iftoggle{bbx:inbeforejournal}{\usebibmacro{in:}}{}%
+  \iftoggle{bbx:inbeforejournal}{\usebibmacro{in:}}{}
   \usebibmacro{journal+issuetitle}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
@@ -593,14 +651,23 @@
   \newunit\newblock
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
-  \usebibmacro{addendum+pubstate:article-book-incoll}%
+  \usebibmacro{addendum+pubstate:article-inbook-incoll}%MOD
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
 
-%v0.8b nuova versione
-  \newbibmacro*{incollection:full}{%
-  \usebibmacro{maintitle+booktitle}%
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
@@ -620,6 +687,8 @@
   \usebibmacro{publisher+location+date}%
   \newunit\newblock
   \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
   \newunit\newblock
   \iftoggle{bbx:isbn}
     {\printfield{isbn}}
@@ -627,12 +696,111 @@
   \newunit\newblock
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
-  \usebibmacro{addendum+pubstate:article-book-incoll}%
-  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{booklet}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
 
-% v0.8b NUOVA VERSIONE
+\DeclareBibliographyDriver{collection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{editor+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \iffieldundef{xref}%
+   {\iffieldundef{crossref}{\usebibmacro{inbook:full}}%
+   {\bbx@crossref@inbook{\thefield{crossref}}%
+   \newunit\newblock
+   \usebibmacro{crossrefdata}}}%
+   {\bbx@crossref@inbook{\thefield{xref}}%
+   \newunit\newblock
+   \usebibmacro{xrefdata}}}%
+
 \newbibmacro*{inbook:full}{%
   \usebibmacro{bybookauthor}%
   \newunit\newblock
@@ -663,15 +831,598 @@
   \newunit\newblock
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
-  \usebibmacro{addendum+pubstate:article-book-incoll}%
-  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{addendum+pubstate:article-inbook-incoll}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{incollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \iffieldundef{xref}%
+   {\iffieldundef{crossref}{\usebibmacro{incollection:full}}%
+   {\bbx@crossref@incollection{\thefield{crossref}}%
+   \newunit\newblock
+   \usebibmacro{crossrefdata}}}%
+   {\bbx@crossref@incollection{\thefield{xref}}%
+   \newunit\newblock
+   \usebibmacro{xrefdata}}}
+
+  \newbibmacro*{incollection:full}{%
+  \usebibmacro{maintitle+booktitle}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \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}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \usebibmacro{maintitle+booktitle}%
+  \newunit\newblock
+  \usebibmacro{event+venue+date}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \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}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{manual}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{misc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{organization+location+date}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{online}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit\newblock
+  \usebibmacro{date}%
+  \newunit\newblock
+  \iftoggle{bbx:eprint}
+    {\usebibmacro{eprint}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{url+urldate}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{patent}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{type}%
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \iflistundef{location}
+    {}
+    {\setunit*{\addspace}%
+     \printtext[parens]{%
+       \printlist[][-\value{listtotal}]{location}}}%
+  \newunit\newblock
+  \usebibmacro{byholder}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{date}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{periodical}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title+issuetitle}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byeditor}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{issn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{proceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{editor+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{event+venue+date}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{report}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{type}%
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{institution+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isrn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \usebibmacro{institution+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{unpublished}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+date}%
+  \newunit\newblock
+  \iftoggle{bbx:url}
+    {\usebibmacro{url+urldate}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{set}{%
+  \protect\PackageWarningNoLine{biblatex-philosophy}{%
+  \MessageBreak
+  Entry type @set is not supported\MessageBreak
+  by the 'biblatex-philosophy' styles.\MessageBreak
+  All the @set entries will be ignored}}
+
+\newbibmacro*{xcross:maintitle+booktitle}{%
+     \iffieldundef{volume}
+       {}%
+       {\printfield{volume}%
+        \printfield{part}%
+        \setunit{\addcolon\space}}%
+  \usebibmacro{booktitle}%
+  \newunit}
+
+\newbibmacro*{xrefdata}{%
+  \usebibmacro{xcross:maintitle+booktitle}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit
+  \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}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
 
+\newbibmacro*{crossrefdata}{%
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate:article-inbook-incoll}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
 
-\endinput
\ No newline at end of file
+\DeclareFieldFormat[jurisdiction]{volume}{\RN{#1}}
+\DeclareFieldFormat[jurisdiction]{number}{\bibsstring{number}~{#1}}
+\DeclareFieldFormat[jurisdiction]{nameaddon}{%
+  \ifinteger{#1}{\bibcpsstring{section}~\RN{#1}}{#1}}
+\DeclareFieldFormat[jurisdiction]{pages}{#1}
+\DeclareFieldFormat[jurisdiction]{title}{%
+ \iffieldequalstr{entrysubtype}{international}{\emph{#1}}{#1}}
+\newbibmacro*{juris:author}{%
+\DeclareNameAlias{sortname}{default}%
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {%
+    \iffieldequalstr{type}{conclusions}{%
+    \printtext{Conclusioni dell'Avv\adddotspace generale}%
+    \setunit{\addspace}}{}%
+\printnames{author}%
+     \iffieldundef{authortype}
+       {}
+       {\setunit{\addcomma\space}%
+\usebibmacro{authorstrg}}}
+    {}%
+\iffieldequalstr{type}{conclusions}{%
+    \setunit{\addspace}%
+  \printtext{presentate il}%
+    \setunit{\addspace}%
+  }{%
+    \setunit{\addcomma\space}%
+  \iffieldundef{nameaddon}{}{%
+\printtext{\printfield{nameaddon}%
+\setunit{\addcomma\space}}}%
+  }%
+        \printeventdate}
+
+\DeclareBibliographyDriver{jurisdiction}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{juris:author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \usebibmacro{maintitle+booktitle}%
+  \newunit\newblock
+\printtext{%
+ \printfield{labelyear}%
+ \printfield{extrayear}}
+   \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \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}%
+  \setunit{\addsemicolon\space}\newblock
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+\AtBeginDocument{%
+\DeclareSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+      \pertype{jurisdiction}
+     \step[fieldsource=court  , fieldtarget=author]
+     \step[fieldsource=section, fieldtarget=nameaddon]
+    }
+  }
+}}
+%% 
+%%  Copyright 2009-2013 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 `philosophy-standard.bbx'.
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 8e1e4a698c8..ca1ff81589e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.bbx
@@ -1,30 +1,22 @@
-% $Id: philosophy-verbose.bbx,v 0.8b 2012/05/06 Valbusa$
-%	Copyright 2009-2012 Ivan Valbusa. This package is author-maintained. 
-%	Permission is granted to copy, distribute and/or modify this software under the 
-%	terms of the LaTeX Project Public License, version 1.3c 
-%	http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-
-
-\ProvidesFile{philosophy-verbose.bbx}[$Id: philosophy-verbose.bbx,v 0.8b 2012/05/06 valbsua beta $]
+%%
+%% This is file `philosophy-verbose.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `verbose-bbx')
+%%   ______________________________________________________
+%%   The biblatex-philosophy package
+%%   Copyright (C) 2009-2013 Ivan Valbusa
+%%   All rights reserved
+%% 
+%%   License information appended
+%% 
+\ProvidesFile{philosophy-verbose.bbx}
+    [2013/03/15 v0.8c valbusa beta]
 
 \RequireBibliographyStyle{authortitle}
 \RequireBibliographyStyle{philosophy-standard}
-
-\renewbibmacro*{bbx:editor}[1]{%
-  \ifboolexpr{
-    test \ifuseeditor
-    and
-    not test {\ifnameundef{editor}}
-  }
-    {\usebibmacro{bbx:dashcheck}
-       {\bibnamedash}
-       {\printnames{editor}%
-	\setunit{\addspace}% #MOD#
-        \usebibmacro{bbx:savehash}}%
-     \usebibmacro{#1}%
-     \clearname{editor}}
-    {\global\undef\bbx@lasthash}}
-
 \renewbibmacro*{author}{%
   \ifboolexpr{
     test \ifuseauthor
@@ -37,152 +29,61 @@
         \iffieldundef{nameaddon}{}%
         {\setunit{\addspace}%
         \printtext[brackets]{\printfield{nameaddon}}}%
-	\setunit{\addcomma\space}%
-	\usebibmacro{bbx:savehash}}%
+\setunit{\addcomma\space}%
+\usebibmacro{bbx:savehash}}%
      \usebibmacro{authorstrg}}
     {\global\undef\bbx@lasthash}}
 
-%**************************************************************
-%``Publisher, Location Year''.
-%**************************************************************
-\newbibmacro*{publocyear}{%
-	  \iflistundef{publisher}%
-	  	{}%
-		{\printlist{publisher}}
-	  \setunit*{\addcomma\space}%
-	  \printlist{location}%
-	    \setunit*{\addspace}%
-  \usebibmacro{date}%
-	\newunit}
-\newbibmacro*{inpublocyear}{%
-	  \iflistundef{institution}%
-	  	{}%
-		{\printlist{institution}}
-	  \setunit*{\addcomma\space}%
-	  \printlist{location}%
-	    \setunit*{\addspace}%
-  \usebibmacro{date}%
-	\newunit}
-\newbibmacro*{orgpublocyear}{%
-	  \iflistundef{organization}%
-	  	{}%
-		{\printlist{organization}}
-	  \setunit*{\addcomma\space}%
-	  \printlist{location}%
-	    \setunit*{\addspace}%
-  \usebibmacro{date}%
-	\newunit}
-%**************************************************************
-%``Location: Publisher, Year'' 
-%**************************************************************
-\newbibmacro*{loccolonpub}{%
-  \printlist{location}%
-  \iflistundef{publisher}%
-  	{\setunit*{\addspace}}
-    	{\setunit*{\addcolon\space}}%
-  \printlist{publisher}%
-    \setunit*{\addcomma\space}%
-  \usebibmacro{date}%
-\newunit}
-\newbibmacro*{inloccolonpub}{%
-  \printlist{location}%
-  \iflistundef{institution}
-    {\setunit*{\addspace}}
-    {\setunit*{\addcolon\space}}%
-  \printlist{institution}%
-  \setunit*{\addcomma\space}%
-  \usebibmacro{date}%
-  \newunit}
-\newbibmacro*{orgloccolonpub}{%
-  \printlist{location}%
-  \iflistundef{organization}
-    {\setunit*{\addspace}}
-    {\setunit*{\addcolon\space}}%
-  \printlist{organization}%
-  \setunit*{\addcomma\space}%
-  \usebibmacro{date}%
-  \newunit}
-%**************************************************************
-%``Location, Publisher, Year'' 
-%**************************************************************
-\newbibmacro*{locpubyear}{%
-  \printlist{location}%
-  \iflistundef{publisher}%
-  	{\setunit*{\addspace}}
-    	{\setunit*{\addcomma\space}}%
-  \printlist{publisher}%
-    \setunit*{\addcomma\space}%
-  \usebibmacro{date}%
-\newunit}
-\newbibmacro*{inlocpubyear}{%
-  \printlist{location}%
-  \iflistundef{institution}
-    {\setunit*{\addspace}}
-    {\setunit*{\addcomma\space}}%
-  \printlist{institution}%
-  \setunit*{\addcomma\space}%
-  \usebibmacro{date}%
-  \newunit}
-\newbibmacro*{orglocpubyear}{%
-  \printlist{location}%
-  \iflistundef{organization}
-    {\setunit*{\addspace}}
-    {\setunit*{\addcomma\space}}%
-  \printlist{organization}%
-  \setunit*{\addcomma\space}%
-  \usebibmacro{date}%
-  \newunit}
-
-%-----------------------------------------------------------------
-%	
-%								DRIVERS
-%										
-%-----------------------------------------------------------------
-
-\DeclareBibliographyDriver{incollection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/translator+others}%
-  \setunit{\labelnamepunct}
-  \newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{in:}%
-  \iffootnote{%
-  \iffieldundef{crossref}%
-  	{\usebibmacro{incollection:full}}%
-	{\cbx@crossref{\thefield{crossref}}%
-	  \newunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}}{\usebibmacro{incollection:full}}%
+\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}}
   }
-  
-\DeclareBibliographyDriver{inbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/translator+others}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{in:}%
-  \iffootnote{%
-  \iffieldundef{crossref}%
-  	{\usebibmacro{inbook:full}}%
-	{\cbx@inbookcrossref{\thefield{crossref}}%
-	  \newunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}}{\usebibmacro{inbook:full}}%
-}
-
-
-
+    {\usebibmacro{bbx:dashcheck}
+       {\bibnamedash}
+       {\printnames{editor}%
+\setunit{\addspace}% #MOD#
+        \usebibmacro{bbx:savehash}}%
+     \usebibmacro{#1}%
+     \clearname{editor}}
+    {\global\undef\bbx@lasthash}}
+\DeclareCiteCommand{\bbx@crossref@inbook}
+  {}%
+  {\ifciteseen{\usebibmacro{bybookauthor}%
+  \setunit*{\addcomma\space}\printtext[bibhyperlink]{%
+    \printfield[citetitle]{labeltitle}%
+      \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+   {\setunit{\addspace\midsentence}}%
+       \bibstring{cited}}}{\usebibmacro{inbook:full}}}%
+  {}%
+  {}%
 
-\endinput
+\DeclareCiteCommand{\bbx@crossref@incollection}
+  {}%
+  {\ifciteseen{\usebibmacro{editor+others}%
+  \setunit*{\addcomma\space}\printtext[bibhyperlink]{%
+    \printfield[citetitle]{labeltitle}%
+       \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
+    {\setunit{\addspace\midsentence}}%
+        \bibstring{cited}}}{\usebibmacro{incollection:full}}}%
+  {}%
+  {}%
+%% 
+%%  Copyright 2009-2013 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 `philosophy-verbose.bbx'.
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 52bca74dca4..8bdc3830958 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-verbose.cbx
@@ -1,63 +1,72 @@
-% $Id: philosophy-verbose.cbx,v 0.8b 2012/05/06 valbusa beta $
-%	Copyright 2009-2012 Ivan Valbusa. This package is author-maintained. 
-%	Permission is granted to copy, distribute and/or modify this software under the 
-%	terms of the LaTeX Project Public License, version 1.3c 
-%	http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt.
-
+%%
+%% This is file `philosophy-verbose.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-philosophy.dtx  (with options: `verbose-cbx')
+%%   ______________________________________________________
+%%   The biblatex-philosophy package
+%%   Copyright (C) 2009-2013 Ivan Valbusa
+%%   All rights reserved
+%% 
+%%   License information appended
+%% 
 \ProvidesFile{philosophy-verbose.cbx}
-[$Id: philosophy-verbose.cbx,v 0.8b 2012/05/06 Valbusa$]
+    [2013/03/15 v0.8c valbusa beta]
 
 \RequireCitationStyle{verbose-trad2}
 
 \newtoggle{cbx:scauthorscite}
 \newtoggle{cbx:latinemph}
 \newtoggle{cbx:commacit}
+
 \DeclareBibliographyOption{scauthorscite}[true]{%
   \settoggle{cbx:scauthorscite}{#1}}
 \DeclareBibliographyOption{latinemph}[true]{%
   \settoggle{cbx:latinemph}{#1}}
 \DeclareBibliographyOption{commacit}[true]{%
   \settoggle{cbx:commacit}{#1}}
+
 \ExecuteBibliographyOptions{%
-	idemtracker=false,
-	loccittracker=strict,
-	scauthorscite=false,
-	latinemph=false,
-	commacit=false}
+idemtracker=false,
+loccittracker=strict,
+scauthorscite=false,
+latinemph=false,
+commacit=false}
 
 \AtEveryCite{%
-	\togglefalse{bbx:annotation}%
-	\iftoggle{cbx:latinemph}{\renewcommand*{\mkibid}{\emph}}{}%
-	\iftoggle{cbx:scauthorscite}{\DeclareNameFormat{labelname}{%
-	\ifcase\value{uniquename}%
-		  \usebibmacro{name:last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}%
-		\or
-		  \ifuseprefix
-		    {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#8}}}%
-		    {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#6}}{\textsc{#8}}}%
-		\or
-		    \usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}%
-		\fi
-	\usebibmacro{name:andothers}}}{}}
+\togglefalse{bbx:annotation}%
+\iftoggle{cbx:latinemph}{\renewcommand*{\mkibid}{\emph}}{}%
+\iftoggle{cbx:scauthorscite}{%
+\DeclareNameFormat{labelname}{%
+\ifcase\value{uniquename}%
+  \usebibmacro{name:last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}%
+\or
+  \ifuseprefix
+    {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#8}}}%
+    {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#6}}{\textsc{#8}}}%
+\or
+    \usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}%
+\fi
+\usebibmacro{name:andothers}}}{}}
 
 \DeclareNameFormat{scdefault}{%
-	\iffirstinits
-	  {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}}
-	  {\ifblank{#3}%
-	    {\usebibmacro{name:first-last}{\textsc{#1}}{#3}{#5}{\textsc{#7}}}%
-	    {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}%
-	\usebibmacro{name:andothers}}
-
-  
+\iffirstinits
+  {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#4}}{\textsc{#5}}{\textsc{#7}}}
+  {\ifblank{#3}%
+    {\usebibmacro{name:first-last}{\textsc{#1}}{#3}{#5}{\textsc{#7}}}%
+    {\usebibmacro{name:first-last}{\textsc{#1}}{\textsc{#3}}{\textsc{#5}}{\textsc{#7}}}}%
+\usebibmacro{name:andothers}}
 \newbibmacro*{cite:opcit}{%
   \printtext[bibhyperlink]{\bibstring[\mkibid]{opcit}}}
-                
+
 \newbibmacro*{cite:loccit}{%
   \printtext{%
     \bibhyperlink{cite\csuse{cbx@lastcite@\thefield{entrykey}}}{%
       \bibstring[\mkibid]{loccit}}}%
   \global\toggletrue{cbx:loccit}}
-  
+
 \renewbibmacro*{cite:ibid}{%
  \ifloccit
    {\usebibmacro{cite:loccit}}{%
@@ -83,39 +92,25 @@
       {\DeclareNameAlias{sortname}{default}}}%
       {\thefield{entrytype}}}%
   \usebibmacro{shorthandintro}}
-
-\DeclareNameFormat{noname}{} 
-    
-\DeclareCiteCommand{\ccite}               
-	{\usebibmacro{prenote}\unspace\addspace}% 
-	{\global\togglefalse{cbx:loccit}% 
-	\usedriver{\DeclareNameAlias{sortname}{noname}} 
-	{\thefield{entrytype}}} 
-	{\multicitedelim} 
-	{\usebibmacro{cite:postnote}} 
-
-\DeclareCiteCommand{\cbx@crossref}
-  {}%
-  {\ifciteseen{\usebibmacro{editor+others}%
-  \setunit*{\addcomma\space}\printtext[bibhyperlink]{%
-    \printfield[citetitle]{labeltitle}%
-       \iftoggle{cbx:commacit}{\setunit{\addcomma\space}}%
-    {\setunit{\addspace\midsentence}}%
-        \bibstring{cited}}}{\usebibmacro{incollection:full}}}%
-  {}%
-  {}%	
-
-\DeclareCiteCommand{\cbx@inbookcrossref}
-  {}%
-  {\ifciteseen
-  	{\usebibmacro{bybookauthor}\setunit*{\addcomma\space}%
-	\printtext[bibhyperlink]{%
-		\printfield[citetitle]{labeltitle}%
-			\iftoggle{cbx:commacit}
-				{\setunit{\addcomma\space}}%
-				{\setunit{\addspace\midsentence}}%
-		\bibstring{cited}}}{\usebibmacro{inbook:full}}}%
-  {}%
-  {}%
-
-\endinput
+\DeclareNameFormat{noname}{}
+\DeclareCiteCommand{\ccite}
+{\usebibmacro{prenote}\unspace\addspace}%
+{\global\togglefalse{cbx:loccit}%
+\usedriver{\DeclareNameAlias{sortname}{noname}}
+{\thefield{entrytype}}}
+{\multicitedelim}
+{\usebibmacro{cite:postnote}}
+%% 
+%%  Copyright 2009-2013 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 `philosophy-verbose.cbx'.