biblatex-philosophy update (8mar10)

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

1 files changed, 257 insertions, 824 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
index 4f11f300639..c4c2cddcd36 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -1,19 +1,27 @@
-% $Id: philosophy-classic.bbx,v 0.4c 2010/02/27 Valbusa$
+% $Id: philosophy-classic.bbx,v 0.5 2010/03/07 Valbusa$
 %	Copyright 2009-2010 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.4c 2010/01/27 valbusa beta$]
+\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.5 2010/03/07 valbusa beta$]
 
 \RequireBibliographyStyle{authoryear}
+\DeclareLanguageMapping{italian}{italian-philosophy}
 
+%***********************************************************************************************************
+%
+% 			DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS
+%
+%***********************************************************************************************************
 \newbool{bbx:locpubyear}
 \newbool{bbx:annotation}
 \newbool{bbx:library}
 \newbool{bbx:scauthors}
 \newbool{bbx:scauthorsbib}
+\newbool{bbx:origparens}
+\newbool{bbx:origbrackets}
 \newbool{bbx:square}
 \newbool{bbx:namelastfirst}
 \newbool{bbx:onlyfirstsc}
@@ -30,14 +38,19 @@
   \csuse{bool#1}{bbx:scauthors}}
 \DeclareBibliographyOption{scauthorsbib}[true]{%
   \csuse{bool#1}{bbx:scauthorsbib}}
+\DeclareBibliographyOption{origparens}[true]{%
+  \csuse{bool#1}{bbx:origparens}}  
+  \DeclareBibliographyOption{origbrackets}[true]{%
+  \csuse{bool#1}{bbx:origbrackets}}  
+\DeclareBibliographyOption{itbackref}[true]{%
+  \csuse{bool#1}{bbx:itbackref}}  
+
 \DeclareBibliographyOption{square}[true]{%
   \csuse{bool#1}{bbx:square}}  
 \DeclareBibliographyOption{namelastfirst}[true]{%
   \csuse{bool#1}{bbx:namelastfirst}}  
 \DeclareBibliographyOption{onlyfirstsc}[true]{%
   \csuse{bool#1}{bbx:onlyfirstsc}}  
-\DeclareBibliographyOption{itbackref}[true]{%
-  \csuse{bool#1}{bbx:itbackref}}  
 
   
 \ExecuteBibliographyOptions{%
@@ -45,9 +58,11 @@ uniquename=false,
 pagetracker,
 locpubyear=false,
 annotation=false,
-library=false,
+library=true,
 scauthors=false,
 scauthorsbib=false,
+origparens=false,
+origbrackets=false,
 singletitle=false,
 square=false,
 onlyfirstsc=false,
@@ -55,21 +70,26 @@ namelastfirst=false,
 itbackref=false
 }
 
+%$$$$$$
 \newcounter{maxnamesincross}
 \newcounter{minnamesincross}
 
 
-%			 AT BEGIN DOCUMENT
-%*********************************************************************
+%***********************************************************************************************************
+%
+% 						AT BEGIN SHORTHANDS
+%
+%***********************************************************************************************************
 \AtBeginShorthands{%
-	\renewcommand{\labelnamepunct}{\addcomma\space}
+\boolfalse{bbx:annotation}
+\renewcommand{\labelnamepunct}{\addcomma\space}
 \renewbibmacro*{commaloc}{%
 	\iflistundef{publisher}{}
 	{\printlist{publisher}}
 	\setunit*{\addcomma\space}%
 	\printlist{location}%
 	\setunit*{\space}%
-	\printtext{\printdateextra}%
+	\printtext{\printfield{labelyear}}%
 	\newunit}
 \renewbibmacro*{colonloc}{%
 	\printlist{location}%
@@ -78,70 +98,53 @@ itbackref=false
 	{\setunit*{\addcolon\space}}%
 	\printlist{publisher}%
 	\setunit*{\addcomma\space}%
-	\printtext{\printdateextra}%
+	\printtext{\printfield{labelyear}}%
 	\newunit}
-\renewbibmacro*{date+extrayear}{}
-\renewbibmacro*{origfields}{%
-  \iflistundef{origlocation}%
-  	{}
-  	{\setunit{\addsemicolon\space}
-	\iffieldundef{reprinttitle}%
-  		{\printtext{\bibstring{reprintas}}}
-		{\printtext{\bibstring{reprint}}\nopunct}
-  	\setunit{\addspace}
-	\iffieldundef{reprinttitle}%
-  		{\usebibmacro{origtitle}}
-		{\usebibmacro{reprinttitle}}
-  	\newunit\newblock
-  	\usebibmacro{origpublisher+origlocation+origdate}}}}
+\renewbibmacro*{date+extrayear}{}}
 	
+%***********************************************************************************************************
+%
+% 						AT BEGIN DOCUMENT
+%
+%***********************************************************************************************************
 \AtBeginDocument{%
   \setcounter{maxnamesincross}{\value{maxnames}}
   \setcounter{minnamesincross}{\value{minnames}}
- 
+
+\ifbool{bbx:origbrackets}{\booltrue{bbx:origparens}
+\renewcommand{\origleftparen}{\bibleftbracket}
+\renewcommand{\origrightparen}{\bibrightbracket}}%
+{}%
+
   \ifbool{bbx:scauthors}
-	{\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}
-	 \renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}
-	 \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}
-	{}	
+	{\booltrue{bbx:scauthorsbib}\booltrue{cbx:scauthorscite}}
+	{}%	
   \ifbool{bbx:square}
 	{\renewcommand{\bibleftparen}{\bibleftbracket}%
 	 \renewcommand{\bibrightparen}{\bibrightbracket}}
-	{}
-}
-
-
-%			 AT EVERY CITE
-%*********************************************************************
-\AtEveryCite{%
-  \ifbool{bbx:onlyfirstsc}%
-	{\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}}%
-	{}% NB senza commento aggiunge uno spazio!!!!
-}
+	{}}
 
-%			 AT BEGIN BIBLIOGRAPHY
-%*********************************************************************
+%***********************************************************************************************************
+%
+% 						AT BEGIN BILIOGRAPHY
+%
+%***********************************************************************************************************
 \AtBeginBibliography{%
-  \ifbool{bbx:namelastfirst}{%
-  \DeclareNameFormat{sortname}{%
-  \ifnum\value{listcount}=1\relax
-    \iffirstinits
-      {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
-      {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}%
-    \ifblank{#3#5}
-      {}
-      {\usebibmacro{name:revsdelim}}%
-  \else
-    \iffirstinits
-      {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
-      {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}%
-  \fi
-  \usebibmacro{name:andothers}}}{}
-
-  \ifbool{bbx:scauthorsbib}
-	{\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}
-	 \renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}
-	 \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}{}
+% SMALL CAPS AUTHORS NAME
+\ifbool{bbx:scauthorsbib}{%
+\DeclareNameFormat{sortname}{%
+  \ifnumequal{\value{listcount}}{1}
+    {\iffirstinits
+       {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+       {\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}}
+}{}%
 
   \ifbool{bbx:onlyfirstsc}
 	{\DeclareNameFormat{sortname}{%
@@ -158,19 +161,19 @@ itbackref=false
 	      {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}%
 	  \fi
 	  \usebibmacro{name:andothers}}}
-	  {}
+	  {}%
 
 \ifbool{bbx:itbackref}
 	{\renewbibmacro*{pageref}{%
 	  \iflistundef{pageref}
-	    {}
+	    {}%
 	    {\setunit{\addperiod\space}%
 	    \ifnum\value{pageref}>1\relax
-	    \printtext[backrefparens]{Citato\space alle\space \bibstring{pages}\ppspace%
-	       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}
+	    \printtext[backrefparens]{Citato\addspace alle\addspace \bibstring{pages}\ppspace%
+	       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct
 	     \else
-	     \printtext[backrefparens]{Citato\space a\space \bibstring{page}\ppspace%
-	       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}
+	     \printtext[backrefparens]{Citato\addspace a\addspace \bibstring{page}\ppspace%
+	       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct
 	     \fi}}}%
 	{\renewbibmacro*{pageref}{%
   \iflistundef{pageref}
@@ -179,46 +182,24 @@ itbackref=false
     \ifnum\value{pageref}>1\relax
     \printtext[backrefparens]{\bibstring{see}\space%
        \bibstring{pages}\ppspace%
-       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}
+       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct
      \else
      \printtext[backrefparens]{\bibstring{see}\space%
        \bibstring{page}\ppspace%
-       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}
+       \printlist[pageref][-\value{listtotal}]{pageref}\adddot}\nopunct
      \fi}}}%	  
 }
 
 
-%--------------------------------------------------------------------------------------------
-%			Settings for italian language
-%--------------------------------------------------------------------------------------------
+%***********************************************************************************************************
 %
+% 						FIELDS FORMAT
+%
+%***********************************************************************************************************
 
-\DefineBibliographyStrings{italian}{%
-	sequentes	=  {ss\adddot},
-	sequens	=  {s\adddot},
-	reprint	  = 	{ristampa},
-	reprintof	  =	{ed.~orig.},
-	reprintas	  =	{trad.~it.},
-	see		  = 	{vedi},
-	editor	  =	{(a~cura~di)},
-	editors	  =	{(a~cura~di)},
-	withcommentator  = {{con commenti di}{con comm\adddot\ di}},
-	withannotator    = {annotazioni di},
-	withintroduction = {introduzione di},
-	withforeword     = {prefazione di},
-	withafterword    = {postfazione di}
-}
-
-%\DefineBibliographyExtras{english}{%
-%\renewrobustcmd*{\bibrangedash}{\mbox{-}\nobreak}
-%}
-
-
-
-%*********************************************************************
-%				FORMATS
-%*********************************************************************
-
+%---------------------------------------------------------------------
+%			new commands
+%---------------------------------------------------------------------
 \newcommand*{\pureleftparen}{\blx@postpunct(}
 \newcommand*{\purerightparen}{\blx@postpunct)\midsentence}
 
@@ -229,42 +210,52 @@ itbackref=false
   \pureleftparen#1\blx@postpunct\purerightparen
   \endgroup}
 
-%---------------------------------------------------------------------
-%%			new commands
-%---------------------------------------------------------------------
 \appto\biburlsetup{\Urlmuskip=0mu\relax}
 
-\newcommand{\backrefleftparen}{(}
-\newcommand{\backrefrightparen}{)}
-\newcommand{\backrefparens}[1]{\backrefleftparen#1\backrefrightparen}
-
-%\newcommand{\annotationfont}{}
-%\newcommand{\libraryfont}{\sffamily}
 \newcommand{\annotationfont}{\sffamily}
 \newcommand{\libraryfont}{}
 \renewcommand*{\newunitpunct}{\addcomma\space}
 \renewcommand*{\subtitlepunct}{\adddot\space}
 
+% Nuovi comandi per avere la traduzione tra parentesi
+\newcommand{\origleftparen}{\bibleftparen}
+\newcommand{\origrightparen}{\bibrightparen}
+
+
 %---------------------------------------------------------------------
-%%			fields format
+%			fields format
 %---------------------------------------------------------------------
+% TITLE
+\DeclareFieldFormat[inbook]{title}{\mkbibemph{#1}}
+
+% CITETITLE
 \DeclareFieldFormat[inbook]{citetitle}{\mkbibemph{#1}}
-\DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
-\DeclareFieldFormat{url}{\url{#1}}
-\DeclareFieldFormat{labelyear}{\mknumalph{#1}}
+
+% ORIGTITLE
 \DeclareFieldFormat{origtitle}{\mkbibemph{#1}}
+
+% USERA
 \DeclareFieldFormat{usera}{\mkbibemph{#1}}
 \DeclareFieldFormat[article]{usera}{\mkbibquote{#1}}
 \DeclareFieldFormat[inbook]{usera}{\mkbibemph{#1}}
 \DeclareFieldFormat[incollection]{usera}{\mkbibquote{#1}}
+
+% USERC
 \DeclareFieldFormat{userc}{\mkpageprefix[bookpagination]{#1}}
-\DeclareFieldFormat{shorthandwidth}{#1}
-\DeclareFieldFormat[inbook]{title}{\mkbibemph{#1}}
+
+% URL
+\DeclareFieldFormat{url}{\url{#1}}
+
+% ANNOTATION LIBRARY
 \DeclareFieldFormat{annotation}{\annotationfont #1}
 \DeclareFieldFormat{library}{\libraryfont #1}
-\DeclareFieldFormat{backrefparens}{\backrefparens{#1}}
-\DeclareFieldFormat{aut}{\mkpageprefix[bookpagination]{#1}}
-\DeclareFieldFormat{edition}{\ifinteger{#1}{\mkbibfemord{#1}~\bibstring{edition}}{#1}}
+
+% PARENS
+\DeclareFieldFormat{pureparens}{\mkpureparens{#1}}
+\DeclareFieldFormat{backrefparens}{\mkpureparens{#1}}
+
+
+
 
 %*********************************************************************
 %			NUOVI AMBIENTI
@@ -280,7 +271,7 @@ itbackref=false
   	{\endlist}
 
 \renewenvironment*{theshorthands}
-	{\boolfalse{bbx:library}\boolfalse{bbx:annotation}\list
+	{\list
      	{\printfield[shorthandwidth]{shorthand}}
      	{\setlength{\labelwidth}{\shorthandwidth}%
       	\setlength{\leftmargin}{\labelwidth}%
@@ -294,29 +285,6 @@ itbackref=false
 %*********************************************************************
 %			NUOVE MACRO
 %*********************************************************************
-
-\renewbibmacro*{name:andothers}{%
-  \ifthenelse{\value{listcount}=\value{liststop}\AND
-              \ifmorenames}
-    {\ifnum\value{liststop}>1 \finalandcomma\fi
-     \andothersdelim\bibstring[\emph]{andothers}}
-    {}}
-
-%\renewcommand*{\lbx@typeeditor}{%
-%  \iffieldundef{editortype}
-%    {\printtext[parens]{\bibstring{typeeditor}}}
-%    {\bibstring{type\thefield{editortype}}}}
-
-%\renewcommand*{\lbx@typeeditors}{%
-%  \iffieldundef{editortype}
-%    {\printtext[parens]{\bibstring{typeeditors}}}
-%    {\bibstring{type\thefield{editortype}s}}}
-
-
-\renewbibmacro*{date+extrayear}{%
-  \iffieldundef{year}
-    {}
-    {\printtext[parens]{\printdateextra}}}
 	
 \renewbibmacro*{journal+issuetitle}{%
   \usebibmacro{journal}%
@@ -338,11 +306,11 @@ itbackref=false
   \usebibmacro{issue}%
   \newunit}
 
+% per avere il numero tra parentesi  
 \renewbibmacro*{issue+date}{%
   \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}}
-    {}
-    {\printtext[pureparens]{%
-       \iffieldundef{issue}
+    {}%
+    {\iffieldundef{issue}
          {\iffieldundef{day}
             {\printfield{month}%
              \setunit{\addspace}%
@@ -350,9 +318,15 @@ itbackref=false
             {\printtext{\bibdate}}}
          {\printfield{issue}%
           \setunit{\addspace}%
-          }}}%
+          }}%
   \newunit}
 
+% per eliminare il mese nelle etichette delle voci article
+\renewbibmacro*{date+extrayear}{%
+  \iffieldundef{year}
+    {}%
+    {\printtext[parens]{\printfield{labelyear}\printfield{extrayear}}}}
+
 % changed
 \renewbibmacro*{bbx:editor}[1]{%
   \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
@@ -375,7 +349,6 @@ itbackref=false
 }
 
 
-
 \renewbibmacro*{annotation}{%
 \ifbool{bbx:library}{%
 \setunit{\addperiod\space}
@@ -418,17 +391,18 @@ itbackref=false
 \newbibmacro*{origfields}{%
   \iflistundef{origlocation}%
   	{}
-  	{\setunit{\addsemicolon\space}
+  	{\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{%  
+\setunit{\addsemicolon\space}}%
 	\iffieldundef{reprinttitle}%
-  		{\printtext{\bibstring{reprintas}}}
-		{\printtext{\bibstring{reprint}}\nopunct}
-  	\setunit{\addspace}
+  		{\printtext{\bibstring{reprintas}}\nopunct}
+		{\printtext{\bibstring{reprint}}\nopunct}%
+  	\setunit{\addspace}%
 	\iffieldundef{reprinttitle}%
   		{\usebibmacro{origtitle}}
 		{\usebibmacro{reprinttitle}}
   	\newunit\newblock
-  	\usebibmacro{origpublisher+origlocation+origdate}}
-}
+  	\usebibmacro{origpublisher+origlocation+origdate}%
+	\ifbool{bbx:origparens}{\origrightparen}{}}}
 
 
 \newbibmacro*{origpublisher+origlocation+origdate}{%
@@ -440,28 +414,29 @@ itbackref=false
     		\setunit{\bibpagespunct}%
     		\printfield{userc}}}
   
-\newbibmacro*{origcommaloc}{%
+
+  \newbibmacro*{origcommaloc}{%
 \iflistundef{origpublisher}%
 	{\printlist{origlocation}
-	\setunit*{\addspace}
-  	\printorigdate}
-	{\printlist{origpublisher}
-    	\setunit*{\addcomma\space}
-	\printlist{origlocation}
-	\setunit*{\addspace}
-  	\printorigdate}
+	\setunit*{\addspace}%
+  	\printorigdate}%
+	{\printlist{origpublisher}%
+    	\setunit*{\addcomma\space}%
+	\printlist{origlocation}%
+	\setunit*{\addspace}%
+  	\printorigdate}%
   \newunit}
 
 \newbibmacro*{origcolonloc}{%
-\iflistundef{origlocation}{}
+\iflistundef{origlocation}{}%
   {\printlist{origlocation}}%
   \iflistundef{origpublisher}%
-    	{\setunit*{\addspace}
+    	{\setunit*{\addspace}%
 	\printorigdate}%
     	{\setunit*{\addcolon\space}%
   \printlist{origpublisher}%
   \setunit*{\addcomma\space}%
-  \printorigdate}
+  \printorigdate}%
   \newunit}
 
 \newbibmacro*{reprinttitle}{%
@@ -476,7 +451,7 @@ itbackref=false
 
 \newbibmacro*{origtitle}{%
   \iffieldundef{origtitle}{}{
-       	\printfield[title]{origtitle}%
+       	\printfield[origtitle]{origtitle}%
      	\setunit{\addcomma\space}}
 	\iffieldundef{userb}{}{%
        	\printfield{userb}%
@@ -484,34 +459,38 @@ itbackref=false
      
 \newbibmacro*{origtitle:incollection}{%
   \iflistundef{origlocation}{}{%
-	\setunit{\addsemicolon\space}%
+\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{%  
+\setunit{\addsemicolon\space}}%
     	\printtext{\bibstring{reprintas}%
  	\iffieldundef{usera}%
 		{\setunit{\addspace}}%
-		{\setunit{\addspace}
- 		\printfield[usera]{usera}
-            	\setunit{\addcomma\space}
+		{\setunit{\addspace}%
+ 		\printfield[usera]{usera}%
+            	\setunit{\addcomma\space}%
             	\usebibmacro{in:}}%
-		\setunit{\addspace}
+		\setunit{\addspace}%
       	\newblock
 	\iffieldundef{origtitle}{}{%
-       	\printfield[title]{origtitle}
+       	\printfield[origtitle]{origtitle}%
      	\setunit{\addcomma\space}}
 	\iffieldundef{userb}{}{%
        	\printfield{userb}%
      	\newunit}
-	\usebibmacro{origpublisher+origlocation+origdate}}}}
+	\usebibmacro{origpublisher+origlocation+origdate}%
+			\ifbool{bbx:origparens}{\origrightparen}{}%
+}}}
      
 \newbibmacro*{origtitle:inbook}{%
   \iflistundef{origlocation}{}{%
-	\setunit{\addsemicolon\space}%
+\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{%  
+\setunit{\addsemicolon\space}}%
     	\printtext{\bibstring{reprintas}%
  	\iffieldundef{usera}%
-		{\setunit{\addspace}}
-		{\setunit{\addspace}
- 		\printfield[usera:inarticle]{usera}
-            	\setunit{\addcomma\space}
-	}%
+		{\setunit{\addspace}}%
+		{\setunit{\addspace}%
+ 		\printfield{usera}%
+            	\setunit{\addcomma\space}%
+            	\usebibmacro{in:}}%
 	\setunit{\addspace}
       	\newblock
 	\iffieldundef{origtitle}{}{%
@@ -520,125 +499,89 @@ itbackref=false
 	\iffieldundef{userb}{}{%
        	\printfield{userb}%
      	\newunit}
-	\usebibmacro{origpublisher+origlocation+origdate}}}}
+	\usebibmacro{origpublisher+origlocation+origdate}%
+	\ifbool{bbx:origparens}{\origrightparen}{}%
+}}}
 
 \renewbibmacro*{in:}{%
   \bibstring{in}\addcolon\setunit{\addspace}}
   
 \newbibmacro*{articletranslated}{%
   \iflistundef{origlocation}{}{%
-	\setunit{\addsemicolon\space}%
+\ifbool{bbx:origparens}{\setunit{\addspace\origleftparen}}{%  
+\setunit{\addsemicolon\space}}%
         \printtext{\bibstring{reprintas}%
  	\iffieldundef{usera}%
 		{\setunit{\addspace}}%
 		{\setunit{\addspace}
  		\printfield{usera}%
             	\setunit{\addcomma\space}%
-            	\usebibmacro{in:}}%
+            	\usebibmacro{in:}%
+		\setunit{\addspace}}%
 	\iffieldundef{origtitle}{}{%
        	\printfield[origtitle]{origtitle}%
        	\newunit\newblock}
 	\iffieldundef{userb}{}{%
        	\printfield{userb}
       	\newunit}
-       	\usebibmacro{origpublisher+origlocation+origdate}}%
-	}}
+       	\usebibmacro{origpublisher+origlocation+origdate}%
+			\ifbool{bbx:origparens}{\origrightparen}{}%
+}}}
 
      
   
 %*********************************************************************
 %%		BIBLIOGRAPHY DRIVERS
 %*********************************************************************
-  
-  \DeclareBibliographyDriver{article}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/editor}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{version}%
-  \newunit\newblock
-  \usebibmacro{journal+issuetitle}%
-\newunit\newblock
-  \printfield{note}%
-  \setunit{\bibpagespunct}%
-  \printfield{pages}
-  \newunit\newblock
-  \printfield{issn}%
-  \newunit\newblock
-  \printfield{doi}%
+
+%***********************************************************************************************************
+  \renewbibmacro*{addendum+pubstate}{%
+  \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{eprint}%
+  \printfield{pubstate}%
+   \newunit\newblock
+  \usebibmacro{origfields}%
   \newunit\newblock
-  \usebibmacro{url+urldate}%
- \newunit\newblock
+  \usebibmacro{annotation}%
+}
+  
+%***********************************************************************************************************
+  \newbibmacro*{artaddendum+pubstate}{%
   \printfield{addendum}%
+  \newunit\newblock
+  \printfield{pubstate}%
+   \newunit\newblock
   \usebibmacro{articletranslated}%
   \newunit\newblock
-    \usebibmacro{annotation}%
- \newunit\newblock		
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}  
+  \usebibmacro{annotation}%
+}	
 
-\DeclareBibliographyDriver{book}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author/editor}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{maintitle+title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \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
-  \printfield{isbn}%
-  \newunit\newblock
-  \printfield{doi}%
-  \newunit\newblock
-  \usebibmacro{eprint}%
+%***********************************************************************************************************
+  \newbibmacro*{inbookaddendum+pubstate}{%
+  \printfield{addendum}%
   \newunit\newblock
-  \usebibmacro{url+urldate}%
+  \printfield{pubstate}%
+   \newunit\newblock
+  \usebibmacro{origtitle:inbook}%
   \newunit\newblock
+  \usebibmacro{annotation}%
+}	
+
+%***********************************************************************************************************
+  \newbibmacro*{incolladdendum+pubstate}{%
   \printfield{addendum}%
-  \usebibmacro{origfields}%
+  \newunit\newblock
+  \printfield{pubstate}%
+   \newunit\newblock
+  \usebibmacro{origtitle:incollection}%
   \newunit\newblock
   \usebibmacro{annotation}%
- \newunit\newblock		
-   \usebibmacro{pageref}%
- \usebibmacro{finentry}}												
+}	
 
-\DeclareBibliographyDriver{booklet}{%
+\DeclareBibliographyDriver{article}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \usebibmacro{author/editor}%
+  \usebibmacro{author/translator+others}%
   \setunit{\labelnamepunct}\newblock
   \usebibmacro{title}%
   \newunit
@@ -646,108 +589,52 @@ itbackref=false
   \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+year}%
-  \newunit\newblock
-  \usebibmacro{chapter+pages}%
-  \newunit
-  \printfield{pagetotal}%
-  \newunit\newblock
-  \printfield{doi}%
+  \usebibmacro{bytranslator+others}%
   \newunit\newblock
-  \usebibmacro{eprint}%
-  \newunit\newblock
-  \usebibmacro{url+urldate}%
+  \printfield{version}%
   \newunit\newblock
-  \printfield{addendum}%
-  \usebibmacro{origfields}%
-   \newunit\newblock
-     \usebibmacro{annotation}%
- \newunit\newblock								
-   \usebibmacro{pageref}%
- \usebibmacro{finentry}}	
-
-\DeclareBibliographyDriver{collection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{editor+others}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{maintitle+title}%
-  \newunit
-  \printlist{language}%
+  \usebibmacro{journal+issuetitle}%
   \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
-  \printfield{pagetotal}%
+  \usebibmacro{note+pages}%
   \newunit\newblock
-  \printfield{isbn}%
-  \newunit\newblock
-  \printfield{doi}%
+  \iftoggle{bbx:isbn}
+    {\printfield{issn}}
+    {}%
   \newunit\newblock
-  \usebibmacro{eprint}%
+  \usebibmacro{doi+eprint+url}%
   \newunit\newblock
-  \usebibmacro{url+urldate}%
+  \usebibmacro{artaddendum+pubstate}%
   \newunit\newblock
-  \printfield{addendum}%
-  \usebibmacro{origfields}%
-   \newunit\newblock	
-     \usebibmacro{annotation}%
- \newunit\newblock							
-   \usebibmacro{pageref}%
- \usebibmacro{finentry}}	
-
-
-%%--------------------------------------------------------------------------------------------------
-%%						INBOOK	with crossref 
-%%--------------------------------------------------------------------------------------------------
-
-\newbibmacro*{crossdate+extrayear}{%
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+  
+  \newbibmacro*{crossdate+extrayear}{%
 	\iffieldundef{year}%
     	{}%
     	{\unspace\printtext[parens]{\printdateextra}}}
 
-\DeclareCiteCommand{\bbx@inbookcrossref}
+	
+  \DeclareCiteCommand{\bbx@crossref}
   {}%
   {\ifsingletitle%
-    {\printtext[bibhyperref]{\ifthenelse{\value{listtotal}=2}
+    {\printtext{\ifthenelse{\value{listtotal}=2}
     	{\printnames[][-\value{maxnamesincross}]{labelname}}
     	{\printnames[][-\value{minnamesincross}]{labelname}}}}%
-    {\ifthenelse{\value{listtotal}=2}%
+    {\ifthenelse{\value{listtotal}=2}
     	{\printnames[][-\value{maxnamesincross}]{labelname}}
     	{\printnames[][-\value{minnamesincross}]{labelname}}
     \setunit{\addspace}%
-    \printtext[bibhyperref]{\usebibmacro{crossdate+extrayear}}}}%
-  {\unspace}%
+    \printtext{\usebibmacro{crossdate+extrayear}}}}%
   {\unspace}%
+  {\unspace}
 
-\DeclareBibliographyDriver{inbook}{%
+
+\DeclareBibliographyDriver{incollection}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \usebibmacro{author}%
+  \usebibmacro{author/translator+others}%
   \setunit{\labelnamepunct}\newblock
   \usebibmacro{title}%
   \newunit
@@ -757,38 +644,21 @@ itbackref=false
   \newunit\newblock
   \usebibmacro{in:}%
   \iffieldundef{crossref}%
-    	{\iffieldundef{xref}%
-      		{\usebibmacro{inbook:full}}%
-      		{\bbx@inbookcrossref{\thefield{xref}}%
+  	{\usebibmacro{incollection:full}}%
+	{\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff
+	\bbx@crossref{\thefield{crossref}}%
 		\newunit\newblock
 		\printfield{userd}%
 		\newunit\newblock
 		\usebibmacro{chapter+pages}%
 		  \newunit\newblock
-		    \printfield{addendum}%
-		  \usebibmacro{origtitle:inbook}
-		  \newunit\newblock
-		    \usebibmacro{annotation}%
-  			\newunit\newblock								
-		  \usebibmacro{pageref}}}%
-    	{\bbx@inbookcrossref{\thefield{crossref}}%
+	  \usebibmacro{incolladdendum+pubstate}%
 		\newunit\newblock
-		\printfield{userd}%
-		\newunit\newblock
-		\usebibmacro{chapter+pages}%
-		  \newunit\newblock
-		    \printfield{addendum}%
-		  \usebibmacro{origtitle:inbook}%
-		  \newunit\newblock
-		    \usebibmacro{annotation}%
-  			\newunit\newblock								
-		  \usebibmacro{pageref}}%
-  \usebibmacro{finentry}}
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}}
   
- \newbibmacro*{inbook:full}{%
-  \usebibmacro{bybookauthor}%
-  \newunit\newblock
-  \usebibmacro{maintitle+booktitle}%
+  \newbibmacro*{incollection:full}{%
+    \usebibmacro{maintitle+booktitle}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
   \newunit\newblock
@@ -809,48 +679,21 @@ itbackref=false
   \newunit\newblock
   \usebibmacro{chapter+pages}%
   \newunit\newblock
-  \printfield{isbn}%
-  \newunit\newblock
-  \printfield{doi}%
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
   \newunit\newblock
-  \usebibmacro{eprint}%
+  \usebibmacro{doi+eprint+url}%
   \newunit\newblock
-  \usebibmacro{url+urldate}%
+  \usebibmacro{incolladdendum+pubstate}%
   \newunit\newblock
-  \printfield{addendum}%
-  \usebibmacro{origtitle:inbook}%
-   \newunit\newblock			
-     \usebibmacro{annotation}%
- \newunit\newblock								
-   \usebibmacro{pageref}}
-
-%%--------------------------------------------------------------------------------------------------
-%%				INCOLLECTION with crossref	
-%%--------------------------------------------------------------------------------------------------
-
-%\ifthenelse{\value{listtotal}=2}{\setcounter{maxnamesincross}{2}}
-%{\setcounter{maxnamesincross}{2}}
-%
-
-\DeclareCiteCommand{\bbx@crossref}
-  {}%
-  {\ifsingletitle%
-    {\printtext[bibhyperref]{\ifthenelse{\value{listtotal}=2}
-    	{\printnames[][-\value{maxnamesincross}]{labelname}}
-    	{\printnames[][-\value{minnamesincross}]{labelname}}}}%
-    {\ifthenelse{\value{listtotal}=2}
-    	{\printnames[][-\value{maxnamesincross}]{labelname}}
-    	{\printnames[][-\value{minnamesincross}]{labelname}}
-    \setunit{\addspace}%
-    \printtext[bibhyperref]{\usebibmacro{date+extrayear}}}}%
-  {\unspace}%
-  {\unspace}
-  
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
 
-\DeclareBibliographyDriver{incollection}{%
+\DeclareBibliographyDriver{inbook}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \usebibmacro{author/editor}%
+  \usebibmacro{author/translator+others}%
   \setunit{\labelnamepunct}\newblock
   \usebibmacro{title}%
   \newunit
@@ -859,45 +702,23 @@ itbackref=false
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{in:}%
-\iffieldundef{crossref}%
-	{\iffieldundef{xref}%
-      		{\usebibmacro{incollection:full}}%
-      		{\bbx@crossref{\thefield{xref}}
-		\newunit\newblock
-		\printfield{userd}%
-		\newunit\newblock
-		 \usebibmacro{chapter+pages}%
-		  \newunit\newblock
-		    \printfield{addendum}%
-		    \usebibmacro{origtitle:incollection}
-		  \newunit\newblock
-		    \usebibmacro{annotation}%
-  			\newunit\newblock								
-		  \usebibmacro{pageref}}}%
-    		{\bbx@crossref{\thefield{crossref}}%
+    \iffieldundef{crossref}%
+  	{\usebibmacro{inbook:full}}%
+	{\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff
+	\bbx@crossref{\thefield{crossref}}%
 		\newunit\newblock
 		\printfield{userd}%
 		\newunit\newblock
 		\usebibmacro{chapter+pages}%
 		  \newunit\newblock
-		    \printfield{addendum}%
-		  \usebibmacro{origtitle:incollection}%
-		  \newunit\newblock
-		    \usebibmacro{annotation}%
-  		\newunit\newblock								
-		  \usebibmacro{pageref}}%
-		  \usebibmacro{finentry}}
-
-\newbibmacro*{incollection:full}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-%  \usebibmacro{editor+others}%
-%  \setunit{\labelnamepunct}\newblock
-%\setunit{\unspace\addspace}%
-%\printnames{editor}
-%  \usebibmacro{editorstrg}
-%  \setunit{\addcomma\space}
-%\setunit*{\addspace}
+	  \usebibmacro{inbookaddendum+pubstate}%
+		\newunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}}
+  
+  \newbibmacro*{inbook:full}{
+  \usebibmacro{bybookauthor}%
+  \newunit\newblock
   \usebibmacro{maintitle+booktitle}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
@@ -906,55 +727,6 @@ itbackref=false
   \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
-  \printfield{isbn}%
-  \newunit\newblock
-  \printfield{doi}%
-  \newunit\newblock
-  \usebibmacro{eprint}%
-  \newunit\newblock
-  \usebibmacro{url+urldate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \usebibmacro{origtitle:incollection}%
-  \newunit\newblock
-    \usebibmacro{annotation}%
- \newunit\newblock										
-  \usebibmacro{pageref}}
-
-\DeclareBibliographyDriver{inproceedings}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{author}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{in:}%
-  \usebibmacro{maintitle+booktitle}%
-  \newunit
-  \printfield{venue}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
      \printfield{part}}
     {}%
   \newunit
@@ -962,359 +734,20 @@ itbackref=false
   \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
-  \printfield{isbn}%
-  \newunit\newblock
-  \printfield{doi}%
-  \newunit\newblock
-  \usebibmacro{eprint}%
-  \newunit\newblock
-  \usebibmacro{url+urldate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \usebibmacro{origfields}%
-   \newunit\newblock
-     \usebibmacro{annotation}%
- \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%			
-  \usebibmacro{series+number}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit
-  \printfield{version}%
-  \newunit\newblock
-  \printfield{note}
-  \newunit\newblock
-  \printlist{organization}%
-  \newunit
-  \usebibmacro{publisher+location+date}%
-  \newunit\newblock
-  \usebibmacro{chapter+pages}%
-  \newunit
-  \printfield{pagetotal}%
-  \newunit\newblock
-  \printfield{isbn}%
-  \newunit\newblock
-  \printfield{doi}%
-  \newunit\newblock
-  \usebibmacro{eprint}%
-  \newunit\newblock
-  \usebibmacro{url+urldate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \usebibmacro{origfields}%
-   \newunit\newblock	
-   \usebibmacro{annotation}%
-   \newunit\newblock									
-   \usebibmacro{pageref}
- \usebibmacro{finentry}}	
-
-\DeclareBibliographyDriver{misc}{%
-  \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{howpublished}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit
-  \printfield{version}%
-  \newunit\newblock
-  \printfield{note}
-  \newunit\newblock
-  \printlist{organization}%
-  \newunit\newblock
-  \printlist{location}%
-  \newunit\newblock
-  \usebibmacro{date}%
-  \newunit\newblock
-  \printfield{doi}%
-  \newunit\newblock
-  \usebibmacro{eprint}%
-  \newunit\newblock
-  \usebibmacro{url+urldate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \usebibmacro{origfields}%
-   \newunit\newblock
-     \usebibmacro{annotation}%
- \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
-%  \usebibmacro{eprint}%
-%  \newunit\newblock
-%  \usebibmacro{url+urldate}%
-%  \newunit\newblock
-%  \printfield{addendum}%
-%  \newunit\newblock
-%  \usebibmacro{annotation}%
-%  \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{url+urldate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
-  \usebibmacro{annotation}%
-  \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
-  \printfield{issn}%
-  \newunit\newblock
-  \printfield{doi}%
-  \newunit\newblock
-  \usebibmacro{eprint}%
-  \newunit\newblock
-  \usebibmacro{url+urldate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
-  \usebibmacro{annotation}%
-  \newunit\newblock		
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-
-\DeclareBibliographyDriver{proceedings}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{begentry}%
-  \usebibmacro{editor}%
-  \setunit{\labelnamepunct}\newblock
-  \usebibmacro{maintitle+title}%
-  \newunit
-  \printlist{language}%
-  \newunit\newblock
-  \printfield{venue}%
-  \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
-  \printfield{isbn}%
-  \newunit\newblock
-  \printfield{doi}%
   \newunit\newblock
-  \usebibmacro{eprint}%
-  \newunit\newblock
-  \usebibmacro{url+urldate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \usebibmacro{origfields}%
-   \newunit\newblock
-     \usebibmacro{annotation}%
- \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+year}%
-  \newunit\newblock
-  \usebibmacro{chapter+pages}%
-  \newunit
-  \printfield{pagetotal}%
-  \newunit\newblock
-  \printfield{isrn}%
-  \newunit\newblock
-  \printfield{doi}%
-  \newunit\newblock
-  \usebibmacro{eprint}%
-  \newunit\newblock
-  \usebibmacro{url+urldate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
-  \usebibmacro{annotation}%
- \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+year}%
-  \newunit\newblock
-  \usebibmacro{chapter+pages}%
-  \newunit
-  \printfield{pagetotal}%
-  \newunit\newblock
-  \printfield{doi}%
-  \newunit\newblock
-  \usebibmacro{eprint}%
-  \newunit\newblock
-  \usebibmacro{url+urldate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
- \usebibmacro{annotation}%
- \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{date}%
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
   \newunit\newblock
-  \usebibmacro{url+urldate}%
+  \usebibmacro{doi+eprint+url}%
   \newunit\newblock
-  \printfield{addendum}%
+  \usebibmacro{addendum+pubstate}%
   \newunit\newblock
-  \usebibmacro{annotation}%
- \newunit\newblock			
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}