archaeologie (8jun16)

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

8 files changed, 1232 insertions, 926 deletions

diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
index c1375cb6e2f..59a5433228c 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
@@ -1,5 +1,6 @@
 % archaeologie --%
-%               biblatex fuer Archaeologen, Historiker und Philologen
+%            biblatex for archaeologists, 
+%				historians and philologists
 % Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
 %  
 % This work may be distributed and/or modified under the
@@ -9,34 +10,31 @@
 %   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-english.lbx}%
-               [2016/03/17 v1.42  archaeologie --%
-                biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei]
+               [2016/06/06 v2.0  archaeologie --%
+            				  biblatex for archaeologists, 
+							historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{english}
 
 \NewBibliographyString{origtitle}
 \NewBibliographyString{firstprint}
-\NewBibliographyString{reviewof}
 \NewBibliographyString{reference}
-\NewBibliographyString{translationof}
-
+\NewBibliographyString{talk}
+\NewBibliographyString{editor}
 
 \DeclareBibliographyStrings{%
   inherit          = {english},
-    translationof = {{Translation\addspace of}{Transl\adddot\addspace of}},
   reference = {{Article}{Art\adddot}},
-  reviewof = {{review\addspace of}{review\addspace of}},
   origtitle = {{original title}{orig\adddot title}},
   firstprint = {{first\addspace edition}{first\addspace edition}},
-    fromamerican     ={{from American} {from\addspace American}},
+  talk = {{talk}{talk}},
+  fromamerican     ={{from\addspace American} {from\addspace American}},
   frombrazilian    = {{from\addspace Brazilian}{from\addspace Brazilian}},
   fromcroatian     = {{from\addspace Croatian}{from\addspace Croatian}},
   fromdanish       = {{from\addspace Danish}{from\addspace Danish}},
   fromdutch        = {{from\addspace Dutch}{from\addspace Dutch}},
   fromenglish      = {{from\addspace English}{from\addspace English}},
-  fromfinnish      = {{frin Finnish}{from\addspace Finnish}},
+  fromfinnish      = {{from\addspace Finnish}{from\addspace Finnish}},
   fromfrench       = { {from\addspace French}{from\addspace French}},
   fromgerman       ={{from\addspace German} {from\addspace German}},
   fromgreek        = {{from\addspace Greek}{from\addspace Greek}},
@@ -48,7 +46,4 @@
   fromspanish      = {{from\addspace Spanish}{from\addspace Spanish}},
   fromswedish      = {{from\addspace Swedish}{from\addspace Swedish}},
 }
-
-
-
-\endinput
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
index 3d7a251a5eb..7a4f9eee64d 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
@@ -1,5 +1,6 @@
 % archaeologie --%
-%               biblatex fuer Archaeologen, Historiker und Philologen
+%            biblatex for archaeologists, 
+%				historians and philologists
 % Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
 %  
 % This work may be distributed and/or modified under the
@@ -12,27 +13,43 @@
 
 
 \ProvidesFile{archaeologie-french.lbx}%
-               [2016/03/17 v1.42  archaeologie --%
-                biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei]
+               [2016/06/06 v2.0  archaeologie --%
+					            biblatex for archaeologists, 
+								historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{french}
-\DefineBibliographyExtras{french}{\restorecommand\mkbibnamelast}
+\DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily}
 
 \NewBibliographyString{origtitle}
 \NewBibliographyString{firstprint}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{reference}
 \NewBibliographyString{translationof}
-
-
-%\DeclareBibliographyStrings{%
-%  inherit          = {english},
-%    translationof = {{Translation\addspace of}{Transl\adddot\addspace of}},
-%  reference = {{Article}{Art\adddot}},
-%  reviewof = {{critique\addspace du}{critique\addspace du}},
-%  origtitle = {{original title}{orig\adddot title}},
-%  firstprint = {{first\addspace edition}{first\addspace edition}},
-%}
-
-
-
-\endinput
+\NewBibliographyString{talk}
+
+
+\DeclareBibliographyStrings{%
+  inherit          = {french},
+  translationof    = {{traduction\addspace de}{trad\adddot\addspace de}},
+  reference        = {{article}{art\adddot}},
+  reviewof         = {{recension\addspace de}{rec\adddot\addspace de}},
+  origtitle 	    = {{titre original}{titre orig.\adddot}},
+  firstprint       = {{première\addspace édition}{première\addspace éd\adddot}},
+  talk 		    = {{conférence}{conf.}},
+  fromamerican     = {{depuis\addspace l'anglais américain} {depuis\addspace l'anglais américain}},
+  frombrazilian    = {{depuis\addspace le\addspace brésilien}{depuis\addspace le\addspace brésilien}},
+  fromcroatian     = {{depuis\addspace le\addspace croatien}{depuis\addspace le\addspace croatien}},
+  fromdanish       = {{depuis\addspace le\addspace danois}{depuis\addspace le\addspace danois}},
+  fromdutch        = {{depuis\addspace le\addspace néerlandais}{depuis\addspace le\addspace néerlandais}},
+  fromenglish      = {{depuis\addspace l'anglais}{depuis l'anglais}},
+  fromfinnish      = {{depuis\addspace Finnish}{depuis\addspace le\addspace Finnish}},
+  fromfrench       = {{depuis\addspace le\addspace français}{depuis\addspace le\addspace français}},
+  fromgerman       = {{depuis\addspace l'allemand} {depuis\addspace l'allemand}},
+  fromgreek        = {{depuis\addspace le\addspace grec}{depuis\addspace le\addspace grec}},
+  fromitalian      = {{depuis\addspace l'italien}{depuis l'italien}},
+  fromlatin        = {{depuis\addspace le\addspace latin}{depuis\addspace le\addspace latin}},
+  fromnorwegian    = {{depuis\addspace le\addspace norvégien}{depuis\addspace le\addspace norvégien}},
+  fromportuguese   = {{depuis\addspace le\addspace portugais}{depuis\addspace le\addspace portugais}},
+  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}},
+}
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
index bdd77fd3456..d1924002398 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
@@ -1,5 +1,6 @@
 % archaeologie --%
-%               biblatex fuer Archaeologen, Historiker und Philologen
+%            biblatex for archaeologists, 
+%				historians and philologists
 % Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
 %  
 % This work may be distributed and/or modified under the
@@ -12,8 +13,9 @@
 
 
 \ProvidesFile{archaeologie-italian.lbx}%
-               [2016/03/17 v1.42  archaeologie --%
-                biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei]
+               [2016/06/06 v2.0  archaeologie --                      
+                      biblatex for archaeologists, 
+						historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{italian}
 
 \NewBibliographyString{origtitle}
@@ -21,7 +23,7 @@
 \NewBibliographyString{reviewof}
 \NewBibliographyString{reference}
 \NewBibliographyString{translationof}
-
+\NewBibliographyString{talk}
 \NewBibliographyString{inpreparation}
 \NewBibliographyString{submitted}
 \NewBibliographyString{forthcoming}
@@ -31,16 +33,16 @@
 
 \DeclareBibliographyStrings{%
   inherit          = {italian},
-    translationof = {{traduzione\addspace di}{trad\adddot\addspace di}},
+  translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}},
   reference = {{articolo}{art\adddot}},
-  reviewof = {{recensione\addspace di}{recens\adddot\addspace di}},
+  reviewof = {{recensione\addspace di}{recens\adddot\addabthinspace di}},
   origtitle = {{titolo\addspace originale}{titolo\addspace orig\adddot}},
-  firstprint = {{primo\addspace edizione}{primo\addspace edizione}},
-  %
-  editor = {{Ed\adddot}{Ed\adddot}},
-  inpreparation = {{}{}},
+  firstprint = {{prima\addspace edizione}{prima\addspace edizione}},
+  talk = {{presentazione}{presentazione}},
+ % editor = {{Editore}{Ed\adddot}}, %predefined
+  inpreparation = {{in\addspace preparazione}{in prep\adddot}},
   submitted = {{}{}},
-  inpress = {{}{}},
+  inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}},
   prepublished = {{}{}},
   forthcoming = {{prossimo}{prossimo}},
 }
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
index 681a0d75e45..e914291d857 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
@@ -1,5 +1,6 @@
 % archaeologie --%
-%               biblatex fuer Archaeologen, Historiker und Philologen
+%            biblatex for archaeologists, 
+%				historians and philologists
 % Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
 %  
 % This work may be distributed and/or modified under the
@@ -12,8 +13,9 @@
 
 
 \ProvidesFile{archaeologie-ngerman.lbx}%
-               [2016/03/17 v1.42  archaeologie --%
-                biblatex fuer Archaeologen, Historiker und Philologen, lbx-Datei]
+               [2016/06/06 v2.0  archaeologie --
+                           biblatex for archaeologists, 
+							historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{ngerman}
 
 \NewBibliographyString{origtitle}
@@ -21,6 +23,10 @@
 \NewBibliographyString{reviewof}
 \NewBibliographyString{reference}
 \NewBibliographyString{translationof}
+\NewBibliographyString{talk}
+
+\NewBibliographyString{seenote}
+\NewBibliographyString{loccit}
 
 
 \DeclareBibliographyStrings{%
@@ -28,7 +34,10 @@
   reference = {{Artikel}{Art\adddot}},
   reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}},
   origtitle = {{Originaltitel}{Orig\adddot titel}},
-  firstprint = {Erstauflage}{Erstaufl\adddot},
+  firstprint = {{Erstauflage}{Erstaufl\adddot}},
+  talk = {{Vortrag}{Vortrag}},
+  seenote = {{Anmerkung}{Anm\adddot}},
+  loccit = {{am\addabthinspace Ort}{a\adddot\addabthinspace O\adddot}},
   translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}},
  }
 \endinput
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
new file mode 100644
index 00000000000..1ea3c75d59f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
@@ -0,0 +1,32 @@
+% archaeologie --%
+%            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
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+
+\ProvidesFile{archaeologie-spanish.lbx}%
+               [2016/06/06 v2.0  archaeologie --%
+          				 biblatex for archaeologists, 
+						historians and philologists, lbx-Datei]
+\InheritBibliographyExtras{spanish}
+
+\NewBibliographyString{origtitle}
+\NewBibliographyString{firstprint}
+\NewBibliographyString{reference}
+\NewBibliographyString{talk}
+
+\DeclareBibliographyStrings{%
+  inherit          = {spanish},
+  reference = {{}{}},
+  origtitle = {{título\addspace original}{título\addspace original}},
+  firstprint = {{edición}{edición}},
+  talk = {{charla}{charla}},
+}
+\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 9c92f144cb4..381a59491dc 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -1,5 +1,6 @@
 % archaeologie --%
-%               biblatex fuer Archaeologen, Historiker und Philologen
+%            biblatex for archaeologists, 
+%				historians and philologists
 % Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
 %  
 % This work may be distributed and/or modified under the
@@ -9,100 +10,113 @@
 %   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/03/17 v1.42  archaeologie --%
-                biblatex fuer Archaeologen, Historiker und Philologen, bbx-Datei]
+               [2016/06/06 v2.0  archaeologie -- 
+                biblatex for archaeologists, 
+                historians and philologists, bbx-file]
 \RequireBibliographyStyle{standard}
 \AtBeginDocument{%
-\urlstyle{sf}%
-\typeout{* * * archaeologie * * *  biblatex fuer Archaeologen, 
-Historiker und Philologen}
+		\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,%
-}%
-
-
-\newbool{bbx:edby}%hrsgv
-\newbool{bbx:width}%abstand
-\newbool{bbx:yearseries}%jahrserie  
-\newbool{bbx:bibfullname}%bibfullnames
-\newbool{bbx:inreferences}		%lexika
-\newbool{bbx:noabbrevs}%		keineabkuerzung
-\newbool{bbx:translation}%		uebersetzung
-\newbool{bbx:publisher}% 	verlag		
-\newbool{bbx:initials}%
-\newbool{bbx:counter}%			
-
-\newbool{cbx:antik}%
-\newbool{cbx:frgantik}%
-\newbool{cbx:corpus}%		
-\newbool{cbx:lastnames}%	nurnachname	
-\newbool{cbx:fullnames}%	vollername	
-
-	
+	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,%
+}
+%-----------------------
+\newbool{bbx:edby}
+\newbool{bbx:width}
+\newbool{bbx:yearseries}  
+\newbool{bbx:bibfullname}
+\newbool{bbx:inreferences}
+\newbool{bbx:noabbrv}
+\newbool{bbx:translation}
+\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}
+\newbool{bib:lstlocations}
+\newbool{bib:lstpublishers}
+\newsavebox\arch@labelbox
 \newlength{\labwidthsameline}
-\setlength{\labwidthsameline}{4em}
-
-
-\DeclareBibliographyOption{strings}[true]{%
-\addbibresource{archaeologie-abbrv.bib}
-%\addbibresource{archaeologie-corpora.bib} 
+	\setlength{\labwidthsameline}{4em}
+%-----------------------
+\DeclareBibliographyOption{lstabbrv}[true]{%
+		\csuse{bool#1}{bib:lstabbrv}%
+		\addbibresource{archaeologie-lstabbrv.bib}
 }
-
-%% \DeclareBibliographyOption %%
+\DeclareBibliographyOption{bibcorpora}[true]{%
+		\addbibresource{archaeologie-bibcorpora.bib}%
+		\ifbool{bib:lstabbrv}%
+				{}%
+				{\addbibresource{archaeologie-lstabbrv.bib}}
+}
+\DeclareBibliographyOption{bibancient}[true]{%
+		\addbibresource{archaeologie-bibancient.bib}%
+}
+\DeclareBibliographyOption{lstlocations}[true]{%
+		\addbibresource{archaeologie-lstlocations.bib}%
+}
+\DeclareBibliographyOption{lstpublishers}[true]{%
+		\addbibresource{archaeologie-lstpublishers.bib}%
+}
+%-----------------------
 \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}}
 \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]{%
+			\ExecuteBibliographyOptions{giveninits=false}}
 \DeclareBibliographyOption{inreferences}[true]{\csuse{bool#1}{bbx:inreferences}
 			\ExecuteBibliographyOptions[inreference]{skipbib=true}}
-\DeclareBibliographyOption{noabbrevs}[true]{\csuse{bool#1}{bbx:noabbrevs}}
+\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,
-			}%
-}
+		\ExecuteBibliographyOptions{maxitems=2}}
 \DeclareBibliographyOption{lastnames}[true]{%
 		\csuse{booltrue}{cbx:lastnames}%
-		\csuse{boolfalse}{cbx:fullnames}%
-		}		
+		\csuse{boolfalse}{cbx:fullnames}	}		
 \DeclareBibliographyOption{fullnames}[true]{%
 		\csuse{boolfalse}{cbx:lastnames}%
-		\csuse{booltrue}{cbx:fullnames}%
-		}
+		\csuse{booltrue}{cbx:fullnames}}
 \DeclareBibliographyOption{scshape}[true]{%
-  \ifstrequal{#1}{true}%
-    {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}%
-    {}}
-    
-%% \DeclareEntryOption %%
-\DeclareEntryOption{antik}[true]{\csuse{bool#1}{cbx:antik}}
-\DeclareEntryOption{frgantik}[true]{%
-  \ifstrequal{#1}{true}{\togglefalse{blx@useauthor}}{}%
-  \csuse{bool#1}{cbx:frgantik}%
+  	\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}%
 }
 \DeclareEntryOption{corpus}[true]{\csuse{bool#1}{cbx:corpus}}
-
+%-----------------------
 \DeclareFieldFormat*{title}{#1}
 \DeclareFieldFormat{subtitle}{#1}
 \DeclareFieldFormat{booktitle}{#1}
@@ -125,109 +139,150 @@ maxbibnames=999,%
 \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}}%
+}
+\DeclareFieldFormat{eprint:jstor}{%
+	\textsc{jstor}%
+	\addcolon\space%
+	\ifhyperref%
+			{\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}%
+			{\nolinkurl{#1}}%
+}
+%-----------------------
+\DeclareFieldAlias{zenon}{eprint:zenon}
+\DeclareFieldAlias{jstor}{eprint:jstor}
+\DeclareFieldAlias{urn}{eprint:urn}
 
+%-----------------------
 \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}
 \DeclareLanguageMapping{italian}{archaeologie-italian}
-
-
-
-
+\DeclareLanguageMapping{spanish}{archaeologie-spanish}
+%-----------------------
 \renewcommand*{\subtitlepunct}{\addperiod\addspace}
 \renewcommand*{\intitlepunct}{\addcolon\addspace}
 \renewcommand*{\newunitpunct}{\addcomma\addspace}
 \newcommand*{\orttrennzeichen}{\addnbspace\textendash\addspace}
-\renewcommand{\finentrypunct}{ 
-		\ifbool{bbx:counter}{%http://tex.stackexchange.com/a/14159/98739
-			\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{\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}}.%
+							}%
+				}%
+				{}%
+}
 \renewcommand{\multinamedelim}{\addnbspace\textendash\addspace}
 \renewcommand{\finalnamedelim}{\multinamedelim}
 \renewcommand*\relateddelim{\addnbspace\textendash\addspace}
 \newcommand*{\volnumdelim}{\addslash}
 \newcommand*{\jourvoldelim}{\addnbspace}
-
-
+%-----------------------
 \DeclareBibliographyAlias{collection}{book}
 \DeclareBibliographyAlias{reference}{book}
 \DeclareBibliographyAlias{institution}{school}
 \DeclareBibliographyAlias{maintitle}{booktitle}
 \DeclareBibliographyAlias{incollection}{inbook}
 \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}}%
+        	\field{shorthand}%
+        	\name{sortname}%
+        	\name{author}%
+        	\name{editor}%
+        	\name{translator}%
+        	\field{sorttitle}%
+       		\field{title}%
+        	}%
     \sort{%
     		\field{sortyear}%
-    		\field{year}}%
+    		\field{year}%
+    		}%
     \sort{%
     		\field{sorttitle}%
-    		\field{title}}%
+    		\field{title}%
+    		}%
     \sort{%
-        \field[padside=left,padwidth=4,padchar=0]{volume}%
-        \literal{0000}}}
-        
+        	\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}}}%   
-            }}  
+    \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{editor}{author}
 \DeclareNameAlias{translator}{author}
-
+%-----------------------
 \DeclareListFormat{location}{%
-  #1\ifthenelse{\value{listcount}<\value{liststop}}%
-          {\orttrennzeichen}{}%
+  	#1\ifthenelse{\value{listcount}<\value{liststop}}%
+          {\orttrennzeichen}%
+          {}%
 }
-
+%-----------------------
 \AtEveryBibitem{%
-  \ifboolexpr{bool {bbx:translation} or bool {cbx:antik} or bool {cbx:frgantik}}%
+  \iffieldequalstr{relatedtype}{translationof}
+    {\savename{translator}{\savedrelatedtranslator}%
+     \clearname{translator}}
+    {}
+  \ifboolexpr{bool {bbx:translation}%
+              or bool {cbx:ancient}%
+              or bool {cbx:frgancient}}%
     {}%
-    {%
-    \clearname{translator}%
-     \clearfield{origtitle}
-	}%
- }
- 
- 
+    {\clearname{translator}%
+     \clearfield{origtitle}}}
+%-----------------------
 \AtBeginDocument{%
-\ifbool{bbx:initials}{%
-\DeclareStyleSourcemap{%%       %http://tex.stackexchange.com/a/295486/98739     
-  \maps[datatype=bibtex]{%
-    \map{%
+	\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*,)}},%
@@ -248,732 +303,897 @@ maxbibnames=999,%
       \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
-}}}
-}{}
+		}}}%
+	}{}%
 }
-     
-%%%%%%%%%%%%%bibmacro%%%%%%%%%%%
-
+%-----------------------
 %% 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{byeditorx}%
-  \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%\setunit{\addcomma\addspace}%\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}}
-
-\renewbibmacro{in:}{\ifthenelse{% 		
+  	\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%
+}   
+%-----------------------
+\newbibmacro{kicklabel}{% 
+  	\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%
-				}%
-		}%
+	{}%
+	{\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}%
+  	\iffieldundef{zenon}%
+    		{}%
+    		{\printfield{zenon}}%
+}
+%-----------------------   
+\newbibmacro*{jstor}{%
+  	\usebibmacro{bbx:parunit}%
+  	\iffieldundef{jstor}%
+    		{}%
+    		{\printfield{jstor}}%
+}
+%-----------------------   
+\newbibmacro*{urn}{%
+  	\usebibmacro{bbx:parunit}%
+  	\iffieldundef{urn}%
+    		{}%
+    		{\printfield{urn}}%
+}
+%-----------------------
 \renewbibmacro*{url+urldate}{%
-  \usebibmacro{bbx:parunit}%
-  \printfield{url}%
-  \iffieldundef{urlyear}%
-    {}%
- {\setunit*{\addspace}%
-     \printtext{\printurldate}}%
-     }
-             
+  	\usebibmacro{bbx:parunit}%
+  	\printfield{url}%
+  	\iffieldundef{urlyear}%
+    		{}%
+ 			{\setunit*{\addspace}%
+     			\printtext{\printurldate}%
+     		}%
+}
+%-----------------------             
 \renewbibmacro*{doi+eprint+url}{%
-  \usebibmacro{bbx:parunit}%
-  \iftoggle{bbx:doi}%
-    {\printfield{doi}}%
-    {}%
-  \iftoggle{bbx:eprint}%
-    {\usebibmacro{eprint}}%
-    {}%
-  \iftoggle{bbx:url}%
-    {\usebibmacro{url+urldate}}%
-    {}}
-
+  	\usebibmacro{bbx:parunit}%
+  	\iftoggle{bbx:doi}%
+    		{\printfield{doi}}%
+    		{}%
+  	\iftoggle{bbx:eprint}%
+    		{\usebibmacro{eprint}}%
+    		{}%
+    \usebibmacro{jstor}%
+	\usebibmacro{urn}%
+  	\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:noabbrevs}}%
-    {\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:noabbrevs}}%
-    {\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}%
-  \setunit{\volnumdelim}% 
-  \printfield{number}% 
-  \newunit%
-  \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}%
-		}
-
+}
+%-----------------------
 \newbibmacro*{related:translationof}[1]{%
-  \entrydata*{#1}{%
-    \renewbibmacro*{name:hook}[1]{%
-      \ifnumequal{\value{listcount}}{1}%
-        {\begingroup%
-         \mkrelatedstring%
-         \lbx@initnamehook{#1}%
-         \endgroup}%
-        {}}%
-	\printnames{savedtranslator}%
+	\entrydata*{#1}{%
+   	\restorename{savedtranslator}{\savedrelatedtranslator}%
     \printtext[emph]{\usebibmacro{title}}%
-    \setunit*{\addspace}%
-\usebibmacro{location+edition+year}%
-}%
+    \usebibmacro{location+edition+year}%
+    	\ifnameundef{savedtranslator}%
+    			{}%
+    			{\newunit
+   	 				\bibstring{bytranslator}%keine Sprache ausgegeben?    
+    				\setunit{\addspace}%
+    				\printnames{savedtranslator}%
+    			}
+  	}
 }
-    
+%-----------------------    
 \newbibmacro*{maintitle+title+volumes}{% 
   \iffieldsequal{maintitle}{title}%
-    {\clearfield{maintitle}%
-     \clearfield{mainsubtitle}%
-     \clearfield{maintitleaddon}}%
-    {\iffieldundef{maintitle}{}%
-       {\usebibmacro{maintitle}%
-         \ifbool{cbx:antik}%
-            {\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}}{}%
+    	{\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}}
-  }
-    {}
+  \ifboolexpr{%
+    	test {\iffieldundef{title}}%
+    	and%
+    	test {\iffieldundef{subtitle}}}
+  	{}%
     {\printtext[title]{%
-       \printfield[titlecase]{title}%
-       \setunit{\subtitlepunct}%
+       	\printfield[titlecase]{title}%
+       		\setunit{\subtitlepunct}%
        \printfield[titlecase]{subtitle}}%
-     \setunit{\subtitlepunct}
+     		\setunit{\subtitlepunct}
      }%
-  \printfield{titleaddon}}
-  
+  \printfield{titleaddon}%
+}
+%-----------------------  
 \renewbibmacro*{booktitle}{%
-  \ifboolexpr{
-    test {\iffieldundef{booktitle}}
-    and
-    test {\iffieldundef{booksubtitle}}
-  }
-    {}
+  \ifboolexpr{%
+   		test {\iffieldundef{booktitle}}%
+   		and%
+    	test {\iffieldundef{booksubtitle}}}
+    {}%
     {\printtext[booktitle]{%
-       \printfield[titlecase]{booktitle}%
-       \setunit{\subtitlepunct}%
-       \printfield[titlecase]{booksubtitle}}%
-	\setunit{\subtitlepunct}
+      	\printfield[titlecase]{booktitle}%
+       		\setunit{\subtitlepunct}%
+       	\printfield[titlecase]{booksubtitle}}%
+			\setunit{\subtitlepunct}%
      }%
-  \printfield{booktitleaddon}}
-  	
+  \printfield{booktitleaddon}%
+}
+%-----------------------  	
 \renewbibmacro*{maintitle}{%
-  \ifboolexpr{
-    test {\iffieldundef{maintitle}}
-    and
-    test {\iffieldundef{mainsubtitle}}
-  }
-    {}
+  \ifboolexpr{%
+    	test {\iffieldundef{maintitle}}%
+    	and%
+    	test {\iffieldundef{mainsubtitle}}}%
+    {}%
     {\printtext[maintitle]{%
        \printfield[titlecase]{maintitle}%
-       \setunit{\subtitlepunct}%
+       		\setunit{\subtitlepunct}%
        \printfield[titlecase]{mainsubtitle}}%
-	\setunit{\subtitlepunct}
+			\setunit{\subtitlepunct}%
      }%
-  \printfield{maintitleaddon}}
-
-
-
+  \printfield{maintitleaddon}%
+}
+%-----------------------
 \newbibmacro*{Erstauflage}{%
 		\bibstring{firstprint}%
 		\setunit{\addcolon\addspace}%
-		}
-
+}
+%-----------------------
 \newbibmacro*{edition}{%
   \iffieldint{edition}%
-    {\setunit*{\addspace}%
-    \mkbibsuperscript{\printfield{edition}}}%
-    {\newunit%
-     \printfield{edition}%
-     \setunit{\addspace}%
+    	{\setunit*{\addspace}%
+    		\mkbibsuperscript{\printfield{edition}}}%
+    	{\newunit%
+     		\printfield{edition}%
+     		\setunit{\addspace}%
       }%
-      }
-
+}
+%-----------------------
 \newbibmacro*{location+edition+year}{%
-\ifboolexpr{test {\iflistundef{location}}%
-  and test {\iffieldundef{publisher}}%
-  and test {\iffieldundef{year}}}%
-  {}%
-  {\ifbool{bbx:publisher}%
-    {\printtext[parens]{%
-        \printlist{location}%
-        \setunit*{\addcolon\addspace}%
-        \printlist{publisher}%
-        \iffieldint{edition}%
-          {\setunit{\addspace}}%
-          {\newunit}%
-        \usebibmacro{edition}%
-        \printfield{year}%
-        \setunit*{\addspace}%
-        \iffieldundef{origyear}{}{%
-        \printtext[parens]{%
-          \usebibmacro{Erstauflage}%
-          \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}%
-        \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}%
-  \printfield{year}%
-  \newunit%
-  }
-
-\newbibmacro*{addendum}{}
+  	\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}%
+}
+%-----------------------         
+\newbibmacro*{addendum}{}%%notwendig?
+%-----------------------         
 \renewbibmacro*{addendum+pubstate}{%
   \printfield{addendum}%
-  \iffieldundef{\thefield{datelabesource}year}{}
-  {\newunit\newblock\printfield{pubstate}}}
-  
+  \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}
-    {}
+  	\iffieldundef{maintitle}%
+    {}%
     {\usebibmacro{maintitle}%
-     \iffieldundef{volume}
-       {\setunit{\maintitlepunct}}% 
-       {\setunit{\addspace}
-        \printfield{volume}%
-        \printfield{part}%
-        \setunit{\adddot\space}}}%
-  \usebibmacro{booktitle}%
-  \newunit}
-  			
+     	\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[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%
+     				}%
+			}%
 }
-
+%-----------------------
 \newbibmacro*{reftitle}{%
-  \iffieldundef{title}{}{%
-	\bibstring{reference}
-	\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 %%
+%-----------------------
 \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%
-  \usebibmacro{addendum+pubstate}%
-  \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}}{}%
-  \usebibmacro{addendum}%
-\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{bibindex}%
+  	\usebibmacro{begentry}%
+  	\usebibmacro{author/editor}
+  		\setunit*{\labelnamepunct}%
+  		\newblock%
 	\usebibmacro{title}%
-	\setunit{\addspace}
+		\setunit{\addspace}
     \printtext[parens]{\printfield{type}%
-    \setunit*{\addspace}%
-  \usebibmacro{institution+location+date}}%
-  \usebibmacro{doi+eprint+url}%
-  \setunit*{\addperiod\addspace}%
-  \usebibmacro{signatur}%
-  \newunit\newblock
-  \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}
-    {}%
-  \usebibmacro{savestuff}%
-  \usebibmacro{finentry}%
+    	\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}}{}%
-  \usebibmacro{addendum}%
-  \usebibmacro{doi+eprint+url}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{signatur}%
-  \usebibmacro{savestuff}%
-  \newunit\newblock
-  \iftoggle{bbx:related}
-    {\usebibmacro{related:init}%
-     \usebibmacro{related}}{}%
-  \usebibmacro{finentry}%
+  	\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}%
-  \setunit{\addspace}%
-  \usebibmacro{addendum}%
-  \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{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{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}%
-  \setunit{\addspace}%
-  \usebibmacro{addendum}%
-  \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{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}%
-  		\iffieldundef{title}{}{\setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}}%
-  		\setunit{\addspace}\printfield{title}%
-  		\iffieldundef{number}{}{\setunit{\addspace}\printtext[brackets]{\printfield{number}}}%
-  		\setunit{\addspace}\printtext[parens]{%
-  			\c@uniquename=1%
-  			\printnames{labelname}}%
+	\usebibmacro{bibindex}%
+ 	\usebibmacro{begentry}%
+	\printfield{booktitle}%
+  		\setunit{\addspace}%
+  	\printfield{volume}%
+  		\setunit{\addspace}%
+  	\printfield[parens]{year}%
+  		\setunit{\addspace}%
+  	\usebibmacro{pages}%
+  	\iffieldundef{title}%
+  			{}%
+  			{\setunit{\addspace}%
+  				\printtext{s\adddot\addnbthinspace v\adddot}%
+  			}%
+  		\setunit{\addspace}%
+  	\printfield{title}%
+	\iffieldundef{number}%
+			{}%
+			{\setunit{\addspace}%
+  				\printtext[brackets]{\printfield{number}}%
+  			}%
+  		\setunit{\addspace}%
+  	\printtext[parens]{\c@uniquename=1%
+  		\printnames{labelname}}%
   		\setunit*{\addspace}%
-  		\usebibmacro{addendum}%
-  		\usebibmacro{doi+eprint+url}%
+  	\usebibmacro{addendum}%
+  	\usebibmacro{doi+eprint+url}%
  		\setunit{\addperiod\addspace}%
-  		\usebibmacro{signatur}%
+  	\usebibmacro{signatur}%
   		\newunit\newblock
-  		\usebibmacro{savestuff}%
-  		\usebibmacro{finentry}%
+  	\usebibmacro{savestuff}%
+  	\usebibmacro{finentry}%
 }
-
+%-----------------------
 \DeclareBibliographyDriver{review}{%
   	\usebibmacro{bibindex}%
   	\usebibmacro{begentry}%
   	\usebibmacro{author/editor}%
-  	\setunit*{\labelnamepunct}\newblock%
-    \iffieldundef{title}{}%
-    				{\usebibmacro{title}}%
-   	\newunit\newblock%
+  		\setunit*{\labelnamepunct}%
+  		\newblock%
+    \iffieldundef{title}%
+    		{}%
+    		{\usebibmacro{title}}%
+   		\newunit\newblock%
 	\usebibmacro{related:init}%
 	\usebibmacro{related}%			
- 	\newunit\newblock%
+ 		\newunit\newblock%
  	\usebibmacro{journal+number+year}%
-  	\newunit\newblock%
+  		\newunit\newblock%
   	\usebibmacro{pages}%
+  	 	\newunit\newblock%
   	\usebibmacro{doi+eprint+url}%
   	\usebibmacro{signatur}%
-  	\newunit\newblock%
+  		\newunit\newblock%
  	\usebibmacro{savestuff}%
  	\usebibmacro{finentry}%
 }
-
-\newsavebox\arch@labelbox%
-
-\newbibmacro{labelwidthbib}{%
-  \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%
-}
-
-
+%-----------------------
 \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 6a8f96db32e..0ca2204ad72 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -1,5 +1,6 @@
 % archaeologie --%
-%               biblatex fuer Archaeologen, Historiker und Philologen
+%            biblatex for archaeologists, 
+%				historians and philologists
 % Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
 %  
 % This work may be distributed and/or modified under the
@@ -9,10 +10,10 @@
 %   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.cbx}%
-               [2016/03/17 v1.42  archaeologie --%
-                biblatex fuer Archaeologen, Historiker und Philologen, cbx-Datei]
+               [2016/06/06 v2.0  archaeologie -- 
+     					        biblatex for archaeologists, 
+								historians and philologists, cbx-Datei]
 \ExecuteBibliographyOptions{%
   citetracker=true,% 
   idemtracker=false,% 
@@ -20,27 +21,29 @@
   opcittracker=true,%
   loccittracker=true,%
   labeldate=true,%
-}%
-
-%%%%%%%% cbx %%%%%%%%%%
-\newbool{cbx:yearinparens}%jahrinklammern
-%%%%%%%% \DeclareBibliographyOption %%%%%%%%%%
+}
+%-----------------------
+\newbool{cbx:yearinparens}
+\newbool{cbx:seenote}
+\newbool{cbx:seen}
+%-----------------------
 \DeclareBibliographyOption{yearinparens}[true]{%
   \ifstrequal{#1}{true}
     {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}
     \csuse{bool#1}{cbx:yearinparens}}
-    {\DeclareFieldFormat{citeyear}{##1}}}
-
+    {\DeclareFieldFormat{citeyear}{##1}}}  
+\DeclareBibliographyOption{seenote}[true]{\csuse{bool#1}%
+	{cbx:seenote}%
+	\ExecuteBibliographyOptions{maxnames=999}%
+	}%
+%-----------------------
 \DeclareFieldFormat{citeyear}{#1}
 \DeclareFieldFormat{prenote}{#1\isdot}%
 \DeclareFieldFormat{postnote}{#1}%
-\DeclareFieldFormat{shorttitle}{#1}%
-
-
-      
- \DeclareNameFormat{frg}{%
+\DeclareFieldFormat{shorttitle}{#1}%      
+\DeclareNameFormat{frg}{%
         \nameparts{#1}%
-        \ifgiveninits
+        \ifgiveninits%
           {\usebibmacro{name:family}
           {\namepartfamily}
           {\namepartgiveni}
@@ -52,58 +55,62 @@
           {\namepartprefix}
           {\namepartsuffix}}%
       \usebibmacro{name:andothers}}
-
-
-      
-      
-\renewcommand*{\multicitedelim}{\addsemicolon\addspace}%
+%-----------------------
+\renewcommand*{\multicitedelim}{\addsemicolon\addspace}
 \newcommand*{\labelyeardelim}{\addspace}
-\renewcommand{\textcitedelim}{}
-\renewcommand{\postnotedelim}{
-  \ifboolexpr{bool {cbx:antik}%
-             	 or bool {cbx:frgantik}%
+\renewcommand{\textcitedelim}{\multicitedelim}
+\renewcommand{\postnotedelim}{%
+  \ifboolexpr{bool {cbx:ancient}%
+             	 or bool {cbx:frgancient}%
 			   	or bool {cbx:corpus}%
               }%
-    {\setunit{\addspace}}%
+    {\addspace}%
     {\newunitpunct}%
 }
-
-
+%-----------------------
 \renewbibmacro*{postnote}{%
-\iffieldundef{postnote}
+\iffieldundef{postnote}%
     {}%
     {\postnotedelim\printfield{postnote}%
-     \ifbool{cbx:frgantik}%
+     \ifbool{cbx:frgancient}%
        {\setunit{\addspace}%
   \usebibmacro{cite:frgname}}%
  }%
  }
-
+%-----------------------
 \newbibmacro*{cite:frgname}{%
       \ifnameundef{shorteditor}%
            {\printnames[frg]{editor}}%
            {\printnames[frg]{shorteditor}}%
 }
-
-\newbibmacro*{cite:name}{%   % 0: only last names, 1: last name + first name initials, 2: full name
-  \ifbool{cbx:fullnames}{\c@uniquename=2}{\ifbool{cbx:lastnames}{\c@uniquename=0}{\c@uniquename=1}}
+%-----------------------
+\newbibmacro*{seenote}{%
+\ifnameundef{labelname}%
+           {\usebibmacro{cite:label}%
+            \setunit{\labelyeardelim}}%
+           {\printnames{labelname}%
+            \setunit{\nameyeardelim}}%
+\setunit{\addspace}%
+\bibstring{loccit}\addspace%
+\printtext[parens]{\bibstring{seenote}\addspace%
+\ref{footref:\thefield{entrykey}}}%
+\renewcommand{\postnotedelim}{\addspace}%
+}%
+%-----------------------
+\newbibmacro*{cite:name}{%   
+% 0: only last names, 1: last name + first name initials, 2: full name
+  \ifbool{cbx:fullnames}{\c@uniquename=2}{\ifbool{cbx:lastnames}{\c@uniquename=0}{\c@uniquename=1}}%
   \ifciteindex{\indexnames{labelname}}{}%
   \printtext[bibhyperref]{%
     \iffootnote{\c@uniquename=0 \printnames{labelname}}{\printnames{labelname}}}}
-
+%-----------------------
 \newbibmacro*{cite:title}{\printfield{labeltitle}}%  
-
-
+%-----------------------
 \newbibmacro*{cite:year}{%            
   \iffieldundef{labelyear}%
     {}%
     {{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}}}
-
-
-
-
-
- 
+%-----------------------
 \newbibmacro*{cite:lexikon}{%
   				\printfield{booktitle}%
   				\setunit{\addspace}%
@@ -111,124 +118,144 @@
   				 \setunit{\addspace}%
   				\printfield[parens]{year}%
   				\setunit{\addspace}%
-  							\iffieldundef{postnote}{\printfield{pages}}{\printfield{postnote}}%
-  				  		\iffieldundef{title}{}{\setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}}%
+  							\iffieldundef{postnote}{\printfield{pages}}%
+  							{\printfield{postnote}}%
+  				  		\iffieldundef{title}{}{\setunit{\addspace}%
+  				  		\printtext{s\adddot\addnbthinspace v\adddot}}%
   				\setunit{\addspace}\printfield{title}%
-  				 \iffieldundef{number}{}{\setunit{\addspace}\printtext[brackets]{\printfield{number}}}%
-  				\setunit{\addspace}\printtext[parens]{\c@uniquename=1 \printnames{labelname}}%
+  				 \iffieldundef{number}{}{\setunit{\addspace}%
+  				 \printtext[brackets]{\printfield{number}}}%
+  				\setunit{\addspace}%
+  				\printtext[parens]{\c@uniquename=1 \printnames{labelname}}%
+	}
+%-----------------------
+\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}}{}%
+  \bibhypertarget{ref:\thefield{entrykey}}{%
+        \usedriver{}{\thefield{entrytype}}%
+         \iffootnote{\label{footref:\thefield{entrykey}}}%
+   }}}%
 }
-
-
+%-----------------------
 \newbibmacro{cite}{%
 	\ifboolexpr{%
 		 test {\ifbool{bbx:inreferences}}%
 		 and %
 		 test	{\ifentrytype{inreference}}%
 		 }%
-{\usebibmacro{cite:lexikon}}%
+{\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:year}}%
         {\usebibmacro{cite:shorthand}}}}%
+       }%
+    }%
+  \ifciteseen{\global\booltrue{cbx:seen}}%
+                  {\global\boolfalse{cbx:seen}}%
+  \usebibmacro{savestuff}%
 }
-
-
+%-----------------------
 \newbibmacro*{citeyear}{%
-  \iffieldundef{shorthand}
-    {\iffieldundef{labelyear}
-       {\usebibmacro{cite:label}}
-       {\usebibmacro{cite:labelyear+extrayear}}}
+  \iffieldundef{shorthand}%
+    {\iffieldundef{labelyear}%
+       {\usebibmacro{cite:label}}%
+       {\usebibmacro{cite:labelyear+extrayear}}}%
     {\usebibmacro{cite}}}
-
+%-----------------------
 \newbibmacro*{textcite}{%aus authoryear
-  \ifnameundef{labelname}
-    {\iffieldundef{shorthand}
+  \ifnameundef{labelname}%
+    {\iffieldundef{shorthand}%
        {\usebibmacro{cite:label}%
         \setunit{%
           \global\booltrue{cbx:yearinparens}%
           \nonameyeardelim\bibopenparen}%
-        \ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}
+        \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}%
           {}%
-        \usebibmacro{cite:labelyear+extrayear}}
-       {\usebibmacro{cite}}}
+        \usebibmacro{cite:labelyear+extrayear}}%
+       {\usebibmacro{cite}}}%
     {\printnames{labelname}%
      \setunit{%
        \global\booltrue{cbx:yearinparens}%
        \nameyeardelim\bibopenparen}%
-     \ifnumequal{\value{citecount}}{1}
-       {\usebibmacro{prenote}}
-       {}%
      \usebibmacro{citeyear}}}
-
+%-----------------------
 \newbibmacro*{cite:shorthand}{%
-  \printtext[bibhyperref]{\printfield{shorthand}}}
-
+  \ifbool{cbx:seenote}%
+  		{\printtext{\printfield{shorthand}}}%
+  		{\printtext[bibhyperref]{\printfield{shorthand}}}}
+%-----------------------
 \newbibmacro*{cite:label}{%
-  \iffieldundef{label}
-    {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
+  \iffieldundef{label}%
+    {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}%
     {\printtext[bibhyperref]{\printfield{label}}}}
-
+%-----------------------
 \newbibmacro*{cite:labelyear+extrayear}{%
   \iffieldundef{labelyear}%
     {}%
     {\printtext[bibhyperref]{%
        \printfield{labelyear}%
        \printfield{extrayear}}}}
-
+%-----------------------
 \newbibmacro*{textcite:postnote}{%
-  \ifboolexpr{bool {cbx:antik}%
-             	 or bool {cbx:frgantik}%
-			   	or bool {cbx:corpus}%
-              }%
-    {\setunit{\addspace}}%
-{}%
-  \iffieldundef{postnote}
-    {\ifbool{cbx:yearinparens}
-       {\bibcloseparen}
-       {}}
-    {\ifbool{cbx:yearinparens}
-       {\setunit{\postnotedelim}}
+  \iffieldundef{postnote}%
+    {\ifbool{cbx:yearinparens}%
+       {\bibcloseparen}%
+       {}}%
+    {\ifbool{cbx:yearinparens}%
+       {\setunit{\postnotedelim}}%
        {\setunit{\extpostnotedelim\bibopenparen}}%
      \printfield{postnote}%
-      \ifbool{cbx:frgantik}%
-       {\setunit{\addspace}%
+      \ifbool{cbx:frgancient}%
+       {\setunit{\addthinspace}%
   \usebibmacro{cite:frgname}%
   \bibcloseparen}%
   \bibcloseparen}}
-
-
-
-%% Cite Commands %%%
+%-----------------------
 \DeclareCiteCommand{\cite}%              
-  {\usebibmacro{prenote}}%
-{\usebibmacro{citeindex}%
-\usebibmacro{cite}}%
-{\multicitedelim}%
-{\ifboolexpr{%
-test{\ifbool{bbx:inreferences}}%
-and%
-test{\ifentrytype{inreference}}%
-}{}{\usebibmacro{postnote}}}%
-
+ 	 {\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}}
+  {\boolfalse{cbx:yearinparens}%
+  \usebibmacro{prenote}%
+  }%
   {\usebibmacro{citeindex}%
-   \iffirstcitekey
-     {\setcounter{textcitetotal}{1}}
+   \iffirstcitekey%
+     {\setcounter{textcitetotal}{1}}%
      {\stepcounter{textcitetotal}%
       \textcitedelim}%
-   \usebibmacro{textcite}}
-  {\ifbool{cbx:parens}
-     {\bibcloseparen\global\boolfalse{cbx:yearinparens}}
-     {}}
-  {\usebibmacro{textcite:postnote}}
- 
-
+   \ifbool{cbx:seenote}{\usebibmacro{cite:seenote}}%
+   				{\usebibmacro{textcite}}}%
+  {\ifbool{cbx:parens}%
+     {\bibcloseparen\global\boolfalse{cbx:yearinparens}}%
+     {}}%
+  {\ifbool{cbx:seenote}{\usebibmacro{postnote}}%
+  				{\usebibmacro{textcite:postnote}}}
+%----------------------- 
 \DeclareCiteCommand{\parencite}[\mkbibparens]%
   {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
@@ -239,17 +266,14 @@ test{\ifentrytype{inreference}}%
   and%
   test{\ifentrytype{inreference}}%
   }{}{\usebibmacro{postnote}}}%
-  
-  
+%-----------------------  
 \DeclareMultiCiteCommand{\cites}%
         {\cite}{\multicitedelim}
 \DeclareMultiCiteCommand{\parencites}[\mkbibparens]%
         {\parencite}{\multicitedelim}
    \DeclareMultiCiteCommand{\textcites}%
-        {\textcite}{\addspace\bibstring{and}\space} 
-        
-        
-        
+        {\textcite}{\textcitedelim} 
+%----------------------- 
 \DeclareCiteCommand{\citeauthor}%
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -261,20 +285,20 @@ test{\ifentrytype{inreference}}%
   {\usebibmacro{cite:name}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}%
-
+%-----------------------
 \DeclareCiteCommand{\citetitle} %
   {\boolfalse{citetracker}%
     \boolfalse{pagetracker}%
     \usebibmacro{prenote}}%
   {\printtext[bibhyperref]{%
-   \ifbool{cbx:antik}{\printtext[emph]{\usebibmacro{cite:title}}}%
+   \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}}%
-     	}%
-    	}}}%
+      					\iffieldundef{origyear}{}%
+      					{\addspace\printfield[parens]{origyear}}}%
+     	    	}}}%
     {\multicitedelim}%
     {\usebibmacro{postnote}}%
 \endinput
-%% End of file `archaeologie.cbx'.
+%% 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 034131d0bd7..bb94482f240 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
@@ -1,5 +1,6 @@
 % archaeologie --%
-%               biblatex fuer Archaeologen, Historiker und Philologen
+%            biblatex for archaeologists, 
+%				historians and philologists
 % Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
 %  
 % This work may be distributed and/or modified under the
@@ -9,14 +10,20 @@
 %   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.dbx}%
-               [2016/03/17 v1.42  archaeologie --%
-                biblatex fuer Archaeologen, Historiker und Philologen, dbx-Datei]
+               [2016/06/06 v2.0  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}
 \DeclareDatamodelEntryfields[inbook,incollection,inproceedings,inreference]{ineditor, intranslator, inannotator, incommentator, inintroduction, inforeword, inafterword}
-
+\DeclareDatamodelEntrytypes{talk}
+\DeclareDatamodelEntryfields[talk]{author,title,subtitle,titleaddon,date,venue,institution,eventtitle,eventdate,url,urldate,note,}
+\DeclareDatamodelFields[type=field,datatype=verbatim]{zenon}
+\DeclareDatamodelEntryfields{zenon}
+\DeclareDatamodelFields[type=field,datatype=verbatim]{urn}
+\DeclareDatamodelEntryfields{urn}
+\DeclareDatamodelFields[type=field,datatype=verbatim]{jstor}
+\DeclareDatamodelEntryfields{jstor}
 \endinput
\ No newline at end of file