biblatex-abnt (29jul17)

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

1 files changed, 527 insertions, 230 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
index ebd4316ac26..110c6d09357 100644
--- a/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-abnt/abnt.bbx
@@ -13,7 +13,7 @@
 %% The Current Maintainer of this work is Daniel B. Marques.
 
 \ProvidesFile{abnt.bbx}%
-[2017/03/15\space v3.0.1\space ABNT BibLaTeX citation style]%
+[2017/07/28\space v3.1\space ABNT BibLaTeX citation style]%
 
 
 % Init >>>1
@@ -23,13 +23,23 @@
 \DeclareLanguageMapping{brazilian}{abnt-brazilian}%
 \DeclareLanguageMapping{portuguese}{abnt-brazilian}%
 \DeclareLanguageMapping{portuges}{abnt-brazilian}%
+\DeclareLanguageMapping{spanish}{abnt-spanish}%
+\DeclareLanguageMapping{english}{abnt-english}%
 
 \RequireBibliographyStyle{standard}%
 
-\ExecuteBibliographyOptions{block=none,urldate=long,pagetracker}%
+\ExecuteBibliographyOptions{%
+  block=none,
+  urldate=long,
+  pagetracker,
+  uniquename=false,
+}%
 
 \InitializeBibliographyStyle{\global\undef\bbx@lasthash}%
 
+\let\origbibsetup\bibsetup%
+\appto{\bibsetup}{\raggedright}%
+
 % <<<1
 
 
@@ -160,6 +170,33 @@
   }{}}%
 % <<<2
 
+% Show extrayear in bibliography >>>2
+\newtoggle{extrayear}%
+\DeclareBibliographyOption{extrayear}[true]{%
+  \settoggle{extrayear}{#1}}%
+\DeclareEntryOption[boolean]{extrayear}[true]{%
+  \settoggle{extrayear}{#1}}%
+% <<<2
+
+% Justify text >>>2
+\DeclareBibliographyOption{justify}[true]{%
+  \ExecuteBibliographyOptions{block=space}%
+  \renewcommand*{\bibsetup}{\origbibsetup}%
+}%
+% <<<2
+
+% Make it pretty >>>2
+\DeclareBibliographyOption{pretty}[true]{%
+  \ExecuteBibliographyOptions{%
+    ittitles,
+    sccite,
+    scbib,
+    indent,
+    justify,
+  }%
+}%
+% <<<2
+
 % <<<1
 
 
@@ -541,7 +578,7 @@
 
 \DeclareFieldFormat{illustrated}{\addspace #1\isdot}%
 
-\DeclareFieldFormat{url}{\bibstring{url}\addcolon\addspace<\url{#1}>}%
+\DeclareFieldFormat{url}{\bibstring{urlfrom}\addcolon\addspace<\url{#1}>}%
 \DeclareFieldFormat{urldate}{\bibstring{urlseen}\addcolon\addspace #1}%
 
 \DeclareFieldFormat*{note}{\addspace #1}%
@@ -843,7 +880,7 @@
 		\iftoggle{repeatfields}%
 			{\addspace\usebibmacro{author/editor+others}}%
 			{\addspace\bibnamedash}%
-		\newunit\newblock%
+		\newunit%
 		\usebibmacro{maintitle}%
 	}%
 }%% <<<3
@@ -926,12 +963,12 @@
 		\usebibmacro{bbx:dashcheck}{%
       \iffieldundef{authortype}{%
         \bibnamedash%
-        \newunit\newblock%
+        \newunit%
         \printfield{nameaddon}%
       }{%
         \nopunctdash%
         \usebibmacro{authorstrg}%
-        \newunit\newblock%
+        \newunit%
         \printfield{nameaddon}%
       }%
 		}{%
@@ -939,7 +976,7 @@
 			\printnames{author}%
       \addspace%
       \usebibmacro{authorstrg}%
-      \newunit\newblock%
+      \newunit%
       \printfield{nameaddon}%
 		}%
 	}{%
@@ -997,7 +1034,7 @@
 			\printlist[uppercase]{organization}}%
 		\savelistcs*{organization}{savedorg}%
 		\clearlist{organization}%
-		\newunit\newblock%
+		\newunit%
 		\printfield{nameaddon}}%
 }%% <<<3
 
@@ -1086,7 +1123,11 @@
 % Publisher, location, date, issue >>>2
 
 \renewbibmacro*{date}{%
-  \printdate%
+  \iftoggle{extrayear}{%
+    \printdateextra%
+  }{%
+    \printdate%
+  }
   \printunit{\addperiod\addspace}%
 }%
 
@@ -1307,22 +1348,26 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/organization}%
-  \setunit{\labelnamepunct}\newblock%
-  \usebibmacro{title}%
-  \newunit%
+  \setunit{\labelnamepunct}%
+  \usebibmacro{title}\newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byauthor}%
-  \newunit\newblock%
-  \usebibmacro{byeditor+others}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  \usebibmacro{byeditor+others}\newunit%
   \usebibmacro{bytranslator+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{version}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iffieldundef{relatedtype}{}{%
-	\bibstring{\strfield{relatedtype}}}%
+    \bibstring{\strfield{relatedtype}}}%
   \setunit*{\addcolon\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{journal+section}%
   \setunit*{\addcomma\addspace}%
   \printlist{publisher}%
@@ -1337,21 +1382,27 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{issue+date}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{issn}}%
     {}%
-  \newunit\newblock%
+    \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
-     \usebibmacro{related}}%
+    \usebibmacro{related}}%
     {}%
   \usebibmacro{finentry}%
 }%% <<<2
@@ -1360,48 +1411,64 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{in:maintitle}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{publisher+location+date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volume}%
   \printfield{part}%
   \setunit{\addcomma\addspace}%
   \printfield{chapter}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{pages}%
-  \newunit\newblock%
+  \newunit%
   \printfield{pagetotal}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{illustrated}%
   \setunit*{\addcomma\addspace}%
   \printfield{dimensions}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{howpublished}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1413,38 +1480,51 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{in:bookauthor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{maintitle/booktitle}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{publisher+location+date}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volume}%
   \printfield{part}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{chapter+pages}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1456,45 +1536,62 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{in:maintitle}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{publisher+location+date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volumes}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{pagetotal}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{illustrated}%
   \setunit*{\addcomma\addspace}%
   \printfield{dimensions}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{howpublished}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1506,41 +1603,56 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{maintitle+title}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byauthor}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{type}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{version}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{location+date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \newunit%
+  \printfield{pagetotal}%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \newunit%
-  \printfield{pagetotal}%
-  \newunit\newblock%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1552,48 +1664,64 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{in:maintitle}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{publisher+location+date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volume}%
   \printfield{part}%
   \setunit{\addcomma\addspace}%
   \printfield{chapter}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{pages}%
-  \newunit\newblock%
+  \newunit%
   \printfield{pagetotal}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{illustrated}%
   \setunit*{\addcomma\addspace}%
   \printfield{dimensions}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{howpublished}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printunit{\addperiod\addspace}%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1605,38 +1733,50 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{in:editor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{maintitle/booktitle}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{publisher+location+date}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volume}%
   \printfield{part}%
-  \newunit\newblock%
+  \newunit%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
   \usebibmacro{chapter+pages}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1648,45 +1788,62 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{in:maintitle}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{publisher+location+date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volumes}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{pagetotal}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{illustrated}%
   \setunit*{\addcomma\addspace}%
   \printfield{dimensions}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{howpublished}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printunit{\addperiod\addspace}%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1698,41 +1855,56 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{maintitle+title}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byauthor}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{type}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{version}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{location+date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \newunit%
   \printfield{pagetotal}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1744,35 +1916,46 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \newunit%
   \printfield{pagetotal}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{type}%
   \setunit*{\addspace\textendash\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{institution}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{location}%
   \setunit*{\addcomma\addspace}%
   \printeventdate%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1793,50 +1976,63 @@
       }{%
         \printnames[given-family]{author}%
       }%
-      \newunit\newblock%
+      \newunit%
       \printfield{nameaddon}%
-      \newunit\newblock%
+      \newunit%
     }%
   }{%
       \printnames{holder}%
-      \newunit\newblock%
+      \newunit%
       \printfield{nameaddon}%
-      \newunit\newblock%
+      \newunit%
       \ifnameundef{author}{%
         \printnames[given-family]{editor}%
       }{%
         \printnames[given-family]{author}%
       }%
   }%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byauthor}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{location}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{date}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{number}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{howpublished}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{type}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{version}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1848,35 +2044,45 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{editor+others/organization}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \printfield[uppercase]{title}%
   \setunit*{\addcolon\addspace}%
   \printfield[normalfont]{subtitle}%
   \newunit%
   \printfield{titleaddon}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{publisher+location+issue+date}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \setunit*{\addcomma\addspace}%
   \printfield{pagetotal}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{issn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1888,47 +2094,62 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{issue}%
   \setunit*{\addperiod\addspace}%
   \usebibmacro{periodical}%
   \setunit*{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{location}%
   \setunit*{\addcolon\addspace}%
   \usebibmacro{publisher}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volume}%
   \setunit*{\addcomma\addspace}%
   \printfield{number}%
   \setunit*{\addcomma\addspace}%
   \printfield{pages}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{date}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byauthor}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{howpublished}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{type}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{version}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \setunit*{\addcomma\addspace}%
   \printfield{pagetotal}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
   \printunit{\addperiod\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1947,37 +2168,50 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{venue}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{maintitle+title}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{publisher+location+date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iffieldundef{maintitle}%
     {\printfield{volume}%
      \printfield{part}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volumes}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printunit{\addperiod\addspace}%
   \printlist{organization}% % This has to be printed conditionally
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \newunit%
   \printfield{pagetotal}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -1989,25 +2223,33 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/translator+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byauthor}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{in:eventtitle/organization/editor}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{number}%
   \setunit*{\adddot\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printeventdate%
   \setunit*{\addcomma\addspace}%
   \printfield{venue}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{maintitle+booktitle}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \ifboolexpr{%
     test {\iffieldundef{booktitle}}%
     and%
@@ -2015,34 +2257,45 @@
   }%
 	{}%
 	{\usebibmacro{publisher+location+date}}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iffieldundef{maintitle}%
     {\printfield{volume}%
      \printfield{part}}%
     {}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volumes}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{organization}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \newunit%
   \printfield{pagetotal}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printunit{\addperiod\addspace}%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -2054,44 +2307,59 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{maintitle+title}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byauthor}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iffieldundef{maintitle}%
     {\printfield{volume}%
      \printfield{part}}%
     {}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volumes}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{location+date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \newunit%
   \printfield{pagetotal}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printunit{\addperiod\addspace}%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -2103,35 +2371,46 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{title}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \newunit%
   \printfield{pagetotal}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{type}%
   \setunit*{\addspace\textendash\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{institution}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{location}%
   \setunit*{\addcomma\addspace}%
   \printeventdate%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printunit{\addperiod\addspace}%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -2143,48 +2422,65 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \usebibmacro{author/editor+others}%
-  \setunit{\labelnamepunct}\newblock%
+  \setunit{\labelnamepunct}%
   \usebibmacro{maintitle+title}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printlist{language}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byauthor}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{byeditor+others}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{edition}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iffieldundef{maintitle}%
     {\printfield{volume}%
      \printfield{part}}%
     {}%
   \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{volumes}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{publisher+location+date}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{chapter+pages}%
   \newunit%
   \printfield{pagetotal}%
   \setunit*{\addcomma\addspace}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{dimensions}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{howpublished}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{series+number}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printfield{note}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \printunit{\addperiod\addspace}%
   \iftoggle{bbx:isbn}%
     {\printfield{isbn}}%
     {}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{doi+eprint+url}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{addendum+pubstate}%
-  \printunit{\bibpagerefpunct}\newblock%
+  \printunit{\bibpagerefpunct}%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{pageref}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \iftoggle{bbx:related}%
     {\usebibmacro{related:init}%
      \usebibmacro{related}}%
@@ -2195,7 +2491,8 @@
 \DeclareBibliographyDriver{set}{%% >>>2
   \booltrue{bbx@inset}%
   \entryset{}{}%
-  \newunit\newblock%
+  \newunit%
+  \newblock%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \usebibmacro{setpageref}%
   \finentry%
 }%% <<<2