archaeologie (15jul16)

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

13 files changed, 1232 insertions, 1201 deletions

diff --git a/Master/texmf-dist/doc/latex/archaeologie/README.md b/Master/texmf-dist/doc/latex/archaeologie/README.md
index 2a00aa3a4b3..69971217052 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/README.md
+++ b/Master/texmf-dist/doc/latex/archaeologie/README.md
@@ -5,7 +5,7 @@ bibLaTeX-__archaeologie__
 
 bibLaTeX-style for archaeologists, historians and philologists.
 ---
-_2016/07/04 v2.02_
+_2016/07/15 v2.03_
 
 Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
 
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
index 7b448542afe..681c56e51ff 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.pdf
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
index 1138ec6e598..4025c68c7de 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie-ger.tex
@@ -35,7 +35,7 @@
  Dank an   ›moewew‹ und Herbert Voß für ihre Hilfe.
 }\\ --- {\scshape kurzanleitung} --\footnote{Für eine vollständige Anleitung siehe die englische Stilbeschreibung unter \url{http://mirrors.ctan.org/macros/latex/contrib/biblatex-contrib/archaeologie/archaeologie.pdf}} }
 \author{Lukas C. Bossert\thanks{\url{lukas@digitales-altertum.de}} \and Johannes Friedl}
-\date{Version: 2.02 (2016-07-04)} 
+\date{Version: 2.03 (2016-07-15)} 
  
  \maketitle
  \begin{abstract}
@@ -114,7 +114,7 @@ nur Nachname (bspw. Ball), \\
 \DescribeMacro{=firstfull}%\meta{firstfull} 
 voller Vor- und Zuname bei Erstnennung (bspw. Larry F. Ball), 
 weitere Erwähnungen werden mit Vornameinitial und Nachname ausgegeben (bspw. L. F. Ball).
-%%(dies entspricht der Autoren-Darstellungweise in Fußnoten).
+
 \DescribeMacro{scshape}  Die Namen im Fließtext und in den Fußnoten werden in Kapitälchen gesetzt, ausgenommen sind Werke unbekannter Herkunft und Werke antiker Autoren.
 
 \subsubsection{Zitierweise}
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
index 1a78197fece..3e9213fa5df 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.pdf
diff --git a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
index 87edfe7dc11..59617fc2bb6 100644
--- a/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
+++ b/Master/texmf-dist/doc/latex/archaeologie/archaeologie.tex
@@ -46,7 +46,7 @@ Comments and criticisms are welcome.
 We thank  ›moewew‹ and Herbert Voß for their big help on the code.%
 }}
 \author{Lukas C. Bossert\thanks{\href{mailto:lukas@digitales-altertum.de}{lukas@digitales-altertum.de}} \and Johannes Friedl}
-\date{Version: 2.02 (2016-07-04)}
+\date{Version: 2.03 (2016-07-15)} 
  \maketitle
  \begin{abstract}
 \noindent This citation-style covers the citation and bibliography rules of the German Archaeological Institute. 
@@ -1171,7 +1171,7 @@ Fest. 3 L
 
 In the bibliography the reference differentiates slightly from |options = {ancient}| because of the missing ancient author of fragment collections, 
 so the editors name is printed in the first place:
-\printbib[2em]{Fest}
+\printbib[3em]{Fest}
 
 \subsubsection{corpus}\label{corpus}
 \DescribeMacro{corpus}
@@ -2076,7 +2076,7 @@ urn = *@\marg{urn:xxx}@*
 \end{lstlisting}	
 
 \DescribeMacro{zenon}
-This is eprint-form is especially designed for the OPAC of the German Archaeological Institute.
+This eprint-form is especially designed for the OPAC (Online Public Access Catalogue) of the German Archaeological Institute.
 All bibliographical entries in this OPAC can be referred to via this link.
 You only need to insert the individual Zenon-number of the entry, e.\,g. \emph{http://zenon.dainst.org/Record/001371402} where \emph{001371402} is the individual number---cf. \cref{Zanker2009}.
 \begin{lstlisting}
@@ -2094,6 +2094,11 @@ zenon = *@\marg{Zenon-number}@*
 doi = *@\marg{doi-number}@*
 \end{lstlisting}	
 
+If you don’t want to have the online references printed you can disable the fields with |jstor=false|, 
+|urn=false|,
+|zenon=false|,
+|doi=false| etc. as preamble option.
+
 \subsection{Brackets (with @Inreference)}\label{faq:inreference}
 Ensure you stick to the correct order of parentheses and brackets.
 The rule says that within a pair of parentheses you have to use square brackets.
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
index 43ae4ff8e82..a7e7cf960ab 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
@@ -11,9 +11,9 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie-english.lbx}%
-               [2016/06/06 v2.0  archaeologie --%
-            				  biblatex for archaeologists, 
-							historians and philologists, lbx-Datei]
+  [2016/07/15 v2.03  archaeologie -- 
+  biblatex for archaeologists, 
+  historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{english}
 
 \NewBibliographyString{origtitle}
@@ -25,7 +25,7 @@
 
 \DeclareBibliographyStrings{%
   inherit          = {english},
- subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
+  subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
   reference = {{Article}{Art\adddot}},
   origtitle = {{original title}{orig\adddot title}},
   firstprint = {{first\addspace edition}{first\addspace edition}},
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
index 407617d2699..dc13d5e70d7 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
@@ -13,9 +13,9 @@
 
 
 \ProvidesFile{archaeologie-french.lbx}%
-               [2016/06/06 v2.0  archaeologie --%
-					            biblatex for archaeologists, 
-								historians and philologists, lbx-Datei]
+  [2016/07/15 v2.03  archaeologie -- 
+  biblatex for archaeologists, 
+  historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{french}
 \DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily}
 
@@ -30,7 +30,7 @@
 
 \DeclareBibliographyStrings{%
   inherit          = {french},
- subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
+  subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
   translationof    = {{traduction\addspace de}{trad\adddot\addspace de}},
   reference        = {{article}{art\adddot}},
   reviewof         = {{recension\addspace de}{rec\adddot\addspace de}},
@@ -54,4 +54,4 @@
   fromrussian      = {{depuis\addspace le\addspace russe}{depuis\addspace le\addspace russe}},
   fromspanish      = {{depuis\addspace l'espagnole}{depuis\addspace l'espagnol}},
   fromswedish      = {{depuis\addspace le\addspace suédois}{depuis\addspace le\addspace suédois}},
-}
+}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
index 7427a0d12b5..ed1e4ac8701 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
@@ -13,9 +13,9 @@
 
 
 \ProvidesFile{archaeologie-italian.lbx}%
-               [2016/06/06 v2.0  archaeologie --                      
-                      biblatex for archaeologists, 
-						historians and philologists, lbx-Datei]
+  [2016/07/15 v2.03  archaeologie -- 
+  biblatex for archaeologists, 
+  historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{italian}
 
 \NewBibliographyString{origtitle}
@@ -34,21 +34,17 @@
 
 \DeclareBibliographyStrings{%
   inherit          = {italian},
- subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
+  subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
   translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}},
   reference = {{articolo}{art\adddot}},
   reviewof = {{recensione\addspace di}{recens\adddot\addabthinspace di}},
   origtitle = {{titolo\addspace originale}{titolo\addspace orig\adddot}},
   firstprint = {{prima\addspace edizione}{prima\addspace edizione}},
   talk = {{presentazione}{presentazione}},
- % editor = {{Editore}{Ed\adddot}}, %predefined
   inpreparation = {{in\addspace preparazione}{in prep\adddot}},
   submitted = {{}{}},
   inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}},
   prepublished = {{}{}},
   forthcoming = {{prossimo}{prossimo}},
 }
-
-
-
-\endinput
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
index 220ed08ce6a..5099e7b4040 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
@@ -13,9 +13,9 @@
 
 
 \ProvidesFile{archaeologie-ngerman.lbx}%
-               [2016/06/06 v2.0  archaeologie --
-                           biblatex for archaeologists, 
-							historians and philologists, lbx-Datei]
+  [2016/07/15 v2.03  archaeologie -- 
+  biblatex for archaeologists, 
+  historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{ngerman}
 
 \NewBibliographyString{origtitle}
@@ -32,7 +32,7 @@
 
 \DeclareBibliographyStrings{%
   inherit          = {ngerman},
- subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
+  subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
   reference = {{Artikel}{Art\adddot}},
   reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}},
   origtitle = {{Originaltitel}{Orig\adddot titel}},
@@ -42,4 +42,4 @@
   loccit = {{am\addabthinspace Ort}{a\adddot\addabthinspace O\adddot}},
   translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}},
  }
-\endinput
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
index 551072fe6a6..f4177c906e7 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
@@ -12,9 +12,9 @@
 % version 2005/12/01 or later.
 
 \ProvidesFile{archaeologie-spanish.lbx}%
-               [2016/06/06 v2.0  archaeologie --%
-          				 biblatex for archaeologists, 
-						historians and philologists, lbx-Datei]
+  [2016/07/15 v2.03  archaeologie -- 
+  biblatex for archaeologists, 
+  historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{spanish}
 
 \NewBibliographyString{origtitle}
@@ -27,8 +27,8 @@
   inherit          = {spanish},
   subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
   reference = {{Artículo}{Art\adddot}},
- origtitle = {{Título original}{Título original}},
- firstprint = {{Primera edición}{Primera edición}},
- talk = {{Conferencia}{Conferencia}},
+  origtitle = {{Título original}{Título original}},
+  firstprint = {{Primera edición}{Primera edición}},
+  talk = {{Conferencia}{Conferencia}},
 }
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index fa4cca8df00..e66a79fa11e 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -1,57 +1,54 @@
 % archaeologie --%
-%            biblatex for archaeologists, 
-%				historians and philologists
+% biblatex for archaeologists, 
+% historians and philologists
 % Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
-%  
+% 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
 % of this license or (at your option) any later version.
 % The latest version of this license is in
-%   http://www.latex-project.org/lppl.txt
+% http://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie.bbx}%
-               [2016/07/04 v2.02  archaeologie -- 
-                biblatex for archaeologists, 
-                historians and philologists, bbx-file]
+   [2016/07/15 v2.03  archaeologie -- 
+  biblatex for archaeologists, 
+  historians and philologists, bbx-file]
 \RequireBibliographyStyle{standard}
 \AtBeginDocument{%
-		\urlstyle{sf}%
-		\typeout{* * * archaeologie * * *  
-				biblatex for archaeologists, 
-				historians and philologists}
+ \urlstyle{sf}%
+ \typeout{* * * archaeologie * * * 
+ biblatex for archaeologists, 
+ historians and philologists}
 }
 \ExecuteBibliographyOptions{%
-	pagetracker=true,%
-	citecounter=true,%
-	%%giveninits=true,%
-	sortlocale=auto,%
-	language=auto,%
-	autolang=other,%
-	bibencoding=utf8,%
-	dateabbrev=false, %
-	sorting=nyt,%
-	maxnames=2,% 
-	minnames=1,%
-	maxitems=1,%
-	maxbibnames=999,%
+ pagetracker=true,%
+ citecounter=true,%
+ sortlocale=auto,%
+ language=auto,%
+ autolang=other,%
+ bibencoding=utf8,%
+ dateabbrev=false, %
+ sorting=nyt,%
+ maxnames=2,% 
+ minnames=1,%
+ maxitems=1,%
+ maxbibnames=999,%
 }
 %-----------------------
 \newbool{bbx:edby}
 \newbool{bbx:width}
-\newbool{bbx:yearseries}  
+\newbool{bbx:yearseries} 
 \newbool{bbx:bibfullname}
 \newbool{bbx:inreferences}
 \newbool{bbx:noabbrv}
 \newbool{bbx:translation}
-\newbool{bbx:publisher}		
+\newbool{bbx:publisher} 
 \newbool{bbx:initials}
 \newbool{bbx:counter}
 \newbool{cbx:ancient}
 \newbool{cbx:frgancient}
 \newbool{cbx:corpus}
-\newbool{cbx:lastnames}	
-\newbool{cbx:fullnames}
 \newbool{bib:lstabbrv}
 \newbool{bib:bibcorpora}
 \newbool{bib:bibancient}
@@ -59,61 +56,72 @@
 \newbool{bib:lstpublishers}
 \newsavebox\arch@labelbox
 \newlength{\labwidthsameline}
-	\setlength{\labwidthsameline}{4em}
+ \setlength{\labwidthsameline}{4em}
+
+\newtoggle{bbx:jstor}
+\newtoggle{bbx:zenon}
+\newtoggle{bbx:urn}
+
 %-----------------------
 \DeclareBibliographyOption{lstabbrv}[true]{%
-		\csuse{bool#1}{bib:lstabbrv}%
-		\addbibresource{archaeologie-lstabbrv.bib}
+ \csuse{bool#1}{bib:lstabbrv}%
+ \addbibresource{archaeologie-lstabbrv.bib}
 }
 \DeclareBibliographyOption{bibcorpora}[true]{%
-		\addbibresource{archaeologie-bibcorpora.bib}%
-		\ifbool{bib:lstabbrv}%
-				{}%
-				{\addbibresource{archaeologie-lstabbrv.bib}}
+ \addbibresource{archaeologie-bibcorpora.bib}%
+ \ifbool{bib:lstabbrv}%
+ {}%
+ {\addbibresource{archaeologie-lstabbrv.bib}}
 }
 \DeclareBibliographyOption{bibancient}[true]{%
-		\addbibresource{archaeologie-bibancient.bib}%
+ \addbibresource{archaeologie-bibancient.bib}%
 }
 \DeclareBibliographyOption{lstlocations}[true]{%
-		\addbibresource{archaeologie-lstlocations.bib}%
+ \addbibresource{archaeologie-lstlocations.bib}%
 }
 \DeclareBibliographyOption{lstpublishers}[true]{%
-		\addbibresource{archaeologie-lstpublishers.bib}%
+ \addbibresource{archaeologie-lstpublishers.bib}%
+}
+
+\DeclareBibliographyOption[boolean]{jstor}[true]{%
+ \settoggle{bbx:jstor}{#1}}
+\DeclareBibliographyOption[boolean]{zenon}[true]{%
+ \settoggle{bbx:zenon}{#1}}
+\DeclareBibliographyOption[boolean]{urn}[true]{%
+ \settoggle{bbx:urn}{#1}} 
+\ExecuteBibliographyOptions{%
+ jstor,%
+ zenon,%
+ urn,%
 }
 %-----------------------
 \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}}
 \DeclareBibliographyOption{initials}[true]{\csuse{bool#1}{bbx:initials}}
 \DeclareBibliographyOption{width}[]{%
-			\csuse{booltrue}{bbx:width}	
-			\setlength{\labwidthsameline}{#1}}
+  \csuse{booltrue}{bbx:width} 
+  \setlength{\labwidthsameline}{#1}}
 \DeclareBibliographyOption{yearseries}[true]{\csuse{bool#1}{bbx:yearseries}}
 \DeclareBibliographyOption{counter}[true]{\csuse{bool#1}{bbx:counter}}
-\DeclareBibliographyOption{bibfullname}[true]{%
-			\ExecuteBibliographyOptions{giveninits=false}}
+\DeclareBibliographyOption{bibfullname}[true]{\csuse{bool#1}{bbx:bibfullname}
+\DeclareNameAlias{author}{given-family}}
 \DeclareBibliographyOption{inreferences}[true]{\csuse{bool#1}{bbx:inreferences}
-			\ExecuteBibliographyOptions[inreference]{skipbib=true}}
+  \ExecuteBibliographyOptions[inreference]{skipbib=true}}
 \DeclareBibliographyOption{noabbrv}[true]{\csuse{bool#1}{bbx:noabbrv}}
 \DeclareBibliographyOption{translation}[true]{\csuse{bool#1}{bbx:translation}}
 \DeclareBibliographyOption{publisher}[true]{\csuse{bool#1}{bbx:publisher}
-		\ExecuteBibliographyOptions{maxitems=2}}
-\DeclareBibliographyOption{lastnames}[true]{%
-		\csuse{booltrue}{cbx:lastnames}%
-		\csuse{boolfalse}{cbx:fullnames}	}		
-\DeclareBibliographyOption{fullnames}[true]{%
-		\csuse{boolfalse}{cbx:lastnames}%
-		\csuse{booltrue}{cbx:fullnames}}
+  \ExecuteBibliographyOptions{maxitems=2}}
 \DeclareBibliographyOption{scshape}[true]{%
-  	\ifstrequal{#1}{true}%
-    		{\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}%
-    		{}%
+ \ifstrequal{#1}{true}%
+ {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}%
+ {}%
 }
 %-----------------------
 \DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}}
 \DeclareEntryOption{frgancient}[true]{%
-  	\ifstrequal{#1}{true}%
-  			{\togglefalse{blx@useauthor}}%
-  			{}%
-  	\csuse{bool#1}{cbx:frgancient}%
+ \ifstrequal{#1}{true}%
+ {\togglefalse{blx@useauthor}}%
+ {}%
+ \csuse{bool#1}{cbx:frgancient}%
 }
 \DeclareEntryOption{corpus}[true]{\csuse{bool#1}{cbx:corpus}}
 %-----------------------
@@ -140,25 +148,25 @@
 \DeclareFieldFormat{shorthandwidth}{#1}
 \DeclareFieldFormat{origtitle}{\mkbibemph{#1}}
 \DeclareFieldFormat{eprint:urn}{%
-  	\textsc{urn}%
-  		\addcolon\space%
-  	\ifhyperref%
-    		{\href{http://www.nbn-resolving.org/#1}{\nolinkurl{#1}}}%
-    		{\nolinkurl{#1}}%
+  \textsc{urn}%
+  \addcolon\space%
+  \ifhyperref%
+  {\href{http://www.nbn-resolving.org/#1}{\nolinkurl{#1}}}%
+  {\nolinkurl{#1}}%
 }
 \DeclareFieldFormat{eprint:zenon}{%
-  	\textsc{zenon (opac)}%
-  	\addcolon\space%
-  	\ifhyperref%
-    		{\href{http://zenon.dainst.org/Record/#1}{\nolinkurl{#1}}}%
-    		{\nolinkurl{#1}}%
+ \textsc{zenon (opac)}%
+ \addcolon\space%
+ \ifhyperref%
+ {\href{http://zenon.dainst.org/Record/#1}{\nolinkurl{#1}}}%
+ {\nolinkurl{#1}}%
 }
 \DeclareFieldFormat{eprint:jstor}{%
-	\textsc{jstor}%
-	\addcolon\space%
-	\ifhyperref%
-			{\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}%
-			{\nolinkurl{#1}}%
+ \textsc{jstor}%
+ \addcolon\space%
+ \ifhyperref%
+ {\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}%
+ {\nolinkurl{#1}}%
 }
 %-----------------------
 \DeclareFieldAlias{zenon}{eprint:zenon}
@@ -168,7 +176,7 @@
 %-----------------------
 \DeclareRedundantLanguages{ngerman}{german,ngerman,austrian,naustrian}
 \DeclareRedundantLanguages{english,american}{english,american,british,%
-                       						canadian,australian,newzealand,USenglish,UKenglish}
+ canadian,australian,newzealand,USenglish,UKenglish}
 \DeclareLanguageMapping{ngerman}{archaeologie-ngerman}
 \DeclareLanguageMapping{english}{archaeologie-english}
 \DeclareLanguageMapping{french}{archaeologie-french}
@@ -180,24 +188,23 @@
 \renewcommand*{\newunitpunct}{\addcomma\addspace}
 \newcommand*{\orttrennzeichen}{\addnbspace\textendash\addspace}
 \renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739
-		\ifbool{bbx:counter}%
-				{\addspace$\vert$ \addspace\scshape%
-					\iflanguage{ngerman}%
-							{wurde \ifnumequal{\value{citecounter}}{0}{{\color{red}{keinmal}}}%
-								{\arabic{citecounter}-mal} zitiert.%
-							}
-							{cited \ifnumequal{\value{citecounter}}{0}{{\color{red}{not once}}}%
-								{\arabic{citecounter}~time\ifnumequal{\value{citecounter}}{1}{}{s}}.%
-							}%
-				}%
-				{}%
+ \ifbool{bbx:counter}%
+ {\addspace$\vert$ \addspace\scshape%
+ \iflanguage{ngerman}%
+ {wurde \ifnumequal{\value{citecounter}}{0}{{\color{red}{keinmal}}}%
+ {\arabic{citecounter}-mal} zitiert.%
+ }
+ {cited \ifnumequal{\value{citecounter}}{0}{{\color{red}{not once}}}%
+ {\arabic{citecounter}~time\ifnumequal{\value{citecounter}}{1}{}{s}}.%
+ }%
+ }%
+ {}%
 }
 \renewcommand{\multinamedelim}{\addnbspace\textendash\addspace}
 \renewcommand{\finalnamedelim}{\multinamedelim}
 \renewcommand*\relateddelim{\addnbspace\textendash\addspace}
 \newcommand*{\volnumdelim}{\addslash}
 \newcommand*{\jourvoldelim}{\addnbspace}
-%%\newcommand*{\subvoce}{\addspace s\adddot\addnbthinspace v\adddot}
 %-----------------------
 \DeclareBibliographyAlias{collection}{book}
 \DeclareBibliographyAlias{reference}{book}
@@ -207,986 +214,991 @@
 \DeclareBibliographyAlias{manual}{book}
 %-----------------------
 \DeclareSortingScheme{nyt}{%
-    \sort{\field{presort}}%
-    \sort[final]{\field{sortkey}}%
-    \sort{%
-        	\field{shorthand}%
-        	\name{sortname}%
-        	\name{author}%
-        	\name{editor}%
-        	\name{translator}%
-        	\field{sorttitle}%
-       		\field{title}%
-        	}%
-    \sort{%
-    		\field{sortyear}%
-    		\field{year}%
-    		}%
-    \sort{%
-    		\field{sorttitle}%
-    		\field{title}%
-    		}%
-    \sort{%
-        	\field[padside=left,padwidth=4,padchar=0]{volume}%
-        	\literal{0000}%
-        	}%
-}
-%-----------------------      
+ \sort{\field{presort}}%
+ \sort[final]{\field{sortkey}}%
+ \sort{%
+ \field{shorthand}%
+ \name{sortname}%
+ \name{author}%
+ \name{editor}%
+ \name{translator}%
+ \field{sorttitle}%
+ \field{title}%
+ }%
+ \sort{%
+ \field{sortyear}%
+ \field{year}%
+ }%
+ \sort{%
+ \field{sorttitle}%
+ \field{title}%
+ }%
+ \sort{%
+ \field[padside=left,padwidth=4,padchar=0]{volume}%
+ \literal{0000}%
+ }%
+}
+%----------------------- 
 \DeclareSortingScheme{shortseries}{\sort{\field{shortseries}}}
 \DeclareSortingScheme{shortjournal}{\sort{\field{shortjournal}}}
 %-----------------------
-\defbibcheck{shortseries}{%	
-    \iffieldundef{shortseries}%
-    		{\skipentry}%
-    		{}%
-    \iffieldundef{series}%
-    		{\skipentry}%
-    		{\ifcsdef{\strfield{series}}%
-    				{\skipentry}%
-        			{\savefieldcs{series}{\strfield{series}}}%
-        	}%
-}  
+\defbibcheck{shortseries}{% 
+ \iffieldundef{shortseries}%
+ {\skipentry}%
+ {}%
+ \iffieldundef{series}%
+ {\skipentry}%
+ {\ifcsdef{\strfield{series}}%
+ {\skipentry}%
+ {\savefieldcs{series}{\strfield{series}}}%
+ }%
+} 
 \defbibcheck{shortjournal}{%
-    \iffieldundef{shortjournal}%
-    		{\skipentry}%
-    		{}%
-    \iffieldundef{journaltitle}%
-    		{\skipentry}%
-    		{\ifcsdef{\strfield{journaltitle}}%
-    					{\skipentry}%
-        				{\savefieldcs{journaltitle}{\strfield{journaltitle}}}%
-        	}%
+ \iffieldundef{shortjournal}%
+ {\skipentry}%
+ {}%
+ \iffieldundef{journaltitle}%
+ {\skipentry}%
+ {\ifcsdef{\strfield{journaltitle}}%
+ {\skipentry}%
+ {\savefieldcs{journaltitle}{\strfield{journaltitle}}}%
+ }%
 }
-%-----------------------
-\DeclareNameAlias{author}{given-family}
+%----------------------- 
+\DeclareNameAlias{author}{name:initials}
 \DeclareNameAlias{editor}{author}
 \DeclareNameAlias{translator}{author}
 %-----------------------
 \DeclareListFormat{location}{%
-  	#1\ifthenelse{\value{listcount}<\value{liststop}}%
-          {\orttrennzeichen}%
-          {}%
+ #1\ifthenelse{\value{listcount}<\value{liststop}}%
+ {\orttrennzeichen}%
+ {}%
 }
 %-----------------------
 \AtEveryBibitem{%
-  \iffieldequalstr{relatedtype}{translationof}
-    {\savename{translator}{\savedrelatedtranslator}%
-     \clearname{translator}}
-    {}
-  \ifboolexpr{bool {bbx:translation}%
-              or bool {cbx:ancient}%
-              or bool {cbx:frgancient}}%
-    {}%
-    {\clearname{translator}%
-     \clearfield{origtitle}}}
+ \iffieldequalstr{relatedtype}{translationof}
+ {\savename{translator}{\savedrelatedtranslator}%
+ \clearname{translator}}
+ {}
+ \ifboolexpr{bool {bbx:translation}%
+ or bool {cbx:ancient}%
+ or bool {cbx:frgancient}}%
+ {}%
+ {\clearname{translator}%
+ \clearfield{origtitle}}}
 %-----------------------
 \AtBeginDocument{%
-	\ifbool{bbx:initials}{%http://tex.stackexchange.com/a/295486/98739     
-			\DeclareStyleSourcemap{%
-  			\maps[datatype=bibtex]{%
-    		\map{%
-        % Author field
-      \step[fieldsource=author,%
-        match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))(\S*,)}},%
-        replace={\regexp{\{$1\}$3}}]% Protect last names (first last)
-      \step[fieldsource=author,%
-        match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))}},%
-        replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
-      \step[fieldsource=author,%
-        match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))([^\}])}},%
-        replace={\regexp{\{\\relax\{\}$1\}$3}}]% Insert \relax after abbreviating
-      % Editor field
-      \step[fieldsource=editor,%
-        match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))(\S*,)}},%
-        replace={\regexp{\{$1\}$3}}]% Protect last names (first last)
-      \step[fieldsource=editor,%
-        match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))}},%
-        replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
-      \step[fieldsource=editor,%
-        match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))([^\}])}},%
-        replace={\regexp{\{\\relax\{\}$1\}$3}}]% Insert \relax after abbreviating
-		}}}%
-	}{}%
+ \ifbool{bbx:initials}{%http://tex.stackexchange.com/a/295486/98739 
+ \DeclareStyleSourcemap{%
+ \maps[datatype=bibtex]{%
+ \map{%
+ % Author field
+ \step[fieldsource=author,%
+ match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))(\S*,)}},%
+ replace={\regexp{\{$1\}$3}}]% Protect last names (first last)
+ \step[fieldsource=author,%
+ match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))}},%
+ replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
+ \step[fieldsource=author,%
+ match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))([^\}])}},%
+ replace={\regexp{\{\\relax\{\}$1\}$3}}]% Insert \relax after abbreviating
+ % Editor field
+ \step[fieldsource=editor,%
+ match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))(\S*,)}},%
+ replace={\regexp{\{$1\}$3}}]% Protect last names (first last)
+ \step[fieldsource=editor,%
+ match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))}},%
+ replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
+ \step[fieldsource=editor,%
+ match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))([^\}])}},%
+ replace={\regexp{\{\\relax\{\}$1\}$3}}]% Insert \relax after abbreviating
+ }}}%
+ }{}%
 }
 %-----------------------
 %% provide macros to deal with intranslator, withincommentator, withinannotator, withinintroduction, withinforeword, withinafterword
 %% that is fields referring to the title work and not the booktitle work in inbook etc. works
 % these macros are essentially the same as the standard macros without the "in"
 \newbibmacro*{byineditor+others}{%
-  	\ifnameundef{ineditor}%
-      		{}%
-    		{\usebibmacro{byeditor+othersstrg}%
-     			\setunit{\addspace}%
-     			\printnames[byeditor]{ineditor}%
-     			\clearname{ineditor}%
-     			\newunit%
-     		}%
-  	\usebibmacro{byintranslator+others}%
+ \ifnameundef{ineditor}%
+ {}%
+ {\usebibmacro{byeditor+othersstrg}%
+ \setunit{\addspace}%
+ \printnames[byeditor]{ineditor}%
+ \clearname{ineditor}%
+ \newunit%
+ }%
+ \usebibmacro{byintranslator+others}%
 }
 %-----------------------
 \newbibmacro*{byintranslator+others}{%
-  	\ifnameundef{intranslator}%
-    		{}%
-    		{\usebibmacro{bytranslator+othersstrg}%
-     			\setunit{\addspace}%
-     			\printnames[bytranslator]{intranslator}%
-     			\clearname{intranslator}%
-    			\newunit%
-    		}%
-  	\usebibmacro{withinothers}%
+ \ifnameundef{intranslator}%
+ {}%
+ {\usebibmacro{bytranslator+othersstrg}%
+ \setunit{\addspace}%
+ \printnames[bytranslator]{intranslator}%
+ \clearname{intranslator}%
+ \newunit%
+ }%
+ \usebibmacro{withinothers}%
 }
 %-----------------------
 \newbibmacro*{withincommentator}{%
-  	\ifnameundef{incommentator}%
-    		{}%
-    		{\bibstring{withcommentator}%
-     			\setunit{\addspace}%
-     			\printnames[withcommentator]{incommentator}%
-     		}%
+ \ifnameundef{incommentator}%
+ {}%
+ {\bibstring{withcommentator}%
+ \setunit{\addspace}%
+ \printnames[withcommentator]{incommentator}%
+ }%
 }
 %-----------------------
 \newbibmacro*{withinannotator}{%
-  	\ifnameundef{inannotator}%
-    		{}%
-    		{\bibstring{withannotator}%
-    			\setunit{\addspace}%
-     			\printnames[withannotator]{inannotator}%
-     		}%
+ \ifnameundef{inannotator}%
+ {}%
+ {\bibstring{withannotator}%
+ \setunit{\addspace}%
+ \printnames[withannotator]{inannotator}%
+ }%
  }
 %-----------------------
 \newbibmacro*{withinintroduction}{%
-  	\ifnameundef{inintroduction}
-    		{}%
-    		{\bibstring{withintroduction}%
-     			\setunit{\addspace}%
-     			\printnames[withintroduction]{inintroduction}%
-     		}%
+ \ifnameundef{inintroduction}
+ {}%
+ {\bibstring{withintroduction}%
+ \setunit{\addspace}%
+ \printnames[withintroduction]{inintroduction}%
+ }%
 }
 %-----------------------
 \newbibmacro*{withinforeword}{%
-  	\ifnameundef{inforeword}%
-    		{}%
-    		{\bibstring{withforeword}%
-     			\setunit{\addspace}%
-     			\printnames[withforeword]{inforeword}%
-     		}%
+ \ifnameundef{inforeword}%
+ {}%
+ {\bibstring{withforeword}%
+ \setunit{\addspace}%
+ \printnames[withforeword]{inforeword}%
+ }%
 }
 %-----------------------
 \newbibmacro*{withinafterword}{%
-  	\ifnameundef{inafterword}
-    		{}
-    		{\bibstring{withafterword}%
-     			\setunit{\addspace}%
-     			\printnames[withafterword]{inafterword}%
-     		}%
+ \ifnameundef{inafterword}
+ {}
+ {\bibstring{withafterword}%
+ \setunit{\addspace}%
+ \printnames[withafterword]{inafterword}%
+ }%
 }
 %-----------------------
 \newbibmacro*{withinothers}{%
-  	\usebibmacro{withincommentator}%
-  	\clearname{incommentator}%
-  		\newunit%
-  	\usebibmacro{withinannotator}%
-  	\clearname{inannotator}%
-  		\newunit%
-  	\usebibmacro{withinintroduction}%
-  	\clearname{inintroduction}%
-  		\newunit%
-  	\usebibmacro{withinforeword}%
-  	\clearname{inforeword}%
-  		\newunit%
-  	\usebibmacro{withinafterword}%
-  	\clearname{inafterword}%
+ \usebibmacro{withincommentator}%
+ \clearname{incommentator}%
+ \newunit%
+ \usebibmacro{withinannotator}%
+ \clearname{inannotator}%
+ \newunit%
+ \usebibmacro{withinintroduction}%
+ \clearname{inintroduction}%
+ \newunit%
+ \usebibmacro{withinforeword}%
+ \clearname{inforeword}%
+ \newunit%
+ \usebibmacro{withinafterword}%
+ \clearname{inafterword}%
 }
 %-----------------------
 \newbibmacro{labelwidthbib}{%
-	\begingroup%
-    	\DeclareFieldFormat{bibhyperref}{##1}%
-    	\csuse{blx@hook@cite}%
-    	\csuse{blx@hook@citekey}%
-    	\defcounter{maxnames}{\blx@maxcitenames}%
-    	\usebibmacro{cite}%
-  	\endgroup%
-}   
+ \begingroup%
+ \DeclareFieldFormat{bibhyperref}{##1}%
+ \csuse{blx@hook@cite}%
+ \csuse{blx@hook@citekey}%
+ \defcounter{maxnames}{\blx@maxcitenames}%
+ \usebibmacro{cite}%
+ \endgroup%
+} 
 %-----------------------
 \newbibmacro{kicklabel}{% 
-  	\sbox\arch@labelbox{\usebibmacro{labelwidthbib}}%
-  	\global\togglefalse{blx@insert}%
-  	\ifdim.9\wd\arch@labelbox>%
-  		\labwidthsameline\leavevmode\newline\fi%
+ \sbox\arch@labelbox{\usebibmacro{labelwidthbib}}%
+ \global\togglefalse{blx@insert}%
+ \ifdim.9\wd\arch@labelbox>%
+ \labwidthsameline\leavevmode\newline\fi%
 }
 %-----------------------
 \renewbibmacro{in:}{%
-	\ifthenelse{% 		
-		\ifentrytype{article}%
-		\OR%
-		\ifentrytype{review}}%
-	{}%
-	{\printtext{\bibstring{in}\intitlepunct}}%
-}
-%-----------------------     	 
+ \ifthenelse{% 
+ \ifentrytype{article}%
+ \OR%
+ \ifentrytype{review}}%
+ {}%
+ {\printtext{\bibstring{in}\intitlepunct}}%
+}
+%----------------------- 
 \newbibmacro*{bbx:parunit}{%
-  	\ifbibliography{%
-  			\setunit{\bibpagerefpunct}%
-    		\newblock
-     		\usebibmacro{pageref}%
-     		\clearlist{pageref}%
-     		\setunit{\addcomma\newline\nobreak}%
-     		}%
- 		{}%
-}
- %-----------------------   
+ \ifbibliography{%
+ \setunit{\bibpagerefpunct}%
+ \newblock
+ \usebibmacro{pageref}%
+ \clearlist{pageref}%
+ \setunit{\addcomma\newline\nobreak}%
+ }%
+ {}%
+}
+ %----------------------- 
 \renewbibmacro*{eprint}{%
-  	\usebibmacro{bbx:parunit}%
-  	\iffieldundef{eprinttype}%
-    		{\printfield{eprint}}%
-    		{\printfield[eprint:\strfield{eprinttype}]{eprint}}%
+ \usebibmacro{bbx:parunit}%
+ \iffieldundef{eprinttype}%
+ {\printfield{eprint}}%
+ {\printfield[eprint:\strfield{eprinttype}]{eprint}}%
 }
-%-----------------------   
+%----------------------- 
 \newbibmacro*{zenon}{%
-  	\usebibmacro{bbx:parunit}%
-  	\printfield{zenon}%
+ \iffieldundef{zenon}
+ {}
+ {\usebibmacro{bbx:parunit}%
+ \printfield{zenon}%
+ } 
 }
-%-----------------------   
+%----------------------- 
 \newbibmacro*{jstor}{%
-  	\usebibmacro{bbx:parunit}%
-    \printfield{jstor}%
+ \iffieldundef{jstor}
+ {} 
+ {\usebibmacro{bbx:parunit}%
+ \printfield{jstor}%
+ }
 }
-%-----------------------   
+%----------------------- 
 \newbibmacro*{urn}{%
-  	\usebibmacro{bbx:parunit}%
-    \printfield{urn}%
+ \iffieldundef{urn}
+ {} 
+ {\usebibmacro{bbx:parunit}%
+ \printfield{urn}%
+ }
 }
 %-----------------------
 \renewbibmacro*{url+urldate}{%
-  	\usebibmacro{bbx:parunit}%
-  	\iffieldundef{url}{}{\printfield{url}%
- 			{\setunit*{\addspace}%
-     			\printtext{\printurldate}%
-     		}}%
+ \usebibmacro{bbx:parunit}%
+ \iffieldundef{url}{}{\printfield{url}%
+ {\setunit*{\addspace}%
+ \printtext{\printurldate}%
+ }}%
 }
-%-----------------------             
+%----------------------- 
 \renewbibmacro*{doi+eprint+url}{%
-  	\usebibmacro{bbx:parunit}%
-  	\iftoggle{bbx:doi}%
-    		{\printfield{doi}}%
-    		{}%
-  	\iftoggle{bbx:eprint}%
-    		{\usebibmacro{eprint}}%
-    		{}%
-    \iffieldundef{jstor}{}{\usebibmacro{jstor}}%
-	\iffieldundef{urn}{}{\usebibmacro{urn}}%
-  	\iffieldundef{zenon}{}{\usebibmacro{zenon}}%
-  	\iftoggle{bbx:url}%
-    		{\usebibmacro{url+urldate}}%
-    		{}%
+ \usebibmacro{bbx:parunit}%
+ \iftoggle{bbx:doi}%
+ {\printfield{doi}}%
+ {}%
+ \iftoggle{bbx:eprint}{\usebibmacro{eprint}}{}%
+ \iftoggle{bbx:jstor}{\usebibmacro{jstor}}{}%
+ \iftoggle{bbx:urn}{\usebibmacro{urn}}{}%
+ \iftoggle{bbx:zenon}{\usebibmacro{zenon}}{}%
+ \iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}%
 }
 %-----------------------
 \DeclareFieldFormat{editortype}{\mkbibparens{#1}}
-	\renewbibmacro*{editor}{%
-  		\ifboolexpr{%
-    			test \ifuseeditor %
-   				and %
-    			not test {\ifnameundef{editor}}
-  				}%
-  			{\printnames{editor}%
-     			\setunit{\addspace}%
- 				\printtext[parens]{\bibstring{editor}}%
-     			\clearname{editor}%
-     		}%
-   			{}%
-}
-%-----------------------    
+ \renewbibmacro*{editor}{%
+ \ifboolexpr{%
+ test \ifuseeditor %
+ and %
+ not test {\ifnameundef{editor}}
+ }%
+ {\printnames{editor}%
+ \setunit{\addspace}%
+ \printtext[parens]{\bibstring{editor}}%
+ \clearname{editor}%
+ }%
+ {}%
+}
+%----------------------- 
 \newbibmacro{savestuff}{%
- 	\savename{editor}{\bbx@lasteditor}%
-   	\savefield{namehash}{\bbx@lasthash}%
-   	\savefield{booktitle}{\bbx@lastbooktitle}%
+ \savename{editor}{\bbx@lasteditor}%
+ \savefield{namehash}{\bbx@lasthash}%
+ \savefield{booktitle}{\bbx@lastbooktitle}%
 }
-%-----------------------				    
+%----------------------- 
 \newbibmacro*{series}{%
-  	\ifboolexpr{test {\iffieldundef{shortseries}} %
-  						or bool {bbx:noabbrv}}%
-    		{\printtext[seriestitle]{\printfield[titlecase]{series}}}%
-    		{\printfield{shortseries}}%
+ \ifboolexpr{test {\iffieldundef{shortseries}} %
+ or bool {bbx:noabbrv}}%
+ {\printtext[seriestitle]{\printfield[titlecase]{series}}}%
+ {\printfield{shortseries}}%
 }
 %-----------------------
 \renewbibmacro*{series+number}{%
-   	\iffieldundef{series}%
-   			{}%
-   			{\usebibmacro{series}%
-     			\setunit*{\addspace}%
-     			\printfield{number}%
-      			\ifbool{bbx:yearseries}%
-      					{\newunit}%
-      					{\setunit{\addspace}}%
-      		}%
+ \iffieldundef{series}%
+ {}%
+ {\usebibmacro{series}%
+ \setunit*{\addspace}%
+ \printfield{number}%
+ \ifbool{bbx:yearseries}%
+ {\newunit}%
+ {\setunit{\addspace}}%
+ }%
 }
 %-----------------------
 \renewbibmacro*{journal}{%
-  	\ifboolexpr{test {\iffieldundef{shortjournal}}%
-  					or bool {bbx:noabbrv}}%
-      {\printtext[journaltitle]{%
-      			\printfield[titlecase]{journaltitle}%
-       			\setunit{\subtitlepunct}%
-       			\printfield[titlecase]{journalsubtitle}%
-       			}%
-      }%
-    	{\printfield{shortjournal}}%
+ \ifboolexpr{test {\iffieldundef{shortjournal}}%
+ or bool {bbx:noabbrv}}%
+ {\printtext[journaltitle]{%
+ \printfield[titlecase]{journaltitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{journalsubtitle}%
+ }%
+ }%
+ {\printfield{shortjournal}}%
 }
 %-----------------------
 \newbibmacro{journal+number+year}{%
-  	\usebibmacro{journal}%
-  		\setunit{\jourvoldelim}%
-  	\printfield{volume}%
-  	%\iffieldundef{number}%
-  	%		{}%
-  			{\setunit{\volnumdelim}%
-  				\printfield{number}%
-  			}% 
-  		\newunit%
-  	\iffieldundef{year}%
-  			{\printfield{pubstate}}%
-  			{\printfield{year}}%
+ \usebibmacro{journal}%
+ \setunit{\jourvoldelim}%
+ \printfield{volume}%
+ %\iffieldundef{number}%
+ % {}%
+ {\setunit{\volnumdelim}%
+ \printfield{number}%
+ }% 
+ \newunit%
+ \iffieldundef{year}%
+ {\printfield{pubstate}}%
+ {\printfield{year}}%
 }
 %-----------------------
 \newbibmacro*{pages}{%
-   	\printfield{pages}%
-   	\isdot%
+ \printfield{pages}%
+ \isdot%
 }
 %-----------------------
 \newbibmacro{translation}{%
-  	\printfield{origtitle}%
-  		\setunit{\addcomma\space}%
-  	\usebibmacro{byeditor+others}%
+ \printfield{origtitle}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{byeditor+others}%
 }
-%-----------------------  
+%----------------------- 
 \newbibmacro{intranslation}{%
-  	\printfield{origtitle}%
-  		\setunit{\addcomma\space}%
-  	\usebibmacro{byineditor+others}%
-}				
-%-----------------------  
+ \printfield{origtitle}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{byineditor+others}%
+} 
+%----------------------- 
 \newbibmacro*{related:reviewof}[1]{%
-		\usebibmacro*{related:default}{#1}%
+ \usebibmacro*{related:default}{#1}%
 }
 %-----------------------
 \newbibmacro*{related:translationof}[1]{%
-	\entrydata*{#1}{%
-   	\restorename{savedtranslator}{\savedrelatedtranslator}%
-    \printtext[emph]{\usebibmacro{title}}%
-    \usebibmacro{location+edition+year}%
-    	\ifnameundef{savedtranslator}%
-    			{}%
-    			{\newunit
-   	 				\bibstring{bytranslator}%keine Sprache ausgegeben?    
-    				\setunit{\addspace}%
-    				\printnames{savedtranslator}%
-    			}
-  	}
-}
-%-----------------------    
+ \entrydata*{#1}{%
+ \restorename{savedtranslator}{\savedrelatedtranslator}%
+ \printtext[emph]{\usebibmacro{title}}%
+ \usebibmacro{location+edition+year}%
+ \ifnameundef{savedtranslator}%
+ {}%
+ {\newunit
+ \bibstring{bytranslator}%keine Sprache ausgegeben? 
+ \setunit{\addspace}%
+ \printnames{savedtranslator}%
+ }
+ }
+}
+%----------------------- 
 \newbibmacro*{inreference:title+author}{%
 \iffieldundef{title}%
-  			{}%
-  			{\setunit{\addspace}
-  				\bibstring{subvoce}%
-  					\setunit{\addspace}%
-  				\printfield{title}%
-  					\setunit*{\addspace}%
-				\printfield{number}}
-  		\setunit{\addspace}%
-  		\printtext[parens]{\printnames[name:inreference]{labelname}}
-}  	
-%-----------------------    
+ {}%
+ {\setunit{\addspace}%
+ \bibstring{subvoce}%
+ \setunit{\addspace}%
+ \printfield{title}%
+ \setunit*{\addspace}%
+ \printfield{number}}%
+ \setunit{\addspace}%
+ \printtext[parens]{\printnames[name:initials]{labelname}}%
+} 
+%----------------------- 
 \newbibmacro*{maintitle+title+volumes}{% 
-  \iffieldsequal{maintitle}{title}%
-    	{\clearfield{maintitle}%
-     		\clearfield{mainsubtitle}%
-     		\clearfield{maintitleaddon}%
-     	}%
-   		{\iffieldundef{maintitle}%
-   			{}%
-       		{\usebibmacro{maintitle}%
-         	\ifbool{cbx:ancient}%
-            		{\usebibmacro{title}%
-            			\iffieldundef{volume}%
-            					{\newunit\newblock}%
-            					{}%
-            		}%
-            		{\iffieldundef{volume}%
-                			{\iffieldundef{volumes}%
-                					{}%
-                					{\printfield{volumes}%
-                   					\setunit*{\addspace}%
-                   					\bibstring{volumes}%
-                   					\setunit{\addspace}%
-                   				}%
-                   		}%
-               			{\setunit{\addspace}%
-               				\printfield{volume}%
-                 				\setunit*{\adddot\addspace}%
-                 			}%
-                 	}%
-			}%
-		}%
-   \iffieldundef{volumes}%
-   			{\usebibmacro{title}}%
-   			{}%
-   \newunit%
+ \iffieldsequal{maintitle}{title}%
+ {\clearfield{maintitle}%
+ \clearfield{mainsubtitle}%
+ \clearfield{maintitleaddon}%
+ }%
+ {\iffieldundef{maintitle}%
+ {}%
+ {\usebibmacro{maintitle}%
+ \ifbool{cbx:ancient}%
+ {\usebibmacro{title}%
+ \iffieldundef{volume}%
+ {\newunit\newblock}%
+ {}%
+ }%
+ {\iffieldundef{volume}%
+ {\iffieldundef{volumes}%
+ {}%
+ {\printfield{volumes}%
+ \setunit*{\addspace}%
+ \bibstring{volumes}%
+ \setunit{\addspace}%
+ }%
+ }%
+ {\setunit{\addspace}%
+ \printfield{volume}%
+ \setunit*{\adddot\addspace}%
+ }%
+ }%
+ }%
+ }%
+ \iffieldundef{volumes}%
+ {\usebibmacro{title}}%
+ {}%
+ \newunit%
 }
 %-----------------------
 \renewbibmacro{event+venue+date}{%
-		\setunit{\adddot\addspace}%  
-  	\printfield{eventtitle}%
-		\setunit*{\addspace}%
-    \printfield{venue}%
-    	\setunit*{\addspace}%
-    \printeventdate%
-  		\newunit%
+ \setunit{\adddot\addspace}% 
+ \printfield{eventtitle}%
+ \setunit*{\addspace}%
+ \printfield{venue}%
+ \setunit*{\addspace}%
+ \printeventdate%
+ \newunit%
  }
-%-----------------------  
+%----------------------- 
 \renewbibmacro*{title}{%
-  \ifboolexpr{%
-    	test {\iffieldundef{title}}%
-    	and%
-    	test {\iffieldundef{subtitle}}}
-  	{}%
-    {\printtext[title]{%
-       	\printfield[titlecase]{title}%
-       		\setunit{\subtitlepunct}%
-       \printfield[titlecase]{subtitle}}%
-     		\setunit{\subtitlepunct}
-     }%
-  \printfield{titleaddon}%
-}
-%-----------------------  
+ \ifboolexpr{%
+ test {\iffieldundef{title}}%
+ and%
+ test {\iffieldundef{subtitle}}}
+ {}%
+ {\printtext[title]{%
+ \printfield[titlecase]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}%
+ \setunit{\subtitlepunct}
+ }%
+ \printfield{titleaddon}%
+}
+%----------------------- 
 \renewbibmacro*{booktitle}{%
-  \ifboolexpr{%
-   		test {\iffieldundef{booktitle}}%
-   		and%
-    	test {\iffieldundef{booksubtitle}}}
-    {}%
-    {\printtext[booktitle]{%
-      	\printfield[titlecase]{booktitle}%
-       		\setunit{\subtitlepunct}%
-       	\printfield[titlecase]{booksubtitle}}%
-			\setunit{\subtitlepunct}%
-     }%
-  \printfield{booktitleaddon}%
-}
-%-----------------------  	
+ \ifboolexpr{%
+ test {\iffieldundef{booktitle}}%
+ and%
+ test {\iffieldundef{booksubtitle}}}
+ {}%
+ {\printtext[booktitle]{%
+ \printfield[titlecase]{booktitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{booksubtitle}}%
+ \setunit{\subtitlepunct}%
+ }%
+ \printfield{booktitleaddon}%
+}
+%----------------------- 
 \renewbibmacro*{maintitle}{%
-  \ifboolexpr{%
-    	test {\iffieldundef{maintitle}}%
-    	and%
-    	test {\iffieldundef{mainsubtitle}}}%
-    {}%
-    {\printtext[maintitle]{%
-       \printfield[titlecase]{maintitle}%
-       		\setunit{\subtitlepunct}%
-       \printfield[titlecase]{mainsubtitle}}%
-			\setunit{\subtitlepunct}%
-     }%
-  \printfield{maintitleaddon}%
+ \ifboolexpr{%
+ test {\iffieldundef{maintitle}}%
+ and%
+ test {\iffieldundef{mainsubtitle}}}%
+ {}%
+ {\printtext[maintitle]{%
+ \printfield[titlecase]{maintitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{mainsubtitle}}%
+ \setunit{\subtitlepunct}%
+ }%
+ \printfield{maintitleaddon}%
 }
 %-----------------------
 \newbibmacro*{Erstauflage}{%
-		\bibstring{firstprint}%
-		\setunit{\addcolon\addspace}%
+ \bibstring{firstprint}%
+ \setunit{\addcolon\addspace}%
 }
 %-----------------------
 \newbibmacro*{edition}{%
-  \iffieldint{edition}%
-    	{\setunit*{\addspace}%
-    		\mkbibsuperscript{\printfield{edition}}}%
-    	{\newunit%
-     		\printfield{edition}%
-     		\setunit{\addspace}%
-      }%
+ \iffieldint{edition}%
+ {\setunit*{\addspace}%
+ \mkbibsuperscript{\printfield{edition}}}%
+ {\newunit%
+ \printfield{edition}%
+ \setunit{\addspace}%
+ }%
 }
 %-----------------------
 \newbibmacro*{location+edition+year}{%
-	\ifboolexpr{%
-			test 			{\iflistundef{location}}%
- 			and test 	{\iflistundef{publisher}}%
-  			and test 	{\iffieldundef{year}}}%
-  		{}%
-  		{\ifbool{bbx:publisher}%
-    		{\printtext[parens]{%
-    			\printlist{location}%
-        			\setunit*{\addcolon\addspace}%
-        		\printlist{publisher}%
-        		\iffieldint{edition}%
-          				{\setunit{\addspace}}%
-          				{\newunit}%
-        		\usebibmacro{edition}%        
-        		\iffieldundef{year}%
-        				{\printfield{pubstate}}%
-        				{\printfield{year}}%
-        			\setunit*{\addspace}%
-        		\ifboolexpr{%
-							test 			{\iflistundef{origlocation}}%
- 							and test 	{\iflistundef{origpublisher}}%
-  							and test 	{\iffieldundef{origyear}}}%
-  							{}%
-        					{\printtext[parens]{%\usebibmacro{Erstauflage}%
-        													\printlist{origlocation}%
-        													\iflistundef{origpublisher}%
-        															{}%
-        															{\setunit*{\addcolon\addspace}%
-        																 \printlist{origpublisher}%
-        															}%
-        												\setunit{\addspace}%
-          												\printfield{origyear}%
-          											}%	
-          					}%
-          		}%
-          }%
-    	{\usebibmacro{edition}%
-      		\printtext[parens]{%
-        			\ifboolexpr{test {\iflistundef{origlocation}}%
-        			 			and test {\iffieldundef{origyear}}}%
-         					{}%
-         					{\iflistundef{origlocation}%
-          						{\printlist{location}}%
-          						{\printlist{origlocation}}%	
-          					\setunit{\addspace}%
-          					\printfield{origyear}%
-        						\setunit*{\addsemicolon\addspace}%
-        					  \iffieldundef{origyear}%
-        							 {}%
-        							 {\bibstring{reprint}%
-                        \addspace%
-                       }%
-        					}%
-        	\printlist{location}%
-        		\setunit*{\addspace}%
-			\iffieldundef{year}%
-					{\printfield{pubstate}}%
-					{\printfield{year}}%        
-        	}%
-      	}%
-   	}%
-}
-%-----------------------																		
+ \ifboolexpr{%
+ test {\iflistundef{location}}%
+ and test {\iflistundef{publisher}}%
+ and test {\iffieldundef{year}}}%
+ {}%
+ {\ifbool{bbx:publisher}%
+ {\printtext[parens]{%
+ \printlist{location}%
+ \setunit*{\addcolon\addspace}%
+ \printlist{publisher}%
+ \iffieldint{edition}%
+ {\setunit{\addspace}}%
+ {\newunit}%
+ \usebibmacro{edition}% 
+ \iffieldundef{year}%
+ {\printfield{pubstate}}%
+ {\printfield{year}}%
+ \setunit*{\addspace}%
+ \ifboolexpr{%
+ test {\iflistundef{origlocation}}%
+ and test {\iflistundef{origpublisher}}%
+ and test {\iffieldundef{origyear}}}%
+ {}%
+ {\printtext[parens]{%\usebibmacro{Erstauflage}%
+  \printlist{origlocation}%
+  \iflistundef{origpublisher}%
+  {}%
+  {\setunit*{\addcolon\addspace}%
+   \printlist{origpublisher}%
+  }%
+  \setunit{\addspace}%
+  \printfield{origyear}%
+  }% 
+ }%
+ }%
+ }%
+ {\usebibmacro{edition}%
+ \printtext[parens]{%
+ \ifboolexpr{test {\iflistundef{origlocation}}%
+ and test {\iffieldundef{origyear}}}%
+ {}%
+ {\iflistundef{origlocation}%
+ {\printlist{location}}%
+ {\printlist{origlocation}}% 
+ \setunit{\addspace}%
+ \printfield{origyear}%
+ \setunit*{\addsemicolon\addspace}%
+ \iffieldundef{origyear}%
+  {}%
+  {\bibstring{reprint}%
+\addspace%
+ }%
+ }%
+ \printlist{location}%
+ \setunit*{\addspace}%
+ \iffieldundef{year}%
+ {\printfield{pubstate}}%
+ {\printfield{year}}% 
+ }%
+ }%
+ }%
+}
+%-----------------------   
 \renewbibmacro*{institution+location+date}{%
-  	\printlist{location}%
-  	\printlist{institution}%
-  		\setunit*{\space}%
-  	\iffieldundef{year}%
-  			{\printfield{pubstate}}%
-  			{\printfield{year}}%
+ \printlist{location}%
+ \printlist{institution}%
+ \setunit*{\space}%
+ \iffieldundef{year}%
+ {\printfield{pubstate}}%
+ {\printfield{year}}%
 }
 %-----------------------
 \DeclareLabeldate{%http://tex.stackexchange.com/a/154367/98739
-  \field{date}%
-  \field{eventdate}%
-  \field{origdate}%
-  \field{urldate}%
-  \field{pubstate}%
-  \literal{nodate}%
-}
-%-----------------------         
+ \field{date}%
+ \field{eventdate}%
+ \field{origdate}%
+ \field{urldate}%
+ \field{pubstate}%
+ \literal{nodate}%
+}
+%----------------------- 
 \newbibmacro*{addendum}{}%%notwendig?
-%-----------------------         
+%----------------------- 
 \renewbibmacro*{addendum+pubstate}{%
-  \printfield{addendum}%
-  \iffieldundef{\thefield{datelabesource}year}%
-  		{}%
-  		{\newunit\newblock%
-  			\printfield{pubstate}%
-  		}%
+ \printfield{addendum}%
+ \iffieldundef{\thefield{datelabesource}year}%
+ {}%
+ {\newunit\newblock%
+ \printfield{pubstate}%
+ }%
 }
 %----------------------- 
 \newbibmacro{signatur}{%
-	\printfield{note}%
+ \printfield{note}%
 } 
-%-----------------------			
+%----------------------- 
 \newbibmacro*{volume}{%
-	\iffieldundef{maintitle}%
-			{\printfield{volume}%
-				\newunit}%
-			{}%
+ \iffieldundef{maintitle}%
+ {\printfield{volume}%
+ \newunit}%
+ {}%
 }
-%-----------------------	
+%----------------------- 
 \renewbibmacro*{maintitle+booktitle}{%
-  	\iffieldundef{maintitle}%
-    {}%
-    {\usebibmacro{maintitle}%
-     	\iffieldundef{volume}
-       			{\setunit{\maintitlepunct}}% 
-       			{\setunit{\addspace}%
-        			\printfield{volume}%
-        			\printfield{part}%
-        				\setunit{\adddot\space}%
-        		}%
-	}%
-  	\usebibmacro{booktitle}%
-  		\newunit
-}
-%-----------------------  			
+ \iffieldundef{maintitle}%
+ {}%
+ {\usebibmacro{maintitle}%
+ \iffieldundef{volume}
+ {\setunit{\maintitlepunct}}% 
+ {\setunit{\addspace}%
+ \printfield{volume}%
+ \printfield{part}%
+ \setunit{\adddot\space}%
+ }%
+ }%
+ \usebibmacro{booktitle}%
+ \newunit
+}
+%----------------------- 
 \newbibmacro*{booktitle+volume+editor}{%
-  	\ifnameundef{editor}%
-  			{\usebibmacro{maintitle+booktitle}%
-    				\setunit{\addspace}%
-    			\usebibmacro{volume}%
-  			}%
-  			{\ifbool{bbx:edby}%
-  					{\usebibmacro{booktitle}%
-          					\setunit{\addspace}%
-         				\usebibmacro{volume}%
-      						\newunit%
-      					\bibstring{byeditor}%
-      						\setunit{\addspace}%
-        				\printnames[author][-\value{listtotal}]{editor}%
-     				}%
-           			{\printnames[author][-\value{listtotal}]{editor}%
-           					\setunit*{\addspace}%
-      					\printtext[parens]{\bibstring{editor}}%
-      						\newunit\newblock%
-      					\usebibmacro{maintitle+booktitle}%
-          					\setunit{\addspace}%
-          				\usebibmacro{volume}%
-     						\newunit%
-     				}%
-			}%
+ \ifnameundef{editor}%
+ {\usebibmacro{maintitle+booktitle}%
+ \setunit{\addspace}%
+ \usebibmacro{volume}%
+ }%
+ {\ifbool{bbx:edby}%
+ {\usebibmacro{booktitle}%
+ \setunit{\addspace}%
+ \usebibmacro{volume}%
+ \newunit%
+ \bibstring{byeditor}%
+ \setunit{\addspace}%
+ \printnames{editor}%
+ }%
+ {\printnames{editor}%
+ \setunit*{\addspace}%
+ \printtext[parens]{\bibstring{editor}}%
+ \newunit\newblock%
+ \usebibmacro{maintitle+booktitle}%
+ \setunit{\addspace}%
+ \usebibmacro{volume}%
+ \newunit%
+ }%
+ }%
 }
 %-----------------------
 \newbibmacro*{reftitle}{%
-  	\iffieldundef{title}%
-  			{}%
-  			{\bibstring{reference}%
-					\setunit{\addspace}%
-    			\printtext[emph]{%
-     			\usebibmacro{title}%
-     			 	\setunit{\addspace}%
-      			\iffieldundef{number}%
-      					{}%
-      					{\printfield[brackets]{number}}%
-				}%
-			}%
+ \iffieldundef{title}%
+ {}%
+ {\bibstring{reference}%
+ \setunit{\addspace}%
+ \printtext[emph]{%
+ \usebibmacro{title}%
+ \setunit{\addspace}%
+ \iffieldundef{number}%
+ {}%
+ {\printfield[brackets]{number}}%
+ }%
+ }%
 }
 %-----------------------
 \DeclareBibliographyDriver{shortjournal}{%
-	\printtext[journaltitle]{%
-		\printfield[titlecase]{journaltitle}%
-       		\setunit{\subtitlepunct}%
-       	\printfield[titlecase]{journalsubtitle}%
-       	}%
+ \printtext[journaltitle]{%
+ \printfield[titlecase]{journaltitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[titlecase]{journalsubtitle}%
+ }%
 }
 %-----------------------
 \DeclareBibliographyDriver{shortseries}{%
-	\printtext[seriestitle]{%
-    	\printfield[titlecase]{series}%
-    }%
+ \printtext[seriestitle]{%
+ \printfield[titlecase]{series}%
+ }%
 }
 %-----------------------
 \DeclareDataInheritance{reference}{inreference}{%
-  	\inherit{shorthand}{booktitle}%
-  	\noinherit{volumes}%
+ \inherit{shorthand}{booktitle}%
+ \noinherit{volumes}%
 }
 %-----------------------
 \DeclareBibliographyDriver{shorthand}{%
-	\iffieldundef{title}%
-			{\printfield{booktitle}}%
-			{\printfield{title}}%
-}          			
-%-----------------------          			
+ \iffieldundef{title}%
+ {\printfield{booktitle}}%
+ {\printfield{title}}%
+} 
+%----------------------- 
 \DeclareBibliographyDriver{article}{%
-  	\usebibmacro{bibindex}%
-  	\usebibmacro{begentry}%
-  	\usebibmacro{author}%
-  		\setunit*{\labelnamepunct}%
-  		\newblock%
-  	\usebibmacro{title}%
-  		\newunit\newblock%
-  	\usebibmacro{translation}%
-  	\usebibmacro{journal+number+year}%
-  		\newunit\newblock%
-  	\usebibmacro{pages}%
-  		\setunit{\addspace}%
-  	\usebibmacro{doi+eprint+url}%
-  		\newunit\newblock%
-  		\setunit{\bibpagerefpunct}%
-  		\newblock%
-  	\usebibmacro{pageref}%
-  		\newunit\newblock%
-  	\iftoggle{bbx:related}%
-    	{\usebibmacro{related:init}%
-     		\usebibmacro{related}%
-     	}%
-    	{}%
-  	\usebibmacro{finentry}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author}%
+ \setunit*{\labelnamepunct}%
+ \newblock%
+ \usebibmacro{title}%
+ \newunit\newblock%
+ \usebibmacro{translation}%
+ \usebibmacro{journal+number+year}%
+ \newunit\newblock%
+ \usebibmacro{pages}%
+ \setunit{\addspace}%
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock%
+ \setunit{\bibpagerefpunct}%
+ \newblock%
+ \usebibmacro{pageref}%
+ \newunit\newblock%
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ }%
+ {}%
+ \usebibmacro{finentry}%
 }
 %-----------------------
 \DeclareBibliographyDriver{book}{%
-  	\usebibmacro{bibindex}%
-  	\usebibmacro{begentry}%
-  	\usebibmacro{author/editor}%
-  		\setunit*{\labelnamepunct}%
-  		\newblock%
-  	\usebibmacro{maintitle+title+volumes}%
-  		\newunit\newblock%   
-  	\usebibmacro{translation}%
-  	\ifbool{bbx:yearseries}%
-  			{}%
-  			{\newunit\usebibmacro{series+number}}%
-  		\setunit{\addspace}%
-  		\newblock%                        
-  	\usebibmacro{location+edition+year}%
-  		\setunit*{\addspace}%
-  		\newblock%
-  	\ifbool{bbx:yearseries}%
-  			{\usebibmacro{series+number}}%
-  			{}%
-  	\newunit\newblock%
-	\usebibmacro{doi+eprint+url}%
-  		\setunit*{\addperiod\addspace}%
-  	\usebibmacro{signatur}%
-  		\newunit\newblock%
-  	\iftoggle{bbx:related}%
-    		{\usebibmacro{related:init}%
-     			\usebibmacro{related}%
-     		}
-    		{}%
-  	\usebibmacro{savestuff}%
-  	\usebibmacro{finentry}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}%
+ \newblock%
+ \usebibmacro{maintitle+title+volumes}%
+ \newunit\newblock% 
+ \usebibmacro{translation}%
+ \ifbool{bbx:yearseries}%
+ {}%
+ {\newunit\usebibmacro{series+number}}%
+ \setunit{\addspace}%
+ \newblock%
+ \usebibmacro{location+edition+year}%
+ \setunit*{\addspace}%
+ \newblock%
+ \ifbool{bbx:yearseries}%
+ {\usebibmacro{series+number}}%
+ {}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}%
+ \setunit*{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock%
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ }
+ {}%
+ \usebibmacro{savestuff}%
+ \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{thesis}{%		
-  	\usebibmacro{bibindex}%
-  	\usebibmacro{begentry}%
-  	\usebibmacro{author/editor}
-  		\setunit*{\labelnamepunct}%
-  		\newblock%
-	\usebibmacro{title}%
-		\setunit{\addspace}
-    \printtext[parens]{\printfield{type}%
-    	\setunit*{\addspace}%
-  	\usebibmacro{institution+location+date}}%
-    	\newunit\newblock%
-	\usebibmacro{doi+eprint+url}%
- 		\setunit*{\addperiod\addspace}%
-  	\usebibmacro{signatur}%
- 	 	\newunit\newblock
-  	\iftoggle{bbx:related}
-    		{\usebibmacro{related:init}%
-     			\usebibmacro{related}%
-     		}
-    		{}%
-  	\usebibmacro{savestuff}%
-  	\usebibmacro{finentry}%
+\DeclareBibliographyDriver{thesis}{% 
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}
+ \setunit*{\labelnamepunct}%
+ \newblock%
+ \usebibmacro{title}%
+ \setunit{\addspace}
+ \printtext[parens]{\printfield{type}%
+ \setunit*{\addspace}%
+ \usebibmacro{institution+location+date}}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}%
+ \setunit*{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ }
+ {}%
+ \usebibmacro{savestuff}%
+ \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{proceedings}{%		
-  	\usebibmacro{bibindex}%
-  	\usebibmacro{begentry}%
-  	\usebibmacro{author/editor}%
-  		\setunit*{\labelnamepunct}%
-  		\newblock%
- 	\usebibmacro{maintitle+title+volumes}%
-	\usebibmacro{event+venue+date}%
-  		\setunit*{\addspace}%
-  	\ifbool{bbx:yearseries}%
-  			{}%
-    		{\newunit%
-    			\usebibmacro{series+number}%
-    		}%
-  		\setunit{\addspace}%
-  		\newblock%        
- 	\usebibmacro{location+edition+year}%
-  		\setunit*{\addspace}%
-  		\newblock% 
-  	\ifbool{bbx:yearseries}%
-  			{\usebibmacro{series+number}}%
-  			{}%
-    	\newunit\newblock%
-	\usebibmacro{doi+eprint+url}%
-  		\setunit{\addperiod\addspace}%
-  	\usebibmacro{signatur}%
-  	\usebibmacro{savestuff}%
-  		\newunit\newblock%
-  	\iftoggle{bbx:related}%
-    		{\usebibmacro{related:init}%
-    			\usebibmacro{related}%
-    		}%
-    		{}%
-  	\usebibmacro{finentry}%
+\DeclareBibliographyDriver{proceedings}{% 
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}%
+ \newblock%
+ \usebibmacro{maintitle+title+volumes}%
+ \usebibmacro{event+venue+date}%
+ \setunit*{\addspace}%
+ \ifbool{bbx:yearseries}%
+ {}%
+ {\newunit%
+ \usebibmacro{series+number}%
+ }%
+ \setunit{\addspace}%
+ \newblock% 
+ \usebibmacro{location+edition+year}%
+ \setunit*{\addspace}%
+ \newblock% 
+ \ifbool{bbx:yearseries}%
+ {\usebibmacro{series+number}}%
+ {}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \usebibmacro{savestuff}%
+ \newunit\newblock%
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ }%
+ {}%
+ \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{inproceedings}{%		
-  	\usebibmacro{bibindex}%
-  	\usebibmacro{begentry}%%
-	\usebibmacro{author/editor}%
-  		\setunit*{\labelnamepunct}%
-  		\newblock%
-  	\usebibmacro{title}%
-  	\newunit\newblock%
-  	\usebibmacro{intranslation}%
-  		\newunit\newblock%
-  	\usebibmacro{in:}%
-  	\usebibmacro{booktitle+volume+editor}%
-  	\usebibmacro{event+venue+date}%
-  		\setunit{\addspace}%
-  	\ifbool{bbx:yearseries}%
-  			{}%
-  			{\newunit%
-  				\usebibmacro{series+number}%
-  			}%
-  		\setunit{\addspace}%
-  		\newblock%                   
-  	\usebibmacro{location+edition+year}%
-  		\setunit*{\addspace}%
-  		\newblock% 
-  	\ifbool{bbx:yearseries}%
-  			{\usebibmacro{series+number}}%
-  			{}%                   
-  	\usebibmacro{pages}%
-  		\newunit\newblock%
-	\usebibmacro{doi+eprint+url}%
-  		\setunit{\addperiod\addspace}%
-  	\usebibmacro{signatur}%
-  		\newunit\newblock%
-  	\iftoggle{bbx:related}%
-    		{\usebibmacro{related:init}%
-     			\usebibmacro{related}%
-     		}%
-    		{}%
-  	\usebibmacro{savestuff}%
-  	\usebibmacro{finentry}%
+\DeclareBibliographyDriver{inproceedings}{% 
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}%
+ \newblock%
+ \usebibmacro{title}%
+ \newunit\newblock%
+ \usebibmacro{intranslation}%
+ \newunit\newblock%
+ \usebibmacro{in:}%
+ \usebibmacro{booktitle+volume+editor}%
+ \usebibmacro{event+venue+date}%
+ \setunit{\addspace}%
+ \ifbool{bbx:yearseries}%
+ {}%
+ {\newunit%
+ \usebibmacro{series+number}%
+ }%
+ \setunit{\addspace}%
+ \newblock% 
+ \usebibmacro{location+edition+year}%
+ \setunit*{\addspace}%
+ \newblock% 
+ \ifbool{bbx:yearseries}%
+ {\usebibmacro{series+number}}%
+ {}% 
+ \usebibmacro{pages}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock%
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ }%
+ {}%
+ \usebibmacro{savestuff}%
+ \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{talk}{%		
-	\usebibmacro{bibindex}%
-	\usebibmacro{begentry}%
-	\usebibmacro{author/editor}%
-		\setunit*{\labelnamepunct}%
-		\newblock%
-	\usebibmacro{title}%
-		\newunit\newblock%
-	\bibstring{talk}%
-	  	\setunit{\addspace}%
-	\printdate
-		\newunit\newblock%
-	 \printlist{institution}%
-		\newunit\newblock%
-	\usebibmacro{event+venue+date}% 
-		\setunit{\addspace}%
-  		\newunit\newblock%
-	\usebibmacro{doi+eprint+url}%
-		\setunit{\addperiod\addspace}%
-	\usebibmacro{signatur}%
-		\newunit\newblock%
-	\iftoggle{bbx:related}%
-			{\usebibmacro{related:init}%
-				\usebibmacro{related}%
-			}%
-			{}%
-	\usebibmacro{savestuff}%
-	\usebibmacro{finentry}%
+\DeclareBibliographyDriver{talk}{% 
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}%
+ \newblock%
+ \usebibmacro{title}%
+ \newunit\newblock%
+ \bibstring{talk}%
+ \setunit{\addspace}%
+ \printdate
+ \newunit\newblock%
+ \printlist{institution}%
+ \newunit\newblock%
+ \usebibmacro{event+venue+date}% 
+ \setunit{\addspace}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock%
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ }%
+ {}%
+ \usebibmacro{savestuff}%
+ \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{inbook}{%	
-   	\usebibmacro{bibindex}%
-   	\usebibmacro{begentry}%
-  	\usebibmacro{author/editor}%
-		\setunit*{\labelnamepunct}%
-  		\newblock%
-  	\usebibmacro{title}%
-   		\newunit\newblock%
-  	\usebibmacro{intranslation}%
-	\iffieldundef{title}%
-			{\setunit{\addspace}}%
- 			{\newunit\newblock}%
-  	\usebibmacro{in:}%
-  	\usebibmacro{booktitle+volume+editor}%
-  		\setunit{\addspace}%
-  	\ifbool{bbx:yearseries}%
-  			{}%
-    		{\newunit%
-    			\usebibmacro{series+number}%
-    		}%
-  	\setunit{\addspace}%
-  		\newblock%                        
-  	\usebibmacro{location+edition+year}%
-  		\setunit*{\addspace}%
-  		\newblock% 
-  	\ifbool{bbx:yearseries}%
-    		{\usebibmacro{series+number}}%
-    		{}%
-  	\usebibmacro{pages}%
-  		\newunit\newblock%
- 	\usebibmacro{doi+eprint+url}%
-  		\setunit{\addperiod\addspace}%
-  	\usebibmacro{signatur}%
-  		\newunit\newblock%
-  	\iftoggle{bbx:related}%
-    		{\usebibmacro{related:init}%
-     			\usebibmacro{related}%
-     		}%
-    		{}%
-  	\usebibmacro{savestuff}%
-  	\usebibmacro{finentry}%
+\DeclareBibliographyDriver{inbook}{% 
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}%
+ \newblock%
+ \usebibmacro{title}%
+ \newunit\newblock%
+ \usebibmacro{intranslation}%
+ \iffieldundef{title}%
+ {\setunit{\addspace}}%
+ {\newunit\newblock}%
+ \usebibmacro{in:}%
+ \usebibmacro{booktitle+volume+editor}%
+ \setunit{\addspace}%
+ \ifbool{bbx:yearseries}%
+ {}%
+ {\newunit%
+ \usebibmacro{series+number}%
+ }%
+ \setunit{\addspace}%
+ \newblock%
+ \usebibmacro{location+edition+year}%
+ \setunit*{\addspace}%
+ \newblock% 
+ \ifbool{bbx:yearseries}%
+ {\usebibmacro{series+number}}%
+ {}%
+ \usebibmacro{pages}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock%
+ \iftoggle{bbx:related}%
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ }%
+ {}%
+ \usebibmacro{savestuff}%
+ \usebibmacro{finentry}%
 }
 %-----------------------
 \DeclareBibliographyDriver{inreference}{%
-	\usebibmacro{bibindex}%
- 	\usebibmacro{begentry}%
-	\printfield{booktitle}%
-  		\setunit{\addspace}%
-  	\printfield{volume}%
-  		\setunit{\addspace}%
-  	\printfield[parens]{year}%
-  		\setunit{\addspace}%
-  	\usebibmacro{pages}%
-  	\usebibmacro{inreference:title+author}
-  		\setunit*{\addspace}%
-  	\usebibmacro{addendum}%
-  	\usebibmacro{doi+eprint+url}%
- 		\setunit{\addperiod\addspace}%
-  	\usebibmacro{signatur}%
-  		\newunit\newblock
-  	\usebibmacro{savestuff}%
-  	\usebibmacro{finentry}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \printfield{booktitle}%
+ \setunit{\addspace}%
+ \printfield{volume}%
+ \setunit{\addspace}%
+ \printfield[parens]{year}%
+ \setunit{\addspace}%
+ \usebibmacro{pages}%
+ \usebibmacro{inreference:title+author}
+ \setunit*{\addspace}%
+ \usebibmacro{addendum}%
+ \usebibmacro{doi+eprint+url}%
+ \setunit{\addperiod\addspace}%
+ \usebibmacro{signatur}%
+ \newunit\newblock
+ \usebibmacro{savestuff}%
+ \usebibmacro{finentry}%
 }
 %-----------------------
 \DeclareBibliographyDriver{review}{%
-  	\usebibmacro{bibindex}%
-  	\usebibmacro{begentry}%
-  	\usebibmacro{author/editor}%
-  		\setunit*{\labelnamepunct}%
-  		\newblock%
-    \iffieldundef{title}%
-    		{}%
-    		{\usebibmacro{title}}%
-   		\newunit\newblock%
-	\usebibmacro{related:init}%
-	\usebibmacro{related}%			
- 		\newunit\newblock%
- 	\usebibmacro{journal+number+year}%
-  		\newunit\newblock%
-  	\usebibmacro{pages}%
-  	 	\newunit\newblock%
-  	\usebibmacro{doi+eprint+url}%
-  	\usebibmacro{signatur}%
-  		\newunit\newblock%
- 	\usebibmacro{savestuff}%
- 	\usebibmacro{finentry}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit*{\labelnamepunct}%
+ \newblock%
+ \iffieldundef{title}%
+ {}%
+ {\usebibmacro{title}}%
+ \newunit\newblock%
+ \usebibmacro{related:init}%
+ \usebibmacro{related}% 
+ \newunit\newblock%
+ \usebibmacro{journal+number+year}%
+ \newunit\newblock%
+ \usebibmacro{pages}%
+ \newunit\newblock%
+ \usebibmacro{doi+eprint+url}%
+ \usebibmacro{signatur}%
+ \newunit\newblock%
+ \usebibmacro{savestuff}%
+ \usebibmacro{finentry}%
 }
 %-----------------------
 \defbibenvironment{bibliography}%
-  	{\list%
-     	{\usebibmacro{labelwidthbib}}%
-     	{\setlength{\labelwidth}{\labwidthsameline}
-    		\setlength{\leftmargin}{\labelwidth}%
-      		\setlength{\labelsep}{\biblabelsep}%
-      		\addtolength{\leftmargin}{\labelsep}%
-      		\setlength{\itemsep}{\bibitemsep}%
-      		\setlength{\parsep}{\bibparsep}%
-      		\renewcommand*{\makelabel}[1]{##1\hss}%
-      	}%
-  	}%
-  {\endlist}%
-  {\item%
-  	\usebibmacro{kicklabel}%
-  }
+ {\list%
+ {\usebibmacro{labelwidthbib}}%
+ {\setlength{\labelwidth}{\labwidthsameline}
+ \setlength{\leftmargin}{\labelwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \setlength{\itemsep}{\bibitemsep}%
+ \setlength{\parsep}{\bibparsep}%
+ \renewcommand*{\makelabel}[1]{##1\hss}%
+ }%
+ }%
+ {\endlist}%
+ {\item%
+ \usebibmacro{kicklabel}%
+ }
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index f2019daab10..5a8ab8b7477 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -1,6 +1,6 @@
 % archaeologie --%
-%            biblatex for archaeologists, 
-%				historians and philologists
+%  biblatex for archaeologists, 
+%  historians and philologists
 % Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
 %  
 % This work may be distributed and/or modified under the
@@ -11,9 +11,9 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie.cbx}%
-               [2016/07/04 v2.02  archaeologie -- 
-     					        biblatex for archaeologists, 
-								historians and philologists, cbx-Datei]
+  [2016/07/15 v2.03  archaeologie -- 
+  biblatex for archaeologists, 
+  historians and philologists, cbx-Datei]
 %-----------------------
 \newbool{cbx:yearinparens}
 \newbool{cbx:seenote}
@@ -23,165 +23,168 @@
 \newcommand*{\cbx@tseen@names}{}
 \newrobustcmd*{\cbx@nameseen}[1]{%
   \iftoggle{blx@footnote}
-    {\listcsxadd{cbx@fseen@names}{#1}}
-    {\listcsxadd{cbx@tseen@names}{#1}}}
+  {\listcsxadd{cbx@fseen@names}{#1}}
+  {\listcsxadd{cbx@tseen@names}{#1}}}
 \newrobustcmd*{\cbx@ifnameseen}[1]{%
   \iftoggle{blx@footnote}
-    {\xifinlistcs{#1}{cbx@fseen@names}}
-    {\xifinlistcs{#1}{cbx@tseen@names}}}
+  {\xifinlistcs{#1}{cbx@fseen@names}}
+  {\xifinlistcs{#1}{cbx@tseen@names}}}
   
 \renewcommand*{\multicitedelim}{\addsemicolon\addspace}
 \newcommand*{\labelyeardelim}{\addspace}
 \renewcommand{\textcitedelim}{\multicitedelim}
 \renewcommand{\postnotedelim}{%
   \ifboolexpr{bool {cbx:ancient}%
-             	 	or bool {cbx:frgancient}%
-			   		or bool {cbx:corpus}%
-              }%
-    {\addspace}%
-    {\newunitpunct}%
+  or bool {cbx:frgancient}%
+   or bool {cbx:corpus}%
+  }%
+  {\addspace}%
+  {\newunitpunct}%
 }
 %-----------------------
 \DeclareBibliographyOption{yearinparens}[true]{%
   \ifstrequal{#1}{true}
-    {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}
-    \csuse{bool#1}{cbx:yearinparens}}
-    {\DeclareFieldFormat{citeyear}{##1}}}  
+  {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}
+  \csuse{bool#1}{cbx:yearinparens}}
+  {\DeclareFieldFormat{citeyear}{##1}}}  
 \DeclareBibliographyOption{seenote}[true]{\csuse{bool#1}%
-	{cbx:seenote}%
-	\ExecuteBibliographyOptions{maxnames=999}%
-	}%
+  {cbx:seenote}%
+  \ExecuteBibliographyOptions{maxnames=999}%
+  }%
 \DeclareBibliographyOption[string]{citeauthorformat}{%
-  	\ifcsdef{cbx@arch@citeauthorformat@#1}
-    	{\csuse{cbx@arch@citeauthorformat@#1}}
-    	{\PackageError{biblatex-archaeologie}
-       {Option 'citeauthorformat=#1' invalid}
-       {The option you have supplied is invalid.\MessageBreak
-        Use one of the values 'initials', 'full', 'family' or 'firstfull'.}}}
+  \ifcsdef{cbx@arch@citeauthorformat@#1}
+  {\csuse{cbx@arch@citeauthorformat@#1}}
+  {\PackageError{biblatex-archaeologie}
+   {Option 'citeauthorformat=#1' invalid}
+   {The option you have supplied is invalid.\MessageBreak
+  Use one of the values 'initials', 'full', 'family' or 'firstfull'.}}}
 %-----------------------
 \DeclareFieldFormat{citeyear}{#1}
-\DeclareFieldFormat{prenote}{#1\isdot}%
-\DeclareFieldFormat{postnote}{#1}%
-\DeclareFieldFormat{shorttitle}{#1}%      
+\DeclareFieldFormat{prenote}{#1\isdot}
+\DeclareFieldFormat{postnote}{#1}
+\DeclareFieldFormat{shorttitle}{#1}
 \DeclareFieldFormat{pages}{#1}
 
 \DeclareNameFormat{labelname}{%
   \ifcase\value{uniquename}%
-    \usebibmacro{name:family}
-      {\namepartfamily}
-      {\namepartgiven}
-      {\namepartprefix}
-      {\namepartsuffix}%
+  \usebibmacro{name:family}
+  {\namepartfamily}
+  {\namepartgiven}
+  {\namepartprefix}
+  {\namepartsuffix}%
   \or
-    \ifuseprefix
-      {\usebibmacro{name:family-given}
-        {\namepartfamily}
-        {\namepartgiveni}
-        {\namepartprefix}
-        {\namepartsuffixi}}
-      {\usebibmacro{name:family-given}
-        {\namepartfamily}
-        {\namepartgiveni}
-        {\namepartprefixi}
-        {\namepartsuffixi}}%
+  \ifuseprefix
+  {\usebibmacro{name:family-given}
+  {\namepartfamily}
+  {\namepartgiveni}
+  {\namepartprefix}
+  {\namepartsuffixi}}
+  {\usebibmacro{name:family-given}
+  {\namepartfamily}
+  {\namepartgiveni}
+  {\namepartprefixi}
+  {\namepartsuffixi}}%
   \or
-   	\usebibmacro{name:family-given}
-      {\namepartfamily}
-      {\namepartgiven}
-      {\namepartprefix}
-      {\namepartsuffix}%
+   \usebibmacro{name:family-given}
+  {\namepartfamily}
+  {\namepartgiven}
+  {\namepartprefix}
+  {\namepartsuffix}%
   \fi
   \usebibmacro{name:andothers}}
   
-
+ \DeclareNameFormat{name:family}{%
+  \ifcase\value{uniquename}%
+  \usebibmacro{name:family}
+  {\namepartfamily}
+  {\namepartgiven}
+  {\namepartprefix}
+  {\namepartsuffix}%
+  \or
+  \ifuseprefix
+  {\usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiveni}
+  {\namepartprefix}
+  {\namepartsuffixi}}
+  {\usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiveni}
+  {\namepartprefixi}
+  {\namepartsuffixi}}%
+  \or
+   \usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiven}
+  {\namepartprefix}
+  {\namepartsuffix}%
+  \fi
+  \usebibmacro{name:andothers}}
   
-\DeclareNameFormat{frg}{%
-        \nameparts{#1}%
-        \ifgiveninits%
-          {\usebibmacro{name:family}
-          {\namepartfamily}
-          {\namepartgiveni}
-          {\namepartprefix}
-          {\namepartsuffix}}
-        {\usebibmacro{name:family}
-          {\namepartfamily}
-          {\namepartgiven}
-          {\namepartprefix}
-          {\namepartsuffix}}%
-      \usebibmacro{name:andothers}}
-     
+ \DeclareNameFormat{name:initials}{%
+  \ifnum\value{uniquename}=2%
+  \usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiven}
+  {\namepartprefix}
+  {\namepartsuffix}%
+  \else
+  \ifuseprefix
+  {\usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiveni}
+  {\namepartprefix}
+  {\namepartsuffixi}}
+  {\usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiveni}
+  {\namepartprefixi}
+  {\namepartsuffixi}}%
+  \fi
+  \usebibmacro{name:andothers}}
+  
+   
 \def\cbx@arch@citeauthorformat@family{%
-  \DeclareNameFormat{citeauthor}{%
-    \usebibmacro{name:family}
-      {\namepartfamily}
-      {\namepartgiven}
-      {\namepartprefix}
-      {\namepartsuffix}%
-    \usebibmacro{name:andothers}}}
+  \DeclareNameAlias{citeauthor}{name:family}}
 
 \def\cbx@arch@citeauthorformat@full{%
-  \DeclareNameFormat{citeauthor}{%
-    \usebibmacro{name:given-family}
-      {\namepartfamily}
-      {\namepartgiven}
-      {\namepartprefix}
-      {\namepartsuffix}%
-    \usebibmacro{name:andothers}}}
+  \DeclareNameAlias{citeauthor}{given-family}}
 
 \def\cbx@arch@citeauthorformat@initials{%
-  \DeclareNameFormat{citeauthor}{%
-    \ifuseprefix
-      {\usebibmacro{name:given-family}
-        {\namepartfamily}
-        {\namepartgiveni}
-        {\namepartprefix}
-        {\namepartsuffixi}}
-      {\usebibmacro{name:given-family}
-        {\namepartfamily}
-        {\namepartgiveni}
-        {\namepartprefixi}
-        {\namepartsuffixi}}%
-    \usebibmacro{name:andothers}}}
+   \DeclareNameAlias{citeauthor}{name:initials}}
 
 \def\cbx@arch@citeauthorformat@firstfull{%
   \DeclareNameFormat{citeauthor}{%
-    \cbx@ifnameseen{\thefield{hash}}
-      {\ifuseprefix
-        {\usebibmacro{name:given-family}
-          {\namepartfamily}
-          {\namepartgiveni}
-          {\namepartprefix}
-          {\namepartsuffixi}}
-        {\usebibmacro{name:given-family}
-          {\namepartfamily}
-          {\namepartgiveni}
-          {\namepartprefixi}
-          {\namepartsuffixi}}}
-      {\usebibmacro{name:given-family}
-        {\namepartfamily}
-        {\namepartgiven}
-        {\namepartprefix}
-        {\namepartsuffix}%
-       \cbx@nameseen{\thefield{hash}}}%
-    \usebibmacro{name:andothers}}}
-    
-\DeclareNameFormat{name:inreference}{%
-    \ifuseprefix
-      {\usebibmacro{name:given-family}
-        {\namepartfamily}
-        {\namepartgiveni}
-        {\namepartprefix}
-        {\namepartsuffixi}}
-      {\usebibmacro{name:given-family}
-        {\namepartfamily}
-        {\namepartgiveni}
-        {\namepartprefixi}
-        {\namepartsuffixi}}%
-    \usebibmacro{name:andothers}}
-%-----------------------    
+  \cbx@ifnameseen{\thefield{hash}}
+  {\ifnum\value{uniquename}=2%
+  \usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiven}
+  {\namepartprefix}
+  {\namepartsuffix}%
+  \else
+  \ifuseprefix
+  {\usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiveni}
+  {\namepartprefix}
+  {\namepartsuffixi}}
+  {\usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiveni}
+  {\namepartprefixi}
+  {\namepartsuffixi}}}
+  {\usebibmacro{name:given-family}
+  {\namepartfamily}
+  {\namepartgiven}
+  {\namepartprefix}
+  {\namepartsuffix}%
+   \cbx@nameseen{\thefield{hash}}}%
+  \usebibmacro{name:andothers}}}
+%-----------------------  
 \ExecuteBibliographyOptions{%
   citetracker=true,% 
-  idemtracker=false,% 
+  idemtracker=true,% 
   ibidtracker=true,%
   opcittracker=true,%
   loccittracker=true,%
@@ -192,26 +195,26 @@
 %-----------------------
 \renewbibmacro*{postnote}{%
 \iffieldundef{postnote}%
-    {}%
-    {\postnotedelim\printfield{postnote}%
-     \ifbool{cbx:frgancient}%
-       {\setunit{\addspace}%
+  {}%
+  {\postnotedelim\printfield{postnote}%
+   \ifbool{cbx:frgancient}%
+   {\setunit{\addspace}%
   \usebibmacro{cite:frgname}}%
  }%
  }
 %-----------------------
 \newbibmacro*{cite:frgname}{%
-      \ifnameundef{shorteditor}%
-           {\printnames[frg]{editor}}%
-           {\printnames[frg]{shorteditor}}%
+  \ifnameundef{shorteditor}%
+   {\printnames[name:family]{editor}}%
+   {\printnames{shorteditor}}%
 }
 %-----------------------
 \newbibmacro*{seenote}{%
 \ifnameundef{labelname}%
-           {\usebibmacro{cite:label}%
-            \setunit{\labelyeardelim}}%
-           {\printnames{labelname}%
-            \setunit{\nameyeardelim}}%
+   {\usebibmacro{cite:label}%
+  \setunit{\labelyeardelim}}%
+   {\printnames{labelname}%
+  \setunit{\nameyeardelim}}%
 \setunit{\addspace}%
 \bibstring{loccit}\addspace%
 \printtext[parens]{\bibstring{seenote}\addspace%
@@ -221,133 +224,136 @@
 %-----------------------
 \newbibmacro*{cite:title}{\printfield{labeltitle}}%  
 %-----------------------
-\newbibmacro*{cite:year}{%            
+\newbibmacro*{cite:year}{%  
   \iffieldundef{labelyear}%
-    {}%
-    {{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}}}
+  {}%
+  {{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}}}
 %-----------------------
 \newbibmacro*{cite:lexikon}{%
-	\printfield{booktitle}%
-  		\setunit{\addspace}%
-  	\printfield{volume}%
-  		\setunit{\addspace}%
-  	\printfield[parens]{year}%
-  		\setunit{\addspace}%
-  	\iffieldundef{postnote}%
-  			{\printfield{pages}}%
-  			{\printfield{postnote}}%
-  	 \usebibmacro{inreference:title+author}
+  \printfield{booktitle}%
+  \setunit{\addspace}%
+  \printfield{volume}%
+  \setunit{\addspace}%
+  \printfield[parens]{year}%
+  \setunit{\addspace}%
+  \iffieldundef{postnote}%
+  {\printfield{pages}}%
+  {\printfield{postnote}}%
+\usebibmacro{inreference:title+author}%
 }
 %-----------------------
 \newbibmacro{cite:seenote}{%
 \ifboolexpr{bool{cbx:ancient}%
-				or bool{cbx:frgancient}% 
-				or bool{cbx:corpus}}%
-		{\usebibmacro{cite:shorthand}}%
-		{\ifciteseen{\usebibmacro{seenote}}{%
-  	\ifboolexpr{%
-  	test {\ifentrytype{book}}%
-  	or %
-  	 test {\ifentrytype{proceedings}}%
-  	or %
-  	test {\ifentrytype{inreference}}%
-  	}{\renewcommand{\postnotedelim}{\addspace}}{}%
+  or bool{cbx:frgancient}% 
+  or bool{cbx:corpus}}%
+  {\usebibmacro{cite:shorthand}}%
+  {\ifciteseen{\usebibmacro{seenote}}{%
+  \ifboolexpr{%
+  test {\ifentrytype{book}}%
+  or %
+   test {\ifentrytype{proceedings}}%
+  or %
+  test {\ifentrytype{inreference}}%
+  }{\renewcommand{\postnotedelim}{\addspace}}{}%
   \bibhypertarget{ref:\thefield{entrykey}}{%
-        \usedriver{}{\thefield{entrytype}}%
-         \iffootnote{\label{footref:\thefield{entrykey}}}%
+  \usedriver{}{\thefield{entrytype}}%
+   \iffootnote{\label{footref:\thefield{entrykey}}}%
    }}}%
 }
 %-----------------------
 \newbibmacro{cite}{%
-	\ifboolexpr{%
-		 test {\ifbool{bbx:inreferences}}%
-		 and %
-		 test	{\ifentrytype{inreference}}%
-		 }%
-{\usebibmacro{cite:lexikon}}{%
-\ifbool{cbx:seenote}{\usebibmacro{cite:seenote}}{%
-      {\printtext[bibhyperref]{\iffieldundef{shorthand}%
-        {\ifnameundef{labelname}%
-           {\usebibmacro{cite:label}%
-            \setunit{\labelyeardelim}}%
-           {\printnames{labelname}%
-            \setunit{\nameyeardelim}}%
-        \usebibmacro{cite:year}}%
-        {\usebibmacro{cite:shorthand}}}}%
-       }%
-    }%
+  \ifboolexpr{%
+   test {\ifbool{bbx:inreferences}}%
+   and %
+   test {\ifentrytype{inreference}}%
+   }%
+  {\usebibmacro{cite:lexikon}}
+  {\ifbool{cbx:seenote}
+  {\usebibmacro{cite:seenote}}
+  {{\printtext[bibhyperref]{\iffieldundef{shorthand}%
+  {\ifnameundef{labelname}%
+   {\usebibmacro{cite:label}%
+   \setunit{\labelyeardelim}%
+  }%
+   {\printnames{labelname}%
+  \setunit{\nameyeardelim}}%
+  \usebibmacro{cite:year}}%
+  {\usebibmacro{cite:shorthand}%
+  }}}%
+  }%
+  }%
   \ifciteseen{\global\booltrue{cbx:seen}}%
-                  {\global\boolfalse{cbx:seen}}%
+  {\global\boolfalse{cbx:seen}}%
   \usebibmacro{savestuff}%
 }
 %-----------------------
 \newbibmacro*{citeyear}{%
   \iffieldundef{shorthand}%
-    {\iffieldundef{labelyear}%
-       {\usebibmacro{cite:label}}%
-       {\usebibmacro{cite:labelyear+extrayear}}}%
-    {\usebibmacro{cite}}}
+  {\iffieldundef{labelyear}%
+   {\usebibmacro{cite:label}}%
+   {\usebibmacro{cite:labelyear+extrayear}}}%
+  {\usebibmacro{cite}}}
 %-----------------------
 \newbibmacro*{textcite}{%aus authoryear
   \ifnameundef{labelname}%
-    {\iffieldundef{shorthand}%
-       {\usebibmacro{cite:label}%
-        \setunit{%
-          \global\booltrue{cbx:yearinparens}%
-          \nonameyeardelim\bibopenparen}%
-        \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}%
-          {}%
-        \usebibmacro{cite:labelyear+extrayear}}%
-       {\usebibmacro{cite}}}%
-    {\printnames{labelname}%
-     \setunit{%
-       \global\booltrue{cbx:yearinparens}%
-       \nameyeardelim\bibopenparen}%
-     \usebibmacro{citeyear}}}
+  {\iffieldundef{shorthand}%
+   {\usebibmacro{cite:label}%
+  \setunit{%
+  \global\booltrue{cbx:yearinparens}%
+  \nonameyeardelim\bibopenparen}%
+  \ifnumequal{\value{citecount}}{1}%
+  {\usebibmacro{prenote}}%
+  {}%
+  \usebibmacro{cite:labelyear+extrayear}}%
+   {\usebibmacro{cite}}}%
+  {\printnames{labelname}%
+   \setunit{%
+   \global\booltrue{cbx:yearinparens}%
+   \nameyeardelim\bibopenparen}%
+   \usebibmacro{citeyear}}}
 %-----------------------
 \newbibmacro*{cite:shorthand}{%
   \ifbool{cbx:seenote}%
-  		{\printtext{\printfield{shorthand}}}%
-  		{\printtext[bibhyperref]{\printfield{shorthand}}}}
+  {\printtext{\printfield{shorthand}}}%
+  {\printtext[bibhyperref]{\printfield{shorthand}}}}
 %-----------------------
 \newbibmacro*{cite:label}{%
   \iffieldundef{label}%
-    {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}%
-    {\printtext[bibhyperref]{\printfield{label}}}}
+  {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}%
+  {\printtext[bibhyperref]{\printfield{label}}}}
 %-----------------------
 \newbibmacro*{cite:labelyear+extrayear}{%
   \iffieldundef{labelyear}%
-    {}%
-    {\printtext[bibhyperref]{%
-       \printfield{labelyear}%
-       \printfield{extrayear}}}}
+  {}%
+  {\printtext[bibhyperref]{%
+   \printfield{labelyear}%
+   \printfield{extrayear}}}}
 %-----------------------
 \newbibmacro*{textcite:postnote}{%
   \iffieldundef{postnote}%
-    {\ifbool{cbx:yearinparens}%
-       {\bibcloseparen}%
-       {}}%
-    {\ifbool{cbx:yearinparens}%
-       {\setunit{\postnotedelim}}%
-       {\setunit{\extpostnotedelim\bibopenparen}}%
-     \printfield{postnote}%
-      \ifbool{cbx:frgancient}%
-       {\setunit{\addthinspace}%
+  {\ifbool{cbx:yearinparens}%
+   {\bibcloseparen}%
+   {}}%
+  {\ifbool{cbx:yearinparens}%
+   {\setunit{\postnotedelim}}%
+   {\setunit{\extpostnotedelim\bibopenparen}}%
+   \printfield{postnote}%
+  \ifbool{cbx:frgancient}%
+   {\setunit{\addthinspace}%
   \usebibmacro{cite:frgname}%
   \bibcloseparen}%
   \bibcloseparen}}
 %-----------------------
-\DeclareCiteCommand{\cite}%              
- 	 {\usebibmacro{prenote}}%
-	{\usebibmacro{citeindex}%
-		\usebibmacro{cite}}%
-	{\multicitedelim}%
-	{\ifboolexpr{%
-		test{\ifbool{bbx:inreferences}}%
-		and%
-		test{\ifentrytype{inreference}}%
-		}{}{\usebibmacro{postnote}}}%
+\DeclareCiteCommand{\cite}%  
+  {\usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+  \usebibmacro{cite}}%
+  {\multicitedelim}%
+  {\ifboolexpr{%
+  test{\ifbool{bbx:inreferences}}%
+  and%
+  test{\ifentrytype{inreference}}%
+  }{}{\usebibmacro{postnote}}}%
 %-----------------------
 \DeclareCiteCommand{\textcite}%aus authoryear
   {\boolfalse{cbx:yearinparens}%
@@ -355,16 +361,16 @@
   }%
   {\usebibmacro{citeindex}%
    \iffirstcitekey%
-     {\setcounter{textcitetotal}{1}}%
-     {\stepcounter{textcitetotal}%
-      \textcitedelim}%
+   {\setcounter{textcitetotal}{1}}%
+   {\stepcounter{textcitetotal}%
+  \textcitedelim}%
    \ifbool{cbx:seenote}{\usebibmacro{cite:seenote}}%
-   				{\usebibmacro{textcite}}}%
+   {\usebibmacro{textcite}}}%
   {\ifbool{cbx:parens}%
-     {\bibcloseparen\global\boolfalse{cbx:yearinparens}}%
-     {}}%
+   {\bibcloseparen\global\boolfalse{cbx:yearinparens}}%
+   {}}%
   {\ifbool{cbx:seenote}{\usebibmacro{postnote}}%
-  				{\usebibmacro{textcite:postnote}}}
+  {\usebibmacro{textcite:postnote}}}
 %----------------------- 
 \DeclareCiteCommand{\parencite}[\mkbibparens]%
   {\usebibmacro{prenote}}%
@@ -378,42 +384,54 @@
   }{}{\usebibmacro{postnote}}}%
 %-----------------------  
 \DeclareMultiCiteCommand{\cites}%
-        {\cite}{\multicitedelim}
+  {\cite}{\multicitedelim}
 \DeclareMultiCiteCommand{\parencites}[\mkbibparens]%
-        {\parencite}{\multicitedelim}
+  {\parencite}{\multicitedelim}
    \DeclareMultiCiteCommand{\textcites}%
-        {\textcite}{\textcitedelim} 
+  {\textcite}{\textcitedelim} 
 %----------------------- 
 \DeclareCiteCommand{\citeauthor}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \renewcommand*{\multinamedelim}{\addcomma\space}%
    \renewcommand*{\finalnamedelim}{%
-     \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
-     \addspace\bibstring{and}\space}%
+   \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+   \addspace\bibstring{and}\space}%
    \usebibmacro{prenote}}%
   {\ifciteindex
-     {\indexnames{labelname}}
-     {}%
-   \printtext[bibhyperref]{%
-   		\printnames[citeauthor]{labelname}}}
+   {\indexnames{labelname}}
+   {}%
+\ifboolexpr{%
+   test {\ifbool{bbx:inreferences}}%
+   and %
+   test  {\ifentrytype{inreference}}%
+   }%
+  {\printtext}%
+  {\printtext[bibhyperref]}
+  {\printnames[citeauthor]{labelname}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 %-----------------------
 \DeclareCiteCommand{\citetitle} %
   {\boolfalse{citetracker}%
-    \boolfalse{pagetracker}%
-    \usebibmacro{prenote}}%
-  {\printtext[bibhyperref]{%
+  \boolfalse{pagetracker}%
+  \usebibmacro{prenote}}%
+  {\ifboolexpr{%
+   test {\ifbool{bbx:inreferences}}%
+   and %
+   test  {\ifentrytype{inreference}}%
+   }%
+   {\printtext}%
+  {\printtext[bibhyperref]}{%
    \ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}%
-      {\printtext[emph]{\usebibmacro{cite:title}}% 
-      			\setunit{\addspace}%
-      			\printtext[parens]{\printfield{year}%
-      					\iffieldundef{origyear}{}%
-      					{\addspace\printfield[parens]{origyear}}}%
-     	    	}}}%
-    {\multicitedelim}%
-    {\usebibmacro{postnote}}%
+  {\printtext[emph]{\usebibmacro{cite:title}}% 
+  \setunit{\addspace}%
+  \printtext[parens]{\printfield{year}%
+  \iffieldundef{origyear}{}%
+  {\addspace\printfield[parens]{origyear}}}%
+   }}}%
+  {\multicitedelim}%
+  {\usebibmacro{postnote}}%
 
 \endinput
 %% End of file `archaeologie.cbx'.
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
index 9ae23d368fa..acdc0caccc8 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
@@ -11,9 +11,9 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie.dbx}%
-               [2016/07/04 v2.02  archaeologie -- 
-                            biblatex for archaeologists, 
-							historians and philologists, dbx-Datei]
+  [2016/07/15 v2.03  archaeologie -- 
+  biblatex for archaeologists, 
+  historians and philologists, dbx-Datei]
                 
  % new translator etc.  fields for "inner" work, that is translator of title (not booktitle) in @in...
 \DeclareDatamodelFields[type=list,datatype=name]{ineditor, intranslator, inannotator, incommentator, inintroduction, inforeword, inafterword}