biblatex-iso690

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

1 files changed, 360 insertions, 334 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx
index 92c8a78e9be..c4d0f165316 100644
--- a/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-iso690/iso.bbx
@@ -4,6 +4,7 @@
 \DeclareLanguageMapping{english}{english-iso}
 \DeclareLanguageMapping{slovak}{slovak-iso}
 \DeclareLanguageMapping{german}{german-iso}
+\DeclareLanguageMapping{polish}{polish-iso}
 \NewBibliographyString{at,bysupervisor,urlalso}
 
 %options
@@ -28,20 +29,43 @@
   \settoggle{bbx:thesisinfoinnotes}{#1}%
   \typeout{Printing thesis info at the end enabled: #1}}
 
+\newtoggle{bbx:url}
+\DeclareBibliographyOption{url}[true]{%
+  \settoggle{bbx:url}{#1}%
+  \typeout{Showing URL field enabled: #1}}
+
+\newtoggle{bbx:isbn}
+\DeclareBibliographyOption{isbn}[true]{%
+  \settoggle{bbx:isbn}{#1}%
+  \typeout{Showing ISBN field enabled: #1}}
+
+\newtoggle{bbx:doi}
+\DeclareBibliographyOption{doi}[true]{%
+  \settoggle{bbx:doi}{#1}%
+  \typeout{Showing DOI field enabled: #1}}
+
+\newtoggle{bbx:eprint}
+\DeclareBibliographyOption{eprint}[true]{%
+  \settoggle{bbx:eprint}{#1}%
+  \typeout{Showing eprint field enabled: #1}}
 
 \ExecuteBibliographyOptions{%
-  spacecolon=false
-  ,pagetotal=false
-  ,shortnumeration=false
-  ,thesisinfoinnotes=true
-   %sorting=nyt
-  ,maxnames=9
-  ,minnames=1
-	,citetracker=true
-  %,autolang=other
-  ,date=year
-  ,urldate=edtf
-  ,seconds=true
+  spacecolon=false,
+  pagetotal=false,
+  shortnumeration=false,
+  thesisinfoinnotes=true,
+  url=true,
+  isbn=true,
+  doi=true,
+  eprint=true,
+  % sorting=nyt,
+  maxnames=9,
+  minnames=1,
+  citetracker=true,
+  autolang=other,
+  date=year,
+  urldate=iso,
+  seconds=true,
 }
 
 \newbibmacro*{begentry}{}
@@ -108,38 +132,38 @@
 \DeclareFieldFormat[article,periodical]{pages}{%
   \iftoggle{bbx:shortnum}
     {#1}
-    {\mainsstring{pages}\addspace\printtext{#1}}
+    {\mainsstring{pages}\addspace\printtext{#1}}%
 }
 \DeclareFieldFormat*{pagetotal}{\mkbibbrackets{\mkmlpagetotal[bookpagination]{#1}}}
 \DeclareFieldFormat*{number}{\bibsstring{number}\addspace\printtext{#1}}
 \DeclareFieldFormat[article,periodical]{number}{%
   \iftoggle{bbx:shortnum}
     {\mkbibparens{#1}}
-    {\bibsstring{number}\addspace\printtext{#1}}
+    {\bibsstring{number}\addspace\printtext{#1}}%
 }
 \DeclareFieldFormat[patent]{number}{#1}
 \DeclareFieldFormat*{url}{%
   \iffieldundef{urlyear}
-  {\mainlstring{urlalso}\addcolon\space\url{#1}}
-  {\mainlstring{urlfrom}\addcolon\space\url{#1}}
+    {\mainlstring{urlalso}\addcolon\space\url{#1}}
+    {\mainlstring{urlfrom}\addcolon\space\url{#1}}%
 }
 \DeclareFieldFormat{doi}{%
-  \printtext{DOI}\addcolon\space%
+  \printtext{DOI}\addcolon\space
   \ifhyperref
-    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
-    {\nolinkurl{#1}}
+    {\href{https://doi.org/#1}{\nolinkurl{#1}}}
+    {\nolinkurl{#1}}%
 }
 \DeclareFieldFormat{howpublished}{\mkbibbrackets{#1}}
 \DeclareFieldFormat[online]{howpublished}{%
   \iffieldundef{howpublished}
     {\mkbibbrackets{online}}
-    {\mkbibbrackets{#1}}
+    {\mkbibbrackets{#1}}%
 }
 
 \DeclareFieldFormat{type}{%
   \ifbibstring{#1}
     {\mainlstring{#1}}
-    {#1}
+    {#1}%
 }
 
 \DeclareFieldFormat{supervisor}{%
@@ -147,12 +171,12 @@
 
 %We must handle more than one isbn and issn
 \DeclareFieldFormat{isbn}{%
-%\renewcommand*{\do}[1]{\printtext{ISBN}\addspace#1\adddot\addspace}%
-\printtext{ISBN}\addspace#1}%
+  %\renewcommand*{\do}[1]{\printtext{ISBN}\addspace#1\adddot\addspace}%
+  \printtext{ISBN}\addspace#1}%
 
 \DeclareFieldFormat{issn}{%
-\renewcommand*{\do}[1]{\printtext{ISSN}\addspace#1\adddot\addspace}%
-\docsvfield{issn}}%
+  \renewcommand*{\do}[1]{\printtext{ISSN}\addspace#1\adddot\addspace}%
+  \docsvfield{issn}}%
 
 \DeclareFieldFormat{isan}{\printtext{ISAN}\addspace#1}
 \DeclareFieldFormat{ismn}{\printtext{ISMN}\addspace#1}
@@ -208,28 +232,22 @@
 
 \newbibmacro*{names:subsidiary}{%
   \usebibmacro{byeditor}%
-  \newunit%
+  \newunit
   \usebibmacro{bytranslator}%
 }
 
-\renewbibmacro*{editor}{%
-  \ifboolexpr{
-    test \ifuseeditor
-    and
-    not test {\ifnameundef{editor}}
-  }
-    {\printnames{editor}%
-     \addspace%
-     \mkbibparens{\usebibmacro{editorstrg}}%
-     \clearname{editor}}%
-    {}}
+% https://github.com/michal-h21/biblatex-iso690/issues/68#issuecomment-435650072
+\DeclareFieldFormat{editortype}{\mkbibparens{#1}} 
+\DeclareDelimFormat{editortypedelim}{\addspace}
+
+
 
 \newbibmacro*{thesissupervisor}{%
   \ifnameundef{supervisor}
     {}
     {\printtext{\mainlstring{bysupervisor}}%
      \addspace%
-     \printnames{supervisor}}
+     \printnames{supervisor}}%
 }
 
 %titles
@@ -246,7 +264,7 @@
        \printfield{#1subtitle}}%
        \setunit{\addspace}}%
   \printfield{#1titleaddon}%
-  \newunit%
+  \newunit
 }%
 
 \newbibmacro{volume}{%
@@ -279,7 +297,7 @@
 
 \newbibmacro{periodical:titles}{%
   \usebibmacro{titles}{}{emph}%
-  \newunit%
+  \newunit
   \iffieldundef{issuetitle}
     {\iffieldundef{journaltitle}
        {}
@@ -346,18 +364,20 @@
 %standard identifiers
 
 \newbibmacro*{identifier}{%
-  \printfield{isan}%
-  \newunit%
-  \printfield{isbn}%
-  \newunit%
-  \printfield{ismn}%
-  \newunit%
-  \printfield{isrn}%
-  \newunit%
-  \printfield{issn}%
-  \newunit%
-  \printfield{iswc}%
-  \newunit%
+  \iftoggle{bbx:isbn}
+    {\printfield{isan}%
+     \newunit
+     \printfield{isbn}%
+     \newunit
+     \printfield{ismn}%
+     \newunit
+     \printfield{isrn}%
+     \newunit
+     \printfield{issn}%
+     \newunit
+     \printfield{iswc}%
+     \newunit}
+    {}%
 }
 
 %availability and access
@@ -373,9 +393,15 @@
 \newbibmacro*{availability+access}{%
   \iffieldundef{doi}
     {\iffieldundef{eprint}
-       {\printfield{url}}
-       {\usebibmacro{from-eprint}}}
-    {\usebibmacro{from-doi}}%
+       {\iftoggle{bbx:url}
+         {\printfield{url}}
+         {}}
+       {\iftoggle{bbx:eprint}
+         {\usebibmacro{from-eprint}}
+         {}}}
+    {\iftoggle{bbx:doi}
+      {\usebibmacro{from-doi}}
+      {}}%
 }
 
 %location
@@ -497,299 +523,299 @@
 %bibliography drivers
 
 \DeclareBibliographyDriver{book}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{multi:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{series+number}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\setunit{\addspace}%
-\iftoggle{bbx:totalpages}
-  {\printfield{pagetotal}}
-  {}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{names:primary}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{multi:titles}%
+  \setunit{\addspace}%
+  \usebibmacro{medium-type}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \usebibmacro{names:subsidiary}%
+  \newunit\newblock
+  \usebibmacro{location+publisher+date}%
+  \newunit
+  \printfield{version}%
+  \setunit{\addspace}%
+  \usebibmacro{urldate}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \usebibmacro{identifier}%
+  \newunit\newblock
+  \usebibmacro{availability+access}%
+  \newunit\newblock
+  \usebibmacro{location}%
+  \setunit{\addspace}%
+  \iftoggle{bbx:totalpages}
+    {\printfield{pagetotal}}
+    {}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{periodical}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-% names macro just because of author-year style
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%%
-\usebibmacro{periodical:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\setunit*{\addcomma\addspace}%
-\usebibmacro{serial:numeration}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  % names macro just because of author-year style
+  \usebibmacro{names:primary}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{periodical:titles}%
+  \setunit{\addspace}%
+  \usebibmacro{medium-type}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \usebibmacro{location+publisher+date}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{serial:numeration}%
+  \setunit{\addspace}%
+  \usebibmacro{urldate}%
+  \newunit\newblock
+  \usebibmacro{identifier}%
+  \newunit\newblock
+  \usebibmacro{availability+access}%
+  \newunit\newblock
+  \usebibmacro{location}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}%
 
 \DeclareBibliographyDriver{article}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{titles}{}{}%
-\newunit\newblock%
-\usebibmacro{titles}{journal}{emph}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{date}
-\setunit*{\addcomma\addspace}%
-\usebibmacro{serial:numeration}%
-\setunit{\bibpagespunct}%
-\printfield{pages}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\newunit\newblock%
-\printfield{note}%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%%
-\usebibmacro{finentry}}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{names:primary}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{titles}{}{}%
+  \newunit\newblock
+  \usebibmacro{titles}{journal}{emph}%
+  \setunit{\addspace}%
+  \usebibmacro{medium-type}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \usebibmacro{date}
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{serial:numeration}%
+  \setunit{\bibpagespunct}%
+  \printfield{pages}%
+  \setunit{\addspace}%
+  \usebibmacro{urldate}%
+  \newunit\newblock
+  \usebibmacro{identifier}%
+  \newunit\newblock
+  \usebibmacro{availability+access}%
+  \newunit\newblock
+  \usebibmacro{location}%
+  \newunit\newblock
+  \printfield{note}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}%
 
 \DeclareBibliographyDriver{inbook}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{titles}{}{}%
-\newunit\newblock%
-\usebibmacro{in:}%
-\printnames{bookauthor}%
-\newunit\newblock%
-\usebibmacro{host:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\setunit*{\addcomma\addspace}%
-\usebibmacro{book:numeration}%
-\setunit{\bibpagespunct}%
-\printfield{pages}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{series+number}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{names:primary}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{titles}{}{}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \printnames{bookauthor}%
+  \newunit\newblock
+  \usebibmacro{host:titles}%
+  \setunit{\addspace}%
+  \usebibmacro{medium-type}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \usebibmacro{names:subsidiary}%
+  \newunit\newblock
+  \usebibmacro{location+publisher+date}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{book:numeration}%
+  \setunit{\bibpagespunct}%
+  \printfield{pages}%
+  \newunit
+  \printfield{version}%
+  \setunit{\addspace}%
+  \usebibmacro{urldate}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \usebibmacro{identifier}%
+  \newunit\newblock
+  \usebibmacro{availability+access}%
+  \newunit\newblock
+  \usebibmacro{location}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}%
 
 \DeclareBibliographyDriver{incollection}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{titles}{}{}%
-\newunit\newblock%
-\usebibmacro{in:}%
-\usebibmacro{editor}%
-\newunit\newblock%
-\usebibmacro{host:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-% could number be even used in `incollection`? 
-% It should be at some other place in this case
-\setunit*{\addcomma\addspace}%
-\usebibmacro{book:numeration}%
-\setunit{\bibpagespunct}%
-\printfield{pages}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{series+number}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\usebibmacro{location}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{names:primary}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{titles}{}{}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \usebibmacro{editor}%
+  \newunit\newblock
+  \usebibmacro{host:titles}%
+  \setunit{\addspace}%
+  \usebibmacro{medium-type}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \usebibmacro{names:subsidiary}%
+  \newunit\newblock
+  \usebibmacro{location+publisher+date}%
+  % could number be even used in `incollection`? 
+  % It should be at some other place in this case
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{book:numeration}%
+  \setunit{\bibpagespunct}%
+  \printfield{pages}%
+  \newunit
+  \printfield{version}%
+  \setunit{\addspace}%
+  \usebibmacro{urldate}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \usebibmacro{identifier}%
+  \newunit\newblock
+  \usebibmacro{availability+access}%
+  \newunit\newblock
+  \usebibmacro{location}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}%
 
 \DeclareBibliographyDriver{online}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%
-\usebibmacro{multi:titles}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\printfield{edition}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{series+number}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\setunit{\addspace}%
-\iftoggle{bbx:totalpages}
-  {\printfield{pagetotal}}
-  {}%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%%
-\usebibmacro{finentry}}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{names:primary}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{multi:titles}%
+  \setunit{\addspace}%
+  \usebibmacro{medium-type}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \usebibmacro{names:subsidiary}%
+  \newunit\newblock
+  \usebibmacro{location+publisher+date}%
+  \newunit
+  \printfield{version}%
+  \setunit{\addspace}%
+  \usebibmacro{urldate}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \usebibmacro{identifier}%
+  \newunit\newblock
+  \usebibmacro{availability+access}%
+  \setunit{\addspace}%
+  \iftoggle{bbx:totalpages}
+    {\printfield{pagetotal}}
+    {}%
+  \printfield{note}%
+  \newunit\newblock
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}%
 
 \DeclareBibliographyDriver{thesis}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%%
-\usebibmacro{titles}{}{emph}%
-\setunit{\addspace}%
-\usebibmacro{medium-type}%
-\newunit\newblock%
-\usebibmacro{location+publisher+date}%
-\newunit%
-\printfield{version}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\usebibmacro{identifier}%
-\newunit\newblock%
-\iftoggle{bbx:thesisinfoinnotes}
-  {}
-  {\printfield{type}
-   \newunit\newblock%
-   \printlist{institution}%
-   \newunit\newblock%
-   \usebibmacro{thesissupervisor}}%
-\newunit\newblock%
-\usebibmacro{availability+access}
-\setunit{\addspace}%
-\iftoggle{bbx:totalpages}
-  {\printfield{pagetotal}}
-  {}%
-\newunit\newblock%
-\iftoggle{bbx:thesisinfoinnotes}
-  {\printfield{type}
-   \newunit\newblock%
-   \printlist{institution}%
-   \newunit\newblock%
-   \usebibmacro{thesissupervisor}}
-  {}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{names:primary}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{titles}{}{emph}%
+  \setunit{\addspace}%
+  \usebibmacro{medium-type}%
+  \newunit\newblock
+  \usebibmacro{location+publisher+date}%
+  \newunit
+  \printfield{version}%
+  \setunit{\addspace}%
+  \usebibmacro{urldate}%
+  \newunit\newblock
+  \usebibmacro{identifier}%
+  \newunit\newblock
+  \iftoggle{bbx:thesisinfoinnotes}
+    {}
+    {\printfield{type}
+     \newunit\newblock
+     \printlist{institution}%
+     \newunit\newblock
+     \usebibmacro{thesissupervisor}}%
+  \newunit\newblock
+  \usebibmacro{availability+access}%
+  \setunit{\addspace}%
+  \iftoggle{bbx:totalpages}
+    {\printfield{pagetotal}}
+    {}%
+  \newunit\newblock
+  \iftoggle{bbx:thesisinfoinnotes}
+    {\printfield{type}
+     \newunit\newblock
+     \printlist{institution}%
+     \newunit\newblock
+     \usebibmacro{thesissupervisor}}
+    {}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}%
 
 \DeclareBibliographyDriver{patent}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{names:primary}%
-\setunit{\labelnamepunct}\newblock%%
-\usebibmacro{titles}{}{emph}%
-\newunit\newblock%
-\usebibmacro{names:subsidiary}%
-\newunit\newblock%
-\printfield{classification}%
-\newunit\newblock%
-\printlist{location}%
-\newunit\newblock%
-\iffieldundef{type}
-  {}
-  {\printfield{type}%
-   \setunit*{\addcomma\space}}%
-\printfield{number}%
-\newunit\newblock%
-\usebibmacro{fulldate}%
-\setunit{\addspace}%
-\usebibmacro{urldate}%
-\newunit\newblock%
-\printfield{note}%
-\newunit\newblock%
-\usebibmacro{availability+access}%
-\newunit\newblock%
-\setunit{\bibpagerefpunct}\newblock%
-\usebibmacro{pageref}%
-\usebibmacro{finentry}}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{names:primary}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{titles}{}{emph}%
+  \newunit\newblock
+  \usebibmacro{names:subsidiary}%
+  \newunit\newblock
+  \printfield{classification}%
+  \newunit\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \iffieldundef{type}
+    {}
+    {\printfield{type}%
+     \setunit*{\addcomma\space}}%
+  \printfield{number}%
+  \newunit\newblock
+  \usebibmacro{fulldate}%
+  \setunit{\addspace}%
+  \usebibmacro{urldate}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{availability+access}%
+  \newunit\newblock
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}%
 
 %bibliography aliases